Revert "[CI-Skip] Updated Dependencies (Paperweight)"

This reverts commit 017f695244.
Fix Incompat (Bump-Dependencies)
2023-09-22 17:45:44 +09:00 · 2023-09-19 09:27:56 +09:00 · 2023-09-15 17:13:59 +00:00 · 2023-09-15 16:41:56 +00:00 · 2023-09-14 21:34:34 +00:00
7 changed files with 9 additions and 9 deletions
--- a/.upstream-data
+++ b/.upstream-data
@@ -1,2 +1,2 @@
-purpurCommit = 7927f53553abfa8c4d4bc4d5eb29dda44144f3dc
-pufferfishCommit = e32a780bcab6821e3804846a63a9153fdeee44f4
+purpurCommit = 07b13f287c8c63e5b2f23c32c52e5d8012ff2eb7
+pufferfishCommit = 0020a8bd30741675ac348af30cc50d19d3566cff
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,7 +1,7 @@
 group = org.plazmamc.plazma
 version = 1.20.1-R0.1-SNAPSHOT

-paperCommit = 7145f41b6ebe89d79f39826663c99f33d7756669
+paperCommit = 29d1c7b60244bb002d29a5dcfc9c995019f550ab

 org.gradle.caching = true
 org.gradle.parallel = true
--- a/patches/api/0001-Pufferfish-API-Changes.patch
+++ b/patches/api/0001-Pufferfish-API-Changes.patch
@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: AlphaKR93 <dev@alpha93.kr>
-Date: Wed, 13 Sep 2023 23:16:16 +0000
+Date: Fri, 15 Sep 2023 16:37:43 +0000
 Subject: [PATCH] Pufferfish API Changes

 Original: Kevin Raneri <kevin.raneri@gmail.com>
--- a/patches/api/0002-Purpur-API-Changes.patch
+++ b/patches/api/0002-Purpur-API-Changes.patch
@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: AlphaKR93 <dev@alpha93.kr>
-Date: Wed, 13 Sep 2023 23:17:56 +0000
+Date: Fri, 15 Sep 2023 16:39:50 +0000
 Subject: [PATCH] Purpur API Changes

 Original: PurpurMC
--- a/patches/server/0001-Pufferfish-Server-Changes.patch
+++ b/patches/server/0001-Pufferfish-Server-Changes.patch
@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: AlphaKR93 <dev@alpha93.kr>
-Date: Wed, 13 Sep 2023 23:16:16 +0000
+Date: Fri, 15 Sep 2023 16:37:43 +0000
 Subject: [PATCH] Pufferfish Server Changes

 Original: Kevin Raneri <kevin.raneri@gmail.com>
--- a/patches/server/0002-Purpur-Server-Changes.patch
+++ b/patches/server/0002-Purpur-Server-Changes.patch
@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: AlphaKR93 <dev@alpha93.kr>
-Date: Wed, 13 Sep 2023 23:17:56 +0000
+Date: Fri, 15 Sep 2023 16:39:49 +0000
 Subject: [PATCH] Purpur Server Changes

 Original: PurpurMC
@@ -955,7 +955,7 @@ index 9b0049dfeaec9b688bf276f2ac2b18943b5696b2..d7563904232353cbf3b9255cedfb7592
                     return true;
                 }
 diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
-index cf20f0983fc25b26cf92b9d3a28746b1909fc56b..89c1b69ddeb420c2fbda5f588e7c9a467a76089d 100644
+index 52cb6476604c98465f81ff9e8d8344d7536a8868..13144ea01bc27db95a13b267d39529b012a4c9c4 100644
 --- a/src/main/java/net/minecraft/network/Connection.java
 +++ b/src/main/java/net/minecraft/network/Connection.java
@@ -579,11 +579,20 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
--- a/patches/server/0006-Bump-Dependencies.patch
+++ b/patches/server/0006-Bump-Dependencies.patch
@@ -66,7 +66,7 @@ index d8b27e3f2fa1ede41125ec27e129b1e1ad42caa7..2c59ed16ea909b6535df3d1d40d83b06
 
     // Pufferfish start
 -    implementation("org.yaml:snakeyaml:1.32")
-+    implementation("org.yaml:snakeyaml:2.2")
+    implementation("org.yaml:snakeyaml:1.33")
     implementation ("com.github.carleslc.Simple-YAML:Simple-Yaml:1.8.4") {
         exclude(group="org.yaml", module="snakeyaml")
     }
Author	SHA1	Message	Date
AlphaKR93	74c593fa04	Revert "[CI-Skip] Updated Dependencies (Paperweight)" This reverts commit `017f695244`.	2023-09-22 17:45:44 +09:00
IPECTER 이팩터	c6c048c34f	Fix Incompat (Bump-Dependencies) Signed-off-by: IPECTER 이팩터 <80433772+IPECTER@users.noreply.github.com>	2023-09-19 09:27:56 +09:00
github-actions[bot]	017f695244	[CI-Skip] Updated Dependencies (Paperweight) Dependency has released updates that appear to apply and compile correctly Paperweight Changes: PaperMC/Paperweight@d3d7eec chore: Bump ASM & lorenz-tiny PaperMC/Paperweight@972de2e Add task to scan generated code to make sure versions match PaperMC/Paperweight@9f602b8 Fix license formats PaperMC/Paperweight@92f922f support importing files from data/minecraft/ into the resources folder PaperMC/Paperweight@33b8a1b add task to filter project dir PaperMC/Paperweight@329b566 fix a couple issues after rebasing on main PaperMC/Paperweight@a3033c6 fix license and style violations PaperMC/Paperweight@ce9df1c account for inner classes PaperMC/Paperweight@57566dd Remove commented code PaperMC/Paperweight@3f6c7a5 Fix Gradle deprecation issue, buildSrc missing name PaperMC/Paperweight@c2d4fcb fix FilterProjectDir vanillaJar input PaperMC/Paperweight@de15167 Merge pull request #198 from Machine-Maker/fix/FilterProjectDir PaperMC/Paperweight@28786b0 use ceilingEntry instead of higherEntry for line mappings PaperMC/Paperweight@d23909c adjust ScanJar loggers PaperMC/Paperweight@8faebd1 release: Version 1.5.6	2023-09-15 17:13:59 +00:00
github-actions[bot]	ecbebeb403	Updated Upstream (Purpur) Upstream has released updates that appear to apply and compile correctly Purpur Changes: PurpurMC/Purpur@07b13f2 Updated Upstream (Paper)	2023-09-15 16:41:56 +00:00
github-actions[bot]	5bf8a8124e	Updated Upstream (Paper) Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@29d1c7b Call BlockRedstoneEvents for lecterns (#9721)	2023-09-14 21:34:34 +00:00