Commit Graph

196 Commits

Author SHA1 Message Date
Shane Freeder
626024b152
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:
e9ad343 Removed duplicated javadoc param (#456)
17d5b78 Updated Upstream (BungeeCord)
2020-02-17 21:12:18 +00:00
Shane Freeder
3072d2af03
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:
cca83df Updated Upstream (BungeeCord)
2020-02-01 15:40:18 +00:00
Shane Freeder
29a0265026
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:
f3bcf0b Ditch 1.6 bootstrap
2020-01-24 22:47:32 +00:00
Shane Freeder
6c610921c9
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:
c21eed1 Updated Upstream (BungeeCord)
2020-01-24 22:44:24 +00:00
Shane Freeder
7740890e8a
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:
8af0366 Updated Upstream (BungeeCord)
2020-01-21 21:51:34 +00:00
Shane Freeder
dbe27f380f
Add temp 1.15.2 support 2020-01-21 17:49:46 +00:00
Shane Freeder
ae5fefb3b6
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:
56fd936 Updated Upstream (BungeeCord)
2020-01-21 17:41:57 +00:00
Shane Freeder
82952e06d1
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:
3a793b8 Updated Upstream (BungeeCord)
2020-01-06 19:57:49 +00:00
Shane Freeder
c080a9e9ca
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:
5adaf9a Speed up some common exceptions
2020-01-02 23:59:05 +00:00
Shane Freeder
269c5fe534
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:
6456426 Updated Upstream (BungeeCord)
2019-12-21 06:55:31 +00:00
Shane Freeder
b65ef1e82f
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:
90dcf97 Updated Upstream (BungeeCord)
82e1da5 ConnectionInitEvent
2019-12-17 22:38:50 +00:00
Shane Freeder
32c100ed03
1.15.1 protocol support 2019-12-17 14:41:14 +00:00
Shane Freeder
6e8f551480
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:
6f85738 Rebuild patches
3426625 Updated Upstream (BungeeCord)
f708bf1 Add missing ViewDistance packet supplier (#436)
2019-12-10 23:04:38 +00:00
Shane Freeder
b11282db31
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:
b4bdcf3 Add callEvent shortcut to Event
47f9491 Cleanup imports from last commit
ea158c3 Further robustness of entity metadata rewrite setting vs plugins
e94c0b9 Cache session exception
2019-12-03 07:20:03 +00:00
Shane Freeder
997635669d
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:
2b3b0ec Ignore empty packets
2019-10-10 16:43:52 +01:00
Shane Freeder
69237a1399
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:
0085381 Updated Upstream (BungeeCord)
fa0711d Speed up packet construction (#373)
3002132 Update TerminalConsoleAppender to 1.2.0, replace JNA with Jansi
7993599 Update Log4j2 to 2.12.0
2019-08-17 21:58:37 +01:00
theminecoder
54a75afe99 Updated Upstream for 1.14.4 (Waterfall) (#110) 2019-07-20 00:29:11 -05:00
Shane Freeder
3bacafa2aa
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:
18b9500 Fix server transfers across dimensions (Fixes #378)
2019-06-27 14:55:27 +01:00
Shane Freeder
f57431e7fe
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:
0ccdb46 Updated Upstream (BungeeCord)
ba94135 Updated Upstream (BungeeCord)
2019-06-25 04:05:03 +01:00
theminecoder
ec53a739e0 Updated Upstream (Waterfall) 2019-05-28 01:16:02 +01:00
theminecoder
4314e4fc46 Update Upstream (Waterfall) 2019-05-14 12:51:07 +10:00
Shane Freeder
234b644750 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:
86ec79b Updated Upstream (BungeeCord)
2019-04-30 06:28:40 +01:00
Shane Freeder
29deb8df30 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:
154eb18 Bring up waterfall to 1.14 release
2019-04-23 18:57:42 +01:00
Shane Freeder
3d9d600164 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:
69d0c40 Updated Upstream (BungeeCord)
2019-04-23 09:34:01 +01:00
Shane Freeder
fdf62c92c5 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:
c331e7f Report slow events in milliseconds
ae319ce Reuse existing ServerInfo object when reloading config
b346845 Use proper max length for serverbound chat packet
2019-03-26 04:47:49 +00:00
Shane Freeder
02c7c496b2 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:
8f8bdf5 Updated Upstream (BungeeCord)
c803d54 Manually specify deploy plugin version
897f9d6 Aggregate API and Chat Javadocs
6a98009 Apply delombok to sources, generate javadocs from delombok sources
aec375c fix critical formatting error
2019-03-20 03:58:21 +00:00
Shane Freeder
6895f1b2ad 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:
03ebf04 Add ProxyDefineCommandsEvent (Fixes #358)
2019-03-16 07:50:01 +00:00
Shane Freeder
b62da97274 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:
c31195b Updated Upstream (BungeeCord)
2019-03-09 01:42:44 +00:00
Shane Freeder
135c73325a Rebuild patches
Local git repo state got... weird...
2019-03-03 02:15:06 +00:00
Shane Freeder
a4c03021b2 Fix wrongly mapped packet
Also, remove a misplaced comment, and a rejected merge file sitting
around
2019-03-03 01:03:35 +00:00
Shane Freeder
db33544cc1 Adopt protocol patch registration for upstream changes 2019-03-02 22:35:35 +00:00
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
b72abd9de8
Update Waterfall 2019-02-04 18:06:59 +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
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
83c2b006a3
Give Travertine it's long awaited upstream merge 2018-10-06 05:01:18 +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
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