FlorianMichael cde4b24cad Merge remote-tracking branch 'origin/main' into recode/3.0.0 ... # Conflicts: # gradle.properties # src/main/java/de/florianmichael/viafabricplus/fixes/data/ResourcePackHeaderDiff.java # src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinLivingEntity.java # src/main/java/de/florianmichael/viafabricplus/injection/mixin/viaversion/MixinProtocolVersion.java		2023-12-06 22:42:09 +01:00
..
java/de/florianmichael/viafabricplus	Merge remote-tracking branch 'origin/main' into recode/3.0.0	2023-12-06 22:42:09 +01:00
resources	Use direct verification uri for bedrock login	2023-12-03 21:23:15 +01:00