Nassim Jahnke 5e4f25efeb Merge branch 'refs/heads/dev' into preview ... # Conflicts: # common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/rewriter/BlockItemPacketRewriter1_20_5.java # common/src/main/java/com/viaversion/viaversion/rewriter/EntityRewriter.java # common/src/main/java/com/viaversion/viaversion/rewriter/ItemRewriter.java		2024-04-21 22:51:45 +02:00
..
src/main	Merge branch 'refs/heads/dev' into preview	2024-04-21 22:51:45 +02:00
build.gradle.kts