7 Commits

Author	SHA1	Message	Date
Jamie Mansfield	a90dae10c9	Merge upstream - Minecraft 1.12.1 support	2017-08-03 16:50:26 +01: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
Tux	722e89f245	Updated Waterfall to Minecraft 1.11.1	2016-12-21 02:34:59 -05: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	51993973fc	Remove redundant patch. Fixes #98 ... Upstream resolved the issue 3a0b0aa116	2016-11-01 15:51:42 +00:00