Living upstream reconciliation

The canonical project combines permanent historical breadth with verified improvements from the execution-time latest official AoA. Tslat and contributors retain credit.

Runtime checklist · Dated upstream lock · Policy · Complete official changelog directory

Current observation

On 2026-10-16, the official default branch is 1.21, HEAD 7919b5fe48599e6105c5740937ce36c36ef21d16. The existing retained modern source matches every one of 14,236 Git blob objects and all 46 changelogs in that exact official tree. Enderloom's complete official provider observation contains 99 version records and identifies AoA3 1.21.1-3.7.16.1, file 7424722, as the newest production release. This is a dated observation, not a permanent latest-version constant or proof that every modern change is already in the private Forge 1.20.1 candidate.

Canonical merge and stable-world rules

• Use one canonical playable identity when exact source/registration/behavior evidence proves an old/new match. Prefer the verified better modern model, texture, behavior and dependencies together.
• Preserve unique historical content and distinct variants. Upstream removal is an explicit restoration/reconciliation decision. Never infer sameness from names or filenames.
• Preserve every proven Enderloom improvement, source authority, registered ID, save record and optional user choice. Retain an alias/migration where an actual rename is proven.
• Use improved worldgen for new chunks. Existing chunk replacement needs an explicit migration with snapshot, compatibility tests and rollback.
• Require native client/server, progression, multiplayer, optional integration, migration and equivalent-work performance evidence for the changed scope.

Latest direction to reconcile, not blindly copy

For 3.7.16.1, review permission safety, firing and scope corrections, projectile/AI fixes, crash fixes, spawn balancing and expanded Extraction support. For 3.7.16, review data-driven equipment configuration, projectile rewrites, newer art, portal safety, persistence/sync repairs, broader ammo interoperability and world-generation/performance changes. Each target needs a native adapter and tests; a 1.21-only API or removed class must not be activated blindly in another target. See the pinned source changelogs for complete details.

Every official changelog remains accounted for

Each unchecked line means its complete change set is not yet certified as reconciled into the full historical/latest project. Some individual fixes may already be implemented; close the complete release task only when linked feature evidence covers it.

• Reconcile the complete 3.6.10 changelog with the canonical project and native target evidence.
• Reconcile the complete 3.6.11 changelog with the canonical project and native target evidence.
• Reconcile the complete 3.6.12 changelog with the canonical project and native target evidence.
• Reconcile the complete 3.6.13 changelog with the canonical project and native target evidence.
• Reconcile the complete 3.6.14 changelog with the canonical project and native target evidence.
• Reconcile the complete 3.6.15 changelog with the canonical project and native target evidence.
• Reconcile the complete 3.6.16 changelog with the canonical project and native target evidence.
• Reconcile the complete 3.6.17 changelog with the canonical project and native target evidence.
• Reconcile the complete 3.6.18 changelog with the canonical project and native target evidence.
• Reconcile the complete 3.6.19.1 changelog with the canonical project and native target evidence.
• Reconcile the complete 3.6.19 changelog with the canonical project and native target evidence.
• Reconcile the complete 3.6.20 changelog with the canonical project and native target evidence.
• Reconcile the complete 3.6.21 changelog with the canonical project and native target evidence.
• Reconcile the complete 3.6.22 changelog with the canonical project and native target evidence.
• Reconcile the complete 3.6.23 changelog with the canonical project and native target evidence.
• Reconcile the complete 3.6.24 changelog with the canonical project and native target evidence.
• Reconcile the complete 3.6.25 changelog with the canonical project and native target evidence.
• Reconcile the complete 3.6.26 changelog with the canonical project and native target evidence.
• Reconcile the complete 3.6.27 changelog with the canonical project and native target evidence.
• Reconcile the complete 3.6.28 changelog with the canonical project and native target evidence.
• Reconcile the complete 3.6.29 changelog with the canonical project and native target evidence.
• Reconcile the complete 3.6.30 changelog with the canonical project and native target evidence.
• Reconcile the complete 3.6.31 changelog with the canonical project and native target evidence.
• Reconcile the complete 3.6.5-Alpha changelog with the canonical project and native target evidence.
• Reconcile the complete 3.6.6 changelog with the canonical project and native target evidence.
• Reconcile the complete 3.6.7 changelog with the canonical project and native target evidence.
• Reconcile the complete 3.6.8 changelog with the canonical project and native target evidence.
• Reconcile the complete 3.6.9 changelog with the canonical project and native target evidence.
• Reconcile the complete 3.7.1 changelog with the canonical project and native target evidence.
• Reconcile the complete 3.7.10 changelog with the canonical project and native target evidence.
• Reconcile the complete 3.7.11 changelog with the canonical project and native target evidence.
• Reconcile the complete 3.7.12 changelog with the canonical project and native target evidence.
• Reconcile the complete 3.7.13 changelog with the canonical project and native target evidence.
• Reconcile the complete 3.7.14 changelog with the canonical project and native target evidence.
• Reconcile the complete 3.7.15 changelog with the canonical project and native target evidence.
• Reconcile the complete 3.7.16.1 changelog with the canonical project and native target evidence.
• Reconcile the complete 3.7.16 changelog with the canonical project and native target evidence.
• Reconcile the complete 3.7.2 changelog with the canonical project and native target evidence.
• Reconcile the complete 3.7.3 changelog with the canonical project and native target evidence.
• Reconcile the complete 3.7.4 changelog with the canonical project and native target evidence.
• Reconcile the complete 3.7.5 changelog with the canonical project and native target evidence.
• Reconcile the complete 3.7.6 changelog with the canonical project and native target evidence.
• Reconcile the complete 3.7.7 changelog with the canonical project and native target evidence.
• Reconcile the complete 3.7.8 changelog with the canonical project and native target evidence.
• Reconcile the complete 3.7.9 changelog with the canonical project and native target evidence.
• Reconcile the complete 3.7 changelog with the canonical project and native target evidence.

Drift and execution

The repository gate checks upstream and the complete wiki intake on relevant changes and daily. It reports changed branch/head/changelogs/releases/tags; it does not silently merge code or delete historical content. Before a meaningful Enderloom implementation/promotion pass, use the existing complete official/provider freshness observer. The whole-project native acceptance runner now validates that observation against the accepted lock before mutation. Direct Studio entry-point coverage remains a separate integration task.