109 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Tux	41ec1b302a	Assorted security improvements ... We should consider using a stronger RSA key as well.	2016-12-21 04:09:09 -05:00
Tux	6fc2170f21	Don't aggressively trim LowMemorySets ... This only add complexity.	2016-12-21 03:43:00 -05:00
Tux	2dd82be3f1	Use async Netty DNS resolver	2016-12-21 03:15:02 -05:00
Tux	722e89f245	Updated Waterfall to Minecraft 1.11.1	2016-12-21 02:34:59 -05:00
Jamie Mansfield	d8d9dc852a	Remove newlines I didn't spot earlier	2016-12-09 23:54:35 +00:00
Jamie Mansfield	1d815c9bb9	Update README to use the temporary CI	2016-12-09 18:51:02 +00:00
Jamie Mansfield	01a2b2f3e1	Merge pull request #106 from Mystiflow/master ... Migrate more micro-optimisations from Waterfall-Old	2016-12-09 14:03:27 +00:00
Mystiflow	4ddfe924e3	Migrate more micro-optimisations from Waterfall-Old	2016-12-09 13:36:42 +00:00
Jamie Mansfield	692af3b22e	Merge upstream	2016-12-06 18:28:40 +00:00
Jamie Mansfield	ea2c109864	Make waterfall-super the parent of waterfall-parent	2016-12-04 17:31:55 +00:00
Jamie Mansfield	cbe6a1b3f5	Reinstate patch to prevent Kick during Handshake ... Remove redundant patch from fire-pit	2016-12-04 16:42:27 +00:00
Jamie Mansfield	3a62539bb1	Merge upstream	2016-12-04 01:11:07 +00:00
Jamie Mansfield	5e0e224df5	Fetch modules from @Z750's CI until Aquifer's is back up	2016-12-03 21:41:35 +00:00
Jamie Mansfield	a1e6856f62	Merge upstream. Fixes #104	2016-12-01 16:12:34 +00:00
Jamie Mansfield	ca691eba5e	Add pom for extra convienience	2016-11-26 20:59:15 +00:00
Jamie Mansfield	c8fe40d640	I'm and idiot	2016-11-26 20:39:19 +00:00
Jamie Mansfield	bcad1e9b55	No need to relocate the metrics class ... Different version of Git were constantely changing the Metrics patch - it wasn't worth it	2016-11-26 20:34:59 +00:00
Techcable	dd44f67c81	Merge upstream ... Fixes #101	2016-11-24 21:31:39 -07:00
Techcable	b75189648a	Add an upstream merge script to help merge upstream faster	2016-11-19 10:24:11 -07:00
Jamie Mansfield	04e241d472	Merge upstream	2016-11-15 22:45:30 +00:00
Jamie Mansfield	9fb1a1f574	Merge upstream	2016-11-14 22:46:55 +00:00
Jamie Mansfield	5f58509a04	Merge upstream	2016-11-14 21:19:05 +00:00
Jamie Mansfield	b4498e1368	Merge upstream	2016-11-14 21:09:12 +00:00
Jamie Mansfield	65bfdc7fe1	Merge upstream, Minecraft 1.11 Support	2016-11-14 17:04:25 +00:00
Jamie Mansfield	6d3a02cba2	Amend patch author ... This is the last time we will be amending the patch authors, unless an author hasen't been credited properly.	2016-11-06 14:23:42 +00:00
Jamie Mansfield	0366c3751a	Merge upstream. Closes #99	2016-11-06 10:17:17 +00:00
Jamie Mansfield	d2d44264d2	Correct the author of the ServerKickHook patch ... It was brought to our attention by the original author.	2016-11-06 09:49:42 +00:00
Jamie Mansfield	51993973fc	Remove redundant patch. Fixes #98 ... Upstream resolved the issue 3a0b0aa116	2016-11-01 15:51:42 +00:00
Troy Frew	59f69a69c5	Upstream Merge	2016-10-30 10:46:05 -04:00
Techcable	124a8b6213	Fix ArrayIndexOutOfBoundsException in LowMemorySet ... Fixes #86	2016-10-29 05:53:37 +00:00