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.

Sign up for GitHub

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

Jump to bottom

Aspect block item pairs #640

Merged
merged 10 commits into from
Dec 3, 2024
Merged

Aspect block item pairs #640

merged 10 commits into from
Dec 3, 2024

Conversation

glubtier
Copy link
Member

@glubtier glubtier commented Oct 8, 2024

  • Migrated Aspect tree blocks to ItemBlockPairs and updated related references
  • Signs were not migrated, since they are not one block to one item
  • Added signs to MINEABLE_WITH_AXE tag (not added to changelog as there is no 1.21 changelog yet.)

@kirderf1 kirderf1 changed the base branch from 1.21 to main October 9, 2024 05:54
@glubtier
Copy link
Member Author

@kirderf1 Wanted to check in where this is at. Know everyone's busy, just didn't want it to get lost, and I'm waiting for it to be done so I can move onto moons.

@kirderf1 kirderf1 added enhancement New feature or request cleanup Patching up existing code bug Something isn't working as it should and removed enhancement New feature or request labels Nov 23, 2024
@kirderf1 kirderf1 self-requested a review November 23, 2024 19:55
@glubtier
Merge branch 'main' into AspectBlockItemPairs
4d290c2 
# Conflicts:
#	src/main/java/com/mraof/minestuck/block/AspectTreeBlocks.java
@glubtier
Update for 1.21 changes
f3b18ae
@glubtier
Copy link
Member Author

Updated for 1.21.1

kirderf1
kirderf1 reviewed Nov 28, 2024
View reviewed changes
Copy link
Member

@kirderf1 kirderf1 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now that this is up to date with the main branch, you should add any data changes/fixes to the changelog.

src/main/java/com/mraof/minestuck/block/AspectTreeBlocks.java Show resolved Hide resolved
src/main/java/com/mraof/minestuck/data/AspectTreeBlocksData.java Show resolved Hide resolved
@glubtier
Copy link
Member Author

glubtier commented Dec 3, 2024

Now that this is up to date with the main branch, you should add any data changes/fixes to the changelog.

Fixes done, I added making signs mineable with axes to the changelog but I don't think the rest is relevant.

@kirderf1 kirderf1 merged commit a8d4c0c into lunar-sway:main Dec 3, 2024
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@github-actions github-actions[bot] github-actions[bot] left review comments

@kirderf1 kirderf1 kirderf1 approved these changes

Assignees
No one assigned
Labels
bug Something isn't working as it should cleanup Patching up existing code
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@glubtier @kirderf1