Merge branch 'master' into future

# Conflicts:
#	src/main/resources/fabric.mod.json

.github/workflows/build-on-pr.yml

@@ -12,11 +12,11 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 16
+    - name: Set up JDK 17
       uses: actions/setup-java@v2
       with:
-        distribution: 'adopt'
+        distribution: 'temurin'
-        java-version: 16
+        java-version: 17
     - name: Cache Gradle packages
       uses: actions/cache@v2
       with:

.github/workflows/devbuild.yml

@@ -12,11 +12,11 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 16
+    - name: Set up JDK 17
       uses: actions/setup-java@v2
       with:
-        distribution: 'adopt'
+        distribution: 'temurin'
-        java-version: 16
+        java-version: 17
     - name: Cache Gradle packages
       uses: actions/cache@v2
       with:

.github/workflows/publish-release.yml

@@ -65,11 +65,11 @@ jobs:
         uses: actions/checkout@v2
         with:
           ref: ${{ steps.getbranchinfo.outputs.branchname }}
-      - name: Set up JDK 16
+      - name: Set up JDK 17
         uses: actions/setup-java@v2
         with:
-          distribution: 'adopt'
+          distribution: 'temurin'
-          java-version: 16
+          java-version: 17
       - name: Cache Gradle packages
         uses: actions/cache@v2
         with:
@@ -140,11 +140,11 @@ jobs:
     steps:
       - name: Checkout Carpet sources
         uses: actions/checkout@v2
-      - name: Set up JDK 16
+      - name: Set up JDK 17
         uses: actions/setup-java@v2
         with:
-          distribution: 'adopt'
+          distribution: 'temurin'
-          java-version: 16
+          java-version: 17
       - name: Cache Gradle packages
         uses: actions/cache@v2
         with:

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists