Merge 1.19.4 into 1.20

embeddedt · embeddedt · commit 3be36f826ce2 · 2023-06-29T19:28:08.000-04:00
diff --git a/common/src/main/java/org/embeddedt/modernfix/resources/PackResourcesCacheEngine.java b/common/src/main/java/org/embeddedt/modernfix/resources/PackResourcesCacheEngine.java
@@ -66,7 +66,7 @@ public PackResourcesCacheEngine(Function<PackType, Set<String>> namespacesRetrie
                                         synchronized (this.containedPaths) {
                                             this.containedPaths.add(cachedPath);
                                         }
-                                        if(!cachedPath.getFileName().endsWith(".mcmeta"))
+                                        //if(!cachedPath.getFileName().endsWith(".mcmeta"))
                                             namespacedList.add(cachedPath);
                                     });
                         }

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ public PackResourcesCacheEngine(Function<PackType, Set<String>> namespacesRetrie`
`66`	`66`	`synchronized (this.containedPaths) {`
`67`	`67`	`this.containedPaths.add(cachedPath);`
`68`	`68`	`}`
`69`		`- if(!cachedPath.getFileName().endsWith(".mcmeta"))`
	`69`	`+ //if(!cachedPath.getFileName().endsWith(".mcmeta"))`
`70`	`70`	`namespacedList.add(cachedPath);`
`71`	`71`	`});`
`72`	`72`	`}`