FlorianMichael 644d592561 Merge branch 'refs/heads/main' into dev ... # Conflicts: # gradle.properties		2024-04-14 02:22:26 +02:00
..
java/com/viaversion/fabric/common	Updated Via API usage	2024-02-24 10:26:16 +01:00
resources	Update client-side-force-disable list	2024-03-31 21:36:35 +02:00