From f4accd7431fcc78f0f7176ec5d747029c4451096 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Fri, 5 Jan 2024 22:30:40 +0700 Subject: [PATCH 1/8] =?UTF-8?q?=D0=92=D1=8B=D1=82=D0=B5=D1=80=20=D0=B7?= =?UTF-8?q?=D0=B0=20=D1=81=D0=BE=D0=B1=D0=BE=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kubejs/server_scripts/tfc/recipes.js | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/kubejs/server_scripts/tfc/recipes.js b/kubejs/server_scripts/tfc/recipes.js index 75e5735cd..193138f8f 100644 --- a/kubejs/server_scripts/tfc/recipes.js +++ b/kubejs/server_scripts/tfc/recipes.js @@ -8,10 +8,11 @@ const registerTFCRecipes = (event) => { let metal = keyValuePair[0] let metalSpecs = keyValuePair[1] - + if (metalSpecs.props.includes(global.INGOT_GEN)) { - + if (metalSpecs.input_fluid != undefined) { + // Отливка слитка в обычной форме event.recipes.tfc.casting(Item.of(`#forge:ingots/${metal}`), 'tfc:ceramic/ingot_mold', TFC.fluidStackIngredient(metalSpecs.input_fluid, 144), 0.1) .id(`tfc:casting/${metal}_ingot`) @@ -20,6 +21,16 @@ const registerTFCRecipes = (event) => { event.recipes.tfc.casting(Item.of(`#forge:ingots/${metal}`), 'tfc:ceramic/fire_ingot_mold', TFC.fluidStackIngredient(metalSpecs.input_fluid, 144), 0.01) .id(`tfc:casting/${metal}_fire_ingot`) } + else + { + // Отливка слитка в обычной форме + event.recipes.tfc.casting(Item.of(`#forge:ingots/${metal}`), 'tfc:ceramic/ingot_mold', TFC.fluidStackIngredient(metalSpecs.output_fluid, 144), 0.1) + .id(`tfc:casting/${metal}_ingot`) + + // Отливка слитка в огнеупорной форме + event.recipes.tfc.casting(Item.of(`#forge:ingots/${metal}`), 'tfc:ceramic/fire_ingot_mold', TFC.fluidStackIngredient(metalSpecs.output_fluid, 144), 0.01) + .id(`tfc:casting/${metal}_fire_ingot`) + } // Декрафт слитка в жидкость event.recipes.tfc.heating(`#forge:ingots/${metal}`, metalSpecs.melt_temp) @@ -2509,9 +2520,9 @@ const registerTFCRecipes = (event) => { //#region Обрушения - event.recipes.tfc.collapse(null, TFC.blockIngredient(['#tfg:rock_slabs'])).id('tfg:collapse/rock_slabs') - event.recipes.tfc.collapse(null, TFC.blockIngredient(['#tfg:rock_stairs'])).id('tfg:collapse/rock_stairs') - event.recipes.tfc.collapse(null, TFC.blockIngredient(['#tfg:rock_walls'])).id('tfg:collapse/rock_walls') + event.recipes.tfc.collapse('#tfg:rock_slabs').id('tfg:collapse/rock_slabs') + event.recipes.tfc.collapse('#tfg:rock_stairs').id('tfg:collapse/rock_stairs') + event.recipes.tfc.collapse('#tfg:rock_walls').id('tfg:collapse/rock_walls') global.TFC_STONE_TYPES.forEach(stoneType => { let oresToCollapse = [] From 4bd7a3cc5f07a57df4411394bf3d7abfec37ab2d Mon Sep 17 00:00:00 2001 From: Dmitry Date: Fri, 5 Jan 2024 22:32:51 +0700 Subject: [PATCH 2/8] dead --- kubejs/server_scripts/chisel_and_bits/recipes.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubejs/server_scripts/chisel_and_bits/recipes.js b/kubejs/server_scripts/chisel_and_bits/recipes.js index 90fa8e3a9..51193d5ed 100644 --- a/kubejs/server_scripts/chisel_and_bits/recipes.js +++ b/kubejs/server_scripts/chisel_and_bits/recipes.js @@ -58,7 +58,7 @@ const registerChiselAndBitsRecipes = (event) => { // Герметик event.shapeless('chiselsandbits:sealant', [ - 'minecraft:slimeball', + 'minecraft:slime_ball', 'firmalife:raw_honey' ]).id('tfg:chiselsandbits/shapeless/sealant_from_slimeballs') From 9be8dbc7836df922ae0cd0520ff77fbad31226bf Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Fri, 5 Jan 2024 20:34:19 +0500 Subject: [PATCH 3/8] ftbranks --- defaultconfigs/ftbessentials.snbt | 2 +- defaultconfigs/ftbranks/ranks.snbt | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/defaultconfigs/ftbessentials.snbt b/defaultconfigs/ftbessentials.snbt index 21a1d601a..888367213 100644 --- a/defaultconfigs/ftbessentials.snbt +++ b/defaultconfigs/ftbessentials.snbt @@ -76,7 +76,7 @@ # Enables usage of a trash can inventory, which can be used to void unneeded items trashcan: { # Default: true - enabled: false + enabled: true } } diff --git a/defaultconfigs/ftbranks/ranks.snbt b/defaultconfigs/ftbranks/ranks.snbt index 775d1473d..16cfe32af 100644 --- a/defaultconfigs/ftbranks/ranks.snbt +++ b/defaultconfigs/ftbranks/ranks.snbt @@ -6,6 +6,7 @@ ftbranks.name_format: "{name}" ftbchunks.max_claimed: 50 ftbchunks.max_force_loaded: 3 + command.trashcan: true } vip: { name: "VIP" From 3c4561e79ea97e70d4715c4fd7a8ae32b33d1711 Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Fri, 5 Jan 2024 22:18:46 +0500 Subject: [PATCH 4/8] Update mods --- mods | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods b/mods index 9584cf55a..e70e20225 160000 --- a/mods +++ b/mods @@ -1 +1 @@ -Subproject commit 9584cf55a8871c54b9cff14a8fde0fd11a817ac1 +Subproject commit e70e20225fccef4743f3854e4f610deff249a047 From f5b265d1e97736c4a6e783baea01fa13c61c6fbe Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Sat, 6 Jan 2024 00:34:26 +0500 Subject: [PATCH 5/8] Update CHANGELOG.md --- CHANGELOG.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b1f042741..0006595df 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,16 @@ # Changelog +## [0.4.2] - 05.01.2024 +### Изменения +- Исправлен вылет игры при нахождении рядом с бойлерами. +### Новые моды +- embeddiumplus +### Обновленные моды +- TerraFirmaGreg-Core -> 0.2.7 +- PuzzlesLib -> 8.1.12 +### Удаленные моды +- dynamiclightsreforged + ## [0.4.1] - 05.01.2024 ### Изменения - Исправлена кнопка подключения к официальному серверу. From b05d61ad8c580ef7865893216d168e94c3b743b2 Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Sat, 6 Jan 2024 00:34:30 +0500 Subject: [PATCH 6/8] Update mods --- mods | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods b/mods index e70e20225..c0edf71ac 160000 --- a/mods +++ b/mods @@ -1 +1 @@ -Subproject commit e70e20225fccef4743f3854e4f610deff249a047 +Subproject commit c0edf71acbd5a0e9077c233b0bf436a180d0fe57 From 9008ee8b58433cc69aa66522e3ae7c490b64f1a8 Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Sat, 6 Jan 2024 00:35:14 +0500 Subject: [PATCH 7/8] manifest --- .github/buildtools/modpack/manifest.json | 880 +++++++++++------------ .github/buildtools/modpack/modlist.html | 188 ++--- 2 files changed, 534 insertions(+), 534 deletions(-) diff --git a/.github/buildtools/modpack/manifest.json b/.github/buildtools/modpack/manifest.json index 65c6f23bc..34262f974 100644 --- a/.github/buildtools/modpack/manifest.json +++ b/.github/buildtools/modpack/manifest.json @@ -15,184 +15,14 @@ "author": "Exception, Xikaro", "projectID": 385053, "files": [ - { - "projectID": 636608, - "fileID": 4982660, - "required": true - }, - { - "projectID": 495476, - "fileID": 4924184, - "required": true - }, - { - "projectID": 223794, - "fileID": 4997114, - "required": true - }, - { - "projectID": 410811, - "fileID": 4896152, - "required": true - }, - { - "projectID": 237307, - "fileID": 4600191, - "required": true - }, - { - "projectID": 943925, - "fileID": 4926070, - "required": true - }, - { - "projectID": 429371, - "fileID": 4884096, - "required": true - }, - { - "projectID": 908741, - "fileID": 4984832, - "required": true - }, - { - "projectID": 663477, - "fileID": 4826822, - "required": true - }, - { - "projectID": 283644, - "fileID": 4913663, - "required": true - }, - { - "projectID": 351441, - "fileID": 4613538, - "required": true - }, - { - "projectID": 890405, - "fileID": 5000343, - "required": true - }, - { - "projectID": 404468, - "fileID": 4623116, - "required": true - }, - { - "projectID": 309927, - "fileID": 4985525, - "required": true - }, - { - "projectID": 511770, - "fileID": 4606615, - "required": true - }, - { - "projectID": 844019, - "fileID": 4893142, - "required": true - }, - { - "projectID": 688231, - "fileID": 4836196, - "required": true - }, - { - "projectID": 581495, - "fileID": 4952626, - "required": true - }, - { - "projectID": 263420, - "fileID": 4933782, - "required": true - }, - { - "projectID": 453394, - "fileID": 4976486, - "required": true - }, - { - "projectID": 310111, - "fileID": 4951142, - "required": true - }, - { - "projectID": 927874, - "fileID": 4968758, - "required": true - }, - { - "projectID": 912469, - "fileID": 4956177, - "required": true - }, - { - "projectID": 302973, - "fileID": 4976574, - "required": true - }, - { - "projectID": 634062, - "fileID": 4610474, - "required": true - }, - { - "projectID": 255389, - "fileID": 4798205, - "required": true - }, - { - "projectID": 551894, - "fileID": 4688940, - "required": true - }, - { - "projectID": 570630, - "fileID": 4936333, - "required": true - }, - { - "projectID": 233019, - "fileID": 4578262, - "required": true - }, - { - "projectID": 411045, - "fileID": 4578649, - "required": true - }, - { - "projectID": 662156, - "fileID": 4944918, - "required": true - }, - { - "projectID": 306770, - "fileID": 4966125, - "required": true - }, - { - "projectID": 818089, - "fileID": 4872397, - "required": true - }, - { - "projectID": 231095, - "fileID": 4787442, - "required": true - }, { "projectID": 448233, "fileID": 4763645, "required": true }, { - "projectID": 654373, - "fileID": 4873766, + "projectID": 333287, + "fileID": 4833106, "required": true }, { @@ -201,53 +31,23 @@ "required": true }, { - "projectID": 551736, - "fileID": 4731947, + "projectID": 889915, + "fileID": 4932157, "required": true }, { - "projectID": 314905, - "fileID": 4596742, + "projectID": 429235, + "fileID": 4810975, "required": true }, { - "projectID": 60089, - "fileID": 4581240, + "projectID": 674852, + "fileID": 4828026, "required": true }, { - "projectID": 326652, - "fileID": 4979375, - "required": true - }, - { - "projectID": 266890, - "fileID": 4994127, - "required": true - }, - { - "projectID": 251407, - "fileID": 4751740, - "required": true - }, - { - "projectID": 439890, - "fileID": 4929694, - "required": true - }, - { - "projectID": 435044, - "fileID": 4596768, - "required": true - }, - { - "projectID": 254284, - "fileID": 4887789, - "required": true - }, - { - "projectID": 410295, - "fileID": 4583492, + "projectID": 233019, + "fileID": 4578262, "required": true }, { @@ -255,19 +55,439 @@ "fileID": 4745380, "required": true }, + { + "projectID": 618298, + "fileID": 4993651, + "required": true + }, + { + "projectID": 324717, + "fileID": 4986594, + "required": true + }, + { + "projectID": 943925, + "fileID": 4926070, + "required": true + }, + { + "projectID": 309927, + "fileID": 4985525, + "required": true + }, + { + "projectID": 912469, + "fileID": 4956177, + "required": true + }, + { + "projectID": 404468, + "fileID": 4623116, + "required": true + }, + { + "projectID": 583345, + "fileID": 4925840, + "required": true + }, + { + "projectID": 654373, + "fileID": 4873766, + "required": true + }, + { + "projectID": 531761, + "fileID": 4943500, + "required": true + }, + { + "projectID": 790626, + "fileID": 4980929, + "required": true + }, + { + "projectID": 326652, + "fileID": 4979375, + "required": true + }, + { + "projectID": 351441, + "fileID": 4613538, + "required": true + }, + { + "projectID": 823106, + "fileID": 4906217, + "required": true + }, + { + "projectID": 521393, + "fileID": 4837449, + "required": true + }, + { + "projectID": 314905, + "fileID": 4596742, + "required": true + }, + { + "projectID": 328085, + "fileID": 4835191, + "required": true + }, + { + "projectID": 435044, + "fileID": 4596768, + "required": true + }, + { + "projectID": 302973, + "fileID": 4976574, + "required": true + }, + { + "projectID": 254284, + "fileID": 4887789, + "required": true + }, + { + "projectID": 292038, + "fileID": 4594106, + "required": true + }, + { + "projectID": 927874, + "fileID": 4968758, + "required": true + }, + { + "projectID": 297038, + "fileID": 4969628, + "required": true + }, + { + "projectID": 634062, + "fileID": 4610474, + "required": true + }, + { + "projectID": 663477, + "fileID": 4826822, + "required": true + }, + { + "projectID": 665658, + "fileID": 4982356, + "required": true + }, + { + "projectID": 270441, + "fileID": 4578892, + "required": true + }, + { + "projectID": 433760, + "fileID": 5008760, + "required": true + }, + { + "projectID": 255389, + "fileID": 4798205, + "required": true + }, + { + "projectID": 60089, + "fileID": 4581240, + "required": true + }, + { + "projectID": 299540, + "fileID": 4711441, + "required": true + }, + { + "projectID": 260262, + "fileID": 4581167, + "required": true + }, + { + "projectID": 581495, + "fileID": 4952626, + "required": true + }, + { + "projectID": 306770, + "fileID": 4966125, + "required": true + }, + { + "projectID": 237307, + "fileID": 4600191, + "required": true + }, + { + "projectID": 240633, + "fileID": 4655091, + "required": true + }, { "projectID": 288885, "fileID": 4711423, "required": true }, + { + "projectID": 890405, + "fileID": 5000343, + "required": true + }, + { + "projectID": 317780, + "fileID": 4929640, + "required": true + }, + { + "projectID": 251407, + "fileID": 4751740, + "required": true + }, + { + "projectID": 231095, + "fileID": 4787442, + "required": true + }, + { + "projectID": 688231, + "fileID": 4836196, + "required": true + }, + { + "projectID": 232131, + "fileID": 4635878, + "required": true + }, + { + "projectID": 310111, + "fileID": 4951142, + "required": true + }, + { + "projectID": 316582, + "fileID": 4973430, + "required": true + }, + { + "projectID": 439890, + "fileID": 4929694, + "required": true + }, + { + "projectID": 633412, + "fileID": 4685319, + "required": true + }, + { + "projectID": 357540, + "fileID": 4699629, + "required": true + }, + { + "projectID": 257814, + "fileID": 5005088, + "required": true + }, + { + "projectID": 289412, + "fileID": 4929479, + "required": true + }, + { + "projectID": 348521, + "fileID": 4973441, + "required": true + }, + { + "projectID": 570630, + "fileID": 4936333, + "required": true + }, + { + "projectID": 636608, + "fileID": 4982660, + "required": true + }, + { + "projectID": 916493, + "fileID": 4988266, + "required": true + }, + { + "projectID": 238086, + "fileID": 4948967, + "required": true + }, + { + "projectID": 538149, + "fileID": 4620037, + "required": true + }, + { + "projectID": 495693, + "fileID": 4870168, + "required": true + }, + { + "projectID": 841001, + "fileID": 4945181, + "required": true + }, + { + "projectID": 422301, + "fileID": 4993659, + "required": true + }, + { + "projectID": 931925, + "fileID": 4958320, + "required": true + }, + { + "projectID": 282001, + "fileID": 5005529, + "required": true + }, + { + "projectID": 453394, + "fileID": 4976486, + "required": true + }, + { + "projectID": 419699, + "fileID": 4663010, + "required": true + }, + { + "projectID": 662156, + "fileID": 4944918, + "required": true + }, + { + "projectID": 411045, + "fileID": 4578649, + "required": true + }, + { + "projectID": 283644, + "fileID": 4913663, + "required": true + }, + { + "projectID": 308240, + "fileID": 4820041, + "required": true + }, + { + "projectID": 354353, + "fileID": 4891706, + "required": true + }, + { + "projectID": 511770, + "fileID": 4606615, + "required": true + }, + { + "projectID": 256717, + "fileID": 4614555, + "required": true + }, + { + "projectID": 844019, + "fileID": 4893142, + "required": true + }, + { + "projectID": 495476, + "fileID": 5010247, + "required": true + }, { "projectID": 387638, "fileID": 4691333, "required": true }, { - "projectID": 495693, - "fileID": 4870168, + "projectID": 908741, + "fileID": 4984832, + "required": true + }, + { + "projectID": 266890, + "fileID": 4994127, + "required": true + }, + { + "projectID": 714158, + "fileID": 4987747, + "required": true + }, + { + "projectID": 940350, + "fileID": 4922586, + "required": true + }, + { + "projectID": 526854, + "fileID": 4631193, + "required": true + }, + { + "projectID": 475117, + "fileID": 4711435, + "required": true + }, + { + "projectID": 871755, + "fileID": 4999501, + "required": true + }, + { + "projectID": 401648, + "fileID": 4863626, + "required": true + }, + { + "projectID": 367706, + "fileID": 4776833, + "required": true + }, + { + "projectID": 513402, + "fileID": 5010415, + "required": true + }, + { + "projectID": 223794, + "fileID": 4997114, + "required": true + }, + { + "projectID": 818089, + "fileID": 4872397, + "required": true + }, + { + "projectID": 410811, + "fileID": 4896152, + "required": true + }, + { + "projectID": 263420, + "fileID": 4933782, + "required": true + }, + { + "projectID": 880532, + "fileID": 4895948, "required": true }, { @@ -280,239 +500,19 @@ "fileID": 4990314, "required": true }, - { - "projectID": 316582, - "fileID": 4973430, - "required": true - }, - { - "projectID": 282001, - "fileID": 5005529, - "required": true - }, - { - "projectID": 238086, - "fileID": 4948967, - "required": true - }, - { - "projectID": 308240, - "fileID": 4820041, - "required": true - }, - { - "projectID": 419699, - "fileID": 4663010, - "required": true - }, - { - "projectID": 433760, - "fileID": 5008760, - "required": true - }, - { - "projectID": 292038, - "fileID": 4594106, - "required": true - }, - { - "projectID": 674852, - "fileID": 4828026, - "required": true - }, - { - "projectID": 324717, - "fileID": 4986594, - "required": true - }, - { - "projectID": 401648, - "fileID": 4863626, - "required": true - }, - { - "projectID": 871755, - "fileID": 4999501, - "required": true - }, - { - "projectID": 880532, - "fileID": 4895948, - "required": true - }, - { - "projectID": 299540, - "fileID": 4711441, - "required": true - }, - { - "projectID": 940350, - "fileID": 4922586, - "required": true - }, - { - "projectID": 365281, - "fileID": 4612683, - "required": true - }, - { - "projectID": 841001, - "fileID": 4945181, - "required": true - }, - { - "projectID": 270441, - "fileID": 4578892, - "required": true - }, - { - "projectID": 422301, - "fileID": 4993659, - "required": true - }, - { - "projectID": 531761, - "fileID": 4943500, - "required": true - }, - { - "projectID": 889915, - "fileID": 4932157, - "required": true - }, - { - "projectID": 475117, - "fileID": 4711435, - "required": true - }, - { - "projectID": 790626, - "fileID": 4980929, - "required": true - }, - { - "projectID": 583345, - "fileID": 4925840, - "required": true - }, - { - "projectID": 232131, - "fileID": 4635878, - "required": true - }, - { - "projectID": 618298, - "fileID": 4993651, - "required": true - }, - { - "projectID": 916493, - "fileID": 4988266, - "required": true - }, - { - "projectID": 367706, - "fileID": 4776833, - "required": true - }, - { - "projectID": 348521, - "fileID": 4973441, - "required": true - }, { "projectID": 416294, "fileID": 4944325, "required": true }, { - "projectID": 260262, - "fileID": 4581167, + "projectID": 551894, + "fileID": 4688940, "required": true }, { - "projectID": 289412, - "fileID": 4929479, - "required": true - }, - { - "projectID": 521393, - "fileID": 4837449, - "required": true - }, - { - "projectID": 240633, - "fileID": 4655091, - "required": true - }, - { - "projectID": 328085, - "fileID": 4835191, - "required": true - }, - { - "projectID": 357540, - "fileID": 4699629, - "required": true - }, - { - "projectID": 354353, - "fileID": 4891706, - "required": true - }, - { - "projectID": 526854, - "fileID": 4631193, - "required": true - }, - { - "projectID": 317780, - "fileID": 4929640, - "required": true - }, - { - "projectID": 823106, - "fileID": 4906217, - "required": true - }, - { - "projectID": 256717, - "fileID": 4614555, - "required": true - }, - { - "projectID": 538149, - "fileID": 4620037, - "required": true - }, - { - "projectID": 714158, - "fileID": 4987747, - "required": true - }, - { - "projectID": 429235, - "fileID": 4810975, - "required": true - }, - { - "projectID": 665658, - "fileID": 4982356, - "required": true - }, - { - "projectID": 297038, - "fileID": 4969628, - "required": true - }, - { - "projectID": 257814, - "fileID": 5005088, - "required": true - }, - { - "projectID": 633412, - "fileID": 4685319, + "projectID": 429371, + "fileID": 4884096, "required": true }, { @@ -521,13 +521,13 @@ "required": true }, { - "projectID": 513402, - "fileID": 5009676, + "projectID": 410295, + "fileID": 4583492, "required": true }, { - "projectID": 333287, - "fileID": 4833106, + "projectID": 365281, + "fileID": 4612683, "required": true } ], diff --git a/.github/buildtools/modpack/modlist.html b/.github/buildtools/modpack/modlist.html index 96ad7cd01..8225137b5 100644 --- a/.github/buildtools/modpack/modlist.html +++ b/.github/buildtools/modpack/modlist.html @@ -1,105 +1,105 @@  From cd6c43fe8333c14022f15fe9c5486c2236ee244c Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Sat, 6 Jan 2024 00:47:25 +0500 Subject: [PATCH 8/8] Update build.yml --- .github/workflows/build.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b9bf06140..263673a00 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -5,8 +5,6 @@ on: push: tags: - "*.*.*" - branches: - - main concurrency: group: ${{ github.ref }}