Commit graph

221 commits

Author SHA1 Message Date
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
Zach Brown
066f383b95
Update upstream B/CB/S 2017-05-27 23:25:17 -05:00
Zach Brown
8e2ea2277b
Update upstream B/CB 2017-05-26 22:09:24 -05:00
Zach Brown
720769bf30
Update upstream B/S 2017-05-23 17:11:28 -05:00
Zach Brown
c1d0b4b4c6
Update Paper to MC 1.12-pre5 2017-05-20 23:49:56 -05:00
Zach Brown
210ef18495
Merge branch 'master' into pre/1.12 2017-05-17 17:53:13 -05:00
Shane Freeder
ca6254067f
Workaround a jansi bug with Windows
Update Paperclip too while we're here
2017-05-17 17:51:54 -05:00
Zach Brown
6bfe26df49
Update upstream CB 2017-05-17 17:24:58 -05:00
Zach Brown
19134fa224
Update upstream B/CB 2017-05-16 17:17:58 -05:00
Zach Brown
baf762a2c1
Update upstream B/CB/S 2017-05-15 11:25:20 -05:00
Zach Brown
828d600143
Update API patches to MC 1.12pre2 2017-05-14 08:46:44 -05:00
Zach Brown
e4f891c95a
Update Paperclip 2017-05-14 04:23:06 -05:00
Zach Brown
3052144be8
Update upstream CB 2017-05-13 20:37:46 -05:00
Zach Brown
6c3faf6aa3
Update upstream B/CB/S 2017-05-04 18:08:52 -05:00
Zach Brown
8b2122a291
Update upstream B/CB/S 2017-04-28 19:25:52 -05:00
Zach Brown
157528a29e
Update upstream S 2017-04-25 18:22:29 -05:00
Zach Brown
f68b2ab95e
Update upstream CB/S 2017-04-22 17:41:28 -05:00
Zach Brown
9db28f00db
Update upstream B/CB 2017-04-21 23:42:59 -05:00
Zach Brown
2f7c5949d0
Update upstream CB 2017-04-20 18:12:03 -05:00
Zach Brown
d5cf14188a
Update upstream B/CB 2017-04-20 08:22:40 -05:00
Zach Brown
63beca49fe
Update upstream B/CB/S
Closes GH-658
2017-04-16 17:12:14 -05:00
Zach Brown
362e425271
Update upstream CB/S 2017-04-10 22:11:26 -05:00
Zach Brown
6127ca1b6e
Update upstream B/CB 2017-04-04 22:38:08 -05:00
Zach Brown
e4a071f6e4
Update upstream B/CB 2017-03-31 23:24:42 -05:00
Zach Brown
e6a7d357ce
Update upstream CB 2017-03-30 18:26:00 -05:00
Zach Brown
07d0098a9e
Update upstream B/CB/S
Adds /paper command for reloading the paper config.
Closes GH-639

Per-world config logging has been removed in favor of all or nothing
logging for all paper settings. I don't believe it was used enough to
warrant maintaining. If this is not the case it should be possible to
re-add it.
2017-03-24 22:27:43 -05:00
Zach Brown
dbabbdbdbe
Update upstream B/CB 2017-03-18 21:01:13 -05:00
Zach Brown
7f3aa1ed29
Update upstream B/CB/S
Closes GH-631
2017-03-15 09:32:50 -05:00
Zach Brown
71d0330810
Update upstream S 2017-03-02 21:08:18 -06:00
Zach Brown
c7638800ac
Update upstream B/CB 2017-02-22 22:29:13 -06:00
Zach Brown
ae98591b8c
Update upstream B/CB/S 2017-02-17 20:03:38 -06:00
Zach Brown
5031a31da5
Update upstream B/CB/S 2017-02-10 18:12:58 -06:00
Zach Brown
919cb9d19a
Update upstream CB, reduce version cache time
Closes GH-602
2017-02-07 16:29:26 -06:00
Zach Brown
d3544dad18
Update upstream S 2017-02-04 03:59:44 -06:00
Zach Brown
8878ecc5f3
Update upstream CB
Closes GH-596
2017-02-01 22:48:16 -06:00
Zach Brown
1e1541a2e9
Update upstream S 2017-01-30 22:33:54 -06:00
Zach Brown
e08ef5457a
Update upstream CB 2017-01-28 17:36:03 -06:00
Zach Brown
88205cd8fe
Update upstream B/CB/S 2017-01-25 22:27:42 -06:00
Zach Brown
c1641b8e0c
Update upstream B/CB/S 2017-01-20 05:21:44 -06:00
Zach Brown
28c0441d02
Update upstream B/CB 2017-01-14 02:11:12 -06:00
Zach Brown
63130fd2aa
Update upstream B/CB
Closes GH-569
2017-01-06 15:45:59 -06:00
Aikar
86e5224d94 Update upstream - fixes more Spawn Egg issues 2017-01-02 01:58:15 -05:00
Zach Brown
3a8acfba6b
Update upstream B/CB 2016-12-31 00:08:30 -06:00
Zach Brown
1870320545
Update upstream CB
Closes GH-556
2016-12-27 18:46:41 -06:00
Aikar
64f6edc759 Upstream update 2016-12-27 13:07:43 -05:00
Zach Brown
bba27681ba
Update usptream CB 2016-12-26 13:02:52 -05:00
Zach Brown
ebd97d6f18
Update upstream B/CB 2016-12-24 17:05:51 -05:00
Aikar
ebeab924f5 Upstream, Fixes #533 2016-12-23 00:55:03 -05:00
Zach Brown
fe913c51c4
Update upstream CB 2016-12-22 15:06:59 -06:00
Zach Brown
cae453c16b
Update to Paper to MC 1.11.2 2016-12-21 11:21:40 -06:00
Aikar
417b1e2e02 Update upstream 2016-12-21 01:40:41 -05:00
Zach Brown
33163525f3
Update Paper to MC 1.11.1 2016-12-20 17:45:00 -06:00
Aikar
c222ffd4cd Update upstream 2016-12-19 22:58:12 -05:00
Aikar
8bbb9c70f3 Update Upstream 2016-12-19 01:23:54 -05:00
Zach Brown
5ff732798d
Update upstream B/CB 2016-12-16 22:23:03 -06:00
Zach Brown
1d8b7e2ecc
Update upstream B/CB 2016-12-16 15:00:16 -06:00
Zach Brown
f087ac45e3
Update upstream B/CB
Fixes GH-542
2016-12-12 14:21:28 -06:00
Zach Brown
7c210e35b4
Update upstream CB 2016-12-10 17:50:31 -06:00
Zach Brown
b41a5ab566
Update upstream B/CB 2016-12-09 18:07:35 -06:00
Zach Brown
57c2b8de43
Update upstream B/CB 2016-12-06 17:12:19 -06:00
Zach Brown
ebf1094ea5
Update upstream CB 2016-12-04 17:59:11 -06:00
Zach Brown
7e6d4b54e1
Don't remove random diffs in update 2016-12-02 21:06:21 -06:00
Zach Brown
f986ebbae5
Update upstream CB 2016-12-02 18:07:07 -06:00
Zach Brown
357b402cbc
Update upstream B/CB some more 2016-12-01 19:34:07 -06:00
Zach Brown
7556f6a556
Update upstream B/CB 2016-11-30 21:10:14 -06:00
Zach Brown
951fbf46dc
Update upstream CB 2016-11-29 23:14:49 -06:00
Zach Brown
2bfdbc4afa
Update upstream CB 2016-11-29 18:02:20 -06:00
Jamie Mansfield
6a127779e7
Update upstream CB 2016-11-29 20:09:37 +00:00
Zach Brown
ed6bd4ea4a
Update upstream B/CB - hitEntity added upstream 2016-11-28 17:16:07 -06:00
DemonWav
a594f94666
Update Paperclip 2016-11-27 23:27:33 -06:00
Zach Brown
b324a0ec4f
More upstream CB 2016-11-27 17:37:38 -06:00
Zach Brown
ceec3e2219
Update upstream CB 2016-11-27 17:00:08 -06:00
Zach Brown
4056a8b468
Update upstream B/CB/S 2016-11-26 21:36:05 -06:00
Zach Brown
a68f5fbec0
Update upstream B/CB/S 2016-11-24 21:12:18 -06:00
Zach Brown
4ea87e5378
Update upstream B/CB/S 2016-11-22 18:06:14 -06:00
Aikar
2290e5f85d Update upstream 2016-11-21 18:00:40 -05:00
Zach Brown
97e0eac6e7
Update upstream B/CB 2016-11-21 15:51:27 -06:00
Zach Brown
eb877d8cdb
Update upstream CB 2016-11-20 17:02:00 -06:00
Zach Brown
a27cdba309
Update upstream CB 2016-11-19 21:30:09 -06:00
Zach Brown
508ce52d68
Update upstream CB 2016-11-19 17:24:37 -06:00
Zach Brown
26e4ac4330
Update upstream B/CB 2016-11-19 11:27:13 -06:00
Aikar
6b81efa677 Upstream update again 2016-11-19 00:16:42 -05:00
Aikar
9725050889 Update Upstream 2016-11-18 23:58:56 -05:00
Zach Brown
a6d146a939
Update Paper to MC 1.11 2016-11-18 16:21:06 -06:00
Zach Brown
65538782cd
Update upstream B/CB/S 2016-11-12 20:21:46 -06:00
Zach Brown
1e1de2ffa8
Update upstream CB 2016-11-04 22:37:19 -05:00
Zach Brown
c4829af34f
Update upstream B/CB 2016-11-03 14:27:37 -05:00
Zach Brown
0860727dae
Update upstream S 2016-10-26 16:05:22 -05:00
Zach Brown
3fafa6306a
Update upstream CB 2016-10-24 21:03:31 -05:00
Zach Brown
88e1379b38
Update upstream CB 2016-10-23 01:32:04 -05:00
Zach Brown
7be0340f48
Update upstream CB 2016-10-22 15:24:15 -05:00
Zach Brown
92567cc43a
Update upstream B/CB 2016-10-21 15:28:44 -05:00
Zach Brown
2645ee04ae
Update upstream CB 2016-10-16 15:35:34 -05:00
Zach Brown
8377df063a
Update upstream CB/S 2016-10-13 17:29:38 -05:00