diff --git a/.gitpod.yml b/.gitpod.yml index a2ef0ae6f..2940034a6 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -1,6 +1,6 @@ # SPDX-FileCopyrightText: 2021 The CC: Tweaked Developers # -# SPDX-License-Identifier: LicenseRef-CCPL +# SPDX-License-Identifier: MPL-2.0 image: file: config/gitpod/Dockerfile diff --git a/.reuse/dep5 b/.reuse/dep5 index 4e7709e2b..48eb2ee7d 100644 --- a/.reuse/dep5 +++ b/.reuse/dep5 @@ -9,6 +9,8 @@ Files: projects/common/src/testMod/resources/data/cctest/structures/* projects/fabric/src/generated/* projects/forge/src/generated/* + projects/web/src/export/index.json + projects/web/src/export/items/minecraft/* Comment: Generated/data files are CC0. Copyright: The CC: Tweaked Developers License: CC0-1.0 @@ -41,7 +43,6 @@ License: MPL-2.0 Files: doc/images/* doc/logo.png - projects/common/src/main/resources/assets/computercraft/lang/* projects/common/src/main/resources/assets/computercraft/models/* projects/common/src/main/resources/assets/computercraft/textures/* projects/common/src/main/resources/pack.mcmeta @@ -53,11 +54,17 @@ Files: projects/core/src/main/resources/data/computercraft/lua/rom/modules/turtle/.ignoreme projects/core/src/main/resources/data/computercraft/lua/rom/motd.txt projects/core/src/main/resources/data/computercraft/lua/rom/programs/fun/advanced/levels/* - projects/web/src/export/* + projects/web/src/export/items/computercraft/* Comment: Bulk-license original assets as CCPL. Copyright: 2011 Daniel Ratcliffe License: LicenseRef-CCPL +Files: + projects/common/src/main/resources/assets/computercraft/lang/* +Comment: Community-contributed license files +Copyright: 2017 The CC: Tweaked Developers +License: LicenseRef-CCPL + Files: .github/* Comment: diff --git a/buildSrc/src/main/kotlin/cc/tweaked/gradle/Illuaminate.kt b/buildSrc/src/main/kotlin/cc/tweaked/gradle/Illuaminate.kt index 0ccdd07e9..d44596fb1 100644 --- a/buildSrc/src/main/kotlin/cc/tweaked/gradle/Illuaminate.kt +++ b/buildSrc/src/main/kotlin/cc/tweaked/gradle/Illuaminate.kt @@ -1,6 +1,6 @@ // SPDX-FileCopyrightText: 2022 The CC: Tweaked Developers // -// SPDX-License-Identifier: LicenseRef-CCPL +// SPDX-License-Identifier: MPL-2.0 package cc.tweaked.gradle diff --git a/config/gitpod/Dockerfile b/config/gitpod/Dockerfile index 3345c4d2c..78e922ea4 100644 --- a/config/gitpod/Dockerfile +++ b/config/gitpod/Dockerfile @@ -1,6 +1,6 @@ # SPDX-FileCopyrightText: 2021 The CC: Tweaked Developers # -# SPDX-License-Identifier: LicenseRef-CCPL +# SPDX-License-Identifier: MPL-2.0 FROM gitpod/workspace-base diff --git a/doc/events/computer_command.md b/doc/events/computer_command.md index 747781740..44eef962b 100644 --- a/doc/events/computer_command.md +++ b/doc/events/computer_command.md @@ -5,7 +5,7 @@ module: [kind=event] computer_command The @{computer_command} event is fired when the `/computercraft queue` command is run for the current computer. diff --git a/doc/events/redstone.md b/doc/events/redstone.md index 369061a1e..866675906 100644 --- a/doc/events/redstone.md +++ b/doc/events/redstone.md @@ -5,7 +5,7 @@ module: [kind=event] redstone The @{event!redstone} event is fired whenever any redstone inputs on the computer change. diff --git a/doc/events/task_complete.md b/doc/events/task_complete.md index 44dbd792e..79e2aa04f 100644 --- a/doc/events/task_complete.md +++ b/doc/events/task_complete.md @@ -6,7 +6,7 @@ see: commands.execAsync To run a command which fires a task_complete event. The @{task_complete} event is fired when an asynchronous task completes. This is usually handled inside the function call that queued the task; however, functions such as @{commands.execAsync} return immediately so the user can wait for completion. diff --git a/doc/events/term_resize.md b/doc/events/term_resize.md index b8969bb21..dbf490445 100644 --- a/doc/events/term_resize.md +++ b/doc/events/term_resize.md @@ -5,7 +5,7 @@ module: [kind=event] term_resize The @{term_resize} event is fired when the main terminal is resized. For instance: diff --git a/doc/events/terminate.md b/doc/events/terminate.md index 64cb87812..b764286b8 100644 --- a/doc/events/terminate.md +++ b/doc/events/terminate.md @@ -5,7 +5,7 @@ module: [kind=event] terminate The @{terminate} event is fired when Ctrl-T is held down. diff --git a/doc/events/turtle_inventory.md b/doc/events/turtle_inventory.md index aad04c353..a39e74950 100644 --- a/doc/events/turtle_inventory.md +++ b/doc/events/turtle_inventory.md @@ -5,7 +5,7 @@ module: [kind=event] turtle_inventory The @{turtle_inventory} event is fired when a turtle's inventory is changed. diff --git a/doc/guides/gps_setup.md b/doc/guides/gps_setup.md index ae7f7a8ab..1b616d67a 100644 --- a/doc/guides/gps_setup.md +++ b/doc/guides/gps_setup.md @@ -5,7 +5,7 @@ module: [kind=guide] gps_setup # Setting up GPS diff --git a/doc/stub/global.lua b/doc/stub/global.lua index 579273741..1065c1497 100644 --- a/doc/stub/global.lua +++ b/doc/stub/global.lua @@ -1,6 +1,6 @@ -- SPDX-FileCopyrightText: 2020 The CC: Tweaked Developers -- --- SPDX-License-Identifier: LicenseRef-CCPL +-- SPDX-License-Identifier: MPL-2.0 --[[- Functions in the global environment, defined in `bios.lua`. This does not diff --git a/doc/stub/os.lua b/doc/stub/os.lua index 295925e3b..48043cb67 100644 --- a/doc/stub/os.lua +++ b/doc/stub/os.lua @@ -1,8 +1,6 @@ -- SPDX-FileCopyrightText: 2020 The CC: Tweaked Developers -- --- SPDX-License-Identifier: LicenseRef-CCPL - --- Defined in bios.lua +-- SPDX-License-Identifier: MPL-2.0 --[[- Loads the given API into the global environment. diff --git a/projects/common-api/src/main/java/dan200/computercraft/api/detail/BasicItemDetailProvider.java b/projects/common-api/src/main/java/dan200/computercraft/api/detail/BasicItemDetailProvider.java index 24ca45b4d..bf706f0db 100644 --- a/projects/common-api/src/main/java/dan200/computercraft/api/detail/BasicItemDetailProvider.java +++ b/projects/common-api/src/main/java/dan200/computercraft/api/detail/BasicItemDetailProvider.java @@ -1,6 +1,6 @@ // SPDX-FileCopyrightText: 2022 The CC: Tweaked Developers // -// SPDX-License-Identifier: LicenseRef-CCPL +// SPDX-License-Identifier: MPL-2.0 package dan200.computercraft.api.detail; diff --git a/projects/common-api/src/main/java/dan200/computercraft/api/detail/BlockReference.java b/projects/common-api/src/main/java/dan200/computercraft/api/detail/BlockReference.java index a96b0229f..fc6f25bf6 100644 --- a/projects/common-api/src/main/java/dan200/computercraft/api/detail/BlockReference.java +++ b/projects/common-api/src/main/java/dan200/computercraft/api/detail/BlockReference.java @@ -1,6 +1,6 @@ // SPDX-FileCopyrightText: 2022 The CC: Tweaked Developers // -// SPDX-License-Identifier: LicenseRef-CCPL +// SPDX-License-Identifier: MPL-2.0 package dan200.computercraft.api.detail; diff --git a/projects/common-api/src/main/java/dan200/computercraft/api/detail/DetailProvider.java b/projects/common-api/src/main/java/dan200/computercraft/api/detail/DetailProvider.java index 60d6c8657..879ed77eb 100644 --- a/projects/common-api/src/main/java/dan200/computercraft/api/detail/DetailProvider.java +++ b/projects/common-api/src/main/java/dan200/computercraft/api/detail/DetailProvider.java @@ -1,6 +1,6 @@ // SPDX-FileCopyrightText: 2022 The CC: Tweaked Developers // -// SPDX-License-Identifier: LicenseRef-CCPL +// SPDX-License-Identifier: MPL-2.0 package dan200.computercraft.api.detail; diff --git a/projects/common-api/src/main/java/dan200/computercraft/api/upgrades/UpgradeBase.java b/projects/common-api/src/main/java/dan200/computercraft/api/upgrades/UpgradeBase.java index 643a14b9f..ee83da691 100644 --- a/projects/common-api/src/main/java/dan200/computercraft/api/upgrades/UpgradeBase.java +++ b/projects/common-api/src/main/java/dan200/computercraft/api/upgrades/UpgradeBase.java @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2020 The CC: Tweaked Developers - +// Copyright Daniel Ratcliffe, 2011-2022. This API may be redistributed unmodified and in full only. +// // SPDX-License-Identifier: LicenseRef-CCPL package dan200.computercraft.api.upgrades; diff --git a/projects/common/src/client/java/dan200/computercraft/client/gui/NoTermComputerScreen.java b/projects/common/src/client/java/dan200/computercraft/client/gui/NoTermComputerScreen.java index c926ad1fb..af5c0f889 100644 --- a/projects/common/src/client/java/dan200/computercraft/client/gui/NoTermComputerScreen.java +++ b/projects/common/src/client/java/dan200/computercraft/client/gui/NoTermComputerScreen.java @@ -1,4 +1,4 @@ -// Copyright Daniel Ratcliffe, 2011-2022. Do not distribute without permission. +// SPDX-FileCopyrightText: 2021 The CC: Tweaked Developers // // SPDX-License-Identifier: LicenseRef-CCPL diff --git a/projects/common/src/client/java/dan200/computercraft/client/render/monitor/MonitorRenderState.java b/projects/common/src/client/java/dan200/computercraft/client/render/monitor/MonitorRenderState.java index a8961b726..f6d77413b 100644 --- a/projects/common/src/client/java/dan200/computercraft/client/render/monitor/MonitorRenderState.java +++ b/projects/common/src/client/java/dan200/computercraft/client/render/monitor/MonitorRenderState.java @@ -1,6 +1,6 @@ -// Copyright Daniel Ratcliffe, 2011-2022. Do not distribute without permission. +// SPDX-FileCopyrightText: 2018 The CC: Tweaked Developers // -// SPDX-License-Identifier: LicenseRef-CCPL +// SPDX-License-Identifier: MPL-2.0 package dan200.computercraft.client.render.monitor; diff --git a/projects/common/src/main/java/dan200/computercraft/shared/details/DetailHelpers.java b/projects/common/src/main/java/dan200/computercraft/shared/details/DetailHelpers.java index 38dac942c..e39385ee8 100644 --- a/projects/common/src/main/java/dan200/computercraft/shared/details/DetailHelpers.java +++ b/projects/common/src/main/java/dan200/computercraft/shared/details/DetailHelpers.java @@ -1,6 +1,6 @@ -// Copyright Daniel Ratcliffe, 2011-2022. Do not distribute without permission. +// SPDX-FileCopyrightText: 2020 The CC: Tweaked Developers // -// SPDX-License-Identifier: LicenseRef-CCPL +// SPDX-License-Identifier: MPL-2.0 package dan200.computercraft.shared.details; diff --git a/projects/common/src/main/java/dan200/computercraft/shared/details/ItemDetails.java b/projects/common/src/main/java/dan200/computercraft/shared/details/ItemDetails.java index 6ccf668a4..e5ebd8e1f 100644 --- a/projects/common/src/main/java/dan200/computercraft/shared/details/ItemDetails.java +++ b/projects/common/src/main/java/dan200/computercraft/shared/details/ItemDetails.java @@ -1,4 +1,4 @@ -// Copyright Daniel Ratcliffe, 2011-2022. Do not distribute without permission. +// SPDX-FileCopyrightText: 2020 The CC: Tweaked Developers // // SPDX-License-Identifier: LicenseRef-CCPL diff --git a/projects/common/src/main/java/dan200/computercraft/shared/network/server/UploadFileMessage.java b/projects/common/src/main/java/dan200/computercraft/shared/network/server/UploadFileMessage.java index b598c16b1..89adb8227 100644 --- a/projects/common/src/main/java/dan200/computercraft/shared/network/server/UploadFileMessage.java +++ b/projects/common/src/main/java/dan200/computercraft/shared/network/server/UploadFileMessage.java @@ -1,6 +1,6 @@ -// Copyright Daniel Ratcliffe, 2011-2022. Do not distribute without permission. +// SPDX-FileCopyrightText: 2021 The CC: Tweaked Developers // -// SPDX-License-Identifier: LicenseRef-CCPL +// SPDX-License-Identifier: MPL-2.0 package dan200.computercraft.shared.network.server; diff --git a/projects/common/src/main/java/dan200/computercraft/shared/peripheral/speaker/SpeakerBlockEntity.java b/projects/common/src/main/java/dan200/computercraft/shared/peripheral/speaker/SpeakerBlockEntity.java index f003ee188..f1d5e02d9 100644 --- a/projects/common/src/main/java/dan200/computercraft/shared/peripheral/speaker/SpeakerBlockEntity.java +++ b/projects/common/src/main/java/dan200/computercraft/shared/peripheral/speaker/SpeakerBlockEntity.java @@ -1,4 +1,4 @@ -// Copyright Daniel Ratcliffe, 2011-2022. Do not distribute without permission. +// SPDX-FileCopyrightText: 2017 The CC: Tweaked Developers // // SPDX-License-Identifier: LicenseRef-CCPL diff --git a/projects/common/src/main/java/dan200/computercraft/shared/peripheral/speaker/SpeakerPeripheral.java b/projects/common/src/main/java/dan200/computercraft/shared/peripheral/speaker/SpeakerPeripheral.java index b17e64595..04fcff384 100644 --- a/projects/common/src/main/java/dan200/computercraft/shared/peripheral/speaker/SpeakerPeripheral.java +++ b/projects/common/src/main/java/dan200/computercraft/shared/peripheral/speaker/SpeakerPeripheral.java @@ -1,4 +1,4 @@ -// Copyright Daniel Ratcliffe, 2011-2022. Do not distribute without permission. +// SPDX-FileCopyrightText: 2017 The CC: Tweaked Developers // // SPDX-License-Identifier: LicenseRef-CCPL diff --git a/projects/common/src/main/java/dan200/computercraft/shared/pocket/peripherals/PocketSpeaker.java b/projects/common/src/main/java/dan200/computercraft/shared/pocket/peripherals/PocketSpeaker.java index 720a6a168..ff8eae684 100644 --- a/projects/common/src/main/java/dan200/computercraft/shared/pocket/peripherals/PocketSpeaker.java +++ b/projects/common/src/main/java/dan200/computercraft/shared/pocket/peripherals/PocketSpeaker.java @@ -1,4 +1,4 @@ -// Copyright Daniel Ratcliffe, 2011-2022. Do not distribute without permission. +// SPDX-FileCopyrightText: 2017 The CC: Tweaked Developers // // SPDX-License-Identifier: LicenseRef-CCPL diff --git a/projects/common/src/main/java/dan200/computercraft/shared/pocket/peripherals/PocketSpeakerPeripheral.java b/projects/common/src/main/java/dan200/computercraft/shared/pocket/peripherals/PocketSpeakerPeripheral.java index b5f682865..9306a55b4 100644 --- a/projects/common/src/main/java/dan200/computercraft/shared/pocket/peripherals/PocketSpeakerPeripheral.java +++ b/projects/common/src/main/java/dan200/computercraft/shared/pocket/peripherals/PocketSpeakerPeripheral.java @@ -1,4 +1,4 @@ -// Copyright Daniel Ratcliffe, 2011-2022. Do not distribute without permission. +// SPDX-FileCopyrightText: 2017 The CC: Tweaked Developers // // SPDX-License-Identifier: LicenseRef-CCPL diff --git a/projects/common/src/main/java/dan200/computercraft/shared/turtle/upgrades/TurtleSpeaker.java b/projects/common/src/main/java/dan200/computercraft/shared/turtle/upgrades/TurtleSpeaker.java index 99f5242e6..455d522fd 100644 --- a/projects/common/src/main/java/dan200/computercraft/shared/turtle/upgrades/TurtleSpeaker.java +++ b/projects/common/src/main/java/dan200/computercraft/shared/turtle/upgrades/TurtleSpeaker.java @@ -1,4 +1,4 @@ -// Copyright Daniel Ratcliffe, 2011-2022. Do not distribute without permission. +// SPDX-FileCopyrightText: 2017 The CC: Tweaked Developers // // SPDX-License-Identifier: LicenseRef-CCPL diff --git a/projects/common/src/main/java/dan200/computercraft/shared/util/DropConsumer.java b/projects/common/src/main/java/dan200/computercraft/shared/util/DropConsumer.java index d2530bc1b..cbedaeeb5 100644 --- a/projects/common/src/main/java/dan200/computercraft/shared/util/DropConsumer.java +++ b/projects/common/src/main/java/dan200/computercraft/shared/util/DropConsumer.java @@ -1,6 +1,6 @@ -// Copyright Daniel Ratcliffe, 2011-2022. Do not distribute without permission. +// SPDX-FileCopyrightText: 2018 The CC: Tweaked Developers // -// SPDX-License-Identifier: LicenseRef-CCPL +// SPDX-License-Identifier: MPL-2.0 package dan200.computercraft.shared.util; diff --git a/projects/common/src/main/resources/assets/minecraft/shaders/core/computercraft/monitor_tbo.fsh b/projects/common/src/main/resources/assets/minecraft/shaders/core/computercraft/monitor_tbo.fsh index 3fe664aca..85e91499b 100644 --- a/projects/common/src/main/resources/assets/minecraft/shaders/core/computercraft/monitor_tbo.fsh +++ b/projects/common/src/main/resources/assets/minecraft/shaders/core/computercraft/monitor_tbo.fsh @@ -1,6 +1,6 @@ // SPDX-FileCopyrightText: 2020 The CC: Tweaked Developers // -// SPDX-License-Identifier: LicenseRef-CCPL +// SPDX-License-Identifier: MPL-2.0 #version 150 diff --git a/projects/common/src/main/resources/assets/minecraft/shaders/core/computercraft/monitor_tbo.vsh b/projects/common/src/main/resources/assets/minecraft/shaders/core/computercraft/monitor_tbo.vsh index 766b0d72c..d46a089ce 100644 --- a/projects/common/src/main/resources/assets/minecraft/shaders/core/computercraft/monitor_tbo.vsh +++ b/projects/common/src/main/resources/assets/minecraft/shaders/core/computercraft/monitor_tbo.vsh @@ -1,6 +1,6 @@ // SPDX-FileCopyrightText: 2020 The CC: Tweaked Developers // -// SPDX-License-Identifier: LicenseRef-CCPL +// SPDX-License-Identifier: MPL-2.0 #version 150 diff --git a/projects/core-api/src/main/java/dan200/computercraft/api/lua/IDynamicLuaObject.java b/projects/core-api/src/main/java/dan200/computercraft/api/lua/IDynamicLuaObject.java index 04be2bc74..f9b1e2ffa 100644 --- a/projects/core-api/src/main/java/dan200/computercraft/api/lua/IDynamicLuaObject.java +++ b/projects/core-api/src/main/java/dan200/computercraft/api/lua/IDynamicLuaObject.java @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2020 The CC: Tweaked Developers - +// Copyright Daniel Ratcliffe, 2011-2022. This API may be redistributed unmodified and in full only. +// // SPDX-License-Identifier: LicenseRef-CCPL package dan200.computercraft.api.lua; diff --git a/projects/core-api/src/main/java/dan200/computercraft/api/lua/ILuaAPI.java b/projects/core-api/src/main/java/dan200/computercraft/api/lua/ILuaAPI.java index 1206e8f86..60b0fb634 100644 --- a/projects/core-api/src/main/java/dan200/computercraft/api/lua/ILuaAPI.java +++ b/projects/core-api/src/main/java/dan200/computercraft/api/lua/ILuaAPI.java @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2017 The CC: Tweaked Developers - +// Copyright Daniel Ratcliffe, 2011-2022. This API may be redistributed unmodified and in full only. +// // SPDX-License-Identifier: LicenseRef-CCPL package dan200.computercraft.api.lua; diff --git a/projects/core-api/src/main/java/dan200/computercraft/api/lua/TaskCallback.java b/projects/core-api/src/main/java/dan200/computercraft/api/lua/TaskCallback.java index 70660f9be..7b1385f58 100644 --- a/projects/core-api/src/main/java/dan200/computercraft/api/lua/TaskCallback.java +++ b/projects/core-api/src/main/java/dan200/computercraft/api/lua/TaskCallback.java @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2020 The CC: Tweaked Developers - +// Copyright Daniel Ratcliffe, 2011-2022. This API may be redistributed unmodified and in full only. +// // SPDX-License-Identifier: LicenseRef-CCPL package dan200.computercraft.api.lua; diff --git a/projects/core-api/src/main/java/dan200/computercraft/api/peripheral/IDynamicPeripheral.java b/projects/core-api/src/main/java/dan200/computercraft/api/peripheral/IDynamicPeripheral.java index 292b0cc1d..6d2b96c4a 100644 --- a/projects/core-api/src/main/java/dan200/computercraft/api/peripheral/IDynamicPeripheral.java +++ b/projects/core-api/src/main/java/dan200/computercraft/api/peripheral/IDynamicPeripheral.java @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2020 The CC: Tweaked Developers - +// Copyright Daniel Ratcliffe, 2011-2022. This API may be redistributed unmodified and in full only. +// // SPDX-License-Identifier: LicenseRef-CCPL package dan200.computercraft.api.peripheral; diff --git a/projects/core/src/main/java/dan200/computercraft/core/terminal/Palette.java b/projects/core/src/main/java/dan200/computercraft/core/terminal/Palette.java index 7ce7cf509..0dea4b521 100644 --- a/projects/core/src/main/java/dan200/computercraft/core/terminal/Palette.java +++ b/projects/core/src/main/java/dan200/computercraft/core/terminal/Palette.java @@ -1,6 +1,6 @@ -// Copyright Daniel Ratcliffe, 2011-2022. Do not distribute without permission. +// SPDX-FileCopyrightText: 2017 The CC: Tweaked Developers // -// SPDX-License-Identifier: LicenseRef-CCPL +// SPDX-License-Identifier: MPL-2.0 package dan200.computercraft.core.terminal; diff --git a/projects/core/src/main/resources/data/computercraft/lua/rom/apis/fs.lua b/projects/core/src/main/resources/data/computercraft/lua/rom/apis/fs.lua index 0374d03d9..1a0fb4b53 100644 --- a/projects/core/src/main/resources/data/computercraft/lua/rom/apis/fs.lua +++ b/projects/core/src/main/resources/data/computercraft/lua/rom/apis/fs.lua @@ -1,4 +1,4 @@ --- SPDX-FileCopyrightText: 2022 The CC: Tweaked Developers +-- SPDX-FileCopyrightText: 2017 Daniel Ratcliffe -- -- SPDX-License-Identifier: LicenseRef-CCPL diff --git a/projects/core/src/main/resources/data/computercraft/lua/rom/apis/http/http.lua b/projects/core/src/main/resources/data/computercraft/lua/rom/apis/http/http.lua index f20c100be..782719962 100644 --- a/projects/core/src/main/resources/data/computercraft/lua/rom/apis/http/http.lua +++ b/projects/core/src/main/resources/data/computercraft/lua/rom/apis/http/http.lua @@ -1,4 +1,4 @@ --- SPDX-FileCopyrightText: 2022 The CC: Tweaked Developers +-- SPDX-FileCopyrightText: 2017 Daniel Ratcliffe -- -- SPDX-License-Identifier: LicenseRef-CCPL diff --git a/projects/core/src/main/resources/data/computercraft/lua/rom/modules/main/cc/completion.lua b/projects/core/src/main/resources/data/computercraft/lua/rom/modules/main/cc/completion.lua index 241f1a218..4b5bf9619 100644 --- a/projects/core/src/main/resources/data/computercraft/lua/rom/modules/main/cc/completion.lua +++ b/projects/core/src/main/resources/data/computercraft/lua/rom/modules/main/cc/completion.lua @@ -1,6 +1,6 @@ -- SPDX-FileCopyrightText: 2017 Daniel Ratcliffe -- --- SPDX-License-Identifier: MPL-2.0 +-- SPDX-License-Identifier: LicenseRef-CCPL --- A collection of helper methods for working with input completion, such -- as that require by @{_G.read}. diff --git a/projects/core/src/main/resources/data/computercraft/lua/rom/modules/main/cc/expect.lua b/projects/core/src/main/resources/data/computercraft/lua/rom/modules/main/cc/expect.lua index 725b0ca59..02b6c510c 100644 --- a/projects/core/src/main/resources/data/computercraft/lua/rom/modules/main/cc/expect.lua +++ b/projects/core/src/main/resources/data/computercraft/lua/rom/modules/main/cc/expect.lua @@ -1,6 +1,6 @@ -- SPDX-FileCopyrightText: 2019 The CC: Tweaked Developers -- --- SPDX-License-Identifier: LicenseRef-CCPL +-- SPDX-License-Identifier: MPL-2.0 --[[- The @{cc.expect} library provides helper functions for verifying that function arguments are well-formed and of the correct type. diff --git a/projects/core/src/main/resources/data/computercraft/lua/rom/modules/main/cc/image/nft.lua b/projects/core/src/main/resources/data/computercraft/lua/rom/modules/main/cc/image/nft.lua index 731dbaaf6..2df2ed962 100644 --- a/projects/core/src/main/resources/data/computercraft/lua/rom/modules/main/cc/image/nft.lua +++ b/projects/core/src/main/resources/data/computercraft/lua/rom/modules/main/cc/image/nft.lua @@ -1,6 +1,6 @@ -- SPDX-FileCopyrightText: 2020 The CC: Tweaked Developers -- --- SPDX-License-Identifier: LicenseRef-CCPL +-- SPDX-License-Identifier: MPL-2.0 --- Read and draw nbt ("Nitrogen Fingers Text") images. -- diff --git a/projects/core/src/main/resources/data/computercraft/lua/rom/modules/main/cc/pretty.lua b/projects/core/src/main/resources/data/computercraft/lua/rom/modules/main/cc/pretty.lua index 19b285882..d0cdf6c41 100644 --- a/projects/core/src/main/resources/data/computercraft/lua/rom/modules/main/cc/pretty.lua +++ b/projects/core/src/main/resources/data/computercraft/lua/rom/modules/main/cc/pretty.lua @@ -1,6 +1,6 @@ -- SPDX-FileCopyrightText: 2020 The CC: Tweaked Developers -- --- SPDX-License-Identifier: LicenseRef-CCPL +-- SPDX-License-Identifier: MPL-2.0 --[[- A pretty printer for rendering data structures in an aesthetically pleasing manner. diff --git a/projects/core/src/main/resources/data/computercraft/lua/rom/modules/main/cc/require.lua b/projects/core/src/main/resources/data/computercraft/lua/rom/modules/main/cc/require.lua index 73e20151f..b6ae8bbee 100644 --- a/projects/core/src/main/resources/data/computercraft/lua/rom/modules/main/cc/require.lua +++ b/projects/core/src/main/resources/data/computercraft/lua/rom/modules/main/cc/require.lua @@ -1,4 +1,4 @@ --- SPDX-FileCopyrightText: 2020 The CC: Tweaked Developers +-- SPDX-FileCopyrightText: 2017 Daniel Ratcliffe -- -- SPDX-License-Identifier: LicenseRef-CCPL diff --git a/projects/core/src/main/resources/data/computercraft/lua/rom/modules/main/cc/strings.lua b/projects/core/src/main/resources/data/computercraft/lua/rom/modules/main/cc/strings.lua index 51e6035d0..11bf4cad4 100644 --- a/projects/core/src/main/resources/data/computercraft/lua/rom/modules/main/cc/strings.lua +++ b/projects/core/src/main/resources/data/computercraft/lua/rom/modules/main/cc/strings.lua @@ -1,6 +1,6 @@ -- SPDX-FileCopyrightText: 2020 The CC: Tweaked Developers -- --- SPDX-License-Identifier: LicenseRef-CCPL +-- SPDX-License-Identifier: MPL-2.0 --- Various utilities for working with strings and text. -- diff --git a/projects/core/src/main/resources/data/computercraft/lua/rom/programs/motd.lua b/projects/core/src/main/resources/data/computercraft/lua/rom/programs/motd.lua index 0fc64ca97..518e16bd0 100644 --- a/projects/core/src/main/resources/data/computercraft/lua/rom/programs/motd.lua +++ b/projects/core/src/main/resources/data/computercraft/lua/rom/programs/motd.lua @@ -1,6 +1,6 @@ -- SPDX-FileCopyrightText: 2020 The CC: Tweaked Developers -- --- SPDX-License-Identifier: LicenseRef-CCPL +-- SPDX-License-Identifier: MPL-2.0 local date = os.date("*t") if date.month == 1 and date.day == 1 then diff --git a/projects/core/src/main/resources/data/computercraft/lua/rom/programs/pocket/equip.lua b/projects/core/src/main/resources/data/computercraft/lua/rom/programs/pocket/equip.lua index e2fbd571c..7f60c7fc7 100644 --- a/projects/core/src/main/resources/data/computercraft/lua/rom/programs/pocket/equip.lua +++ b/projects/core/src/main/resources/data/computercraft/lua/rom/programs/pocket/equip.lua @@ -1,6 +1,6 @@ -- SPDX-FileCopyrightText: 2017 The CC: Tweaked Developers -- --- SPDX-License-Identifier: LicenseRef-CCPL +-- SPDX-License-Identifier: MPL-2.0 if not pocket then printError("Requires a Pocket Computer") diff --git a/projects/core/src/main/resources/data/computercraft/lua/rom/programs/pocket/unequip.lua b/projects/core/src/main/resources/data/computercraft/lua/rom/programs/pocket/unequip.lua index 613ffbb61..a857426d4 100644 --- a/projects/core/src/main/resources/data/computercraft/lua/rom/programs/pocket/unequip.lua +++ b/projects/core/src/main/resources/data/computercraft/lua/rom/programs/pocket/unequip.lua @@ -1,6 +1,6 @@ -- SPDX-FileCopyrightText: 2017 The CC: Tweaked Developers -- --- SPDX-License-Identifier: LicenseRef-CCPL +-- SPDX-License-Identifier: MPL-2.0 if not pocket then printError("Requires a Pocket Computer") diff --git a/projects/core/src/test/java/dan200/computercraft/core/terminal/TerminalTest.java b/projects/core/src/test/java/dan200/computercraft/core/terminal/TerminalTest.java index 7f79d49f8..bb34efcb5 100644 --- a/projects/core/src/test/java/dan200/computercraft/core/terminal/TerminalTest.java +++ b/projects/core/src/test/java/dan200/computercraft/core/terminal/TerminalTest.java @@ -1,4 +1,4 @@ -// Copyright Daniel Ratcliffe, 2011-2022. Do not distribute without permission. +// SPDX-FileCopyrightText: 2021 The CC: Tweaked Developers // // SPDX-License-Identifier: LicenseRef-CCPL diff --git a/projects/core/src/test/java/dan200/computercraft/core/terminal/TextBufferTest.java b/projects/core/src/test/java/dan200/computercraft/core/terminal/TextBufferTest.java index 4efc3e980..c52490643 100644 --- a/projects/core/src/test/java/dan200/computercraft/core/terminal/TextBufferTest.java +++ b/projects/core/src/test/java/dan200/computercraft/core/terminal/TextBufferTest.java @@ -1,4 +1,4 @@ -// Copyright Daniel Ratcliffe, 2011-2022. Do not distribute without permission. +// SPDX-FileCopyrightText: 2021 The CC: Tweaked Developers // // SPDX-License-Identifier: LicenseRef-CCPL diff --git a/projects/core/src/test/resources/test-rom/mcfly.lua b/projects/core/src/test/resources/test-rom/mcfly.lua index 01c1656f1..7eba0c5dc 100644 --- a/projects/core/src/test/resources/test-rom/mcfly.lua +++ b/projects/core/src/test/resources/test-rom/mcfly.lua @@ -1,6 +1,6 @@ -- SPDX-FileCopyrightText: 2019 The CC: Tweaked Developers -- --- SPDX-License-Identifier: LicenseRef-CCPL +-- SPDX-License-Identifier: MPL-2.0 --- A very basic test framework for ComputerCraft -- diff --git a/projects/core/src/test/resources/test-rom/spec/apis/colors_spec.lua b/projects/core/src/test/resources/test-rom/spec/apis/colors_spec.lua index 5a65a0222..d22865661 100644 --- a/projects/core/src/test/resources/test-rom/spec/apis/colors_spec.lua +++ b/projects/core/src/test/resources/test-rom/spec/apis/colors_spec.lua @@ -1,6 +1,6 @@ -- SPDX-FileCopyrightText: 2019 The CC: Tweaked Developers -- --- SPDX-License-Identifier: LicenseRef-CCPL +-- SPDX-License-Identifier: MPL-2.0 describe("The colors library", function() describe("colors.combine", function() diff --git a/projects/core/src/test/resources/test-rom/spec/apis/fs_spec.lua b/projects/core/src/test/resources/test-rom/spec/apis/fs_spec.lua index 6cf84a7b7..ca540985f 100644 --- a/projects/core/src/test/resources/test-rom/spec/apis/fs_spec.lua +++ b/projects/core/src/test/resources/test-rom/spec/apis/fs_spec.lua @@ -1,6 +1,6 @@ -- SPDX-FileCopyrightText: 2019 The CC: Tweaked Developers -- --- SPDX-License-Identifier: LicenseRef-CCPL +-- SPDX-License-Identifier: MPL-2.0 describe("The fs library", function() local test_root = "/test-files/fs" diff --git a/projects/core/src/test/resources/test-rom/spec/apis/peripheral_spec.lua b/projects/core/src/test/resources/test-rom/spec/apis/peripheral_spec.lua index a442a5a9c..a809c72ab 100644 --- a/projects/core/src/test/resources/test-rom/spec/apis/peripheral_spec.lua +++ b/projects/core/src/test/resources/test-rom/spec/apis/peripheral_spec.lua @@ -1,6 +1,6 @@ -- SPDX-FileCopyrightText: 2019 The CC: Tweaked Developers -- --- SPDX-License-Identifier: LicenseRef-CCPL +-- SPDX-License-Identifier: MPL-2.0 describe("The peripheral library", function() local it_modem = peripheral.getType("top") == "modem" and it or pending diff --git a/projects/core/src/test/resources/test-rom/spec/modules/cc/expect_spec.lua b/projects/core/src/test/resources/test-rom/spec/modules/cc/expect_spec.lua index e42a4dfaa..c5bc7d37e 100644 --- a/projects/core/src/test/resources/test-rom/spec/modules/cc/expect_spec.lua +++ b/projects/core/src/test/resources/test-rom/spec/modules/cc/expect_spec.lua @@ -1,6 +1,6 @@ -- SPDX-FileCopyrightText: 2019 The CC: Tweaked Developers -- --- SPDX-License-Identifier: LicenseRef-CCPL +-- SPDX-License-Identifier: MPL-2.0 describe("cc.expect", function() local e = require("cc.expect") diff --git a/projects/core/src/test/resources/test-rom/spec/modules/cc/image/nft_spec.lua b/projects/core/src/test/resources/test-rom/spec/modules/cc/image/nft_spec.lua index 09672438e..4e46d9e83 100644 --- a/projects/core/src/test/resources/test-rom/spec/modules/cc/image/nft_spec.lua +++ b/projects/core/src/test/resources/test-rom/spec/modules/cc/image/nft_spec.lua @@ -1,6 +1,6 @@ -- SPDX-FileCopyrightText: 2020 The CC: Tweaked Developers -- --- SPDX-License-Identifier: LicenseRef-CCPL +-- SPDX-License-Identifier: MPL-2.0 local helpers = require "test_helpers" diff --git a/projects/core/src/test/resources/test-rom/spec/modules/cc/shell/completion_spec.lua b/projects/core/src/test/resources/test-rom/spec/modules/cc/shell/completion_spec.lua index 38ce8efa0..f00533f85 100644 --- a/projects/core/src/test/resources/test-rom/spec/modules/cc/shell/completion_spec.lua +++ b/projects/core/src/test/resources/test-rom/spec/modules/cc/shell/completion_spec.lua @@ -1,6 +1,6 @@ -- SPDX-FileCopyrightText: 2019 The CC: Tweaked Developers -- --- SPDX-License-Identifier: LicenseRef-CCPL +-- SPDX-License-Identifier: MPL-2.0 describe("cc.shell.completion", function() local c = require "cc.shell.completion" diff --git a/projects/core/src/test/resources/test-rom/spec/modules/cc/strings_spec.lua b/projects/core/src/test/resources/test-rom/spec/modules/cc/strings_spec.lua index 42f7ba826..585f8ef1a 100644 --- a/projects/core/src/test/resources/test-rom/spec/modules/cc/strings_spec.lua +++ b/projects/core/src/test/resources/test-rom/spec/modules/cc/strings_spec.lua @@ -1,6 +1,6 @@ -- SPDX-FileCopyrightText: 2020 The CC: Tweaked Developers -- --- SPDX-License-Identifier: LicenseRef-CCPL +-- SPDX-License-Identifier: MPL-2.0 describe("cc.pretty", function() local str = require("cc.strings") diff --git a/projects/core/src/test/resources/test-rom/spec/programs/advanced/bg_spec.lua b/projects/core/src/test/resources/test-rom/spec/programs/advanced/bg_spec.lua index 6c2b1e44c..ccc70d048 100644 --- a/projects/core/src/test/resources/test-rom/spec/programs/advanced/bg_spec.lua +++ b/projects/core/src/test/resources/test-rom/spec/programs/advanced/bg_spec.lua @@ -1,6 +1,6 @@ -- SPDX-FileCopyrightText: 2019 The CC: Tweaked Developers -- --- SPDX-License-Identifier: LicenseRef-CCPL +-- SPDX-License-Identifier: MPL-2.0 local capture = require "test_helpers".capture_program diff --git a/projects/core/src/test/resources/test-rom/spec/programs/advanced/fg_spec.lua b/projects/core/src/test/resources/test-rom/spec/programs/advanced/fg_spec.lua index bdbd35325..c8acafd3a 100644 --- a/projects/core/src/test/resources/test-rom/spec/programs/advanced/fg_spec.lua +++ b/projects/core/src/test/resources/test-rom/spec/programs/advanced/fg_spec.lua @@ -1,6 +1,6 @@ -- SPDX-FileCopyrightText: 2019 The CC: Tweaked Developers -- --- SPDX-License-Identifier: LicenseRef-CCPL +-- SPDX-License-Identifier: MPL-2.0 local capture = require "test_helpers".capture_program diff --git a/projects/core/src/test/resources/test-rom/spec/programs/alias_spec.lua b/projects/core/src/test/resources/test-rom/spec/programs/alias_spec.lua index 7fc24363e..dbd62afc4 100644 --- a/projects/core/src/test/resources/test-rom/spec/programs/alias_spec.lua +++ b/projects/core/src/test/resources/test-rom/spec/programs/alias_spec.lua @@ -1,6 +1,6 @@ -- SPDX-FileCopyrightText: 2019 The CC: Tweaked Developers -- --- SPDX-License-Identifier: LicenseRef-CCPL +-- SPDX-License-Identifier: MPL-2.0 local capture = require "test_helpers".capture_program diff --git a/projects/core/src/test/resources/test-rom/spec/programs/cd_spec.lua b/projects/core/src/test/resources/test-rom/spec/programs/cd_spec.lua index 8edd55d4e..594be0cac 100644 --- a/projects/core/src/test/resources/test-rom/spec/programs/cd_spec.lua +++ b/projects/core/src/test/resources/test-rom/spec/programs/cd_spec.lua @@ -1,6 +1,6 @@ -- SPDX-FileCopyrightText: 2019 The CC: Tweaked Developers -- --- SPDX-License-Identifier: LicenseRef-CCPL +-- SPDX-License-Identifier: MPL-2.0 local capture = require "test_helpers".capture_program diff --git a/projects/core/src/test/resources/test-rom/spec/programs/clear_spec.lua b/projects/core/src/test/resources/test-rom/spec/programs/clear_spec.lua index 4f66e7c1c..e5aef0f18 100644 --- a/projects/core/src/test/resources/test-rom/spec/programs/clear_spec.lua +++ b/projects/core/src/test/resources/test-rom/spec/programs/clear_spec.lua @@ -1,6 +1,6 @@ -- SPDX-FileCopyrightText: 2019 The CC: Tweaked Developers -- --- SPDX-License-Identifier: LicenseRef-CCPL +-- SPDX-License-Identifier: MPL-2.0 local capture = require "test_helpers".capture_program diff --git a/projects/core/src/test/resources/test-rom/spec/programs/command/commands_spec.lua b/projects/core/src/test/resources/test-rom/spec/programs/command/commands_spec.lua index 6fe78f4ce..b9a848527 100644 --- a/projects/core/src/test/resources/test-rom/spec/programs/command/commands_spec.lua +++ b/projects/core/src/test/resources/test-rom/spec/programs/command/commands_spec.lua @@ -1,6 +1,6 @@ -- SPDX-FileCopyrightText: 2019 The CC: Tweaked Developers -- --- SPDX-License-Identifier: LicenseRef-CCPL +-- SPDX-License-Identifier: MPL-2.0 local capture = require "test_helpers".capture_program diff --git a/projects/core/src/test/resources/test-rom/spec/programs/command/exec_spec.lua b/projects/core/src/test/resources/test-rom/spec/programs/command/exec_spec.lua index 2656f9d5b..7b2521c1d 100644 --- a/projects/core/src/test/resources/test-rom/spec/programs/command/exec_spec.lua +++ b/projects/core/src/test/resources/test-rom/spec/programs/command/exec_spec.lua @@ -1,6 +1,6 @@ -- SPDX-FileCopyrightText: 2019 The CC: Tweaked Developers -- --- SPDX-License-Identifier: LicenseRef-CCPL +-- SPDX-License-Identifier: MPL-2.0 local capture = require "test_helpers".capture_program diff --git a/projects/core/src/test/resources/test-rom/spec/programs/copy_spec.lua b/projects/core/src/test/resources/test-rom/spec/programs/copy_spec.lua index e89a0cca3..ca4568bfd 100644 --- a/projects/core/src/test/resources/test-rom/spec/programs/copy_spec.lua +++ b/projects/core/src/test/resources/test-rom/spec/programs/copy_spec.lua @@ -1,6 +1,6 @@ -- SPDX-FileCopyrightText: 2019 The CC: Tweaked Developers -- --- SPDX-License-Identifier: LicenseRef-CCPL +-- SPDX-License-Identifier: MPL-2.0 local capture = require "test_helpers".capture_program diff --git a/projects/core/src/test/resources/test-rom/spec/programs/delete_spec.lua b/projects/core/src/test/resources/test-rom/spec/programs/delete_spec.lua index b34bc9519..17f912136 100644 --- a/projects/core/src/test/resources/test-rom/spec/programs/delete_spec.lua +++ b/projects/core/src/test/resources/test-rom/spec/programs/delete_spec.lua @@ -1,6 +1,6 @@ -- SPDX-FileCopyrightText: 2019 The CC: Tweaked Developers -- --- SPDX-License-Identifier: LicenseRef-CCPL +-- SPDX-License-Identifier: MPL-2.0 local capture = require "test_helpers".capture_program diff --git a/projects/core/src/test/resources/test-rom/spec/programs/drive_spec.lua b/projects/core/src/test/resources/test-rom/spec/programs/drive_spec.lua index 5424d028f..1ac294892 100644 --- a/projects/core/src/test/resources/test-rom/spec/programs/drive_spec.lua +++ b/projects/core/src/test/resources/test-rom/spec/programs/drive_spec.lua @@ -1,6 +1,6 @@ -- SPDX-FileCopyrightText: 2019 The CC: Tweaked Developers -- --- SPDX-License-Identifier: LicenseRef-CCPL +-- SPDX-License-Identifier: MPL-2.0 local capture = require "test_helpers".capture_program diff --git a/projects/core/src/test/resources/test-rom/spec/programs/edit_spec.lua b/projects/core/src/test/resources/test-rom/spec/programs/edit_spec.lua index 3d378959b..47a844c8f 100644 --- a/projects/core/src/test/resources/test-rom/spec/programs/edit_spec.lua +++ b/projects/core/src/test/resources/test-rom/spec/programs/edit_spec.lua @@ -1,6 +1,6 @@ -- SPDX-FileCopyrightText: 2019 The CC: Tweaked Developers -- --- SPDX-License-Identifier: LicenseRef-CCPL +-- SPDX-License-Identifier: MPL-2.0 local capture = require "test_helpers".capture_program diff --git a/projects/core/src/test/resources/test-rom/spec/programs/eject_spec.lua b/projects/core/src/test/resources/test-rom/spec/programs/eject_spec.lua index d22aeae69..77d25e1bd 100644 --- a/projects/core/src/test/resources/test-rom/spec/programs/eject_spec.lua +++ b/projects/core/src/test/resources/test-rom/spec/programs/eject_spec.lua @@ -1,6 +1,6 @@ -- SPDX-FileCopyrightText: 2019 The CC: Tweaked Developers -- --- SPDX-License-Identifier: LicenseRef-CCPL +-- SPDX-License-Identifier: MPL-2.0 local capture = require "test_helpers".capture_program diff --git a/projects/core/src/test/resources/test-rom/spec/programs/exit_spec.lua b/projects/core/src/test/resources/test-rom/spec/programs/exit_spec.lua index 7468a6421..0db2d6739 100644 --- a/projects/core/src/test/resources/test-rom/spec/programs/exit_spec.lua +++ b/projects/core/src/test/resources/test-rom/spec/programs/exit_spec.lua @@ -1,6 +1,6 @@ -- SPDX-FileCopyrightText: 2019 The CC: Tweaked Developers -- --- SPDX-License-Identifier: LicenseRef-CCPL +-- SPDX-License-Identifier: MPL-2.0 local capture = require "test_helpers".capture_program diff --git a/projects/core/src/test/resources/test-rom/spec/programs/fun/advanced/paint_spec.lua b/projects/core/src/test/resources/test-rom/spec/programs/fun/advanced/paint_spec.lua index df68ff411..d25d29faf 100644 --- a/projects/core/src/test/resources/test-rom/spec/programs/fun/advanced/paint_spec.lua +++ b/projects/core/src/test/resources/test-rom/spec/programs/fun/advanced/paint_spec.lua @@ -1,6 +1,6 @@ -- SPDX-FileCopyrightText: 2019 The CC: Tweaked Developers -- --- SPDX-License-Identifier: LicenseRef-CCPL +-- SPDX-License-Identifier: MPL-2.0 local capture = require "test_helpers".capture_program diff --git a/projects/core/src/test/resources/test-rom/spec/programs/fun/dj_spec.lua b/projects/core/src/test/resources/test-rom/spec/programs/fun/dj_spec.lua index ea88276ac..350f384a3 100644 --- a/projects/core/src/test/resources/test-rom/spec/programs/fun/dj_spec.lua +++ b/projects/core/src/test/resources/test-rom/spec/programs/fun/dj_spec.lua @@ -1,6 +1,6 @@ -- SPDX-FileCopyrightText: 2019 The CC: Tweaked Developers -- --- SPDX-License-Identifier: LicenseRef-CCPL +-- SPDX-License-Identifier: MPL-2.0 local capture = require "test_helpers".capture_program diff --git a/projects/core/src/test/resources/test-rom/spec/programs/fun/hello_spec.lua b/projects/core/src/test/resources/test-rom/spec/programs/fun/hello_spec.lua index ead7d0fe2..5c6338980 100644 --- a/projects/core/src/test/resources/test-rom/spec/programs/fun/hello_spec.lua +++ b/projects/core/src/test/resources/test-rom/spec/programs/fun/hello_spec.lua @@ -1,6 +1,6 @@ -- SPDX-FileCopyrightText: 2019 The CC: Tweaked Developers -- --- SPDX-License-Identifier: LicenseRef-CCPL +-- SPDX-License-Identifier: MPL-2.0 local capture = require "test_helpers".capture_program diff --git a/projects/core/src/test/resources/test-rom/spec/programs/gps_spec.lua b/projects/core/src/test/resources/test-rom/spec/programs/gps_spec.lua index 4417e50ed..ac57d1d04 100644 --- a/projects/core/src/test/resources/test-rom/spec/programs/gps_spec.lua +++ b/projects/core/src/test/resources/test-rom/spec/programs/gps_spec.lua @@ -1,6 +1,6 @@ -- SPDX-FileCopyrightText: 2019 The CC: Tweaked Developers -- --- SPDX-License-Identifier: LicenseRef-CCPL +-- SPDX-License-Identifier: MPL-2.0 local capture = require "test_helpers".capture_program diff --git a/projects/core/src/test/resources/test-rom/spec/programs/help_spec.lua b/projects/core/src/test/resources/test-rom/spec/programs/help_spec.lua index 8e9875983..78d279ae4 100644 --- a/projects/core/src/test/resources/test-rom/spec/programs/help_spec.lua +++ b/projects/core/src/test/resources/test-rom/spec/programs/help_spec.lua @@ -1,6 +1,6 @@ -- SPDX-FileCopyrightText: 2019 The CC: Tweaked Developers -- --- SPDX-License-Identifier: LicenseRef-CCPL +-- SPDX-License-Identifier: MPL-2.0 local capture = require "test_helpers".capture_program local with_window_lines = require "test_helpers".with_window_lines diff --git a/projects/core/src/test/resources/test-rom/spec/programs/http/pastebin_spec.lua b/projects/core/src/test/resources/test-rom/spec/programs/http/pastebin_spec.lua index 69f64d5e9..eff9fb0e9 100644 --- a/projects/core/src/test/resources/test-rom/spec/programs/http/pastebin_spec.lua +++ b/projects/core/src/test/resources/test-rom/spec/programs/http/pastebin_spec.lua @@ -1,6 +1,6 @@ -- SPDX-FileCopyrightText: 2019 The CC: Tweaked Developers -- --- SPDX-License-Identifier: LicenseRef-CCPL +-- SPDX-License-Identifier: MPL-2.0 local capture = require "test_helpers".capture_program diff --git a/projects/core/src/test/resources/test-rom/spec/programs/http/wget_spec.lua b/projects/core/src/test/resources/test-rom/spec/programs/http/wget_spec.lua index c7588f197..4e259f980 100644 --- a/projects/core/src/test/resources/test-rom/spec/programs/http/wget_spec.lua +++ b/projects/core/src/test/resources/test-rom/spec/programs/http/wget_spec.lua @@ -1,6 +1,6 @@ -- SPDX-FileCopyrightText: 2019 The CC: Tweaked Developers -- --- SPDX-License-Identifier: LicenseRef-CCPL +-- SPDX-License-Identifier: MPL-2.0 local capture = require "test_helpers".capture_program diff --git a/projects/core/src/test/resources/test-rom/spec/programs/id_spec.lua b/projects/core/src/test/resources/test-rom/spec/programs/id_spec.lua index 648e0f9df..9fbfd9623 100644 --- a/projects/core/src/test/resources/test-rom/spec/programs/id_spec.lua +++ b/projects/core/src/test/resources/test-rom/spec/programs/id_spec.lua @@ -1,6 +1,6 @@ -- SPDX-FileCopyrightText: 2019 The CC: Tweaked Developers -- --- SPDX-License-Identifier: LicenseRef-CCPL +-- SPDX-License-Identifier: MPL-2.0 local capture = require "test_helpers".capture_program diff --git a/projects/core/src/test/resources/test-rom/spec/programs/label_spec.lua b/projects/core/src/test/resources/test-rom/spec/programs/label_spec.lua index 6eefdb322..5b39865e9 100644 --- a/projects/core/src/test/resources/test-rom/spec/programs/label_spec.lua +++ b/projects/core/src/test/resources/test-rom/spec/programs/label_spec.lua @@ -1,6 +1,6 @@ -- SPDX-FileCopyrightText: 2019 The CC: Tweaked Developers -- --- SPDX-License-Identifier: LicenseRef-CCPL +-- SPDX-License-Identifier: MPL-2.0 local capture = require "test_helpers".capture_program diff --git a/projects/core/src/test/resources/test-rom/spec/programs/list_spec.lua b/projects/core/src/test/resources/test-rom/spec/programs/list_spec.lua index a3e4f0866..0fd34d2c7 100644 --- a/projects/core/src/test/resources/test-rom/spec/programs/list_spec.lua +++ b/projects/core/src/test/resources/test-rom/spec/programs/list_spec.lua @@ -1,6 +1,6 @@ -- SPDX-FileCopyrightText: 2019 The CC: Tweaked Developers -- --- SPDX-License-Identifier: LicenseRef-CCPL +-- SPDX-License-Identifier: MPL-2.0 local capture = require "test_helpers".capture_program diff --git a/projects/core/src/test/resources/test-rom/spec/programs/mkdir_spec.lua b/projects/core/src/test/resources/test-rom/spec/programs/mkdir_spec.lua index f743e761d..e04f32445 100644 --- a/projects/core/src/test/resources/test-rom/spec/programs/mkdir_spec.lua +++ b/projects/core/src/test/resources/test-rom/spec/programs/mkdir_spec.lua @@ -1,6 +1,6 @@ -- SPDX-FileCopyrightText: 2019 The CC: Tweaked Developers -- --- SPDX-License-Identifier: LicenseRef-CCPL +-- SPDX-License-Identifier: MPL-2.0 describe("The mkdir program", function() it("creates a directory", function() diff --git a/projects/core/src/test/resources/test-rom/spec/programs/monitor_spec.lua b/projects/core/src/test/resources/test-rom/spec/programs/monitor_spec.lua index 3a0ebce92..1bc04aed5 100644 --- a/projects/core/src/test/resources/test-rom/spec/programs/monitor_spec.lua +++ b/projects/core/src/test/resources/test-rom/spec/programs/monitor_spec.lua @@ -1,6 +1,6 @@ -- SPDX-FileCopyrightText: 2019 The CC: Tweaked Developers -- --- SPDX-License-Identifier: LicenseRef-CCPL +-- SPDX-License-Identifier: MPL-2.0 local capture = require "test_helpers".capture_program diff --git a/projects/core/src/test/resources/test-rom/spec/programs/motd_spec.lua b/projects/core/src/test/resources/test-rom/spec/programs/motd_spec.lua index 98b251067..c64abde2c 100644 --- a/projects/core/src/test/resources/test-rom/spec/programs/motd_spec.lua +++ b/projects/core/src/test/resources/test-rom/spec/programs/motd_spec.lua @@ -1,6 +1,6 @@ -- SPDX-FileCopyrightText: 2019 The CC: Tweaked Developers -- --- SPDX-License-Identifier: LicenseRef-CCPL +-- SPDX-License-Identifier: MPL-2.0 local capture = require "test_helpers".capture_program diff --git a/projects/core/src/test/resources/test-rom/spec/programs/move_spec.lua b/projects/core/src/test/resources/test-rom/spec/programs/move_spec.lua index 652744da6..ac3115699 100644 --- a/projects/core/src/test/resources/test-rom/spec/programs/move_spec.lua +++ b/projects/core/src/test/resources/test-rom/spec/programs/move_spec.lua @@ -1,6 +1,6 @@ -- SPDX-FileCopyrightText: 2019 The CC: Tweaked Developers -- --- SPDX-License-Identifier: LicenseRef-CCPL +-- SPDX-License-Identifier: MPL-2.0 local capture = require "test_helpers".capture_program diff --git a/projects/core/src/test/resources/test-rom/spec/programs/peripherals_spec.lua b/projects/core/src/test/resources/test-rom/spec/programs/peripherals_spec.lua index 04d3d97f5..a3bf1599f 100644 --- a/projects/core/src/test/resources/test-rom/spec/programs/peripherals_spec.lua +++ b/projects/core/src/test/resources/test-rom/spec/programs/peripherals_spec.lua @@ -1,6 +1,6 @@ -- SPDX-FileCopyrightText: 2019 The CC: Tweaked Developers -- --- SPDX-License-Identifier: LicenseRef-CCPL +-- SPDX-License-Identifier: MPL-2.0 local capture = require "test_helpers".capture_program diff --git a/projects/core/src/test/resources/test-rom/spec/programs/pocket/equip_spec.lua b/projects/core/src/test/resources/test-rom/spec/programs/pocket/equip_spec.lua index d03b4888d..7cbf8a13f 100644 --- a/projects/core/src/test/resources/test-rom/spec/programs/pocket/equip_spec.lua +++ b/projects/core/src/test/resources/test-rom/spec/programs/pocket/equip_spec.lua @@ -1,6 +1,6 @@ -- SPDX-FileCopyrightText: 2019 The CC: Tweaked Developers -- --- SPDX-License-Identifier: LicenseRef-CCPL +-- SPDX-License-Identifier: MPL-2.0 local capture = require "test_helpers".capture_program diff --git a/projects/core/src/test/resources/test-rom/spec/programs/pocket/unequip_spec.lua b/projects/core/src/test/resources/test-rom/spec/programs/pocket/unequip_spec.lua index f81739b41..97121a78d 100644 --- a/projects/core/src/test/resources/test-rom/spec/programs/pocket/unequip_spec.lua +++ b/projects/core/src/test/resources/test-rom/spec/programs/pocket/unequip_spec.lua @@ -1,6 +1,6 @@ -- SPDX-FileCopyrightText: 2019 The CC: Tweaked Developers -- --- SPDX-License-Identifier: LicenseRef-CCPL +-- SPDX-License-Identifier: MPL-2.0 local capture = require "test_helpers".capture_program diff --git a/projects/core/src/test/resources/test-rom/spec/programs/programs_spec.lua b/projects/core/src/test/resources/test-rom/spec/programs/programs_spec.lua index 9905a9e9c..1062778f7 100644 --- a/projects/core/src/test/resources/test-rom/spec/programs/programs_spec.lua +++ b/projects/core/src/test/resources/test-rom/spec/programs/programs_spec.lua @@ -1,6 +1,6 @@ -- SPDX-FileCopyrightText: 2019 The CC: Tweaked Developers -- --- SPDX-License-Identifier: LicenseRef-CCPL +-- SPDX-License-Identifier: MPL-2.0 local capture = require "test_helpers".capture_program diff --git a/projects/core/src/test/resources/test-rom/spec/programs/reboot_spec.lua b/projects/core/src/test/resources/test-rom/spec/programs/reboot_spec.lua index b918ba627..43ee1ed64 100644 --- a/projects/core/src/test/resources/test-rom/spec/programs/reboot_spec.lua +++ b/projects/core/src/test/resources/test-rom/spec/programs/reboot_spec.lua @@ -1,6 +1,6 @@ -- SPDX-FileCopyrightText: 2019 The CC: Tweaked Developers -- --- SPDX-License-Identifier: LicenseRef-CCPL +-- SPDX-License-Identifier: MPL-2.0 local capture = require "test_helpers".capture_program diff --git a/projects/core/src/test/resources/test-rom/spec/programs/redstone_spec.lua b/projects/core/src/test/resources/test-rom/spec/programs/redstone_spec.lua index aa610b85a..4aa9efcbb 100644 --- a/projects/core/src/test/resources/test-rom/spec/programs/redstone_spec.lua +++ b/projects/core/src/test/resources/test-rom/spec/programs/redstone_spec.lua @@ -1,6 +1,6 @@ -- SPDX-FileCopyrightText: 2019 The CC: Tweaked Developers -- --- SPDX-License-Identifier: LicenseRef-CCPL +-- SPDX-License-Identifier: MPL-2.0 local capture = require "test_helpers".capture_program diff --git a/projects/core/src/test/resources/test-rom/spec/programs/rename_spec.lua b/projects/core/src/test/resources/test-rom/spec/programs/rename_spec.lua index 9bfcb744d..541150f73 100644 --- a/projects/core/src/test/resources/test-rom/spec/programs/rename_spec.lua +++ b/projects/core/src/test/resources/test-rom/spec/programs/rename_spec.lua @@ -1,6 +1,6 @@ -- SPDX-FileCopyrightText: 2019 The CC: Tweaked Developers -- --- SPDX-License-Identifier: LicenseRef-CCPL +-- SPDX-License-Identifier: MPL-2.0 local capture = require "test_helpers".capture_program diff --git a/projects/core/src/test/resources/test-rom/spec/programs/set_spec.lua b/projects/core/src/test/resources/test-rom/spec/programs/set_spec.lua index 4ec04c93d..19a9215ca 100644 --- a/projects/core/src/test/resources/test-rom/spec/programs/set_spec.lua +++ b/projects/core/src/test/resources/test-rom/spec/programs/set_spec.lua @@ -1,6 +1,6 @@ -- SPDX-FileCopyrightText: 2019 The CC: Tweaked Developers -- --- SPDX-License-Identifier: LicenseRef-CCPL +-- SPDX-License-Identifier: MPL-2.0 local capture = require "test_helpers".capture_program diff --git a/projects/core/src/test/resources/test-rom/spec/programs/shell_spec.lua b/projects/core/src/test/resources/test-rom/spec/programs/shell_spec.lua index 7ef3748e1..92e19172a 100644 --- a/projects/core/src/test/resources/test-rom/spec/programs/shell_spec.lua +++ b/projects/core/src/test/resources/test-rom/spec/programs/shell_spec.lua @@ -1,6 +1,6 @@ -- SPDX-FileCopyrightText: 2019 The CC: Tweaked Developers -- --- SPDX-License-Identifier: LicenseRef-CCPL +-- SPDX-License-Identifier: MPL-2.0 local with_window = require "test_helpers".with_window diff --git a/projects/core/src/test/resources/test-rom/spec/programs/shutdown_spec.lua b/projects/core/src/test/resources/test-rom/spec/programs/shutdown_spec.lua index 67f0ff520..54e974398 100644 --- a/projects/core/src/test/resources/test-rom/spec/programs/shutdown_spec.lua +++ b/projects/core/src/test/resources/test-rom/spec/programs/shutdown_spec.lua @@ -1,6 +1,6 @@ -- SPDX-FileCopyrightText: 2019 The CC: Tweaked Developers -- --- SPDX-License-Identifier: LicenseRef-CCPL +-- SPDX-License-Identifier: MPL-2.0 local capture = require "test_helpers".capture_program diff --git a/projects/core/src/test/resources/test-rom/spec/programs/time_spec.lua b/projects/core/src/test/resources/test-rom/spec/programs/time_spec.lua index 869d27187..3ba25c0d7 100644 --- a/projects/core/src/test/resources/test-rom/spec/programs/time_spec.lua +++ b/projects/core/src/test/resources/test-rom/spec/programs/time_spec.lua @@ -1,6 +1,6 @@ -- SPDX-FileCopyrightText: 2019 The CC: Tweaked Developers -- --- SPDX-License-Identifier: LicenseRef-CCPL +-- SPDX-License-Identifier: MPL-2.0 local capture = require "test_helpers".capture_program diff --git a/projects/core/src/test/resources/test-rom/spec/programs/turtle/equip_spec.lua b/projects/core/src/test/resources/test-rom/spec/programs/turtle/equip_spec.lua index 3f2c1ff38..351b7df0a 100644 --- a/projects/core/src/test/resources/test-rom/spec/programs/turtle/equip_spec.lua +++ b/projects/core/src/test/resources/test-rom/spec/programs/turtle/equip_spec.lua @@ -1,6 +1,6 @@ -- SPDX-FileCopyrightText: 2019 The CC: Tweaked Developers -- --- SPDX-License-Identifier: LicenseRef-CCPL +-- SPDX-License-Identifier: MPL-2.0 local capture = require "test_helpers".capture_program diff --git a/projects/core/src/test/resources/test-rom/spec/programs/turtle/refuel_spec.lua b/projects/core/src/test/resources/test-rom/spec/programs/turtle/refuel_spec.lua index 418d8df74..07dede5ee 100644 --- a/projects/core/src/test/resources/test-rom/spec/programs/turtle/refuel_spec.lua +++ b/projects/core/src/test/resources/test-rom/spec/programs/turtle/refuel_spec.lua @@ -1,6 +1,6 @@ -- SPDX-FileCopyrightText: 2019 The CC: Tweaked Developers -- --- SPDX-License-Identifier: LicenseRef-CCPL +-- SPDX-License-Identifier: MPL-2.0 local capture = require "test_helpers".capture_program diff --git a/projects/core/src/test/resources/test-rom/spec/programs/turtle/unequip_spec.lua b/projects/core/src/test/resources/test-rom/spec/programs/turtle/unequip_spec.lua index 912624eb0..1a261e00c 100644 --- a/projects/core/src/test/resources/test-rom/spec/programs/turtle/unequip_spec.lua +++ b/projects/core/src/test/resources/test-rom/spec/programs/turtle/unequip_spec.lua @@ -1,6 +1,6 @@ -- SPDX-FileCopyrightText: 2019 The CC: Tweaked Developers -- --- SPDX-License-Identifier: LicenseRef-CCPL +-- SPDX-License-Identifier: MPL-2.0 local capture = require "test_helpers".capture_program diff --git a/projects/core/src/test/resources/test-rom/spec/programs/type_spec.lua b/projects/core/src/test/resources/test-rom/spec/programs/type_spec.lua index a770b1302..f8336ed05 100644 --- a/projects/core/src/test/resources/test-rom/spec/programs/type_spec.lua +++ b/projects/core/src/test/resources/test-rom/spec/programs/type_spec.lua @@ -1,6 +1,6 @@ -- SPDX-FileCopyrightText: 2019 The CC: Tweaked Developers -- --- SPDX-License-Identifier: LicenseRef-CCPL +-- SPDX-License-Identifier: MPL-2.0 local capture = require "test_helpers".capture_program diff --git a/projects/core/src/testFixtures/java/dan200/computercraft/test/core/CallCounter.java b/projects/core/src/testFixtures/java/dan200/computercraft/test/core/CallCounter.java index 271c55168..6f8b53d23 100644 --- a/projects/core/src/testFixtures/java/dan200/computercraft/test/core/CallCounter.java +++ b/projects/core/src/testFixtures/java/dan200/computercraft/test/core/CallCounter.java @@ -1,4 +1,4 @@ -// Copyright Daniel Ratcliffe, 2011-2022. Do not distribute without permission. +// SPDX-FileCopyrightText: 2021 The CC: Tweaked Developers // // SPDX-License-Identifier: LicenseRef-CCPL diff --git a/projects/core/src/testFixtures/java/dan200/computercraft/test/core/terminal/TerminalMatchers.java b/projects/core/src/testFixtures/java/dan200/computercraft/test/core/terminal/TerminalMatchers.java index 4c84afcc7..4807d204a 100644 --- a/projects/core/src/testFixtures/java/dan200/computercraft/test/core/terminal/TerminalMatchers.java +++ b/projects/core/src/testFixtures/java/dan200/computercraft/test/core/terminal/TerminalMatchers.java @@ -1,4 +1,4 @@ -// Copyright Daniel Ratcliffe, 2011-2022. Do not distribute without permission. +// SPDX-FileCopyrightText: 2021 The CC: Tweaked Developers // // SPDX-License-Identifier: LicenseRef-CCPL diff --git a/projects/fabric/src/main/java/dan200/computercraft/shared/platform/PlatformHelperImpl.java b/projects/fabric/src/main/java/dan200/computercraft/shared/platform/PlatformHelperImpl.java index 4d50035ec..1cf67972b 100644 --- a/projects/fabric/src/main/java/dan200/computercraft/shared/platform/PlatformHelperImpl.java +++ b/projects/fabric/src/main/java/dan200/computercraft/shared/platform/PlatformHelperImpl.java @@ -1,6 +1,6 @@ -// Copyright Daniel Ratcliffe, 2011-2022. Do not distribute without permission. +// SPDX-FileCopyrightText: 2022 The CC: Tweaked Developers // -// SPDX-License-Identifier: LicenseRef-CCPL +// SPDX-License-Identifier: MPL-2.0 package dan200.computercraft.shared.platform; diff --git a/projects/forge/src/main/java/dan200/computercraft/shared/details/FluidData.java b/projects/forge/src/main/java/dan200/computercraft/shared/details/FluidData.java index a877b21f2..4bd36f78b 100644 --- a/projects/forge/src/main/java/dan200/computercraft/shared/details/FluidData.java +++ b/projects/forge/src/main/java/dan200/computercraft/shared/details/FluidData.java @@ -1,6 +1,6 @@ -// Copyright Daniel Ratcliffe, 2011-2022. Do not distribute without permission. +// SPDX-FileCopyrightText: 2020 The CC: Tweaked Developers // -// SPDX-License-Identifier: LicenseRef-CCPL +// SPDX-License-Identifier: MPL-2.0 package dan200.computercraft.shared.details; diff --git a/projects/forge/src/main/java/dan200/computercraft/shared/peripheral/generic/methods/InventoryMethods.java b/projects/forge/src/main/java/dan200/computercraft/shared/peripheral/generic/methods/InventoryMethods.java index a0fb47ed5..7aedf5d83 100644 --- a/projects/forge/src/main/java/dan200/computercraft/shared/peripheral/generic/methods/InventoryMethods.java +++ b/projects/forge/src/main/java/dan200/computercraft/shared/peripheral/generic/methods/InventoryMethods.java @@ -1,4 +1,4 @@ -// Copyright Daniel Ratcliffe, 2011-2022. Do not distribute without permission. +// SPDX-FileCopyrightText: 2020 The CC: Tweaked Developers // // SPDX-License-Identifier: LicenseRef-CCPL