Merge branch 'master' into dev

# Conflicts:
#	.github/workflows/gradle.yml

.github/workflows/gradle.yml

@@ -13,11 +13,11 @@ jobs:
       uses: actions/checkout@v4
     - name: Validate Gradle Wrapper
       uses: gradle/wrapper-validation-action@v1
-    - name: Set up JDK 11
+    - name: Set up JDK 17
       uses: actions/setup-java@v4
       with:
         distribution: 'temurin'
-        java-version: 11
+        java-version: 17
         check-latest: true
     - name: Build with Gradle
       run: ./gradlew build

gradle.properties

@@ -4,4 +4,4 @@ projectVersion=4.10.0-24w03a-SNAPSHOT
 mcVersions=1.20.4, 1.20.3, 1.20.2, 1.20.1, 1.20, 1.19.4, 1.19.3, 1.19.2, 1.19.1, 1.19, 1.18.2, 1.18.1, 1.18, 1.17.1, 1.17, 1.16.5, 1.16.4, 1.16.3, 1.16.2, 1.16.1, 1.16, 1.15.2, 1.15.1, 1.15, 1.14.4, 1.14.3, 1.14.2, 1.14.1, 1.14, 1.13.2, 1.13.1, 1.13, 1.12.2, 1.12.1, 1.12, 1.11.2, 1.11.1, 1.11, 1.10.2, 1.10.1, 1.10
 mcVersionRange=1.10-1.20.4
 waterfallVersion=1.20
-velocityVersion=3.2
+velocityVersion=3.3

velocity/build.gradle.kts

@@ -1,7 +1,7 @@
 dependencies {
     compileOnlyApi(projects.viabackwardsCommon)
     compileOnly(libs.velocity) {
-        // Requires Java 11
+        // Requires Java 17
         exclude("com.velocitypowered", "velocity-brigadier")
     }
     annotationProcessor(libs.velocity)