110 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Troy Frew	9320467862	update upstream	2017-07-04 17:20:14 -04:00
Techcable	32dbddccf0	Update to minecraft v1.12 ... Fixes #45 Fixes #48	2017-06-12 20:17:46 -07:00
fuzzybot	cd3ea9538d	Automatic upstream update to git commit 4f5b91198a	2017-06-01 04:44:17 +00:00
fuzzybot	ee0ff63e63	Automatic upstream update to git commit 7f5b95d380	2017-05-23 15:53:12 +00:00
fuzzybot	f2be1e7f81	Automatic upstream update to git commit ad3bf933b8	2017-05-22 19:13:09 +00:00
fuzzybot	b1bb4b4c38	Automatic upstream update to git commit 9432ed7e40	2017-05-19 20:52:11 +00:00
fuzzybot	5848a88daa	Automatic upstream update to git commit 474774102e	2017-05-15 15:55:13 +00:00
Techcable	7b902eb14f	Wiggle the patches to resolve conflicts ... For some reason, this doesn't build on my computer because of an issue with OpenSSL. Fixes #43	2017-05-15 00:01:52 -07:00
fuzzybot	ae12edaf1d	Automatic upstream update to git commit 710c45640c	2017-05-14 15:21:10 +00:00
fuzzybot	17655ffd0b	Automatic upstream update to git commit db05bbac39	2017-05-14 14:08:15 +00:00
fuzzybot	052e9d29a8	Automatic upstream update to git commit ec611c5d0a	2017-05-10 17:55:13 +00:00
fuzzybot	050f5d5fdd	Automatic upstream update to git commit 11f46ca049	2017-04-28 20:23:11 +00:00
fuzzybot	5b668359a0	Automatic upstream update to git commit bfb622eb23	2017-04-26 16:35:09 +00:00
fuzzybot	7d697fa5f2	Automatic upstream update to git commit 6cd013ce1d	2017-04-09 21:20:10 +00:00
fuzzybot	eebc9d1ade	Automatic upstream update to git commit 78a8edd2da	2017-04-08 14:29:12 +00:00
fuzzybot	fe706656f2	Automatic upstream update to git commit b5ed82d599	2017-04-08 03:27:11 +00:00
fuzzybot	c2618c8dba	Automatic upstream update to git commit 8ff8de0fbd	2017-03-11 11:14:10 +00:00
fuzzybot	eb02538783	Automatic upstream update to git commit 53eade81e8	2017-03-07 21:30:12 +00:00
fuzzybot	f18b58e29a	Automatic upstream update to git commit 1073945fba	2017-03-07 21:26:07 +00:00
fuzzybot	1b074b99ac	Automatic upstream update to git commit 32a7625f4f	2017-02-07 22:40:09 +00:00
fuzzybot	f2ea4a5a2f	Automatic upstream update to git commit 91d537c7cc	2017-02-01 20:50:09 +00:00
fuzzybot	38812354d3	Automatic upstream update to git commit 2268a31735	2017-01-19 20:45:08 +00:00
Techcable	75131ec9a1	Fix conflicts	2017-01-17 08:10:10 -07:00
fuzzybot	42cc342e8c	Automatic upstream update to git commit 7e1c6381ee	2017-01-17 15:10:08 +00:00
fuzzybot	5492b77e7a	Automatic upstream update to git commit 228318425b	2017-01-17 15:02:07 +00:00
Techcable	bf36a4c5af	Fix patch conflicts	2017-01-15 10:05:31 -07:00
fuzzybot	8251f53dd8	Automatic upstream update to git commit 0285fa1808	2017-01-15 17:04:08 +00:00
Tux	1d5e74d222	Removed junk	2017-01-04 20:08:33 -05:00
Tux	5d52e0f653	Actually fix the patches	2017-01-04 20:07:36 -05:00
Tux	8ed5f195a6	Revert "Corrected patches" ... This reverts commit c6cd052545.	2017-01-04 20:04:39 -05:00
Tux	c6cd052545	Corrected patches ... Resolves #30, #31, #32	2017-01-04 19:31:11 -05:00
fuzzybot	74378edf7d	Automatic upstream update to git commit bec652093f	2016-12-24 06:37:09 +00:00
fuzzybot	de2941c1dc	Automatic upstream update to git commit 41ec1b302a	2016-12-21 09:10:13 +00:00
fuzzybot	17c30ce6e7	Automatic upstream update to git commit 6fc2170f21	2016-12-21 08:47:16 +00:00
fuzzybot	6fe29cce36	Automatic upstream update to git commit 2dd82be3f1	2016-12-21 08:16:15 +00:00
fuzzybot	6ab6d83339	Automatic upstream update to git commit 722e89f245	2016-12-21 07:36:18 +00:00
Troy Frew	94bb00787a	add super pom	2016-12-09 20:55:05 -05:00
fuzzybot	ccaf0f0d9b	Automatic upstream update to git commit d8d9dc852a	2016-12-09 23:55:09 +00:00
kamcio96	765da9ee2d	Now 1.7 really works. + EntityEffect protocol (#24)	2016-11-23 11:41:45 -05:00
Techcable	a4745d8e6d	Merge upstream	2016-11-19 10:19:35 -07:00
Troy Frew	0cb263f765	Update Upstream. Optimize the patches a bit. This needs testing.	2016-11-15 10:32:02 -05:00
Troy Frew	4e30754083	initial 1.11 snapshot support	2016-08-11 03:07:36 -04:00
Troy Frew	6c235d7ce3	update upstream	2016-08-11 02:54:31 -04:00
Troy Frew	0855997380	Attempted negative packet fix for 1.7 clients	2016-07-31 15:04:17 -04:00
Troy Frew	859f9c741b	Update upstream	2016-07-31 14:06:00 -04:00
kamcio96	bb047f1302	Remove log (#15)	2016-07-28 10:21:33 -04:00
Troy Frew	063b91c3d4	Update upstream	2016-07-18 10:39:34 -04:00
Troy Frew	060c308f60	Update upstream	2016-07-16 22:41:50 -04:00
Troy Frew	fb40d19157	fix #5	2016-07-03 14:46:58 -04:00
Troy Frew	31866db9e5	Travertine is running on a network with 100 players as of this commit ... Update upstream	2016-07-03 12:21:56 -04:00