Upstream/Waterfall
1
0
Fork 0
mirror of https://github.com/PaperMC/Waterfall.git synced 2024-11-19 08:45:21 +01:00
Code Issues Projects Releases Wiki Activity
340 Commits 4 Branches 1 Tag 4 MiB
213e226efd
Commit Graph

340 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
kashike
b06491c36c
Merge pull request #58 from electronicboy/master 
Merge upstream
 2017-11-19 10:29:35 -08: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
85c21cc277
Update upstream 2017-07-17 15:39:46 -04: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
fuzzybot
cd3ea9538d Automatic upstream update to git commit 4f5b91198a 2017-06-01 04:44:17 +00:00
fuzzybot
ee0ff63e63 Automatic upstream update to git commit 7f5b95d380 2017-05-23 15:53:12 +00:00
fuzzybot
f2be1e7f81 Automatic upstream update to git commit ad3bf933b8 2017-05-22 19:13:09 +00:00
fuzzybot
b1bb4b4c38 Automatic upstream update to git commit 9432ed7e40 2017-05-19 20:52:11 +00:00
fuzzybot
5848a88daa Automatic upstream update to git commit 474774102e 2017-05-15 15:55:13 +00: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
fuzzybot
ae12edaf1d Automatic upstream update to git commit 710c45640c 2017-05-14 15:21:10 +00:00
fuzzybot
17655ffd0b Automatic upstream update to git commit db05bbac39 2017-05-14 14:08:15 +00:00
fuzzybot
052e9d29a8 Automatic upstream update to git commit ec611c5d0a 2017-05-10 17:55:13 +00:00
fuzzybot
050f5d5fdd Automatic upstream update to git commit 11f46ca049 2017-04-28 20:23:11 +00:00
fuzzybot
5b668359a0 Automatic upstream update to git commit bfb622eb23 2017-04-26 16:35:09 +00:00
fuzzybot
7d697fa5f2 Automatic upstream update to git commit 6cd013ce1d 2017-04-09 21:20:10 +00:00
fuzzybot
eebc9d1ade Automatic upstream update to git commit 78a8edd2da 2017-04-08 14:29:12 +00:00
fuzzybot
fe706656f2 Automatic upstream update to git commit b5ed82d599 2017-04-08 03:27:11 +00:00
fuzzybot
c2618c8dba Automatic upstream update to git commit 8ff8de0fbd 2017-03-11 11:14:10 +00:00
fuzzybot
eb02538783 Automatic upstream update to git commit 53eade81e8 2017-03-07 21:30:12 +00:00
fuzzybot
f18b58e29a Automatic upstream update to git commit 1073945fba 2017-03-07 21:26:07 +00:00
fuzzybot
1b074b99ac Automatic upstream update to git commit 32a7625f4f 2017-02-07 22:40:09 +00:00