Commit Graph

186 Commits

Author SHA1 Message Date
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
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