Skip to content

Commit

Permalink
Microminer rework kits and mega-merge (#1495)
Browse files Browse the repository at this point in the history
* Translated using Weblate (Russian)

Currently translated at 36.6% (1250 of 3413 strings)

Translation: Monifactory/Questbook
Translate-URL: https://hosted.weblate.org/projects/monifactory/questbook/ru/

* Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 96.3% (3289 of 3413 strings)

Translation: Monifactory/Questbook
Translate-URL: https://hosted.weblate.org/projects/monifactory/questbook/zh_Hans/

* Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 96.3% (3289 of 3413 strings)

Translation: Monifactory/Questbook
Translate-URL: https://hosted.weblate.org/projects/monifactory/questbook/zh_Hans/

* Switch microminers from chanced consumption to repair

* Tweaks to missions that return Neutronium

* Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 97.2% (3319 of 3413 strings)

Translation: Monifactory/Questbook
Translate-URL: https://hosted.weblate.org/projects/monifactory/questbook/zh_Hans/

* Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 97.2% (3319 of 3413 strings)

Translation: Monifactory/Questbook
Translate-URL: https://hosted.weblate.org/projects/monifactory/questbook/zh_Hans/

* Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 97.9% (3344 of 3413 strings)

Translation: Monifactory/Questbook
Translate-URL: https://hosted.weblate.org/projects/monifactory/questbook/zh_Hans/

* Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 97.9% (3344 of 3413 strings)

Translation: Monifactory/Questbook
Translate-URL: https://hosted.weblate.org/projects/monifactory/questbook/zh_Hans/

* Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 98.1% (3350 of 3413 strings)

Translation: Monifactory/Questbook
Translate-URL: https://hosted.weblate.org/projects/monifactory/questbook/zh_Hans/

* Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 98.1% (3350 of 3413 strings)

Translation: Monifactory/Questbook
Translate-URL: https://hosted.weblate.org/projects/monifactory/questbook/zh_Hans/

* Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 98.2% (3352 of 3413 strings)

Translation: Monifactory/Questbook
Translate-URL: https://hosted.weblate.org/projects/monifactory/questbook/zh_Hans/

* Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 98.2% (3352 of 3413 strings)

Translation: Monifactory/Questbook
Translate-URL: https://hosted.weblate.org/projects/monifactory/questbook/zh_Hans/

* Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 98.2% (3354 of 3413 strings)

Translation: Monifactory/Questbook
Translate-URL: https://hosted.weblate.org/projects/monifactory/questbook/zh_Hans/

* Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 98.4% (3359 of 3413 strings)

Translation: Monifactory/Questbook
Translate-URL: https://hosted.weblate.org/projects/monifactory/questbook/zh_Hans/

* Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 98.4% (3359 of 3413 strings)

Translation: Monifactory/Questbook
Translate-URL: https://hosted.weblate.org/projects/monifactory/questbook/zh_Hans/

* Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 98.5% (3364 of 3413 strings)

Translation: Monifactory/Questbook
Translate-URL: https://hosted.weblate.org/projects/monifactory/questbook/zh_Hans/

* Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 98.5% (3364 of 3413 strings)

Translation: Monifactory/Questbook
Translate-URL: https://hosted.weblate.org/projects/monifactory/questbook/zh_Hans/

* Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 98.7% (3369 of 3413 strings)

Translation: Monifactory/Questbook
Translate-URL: https://hosted.weblate.org/projects/monifactory/questbook/zh_Hans/

* Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 98.7% (3369 of 3413 strings)

Translation: Monifactory/Questbook
Translate-URL: https://hosted.weblate.org/projects/monifactory/questbook/zh_Hans/

* Tweak repair probabilities

* Change Gem Sensor to be cheaper now that it's used more per ore

* Reduce dilithium returned from dilithium mission now that less is consumed as fuel

* Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 100.0% (3413 of 3413 strings)

Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 100.0% (3413 of 3413 strings)

Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 100.0% (470 of 470 strings)

Co-authored-by: forteen14desu <[email protected]>
Co-authored-by: quettalum <[email protected]>
Translate-URL: https://hosted.weblate.org/projects/monifactory/kubejs/zh_Hans/
Translate-URL: https://hosted.weblate.org/projects/monifactory/questbook/zh_Hans/
Translation: Monifactory/KubeJS
Translation: Monifactory/Questbook

* Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 100.0% (3413 of 3413 strings)

Translation: Monifactory/Questbook
Translate-URL: https://hosted.weblate.org/projects/monifactory/questbook/zh_Hans/

* Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 100.0% (3413 of 3413 strings)

Translation: Monifactory/Questbook
Translate-URL: https://hosted.weblate.org/projects/monifactory/questbook/zh_Hans/

* Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 100.0% (3413 of 3413 strings)

Translation: Monifactory/Questbook
Translate-URL: https://hosted.weblate.org/projects/monifactory/questbook/zh_Hans/

* Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 100.0% (3413 of 3413 strings)

Translation: Monifactory/Questbook
Translate-URL: https://hosted.weblate.org/projects/monifactory/questbook/zh_Hans/

* Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 100.0% (9 of 9 strings)

Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 100.0% (9 of 9 strings)

Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 100.0% (15 of 15 strings)

Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 100.0% (10 of 10 strings)

Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 100.0% (3413 of 3413 strings)

Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 100.0% (434 of 434 strings)

Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 99.7% (469 of 470 strings)

Co-authored-by: forteen14desu <[email protected]>
Translate-URL: https://hosted.weblate.org/projects/monifactory/gregtech/zh_Hans/
Translate-URL: https://hosted.weblate.org/projects/monifactory/kubejs/zh_Hans/
Translate-URL: https://hosted.weblate.org/projects/monifactory/mods/emi/zh_Hans/
Translate-URL: https://hosted.weblate.org/projects/monifactory/mods/enderio/zh_Hans/
Translate-URL: https://hosted.weblate.org/projects/monifactory/mods/extended-crafting/zh_Hans/
Translate-URL: https://hosted.weblate.org/projects/monifactory/mods/laserio/zh_Hans/
Translate-URL: https://hosted.weblate.org/projects/monifactory/questbook/zh_Hans/
Translation: Monifactory/EMI
Translation: Monifactory/EnderIO
Translation: Monifactory/Extended Crafting
Translation: Monifactory/Gregtech
Translation: Monifactory/KubeJS
Translation: Monifactory/LaserIO
Translation: Monifactory/Questbook

* Reduce quantity of Alien Scrap returned from T11 now that it's repairable

* Simplify mission definitions and fix half-tier actualization bug

* Lint

* fix projectred plate recipe conflicting with smooth stone slab (#1478)

* Allow any type of rubber in thermal recipes. (#1470)

This is particularly useful for the alchemical quiver used in the
T2.5MM (from #1477).

* Reduce repair times so that repairs are as fast as missions in higher tiers and even faster in lower tiers.

* Fluid Rig quest change (#1483)

indicates the you can now get regular oil in the void
no longer says oil in the void doesn't deplete

* Translated using Weblate (Russian)

Currently translated at 37.6% (1284 of 3413 strings)

Translation: Monifactory/Questbook
Translate-URL: https://hosted.weblate.org/projects/monifactory/questbook/ru/

* Account for tick-second conversion in new repair times (Amended commit)

* Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 100.0% (3413 of 3413 strings)

Translation: Monifactory/Questbook
Translate-URL: https://hosted.weblate.org/projects/monifactory/questbook/zh_Hans/

* Tweak repair overclock cost decreases

* Re-add Neutronium to T8MM mission for MkIII skip

* Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 100.0% (3413 of 3413 strings)

Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 100.0% (470 of 470 strings)

Co-authored-by: forteen14desu <[email protected]>
Translate-URL: https://hosted.weblate.org/projects/monifactory/kubejs/zh_Hans/
Translate-URL: https://hosted.weblate.org/projects/monifactory/questbook/zh_Hans/
Translation: Monifactory/KubeJS
Translation: Monifactory/Questbook

* Post-tank mats frames on multiblocks (#1486)

They look good :3

* Stonecut GTCEU warning blocks into each other (#1439)

For parity with Chisel.

* Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 100.0% (3413 of 3413 strings)

Translation: Monifactory/Questbook
Translate-URL: https://hosted.weblate.org/projects/monifactory/questbook/zh_Hans/

* Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 100.0% (3413 of 3413 strings)

Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 100.0% (470 of 470 strings)

Co-authored-by: forteen14desu <[email protected]>
Translate-URL: https://hosted.weblate.org/projects/monifactory/kubejs/zh_Hans/
Translate-URL: https://hosted.weblate.org/projects/monifactory/questbook/zh_Hans/
Translation: Monifactory/KubeJS
Translation: Monifactory/Questbook

* Usable complex SMDs  (#1484)

* Craft for basic capacitor with complex smd

* Type definitions for GT JSON recipes

* Automatically generate recipes with complex SMDs

* Mention the change in QB

* Simplify naquadah energy values. (#1472)

* Added tooltip for damaged MMs

* Added proper JSDocs to my compat script for Create: Steam & Rails (#1462)

* add some comments to break up the wall of code here into manageable segments

* did proper JSDocs for my functions here, hopefully they'll be useful to future maintainers

* clarification on the cutter chanced output for narrow-gauge

---------

Signed-off-by: Becquerel <[email protected]>

* Replace repair for T1-5MMs and some higher-tier missions with consumable kits which are easier to automate

* Integral components-based programmer art for microminer kits

* Lint

---------

Signed-off-by: Becquerel <[email protected]>
Co-authored-by: Денис Денис <[email protected]>
Co-authored-by: quettalum <[email protected]>
Co-authored-by: hyl5942850 <[email protected]>
Co-authored-by: forteen14desu <[email protected]>
Co-authored-by: Hosted Weblate <[email protected]>
Co-authored-by: medsal15 <[email protected]>
Co-authored-by: Tom Prince <[email protected]>
Co-authored-by: Jollahs <[email protected]>
Co-authored-by: WithersChat <[email protected]>
Co-authored-by: petrak@ <[email protected]>
Co-authored-by: iluha168 <[email protected]>
Co-authored-by: Pansmith <[email protected]>
Co-authored-by: Becquerel <[email protected]>
  • Loading branch information
14 people authored Feb 7, 2025
1 parent 775df45 commit 8c9620e
Show file tree
Hide file tree
Showing 58 changed files with 1,613 additions and 940 deletions.
20 changes: 10 additions & 10 deletions kubejs/assets/emi/lang/zh_cn.json
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
{
"tag.item.gtceu.circuits": "电路板",
"tag.item.gtceu.circuits.ulv": "ULV电路板",
"tag.item.gtceu.circuits.lv": "LV电路板",
"tag.item.gtceu.circuits.mv": "MV电路板",
"tag.item.gtceu.circuits.hv": "HV电路板",
"tag.item.gtceu.circuits.ev": "EV电路板",
"tag.item.gtceu.circuits.iv": "IV电路板",
"tag.item.gtceu.circuits.luv": "LuV电路板",
"tag.item.gtceu.circuits.zpm": "ZPM电路板",
"tag.item.gtceu.circuits": "电路",
"tag.item.gtceu.circuits.ulv": "ULV电路",
"tag.item.gtceu.circuits.lv": "LV电路",
"tag.item.gtceu.circuits.mv": "MV电路",
"tag.item.gtceu.circuits.hv": "HV电路",
"tag.item.gtceu.circuits.ev": "EV电路",
"tag.item.gtceu.circuits.iv": "IV电路",
"tag.item.gtceu.circuits.luv": "LuV电路",
"tag.item.gtceu.circuits.zpm": "ZPM电路",
"tag.item.moni_quest.backpack": "背包",
"tag.item.moni.output_bus": "物品输出总线",
"tag.item.moni.input_bus": "物品输入总线",
"tag.item.moni.input_hatch": "流体输入仓",
"tag.item.moni.output_hatch": "流体输出仓",
"tag.item.moni.coins": "货币"
}
}
22 changes: 11 additions & 11 deletions kubejs/assets/enderio/lang/zh_cn.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"item.enderio.conductive_conduit": "导电铁能量导管",
"item.enderio.energetic_conduit": "充能合金能量导管",
"item.enderio.endsteel_conduit": "末地钢合金能量导管",
"item.enderio.lumium_conduit": "流明能量导管",
"item.enderio.signalum_conduit": "信素能量导管",
"item.enderio.vibrant_conduit": "振动合金能量导管",
"item.enderio.enderium_conduit": "末影能量导管",
"item.enderio.cryolobus_conduit": "寒触合金能量导管",
"item.enderio.sculk_superconductor_conduit": "幽匿超导体能量导管"
}
{
"item.enderio.conductive_conduit": "导电铁能量导管",
"item.enderio.energetic_conduit": "充能合金能量导管",
"item.enderio.endsteel_conduit": "末影钢能量导管",
"item.enderio.lumium_conduit": "流明能量导管",
"item.enderio.signalum_conduit": "信素能量导管",
"item.enderio.vibrant_conduit": "脉冲合金能量导管",
"item.enderio.enderium_conduit": "末影能量导管",
"item.enderio.cryolobus_conduit": "寒触合金能量导管",
"item.enderio.sculk_superconductor_conduit": "幽匿超导体能量导管"
}
22 changes: 11 additions & 11 deletions kubejs/assets/extendedcrafting/lang/zh_cn.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"block.extendedcrafting.flux_alternator": "幽匿基塔",
"block.extendedcrafting.flux_crafter": "幽匿充能器",
"block.extendedcrafting.auto_flux_crafter": "幽匿充能器",
"container.extendedcrafting.flux_alternator": "幽匿基塔",
"container.extendedcrafting.flux_crafter": "幽匿充能",
"jei.category.extendedcrafting.flux_crafting": "幽匿充能",
"config.jade.plugin_extendedcrafting.flux_crafter": "通量合成器信息",
"book.extendedcrafting.entry.flux_crafting": "幽匿充能",
"book.extendedcrafting.entry.flux_crafting.page.1": "幽匿充能是一种利用等待和能量的力量进行合成的方式。一个幽匿合成设置包括一个幽匿充能器和多个幽匿基塔。充能器会从基塔中获取能量。你拥有的基塔越多,合成速度就越快。",
"book.extendedcrafting.entry.flux_crafting.page.2": "幽匿基塔可以放置在幽匿充能器周围 $(bold)3 个方块半径$() 的任何位置。甚至可以放置在上面或下面!"
}
"block.extendedcrafting.flux_alternator": "幽匿基塔",
"block.extendedcrafting.flux_crafter": "幽匿充能器",
"block.extendedcrafting.auto_flux_crafter": "幽匿充能器",
"container.extendedcrafting.flux_alternator": "幽匿基塔",
"container.extendedcrafting.flux_crafter": "幽匿充能",
"jei.category.extendedcrafting.flux_crafting": "幽匿充能",
"config.jade.plugin_extendedcrafting.flux_crafter": "通量合成器信息",
"book.extendedcrafting.entry.flux_crafting": "幽匿充能",
"book.extendedcrafting.entry.flux_crafting.page.1": "幽匿充能是一种利用等待和能量的力量进行合成的方式。一个幽匿合成套装包括一个幽匿充能器和多个幽匿基塔。充能器会从基塔中获取能量。你拥有的基塔越多,合成速度就越快。",
"book.extendedcrafting.entry.flux_crafting.page.2": "幽匿基塔可以放置在幽匿充能器周围 $(bold)3 个方块半径$() 的任何位置。甚至可以放置在上面或下面!"
}
4 changes: 2 additions & 2 deletions kubejs/assets/ftbquests/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -845,7 +845,7 @@
"moni.quest.1DBBE96165C7987D.title": "LV Mixer",
"moni.quest.1DFF7C35B5B26B80.description1": "Nothing you haven\u0027t seen here: just combine some standard circuit components and \u00266Nanocircuits\u0026r to make a \u00266Nanoprocessor\u0026r.",
"moni.quest.1DFF7C35B5B26B80.title": "The Second Tier Four Circuits",
"moni.quest.1E36AFB19932C805.description1": "\u00269Complex SMD Components\u0026r are required for \u00269Dimensional and Monic circuits\u0026r. They can also be substituted for the equivalent of 4 normal SMD components in Crystal, Wetware, and Matter circuits.",
"moni.quest.1E36AFB19932C805.description1": "\u00269Complex SMD Components\u0026r are required for \u00269Dimensional and Monic circuits\u0026r. They can also be substituted for the equivalent of 4 advanced SMD components.",
"moni.quest.1E36AFB19932C805.title": "\u00269Complex SMD Components",
"moni.quest.1E498F509DB1D460.description1": "Give me a little juice, FRIDAY!",
"moni.quest.1E498F509DB1D460.title": "Infinity War",
Expand Down Expand Up @@ -1272,7 +1272,7 @@
"moni.quest.2F04FA8D3E15E375.description4": "Salt Water\u0026r\u0026r (only in Ocean biomes)",
"moni.quest.2F04FA8D3E15E375.description5": "In the \u0026eNether\u0026r: \u0026eLava, Natural Gas\u0026r",
"moni.quest.2F04FA8D3E15E375.description6": "On the \u0026eMoon\u0026r: \u00269Deuterium, Helium-3\u0026r",
"moni.quest.2F04FA8D3E15E375.description7": "In the \u0026eVoid\u0026r: \u00269Raw Oil\u0026r (does not deplete)",
"moni.quest.2F04FA8D3E15E375.description7": "In the \u0026eVoid\u0026r: \u00269Oil, Raw Oil\u0026r",
"moni.quest.2F04FA8D3E15E375.description8": "As Fluid Rigs work, they will deplete the vein under them, reducing their yields. When a vein is depleted, it still yields a small amount of its fluid. The first tier of Fluid Rig takes \u00269100,000 operations\u0026r to deplete a vein. Higher tier Fluid Rigs harvest fluids far faster and deplete veins slower.",
"moni.quest.2F04FA8D3E15E375.title": "\u00262Fluid Rig",
"moni.quest.2F21C6B6F145EA81.description1": "Changing the circuit value on your newfound \u00263Subatomic Digital Assembler\u0026r will allow you to assemble \u00269ME Infinity Cell Bases\u0026r.",
Expand Down
Loading

0 comments on commit 8c9620e

Please sign in to comment.