diff --git a/patches/server/0015-Bump-Netty-version-to-4.1.70.Final.patch b/patches/server/0015-Bump-Netty-version-to-4.1.70.Final.patch new file mode 100644 index 0000000..bbf2ecc --- /dev/null +++ b/patches/server/0015-Bump-Netty-version-to-4.1.70.Final.patch @@ -0,0 +1,19 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Etil <81570777+etil2jz@users.noreply.github.com> +Date: Thu, 11 Nov 2021 11:57:52 +0100 +Subject: [PATCH] Bump Netty version to 4.1.70.Final + + +diff --git a/build.gradle.kts b/build.gradle.kts +index 5fde6b03fcccef4f9cc5c84c3701e45b27bc4471..d48b6a9c7816ba5f18a63e247aa814f986456465 100644 +--- a/build.gradle.kts ++++ b/build.gradle.kts +@@ -52,7 +52,7 @@ dependencies { + runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.0") + runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.0") + +- implementation("io.netty:netty-all:4.1.65.Final") // Paper ++ implementation("io.netty:netty-all:4.1.70.Final") // Paper // Mirai + + implementation("net.fabricmc:mapping-io:0.3.0") // Paper - needed to read mappings for stacktrace deobfuscation + implementation("com.velocitypowered:velocity-native:1.1.0-SNAPSHOT") // Paper diff --git a/patches/server/0016-Bump-Netty-version-to-4.1.69.Final.patch b/patches/server/0016-Bump-Netty-version-to-4.1.69.Final.patch deleted file mode 100644 index 5426695..0000000 --- a/patches/server/0016-Bump-Netty-version-to-4.1.69.Final.patch +++ /dev/null @@ -1,19 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Etil <81570777+etil2jz@users.noreply.github.com> -Date: Tue, 26 Oct 2021 20:17:49 +0200 -Subject: [PATCH] Bump Netty version to 4.1.69.Final - - -diff --git a/build.gradle.kts b/build.gradle.kts -index e0077c83202e9b092bdd76c9dfbeb6f0b1c85947..054ed3a83a5d3bb392571f538f148b83fb2aa94e 100644 ---- a/build.gradle.kts -+++ b/build.gradle.kts -@@ -57,7 +57,7 @@ dependencies { - runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.0") - - implementation("co.aikar:cleaner:1.0-SNAPSHOT") // Paper -- implementation("io.netty:netty-all:4.1.65.Final") // Paper -+ implementation("io.netty:netty-all:4.1.69.Final") // Paper - - 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") // Paper