From d15d2ca9bd5c2b00c7f8adeb041ecb1d6154ad3d Mon Sep 17 00:00:00 2001 From: Thomas Weber Date: Thu, 25 Mar 2021 16:35:45 -0500 Subject: [PATCH] Do not add license header to SA files These notices were added when it was ambiguous what was GPL and what wasn't. As this ambiguity no longer exists, they can be removed. --- src/addons/addons/bitmap-copy/userscript.js | 5 ----- src/addons/addons/block-palette-icons/userscript.js | 5 ----- src/addons/addons/block-switching/userscript.js | 5 ----- src/addons/addons/cat-blocks/userscript.js | 5 ----- src/addons/addons/clones/style.css | 5 ----- src/addons/addons/clones/userscript.js | 5 ----- src/addons/addons/color-picker/code-editor.js | 5 ----- src/addons/addons/color-picker/paint-editor.js | 5 ----- src/addons/addons/color-picker/style.css | 5 ----- src/addons/addons/color-picker/userscript.js | 5 ----- .../addons/data-category-tweaks-v2/userscript.js | 5 ----- .../addons/editor-colored-context-menus/userscript.css | 5 ----- .../addons/editor-colored-context-menus/userscript.js | 5 ----- src/addons/addons/editor-devtools/BlockInstance.js | 5 ----- src/addons/addons/editor-devtools/BlockItem.js | 5 ----- src/addons/addons/editor-devtools/DevTools.js | 5 ----- src/addons/addons/editor-devtools/DomHelpers.js | 5 ----- src/addons/addons/editor-devtools/XML.js | 5 ----- .../addons/editor-devtools/blockly/BlockFlasher.js | 5 ----- src/addons/addons/editor-devtools/blockly/UndoGroup.js | 5 ----- src/addons/addons/editor-devtools/blockly/Utils.js | 5 ----- src/addons/addons/editor-devtools/show-broadcast.js | 5 ----- src/addons/addons/editor-devtools/userscript.css | 5 ----- src/addons/addons/editor-devtools/userscript.js | 5 ----- .../addons/editor-searchable-dropdowns/userscript.css | 5 ----- .../addons/editor-searchable-dropdowns/userscript.js | 5 ----- .../addons/editor-stage-left/fix-share-the-love.js | 5 ----- src/addons/addons/editor-stage-left/stageleft.css | 5 ----- src/addons/addons/editor-theme3/theme3.css | 5 ----- src/addons/addons/editor-theme3/theme3.js | 5 ----- src/addons/addons/fix-uploaded-svgs/userscript.js | 5 ----- src/addons/addons/folders/style.css | 5 ----- src/addons/addons/folders/userscript.js | 5 ----- src/addons/addons/hide-flyout/style.css | 5 ----- src/addons/addons/hide-flyout/userscript.js | 5 ----- src/addons/addons/load-extensions/userscript.js | 5 ----- src/addons/addons/mediarecorder/style.css | 5 ----- src/addons/addons/mediarecorder/userscript.js | 5 ----- src/addons/addons/mouse-pos/style.css | 5 ----- src/addons/addons/mouse-pos/userscript.js | 5 ----- src/addons/addons/mute-project/userscript.js | 5 ----- src/addons/addons/onion-skinning/style.css | 5 ----- src/addons/addons/onion-skinning/userscript.js | 5 ----- src/addons/addons/pause/style.css | 5 ----- src/addons/addons/pause/userscript.js | 5 ----- src/addons/addons/remove-sprite-confirm/userscript.js | 5 ----- .../tw-interface-customization/remove-backpack.css | 5 ----- .../tw-interface-customization/remove-backpack.js | 5 ----- .../tw-interface-customization/remove-warning.js | 5 ----- src/addons/addons/tw-project-info/blockcount.js | 5 ----- src/addons/addons/variable-manager/style.css | 5 ----- src/addons/addons/variable-manager/userscript.js | 5 ----- src/addons/pull.js | 10 ---------- 53 files changed, 270 deletions(-) diff --git a/src/addons/addons/bitmap-copy/userscript.js b/src/addons/addons/bitmap-copy/userscript.js index 929eaa4c0..712873330 100644 --- a/src/addons/addons/bitmap-copy/userscript.js +++ b/src/addons/addons/bitmap-copy/userscript.js @@ -1,8 +1,3 @@ -/**! - * Imported from SA - * @license GPLv3.0 (see LICENSE or https://www.gnu.org/licenses/ for more information) - */ - export default async ({ addon, console }) => { if (!addon.tab.redux.state) return console.warn("Redux is not available!"); addon.tab.redux.initialize(); diff --git a/src/addons/addons/block-palette-icons/userscript.js b/src/addons/addons/block-palette-icons/userscript.js index 6f1cdacb4..8f7664a19 100644 --- a/src/addons/addons/block-palette-icons/userscript.js +++ b/src/addons/addons/block-palette-icons/userscript.js @@ -1,8 +1,3 @@ -/**! - * Imported from SA - * @license GPLv3.0 (see LICENSE or https://www.gnu.org/licenses/ for more information) - */ - /* inserted by pull.js */ import _twAsset0 from "./icons/block_icon.svg"; import _twAsset1 from "./icons/control_icon.svg"; diff --git a/src/addons/addons/block-switching/userscript.js b/src/addons/addons/block-switching/userscript.js index 584527bf8..bc25f7d37 100644 --- a/src/addons/addons/block-switching/userscript.js +++ b/src/addons/addons/block-switching/userscript.js @@ -1,8 +1,3 @@ -/**! - * Imported from SA - * @license GPLv3.0 (see LICENSE or https://www.gnu.org/licenses/ for more information) - */ - import blockToDom from "./blockToDom.js"; export default async function ({ addon, global, console, msg }) { diff --git a/src/addons/addons/cat-blocks/userscript.js b/src/addons/addons/cat-blocks/userscript.js index 9f59d107d..75d50195d 100644 --- a/src/addons/addons/cat-blocks/userscript.js +++ b/src/addons/addons/cat-blocks/userscript.js @@ -1,8 +1,3 @@ -/**! - * Imported from SA - * @license GPLv3.0 (see LICENSE or https://www.gnu.org/licenses/ for more information) - */ - export default async function ({ addon, global, console }) { // TODO: Switch completely to Blockly? // Well anyway future self, here you go: https://github.com/LLK/scratch-blocks/compare/hotfix/totally-normal-2020 diff --git a/src/addons/addons/clones/style.css b/src/addons/addons/clones/style.css index 0a5adae3e..90382af8e 100644 --- a/src/addons/addons/clones/style.css +++ b/src/addons/addons/clones/style.css @@ -1,8 +1,3 @@ -/**! - * Imported from SA - * @license GPLv3.0 (see LICENSE or https://www.gnu.org/licenses/ for more information) - */ - .clone-container-container { display: -webkit-box; display: -webkit-flex; diff --git a/src/addons/addons/clones/userscript.js b/src/addons/addons/clones/userscript.js index ad4cfcab2..620d8c972 100644 --- a/src/addons/addons/clones/userscript.js +++ b/src/addons/addons/clones/userscript.js @@ -1,8 +1,3 @@ -/**! - * Imported from SA - * @license GPLv3.0 (see LICENSE or https://www.gnu.org/licenses/ for more information) - */ - export default async function ({ addon, global, console, msg }) { const vm = addon.tab.traps.vm; diff --git a/src/addons/addons/color-picker/code-editor.js b/src/addons/addons/color-picker/code-editor.js index 44c3dd79d..8e790d16e 100644 --- a/src/addons/addons/color-picker/code-editor.js +++ b/src/addons/addons/color-picker/code-editor.js @@ -1,8 +1,3 @@ -/**! - * Imported from SA - * @license GPLv3.0 (see LICENSE or https://www.gnu.org/licenses/ for more information) - */ - import { normalizeHex, getHexRegex } from "../../libraries/normalize-color.js"; import RateLimiter from "../../libraries/rate-limiter.js"; import tinycolor from "../../libraries/tinycolor-min.js"; diff --git a/src/addons/addons/color-picker/paint-editor.js b/src/addons/addons/color-picker/paint-editor.js index 9dc75ff2f..14723ff1d 100644 --- a/src/addons/addons/color-picker/paint-editor.js +++ b/src/addons/addons/color-picker/paint-editor.js @@ -1,8 +1,3 @@ -/**! - * Imported from SA - * @license GPLv3.0 (see LICENSE or https://www.gnu.org/licenses/ for more information) - */ - import { normalizeHex, getHexRegex } from "../../libraries/normalize-color.js"; import RateLimiter from "../../libraries/rate-limiter.js"; import tinycolor from "../../libraries/tinycolor-min.js"; diff --git a/src/addons/addons/color-picker/style.css b/src/addons/addons/color-picker/style.css index 0f8ad45ec..7f286e924 100644 --- a/src/addons/addons/color-picker/style.css +++ b/src/addons/addons/color-picker/style.css @@ -1,8 +1,3 @@ -/**! - * Imported from SA - * @license GPLv3.0 (see LICENSE or https://www.gnu.org/licenses/ for more information) - */ - .sa-color-picker { display: flex; } diff --git a/src/addons/addons/color-picker/userscript.js b/src/addons/addons/color-picker/userscript.js index 923bdecd9..4ee7de1bb 100644 --- a/src/addons/addons/color-picker/userscript.js +++ b/src/addons/addons/color-picker/userscript.js @@ -1,8 +1,3 @@ -/**! - * Imported from SA - * @license GPLv3.0 (see LICENSE or https://www.gnu.org/licenses/ for more information) - */ - import codeEditorHandler from "./code-editor.js"; import paintEditorHandler from "./paint-editor.js"; diff --git a/src/addons/addons/data-category-tweaks-v2/userscript.js b/src/addons/addons/data-category-tweaks-v2/userscript.js index 0c9ad80cc..b7da0103f 100644 --- a/src/addons/addons/data-category-tweaks-v2/userscript.js +++ b/src/addons/addons/data-category-tweaks-v2/userscript.js @@ -1,8 +1,3 @@ -/**! - * Imported from SA - * @license GPLv3.0 (see LICENSE or https://www.gnu.org/licenses/ for more information) - */ - export default async function ({ addon, global, console, msg, safeMsg }) { // This needs to be stored in a separate variable updated in getBlocksXML // because addon.settings and actual workspace state do not necessarily match. diff --git a/src/addons/addons/editor-colored-context-menus/userscript.css b/src/addons/addons/editor-colored-context-menus/userscript.css index e84fc7d99..e9f4af020 100644 --- a/src/addons/addons/editor-colored-context-menus/userscript.css +++ b/src/addons/addons/editor-colored-context-menus/userscript.css @@ -1,8 +1,3 @@ -/**! - * Imported from SA - * @license GPLv3.0 (see LICENSE or https://www.gnu.org/licenses/ for more information) - */ - .u-contextmenu-colored .blocklyContextMenu { background-color: var(--u-contextmenu-bg); border-color: #0003; diff --git a/src/addons/addons/editor-colored-context-menus/userscript.js b/src/addons/addons/editor-colored-context-menus/userscript.js index 8c96fe340..92e3eea59 100644 --- a/src/addons/addons/editor-colored-context-menus/userscript.js +++ b/src/addons/addons/editor-colored-context-menus/userscript.js @@ -1,8 +1,3 @@ -/**! - * Imported from SA - * @license GPLv3.0 (see LICENSE or https://www.gnu.org/licenses/ for more information) - */ - export default async function ({ addon, global, console }) { document.body.addEventListener("mousedown", handleClick, true); } diff --git a/src/addons/addons/editor-devtools/BlockInstance.js b/src/addons/addons/editor-devtools/BlockInstance.js index 6c8d3051e..5ade803fc 100644 --- a/src/addons/addons/editor-devtools/BlockInstance.js +++ b/src/addons/addons/editor-devtools/BlockInstance.js @@ -1,8 +1,3 @@ -/**! - * Imported from SA - * @license GPLv3.0 (see LICENSE or https://www.gnu.org/licenses/ for more information) - */ - /** * Encapsulates a block (either in this sprite or another / Blockly, or native JSON block */ diff --git a/src/addons/addons/editor-devtools/BlockItem.js b/src/addons/addons/editor-devtools/BlockItem.js index e33a649d8..375202027 100644 --- a/src/addons/addons/editor-devtools/BlockItem.js +++ b/src/addons/addons/editor-devtools/BlockItem.js @@ -1,8 +1,3 @@ -/**! - * Imported from SA - * @license GPLv3.0 (see LICENSE or https://www.gnu.org/licenses/ for more information) - */ - export default class BlockItem { constructor(cls, procCode, labelID, y) { this.cls = cls; diff --git a/src/addons/addons/editor-devtools/DevTools.js b/src/addons/addons/editor-devtools/DevTools.js index 5812094a5..75a4f4a72 100644 --- a/src/addons/addons/editor-devtools/DevTools.js +++ b/src/addons/addons/editor-devtools/DevTools.js @@ -1,8 +1,3 @@ -/**! - * Imported from SA - * @license GPLv3.0 (see LICENSE or https://www.gnu.org/licenses/ for more information) - */ - // import ShowBroadcast from "./show-broadcast.js"; import Utils from "./blockly/Utils.js"; import DomHelpers from "./DomHelpers.js"; diff --git a/src/addons/addons/editor-devtools/DomHelpers.js b/src/addons/addons/editor-devtools/DomHelpers.js index b88a9c8f1..47c0102b8 100644 --- a/src/addons/addons/editor-devtools/DomHelpers.js +++ b/src/addons/addons/editor-devtools/DomHelpers.js @@ -1,8 +1,3 @@ -/**! - * Imported from SA - * @license GPLv3.0 (see LICENSE or https://www.gnu.org/licenses/ for more information) - */ - export default class DomHelpers { constructor(addon) { this.addon = addon; diff --git a/src/addons/addons/editor-devtools/XML.js b/src/addons/addons/editor-devtools/XML.js index f2cabb289..cb40edb73 100644 --- a/src/addons/addons/editor-devtools/XML.js +++ b/src/addons/addons/editor-devtools/XML.js @@ -1,8 +1,3 @@ -/**! - * Imported from SA - * @license GPLv3.0 (see LICENSE or https://www.gnu.org/licenses/ for more information) - */ - /** * A fake XML class to use in place of the real XML for faking things? */ diff --git a/src/addons/addons/editor-devtools/blockly/BlockFlasher.js b/src/addons/addons/editor-devtools/blockly/BlockFlasher.js index 64a284da3..10c2637f9 100644 --- a/src/addons/addons/editor-devtools/blockly/BlockFlasher.js +++ b/src/addons/addons/editor-devtools/blockly/BlockFlasher.js @@ -1,8 +1,3 @@ -/**! - * Imported from SA - * @license GPLv3.0 (see LICENSE or https://www.gnu.org/licenses/ for more information) - */ - /** * Helper class to flash a Blockly scratch block in the users workspace */ diff --git a/src/addons/addons/editor-devtools/blockly/UndoGroup.js b/src/addons/addons/editor-devtools/blockly/UndoGroup.js index 6f79a5827..c08d67716 100644 --- a/src/addons/addons/editor-devtools/blockly/UndoGroup.js +++ b/src/addons/addons/editor-devtools/blockly/UndoGroup.js @@ -1,8 +1,3 @@ -/**! - * Imported from SA - * @license GPLv3.0 (see LICENSE or https://www.gnu.org/licenses/ for more information) - */ - /** * This class is dedicated to maintaining the Undo stack of Blockly * It allows us to initiate an undo group such that all subsequent operations are recorded as a single diff --git a/src/addons/addons/editor-devtools/blockly/Utils.js b/src/addons/addons/editor-devtools/blockly/Utils.js index 31952a87d..a461cc498 100644 --- a/src/addons/addons/editor-devtools/blockly/Utils.js +++ b/src/addons/addons/editor-devtools/blockly/Utils.js @@ -1,8 +1,3 @@ -/**! - * Imported from SA - * @license GPLv3.0 (see LICENSE or https://www.gnu.org/licenses/ for more information) - */ - import BlockInstance from "../BlockInstance.js"; import BlockFlasher from "./BlockFlasher.js"; diff --git a/src/addons/addons/editor-devtools/show-broadcast.js b/src/addons/addons/editor-devtools/show-broadcast.js index 676395e5b..8e062efe3 100644 --- a/src/addons/addons/editor-devtools/show-broadcast.js +++ b/src/addons/addons/editor-devtools/show-broadcast.js @@ -1,8 +1,3 @@ -/**! - * Imported from SA - * @license GPLv3.0 (see LICENSE or https://www.gnu.org/licenses/ for more information) - */ - // A file to split Editor Devtools by features. // Unlike userscript.js, this file mainly interacts with VM. export default class ShowBroadcast { diff --git a/src/addons/addons/editor-devtools/userscript.css b/src/addons/addons/editor-devtools/userscript.css index a46ad9928..0a23167f7 100644 --- a/src/addons/addons/editor-devtools/userscript.css +++ b/src/addons/addons/editor-devtools/userscript.css @@ -1,8 +1,3 @@ -/**! - * Imported from SA - * @license GPLv3.0 (see LICENSE or https://www.gnu.org/licenses/ for more information) - */ - #s3devToolBar { display: flex; white-space: nowrap; diff --git a/src/addons/addons/editor-devtools/userscript.js b/src/addons/addons/editor-devtools/userscript.js index 6176053a8..d591ef726 100644 --- a/src/addons/addons/editor-devtools/userscript.js +++ b/src/addons/addons/editor-devtools/userscript.js @@ -1,8 +1,3 @@ -/**! - * Imported from SA - * @license GPLv3.0 (see LICENSE or https://www.gnu.org/licenses/ for more information) - */ - /* inserted by pull.js */ import _twAsset0 from "./icon--close.svg"; const _twGetAsset = (path) => { diff --git a/src/addons/addons/editor-searchable-dropdowns/userscript.css b/src/addons/addons/editor-searchable-dropdowns/userscript.css index 44d7b1837..9689a4390 100644 --- a/src/addons/addons/editor-searchable-dropdowns/userscript.css +++ b/src/addons/addons/editor-searchable-dropdowns/userscript.css @@ -1,8 +1,3 @@ -/**! - * Imported from SA - * @license GPLv3.0 (see LICENSE or https://www.gnu.org/licenses/ for more information) - */ - .u-dropdown-searchbar { width: 100%; box-sizing: border-box; diff --git a/src/addons/addons/editor-searchable-dropdowns/userscript.js b/src/addons/addons/editor-searchable-dropdowns/userscript.js index b1c3a3a24..463328354 100644 --- a/src/addons/addons/editor-searchable-dropdowns/userscript.js +++ b/src/addons/addons/editor-searchable-dropdowns/userscript.js @@ -1,8 +1,3 @@ -/**! - * Imported from SA - * @license GPLv3.0 (see LICENSE or https://www.gnu.org/licenses/ for more information) - */ - export default async function ({ addon, global, console }) { // The hierarchy is: // blocklyDropDownDiv (position, background color, etc.) -> blocklyDropDownContent (scrollbar) -> blocklyDropdownMenu (items) diff --git a/src/addons/addons/editor-stage-left/fix-share-the-love.js b/src/addons/addons/editor-stage-left/fix-share-the-love.js index 84db93073..8fb008fb0 100644 --- a/src/addons/addons/editor-stage-left/fix-share-the-love.js +++ b/src/addons/addons/editor-stage-left/fix-share-the-love.js @@ -1,8 +1,3 @@ -/**! - * Imported from SA - * @license GPLv3.0 (see LICENSE or https://www.gnu.org/licenses/ for more information) - */ - export default function ({ addon, global, console }) { window.dispatchEvent(new Event("resize")); diff --git a/src/addons/addons/editor-stage-left/stageleft.css b/src/addons/addons/editor-stage-left/stageleft.css index 1d7ce2fec..356f267ae 100644 --- a/src/addons/addons/editor-stage-left/stageleft.css +++ b/src/addons/addons/editor-stage-left/stageleft.css @@ -1,8 +1,3 @@ -/**! - * Imported from SA - * @license GPLv3.0 (see LICENSE or https://www.gnu.org/licenses/ for more information) - */ - /* sa-autoupdate-theme-ignore */ /* Userscript handles whether this style should be enabled until dynamicEnable is a thing */ /* If we didn't add autoupdate-ignore, loading the editor with the addon disabled, then diff --git a/src/addons/addons/editor-theme3/theme3.css b/src/addons/addons/editor-theme3/theme3.css index afb9fe8e8..ae77dd0dc 100644 --- a/src/addons/addons/editor-theme3/theme3.css +++ b/src/addons/addons/editor-theme3/theme3.css @@ -1,8 +1,3 @@ -/**! - * Imported from SA - * @license GPLv3.0 (see LICENSE or https://www.gnu.org/licenses/ for more information) - */ - /* sa-autoupdate-theme-ignore */ path.blocklyBlockBackground[fill="#FF6680"], diff --git a/src/addons/addons/editor-theme3/theme3.js b/src/addons/addons/editor-theme3/theme3.js index 993bea87a..905787be0 100644 --- a/src/addons/addons/editor-theme3/theme3.js +++ b/src/addons/addons/editor-theme3/theme3.js @@ -1,8 +1,3 @@ -/**! - * Imported from SA - * @license GPLv3.0 (see LICENSE or https://www.gnu.org/licenses/ for more information) - */ - export default async function ({ addon, global, console }) { var stylesheet = `path.blocklyBlockBackground[fill="#FF6680"], path.blocklyBlockBackground[fill="#5CB1D6"], diff --git a/src/addons/addons/fix-uploaded-svgs/userscript.js b/src/addons/addons/fix-uploaded-svgs/userscript.js index 065e8e424..19216b3c0 100644 --- a/src/addons/addons/fix-uploaded-svgs/userscript.js +++ b/src/addons/addons/fix-uploaded-svgs/userscript.js @@ -1,8 +1,3 @@ -/**! - * Imported from SA - * @license GPLv3.0 (see LICENSE or https://www.gnu.org/licenses/ for more information) - */ - export default async function ({ addon, global, console }) { const originalFileReader = window.FileReader; window.FileReader = function () { diff --git a/src/addons/addons/folders/style.css b/src/addons/addons/folders/style.css index 3623c3fdd..6b785f86e 100644 --- a/src/addons/addons/folders/style.css +++ b/src/addons/addons/folders/style.css @@ -1,8 +1,3 @@ -/**! - * Imported from SA - * @license GPLv3.0 (see LICENSE or https://www.gnu.org/licenses/ for more information) - */ - .sa-folders-contextmenu-container { } diff --git a/src/addons/addons/folders/userscript.js b/src/addons/addons/folders/userscript.js index 4d74fafaa..fdc062c2a 100644 --- a/src/addons/addons/folders/userscript.js +++ b/src/addons/addons/folders/userscript.js @@ -1,8 +1,3 @@ -/**! - * Imported from SA - * @license GPLv3.0 (see LICENSE or https://www.gnu.org/licenses/ for more information) - */ - /* inserted by pull.js */ import _twAsset0 from "./folder.svg"; const _twGetAsset = (path) => { diff --git a/src/addons/addons/hide-flyout/style.css b/src/addons/addons/hide-flyout/style.css index 0a680ee32..6b2c7277a 100644 --- a/src/addons/addons/hide-flyout/style.css +++ b/src/addons/addons/hide-flyout/style.css @@ -1,8 +1,3 @@ -/**! - * Imported from SA - * @license GPLv3.0 (see LICENSE or https://www.gnu.org/licenses/ for more information) - */ - .blocklyFlyout.sa-flyoutClose { transform: translateX(-200px) !important; } diff --git a/src/addons/addons/hide-flyout/userscript.js b/src/addons/addons/hide-flyout/userscript.js index 53771f6a7..978754b21 100644 --- a/src/addons/addons/hide-flyout/userscript.js +++ b/src/addons/addons/hide-flyout/userscript.js @@ -1,8 +1,3 @@ -/**! - * Imported from SA - * @license GPLv3.0 (see LICENSE or https://www.gnu.org/licenses/ for more information) - */ - /* inserted by pull.js */ import _twAsset0 from "./lock.svg"; import _twAsset1 from "./unlock.svg"; diff --git a/src/addons/addons/load-extensions/userscript.js b/src/addons/addons/load-extensions/userscript.js index 87f46ed12..fceec39c5 100644 --- a/src/addons/addons/load-extensions/userscript.js +++ b/src/addons/addons/load-extensions/userscript.js @@ -1,8 +1,3 @@ -/**! - * Imported from SA - * @license GPLv3.0 (see LICENSE or https://www.gnu.org/licenses/ for more information) - */ - export default async function ({ addon, global, console }) { // IDs are taken from https://github.com/LLK/scratch-vm/blob/ffa78b91b8645b6a8c80f698a3637bb73abf2931/src/extension-support/extension-manager.js#L11 const Extensions = ["music", "pen", "text2speech", "translate"]; diff --git a/src/addons/addons/mediarecorder/style.css b/src/addons/addons/mediarecorder/style.css index 5c145d1b1..25e878f5c 100644 --- a/src/addons/addons/mediarecorder/style.css +++ b/src/addons/addons/mediarecorder/style.css @@ -1,8 +1,3 @@ -/**! - * Imported from SA - * @license GPLv3.0 (see LICENSE or https://www.gnu.org/licenses/ for more information) - */ - .mediaRecorderPopup { box-sizing: border-box; width: 700px; diff --git a/src/addons/addons/mediarecorder/userscript.js b/src/addons/addons/mediarecorder/userscript.js index 348f6571f..decc2577d 100644 --- a/src/addons/addons/mediarecorder/userscript.js +++ b/src/addons/addons/mediarecorder/userscript.js @@ -1,8 +1,3 @@ -/**! - * Imported from SA - * @license GPLv3.0 (see LICENSE or https://www.gnu.org/licenses/ for more information) - */ - import downloadBlob from "../../libraries/download-blob.js"; export default async ({ addon, console, msg }) => { diff --git a/src/addons/addons/mouse-pos/style.css b/src/addons/addons/mouse-pos/style.css index 9167f9c83..a46532790 100644 --- a/src/addons/addons/mouse-pos/style.css +++ b/src/addons/addons/mouse-pos/style.css @@ -1,8 +1,3 @@ -/**! - * Imported from SA - * @license GPLv3.0 (see LICENSE or https://www.gnu.org/licenses/ for more information) - */ - .pos-container-container { display: -webkit-box; display: -webkit-flex; diff --git a/src/addons/addons/mouse-pos/userscript.js b/src/addons/addons/mouse-pos/userscript.js index 07398c7f1..42091ffb8 100644 --- a/src/addons/addons/mouse-pos/userscript.js +++ b/src/addons/addons/mouse-pos/userscript.js @@ -1,8 +1,3 @@ -/**! - * Imported from SA - * @license GPLv3.0 (see LICENSE or https://www.gnu.org/licenses/ for more information) - */ - export default async function ({ addon, global, console }) { let pos = null; diff --git a/src/addons/addons/mute-project/userscript.js b/src/addons/addons/mute-project/userscript.js index b3ee5cb85..aaf83e719 100644 --- a/src/addons/addons/mute-project/userscript.js +++ b/src/addons/addons/mute-project/userscript.js @@ -1,8 +1,3 @@ -/**! - * Imported from SA - * @license GPLv3.0 (see LICENSE or https://www.gnu.org/licenses/ for more information) - */ - /* inserted by pull.js */ import _twAsset0 from "./icon--mute.svg"; const _twGetAsset = (path) => { diff --git a/src/addons/addons/onion-skinning/style.css b/src/addons/addons/onion-skinning/style.css index 02083edde..e95347fe1 100644 --- a/src/addons/addons/onion-skinning/style.css +++ b/src/addons/addons/onion-skinning/style.css @@ -1,8 +1,3 @@ -/**! - * Imported from SA - * @license GPLv3.0 (see LICENSE or https://www.gnu.org/licenses/ for more information) - */ - .sa-onion-controls-container { display: flex; flex-direction: row; diff --git a/src/addons/addons/onion-skinning/userscript.js b/src/addons/addons/onion-skinning/userscript.js index ab41f0db3..efa9243e5 100644 --- a/src/addons/addons/onion-skinning/userscript.js +++ b/src/addons/addons/onion-skinning/userscript.js @@ -1,8 +1,3 @@ -/**! - * Imported from SA - * @license GPLv3.0 (see LICENSE or https://www.gnu.org/licenses/ for more information) - */ - /* inserted by pull.js */ import _twAsset0 from "./decrement.svg"; import _twAsset1 from "./increment.svg"; diff --git a/src/addons/addons/pause/style.css b/src/addons/addons/pause/style.css index 55ad7a94f..d5e2130f2 100644 --- a/src/addons/addons/pause/style.css +++ b/src/addons/addons/pause/style.css @@ -1,8 +1,3 @@ -/**! - * Imported from SA - * @license GPLv3.0 (see LICENSE or https://www.gnu.org/licenses/ for more information) - */ - .pause-btn { width: 2rem; height: 2rem; diff --git a/src/addons/addons/pause/userscript.js b/src/addons/addons/pause/userscript.js index c6972b508..3e358cc30 100644 --- a/src/addons/addons/pause/userscript.js +++ b/src/addons/addons/pause/userscript.js @@ -1,8 +1,3 @@ -/**! - * Imported from SA - * @license GPLv3.0 (see LICENSE or https://www.gnu.org/licenses/ for more information) - */ - /* inserted by pull.js */ import _twAsset0 from "./pause.svg"; import _twAsset1 from "./play.svg"; diff --git a/src/addons/addons/remove-sprite-confirm/userscript.js b/src/addons/addons/remove-sprite-confirm/userscript.js index 1e674de0a..dd80e0913 100644 --- a/src/addons/addons/remove-sprite-confirm/userscript.js +++ b/src/addons/addons/remove-sprite-confirm/userscript.js @@ -1,8 +1,3 @@ -/**! - * Imported from SA - * @license GPLv3.0 (see LICENSE or https://www.gnu.org/licenses/ for more information) - */ - export default async ({ addon, console, msg }) => { if (!addon.tab.redux.state) return console.warn("Redux is not available!"); const vm = addon.tab.traps.vm; diff --git a/src/addons/addons/tw-interface-customization/remove-backpack.css b/src/addons/addons/tw-interface-customization/remove-backpack.css index 2c2343e8e..20f9b0b22 100644 --- a/src/addons/addons/tw-interface-customization/remove-backpack.css +++ b/src/addons/addons/tw-interface-customization/remove-backpack.css @@ -1,8 +1,3 @@ -/**! - * Imported from SA - * @license GPLv3.0 (see LICENSE or https://www.gnu.org/licenses/ for more information) - */ - [class^="backpack_backpack-container"] { display: none; } diff --git a/src/addons/addons/tw-interface-customization/remove-backpack.js b/src/addons/addons/tw-interface-customization/remove-backpack.js index 35b72c024..e09f89a2c 100644 --- a/src/addons/addons/tw-interface-customization/remove-backpack.js +++ b/src/addons/addons/tw-interface-customization/remove-backpack.js @@ -1,8 +1,3 @@ -/**! - * Imported from SA - * @license GPLv3.0 (see LICENSE or https://www.gnu.org/licenses/ for more information) - */ - export default async function () { // Trigger a resize so that Blockly knows that the backpack is gone window.dispatchEvent(new Event("resize")); diff --git a/src/addons/addons/tw-interface-customization/remove-warning.js b/src/addons/addons/tw-interface-customization/remove-warning.js index 6af2ed26b..0327b099e 100644 --- a/src/addons/addons/tw-interface-customization/remove-warning.js +++ b/src/addons/addons/tw-interface-customization/remove-warning.js @@ -1,8 +1,3 @@ -/**! - * Imported from SA - * @license GPLv3.0 (see LICENSE or https://www.gnu.org/licenses/ for more information) - */ - export default async function ({ addon }) { addon.tab.redux.initialize(); const close = () => diff --git a/src/addons/addons/tw-project-info/blockcount.js b/src/addons/addons/tw-project-info/blockcount.js index ecbdf041d..00952d174 100644 --- a/src/addons/addons/tw-project-info/blockcount.js +++ b/src/addons/addons/tw-project-info/blockcount.js @@ -1,8 +1,3 @@ -/**! - * Imported from SA - * @license GPLv3.0 (see LICENSE or https://www.gnu.org/licenses/ for more information) - */ - export default async function ({ addon, console, msg }) { const vm = addon.tab.traps.vm; diff --git a/src/addons/addons/variable-manager/style.css b/src/addons/addons/variable-manager/style.css index c4508e6a3..3ddde9081 100644 --- a/src/addons/addons/variable-manager/style.css +++ b/src/addons/addons/variable-manager/style.css @@ -1,8 +1,3 @@ -/**! - * Imported from SA - * @license GPLv3.0 (see LICENSE or https://www.gnu.org/licenses/ for more information) - */ - /* Change z-indexes to allow more than 3 tabs */ .gui_tab_27Unf.gui_is-selected_sHAiu { z-index: 10 !important; diff --git a/src/addons/addons/variable-manager/userscript.js b/src/addons/addons/variable-manager/userscript.js index 631cea16d..2f8f392b7 100644 --- a/src/addons/addons/variable-manager/userscript.js +++ b/src/addons/addons/variable-manager/userscript.js @@ -1,8 +1,3 @@ -/**! - * Imported from SA - * @license GPLv3.0 (see LICENSE or https://www.gnu.org/licenses/ for more information) - */ - /* inserted by pull.js */ import _twAsset0 from "./icon.svg"; import _twAsset1 from "./search.svg"; diff --git a/src/addons/pull.js b/src/addons/pull.js index 3678657e3..4c614ca32 100644 --- a/src/addons/pull.js +++ b/src/addons/pull.js @@ -62,11 +62,6 @@ const commitHash = childProcess.execSync('git rev-parse --short HEAD') .toString() .trim(); -const JS_HEADER = `/**! - * Imported from SA - * @license GPLv3.0 (see LICENSE or https://www.gnu.org/licenses/ for more information) - */\n\n`; - const includeImportedLibraries = contents => { // Parse things like: // import { normalizeHex, getHexRegex } from "../../libraries/normalize-color.js"; @@ -141,11 +136,6 @@ request('https://raw.githubusercontent.com/ScratchAddons/contributors/master/.al } } - // Add a license notice, unless one already exists. - if ((file.endsWith('.js') || file.endsWith('.css')) && !contents.includes('@license')) { - contents = JS_HEADER + contents; - } - fs.writeFileSync(newPath, contents); } }