Commit Graph

1996 Commits

Author SHA1 Message Date
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
faaa252fa8
Merge pull request #1521 from creeper123123321/abstraction
Merge dev into abstraction
2019-11-20 12:58:53 +00:00
creeper123123321
f9165a1b64 fixed mappings 2019-11-15 12:30:47 -03:00
creeper123123321
bd0ce3dd71 merge dev 2019-11-15 11:35:35 -03:00
creeper123123321
385a483a29 19w46b 2019-11-15 11:19:31 -03: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
a114e56e06
Merge pull request #1499 from creeper123123321/abstraction
Add fabric metadata
2019-11-11 22:18:59 +00:00
Myles
04e60d95e4
Merge pull request #1514 from KennyTV/dev
19w45b
2019-11-11 22:14:40 +00: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
Myles
a7d78f7f69
Merge pull request #1503 from creeper123123321/abstraction-update
Abstraction update
2019-11-02 14:28:58 +00:00
Myles
f59c0722e0
Merge pull request #1507 from creeper123123321/primitivebytearray
primitive array types
2019-11-02 13:32:42 +00:00
creeper123123321
1735f48f23 primitive array types 2019-11-02 10:00:27 -03:00
creeper123123321
a280c1ad39
Add "install: true" in .travis.yml 2019-10-30 14:53:38 -03:00
creeper123123321
ce4ae73f55
forgotten merge conflict 2019-10-30 14:30:36 -03:00
creeper123123321
fd065fb7c5
merge dev 2019-10-30 14:24:22 -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
creeper123123321
a13c417352 add fabric metadata 2019-10-27 09:15:45 -03:00
Myles
a8d0a4dd14
Merge pull request #1491 from creeper123123321/abstraction
deduplicate minecraft compact array code/decode
2019-10-24 21:49:31 +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
Myles
85e048f22a
Merge pull request #1497 from KennyTV/abstraction
Bump version to 3.0.0-SNAPSHOT
2019-10-24 21:03:09 +01:00
KennyTV
3257c79e69 Major version bump to 3.0.0-SNAPSHOT 2019-10-24 21:58:22 +02:00
MrMicky
ee54e153bf Fix item hover event for 1.12 players 2019-10-23 16:11:14 +02:00
creeper123123321
9ea6c34543 use setflatblock 2019-10-19 15:35:34 -03:00
creeper123123321
005c91eb4d deduplicate minecraft compact array code/decode 2019-10-19 15:31:50 -03: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
28b7f6febc
Merge pull request #1484 from KennyTV/abstraction
Item rewriter cleanup
2019-10-12 10:06:55 +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
KennyTV
c8171b3f43 Item rewriter cleanup 2019-10-05 09:17:10 +02:00
Myles
857ae523cf
Merge pull request #1477 from KennyTV/abstraction
Cleanup more entity tracking and rewriting
2019-10-04 13:40:48 +01: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
KennyTV
c131672870 Fix 2019-10-03 11:00:55 +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
KennyTV
48edd01461 Readd second cancelOutgoing method for VB 2019-10-02 15:55:59 +02:00
KennyTV
3adffdc438 Minor fix 2019-10-02 15:14:03 +02:00
KennyTV
655ef137c1 Cleanup more entity tracking and rewriting 2019-10-02 15:09:50 +02:00
KennyTV
b11456d86b Helper methods for cancelling packets 2019-10-02 11:17:55 +02:00
Myles
abb5e27358
Merge pull request #1476 from KennyTV/abstraction
Merge master & restore merged branches' history
2019-10-02 08:59:18 +01:00
KennyTV
42a7b5a1b2 Merge upstream/dev into abstraction 2019-10-02 09:50:51 +02:00