Commit graph

1033 commits

Author SHA1 Message Date
Aikar
7d73fa7ae0 Update Upstream 2016-11-18 23:58:56 -05:00
Zach Brown
4832b1a385 Update Paper to MC 1.11 2016-11-16 20:23:38 -06:00
Zach Brown
c8051323cd Update upstream B/CB/S 2016-11-12 20:21:46 -06:00
Zach Brown
da6e2f40a9 Update upstream CB 2016-11-04 22:37:19 -05:00
Zach Brown
2ea9521f37 Update upstream B/CB 2016-11-03 14:27:37 -05:00
Zach Brown
122d3d9d43 Update upstream S 2016-10-26 16:05:22 -05:00
Zach Brown
ba280d2292 Update upstream CB 2016-10-24 21:03:31 -05:00
Zach Brown
5b6d46e4c8 Update upstream CB 2016-10-23 01:32:04 -05:00
Zach Brown
714413ff1e Update upstream CB 2016-10-22 15:24:15 -05:00
Zach Brown
2515c80051 Update upstream B/CB 2016-10-21 15:28:44 -05:00
Zach Brown
0df1dae663 Update upstream CB 2016-10-16 15:35:34 -05:00
Zach Brown
f1e5f599ca Update upstream CB/S 2016-10-13 17:29:38 -05:00
Zach Brown
8e6ecaeae0 Update upstream CB 2016-10-10 21:29:08 -05:00
Zach Brown
40f1788ef3 Update upstream CB 2016-10-05 16:08:40 -05:00
Zach Brown
ab9bbceba9 Update paperclip 2016-10-01 22:23:28 -05:00
Zach Brown
abd7523079 Update upstream B/CB/S 2016-10-01 11:47:56 -05:00
Zach Brown
d6618994b5 Update upstream CB 2016-09-20 15:59:26 -05:00
Zach Brown
bc24e29dc5 Update upstream CB 2016-09-18 13:37:38 -05:00
Zach Brown
ca7a828688 Update upstrean CB/S 2016-09-11 14:55:02 -05:00
Zach Brown
64c6e06d95 Update upstream B/CB/S 2016-09-05 14:21:03 -05:00
Zach Brown
b4eceb16ec Update upstream B/CB 2016-09-04 16:59:06 -05:00
Riley Park
7a403d82a0 @Zbob750 missed a few name changes 2016-09-04 06:26:05 +00:00
Zach Brown
e1423d87ba Update upstream B/CB/S 2016-09-02 22:44:52 -05:00
Zach Brown
fcbbc76319 Update upstream B/CB/S
Remove two features added upstream
2016-08-27 18:41:58 -05:00
Zach Brown
a9481ee3c7 Update upstream CB 2016-08-21 14:52:19 -05:00
Zach Brown
aec2bb905c Update upstream B/S 2016-08-15 18:51:55 -05:00
Zach Brown
be420541b7 Update upstream B/CB 2016-08-11 15:07:07 -05:00
Zach Brown
f91686b6db Update upstream B/CB 2016-08-07 00:01:31 -05:00
Zach Brown
4db0ba851c Update upstream B/CB/S 2016-07-30 18:02:34 -05:00
Zach Brown
608d77d492 Update upstream B/CB 2016-07-26 19:30:03 -05:00
Zach Brown
359f9ad8cf Update upstream CB 2016-07-22 17:24:30 -05:00
Zach Brown
719164b4ce Update upstream B/CB/S 2016-07-15 17:36:53 -05:00
Zach Brown
aff7563c30 Update upstream B/CB/S 2016-07-12 23:22:58 -05:00
Aikar
0c18db0e44 Upstream burritos, maybe tacos, and churros. 2016-07-08 00:17:25 -04:00
Zach Brown
93dca2c0de Update upstream B/CB/S 2016-07-07 21:06:58 -05:00
Zach Brown
d5a6e263fd Update upstream tacos B/CB/S 2016-07-04 18:49:14 -05:00
Aikar
122f47ac1c More Upstream tacos 2016-06-30 01:38:53 -04:00
Aikar
cb334f6321 Upstream tacos 2016-06-30 01:23:30 -04:00
Zach Brown
fd6048a265 Update upstream CB 2016-06-27 21:21:08 -05:00
Zach Brown
b978b76443 Update upstream CB
It seems they've gotten their own workaround figured out, we'll keep our own fix for TE removal in but let them try theirs and see if it's better now.
2016-06-26 22:51:20 -05:00
Zach Brown
de4a16ead0 Update upstream B/CB/S 2016-06-26 14:13:00 -05:00
Zach Brown
e93299df87 Update upstream CB
Doesn't change anything except puts the last commit upstream, where it belongs
because we're nice like that, or something
2016-06-25 21:34:09 -05:00
Zach Brown
57cff1f17f Update to MC 1.10.2 2016-06-25 12:19:04 -05:00
Aikar
03553d232e Update upstream 2016-06-22 22:18:41 -04:00
Zach Brown
7253bb10ca Update upstream B/CB 2016-06-19 21:41:46 -05:00
Zach Brown
dd7b44ce04 Update upstream B/CB/S 2016-06-16 18:22:35 -05:00
Zach Brown
3497f7000d Update upstreams 2016-06-15 17:43:51 -05:00
Zach Brown
03eeadc2df Update upstream B/CB
Merges fixes for SPIGOT-2404 and SPIGOT-2408 into Paper
2016-06-13 18:42:08 -05:00
Zach Brown
55fe08d4b9 Update upstream CB/S 2016-06-12 12:00:07 -05:00
Zach Brown
0aaf5eb95c Update upstream B/CB 2016-06-11 22:22:27 -05:00
Zach Brown
2a773b737b Update upstream and rebuild 2016-06-11 14:58:54 -05:00
Brokkonaut
044978f8cc Update upstream CB/S 2016-06-09 19:28:16 +02:00
Zach Brown
8ab69858ac Update upstream CB 2016-06-09 00:24:23 -05:00
Zach Brown
9b192b2708 Update to Minecraft 1.10 2016-06-08 22:57:14 -05:00
Aikar
ec95eb86f7 Update Upstream 2016-06-04 11:41:04 -04:00
Zach Brown
44ddc211c4 Update upstream 2016-06-01 22:52:52 -05:00
Zach Brown
6c11d95680 Update upstreams 2016-05-29 18:32:21 -05:00
Zach Brown
ff2c1ee38e Update upstreams 2016-05-27 21:22:18 -05:00
Aikar
45aa7db5c4 Update Upstream 2016-05-25 12:37:17 -04:00
Zach Brown
32ea7542d2 Update upstream CB
Closes GH-303
2016-05-21 22:07:14 -05:00
Zach Brown
143ab568d4 Update B/CB/S
Closes GH-288
2016-05-20 17:32:50 -05:00
Zach Brown
af4db4ddea [16:55:31] *mibby pokes upstream 2016-05-16 17:00:53 -05:00
Aikar
34fcd8ccc2 Paper 1.9.4 Update 2016-05-11 22:07:46 -04:00
Aikar
22d5cbee82 Update Upstream 2016-05-04 20:10:27 -04:00
Aikar
4e7355aa95 update upstream 2016-05-01 15:58:10 -04:00
Zach Brown
8c96f893c8 Update CB 2016-04-26 23:15:39 -05:00
Zach Brown
ee1ea990e1 Update CB 2016-04-24 19:27:43 -05:00
Aikar
71db253321 update upstream 2016-04-23 22:41:46 -04:00
Zach Brown
ef8ee10bd6 Update CB + Paperclip 2016-04-23 15:47:25 -05:00
Zach Brown
36394d5284 Update upstream Spigot and rebuild 2016-04-22 22:20:34 -05:00
Zach Brown
08cfefeb50 Update upstream CB and rebuild 2016-04-20 11:58:49 -05:00
Zach Brown
85e00ed1ab Update upstream B/CB 2016-04-17 13:36:39 -05:00
Zach Brown
14f6bee0a1 Update upstream 2016-04-12 11:31:54 -05:00
Zach Brown
f54aa3ca2c Update upstreams 2016-04-11 10:30:12 -05:00
Aikar
52ca5f228b upstream 2016-04-10 19:58:05 -04:00
Zach Brown
309e2bd0d3 Update upstream CB 2016-04-09 20:44:54 -05:00
Zach Brown
b6dd739ed4 Update B/CB 2016-04-09 13:51:47 -05:00
Zach Brown
c7bdf516da Update upstreams and rebuild 2016-04-08 17:24:26 -05:00
Zach Brown
933829f334 Update upstream B/CB/Spigot 2016-04-07 00:32:10 -05:00
Zach Brown
b4a0af94bb Upstream merge 2016-04-05 11:42:40 -05:00
Zach Brown
3506f09ca7 Update upstream and rebuild 2016-04-04 09:53:03 -05:00
DemonWav
d89cd16ecb Update Paperclip 2016-04-01 23:20:56 -05:00
DemonWav
09812092f9 Cleanup and restructure the project 2016-04-01 22:55:54 -05:00