Merge branch 'ver/1.19.2' of https://github.com/PrismarineTeam/Prisma…

…rine into dev/rewrite-chunk-system
PrismarineTeam · Sep 2, 2022 · 2805b82 · 2805b82
2 parents 470d657 + 7a49961
commit 2805b82
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git 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 <alphakr93@outlook.com>
-Date: Thu, 1 Sep 2022 06:08:23 +0000
+Date: Fri, 2 Sep 2022 03:57:36 +0000
 Subject: [PATCH] Pufferfish API Changes
 
 Original by Kevin Raneri <kevin.raneri@gmail.com>

diff --git 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 <alphakr93@outlook.com>
-Date: Thu, 1 Sep 2022 06:10:26 +0000
+Date: Fri, 2 Sep 2022 03:59:49 +0000
 Subject: [PATCH] Purpur API Changes
 
 Original by PurpurMC Team

diff --git 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 <alphakr93@outlook.com>
-Date: Thu, 1 Sep 2022 06:08:23 +0000
+Date: Fri, 2 Sep 2022 03:57:36 +0000
 Subject: [PATCH] Pufferfish Server Changes
 
 Original by Kevin Raneri <kevin.raneri@gmail.com>

diff --git a/patches/server/0004-Purpur-Server-Changes.patch b/patches/server/0004-Purpur-Server-Changes.patch
@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: AlphaKR93 <alphakr93@outlook.com>
-Date: Thu, 1 Sep 2022 06:10:26 +0000
+Date: Fri, 2 Sep 2022 03:59:49 +0000
 Subject: [PATCH] Purpur Server Changes
 
 Original by PurpurMC Team

diff --git a/upstream-data b/upstream-data
@@ -1,2 +1,2 @@
-purpur = be681220d6fc60a04ee01130877b8ff0d7444f14
+purpur = ff8e329e9dc69bc397dfccc7ea3bd70b520174bc
 pufferfish = 3888607ea6f8424c4a8e393d93cd21932e4500ea