Repository navigation
chore: merge Modrinth upstream (sync 1) - #107
Merged
Merged
Conversation
…th#8091) * feat: add field error message for invalid custom license name * pnpm prepr
Merged cleanly.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Daily merge of
modrinth/main(2 new commits). Both touch only pathsupstream.jsonignores, so this merge changes no files in our tree. It records the upstream parent so the next sync starts from here.New features
apps/frontendand labrinth's payouts queue, both ignored. Amberite has no creator payouts.apps/frontend, which is ignored.Ported to our backend
Nothing. No commits touched the labrinth watch paths.
Fixes you get for free
None this round.
Ignored 2 commits
a272958ceandf00f64529, bothapps/frontendandapps/labrinthpayouts only.Conflicts
None. The workflow's merge did rewrite
pnpm-lock.yaml(oxlint 1.88 to 1.89, rollup 4.63.6 to 4.57.1 in a few peer entries,@napi-rs/lzma-linux-x64-gnudropped) even though no manifest changed on either side.scripts/upstream-sync.tsrebuilds the lockfile from Modrinth's copy with--no-frozen-lockfile, which re-resolves caret ranges. I restored our lockfile in the merge commit so this PR carries no dependency drift. Worth a follow-up so the script keeps our lockfile when no manifest changed.No checks run: the merge tree is identical to
mainate33306148.Merge with a merge commit. Never squash or rebase: the sync needs both parents.
Changes made by Claude Opus 5.5 (
claude-opus-5-5) in Claude Code, running in T3 Code.🤖 Generated with Claude Code