Commit Graph

9 Commits

Author SHA1 Message Date
Shane Freeder
8ad3bf6da2
Merge upstream 2018-06-21 03:41:48 +01:00
Jamie Mansfield
aab96dc7e8 Merge Bungeecord#e93323d 2018-05-28 21:53:01 +01:00
Jamie Mansfield
7385da83cf
Merge upstream 2018-04-23 21:04:05 +01:00
Shane Freeder
58127189ff
Merge upstream 2018-04-02 10:21:24 +01:00
Jamie Mansfield
19d850ebb1
Merge upstream 2018-02-20 13:20:51 +00:00
Jamie Mansfield
7fcb9fbf8c
Merge upstream 2018-01-07 17:04:30 +00:00
Jamie Mansfield
e24fdb377e
Merge upstream
Resolves #192
2017-12-05 19:14:15 +00:00
Jamie Mansfield
60905d7d56
Merge upstream 2017-11-10 17:53:59 +00: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