diff options
| author | shedaniel <daniel@shedaniel.me> | 2021-04-04 19:44:11 +0800 |
|---|---|---|
| committer | shedaniel <daniel@shedaniel.me> | 2021-04-04 19:44:11 +0800 |
| commit | 8c859ecba26af6cc3deafbc02471d284c4610391 (patch) | |
| tree | a4728bb560d20e4432d146b04c23589f725882a7 /src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java | |
| parent | ad1754a932ef0c6b2134f5d717f6e55f692d85ee (diff) | |
| download | architectury-loom-8c859ecba26af6cc3deafbc02471d284c4610391.tar.gz architectury-loom-8c859ecba26af6cc3deafbc02471d284c4610391.tar.bz2 architectury-loom-8c859ecba26af6cc3deafbc02471d284c4610391.zip | |
Fix merge conflicts
Diffstat (limited to 'src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java')
| -rw-r--r-- | src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java b/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java index 23de41b2..ebc8059b 100644 --- a/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java +++ b/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java @@ -47,6 +47,7 @@ import net.fabricmc.loom.configuration.providers.forge.McpConfigProvider; import net.fabricmc.loom.configuration.providers.forge.PatchProvider; import net.fabricmc.loom.configuration.providers.forge.SrgProvider; import net.fabricmc.loom.configuration.providers.mappings.MappingsProvider; +import net.fabricmc.loom.task.GenVsCodeProjectTask; import net.fabricmc.loom.util.Constants; public final class CompileConfiguration { @@ -179,7 +180,7 @@ public final class CompileConfiguration { project.getTasks().getByName("cleanEclipse").finalizedBy(project.getTasks().getByName("cleanEclipseRuns")); SetupIntelijRunConfigs.setup(project); - GenVsCodeProjectTask.generate(project1); + GenVsCodeProjectTask.generate(project); // Enables the default mod remapper if (extension.remapMod) { |