From 95e4f33becf8404a9fa810558d0aff80ca452e05 Mon Sep 17 00:00:00 2001 From: Automated Date: Mon, 12 Nov 2018 02:46:43 -0500 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: 3aee9dbd Add Material BlockData to JavaDocs --- Spigot-API-Patches/Material-API-additions.patch | 2 +- work/Bukkit | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Spigot-API-Patches/Material-API-additions.patch b/Spigot-API-Patches/Material-API-additions.patch index 6dae217fa1..ac4d9c4240 100644 --- a/Spigot-API-Patches/Material-API-additions.patch +++ b/Spigot-API-Patches/Material-API-additions.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Material API additions diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java -index 83f8eca15..98775ea54 100644 +index 14cae61fb..393024343 100644 --- a/src/main/java/org/bukkit/Material.java +++ b/src/main/java/org/bukkit/Material.java @@ -0,0 +0,0 @@ import org.bukkit.material.MaterialData; diff --git a/work/Bukkit b/work/Bukkit index 67e91ef777..3aee9dbd08 160000 --- a/work/Bukkit +++ b/work/Bukkit @@ -1 +1 @@ -Subproject commit 67e91ef77757f4affbb1ba7867bd2913e3a2a654 +Subproject commit 3aee9dbd0894558ae1178a50872d66592bbdfd1e