5 Commits

Author	SHA1	Message	Date
Jamie Mansfield	71b76653f2	Merge upstream	2017-10-28 20:51:33 +01:00
kashike	178e989894	Merge upstream ... Resolves #170	2017-08-18 02:40:00 -07: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
Troy Frew	a1e3ee4799	Updated upstream. Moved our Disconnection patches to the fire-pit as there is some duplicate features from BungeeCord provided now.	2016-10-25 12:57:11 -04: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