From fd4fbf5df5990cb05c43e811bdfacc38fe9f77c3 Mon Sep 17 00:00:00 2001
From: rfresh2 <89827146+rfresh2@users.noreply.github.com>
Date: Wed, 30 Oct 2024 20:44:51 -0700
Subject: [PATCH] update forge and resolve rebase conflicts

---
 gradle.properties                                           | 6 +++---
 .../java/fi/dy/masa/litematica/world/WorldSchematic.java    | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 0407ff60c..b447af9ed 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,7 +2,7 @@ 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
 
@@ -10,9 +10,9 @@ 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
index 58f28b3a6..9f7bb9c48 100644
--- 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 @@ import net.minecraft.world.level.Level;
 
 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();
     }
 }