Fix image links in Modrinth description

Modrinth proxies images hosted on non-trusted domains through wsrv.nl,
for understandable reasons. However, wsrv.nl blocks tweaked.cc - I'm not
sure why. Instead we reference the image on GH directly, which works!

Also:
 - Fix the modrinthSyncBody task pointing to a missing file.
 - Update the licenses of a few files, post getting permission from
   people. <3 all.
This commit is contained in:
Jonathan Coates 2023-05-24 22:32:46 +01:00
parent 2ae14b4c08
commit 9d16fda266
No known key found for this signature in database
GPG Key ID: B9E431FF07C98D06
5 changed files with 11 additions and 11 deletions

View File

@ -16,6 +16,7 @@ Copyright: The CC: Tweaked Developers
License: CC0-1.0 License: CC0-1.0
Files: Files:
doc/images/*
package.json package.json
package-lock.json package-lock.json
projects/common/src/client/resources/computercraft-client.mixins.json projects/common/src/client/resources/computercraft-client.mixins.json
@ -24,6 +25,10 @@ Files:
projects/common/src/testMod/resources/computercraft-gametest.mixins.json projects/common/src/testMod/resources/computercraft-gametest.mixins.json
projects/common/src/testMod/resources/data/computercraft/loot_tables/treasure_disk.json projects/common/src/testMod/resources/data/computercraft/loot_tables/treasure_disk.json
projects/common/src/testMod/resources/pack.mcmeta projects/common/src/testMod/resources/pack.mcmeta
projects/core/src/main/resources/data/computercraft/lua/rom/modules/command/.ignoreme
projects/core/src/main/resources/data/computercraft/lua/rom/modules/main/.ignoreme
projects/core/src/main/resources/data/computercraft/lua/rom/modules/turtle/.ignoreme
projects/core/src/main/resources/data/computercraft/lua/rom/motd.txt
projects/fabric-api/src/main/modJson/fabric.mod.json projects/fabric-api/src/main/modJson/fabric.mod.json
projects/fabric/src/client/resources/computercraft-client.fabric.mixins.json projects/fabric/src/client/resources/computercraft-client.fabric.mixins.json
projects/fabric/src/main/resources/computercraft.fabric.mixins.json projects/fabric/src/main/resources/computercraft.fabric.mixins.json
@ -41,7 +46,6 @@ Copyright: The CC: Tweaked Developers
License: MPL-2.0 License: MPL-2.0
Files: Files:
doc/images/*
doc/logo.png doc/logo.png
projects/common/src/main/resources/assets/computercraft/models/* projects/common/src/main/resources/assets/computercraft/models/*
projects/common/src/main/resources/assets/computercraft/textures/* projects/common/src/main/resources/assets/computercraft/textures/*
@ -49,10 +53,6 @@ Files:
projects/common/src/main/resources/pack.png projects/common/src/main/resources/pack.png
projects/core/src/main/resources/data/computercraft/lua/rom/autorun/.ignoreme projects/core/src/main/resources/data/computercraft/lua/rom/autorun/.ignoreme
projects/core/src/main/resources/data/computercraft/lua/rom/help/* projects/core/src/main/resources/data/computercraft/lua/rom/help/*
projects/core/src/main/resources/data/computercraft/lua/rom/modules/command/.ignoreme
projects/core/src/main/resources/data/computercraft/lua/rom/modules/main/.ignoreme
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/core/src/main/resources/data/computercraft/lua/rom/programs/fun/advanced/levels/*
projects/web/src/export/items/computercraft/* projects/web/src/export/items/computercraft/*
Comment: Bulk-license original assets as CCPL. Comment: Bulk-license original assets as CCPL.

View File

@ -53,7 +53,7 @@ modrinth {
gameVersions.add(mcVersion) gameVersions.add(mcVersion)
changelog.set("Release notes can be found on the [GitHub repository](https://github.com/cc-tweaked/CC-Tweaked/releases/tag/v$mcVersion-$modVersion).") changelog.set("Release notes can be found on the [GitHub repository](https://github.com/cc-tweaked/CC-Tweaked/releases/tag/v$mcVersion-$modVersion).")
syncBodyFrom.set(provider { file("doc/mod-page.md").readText() }) syncBodyFrom.set(provider { rootProject.file("doc/mod-page.md").readText() })
} }
tasks.publish { dependsOn(tasks.modrinth) } tasks.publish { dependsOn(tasks.modrinth) }

View File

@ -22,13 +22,13 @@ ## Features
Controlled using the [Lua programming language][lua], CC: Tweaked's computers provides all the tools you need to start Controlled using the [Lua programming language][lua], CC: Tweaked's computers provides all the tools you need to start
writing code and automating your Minecraft world. writing code and automating your Minecraft world.
![A ComputerCraft terminal open and ready to be programmed.](https://tweaked.cc/images/basic-terminal.png) ![A ComputerCraft terminal open and ready to be programmed.](https://raw.githubusercontent.com/cc-tweaked/CC-Tweaked/HEAD/doc/images/basic-terminal.png)
While computers are incredibly powerful, they're rather limited by their inability to move about. *Turtles* are the While computers are incredibly powerful, they're rather limited by their inability to move about. *Turtles* are the
solution here. They can move about the world, placing and breaking blocks, swinging a sword to protect you from zombies, solution here. They can move about the world, placing and breaking blocks, swinging a sword to protect you from zombies,
or whatever else you program them to! or whatever else you program them to!
![A turtle tunneling in Minecraft.](https://tweaked.cc/images/turtle.png) ![A turtle tunneling in Minecraft.](https://raw.githubusercontent.com/cc-tweaked/CC-Tweaked/HEAD/doc/images/turtle.png)
Not all problems can be solved with a pickaxe though, and so CC: Tweaked also provides a bunch of additional peripherals Not all problems can be solved with a pickaxe though, and so CC: Tweaked also provides a bunch of additional peripherals
for your computers. You can play a tune with speakers, display text or images on a monitor, connect all your for your computers. You can play a tune with speakers, display text or images on a monitor, connect all your
@ -37,7 +37,7 @@ ## Features
Computers can now also interact with inventories such as chests, allowing you to build complex inventory and item Computers can now also interact with inventories such as chests, allowing you to build complex inventory and item
management systems. management systems.
![A chest's contents being read by a computer and displayed on a monitor.](https://tweaked.cc/images/peripherals.png) ![A chest's contents being read by a computer and displayed on a monitor.](https://raw.githubusercontent.com/cc-tweaked/CC-Tweaked/HEAD/doc/images/peripherals.png)
## Getting Started ## Getting Started
While ComputerCraft is lovely for both experienced programmers and for people who have never coded before, it can be a While ComputerCraft is lovely for both experienced programmers and for people who have never coded before, it can be a

View File

@ -1,6 +1,6 @@
-- SPDX-FileCopyrightText: 2019 The CC: Tweaked Developers -- SPDX-FileCopyrightText: 2019 The CC: Tweaked Developers
-- --
-- SPDX-License-Identifier: LicenseRef-CCPL -- SPDX-License-Identifier: MPL-2.0
describe("The window library", function() describe("The window library", function()
local function mk() local function mk()

View File

@ -1,6 +1,6 @@
-- SPDX-FileCopyrightText: 2019 The CC: Tweaked Developers -- 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 capture = require "test_helpers".capture_program