From 5caf597397e9afb09c2e13b5ce0d14b4aef3a364 Mon Sep 17 00:00:00 2001
From: Automated <noreply+automated@papermc.io>
Date: Fri, 17 Aug 2018 06:49:39 -0400
Subject: [PATCH] [Auto] Updated Upstream (Bukkit/CraftBukkit)

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:
f7662d5c SPIGOT-4283: Allow setting recipe groups

CraftBukkit Changes:
bfb91314 SPIGOT-4283: Allow setting recipe groups
---
 .../Display-warning-on-deprecated-recipe-API.patch            | 4 ++--
 work/Bukkit                                                   | 2 +-
 work/CraftBukkit                                              | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Spigot-API-Patches/Display-warning-on-deprecated-recipe-API.patch b/Spigot-API-Patches/Display-warning-on-deprecated-recipe-API.patch
index db03bfe35..4358991d7 100644
--- a/Spigot-API-Patches/Display-warning-on-deprecated-recipe-API.patch
+++ b/Spigot-API-Patches/Display-warning-on-deprecated-recipe-API.patch
@@ -10,7 +10,7 @@ on the players login.
 Plugin authors need to define a key to keep it consistent between server restarts.
 
 diff --git a/src/main/java/org/bukkit/inventory/ShapedRecipe.java b/src/main/java/org/bukkit/inventory/ShapedRecipe.java
-index d9af7155..d7fa6d28 100644
+index 398ac245..fc06c7b6 100644
 --- a/src/main/java/org/bukkit/inventory/ShapedRecipe.java
 +++ b/src/main/java/org/bukkit/inventory/ShapedRecipe.java
 @@ -0,0 +0,0 @@ public class ShapedRecipe implements Recipe, Keyed {
@@ -22,7 +22,7 @@ index d9af7155..d7fa6d28 100644
      }
  
 diff --git a/src/main/java/org/bukkit/inventory/ShapelessRecipe.java b/src/main/java/org/bukkit/inventory/ShapelessRecipe.java
-index ca5c09b8..f2dd46f2 100644
+index 0c340c84..7d60a0a9 100644
 --- a/src/main/java/org/bukkit/inventory/ShapelessRecipe.java
 +++ b/src/main/java/org/bukkit/inventory/ShapelessRecipe.java
 @@ -0,0 +0,0 @@ public class ShapelessRecipe implements Recipe, Keyed {
diff --git a/work/Bukkit b/work/Bukkit
index 5d659aa0e..f7662d5c9 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit 5d659aa0e44dfb8ec758f910f0a4d0d1dcddd614
+Subproject commit f7662d5c9249b90936349d3da43bb0bab089e59e
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 06112946d..bfb913149 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 06112946da2e82ed8cbdd5f210f2a3373800181e
+Subproject commit bfb9131494176498e2444f7ac69bdc924192ee2e