Commit Graph

15 Commits

Author SHA1 Message Date
Shane Freeder
ba94135bd5
Updated Upstream (BungeeCord)
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

BungeeCord Changes:
fe2a39e4 Minecraft 1.14.3-pre4 support
8eb56837 Bundle 1.14.2 translations
2019-06-24 18:42:23 +01:00
Shane Freeder
69d0c4010d Updated Upstream (BungeeCord)
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

BungeeCord Changes:
af10f82d Apply and enforce import ordering rules
3f01748d Minecraft 1.14-pre5 support
2019-04-23 09:09:26 +01:00
Shane Freeder
a4c1e457e8 Updated Upstream (BungeeCord)
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

BungeeCord Changes:
5aaccd2e #2621: Fix score component serialization
2019-04-09 04:12:16 +01:00
Shane Freeder
7dd259045b Update BungeeCord 2019-01-31 22:24:13 +00:00
kashike
12e53fcf76 Drop 'Fix unicode characters in configuration files' patch 2018-11-11 00:40:41 -08:00
Shane Freeder
1c8ea44393
move up Fixup ProtocolConstants to waterfall
This patch contains a trivial formatting fix, while while somewhat
pointless, I decided to keep, the main advantage is in the util
helpers which will aim to keep code cleaner (I've wished for this
to be included in waterfall for a while, and given future work, I
feel now is a good time to shift it over)
2018-10-27 22:18:13 +01:00
Jamie Mansfield
f6788a0886
Disable Metrics 2018-07-22 17:45:31 +01:00
Mark Vainomaa
3d4d154926 Copy license files into jar
Solves issue #201 with including the BungeeCord LICENSE file
in binary distribution, as the license requires.
2018-07-18 18:47:50 +01:00
Minecrell
e1553a3f25 Drop redundant patches for JUL logger
Since Waterfall is now using Log4J for logging, these patches no
longer have any effect.
2017-10-09 08:15:44 +01:00
Jamie Mansfield
29831c0399
Merge upstream. Fixes #173 2017-09-16 12:47:11 +01:00
Jamie Mansfield
34068e62d8
Merge upstream. Closes #167 2017-08-13 16:08:33 +01:00
Jamie Mansfield
5b488566be
Fix broken build 2017-08-10 22:40:40 +01:00
Techcable
05fc872738
Make the Netty 4.1 upgrade one of the first patches
@aikar suggested this so patches don't have conflicts with netty 4.1
2016-05-31 12:49:57 -06:00
Techcable
c6ee5b53a7
Remove uneeded patch and call UUIDUtils.toMojangUUID() directly
Closes #8 even more
2016-05-31 12:46:47 -06:00
Techcable
3809083007
Turn waterfall into a patch-based fork like Spigot and Paper (WIP)
Allows us to easily see and manage the diff with upstream.
Makes fixing conflicts with upstream easier and shows a cleaner, more acurate commit history.

All credits to scripts go to @md_5 @aikar @Zbob750 @Thinkofname @Byteflux @Techcable (GPL3 Licensed)
2016-05-30 14:51:51 -06:00