Commit Graph

22 Commits

Author SHA1 Message Date
Shane Freeder
fda6406e25
Actually rebuilding patches goes a long way 2020-03-07 22:50:46 +00:00
Shane Freeder
c21eed1f7b
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:
70370faf Add checkstyle indentation checks
24a53a67 Show socketAddress in BungeeServerInfo.toString
503b4827 Fix bad formatting in EntityMap
eeb37479 #2710: Store queue of pending keepalives
3f6aa033 Also check that things that should not be padded are so
78a84953 Add more checkstyle rules
636c0207 #2753: Add configurable remote ping caching
a4512e50 Check Maven version in action build & don't print noisy transfer progress
f510989c Add building of pull requests via GitHub Actions
2020-01-24 22:41:39 +00:00
Shane Freeder
56fd936664
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:
4bb0fb67 Fix Javadoc in ServerInfo.getSocketAddress
68cc325a #2755: Add ClickEvent.COPY_TO_CLIPBOARD
3d3a5aef Remove unused .travis.yml
2c6a21d5 Remove stray import breaking build
b7e7274b #2750: Don't special case TextComponent constructor with a single extra
b70cb014 Add beta support for binding bungee to unix socket addresses
701391f2 Update Netty to 4.1.45.Final
2020-01-21 17:36:22 +00:00
Shane Freeder
3a793b886c
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:
d8c222ae Update date
d20e622b Apply checkstyle to javadoc
6c8a0cce Remove m2e settings, causes useless warnings
2f547f73 Fix some javadoc warnings
5f29e939 #2720: Send different log message for pings (vs login)
46521568 #2740: Fix BaseComponent#equals() stack overflow
d2ceccd6 #2725: Various improvements to chat API
7ed4c41d #2723: Improved Send Command
2020-01-06 19:43:23 +00:00
Shane Freeder
86ec79b6a5 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:
7d68335c Fix switching to servers with larger view distance
2019-04-30 04:19:02 +01:00
Shane Freeder
6b32122de3
Update Bungeecord 2018-12-21 15:24:26 +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
Shane Freeder
3fd1c6f6d8 Merge upstream 2018-07-30 12:54:15 +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
4fc076eefa
Merge upstream 2017-09-23 19:25:31 +01:00
Jamie Mansfield
c676a410b0
Merge upstream 2017-09-05 18:17:15 +01:00
Jamie Mansfield
34068e62d8
Merge upstream. Closes #167 2017-08-13 16:08:33 +01:00
Jamie Mansfield
2b302da76c
Merge upstream 2017-08-04 14:57:11 +01:00
Troy Frew
59f69a69c5
Upstream Merge 2016-10-30 10:46:05 -04:00
Troy Frew
a1e3ee4799
Updated upstream. Moved our Disconnection patches to the fire-pit as there is some duplicate features from BungeeCord provided now. 2016-10-25 12:57:11 -04:00
Jamie Mansfield
1e10ca1c09 Update upstream 2016-08-26 10:05:00 +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