Merge branch 'mc1.19/fabric/dev' into mc1.20.1/fabric/dev

# Conflicts:
#	src/generated/resources/.cache/1befec8d6a93075ce6b4cde2ad591d86e1289c0e
#	src/generated/resources/.cache/35806e87dccf1c56c630455071f2d6dfd38015f6
#	src/generated/resources/.cache/3f8e2bfad643b52631e6eb80098aea304497f9a9
#	src/generated/resources/.cache/455c485c9c8ef171bbc1ce4d435b3110ba1557ba
#	src/generated/resources/.cache/5941507bfa52efb23b73a8b0f1a97554e2aada1d
#	src/generated/resources/.cache/82992cbf8f2794d83ac94034835eac0acd7915b9
#	src/generated/resources/.cache/8374d11e7b3d6ea1837e31911da1439b12da9432
#	src/generated/resources/.cache/899d321c4524b581eebda1c204a82d1a56a5eaa0
#	src/main/java/com/simibubi/create/AllItems.java