fix unfixable conflicts

cabaletta · May 7, 2024 · 8a5e3f7 · 8a5e3f7
1 parent b29878d
commit 8a5e3f7
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 8 deletions.
diff --git 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
@@ -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
@@ -25,9 +25,6 @@ plugins {
 archivesBaseName = archivesBaseName + "-neoforge"
 
 unimined.minecraft {
-    mappings {
-        devFallbackNamespace "intermediary"
-    }
 
     neoForged {
         loader project.neoforge_version