Merge remote-tracking branch 'origin/master'

# Conflicts:
#	build.gradle

Author: Anuken

.github/workflows/commitTest.yml

@@ -7,13 +7,14 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Set up PATH
       run: |
         echo "${ANDROID_HOME}/build-tools/34.0.0" >> $GITHUB_PATH
     - name: Set up JDK 17
-      uses: actions/setup-java@v1
+      uses: actions/setup-java@v5
       with:
+        distribution: 'temurin'
         java-version: 17
     - name: Build mod jar
       run: |