Skip to content
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

Backend: PetAPI V2 #3042

Open
wants to merge 89 commits into
base: beta
Choose a base branch
from

Conversation

DavidArthurCole
Copy link
Contributor

@DavidArthurCole DavidArthurCole commented Dec 10, 2024

What

Continuation PR of #2605, reforming the PetAPI in preparations for overhauling the active pet display. This does a little more work on top of what @martimavocado had done, to clean up the way data is being populated - as such, this PR is based on his branch.

What was previously PetAPI has now been split into:

  • Data loading & parsing helpers stored in PetData
  • Data loading happens in CurrentPetAPI
  • Utils related to pets in general moved to PetUtils

Changelog Technical Details

  • Revamped PetAPI. - martimavocado & Daveed
    • Refactored to CurrentPetAPI, PetUtils, and PetData.

Copy link

github-actions bot commented Jan 4, 2025

Conflicts have been resolved! 🎉

@github-actions github-actions bot added the Merge Conflicts There are open merge conflicts with the beta branch. label Jan 7, 2025
Copy link

github-actions bot commented Jan 7, 2025

This pull request has conflicts with the base branch "beta". Please resolve those so we can test out your changes.

@github-actions github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label Jan 7, 2025
Copy link

github-actions bot commented Jan 7, 2025

Conflicts have been resolved! 🎉

@github-actions github-actions bot added the Merge Conflicts There are open merge conflicts with the beta branch. label Jan 8, 2025
Copy link

github-actions bot commented Jan 8, 2025

This pull request has conflicts with the base branch "beta". Please resolve those so we can test out your changes.

# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/ExperimentationTableAPI.kt
#	src/main/java/at/hannibal2/skyhanni/features/misc/pets/CurrentPetDisplay.kt
@github-actions github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label Jan 8, 2025
Copy link

github-actions bot commented Jan 8, 2025

Conflicts have been resolved! 🎉

@github-actions github-actions bot added the Merge Conflicts There are open merge conflicts with the beta branch. label Jan 9, 2025
Copy link

github-actions bot commented Jan 9, 2025

This pull request has conflicts with the base branch "beta". Please resolve those so we can test out your changes.

@github-actions github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label Jan 9, 2025
Copy link

github-actions bot commented Jan 9, 2025

Conflicts have been resolved! 🎉

Copy link

This pull request has conflicts with the base branch "beta". Please resolve those so we can test out your changes.

@github-actions github-actions bot added the Merge Conflicts There are open merge conflicts with the beta branch. label Jan 12, 2025
@github-actions github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label Jan 12, 2025
Copy link

Conflicts have been resolved! 🎉

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Backend A backend pull request that will be merged soon
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants