From 4c26d69762571265e9735397f0644dfea25d9408 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 23 Sep 2023 10:30:38 +0000 Subject: [PATCH] Updated Upstream (Purpur) Upstream has released updates that appear to apply and compile correctly Purpur Changes: PurpurMC/Purpur@b0a7353 Updated Upstream (Paper) PurpurMC/Purpur@fbedef8 Updated Upstream (Paper) PurpurMC/Purpur@cc43efd Updated Upstream (Paper) PurpurMC/Purpur@f6fd5f6 update paperweight to 1.5.7-SNAPSHOT --- .upstream-data | 4 ++-- patches/api/0001-Pufferfish-API-Changes.patch | 2 +- patches/api/0002-Purpur-API-Changes.patch | 2 +- patches/server/0001-Pufferfish-Server-Changes.patch | 2 +- patches/server/0002-Purpur-Server-Changes.patch | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.upstream-data b/.upstream-data index abdbabf..1df8b86 100644 --- a/.upstream-data +++ b/.upstream-data @@ -1,2 +1,2 @@ -purpurCommit = 07b13f287c8c63e5b2f23c32c52e5d8012ff2eb7 -pufferfishCommit = 0020a8bd30741675ac348af30cc50d19d3566cff +purpurCommit = f6fd5f6ba6e672bfdbc79def7e8598d984ec8b3c +pufferfishCommit = 040d0aa58ee6bdadc1cb040de2cb24e9f3bf4fb2 diff --git a/patches/api/0001-Pufferfish-API-Changes.patch b/patches/api/0001-Pufferfish-API-Changes.patch index be1a985..822eacd 100644 --- a/patches/api/0001-Pufferfish-API-Changes.patch +++ b/patches/api/0001-Pufferfish-API-Changes.patch @@ -1,6 +1,6 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: AlphaKR93 -Date: Sat, 23 Sep 2023 08:26:16 +0000 +Date: Sat, 23 Sep 2023 10:20:55 +0000 Subject: [PATCH] Pufferfish API Changes Original: Kevin Raneri diff --git a/patches/api/0002-Purpur-API-Changes.patch b/patches/api/0002-Purpur-API-Changes.patch index eb7ee6a..919044d 100644 --- a/patches/api/0002-Purpur-API-Changes.patch +++ b/patches/api/0002-Purpur-API-Changes.patch @@ -1,6 +1,6 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: AlphaKR93 -Date: Sat, 23 Sep 2023 08:35:34 +0000 +Date: Sat, 23 Sep 2023 10:28:31 +0000 Subject: [PATCH] Purpur API Changes Original: PurpurMC diff --git a/patches/server/0001-Pufferfish-Server-Changes.patch b/patches/server/0001-Pufferfish-Server-Changes.patch index 5ae3444..6b303e5 100644 --- a/patches/server/0001-Pufferfish-Server-Changes.patch +++ b/patches/server/0001-Pufferfish-Server-Changes.patch @@ -1,6 +1,6 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: AlphaKR93 -Date: Sat, 23 Sep 2023 08:26:16 +0000 +Date: Sat, 23 Sep 2023 10:20:55 +0000 Subject: [PATCH] Pufferfish Server Changes Original: Kevin Raneri diff --git a/patches/server/0002-Purpur-Server-Changes.patch b/patches/server/0002-Purpur-Server-Changes.patch index b829f6d..c985bde 100644 --- a/patches/server/0002-Purpur-Server-Changes.patch +++ b/patches/server/0002-Purpur-Server-Changes.patch @@ -1,6 +1,6 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: AlphaKR93 -Date: Sat, 23 Sep 2023 08:35:34 +0000 +Date: Sat, 23 Sep 2023 10:28:30 +0000 Subject: [PATCH] Purpur Server Changes Original: PurpurMC