Upstream/Waterfall
1
0
Fork 0
mirror of https://github.com/PaperMC/Waterfall.git synced 2024-12-27 11:07:39 +01:00
Code Issues Projects Releases Wiki Activity
117 Commits 4 Branches 1 Tag 4 MiB
4298d8c8eb
Commit Graph

117 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shane Freeder
4298d8c8eb Updated Upstream (Waterfall) 
Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

Waterfall Changes:
0874931 Updated Upstream (BungeeCord)
 2019-02-21 03:01:39 +00:00
Shane Freeder
339460b7c3 Misc script fixes 
Also, grab upstreamCommit
 2019-02-20 19:49:13 +00:00
DoNotSpamPls
46523ec73d
Use new build system from Waterfall 2019-02-20 19:31:51 +00:00
Shane Freeder
b72abd9de8
Update Waterfall 2019-02-04 18:06:59 +00:00
Shane Freeder
c3accea68d
Update Waterfall 2019-01-03 06:08:57 +00:00
Shane Freeder
aa9fe6c74e
Update Waterfall 2018-12-26 23:46:48 +00:00
Shane Freeder
abf38c696e
Update Waterfall 2018-12-21 15:48:19 +00:00
Shane Freeder
f7ad8b173a Merge upstream 2018-12-10 14:08:05 +00:00
Kah
bcba0e5d11 Fix commit 80367c1 that failed to correctly merge the file 
Caused ForgeMultipart client to crash when trying to load a multiblock
 2018-12-09 13:18:55 +00:00
Shane Freeder
af00e33389 Merge upstream 2018-11-19 23:36:27 +00:00
Shane Freeder
9c4bf9ca4a Fix compilation 
An import statement when missing during the last upstream merge
(Don't ask how I missed this, I have no idea!)
 2018-11-12 21:22:32 +00:00
Shane Freeder
0d92082a73 [CI-SKIP] Protocol patch is travertine, not waterfall 2018-11-11 14:28:05 +00:00
Shane Freeder
f8e3243c7d Merge upstream 2018-11-11 12:29:39 +00:00
Shane Freeder
c34c98efa2
Merge upstream 
Also drop "Fixup ProtocolConstants - moved upstream
 2018-10-27 23:35:46 +01:00
Shane Freeder
8030568e21
Merge upstream for 1.13.2 (Closes #80) 2018-10-23 00:58:52 +01:00
Shane Freeder
e4d5824710 Merge upstream and fix module download 2018-10-14 11:23:29 +01:00
Shane Freeder
2b0af959fc
Update upstream 2018-10-06 20:02:42 +01:00
Shane Freeder
83c2b006a3
Give Travertine it's long awaited upstream merge 2018-10-06 05:01:18 +01:00
Shane Freeder
5fcd3ca6c2 Merge upstream 2018-09-10 21:18:08 +01:00
Shane Freeder
21050ebfb0 Merge upstream 2018-09-04 03:15:37 +01:00
Shane Freeder
6deaa1c15c
Merge upstream - Minecraft 1.13.1 support 2018-08-23 22:59:35 +01:00
Shane Freeder
88bbba2f39
Merge upstream 2018-08-07 02:16:23 +01:00
Shane Freeder
a393505f4c Merge upstream 2018-07-30 13:20:51 +01:00
Shane Freeder
c3d5404c39 Merge upstream ref: Drop 1.13 scoreboard api support 2018-07-25 19:14:44 +01:00
Shane Freeder
72289ab8e7 Fix HealthObjective NPE on 1.7.10 connections 2018-07-24 01:48:59 +01:00
Shane Freeder
103dab73d7 Merge upstream 2018-07-23 08:36:53 +01:00
Shane Freeder
2495a12b97 Merge upstream 2018-07-22 15:12:43 +01:00
Shane Freeder
040ae7f349 Merge upstream 2018-07-22 06:45:50 +01:00
Shane Freeder
548acd0e66 Merge upstream 2018-07-22 01:37:33 +01:00
Shane Freeder
d4100f1f67 Merge upstream 2018-07-22 01:36:00 +01:00
Shane Freeder
6426c6a0e9
Merge upstream 2018-07-21 21:55:04 +01:00
Shane Freeder
fc46ad499f Merge upstream 2018-07-21 19:57:00 +01:00
Shane Freeder
be8994ba31 Merge upstream for scoreboard handling 2018-07-21 18:17:08 +01:00
Shane Freeder
3cdf15f083 Merge upstream 2018-07-21 17:45:51 +01:00
Shane Freeder
5963c4a153
Merge upstream 2018-07-20 21:39:35 +01:00
Shane Freeder
2bf2eb0c19
Fix 1.7 protocol patch objective changes 2018-07-20 14:16:11 +01:00
Shane Freeder
6031511c81
Fix support for 1.7 scoreboard objectives 2018-07-20 06:17:40 +01:00
Shane Freeder
ccfdc92c9a
Fix backwards protocol linking 
No idea why this one worked during testing.
 2018-07-20 04:25:38 +01:00
Shane Freeder
5f9f4a5656
Merge upstream 
Also sneak in a bit of support for 1.13...
 2018-07-20 03:55:49 +01:00
Shane Freeder
3cffe7c4a3
Merge upstream 2018-07-13 08:07:09 +01:00
Shane Freeder
56e5b6b920
Merge upstream 2018-06-21 03:45:08 +01:00
Shane Freeder
80367c1e14
Fix patch which was mismerged 2018-06-09 11:52:32 +01:00
Shane Freeder
c5e413a81b
Merge upstream 2018-06-08 11:46:31 +01:00
Shane Freeder
c333cd990e
update to point to the correct CI server 2018-05-08 23:20:33 +01:00
Shane Freeder
b315787b57
Merge upstream (closes #66) 2018-05-08 23:14:42 +01:00
Shane Freeder
dc6a32202e
Merge upstream 2018-04-02 10:25:58 +01:00
Shane Freeder
d8cd722dad
Merge upstream 2018-03-14 14:56:58 +00:00
Shane Freeder
745ff9f4b4
Merge upstream 2018-03-06 21:12:53 +00:00
Shane Freeder
9e838f67a3
Merge upstream 2018-02-08 08:14:13 +00:00
Shane Freeder
a03f09a9ae [CI-SKIP] Update README 2018-02-01 16:57:15 +00:00