merge some patches & re-enable timings

This commit is contained in:
Ben Kerllenevich
2021-08-20 17:41:02 -04:00
parent d918b4f0c6
commit 6e1ad89162
54 changed files with 75 additions and 64 deletions

View File

@@ -5,14 +5,10 @@ Subject: [PATCH] Rebrand
diff --git a/build.gradle.kts b/build.gradle.kts
index 467ac5ba77cc35dc84c38161881db37e8f9adc14..1dac8dda93c03d1f0c4f8a91387527a7d06d1360 100644
index 467ac5ba77cc35dc84c38161881db37e8f9adc14..9b844735f37de2f833b59f619c88045e8ad336c9 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -32,10 +32,11 @@ repositories {
}
// Paper end
maven("https://repo.velocitypowered.com/snapshots/") // Tuinity
+ maven ("https://jitpack.io") // Purpur
@@ -35,7 +35,7 @@ repositories {
}
dependencies {
@@ -21,7 +17,7 @@ index 467ac5ba77cc35dc84c38161881db37e8f9adc14..1dac8dda93c03d1f0c4f8a91387527a7
implementation("io.papermc.paper:paper-mojangapi:1.17.1-R0.1-SNAPSHOT") // Tuinity
// Paper start
implementation("org.jline:jline-terminal-jansi:3.12.1")
@@ -67,6 +68,7 @@ dependencies {
@@ -67,6 +67,7 @@ dependencies {
implementation("co.aikar:cleaner:1.0-SNAPSHOT") // Paper
implementation("io.netty:netty-all:4.1.65.Final") // Paper
@@ -29,7 +25,7 @@ index 467ac5ba77cc35dc84c38161881db37e8f9adc14..1dac8dda93c03d1f0c4f8a91387527a7
implementation("org.quiltmc:tiny-mappings-parser:0.3.0") // Paper - needed to read mappings for stacktrace deobfuscation
implementation("com.velocitypowered:velocity-native:1.1.0-SNAPSHOT") // Tuinity
@@ -86,13 +88,13 @@ tasks.jar {
@@ -86,13 +87,13 @@ tasks.jar {
manifest {
val git = Git(rootProject.layout.projectDirectory.path)
val gitHash = git("rev-parse", "--short=7", "HEAD").getText().trim()