diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 0629a123..1f70025a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -44,7 +44,7 @@ Extensions must be self-contained. All libraries and hardcoded resources should **We are not lawyers. This is not legal advice.** -Everything in this repository must be available under an open source license. You can use any license you want, but we **STRONGLY** recommend using the [GNU Lesser General Public License version 3](licenses/GPL-3.0.txt) for all new extensions. +Everything in this repository must be available under an open source license. You can use any license you want, but we **STRONGLY** recommend using the [Mozilla Public License verison 2.0](licenses/MPL-2.0.txt) for all new extensions. The following licenses are banned for being [incompatible the GPLv3](https://www.gnu.org/licenses/license-list.en.html), so do not use any code, images, etc. under them: @@ -66,7 +66,7 @@ All extensions should need a metadata comment at the *very* start of the file, b // Description: Does a very cool thing. This must have punctuation at the end! // By: GarboMuffin // Original: TestMuffin -// License: LGPL-3.0 +// License: MPL-2.0 ``` You must use line comments; block comments `/* */` will not work. These fields are **REQUIRED**: @@ -74,7 +74,7 @@ You must use line comments; block comments `/* */` will not work. These fields a - `Name` will appear on the website. It should be similar to the name returned by getInfo(). - `ID` should be identical to the id returned by getInfo(). - `Description` will appear on the website. - - `License` describes the license that the extension's code is under. It should be a valid [SPDX license](https://spdx.org/licenses/) expression. (use `LGPL-3.0` if you are unsure) + - `License` describes the license that the extension's code is under. It should be a valid [SPDX license](https://spdx.org/licenses/) expression. (use `MPL-2.0` if you are unsure) `By` is optionally used to credit the author of the extension (you!). `Original` is used if the extension is based on or ported from somewhere else. They both use the same format of `Name` or `Name `. Links to places other than Scratch are not allowed at this time. You can repeat both of these as many times as needed, just add another `// By: ...` comment after. diff --git a/README.md b/README.md index a159f248..8b750b5a 100644 --- a/README.md +++ b/README.md @@ -10,10 +10,10 @@ See [CONTRIBUTING.md](CONTRIBUTING.md). ## License -Extensions (in the `extensions` folder) will have a comment at the top of the file describing the license for the code. In the past [MIT](./licenses/MIT.txt) was the default, however now [LGPL-3.0](./licenses/LGPL-3.0.txt) is recommended. Some extensions may contain a mix of both. +Extensions (in the `extensions` folder) will have a comment at the top of the file describing the license for the code. In the past [MIT](./licenses/MIT.txt) was the default, however now [MPL-2.0](./licenses/MPL-2.0.txt) is recommended. Some extensions may contain a mix of several. Sample projects (in the `samples` folder) are licensed under [CC-BY 4.0](./licenses/CC-BY-4.0.txt). -Everything else, such as the extension images, development server, and website, are licensed under the [GNU General Public License version 3](licenses/GPL-3.0.txt). +Everything else, such as the extension images, development server, and website are licensed under the [GNU General Public License version 3](licenses/GPL-3.0.txt). See [images/README.md](images/README.md) for attribution information for each image. diff --git a/extensions/CubesterYT/KeySimulation.js b/extensions/CubesterYT/KeySimulation.js index 4e8568b5..795be1fd 100644 --- a/extensions/CubesterYT/KeySimulation.js +++ b/extensions/CubesterYT/KeySimulation.js @@ -2,7 +2,7 @@ // ID: cubesterKeySimulation // Description: Simulate key presses and mouse clicks. // By: CubesterYT -// License: MIT AND LGPL-3.0 +// License: MIT AND MPL-2.0 (function (Scratch) { "use strict"; diff --git a/extensions/battery.js b/extensions/battery.js index 4072e17f..59fabcd2 100644 --- a/extensions/battery.js +++ b/extensions/battery.js @@ -1,7 +1,7 @@ // Name: Battery // ID: battery // Description: Access information about the battery of phones or laptops. May not work on all devices and browsers. -// License: MIT AND LGPL-3.0 +// License: MIT AND MPL-2.0 (function (Scratch) { "use strict"; diff --git a/extensions/bitwise.js b/extensions/bitwise.js index 58ad4b70..e935d9b4 100644 --- a/extensions/bitwise.js +++ b/extensions/bitwise.js @@ -2,7 +2,7 @@ // ID: Bitwise // Description: Blocks that operate on the binary representation of numbers in computers. // By: TrueFantom -// License: MIT AND LGPL-3.0 +// License: MIT AND MPL-2.0 ((Scratch) => { "use strict"; diff --git a/extensions/clouddata-ping.js b/extensions/clouddata-ping.js index 951a90bd..4a318693 100644 --- a/extensions/clouddata-ping.js +++ b/extensions/clouddata-ping.js @@ -2,7 +2,7 @@ // ID: clouddataping // Description: Determine whether a cloud variable server is probably up. // Original: TheShovel -// License: MIT AND LGPL-3.0 +// License: MIT AND MPL-2.0 (function (Scratch) { "use strict"; diff --git a/extensions/cursor.js b/extensions/cursor.js index 0da7d026..575992c8 100644 --- a/extensions/cursor.js +++ b/extensions/cursor.js @@ -1,7 +1,7 @@ // Name: Mouse Cursor // ID: MouseCursor // Description: Use custom cursors or hide the cursor. Also allows replacing the cursor with any costume image. -// License: MIT AND LGPL-3.0 +// License: MIT AND MPL-2.0 (function (Scratch) { "use strict"; diff --git a/extensions/fetch.js b/extensions/fetch.js index 3f24731f..2f2e6092 100644 --- a/extensions/fetch.js +++ b/extensions/fetch.js @@ -1,7 +1,7 @@ // Name: Fetch // ID: fetch // Description: Make requests to the broader internet. -// License: MIT AND LGPL-3.0 +// License: MIT AND MPL-2.0 (function (Scratch) { "use strict"; diff --git a/extensions/files.js b/extensions/files.js index b2c23be2..a4d03a31 100644 --- a/extensions/files.js +++ b/extensions/files.js @@ -1,7 +1,7 @@ // Name: Files // ID: files // Description: Read and download files. -// License: MIT AND LGPL-3.0 +// License: MIT AND MPL-2.0 (function (Scratch) { "use strict"; diff --git a/extensions/gamepad.js b/extensions/gamepad.js index 2537d667..12e4fb63 100644 --- a/extensions/gamepad.js +++ b/extensions/gamepad.js @@ -1,7 +1,7 @@ // Name: Gamepad // ID: Gamepad // Description: Directly access gamepads instead of just mapping buttons to keys. -// License: MIT AND LGPL-3.0 +// License: MIT AND MPL-2.0 // Some parts of this scripts are based on or designed to be compatible-ish with: // https://arpruss.github.io/gamepad.js (MIT Licensed) diff --git a/extensions/iframe.js b/extensions/iframe.js index 4adeed70..68375ea3 100644 --- a/extensions/iframe.js +++ b/extensions/iframe.js @@ -2,7 +2,7 @@ // ID: iframe // Description: Display webpages or HTML over the stage. // Context: "iframe" is an HTML element that lets websites embed other websites. -// License: MIT AND LGPL-3.0 +// License: MIT AND MPL-2.0 (function (Scratch) { "use strict"; diff --git a/extensions/local-storage.js b/extensions/local-storage.js index f8218a46..ac06c9b2 100644 --- a/extensions/local-storage.js +++ b/extensions/local-storage.js @@ -1,7 +1,7 @@ // Name: Local Storage // ID: localstorage // Description: Store data persistently. Like cookies, but better. -// License: MIT AND LGPL-3.0 +// License: MIT AND MPL-2.0 (function (Scratch) { "use strict"; diff --git a/extensions/navigator.js b/extensions/navigator.js index 071d7309..b0466f3c 100644 --- a/extensions/navigator.js +++ b/extensions/navigator.js @@ -2,7 +2,7 @@ // ID: navigatorinfo // Description: Details about the user's browser and operating system. // Context: "Navigator" refers to someone's browser -// License: MIT AND LGPL-3.0 +// License: MIT AND MPL-2.0 (function (Scratch) { "use strict"; diff --git a/extensions/pointerlock.js b/extensions/pointerlock.js index d606ea52..f8b8d540 100644 --- a/extensions/pointerlock.js +++ b/extensions/pointerlock.js @@ -1,7 +1,7 @@ // Name: Pointerlock // ID: pointerlock // Description: Adds blocks for mouse locking. Mouse x & y blocks will report the change since the previous frame while the pointer is locked. Replaces the pointerlock experiment. -// License: MIT AND LGPL-3.0 +// License: MIT AND MPL-2.0 (function (Scratch) { "use strict"; diff --git a/extensions/runtime-options.js b/extensions/runtime-options.js index ca733db2..2bc7750f 100644 --- a/extensions/runtime-options.js +++ b/extensions/runtime-options.js @@ -1,7 +1,7 @@ // Name: Runtime Options // ID: runtimeoptions // Description: Get and modify turbo mode, framerate, interpolation, clone limit, stage size, and more. -// License: MIT AND LGPL-3.0 +// License: MIT AND MPL-2.0 (function (Scratch) { "use strict"; diff --git a/extensions/sound.js b/extensions/sound.js index 0af73f5c..9d46c376 100644 --- a/extensions/sound.js +++ b/extensions/sound.js @@ -1,7 +1,7 @@ // Name: Sound // ID: notSound // Description: Play sounds from URLs. -// License: MIT AND LGPL-3.0 +// License: MIT AND MPL-2.0 ((Scratch) => { "use strict"; diff --git a/extensions/stretch.js b/extensions/stretch.js index 09db521d..63828d28 100644 --- a/extensions/stretch.js +++ b/extensions/stretch.js @@ -1,7 +1,7 @@ // Name: Stretch // ID: stretch // Description: Stretch sprites horizontally or vertically. -// License: MIT AND LGPL-3.0 +// License: MIT AND MPL-2.0 (function (Scratch) { "use strict"; diff --git a/extensions/text.js b/extensions/text.js index 8ad0c479..231b10be 100644 --- a/extensions/text.js +++ b/extensions/text.js @@ -2,7 +2,7 @@ // ID: strings // Description: Manipulate characters and text. // Original: CST1229 -// License: MIT AND LGPL-3.0 +// License: MIT AND MPL-2.0 (function (Scratch) { "use strict"; diff --git a/extensions/utilities.js b/extensions/utilities.js index dd4b524d..33fecb76 100644 --- a/extensions/utilities.js +++ b/extensions/utilities.js @@ -2,7 +2,7 @@ // ID: utilities // Description: A bunch of interesting blocks. // Original: Sheep_maker -// License: MIT AND LGPL-3.0 +// License: MIT AND MPL-2.0 /*! * This is based on: diff --git a/licenses/MPL-2.0.txt b/licenses/MPL-2.0.txt new file mode 100644 index 00000000..14e2f777 --- /dev/null +++ b/licenses/MPL-2.0.txt @@ -0,0 +1,373 @@ +Mozilla Public License Version 2.0 +================================== + +1. Definitions +-------------- + +1.1. "Contributor" + means each individual or legal entity that creates, contributes to + the creation of, or owns Covered Software. + +1.2. "Contributor Version" + means the combination of the Contributions of others (if any) used + by a Contributor and that particular Contributor's Contribution. + +1.3. "Contribution" + means Covered Software of a particular Contributor. + +1.4. "Covered Software" + means Source Code Form to which the initial Contributor has attached + the notice in Exhibit A, the Executable Form of such Source Code + Form, and Modifications of such Source Code Form, in each case + including portions thereof. + +1.5. "Incompatible With Secondary Licenses" + means + + (a) that the initial Contributor has attached the notice described + in Exhibit B to the Covered Software; or + + (b) that the Covered Software was made available under the terms of + version 1.1 or earlier of the License, but not also under the + terms of a Secondary License. + +1.6. "Executable Form" + means any form of the work other than Source Code Form. + +1.7. "Larger Work" + means a work that combines Covered Software with other material, in + a separate file or files, that is not Covered Software. + +1.8. "License" + means this document. + +1.9. "Licensable" + means having the right to grant, to the maximum extent possible, + whether at the time of the initial grant or subsequently, any and + all of the rights conveyed by this License. + +1.10. "Modifications" + means any of the following: + + (a) any file in Source Code Form that results from an addition to, + deletion from, or modification of the contents of Covered + Software; or + + (b) any new file in Source Code Form that contains any Covered + Software. + +1.11. "Patent Claims" of a Contributor + means any patent claim(s), including without limitation, method, + process, and apparatus claims, in any patent Licensable by such + Contributor that would be infringed, but for the grant of the + License, by the making, using, selling, offering for sale, having + made, import, or transfer of either its Contributions or its + Contributor Version. + +1.12. "Secondary License" + means either the GNU General Public License, Version 2.0, the GNU + Lesser General Public License, Version 2.1, the GNU Affero General + Public License, Version 3.0, or any later versions of those + licenses. + +1.13. "Source Code Form" + means the form of the work preferred for making modifications. + +1.14. "You" (or "Your") + means an individual or a legal entity exercising rights under this + License. For legal entities, "You" includes any entity that + controls, is controlled by, or is under common control with You. For + purposes of this definition, "control" means (a) the power, direct + or indirect, to cause the direction or management of such entity, + whether by contract or otherwise, or (b) ownership of more than + fifty percent (50%) of the outstanding shares or beneficial + ownership of such entity. + +2. License Grants and Conditions +-------------------------------- + +2.1. Grants + +Each Contributor hereby grants You a world-wide, royalty-free, +non-exclusive license: + +(a) under intellectual property rights (other than patent or trademark) + Licensable by such Contributor to use, reproduce, make available, + modify, display, perform, distribute, and otherwise exploit its + Contributions, either on an unmodified basis, with Modifications, or + as part of a Larger Work; and + +(b) under Patent Claims of such Contributor to make, use, sell, offer + for sale, have made, import, and otherwise transfer either its + Contributions or its Contributor Version. + +2.2. Effective Date + +The licenses granted in Section 2.1 with respect to any Contribution +become effective for each Contribution on the date the Contributor first +distributes such Contribution. + +2.3. Limitations on Grant Scope + +The licenses granted in this Section 2 are the only rights granted under +this License. No additional rights or licenses will be implied from the +distribution or licensing of Covered Software under this License. +Notwithstanding Section 2.1(b) above, no patent license is granted by a +Contributor: + +(a) for any code that a Contributor has removed from Covered Software; + or + +(b) for infringements caused by: (i) Your and any other third party's + modifications of Covered Software, or (ii) the combination of its + Contributions with other software (except as part of its Contributor + Version); or + +(c) under Patent Claims infringed by Covered Software in the absence of + its Contributions. + +This License does not grant any rights in the trademarks, service marks, +or logos of any Contributor (except as may be necessary to comply with +the notice requirements in Section 3.4). + +2.4. Subsequent Licenses + +No Contributor makes additional grants as a result of Your choice to +distribute the Covered Software under a subsequent version of this +License (see Section 10.2) or under the terms of a Secondary License (if +permitted under the terms of Section 3.3). + +2.5. Representation + +Each Contributor represents that the Contributor believes its +Contributions are its original creation(s) or it has sufficient rights +to grant the rights to its Contributions conveyed by this License. + +2.6. Fair Use + +This License is not intended to limit any rights You have under +applicable copyright doctrines of fair use, fair dealing, or other +equivalents. + +2.7. Conditions + +Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted +in Section 2.1. + +3. Responsibilities +------------------- + +3.1. Distribution of Source Form + +All distribution of Covered Software in Source Code Form, including any +Modifications that You create or to which You contribute, must be under +the terms of this License. You must inform recipients that the Source +Code Form of the Covered Software is governed by the terms of this +License, and how they can obtain a copy of this License. You may not +attempt to alter or restrict the recipients' rights in the Source Code +Form. + +3.2. Distribution of Executable Form + +If You distribute Covered Software in Executable Form then: + +(a) such Covered Software must also be made available in Source Code + Form, as described in Section 3.1, and You must inform recipients of + the Executable Form how they can obtain a copy of such Source Code + Form by reasonable means in a timely manner, at a charge no more + than the cost of distribution to the recipient; and + +(b) You may distribute such Executable Form under the terms of this + License, or sublicense it under different terms, provided that the + license for the Executable Form does not attempt to limit or alter + the recipients' rights in the Source Code Form under this License. + +3.3. Distribution of a Larger Work + +You may create and distribute a Larger Work under terms of Your choice, +provided that You also comply with the requirements of this License for +the Covered Software. If the Larger Work is a combination of Covered +Software with a work governed by one or more Secondary Licenses, and the +Covered Software is not Incompatible With Secondary Licenses, this +License permits You to additionally distribute such Covered Software +under the terms of such Secondary License(s), so that the recipient of +the Larger Work may, at their option, further distribute the Covered +Software under the terms of either this License or such Secondary +License(s). + +3.4. Notices + +You may not remove or alter the substance of any license notices +(including copyright notices, patent notices, disclaimers of warranty, +or limitations of liability) contained within the Source Code Form of +the Covered Software, except that You may alter any license notices to +the extent required to remedy known factual inaccuracies. + +3.5. Application of Additional Terms + +You may choose to offer, and to charge a fee for, warranty, support, +indemnity or liability obligations to one or more recipients of Covered +Software. However, You may do so only on Your own behalf, and not on +behalf of any Contributor. You must make it absolutely clear that any +such warranty, support, indemnity, or liability obligation is offered by +You alone, and You hereby agree to indemnify every Contributor for any +liability incurred by such Contributor as a result of warranty, support, +indemnity or liability terms You offer. You may include additional +disclaimers of warranty and limitations of liability specific to any +jurisdiction. + +4. Inability to Comply Due to Statute or Regulation +--------------------------------------------------- + +If it is impossible for You to comply with any of the terms of this +License with respect to some or all of the Covered Software due to +statute, judicial order, or regulation then You must: (a) comply with +the terms of this License to the maximum extent possible; and (b) +describe the limitations and the code they affect. Such description must +be placed in a text file included with all distributions of the Covered +Software under this License. Except to the extent prohibited by statute +or regulation, such description must be sufficiently detailed for a +recipient of ordinary skill to be able to understand it. + +5. Termination +-------------- + +5.1. The rights granted under this License will terminate automatically +if You fail to comply with any of its terms. However, if You become +compliant, then the rights granted under this License from a particular +Contributor are reinstated (a) provisionally, unless and until such +Contributor explicitly and finally terminates Your grants, and (b) on an +ongoing basis, if such Contributor fails to notify You of the +non-compliance by some reasonable means prior to 60 days after You have +come back into compliance. Moreover, Your grants from a particular +Contributor are reinstated on an ongoing basis if such Contributor +notifies You of the non-compliance by some reasonable means, this is the +first time You have received notice of non-compliance with this License +from such Contributor, and You become compliant prior to 30 days after +Your receipt of the notice. + +5.2. If You initiate litigation against any entity by asserting a patent +infringement claim (excluding declaratory judgment actions, +counter-claims, and cross-claims) alleging that a Contributor Version +directly or indirectly infringes any patent, then the rights granted to +You by any and all Contributors for the Covered Software under Section +2.1 of this License shall terminate. + +5.3. In the event of termination under Sections 5.1 or 5.2 above, all +end user license agreements (excluding distributors and resellers) which +have been validly granted by You or Your distributors under this License +prior to termination shall survive termination. + +************************************************************************ +* * +* 6. Disclaimer of Warranty * +* ------------------------- * +* * +* Covered Software is provided under this License on an "as is" * +* basis, without warranty of any kind, either expressed, implied, or * +* statutory, including, without limitation, warranties that the * +* Covered Software is free of defects, merchantable, fit for a * +* particular purpose or non-infringing. The entire risk as to the * +* quality and performance of the Covered Software is with You. * +* Should any Covered Software prove defective in any respect, You * +* (not any Contributor) assume the cost of any necessary servicing, * +* repair, or correction. This disclaimer of warranty constitutes an * +* essential part of this License. No use of any Covered Software is * +* authorized under this License except under this disclaimer. * +* * +************************************************************************ + +************************************************************************ +* * +* 7. Limitation of Liability * +* -------------------------- * +* * +* Under no circumstances and under no legal theory, whether tort * +* (including negligence), contract, or otherwise, shall any * +* Contributor, or anyone who distributes Covered Software as * +* permitted above, be liable to You for any direct, indirect, * +* special, incidental, or consequential damages of any character * +* including, without limitation, damages for lost profits, loss of * +* goodwill, work stoppage, computer failure or malfunction, or any * +* and all other commercial damages or losses, even if such party * +* shall have been informed of the possibility of such damages. This * +* limitation of liability shall not apply to liability for death or * +* personal injury resulting from such party's negligence to the * +* extent applicable law prohibits such limitation. Some * +* jurisdictions do not allow the exclusion or limitation of * +* incidental or consequential damages, so this exclusion and * +* limitation may not apply to You. * +* * +************************************************************************ + +8. Litigation +------------- + +Any litigation relating to this License may be brought only in the +courts of a jurisdiction where the defendant maintains its principal +place of business and such litigation shall be governed by laws of that +jurisdiction, without reference to its conflict-of-law provisions. +Nothing in this Section shall prevent a party's ability to bring +cross-claims or counter-claims. + +9. Miscellaneous +---------------- + +This License represents the complete agreement concerning the subject +matter hereof. If any provision of this License is held to be +unenforceable, such provision shall be reformed only to the extent +necessary to make it enforceable. Any law or regulation which provides +that the language of a contract shall be construed against the drafter +shall not be used to construe this License against a Contributor. + +10. Versions of the License +--------------------------- + +10.1. New Versions + +Mozilla Foundation is the license steward. Except as provided in Section +10.3, no one other than the license steward has the right to modify or +publish new versions of this License. Each version will be given a +distinguishing version number. + +10.2. Effect of New Versions + +You may distribute the Covered Software under the terms of the version +of the License under which You originally received the Covered Software, +or under the terms of any subsequent version published by the license +steward. + +10.3. Modified Versions + +If you create software not governed by this License, and you want to +create a new license for such software, you may create and use a +modified version of this License if you rename the license and remove +any references to the name of the license steward (except to note that +such modified license differs from this License). + +10.4. Distributing Source Code Form that is Incompatible With Secondary +Licenses + +If You choose to distribute Source Code Form that is Incompatible With +Secondary Licenses under the terms of this version of the License, the +notice described in Exhibit B of this License must be attached. + +Exhibit A - Source Code Form License Notice +------------------------------------------- + + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. + +If it is not possible or desirable to put the notice in a particular +file, then You may include the notice in a location (such as a LICENSE +file in a relevant directory) where a recipient would be likely to look +for such a notice. + +You may add additional accurate notices of copyright ownership. + +Exhibit B - "Incompatible With Secondary Licenses" Notice +--------------------------------------------------------- + + This Source Code Form is "Incompatible With Secondary Licenses", as + defined by the Mozilla Public License, v. 2.0. diff --git a/package-lock.json b/package-lock.json index 4aa4feb0..fe0925a2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7,7 +7,7 @@ "": { "name": "@turbowarp/extensions", "version": "0.0.1", - "license": "MIT AND LGPL-3.0-only AND GPL-3.0-only AND CC-BY-SA-4.0 AND CC-BY-4.0 AND CC-BY-2.5 AND CC0-1.0 AND Apache-2.0", + "license": "MIT AND LGPL-3.0-only AND GPL-3.0-only AND CC-BY-SA-4.0 AND CC-BY-4.0 AND CC-BY-2.5 AND CC0-1.0 AND Apache-2.0 AND MPL-2.0", "dependencies": { "@turbowarp/json": "^0.1.2", "@turbowarp/scratchblocks": "^3.6.4", diff --git a/package.json b/package.json index 65bfb8e3..162c5566 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "type": "git", "url": "git+https://github.com/TurboWarp/extensions.git" }, - "license": "MIT AND LGPL-3.0-only AND GPL-3.0-only AND CC-BY-SA-4.0 AND CC-BY-4.0 AND CC-BY-2.5 AND CC0-1.0 AND Apache-2.0", + "license": "MIT AND LGPL-3.0-only AND GPL-3.0-only AND CC-BY-SA-4.0 AND CC-BY-4.0 AND CC-BY-2.5 AND CC0-1.0 AND Apache-2.0 AND MPL-2.0", "bugs": { "url": "https://github.com/TurboWarp/extensions/issues" },