Commit Graph

2057 Commits

Author SHA1 Message Date
creeper123123321
aaba566b1e change version to 2.1.4-SNAPSHOT 2019-07-20 09:08:13 -03:00
Myles
7191dcaa15 Update README.md 2019-07-19 11:21:19 +01:00
Myles
437b16ccd5 Merge branch 'dev' 2019-07-19 11:20:24 +01:00
Myles
e4b0a99141
Merge pull request #1402 from KennyTV/1.14.4
1.14.4
2019-07-19 11:19:26 +01:00
Myles
3e5300f03c
Merge pull request #1401 from KennyTV/master
Fix 1.14 client lag on join
2019-07-19 11:14:23 +01:00
KennyTV
abb09153f0 1.14.4 2019-07-18 16:40:34 +02:00
KennyTV
05437a3e70 Fix 1.14 client lag on join 2019-07-16 20:44:56 +02:00
Myles
c697704d04
Merge pull request #1400 from KennyTV/dev
1.14.4-pre6 support
2019-07-15 14:36:31 +01:00
KennyTV
bc09187dc1 1.14.4-pre6 support 2019-07-15 14:58:55 +02:00
Myles
fd53881221
Merge pull request #1390 from KennyTV/dev
1.14.4-pre1 support
2019-07-03 20:46:35 +01:00
KennyTV
2024614b68 1.14.4-pre1 support 2019-07-03 19:36:30 +02:00
Myles
3521f9ac36 Merge branch 'master' into abstraction 2019-06-28 22:02:48 +01:00
Myles
d6973a301b Fix #1382 2019-06-28 22:01:46 +01:00
Myles
b675018acf
Merge pull request #1375 from KennyTV/master
Fix 1.13 clients unable to break infested blocks (#1370)
2019-06-24 20:37:08 +01:00
Myles
10984cbeb7 Merge branch 'master' into abstraction 2019-06-24 16:24:42 +01:00
Myles
bae0cd5e3e Back to snapshot 2019-06-24 16:23:35 +01:00
Myles
e4750249e9 1.14.3 support 2019-06-24 16:14:31 +01:00
KennyTV
662bae45b7 Fix 1.13 clients unable to break infested blocks (#1370) 2019-06-22 16:07:38 +02:00
Myles
c0e56c7c19 1.14.3 Pre-4 support 2019-06-19 23:11:54 +01:00
Myles
390653a9a6 Merge branch 'master' into abstraction 2019-06-19 09:42:01 +01:00
Myles
0cd04381a4 Merge branch 'master' into dev 2019-06-19 09:41:06 +01:00
Myles
dcefaa6b19
Merge pull request #1367 from Gerrygames/master
Fix 1.13 chunk reading, fix 1.9 chunk type not using global palette
2019-06-19 09:40:26 +01:00
Gerrygames
3063538ad0 fix 1.13 chunk reading, fix 1.9 chunk type not using global palette 2019-06-14 17:50:14 +02:00
Myles
604b694709
Merge pull request #1366 from KennyTV/dev
1.14.3 pre-3
2019-06-14 10:33:16 +01:00
KennyTV
1c9309ac98 1.14.3 pre-3 2019-06-14 11:17:38 +02:00
Myles
e7c89f28ba
Merge pull request #1363 from KennyTV/dev
1.14.3 pre-2
2019-06-07 13:41:30 +01:00
KennyTV
97a8f41e12 1.14.3 pre-2 2019-06-07 12:36:37 +02:00
Myles
be5bf7961e Merge branch 'master' into dev 2019-06-05 15:56:29 +01:00
Myles
318db58be1 Servers older than 1.13.2 have a length limit on plugin message name 2019-06-05 15:55:55 +01:00
Myles
0deed6e00d
Merge pull request #1359 from KennyTV/dev
1.14.3 pre-1
2019-06-03 21:01:57 +01:00
KennyTV
5ad9d51fb0 Set version to 2.1.2 2019-06-03 21:59:19 +02:00
KennyTV
907b5e020c Change new trade list boolean 2019-06-03 21:20:32 +02:00
KennyTV
a8d13fadb3 1.14.3 pre-1 2019-06-03 20:21:33 +02:00
Myles
0137105a6d Fix #1358 by checking for null before processing 2019-05-31 20:43:02 +01:00
Myles
5364d89ca8 Implement hashCode for version 2019-05-27 18:10:57 +01:00
Myles
744fa25349 Fix several NPE cases, apply final to relevant fields, remove unused code
The suggested changes were found with FindBugs, some of these bugs may be rare cases.
2019-05-27 17:50:08 +01:00
Myles
3027490256 Merge branch 'master' into abstraction 2019-05-27 17:29:04 +01:00
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