19 Commits

Author	SHA1	Message	Date
Aikar	857ed67709	Merge branch 'master' into pre/1.13 ... * master: Relookup Entity Save ID if was null during precache	2018-07-27 00:44:53 -04:00
Aikar	e2c75e81f7	Update Paper to 1.13 proper - THIS IS STILL HIGHLY UNSTABLE ... DO NOT RUN ON PRODUCTION SERVERS!!! Use Backups!!	2018-07-22 01:27:46 -04:00
Shane Freeder	84c98c2ba8	NOT FINISHED! She compiles, and she... suffers the wrath of chunkgen...	2018-07-19 05:42:43 +01:00
Zach Brown	d8c81d20d8	Update upstream B/CB/S	2018-01-10 23:31:19 -06:00
Aikar	ad40e694a3	Update upstream	2017-12-09 12:37:09 -05:00
Shane Freeder	d934dcc1e3	Update to 1.12.2, May the Tacos be with you	2017-09-18 12:04:01 +01:00
BlackHole	6879328bf6	Update to 1.12.1	2017-08-03 17:27:54 +02:00
Shane Freeder	fed4815fff	Update B/CB	2017-07-28 15:51:46 +01:00
Zach Brown	272f130b5a	Update upstream CB/S	2017-06-18 20:37:08 -05:00
Zach Brown	491286def4	Update to MC 1.12-pre2	2017-05-14 16:06:27 -05:00
Zach Brown	2db4e57e4d	Update bStats implementation	2017-04-22 01:16:45 -05:00
Zach Brown	5e2784e941	Switch to a bStats based Metrics system	2017-03-25 00:22:02 -05:00
Zach Brown	7f3aa1ed29	Update upstream B/CB/S ... Closes GH-631	2017-03-15 09:32:50 -05:00
Zach Brown	1870320545	Update upstream CB ... Closes GH-556	2016-12-27 18:46:41 -06:00
Zach Brown	fe913c51c4	Update upstream CB	2016-12-22 15:06:59 -06:00
Zach Brown	f099ddc99e	Fix a merge conflict that was resolved improperly	2016-12-20 18:01:37 -06:00
Zach Brown	33163525f3	Update Paper to MC 1.11.1	2016-12-20 17:45:00 -06:00
Zach Brown	5ff732798d	Update upstream B/CB	2016-12-16 22:23:03 -06:00
Zach Brown	0728696e06	Add ProjectileCollideEvent ... Base our vanish changes on top of that event.	2016-12-16 22:13:46 -06:00