diff --git a/gradle.properties b/gradle.properties index fece410b4..62619a44b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group = org.purpurmc.purpur version = 1.20.1-R0.1-SNAPSHOT mcVersion = 1.20.1 -paperCommit = f402f89a67bfdbcbe302733a0e62b064888b0f6f +paperCommit = 69a801305d3148d49672401e83905d95bfc950ec org.gradle.caching = true org.gradle.parallel = true diff --git a/patches/server/0307-revert-net.kyori.ansi-version-temporarily.patch b/patches/server/0307-revert-net.kyori.ansi-version-temporarily.patch deleted file mode 100644 index 6cdf2cedd..000000000 --- a/patches/server/0307-revert-net.kyori.ansi-version-temporarily.patch +++ /dev/null @@ -1,19 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: granny -Date: Sat, 29 Jul 2023 20:53:02 -0700 -Subject: [PATCH] revert net.kyori.ansi version temporarily - - -diff --git a/build.gradle.kts b/build.gradle.kts -index cbdc0e182f7cdbdeaf717104fa5be24c95f7a79b..240394b1d9dd1449674a299aa73fa155be2d3d82 100644 ---- a/build.gradle.kts -+++ b/build.gradle.kts -@@ -23,7 +23,7 @@ dependencies { - implementation("org.jline:jline-terminal-jansi:3.21.0") - implementation("net.minecrell:terminalconsoleappender:1.3.0") - implementation("net.kyori:adventure-text-serializer-ansi:4.14.0") // Keep in sync with adventureVersion from Paper-API build file -- implementation("net.kyori:ansi:1.0.2") // Manually bump beyond above transitive dep -+ implementation("net.kyori:ansi:1.0.1") // Manually bump beyond above transitive dep - /* - Required to add the missing Log4j2Plugins.dat file from log4j-core - which has been removed by Mojang. Without it, log4j has to classload