From 46d9135f6d9f81de644f38001cadbbcbe2c89f6b Mon Sep 17 00:00:00 2001 From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com> Date: Wed, 19 Jun 2024 17:56:37 +0800 Subject: [PATCH] Updated Upstream (Gale/Purpur) --- gradle.properties | 2 +- patches/api/0004-Purpur-API-Changes.patch | 2 +- patches/generated-api/0001-Purpur-generated-api-Changes.patch | 2 +- patches/server/0011-Purpur-Server-Changes.patch | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gradle.properties b/gradle.properties index 92fcb7cf6..e2ecc0d4c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group = cn.dreeam.leaf mcVersion = 1.20.6 version = 1.20.6-R0.1-SNAPSHOT -galeCommit = 886651ccef21e12c941fb8c3304ed7c8a83178e3 +galeCommit = f01910e3bd510a5a1fa4561fee96434b4d4b45da org.gradle.caching = true org.gradle.parallel = true diff --git a/patches/api/0004-Purpur-API-Changes.patch b/patches/api/0004-Purpur-API-Changes.patch index 198db6d32..8c53e1176 100644 --- a/patches/api/0004-Purpur-API-Changes.patch +++ b/patches/api/0004-Purpur-API-Changes.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Purpur API Changes Original license: MIT Original project: https://github.com/PurpurMC/Purpur -Commit: f1c87e4fee9a8e7d513f9e284d402a21fd73ec3a +Commit: 0d6766e21d08f8348c666a460cb145fdc3a45ed0 Patches below are removed in this patch: Pufferfish-API-Changes.patch diff --git a/patches/generated-api/0001-Purpur-generated-api-Changes.patch b/patches/generated-api/0001-Purpur-generated-api-Changes.patch index 27651d988..b18890866 100644 --- a/patches/generated-api/0001-Purpur-generated-api-Changes.patch +++ b/patches/generated-api/0001-Purpur-generated-api-Changes.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Purpur generated-api Changes Original license: MIT Original project: https://github.com/PurpurMC/Purpur -Commit: f1c87e4fee9a8e7d513f9e284d402a21fd73ec3a +Commit: 0d6766e21d08f8348c666a460cb145fdc3a45ed0 diff --git a/com/destroystokyo/paper/entity/ai/VanillaGoal.java b/com/destroystokyo/paper/entity/ai/VanillaGoal.java index 43f4deacef349502cbb207aafc4f9cb7a75177c5..6b692c24a62e2172116a6b9c371b1c0e2411c27e 100644 diff --git a/patches/server/0011-Purpur-Server-Changes.patch b/patches/server/0011-Purpur-Server-Changes.patch index 914d1ac87..0d792c048 100644 --- a/patches/server/0011-Purpur-Server-Changes.patch +++ b/patches/server/0011-Purpur-Server-Changes.patch @@ -8,7 +8,7 @@ TODO - Dreeam: Check TODOs in ServerGamePacketListenerImpl & Fix-pufferfish-issu Original license: MIT Original project: https://github.com/PurpurMC/Purpur -Commit: f1c87e4fee9a8e7d513f9e284d402a21fd73ec3a +Commit: 0d6766e21d08f8348c666a460cb145fdc3a45ed0 Patches below are removed in this patch: Metrics changes in Purpur-config-files.patch