From 8a5e3f7009860f2f8ca2b4562d73395ade16dc29 Mon Sep 17 00:00:00 2001
From: Wagyourtail <wagyourtail@wagyourtail.xyz>
Date: Tue, 7 May 2024 13:07:02 -0500
Subject: [PATCH] fix unfixable conflicts

---
 build.gradle          | 2 ++
 forge/build.gradle    | 6 +-----
 neoforge/build.gradle | 3 ---
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/build.gradle b/build.gradle
index f17fa9259..d802ac566 100755
--- a/build.gradle
+++ b/build.gradle
@@ -95,6 +95,8 @@ allprojects {
             intermediary()
             mojmap()
             parchment("1.20.6", "2024.05.01")
+
+            devFallbackNamespace "official"
         }
     }
 
diff --git a/forge/build.gradle b/forge/build.gradle
index 334bd968c..54e7bb6ff 100644
--- 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"]
     }
diff --git a/neoforge/build.gradle b/neoforge/build.gradle
index c60cc81be..4f3bf0fed 100644
--- 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