Upstream/ViaVersion
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaVersion.git synced 2024-11-23 10:35:12 +01:00
Code Issues Projects Releases Wiki Activity
2,348 Commits 9 Branches 107 Tags 28 MiB
70e142e4c4
Commit Graph

2348 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Myles
ff7cb4bbbe
Merge pull request #1552 from Gerrygames/dev 
1.15-pre5
 2019-12-05 14:08:47 +00:00
Gerrygames
a68fca9dda 1.15-pre5 2019-12-05 15:03:45 +01:00
Myles
944bfe2b06
Merge pull request #1549 from Gerrygames/dev 
1.15-pre4
 2019-12-03 13:25:26 +00:00
Gerrygames
762151f067 1.15-rep4 2019-12-03 14:22:54 +01:00
Myles
0327b66a1d
Merge pull request #1543 from KennyTV/dev 
Fix blaze remap and entity destroy in 1.15
 2019-11-30 18:32:05 +00:00
KennyTV
2c95229cfc Fix blaze remap and entity destroy in 1.15 
Fixes #1542
 2019-11-30 19:22:36 +01:00
Myles
18fa4062e6
Merge pull request #1537 from KennyTV/dev 
1.15-pre3
 2019-11-28 20:58:56 +00:00
KennyTV
5c7520f552 1.15-pre3 2019-11-28 20:10:19 +01:00
creeper123123321
875d2392b5 Fix position shifting, fix two layers of item copy 2019-11-27 16:39:06 -03:00
KennyTV
a68eac7cd2 Add set cooldown register in ItemRewriter 2019-11-27 12:56:20 +01:00
KennyTV
42efec6e2b Add version to entity type warning 2019-11-27 00:55:33 +01:00
KennyTV
bcb953a45a Fix 1.15 chunk read 2019-11-27 00:08:28 +01:00
KennyTV
bca5b43a2a Fix entity type 2019-11-26 23:59:23 +01:00
KennyTV
da704539f0 Rename suppress-warning config option 2019-11-26 20:14:56 +01:00
KennyTV
bd9a1dda88 Fix last config issues 2019-11-26 18:22:33 +01:00
KennyTV
915258169e Fix inverted array read check 2019-11-26 13:51:37 +01:00
KennyTV
1b207251e8 Add extra mappings constructor for VB 2019-11-25 22:41:59 +01:00
Myles
b7a0829e76
Merge pull request #1534 from KennyTV/dev 
1.15-pre2
 2019-11-25 20:52:28 +00:00
KennyTV
48feee2bfc Destroy 1.15 entities 2019-11-25 20:40:03 +01:00
KennyTV
08e145f831 1.15-pre2 2019-11-25 19:37:02 +01:00
Myles
a44e28bbab
Merge pull request #1532 from creeper123123321/sendtrap 
Add exception for wrong protocol
 2019-11-25 18:19:58 +00:00
KennyTV
21cad97f3f Some fixes, move blockconnection method to bukkit config 2019-11-25 18:34:55 +01:00
creeper123123321
de97b5b15f
fix typo 2019-11-24 18:43:10 -03:00
creeper123123321
1e8d04a07d remove deprecated methods and constructor on item and position, inline some uses of position 2019-11-24 17:55:46 -03:00
creeper123123321
a8a33a3a2b add exception for wrong protocol 2019-11-24 09:04:37 -03:00
Myles
adafcda13d
Merge pull request #1531 from Gerrygames/dev 
Fix missing boss bar packet remap
 2019-11-24 10:57:59 +00:00
Gerrygames
c478492227 fix missing boss bar packet remap 2019-11-24 11:52:04 +01:00
Myles
07b11b4f4a
Merge pull request #1529 from creeper123123321/abstraction-update 
Merge dev
 2019-11-23 11:23:41 +00:00
creeper123123321
beed8437a4 merge dev 2019-11-23 07:23:20 -03:00
KennyTV
501adc503c Fix typo in simulatePlayerTick getter 2019-11-22 22:39:34 +01:00
KennyTV
907516eb71 Hold config values in fields 2019-11-22 22:00:41 +01:00
creeper123123321
9308fc7712 Fix wrong casting 2019-11-22 15:19:25 -03:00
creeper123123321
062d3759be Use primitive types in Position and BlockFace, remove world block connections on Sponge, clean code in 1.8 entity tracker, add constructor for cloning Item and Position 2019-11-22 15:13:41 -03:00
Myles
c699baaa41
Merge pull request #1526 from Gerrygames/dev 
1.15 pre1
 2019-11-22 11:49:28 +00:00
Gerrygames
582e4a11d4 1.15 pre1 2019-11-21 18:34:29 +01:00
Myles
285744a274
Merge pull request #1520 from creeper123123321/dev 
19w46b
 2019-11-20 12:59:16 +00:00
Myles
faaa252fa8
Merge pull request #1521 from creeper123123321/abstraction 
Merge dev into abstraction
 2019-11-20 12:58:53 +00:00
Myles
b01fd89373
Merge pull request #1510 from creeper123123321/flowerpotrewrite 
Pot handler rewrite
 2019-11-20 12:58:21 +00:00
Myles
ed5702188c
Merge pull request #1515 from ForceUpdate1/dev_particle_type 
Fix area effect cloud
 2019-11-20 12:12:43 +00:00
creeper123123321
f9165a1b64 fixed mappings 2019-11-15 12:30:47 -03:00