[Auto] Updated Upstream (Bukkit/CraftBukkit/Spigot)

Upstream has released updates that appear 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:
315b69c1 SPIGOT-6349: Material#MOSSY_COBBLESTONE incorrectly claims it is a MultipleFacing block

CraftBukkit Changes:
a82b21297 BUILDTOOLS-569: development maven profile fails build on windows

Spigot Changes:
cd23533a Rebuild patches

Spigot-API-Patches/0152-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 f66cd342c2ec3e5d4f4ae5e68dda797c793c76a7..e203c5bfc1d1bf6b500ef8a4446d3aef182b8ecb 100644
+index 27adc7afae3d32c36762b9355cb5210e187df795..2e959d195f7a5e723952e421aeaeeb463f07d3f5 100644
 --- a/src/main/java/org/bukkit/Material.java
 +++ b/src/main/java/org/bukkit/Material.java
 @@ -86,6 +86,7 @@ import org.jetbrains.annotations.Nullable;
@@ -16,7 +16,7 @@ index f66cd342c2ec3e5d4f4ae5e68dda797c793c76a7..e203c5bfc1d1bf6b500ef8a4446d3aef
  public enum Material implements Keyed {
      //<editor-fold desc="Materials" defaultstate="collapsed">
      AIR(9648, 0),
-@@ -3565,6 +3566,22 @@ public enum Material implements Keyed {
+@@ -3562,6 +3563,22 @@ public enum Material implements Keyed {
          }
      }
  

Spigot-API-Patches/0223-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch

@@ -6,10 +6,10 @@ Subject: [PATCH] Add a way to get translation keys for blocks, entities and
 
 
 diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
-index e203c5bfc1d1bf6b500ef8a4446d3aef182b8ecb..4ba991b79f13219182df35b4ce0c5cf57cbd208b 100644
+index 2e959d195f7a5e723952e421aeaeeb463f07d3f5..2a3becabbd10fa8ffd19f35a3f6d8a6bfcb388c3 100644
 --- a/src/main/java/org/bukkit/Material.java
 +++ b/src/main/java/org/bukkit/Material.java
-@@ -3580,6 +3580,16 @@ public enum Material implements Keyed {
+@@ -3577,6 +3577,16 @@ public enum Material implements Keyed {
          }
          return false;
      }