Nassim Jahnke b426302e76 Merge branch 'master' into dev ... # Conflicts: # common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19to1_18_2/packets/EntityPackets.java # common/src/main/java/com/viaversion/viaversion/rewriter/EntityRewriter.java # gradle/libs.versions.toml		2024-03-09 12:59:36 +01:00
..
src/main	Merge branch 'master' into dev	2024-03-09 12:59:36 +01:00
build.gradle.kts	Small refactors around ProtocolPipeline and concurrent collections	2024-02-21 12:18:19 +01:00