Merge branch 'refs/heads/1.19' into 1.20

sisby-folk · Aug 27, 2024 · b97b70b · b97b70b
2 parents c985fbd + 4017c05
commit b97b70b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/build.gradle b/build.gradle
@@ -137,18 +137,16 @@ allprojects {
 }
 
 dependencies {
-	runtimeOnly(include(project(path: ":core", configuration: "namedElements")))
-	runtimeOnly(include(project(path: ":client", configuration: "namedElements")))
-	runtimeOnly(include(project(path: ":ui", configuration: "namedElements")))
-	runtimeOnly(include(project(path: ":cardinal", configuration: "namedElements")))
-	runtimeOnly(include(project(path: ":cardinal-ui", configuration: "namedElements")))
-	runtimeOnly(include(project(path: ":compat", configuration: "namedElements")))
-	runtimeOnly(include(project(path: ":compat-ui", configuration: "namedElements")))
+	include project(":core")
+	include project(":client")
+	include project(":ui")
+	include project(":cardinal")
+	include project(":cardinal-ui")
+	include project(":compat")
+	include project(":compat-ui")
 	modLocalRuntime libs.fapi
 	modLocalRuntime libs.kaleidoConfig
 	modLocalRuntime libs.serverTranslationsApi
-	include libs.kaleidoConfig
-	include libs.serverTranslationsApi
 }
 
 

diff --git a/cardinal-ui/build.gradle b/cardinal-ui/build.gradle
@@ -9,5 +9,5 @@ dependencies {
 }
 
 loom {
-	accessWidenerPath = file("src/main/resources/${cardinalUiId}.accesswidener")
+	accessWidenerPath = file("src/main/resources/switchy-cardinal-ui.accesswidener")
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,5 +9,5 @@ dependencies { @@
     }
     loom {
-    	accessWidenerPath = file("src/main/resources/${cardinalUiId}.accesswidener")
+    	accessWidenerPath = file("src/main/resources/switchy-cardinal-ui.accesswidener")
     }