Merge branch 'minetest32double' into minetest32net

.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

.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

.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

.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,37 +20,55 @@ 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
     - 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