Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
jordanknapp00 committed Oct 26, 2022
2 parents 50b6867 + d2fa027 commit cad0f54
Show file tree
Hide file tree
Showing 14 changed files with 22 additions and 2 deletions.
7 changes: 6 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,11 @@
hs_err_pid*

# Eclipse files
.project

.classpath
.project
.settings/

# bin foder

bin/
11 changes: 11 additions & 0 deletions LICENSE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
Copyright 2022 Jordan Knapp

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without limitation in the rights to use, copy, modify, merge, publish, and/ or distribute copies of the Software in an educational or personal context, subject to the following conditions:

- The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.

Permission is granted to sell and/ or distribute copies of the Software in a commercial context, subject to the following conditions:

- Substantial changes: adding, removing, or modifying large parts, shall be developed in the Software. Reorganizing logic in the software does not warrant a substantial change.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
6 changes: 5 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,8 @@ The main window has only three buttons: generate, load, and buffer. The generate

Under the buffer menu, you'll find that every episode is listed in the order you watched them. You can remove individual episodes from the buffer by clicking on them, or you can clear the entire buffer with the clear all button. Note that the buffer does not update while it's open. In other words, if you have the buffer window open, generating new episodes will not cause those episodes to appear in the buffer menu. You must close and reopen the buffer menu to refresh it at this time. The buffer is still *updated*, but the *display* is not.

When you generate an episode, it will tell you how many episodes are currently in the buffer, and how many total episodes you have included in the system.
When you generate an episode, it will tell you how many episodes are currently in the buffer, and how many total episodes you have included in the system.

# License

This project uses the [FPA General Code License](https://about.fairfieldprogramming.org/licenses/code/). In short, you can do whatever you want with this code for non-commerical purposes. In order to use this code for commerical purposes, you must make substantial changes to it. Reorganizing the logic does not count as a substantial change. See [LICENSE.md](LICENSE.md) or the link above for more details.
Binary file removed bin/images/Open.png
Binary file not shown.
Binary file removed bin/images/jery.png
Binary file not shown.
Binary file removed bin/picker/Picker$1.class
Binary file not shown.
Binary file removed bin/picker/Picker$2.class
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed bin/picker/Picker$BufferButtonActionListener.class
Binary file not shown.
Binary file removed bin/picker/Picker$GenerateButtonActionListener.class
Binary file not shown.
Binary file removed bin/picker/Picker$LoadButtonActionListener.class
Binary file not shown.
Binary file removed bin/picker/Picker.class
Binary file not shown.

0 comments on commit cad0f54

Please sign in to comment.