Commit Graph

7 Commits

Author SHA1 Message Date
Shane Freeder
5955ede0cb Merge upstream (Closes #282) 2018-09-04 03:12:52 +01:00
Shane Freeder
578418c4f2
Merge upstream 2018-07-20 02:30:56 +01:00
Mark Vainomaa
3d4d154926 Copy license files into jar
Solves issue #201 with including the BungeeCord LICENSE file
in binary distribution, as the license requires.
2018-07-18 18:47:50 +01:00
BlackHole
6a77c81ac1
Merge upstream - Minecraft 1.13-pre7 support 2018-07-15 13:16:15 +01:00
Jamie Mansfield
a40c225a66
Merge upstream 2018-07-09 10:12:55 +01:00
Shane Freeder
8ad3bf6da2
Merge upstream 2018-06-21 03:41:48 +01:00
Jamie Mansfield
aab96dc7e8 Merge Bungeecord#e93323d 2018-05-28 21:53:01 +01:00