-
Notifications
You must be signed in to change notification settings - Fork 149
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
Add more detail to hoppity pv page #1160
Merged
NopoTheGamer
merged 34 commits into
NotEnoughUpdates:master
from
catgirlseraid:hoppity-page-tooltips
May 31, 2024
Merged
Add more detail to hoppity pv page #1160
NopoTheGamer
merged 34 commits into
NotEnoughUpdates:master
from
catgirlseraid:hoppity-page-tooltips
May 31, 2024
Conversation
This file contains 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
# 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
nea89o
previously requested changes
May 13, 2024
src/main/kotlin/io/github/moulberry/notenoughupdates/miscfeatures/profileviewer/HoppityPage.kt
Outdated
Show resolved
Hide resolved
catgirlseraid
changed the title
Add Hoppity page tooltips
Add polish and fix hoppity tooltips
May 22, 2024
catgirlseraid
changed the title
Add polish and fix hoppity tooltips
Add hoppity pv page but good
May 22, 2024
catgirlseraid
changed the title
Add hoppity pv page but good
Add more detail to hoppity pv page
May 22, 2024
jani270
reviewed
May 23, 2024
src/main/kotlin/io/github/moulberry/notenoughupdates/miscfeatures/profileviewer/HoppityPage.kt
Outdated
Show resolved
Hide resolved
Also conflict resolve when 🧌 |
…res/profileviewer/HoppityPage.kt Co-authored-by: jani270 <[email protected]>
# Conflicts: # src/main/java/io/github/moulberry/notenoughupdates/profileviewer/data/APIDataJson.java
NopoTheGamer
force-pushed
the
hoppity-page-tooltips
branch
from
May 29, 2024 10:21
b713bbf
to
42506ee
Compare
NopoTheGamer
approved these changes
May 29, 2024
ThatGravyBoat
approved these changes
May 31, 2024
Merged
Lulonaut
approved these changes
May 31, 2024
src/main/kotlin/io/github/moulberry/notenoughupdates/util/KotlinNumberUtils.kt
Show resolved
Hide resolved
heinrich26
pushed a commit
to heinrich26/NotEnoughUpdates
that referenced
this pull request
Jun 29, 2024
Co-authored-by: jani270 <[email protected]> Co-authored-by: Cal <[email protected]> Co-authored-by: SeRaid <[email protected]> Co-authored-by: nopo <[email protected]>
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.
dependant on
added tooltips and a bunch of other changes to the above pr