resolve conflicts 1.10

Author: Goldenfield192

src/main/java/cam72cam/mod/resource/BuiltinPack.java

@@ -84,7 +84,7 @@ public static IResourcePack attach(File path) {
                 @Override
                 protected InputStream getInputStreamByName(String name) throws IOException {
                     InputStream stream = super.getInputStreamByName(name);
-                    File file = this.getFile(name);
+                    File file = new File(this.resourcePackFile, name);
                     return new Identifier.InputStreamMod(stream, file.lastModified());
                 }
             };