Merge origin/master into terrain-first hydrology

Brings master's Sentry removal, bound platform classification, Vision
entity toggle, release version and generation context binding onto the
rivers rework while keeping the hydrology system master had removed.
Hydrology files master deleted are restored from the branch, master's
non-hydrology edits are kept, and the modded adapter builds drop the
Sentry dependency with master.

Also removes the ridge_tunnel find selector: no course publishes ridge
bores any more, so it could never return a result.
This commit is contained in:
Brian Neumann-Fopiano committed 2026-09-02 02:52:08 -04:00
commit f6a7ad7472
74 files changed
+869 -726

No files matched your search

+1 -3
View File
@@ -165,8 +165,7 @@ dependencies {
libs.lru,
libs.caffeine,
libs.dom4j,
libs.jaxen,
libs.sentry
libs.jaxen
]
shared.each { Object notation ->
add('bundle', notation)
@@ -267,7 +266,6 @@ tasks.named('shadowJar', ShadowJar).configure {
exclude('art/arcane/iris/platform/bukkit/**')
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
relocate('org.objectweb.asm', 'art.arcane.iris.shadow.asm')
relocate('io.sentry', 'art.arcane.iris.shadow.sentry')
// Split-package guard. A co-installed mod that ships any of these at their original coordinates
// puts two copies of the same package on one module layer, which the loaders reject at boot
// (Terra ships paralithic; caffeine and dom4j are common in mod dependency trees). First-party