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: Custom Scoreboard Lines #2048

Draft
wants to merge 337 commits into
base: beta
Choose a base branch
from
Draft

Feature: Custom Scoreboard Lines #2048

wants to merge 337 commits into from

Conversation

j10a1n15
Copy link
Contributor

@j10a1n15 j10a1n15 commented Jun 9, 2024 •
edited
Loading

hi remove this stupid label
this pr is something what you call a draft

@j10a1n15 j10a1n15 marked this pull request as draft June 9, 2024 18:11
@j10a1n15 j10a1n15 mentioned this pull request Jun 9, 2024
Closed
@github-actions github-actions bot added the Merge Conflicts There are open merge conflicts with the beta branch. label Jun 10, 2024
@github-actions GitHub Actions
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
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 Jun 10, 2024
@github-actions GitHub Actions
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 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 Jun 12, 2024
@github-actions GitHub Actions
Copy link

Conflicts have been resolved! 🎉

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

Conflicts have been resolved! 🎉

@github-actions github-actions bot added the Merge Conflicts There are open merge conflicts with the beta branch. label Jun 13, 2024
@github-actions GitHub Actions
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 removed the Merge Conflicts There are open merge conflicts with the beta branch. label Jun 14, 2024
@github-actions GitHub Actions
Copy link

Conflicts have been resolved! 🎉

j10a1n15 and others added 10 commits June 22, 2024 00:39
@j10a1n15
add todo
42da904 
Signed-off-by: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
@hannibal002
formatting
c7b5ee5
@hannibal002
Merge branch 'refs/heads/beta' into fork/j10a1n15/chunked
c76a036
@hannibal002
fix
5fc2d09
@hannibal002
do not use Supplier
c633a20
@hannibal002
Merge branch 'refs/heads/beta' into fork/j10a1n15/chunked
abdeea5
@hannibal002
enum is singular
29dbaa4
@j10a1n15
applied default config schema to chunked appearance
61df074 
Signed-off-by: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
@j10a1n15
Merge branch 'refs/heads/beta' into backend/scoreboard-refactor
d30433f 
# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardElements.kt
#	src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardEvent.kt
@j10a1n15
fix merge
502095c 
Signed-off-by: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
@github-actions github-actions bot added the Merge Conflicts There are open merge conflicts with the beta branch. label Jun 22, 2024
@github-actions GitHub Actions
Copy link

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

j10a1n15 and others added 3 commits October 18, 2024 17:57
@j10a1n15
hannibal2 — Today at 17:56
c68a506 
bump to 63

Signed-off-by: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
@ItsEmpa
bump migrator
ea71366
@j10a1n15
Merge remote-tracking branch 'SillyTM/backend/scoreboard-refactor' in…
90d85d2 
…to backend/scoreboard-refactor
@github-actions github-actions bot added the Merge Conflicts There are open merge conflicts with the beta branch. label Oct 18, 2024
@github-actions GitHub Actions
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 removed the Merge Conflicts There are open merge conflicts with the beta branch. label Oct 18, 2024
@github-actions GitHub Actions
Copy link

Conflicts have been resolved! 🎉

@github-actions github-actions bot added the Wrong Title/Changelog There is an error in the title or changelog label Oct 18, 2024
@github-actions GitHub Actions
Copy link

I have detected some issues with your pull request:

Body issues:
Author is not set in text: + Cool new feature. - your_name_here
Change should start with a capital letter in text: extra info
Change should end with a full stop in text: extra info
Author is not set in text: + Improved cool feature. - your_name_here
Extra info is not filled out in text: * Extra info.
Author is not set in text: + Fixed cool feature. - your_name_here
Extra info is not filled out in text: * Extra info.
Author is not set in text: + Something technical you changed in the backend. - your_name_here
Extra info is not filled out in text: * Extra info.
Author is not set in text: + Removed cool feature. - your_name_here
Extra info is not filled out in text: * Extra info.

Please fix these issues. For the correct format, refer to the pull request template.

@github-actions GitHub Actions
Copy link

I have detected some issues with your pull request:

Body issues:
No changes detected in this pull request

Please fix these issues. For the correct format, refer to the pull request template.

1 similar comment
@github-actions GitHub Actions
Copy link

I have detected some issues with your pull request:

Body issues:
No changes detected in this pull request

Please fix these issues. For the correct format, refer to the pull request template.

@j10a1n15 j10a1n15 mentioned this pull request Oct 18, 2024
Merged
@CalMWolfs CalMWolfs removed the Wrong Title/Changelog There is an error in the title or changelog label Oct 18, 2024
@j10a1n15
Merge branch 'beta' into feature/custom-scoreboard-custom-lines
9da567d
@j10a1n15
Merge branch 'hannibal002:beta' into feature/custom-scoreboard-custom…
91f9e87 
…-lines
@j10a1n15
Merge branch 'hannibal002:beta' into feature/custom-scoreboard-custom…
7e7cafd 
…-lines
@j10a1n15
fix command
8c6644e 
Signed-off-by: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
@j10a1n15
Merge remote-tracking branch 'origin/feature/custom-scoreboard-custom…
d2b58a8 
…-lines' into feature/custom-scoreboard-custom-lines
@j10a1n15
fix detekt
6d2a8f2 
Signed-off-by: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
@j10a1n15
Merge branch 'beta' into feature/custom-scoreboard-custom-lines
44291a8
@j10a1n15
rename
ddbfd5f 
Signed-off-by: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
@j10a1n15
move some things
5e16878 
Signed-off-by: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
@github-actions github-actions bot added the Detekt Has detekt problem label Nov 3, 2024
@j10a1n15
Merge branch 'beta' into feature/custom-scoreboard-custom-lines
daf74df
@j10a1n15
deprecated methods
39b879c 
Signed-off-by: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
@j10a1n15
fix build
882f45c 
Signed-off-by: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
@github-actions github-actions bot removed the Detekt Has detekt problem label Nov 20, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

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