18 Commits

Author	SHA1	Message	Date
Shane Freeder	80367c1e14	Fix patch which was mismerged	2018-06-09 11:52:32 +01:00
Shane Freeder	c5e413a81b	Merge upstream	2018-06-08 11:46:31 +01:00
Shane Freeder	dc6a32202e	Merge upstream	2018-04-02 10:25:58 +01:00
Shane Freeder	745ff9f4b4	Merge upstream	2018-03-06 21:12:53 +00:00
Shane Freeder	dd6dac6716	Merge upstream	2018-01-28 11:57:02 +00:00
Shane Freeder	f0974e8ce7	Merge upstream	2017-12-20 13:24:32 +00:00
Shane Freeder	869569b212	Update for 1.12.2 (#57) ... Wow, saved by @electronicboy yet again! 👏	2017-10-29 10:12:12 -07:00
Techcable	32dbddccf0	Update to minecraft v1.12 ... Fixes #45 Fixes #48	2017-06-12 20:17:46 -07: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
Techcable	75131ec9a1	Fix conflicts	2017-01-17 08:10:10 -07:00
Techcable	bf36a4c5af	Fix patch conflicts	2017-01-15 10:05:31 -07: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
Troy Frew	94bb00787a	add super pom	2016-12-09 20:55:05 -05:00
kamcio96	765da9ee2d	Now 1.7 really works. + EntityEffect protocol (#24)	2016-11-23 11:41:45 -05:00
Troy Frew	0cb263f765	Update Upstream. Optimize the patches a bit. This needs testing.	2016-11-15 10:32:02 -05:00