Import all the things! #696
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
flowln
added
bug
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
launcher/minecraft/mod/DataPack.cpp
Outdated
Comment on lines
70
to
85
| switch (type) { | ||
| default: { | ||
| auto res = Resource::compare(other, type); | ||
| if (res.first != 0) | ||
| return res; | ||
| } | ||
| case SortType::PACK_FORMAT: { | ||
| auto this_ver = packFormat(); | ||
| auto other_ver = cast_other.packFormat(); | ||
|
|
||
| if (this_ver > other_ver) | ||
| return { 1, type == SortType::PACK_FORMAT }; | ||
| if (this_ver < other_ver) | ||
| return { -1, type == SortType::PACK_FORMAT }; | ||
| } | ||
| } |
Check notice
Code scanning / CodeQL
No trivial switch statements
|
with the latest commit this should fix #700 as well |
|
This should be rebased |
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
Ryex
force-pushed
the
import-all-the-things
branch
from
cc3b244
to
47381a1
Compare
flowln
reviewed
Jan 9, 2023
|
btw, 47381a1 has some typos in the description :P |
fixed by properly converting from a file path and converting to native seperators. should have known naive handling of file path as a URL would come back to bite us cross platform. Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
Ryex
force-pushed
the
import-all-the-things
branch
from
47381a1
to
aa550d7
Compare
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
Ryex
force-pushed
the
import-all-the-things
branch
from
aa550d7
to
574af2c
Compare
Scrumplex
reviewed
Jan 13, 2023
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net> Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
Ryex
force-pushed
the
import-all-the-things
branch
from
d05365e
to
f7b0ba8
Compare
|
fixed |
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.
Based off #576
Fixes #581
Fixes #700
-Iflag to be passed multiple times-Iflag and though tacked on at the end without flags are treated the same are functionally identical