Skip to content

Commit

Permalink
Updated Upstream (Purpur)
Browse files Browse the repository at this point in the history
Upstream has released updates that appear to apply and compile correctly

Purpur Changes:
PurpurMC/Purpur@4b57bed Updated Upstream (Paper)
  • Loading branch information
actions-user committed Oct 21, 2024
1 parent dda71da commit 2b362bc
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ group = org.purpurmc.tentacles
version = 1.21.1-R0.1-SNAPSHOT

mcVersion=1.21.1
purpurCommit = 4f2fe312cc5e0bdf55d8bf33521885b9b08a37e7
purpurCommit = 4b57bed513aaadb0a1ecebae3796a5e93b7561ea

org.gradle.caching = true
org.gradle.parallel = true
Expand Down
4 changes: 2 additions & 2 deletions patches/server/0001-Rebrand.patch
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Subject: [PATCH] Rebrand


diff --git a/build.gradle.kts b/build.gradle.kts
index 299881d2c9fb7321f4b29c019e9088e024b64689..571e30fa02dcbe5c9095334579b4cfce135563e8 100644
index 535b0c6a750cc77fb9340d6e080932f3eb3bde17..f5655dae10ef990503212e96650b0277faff3337 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -13,7 +13,7 @@ configurations.named(log4jPlugins.compileClasspathConfigurationName) {
Expand All @@ -17,7 +17,7 @@ index 299881d2c9fb7321f4b29c019e9088e024b64689..571e30fa02dcbe5c9095334579b4cfce
// Paper start
implementation("org.jline:jline-terminal-jansi:3.21.0")
implementation("net.minecrell:terminalconsoleappender:1.3.0")
@@ -103,14 +103,14 @@ tasks.jar {
@@ -104,14 +104,14 @@ tasks.jar {
val gitBranch = git("rev-parse", "--abbrev-ref", "HEAD").getText().trim() // Paper
attributes(
"Main-Class" to "org.bukkit.craftbukkit.Main",
Expand Down

0 comments on commit 2b362bc

Please sign in to comment.