Commit graph

309 commits

Author SHA1 Message Date
Aikar 6b00d856be
Upstream update 2018-08-03 01:04:28 -04:00
Zach Brown dbde9e6332
Update upstream B/CB 2018-08-02 18:29:34 -05:00
Zach Brown 376140dfd1
Update upstream B/CB 2018-08-02 18:12:29 -05:00
Aikar 1abd4d51c1
Update upstream 2018-08-01 22:49:47 -04:00
Zach Brown 9355f325cd
Update upstream CB 2018-07-31 16:45:04 -05:00
Zach Brown 96ce4bd9fd
Update upstream B/CB 2018-07-30 20:19:41 -05:00
Aikar 76e1e4d79f
Update Upstream
Removed my ChunkLoadEvent patch as upstream fixed it
2018-07-30 01:08:59 -04:00
Aikar b9b32ba7dc
Update upstream 2018-07-29 22:16:15 -04:00
Aikar 566740114e
update upstream 2018-07-29 12:42:07 -04:00
Shane Freeder f7d02b2518
Update CB/S 2018-07-28 03:38:13 +01:00
Zach Brown 4eec0c9b27
Update upstream B/CB 2018-07-27 13:10:30 -05:00
Shane Freeder 8808629550
Update B/CB/S 2018-07-26 16:20:37 +01:00
Aikar 48d75228ed
Update upstream 2018-07-25 19:05:07 -04:00
Aikar c280d84172
Update upstream and remove hopper patch for #1270 2018-07-25 01:11:08 -04:00
Aikar 0e5e60c1d8
Update upstream 2018-07-24 20:53:26 -04:00
Aikar 166eb8b489
Update upstream 2018-07-23 23:00:57 -04:00
Aikar 9a17bddf12
Update upstream 2018-07-23 19:41:14 -04:00
Shane Freeder 4608731dca
Update S
Also drop a few patches which are no longer needed/already merged in.
2018-07-23 18:21:07 +01:00
Shane Freeder aad194a32e
Update B/CB/S 2018-07-23 09:44:57 +01:00
Aikar 4b66f1978d
Update upstream 2018-07-22 13:10:15 -04:00
Aikar c025f19c31
because upstream force pushed... lets try again 2018-07-22 01:30:37 -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
Aikar dc8f516424
Update Upstream 2018-07-21 16:03:10 -04:00
Shane Freeder 1fe8472503
update B/CB/S 2018-07-20 20:57:43 +01:00
Zach Brown 19bf52c4f4
Update paperclip for new Mojang download URLs 2018-07-19 15:51:04 -05:00
Shane Freeder 7a698b592c
Update CB 2018-07-19 19:43:08 +01:00
Shane Freeder 84c98c2ba8
NOT FINISHED! She compiles, and she... suffers the wrath of chunkgen... 2018-07-19 05:42:43 +01:00
Aikar 3d8746445e
NOT FINISHED: Current progress, updated upstream 2018-07-18 00:52:45 -04:00
Shane Freeder 885edbdaf5
NOT WORKING! Even even more patches! 2018-07-17 21:32:26 +01:00
Shane Freeder 8bf65f2872
NOT FINISHED! even more 1.13-pre patches! 2018-07-17 01:32:54 +01:00
Shane Freeder 63214cb795
NOT FINISHED!!! More progress on 1.13-pre7
This work is unfinished, keep your paws off this branch!
2018-07-16 16:43:38 +01:00
Aikar 5b6dfb3463
NOT FINISHED!!! Current Progress on 1.13-pre7 update
This work is 100% unfinished. I am pushing it up so that we as a team
can work on this update.

Do not try to use this branch. You will fail.
2018-07-16 00:13:29 -04:00
Zach Brown 5b02e5736a
Update upstream B/CB 2018-07-13 02:39:44 -05:00
Aikar 9b1e9b43ff
Update Upstream 2018-06-20 23:29:33 -04:00
Zach Brown 51b88cabbc
Update upstream CB 2018-05-27 23:39:08 -05:00
Zach Brown 264c9d0060
Update upstream B 2018-05-19 00:58:46 -05:00
Shane Freeder 8595189ab6
Update B/CB 2018-05-08 23:09:45 +01:00
Aikar ff661c3555
Upstream update 2018-04-30 12:20:46 -04:00
Aikar a72fc26fc1
Update upstream 2018-04-22 10:40:36 -04:00
Zach Brown d49c6a296e
Update upstream CB/S 2018-04-17 22:25:50 -04:00
Zach Brown 344a125dc1
Update BD to allow building on Java 10 2018-04-08 16:19:44 -04:00
Zach Brown b9c451f294
Update upstream CB 2018-04-08 16:15:23 -04:00
Zach Brown c178b3931a
Update upstream CB 2018-04-04 21:05:09 -04:00
Zach Brown d0bf96b26b
Update CB 2018-04-02 16:33:04 -04:00
Shane Freeder fad15a6acc
Update CB/S 2018-03-31 14:30:29 +01:00
Aikar 9b12f54b69
Update upstream 2018-03-25 20:06:44 -04:00
Zach Brown b2eec92412
Update upstream B/CB 2018-03-22 23:58:50 -04:00
Shane Freeder cdc1dcf02e
Update CB/S 2018-03-08 19:36:35 +00:00
Zach Brown 1e870d319b
Update upstream B/CB 2018-03-04 18:32:38 -05:00
Shane Freeder fab6cbe7e7
Update B/CB 2018-02-24 04:03:32 +00:00