Skip to content
This repository has been archived by the owner on Feb 15, 2024. It is now read-only.

Commit

Permalink
Update Upstream (Folia)
Browse files Browse the repository at this point in the history
Upstream has released updates that appear to apply and compile correctly

Folia Changes :
PaperMC/Folia@9190eb0 Update paper
  • Loading branch information
Euphillya committed Oct 16, 2023
1 parent 0554c30 commit 6045e7c
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ group = fr.euphilia.tenseimc
version = 1.20.2-R0.1-SNAPSHOT
mcVersion = 1.20.2

foliaRef = 84aecdc64afc48e73fffe01f6055c453567f2027
foliaRef = 9190eb011c60a185cc88f6985fb5b941eafa91a3

org.gradle.caching=true
org.gradle.parallel=false
Expand Down
6 changes: 3 additions & 3 deletions patches/server/0001-Rebranding.patch
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Subject: [PATCH] Rebranding


diff --git a/build.gradle.kts b/build.gradle.kts
index 521ff85fcf10fc85fe706d6fa3778e0569551829..0c7061bf912629de8b7e9510dd8bb1f153949b35 100644
index b62a25bd32b7976dd00f53521d0e050d60c34ca7..167c0c0f2a2d1cb8658bca7886c448198f4503f1 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -14,7 +14,7 @@ val alsoShade: Configuration by configurations.creating
Expand All @@ -17,7 +17,7 @@ index 521ff85fcf10fc85fe706d6fa3778e0569551829..0c7061bf912629de8b7e9510dd8bb1f1
implementation("io.papermc.paper:paper-mojangapi:1.19.3-R0.1-SNAPSHOT") {
exclude("io.papermc.paper", "paper-api")
}
@@ -70,13 +70,13 @@ tasks.jar {
@@ -68,13 +68,13 @@ tasks.jar {
manifest {
val git = Git(rootProject.layout.projectDirectory.path)
val gitHash = git("rev-parse", "--short=7", "HEAD").getText().trim()
Expand Down Expand Up @@ -134,7 +134,7 @@ index 2f2a8a0c05024115f3b7bd69ae400fadff2f36c5..b62137def6ac3826eb5d9e367d97579b

public SystemReport fillSystemReport(SystemReport details) {
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 249ff636a40f6493444a6ea8b8a5e017cb2c30eb..cba140514d91a6d9713a2bd38a112f565e3c6bb0 100644
index a50a9ffda4875061fb8840873115119f334f0519..eb302567a5e6e83ad64547445e0d9e058aacccdc 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -267,7 +267,7 @@ import javax.annotation.Nullable; // Paper
Expand Down

0 comments on commit 6045e7c

Please sign in to comment.