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

Feature: Hotm Features + Hotm API/Data #1059

Merged
merged 65 commits into from
May 30, 2024

Conversation

Thunderblade73
Copy link
Contributor

@Thunderblade73 Thunderblade73 commented Feb 25, 2024

Point of focus of this PR ist the Hotm API, which gives every data that could be needed from the hotm tree. The features are only there so that the PR can be test (If more detailed testing is need revert 243a4c2) and since there also useful for the user they are full features.

Preview

image
image

Changelog New Features

  • Added HOTM perks level and Enable Display. - Thunderblade73

Changelog Technical Details

  • Added HotmAPI. - Thunderblade73 & j10a1n15 & martimavocado

Thunderblade73 and others added 12 commits December 29, 2023 14:33
# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
#	src/main/java/at/hannibal2/skyhanni/config/Storage.java
#	src/main/java/at/hannibal2/skyhanni/utils/StringUtils.kt
This reverts commit 2ed9de7.
Copy link
Collaborator

@jani270 jani270 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

image
😠

@hannibal002 hannibal002 added this to the Version 0.24 milestone Feb 25, 2024
@jani270 jani270 dismissed their stale review February 25, 2024 17:22

. looks good

@jani270 jani270 removed their request for review February 25, 2024 17:22
@hannibal002 hannibal002 changed the title Feature/Backend: Hotm Features + Hotm API/Data Feature: Hotm Features + Hotm API/Data Mar 13, 2024
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 Mar 15, 2024
# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/config/Storage.java
Copy link

Conflicts have been resolved! 🎉

@github-actions github-actions bot added Merge Conflicts There are open merge conflicts with the beta branch. and removed Merge Conflicts There are open merge conflicts with the beta branch. labels Mar 16, 2024
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 May 24, 2024
Copy link

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/utils/TimeLimitedCache.kt
Copy link

Conflicts have been resolved! 🎉

@github-actions github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label May 24, 2024
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 May 26, 2024
@github-actions github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label May 26, 2024
Copy link

Conflicts have been resolved! 🎉

@hannibal002 hannibal002 added the Soon This Pull Request will be merged within the next couple of betas label May 28, 2024
Copy link
Owner

@hannibal002 hannibal002 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

look at #1564 (review)

Copy link
Collaborator

@CalMWolfs CalMWolfs left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

just a few code things I saw

src/main/java/at/hannibal2/skyhanni/api/HotmAPI.kt Outdated Show resolved Hide resolved
src/main/java/at/hannibal2/skyhanni/utils/StringUtils.kt Outdated Show resolved Hide resolved
src/main/java/at/hannibal2/skyhanni/data/HotmData.kt Outdated Show resolved Hide resolved
src/main/java/at/hannibal2/skyhanni/data/HotmData.kt Outdated Show resolved Hide resolved
Copy link
Owner

@hannibal002 hannibal002 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

crash on startup

src/main/java/at/hannibal2/skyhanni/api/HotmAPI.kt Outdated Show resolved Hide resolved
@hannibal002 hannibal002 merged commit 6b0e324 into hannibal002:beta May 30, 2024
3 checks passed
@github-actions github-actions bot removed the Soon This Pull Request will be merged within the next couple of betas label May 30, 2024
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