Skip to content
This repository has been archived by the owner on Apr 21, 2023. It is now read-only.

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@fff2015 Updated Upstream (Paper) (#1174)
  • Loading branch information
actions-user committed Oct 30, 2022
1 parent 33de4ee commit be9eb23
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 17 deletions.
2 changes: 1 addition & 1 deletion patches/api/0001-Pufferfish-API-Changes.patch
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: AlphaKR93 <[email protected]>
Date: Thu, 27 Oct 2022 09:45:25 +0000
Date: Sun, 30 Oct 2022 05:58:43 +0000
Subject: [PATCH] Pufferfish API Changes

Original by Kevin Raneri <[email protected]>
Expand Down
9 changes: 2 additions & 7 deletions patches/api/0002-Purpur-API-Changes.patch
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: AlphaKR93 <[email protected]>
Date: Thu, 27 Oct 2022 09:47:08 +0000
Date: Sun, 30 Oct 2022 06:00:46 +0000
Subject: [PATCH] Purpur API Changes

Original by PurpurMC Team
Expand All @@ -17,12 +17,7 @@ furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
THE SOFTWARE IS PROVIDED AS

diff --git a/build.gradle.kts b/build.gradle.kts
index 780c9b40f69c247592c1fe469c05fd12e984b633..8e64ccdb928bc38cb703e60c8ec31339a6f6d894 100644
Expand Down
2 changes: 1 addition & 1 deletion patches/server/0001-Pufferfish-Server-Changes.patch
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: AlphaKR93 <[email protected]>
Date: Thu, 27 Oct 2022 09:45:25 +0000
Date: Sun, 30 Oct 2022 05:58:43 +0000
Subject: [PATCH] Pufferfish Server Changes

Original by Kevin Raneri <[email protected]>
Expand Down
9 changes: 2 additions & 7 deletions patches/server/0002-Purpur-Server-Changes.patch
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: AlphaKR93 <[email protected]>
Date: Thu, 27 Oct 2022 09:47:08 +0000
Date: Sun, 30 Oct 2022 06:00:46 +0000
Subject: [PATCH] Purpur Server Changes

Original by PurpurMC Team
Expand All @@ -17,12 +17,7 @@ furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
THE SOFTWARE IS PROVIDED AS

diff --git a/build.gradle.kts b/build.gradle.kts
index f0d22a733e3b97fb959cd566fb6c93c6d5681e16..fd4a23b4b9fc9143f88c907e406476508ff62f99 100644
Expand Down
2 changes: 1 addition & 1 deletion upstream-data
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
purpur = 0d5fd505e5a82ea9e9d8afb35f72c5c3e03a4a9b
purpur = fff2015d5255bff063d1d872e60898194cc8dde8
pufferfish = eba9164494dde5f8dc9914481b4808be8ac9e6ef

slice = 14575216df800fafe688814e979656113d3eaa9f
Expand Down

0 comments on commit be9eb23

Please sign in to comment.