update forge and resolve rebase conflicts

Author: rfresh2

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
 

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();
     }
 }