imports/architectury-loom
1
0
Fork 0
mirror of https://github.com/architectury/architectury-loom.git synced 2026-04-02 21:47:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge conflicts

Browse Source
This commit is contained in:
shedaniel
2021-04-04 19:44:11 +08:00
parent ad1754a932
commit 8c859ecba2
6 changed files with 32 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/net/fabricmc/loom/LoomGradleExtension.java
View File

@@ -80,8 +80,6 @@ public class LoomGradleExtension {
public File accessWidener = null;
public Function<String, Object> intermediaryUrl = mcVer -> "https://maven.fabricmc.net/net/fabricmc/intermediary/" + mcVer + "/intermediary-" + mcVer + "-v2.jar";
public boolean shareCaches = false;
@Deprecated
public String mixinConfig = null; // FORGE: Passed to Minecraft
public List<String> mixinConfigs = new ArrayList<>(); // FORGE: Passed to Minecraft
public boolean useFabricMixin = true; // FORGE: Use Fabric Mixin for better refmap resolutions
@@ -198,8 +196,8 @@ public class LoomGradleExtension {
return tasksBeforeRun;
}
public void mixinConfig(String config) {
mixinConfigs.add(config);
public void mixinConfig(String... config) {
mixinConfigs.addAll(Arrays.asList(config));
}
public void silentMojangMappingsLicense() {