diff --git a/CHANGELOG.md b/CHANGELOG.md index 257dd0f72..70c155a89 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,20 @@ ## Unreleased ### Changes ### Bug fixes +### Translation updates + +## [0.11.12] - 19-12-2025 +### Changes +- Brick Wooden Form can now be used to make unfired clay and fire clay bricks at the same rate as knapping (#2461) @Pyritie +### Bug fixes +- Fixed missing blocks of coke @Pyritie +- Fixed some missing boiler recipes like charcoal blocks (#2463) @applenper +- Fixed vulcanized latex to raw rubber vacuumizer recipe being the wrong way around (#2464) @Mqrius +- Fixed a crash when loading a chunk that had an old blaze burner with a straw @Pyritie +- Fixed incorrect coil tooltips on the nuclear fuel factory and liquefaction tower @Pyritie +- Fixed new rose quartz lens not being in the pink lens tag @Pyritie +### Translation updates +- Chinese (simplified) @jmecn ## [0.11.11] - 18-12-2025 ### Breaking Changes diff --git a/kubejs/assets/greate/lang/ru_ru.json b/kubejs/assets/greate/lang/ru_ru.json index eda27e13d..47f9b2773 100644 --- a/kubejs/assets/greate/lang/ru_ru.json +++ b/kubejs/assets/greate/lang/ru_ru.json @@ -41,6 +41,7 @@ "greate.recipe.packing": "Сварка и упаковка", "greate.ponder.belt_casing.text_1": "Латунный или металлический корпус может быть использован для украшения механического ремня", "greate.ponder.cogwheel_casing.text_1": "Латунный или металлический корпус может быть использован для украшения шестерни", + "material.greate.rose_quartz": "Розовый кварц", "block.greate.aluminium_cogwheel": "Шестерня (Алюминий)", "block.greate.aluminium_crushing_wheel": "Дробильное колесо (Алюминий)", "block.greate.aluminium_crushing_wheel_controller": "Контроллер дробильного колеса (Алюминий)", diff --git a/kubejs/assets/gtceu/lang/ru_ru.json b/kubejs/assets/gtceu/lang/ru_ru.json index 4369a0fbc..254a2e60c 100644 --- a/kubejs/assets/gtceu/lang/ru_ru.json +++ b/kubejs/assets/gtceu/lang/ru_ru.json @@ -172,7 +172,6 @@ "material.gtceu.lightweight_ostrum_vapor": "Lightweight Ostrum Vapor", "material.gtceu.ostrum_vapor": "Ostrum Vapor", "material.gtceu.blue_steel": "Синяя сталь", - "material.gtceu.rose_quartz": "Розовый кварц", "metaitem.dust.tooltip.purify": "Бросьте в источник воды или нажмите ПКМ по котлу, для получения чистой пыли", "metaitem.crushed.tooltip.purify": "Бросьте в источник воды или нажмите ПКМ по котлу, для получения очищенной руды", "item.gtceu.tool.behavior.silk_ice": "§dSculptor:§r Silk harvests Packed Ice", diff --git a/kubejs/assets/forge/models/tag/item/sand.json b/kubejs/assets/minecraft/models/tag/item/sand.json similarity index 100% rename from kubejs/assets/forge/models/tag/item/sand.json rename to kubejs/assets/minecraft/models/tag/item/sand.json diff --git a/kubejs/assets/tfg/lang/en_us.json b/kubejs/assets/tfg/lang/en_us.json index 97c3fa262..f394094b6 100644 --- a/kubejs/assets/tfg/lang/en_us.json +++ b/kubejs/assets/tfg/lang/en_us.json @@ -1567,10 +1567,11 @@ "tfg.tooltip.hotornot_hot_equipment": "§7Provides protection from all §6hot§7 items, fluids, and pipes.§r", "tfg.tooltip.hotornot_cold_equipment": "§7Provides protection from all §bcold§7 items, fluids, and pipes.§r", "tfg.tooltip.hotornot_floating_equipment": "§7Provides protection from all §elighter-than-air§7 gases.§r", - "tfg.tooltip.machine.one_energy_hatch": "Accepts exactly §6One§r Energy Hatch", - "tfg.tooltip.machine.two_energy_hatches": "Accepts up to §6Two§r Energy Hatches", + "tfg.tooltip.machine.one_energy_hatch": "Accepts exactly §6One§r Energy Hatch.", + "tfg.tooltip.machine.two_energy_hatches": "Accepts up to §6Two§r Energy Hatches.", "tfg.tooltip.machine.subtick": "This machine supports §2Subticking§r!", - "tfg.tooltip.machine.coil_energy_discount": "Every coil after §6Cupronickel§r reduces energy usage by §r10%§7.§r", + "tfg.tooltip.machine.coil_energy_discount": "Every coil after §6Cupronickel§r reduces energy usage by 10%.", + "tfg.tooltip.machine.coil_speed_discount": "§6Cupronickel§r coils process 75% slower. Every coil after §3Kanthal§r increases processing speed by 50%.", "tfg.tooltip.machine.bioreactor_1": "§7Chemistry meets Biology§r", "tfg.tooltip.machine.bioreactor_2": "§7Combines organic and inorganic ingredients to produce synthetic biological products.§r", "tfg.tooltip.machine.growth_chamber_1": "§7Growing new life§r", @@ -2317,7 +2318,7 @@ "quests.extreme_voltage.btx.desc.2": "Let’s start with the &bBTX Fuel&r crafting. You will need to mix &eReformate Gas&r with the &eCatalyst&r and a small amount of &ePropene&r. A new processing path allows you to produce &eMethanol&r from &eSyngas&r, which can then be distilled into the required Propene. This is a good way to reuse the Syngas generated during &eReformate Gas&r production.\n\nOnce that is done, distilling &eWood Tar&r in a &6Distillation Tower&r will provide everything else you need to complete the mix. Simple enough. In the next quests, we will cover how to craft the &eCatalyst&r and how to recycle it efficiently.", "quests.extreme_voltage.btx_catalyser.title": "Catalyser Pt-Re ZSM-5", "quests.extreme_voltage.btx_catalyser.subtitle": "What a complex name", - "quests.extreme_voltage.btx_catalyser.desc": "To craft the &ePt-Re ZSM-5 Catalyst&r, you will need to set up infinite sources of &aLye&r, &aSodium&r, and &dNether Quartz&r, as well as &aAmmonia&r and &aEthanol&r. The &bAluminum&r will be fully looped, while the other materials will only be partially recovered.\n\nIf you are unsure about &dNether Quartz&r, take a look at the recipe chain starting from &eSand&r. &aSodium&r, on the other hand, can be obtained easily from &bSea Water&r processing, and Lye can be from Wood Ash.\n\nFinally, mix everything together with some &5Platinum&r and &5Rhenium&r to obtain your &eCatalyst&r. The good news is that both Platinum and Rhenium are fully recycled in this process, so there is no need to worry you will only have to mine them once.", + "quests.extreme_voltage.btx_catalyser.desc": "To craft the &ePt-Re ZSM-5 Catalyst&r, you will need to set up infinite sources of &aLye&r, &aSodium&r, and &dNether Quartz&r, as well as &aAmmonia&r and &aEthanol&r. The &bAluminum&r will be fully looped, while the other materials will only be partially recovered.\n\nIf you are unsure about &dNether Quartz&r, take a look at the recipe chain starting from &eSand&r. &aSodium&r, on the other hand, can be obtained easily from &bSea Water&r processing, and Lye can be from Wood Ash.\n\nFinally, mix everything together with some &5Platinum&r and &5Rhenium&r to obtain your &eCatalyst&r. The good news is that both Platinum and Rhenium are fully recycled in this process, so there is no need to worry - you will only have to mine them once.", "quests.extreme_voltage.btx_loop.title": "Recycling the Used Catalyser", "quests.extreme_voltage.btx_loop.subtitle": "Getting back as much as you can", "quests.extreme_voltage.btx_loop.desc.1": "The last part of this chain consists in recycling your Used Catalyser. The overall process is fairly straightforward, and the main challenge will be maintaining a continuous supply of &aReinforced Epoxy Resin Plates&r and &eGlue&r.\n\nIf you still have your &2tapping system&r in place, it should be more than sufficient to produce all the resin required to craft your Glue. Alternatively, using an &bExtractor&r on logs is also a perfectly viable option. This method is slightly more &cpower-hungry&r, but the choice is entirely up to you depending on your infrastructure.", diff --git a/kubejs/assets/tfg/lang/zh_cn.json b/kubejs/assets/tfg/lang/zh_cn.json index 3d1eb0881..e805095b7 100644 --- a/kubejs/assets/tfg/lang/zh_cn.json +++ b/kubejs/assets/tfg/lang/zh_cn.json @@ -1301,7 +1301,7 @@ "material.tfg.reformed_aromatic_feedstock": "重整芳香原料", "material.tfg.reformate_gas": "重整气", "material.tfg.cracker_off_gas": "裂化重整尾气", - "material.tfg.btx_fuel": "轻质芳烃燃料", + "material.tfg.btx_fuel": "芳烃燃料", "material.tfg.critical_steam": "临界蒸汽", "material.tfg.americium_241": "镅-241", "material.tfg.californium_252": "锎-252", @@ -2398,10 +2398,10 @@ "quests.extreme_voltage.large_generators.desc": "各种单方块发电机的上限只到HV，自此往后你必须采用多方块结构来产生更多能量。EV阶段两个最好的选择是&d大型燃气涡轮&r和&d大型内燃机&r，请移步格雷科技能源章节了解详细信息。", "quests.extreme_voltage.large_centrifuge.subtitle": "材料旋转木马", "quests.extreme_voltage.large_centrifuge.desc": "&6大型离心机&r是你裂变生产线中必备的多方块结构。\n\n它最多支持&52个EV能源仓&r，能够以与电力高炉相同的机制处理&1IV等级&r的配方，因此操作逻辑会让你感到熟悉。\n\n该设备拥有两种运行模式：&b离心&r与&6热力离心&r。你可直接在控制器界面切换模式，但暂不支持通过AE2或其他自动化系统远程控制。\n\n此次升级将使你的&a矿物处理&r速度实现质的飞跃。", - "quests.extreme_voltage.btx.title": "轻质芳烃燃料", + "quests.extreme_voltage.btx.title": "芳烃燃料", "quests.extreme_voltage.btx.subtitle": "硝基苯久违的远亲", - "quests.extreme_voltage.btx.desc.1": "&e轻质芳烃燃料&r是&e重整气&r的升级版，每mB的能量强度约为后者的五倍。其生产过程更为繁琐，但能为运行你的&6大型燃气涡轮&r带来显著的性能提升。与其前身一样，这种燃料完全可再生，并且可以完全通过&a树木加工&r来生产。\n\n为了解释&e轻质芳烃燃料&r的制作过程，我们将其加工分为三部分：&b轻质芳烃燃料合成&r本身、&e催化剂&r的制作，以及最后如何循环&e铼&r和&e铂&r。", - "quests.extreme_voltage.btx.desc.2": "让我们从&b轻质芳烃燃料&r的合成开始。你需要将&e重整气&r与&e催化剂&r以及少量&e丙烯&r混合。一条新的加工路线允许你用&e合成气&r生产&e甲醇&r，然后将其蒸馏成所需的丙烯。这是重新利用生产&e重整气&r过程中产生的合成气的好方法。\n\n完成这一步后，在&6蒸馏塔&r中分馏&e木焦油&r将提供完成混合物所需的所有其他成分。相当简单。在接下来的任务中，我们将介绍如何制作&e催化剂&r以及如何高效地回收它。", + "quests.extreme_voltage.btx.desc.1": "&e芳烃燃料&r是&e重整气&r的升级版，每豪桶的能量密度约为后者的五倍。其生产过程更为繁琐，但能为运行你的&6大型燃气涡轮&r带来显著的性能提升。与其前身一样，这种燃料完全可再生，并且可以完全通过&a树木加工&r来生产。\n\n为了解释&e芳烃燃料&r的制作过程，我们将其加工分为三部分：&b芳烃燃料合成&r本身、&e催化剂&r的制作，以及最后如何循环&e铼&r和&e铂&r。", + "quests.extreme_voltage.btx.desc.2": "让我们从&b芳烃燃料&r的合成开始。你需要将&e重整气&r与&e催化剂&r以及少量&e丙烯&r混合。一条新的加工路线允许你用&e合成气&r生产&e甲醇&r，然后将其蒸馏成所需的丙烯。这是重新利用生产&e重整气&r过程中产生的合成气的好方法。\n\n完成这一步后，在&6蒸馏塔&r中分馏&e木焦油&r将提供完成混合物所需的所有其他成分。相当简单。在接下来的任务中，我们将介绍如何制作&e催化剂&r以及如何高效地回收它。", "quests.extreme_voltage.btx_catalyser.title": "铂-铼/ZSM-5催化剂", "quests.extreme_voltage.btx_catalyser.subtitle": "多么复杂的名字", "quests.extreme_voltage.btx_catalyser.desc": "要制作&e铂-铼/ZSM-5催化剂&r，你需要建立&a碱&r、&a钠&r和&d下界石英&r的无限来源，以及&a氨&r和&a乙醇&r。&b铝&r将被完全循环利用，而其他材料只能部分回收。\n\n如果你不确定&d下界石英&r的来源，可以看看从&e沙子&r开始的配方链。另一方面，&a钠&r可以通过处理&b海水&r轻松获得，而碱可以通过草木灰获取。\n\n最后，将所有东西与一些&5铂&r和&5铼&r混合，即可得到你的&e催化剂&r。好消息是，铂和铼在此过程中都会被完全回收，因此无需担心，你只需要开采一次即可。", @@ -2421,7 +2421,7 @@ "quests.gregtech_energy.moving.task": "我明白了", "quests.gregtech_energy.transformer.title": "超级变压器", "quests.gregtech_energy.transformer.subtitle": "比擎天柱还厉害", - "quests.gregtech_energy.transformer.desc": "格雷科技为每个问题都准备了多方块解决方案，&d有源变压器&r便是其中之一。\n\n此装置堪称终极变压器，能够在&aLV&r至&cUHV&r的任意等级间传输能量，且不会引发爆炸。但这并非其最突出的优势。\n\n它能够通过激光管道传输能量：\n&8•&r激光可传输超大安培能量\n&8•&r零损耗、无电缆，纯粹的能量传输\n&8•&r唯一限制：管道&c必须保持绝对直线&r\n\n当电缆传输能力不足时，请&l采用激光方案&r。", + "quests.gregtech_energy.transformer.desc": "格雷科技为每个问题都准备了多方块解决方案，&d有源变压器&r便是其中之一。\n\n此装置堪称终极变压器，能够在&aLV&r至&cUHV&r的任意等级间传输能量，且无需顾虑电流数或一堆杂乱无章的单方块变压器。\n\n但这并非其最突出的优势：它能够通过激光管道传输能量。\n&8•&r激光可传输超大安培能量\n&8•&r零损耗、无电缆，纯粹的能量传输\n&8•&r唯一限制：管道&c必须保持绝对直线&r\n\n当电缆传输能力不足时，请&l采用激光方案&r。", "quests.gregtech_energy.moving_wire.title": "用导线传输", "quests.gregtech_energy.moving_wire.subtitle": "放置起来有点意思", "quests.gregtech_energy.moving_wire.desc": "在格雷科技中传输能量可能颇具挑战——&b多数电缆存在能量损耗&r。能量在导线中每传输一格距离、每安培电流都可能产生损耗。但无需担心，现有解决方案如下：\n\n&8•&r为电缆包裹橡胶包覆层。此举可显著降低长距离传输中的能量损耗，具体请参照任务物品示例。\n\n&8•&r采用更高等级的电缆。例如铂电缆每格仅损耗1EU，相较于其8192EU的传输容量而言几乎可忽略不计。\n\n&8•&r使用&b超导电缆&r。这类电缆成本稍高，但具备&9零损耗&r特性。它们无需橡胶包覆且不会对玩家造成电击，但需注意通常需在对应科技阶段的后期方可制造。\n\n优化能量传输体系——&b降低损耗&r，提升系统能效。", @@ -2492,9 +2492,9 @@ "quests.gregtech_energy.reformate_gas.subtitle": "这是重整后的苯吗？", "quests.gregtech_energy.reformate_gas.desc.1": "&9重整气&r是一种强大且新的气体燃料，在&bMV&r阶段承担了通常由苯扮演的角色。\n\n要生产它，你需要建造一座&6液化塔&r，并从仅存在于干燥炎热气候的&6塔基安矿&r矿脉中获取一些&5铼&r。两座&6热解炉&r——一座生产杂酚油，另一座生产木焦油——将提供生产这种燃料所需的全部材料。如果你想简化设置，请记住可以用&6流体加热器&r来生产蒸汽。", "quests.gregtech_energy.reformate_gas.desc.2": "同样重要的是，需要考虑在&6HV&r阶段使用&6裂化机&r时可获得的提升产率。这将使你能够循环利用绝大部分的&5铼&r，使重整气实质上成为一种接近无限的燃料。\n\n在此流程中添加&9氮气&r和&9氢气&r，将进一步增强你的生产吞吐量。", - "quests.gregtech_energy.btx.title": "轻质芳烃燃料", - "quests.gregtech_energy.btx.subtitle": "并非韩国乐队", - "quests.gregtech_energy.btx.desc": "获得&5EV能源仓&r意味着你终于可以启动&e轻质芳烃燃料&r的生产。这种燃料将为你服务很长一段时间，并且即便在游戏后期，于&6大型涡轮机&r中仍然保持竞争力。虽然初看之下这像是一项浩大的工程，但请放心，付出的努力将是完全值得的。\n\n这条生产线需要大量的木材制品。由于对&e胶水&r的需求，树脂再次变得重要——你可以选择被动采集树液，或者直接从原木中提取。你还需要在&6蒸馏塔&r中分馏&e木焦油&r。除此之外，请确保你能无限量生产&e乙醇&r、&e下界石英&r、&e钠&r、&e氨&r、&e碱&r和&e强化环氧树脂板&r。\n\n如果你想了解轻质芳烃燃料生产链更详细的分析，请参阅&5EV&r章节。", + "quests.gregtech_energy.btx.title": "芳烃燃料", + "quests.gregtech_energy.btx.subtitle": "并非韩国男团", + "quests.gregtech_energy.btx.desc": "获得&5EV能源仓&r意味着你终于可以启动&e芳烃燃料&r（苯、甲苯、二甲苯的混合物，简称BTX）的生产。这种燃料将为你服务很长一段时间，并且即便在游戏后期，于&6大型涡轮机&r中仍然保持竞争力。虽然初看之下这像是一项浩大的工程，但请放心，付出的努力将是完全值得的。\n\n这条生产线需要大量的木材制品。由于对&e胶水&r的需求，树脂再次变得重要——你可以选择被动采集树液，或者直接从原木中提取。你还需要在&6蒸馏塔&r中分馏&e木焦油&r。除此之外，请确保你能无限量生产&e乙醇&r、&e下界石英&r、&e钠&r、&e氨&r、&e碱&r和&e强化环氧树脂板&r。\n\n如果你想了解芳烃燃料生产链更详细的分析，请参阅&5EV&r章节。", "quests.gregtech_energy.fission_rod.title": "裂变燃料", "quests.gregtech_energy.fission_rod.subtitle": "别让我过热了", "quests.gregtech_energy.fission_rod.desc.1": "地球裂变材料尚未实装，但或许即将到来", diff --git a/kubejs/client_scripts/tooltips.js b/kubejs/client_scripts/tooltips.js index cff423a37..c722b13df 100644 --- a/kubejs/client_scripts/tooltips.js +++ b/kubejs/client_scripts/tooltips.js @@ -81,7 +81,8 @@ const registerTooltips = (event) => { event.addAdvanced(['gtceu:nuclear_fuel_factory'], (item, advanced, text) => { text.add(1, Text.translate('gtceu.tooltip.machine.nuclear_fuel_factory_1')); text.add(2, Text.translate('gtceu.tooltip.machine.nuclear_fuel_factory_2')); - text.add(3, Text.translate('tfg.tooltip.machine.one_energy_hatch')); + text.add(3, Text.translate('tfg.tooltip.machine.coil_speed_discount')); + text.add(4, Text.translate('tfg.tooltip.machine.one_energy_hatch')); }) event.addAdvanced(['gtceu:steam_bloomery'], (item, advanced, text) => { text.add(1, Text.translate('gtceu.tooltip.machine.steam_bloomery_1')); @@ -96,7 +97,7 @@ const registerTooltips = (event) => { event.addAdvanced(['gtceu:coal_liquefaction_tower'], (item, advanced, text) => { text.add(1, Text.translate('gtceu.tooltip.machine.coal_liquefaction_tower_1')); text.add(2, Text.translate('gtceu.tooltip.machine.coal_liquefaction_tower_2')); - text.add(3, Text.translate('tfg.tooltip.machine.coil_energy_discount')); + text.add(3, Text.translate('tfg.tooltip.machine.coil_speed_discount')); text.add(3, Text.translate('tfg.tooltip.machine.one_energy_hatch')); }) diff --git a/kubejs/server_scripts/gregtech/tags.js b/kubejs/server_scripts/gregtech/tags.js index a7f7a9674..338f388a7 100644 --- a/kubejs/server_scripts/gregtech/tags.js +++ b/kubejs/server_scripts/gregtech/tags.js @@ -28,7 +28,7 @@ function registerGTCEUItemTags(event) { event.remove("forge:gems", "gtceu:coke_gem"); // Rose Quartz Lens - event.add("forge:lenses/pink", "gtceu:rose_quartz_lens"); + event.add("forge:lenses/pink", "greate:rose_quartz_lens"); event.add("tfc:saws", "#forge:tools/buzzsaws"); event.add("tfc:saws", "#forge:tools/chainsaws"); diff --git a/kubejs/server_scripts/tfg/powergen/recipes.boiler.js b/kubejs/server_scripts/tfg/powergen/recipes.boiler.js index 8a042cb78..847e4123a 100644 --- a/kubejs/server_scripts/tfg/powergen/recipes.boiler.js +++ b/kubejs/server_scripts/tfg/powergen/recipes.boiler.js @@ -34,15 +34,15 @@ function registerTFGBoilerRecipes(event) { event.remove({ id: /gtceu:....._boiler\/.*loom.*/ }) event.remove({ id: /gtceu:....._boiler\/.*bowl.*/ }) event.remove({ id: /gtceu:....._boiler\/.*sticky_resin.*/ }) - event.remove({ id: /gtceu:....._boiler\/.*plant_ball*/ }) - event.remove({ id: /gtceu:....._boiler\/.*note_block*/ }) - event.remove({ id: /gtceu:....._boiler\/.*smithing_table*/ }) - event.remove({ id: /gtceu:....._boiler\/.*fiberboard*/ }) - event.remove({ id: /gtceu:....._boiler\/.*wood*/ }) - event.remove({ id: /gtceu:....._boiler\/.*sapling*/ }) - event.remove({ id: /gtceu:....._boiler\/.*log*/ }) - event.remove({ id: /gtceu:....._boiler\/.*stem*/ }) - event.remove({ id: /gtceu:....._boiler\/.*mosaic*/ }) + event.remove({ id: /gtceu:....._boiler\/.*plant_ball.*/ }) + event.remove({ id: /gtceu:....._boiler\/.*note_block.*/ }) + event.remove({ id: /gtceu:....._boiler\/.*smithing_table.*/ }) + event.remove({ id: /gtceu:....._boiler\/.*fiberboard.*/ }) + event.remove({ id: /gtceu:....._boiler\/.*wood.*/ }) + event.remove({ id: /gtceu:....._boiler\/.*sapling.*/ }) + event.remove({ id: /gtceu:....._boiler\/.*log.*/ }) + event.remove({ id: /gtceu:....._boiler\/.*stem.*/ }) + event.remove({ id: /gtceu:....._boiler\/.*mosaic.*/ }) //Re-add some recipes to the boiler under tags event.recipes.gtceu.steam_boiler('tfg:logs') @@ -62,7 +62,7 @@ function registerTFGBoilerRecipes(event) { // Small nerf to charcoal - event.forEachRecipe({ id: /gtceu:(steam_boiler|large_boiler)\/minecraft_charcoal/ }, recipe => { + event.forEachRecipe({ id: /gtceu:(steam_boiler|large_boiler)\/.*charcoal.*/ }, recipe => { var newDuration = recipe.get("duration") recipe.set("duration", newDuration/4*3) }) diff --git a/kubejs/server_scripts/tfg/primitive/recipes.clay.js b/kubejs/server_scripts/tfg/primitive/recipes.clay.js index 5660650cb..53ffe00e6 100644 --- a/kubejs/server_scripts/tfg/primitive/recipes.clay.js +++ b/kubejs/server_scripts/tfg/primitive/recipes.clay.js @@ -49,6 +49,12 @@ function registerTFGClayRecipes(event) { .EUt(2) } + event.shapeless('3x tfc:ceramic/unfired_brick', ['4x minecraft:clay_ball', 'gtceu:brick_wooden_form', 'minecraft:clay_ball']) + .id('tfg:shapeless/unfired_brick_via_wooden_form') + + event.shapeless('3x tfc:ceramic/unfired_fire_brick', ['4x tfc:fire_clay', 'gtceu:brick_wooden_form', 'tfc:fire_clay']) + .id('tfg:shapeless/unfired_fire_brick_via_wooden_form') + event.recipes.gtceu.extruder('tfg:unfired_clay_brick') .itemInputs('minecraft:clay_ball') .notConsumable('gtceu:ingot_extruder_mold') diff --git a/kubejs/server_scripts/vintage_improvements/recipes.js b/kubejs/server_scripts/vintage_improvements/recipes.js index 516b529bc..7bc7f8907 100644 --- a/kubejs/server_scripts/vintage_improvements/recipes.js +++ b/kubejs/server_scripts/vintage_improvements/recipes.js @@ -546,7 +546,7 @@ function registerVintageImprovementsRecipes(event) { .id('tfg:vi/vacuumizing/latex_from_rubber_plants') // Vulc. latex to raw rubber pulp - event.recipes.vintageimprovements.pressurizing(Fluid.of('tfg:vulcanized_latex', 250), '#forge:dusts/raw_rubber') + event.recipes.vintageimprovements.pressurizing('#forge:dusts/raw_rubber', Fluid.of('tfg:vulcanized_latex', 250)) .heated() .processingTime(60 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER) .id('tfg:vi/pressurizing/vulcanized_latex_to_raw_rubber') @@ -637,4 +637,4 @@ function generateHammeringRecipeFromItem(event, input, output, blows, anvil) { .anvilBlock(`tfc:metal/anvil/${anvil}`) .hammerBlows(blows) .id(`tfg:vi/hammer/${input.replace(/[#:]/g, '_')}_on_${anvil}_anvil`) -} \ No newline at end of file +} diff --git a/kubejs/startup_scripts/tfg/materials.js b/kubejs/startup_scripts/tfg/materials.js index 47c0f10df..f3fad7184 100644 --- a/kubejs/startup_scripts/tfg/materials.js +++ b/kubejs/startup_scripts/tfg/materials.js @@ -113,7 +113,6 @@ const registerTFGMaterials = (event) => { GTMaterialFlags.GENERATE_ROD, GTMaterialFlags.GENERATE_BOLT_SCREW, GTMaterialFlags.EXCLUDE_BLOCK_CRAFTING_BY_HAND_RECIPES, - GTMaterialFlags.GENERATE_GEAR, GTMaterialFlags.GENERATE_FOIL, GTMaterialFlags.GENERATE_FINE_WIRE ) diff --git a/kubejs/startup_scripts/tfg/tag_prefixes.js b/kubejs/startup_scripts/tfg/tag_prefixes.js index 8d9f53cb6..d521ca895 100644 --- a/kubejs/startup_scripts/tfg/tag_prefixes.js +++ b/kubejs/startup_scripts/tfg/tag_prefixes.js @@ -3,10 +3,15 @@ function registerTFGTagPrefixes(event) { - excludeAllGemsButNormal(TFGHelpers.getMaterial('tfg:apt')); - excludeAllGemsButNormal(TFGHelpers.getMaterial('tfg:tetrafluoroethane')); - excludeAllGemsButNormal(TFGHelpers.getMaterial('tfg:crimsene')); - excludeAllGemsButNormal(TFGHelpers.getMaterial('tfg:warpane')); + excludeAllGemsButNormal(GTMaterials.get('tfg:apt')); + TagPrefix.block.setIgnored(GTMaterials.get('tfg:apt')); + excludeAllGemsButNormal(GTMaterials.get('tfg:tetrafluoroethane')); + TagPrefix.block.setIgnored(GTMaterials.get('tfg:tetrafluoroethane')); + excludeAllGemsButNormal(GTMaterials.get('tfg:crimsene')); + TagPrefix.block.setIgnored(GTMaterials.get('tfg:crimsene')); + excludeAllGemsButNormal(GTMaterials.get('tfg:warpane')); + TagPrefix.block.setIgnored(GTMaterials.get('tfg:warpane')); + excludeAllGemsButNormal(GTMaterials.Coke) TagPrefix.nugget.setIgnored(GTMaterials.RawRubber); @@ -20,5 +25,4 @@ function excludeAllGemsButNormal(material) { TagPrefix.gemFlawed.setIgnored(material); TagPrefix.gemFlawless.setIgnored(material); TagPrefix.gemExquisite.setIgnored(material); - TagPrefix.block.setIgnored(material); } \ No newline at end of file diff --git a/pakku-lock.json b/pakku-lock.json index 60da72190..0e66b6a50 100644 --- a/pakku-lock.json +++ b/pakku-lock.json @@ -13922,7 +13922,7 @@ "files": [ { "type": "modrinth", - "file_name": "TerraFirmaGreg-Core-Modern-0.8.10.jar", + "file_name": "TerraFirmaGreg-Core-Modern-0.8.11.jar", "mc_versions": [ "1.20.1" ], @@ -13931,23 +13931,23 @@ "neoforge" ], "release_type": "release", - "url": "https://cdn.modrinth.com/data/lNttW2Xl/versions/EY4KluIB/TerraFirmaGreg-Core-Modern-0.8.10.jar", - "id": "EY4KluIB", + "url": "https://cdn.modrinth.com/data/lNttW2Xl/versions/LlHAk3em/TerraFirmaGreg-Core-Modern-0.8.11.jar", + "id": "LlHAk3em", "parent_id": "lNttW2Xl", "hashes": { - "sha512": "f9b39b905a066ef4d0a131080d076c007d348ad700cb56a8ee52e607046f1564d28993ebd3ae8f0d48ee874770b7ab1cab9fdfe4e36c918b05d6fc697bee402b", - "sha1": "eb6603cfaa8d84cf6fe747732f97d7b3b10bb274" + "sha512": "0ca79125debccf02c2f65bdf60be78ad6a80383ca250c2505f912b53364bb9de323214c40a4d74453e696ed382a21c21a002866e330226fa53436772f3f98b7c", + "sha1": "0590a2fd0a2a6730def92f60df285adb838b2162" }, "required_dependencies": [ "7tG215v7", "JaCEZUhg" ], - "size": 9347264, - "date_published": "2025-12-18T21:55:26.799768Z" + "size": 9344637, + "date_published": "2025-12-19T11:54:06.090471Z" }, { "type": "curseforge", - "file_name": "TerraFirmaGreg-Core-Modern-0.8.9.jar", + "file_name": "TerraFirmaGreg-Core-Modern-0.8.11.jar", "mc_versions": [ "1.20.1" ], @@ -13956,19 +13956,19 @@ "neoforge" ], "release_type": "release", - "url": "https://edge.forgecdn.net/files/7351/217/TerraFirmaGreg-Core-Modern-0.8.9.jar", - "id": "7351217", + "url": "https://edge.forgecdn.net/files/7353/303/TerraFirmaGreg-Core-Modern-0.8.11.jar", + "id": "7353303", "parent_id": "513402", "hashes": { - "sha1": "40b2d01116d9f879d8b49d78e09657c4277f02b7", - "md5": "e032d7fb422eaf1e3793250f67ef5d62" + "sha1": "0590a2fd0a2a6730def92f60df285adb838b2162", + "md5": "fd7a169dc0a1a25da9877b8bb1b2cb41" }, "required_dependencies": [ - "302973", - "890405" + "890405", + "302973" ], - "size": 9347264, - "date_published": "2025-12-18T20:54:23.127Z" + "size": 9344637, + "date_published": "2025-12-19T11:54:01.770Z" } ] }, @@ -14922,15 +14922,15 @@ "sha1": "cad73c6a3e78233bed25f1d4255f12ffc6f97baf" }, "required_dependencies": [ - "XxWD5pD3", - "SzzJttH8" + "SzzJttH8", + "XxWD5pD3" ], "size": 67381, "date_published": "2025-09-05T14:26:22.489897Z" }, { "type": "curseforge", - "file_name": "applied_ammo_box-0.4.1.jar", + "file_name": "applied_ammo_box-1.0.0.jar", "mc_versions": [ "1.20.1" ], @@ -14938,19 +14938,19 @@ "forge" ], "release_type": "release", - "url": "https://edge.forgecdn.net/files/7344/136/applied_ammo_box-0.4.1.jar", - "id": "7344136", + "url": "https://edge.forgecdn.net/files/7353/104/applied_ammo_box-1.0.0.jar", + "id": "7353104", "parent_id": "1338332", "hashes": { - "sha1": "0e8adc7538611a1ffc964b739f50d8ef0fa0fcb3", - "md5": "62dfb0ed8cdafaf5985897d6fc6bfa09" + "sha1": "3fc67723dc70b544b57ab0d0a34e2be991d285f9", + "md5": "a6f67bd0ced376be1ef8dbf41e09fa51" }, "required_dependencies": [ - "223794", - "1028108" + "1028108", + "223794" ], - "size": 67748, - "date_published": "2025-12-17T14:13:03.837Z" + "size": 70111, + "date_published": "2025-12-19T10:36:12.707Z" } ] },