Skip to content

Conflict Resolver#73

Open
xGabou wants to merge 2 commits intostarfish-studios:1.20.1-Archfrom
xGabou:Arch-1.20.1
Open

Conflict Resolver#73
xGabou wants to merge 2 commits intostarfish-studios:1.20.1-Archfrom
xGabou:Arch-1.20.1

Conversation

@xGabou
Copy link

@xGabou xGabou commented Aug 13, 2025

Mapping target name conflicts detected:
METHODs com/starfish_studios/naturalist/common/entity/core/TamableClimbingAnimal/net/minecraft/world/entity/LivingEntity/m_6147_, isClimbingZ -> isClimbing
METHODs com/starfish_studios/naturalist/common/entity/core/ClimbingAnimal/net/minecraft/world/entity/LivingEntity/m_6147_, isClimbingZ -> isClimbing
There were unfixable conflicts.

Now it's fixed

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.

1 participant