From f479e32b5ffacc915d1475db8545a06c7879551d Mon Sep 17 00:00:00 2001 From: NotMyFault Date: Sat, 24 Jul 2021 19:28:28 +0200 Subject: [PATCH] Update contributing url --- .github/ISSUE_TEMPLATE/bug_report.yml | 2 +- .github/PULL_REQUEST_TEMPLATE.md | 2 +- .github/workflows/build.yml | 2 +- COMPILING.md | 2 +- worldedit-bukkit/build.gradle.kts | 3 +-- worldedit-core/build.gradle.kts | 2 +- 6 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index 8470aa773..e9824a0f1 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -29,7 +29,7 @@ body: description: Which server version version you using? If your server version is not listed, it is not supported. Update to a supported version first. multiple: false options: - - '1.17.+' + - '1.17.1' - '1.16.5' - '1.15.2' validations: diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 58e192ab0..6277f3cd9 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -16,4 +16,4 @@ You can do so here: https://github.com/IntellectualSites/FastAsyncWorldEdit/issu - [] I included all information required in the sections above - [] I tested my changes and approved their functionality - [] I ensured my changes do not break other parts of the code -- [] I read and followed the [contribution guidelines](https://github.com/IntellectualSites/FastAsyncWorldEdit/blob/1.16/CONTRIBUTING.md) +- [] I read and followed the [contribution guidelines](https://github.com/IntellectualSites/FastAsyncWorldEdit/blob/main/CONTRIBUTING.md) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f8629843e..169d5269c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -44,7 +44,7 @@ jobs: - name: "Download BuildTools" run: "wget https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar" - name: "Run BuildTools" - run: "java -jar BuildTools.jar --rev 1.16.5" + run: "java -jar BuildTools.jar --rev 1.17.1" - name: "Clean Build" run: "./gradlew clean build sourcesJar javadocJar -x test" - name: Cleanup Gradle Cache diff --git a/COMPILING.md b/COMPILING.md index cc1580e2c..dbad3f134 100644 --- a/COMPILING.md +++ b/COMPILING.md @@ -38,7 +38,7 @@ You will find: * FastAsyncWorldEdit for Bukkit in **worldedit-bukkit/build/libs** * the CLI version in **worldedit-cli/build/libs** -If you want to use FastAsyncWorldEdit, use the `FastAsyncWorldEdit-1.16-` version obtained in **worldedit-bukkit/build/libs**. +If you want to use FastAsyncWorldEdit, use the `FastAsyncWorldEdit-1.17-` version obtained in **worldedit-bukkit/build/libs**. (The `-#` version includes FastAsyncWorldEdit + necessary libraries.) diff --git a/worldedit-bukkit/build.gradle.kts b/worldedit-bukkit/build.gradle.kts index 143ca9058..dfe96dd17 100644 --- a/worldedit-bukkit/build.gradle.kts +++ b/worldedit-bukkit/build.gradle.kts @@ -100,10 +100,9 @@ dependencies { implementation("com.massivecraft:mcore:7.0.1") { isTransitive = false } implementation("com.bekvon.bukkit.residence:Residence:4.5._13.1") { isTransitive = false } implementation("com.palmergames.bukkit:towny:0.84.0.9") { isTransitive = false } - implementation("com.thevoxelbox.voxelsniper:voxelsniper:5.171.0") { isTransitive = false } implementation("com.comphenix.protocol:ProtocolLib:4.7.0") { isTransitive = false } implementation("org.incendo.serverlib:ServerLib:2.2.1") - api("com.plotsquared:PlotSquared-Bukkit:6.0.6-SNAPSHOT") + api("com.plotsquared:PlotSquared-Bukkit:6.0.6-SNAPSHOT") { isTransitive = false } } tasks.named("processResources") { diff --git a/worldedit-core/build.gradle.kts b/worldedit-core/build.gradle.kts index 29207c57b..b4e209bd5 100644 --- a/worldedit-core/build.gradle.kts +++ b/worldedit-core/build.gradle.kts @@ -45,7 +45,7 @@ dependencies { implementation("com.github.luben:zstd-jni:1.5.0-4") compileOnly("net.fabiozumbi12:redprotect:1.9.6") api("com.github.intellectualsites.plotsquared:PlotSquared-API:4.514") { isTransitive = false } - api("com.plotsquared:PlotSquared-Core:6.0.6-SNAPSHOT") + api("com.plotsquared:PlotSquared-Core:6.0.6-SNAPSHOT") { isTransitive = false } compileOnlyApi("net.kyori:adventure-api:4.8.0") compileOnlyApi("net.kyori:adventure-text-minimessage:4.1.0-SNAPSHOT") api("com.intellectualsites.paster:Paster:1.0.1-SNAPSHOT")