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

Quick Nav Refactor and Clean Up, 2 Extra Tabs, Config Version 3, Config Data Fixer Refactor, Debug Dump Hovered Item Tool #643

Merged
merged 10 commits into from
May 20, 2024

Conversation

VeritasDL
Copy link
Contributor

added 2 extra quick nav tabs and tweaked rendering to accommodate the new tabs

@LifeIsAParadox LifeIsAParadox added the wip This PR is a work in progress label Apr 8, 2024
@VeritasDL VeritasDL marked this pull request as ready for review April 8, 2024 20:30
@LifeIsAParadox LifeIsAParadox added reviews needed This PR needs reviews and removed wip This PR is a work in progress labels Apr 8, 2024
@kevinthegreat1 kevinthegreat1 added the bleeding edge This PR has been accepted into bleeding edge label Apr 12, 2024
@kevinthegreat1
Copy link
Collaborator

Thank you for your pull request. This is a great pr but there seems to be some slight disagreement due to the reordering of this feature. In addition with the large volume of pr's we have right now, please allow some time for review. Your pr has been put in bleeding edge, and you can download the newest bleeding edge build here.

@VeritasDL
Copy link
Contributor Author

I think I've added a working config for disabling the extra tabs, I'm sure the codes straight spaghetti but ¯_(ツ)_/¯

@kevinthegreat1
Copy link
Collaborator

I said this on discord but just so the information is on GitHub too:

Since this restructures the config, we're waiting until 1.20.5 is merged and will include this when we overhaul the config, to not mess up people's quick nav configs, which will likely be the next update.

Marking as wip for now.

@kevinthegreat1 kevinthegreat1 added wip This PR is a work in progress and removed reviews needed This PR needs reviews labels May 4, 2024
@LifeIsAParadox LifeIsAParadox added merge conflicts This PR has merge conflicts that need solving. reviews needed This PR needs reviews and removed wip This PR is a work in progress merge conflicts This PR has merge conflicts that need solving. labels May 9, 2024
@VeritasDL VeritasDL closed this May 9, 2024
@LifeIsAParadox LifeIsAParadox removed reviews needed This PR needs reviews labels May 9, 2024
@VeritasDL VeritasDL reopened this May 9, 2024
@LifeIsAParadox LifeIsAParadox added reviews needed This PR needs reviews labels May 9, 2024
@kevinthegreat1 kevinthegreat1 removed the bleeding edge This PR has been accepted into bleeding edge label May 11, 2024
@kevinthegreat1
Copy link
Collaborator

Conflicts with datafixer pr. Will need to wait for #701 to be merged.

@kevinthegreat1 kevinthegreat1 added good first issue Welcome new contributors :) wip This PR is a work in progress and removed reviews needed This PR needs reviews labels May 12, 2024
@kevinthegreat1
Copy link
Collaborator

Hey can you please do a quick rebase? Then I can add the config shifting and data fixer stuff, unless you want to do it.

@kevinthegreat1 kevinthegreat1 added changes requested This PR need changes and removed wip This PR is a work in progress labels May 14, 2024
@kevinthegreat1
Copy link
Collaborator

Basically rewrote quick nav.
Screenshot 2024-05-15 at 16 48 29Screenshot 2024-05-15 at 16 48 37

@kevinthegreat1 kevinthegreat1 added the bleeding edge This PR has been accepted into bleeding edge label May 16, 2024
@kevinthegreat1 kevinthegreat1 added this to the 1.21 milestone May 16, 2024
kevinthegreat1
kevinthegreat1 previously approved these changes May 18, 2024
@LifeIsAParadox LifeIsAParadox added merge me please Pull requests that are ready to merge and removed reviews needed This PR needs reviews labels May 18, 2024
@LifeIsAParadox LifeIsAParadox added reviews needed This PR needs reviews and removed merge me please Pull requests that are ready to merge labels May 18, 2024
kevinthegreat1
kevinthegreat1 previously approved these changes May 18, 2024
@LifeIsAParadox LifeIsAParadox added merge me please Pull requests that are ready to merge and removed reviews needed This PR needs reviews labels May 18, 2024
@LifeIsAParadox LifeIsAParadox added changes requested This PR need changes and removed merge me please Pull requests that are ready to merge labels May 19, 2024
@LifeIsAParadox LifeIsAParadox added merge me please Pull requests that are ready to merge and removed reviews needed This PR needs reviews labels May 20, 2024
@kevinthegreat1 kevinthegreat1 changed the title added 2 extra quick nav tabs Quick Nav Refactor and Clean Up, 2 Extra Tabs, Config Version 3, Config Data Fixer Refactor, Debug Dump Hovered Item Tool May 20, 2024
@kevinthegreat1 kevinthegreat1 merged commit 5366812 into SkyblockerMod:master May 20, 2024
1 check passed
@LifeIsAParadox LifeIsAParadox removed the merge me please Pull requests that are ready to merge label May 20, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bleeding edge This PR has been accepted into bleeding edge good first issue Welcome new contributors :)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants