From 02bf66a783f6cacc5a5a1add8fe0e0f85add8449 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 31 Mar 2023 03:25:53 +0000 Subject: [PATCH] Updated Upstream (Purpur) Upstream has released updates that appear to apply and compile correctly Purpur Changes: PurpurMC/Purpur@7f4822d [ci-skip] let's try using cache in github actions again PurpurMC/Purpur@7cb1f46 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 a400109..43815ee 100644 --- a/.upstream-data +++ b/.upstream-data @@ -1,2 +1,2 @@ -purpurCommit = 1924a57cc7a547de392686dc18fd0b1e137e95b1 +purpurCommit = 7cb1f466d1031ae7c8c371330360c5ae17a2ac62 pufferfishCommit = 751dfb0338e2c09519313ffaca04084dc3140b80 diff --git a/patches/api/0001-Pufferfish-API-Changes.patch b/patches/api/0001-Pufferfish-API-Changes.patch index 6168f6c..6cc254d 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: Thu, 30 Mar 2023 06:56:29 +0000 +Date: Fri, 31 Mar 2023 03:20:52 +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 45446e0..d6d95c5 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: Thu, 30 Mar 2023 06:58:47 +0000 +Date: Fri, 31 Mar 2023 03:22:47 +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 a23664e..3d828d3 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: Thu, 30 Mar 2023 06:56:29 +0000 +Date: Fri, 31 Mar 2023 03:20:52 +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 434dc97..e41eb36 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: Thu, 30 Mar 2023 06:58:47 +0000 +Date: Fri, 31 Mar 2023 03:22:46 +0000 Subject: [PATCH] Purpur Server Changes Original: PurpurMC