From 0d5c176d3a4ad9d8921583d79e0b4521ab503806 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Thu, 5 Jun 2025 00:26:09 +0100 Subject: [PATCH 1/7] added a resource pack that makes some animals look nicer --- pakku-lock.json | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/pakku-lock.json b/pakku-lock.json index 857a69258..b4276ec52 100644 --- a/pakku-lock.json +++ b/pakku-lock.json @@ -5878,6 +5878,39 @@ } ] }, + { + "pakku_id": "v7A0bgYd4KcqmpVA", + "type": "RESOURCE_PACK", + "slug": { + "curseforge": "new-animals-for-terrafirmacraft" + }, + "name": { + "curseforge": "New Animals for TerraFirmaCraft" + }, + "id": { + "curseforge": "1246070" + }, + "files": [ + { + "type": "curseforge", + "file_name": "TerraFirmaCraft_New_Animals.zip", + "mc_versions": [ + "1.20.1" + ], + "release_type": "release", + "url": "https://edge.forgecdn.net/files/6436/812/TerraFirmaCraft_New_Animals.zip", + "id": "6436812", + "parent_id": "1246070", + "hashes": { + "sha1": "c3318956eff6b4c9e49e81b89ff2b49eaf16d4dc", + "md5": "09466b7016348fb845c40886f466e9b2" + }, + "required_dependencies": [], + "size": 65591, + "date_published": "2025-04-18T17:00:53.570Z" + } + ] + }, { "pakku_id": "PelbQK42HFCTe5cc", "type": "MOD", From 08e0c4072351e9680e869cc2b7e949e7e3a85d3e Mon Sep 17 00:00:00 2001 From: Xikaro Date: Thu, 5 Jun 2025 17:30:13 +0500 Subject: [PATCH 2/7] bump --- CHANGELOG.md | 3 +++ pakku.json | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a3e0d7ac4..b63c4b0cc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # Changelog ## [Unreleased] +### Changes + +## [0.9.10] - 05.06.2025 ### New features - Added Trowel tool to randomly place blocks from hotbar (#1106) @Redeix - Started work on Brazilian Portuguese translations @gifpxto diff --git a/pakku.json b/pakku.json index d0db97959..d6425913f 100644 --- a/pakku.json +++ b/pakku.json @@ -1,6 +1,6 @@ { "name": "TerraFirmaGreg-Modern", - "version": "0.9.9", + "version": "0.9.10", "description": "An innovative modpack that contains GregTech and TerraFirmaCraft on 1.20.x.", "author": "Exception, Xikaro", "overrides": [ From 80fff75580bcdee0f4384b172e8735aa12632989 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Thu, 5 Jun 2025 21:44:37 +0100 Subject: [PATCH 3/7] fixes #1130 --- config/ftbquests/quests/chapters/queststfc_tips.snbt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/ftbquests/quests/chapters/queststfc_tips.snbt b/config/ftbquests/quests/chapters/queststfc_tips.snbt index 219a9f019..c9a45c9e9 100644 --- a/config/ftbquests/quests/chapters/queststfc_tips.snbt +++ b/config/ftbquests/quests/chapters/queststfc_tips.snbt @@ -1996,7 +1996,7 @@ Count: 1 id: "ftbfiltersystem:smart_filter" tag: { - "ftbfiltersystem:filter": "custom(HasPreservation/firmaciv:smoked)custom(HasPreservation/tfc:brined)" + "ftbfiltersystem:filter": "custom(HasPreservation/firmalife:smoked)custom(HasPreservation/tfc:brined)" } } title: "{quests.tfg_tips.smoke_meat.task}" @@ -5269,7 +5269,7 @@ Count: 1 id: "ftbfiltersystem:smart_filter" tag: { - "ftbfiltersystem:filter": "custom(HasPreservation/firmaciv:smoked)item(tfc:food/pork)" + "ftbfiltersystem:filter": "custom(HasPreservation/firmalife:smoked)item(tfc:food/pork)" } } title: "{quests.tfg_tips.bacon.task}" From 1942321b1c79be7a7e251d4400737edc935eac1b Mon Sep 17 00:00:00 2001 From: Pyritie Date: Thu, 5 Jun 2025 21:48:45 +0100 Subject: [PATCH 4/7] added clean-swing-through-grass mod --- pakku-lock.json | 41 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 39 insertions(+), 2 deletions(-) diff --git a/pakku-lock.json b/pakku-lock.json index a04aece95..3176e285f 100644 --- a/pakku-lock.json +++ b/pakku-lock.json @@ -1462,6 +1462,44 @@ } ] }, + { + "pakku_id": "0Cv6dO3ZGvsziQH1", + "type": "MOD", + "slug": { + "curseforge": "clean-swing-through-grass" + }, + "name": { + "curseforge": "Clean Swing Through Grass" + }, + "id": { + "curseforge": "915308" + }, + "files": [ + { + "type": "curseforge", + "file_name": "cleanswing-1.20-1.8.jar", + "mc_versions": [ + "1.20.1", + "1.20" + ], + "loaders": [ + "neoforge", + "forge" + ], + "release_type": "release", + "url": "https://edge.forgecdn.net/files/5962/530/cleanswing-1.20-1.8.jar", + "id": "5962530", + "parent_id": "915308", + "hashes": { + "sha1": "c128e24c47ab4a389b3868ff6913ee0631f254e8", + "md5": "84f9950e09245d82f72a6461f57ca30f" + }, + "required_dependencies": [], + "size": 8305, + "date_published": "2024-12-04T16:23:38.883Z" + } + ] + }, { "pakku_id": "PDE7RB7hlFnTfgkq", "type": "MOD", @@ -2494,7 +2532,7 @@ { "pakku_id": "SG15bUHPcW2KqNGd", "type": "MOD", - "side": "BOTH", + "side": "CLIENT", "slug": { "curseforge": "detected-setblock-be-gone" }, @@ -6592,7 +6630,6 @@ "id": { "curseforge": "585406" }, - "export": false, "files": [ { "type": "curseforge", From e8c9346f8aa5f46900b9a37d7d3ee2da6bf1feb3 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sat, 7 Jun 2025 11:12:01 +0100 Subject: [PATCH 5/7] added computercraft/advanced peripherals resource pack --- pakku-lock.json | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/pakku-lock.json b/pakku-lock.json index 3176e285f..4aabc5f2a 100644 --- a/pakku-lock.json +++ b/pakku-lock.json @@ -1689,6 +1689,45 @@ } ] }, + { + "pakku_id": "On44S9fQbI0vVJTW", + "type": "RESOURCE_PACK", + "slug": { + "curseforge": "computercraft-greg-flavored" + }, + "name": { + "curseforge": "ComputerCraft: Greg Flavored" + }, + "id": { + "curseforge": "1061743" + }, + "files": [ + { + "type": "curseforge", + "file_name": "ComputerCraft Greg Refreshed 1.1 - 1.20.1.zip", + "mc_versions": [ + "1.20.2", + "1.20.5", + "1.20.3", + "1.20.1", + "1.20", + "1.20.6", + "1.20.4" + ], + "release_type": "release", + "url": "https://edge.forgecdn.net/files/5560/613/ComputerCraft Greg Refreshed 1.1 - 1.20.1.zip", + "id": "5560613", + "parent_id": "1061743", + "hashes": { + "sha1": "6d1d3642537c40ea813507379941773a49c62f28", + "md5": "57d0168a3d006bca79603d0646594f83" + }, + "required_dependencies": [], + "size": 957439, + "date_published": "2024-07-24T09:35:57.853Z" + } + ] + }, { "pakku_id": "MaU4DxZPJWpFlsaT", "type": "MOD", From 7dc2130819b445ebab6e1cb5660bd66843a209cd Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sat, 7 Jun 2025 11:13:55 +0100 Subject: [PATCH 6/7] fixes #1134 --- CHANGELOG.md | 3 +++ kubejs/server_scripts/gregtech/recipes.materials.js | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b63c4b0cc..937e6bd65 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,9 @@ # Changelog ## [Unreleased] +### New features ### Changes +### Bug fixes +- Fixed glass dust dupe with unfinished lamps (#1134) @Pyritie ## [0.9.10] - 05.06.2025 ### New features diff --git a/kubejs/server_scripts/gregtech/recipes.materials.js b/kubejs/server_scripts/gregtech/recipes.materials.js index a3b5bbbc8..1e63e277e 100644 --- a/kubejs/server_scripts/gregtech/recipes.materials.js +++ b/kubejs/server_scripts/gregtech/recipes.materials.js @@ -666,7 +666,7 @@ function registerGTCEUMetalRecipes(event) { event.recipes.gtceu.arc_furnace(`tfg:arc_${material.getName()}_unfinished_lamp`) .itemInputs(unfinishedLampStack) - .itemOutputs([materialIngotStack, glassDustStack]) + .itemOutputs(materialIngotStack) .duration(material.getMass() * 8) .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) .EUt(GTValues.VA[GTValues.ULV]) From a99c2da26cf2893856dad90a08e083a77605a2b0 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sat, 7 Jun 2025 11:24:04 +0100 Subject: [PATCH 7/7] changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 937e6bd65..7249d00ac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ### New features ### Changes ### Bug fixes +- Fixed trowel being consumed on use @Redeix - Fixed glass dust dupe with unfinished lamps (#1134) @Pyritie ## [0.9.10] - 05.06.2025