Nassim Jahnke ee75f19790 Merge branch 'master' into dev ... # Conflicts: # gradle.properties		2023-03-29 16:28:57 +02:00
..
src/main/java/com/viaversion/viaversion	Merge branch 'master' into dev	2023-03-29 16:28:57 +02:00
build.gradle.kts	Readd flare	2021-10-19 09:10:17 +02:00