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:
b46ac67 Update to Minecraft 1.18

CraftBukkit Changes:
bc14cb6 Update to Minecraft 1.18

Spigot Changes:
a5dea1cb Update to Minecraft 1.18

patches/api/0001-Convert-project-to-Gradle.patch

@@ -99,7 +99,7 @@ index 0000000000000000000000000000000000000000..1b16a242187079f80720fc1990ee09bb
 +}
 diff --git a/pom.xml b/pom.xml
 deleted file mode 100644
-index 8a8fa2c76ecbd78b5bc57fe0be9abca5dc20ad86..0000000000000000000000000000000000000000
+index 236c9e76bbbb6db5eafd03b1468ecf9fac3416fc..0000000000000000000000000000000000000000
 --- a/pom.xml
 +++ /dev/null
 @@ -1,262 +0,0 @@
@@ -110,7 +110,7 @@ index 8a8fa2c76ecbd78b5bc57fe0be9abca5dc20ad86..00000000000000000000000000000000
 -
 -    <groupId>org.spigotmc</groupId>
 -    <artifactId>spigot-api</artifactId>
--    <version>1.18-rc3-R0.1-SNAPSHOT</version>
+-    <version>1.18-R0.1-SNAPSHOT</version>
 -    <packaging>jar</packaging>
 -
 -    <name>Spigot-API</name>

patches/server/0001-Setup-Gradle-project.patch

@@ -178,7 +178,7 @@ index 0000000000000000000000000000000000000000..139f377673414e1d0213129549e94934
 +}
 diff --git a/pom.xml b/pom.xml
 deleted file mode 100644
-index bfdc67dc0956979f0b54fb68c7f213676875f97d..0000000000000000000000000000000000000000
+index 1ab6e8bd68a3fff2ec8795da099e4f8cce8b62ca..0000000000000000000000000000000000000000
 --- a/pom.xml
 +++ /dev/null
 @@ -1,540 +0,0 @@
@@ -188,7 +188,7 @@ index bfdc67dc0956979f0b54fb68c7f213676875f97d..00000000000000000000000000000000
 -    <groupId>org.spigotmc</groupId>
 -    <artifactId>spigot</artifactId>
 -    <packaging>jar</packaging>
--    <version>1.18-rc3-R0.1-SNAPSHOT</version>
+-    <version>1.18-R0.1-SNAPSHOT</version>
 -    <name>Spigot</name>
 -    <url>https://www.spigotmc.org/</url>
 -