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:
122289ff Add FaceAttachable interface to handle Grindstone facing in common with Switches
a6db750e SPIGOT-5647: ZombieVillager entity should have getVillagerType()

CraftBukkit Changes:
bbe3d58e SPIGOT-5650: Lectern.setPage(int) causes a NullPointerException
3075579f Add FaceAttachable interface to handle Grindstone facing in common with Switches
95bd4238 SPIGOT-5647: ZombieVillager entity should have getVillagerType()
4d975ac3 SPIGOT-5617: setBlockData does not work when NotPlayEvent is called by redstone current

Spigot-API-Patches/0150-Add-ItemStackRecipeChoice-Draft-API.patch

@@ -1,4 +1,4 @@
-From 48d7033d5636f973e7c0866bf74610ac7aa22fd4 Mon Sep 17 00:00:00 2001
+From 3fda3c194e7401c8a71415625cd66b7c9fa8dbc1 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 13 Sep 2018 21:39:26 -0400
 Subject: [PATCH] Add ItemStackRecipeChoice Draft API
@@ -9,7 +9,7 @@ Allows creating recipes that must match isSimilar to full item stack.
 
 diff --git a/src/main/java/com/destroystokyo/paper/inventory/ItemStackRecipeChoice.java b/src/main/java/com/destroystokyo/paper/inventory/ItemStackRecipeChoice.java
 new file mode 100644
-index 00000000..43e6576b
+index 000000000..43e6576b1
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/inventory/ItemStackRecipeChoice.java
 @@ -0,0 +1,51 @@
@@ -65,5 +65,5 @@ index 00000000..43e6576b
 +    }
 +}
 -- 
-2.25.0.windows.1
+2.25.1