merge upstream

gradle.properties

@@ -5,8 +5,9 @@ org.gradle.caching=true
 
 # Mod Info
 mod_name=DistantHorizons
-mod_version=3.0.0-b-dev
-api_version=6.0.0
+api_name=DistantHorizonsApi
+mod_version=3.0.4-b-dev
+api_version=6.1.1
 maven_group=com.seibel.distanthorizons
 mod_readable_name=Distant Horizons
 mod_id=distanthorizons
@@ -14,14 +15,14 @@ mod_description=This mod generates and renders simplified terrain beyond the nor
 # Note: In forge's mods.toml this is hard coded because Architectury throws an error with setting it as a variable
 mod_authors=["James Seibel", "Leonardo Amato", "Cola", "coolGi", "Ran", "Leetom", "pshsh"]
 mod_homepage=https://modrinth.com/mod/distanthorizons
-mod_source=https://gitlab.com/jeseibel/distant-horizons
-mod_issues=https://gitlab.com/jeseibel/distant-horizons/-/issues
+mod_source=https://gitlab.com/distant-horizons-team/distant-horizons/
+mod_issues=https://gitlab.com/distant-horizons-team/distant-horizons/-/issues
 mod_discord=https://discord.gg/xAB8G4cENx
 
 # Global Plugin Versions
-manifold_version=2025.1.31
+manifold_version=2026.1.6
 # 2023.1.17 can be used if there are mystery Java compiler issues
-nightconfig_version=3.6.6
+nightconfig_version=3.8.3
 lz4_version=1.8.0
 xz_version=1.9
 zstd_version=1.5.7-6
@@ -35,11 +36,6 @@ fastutil_version=8.2.1
 log4j_version=2.23.1
 joml_version=1.10.2
 
-# Architectury config
-# this is necessary for MC 1.21.3 because including Sodium and Iris throws "Mod was built with a newer version of Loom (1.8.9), you are using Loom (1.7.415)"
-loom.ignoreDependencyLoomVersionValidation=true
-
-
 # These are here so they can be changed with cmd arguments
 # If they are null, they would be automatically set
 # (This is mainly used for the CI)
@@ -52,7 +48,10 @@ versionStr=
 
 # This defines what MC version Intellij will use for the preprocessor
 # and what version is used automatically by build and run commands
-mcVer=1.21.11
+mcVer=26.1.2
 
 # Defines the maximum amount of memory Minecraft is allowed when run in a development environment
-#minecraftMemoryJavaArg="-Xmx4G"
+minecraftMemoryJavaArg=-Xmx6G
+# can be enabled for use with the Tracy profiler, disabled by default since it causes constant memory growth when running
+minecraftEnableTracy=false
+