Updated license, release 1.5.22

scottmudge · Aug 14, 2023 · dd8776e · ljharb · Feb 5, 2024 · dd8776e
1 parent 0c0793f
commit dd8776e
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 7 deletions.
diff --git a/LICENSE b/LICENSE
@@ -0,0 +1,14 @@
+Copyright (c) 2023 Scott Mudge. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+3. All advertising materials mentioning features or use of this software must display the following acknowledgement:
+This product includes software developed by the organization.
+
+1. Neither the name of the copyright holder nor the names the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY COPYRIGHT HOLDER "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDER BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/OctoPrint_MeatPack/__init__.py b/OctoPrint_MeatPack/__init__.py
@@ -10,8 +10,8 @@
 from OctoPrint_MeatPack.packing_serial import PackingSerial
 
 __author__ = "Scott Mudge <mail@scottmudge.com, https://scottmudge.com>"
-__license__ = "GNU Affero General Public License http://www.gnu.org/licenses/agpl.html"
-__copyright__ = "Copyright (C) 2020-2021 Scott Mudge - Released under terms of the AGPLv3 License"
+__license__ = "BSD-4-Clause License - https://raw.githubusercontent.com/scottmudge/OctoPrint-MeatPack/master/LICENSE"
+__copyright__ = "Copyright (C) 2020-2023 Scott Mudge - Released under terms of the BSD-4-Clause License"
 
 
 class MeatPackPlugin(

diff --git a/OctoPrint_MeatPack/templates/meatpack_settings.jinja2 b/OctoPrint_MeatPack/templates/meatpack_settings.jinja2
@@ -30,7 +30,7 @@
             <div class="controls">
                 <label class="checkbox">
                     <input type="checkbox" data-bind="checked: settings.plugins.meatpack.playSongOnPrintComplete">
-                    Play the "Meatball" Song on Print Completion (M84)
+                    Play the "Meatball" Song on Print Completion (M84 GCode support required)
                 </label>
             </div>
         </div>

diff --git a/README.md b/README.md
@@ -19,7 +19,7 @@ With both plugins combined, I was able to compress a 5 MB gcode file of a cylind
 
 If using a Prusa MK3, I also recommend creating a local fork of the MeatPack MK3 firmware (linked above), and merging in FormalLurker's MK3 fork, which improves the quality and efficiency of the arc motion-planning feature of the MK3 firmware.
 
-## Current Features (v1.5.21)
+## Current Features (v1.5.22)
 
 1. Fully working g-code compression ("MeatPack") support for compatible printer firmwares. Both Marlin and the official Prusa MK2/3/3S+ firmwares now officially support MeatPack. See the Firmware section above for which versions/build dates are compatible. 
 2. Added extra data to the "State" side-bar content, updated in real time. It shows transmission statistics:
@@ -51,7 +51,7 @@ If using a Prusa MK3, I also recommend creating a local fork of the MeatPack MK3
 
 2. After activating the OctoPrint environment, run the following command:
 
-`pip install https://github.com/scottmudge/OctoPrint-MeatPack/archive/v1.5.21.zip`
+`pip install https://github.com/scottmudge/OctoPrint-MeatPack/archive/v1.5.22.zip`
 
 3. Restart your OctoPrint server, or restart the machine.
 
@@ -154,3 +154,23 @@ My cat's name is Meatball, I thought it sounded fun.
 Obligatory cat photo:
 
 ![photo](https://i.imgur.com/QgUuyzs.png)
+
+## License
+
+#### MeatPack is licensed under 4-Clause BSD:
+
+Copyright (c) 2023 Scott Mudge. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+3. All advertising materials mentioning features or use of this software must display the following acknowledgement:
+This product includes software developed by the organization.
+
+1. Neither the name of the copyright holder nor the names the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY COPYRIGHT HOLDER "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDER BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
diff --git a/setup.py b/setup.py
@@ -12,7 +12,7 @@
 plugin_name = "OctoPrint-MeatPack"
 
 # The plugin's version. Can be overwritten within OctoPrint's internal data via __plugin_version__ in the plugin module
-plugin_version = "1.5.21"
+plugin_version = "1.5.22"
 
 # The plugin's description. Can be overwritten within OctoPrint's internal data via __plugin_description__ in the plugin
 # module
@@ -28,7 +28,7 @@
 plugin_url = "https://github.com/scottmudge/OctoPrint-MeatPack"
 
 # The plugin's license. Can be overwritten within OctoPrint's internal data via __plugin_license__ in the plugin module
-plugin_license = "AGPLv3"
+plugin_license = "BSD-4-Clause"
 
 # Any additional requirements besides OctoPrint should be listed here
 plugin_requires = []