diff --git a/defaultconfigs/firmalife-server.toml b/defaultconfigs/firmalife-server.toml index db7fa6172..744699e5e 100644 --- a/defaultconfigs/firmalife-server.toml +++ b/defaultconfigs/firmalife-server.toml @@ -30,7 +30,7 @@ #Range: > 1 ovenCureTemperature = 600 #If true, ovens will hurt the player if they touch it without a peel in hand. - ovenRequirePeel = true + ovenRequirePeel = false #The chance for fuel burning in an oven to drop an ash block into an ashtray. #Range: 0.0 ~ 1.0 ovenAshChance = 0.5 @@ -63,7 +63,7 @@ #Range: 1 ~ 128 cellarRadius = 15 #If true, the tumbler and the pumping station work magically with a redstone signal and no power required. - mechanicalPowerCheatMode = false + mechanicalPowerCheatMode = true [foodTraits] #The modifier for the 'Dried' food trait. Values less than 1 extend food lifetime, values greater than one decrease it. A value of zero stops decay. diff --git a/kubejs/server_scripts/firmalife/recipes.js b/kubejs/server_scripts/firmalife/recipes.js index da24989e3..87a5cc299 100644 --- a/kubejs/server_scripts/firmalife/recipes.js +++ b/kubejs/server_scripts/firmalife/recipes.js @@ -419,6 +419,27 @@ const registerFirmaLifeRecipes = (event) => { //#endregion + event.shaped('2x firmalife:sweeper', [ + 'ABD', + 'CB ' + ], { + A: '#forge:saw_heads/steel', + B: '#forge:rods/steel', + C: 'vintageimprovements:redstone_module', + D: '#forge:tools/wrenches' + }).id('firmalife:crafting/sweeper') + + event.shaped('2x firmalife:picker', [ + 'ABD', + 'CC ', + 'CC ' + ], { + A: '#forge:plates/steel', + B: 'vintageimprovements:redstone_module', + C: '#forge:rods/steel', + D: '#forge:tools/wrenches' + }).id('firmalife:crafting/picker') + //#endregion //#region Укрепленное стекло diff --git a/pakku-lock.json b/pakku-lock.json index 02f361520..820c395cb 100644 --- a/pakku-lock.json +++ b/pakku-lock.json @@ -2710,7 +2710,7 @@ { "pakku_id": "SG15bUHPcW2KqNGd", "type": "MOD", - "side": "CLIENT", + "side": "BOTH", "slug": { "curseforge": "detected-setblock-be-gone" }, @@ -3199,7 +3199,7 @@ "files": [ { "type": "curseforge", - "file_name": "everycomp-1.20-2.8.11-forge.jar", + "file_name": "everycomp-1.20-2.8.12-forge.jar", "mc_versions": [ "1.20.1" ], @@ -3207,18 +3207,18 @@ "forge" ], "release_type": "release", - "url": "https://edge.forgecdn.net/files/6734/328/everycomp-1.20-2.8.11-forge.jar", - "id": "6734328", + "url": "https://edge.forgecdn.net/files/6740/51/everycomp-1.20-2.8.12-forge.jar", + "id": "6740051", "parent_id": "628539", "hashes": { - "sha1": "f4cd311366b751c260afef8bbf60a1629e040632", - "md5": "715e5709c95d01c4d5c47ef4d1c4fa9b" + "sha1": "018be48ad689e61fc14ad0bf54692a5b33f8f8ec", + "md5": "b527208c0b890e7b3ac048b753420e39" }, "required_dependencies": [ "499980" ], - "size": 2751317, - "date_published": "2025-07-05T19:27:09.543Z" + "size": 2750134, + "date_published": "2025-07-07T07:20:06.753Z" } ] }, @@ -4113,7 +4113,7 @@ "files": [ { "type": "curseforge", - "file_name": "Firmalife-1.20.1-2.1.19.jar", + "file_name": "Firmalife-1.20.1-2.1.20.jar", "mc_versions": [ "1.20.1" ], @@ -4122,18 +4122,18 @@ "forge" ], "release_type": "release", - "url": "https://edge.forgecdn.net/files/6539/645/Firmalife-1.20.1-2.1.19.jar", - "id": "6539645", + "url": "https://edge.forgecdn.net/files/6739/267/Firmalife-1.20.1-2.1.20.jar", + "id": "6739267", "parent_id": "453394", "hashes": { - "sha1": "10a33eb2e568207ade545676ea744cb6b429d8cf", - "md5": "f84e578a7cc607a70c33ed1972e55767" + "sha1": "f3a062a56a791e57efffc5afad78ba42f456d4a0", + "md5": "c1ab4e133f4fb9ac2027f241819e7da2" }, "required_dependencies": [ "302973" ], - "size": 4601850, - "date_published": "2025-05-17T16:15:39.383Z" + "size": 4628064, + "date_published": "2025-07-06T23:27:09.977Z" } ] }, @@ -4784,7 +4784,7 @@ "files": [ { "type": "curseforge", - "file_name": "immersive_aircraft-1.2.2+1.20.1-forge.jar", + "file_name": "immersive_aircraft-1.3.2+1.20.1-forge.jar", "mc_versions": [ "1.20.1" ], @@ -4792,16 +4792,16 @@ "forge" ], "release_type": "release", - "url": "https://edge.forgecdn.net/files/6316/345/immersive_aircraft-1.2.2+1.20.1-forge.jar", - "id": "6316345", + "url": "https://edge.forgecdn.net/files/6741/870/immersive_aircraft-1.3.2+1.20.1-forge.jar", + "id": "6741870", "parent_id": "666014", "hashes": { - "sha1": "5f1c9fb4a9825557a951bd5f97465fe44fc01df7", - "md5": "18fa516980439d1b7f4fd1d3a68334f8" + "sha1": "99207ff15e3f9348a112796696ca8390eb7ba148", + "md5": "b341cd1f0c8b4d2153c04522327bf640" }, "required_dependencies": [], - "size": 2180392, - "date_published": "2025-03-17T18:06:57.950Z" + "size": 2391337, + "date_published": "2025-07-07T18:28:38.877Z" } ] }, @@ -5852,7 +5852,7 @@ "files": [ { "type": "curseforge", - "file_name": "moonlight-1.20-2.14.11-forge.jar", + "file_name": "moonlight-1.20-2.14.13-forge.jar", "mc_versions": [ "1.20.1" ], @@ -5861,16 +5861,16 @@ "forge" ], "release_type": "release", - "url": "https://edge.forgecdn.net/files/6693/288/moonlight-1.20-2.14.11-forge.jar", - "id": "6693288", + "url": "https://edge.forgecdn.net/files/6740/431/moonlight-1.20-2.14.13-forge.jar", + "id": "6740431", "parent_id": "499980", "hashes": { - "sha1": "b95207f0440e6947a7e97a0d6ddb39d04e489d7f", - "md5": "ff5ad502d3b76d59eab710c2808eef1b" + "sha1": "845e93a836bbb0ed087d363d32b64cad131bcfc4", + "md5": "ebc46c08854f1b07cc30b9442dd5daaa" }, "required_dependencies": [], - "size": 1270442, - "date_published": "2025-06-25T05:13:07.137Z" + "size": 1272670, + "date_published": "2025-07-07T10:31:53.687Z" } ] }, @@ -6198,7 +6198,7 @@ "files": [ { "type": "curseforge", - "file_name": "notenoughanimations-forge-1.10.0-mc1.20.1.jar", + "file_name": "notenoughanimations-forge-1.10.1-mc1.20.1.jar", "mc_versions": [ "1.20.1" ], @@ -6206,16 +6206,16 @@ "forge" ], "release_type": "release", - "url": " https://edge.forgecdn.net/files/6688/512/notenoughanimations-forge-1.10.0-mc1.20.1.jar", - "id": "6688512", + "url": "https://edge.forgecdn.net/files/6738/627/notenoughanimations-forge-1.10.1-mc1.20.1.jar", + "id": "6738627", "parent_id": "433760", "hashes": { - "sha1": "4a2702f46248a9c629aa052e60676bc6b4623683", - "md5": "f6e557ba7e253019d32c9fbfb85bbb45" + "sha1": "ed3c4929d6bb08deebe7397b878cfbcb08172d71", + "md5": "5cc3073b456e16eb9f67d61d865a8c3c" }, "required_dependencies": [], - "size": 453719, - "date_published": "2025-03-27T17:09:31.037Z" + "size": 847497, + "date_published": "2025-07-06T19:38:28.650Z" } ] },