Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
7329e19c Updated Upstream (CraftBukkit)
b3a97d14 Fix startup errors when double clicking jar (#2903)
b51fbefc Revert "Fix errors on startup when double clicking jar (#2901)"
a0438fab Fix errors on startup when double clicking jar (#2901)
e0da6d4b Seed based feature search (Fixes #2312) (#2852)
78dfb77e Updated Upstream (Bukkit/CraftBukkit)
969ef51a Init legacy material data
c4714909 Fix items vanishing through end portal (Resolves #2681) (#2894)
74b0ef39 Updated Upstream (CraftBukkit)
This commit is contained in:
William Blake Galbreath
2020-01-25 02:35:47 -06:00
parent 0118e083d1
commit 8f99ddb050
8 changed files with 24 additions and 24 deletions

View File

@@ -1,4 +1,4 @@
From ccac65fb797842f093e4f04c6750152a193afeaf Mon Sep 17 00:00:00 2001
From 18b9102c49cd9cf5d273bca99ea956b79baa31eb Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Thu, 16 Jan 2020 14:59:16 -0600
Subject: [PATCH] Make the GUI better
@@ -793,7 +793,7 @@ index 000000000..c4519794c
+ }
+}
diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
index 869bff4af..2a3e57c2f 100644
index a9bb98765..707ade70a 100644
--- a/src/main/resources/log4j2.xml
+++ b/src/main/resources/log4j2.xml
@@ -2,7 +2,16 @@
@@ -812,8 +812,8 @@ index 869bff4af..2a3e57c2f 100644
+ </PatternLayout>
+ <!-- Purpur end -->
</Queue>
<Queue name="TerminalConsole">
<PatternLayout pattern="[%d{HH:mm:ss}] [%t/%level]: %msg%n" />
<TerminalConsole name="TerminalConsole">
<PatternLayout>
--
2.24.0