Skip to content

Better Combat Compat with Hemalurgy#222

Open
RequestingKidney wants to merge 4 commits into
leafreynolds:feature/1.21.1/port_1.20.1_to_1.21.1from
RequestingKidney:better_combat_compat
Open

Better Combat Compat with Hemalurgy#222
RequestingKidney wants to merge 4 commits into
leafreynolds:feature/1.21.1/port_1.20.1_to_1.21.1from
RequestingKidney:better_combat_compat

Conversation

@RequestingKidney

Copy link
Copy Markdown
Contributor

Changes proposed in this pull request:

Better Combat Compat with Hemalurgy plus room for more later

Testing checklist:

  • yes I tested this in a runServer environment, and therefore won't make leaf cry
  • yes, I actually connected to that server and verified it worked and don't need to have my kneecaps removed
  • [no] yes, I also tested the built jars manually outside of the development environment, because problems sometimes don't show up inside the dev environment.

…t_compat

# Conflicts:
#	src/datagen/generated/cosmeretools/.cache/dd0552f4815307fa79918bc7fddf7e3ebb5df25c
#	src/datagen/generated/cosmeretools/data/minecraft/tags/item/axes.json
#	src/datagen/generated/cosmeretools/data/minecraft/tags/item/hoes.json
#	src/datagen/generated/cosmeretools/data/minecraft/tags/item/pickaxes.json
#	src/datagen/generated/cosmeretools/data/minecraft/tags/item/shovels.json
#	src/datagen/generated/cosmeretools/data/minecraft/tags/item/swords.json
#	src/datagen/generated/surgebinding/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e
@leafreynolds

Copy link
Copy Markdown
Owner

There's been a preference to not use the claude 1.21.1 port, so I will get you to switch the target branch to merge changes over to feature/1.21.1/human_port_1.21.1 :) sorry

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