Merge remote-tracking branch 'FabricMC/dev/0.6' into dev/0.6-forge

# Conflicts:
#	build.gradle
#	src/main/java/net/fabricmc/loom/LoomGradleExtension.java
#	src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java
#	src/main/java/net/fabricmc/loom/configuration/processors/MinecraftProcessedProvider.java
#	src/main/java/net/fabricmc/loom/configuration/providers/mappings/MappingsProvider.java
#	src/main/java/net/fabricmc/loom/configuration/providers/minecraft/MinecraftNativesProvider.java
#	src/main/java/net/fabricmc/loom/configuration/providers/minecraft/assets/MinecraftAssetsProvider.java
#	src/main/java/net/fabricmc/loom/task/GenVsCodeProjectTask.java
#	src/main/java/net/fabricmc/loom/util/SourceRemapper.java

1 files changed, 20 insertions, 0 deletions

diff --git a/src/main/java/net/fabricmc/loom/configuration/ide/RunConfigSettings.java b/src/main/java/net/fabricmc/loom/configuration/ide/RunConfigSettings.java
index 41cda1b1..ec50c3a5 100644
--- a/src/main/java/net/fabricmc/loom/configuration/ide/RunConfigSettings.java
+++ b/src/main/java/net/fabricmc/loom/configuration/ide/RunConfigSettings.java
@@ -92,6 +92,13 @@ public final class RunConfigSettings implements Named {
 	 */
 	private final String baseName;
 
+	/**
+	 * When true a run configuration file will be generated for IDE's.
+	 *
+	 * <p>By default only run configs on the root project will be generated.
+	 */
+	private boolean ideConfigGenerated;
+
 	private final Project project;
 	private final LoomGradleExtension extension;
 
@@ -99,6 +106,7 @@ public final class RunConfigSettings implements Named {
 		this.baseName = baseName;
 		this.project = project;
 		this.extension = project.getExtensions().getByType(LoomGradleExtension.class);
+		this.ideConfigGenerated = extension.isRootProject();
 
 		source("main");
 		runDir("run");
@@ -232,6 +240,10 @@ public final class RunConfigSettings implements Named {
 		});
 	}
 
+	public void ideConfigGenerated(boolean ideConfigGenerated) {
+		this.ideConfigGenerated = ideConfigGenerated;
+	}
+
 	/**
 	 * Add the {@code -XstartOnFirstThread} JVM argument when on OSX.
 	 */
@@ -295,4 +307,12 @@ public final class RunConfigSettings implements Named {
 			file.mkdir();
 		}
 	}
+
+	public boolean isIdeConfigGenerated() {
+		return ideConfigGenerated;
+	}
+
+	public void setIdeConfigGenerated(boolean ideConfigGenerated) {
+		this.ideConfigGenerated = ideConfigGenerated;
+	}
 }