diff --git a/CHANGELOG.md b/CHANGELOG.md index a3e0d7ac4..7249d00ac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,13 @@ # Changelog ## [Unreleased] ### 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 +### New features - Added Trowel tool to randomly place blocks from hotbar (#1106) @Redeix - Started work on Brazilian Portuguese translations @gifpxto - Added Aqueous Accumulator machine, basically a rock breaker but for fluids (#1030) @Pyritie diff --git a/config/ftbquests/quests/chapters/queststfc_tips.snbt b/config/ftbquests/quests/chapters/queststfc_tips.snbt index d82ff3945..29b8905fe 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}" @@ -5273,7 +5273,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}" 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]) diff --git a/pakku-lock.json b/pakku-lock.json index abcc5ad89..37eb3f710 100644 --- a/pakku-lock.json +++ b/pakku-lock.json @@ -1631,6 +1631,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", @@ -1820,6 +1858,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", @@ -2663,7 +2740,7 @@ { "pakku_id": "SG15bUHPcW2KqNGd", "type": "MOD", - "side": "BOTH", + "side": "CLIENT", "slug": { "curseforge": "detected-setblock-be-gone" }, @@ -6050,6 +6127,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", @@ -6728,7 +6838,6 @@ "id": { "curseforge": "585406" }, - "export": false, "files": [ { "type": "curseforge", 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": [