From dca2ee55dfc6dbffdb6b3cde448a089c4f52153e Mon Sep 17 00:00:00 2001
From: Automated <noreply+automated@papermc.io>
Date: Mon, 14 Sep 2020 05:57:06 -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:
d75d8a38 #549: Add Fluid types / tags

CraftBukkit Changes:
890130b46 #746: Add Fluid types / tags
---
 .../Add-a-way-to-get-translation-keys-for-blocks-entitie.patch  | 2 +-
 work/Bukkit                                                     | 2 +-
 work/CraftBukkit                                                | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Spigot-Server-Patches/Add-a-way-to-get-translation-keys-for-blocks-entitie.patch b/Spigot-Server-Patches/Add-a-way-to-get-translation-keys-for-blocks-entitie.patch
index 632c177d64..88991f589f 100644
--- a/Spigot-Server-Patches/Add-a-way-to-get-translation-keys-for-blocks-entitie.patch
+++ b/Spigot-Server-Patches/Add-a-way-to-get-translation-keys-for-blocks-entitie.patch
@@ -77,7 +77,7 @@ diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-@@ -0,0 +0,0 @@ import org.bukkit.NamespacedKey;
+@@ -0,0 +0,0 @@ import org.bukkit.Registry;
  import org.bukkit.UnsafeValues;
  import org.bukkit.advancement.Advancement;
  import org.bukkit.block.data.BlockData;
diff --git a/work/Bukkit b/work/Bukkit
index 91957aa3b9..d75d8a38c4 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit 91957aa3b9b05c0a9243d7c360e284f508d925a8
+Subproject commit d75d8a38c4baaa944290d524f27f9bea83770318
diff --git a/work/CraftBukkit b/work/CraftBukkit
index d5a7296002..890130b460 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit d5a72960028deccea210ec9883403fd01e37b09e
+Subproject commit 890130b46025667e7d7d4ce2ba870dd2ddba1841