fix unfixable conflicts

2024-05-07 13:07:02 -05:00
parent b29878d0f2
commit 8a5e3f7009
3 changed files with 3 additions and 8 deletions
--- a/build.gradle
+++ b/build.gradle
@@ -95,6 +95,8 @@ allprojects {
            intermediary()
            mojmap()
            parchment("1.20.6", "2024.05.01")
+
+            devFallbackNamespace "official"
        }
    }

--- a/forge/build.gradle
+++ b/forge/build.gradle
@@ -25,11 +25,7 @@ plugins {
 archivesBaseName = archivesBaseName + "-forge"

 unimined.minecraft {
-    mappings {
-        devFallbackNamespace "intermediary"
-    }
-
-    forge {
+    minecraftForge {
        loader project.forge_version
        mixinConfig ["mixins.baritone.json"]
    }
--- a/neoforge/build.gradle
+++ b/neoforge/build.gradle
@@ -25,9 +25,6 @@ plugins {
 archivesBaseName = archivesBaseName + "-neoforge"

 unimined.minecraft {
-    mappings {
-        devFallbackNamespace "intermediary"
-    }

    neoForged {
        loader project.neoforge_version