Skip to content

Vanquish my eternal adversary for ever #351

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
Merged
merged 25 commits into from
Oct 12, 2025
Merged

Vanquish my eternal adversary for ever #351

merged 25 commits into from
Oct 12, 2025

Conversation

Seggan
Copy link
Member

@Seggan Seggan commented Sep 30, 2025

Also performance improvements

@Seggan Seggan requested a review from a team September 30, 2025 15:56
@Seggan
Copy link
Member Author

Seggan commented Sep 30, 2025

The issues are linked to the individual commits so theyll be closed once this is merged

@Seggan Seggan linked an issue Oct 1, 2025 that may be closed by this pull request
Text colors disappeared after newline automatically #355
Closed
@Seggan Seggan mentioned this pull request Oct 3, 2025
Closed
LordIdra
LordIdra requested changes Oct 3, 2025
View reviewed changes
Copy link
Contributor

@LordIdra LordIdra left a comment

Choose a reason for hiding this comment

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

Items without any lore specified seem to have a single blank line as lore. Otherwise looks good.

@LordIdra
Copy link
Contributor

LordIdra commented Oct 3, 2025

image

(sorry)

@LordIdra
Copy link
Contributor

LordIdra commented Oct 3, 2025

^^^^^ happens in the recipe view for fiber

@OhmV-IR
Copy link
Contributor

OhmV-IR commented Oct 4, 2025 •
edited
Loading

lgtm cw, just idra's bugs + this one, can the No Effects line be removed?
image

@Seggan
Copy link
Member Author

Seggan commented Oct 5, 2025

lgtm cw, just idra's bugs + this one, can the No Effects line be removed?
image

Yes, but that's a thing that should be applied by the item itself and is out of scope of the PR

@Seggan
Merge branch 'master' into rewrite/translation-take-three
6d05e3d 
# Conflicts:
#	pylon-core/src/main/kotlin/io/github/pylonmc/pylon/core/item/builder/ItemStackBuilder.kt
@Seggan Seggan requested a review from LordIdra October 6, 2025 20:23
@Seggan Seggan requested a review from JustAHuman-xD October 7, 2025 02:25
@Seggan Seggan requested a review from JustAHuman-xD October 7, 2025 14:48
@Seggan
Copy link
Member Author

Seggan commented Oct 7, 2025

Also updated enws translations, fixes #392

@Seggan Seggan linked an issue Oct 7, 2025 that may be closed by this pull request
Inconsistent en.yml and enws.yml #392
Closed
58 tasks
@LordIdra
Copy link
Contributor

image

need to remove line breaks now that that's fixed

@LordIdra
Copy link
Contributor

I'll just do that now (may as well) and push if that's OK. am happy after that

@LordIdra LordIdra merged commit 6fb5ca8 into master Oct 12, 2025
1 check passed
@LordIdra LordIdra deleted the rewrite/translation-take-three branch October 12, 2025 01:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@LordIdra LordIdra LordIdra approved these changes

@JustAHuman-xD JustAHuman-xD Awaiting requested review from JustAHuman-xD

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Inconsistent en.yml and enws.yml Text colors disappeared after newline automatically

4 participants

@Seggan @LordIdra @OhmV-IR @JustAHuman-xD