3
0
Mirror von https://github.com/ViaVersion/ViaVersion.git synchronisiert 2024-09-20 19:10:04 +02:00
Commit graph

116 Commits

Autor SHA1 Nachricht Datum
creeper123123321
bd0ce3dd71 merge dev 2019-11-15 11:35:35 -03:00
Gerrygames
d16a760466 19w45a 2019-11-07 18:42:05 +01:00
creeper123123321
fd065fb7c5
merge dev 2019-10-30 14:24:22 -03:00
Gerrygames
12279731ad 19w44a 2019-10-30 17:14:00 +01:00
Gerrygames
3ffc55b539 19w41a 2019-10-09 18:06:37 +02:00
KennyTV
a9c49d948a Merge remote-tracking branch 'upstream/master' into dev
# Conflicts:
#	bukkit/src/main/java/us/myles/ViaVersion/bukkit/platform/BukkitViaConfig.java
#	bungee/src/main/java/us/myles/ViaVersion/bungee/platform/BungeeViaConfig.java
#	common/src/main/java/us/myles/ViaVersion/api/ViaVersionConfig.java
#	common/src/main/resources/assets/viaversion/config.yml
#	sponge/src/main/java/us/myles/ViaVersion/sponge/platform/SpongeViaConfig.java
#	velocity/src/main/java/us/myles/ViaVersion/velocity/platform/VelocityViaConfig.java
2019-10-02 16:21:37 +02:00
KennyTV
7ba2630dd2 Finish merge 2019-10-02 09:37:18 +02:00
KennyTV
bbeabd20b8 Merge remote-tracking branch 'upstream/master' into abstraction
# Conflicts:
#	bukkit/src/main/java/us/myles/ViaVersion/bukkit/platform/BukkitViaConfig.java
#	bungee/src/main/java/us/myles/ViaVersion/bungee/platform/BungeeViaConfig.java
#	common/src/main/java/us/myles/ViaVersion/api/ViaVersionConfig.java
#	common/src/main/java/us/myles/ViaVersion/protocols/protocol1_13to1_12_2/packets/InventoryPackets.java
#	common/src/main/java/us/myles/ViaVersion/protocols/protocol1_14_1to1_14/Protocol1_14_1To1_14.java
#	common/src/main/java/us/myles/ViaVersion/protocols/protocol1_14_1to1_14/packets/EntityPackets.java
#	common/src/main/java/us/myles/ViaVersion/protocols/protocol1_14to1_13_2/MetadataRewriter.java
#	common/src/main/java/us/myles/ViaVersion/protocols/protocol1_14to1_13_2/data/MappingData.java
#	common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/packets/EntityPackets.java
#	common/src/main/resources/assets/viaversion/config.yml
#	velocity/src/main/java/us/myles/ViaVersion/velocity/platform/VelocityViaConfig.java
2019-10-02 09:31:42 +02:00
Lukas
7e008226ec Fix 1.14+ walk animation (#1469)
* Do not send NaN health metadata to 1.14+ clients
* Added config option 'fix-1_14-health-nan'
2019-10-01 09:04:58 +01:00
Nassim
9408946b36 Merge master into abstraction (#1457) 2019-09-19 10:22:06 +01:00
Nassim
cad6e7604d Merge dev, update 1.15 to abstraction, reduce helper mapping (#1456) 2019-09-19 09:27:48 +01:00
Gerrygames
e452289603 19w38b, fix bell remap (#1455)
* 19w38a, fix bell remap

* 19w38b
2019-09-18 17:32:13 +01:00
Nassim
5eb3771704 Fix no light for non full blocks (#1414) 2019-09-09 13:02:30 +01:00
BlackBeltPanda
9fd4795cb3 Update mapping-lang-1.12-1.13.json (#1439)
Fixes Tool Smith and Weapon Smith Villager names
2019-09-08 16:01:35 +01:00
Gerrygames
23eadaeaee 19w36a (#1435) 2019-09-04 16:49:27 +01:00
KennyTV
f35eb3054c Finish 19w35a 2019-08-29 19:56:30 +02:00
KennyTV
6f19d2d6d1 Start working on 19w34a 2019-08-23 21:15:38 +02:00
KennyTV
ac1943758d Remove unnecessary heightmap entries 2019-04-25 12:11:14 +02:00
Gerrygames
53a639e7ae 1.14 heightmap 2019-04-24 18:40:03 +02:00
Myles
d3662d226b Merge branch 'master' into dev 2019-04-22 18:56:29 +01:00
Myles
d699000dc3 Default to 'packet' blockconnection method 2019-04-22 18:56:05 +01:00
KennyTV
e38bdffc84 Hitbox fix options 2019-04-22 14:38:22 +02:00
Myles
421a5e8141 Merge branch 'master' into dev 2019-04-06 13:31:44 +01:00
Myles
9fe19e763a Update GitHub + chat links 2019-04-06 13:31:33 +01:00
Myles
aecf9fb9b1
Merge pull request #1236 from ViaVersion/master
merge master into dev
2019-03-30 18:23:09 +00:00
creeper123123321
6751acb6c4
Generated mappings for 13b 2019-03-30 10:00:54 -03:00
Gerrygames
65f60098c8 19w13a 2019-03-27 19:08:53 +01:00
creeper123123321
c5e0fcae9a
convert numerical ids to string ids on canplaceon/candestroy 2019-03-21 17:48:14 -03:00
Gerrygames
e0b88b750d 19w12a 2019-03-20 14:27:28 +01:00
Myles
32a2734082 Merge branch 'master' into dev 2019-03-17 16:10:38 +00:00
Gerrygames
f9d957a827 19w11a 2019-03-13 17:53:17 +01:00
creeper123123321
12b45d95e0
Trying to fix main hand on bungee, handle left handed on 1.8 using 0x80 2019-03-05 19:47:58 -03:00
KennyTV
9d0331e190 Add option to truncate edited books with more than 50 pages 2019-03-04 10:14:52 +01:00
Gerrygames
31550bd010 19w09a 2019-02-27 17:03:38 +01:00
Gerrygames
3de06c269d 19w08a 2019-02-20 18:01:21 +01:00
Gerrygames
d1007bbb38 19w07a 2019-02-13 17:50:07 +01:00
Myles
1be617c110 Merge branch 'master' into dev 2019-02-10 16:45:34 +00:00
Myles
f1743e5912
Merge pull request #1186 from creeper123123321/tabdelay
Tab delaying
2019-02-10 16:42:05 +00:00
creeper123123321
bce3593110
Tab delaying
(cherry picked from commit 386de52b9db1454e0fcec56ef9bfcd2c3a0f8d4a)
2019-02-06 18:53:24 -02:00
Gerrygames
8c543ee97f 19w06a 2019-02-06 17:56:19 +01:00
KennyTV
bafa6edd28 Fix some stair and lever connections 2019-02-03 00:22:49 +01:00
Gerrygames
91d9f99c70 19w05a 2019-01-30 17:16:06 +01:00
Gerrygames
b7f72bf55d 19w04a 2019-01-24 16:56:59 +01:00
KennyTV
880df7a482 Remove unmapped blockconnection data 2019-01-19 19:17:55 +01:00
Gerrygames
17c5849f33 fix powered levers 2019-01-18 18:45:05 +01:00
Gerrygames
ff0ec98a27 fix the fix for stone slab mapping 2019-01-18 17:29:48 +01:00
Gerrygames
553e56fe4c fix stone slab mapping 2019-01-18 17:18:17 +01:00
Gerrygames
f6932e09f7 fix lever mapping 2019-01-18 14:07:27 +01:00
Gerrygames
7102214c9e 19w03a 2019-01-16 18:44:37 +01:00
Myles
77a57d2243 Merge branch 'master' into dev 2019-01-12 17:42:47 +00:00