Skip to content

More cleanup #396

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
Merged
merged 12 commits into from
Nov 3, 2023
Merged

More cleanup #396

merged 12 commits into from
Nov 3, 2023

Conversation

msg-programs
Copy link
Contributor

Just some small things bugging me. Apart from actual cleanup, the following things have changed:

  • Creeper beams colors, should be more differentiable now but I'm still not sure if this is optimal.
  • Add color to puzzle status icon on the dungeon widget.
  • Forge widget doesn't show "Done in: Ready!" but instead only shows "Ready!"

@msg-programs
Remove unused variable.
246472a 
layer(1|2)Count is used to shrink status bars on the same layer
when above the hotbar, but bars set to "right" always have the same width.
@msg-programs
Remove unused import
1d1a901
@msg-programs
Remove whitespace in otherwise empty lines
8dcc050
@msg-programs
Update colors to be a bit more differentiable
130ebd5
@msg-programs
Fix typo
91ed6ea
@msg-programs
Remove duplicated method.
73f388a
@msg-programs
Add color to dungeon puzzle status on widget
d67f67f
@msg-programs
Add special case for when forged items are ready to be received
1df4ef8
@msg-programs
Merge branch 'master' of https://github.com/SkyblockerMod/Skyblocker …
d560c46 
…into cleanup-2

# Conflicts:
#	src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java
#	src/main/java/de/hysky/skyblocker/utils/Http.java
#	src/main/java/de/hysky/skyblocker/utils/render/title/TitleContainerConfigScreen.java

Pull changes from upstream master
@msg-programs
Delete more whitespace on empty lines.
a01aa5b
@AzureAaron AzureAaron added the reviews needed This PR needs reviews label Oct 31, 2023
@AzureAaron AzureAaron added merge me please Pull requests that are ready to merge and removed reviews needed This PR needs reviews labels Nov 3, 2023
@AzureAaron AzureAaron merged commit bcec597 into SkyblockerMod:master Nov 3, 2023
@AzureAaron AzureAaron removed the merge me please Pull requests that are ready to merge label Nov 3, 2023
@kevinthegreat1 kevinthegreat1 mentioned this pull request Nov 9, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@AzureAaron AzureAaron AzureAaron approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@msg-programs @AzureAaron