Merge branch 'main' into v3

# Conflicts: # worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/TransformExtent.java # worldedit-core/src/main/java/com/fastasyncworldedit/core/util/collection/SimpleRandomCollection.java
IntellectualSites · Mar 27, 2024 · 914cf85 · 914cf85
2 parents fb12ff2 + c1c3a5f
commit 914cf85
Show file tree

Hide file tree

Showing 77 changed files with 543 additions and 8,654 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -31,7 +31,6 @@ body:
  - '1.20'
  - '1.19.4'
  - '1.18.2'
- - '1.17.1'
  validations:
  required: true
 

diff --git a/.github/workflows/label-merge-conflicts.yaml b/.github/workflows/label-merge-conflicts.yaml
@@ -15,7 +15,7 @@ jobs:
  runs-on: ubuntu-latest
  steps:
  - name: Label conflicting PRs
- uses: eps1lon/actions-label-merge-conflict@v2.1.0
+ uses: eps1lon/actions-label-merge-conflict@v3.0.0
  with:
  dirtyLabel: "unresolved-merge-conflict"
  repoToken: "${{ secrets.GITHUB_TOKEN }}"

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -34,7 +34,7 @@ logger.lifecycle("""
 *******************************************
 """)
 
-var rootVersion by extra("2.9.1")
+var rootVersion by extra("2.9.2")
 var snapshot by extra("SNAPSHOT")
 var revision: String by extra("")
 var buildNumber by extra("")
@@ -83,7 +83,7 @@ allprojects {
 }
 
 applyCommonConfiguration()
-val supportedVersions = listOf("1.17.1", "1.18.2", "1.19.4", "1.20", "1.20.4")
+val supportedVersions = listOf("1.18.2", "1.19.4", "1.20", "1.20.4")
 
 tasks {
  supportedVersions.forEach {

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -14,7 +14,7 @@ mapmanager = "1.8.0-SNAPSHOT"
 griefprevention = "17.0.0"
 griefdefender = "2.1.0-SNAPSHOT"
 residence = "4.5._13.1"
-towny = "0.100.1.20"
+towny = "0.100.1.23"
 plotsquared = "7.3.6"
 
 # Third party

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -2,7 +2,7 @@ rootProject.name = "FastAsyncWorldEdit"
 
 include("worldedit-libs")
 
-listOf("1_17_1", "1_18_2", "1_19_4", "1_20", "1_20_2", "1_20_4").forEach {
+listOf("1_18_2", "1_19_4", "1_20", "1_20_2", "1_20_4").forEach {
  include("worldedit-bukkit:adapters:adapter-$it")
 }
 

diff --git a/worldedit-bukkit/adapters/adapter-1_17_1/build.gradle.kts b/worldedit-bukkit/adapters/adapter-1_17_1/build.gradle.kts