Myles
|
9a0cc02b86
|
Merge branch 'master' into dev
|
2020-01-14 19:14:38 +00:00 |
|
Myles
|
5fb86d8df3
|
*sobs*
|
2020-01-14 19:14:18 +00:00 |
|
Myles
|
c64c27331a
|
Merge branch 'master' into dev
|
2020-01-14 19:12:55 +00:00 |
|
Myles
|
cd2ca76236
|
Merge branch 'master' into abstraction
|
2020-01-14 19:12:42 +00:00 |
|
Myles
|
9598e0e4f8
|
Update authors
|
2020-01-14 19:12:24 +00:00 |
|
Myles
|
d29c2bdfb7
|
Merge pull request #1627 from KennyTV/master
Fix heightmaps
|
2020-01-14 18:24:51 +00:00 |
|
KennyTV
|
538b467fa6
|
Fix heightmaps
|
2020-01-14 19:18:02 +01:00 |
|
Myles
|
7deca33374
|
Merge pull request #1626 from Gerrygames/dev
1.15.2-pre1 + merge master
|
2020-01-14 17:07:19 +00:00 |
|
Gerrygames
|
c704813a6c
|
1.15.2-pre1
|
2020-01-14 17:51:39 +01:00 |
|
Myles
|
86af7f054a
|
Merge pull request #1601 from KennyTV/abstraction
Cleanup some block rewrite methods
|
2020-01-06 14:56:17 +00:00 |
|
Myles
|
a6932bb71f
|
Merge pull request #1617 from KennyTV/channelnames
Make plugin channel mappings modifiable
|
2020-01-06 14:55:38 +00:00 |
|
KennyTV
|
3384b6bc17
|
Only load mappings file from dir if manually copied
|
2020-01-06 10:52:42 +01:00 |
|
KennyTV
|
4bdb566fb5
|
Kept the wrong defaults
|
2020-01-05 21:23:40 +01:00 |
|
KennyTV
|
5ad62a03ed
|
Make plugin channel mappings modifiable
|
2020-01-05 21:21:58 +01:00 |
|
KennyTV
|
280b6fae2a
|
Merge master
|
2019-12-21 19:49:18 +01:00 |
|
Myles
|
e07c994ddc
|
Merge pull request #1599 from KennyTV/master
Fix Bungee injection on Java 12+
|
2019-12-21 07:18:23 +00:00 |
|
KennyTV
|
5d974858fe
|
Some more cleanup
|
2019-12-20 17:53:14 +01:00 |
|
KennyTV
|
5cb5992d44
|
Fix Bungee injection on Java 12+
Fixes #1512
|
2019-12-20 16:35:10 +01:00 |
|
KennyTV
|
fddbeda81e
|
Back to snapshot
|
2019-12-20 16:29:10 +01:00 |
|
KennyTV
|
1c1ec10a0a
|
Common methods for block rewriting
|
2019-12-17 18:29:38 +01:00 |
|
Myles
|
cd9566fbc8
|
1.15.1 support
|
2019-12-17 15:28:43 +00:00 |
|
KennyTV
|
90b88f3cbf
|
Update readme
|
2019-12-17 15:03:06 +01:00 |
|
Myles
|
faf86b2439
|
Merge pull request #1590 from KennyTV/dev
1.15.1
|
2019-12-17 13:59:06 +00:00 |
|
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 |
|