diff --git a/gradle.properties b/gradle.properties index e78087ac1..b07a1611c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ group = org.purpurmc.purpur version = 1.19-R0.1-SNAPSHOT -paperCommit = 17c1c6c3e71c4fbef3a86ca6a0e64d2a46910669 +paperCommit = 2dcfb2b11fb0ef9807d01c81e891d90b74ba4750 org.gradle.caching = true org.gradle.parallel = true diff --git a/patches/server/0278-Add-log-suppression-for-sent-expired-chat.patch b/patches/server/0277-Add-log-suppression-for-sent-expired-chat.patch similarity index 96% rename from patches/server/0278-Add-log-suppression-for-sent-expired-chat.patch rename to patches/server/0277-Add-log-suppression-for-sent-expired-chat.patch index 41de92c1f..ab2e5024d 100644 --- a/patches/server/0278-Add-log-suppression-for-sent-expired-chat.patch +++ b/patches/server/0277-Add-log-suppression-for-sent-expired-chat.patch @@ -18,7 +18,7 @@ index 05bda808496f38d10416c3702b1f97fe18247769..99c8b4957194868c36f9ea214c7f77a2 } diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java -index bcb386d4cbd37ed41cf27808c7104d2780ce2558..6dd8cc13d32138c5cb7aa9c950f80c8881861fe1 100644 +index 3d96a49cca34f0a3f3b37de839e476c2a4c1f1d6..fecfe935e09ff52a6ec582e6f2e09611adb1106f 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java @@ -417,11 +417,13 @@ public class PurpurConfig { diff --git a/patches/server/0277-Fix-bold-text-in-console.patch b/patches/server/0277-Fix-bold-text-in-console.patch deleted file mode 100644 index b7086c9a5..000000000 --- a/patches/server/0277-Fix-bold-text-in-console.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: BillyGalbreath -Date: Sat, 11 Jun 2022 02:54:53 -0500 -Subject: [PATCH] Fix bold text in console - - -diff --git a/src/main/java/io/papermc/paper/console/HexFormattingConverter.java b/src/main/java/io/papermc/paper/console/HexFormattingConverter.java -index 489dc33154bebd70b31480807f104e15e97f4f2c..be741daa4df009375d9d6e8ed51abb36722bb5ae 100644 ---- a/src/main/java/io/papermc/paper/console/HexFormattingConverter.java -+++ b/src/main/java/io/papermc/paper/console/HexFormattingConverter.java -@@ -70,7 +70,7 @@ public final class HexFormattingConverter extends LogEventPatternConverter { - formatHexAnsi(NamedTextColor.YELLOW), // Yellow §e - formatHexAnsi(NamedTextColor.WHITE), // White §f - "\u001B[5m", // Obfuscated §k -- "\u001B[21m", // Bold §l -+ "\u001B[1m", // Bold §l // Purpur - "\u001B[9m", // Strikethrough §m - "\u001B[4m", // Underline §n - "\u001B[3m", // Italic §o -@@ -94,7 +94,7 @@ public final class HexFormattingConverter extends LogEventPatternConverter { - "\u001B[0;33;1m", // Yellow §e - "\u001B[0;37;1m", // White §f - "\u001B[5m", // Obfuscated §k -- "\u001B[21m", // Bold §l -+ "\u001B[1m", // Bold §l // Purpur - "\u001B[9m", // Strikethrough §m - "\u001B[4m", // Underline §n - "\u001B[3m", // Italic §o