Skip to content

Conversation

@catgirlseraid
Copy link
Contributor

dependant on

added tooltips and a bunch of other changes to the above pr

CalMWolfs and others added 21 commits May 10, 2024 11:56
# 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
NopoTheGamer previously approved these changes May 12, 2024
@catgirlseraid catgirlseraid changed the title Add Hoppity page tooltips Add polish and fix hoppity tooltips May 22, 2024
@catgirlseraid catgirlseraid changed the title Add polish and fix hoppity tooltips Add hoppity pv page but good May 22, 2024
@catgirlseraid catgirlseraid changed the title Add hoppity pv page but good Add more detail to hoppity pv page May 22, 2024
@jani270
Copy link
Collaborator

jani270 commented May 23, 2024

Also conflict resolve when 🧌

catgirlseraid and others added 2 commits May 24, 2024 12:08
…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 NopoTheGamer merged commit 320e81b into NotEnoughUpdates:master 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>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants