Merge remote-tracking branch 'architectury/1.18.2' into 1.19

# Conflicts:
#	gradle.properties
#	testmod-common/src/main/java/dev/architectury/test/item/TestBlockInteractions.java
This commit is contained in:
shedaniel
2022-05-13 07:13:53 +08:00
33 changed files with 2712 additions and 69 deletions

View File

@@ -102,7 +102,7 @@ curseforge {
if (project.hasProperty("CURSE_API_KEY") || System.getenv("CURSE_API_KEY") != null) {
apiKey = project.hasProperty("CURSE_API_KEY") ? project.property("CURSE_API_KEY") : System.getenv("CURSE_API_KEY")
project {
id = "419697"
id = "419699"
releaseType = "$rootProject.cf_type"
changelogType = "html"
changelog = releaseChangelog()