Skip to content

完全支持1.21+#118

Merged
Bkm016 merged 36 commits into
2.1from
XiaoJie-150/1.21
Jun 10, 2026
Merged

完全支持1.21+#118
Bkm016 merged 36 commits into
2.1from
XiaoJie-150/1.21

Conversation

@Jie-150

@Jie-150 Jie-150 commented Jun 10, 2026

Copy link
Copy Markdown
Collaborator

No description provided.

Jie and others added 30 commits May 8, 2025 16:31
# Conflicts:
#	build.gradle.kts
#	gradle.properties
#	project/common-impl-nms/src/main/kotlin/ink/ptms/adyeshach/impl/nms/DefaultMinecraftEntityOperator.kt
# Conflicts:
#	build.gradle.kts
# Conflicts:
#	project/common-impl/src/main/kotlin/ink/ptms/adyeshach/impl/VisualTeam.kt
# Conflicts:
#	project/common-impl/src/main/kotlin/ink/ptms/adyeshach/impl/entity/type/DefaultPainting.kt
#	project/common-impl/src/main/resources/core/description/entity_meta.desc
# Conflicts:
#	project/compat-model-engine-v4/src/main/kotlin/ink/ptms/adyeshach/compat/modelengine4/ActiveModelExtension.kt
# Conflicts:
#	project/common-impl-nms/src/main/kotlin/ink/ptms/adyeshach/impl/nms/DefaultMinecraftHelper.kt
Jie-150 added 6 commits March 30, 2026 04:58
# Conflicts:
#	project/common-impl/src/main/kotlin/ink/ptms/adyeshach/impl/entity/type/DefaultHuman.kt
# Conflicts:
#	build.gradle.kts
#	project/common-impl/src/main/kotlin/ink/ptms/adyeshach/impl/entity/handler/LifecycleHandler.kt
#	project/compat-model-engine-v4/src/main/kotlin/ink/ptms/adyeshach/compat/modelengine4/DefaultModelEngine.kt
@claude

claude Bot commented Jun 10, 2026

Copy link
Copy Markdown

Claude encountered an error —— View job


I'll analyze this and get back to you.

@Bkm016 Bkm016 merged commit 3732a84 into 2.1 Jun 10, 2026
1 check failed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants