Merge branch '1.20.4' into 1.20.5

# Conflicts:
#	src/main/java/eu/ha3/presencefootsteps/mixins/MClientPlayNetworkHandler.java
#	src/main/java/eu/ha3/presencefootsteps/world/PFSolver.java

src/main/resources/resourcepacks/default_sound_pack/assets/presencefootsteps/config/acoustics.json

@@ -2274,4 +2274,4 @@
             }
         }
     }
-}
+}