Fix Some Sentry Issues - #1026
Merged
Merged
Conversation
POLYPLUS3-1XS POLYPLUS3-29C POLYPLUS3-29D POLYPLUS3-29G POLYPLUS3-1Y2 POLYPLUS3-23T POLYPLUS3-27M
lunaynx
reviewed
Sep 2, 2026
lunaynx
left a comment
lunaynx
left a comment
Contributor
There was a problem hiding this comment.
Non-blocking, but lf imports 🙏
…compose/SkiaCtx.kt Co-authored-by: Luna <lunaynx@gmail.com>
…nfigMixinInit.java Co-authored-by: Luna <lunaynx@gmail.com>
…nfigMixinInit.java Co-authored-by: Luna <lunaynx@gmail.com>
…nfigMixinInit.java Co-authored-by: Luna <lunaynx@gmail.com>
…config/v1/ConfigManager.java Co-authored-by: Luna <lunaynx@gmail.com>
…config/v1/ConfigManager.java Co-authored-by: Luna <lunaynx@gmail.com>
Resolves the two conflicts introduced by upstream's "derive settings panel state from selection" refactor and the PolyComposeClock split: - HudDesignStudio: panelHud is now derived from selectedHuds/panelOpen, so the stale-HUD delete path no longer clears it by hand and OpenSettings sets panelOpen instead. - PolyComposeHost: the re-entrancy guard and Snapshot.global wrapper move onto PolyComposeClock.frame so both the hud and preview clocks get them.
Pr1026 merge
lowercasebtw
added a commit
to lowercasebtw/OneConfig
that referenced
this pull request
Sep 8, 2026
Resolves the two conflicts introduced by upstream's "derive settings panel state from selection" refactor and the PolyComposeClock split: - HudDesignStudio: panelHud is now derived from selectedHuds/panelOpen, so the stale-HUD delete path no longer clears it by hand and OpenSettings sets panelOpen instead. - PolyComposeHost: the re-entrancy guard and Snapshot.global wrapper move onto PolyComposeClock.frame so both the hud and preview clocks get them.
lowercasebtw
force-pushed
the
v1
branch
2 times, most recently
from
September 8, 2026 02:41
f52a3cd to
241332e
Compare
72, 71, 7C, 7A, 77, 7D, DS, T0, 9E, 1XR, 1B1, 29G, 29D, 29C, 2AR, 10B, 17R, 27M, BF, KC, 9, 10
# Conflicts: # minecraft/src/main/kotlin/org/polyfrost/oneconfig/internal/compat/SkyblockerCompat.kt # minecraft/src/main/kotlin/org/polyfrost/oneconfig/internal/ui/compose/SkiaCtx.kt
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
3 participants
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.
POLYPLUS3-1XS
POLYPLUS3-29C
POLYPLUS3-29D
POLYPLUS3-29G
POLYPLUS3-1Y2
POLYPLUS3-23T