214 commits

Author	SHA1	Message	Date
Zach Brown	88ba5fcaac	Update upstream CB ... Fixes GH-887	2017-09-18 22:01:43 -04:00
Zach Brown	71e2d0e88c	Update B	2017-09-18 12:03:48 -04:00
Shane Freeder	d934dcc1e3	Update to 1.12.2, May the Tacos be with you	2017-09-18 12:04:01 +01:00
Shane Freeder	836db0ec9c	Update CB, refactor 0229-Fix-this-stupid-bullshit ... Refactored 0229-Fix-this-stupid-bullshit in order to prevent merge conflicts when spigot decides to update the timer and to provide some form of hint in the console/log on startup.	2017-09-15 15:37:05 +01:00
Shane Freeder	2104c3a683	Update CB/S	2017-09-09 08:17:12 +01:00
CDAGaming	15a47148c7	Update CB & B (#876)	2017-09-06 12:31:37 -04:00
CDAGaming	f520871b4f	Update CB and B (#873)	2017-09-02 14:01:45 -04:00
CDAGaming	d375188e15	Update CB	2017-08-31 17:38:48 -05:00
CDAGaming	40426d52ad	Update Bukkit	2017-08-26 11:27:46 -05:00
CDAGaming	84c2351e37	Update CB and BD	2017-08-23 09:13:12 -05:00
Shane Freeder	48d8add662	Update B	2017-08-20 11:50:29 +01:00
Shane Freeder	4368f412c6	Update CB	2017-08-16 16:47:06 +01:00
Shane Freeder	d77731eee2	Update S	2017-08-12 22:51:29 +01:00
Shane Freeder	912ee23e25	Update CB	2017-08-11 13:05:23 +01:00
Shane Freeder	42faa9e529	Update CB (#846)	2017-08-09 14:44:28 -04:00
Aikar	ff5bd7b03b	Upstream update	2017-08-07 23:05:16 -04:00
Shane Freeder	bec1253aa9	Update B/CB/S	2017-08-06 00:08:21 +01:00
Zach Brown	f7e23ba7fa	Update upstream CB	2017-08-04 22:10:30 -05:00
BlackHole	6879328bf6	Update to 1.12.1	2017-08-03 17:27:54 +02:00
Aikar	cdd6d8562a	Update Upstream	2017-07-30 18:41:08 -04:00
Shane Freeder	fed4815fff	Update B/CB	2017-07-28 15:51:46 +01:00
Aikar	dcd4f3710f	Upstream update	2017-07-26 21:12:40 -04:00
Zach Brown	43543c78c4	Update upstream CB	2017-07-24 06:47:43 -05:00
Zach Brown	c9b00ce95d	Update upstream CB	2017-07-22 20:16:06 -05:00
Shane Freeder	8d10a38779	Update C	2017-07-19 23:02:48 +01:00
Aikar	a7cb000633	Update upstream (memory leak fix)	2017-07-16 20:36:27 -04:00
Zach Brown	9a536c5a7b	Update upstream CB	2017-07-15 14:57:50 -05:00
Shane Freeder	18be9d24e4	Update B/CB	2017-07-10 14:04:41 +01:00
Shane Freeder	1e4d3c3106	Update C	2017-07-09 10:56:36 +01:00
Aikar	a92bce595d	Update upstream	2017-06-30 18:13:06 -05:00
Aikar	7cd81967b4	Update upstream, pretty important bug fix	2017-06-25 21:49:58 -04:00
Aikar	3244d917f3	Update upstream	2017-06-25 20:26:00 -04:00
Zach Brown	dedf848bea	Update upstream S ... Fixes build	2017-06-25 18:37:00 -05:00
Zach Brown	b61aec52a4	Update upstream B/CB	2017-06-25 18:00:32 -05:00
Zach Brown	4793368f72	Update upstream CB	2017-06-24 13:52:44 -05:00
Aikar	7daa2e11b9	Update upstream	2017-06-22 23:14:20 -04:00
Zach Brown	8a45451a97	Update upstream B/CB/S	2017-06-21 22:12:40 -05:00
Aikar	825834273c	update upstream	2017-06-20 18:53:55 -04:00
Zach Brown	272f130b5a	Update upstream CB/S	2017-06-18 20:37:08 -05:00
Zach Brown	76cede4391	Update upstream CB	2017-06-17 14:18:29 -05:00
Zach Brown	2b51986c25	Update upstream B/CB/S	2017-06-12 22:28:09 -05:00
Zach Brown	cce9b7a866	Update upstream CB	2017-06-11 23:25:44 -05:00
Zach Brown	263bd3f539	Update upstream CB/S	2017-06-11 12:03:07 -05:00
Aikar	8121250409	upstream update	2017-06-10 13:14:52 -04:00
Aikar	19e9e0d647	Update upstream	2017-06-09 08:29:44 -04:00
Shane Freeder	3c9f2a0a20	Update Paper to MC 1.12	2017-06-08 15:17:11 +01:00
Zach Brown	bd34f2060d	Update upstream B/CB	2017-06-04 15:11:50 -05:00
Zach Brown	04d2d38581	Update upstream B/CB	2017-06-02 23:41:05 -05:00
Shane Freeder	adab11a1f7	Update to 1.12-pre6	2017-05-31 22:12:46 -05:00
Zach Brown	a7d4bd3735	Update upstream B/CB	2017-05-29 16:11:54 -05:00