Upstream/Waterfall
1
0
Fork 0
mirror of https://github.com/PaperMC/Waterfall.git synced 2024-07-08 20:34:46 +02:00
Code Issues Projects Releases Wiki Activity
148 Commits 4 Branches 1 Tag 7.2 MiB
71b76653f2
Commit Graph

25 Commits

Author SHA1 Message Date
Jamie Mansfield
71b76653f2
Merge upstream 2017-10-28 20:51:33 +01:00
Jamie Mansfield
4c8715286f
Deploy to destroystokyo mvn repo 
Thanks @Z750 :D
 2017-10-09 20:20:14 +01:00
Jamie Mansfield
2e32a81429
Merge upstream. Closes #171 2017-09-03 19:55:05 +01:00
Jamie Mansfield
8edae227f6
Merge upstream 2017-07-09 00:24:38 +01:00
Troy Frew
6ab69de258
upstream merge 9b3b42316f25a84530e3bbc8b3887ced4ad9838c 2017-07-04 16:20:09 -04:00
Troy Frew
1c98857249
merge upstream daac8d85e20baed2ee0107ee637d0e82af8b2cd1 2017-07-04 16:06:59 -04:00
Jamie Mansfield
03bdb50116
Merge upstream + Fix build 2017-06-21 22:19:45 +01:00
Jamie Mansfield
3b5e511743
Merge upstream 2017-06-18 16:03:06 +01:00
Jamie Mansfield
db05bbac39
Merge upstream - Minecraft 1.12-pre2 support 2017-05-14 15:07:38 +01:00
Jamie Mansfield
8ff8de0fbd
Merge upstream 2017-03-11 11:12:59 +00:00
Jamie Mansfield
91d537c7cc
Update upstream 2017-02-01 20:49:23 +00:00
Tux
bec652093f Merge with upstream 2016-12-24 01:36:32 -05:00
Jamie Mansfield
ea2c109864
Make waterfall-super the parent of waterfall-parent 2016-12-04 17:31:55 +00:00
Jamie Mansfield
65bfdc7fe1
Merge upstream, Minecraft 1.11 Support 2016-11-14 17:04:25 +00:00
Jamie Mansfield
a5c3110642 Update pom 
- Update developers list
- Update ci link
 2016-08-30 18:38:26 +01:00
Jamie Mansfield
1d27a880c3 Update upstream 
upstream finnaly caught up on those netty versions :D
 2016-08-30 18:30:38 +01:00
Jamie Mansfield
d983224c69
Set module author to WaterfallMC 2016-08-17 01:21:26 +01:00
Troy Frew
2f7ff90ecc
Update upstream 2016-07-31 13:59:30 -04:00
Troy Frew
9f45b24f77 waterfall-chat is under io.github.waterfallmc 2016-07-16 22:38:31 -04:00
Troy Frew
abe3f78e85 Fixed missed change in log/pom.xml 2016-07-16 22:33:11 -04:00
Troy Frew
f04680f98e Update upstream. Fixup patch files for new log module and other changes from upstream. Update netty to 4.1.3.Final 2016-07-16 21:12:39 -04:00
Techcable
d5d0edbadd
Sleep deprevation is good because it keeps syntax errors in business 2016-06-08 23:12:58 -07:00
Techcable
629ab1e0b1
Updade bungeecord and use their 1.10 support 2016-06-08 23:08:37 -07:00
Techcable
ca92e83419
Try and fix build 2016-05-31 13:11:28 -06:00
Techcable
3809083007
Turn waterfall into a patch-based fork like Spigot and Paper (WIP) 
Allows us to easily see and manage the diff with upstream.
Makes fixing conflicts with upstream easier and shows a cleaner, more acurate commit history.

All credits to scripts go to @md_5 @aikar @Zbob750 @Thinkofname @Byteflux @Techcable (GPL3 Licensed)
 2016-05-30 14:51:51 -06:00