1.5: 苍蝇及变异繁育系统#60
Open
Wulian233 wants to merge 18 commits into
Open
Conversation
This comment has been minimized.
This comment has been minimized.
Altnoir
requested changes
Jun 16, 2026
Altnoir
left a comment
Altnoir
left a comment
Owner
There was a problem hiding this comment.
一些小细节还需要人工微调，比如gui贴图，jei格子对齐；还有繁育箱jei不需要显示食物槽和杂交失败的槽位，只需要显示两个输入和一个输出。
… into deepseek-fly # Conflicts: # src/main/java/com/altnoir/poopsky/PSItemGroups.java # src/main/java/com/altnoir/poopsky/compat/jei/PSJEIPlugin.java # src/main/java/com/altnoir/poopsky/datagen/PSBlockLootTableProvider.java # src/main/java/com/altnoir/poopsky/datagen/PSBlockStateProvider.java # src/main/java/com/altnoir/poopsky/datagen/PSItemModelProvider.java # src/main/java/com/altnoir/poopsky/init/PBlockEntityType.java # src/main/java/com/altnoir/poopsky/item/PItems.java
# Conflicts: # src/main/java/com/altnoir/poopsky/PoopSkyClient.java # src/main/java/com/altnoir/poopsky/compat/jei/PSJEIPlugin.java
Open
Collaborator
Author
|
哭了，怎么天天有合并冲突啊TT |
Owner
|
可以合并了 |
Collaborator
Author
|
按我的时间处理最晚后天前合并。我记得目前变异进度条还是偏移的，两个功能方块贴图没有定义紫黑 |
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
3 participants
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.
#55 的概念验证 其他颜色苍蝇没有获取来源（作者没写）
等待贴图