January upstream catchup. WIP #20
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
(cherry picked from commit 1fc9c37)
(cherry picked from commit e855bed)
* replace math expr parser with mXparser * metric suffix as constants * fix * how did this sneak back in * move parser methods to MathUtils (cherry picked from commit 6609d7b)
(cherry picked from commit 28fa4bb)
(cherry picked from commit 12329d6)
* list widget rewrite & fixes * funtime with generics * extreme slot amount test * fix scrolling going through widgets after hitting an edge * minor things (cherry picked from commit 3f7c5f4)
(cherry picked from commit 606032d)
(cherry picked from commit 134a975)
(cherry picked from commit 9ac3b65)
(cherry picked from commit 9efd2f7)
YannickMG
force-pushed
the
january-upstream-catchup
branch
from
631eb57 to
880b592
Compare
YannickMG
changed the title
|
I should be able to split this up into smaller PRs if desired. |
YannickMG
commented
Jan 27, 2025
serenibyss
approved these changes
Jan 28, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Catches up to master in terms. There is a bug when NEI is enabled where it overrides clicks on MUI2 inventory slots but it seems to predate any of the commits in this PR. I bisected it back to commit 8d90e33 and it probably should be addressed in a separate PR.