mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-17 08:27:43 +01:00
Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@81619a6 Fix treasure map config default (#9572) PaperMC/Paper@13c9d3c Bump net.kyori:ansi to 1.0.3 (#9575) PaperMC/Paper@2c55dd8 Expand use of strict advancement dim check (#9545) PaperMC/Paper@69a8013 [ci skip] Fix inventorycloseevent javadocs (#9533)
This commit is contained in:
@@ -2,7 +2,7 @@ group = org.purpurmc.purpur
|
|||||||
version = 1.20.1-R0.1-SNAPSHOT
|
version = 1.20.1-R0.1-SNAPSHOT
|
||||||
|
|
||||||
mcVersion = 1.20.1
|
mcVersion = 1.20.1
|
||||||
paperCommit = f402f89a67bfdbcbe302733a0e62b064888b0f6f
|
paperCommit = 69a801305d3148d49672401e83905d95bfc950ec
|
||||||
|
|
||||||
org.gradle.caching = true
|
org.gradle.caching = true
|
||||||
org.gradle.parallel = true
|
org.gradle.parallel = true
|
||||||
|
|||||||
@@ -1,19 +0,0 @@
|
|||||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
||||||
From: granny <granny@purpurmc.org>
|
|
||||||
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
|
|
||||||
Reference in New Issue
Block a user