Merge remote-tracking branch 'fabric/1.20.4' into 1.20.4

# Conflicts:
#	gradle.properties

fabric-resource-loader-v0/src/main/java/net/fabricmc/fabric/impl/resource/loader/ModNioResourcePack.java

@@ -95,7 +95,7 @@ public static ModNioResourcePack create(String id, ModContainer mod, String subP
 
 		if (paths.isEmpty()) return null;
 
-		String packId = subPath == null ? id : id + "_" + subPath;
+		String packId = subPath != null && modBundled ? id + "_" + subPath : id;
 		ModNioResourcePack ret = new ModNioResourcePack(packId, mod, paths, type, activationType, modBundled);
 
 		return ret.getNamespaces(type).isEmpty() ? null : ret;

gradle.properties

@@ -4,7 +4,7 @@ fabric.loom.multiProjectOptimisation=true
 
 archivesBaseName=quilted_fabric_api
 version=9.0.0-alpha.3
-upstream_version=0.96.4
+upstream_version=0.96.11
 minecraft_version=1.20.4
 yarn_version=+build.1
 loader_version=0.23.1
@@ -25,28 +25,28 @@ fabric-command-api-v1-version=1.2.41
 fabric-command-api-v2-version=2.2.20
 fabric-commands-v0-version=0.2.58
 fabric-containers-v0-version=0.1.86
-fabric-content-registries-v0-version=5.0.14
+fabric-content-registries-v0-version=5.0.15
 fabric-crash-report-info-v1-version=0.2.23
-fabric-data-attachment-api-v1-version=1.1.3
-fabric-data-generation-api-v1-version=13.2.3
+fabric-data-attachment-api-v1-version=1.1.4
+fabric-data-generation-api-v1-version=13.2.4
 fabric-dimensions-v1-version=2.1.61
 fabric-entity-events-v1-version=1.6.1
 fabric-events-interaction-v0-version=0.7.1
 fabric-events-lifecycle-v0-version=0.2.74
 fabric-game-rule-api-v1-version=1.0.46
-fabric-gametest-api-v1-version=1.3.4
+fabric-gametest-api-v1-version=1.3.5
 fabric-item-api-v1-version=2.2.0
-fabric-item-group-api-v1-version=4.0.25
+fabric-item-group-api-v1-version=4.0.26
 fabric-key-binding-api-v1-version=1.0.41
 fabric-keybindings-v0-version=0.2.39
 fabric-lifecycle-events-v1-version=2.3.0
-fabric-loot-api-v2-version=2.1.8
+fabric-loot-api-v2-version=2.1.9
 fabric-message-api-v1-version=6.0.5
-fabric-mining-level-api-v1-version=2.1.64
+fabric-mining-level-api-v1-version=2.1.65
 fabric-model-loading-api-v1-version=1.0.8
 fabric-models-v0-version=0.4.7
 fabric-networking-api-v1-version=3.1.7
-fabric-object-builder-api-v1-version=13.0.13
+fabric-object-builder-api-v1-version=13.0.14
 fabric-particles-v1-version=1.1.7
 fabric-recipe-api-v1-version=2.0.20
 fabric-registry-sync-v0-version=4.0.19
@@ -58,7 +58,7 @@ fabric-rendering-fluids-v1-version=3.1.1
 fabric-rendering-v0-version=1.1.56
 fabric-rendering-v1-version=3.2.0
 fabric-resource-conditions-api-v1-version=2.3.14
-fabric-resource-loader-v0-version=0.11.19
+fabric-resource-loader-v0-version=0.11.20
 fabric-screen-api-v1-version=2.0.17
 fabric-screen-handler-api-v1-version=1.3.55
 fabric-sound-api-v1-version=1.0.17