5 Commits

Author	SHA1	Message	Date
Jamie Mansfield	1073945fba	Merge upstream	2017-03-07 21:25:35 +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	c369fa9f30	Fix the CI links	2016-08-12 19:41:16 +01:00
Jamie Mansfield	d9420aa63b	Fetch modules from the correct CI	2016-07-03 21:40:10 +01:00
Techcable	3809083007	Turn waterfall into a patch-based fork like Spigot and Paper (WIP) ... Allows us to easily see and manage the diff with upstream. Makes fixing conflicts with upstream easier and shows a cleaner, more acurate commit history. All credits to scripts go to @md_5 @aikar @Zbob750 @Thinkofname @Byteflux @Techcable (GPL3 Licensed)	2016-05-30 14:51:51 -06:00