diff --git a/buildSrc/src/main/kotlin/cc-tweaked.mod-publishing.gradle.kts b/buildSrc/src/main/kotlin/cc-tweaked.mod-publishing.gradle.kts index ecd66e9c34..605a4b1a71 100644 --- a/buildSrc/src/main/kotlin/cc-tweaked.mod-publishing.gradle.kts +++ b/buildSrc/src/main/kotlin/cc-tweaked.mod-publishing.gradle.kts @@ -33,7 +33,6 @@ val publishCurseForge by tasks.registering(TaskPublishCurseForge::class) { enabled = apiToken != "" val mainFile = upload("282001", modPublishing.output.get().archiveFile) - dependsOn(modPublishing.output) // See https://github.com/Darkhax/CurseForgeGradle/pull/7. mainFile.changelog = "Release notes can be found on the [GitHub repository](https://github.com/cc-tweaked/CC-Tweaked/releases/tag/v$mcVersion-$modVersion)." mainFile.changelogType = "markdown" diff --git a/buildSrc/src/main/kotlin/cc-tweaked.publishing.gradle.kts b/buildSrc/src/main/kotlin/cc-tweaked.publishing.gradle.kts index 8b1ae55233..08cec53e8c 100644 --- a/buildSrc/src/main/kotlin/cc-tweaked.publishing.gradle.kts +++ b/buildSrc/src/main/kotlin/cc-tweaked.publishing.gradle.kts @@ -2,8 +2,6 @@ // // SPDX-License-Identifier: MPL-2.0 -import org.gradle.kotlin.dsl.`maven-publish` - plugins { `java-library` `maven-publish` diff --git a/gradle.properties b/gradle.properties index f395aa0f31..31d73d2bb0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,7 +10,7 @@ kotlin.jvm.target.validation.mode=error # Mod properties isUnstable=false -modVersion=1.104.0 +modVersion=1.105.0 # Minecraft properties: We want to configure this here so we can read it in settings.gradle mcVersion=1.19.4 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index fa3ffc7c38..e13ca1c60e 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -50,7 +50,7 @@ junit = "5.9.2" # Build tools cctJavadoc = "1.7.0" checkstyle = "10.3.4" -curseForgeGradle = "1.0.11" +curseForgeGradle = "1.0.14" errorProne-core = "2.18.0" errorProne-plugin = "3.0.1" fabric-loom = "1.1.10" diff --git a/projects/common/src/client/java/dan200/computercraft/client/ClientTableFormatter.java b/projects/common/src/client/java/dan200/computercraft/client/ClientTableFormatter.java index 08042cc6a2..fe6263b515 100644 --- a/projects/common/src/client/java/dan200/computercraft/client/ClientTableFormatter.java +++ b/projects/common/src/client/java/dan200/computercraft/client/ClientTableFormatter.java @@ -23,7 +23,7 @@ * A {@link TableFormatter} subclass which writes directly to {@linkplain ChatComponent the chat GUI}. *

* Each message written gets a special {@link GuiMessageTag}, so we can remove the previous table of the same - * {@link TableBuilder#getId() id}. + * {@linkplain TableBuilder#getId() id}. */ public class ClientTableFormatter implements TableFormatter { public static final ClientTableFormatter INSTANCE = new ClientTableFormatter(); diff --git a/projects/core/src/main/resources/data/computercraft/lua/rom/help/changelog.md b/projects/core/src/main/resources/data/computercraft/lua/rom/help/changelog.md index a776f31c31..19561664cd 100644 --- a/projects/core/src/main/resources/data/computercraft/lua/rom/help/changelog.md +++ b/projects/core/src/main/resources/data/computercraft/lua/rom/help/changelog.md @@ -1,3 +1,27 @@ +# New features in CC: Tweaked 1.105.0 + +* Optimise JSON string parsing. +* Add `colors.fromBlit` (Erb3). +* Upload file size limit is now configurable (khankul). +* Wired cables no longer have a distance limit. +* Java methods now coerce values to strings consistently with Lua. +* Add custom timeout support to the HTTP API. +* Support custom proxies for HTTP requests (Lemmmy). +* The `speaker` program now errors when playing HTTP files. +* `edit` now shows an error message when editing read-only files. +* Update Ukranian translation (SirEdvin). + +Several bug fixes: +* Allow GPS hosts to only be 1 block apart. +* Fix "Turn On"/"Turn Off" buttons being inverted in the computer GUI (Erb3). +* Fix arrow keys not working in the printout UI. +* Several documentation fixes (zyxkad, Lupus590, Commandcracker). +* Fix monitor renderer debug text always being visible on Forge. +* Fix crash when another mod changes the LoggerContext. +* Fix the `monitor_renderer` option not being present in Fabric config files. +* Pasting on MacOS/OSX now uses Cmd+V rather than Ctrl+V. +* Fix turtles placing blocks upside down when at y<0. + # New features in CC: Tweaked 1.104.0 * Update to Minecraft 1.19.4. diff --git a/projects/core/src/main/resources/data/computercraft/lua/rom/help/whatsnew.md b/projects/core/src/main/resources/data/computercraft/lua/rom/help/whatsnew.md index 4973b3df29..3407fccd66 100644 --- a/projects/core/src/main/resources/data/computercraft/lua/rom/help/whatsnew.md +++ b/projects/core/src/main/resources/data/computercraft/lua/rom/help/whatsnew.md @@ -1,31 +1,25 @@ -New features in CC: Tweaked 1.104.0 +New features in CC: Tweaked 1.105.0 -* Update to Minecraft 1.19.4. -* Turtles can now right click items "into" certain blocks (cauldrons and hives by default, configurable with the `computercraft:turtle_can_use` block tag). -* Update Cobalt to 0.7: - * `table` methods and `ipairs` now use metamethods. - * Type errors now use the `__name` metatag. - * Coroutines no longer run on multiple threads. - * Timeout errors should be thrown more reliably. -* `speaker` program now reports an error on common unsupported audio formats. -* `multishell` now hides the implementation details of its terminal redirect from programs. -* Use VBO monitor renderer by default. -* Improve syntax errors when missing commas in tables, and on trailing commas in parameter lists. -* Turtles can now hold flags. -* Update several translations (Alessandro, chesiren, Erlend, RomanPlayer22). +* Optimise JSON string parsing. +* Add `colors.fromBlit` (Erb3). +* Upload file size limit is now configurable (khankul). +* Wired cables no longer have a distance limit. +* Java methods now coerce values to strings consistently with Lua. +* Add custom timeout support to the HTTP API. +* Support custom proxies for HTTP requests (Lemmmy). +* The `speaker` program now errors when playing HTTP files. +* `edit` now shows an error message when editing read-only files. +* Update Ukranian translation (SirEdvin). Several bug fixes: -* `settings.load` now ignores malformed values created by editing the `.settings` file by hand. -* Fix introduction dates on `os.cancelAlarm` and `os.cancelTimer` (MCJack123). -* Fix the REPL syntax reporting crashing on valid parses. -* Make writes to the ID file atomic. -* Obey stack limits when transferring items with Fabric's APIs. -* Ignore metatables in `textutils.serialize`. -* Correctly recurse into NBT lists when computing the NBT hash (Lemmmy). -* Fix advanced pocket computers rendering as greyscale. -* Fix stack overflow when using `shell` as a hashbang program. -* Fix websocket messages being empty when using a non-default compression settings. -* Fix `gps.locate` returning `nan` when receiving a duplicate location (Wojbie). -* Remove several thread safety issues inside Java-side argument parsing code. +* Allow GPS hosts to only be 1 block apart. +* Fix "Turn On"/"Turn Off" buttons being inverted in the computer GUI (Erb3). +* Fix arrow keys not working in the printout UI. +* Several documentation fixes (zyxkad, Lupus590, Commandcracker). +* Fix monitor renderer debug text always being visible on Forge. +* Fix crash when another mod changes the LoggerContext. +* Fix the `monitor_renderer` option not being present in Fabric config files. +* Pasting on MacOS/OSX now uses Cmd+V rather than Ctrl+V. +* Fix turtles placing blocks upside down when at y<0. Type "help changelog" to see the full version history. diff --git a/projects/fabric/build.gradle.kts b/projects/fabric/build.gradle.kts index 576bac7690..f2aef9cb8c 100644 --- a/projects/fabric/build.gradle.kts +++ b/projects/fabric/build.gradle.kts @@ -251,3 +251,7 @@ publishing { } } } + +modrinth { + required.project("fabric-api") +}