From a20239b3d739a8ec3634706f4573042ae6e58189 Mon Sep 17 00:00:00 2001
From: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
Date: Sun, 21 Nov 2021 21:23:54 -0800
Subject: [PATCH] start update

jtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhm
---
 build.gradle.kts    | 12 ++++++------
 gradle.properties   |  6 +++---
 settings.gradle.kts |  1 +
 work/Bukkit         |  2 +-
 work/CraftBukkit    |  2 +-
 work/Spigot         |  2 +-
 6 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 9ca58a4b4..d4ab62558 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -2,7 +2,7 @@ plugins {
     java
     `maven-publish`
     id("com.github.johnrengelman.shadow") version "7.1.0" apply false
-    id("io.papermc.paperweight.core") version "1.2.0"
+    id("io.papermc.paperweight.core") version "1.3.0-LOCAL-SNAPSHOT"
 }
 
 allprojects {
@@ -46,9 +46,9 @@ repositories {
 }
 
 dependencies {
-    paramMappings("org.quiltmc:yarn:1.17.1+build.1:mergedv2")
-    remapper("net.fabricmc:tiny-remapper:0.6.0:fat")
-    decompiler("net.minecraftforge:forgeflower:1.5.498.12")
+    paramMappings("net.fabricmc:yarn:1.18-pre5+build.4:mergedv2")
+    remapper("net.fabricmc:tiny-remapper:0.7.0:fat")
+    decompiler("org.quiltmc:quiltflower:1.6.0")
     paperclip("io.papermc:paperclip:2.0.1")
 }
 
@@ -56,9 +56,9 @@ paperweight {
     minecraftVersion.set(providers.gradleProperty("mcVersion"))
     serverProject.set(project(":Paper-Server"))
 
-    paramMappingsRepo.set("https://maven.quiltmc.org/repository/release/")
+    paramMappingsRepo.set("https://maven.fabricmc.net/")
     remapRepo.set("https://maven.fabricmc.net/")
-    decompileRepo.set("https://files.minecraftforge.net/maven/")
+    decompileRepo.set("https://maven.quiltmc.org/repository/snapshot/")
 
     paper {
         spigotApiPatchDir.set(layout.projectDirectory.dir("patches/api"))
diff --git a/gradle.properties b/gradle.properties
index 37bb1878b..25a452897 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,7 +1,7 @@
-group = io.papermc.paper
-version = 1.17.1-R0.1-SNAPSHOT
+group=io.papermc.paper
+version=1.18-pre5-R0.1-SNAPSHOT
 
-mcVersion = 1.17.1
+mcVersion=1.18-pre5
 
 org.gradle.caching=true
 org.gradle.parallel=true
diff --git a/settings.gradle.kts b/settings.gradle.kts
index d6037036b..1fadc5e81 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,5 +1,6 @@
 pluginManagement {
     repositories {
+        mavenLocal()
         gradlePluginPortal()
         maven("https://papermc.io/repo/repository/maven-public/")
     }
diff --git a/work/Bukkit b/work/Bukkit
index cfd18bd0a..0a35cb18f 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit cfd18bd0ac9000319520374d6950d95bf8a218f4
+Subproject commit 0a35cb18fc92be8858f7abc3a23ed19fb4dfa326
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 20716710f..f38217938 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 20716710f83a07f4108d001543d33412655f1125
+Subproject commit f38217938a61af5f84d0df76f71a339bd1dc1280
diff --git a/work/Spigot b/work/Spigot
index 38929296b..623466957 160000
--- a/work/Spigot
+++ b/work/Spigot
@@ -1 +1 @@
-Subproject commit 38929296b008a62a7a8532c46550aa493e2246a8
+Subproject commit 6234669574cf0c5fb951f504399f4b171d1a09a7