Nassim Jahnke 93990c8baa 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.properties # gradle/libs.versions.toml		2024-03-07 13:45:10 +01:00
..
src/main	Merge branch 'master' into dev	2024-03-07 13:45:10 +01:00
build.gradle.kts	Include api sources in common sources jar	2023-11-06 20:04:45 +10:00