Commit Graph

1948 Commits

Author SHA1 Message Date
Myles
89dfcaf626 Back to SNAPSHOT 2019-05-27 13:37:16 +01:00
Myles
4fb0738c1a
Merge pull request #1356 from Gerrygames/1.14.2
1.14.2
2019-05-27 13:24:38 +01:00
Gerrygames
e8f4f7049b 1.14.2 2019-05-27 14:23:00 +02:00
Myles
0087e382ed
Merge pull request #1354 from Gerrygames/1.14.2
1.14.2-pre4
2019-05-24 17:37:27 +01:00
Gerrygames
eb9e48ecdc 1.14.2-pre4 2019-05-24 18:25:55 +02:00
Myles
34f8451ac5
Merge pull request #1352 from KennyTV/master
Fix minecart mapping
2019-05-22 17:41:57 +01:00
KennyTV
894503d56b Fix minecart mapping 2019-05-22 18:35:50 +02:00
Myles
ee8c3d609f
Merge pull request #1351 from KennyTV/dev
1.14.2-pre3
2019-05-22 16:24:13 +01:00
KennyTV
b2c1c24902 1.14.2-pre3 2019-05-22 16:54:25 +02:00
Myles
6e8ea8689b
Merge pull request #1349 from KennyTV/master
Add dolphin to Entity1_13Types
2019-05-22 14:44:20 +01:00
KennyTV
7fcb489f38 Add dolphin to Entity1_13Types 2019-05-22 15:25:42 +02:00
Myles
10b0a6fbb6 Merge branch 'master' into dev 2019-05-21 18:07:00 +01:00
Myles
ecc1cce033
Merge pull request #1348 from KennyTV/master
Fix suffocation damage for 1.14+ players in hitbox patch
2019-05-21 18:06:20 +01:00
KennyTV
10d8ce86b3 Use weakhashmap 2019-05-21 19:02:03 +02:00
KennyTV
5cc421cff9 Don't cancel normal suffocation 2019-05-20 10:30:42 +02:00
KennyTV
ca1ba4f422 Fix suffocation damage for 1.14+ players in hitbox patch 2019-05-19 23:28:05 +02:00
Myles
a2d9489ad5
Merge pull request #1344 from astei/dont-send-empty-register
Don't try to send register messages without channels
2019-05-17 23:08:43 +01:00
Andrew Steinborn
232ee9b63b Don't try to send register messages without channels
Bukkit interprets this as attempting to register the channel "" (the
empty string), which fails on Minecraft 1.13 and above.
2019-05-17 18:01:58 -04:00
Myles
7861c76730
Merge pull request #1342 from KennyTV/dev
1.14.2-pre2
2019-05-17 14:24:15 +01:00
KennyTV
d7aa23681b 1.14.2-pre2 2019-05-17 15:15:21 +02:00
Myles
b75016a186 Merge branch 'master' into dev 2019-05-17 11:59:59 +01:00
Myles
6882b7074c Fix #1333 pandas missing 2019-05-17 11:59:46 +01:00
Myles
83bca3c23f
Merge pull request #1341 from Gerrygames/1.14.2
1.14.2-pre1
2019-05-16 18:26:55 +01:00
Gerrygames
a075e31a4e 1.14.2-pre1 2019-05-16 19:21:26 +02:00
Myles
cb857d828f
Merge pull request #1340 from KennyTV/master
Support latest Velocity changes
2019-05-15 22:23:37 +01:00
KennyTV
440d469fa2 Update to latest Velocity build 2019-05-15 23:16:01 +02:00
Myles
56a34ec2f8 Update to 2.1.0 2019-05-13 13:15:14 +01:00
Myles
362962dfb3
Merge pull request #1332 from Gerrygames/1.14.1
1.14.1
2019-05-13 13:10:48 +01:00
Gerrygames
77d572190e 1.14.1 2019-05-13 14:00:37 +02:00
Myles
1d0d032431 Merge branch 'master' into dev 2019-05-12 13:01:08 +01:00
Myles
fac7dafca5 Use fixed locale for toUpperCase/toLower #1126 2019-05-12 13:00:14 +01:00
Myles
fbebf2d75e
Merge pull request #1321 from creeper123123321/master
Not tested workaround for #1312
2019-05-10 22:57:22 +01:00
creeper123123321
a51f347371
Use readableBytes 2019-05-10 16:02:17 -03:00
Myles
6cee137780
Merge pull request #1325 from Gerrygames/1.14.1
1.14.1-pre2
2019-05-09 17:33:24 +01:00
Gerrygames
56b48a803a 1.14.1-pre2 2019-05-09 18:32:53 +02:00
Myles
3318d682fd
Merge pull request #1324 from Gerrygames/1.14.1
1.14-pre2
2019-05-09 16:28:23 +01:00
Gerrygames
1fe3c337e1 1.14-pre2 2019-05-09 17:26:56 +02:00
creeper123123321
4d16dbf76f
Not tested workaround for #1312 2019-05-08 20:38:55 -03:00
Myles
ab9c0434e1
Merge pull request #1320 from Gerrygames/1.14.1
1.14.1
2019-05-07 17:23:20 +01:00
Gerrygames
3b932bd6b3 1.14.1 pre1 2019-05-07 18:19:34 +02:00
Myles
256839765a
Merge pull request #1319 from KennyTV/master
Update text usage for latest Velocity build
2019-05-07 11:03:35 +01:00
KennyTV
46f9967dba Update text usage for latest Velocity build 2019-05-07 11:48:57 +02:00
Myles
d91d47a755
Merge pull request #1317 from creeper123123321/master
Register tabcompletethread once - fixes #1316
2019-05-05 19:25:29 +01:00
creeper123123321
5a2c047e7a
Register tabcompletethread once - fixes #1316 2019-05-05 14:16:24 -03:00
Myles
5ca8b0aef8
Merge pull request #1315 from creeper123123321/master
Add some needed tags
2019-05-01 22:11:13 +01:00
creeper123123321
e249ea1f0a
fix tag ids - not tested 2019-05-01 16:54:09 -03:00
creeper123123321
e1b06d3872
Add some needed tags 2019-05-01 16:37:17 -03:00
Myles
a4ed1644f3
Merge pull request #1314 from creeper123123321/master
Send set view distance on server change - not tested
2019-05-01 17:01:39 +01:00
creeper123123321
ad12866bf4
Send set view distance on server change - not tested 2019-05-01 12:52:53 -03:00
Myles
b04acf98c7
Merge pull request #1313 from creeper123123321/master
Send light update before chunk packet, maybe better ByteBuf releasing…
2019-05-01 15:34:38 +01:00