Fix merge conflicts

Signed-off-by: shedaniel <daniel@shedaniel.me>
This commit is contained in:
shedaniel
2021-09-29 01:28:29 +08:00
18 changed files with 369 additions and 62 deletions

View File

@@ -74,7 +74,7 @@ public class LoomGradlePlugin implements BootstrappedPlugin {
project.getLogger().lifecycle("You are using an unstable version of Architectury Loom! Please report any issues found!");
}
refreshDeps = project.getGradle().getStartParameter().isRefreshDependencies() || "true".equals(System.getProperty("loom.refresh"));
refreshDeps = project.getGradle().getStartParameter().isRefreshDependencies() || Boolean.getBoolean("loom.refresh");
if (refreshDeps) {
project.getLogger().lifecycle("Refresh dependencies is in use, loom will be significantly slower.");