Use bulk endpoint for scanning #170
Conversation
added modrinth support
Update to ferinth 2.3 Update readme Fix find dupe function bug Switched to FO for modpack tests
added modrinth support
and update dependencies
|
|
|
i appear to have done a poor job at merging upstream sorry about that (mainly towards sidit77 as this does not involve you at all) |
fix gorilla-devs#139, fix gorilla-devs#169, and fix gorilla-devs#152
|
just a thought... you shouldn't have been using git merge in the first place. if you were working on your local tree and it was out of date compared to upstream, you should have done a git interactive rebase on the upstream branch. that would apply your commits on top of the upstream branch and would prompt you with any conflicts which you might need to fix with the mess you have now, it would be best to just just apply one commit on top of upstream |
|
Yeah giving up and squashing things is probably the way to go :P. If you have time you could probably spend some time rebasing and splitting things up sensibly, that would be the best thing to do, but that'll probably take a bit |
No description provided.