diff options
| author | shedaniel <daniel@shedaniel.me> | 2021-02-14 15:42:50 +0800 |
|---|---|---|
| committer | shedaniel <daniel@shedaniel.me> | 2021-02-14 15:42:50 +0800 |
| commit | 021773f263261673fbbe5d4be49b5b98ca64b4ca (patch) | |
| tree | e799d6028b0aea37ad42af2f35f768f805aaaf3e /src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java | |
| parent | 17d60503f15214e80b278d4e0ff89453d836e0bb (diff) | |
| parent | 2070aeb94aec2823e0941b71c9019424494cf792 (diff) | |
| download | architectury-loom-021773f263261673fbbe5d4be49b5b98ca64b4ca.tar.gz architectury-loom-021773f263261673fbbe5d4be49b5b98ca64b4ca.tar.bz2 architectury-loom-021773f263261673fbbe5d4be49b5b98ca64b4ca.zip | |
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
Diffstat (limited to 'src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java')
| -rw-r--r-- | src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java b/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java index d315f75c..a8c52b5a 100644 --- a/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java +++ b/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java @@ -248,10 +248,8 @@ public final class CompileConfiguration { project1.getTasks().getByName("eclipse").finalizedBy(project1.getTasks().getByName("genEclipseRuns")); project1.getTasks().getByName("cleanEclipse").finalizedBy(project1.getTasks().getByName("cleanEclipseRuns")); - if (extension.autoGenIDERuns) { - SetupIntelijRunConfigs.setup(project1); - GenVsCodeProjectTask.generate(project1); - } + SetupIntelijRunConfigs.setup(project1); + GenVsCodeProjectTask.generate(project1); // Enables the default mod remapper if (extension.remapMod) { @@ -362,6 +360,7 @@ public final class CompileConfiguration { // Disable some things used by log4j via the mixin AP that prevent it from being garbage collected System.setProperty("log4j2.disable.jmx", "true"); System.setProperty("log4j.shutdownHookEnabled", "false"); + System.setProperty("log4j.skipJansi", "true"); project.getLogger().info("Configuring compiler arguments for Java"); new JavaApInvoker(project).configureMixin(); |