Reduce merge conflicts with shader-sanity

.gitignore

@@ -4,6 +4,7 @@ run/
 .gradle/
 build/
 gradle-app.setting
+out/
 
 ## IntelliJ IDEA
 

src/main/java/com/jozufozu/flywheel/backend/source/FileResolution.java

@@ -62,7 +62,7 @@ public class FileResolution {
 	 *     Called after all files are loaded. If we can't find the file here, it doesn't exist.
 	 * </p>
 	 */
-	void resolve(SourceHolder sources) {
+	void resolve(SourceFinder sources) {
 
 		try {
 			file = sources.findSource(fileLoc);

src/main/java/com/jozufozu/flywheel/backend/source/Resolver.java

@@ -28,7 +28,7 @@ public class Resolver {
 	/**
 	 * Try and resolve all referenced source files, printing errors if any aren't found.
 	 */
-	public void resolve(SourceHolder sources) {
+	public void resolve(SourceFinder sources) {
 		for (FileResolution resolution : resolutions.values()) {
 			resolution.resolve(sources);
 		}

src/main/java/com/jozufozu/flywheel/backend/source/ShaderSources.java

@@ -17,7 +17,7 @@ import net.minecraft.server.packs.resources.ResourceManager;
 /**
  * The main object for loading and parsing source files.
  */
-public class ShaderSources implements SourceHolder {
+public class ShaderSources implements SourceFinder {
 	public static final String SHADER_DIR = "flywheel/shaders/";
 	public static final ArrayList<String> EXTENSIONS = Lists.newArrayList(".vert", ".vsh", ".frag", ".fsh", ".glsl");
 

src/main/java/com/jozufozu/flywheel/backend/source/SourceFinder.java

@@ -6,7 +6,7 @@ import net.minecraft.resources.ResourceLocation;
  * A minimal source file lookup function.
  */
 @FunctionalInterface
-public interface SourceHolder {
+public interface SourceFinder {
 
 	SourceFile findSource(ResourceLocation name);
 }