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.

Sign up for GitHub

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

Jump to bottom

Feature: Stereo Harmony Display #1324

Merged
merged 22 commits into from
Apr 10, 2024
Merged

Feature: Stereo Harmony Display #1324

merged 22 commits into from
Apr 10, 2024

Conversation

ItsEmpa
Copy link
Contributor

@ItsEmpa ItsEmpa commented Mar 31, 2024

Dependencies

What

Adds a Stereo Harmony Display, showing what vinyl the InfiniVacuum is currently playing and what pest spawns are boosted by it.

Images

image
image

Changelog New Features

  • Added Stereo Harmony Display. - Empa
    • Options to show/hide boosted crop and pest icons.

@hannibal002 hannibal002 added this to the Version 0.25 milestone Apr 1, 2024
@hannibal002 hannibal002 added the Soon This Pull Request will be merged within the next couple of betas label Apr 1, 2024
@github-actions GitHub Actions
Copy link

github-actions bot commented Apr 3, 2024

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 Apr 3, 2024
@github-actions GitHub Actions
Copy link

github-actions bot commented Apr 3, 2024

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

@ItsEmpa
Merge branch 'beta' into stereo-harmony-display
9646603 
# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
#	src/main/java/at/hannibal2/skyhanni/config/storage/ProfileSpecificStorage.java
@github-actions github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label Apr 3, 2024
@github-actions GitHub Actions
Copy link

github-actions bot commented Apr 3, 2024

Conflicts have been resolved! 🎉

@github-actions github-actions bot added the Merge Conflicts There are open merge conflicts with the beta branch. label Apr 4, 2024
@github-actions GitHub Actions
Copy link

github-actions bot commented Apr 4, 2024

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

@hannibal002
Merge branch 'beta' into fork/stereo-harmony-display
40355fb 
# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
@hannibal002
move
95aea5c
@github-actions GitHub Actions
Copy link

github-actions bot commented Apr 4, 2024

Conflicts have been resolved! 🎉

@github-actions github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label Apr 4, 2024
@hannibal002 hannibal002 added the Waiting on Dependency PR waiting for a dependency pr to be merged label Apr 7, 2024
@github-actions github-actions bot added the Merge Conflicts There are open merge conflicts with the beta branch. label Apr 7, 2024
@github-actions GitHub Actions
Copy link

github-actions bot commented Apr 7, 2024

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

@hannibal002 hannibal002 removed the Waiting on Dependency PR waiting for a dependency pr to be merged label Apr 7, 2024
@hannibal002 hannibal002 self-requested a review April 7, 2024 18:21
@hannibal002
Merge branch 'beta' into fork/stereo-harmony-display
d903e82 
# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt
hannibal002
hannibal002 requested changes Apr 7, 2024
View reviewed changes
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.

Code looks clean and the feature works fine!

A bit annoying to have this default enabled AND always visible.
please add the GardenAPI.isCurrentlyFarming() check and create a toggle "show always". Then either default disable the whole feature and have always in garden enabled, or default enable the feature but have this "always enabled" disabled.

Please add text here. Even if not necessary, just for consistency.
image

@ItsEmpa
Copy link
Contributor Author

ItsEmpa commented Apr 7, 2024

oops i had the config descriptions done but i must have forgotten to commit it, will do

@github-actions GitHub Actions
Copy link

github-actions bot commented Apr 7, 2024

Conflicts have been resolved! 🎉

@github-actions github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label Apr 7, 2024
@ItsEmpa ItsEmpa requested a review from hannibal002 April 8, 2024 08:35
@ItsEmpa ItsEmpa requested a review from CalMWolfs April 8, 2024 12:11
CalMWolfs
CalMWolfs approved these changes Apr 10, 2024
View reviewed changes
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.

code looks fine, didnt test in game

@hannibal002 hannibal002 merged commit 2ee1322 into hannibal002:beta Apr 10, 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 Apr 10, 2024
@ItsEmpa ItsEmpa deleted the stereo-harmony-display branch May 13, 2024 12:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@CalMWolfs CalMWolfs CalMWolfs approved these changes

@hannibal002 hannibal002 hannibal002 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
Version 0.25
Development

Successfully merging this pull request may close these issues.
4 participants
@ItsEmpa @hannibal002 @CalMWolfs @Thunderblade73