diff options
| author | Owen1212055 <[email protected]> | 2023-12-07 15:14:35 -0500 |
|---|---|---|
| committer | Owen1212055 <[email protected]> | 2023-12-07 15:15:25 -0500 |
| commit | ff72782888e6061b9fc3c1a9034a1892eaaf2fba (patch) | |
| tree | 80df85a2d722003e4e2ab61c6e2466519d03bc01 | |
| parent | d0476837a5785cb78ace920a18c62b066b1500e6 (diff) | |
| download | Paper-ff72782888e6061b9fc3c1a9034a1892eaaf2fba.tar.gz Paper-ff72782888e6061b9fc3c1a9034a1892eaaf2fba.zip | |
Updated Upstream (Bukkit/CraftBukkit/Spigot)
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:
51eea725f Update to Minecraft 1.20.4
Spigot Changes:
ce0f71e4 Update to Minecraft 1.20.4
| -rw-r--r-- | patches/api/0001-Convert-project-to-Gradle.patch | 4 | ||||
| -rw-r--r-- | patches/server/0001-Setup-Gradle-project.patch | 4 | ||||
| m--------- | work/Bukkit | 0 | ||||
| m--------- | work/CraftBukkit | 0 | ||||
| m--------- | work/Spigot | 0 |
5 files changed, 4 insertions, 4 deletions
diff --git a/patches/api/0001-Convert-project-to-Gradle.patch b/patches/api/0001-Convert-project-to-Gradle.patch index 540f4d353b..562225e974 100644 --- a/patches/api/0001-Convert-project-to-Gradle.patch +++ b/patches/api/0001-Convert-project-to-Gradle.patch @@ -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 @@ @@ -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> diff --git a/patches/server/0001-Setup-Gradle-project.patch b/patches/server/0001-Setup-Gradle-project.patch index fb57ad384b..da7bebccdf 100644 --- a/patches/server/0001-Setup-Gradle-project.patch +++ b/patches/server/0001-Setup-Gradle-project.patch @@ -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 @@ @@ -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> - diff --git a/work/Bukkit b/work/Bukkit -Subproject 9a294519b082385a41711eed78797c6b7f3c247 +Subproject cdfe62e472085016a8225f356eec9efede9d8b5 diff --git a/work/CraftBukkit b/work/CraftBukkit -Subproject c9cb085517dd8a0042a53bf376664397209b185 +Subproject 51eea725f7b2b683ce04c7d2aeb76705086d78e diff --git a/work/Spigot b/work/Spigot -Subproject 9d728858d26d780a91aa8e3541bcfda9de7f76d +Subproject ce0f71e4276e911707a258a968371f06f8718ac |