Skip to content

Commit

Permalink
Updated Upstream (Bukkit/CraftBukkit/Spigot)
Browse files Browse the repository at this point in the history
Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

Bukkit Changes:
cdfe62e4 Update to Minecraft 1.20.4

CraftBukkit Changes:
51eea72 Update to Minecraft 1.20.4

Spigot Changes:
ce0f71e4 Update to Minecraft 1.20.4
  • Loading branch information
Owen1212055 committed Dec 7, 2023
1 parent d047683 commit ff72782
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions patches/api/0001-Convert-project-to-Gradle.patch
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ index 0000000000000000000000000000000000000000..41e77b687df6480adf8f5e21daad105d
+}
diff --git a/pom.xml b/pom.xml
deleted file mode 100644
index 061d8bcc258d8f1936462a9f92e9d4f7617e716f..0000000000000000000000000000000000000000
index 6a2befb4a0172e2208775887a7ebe25ed8ba5e4c..0000000000000000000000000000000000000000
--- a/pom.xml
+++ /dev/null
@@ -1,278 +0,0 @@
Expand All @@ -135,7 +135,7 @@ index 061d8bcc258d8f1936462a9f92e9d4f7617e716f..00000000000000000000000000000000
-
- <groupId>org.spigotmc</groupId>
- <artifactId>spigot-api</artifactId>
- <version>1.20.3-R0.1-SNAPSHOT</version>
- <version>1.20.4-R0.1-SNAPSHOT</version>
- <packaging>jar</packaging>
-
- <name>Spigot-API</name>
Expand Down
4 changes: 2 additions & 2 deletions patches/server/0001-Setup-Gradle-project.patch
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ index 0000000000000000000000000000000000000000..126d8c232de267d6d5639647fcda3b34
+}
diff --git a/pom.xml b/pom.xml
deleted file mode 100644
index 6ebce22b21550442716de605149e9d9eb6bee481..0000000000000000000000000000000000000000
index bd92ee304f9ab0fcc80d4456ca34a3e026e1b97f..0000000000000000000000000000000000000000
--- a/pom.xml
+++ /dev/null
@@ -1,602 +0,0 @@
Expand All @@ -184,7 +184,7 @@ index 6ebce22b21550442716de605149e9d9eb6bee481..00000000000000000000000000000000
- <groupId>org.spigotmc</groupId>
- <artifactId>spigot</artifactId>
- <packaging>jar</packaging>
- <version>1.20.3-R0.1-SNAPSHOT</version>
- <version>1.20.4-R0.1-SNAPSHOT</version>
- <name>Spigot</name>
- <url>https://www.spigotmc.org/</url>
-
Expand Down
2 changes: 1 addition & 1 deletion work/Bukkit
Submodule Bukkit updated from 9a2945 to cdfe62
2 changes: 1 addition & 1 deletion work/CraftBukkit
Submodule CraftBukkit updated from c9cb08 to 51eea7
2 changes: 1 addition & 1 deletion work/Spigot
Submodule Spigot updated from 9d7288 to ce0f71

0 comments on commit ff72782

Please sign in to comment.