From 1c7850d47e0c2d50bd7ed607df8f3da40bb3bfd3 Mon Sep 17 00:00:00 2001 From: Thomas Weber Date: Thu, 25 Mar 2021 15:04:10 -0500 Subject: [PATCH] Make everything GPLv3 --- LICENSE_GPL => LICENSE | 0 LICENSE_BSD | 13 ------------ README.md | 20 ++++++++++++++++--- package.json | 2 +- src/addons/README.md | 2 -- src/addons/addons/bitmap-copy/userscript.js | 2 +- .../addons/block-palette-icons/userscript.js | 2 +- .../addons/block-switching/userscript.js | 2 +- src/addons/addons/cat-blocks/userscript.js | 2 +- src/addons/addons/clones/style.css | 2 +- src/addons/addons/clones/userscript.js | 2 +- src/addons/addons/color-picker/code-editor.js | 2 +- .../addons/color-picker/paint-editor.js | 2 +- src/addons/addons/color-picker/style.css | 2 +- src/addons/addons/color-picker/userscript.js | 2 +- .../data-category-tweaks-v2/userscript.js | 2 +- .../userscript.css | 2 +- .../userscript.js | 2 +- .../addons/editor-devtools/BlockInstance.js | 2 +- .../addons/editor-devtools/BlockItem.js | 2 +- src/addons/addons/editor-devtools/DevTools.js | 2 +- .../addons/editor-devtools/DomHelpers.js | 2 +- src/addons/addons/editor-devtools/XML.js | 2 +- .../editor-devtools/blockly/BlockFlasher.js | 2 +- .../editor-devtools/blockly/UndoGroup.js | 2 +- .../addons/editor-devtools/blockly/Utils.js | 2 +- .../addons/editor-devtools/show-broadcast.js | 2 +- .../addons/editor-devtools/userscript.css | 2 +- .../addons/editor-devtools/userscript.js | 2 +- .../userscript.css | 2 +- .../editor-searchable-dropdowns/userscript.js | 2 +- .../editor-stage-left/fix-share-the-love.js | 2 +- .../addons/editor-stage-left/stageleft.css | 2 +- src/addons/addons/editor-theme3/theme3.css | 2 +- src/addons/addons/editor-theme3/theme3.js | 2 +- .../addons/fix-uploaded-svgs/userscript.js | 2 +- src/addons/addons/folders/style.css | 2 +- src/addons/addons/folders/userscript.js | 2 +- src/addons/addons/hide-flyout/style.css | 2 +- src/addons/addons/hide-flyout/userscript.js | 2 +- .../addons/load-extensions/userscript.js | 2 +- src/addons/addons/mediarecorder/style.css | 2 +- src/addons/addons/mediarecorder/userscript.js | 2 +- src/addons/addons/mouse-pos/style.css | 2 +- src/addons/addons/mouse-pos/userscript.js | 2 +- src/addons/addons/mute-project/userscript.js | 2 +- src/addons/addons/onion-skinning/style.css | 2 +- .../addons/onion-skinning/userscript.js | 2 +- src/addons/addons/pause/style.css | 2 +- src/addons/addons/pause/userscript.js | 2 +- .../remove-sprite-confirm/userscript.js | 2 +- .../remove-backpack.css | 2 +- .../remove-backpack.js | 2 +- .../remove-warning.js | 2 +- .../addons/tw-project-info/blockcount.js | 2 +- src/addons/addons/variable-manager/style.css | 2 +- .../addons/variable-manager/userscript.js | 2 +- src/addons/pull.js | 2 +- src/lib/tw-translations/translations.json | 2 +- 59 files changed, 72 insertions(+), 73 deletions(-) rename LICENSE_GPL => LICENSE (100%) delete mode 100644 LICENSE_BSD diff --git a/LICENSE_GPL b/LICENSE similarity index 100% rename from LICENSE_GPL rename to LICENSE diff --git a/LICENSE_BSD b/LICENSE_BSD deleted file mode 100644 index 4a2348ab7..000000000 --- a/LICENSE_BSD +++ /dev/null @@ -1,13 +0,0 @@ -Copyright (c) 2016, Massachusetts Institute of Technology -Copyright (c) 2020 Thomas Weber -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. Neither the name of 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 THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 THE COPYRIGHT HOLDER OR CONTRIBUTORS 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/README.md b/README.md index 0bfc4dc1c..65a7d03c1 100644 --- a/README.md +++ b/README.md @@ -6,11 +6,25 @@ See https://github.com/TurboWarp/scratch-gui/wiki/Getting-Started to setup the c If you just want to play with the GUI then it's the same process as upstream scratch-gui. -## A note on licensing +## License -Most files in TurboWarp/scratch-gui are licensed under BSD-3-Clause License (see LICENSE_BSD). However, some files are instead licensed under the GNU General Public License v3.0 (see LICENSE_GPL). Notably this includes everything in src/addons and anything that (indirectly or directly) imports a file from src/addons. These files generally have license disclaimers at the start of their contents. +TurboWarp's modifications to Scratch are licensed under the GNU General Public License v3.0. See LICENSE or https://www.gnu.org/licenses/ for details. -It is assumed that any contributions you send to this repository (via pull request or otherwise) are licensed under the BSD-3-Clause License, not the GPL. +
+Original license for Scratch +
Copyright (c) 2016, Massachusetts Institute of Technology
+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. Neither the name of 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 THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 THE COPYRIGHT HOLDER OR CONTRIBUTORS 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.
+