Upstream/Waterfall
1
0
Fork 0
mirror of https://github.com/PaperMC/Waterfall.git synced 2025-01-13 19:21:50 +01:00
Code Issues Projects Releases Wiki Activity

Updated Upstream (Waterfall)

Browse Source 
Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

Waterfall Changes:
a619858 Updated Upstream (BungeeCord) (#549)
6f55959 Apply SpigotMC/BungeeCord#2908 (#546)
This commit is contained in:
riku6460 2020-07-20 02:07:36 +09:00 committed by Shane Freeder
parent 781ce27c50
commit 16e6a12982
3 changed files with 67 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Waterfall

@ -1 +1 @@
Subproject commit 7ddd12de7613e9badc0f7e74ccdc968a21e503c0
Subproject commit a6198586d9558f9c9d0a39467b210393df1b2911

120
Waterfall-Proxy-Patches/0001-POM-Changes.patch
View File

@ -1,11 +1,11 @@
From e9d5abc29200cdc9a9415cf4938e814a9afa0c4f Mon Sep 17 00:00:00 2001
From f830225f2c26d8807de43f16843b5132f5c48c30 Mon Sep 17 00:00:00 2001
From: Troy Frew <fuzzy_bot@arenaga.me>
Date: Tue, 15 Nov 2016 08:56:43 -0500
Subject: [PATCH] POM Changes
diff --git a/api/pom.xml b/api/pom.xml
index b276ee73..bb58e96d 100644
index 87b279b8..d3016c10 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -5,41 +5,41 @@
@ -14,14 +14,14 @@ index b276ee73..bb58e96d 100644
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-parent</artifactId>
+ <artifactId>travertine-parent</artifactId>
<version>1.16-R0.3-SNAPSHOT</version>
<version>1.16-R0.4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-api</artifactId>
+ <artifactId>travertine-api</artifactId>
<version>1.16-R0.3-SNAPSHOT</version>
<version>1.16-R0.4-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>Waterfall-API</name>
@ -58,7 +58,7 @@ index b276ee73..bb58e96d 100644
<scope>compile</scope>
</dependency>
diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml
index 3730c14c..2668b278 100644
index a43db907..078c5b1a 100644
--- a/bootstrap/pom.xml
+++ b/bootstrap/pom.xml
@@ -5,18 +5,18 @@
@ -67,14 +67,14 @@ index 3730c14c..2668b278 100644
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-parent</artifactId>
+ <artifactId>travertine-parent</artifactId>
<version>1.16-R0.3-SNAPSHOT</version>
<version>1.16-R0.4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-bootstrap</artifactId>
+ <artifactId>travertine-bootstrap</artifactId>
<version>1.16-R0.3-SNAPSHOT</version>
<version>1.16-R0.4-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>Waterfall-Bootstrap</name>
@ -102,23 +102,23 @@ index 3730c14c..2668b278 100644
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/chat/pom.xml b/chat/pom.xml
index 4c08a151..65c44d00 100644
index 8523d99a..29094871 100644
--- a/chat/pom.xml
+++ b/chat/pom.xml
@@ -6,18 +6,18 @@
<parent>
@@ -5,18 +5,18 @@
<parent>
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-parent</artifactId>
+ <artifactId>travertine-parent</artifactId>
<version>1.16-R0.3-SNAPSHOT</version>
<version>1.16-R0.4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-chat</artifactId>
+ <artifactId>travertine-chat</artifactId>
<version>1.16-R0.3-SNAPSHOT</version>
<version>1.16-R0.4-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>Waterfall-Chat</name>
@ -129,7 +129,7 @@ index 4c08a151..65c44d00 100644
<dependencies>
<dependency>
diff --git a/config/pom.xml b/config/pom.xml
index 43542e86..5209bab2 100644
index 5f4f2b33..18f0a14e 100644
--- a/config/pom.xml
+++ b/config/pom.xml
@@ -5,18 +5,18 @@
@ -138,14 +138,14 @@ index 43542e86..5209bab2 100644
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-parent</artifactId>
+ <artifactId>travertine-parent</artifactId>
<version>1.16-R0.3-SNAPSHOT</version>
<version>1.16-R0.4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-config</artifactId>
+ <artifactId>travertine-config</artifactId>
<version>1.16-R0.3-SNAPSHOT</version>
<version>1.16-R0.4-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>Waterfall-Config</name>
@ -156,7 +156,7 @@ index 43542e86..5209bab2 100644
<dependencies>
<dependency>
diff --git a/event/pom.xml b/event/pom.xml
index c5c7f8b4..017d3100 100644
index f4f7fdb0..592bef24 100644
--- a/event/pom.xml
+++ b/event/pom.xml
@@ -5,16 +5,16 @@
@ -165,14 +165,14 @@ index c5c7f8b4..017d3100 100644
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-parent</artifactId>
+ <artifactId>travertine-parent</artifactId>
<version>1.16-R0.3-SNAPSHOT</version>
<version>1.16-R0.4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-event</artifactId>
+ <artifactId>travertine-event</artifactId>
<version>1.16-R0.3-SNAPSHOT</version>
<version>1.16-R0.4-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>Waterfall-Event</name>
@ -181,7 +181,7 @@ index c5c7f8b4..017d3100 100644
+ <description>Generic java event dispatching API intended for use with Travertine.</description>
</project>
diff --git a/log/pom.xml b/log/pom.xml
index 5cb1bd19..a07c5a62 100644
index 93bd4bcc..3ef8acf2 100644
--- a/log/pom.xml
+++ b/log/pom.xml
@@ -5,18 +5,18 @@
@ -190,14 +190,14 @@ index 5cb1bd19..a07c5a62 100644
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-parent</artifactId>
+ <artifactId>travertine-parent</artifactId>
<version>1.16-R0.3-SNAPSHOT</version>
<version>1.16-R0.4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-log</artifactId>
+ <artifactId>travertine-log</artifactId>
<version>1.16-R0.3-SNAPSHOT</version>
<version>1.16-R0.4-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>Waterfall-Log</name>
@ -217,7 +217,7 @@ index 5cb1bd19..a07c5a62 100644
<scope>compile</scope>
</dependency>
diff --git a/log4j/pom.xml b/log4j/pom.xml
index 5ec771c9..7c04ce59 100644
index 1cd12d6a..ca18158f 100644
--- a/log4j/pom.xml
+++ b/log4j/pom.xml
@@ -4,18 +4,18 @@
@ -226,14 +226,14 @@ index 5ec771c9..7c04ce59 100644
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-parent</artifactId>
+ <artifactId>travertine-parent</artifactId>
<version>1.16-R0.3-SNAPSHOT</version>
<version>1.16-R0.4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-log4j</artifactId>
+ <artifactId>travertine-log4j</artifactId>
<version>1.16-R0.3-SNAPSHOT</version>
<version>1.16-R0.4-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>Waterfall-Log</name>
@ -269,7 +269,7 @@ index 5ec771c9..7c04ce59 100644
</dependencies>
</project>
diff --git a/module/cmd-alert/pom.xml b/module/cmd-alert/pom.xml
index 809f8bb6..78b878ed 100644
index 8eea364f..83bc7a7d 100644
--- a/module/cmd-alert/pom.xml
+++ b/module/cmd-alert/pom.xml
@@ -5,13 +5,13 @@
@ -278,18 +278,18 @@ index 809f8bb6..78b878ed 100644
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-module</artifactId>
+ <artifactId>travertine-module</artifactId>
<version>1.16-R0.3-SNAPSHOT</version>
<version>1.16-R0.4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-module-cmd-alert</artifactId>
+ <artifactId>travertine-module-cmd-alert</artifactId>
<version>1.16-R0.3-SNAPSHOT</version>
<version>1.16-R0.4-SNAPSHOT</version>
<packaging>jar</packaging>
diff --git a/module/cmd-find/pom.xml b/module/cmd-find/pom.xml
index f4a45cec..f54d0f03 100644
index 9a2eb779..42fb0a11 100644
--- a/module/cmd-find/pom.xml
+++ b/module/cmd-find/pom.xml
@@ -5,13 +5,13 @@
@ -298,18 +298,18 @@ index f4a45cec..f54d0f03 100644
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-module</artifactId>
+ <artifactId>travertine-module</artifactId>
<version>1.16-R0.3-SNAPSHOT</version>
<version>1.16-R0.4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-module-cmd-find</artifactId>
+ <artifactId>travertine-module-cmd-find</artifactId>
<version>1.16-R0.3-SNAPSHOT</version>
<version>1.16-R0.4-SNAPSHOT</version>
<packaging>jar</packaging>
diff --git a/module/cmd-list/pom.xml b/module/cmd-list/pom.xml
index 5c4c1717..e5ef5689 100644
index 57b0cdd8..cc2e55f9 100644
--- a/module/cmd-list/pom.xml
+++ b/module/cmd-list/pom.xml
@@ -5,13 +5,13 @@
@ -318,18 +318,18 @@ index 5c4c1717..e5ef5689 100644
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-module</artifactId>
+ <artifactId>travertine-module</artifactId>
<version>1.16-R0.3-SNAPSHOT</version>
<version>1.16-R0.4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-module-cmd-list</artifactId>
+ <artifactId>travertine-module-cmd-list</artifactId>
<version>1.16-R0.3-SNAPSHOT</version>
<version>1.16-R0.4-SNAPSHOT</version>
<packaging>jar</packaging>
diff --git a/module/cmd-send/pom.xml b/module/cmd-send/pom.xml
index ed209b57..efec2710 100644
index 990c0a6d..af82bb2c 100644
--- a/module/cmd-send/pom.xml
+++ b/module/cmd-send/pom.xml
@@ -5,13 +5,13 @@
@ -338,18 +338,18 @@ index ed209b57..efec2710 100644
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-module</artifactId>
+ <artifactId>travertine-module</artifactId>
<version>1.16-R0.3-SNAPSHOT</version>
<version>1.16-R0.4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-module-cmd-send</artifactId>
+ <artifactId>travertine-module-cmd-send</artifactId>
<version>1.16-R0.3-SNAPSHOT</version>
<version>1.16-R0.4-SNAPSHOT</version>
<packaging>jar</packaging>
diff --git a/module/cmd-server/pom.xml b/module/cmd-server/pom.xml
index 542d42c3..5e407092 100644
index 1b4e0455..8d96679e 100644
--- a/module/cmd-server/pom.xml
+++ b/module/cmd-server/pom.xml
@@ -5,13 +5,13 @@
@ -358,18 +358,18 @@ index 542d42c3..5e407092 100644
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-module</artifactId>
+ <artifactId>travertine-module</artifactId>
<version>1.16-R0.3-SNAPSHOT</version>
<version>1.16-R0.4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-module-cmd-server</artifactId>
+ <artifactId>travertine-module-cmd-server</artifactId>
<version>1.16-R0.3-SNAPSHOT</version>
<version>1.16-R0.4-SNAPSHOT</version>
<packaging>jar</packaging>
diff --git a/module/pom.xml b/module/pom.xml
index b195f687..1308ebab 100644
index 0b9fc4aa..ca1f7487 100644
--- a/module/pom.xml
+++ b/module/pom.xml
@@ -5,18 +5,18 @@
@ -378,14 +378,14 @@ index b195f687..1308ebab 100644
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-parent</artifactId>
+ <artifactId>travertine-parent</artifactId>
<version>1.16-R0.3-SNAPSHOT</version>
<version>1.16-R0.4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-module</artifactId>
+ <artifactId>travertine-module</artifactId>
<version>1.16-R0.3-SNAPSHOT</version>
<version>1.16-R0.4-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>Waterfall Modules</name>
@ -405,7 +405,7 @@ index b195f687..1308ebab 100644
<scope>compile</scope>
</dependency>
diff --git a/module/reconnect-yaml/pom.xml b/module/reconnect-yaml/pom.xml
index e46cf142..5d9bcbae 100644
index 0d3a3b70..e6ee3cd8 100644
--- a/module/reconnect-yaml/pom.xml
+++ b/module/reconnect-yaml/pom.xml
@@ -5,13 +5,13 @@
@ -414,18 +414,18 @@ index e46cf142..5d9bcbae 100644
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-module</artifactId>
+ <artifactId>travertine-module</artifactId>
<version>1.16-R0.3-SNAPSHOT</version>
<version>1.16-R0.4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-module-reconnect-yaml</artifactId>
+ <artifactId>travertine-module-reconnect-yaml</artifactId>
<version>1.16-R0.3-SNAPSHOT</version>
<version>1.16-R0.4-SNAPSHOT</version>
<packaging>jar</packaging>
diff --git a/native/pom.xml b/native/pom.xml
index 6453a6f0..6bfd337f 100644
index ec465dd3..28d1a02c 100644
--- a/native/pom.xml
+++ b/native/pom.xml
@@ -5,18 +5,18 @@
@ -434,14 +434,14 @@ index 6453a6f0..6bfd337f 100644
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-parent</artifactId>
+ <artifactId>travertine-parent</artifactId>
<version>1.16-R0.3-SNAPSHOT</version>
<version>1.16-R0.4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-native</artifactId>
+ <artifactId>travertine-native</artifactId>
<version>1.16-R0.3-SNAPSHOT</version>
<version>1.16-R0.4-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>Waterfall-Native</name>
@ -452,7 +452,7 @@ index 6453a6f0..6bfd337f 100644
<dependencies>
<dependency>
diff --git a/pom.xml b/pom.xml
index 97908819..dc56d60c 100644
index 3ca7ca91..94e4aca2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,19 +5,19 @@
@ -468,7 +468,7 @@ index 97908819..dc56d60c 100644
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-parent</artifactId>
+ <artifactId>travertine-parent</artifactId>
<version>1.16-R0.3-SNAPSHOT</version>
<version>1.16-R0.4-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>Waterfall-Parent</name>
@ -504,7 +504,7 @@ index 97908819..dc56d60c 100644
<distributionManagement>
diff --git a/protocol/pom.xml b/protocol/pom.xml
index cfc33af2..6c542037 100644
index 8571f378..ba3ffe3d 100644
--- a/protocol/pom.xml
+++ b/protocol/pom.xml
@@ -5,18 +5,18 @@
@ -513,14 +513,14 @@ index cfc33af2..6c542037 100644
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-parent</artifactId>
+ <artifactId>travertine-parent</artifactId>
<version>1.16-R0.3-SNAPSHOT</version>
<version>1.16-R0.4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-protocol</artifactId>
+ <artifactId>travertine-protocol</artifactId>
<version>1.16-R0.3-SNAPSHOT</version>
<version>1.16-R0.4-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>Waterfall-Protocol</name>
@ -540,7 +540,7 @@ index cfc33af2..6c542037 100644
<scope>compile</scope>
</dependency>
diff --git a/proxy/pom.xml b/proxy/pom.xml
index fca4d609..805778fd 100644
index f0c36550..4bda0d62 100644
--- a/proxy/pom.xml
+++ b/proxy/pom.xml
@@ -5,17 +5,17 @@
@ -549,14 +549,14 @@ index fca4d609..805778fd 100644
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-parent</artifactId>
+ <artifactId>travertine-parent</artifactId>
<version>1.16-R0.3-SNAPSHOT</version>
<version>1.16-R0.4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-proxy</artifactId>
+ <artifactId>travertine-proxy</artifactId>
<version>1.16-R0.3-SNAPSHOT</version>
<version>1.16-R0.4-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>Waterfall-Proxy</name>
@ -615,7 +615,7 @@ index 9b20d0df..2637b9e2 100644
// 15 second timeout at various stages
con.setConnectTimeout( 15000 );
diff --git a/query/pom.xml b/query/pom.xml
index 98abf706..660662cb 100644
index 1c845a6d..0f2ea00b 100644
--- a/query/pom.xml
+++ b/query/pom.xml
@@ -5,18 +5,18 @@
@ -624,14 +624,14 @@ index 98abf706..660662cb 100644
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-parent</artifactId>
+ <artifactId>travertine-parent</artifactId>
<version>1.16-R0.3-SNAPSHOT</version>
<version>1.16-R0.4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-query</artifactId>
+ <artifactId>travertine-query</artifactId>
<version>1.16-R0.3-SNAPSHOT</version>
<version>1.16-R0.4-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>Waterfall-Query</name>
@ -651,5 +651,5 @@ index 98abf706..660662cb 100644
<scope>compile</scope>
</dependency>
--
2.27.0
2.25.1

12
Waterfall-Proxy-Patches/0003-1.7.x-Protocol-Patch.patch
View File

@ -1,4 +1,4 @@
From 5d4fc112165aad5d02acf4428f654eff210bc0f3 Mon Sep 17 00:00:00 2001
From b7162b89565b9c7724fd0f43c5d7535018a3b66c Mon Sep 17 00:00:00 2001
From: Troy Frew <fuzzy_bot@arenaga.me>
Date: Tue, 15 Nov 2016 10:31:04 -0500
Subject: [PATCH] 1.7.x Protocol Patch
@ -129,7 +129,7 @@ index 68c716b9..3f1bf41e 100644
@Override
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java b/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java
index 6c3c7ab8..2fbbd476 100644
index 1a647f2b..ec932e92 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java
@@ -5,10 +5,11 @@ import io.netty.buffer.ByteBufUtil;
@ -145,7 +145,7 @@ index 6c3c7ab8..2fbbd476 100644
@AllArgsConstructor
public class MinecraftDecoder extends MessageToMessageDecoder<ByteBuf>
{
@@ -49,7 +50,7 @@ public class MinecraftDecoder extends MessageToMessageDecoder<ByteBuf>
@@ -56,7 +57,7 @@ public class MinecraftDecoder extends MessageToMessageDecoder<ByteBuf>
if ( packet != null )
{
packetTypeInfo = packet.getClass();
@ -492,7 +492,7 @@ index a82f2ec8..f93486da 100644
ProtocolConstants.MINECRAFT_1_9,
ProtocolConstants.MINECRAFT_1_9_1,
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/Varint21FrameDecoder.java b/protocol/src/main/java/net/md_5/bungee/protocol/Varint21FrameDecoder.java
index 743d65e4..37bf6b4b 100644
index c0d37142..a07e25b1 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/Varint21FrameDecoder.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/Varint21FrameDecoder.java
@@ -6,10 +6,12 @@ import io.netty.channel.ChannelHandlerContext;
@ -508,7 +508,7 @@ index 743d65e4..37bf6b4b 100644
private static boolean DIRECT_WARNING;
@Override
@@ -34,7 +36,15 @@ public class Varint21FrameDecoder extends ByteToMessageDecoder
@@ -44,7 +46,15 @@ public class Varint21FrameDecoder extends ByteToMessageDecoder
// Waterfall end
if ( false && length == 0) // Waterfall - ignore
{
@ -2038,5 +2038,5 @@ index daf12f74..e33861ab 100644
@Override
--
2.27.0
2.25.1