From 9cda28480e9f21357c8bb473f069c8c853e5cb66 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Sun, 9 Apr 2023 01:13:38 +0100
Subject: [PATCH] Updated Upstream (Bukkit/CraftBukkit)

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:
aeb62aa3 Remove obsolete documentation from ArmorMeta#setTrim

CraftBukkit Changes:
cb6f3c028 PR-1173: Change CraftMinecartTNT to public for consistency
---
 work/Bukkit      | 2 +-
 work/CraftBukkit | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/work/Bukkit b/work/Bukkit
index eb4b416d2b..aeb62aa331 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit eb4b416d2b270c01dba22a583204e62c4440dd3d
+Subproject commit aeb62aa331de90cf1a39f9be40725fd53d20a1b1
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 19de3550d8..cb6f3c0286 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 19de3550d85d736cdf1ae0838fe7891576985e49
+Subproject commit cb6f3c0286d752d68c95d1524dedf08eb21945c5