diff --git a/CHANGELOG.md b/CHANGELOG.md index c2bbbc98e..2bd8dc4f8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ - New electric refrigerator with different tiers. You can craft the old one into this new one, but please take your food out of it before upgrading otherwise it will be lost! @ofoxsmith - Added many new advanced food items including freeze-dried fruit, calorie paste, and meal bags. @Redeix - Quest updates for all of the above. @TomPlop +- Main UI overhaul and curseforge branding updated @Redeix ### Minor changes - Balance changes for water wheels and glowstone blocks @Pyritie - Added straws for the blaze burners so now you can pump liquid fuels into them (#1204) @34y34y34y34y34y34y34y34y34y @@ -32,6 +33,9 @@ - Updated texture for aqueous accumulator (#1168) @Redeix - Kaolin Klayzes now also drop blood lilies @Pyritie - Crushing wheels need a machine hull to craft now @Pyritie +- Anvil rod recipes are easier now (#1225) @Redeix +- Minecraft campfires now drop themselves (RIP lost bluesteel) (#1225) @Redeix +- Wooden multiblock tank increased to 1000000mB, and steel multiblock tank increased to 8000000mB @Redeix ### Bug fixes - Fixed a mud hut structure that had deprecated zinc ingots @Pyritie - The electric greenhouse now also allows loose rocks and plants inside, since TFC spawns them on any grass block @Pyritie diff --git a/kubejs/assets/tfg/textures/gui/button.png b/kubejs/assets/tfg/textures/gui/button.png index bed12e5f3..72ebc6fc4 100644 Binary files a/kubejs/assets/tfg/textures/gui/button.png and b/kubejs/assets/tfg/textures/gui/button.png differ diff --git a/kubejs/assets/tfg/textures/gui/button_20x20.png b/kubejs/assets/tfg/textures/gui/button_20x20.png index 44a44aa15..33ea686bf 100644 Binary files a/kubejs/assets/tfg/textures/gui/button_20x20.png and b/kubejs/assets/tfg/textures/gui/button_20x20.png differ diff --git a/kubejs/assets/tfg/textures/gui/button_98x20.png b/kubejs/assets/tfg/textures/gui/button_98x20.png index 8e896e8f7..81b291ee1 100644 Binary files a/kubejs/assets/tfg/textures/gui/button_98x20.png and b/kubejs/assets/tfg/textures/gui/button_98x20.png differ diff --git a/kubejs/assets/tfg/textures/gui/button_hover.gif b/kubejs/assets/tfg/textures/gui/button_hover.gif index 739a9ce18..054545d73 100644 Binary files a/kubejs/assets/tfg/textures/gui/button_hover.gif and b/kubejs/assets/tfg/textures/gui/button_hover.gif differ diff --git a/kubejs/assets/tfg/textures/gui/button_hover.png b/kubejs/assets/tfg/textures/gui/button_hover.png index 775ab38f9..b0fd3ee96 100644 Binary files a/kubejs/assets/tfg/textures/gui/button_hover.png and b/kubejs/assets/tfg/textures/gui/button_hover.png differ diff --git a/kubejs/assets/tfg/textures/gui/button_hover_20x20.png b/kubejs/assets/tfg/textures/gui/button_hover_20x20.png index 5ca3e7738..b52b837fc 100644 Binary files a/kubejs/assets/tfg/textures/gui/button_hover_20x20.png and b/kubejs/assets/tfg/textures/gui/button_hover_20x20.png differ diff --git a/kubejs/assets/tfg/textures/gui/button_hover_98x20.gif b/kubejs/assets/tfg/textures/gui/button_hover_98x20.gif index c5940fbcc..d502372fb 100644 Binary files a/kubejs/assets/tfg/textures/gui/button_hover_98x20.gif and b/kubejs/assets/tfg/textures/gui/button_hover_98x20.gif differ diff --git a/kubejs/assets/tfg/textures/gui/button_hover_98x20.png b/kubejs/assets/tfg/textures/gui/button_hover_98x20.png index 3b3120dc4..49e34ed32 100644 Binary files a/kubejs/assets/tfg/textures/gui/button_hover_98x20.png and b/kubejs/assets/tfg/textures/gui/button_hover_98x20.png differ diff --git a/kubejs/assets/tfg/textures/gui/curseforge_logo.png b/kubejs/assets/tfg/textures/gui/curseforge_logo.png index 6cf5699c7..86829dad2 100644 Binary files a/kubejs/assets/tfg/textures/gui/curseforge_logo.png and b/kubejs/assets/tfg/textures/gui/curseforge_logo.png differ diff --git a/kubejs/assets/tfg/textures/gui/curseforge_logo_hovered.png b/kubejs/assets/tfg/textures/gui/curseforge_logo_hovered.png index 6fc6e7fb4..da36fc2d8 100644 Binary files a/kubejs/assets/tfg/textures/gui/curseforge_logo_hovered.png and b/kubejs/assets/tfg/textures/gui/curseforge_logo_hovered.png differ diff --git a/kubejs/assets/tfg/textures/gui/discord_logo.png b/kubejs/assets/tfg/textures/gui/discord_logo.png index 48c1bcefd..09491fdee 100644 Binary files a/kubejs/assets/tfg/textures/gui/discord_logo.png and b/kubejs/assets/tfg/textures/gui/discord_logo.png differ diff --git a/kubejs/assets/tfg/textures/gui/discord_logo_hovered.png b/kubejs/assets/tfg/textures/gui/discord_logo_hovered.png index 34149a6a2..6d4f20faa 100644 Binary files a/kubejs/assets/tfg/textures/gui/discord_logo_hovered.png and b/kubejs/assets/tfg/textures/gui/discord_logo_hovered.png differ diff --git a/kubejs/assets/tfg/textures/gui/github_logo.png b/kubejs/assets/tfg/textures/gui/github_logo.png index b512224d7..b028c7f0b 100644 Binary files a/kubejs/assets/tfg/textures/gui/github_logo.png and b/kubejs/assets/tfg/textures/gui/github_logo.png differ diff --git a/kubejs/assets/tfg/textures/gui/github_logo_hovered.png b/kubejs/assets/tfg/textures/gui/github_logo_hovered.png index 4d5c929ea..b549c5be6 100644 Binary files a/kubejs/assets/tfg/textures/gui/github_logo_hovered.png and b/kubejs/assets/tfg/textures/gui/github_logo_hovered.png differ diff --git a/kubejs/assets/tfg/textures/gui/modrinth_logo.png b/kubejs/assets/tfg/textures/gui/modrinth_logo.png index 2e82d6ab2..43546223c 100644 Binary files a/kubejs/assets/tfg/textures/gui/modrinth_logo.png and b/kubejs/assets/tfg/textures/gui/modrinth_logo.png differ diff --git a/kubejs/assets/tfg/textures/gui/modrinth_logo_hovered.png b/kubejs/assets/tfg/textures/gui/modrinth_logo_hovered.png index 60fd47f07..eb1e848e2 100644 Binary files a/kubejs/assets/tfg/textures/gui/modrinth_logo_hovered.png and b/kubejs/assets/tfg/textures/gui/modrinth_logo_hovered.png differ diff --git a/kubejs/server_scripts/gregtech/recipes.js b/kubejs/server_scripts/gregtech/recipes.js index 9110847b1..7efc5bccc 100644 --- a/kubejs/server_scripts/gregtech/recipes.js +++ b/kubejs/server_scripts/gregtech/recipes.js @@ -1197,4 +1197,41 @@ const registerGTCEURecipes = (event) => { .duration(7 * 20) .EUt(60) //#endregion + + //#region Multiblock Tanks + + event.recipes.gtceu.assembler('tfg:assembler/wood_wall') + .itemInputs('4x #forge:treated_wood', ChemicalHelper.get(TagPrefix.plate, GTMaterials.Copper, 1)) + .itemOutputs('gtceu:wood_wall') + .circuit(4) + .duration(100) + .EUt(GTValues.VA[GTValues.ULV]) + + event.recipes.gtceu.assembler('tfg:assembler/wooden_multiblock_tank') + .itemInputs('gtceu:wood_wall', ChemicalHelper.get(TagPrefix.ring, GTMaterials.Copper, 2)) + .itemOutputs('gtceu:wooden_multiblock_tank') + .circuit(4) + .duration(200) + .EUt(GTValues.VA[GTValues.ULV]) + + event.recipes.gtceu.assembler('tfg:assembler/wooden_tank_valve') + .itemInputs('gtceu:wood_wall', ChemicalHelper.get(TagPrefix.ring, GTMaterials.Copper, 1), ChemicalHelper.get(TagPrefix.rotor, GTMaterials.Copper, 1)) + .itemOutputs('gtceu:wooden_tank_valve') + .duration(200) + .EUt(GTValues.VA[GTValues.ULV]) + + event.recipes.gtceu.assembler('tfg:assembler/steel_multiblock_tank') + .itemInputs('gtceu:solid_machine_casing', ChemicalHelper.get(TagPrefix.ring, GTMaterials.Steel, 2)) + .itemOutputs('gtceu:steel_multiblock_tank') + .circuit(4) + .duration(200) + .EUt(GTValues.VA[GTValues.ULV]) + + event.recipes.gtceu.assembler('tfg:assembler/steel_tank_valve') + .itemInputs('gtceu:solid_machine_casing', ChemicalHelper.get(TagPrefix.ring, GTMaterials.Steel, 1), ChemicalHelper.get(TagPrefix.rotor, GTMaterials.Steel, 1)) + .itemOutputs('gtceu:steel_tank_valve') + .duration(200) + .EUt(GTValues.VA[GTValues.ULV]) + + //#endregion } diff --git a/kubejs/server_scripts/tfc/recipes.materials.js b/kubejs/server_scripts/tfc/recipes.materials.js index 80f4d9112..243e60f28 100644 --- a/kubejs/server_scripts/tfc/recipes.materials.js +++ b/kubejs/server_scripts/tfc/recipes.materials.js @@ -454,7 +454,7 @@ function registerTFCMaterialsRecipes(event) { .id(`tfc:heating/metal/${material.getName()}_rod`) // Слиток -> 2 Стержня - event.recipes.tfc.anvil(rodItem.withCount(2), ingotItem, ['bend_last', 'draw_second_last', 'draw_third_last']) + event.recipes.tfc.anvil(rodItem.withCount(2), ingotItem, ['draw_last']) .tier(tfcProperty.getTier()) .id(`tfc:anvil/${material.getName()}_rod`) diff --git a/kubejs/server_scripts/tfg/loot_tables.js b/kubejs/server_scripts/tfg/loot_tables.js index f9644fbba..2cd1aedb2 100644 --- a/kubejs/server_scripts/tfg/loot_tables.js +++ b/kubejs/server_scripts/tfg/loot_tables.js @@ -80,4 +80,12 @@ function registerTFGLoots(event) { ); }) }); + + //#region Blocks + + event.addBlockLootModifier('minecraft:campfire') + .removeLoot(Ingredient.all) + .addLoot('minecraft:campfire') + + //#endregion }; \ No newline at end of file