Commit Graph

240 Commits

Author SHA1 Message Date
ForceUpdate1
c9eee58a80
Merge pull request #4 from ViaVersion/dev
Dev
2019-05-15 13:24:07 +02:00
Myles
2584d2934d Merge branch 'master' into dev 2019-05-12 16:08:39 +01:00
Myles
271079370d
Merge pull request #108 from creeper123123321/patch-1
Stop shading guava
2019-05-12 16:08:20 +01:00
creeper123123321
15324dd149
Stop shading guava 2019-05-12 11:35:28 -03:00
Myles
6072b9a74e
Merge pull request #107 from Gerrygames/1.13
Fix map packet
2019-05-07 12:22:06 +01:00
Gerrygames
9441a1e49e fix map packet 2019-05-07 13:13:15 +02:00
Myles
aaaa396f2c
Merge pull request #106 from Gerrygames/fix_jukebox
Fix play record rewrites
2019-05-01 22:20:58 +01:00
Marco Neuhaus
da67500eaa fix play record rewrites 2019-05-01 14:46:06 +02:00
Myles
adc8c56862 Merge branch 'master' into dev 2019-04-23 15:50:05 +01:00
Myles
cec91ee159 Fix compiling 2019-04-23 15:49:38 +01:00
Myles
4e36ac59b0 Merge branch 'master' into dev 2019-04-23 13:04:23 +01:00
Myles
608df43225 Use ViaVersion libraries 2019-04-23 13:04:03 +01:00
Myles
cc68a6fa4c Merge branch 'master' into dev 2019-04-21 12:13:23 +01:00
Myles
6877304de1
Merge pull request #104 from creeper123123321/master
Set item to null when shift clicking
2019-04-20 23:24:02 +01:00
creeper123123321
bb2e089f27
Set item to null when shift clicking 2019-04-20 18:33:29 -03:00
Myles
2d0db67a29 Merge branch 'master' into dev 2019-04-19 16:29:57 +01:00
Myles
44d71ec538
Merge pull request #97 from creeper123123321/master
Workaround for #48
2019-04-19 11:40:49 +01:00
Myles
86c1a035f6
Merge pull request #102 from creeper123123321/dev
1.13: Fix sound underflow + tag name conflict + when rewriting of item nbt should occur
2019-04-11 15:39:16 +01:00
creeper123123321
77efe57015
fix tag name conflict 2019-03-30 16:33:02 -03:00
creeper123123321
6f20b874c5
fix possible array out of bounds 2019-03-30 15:08:31 -03:00
creeper123123321
1f3ed39eb6
fix toServer 2019-03-30 14:39:45 -03:00
Matsv
6c49c0b2d3 Fix paintings 2019-03-16 16:43:46 +01:00
Matsv
68aae77877 🐛 Fix recipe book crash 2019-03-16 16:15:49 +01:00
Matsv
6fb9f9adf3 🆘 Hacky way to fix flower pots 2019-03-16 16:03:32 +01:00
Matsv
0497ce198d 🔧 Start working on flower pot special treatment 2019-03-16 15:11:23 +01:00
Matsv
092057431c 🚀 Bump version for the development branch 2019-03-16 13:00:19 +01:00
Matsv
1130ba6e87 Merge branch 'master' of https://github.com/Matsv/ViaBackwards into dev 2019-03-16 12:04:21 +01:00
creeper123123321
a352822afa
shorter workaround 2019-03-07 14:56:00 -03:00
creeper123123321
ce63e5ee62
Revert "Workaround for #48"
This reverts commit df53ce3e1c.
2019-03-07 14:49:54 -03:00
creeper123123321
df53ce3e1c
Workaround for #48 2019-03-07 14:38:19 -03:00
Myles
414fdac20a
Merge pull request #96 from Gerrygames/1.13_items
add missing wood rewrites
2019-02-19 19:32:51 +00:00
Marco Neuhaus
d6c37db4eb add missing wood rewrites 2019-02-18 21:56:38 +01:00
Myles
0c94a85dcc
Merge pull request #95 from creeper123123321/master
Do not register new incoming packets
2019-02-16 13:30:05 +00:00
creeper123123321
0fe233c7ed
Do not register new incoming packets 2019-02-16 11:21:53 -02:00
Mats
b1246b6ffc
Merge pull request #94 from Gerrygames/1.13_items
add dummy enchantment for 1.13 enchatments
2019-02-16 10:02:26 +01:00
Mats
1c04ec7c55
Merge pull request #92 from creeper123123321/dev
Better tab-complete
2019-02-16 10:01:44 +01:00
Marco Neuhaus
e35f264e89 Merge branch 'dev' of https://github.com/Matsv/ViaBackwards into 1.13_items
# Conflicts:
#	core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/packets/BlockItemPackets1_13.java
2019-02-16 00:07:36 +01:00
Marco Neuhaus
02bdaa5ddb Merge branch 'dev' of https://github.com/Gerrygames/ViaBackwards into 1.13_items 2019-02-16 00:03:58 +01:00
Marco Neuhaus
cd230b601d add dummy enchantments for 1.13 enchatments 2019-02-16 00:00:05 +01:00
Myles
4574d9d9b8
Merge pull request #93 from Gerrygames/1.13_items
fix enchantments
2019-02-15 22:15:44 +00:00
Marco Neuhaus
934bd4d1db fix enchantments 2019-02-15 23:12:11 +01:00
creeper123123321
66336bca0f
ooops 2019-02-15 18:30:48 -02:00
creeper123123321
829857be7c
Use boolean + string 2019-02-15 18:24:42 -02:00
creeper123123321
6e5f9e0741
Better tab-complete 2019-02-15 18:03:06 -02:00
Mats
19d2c8fcb9
Merge pull request #91 from creeper123123321/dev
Login plugin request and response
2019-02-03 13:54:59 +01:00
creeper123123321
9e12a199cf
Login plugin request and response 2019-02-02 17:19:30 -02:00
Mats
c310290bbc
Merge pull request #90 from Gerrygames/1.13
fix ConcurrentModificationException
2019-01-30 22:19:01 +01:00
Gerrygames
ff68a5182a fix ConcurrentModificationException 2019-01-28 14:45:52 +01:00
Matsv
9b7a4b79f7 📎 Rename 1.13.2 classes 2019-01-27 14:25:27 +01:00
Matsv
58b8f4004b 📎 Rename 1.13.1 classes 2019-01-27 14:16:05 +01:00