Skip to content

Commit 914cf85

Browse files
committed
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
2 parents fb12ff2 + c1c3a5f commit 914cf85

File tree

77 files changed

+543
-8654
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+543
-8654
lines changed

.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ body:
3131
- '1.20'
3232
- '1.19.4'
3333
- '1.18.2'
34-
- '1.17.1'
3534
validations:
3635
required: true
3736

.github/workflows/label-merge-conflicts.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
runs-on: ubuntu-latest
1616
steps:
1717
- name: Label conflicting PRs
18-
uses: eps1lon/actions-label-merge-conflict@v2.1.0
18+
uses: eps1lon/actions-label-merge-conflict@v3.0.0
1919
with:
2020
dirtyLabel: "unresolved-merge-conflict"
2121
repoToken: "${{ secrets.GITHUB_TOKEN }}"

build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ logger.lifecycle("""
3434
*******************************************
3535
""")
3636

37-
var rootVersion by extra("2.9.1")
37+
var rootVersion by extra("2.9.2")
3838
var snapshot by extra("SNAPSHOT")
3939
var revision: String by extra("")
4040
var buildNumber by extra("")
@@ -83,7 +83,7 @@ allprojects {
8383
}
8484

8585
applyCommonConfiguration()
86-
val supportedVersions = listOf("1.17.1", "1.18.2", "1.19.4", "1.20", "1.20.4")
86+
val supportedVersions = listOf("1.18.2", "1.19.4", "1.20", "1.20.4")
8787

8888
tasks {
8989
supportedVersions.forEach {

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ mapmanager = "1.8.0-SNAPSHOT"
1414
griefprevention = "17.0.0"
1515
griefdefender = "2.1.0-SNAPSHOT"
1616
residence = "4.5._13.1"
17-
towny = "0.100.1.20"
17+
towny = "0.100.1.23"
1818
plotsquared = "7.3.6"
1919

2020
# Third party

gradle/wrapper/gradle-wrapper.jar

-9 Bytes
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

settings.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ rootProject.name = "FastAsyncWorldEdit"
22

33
include("worldedit-libs")
44

5-
listOf("1_17_1", "1_18_2", "1_19_4", "1_20", "1_20_2", "1_20_4").forEach {
5+
listOf("1_18_2", "1_19_4", "1_20", "1_20_2", "1_20_4").forEach {
66
include("worldedit-bukkit:adapters:adapter-$it")
77
}
88

worldedit-bukkit/adapters/adapter-1_17_1/build.gradle.kts

Lines changed: 0 additions & 27 deletions
This file was deleted.

0 commit comments

Comments
 (0)