Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: edward and josediya #365

Draft
wants to merge 6 commits into
base: 1.21.0-develop
Choose a base branch
from
Draft

Conversation

bconlon1
Copy link
Contributor

No description provided.

@bconlon1 bconlon1 added the status/in-progress The issue is currently being worked on. label Jul 11, 2024
bconlon1 added 4 commits July 11, 2024 20:58
# Conflicts:
#	src/generated/resources/assets/aether_ii/lang/en_us.json
#	src/main/java/com/aetherteam/aetherii/client/renderer/AetherIIModelLayers.java
#	src/main/java/com/aetherteam/aetherii/entity/AetherIIEntityTypes.java
@bconlon1 bconlon1 changed the title feat: edward feat: edward and josediya Jul 28, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
status/in-progress The issue is currently being worked on.
Projects
Status: In Progress
Development

Successfully merging this pull request may close these issues.

1 participant