Commit Graph

1406 Commits

Author SHA1 Message Date
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
Matsv
8477e20725 ♻ Rewrite Entity 1.13.1 the ViaBackwards way & remove incorrect metadata & 1.13 rewrite 2019-01-27 14:06:48 +01:00
Matsv
99ffbc1bfa 🔥 Merge branch 'master' of https://github.com/Matsv/ViaBackwards into dev
# Conflicts:
#	core/src/main/java/nl/matsv/viabackwards/api/ViaBackwardsPlatform.java
2019-01-27 13:06:09 +01:00
Matsv
29f1f3ea7c Reformat code 2019-01-27 13:01:24 +01:00
Mats
ce93f48a55
Merge pull request #75 from creeper123123321/master
Velocity and maybe better version detector
2019-01-27 12:58:45 +01:00
Mats
bf7ea31d35
Merge pull request #89 from Gerrygames/dev
remap trading gui 1.13.1 to 1.13
2019-01-27 12:58:08 +01:00
Mats
0965acafd7
Merge pull request #88 from Gerrygames/1.13_items
Add remap for 1.13 Items
2019-01-27 12:57:27 +01:00
Marco Neuhaus
2d53b812ea remove debug messages and fix enchantment rewrite 2019-01-27 12:40:58 +01:00
Gerrygames
316ae1020e remap trading gui 1.131 to 1.13 2019-01-26 19:25:24 +01:00
Marco Neuhaus
b15c55fb28 fix rewrite and add pumpkin rewrite 2019-01-26 16:51:39 +01:00
Marco Neuhaus
c0dbda5882 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/PlayerPacket1_13.java
2019-01-26 16:47:58 +01:00
creeper123123321
9ee8e6efa7
Velocity and maybe better version detector 2019-01-26 11:48:28 -02:00
Matsv
f9e2a37816 Merge with masta 2019-01-26 12:29:55 +01:00
Matsv
ec33f48674 Merge with masta 2019-01-26 12:23:18 +01:00
Marco Neuhaus
847a54493a add more rewirtes 2019-01-23 20:49:49 +01:00
Foorcee
0d0334a963 add more 2019-01-23 17:37:59 +01:00
Foorcee
16514526c1 add some more items rewrites 2019-01-23 17:28:53 +01:00
Marco Neuhaus
ef5125e972 fix rewrite 2019-01-23 15:02:55 +01:00
Myles
5aaa352705
Merge pull request #86 from Gerrygames/master
fix package name
2019-01-23 13:39:50 +00:00
Myles
15db59f439
Merge pull request #84 from Gerrygames/removeUnusedColor
remove unused colors from team prefix/suffix
2019-01-23 13:39:20 +00:00
Gerrygames
8448b9628e replace tabs 2019-01-23 14:37:07 +01:00
Marco Neuhaus
55b4f6c080 fix rewrite 2019-01-23 13:31:05 +01:00
Marco Neuhaus
53b4151a26 start implementing item rewrite 2019-01-23 13:11:52 +01:00
Marco Neuhaus
e6b438a9e0 Merge remote-tracking branch 'remotes/origin/removeUnusedColor' into 1.13_items 2019-01-23 12:26:38 +01:00
Gerrygames
2f1c54ca93 fix package name 2019-01-23 11:15:26 +01:00
Myles
f05bbbc2a1
Merge pull request #83 from Gerrygames/1.13
fix tab complete
2019-01-22 22:54:29 +00:00
Gerrygames
42bfe19c9c block action block ids 2019-01-22 22:37:24 +01:00
Gerrygames
22a486752b remove sysout 2019-01-22 21:49:17 +01:00
Gerrygames
8519ad8cf1 fix actionbar color 2019-01-22 21:41:49 +01:00
Gerrygames
7b9cde9946 fix wrong protocol 2019-01-22 21:25:53 +01:00
Gerrygames
c539cc6e57 fix NPE 2019-01-22 20:59:00 +01:00
Gerrygames
3fc55638f9 fix NPE 2019-01-22 20:33:39 +01:00
Gerrygames
e5a110f24f fix mapping issue 2019-01-22 15:42:09 +01:00
Gerrygames
ccf132ff50 remove unused colors from team prefix/suffix 2019-01-22 14:41:50 +01:00
Gerrygames
4f9334c1dd fix tab complete 2019-01-22 13:58:06 +01:00
Matsv
905cd9cf0d Merge branch 'master' of https://github.com/Matsv/ViaBackwards into dev 2019-01-21 22:23:43 +01:00