Repository navigation
Conversation
vcwdfca
marked this pull request as draft
September 14, 2026 12:47
vcwdfca
force-pushed
the
ae2s
branch
4 times, most recently
from
September 14, 2026 16:34
c7cab66 to
7a25694
Compare
vcwdfca
marked this pull request as ready for review
September 22, 2026 12:42
vcwdfca
force-pushed
the
ae2s
branch
2 times, most recently
from
September 27, 2026 07:21
611f2cf to
ae5969a
Compare
Circulate233
force-pushed
the
main
branch
2 times, most recently
from
October 14, 2026 16:10
929981b to
e45c826
Compare
# Conflicts: # build.gradle # gradle/scripts/dependencies.gradle # src/main/java/github/kasuminova/novaeng/NovaEngineeringCore.java # src/main/java/github/kasuminova/novaeng/mixin/ae2/MixinNetworkInventoryOutputPreparation.java # src/main/java/github/kasuminova/novaeng/mixin/crafttweaker/MixinPreprocessorManager.java # src/main/java/github/kasuminova/novaeng/mixin/ctm/MixinTextureCTMConnectToCache.java # src/main/java/github/kasuminova/novaeng/mixin/electroblobs/MixinModelBookshelfConcurrent.java # src/main/java/github/kasuminova/novaeng/mixin/journeymap/MixinJMChunkCache.java # src/main/java/github/kasuminova/novaeng/mixin/konkrete/MixinLocalsCopy.java # src/main/java/github/kasuminova/novaeng/mixin/minecraft/MixinChunkEntityQuery.java # src/main/java/github/kasuminova/novaeng/mixin/minecraft/MixinClassInheritanceMultiMapIterator.java # src/main/java/github/kasuminova/novaeng/mixin/minecraft/MixinConditionAndCanonicalization.java # src/main/java/github/kasuminova/novaeng/mixin/minecraft/MixinConditionOrCanonicalization.java # src/main/java/github/kasuminova/novaeng/mixin/minecraft/MixinInventoryPlayer.java # src/main/java/github/kasuminova/novaeng/mixin/minecraft/MixinResourceLocation.java # src/main/java/github/kasuminova/novaeng/mixin/mmce/MixinTaskExecutor.java # src/main/java/github/kasuminova/novaeng/mixin/mmce/MixinTileEnergyHatchDEBinding.java
# Conflicts: # gradle/scripts/dependencies.gradle # src/main/java/github/kasuminova/novaeng/common/CommonProxy.kt # src/main/java/github/kasuminova/novaeng/common/item/ItemMachineAssemblyTool.kt # src/main/java/github/kasuminova/novaeng/common/machine/BiogenicSimulationComputer.kt # src/main/java/github/kasuminova/novaeng/common/network/PktPatternTermUploadPattern.kt # src/main/java/github/kasuminova/novaeng/common/registry/RegistryAssembly.kt # src/main/java/github/kasuminova/novaeng/common/tile/ecotech/efabricator/EFabricatorController.kt # src/main/java/github/kasuminova/novaeng/common/tile/ecotech/efabricator/EFabricatorMEChannel.kt # src/main/java/github/kasuminova/novaeng/common/tile/ecotech/efabricator/EFabricatorPatternBus.kt # src/main/java/github/kasuminova/novaeng/common/tile/ecotech/efabricator/EFabricatorWorker.kt # src/main/java/github/kasuminova/novaeng/common/util/AssemblyBlockArray.kt # src/main/java/github/kasuminova/novaeng/common/util/MixinDecisions.java # src/main/java/github/kasuminova/novaeng/common/util/NEWMachineAssemblyManager.kt # src/main/java/github/kasuminova/novaeng/mixin/ae2/MixinCraftingCPUStatus.java # src/main/java/github/kasuminova/novaeng/mixin/betterp2p/MixinServerLinkP2PHandler.java # src/main/resources/novaeng_core.mixin.json
- 完成 kt→java 合并：删除残留的 Kotlin 源文件，把分支侧的 AE2 Supergiant（ae2.*）迁移移植进上游的 Java 实现 - 恢复分支删除的自动合成子系统（AutoCraftingQueue/ContainerNEWCraftConfirm/GuiNEWCraftConfirm/PktAutoCraftConfirm/EmptyQueue），改用原版 AE2 的 ContainerCraftConfirm - 删除依赖旧版 AE2 内部实现的混入（流星罗盘、元数据命名、SpawnData）及相关测试 - 删除已被移除的 AE2 附属模组（ae2ctl/betterp2p/MekanismEnergistics/NotEnoughEnergistics/threng）对应的 enumcache 混入并清理注册表 - 修复 EFabricatorWorker 中 Math.clamp 在能量不足时抛 IllegalArgumentException 的问题 - 修复 ItemMachineAssemblyTool 建造高度判断条件写反的问题 - 去掉重复的依赖声明，使 advanced-rocketry/modular-routers 的 access transformer 生效 - 还原 build.gradle 的 mod_version 推导（本地临时硬编码不应提交）
冲突处理： - 依赖表：保留分支的 AE2 Supergiant v1.1.0（ae2.*）栈与 AppliedCompatibility，同时接受上游新增的 GTNH 仓库、astral-sorcery 等依赖与 access transformer；不恢复已废弃的 AE2 附属模组（better-meteorite/ae2-crafting-tree/nae2/ae2-extended-life 等） - 依赖版本取本地缓存中可离线解析的版本（random-complement 8828633） - 混入注册表：接受上游新增条目，剔除目标类已不存在于新版 AE2 的混入；补回上游修正过的 minecraft.forge 系列注册 - 删除上游新增但仍依赖旧版 AE2 内部实现的混入（ItemList/MECraftingInventory/TickHandler/CompassService 相关）及其依赖的 Accessor - 测试目录按上游改动整体移除（上游已删除 src/test） - ItemMachineAssemblyTool 建造高度判断采用上游 new 修正 - EStorageMEChannel 保留分支的 IStorageMounts 实现
# Conflicts: # src/main/resources/novaeng_core.mixin.json
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.
No description provided.