Upstream/Waterfall
1
0
Fork 0
mirror of https://github.com/PaperMC/Waterfall.git synced 2024-11-16 07:15:14 +01:00
Code Issues Projects Releases Wiki Activity
215a964014
Waterfall/BungeeCord-Patches/0002-Copy-license-files-into-jar.patch

41 lines
1.1 KiB
Diff
Raw Normal View History

Updated Upstream (BungeeCord) Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing BungeeCord Changes: 77907839 #3436, #3441: Check if server icon image is null f4534c82 #3446: Fix < 1.19 support 76673f02 Apply dependabot configuration b47ae094 #3444: Use same duplicate player handling for online and offline modes
2023-03-15 19:37:00 +01:00
From f090bbf4ac1184c000210d21a7485c3cb7f24b13 Mon Sep 17 00:00:00 2001
Copy license files into jar Solves issue #201 with including the BungeeCord LICENSE file in binary distribution, as the license requires.
2018-07-18 19:46:20 +02:00
From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
Date: Wed, 18 Jul 2018 20:23:03 +0300
Subject: [PATCH] Copy license files into jar
diff --git a/proxy/pom.xml b/proxy/pom.xml
Updated Upstream (BungeeCord) Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing BungeeCord Changes: 77907839 #3436, #3441: Check if server icon image is null f4534c82 #3446: Fix < 1.19 support 76673f02 Apply dependabot configuration b47ae094 #3444: Use same duplicate player handling for online and offline modes
2023-03-15 19:37:00 +01:00
index 5135c0fd..233c6aae 100644
Copy license files into jar Solves issue #201 with including the BungeeCord LICENSE file in binary distribution, as the license requires.
2018-07-18 19:46:20 +02:00
--- a/proxy/pom.xml
+++ b/proxy/pom.xml
Updated Upstream (BungeeCord) Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing BungeeCord Changes: 77907839 #3436, #3441: Check if server icon image is null f4534c82 #3446: Fix < 1.19 support 76673f02 Apply dependabot configuration b47ae094 #3444: Use same duplicate player handling for online and offline modes
2023-03-15 19:37:00 +01:00
@@ -119,4 +119,26 @@
Updated Upstream (BungeeCord) (#741)
2022-06-07 19:12:20 +02:00
<scope>runtime</scope>
</dependency>
</dependencies>
+
+ <!-- Waterfall start - copy license files into jar -->
+ <build>
+ <resources>
Copy license files into jar Solves issue #201 with including the BungeeCord LICENSE file in binary distribution, as the license requires.
2018-07-18 19:46:20 +02:00
+ <resource>
Fix crash on startup (#743)
2022-06-07 19:44:58 +02:00
+ <directory>src/main/resources</directory>
+ </resource>
+ <resource>
Copy license files into jar Solves issue #201 with including the BungeeCord LICENSE file in binary distribution, as the license requires.
2018-07-18 19:46:20 +02:00
+ <directory>../</directory>
+ <includes>
+ <include>LICENSE</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>../../</directory>
+ <includes>
+ <include>LICENSE.txt</include>
+ </includes>
+ </resource>
Updated Upstream (BungeeCord) (#741)
2022-06-07 19:12:20 +02:00
+ </resources>
+ </build>
+ <!-- Waterfall end -->
Copy license files into jar Solves issue #201 with including the BungeeCord LICENSE file in binary distribution, as the license requires.
2018-07-18 19:46:20 +02:00
</project>
--
Updated Upstream (BungeeCord) Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing BungeeCord Changes: 77907839 #3436, #3441: Check if server icon image is null f4534c82 #3446: Fix < 1.19 support 76673f02 Apply dependabot configuration b47ae094 #3444: Use same duplicate player handling for online and offline modes
2023-03-15 19:37:00 +01:00
2.17.2 (Apple Git-113)
Copy license files into jar Solves issue #201 with including the BungeeCord LICENSE file in binary distribution, as the license requires.
2018-07-18 19:46:20 +02:00
Reference in New Issue Copy Permalink