2.2.4 release #49
Merged
2.2.4 release #49
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
Remove TODO from README
…when beta blobs are selected
…parators, add some misc. comments, disable old taskbar implementation, fix background button not changing to 'stop background', update showStage(), add misc.xml to .gitignore
…t about debug mode
…Jetbrains) and update Gradle plugins
…n first launch on macOS
…g I can do there)
Repository owner
deleted a comment
Feb 7, 2019
Repository owner
deleted a comment
Feb 7, 2019
Repository owner
deleted a comment
Feb 7, 2019
Repository owner
deleted a comment
Mar 2, 2019
Repository owner
deleted a comment
Mar 2, 2019
# Conflicts: # .idea/modules/blobsaver_main.iml # .idea/modules/blobsaver_test.iml # build.gradle
Repository owner
deleted a comment
Mar 2, 2019
Repository owner
deleted a comment
Mar 2, 2019
# Conflicts: # src/main/java/com/airsquared/blobsaver/Background.java # src/main/java/com/airsquared/blobsaver/Controller.java # src/main/java/com/airsquared/blobsaver/Main.java
Repository owner
deleted a comment
Mar 2, 2019
Repository owner
deleted a comment
Mar 2, 2019
Repository owner
deleted a comment
Mar 2, 2019
Repository owner
deleted a comment
Mar 2, 2019
Repository owner
deleted a comment
Mar 2, 2019
Repository owner
deleted a comment
Mar 2, 2019
# Conflicts: # src/main/java/com/airsquared/blobsaver/Controller.java
Repository owner
deleted a comment
Mar 2, 2019
Repository owner
deleted a comment
Mar 2, 2019
Repository owner
deleted a comment
Mar 2, 2019
Repository owner
deleted a comment
Mar 3, 2019
Repository owner
deleted a comment
Mar 3, 2019
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.
OK, you're not really gonna like this, but it's just really difficult to cherrypick all of the changes. Let me just have them all in one (sorry, but at least there are no merge conflicts!):
I changed the .gitignore to include Gradle's and macOS's gitignore, because there were some DS_Store stuff from macOS slipping through and the .gradle folder should be ignored.
A lot of the .idea path got edited automatically, which I know you don't want, but could you try it out (locally before you accept), because everything works just fine. If it doesn't work out how you like, then could you make a commit above it to revert the changes to the .idea folder? None of the .idea folders contain personal settings (those are all ignored).OK, I reverted all of them but kept encodings.xml, since it's recommended by JetbrainsI bumped the copyright date and the version to 2.2.3. I'm also encapsulating the version in a class so that we can compare versions better.
I removed redundant parentheses. I also removed all "*" imports. I know you told me that you were going to do the refactoring, because it would cause merge conflicts, but here, there are no merge conflicts.
I fixed the cmd+q crash when in background on macOS
I added Windows and macOS A12/A12X support
If you have any questions about the code just ask me!
If this gets merged, it closes #47, closes #46, closes #42, and closes #38
EDIT: This also closes #55