Repository navigation
Conversation
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.
中文
改动
1.20.1,承接已合并的 Forge 1.20.1: align Mekanism pins and quiet capsule diagnostics #4;保留上游20.1.6.3版本、官方本体20.2.4.7默认构建依赖及世界级配置说明。tools/,素材来源保留在第三方声明中。不添加新的 CHANGELOG 或临时报告。本轮合并 README 中重复的构建说明,保留默认官方 20.2.4.7、显式 20.2.4.9 开发包及离线仓库三种说明;日志复核未发现新增刷屏点。验证
aa47e113的 GitHub Actions build 已通过。20.2.4.7:./gradlew test --rerun build --offline --max-workers=1通过,16 项 JUnit 全部通过。20.2.4.9的build/devlibs包显式覆盖后,离线普通构建及同一组 16 项测试再次通过。compileJava -PcapsuleChecks -PstaffCompatChecks -PstaffPackChecks编译通过;本次没有重新运行这些真实世界场景。python tools/audit_forge_release.py build/libs/useless_stretcher-20.1.6.3.jar通过:生产源码/资源完整,测试及外部 class 泄漏均为零。范围
保持既有功能和配方语义,不把日志安静或目录数量当作兼容通过。ATM9 的 Thermal、龙研及两端配方身份问题仍属本体待修范围。此次仅更新已有 PR,未改动整合包或存档,不合并 PR、不发布 Release、不移动标签、不部署整包。
English
Changes
1.20.1after merged PR Forge 1.20.1: align Mekanism pins and quiet capsule diagnostics #4. Retain upstream version20.1.6.3, the default official base-mod20.2.4.7dependency and world-scoped configuration guidance.tools/and retain asset attribution in third-party notices. Add no new CHANGELOG or temporary reports. This update consolidates duplicate README build instructions while retaining the official 20.2.4.7 default, explicit 20.2.4.9 development-jar override and offline repository guidance. The logging re-audit found no additional spam sites.Validation
aa47e113).20.2.4.7:./gradlew test --rerun build --offline --max-workers=1passed with all 16 JUnit tests.20.2.4.9development jar frombuild/devlibs.compileJava -PcapsuleChecks -PstaffCompatChecks -PstaffPackCheckspassed compilation; these real-world scenarios were not rerun in this submission.python tools/audit_forge_release.py build/libs/useless_stretcher-20.1.6.3.jarpassed: complete production sources/resources, zero verification entries and zero foreign classes.Scope
Preserve existing functionality and recipe semantics. Quiet logs and catalog counts are not compatibility proof. ATM9 Thermal, Draconic and client/server recipe-identity issues remain outstanding in the base mod. This update only refreshes the existing PR and does not modify modpacks/saves, merge PRs, publish Releases, move tags or deploy into modpacks.
合并方式 / Merge method
当前最终内容已在上游合并提交中解决冲突,普通 Merge / Squash 可用。自动 Rebase 会逐个重放旧清理提交,与上游对 README、交接/更新文档及 docs 工具路径的修改冲突。本次保留历史正常推送,不强推、不代为合并。
The upstream merge already resolves the final tree, so normal Merge / Squash is available. Automatic Rebase instead replays earlier cleanup against upstream README, handoff/update-document and docs/tool-path changes and conflicts. History is preserved with a normal push; no force push or PR merge is performed.
关联 / Related
配套本体 PR / Companion base-mod PR: SorrowMist/UselessMod#54