Commit Graph

2288 Commits

Author SHA1 Message Date
KennyTV
5a1dadf476 1.15.1 2019-12-17 14:54:51 +01:00
Myles
6eabb17f67 Merge from master 2019-12-15 09:16:53 +00:00
Myles
4f72edeaee Merge branch 'master' into dev 2019-12-15 09:02:48 +00:00
Myles
b0f3d04439 Merge branch 'master' of https://github.com/ViaVersion/ViaVersion 2019-12-15 09:02:03 +00:00
Myles
33a34fc149 Update README with new table 2019-12-15 09:01:49 +00:00
Myles
679f573444
Merge pull request #1587 from robinbraemer/patch-1
fix typo
2019-12-15 09:00:37 +00:00
Robin Brämer
f35b931004
fix typo 2019-12-14 22:01:50 +01:00
Myles
7ca50291e3
Merge pull request #1585 from KennyTV/master
Fix book edit
2019-12-14 16:34:57 +00:00
KennyTV
9c8a8e2e9c Fix book edit 2019-12-14 16:22:24 +01:00
Myles
d45a370a4d
Merge pull request #1527 from creeper123123321/primitive_types
Use primitive types in Position and BlockFace, remove world block con…
2019-12-13 12:48:36 +00:00
Myles
d5907711e1
Merge pull request #1576 from astei/remove-unneeded-indirection
Remove unneeded indirection
2019-12-13 08:30:22 +00:00
Andrew Steinborn
437463f1b4 Revert "Remove indirection in byte array writing"
This reverts commit ba08c3ad2f.

Breaks the API that ViaRewind and ViaBackwards depend on.
2019-12-12 20:45:03 -05:00
creeper123123321
d6b52bcc54 Merge remote-tracking branch 'upstream/abstraction' into primitive_types 2019-12-12 15:23:32 -03:00
Myles
3738459fa6
Merge pull request #1580 from KennyTV/dev
1.15.1-pre1
2019-12-12 15:35:36 +00:00
KennyTV
be4d071250 1.15.1-pre1 2019-12-12 16:32:53 +01:00
Myles
91a2aa6781
Merge pull request #1575 from KennyTV/master
Fix biomedata on some custom Spigot versions
2019-12-12 09:33:20 +00:00
Andrew Steinborn
ba08c3ad2f Remove indirection in byte array writing
This saves us from the cost of (un)boxing bytes on the fly.
2019-12-12 00:02:09 -05:00
Andrew Steinborn
220c45b800 Remove indirection in StringType decoding 2019-12-11 23:55:44 -05:00
Andrew Steinborn
a42e724f50 Remove unneeded indirection in NBTType
ByteBufInputStream implements DataInput, ByteBufOutputStream implements DataOutput. Use them to exploit native Netty ByteBuf calls where possible.
2019-12-11 23:51:39 -05:00
KennyTV
1002ca4016 Fix biomedata on some custom Spigot versions 2019-12-11 20:36:49 +01:00
Myles
c1b11a55d5 Back to SNAPSHOT 2019-12-11 11:16:05 +00:00
Myles
a21a2079c6 2.2.1 2019-12-11 11:12:22 +00:00
Myles
07d219c77b
Merge pull request #1569 from KennyTV/master
Ignore unneeded sound warnings
2019-12-11 11:10:01 +00:00
KennyTV
b7b8bdc841 Ignore unneeded sound warnings 2019-12-11 12:07:22 +01:00
Myles
dd5c1bb1a4
Merge pull request #1568 from KennyTV/abstraction
Merge master into abstraction
2019-12-11 09:11:56 +00:00
KennyTV
5f46dcbab0 Merge remote-tracking branch 'upstream/master' into abstraction
# Conflicts:
#	bukkit/pom.xml
#	bungee/pom.xml
#	common/pom.xml
#	common/src/main/java/us/myles/ViaVersion/protocols/protocol1_13to1_12_2/providers/blockentities/FlowerPotHandler.java
#	common/src/main/java/us/myles/ViaVersion/protocols/protocol1_15to1_14_4/packets/EntityPackets.java
#	jar/pom.xml
#	pom.xml
#	sponge-legacy/pom.xml
#	sponge/pom.xml
#	velocity/pom.xml
2019-12-11 09:53:09 +01:00
Myles
66b9bfbbd5
Merge pull request #1567 from KennyTV/master
Fix acknowledge digging
2019-12-11 08:36:18 +00:00
KennyTV
dfbe2e9739 Fix acknowledge digging
Fixes #1564
2019-12-11 09:30:51 +01:00
Myles
3d10c56aac
Merge pull request #1565 from Gerrygames/master
fix entity metadata in spawn packet being ignored
2019-12-11 08:18:23 +00:00
Gerrygames
84624a4884 fix entity metadata in spawn packet being ignored 2019-12-11 02:10:16 +01:00
Myles
68ac978d45 Back to SNAPSHOT 2019-12-10 15:34:42 +00:00
Myles
8136eb15e1 Merge 1.15 support 2019-12-10 15:31:07 +00:00
Myles
2c95a1e71c README 2019-12-10 15:29:52 +00:00
Myles
c85d4224ad 1.15 protocol + 2.2.0 2019-12-10 15:29:26 +00:00
Myles
a74bee5bed
Merge pull request #1562 from KennyTV/dev
Fix trade list
2019-12-09 18:30:46 +00:00
KennyTV
9dae40f455 Fix trade list 2019-12-09 19:30:09 +01:00
Myles
fe7a5a2ae5
Merge pull request #1561 from Gerrygames/dev
fix wrong import - #1560
2019-12-09 18:26:05 +00:00
Gerrygames
44a3108982 fix wrong import - #1560 2019-12-09 19:24:18 +01:00
Myles
c0beee9189
Merge pull request #1559 from Gerrygames/dev
1.15-pre7
2019-12-09 12:49:47 +00:00
Gerrygames
ea045e6c34 1.15-pre7 2019-12-09 13:48:06 +01:00
Myles
7c38a77f60
Merge pull request #1558 from Gerrygames/abstraction
Merge dev into abstraction
2019-12-09 11:11:15 +00:00
Gerrygames
9174ad854c Merge branch 'dev' into abstraction
# Conflicts:
#	bukkit/pom.xml
#	bungee/pom.xml
#	common/pom.xml
#	common/src/main/java/us/myles/ViaVersion/protocols/protocol1_15to1_14_4/Protocol1_15To1_14_4.java
#	common/src/main/java/us/myles/ViaVersion/protocols/protocol1_15to1_14_4/packets/EntityPackets.java
#	common/src/main/java/us/myles/ViaVersion/protocols/protocol1_15to1_14_4/types/Chunk1_15Type.java
#	jar/pom.xml
#	pom.xml
#	sponge-legacy/pom.xml
#	sponge/pom.xml
#	velocity/pom.xml
2019-12-09 11:52:23 +01:00
Myles
2960f2a3bb
Merge pull request #1557 from Gerrygames/dev
Fix 1.15 entity type ids
2019-12-09 10:46:13 +00:00
Gerrygames
cfe073cd20 fix 1.15 entity type ids 2019-12-09 11:34:00 +01:00
Myles
459871257e
Merge pull request #1528 from KennyTV/abstraction
Hold config values in fields, add extra mappings constructor, other fixes
2019-12-08 23:08:52 +00:00
Myles
4bb4b96a10
Merge pull request #1548 from KennyTV/dev
Convert biome data to 1.15 format
2019-12-07 10:35:44 +00:00
KennyTV
68a18df969 Take biome data from same indexes as Mojang ("middle" of 4x4x4 areas) 2019-12-07 11:31:00 +01:00
Myles
8c921f427c
Merge pull request #1554 from KennyTV/pre6
1.15-pre6
2019-12-07 09:07:40 +00:00
KennyTV
90e1d7236e 1.15-pre6 2019-12-07 10:05:29 +01:00
KennyTV
decb20d2d1 Convert biome data to 1.15 format 2019-12-07 10:02:11 +01:00