From e622c64617d7f79907c961b2dec9f0c1858b3e06 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 4 Jun 2023 07:38:42 +0000 Subject: [PATCH] Updated Upstream (Purpur) Upstream has released updates that appear to apply and compile correctly Purpur Changes: PurpurMC/Purpur@6d7bb23 Updated Upstream (Paper) --- .upstream-data | 2 +- 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, 5 insertions(+), 5 deletions(-) diff --git a/.upstream-data b/.upstream-data index 6fd4100..1a13b05 100644 --- a/.upstream-data +++ b/.upstream-data @@ -1,2 +1,2 @@ -purpurCommit = d6cfa8f939efaa1e8d91b0193ee6f0495a94bd5b +purpurCommit = 6d7bb23341546e6fbc0202578d833f6314571a5c pufferfishCommit = 845c015664150048d0a7c02b706fe1c05a91ac16 diff --git a/patches/api/0001-Pufferfish-API-Changes.patch b/patches/api/0001-Pufferfish-API-Changes.patch index 1df20ec..5479596 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: Wed, 31 May 2023 12:39:00 +0000 +Date: Sun, 4 Jun 2023 07:31:02 +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 0f8339f..dd7864d 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: Wed, 31 May 2023 12:46:00 +0000 +Date: Sun, 4 Jun 2023 07:34:44 +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 4b9a43b..89a29d7 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: Wed, 31 May 2023 12:39:00 +0000 +Date: Sun, 4 Jun 2023 07:31:01 +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 5ffda89..ef2b5e4 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: Wed, 31 May 2023 12:46:00 +0000 +Date: Sun, 4 Jun 2023 07:34:44 +0000 Subject: [PATCH] Purpur Server Changes Original: PurpurMC