Jamie Mansfield
1ef166d6a9
Merge upstream
...
Resolves #193
2017-12-13 21:00:48 +00:00
Jamie Mansfield
e24fdb377e
Merge upstream
...
Resolves #192
2017-12-05 19:14:15 +00:00
Jamie Mansfield
42bc9c39a9
Merge upstream
2017-11-18 18:22:53 +00:00
kashike
66dbf93bab
Merge upstream
...
resolves #190
2017-11-10 15:18:17 -08:00
Jamie Mansfield
60905d7d56
Merge upstream
2017-11-10 17:53:59 +00:00
Minecrell
ef09beba3d
Minor improvements to Log4j configuration that replicates Bungee setup
...
- Remove colons that are not present in Bungee's log file
- Use standard stack traces instead of Log4j's extended stack traces
2017-10-31 18:09:10 +00:00
Jamie Mansfield
71b76653f2
Merge upstream
2017-10-28 20:51:33 +01:00
Jamie Mansfield
b5d048b57a
Revert to BungeeCord behaviour for the 'not direct byte buf' business
...
Not worth the time wasted on closing invalid bug reports.
2017-10-23 19:53:51 +01:00
Jamie Mansfield
4c8715286f
Deploy to destroystokyo mvn repo
...
Thanks @Z750 :D
2017-10-09 20:20:14 +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
Minecrell
d3dc2d3748
Implement full console command completion
...
Drop the original console command completion patch and rewrite it
for JLine 3. Add support to complete command names instead of just
command arguments.
The additional single thread executor for command completion was
dropped because it's redundant: since the command completer needs
to wait for it to complete anyway, we might as well do the completion
directly from the console thread.
2017-09-26 19:37:34 +01:00
kashike
ab5021987d
Merge pull request #176 from Minecrell/log4j-tca
...
Use Log4j, add console improvements and allow plugins to use SLF4 for logging
2017-09-24 09:12:26 -07:00
Minecrell
ab59b59fd9
Add Log4j configuration that replicates the old BungeeCord setup
...
Can be enabled using -Dlog4j.configurationFile=log4j2-bungee.xml
2017-09-24 15:14:55 +02:00
Minecrell
c75b27a22e
Allow plugins to use SLF4J for logging
2017-09-24 15:14:55 +02:00
Minecrell
d5d18f28b1
Handle plugin prefixes using Log4J
2017-09-24 15:14:55 +02:00
Minecrell
2e698ff9c3
Use Log4J2 for logging and TerminalConsoleAppender for console
2017-09-24 15:14:52 +02:00
Jamie Mansfield
4fc076eefa
Merge upstream
2017-09-23 19:25:31 +01:00
kashike
a0220aa0d4
Merge pull request #175 from lucko/master
...
Merge upstream
2017-09-19 06:25:57 -07:00
Luck
e25b1d8a1d
Merge upstream
2017-09-19 14:08:22 +01:00
kashike
688da25b64
Merge pull request #174 from MineTheCube/master
...
Merge upstream - Minecraft 1.12.2 support
2017-09-18 07:20:30 -07:00
MineTheCube
fd02d88345
Merge upstream - Minecraft 1.12.2 support
2017-09-18 15:53:50 +02:00
Jamie Mansfield
29831c0399
Merge upstream. Fixes #173
2017-09-16 12:47:11 +01:00
Jamie Mansfield
c676a410b0
Merge upstream
2017-09-05 18:17:15 +01:00
Jamie Mansfield
1625d25ae9
Merge upstream
2017-09-04 11:06:33 +01:00
Jamie Mansfield
2e32a81429
Merge upstream. Closes #171
2017-09-03 19:55:05 +01:00
kashike
178e989894
Merge upstream
...
Resolves #170
2017-08-18 02:40:00 -07: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
Jamie Mansfield
cc7e494098
Merge upstream
2017-08-09 01:20:45 +01:00
Jamie Mansfield
2b302da76c
Merge upstream
2017-08-04 14:57:11 +01:00
Jamie Mansfield
a90dae10c9
Merge upstream - Minecraft 1.12.1 support
2017-08-03 16:50:26 +01:00
Nate Mortensen
c7cd61c968
Make usage of the Netty DNS resolver configurable
...
This adds a new configuration value "use_netty_dns_resolver", which
defaults to true. This allows users to opt out of Netty's DNS
resolver if they encounter any issues with it.
2017-07-26 22:42:21 +01:00
Daniel Naylor
6b33c62e14
Fix some forge plugin message packets not being forwarded correctly
...
This fixes #155 , see SpongePowered/SpongeForge#1507
2017-07-17 20:37:20 +01:00
Jamie Mansfield
8edae227f6
Merge upstream
2017-07-09 00:24:38 +01:00
Troy Frew
6ab69de258
upstream merge 9b3b42316f25a84530e3bbc8b3887ced4ad9838c
2017-07-04 16:20:09 -04:00
Troy Frew
1c98857249
merge upstream daac8d85e20baed2ee0107ee637d0e82af8b2cd1
2017-07-04 16:06:59 -04:00
Troy Frew
d9bc29c5d5
upstream a5ffeae757d9fbb81efa87b1bae49ca5175f4007
2017-07-04 15:28:43 -04:00
Jamie Mansfield
03bdb50116
Merge upstream + Fix build
2017-06-21 22:19:45 +01:00
Jamie Mansfield
3b5e511743
Merge upstream
2017-06-18 16:03:06 +01:00
Jamie Mansfield
0a0f6974f3
Implement changes proposed in #124
2017-06-10 20:57:00 +01:00
Jamie Mansfield
cb4d5effb9
Merge upstream - Minecraft 1.12 support
2017-06-08 16:58:07 +01:00
Techcable
4f5b91198a
Merge upstream update to minecraft 1.12-pre6
...
Fixes #141
2017-05-31 21:42:42 -07:00
Jamie Mansfield
7f5b95d380
Merge upstream
2017-05-23 16:52:13 +01:00
BlackHole
ad3bf933b8
Use correct packet ids for 1.12-pre5
2017-05-22 20:12:17 +01:00
Jamie Mansfield
9432ed7e40
Merge upstream - Minecraft 1.12-pre5 support
2017-05-19 21:51:18 +01:00
Black Hole
474774102e
Use correct packet ids for 1.12-pre2 ( #135 )
2017-05-15 08:54:56 -07:00
Jamie Mansfield
710c45640c
Resolve previous bad merge - opps
2017-05-14 16:20:22 +01:00
Jamie Mansfield
db05bbac39
Merge upstream - Minecraft 1.12-pre2 support
2017-05-14 15:07:38 +01:00
Jamie Mansfield
ec611c5d0a
Merge upstream
2017-05-10 18:54:46 +01:00
Jamie Mansfield
11f46ca049
Merge upstream
2017-04-28 21:22:02 +01:00
