139 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
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
Jamie Mansfield	bfb622eb23	Merge upstream	2017-04-26 17:32:42 +01:00
Jamie Mansfield	6cd013ce1d	Move 'raw hex dump for rewrite fails' patch to fire-pit	2017-04-09 22:19:14 +01:00
Jamie Mansfield	78a8edd2da	Resolve the import statements I reordered a while back	2017-04-08 15:26:20 +01:00
Techcable	b5ed82d599	Dump a packet's raw hex if entity rewriting fails.	2017-04-07 20:21:19 -07:00
Jamie Mansfield	8ff8de0fbd	Merge upstream	2017-03-11 11:12:59 +00:00
Jamie Mansfield	53eade81e8	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 refresh to actual bloody refresh!	2017-03-07 21:28:08 +00:00
Jamie Mansfield	1073945fba	Merge upstream	2017-03-07 21:25:35 +00:00
Jamie Mansfield	32a7625f4f	Update upstream	2017-02-07 22:39:22 +00:00
Jamie Mansfield	91d537c7cc	Update upstream	2017-02-01 20:49:23 +00:00
Jamie Mansfield	2268a31735	Update upstream	2017-01-19 20:44:41 +00:00
Techcable	7e1c6381ee	Merge upstream	2017-01-17 08:05:13 -07:00
kamcio96	228318425b	Fix #113	2017-01-17 07:55:53 -07:00
kamcio96	0285fa1808	Improve connection closing, fixing the kick delay. ... Taken from WaterfallMC/Waterfall-Old@b8845c4edb @kamcio96 claims that these channel closing changes are removing the need of delayed kick packets @Janmm14 can confirm this (at login state) on a no-latency and low-latency connection (<1ms; ~16ms), high-latency connection was not tested, but it should work on these too. Fixes WaterfallMC/Travertine#25	2017-01-15 09:57:49 -07:00
Techcable	575f88841c	Include the cause exception of an DecodingError ... Add a newline to make things prettier.	2017-01-15 09:38:49 -07:00
Tux	bec652093f	Merge with upstream	2016-12-24 01:36:32 -05:00