Merge remote-tracking branch 'origin/1.20' into 1.21.1

embeddedt · embeddedt · commit 2f25bb4baecf · 2025-07-01T20:53:16.000-04:00
diff --git a/buildSrc/src/main/groovy/modernfix.common-conventions.gradle b/buildSrc/src/main/groovy/modernfix.common-conventions.gradle
@@ -125,14 +125,4 @@ repositories {
             includeGroup "com.terraformersmc"
         }
     }
-    exclusiveContent {
-        forRepository {
-            maven {
-                url "https://maven.tterrag.com"
-            }
-        }
-        filter {
-            includeGroup "team.chisel.ctm"
-        }
-    }
 }

Original file line number	Diff line number	Diff line change
`@@ -125,14 +125,4 @@ repositories {`
`125`	`125`	`includeGroup "com.terraformersmc"`
`126`	`126`	`}`
`127`	`127`	`}`
`128`		`- exclusiveContent {`
`129`		`- forRepository {`
`130`		`- maven {`
`131`		`- url "https://maven.tterrag.com"`
`132`		`- }`
`133`		`- }`
`134`		`- filter {`
`135`		`- includeGroup "team.chisel.ctm"`
`136`		`- }`
`137`		`- }`
`138`	`128`	`}`