Merge remote-tracking branch 'forge/mc1.20.1/dev' into mc1.20.1/fabri…

…c/dev

# Conflicts:
#	gradle.properties
#	src/generated/resources/.cache/12afe0d97856fb2040b8407470e6d13529994eaa
#	src/generated/resources/.cache/3f8e2bfad643b52631e6eb80098aea304497f9a9
#	src/generated/resources/.cache/455c485c9c8ef171bbc1ce4d435b3110ba1557ba
#	src/generated/resources/.cache/528ac2e8644db78e56272a28e1f653f416709616
#	src/generated/resources/.cache/6ec3b5a261c9ae3df674f7595dc66530ce54feb9
#	src/generated/resources/.cache/82992cbf8f2794d83ac94034835eac0acd7915b9
#	src/generated/resources/.cache/899d321c4524b581eebda1c204a82d1a56a5eaa0
#	src/generated/resources/.cache/8ede8fad2f9d17f80679e3b4a06e7ce5921f134f
#	src/generated/resources/.cache/ad9bf59631726a3f24738ebf1a6cd44c7f88ba0f
#	src/generated/resources/.cache/c24b4d2b8d15abff51c78bd94f4403d9eae6c139
#	src/generated/resources/.cache/e0a39a97205b7149114f15de91b614248d05fd95

.github/workflows/localization.yml

@@ -41,7 +41,7 @@ jobs:
                   create_pull_request: true
                   pull_request_title: 'New Crowdin translations'
                   pull_request_body: 'New Crowdin pull request with translations'
-                  pull_request_base_branch_name: 'mc1.18/dev'
+                  pull_request_base_branch_name: 'mc1.20.1/dev'
               env:
                   GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
                   CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }}