From 7d915467fe1ca87d6468f04b01671530047bc0d3 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 15 Aug 2018 02:15:28 -0400 Subject: [PATCH] [Auto] Updated Upstream (Bukkit) Upstream has released updates that appears 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: 7ba8d633 SPIGOT-4265: Declare org.bukkit module --- Spigot-API-Patches/0001-POM-changes.patch | 6 +++--- work/Bukkit | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Spigot-API-Patches/0001-POM-changes.patch b/Spigot-API-Patches/0001-POM-changes.patch index 0298688ced..6bcb2032b5 100644 --- a/Spigot-API-Patches/0001-POM-changes.patch +++ b/Spigot-API-Patches/0001-POM-changes.patch @@ -1,11 +1,11 @@ -From 012c183c1c668f4ab31e7b6e0e6ae61005127510 Mon Sep 17 00:00:00 2001 +From 78932fdd2a280f8bc6eb8cd540dbb14c9413fcd6 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 1 Mar 2016 00:16:08 +0100 Subject: [PATCH] POM changes diff --git a/pom.xml b/pom.xml -index e946bccf..7374304f 100644 +index f06c89c1..97c13752 100644 --- a/pom.xml +++ b/pom.xml @@ -3,29 +3,35 @@ @@ -96,7 +96,7 @@ index e946bccf..7374304f 100644 -@@ -131,40 +145,11 @@ +@@ -143,40 +157,11 @@ diff --git a/work/Bukkit b/work/Bukkit index dde07e23c8..7ba8d63388 160000 --- a/work/Bukkit +++ b/work/Bukkit @@ -1 +1 @@ -Subproject commit dde07e23c89024c7a63299a447842600f2e06cf1 +Subproject commit 7ba8d63388f6263d052cac1b541ba12c795696c4