Repository navigation
Conversation
This branch has not been deployed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
中文
改动
20.2.4.9,基于最新develop/1.20.1,承接已合并的 Forge 1.20.1: align optional dependencies and fix config application #49。验证
6d189a0a的 GitHub Actions build 已通过。./gradlew test --rerun portBridgeTest --rerun build --offline --max-workers=1通过:62 项 JUnit(含 8 项原生化学品传输、5 项悬浮回归)、167 项桥接测试、10 项字节码契约;全部无失败、错误或跳过。已知边界
ATM9 审计完成不等于全模组兼容通过:Thermal 温室 locked chance、龙研 IngredientStack 数量,以及匠魂/交易两端身份漂移仍未修复。本 PR 不声称补齐所有未注册或构建排除的适配器;配置关闭、脚本删除及动态规则也不强行恢复或简化。
English
Changes
20.2.4.9on the latestdevelop/1.20.1, following merged PR Forge 1.20.1: align optional dependencies and fix config application #49.Validation
6d189a0a)../gradlew test --rerun portBridgeTest --rerun build --offline --max-workers=1passed: 62 JUnit tests (including 8 native-chemical transfer and 5 tooltip regressions), 167 bridge tests and 10 bytecode contracts, with no failures, errors or skips.Known limits
Completing the ATM9 audit is not an all-mod compatibility pass. Thermal insolator locked chances, Draconic IngredientStack quantities, and TConstruct/trade client-server identity drift remain unresolved. This PR does not claim support for every unregistered/build-excluded adapter or restore disabled, script-removed or dynamic-rule recipes by weakening their semantics.
合并方式 / Merge method
当前分支已通过上游合并提交解决最终文件内容冲突。GitHub 的普通 Merge / Squash 可用,但自动 Rebase 会重新撞上早期清理提交对 CHANGELOG 的删除与上游修改冲突。本次正常推送、保留历史,不强推、不代为合并。
The branch already contains the resolved upstream merge. Normal Merge / Squash is available, but automatic Rebase replays the earlier CHANGELOG delete against upstream edits and conflicts. This update uses a normal push without rewriting history or merging the PR.
关联 / Related
配套附属 PR / Companion addon PR: 21i0/UselessStretcher#5