From a57facb10cbebef78afd3930f7ff38b219e0f49a Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 6 Aug 2018 00:58:30 -0400
Subject: [PATCH] [Auto] Update Upstream

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:
97d31e64 Add merging and matching of parsed BlockData

CraftBukkit Changes:
cfc67965 Add merging and matching of parsed BlockData
---
 work/Bukkit      | 2 +-
 work/CraftBukkit | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/work/Bukkit b/work/Bukkit
index d2834556b1..97d31e64a5 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit d2834556b1032e98f2ff3125340e792bf19b0ec1
+Subproject commit 97d31e64a5e4206b4c191f1d313d7c5fc5db88e4
diff --git a/work/CraftBukkit b/work/CraftBukkit
index a9c796f12c..cfc67965f3 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit a9c796f12cf00276e4e22de8a54138235c1cea72
+Subproject commit cfc67965f397a7d1b930f4212eba07120a43b5f9