update forge and resolve rebase conflicts

cabaletta · Oct 31, 2024 · fd4fbf5 · fd4fbf5
1 parent 7e8c850
commit fd4fbf5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -2,17 +2,17 @@ org.gradle.jvmargs=-Xmx4G
 
 available_loaders=fabric,forge,neoforge,tweaker
 
-mod_version=1.11.0
+mod_version=1.12.0
 maven_group=baritone
 archives_base_name=baritone
 
 java_version=21
 
 minecraft_version=1.21.3
 
-forge_version=53.0.0
+forge_version=53.0.7
 
-neoforge_version=3-beta
+neoforge_version=6-beta
 
 fabric_version=0.16.7
 

diff --git a/src/schematica_api/java/fi/dy/masa/litematica/world/WorldSchematic.java b/src/schematica_api/java/fi/dy/masa/litematica/world/WorldSchematic.java
@@ -21,7 +21,7 @@
 
 public abstract class WorldSchematic extends Level {
     private WorldSchematic() {
-        super(null, null, null, null, null, false, false, 0, 0);
+        super(null, null, null, null, false, false, 0, 0);
         throw new LinkageError();
     }
 }