This repository was archived by the owner on Feb 24, 2026. It is now read-only.
Add more detail to hoppity pv page#1160
Merged
NopoTheGamer merged 34 commits intoNotEnoughUpdates:masterfrom May 31, 2024
catgirlseraid:hoppity-page-tooltips
Merged
Add more detail to hoppity pv page#1160NopoTheGamer merged 34 commits intoNotEnoughUpdates:masterfrom catgirlseraid:hoppity-page-tooltips
NopoTheGamer merged 34 commits intoNotEnoughUpdates:masterfrom
catgirlseraid:hoppity-page-tooltips
Conversation
# Conflicts: # src/main/kotlin/io/github/moulberry/notenoughupdates/miscfeatures/profileviewer/HoppityPage.kt
# Conflicts: # src/main/kotlin/io/github/moulberry/notenoughupdates/miscfeatures/profileviewer/HoppityPage.kt
# Conflicts: # src/main/kotlin/io/github/moulberry/notenoughupdates/miscfeatures/profileviewer/HoppityPage.kt
# Conflicts: # src/main/kotlin/io/github/moulberry/notenoughupdates/miscfeatures/profileviewer/HoppityPage.kt
# Conflicts: # src/main/java/io/github/moulberry/notenoughupdates/profileviewer/data/APIDataJson.java # src/main/kotlin/io/github/moulberry/notenoughupdates/miscfeatures/profileviewer/HoppityPage.kt
NopoTheGamer
previously approved these changes
May 12, 2024
lineargraph
previously requested changes
May 13, 2024
catgirlseraid
changed the title
catgirlseraid
changed the title
catgirlseraid
changed the title
jani270
reviewed
May 23, 2024
Collaborator
|
Also conflict resolve when 🧌 |
…res/profileviewer/HoppityPage.kt Co-authored-by: jani270 <69345714+jani270@users.noreply.github.com>
# Conflicts: # src/main/java/io/github/moulberry/notenoughupdates/profileviewer/data/APIDataJson.java
NopoTheGamer
approved these changes
May 29, 2024
ThatGravyBoat
approved these changes
May 31, 2024
Merged
Lulonaut
approved these changes
May 31, 2024
heinrich26
pushed a commit
to heinrich26/NotEnoughUpdates
that referenced
this pull request
Jun 29, 2024
Co-authored-by: jani270 <69345714+jani270@users.noreply.github.com> Co-authored-by: Cal <cwolfson58@gmail.com> Co-authored-by: SeRaid <77941535+SeRaid743@users.noreply.github.com> Co-authored-by: nopo <nopotheemail@gmail.com>
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 subscribe to this conversation on GitHub.
Already have an account?
Sign in.
7 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.
dependant on
added tooltips and a bunch of other changes to the above pr