Merge remote-tracking branch 'upstream/mc1.19/dev' into mc1.19/fabric…

…/dev

# Conflicts:
#	gradle.properties
#	src/generated/resources/.cache/12afe0d97856fb2040b8407470e6d13529994eaa
#	src/generated/resources/.cache/455c485c9c8ef171bbc1ce4d435b3110ba1557ba
#	src/generated/resources/.cache/6ec3b5a261c9ae3df674f7595dc66530ce54feb9
#	src/generated/resources/.cache/82992cbf8f2794d83ac94034835eac0acd7915b9
#	src/generated/resources/.cache/8e794e243511ea3d808ffb90a97ef5ee71d8d5f9
#	src/generated/resources/.cache/b256105d8411632b0d585496ea8944a751a08034
#	src/generated/resources/.cache/c24b4d2b8d15abff51c78bd94f4403d9eae6c139
#	src/generated/resources/.cache/e0a39a97205b7149114f15de91b614248d05fd95