github.com/PaperMC/Waterfall commits | Ecosyste.ms: OpenCollective

Add Log4j configuration that replicates the old BungeeCord setup

Can be enabled using -Dlog4j.configurationFile=log4j2-bungee.xml

ab59b59fd9c4e2eac87dce7818075bf7b53e4ea1 authored over 7 years ago by Minecrell <[email protected]>

Allow plugins to use SLF4J for logging

c75b27a22ea6d8ec07908f89ba3f9fbebc118566 authored over 7 years ago by Minecrell <[email protected]>

Use Log4J2 for logging and TerminalConsoleAppender for console

2e698ff9c33a75dede83a65fb696fae7fe27ec55 authored over 7 years ago by Minecrell <[email protected]>

Merge upstream

4fc076eefa501117dfc838892efc775a5ce9f2e6 authored over 7 years ago by Jamie Mansfield <[email protected]>

Merge pull request #175 from lucko/master

Merge upstream

a0220aa0d45ec4a895522c94361664f83731cdc6 authored over 7 years ago by kashike <[email protected]>

Merge upstream

e25b1d8a1dbe2afd8f988d604a5c1d625b465c64 authored over 7 years ago by Luck <[email protected]>

Merge pull request #174 from MineTheCube/master

Merge upstream - Minecraft 1.12.2 support

688da25b64ded40d740ddc3d9e4d317713f75c61 authored over 7 years ago by kashike <[email protected]>

Merge upstream - Minecraft 1.12.2 support

fd02d88345bbb77fd12722868dac777417b3c5da authored over 7 years ago by MineTheCube <[email protected]>

Merge upstream. Fixes #173

29831c03994a59590efde48b20f5ab7d4263ec7e authored over 7 years ago by Jamie Mansfield <[email protected]>

Merge upstream

c676a410b0c215d348c74402b69b4f44b4f1aa21 authored over 7 years ago by Jamie Mansfield <[email protected]>

Merge upstream

1625d25ae9dc3e51579e334ff317383fedbc98c4 authored over 7 years ago by Jamie Mansfield <[email protected]>

Merge upstream. Closes #171

2e32a814292749b8b79a5b96474f1c52b4a9d60b authored over 7 years ago by Jamie Mansfield <[email protected]>

Merge upstream

Resolves #170

178e9898948f5552b4c1ae71f35353d7185f1f8c authored over 7 years ago by kashike <[email protected]>

Merge upstream. Closes #167

34068e62d871d8b910940658fe9af01fabc2ac1f authored over 7 years ago by Jamie Mansfield <[email protected]>

Fix broken build

5b488566bee8fe146e7e518142d1db45c7f83967 authored over 7 years ago by Jamie Mansfield <[email protected]>

Merge upstream

cc7e494098d2bcfa8e43ed11f581e1a6d7b0e0c5 authored over 7 years ago by Jamie Mansfield <[email protected]>

Merge upstream

2b302da76ce8e19a388e684b40b9409f2ac2f695 authored over 7 years ago by Jamie Mansfield <[email protected]>

Merge upstream - Minecraft 1.12.1 support

a90dae10c907b65a897d67b323276ee057e74a07 authored over 7 years ago by Jamie Mansfield <[email protected]>

Make usage of the Netty DNS resolver configurable

This adds a new configuration value "use_netty_dns_resolver", which
defaults to true. This allo...

c7cd61c9689d18913619a66bdf9f0b68a4edad45 authored over 7 years ago by Nate Mortensen <[email protected]>

Fix some forge plugin message packets not being forwarded correctly

This fixes #155, see SpongePowered/SpongeForge#1507

6b33c62e14815cffe694fb86455d53f41ed4c0d8 authored over 7 years ago by Daniel Naylor <[email protected]>

Merge upstream

8edae227f6243f329907d2c1530d5942b70ca21f authored over 7 years ago by Jamie Mansfield <[email protected]>

upstream merge 9b3b42316f25a84530e3bbc8b3887ced4ad9838c

6ab69de258ad6d432723963046ddff0f5745bd63 authored over 7 years ago by Troy Frew <[email protected]>

merge upstream daac8d85e20baed2ee0107ee637d0e82af8b2cd1

1c98857249f48be2656f5a0d05538e315251dd09 authored over 7 years ago by Troy Frew <[email protected]>

upstream a5ffeae757d9fbb81efa87b1bae49ca5175f4007

d9bc29c5d526efd7215fe3c687249d36d804af68 authored over 7 years ago by Troy Frew <[email protected]>

Merge upstream + Fix build

03bdb5011658e7e05f3da2f48be3139f92dd1133 authored over 7 years ago by Jamie Mansfield <[email protected]>

Merge upstream

3b5e511743de70f4e60215e9ad4b37366d98bc47 authored over 7 years ago by Jamie Mansfield <[email protected]>

Implement changes proposed in #124

0a0f6974f30ed38897fb1ee69c1ba56a986fcd82 authored over 7 years ago by Jamie Mansfield <[email protected]>

Merge upstream - Minecraft 1.12 support

cb4d5effb96d190c27e266f05888bba93edb6601 authored over 7 years ago by Jamie Mansfield <[email protected]>

Merge upstream update to minecraft 1.12-pre6

Fixes #141

4f5b91198a262feb6343c59170e02d25a6869ea4 authored over 7 years ago by Techcable <[email protected]>

Merge upstream

7f5b95d38006a9b07f6e595a9c05bb62acfba0f1 authored over 7 years ago by Jamie Mansfield <[email protected]>

Use correct packet ids for 1.12-pre5

ad3bf933b8900b264b81a56708260e07f31e0ce8 authored over 7 years ago by BlackHole <[email protected]>

Merge upstream - Minecraft 1.12-pre5 support

9432ed7e404b14bc2fbec3c014c207f2d970b33f authored over 7 years ago by Jamie Mansfield <[email protected]>

Use correct packet ids for 1.12-pre2 (#135)

474774102e2d7fa9b876c3909139855c2b5975f1 authored over 7 years ago by Black Hole <[email protected]>

Resolve previous bad merge - opps

710c45640c493bdab24c21b839c844f2248ccf8a authored over 7 years ago by Jamie Mansfield <[email protected]>

Merge upstream - Minecraft 1.12-pre2 support

db05bbac394a094a8536e356d86658f0acdf9d49 authored over 7 years ago by Jamie Mansfield <[email protected]>

Merge upstream

ec611c5d0a86d6a2fef4a61dafd0b8dbae78dc54 authored over 7 years ago by Jamie Mansfield <[email protected]>

Merge upstream

11f46ca04990b761a6ca5a5a8a42eb415858cbdc authored over 7 years ago by Jamie Mansfield <[email protected]>

Merge upstream

bfb622eb23224315e4638a6e615c54e626fea977 authored over 7 years ago by Jamie Mansfield <[email protected]>

Move 'raw hex dump for rewrite fails' patch to fire-pit

6cd013ce1ddfa51af3d845d03952f5760ae3d0dc authored over 7 years ago by Jamie Mansfield <[email protected]>

Resolve the import statements I reordered a while back

78a8edd2da8aacf7eceb53edaa8b5a3e161271ef authored over 7 years ago by Jamie Mansfield <[email protected]>

Dump a packet's raw hex if entity rewriting fails.

b5ed82d599efafa515dd52428130836e59ef32b2 authored over 7 years ago by Techcable <[email protected]>

Merge upstream

8ff8de0fbdbf14d0b3e842780738f6d0b204d07a authored almost 8 years ago by Jamie Mansfield <[email protected]>

This commit is dedicated to JetBrains

Yep, I had thought no merge conflict was odd - didn't think much of it. Jetbrains ffs fix the re...

53eade81e8d8ba7cabca9c397a4f774ac0e45104 authored almost 8 years ago by Jamie Mansfield <[email protected]>

Merge upstream

1073945fbabf2a0dc088c22f372a011d9380673e authored almost 8 years ago by Jamie Mansfield <[email protected]>

Update upstream

32a7625f4f34ac03692d3ad14d8f6cefa388a300 authored almost 8 years ago by Jamie Mansfield <[email protected]>

Update upstream

91d537c7cc5dcee415855a20dd681c8b42f20e5c authored almost 8 years ago by Jamie Mansfield <[email protected]>

Update upstream

2268a317351f1d6676d2827fb9403ef8050fd021 authored almost 8 years ago by Jamie Mansfield <[email protected]>

Merge upstream

7e1c6381ee88d65b4ed41ff740b036471b1f9438 authored almost 8 years ago by Techcable <[email protected]>

Fix #113

228318425bfbd5dd58b5d023d893317fc23c49af authored almost 8 years ago by kamcio96 <[email protected]>

Improve connection closing, fixing the kick delay.

Taken from WaterfallMC/Waterfall-Old@b8845c4edbae46

@kamcio96 claims that these channel closing...

0285fa1808069e3c493cf2dc2611d7848e0d2a25 authored almost 8 years ago by kamcio96 <[email protected]>

Include the cause exception of an DecodingError

Add a newline to make things prettier.

575f88841c8c40354d9d7d8babe681975652637b authored almost 8 years ago by Techcable <[email protected]>

Merge with upstream

bec652093fb8d6cc395b0dfe80330fbd3f5c1838 authored about 8 years ago by Tux <[email protected]>

Assorted security improvements

We should consider using a stronger RSA key as well.

41ec1b302a5ef7c9da537549ab58bc3f85b425fa authored about 8 years ago by Tux <[email protected]>

Don't aggressively trim LowMemorySets

This only add complexity.

6fc2170f21da11ecf9ee81d584895725cceb68db authored about 8 years ago by Tux <[email protected]>

Use async Netty DNS resolver

2dd82be3f14b906f62afa0b97a747d4aac785127 authored about 8 years ago by Tux <[email protected]>

Updated Waterfall to Minecraft 1.11.1

722e89f245faed3c7f16c301d5bff9c9118c18b0 authored about 8 years ago by Tux <[email protected]>

Remove newlines I didn't spot earlier

d8d9dc852a352ff2db40dafa17f2177fd4de6524 authored about 8 years ago by Jamie Mansfield <[email protected]>

Update README to use the temporary CI

1d815c9bb9e1fb1601a75dbd098517699f239a38 authored about 8 years ago by Jamie Mansfield <[email protected]>

Merge pull request #106 from Mystiflow/master

Migrate more micro-optimisations from Waterfall-Old

01a2b2f3e1904e73cdfffc472a4d381eee531b2a authored about 8 years ago by Jamie Mansfield <[email protected]>

Migrate more micro-optimisations from Waterfall-Old

4ddfe924e3f2b0200bf909fc6255145cfa91f679 authored about 8 years ago by Mystiflow <[email protected]>

Merge upstream

692af3b22e5a74829fa66e64665c48e4f935b92c authored about 8 years ago by Jamie Mansfield <[email protected]>

Make waterfall-super the parent of waterfall-parent

ea2c1098646642d1542f573111c74b8990602fc6 authored about 8 years ago by Jamie Mansfield <[email protected]>

Reinstate patch to prevent Kick during Handshake

Remove redundant patch from fire-pit

cbe6a1b3f5ad6e1ad9f0dd383b152c5d28a65ab9 authored about 8 years ago by Jamie Mansfield <[email protected]>

Merge upstream

3a62539bb15d4cb01112d47d71a3d33800a7102c authored about 8 years ago by Jamie Mansfield <[email protected]>

Fetch modules from @Z750's CI until Aquifer's is back up

5e0e224df5aa6425e2b861ac0263c27dea73228b authored about 8 years ago by Jamie Mansfield <[email protected]>

Merge upstream. Fixes #104

a1e6856f62c682d899cc3f8dd3a07e29b822eb58 authored about 8 years ago by Jamie Mansfield <[email protected]>

Add pom for extra convienience

ca691eba5e0bb2ab886cd14fd73f8a8fb736fb21 authored about 8 years ago by Jamie Mansfield <[email protected]>

I'm and idiot

c8fe40d64005197f4a7138ff072e7616cb5d0dec authored about 8 years ago by Jamie Mansfield <[email protected]>

No need to relocate the metrics class

Different version of Git were constantely changing the Metrics patch - it wasn't worth it

bcad1e9b55c5ab397f6fe739ab7967d9dee442df authored about 8 years ago by Jamie Mansfield <[email protected]>

Merge upstream

Fixes #101

dd44f67c8134ebc0189331b82d59e0e3dee1a5de authored about 8 years ago by Techcable <[email protected]>

Add an upstream merge script to help merge upstream faster

b75189648a4aedf35112253b0e08312b6c1caa13 authored about 8 years ago by Techcable <[email protected]>

Merge upstream

04e241d47227b1e0cf3c186a92428c6f7749f3c5 authored about 8 years ago by Jamie Mansfield <[email protected]>

Merge upstream

9fb1a1f574ff31527341a01706a451fddae44889 authored about 8 years ago by Jamie Mansfield <[email protected]>

Merge upstream

5f58509a0405cd3f11fbb30f4548d576be4be655 authored about 8 years ago by Jamie Mansfield <[email protected]>

Merge upstream

b4498e1368e451abc81aa4df4be90369fe711e0b authored about 8 years ago by Jamie Mansfield <[email protected]>

Merge upstream, Minecraft 1.11 Support

65bfdc7fe1ea12518df2f9a1a64a341ef9dac002 authored about 8 years ago by Jamie Mansfield <[email protected]>

Amend patch author

This is the last time we will be amending the patch authors, unless an author hasen't been credi...

6d3a02cba2e4e4d9c79dc9c82655dc5311900b89 authored about 8 years ago by Jamie Mansfield <[email protected]>

Merge upstream. Closes #99

0366c3751ad2571a2286c9e5eac0b8cf933cc3c6 authored about 8 years ago by Jamie Mansfield <[email protected]>

Correct the author of the ServerKickHook patch

It was brought to our attention by the original author.

d2d44264d2ed93577ca310c54b71d2a37bd27efb authored about 8 years ago by Jamie Mansfield <[email protected]>

Remove redundant patch. Fixes #98

Upstream resolved the issue https://github.com/SpigotMC/BungeeCord/commit/3a0b0aa116310add15ef0b...

51993973fc9c7f7f20085c895ca36f803892e306 authored about 8 years ago by Jamie Mansfield <[email protected]>

Upstream Merge

59f69a69c53b688716770d9ec592f5957c76a906 authored about 8 years ago by Troy Frew <[email protected]>

Fix ArrayIndexOutOfBoundsException in LowMemorySet

Fixes #86

124a8b6213a9f3fcf9099f7d12ec7e48529f5709 authored about 8 years ago by Techcable <[email protected]>

Updated upstream. Moved our Disconnection patches to the fire-pit as there is some duplicate features from BungeeCord provided now.

a1e3ee47994470b467a2428cb6f4adf8f9fb9816 authored about 8 years ago by Troy Frew <[email protected]>

Update upstream

44f56d895b4d8b32f5720d9935ce8d9835d1c48e authored about 8 years ago by Jamie Mansfield <[email protected]>

Properly map EntityEffect for 1.9.0/1.9.2 (#92)

bd6cfa1dfc190fd38784c1e18bbb65d57dd20e90 authored over 8 years ago by Aaron Hill <[email protected]>

Fix rare potion race condition with forge 1.8.9 (#73)

40e2465947525c19bd63863d7e26a9bf6174b943 authored over 8 years ago by Aaron Hill <[email protected]>

Remove duplicate dependency

ea1d5fd3a674d0b870745c310a3f77c5cd3024bc authored over 8 years ago by Jamie Mansfield <[email protected]>

Update pom

- Update developers list
- Update ci link

a5c3110642ec26f7aa9731e36987e231bf2e7d02 authored over 8 years ago by Jamie Mansfield <[email protected]>

Update upstream

upstream finnaly caught up on those netty versions :D

1d27a880c379db3eb5988f5014411eee277ccc11 authored over 8 years ago by Jamie Mansfield <[email protected]>

Remove Event4J patch temporarily

Its apparently the cause of many issues we are currently having

80bed7979d707563283635998cc326f6aa0ad5b0 authored over 8 years ago by Jamie Mansfield <[email protected]>

Update upstream

1e10ca1c097ce98a4335cc4e4258c3f8d975039e authored over 8 years ago by Jamie Mansfield <[email protected]>

Update upstream

b3c95fca44700ebc09078cbd2f460f8a37e2fed2 authored over 8 years ago by Jamie Mansfield <[email protected]>

Update upstream

Hopefully this has worked. I did it rather quickly during the break of American Dad and on mobil...

d6532d31f7a360581ba3fd9f29c4bfa5633be795 authored over 8 years ago by Jamie Mansfield <[email protected]>

Fix modified imports

21360f278dc349e398383ecd207f2bdad4f22126 authored over 8 years ago by Jamie Mansfield <[email protected]>

Update upstream

12baa16bbf4d0d1e4ee9b863a9145e78ae8dd264 authored over 8 years ago by Jamie Mansfield <[email protected]>

Update upstream

e93bf2bf7fa0a317ab59d3591f3288b8b78bd63a authored over 8 years ago by Jamie Mansfield <[email protected]>

Set module author to WaterfallMC

d983224c69abc471cc177228604119c7d7196e6e authored over 8 years ago by Jamie Mansfield <[email protected]>

Update upstream

d1b744857b824bc61c6844819a6dd1e7425d53e9 authored over 8 years ago by Jamie Mansfield <[email protected]>

Fix the CI links

c369fa9f300a47f812a7d2203207fa40fd485111 authored over 8 years ago by Jamie Mansfield <[email protected]>

Dump the raw hex of a packet on a decoding error

10a81df944833addbae2d8c7b8042e7c19c2a016 authored over 8 years ago by Techcable <[email protected]>