2006 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Myles	b7a0829e76	Merge pull request #1534 from KennyTV/dev ... 1.15-pre2	2019-11-25 20:52:28 +00: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
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	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	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	385a483a29	19w46b	2019-11-15 11:19:31 -03:00
Marco Neuhaus	3b97f843cd	relocate classes	2019-11-13 22:28:23 +01:00
Myles	3766da5a3a	Merge pull request #1518 from Gerrygames/dev ... 19w46a	2019-11-13 21:04:29 +00:00
Gerrygames	c3fa950a9f	19w46a	2019-11-13 17:27:51 +01:00
Myles	04e60d95e4	Merge pull request #1514 from KennyTV/dev ... 19w45b	2019-11-11 22:14:40 +00:00
Marco Neuhaus	000313ee9a	move particle type	2019-11-11 12:29:51 +01:00
Marco	dc54551d0c	fix area effect cloud ... add 1.14 particle type	2019-11-10 16:38:12 +01:00
KennyTV	b3dc05e5ce	19w45b	2019-11-08 14:26:20 +01:00
Myles	3c57127a6c	Merge pull request #1513 from Gerrygames/dev ... 19w45a	2019-11-07 19:06:15 +00:00
Gerrygames	d16a760466	19w45a	2019-11-07 18:42:05 +01:00
creeper123123321	3761ebf8c7	Pot handler rewrite	2019-11-04 17:36:16 -03:00
Myles	5ad2511e17	Merge pull request #1502 from ViaVersion/master ... Merge master into dev	2019-10-30 16:59:47 +00:00
Myles	8fe47391bf	Merge pull request #1501 from Gerrygames/dev ... 19w44a	2019-10-30 16:20:43 +00:00
Gerrygames	12279731ad	19w44a	2019-10-30 17:14:00 +01:00
Myles	f8b4a6e28a	Merge pull request #1496 from MrMicky-FR/master ... Fix item hover event on 1.12	2019-10-24 21:48:09 +01:00
MrMicky	ee54e153bf	Fix item hover event for 1.12 players	2019-10-23 16:11:14 +02:00
Myles	806312e248	Merge pull request #1487 from Gerrygames/dev ... 19w42a	2019-10-17 16:33:52 +01:00
Gerrygames	bd805bfdc4	19w42a	2019-10-16 18:07:58 +02:00
Myles	98a8f7f072	Merge pull request #1480 from MrMicky-FR/master ... Fix scoreboard colors on 1.13	2019-10-13 15:54:51 +01:00
Myles	d2ad3aea44	Merge pull request #1481 from Gerrygames/dev ... 19w41a	2019-10-10 11:13:10 +01:00
Gerrygames	3ffc55b539	19w41a	2019-10-09 18:06:37 +02:00
MrMicky	96c58e7b1c	Fix scoreboard colors on 1.13	2019-10-08 13:25:37 +02:00
Myles	232f2494e3	Merge pull request #1479 from KennyTV/dev ... Fix an error in the player spawn packet	2019-10-04 13:40:24 +01:00
KennyTV	626eb14960	Fix an error in the player spawn packet	2019-10-04 13:26:51 +02:00
Myles	10a2e6b959	Merge pull request #1478 from KennyTV/dev ... 19w40a, merge master	2019-10-02 15:23:37 +01: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	79a2304728	19w40a	2019-10-02 16:19:56 +02:00
Nassim	7e323bc497	Untrack entities in 1.14.1 protocol (#1474)	2019-10-01 21:07:42 +01:00