From 77ac04cb7ac3456c98f70998864c8b84343e7c5a Mon Sep 17 00:00:00 2001 From: Jonathan Coates Date: Thu, 15 Jun 2023 18:32:30 +0100 Subject: [PATCH] Fix changelog notes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also exclude data generator cache from the Forge jar. Didn't have any better place to put this 😳. --- .../main/resources/data/computercraft/lua/rom/help/changelog.md | 2 +- .../main/resources/data/computercraft/lua/rom/help/whatsnew.md | 2 +- projects/forge/build.gradle.kts | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) 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 19561664c..098267351 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 @@ -7,7 +7,7 @@ * 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. +* The `speaker` program now errors when playing HTML files. * `edit` now shows an error message when editing read-only files. * Update Ukranian translation (SirEdvin). 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 3407fccd6..1512a2ae6 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 @@ -7,7 +7,7 @@ New features in CC: Tweaked 1.105.0 * 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. +* The `speaker` program now errors when playing HTML files. * `edit` now shows an error message when editing read-only files. * Update Ukranian translation (SirEdvin). diff --git a/projects/forge/build.gradle.kts b/projects/forge/build.gradle.kts index 589e44f0d..9291f2e4a 100644 --- a/projects/forge/build.gradle.kts +++ b/projects/forge/build.gradle.kts @@ -206,6 +206,7 @@ tasks.processResources { filesMatching("META-INF/mods.toml") { expand(mapOf("forgeVersion" to libs.versions.forge.get(), "file" to mapOf("jarVersion" to modVersion))) } + exclude(".cache") } tasks.jar {