Skip to content

Commit

Permalink
Updated Upstream (Paper, Purpur)
Browse files Browse the repository at this point in the history
Upstream has released updates that appear to apply and compile correctly

Upstream has released updates that appear to apply and compile correctly.

[Purpur Changes]
PlazmaMC/Purpur@be3a6d5: Updated Upstream (Paper)
PlazmaMC/Purpur@0cbff64: Add back Pufferfish patches
  • Loading branch information
github-actions[bot] committed Jun 2, 2024
1 parent 45fe520 commit ad01d8a
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,5 @@ pufferfishRepo = https://github.com/PlazmaMC/Pufferfish
pufferfishBranch = ver/1.20
usePufferfish = true

paperCommit = 5d8e53d78d0089894c9552b95b7b8ad9dcc8cb6f
purpurCommit = 7095128d494cf55d8de10bece0a05f444fda183e
paperCommit = ac647513b2330e4c58f7c511ed79b1ad5d262be6
purpurCommit = 0cbff64ea99f0878244431477d21d9faa14b768f
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: Kevin Raneri <[email protected]>
Date: Sun, 2 Jun 2024 20:42:32 +0900
Date: Sun, 2 Jun 2024 23:04:51 +0000
Subject: [PATCH] Pufferfish API Changes

Pufferfish
Expand Down
2 changes: 1 addition & 1 deletion 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: granny <[email protected]>
Date: Sun, 2 Jun 2024 20:43:53 +0900
Date: Sun, 2 Jun 2024 23:06:07 +0000
Subject: [PATCH] Purpur API Changes

PurpurMC
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: Kevin Raneri <[email protected]>
Date: Sun, 2 Jun 2024 20:43:58 +0900
Date: Sun, 2 Jun 2024 23:06:13 +0000
Subject: [PATCH] Pufferfish Server Changes

Pufferfish
Expand Down
2 changes: 1 addition & 1 deletion 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: granny <[email protected]>
Date: Sun, 2 Jun 2024 20:43:59 +0900
Date: Sun, 2 Jun 2024 23:06:15 +0000
Subject: [PATCH] Purpur Server Changes

PurpurMC
Expand Down

0 comments on commit ad01d8a

Please sign in to comment.