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

Plantable saplings, frost leaves drop saplings, tag changes to woods #615

Merged
merged 30 commits into from
May 15, 2024

Conversation

glubtier
Copy link
Member

@glubtier glubtier commented Apr 28, 2024

  • Saplings were made pottable
  • Frost leaves drop saplings and flowering frost leaves are available in creative tabs, as is the case with azalea/flowering azalea
  • Corrected various wood-related tags, mostly aspect, to allow for crafting of certain items such as composters
  • Modified Space aspect sapling texture

@kirderf1 kirderf1 added the enhancement New feature or request label Apr 28, 2024
@kirderf1
Copy link
Member

Do you want this released in a small update on 1.20.1, or should this go in somewhere over on 1.20.4?

@glubtier
Copy link
Member Author

Do you want this released in a small update on 1.20.1, or should this go in somewhere over on 1.20.4?

1.20.1 would probably be better, it technically should have been part of the trees release.

@glubtier
Copy link
Member Author

Snuck in a tiny little change to add wooden Slabs to the appropriate tags

@kirderf1
Copy link
Member

Looks like you accidentally deleted the entire "generated" folder in the last commit.

@glubtier
Copy link
Member Author

Looks like you accidentally deleted the entire "generated" folder in the last commit.

oh gosh I did delete the generated folder for unrelated issues and regenerated, and it looks like it only pushed the delete. Hopefully this fixes it.

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.

The tag changes ought to be referenced in the PR title/description. The space sapling texture change ought to be mentioned somewhere too.

@glubtier glubtier changed the title Plantable saplings, frost leaves drop saplings Plantable saplings, frost leaves drop saplings, tag changes to woods May 2, 2024
@glubtier
Copy link
Member Author

glubtier commented May 2, 2024

@kirderf1 I updated the PR. I included the space sapling there, but didn't add it to the change log... it was two pixels removed from each side so that it wouldn't stick out the sides of the pot. It felt a little cheeky to put it in the changelog lol. But I can if you think it's important!

@kirderf1
Copy link
Member

kirderf1 commented May 2, 2024

I included the space sapling there, but didn't add it to the change log... it was two pixels removed from each side so that it wouldn't stick out the sides of the pot. It felt a little cheeky to put it in the changelog lol. But I can if you think it's important!

Looks like the texture was also moved vertically. If nothing else, I think that deserves to be added to the "Fixed" part of the changelog.

@glubtier
Copy link
Member Author

glubtier commented May 8, 2024

I included the space sapling there, but didn't add it to the change log... it was two pixels removed from each side so that it wouldn't stick out the sides of the pot. It felt a little cheeky to put it in the changelog lol. But I can if you think it's important!

Looks like the texture was also moved vertically. If nothing else, I think that deserves to be added to the "Fixed" part of the changelog.

Oh... uh, huh. I was working off my work folder, I guess I changed it but forgot to upload it before the 4/13 update lol. Sure I'll add that.

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.

Alright nice! Just one clarification for the changelog and this should be good by me.

CHANGELOG.md Outdated Show resolved Hide resolved
@kirderf1 kirderf1 requested a review from Dweblenod May 13, 2024 19:44
Co-authored-by: kirderf1 <[email protected]>
Copy link
Member

@Dweblenod Dweblenod left a comment

Choose a reason for hiding this comment

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

Excellent work! I do have a few comments.

  • It looks like all the potted blocks should be added to the minecraft block tag "flower_pots"
  • The base of the frost saplings stick out of the pot a little bit. Im fine with it staying as is but thought I would point it out.

@glubtier
Copy link
Member Author

Excellent work! I do have a few comments.

* It looks like all the potted blocks should be added to the minecraft block tag "flower_pots"

* The base of the frost saplings stick out of the pot a little bit. Im fine with it staying as is but thought I would point it out.

ty, I can look at the tags later tonight, but until then do you have a screenshot of the frost sapling? I believe you, it just doesn't show that way on my screen.

@Dweblenod
Copy link
Member

Excellent work! I do have a few comments.

* It looks like all the potted blocks should be added to the minecraft block tag "flower_pots"

* The base of the frost saplings stick out of the pot a little bit. Im fine with it staying as is but thought I would point it out.

ty, I can look at the tags later tonight, but until then do you have a screenshot of the frost sapling? I believe you, it just doesn't show that way on my screen.

image

@Dweblenod Dweblenod merged commit 1a72692 into lunar-sway:1.20.1 May 15, 2024
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants