Upstream/Waterfall
1
0
Fork 0
mirror of https://github.com/PaperMC/Waterfall.git synced 2024-12-29 12:07:45 +01:00
Code Issues Projects Releases Wiki Activity
249 Commits 4 Branches 1 Tag 4 MiB
7df29fa62b
Commit Graph

151 Commits

Author SHA1 Message Date
Shane Freeder
6deaa1c15c
Merge upstream - Minecraft 1.13.1 support 2018-08-23 22:59:35 +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
548acd0e66 Merge upstream 2018-07-22 01:37:33 +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
dc6a32202e
Merge upstream 2018-04-02 10:25:58 +01:00
Shane Freeder
745ff9f4b4
Merge upstream 2018-03-06 21:12:53 +00:00
Shane Freeder
dd6dac6716 Merge upstream 2018-01-28 11:57:02 +00:00
Shane Freeder
240d039138 Merge upstream 2018-01-08 17:36:22 +00:00
Shane Freeder
f0974e8ce7 Merge upstream 2017-12-20 13:24:32 +00:00
Shane Freeder
a536194466
Merge upstream 2017-11-19 08:52:38 +00:00
Shane Freeder
869569b212 Update for 1.12.2 (#57) 
Wow, saved by @electronicboy yet again! 👏
 2017-10-29 10:12:12 -07:00
Troy Frew
9320467862
update upstream 2017-07-04 17:20:14 -04:00
Techcable
32dbddccf0
Update to minecraft v1.12 
Fixes #45
Fixes #48
 2017-06-12 20:17:46 -07:00
Techcable
7b902eb14f
Wiggle the patches to resolve conflicts 
For some reason, this doesn't build on my computer because of an issue
with OpenSSL.

Fixes #43
 2017-05-15 00:01:52 -07:00
Techcable
75131ec9a1
Fix conflicts 2017-01-17 08:10:10 -07:00
Techcable
bf36a4c5af
Fix patch conflicts 2017-01-15 10:05:31 -07:00
Tux
1d5e74d222 Removed junk 2017-01-04 20:08:33 -05:00
Tux
5d52e0f653 Actually fix the patches 2017-01-04 20:07:36 -05:00
Tux
8ed5f195a6 Revert "Corrected patches" 
This reverts commit c6cd052545.
 2017-01-04 20:04:39 -05:00
Tux
c6cd052545 Corrected patches 
Resolves #30, #31, #32
 2017-01-04 19:31:11 -05:00
Troy Frew
94bb00787a
add super pom 2016-12-09 20:55:05 -05:00
kamcio96
765da9ee2d Now 1.7 really works. + EntityEffect protocol (#24) 2016-11-23 11:41:45 -05:00
Troy Frew
0cb263f765
Update Upstream. Optimize the patches a bit. This needs testing. 2016-11-15 10:32:02 -05:00
Troy Frew
4e30754083
initial 1.11 snapshot support 2016-08-11 03:07:36 -04:00
Troy Frew
0855997380
Attempted negative packet fix for 1.7 clients 2016-07-31 15:04:17 -04:00
kamcio96
bb047f1302 Remove log (#15) 2016-07-28 10:21:33 -04:00
Troy Frew
060c308f60 Update upstream 2016-07-16 22:41:50 -04:00
Troy Frew
fb40d19157
fix #5 2016-07-03 14:46:58 -04:00
Troy Frew
31866db9e5 Travertine is running on a network with 100 players as of this commit 
Update upstream
 2016-07-03 12:21:56 -04:00
Troy Frew
faa802ef2f Couple of small updates, 
Update upstream
Add CONTRIBUTING.md file
Add 1.7.x client support
 2016-07-03 02:56:31 -04:00
Troy Frew
4f57bed1d3 Fix a couple more Waterfall->Travertine name changes 2016-06-30 12:44:08 -05:00
Techcable
aea75ddfda
Support 1.7 (WIP) 
This also refractors deserialization code to make it easier for new versions to be added
 2016-06-27 13:05:10 -07:00
Techcable
3da9645ff4
Claenup stuff, add metrics, and rename references from Waterfall to Travertine 2016-06-27 13:00:16 -07:00
Troy Frew
54ebac784a Initial project structure. More to come soon.. 2016-06-27 02:09:47 -04:00