Merge remote-tracking branch 'origin/1.18' into 1.19.2

fabric/src/main/java/org/embeddedt/modernfix/fabric/mixin/perf/dynamic_resources/ModelBakeryMixin.java

@@ -250,9 +250,12 @@ public abstract class ModelBakeryMixin implements IExtendedModelBakery {
                 "entity/chest",
                 "item",
                 "items",
+                "model",
+                "models",
                 "part",
                 "pipe",
-                "ropebridge"
+                "ropebridge",
+                "solid_block"
         };
         for(String folder : extraFolders) {
             Collection<ResourceLocation> textureLocations = this.resourceManager.listResources("textures/" + folder, p -> p.getPath().endsWith(".png")).keySet();