Merge some fixes from the dev branch to master #293
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
1zc
changed the title
Bara
approved these changes
Sep 5, 2021
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.
The dev branch has a lot of commits and fixes, many of them being things that not everyone should run. However, there are a few fixes in the branch that ought to be in the master branch since they are easy to test and resolve issues that have been in the timer since 285 or improve the way some things are done.
This pull request aims to merge some of the simpler fixes and commits from the dev branch, so people don't need to manually cherry-pick these commits themselves when cloning SurfTimer. (Since we are actively merging things into the master branch, I figured this would be a good thing to do!)
Full disclosure: this is my first time cherry-picking commits to actually pull request, so I hope I did this right ahah