Update upstream

Final 1.17 update most likely
This commit is contained in:
lexikiq
2021-12-11 20:02:01 -05:00
parent 19be21e186
commit 684ee059ea
2 changed files with 6 additions and 6 deletions

View File

@@ -2,7 +2,7 @@ group = me.lexikiq
version = 1.17.1-R0.1-SNAPSHOT
mcVersion = 1.17.1
paperRef = 244b392f390afa7a4880e2207c7358fe195bd431
paperRef = d4318a6ebca2a3f2859ca0ef1b274192633c7d5e
org.gradle.caching=true
org.gradle.parallel=true

View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Build changes
diff --git a/build.gradle.kts b/build.gradle.kts
index e067c69fea1dec79ef8e97cad1c74020b6a3a235..1a906b8a29e8359dda43985a37c1857c4f6f74cd 100644
index f442236efe30d7d9e0c6a8dfb0f040540dc62753..fdb196e44535eebf63a6c0e0ee98280e21d9b450 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -22,8 +22,8 @@ repositories {
@@ -19,7 +19,7 @@ index e067c69fea1dec79ef8e97cad1c74020b6a3a235..1a906b8a29e8359dda43985a37c1857c
// Paper start
implementation("org.jline:jline-terminal-jansi:3.21.0")
implementation("net.minecrell:terminalconsoleappender:1.3.0")
@@ -74,7 +74,7 @@ tasks.jar {
@@ -75,7 +75,7 @@ tasks.jar {
attributes(
"Main-Class" to "org.bukkit.craftbukkit.Main",
"Implementation-Title" to "CraftBukkit",
@@ -28,7 +28,7 @@ index e067c69fea1dec79ef8e97cad1c74020b6a3a235..1a906b8a29e8359dda43985a37c1857c
"Implementation-Vendor" to date, // Paper
"Specification-Title" to "Bukkit",
"Specification-Version" to project.version,
@@ -96,6 +96,26 @@ publishing {
@@ -97,6 +97,26 @@ publishing {
classifier = null
}
artifact(tasks.shadowJar)
@@ -55,7 +55,7 @@ index e067c69fea1dec79ef8e97cad1c74020b6a3a235..1a906b8a29e8359dda43985a37c1857c
}
}
@@ -140,7 +160,7 @@ tasks.shadowJar {
@@ -141,7 +161,7 @@ tasks.shadowJar {
// Needed for Paperclip's install to maven local feature
from(generatePom) {
@@ -64,7 +64,7 @@ index e067c69fea1dec79ef8e97cad1c74020b6a3a235..1a906b8a29e8359dda43985a37c1857c
rename { "pom.xml" }
}
@@ -201,7 +221,7 @@ tasks.test {
@@ -202,7 +222,7 @@ tasks.test {
fun TaskContainer.registerRunTask(
name: String, block: JavaExec.() -> Unit
): TaskProvider<JavaExec> = register<JavaExec>(name) {