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
70 Commits 4 Branches 1 Tag 4 MiB
745ff9f4b4
Commit Graph

70 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
fuzzybot
f2ea4a5a2f Automatic upstream update to git commit 91d537c7cc 2017-02-01 20:50:09 +00:00
fuzzybot
38812354d3 Automatic upstream update to git commit 2268a31735 2017-01-19 20:45:08 +00:00
Techcable
75131ec9a1
Fix conflicts 2017-01-17 08:10:10 -07:00
fuzzybot
42cc342e8c Automatic upstream update to git commit 7e1c6381ee 2017-01-17 15:10:08 +00:00
fuzzybot
5492b77e7a Automatic upstream update to git commit 228318425b 2017-01-17 15:02:07 +00:00
Techcable
bf36a4c5af
Fix patch conflicts 2017-01-15 10:05:31 -07:00
fuzzybot
8251f53dd8 Automatic upstream update to git commit 0285fa1808 2017-01-15 17:04:08 +00: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
fuzzybot
74378edf7d Automatic upstream update to git commit bec652093f 2016-12-24 06:37:09 +00:00
fuzzybot
de2941c1dc Automatic upstream update to git commit 41ec1b302a 2016-12-21 09:10:13 +00:00
fuzzybot
17c30ce6e7 Automatic upstream update to git commit 6fc2170f21 2016-12-21 08:47:16 +00:00
fuzzybot
6fe29cce36 Automatic upstream update to git commit 2dd82be3f1 2016-12-21 08:16:15 +00:00
fuzzybot
6ab6d83339 Automatic upstream update to git commit 722e89f245 2016-12-21 07:36:18 +00:00
Troy Frew
94bb00787a
add super pom 2016-12-09 20:55:05 -05:00
fuzzybot
ccaf0f0d9b Automatic upstream update to git commit d8d9dc852a 2016-12-09 23:55:09 +00:00
kamcio96
765da9ee2d Now 1.7 really works. + EntityEffect protocol (#24) 2016-11-23 11:41:45 -05:00
Techcable
a4745d8e6d
Merge upstream 2016-11-19 10:19:35 -07:00