From 0372f54541e49d715296f1cf2be72268d6a4700a Mon Sep 17 00:00:00 2001 From: Sekwah Date: Fri, 23 Jun 2023 00:28:34 +0100 Subject: [PATCH] chore(deps): disable automerge and switch forge version back --- build.gradle | 2 +- renovate.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 0cead7d5..c921610e 100644 --- a/build.gradle +++ b/build.gradle @@ -154,7 +154,7 @@ dependencies { // Specify the version of Minecraft to use, If this is any group other then 'net.minecraft' it is assumed // that the dep is a ForgeGradle 'patcher' dependency. And it's patches will be applied. // The userdev artifact is a special name and will get all sorts of transformations applied to it. - minecraft 'net.minecraftforge:forge:1.20-46.0.14' + minecraft 'net.minecraftforge:forge:1.20.1-47.0.14' implementation 'org.spongepowered:mixin:0.8.5' annotationProcessor 'org.spongepowered:mixin:0.8.5:processor' diff --git a/renovate.json b/renovate.json index 98741554..981acd06 100644 --- a/renovate.json +++ b/renovate.json @@ -31,7 +31,7 @@ "minor", "patch" ], - "automerge": true, + "automerge": false, "automergeType": "branch", "groupName": "Deps", "schedule": [