diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9f6283efd..1e719ced3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -34,7 +34,7 @@ jobs: steps: - name: 📦 Checkout - uses: actions/checkout@v6.0.0 + uses: actions/checkout@v6.0.1 with: fetch-depth: 0 @@ -156,7 +156,7 @@ jobs: continue-on-error: true - name: 🔍 Check if tag exists - uses: mukunku/tag-exists-action@v1.6.0 + uses: mukunku/tag-exists-action@v1.7.0 id: check_tag with: tag: ${{ steps.changelog.outputs.version }} @@ -229,7 +229,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v6.0.0 + uses: actions/checkout@v6.0.1 with: fetch-depth: 0 @@ -313,7 +313,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v6.0.0 + uses: actions/checkout@v6.0.1 - name: 🔄 Replace strings shell: bash @@ -340,7 +340,7 @@ jobs: sed -i -e "s/MINECRAFT_VERSION/${MINECRAFT_VERSION}/g" .pakku/server-overrides/forge-auto-install.txt - name: 📝 Cache pakku - uses: actions/cache@v4.3.0 + uses: actions/cache@v5.0.1 id: cache with: path: build/.cache @@ -362,7 +362,7 @@ jobs: mv *.zip $(basename -s .zip *.zip)-curseforge.zip - name: 🚀 Upload artifact CurseForge - uses: actions/upload-artifact@v5.0.0 + uses: actions/upload-artifact@v6.0.0 with: name: ${{ needs.info.outputs.project_full_name }}-curseforge path: ./build/curseforge/${{ needs.info.outputs.project_full_name }}-curseforge.zip @@ -374,7 +374,7 @@ jobs: mv *.mrpack $(basename -s .mrpack *.mrpack)-modrinth.mrpack - name: 🚀 Upload artifact modrinth - uses: actions/upload-artifact@v5.0.0 + uses: actions/upload-artifact@v6.0.0 with: name: ${{ needs.info.outputs.project_full_name }}-modrinth path: ./build/modrinth/${{ needs.info.outputs.project_full_name }}-modrinth.mrpack @@ -387,16 +387,18 @@ jobs: mv -vf .pakku/multimc-overrides ./build/multimc - cp -vf ./build/.cache/curseforge/manifest.json ./build/multimc/flame/manifest.json - + cp -rf ./build/.cache/curseforge/overrides ./build/multimc/.minecraft + + cp -vf ./build/.cache/curseforge/manifest.json ./build/multimc/flame/manifest.json + cp -vf ./config/fancymenu/assets/icons/icon128x128.png ./build/multimc/.minecraft/icon.png cp -rf ./mods ./build/multimc/.minecraft/ cd ./build/multimc/ zip -r ${{ needs.info.outputs.project_full_name }}-multimc.zip icon.png mmc-pack.json instance.cfg .minecraft/ flame/ - name: 🚀 Upload artifact multimc - uses: actions/upload-artifact@v5.0.0 + uses: actions/upload-artifact@v6.0.0 with: name: ${{ needs.info.outputs.project_full_name }}-multimc path: ./build/multimc/${{ needs.info.outputs.project_full_name }}-multimc.zip @@ -408,7 +410,7 @@ jobs: mv *.zip $(basename -s .zip *.zip)-serverpack.zip - name: 🚀 Upload artifact server - uses: actions/upload-artifact@v5.0.0 + uses: actions/upload-artifact@v6.0.0 with: name: ${{ needs.info.outputs.project_full_name }}-serverpack path: ./build/serverpack/${{ needs.info.outputs.project_full_name }}-serverpack.zip @@ -424,10 +426,10 @@ jobs: steps: - name: 📦 Checkout - uses: actions/checkout@v6.0.0 + uses: actions/checkout@v6.0.1 - name: 📦 Download artifact - uses: actions/download-artifact@v6.0.0 + uses: actions/download-artifact@v7.0.0 with: merge-multiple: true @@ -495,7 +497,7 @@ jobs: fi - name: 📦 Download artifact - uses: actions/download-artifact@v6.0.0 + uses: actions/download-artifact@v7.0.0 with: merge-multiple: true @@ -545,7 +547,7 @@ jobs: fi - name: 📦 Download artifact - uses: actions/download-artifact@v6.0.0 + uses: actions/download-artifact@v7.0.0 with: merge-multiple: true diff --git a/.pakku/multimc-overrides/icon.png b/.pakku/multimc-overrides/icon.png deleted file mode 100644 index 7181ee2ba..000000000 Binary files a/.pakku/multimc-overrides/icon.png and /dev/null differ diff --git a/.pakku/server-overrides/defaultconfigs/ftbranks/ranks.snbt b/.pakku/server-overrides/defaultconfigs/ftbranks/ranks.snbt index c0a1287db..71004f076 100644 --- a/.pakku/server-overrides/defaultconfigs/ftbranks/ranks.snbt +++ b/.pakku/server-overrides/defaultconfigs/ftbranks/ranks.snbt @@ -7,8 +7,41 @@ ftbchunks.max_claimed: 50 ftbchunks.max_force_loaded: 6 ftbchunks.chunk_load_offline: false + + command.enderchest: false + command.ldlib: false + command.compass_server: false + command.chunky: false + command.catnip: false + command.bookshelf: false + command.aptweaks: false + command.afc: false + command.advancement: false + command.bossbar: false + command.clone: false + command.cucumber: false + command.gamemode: false + command.give: false + command.guideme: false + command.kubejs: false + command.kubejs_tfc: false + command.letmedespawn: false + command.locate: false + command.lode: false + command.octolib: false + command.worldborder: false + command.whitelist: false + command.uteamcore: false + command.tpx: false + command.tp_offline: false + command.tpa: false + command.tpaccept: false + command.tpahere: false + command.tpdeny: false + command.tpx: false + command.trashcan: true - command.enderchest: false + } vip: { name: "VIP" @@ -18,13 +51,6 @@ ftbchunks.max_force_loaded: 8 ftbchunks.chunk_load_offline: true } - moderator_girl: { - name: "Moderator" - power: 51 - ftbranks.name_format: "&d{name}" - ftbchunks.max_claimed: 200 - ftbchunks.max_force_loaded: 8 - } moderator: { name: "Moderator" power: 51 diff --git a/CHANGELOG.md b/CHANGELOG.md index c2b3b8560..257dd0f72 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,67 @@ ## Unreleased ### Changes ### Bug fixes + +## [0.11.11] - 18-12-2025 +### Breaking Changes +- Rose Quartz moved namespaces, so you'll have to convert all your old rose quartz items into the new ones. You'll need to explore new chunks to find new geodes with the correct ore blocks. +- The previous silicone rubber styrene butadiene rubber belts have been changed to a different item, so please break and recycle them before updating if you're using any. +- Cleaning meal bag foil packs is now done in the chem bath instead of the ore washer. @Pyritie +- Turning honey into sugar is now done in the extractor instead of the centrifuge. @Pyritie +- Syngas crafting in the Vacuum Chamber will now output into the chamber itself instead of the Basin, so it won't get mixed up with the creosote (#2378) @Pyritie +- Cleaned up the EMI pages for small and large boilers so they aren't flooded with furniture and other things. If you were using something "non-standard" to fuel your boilers, check if they're still valid. (#2421, #2415) @thederpysockdude123 @applenper +- Clay dust is no longer electrolyzable, but now you can get infinite clay blocks from a rock breaker @Pyritie +### Changes +- Added BTX fuel, a new EV-tier gas fuel to replace nitrobenzene. (#2416) @TomPlop +- Primitive illagers will no longer endlessly respawn. Instead, now they only spawn as "structures", so once you kill them they will never return. @Pyritie +#### Hot or Not +- Added "too cold to handle" and "too light to handle" for cold things and lighter-than-air things. Uses the same mechanic as tongs. Lighter-than-air things can also be negated with something Very Heavy in your inventory, and all effects (including "too hot to handle") are negated by super tanks/chests and cells, but *not* drums or buckets. Check the `#tfg:hot_protection_equipment`, `#tfg:cold_protection_equipment`, and `#tfg:floating_protection_equipment` tags for equipment that makes you immune to these effects. The equipment also protects against pipes! @Pyritie +- GregTech hot ingots are also now properly included in the "too hot to handle" system so the same protection applies @Pyritie +- Added machine recipes for crafting tongs @Pyritie +- All baby animals and more "medium" size animals can now be picked up (#2398) @Pyritie +#### Medical Hazards +- Added visual debuff effects for all medical conditions, so you're immediately notified when carrying something hazardous instead of wondering why you have Hunger II. They don't do anything by themselves, they're just a much more visible way of checking your conditions. @Pyritie +- Early `#tfg:medicines` can now also cure medical conditions! Did you think they wouldn't come with side effects? @Pyritie +- The medicines have also been rebalanced, so some of the stronger ones come with a downside, while the weaker ones have a stronger cure effect. +- The medical condition effect that previously instantly killed you (which did not spawn a corpse) now gives you Wither III instead. @Pyritie +#### Other +- Added two more early game mechanical belts, and rubber+ belts are also now more expensive. @Pyritie @Epicificator +- Doubled the durability of all space suits @Pyritie +- Added a way to convert between vinegar and acetic acid (#2386) @Epicificator +- Added a renderer to the electric greenhouse, so now you can visually see your crops grow! @RubenVerg +- Added some distant horizons config options, for those who want to use it (#2406) @Mqrius +- More animals now drop animal fat (#2367) @Pyritie +- Nerfed how much biomass and plant balls are produced from certain vanilla plants (#2361) @Pyritie +- Added some more ruined structures with a small bit of loot. +- Added some resource packs for TFC, disabled by default +- Lenses are now allowed on tool racks (#2434) @thederpysockdude123 +- The Active Transformer multiblock is now craftable at EV, with a new texture and casings. (#2424) @BlueBoat29 +- Renamed AE2 Sky Stone to Suevite @Pyritie +- Removed the shapeless crafting recipe for colored concrete powder, added an instant barrel recipe to turn it into solid concrete @Pyritie +- GregTech mining machines now replace mined ores with the correct type of cobble, instead of rhyolite or vanilla cobble @Pyritie +### Bug fixes +- Fixed aged sake, vodka, and whiskey losing their buff effects, but for real this time @Pyritie +- Fixed fries and cheese curds not being able to be put on burgers. @Redeix +- Fixed sliced brinza missing the proper cheese tags. @Redeix +- Fixed pyroxenite and keratophyre bricks crafting 1 instead of 4 (#2373) @Pyritie +- Fixed some issues with quest text and items (#2384, #2386, #2435) @Mqrius @thederpysockdude123 +- Fixed some tag issues with foods (#2405) @thederpysockdude123 +- Fixed treated wooden planks from being excluded in the Domum Ornamentum and Facade whitelists (#2404) @thederpysockdude123 +- Fixed a recipe conflict for boiled and fried eggs (#2407) @Mqrius +- Fixed a recipe conflict blocking the crafting of silicone rubber (#2387) @Mqrius +- Fixed the backpack and QuarkTech helmet auto-feeding from feeding you while you're downed @Mqrius +- Fixed drills taking way more damage when mining than intended (#2419, #2428) @Mqrius +- Fixed Ostrum Casing not having a recipe (#2363) @FlightingFalcon +- Fixed warped trees not growing on normal mars dirt @Pyritie +- Fixed missing block names for some of the variations of non-earth stones @Pyritie +- Fixed being able to turn bismuth and black bronze drums into regular bronze drums (#2436) @Jeuvke +- Fixed a recipe conflict with stone plates (#2433) @Pyritie +- Fixed concrete pouring consuming your fluid container if you use anything other than a bucket to pour @Mqrius +- Fixed large amounts of TPS lag when pouring huge areas of concrete at once @Therighthon ### Translation updates +- Chinese (simplified) @jmecn +- Japanese @sakura-gondra +- Russian @Petr211071 ## [0.11.10] - 9-12-2025 ### Breaking Changes diff --git a/config/carryon-common.toml b/config/carryon-common.toml index b46d9a87d..bcd253142 100644 --- a/config/carryon-common.toml +++ b/config/carryon-common.toml @@ -30,7 +30,7 @@ #Larger Entities slow down the player more heavyEntities = true #Allow babies to be carried even when adult mob is blacklisted (or not whitelisted) - allowBabies = false + allowBabies = true #Use Whitelist instead of Blacklist for Blocks useWhitelistBlocks = true #Use Whitelist instead of Blacklist for Entities @@ -57,7 +57,7 @@ [whitelist] #Whitelist. Read about the format here: https://github.com/Tschipp/CarryOn/wiki/Black---and-Whitelist-Config #Entities that CAN be picked up (useWhitelistEntities must be true) - allowedEntities = ["minecraft:axolotl", "tfc:turkey", "tfc:isopod", "tfc:lobster", "tfc:frog", "tfc:penguin", "tfc:turtle", "tfc:horseshoe_crab", "tfc:crayfish", "tfc:grouse", "tfc:pheasant", "tfc:peafowl", "tfc:rat", "tfc:chicken", "tfc:duck", "tfc:quail", "tfc:rabbit", "tfg:moon_rabbit", "species:birt", "species:stackatick", "species:springling", "tfg:glacian_ram"] + allowedEntities = ["minecraft:axolotl", "tfc:turkey", "tfc:isopod", "tfc:lobster", "tfc:frog", "tfc:penguin", "tfc:turtle", "tfc:horseshoe_crab", "tfc:crayfish", "tfc:grouse", "tfc:pheasant", "tfc:peafowl", "tfc:rat", "tfc:chicken", "tfc:duck", "tfc:quail", "tfc:rabbit", "tfc:sheep", "tfc:wolf", "tfc:dog", "tfc:pig", "tfc:goat", "tfc:alpaca", "tfg:wraptor", "tfg:surfer", "tfg:moon_rabbit", "species:limpet", "species:birt", "species:stackatick", "species:springling", "tfg:glacian_ram", "wan_ancient_beasts:crusher", "wan_ancient_beasts:glider", "wan_ancient_beasts:soarer", "wan_ancient_beasts:surfer", "primitive_creatures:viloger_10"] #Blocks that CAN be picked up (useWhitelistBlocks must be true) allowedBlocks = ["framedblocks:framed_chest", "tfc:wood/chest/*", "tfc:wood/trapped_chest/*", "afc:wood/chest/*", "afc:wood/trapped_chest/*", "#forge:chests/wooden"] #Entities that CAN have other entities stacked on top of them (useWhitelistStacking must be true) diff --git a/config/fallingtrees_common.json b/config/fallingtrees_common.json index 02bba7941..f8e545647 100644 --- a/config/fallingtrees_common.json +++ b/config/fallingtrees_common.json @@ -97,7 +97,9 @@ "onlyFallWithRequiredTool": false, "allowedToolFilter": { "whitelistedTags": [], - "whitelist": [], + "whitelist": [ + "tfg:charred_log" + ], "blacklist": [] } }, diff --git a/config/fancymenu/assets/icons/icon128x128.png b/config/fancymenu/assets/icons/icon128x128.png new file mode 100644 index 000000000..da40effb1 Binary files /dev/null and b/config/fancymenu/assets/icons/icon128x128.png differ diff --git a/config/fancymenu/customization/gui_loading_screen.txt b/config/fancymenu/customization/gui_loading_screen.txt index 06a59d906..0350b775c 100644 --- a/config/fancymenu/customization/gui_loading_screen.txt +++ b/config/fancymenu/customization/gui_loading_screen.txt @@ -91,7 +91,7 @@ element { element { interactable = false - source = {"placeholder":"local","values":{"key":"tfg.gui.menu.field_guide_splash_text"}} + source = Tip: Read the field guide!!! source_mode = direct shadow = true scale = 1.0 @@ -158,7 +158,7 @@ element { element { interactable = false - source = {"placeholder":"local","values":{"key":"tfg.gui.menu.ram_usage"}} {"placeholder":"usedram"}MB/ {"placeholder":"maxram"}MB + source = RAM: {"placeholder":"usedram"}MB/ {"placeholder":"maxram"}MB source_mode = direct shadow = true scale = 0.8 @@ -225,7 +225,7 @@ element { element { interactable = false - source = {"placeholder":"local","values":{"key":"tfg.gui.menu.fps_count"}} {"placeholder":"fps"} + source = FPS: {"placeholder":"fps"} source_mode = direct shadow = true scale = 0.8 diff --git a/config/ftbbackups2.json b/config/ftbbackups2.json index fb96a0bd6..32efe057c 100644 --- a/config/ftbbackups2.json +++ b/config/ftbbackups2.json @@ -65,7 +65,7 @@ *path/ends/with.txt Any files who's path ends with *path/contains* Any files who's path contains */ - "excluded": [], + "excluded": ["DistantHorizons.sqlite"], // The dimension used when creating backup preview image, specify "all" to enable automatic detection of primary dimension (can be very slow) "preview_dimension": "minecraft:overworld" -} \ No newline at end of file +} diff --git a/config/ftbquests/quests/chapters/create_logistics.snbt b/config/ftbquests/quests/chapters/create_logistics.snbt index 0af188592..9d7f8c168 100644 --- a/config/ftbquests/quests/chapters/create_logistics.snbt +++ b/config/ftbquests/quests/chapters/create_logistics.snbt @@ -134,7 +134,7 @@ ] dependency_requirement: "one_completed" description: ["{quests.create_logistics.rose_quartz_lens.desc}"] - icon: "gtceu:rose_quartz_lens" + icon: "greate:rose_quartz_lens" id: "7C4807A247AF36A1" shape: "octagon" size: 2.0d @@ -142,7 +142,7 @@ tasks: [ { id: "0C0BA9D487C3B948" - item: "gtceu:rose_quartz_lens" + item: "greate:rose_quartz_lens" type: "item" } { @@ -182,8 +182,8 @@ optional: true subtitle: "{quests.create_logistics.cold_rose_quartz.subtitle}" tasks: [{ - id: "00680B620AC2F8ED" - item: "gtceu:exquisite_rose_quartz_gem" + id: "60D9FAD7D3290FF5" + item: "greate:exquisite_rose_quartz_gem" type: "item" }] title: "{quests.create_logistics.cold_rose_quartz.title}" @@ -199,7 +199,7 @@ subtitle: "{quests.create_logistics.fabricate_rose_quartz.subtitle}" tasks: [{ id: "57B107DB57726992" - item: "gtceu:rose_quartz_plate" + item: "greate:rose_quartz_plate" type: "item" }] title: "{quests.create_logistics.fabricate_rose_quartz.title}" diff --git a/config/ftbquests/quests/chapters/ev__extreme_voltage.snbt b/config/ftbquests/quests/chapters/ev__extreme_voltage.snbt index 83efe62f8..054f016f5 100644 --- a/config/ftbquests/quests/chapters/ev__extreme_voltage.snbt +++ b/config/ftbquests/quests/chapters/ev__extreme_voltage.snbt @@ -11,7 +11,7 @@ image: "gtceu:textures/gui/overlay/atomic_overlay_2.png" rotation: 0.0d width: 8.0d - x: 8.5d + x: 10.0d y: 7.0d }] order_index: 0 @@ -32,19 +32,19 @@ id: "66960076A74E9B79" linked_quest: "0CA5B715B76E4A5B" shape: "diamond" - x: 14.0d + x: 15.5d y: 2.5d } { id: "6058CD9466BE0852" linked_quest: "00202200344F3456" - x: 11.5d + x: 13.0d y: 4.0d } { id: "49FB3507B0FB3000" linked_quest: "155F421FC2F39C3C" - x: 10.5d + x: 12.0d y: 4.0d } { @@ -52,14 +52,20 @@ linked_quest: "4B1F957EB41A5E9B" shape: "octagon" size: 1.5d - x: 4.5d + x: 5.5d y: 5.5d } { id: "7B380A243C2C39FA" linked_quest: "13F2929C1C303A0B" - x: 0.5d - y: -3.0d + x: -1.0d + y: -5.0d + } + { + id: "2151F8AA263F1D6E" + linked_quest: "6ECAD339C91EF194" + x: 4.0d + y: -5.5d } ] quests: [ @@ -151,8 +157,8 @@ } ] title: "{quests.extreme_voltage.tungsten.title}" - x: 6.0d - y: -4.5d + x: 7.5d + y: -2.0d } { dependencies: ["4EA8888B12D75BF1"] @@ -176,8 +182,8 @@ } ] title: "{quests.extreme_voltage.tunsgten_line_step_1.title}" - x: 0.5d - y: -4.5d + x: -2.0d + y: -2.0d } { dependencies: ["4EA8888B12D75BF1"] @@ -288,7 +294,7 @@ type: "item" }] title: "{quests.extreme_voltage.wood_distillation.title}" - x: -6.0d + x: -5.5d y: -2.5d } { @@ -306,7 +312,7 @@ item: "gtceu:alloy_blast_smelter" type: "item" }] - x: 8.5d + x: 10.0d y: 1.5d } { @@ -323,7 +329,7 @@ type: "item" }] title: "{quests.extreme_voltage.ev_mixer.title}" - x: -0.75d + x: 0.0d y: 0.0d } { @@ -421,7 +427,7 @@ } ] title: "{quests.extreme_voltage.gcym_alloys.title}" - x: 4.5d + x: 8.5d y: 1.5d } { @@ -469,7 +475,7 @@ item: "gtceu:large_centrifuge" type: "item" }] - x: 15.5d + x: 17.0d y: 1.5d } { @@ -495,8 +501,8 @@ } ] title: "{quests.extreme_voltage.tungsten_steel.title}" - x: 0.5d - y: -2.0d + x: 0.0d + y: -4.0d } { dependencies: [ @@ -514,7 +520,7 @@ type: "item" }] title: "{quests.extreme_voltage.nuclear_fuel_factory.title}" - x: 6.0d + x: 7.5d y: 7.0d } { @@ -556,7 +562,7 @@ } ] title: "{quests.extreme_voltage.heavy_water.title}" - x: 8.5d + x: 10.0d y: 5.5d } { @@ -581,7 +587,7 @@ } type: "item" }] - x: 7.0d + x: 8.5d y: 7.0d } { @@ -612,7 +618,7 @@ } ] title: "{quests.gregtech_energy.fission_reactor.title}" - x: 8.5d + x: 10.0d y: 7.0d } { @@ -635,7 +641,7 @@ } ] title: "{quests.extreme_voltage.radioactive_waste.title}" - x: 10.0d + x: 11.5d y: 7.0d } { @@ -663,7 +669,7 @@ } type: "item" }] - x: 11.0d + x: 12.5d y: 7.0d } { @@ -684,7 +690,7 @@ } ] title: "{quests.extreme_voltage.uranium_line.title}" - x: 11.0d + x: 12.5d y: 8.0d } { @@ -698,7 +704,7 @@ item: "gtceu:uraninite_dust" type: "item" }] - x: 11.0d + x: 12.5d y: 9.0d } { @@ -731,7 +737,7 @@ } ] title: "{quests.extreme_voltage.uranium_waste.title}" - x: 13.0d + x: 14.5d y: 7.0d } { @@ -758,7 +764,7 @@ type: "item" }] title: "{quests.extreme_voltage.heat_exchanger.title}" - x: 13.0d + x: 14.5d y: 5.5d } { @@ -786,7 +792,7 @@ } ] title: "{quests.extreme_voltage.ammonium_formate.title}" - x: 12.0d + x: 13.5d y: 5.5d } { @@ -809,7 +815,7 @@ } ] title: "{quests.extreme_voltage.formamide.title}" - x: 14.0d + x: 15.5d y: 5.5d } { @@ -842,7 +848,7 @@ } ] title: "{quests.extreme_voltage.nuclear_residue_dust.title}" - x: 15.5d + x: 17.0d y: 5.5d } { @@ -868,7 +874,7 @@ } ] title: "{quests.extreme_voltage.martian_sludge.title}" - x: 15.5d + x: 17.0d y: 3.5d } { @@ -896,7 +902,7 @@ } ] title: "{quests.extreme_voltage.hexafluorosilic_acid.title}" - x: 17.0d + x: 18.5d y: 3.5d } { @@ -913,7 +919,7 @@ item: "tfg:oxidized_nuclear_residue_dust" type: "item" }] - x: 17.0d + x: 18.5d y: 5.5d } { @@ -926,7 +932,7 @@ item: "tfg:refined_nuclear_residue_dust" type: "item" }] - x: 17.0d + x: 18.5d y: 7.0d } { @@ -952,7 +958,7 @@ } type: "item" }] - x: 17.0d + x: 18.5d y: 10.5d } { @@ -975,7 +981,7 @@ } ] title: "{quests.extreme_voltage.radioactive_concoction.title}" - x: 20.0d + x: 21.5d y: 5.5d } { @@ -998,7 +1004,7 @@ } ] title: "{quests.extreme_voltage.tritiated_water.title}" - x: 14.5d + x: 16.0d y: 10.5d } { @@ -1143,7 +1149,7 @@ } ] title: "{quests.extreme_voltage.ostrum_harvester.title}" - x: 13.0d + x: 14.5d y: 2.5d } { @@ -1210,8 +1216,8 @@ item: "gtceu:iv_machine_hull" type: "item" }] - x: 4.5d - y: -2.0d + x: 1.5d + y: -5.5d } { dependencies: ["2C000B45C23752D0"] @@ -1240,7 +1246,7 @@ } ] title: "{quests.extreme_voltage.ev_superconductor.title}" - x: 12.0d + x: 13.5d y: 8.0d } { @@ -1272,14 +1278,24 @@ { dependencies: ["2DEC7AF917AAE4EC"] description: ["{quests.extreme_voltage.gasoline.desc}"] + icon: "gtceu:gasoline_bucket" id: "397546E863E9835E" + optional: true shape: "octagon" size: 1.5d - tasks: [{ - id: "3F040C1D8A8D6676" - item: "gtceu:gasoline_bucket" - type: "item" - }] + tasks: [ + { + id: "3F040C1D8A8D6676" + item: "gtceu:gasoline_bucket" + optional_task: true + type: "item" + } + { + id: "4BE81C925AD3FB91" + title: "{quests.tasktype.checkmark}" + type: "checkmark" + } + ] title: "{quests.extreme_voltage.gasoline.title}" x: -7.0d y: -4.5d @@ -1291,7 +1307,6 @@ ] description: ["{quests.extreme_voltage.pss.desc}"] id: "60433993B715029A" - shape: "heart" subtitle: "{quests.extreme_voltage.pss.subtitle}" tasks: [ { @@ -1433,7 +1448,7 @@ } ] title: "{quests.extreme_voltage.high_pressure_steam.title}" - x: 8.5d + x: 10.0d y: 9.0d } { @@ -1455,7 +1470,7 @@ type: "item" }] title: "{quests.extreme_voltage.me_part.title}" - x: 4.5d + x: 5.5d y: 3.0d } { @@ -1481,7 +1496,7 @@ type: "item" }] title: "{quests.extreme_voltage.building_gadgets.title}" - x: 3.5d + x: 4.5d y: 4.0d } { @@ -1510,12 +1525,13 @@ } ] title: "{quests.ae2.wireless_access.title}" - x: 4.5d + x: 5.5d y: 4.0d } { dependencies: ["601088B7920140B2"] description: ["{quests.extreme_voltage.new_qol.desc}"] + icon: "gtceu:ev_sensor" id: "70ABD1E3FC1CA672" tasks: [{ id: "73ABA113A9069875" @@ -1523,7 +1539,7 @@ type: "checkmark" }] title: "{quests.extreme_voltage.new_qol.title}" - x: 3.5d + x: 4.5d y: 3.0d } { @@ -1569,7 +1585,7 @@ } ] title: "{quests.extreme_voltage.plutonium.title}" - x: 17.0d + x: 18.5d y: 9.0d } { @@ -1584,7 +1600,7 @@ item: "tfg:ostrum_linear_accelerator" type: "item" }] - x: 20.0d + x: 21.5d y: 9.0d } { @@ -1604,7 +1620,7 @@ type: "checkmark" } ] - x: 20.0d + x: 21.5d y: 12.5d } { @@ -1624,7 +1640,7 @@ type: "checkmark" } ] - x: 21.0d + x: 22.5d y: 12.5d } { @@ -1647,7 +1663,7 @@ type: "checkmark" } ] - x: 19.0d + x: 20.5d y: 12.5d } { @@ -1680,7 +1696,7 @@ type: "item" } ] - x: 21.0d + x: 22.5d y: 13.5d } { @@ -1713,7 +1729,7 @@ type: "item" } ] - x: 20.0d + x: 21.5d y: 13.5d } { @@ -1746,7 +1762,7 @@ type: "item" } ] - x: 19.0d + x: 20.5d y: 13.5d } { @@ -1833,7 +1849,7 @@ } ] title: "{quests.extreme_voltage.nuclear_turbine.title}" - x: 7.0d + x: 8.5d y: 9.0d } { @@ -1848,7 +1864,7 @@ type: "item" }] title: "{quests.extreme_voltage.refrigerant_pellet.title}" - x: 18.0d + x: 19.5d y: 10.5d } { @@ -1883,7 +1899,7 @@ } ] title: "{quests.extreme_voltage.reactor_components.title}" - x: 10.0d + x: 11.5d y: 5.5d } { @@ -1912,7 +1928,7 @@ dependencies: ["5EC5566546591DEE"] description: ["{quests.extreme_voltage.large_miner.desc}"] id: "3F77D528961D5C5E" - shape: "heart" + shape: "octagon" size: 2.0d subtitle: "{quests.extreme_voltage.large_miner.subtitle}" tasks: [{ @@ -1921,8 +1937,8 @@ type: "item" }] title: "{quests.extreme_voltage.large_miner.title}" - x: 6.0d - y: -6.0d + x: 7.5d + y: -3.5d } { dependencies: ["2979AFD231E5B37B"] @@ -1957,7 +1973,7 @@ type: "item" }] title: "{quests.extreme_voltage.dense_lead.title}" - x: 5.0d + x: 6.5d y: 8.0d } { @@ -1982,7 +1998,7 @@ } ] title: "{quests.extreme_voltage.ostrum_dust.title}" - x: 13.0d + x: 14.5d y: 4.0d } { @@ -2001,7 +2017,7 @@ type: "checkmark" }] title: "Breaking changes in next update" - x: 22.5d + x: 24.0d y: 9.0d } { @@ -2032,8 +2048,8 @@ } ] title: "{quests.extreme_voltage.tunsgten_line_step.title}" - x: 0.5d - y: -5.5d + x: -2.0d + y: -3.0d } { dependencies: ["04682CD04FE0A56E"] @@ -2046,8 +2062,8 @@ type: "item" }] title: "{quests.extreme_voltage.tunsgten_line_step_2.title}" - x: 1.5d - y: -4.5d + x: -1.0d + y: -2.0d } { dependencies: ["3A2E442E4D84C891"] @@ -2145,8 +2161,8 @@ type: "item" }] title: "{quests.extreme_voltage.advanced_fluid_rig.title}" - x: 7.5d - y: -4.5d + x: 9.0d + y: -2.0d } { dependencies: ["5CF58F7CBE255585"] @@ -2171,6 +2187,68 @@ x: 2.0d y: 4.5d } + { + dependencies: ["43BBB9074608F9B1"] + description: [ + "{quests.extreme_voltage.btx.desc.1}" + "{@pagebreak}" + "{quests.extreme_voltage.btx.desc.2}" + ] + icon: "tfg:btx_fuel_bucket" + id: "601B05D5F3888C74" + optional: true + shape: "octagon" + size: 1.5d + subtitle: "{quests.extreme_voltage.btx.subtitle}" + tasks: [ + { + id: "1EC8E5CE7DD21191" + item: "tfg:btx_fuel_bucket" + optional_task: true + type: "item" + } + { + id: "2A71DF31AAA0CD3D" + title: "{quests.tasktype.checkmark}" + type: "checkmark" + } + ] + title: "{quests.extreme_voltage.btx.title}" + x: -5.5d + y: -4.5d + } + { + dependencies: ["601B05D5F3888C74"] + description: ["{quests.extreme_voltage.btx_catalyser.desc}"] + id: "3EC1D337D9FC3F1B" + optional: true + subtitle: "{quests.extreme_voltage.btx_catalyser.subtitle}" + tasks: [{ + id: "55930B83D1BA6672" + item: "tfg:catalyser_pt_re_zsm" + type: "item" + }] + title: "{quests.extreme_voltage.btx_catalyser.title}" + x: -4.0d + y: -4.5d + } + { + dependencies: ["3EC1D337D9FC3F1B"] + description: [ + "{quests.extreme_voltage.btx_loop.desc.1}" + "{@pagebreak}" + "{quests.extreme_voltage.btx_loop.desc.2}" + ] + id: "38184C7BA01A9B5B" + optional: true + tasks: [{ + id: "39568ED5E30CDC88" + item: "gtceu:rhenium_dust" + type: "item" + }] + x: -4.0d + y: -5.5d + } ] subtitle: ["{quests.extreme_voltage.subtitle}"] title: "{quests.extreme_voltage}" diff --git a/config/ftbquests/quests/chapters/gregtech_energy.snbt b/config/ftbquests/quests/chapters/gregtech_energy.snbt index 581c9b6a3..6cecc3a84 100644 --- a/config/ftbquests/quests/chapters/gregtech_energy.snbt +++ b/config/ftbquests/quests/chapters/gregtech_energy.snbt @@ -235,15 +235,18 @@ dependencies: [ "60FF9249376DF9BD" "05E2F203DA46A5E8" + "3EC8D58DB73CEFE5" ] + dependency_requirement: "one_completed" description: ["{quests.gregtech_energy.transformer.desc}"] - icon: "gtceu:active_transformer" + icon: "tfg:active_power_transformer" id: "6ECAD339C91EF194" subtitle: "{quests.gregtech_energy.transformer.subtitle}" tasks: [ { id: "098424C2B55ABA69" item: "gtceu:normal_laser_pipe" + optional_task: true type: "item" } { @@ -260,7 +263,7 @@ } { id: "3402A41D0F9CAD37" - item: "gtceu:active_transformer" + item: "tfg:active_power_transformer" type: "item" } ] diff --git a/config/ftbquests/quests/chapters/hv__high_voltage.snbt b/config/ftbquests/quests/chapters/hv__high_voltage.snbt index a203b1f59..cb45408b1 100644 --- a/config/ftbquests/quests/chapters/hv__high_voltage.snbt +++ b/config/ftbquests/quests/chapters/hv__high_voltage.snbt @@ -244,7 +244,7 @@ type: "item" }] title: "{quests.high_voltage.ulv_circuits.title}" - x: -3.0d + x: -3.5d y: 1.5d } { @@ -496,15 +496,26 @@ type: "item" } { - count: 40L id: "18AECBFB42064D4E" item: "gtceu:plascrete" type: "item" } { - count: 10L id: "4DA87A845076183A" item: "gtceu:cleanroom_glass" + optional_task: true + type: "item" + } + { + id: "0B8D91BE431AEB56" + item: { + Count: 1 + id: "ftbfiltersystem:smart_filter" + tag: { + "ftbfiltersystem:filter": "or(item(gtceu:auto_maintenance_hatch)item(gtceu:maintenance_hatch))" + } + } + title: "{quests.high_voltage.cleanroom.task}" type: "item" } ] @@ -553,7 +564,7 @@ } ] title: "{quests.high_voltage.fluorine.title}" - x: 1.0d + x: 1.5d y: 4.5d } { @@ -612,8 +623,8 @@ } ] title: "{quests.high_voltage.nitrobenzene.title}" - x: -1.0d - y: 9.5d + x: -3.0d + y: 5.0d } { dependencies: ["7CC79617A4965F25"] @@ -627,7 +638,7 @@ icon: "gtceu:large_chemical_reactor" id: "528CE69DA4358B2E" shape: "octagon" - size: 3.0d + size: 2.0d tasks: [ { id: "4738F666E22B212B" @@ -648,7 +659,7 @@ ] title: "{quests.high_voltage.lcr.title}" x: 0.0d - y: 7.0d + y: 6.0d } { description: [ @@ -675,7 +686,7 @@ }] title: "{quests.high_voltage.tnt.title}" x: 3.5d - y: 3.0d + y: 3.5d } { dependencies: [ @@ -740,7 +751,7 @@ type: "item" }] title: "{quests.high_voltage.implosion_compressor.title}" - x: 2.5d + x: 2.0d y: 2.0d } { @@ -772,8 +783,8 @@ } ] title: "{quests.high_voltage.nitric_acid.title}" - x: 0.0d - y: 9.5d + x: -1.5d + y: 6.0d } { dependencies: ["5BACED5AE350EAB1"] @@ -798,8 +809,8 @@ } ] title: "{quests.high_voltage.cetane_diesel.title}" - x: 1.0d - y: 9.5d + x: -3.0d + y: 7.0d } { dependencies: ["16B735F9C391D260"] @@ -897,8 +908,8 @@ } ] title: "{quests.high_voltage.ammonia.title}" - x: -3.0d - y: 6.0d + x: -1.5d + y: 4.5d } { dependencies: ["52AD30F04DD5A812"] @@ -928,7 +939,7 @@ description: ["{quests.high_voltage.blue_alloy.desc}"] icon: "gtceu:blue_alloy_ingot" id: "073F59194B479AA3" - shape: "square" + shape: "diamond" size: 1.0d subtitle: "{quests.high_voltage.blue_alloy.subtitle}" tasks: [{ @@ -938,7 +949,7 @@ }] title: "{quests.high_voltage.blue_alloy.title}" x: 0.0d - y: -10.0d + y: -9.0d } { dependencies: [ @@ -1253,6 +1264,7 @@ "" "{ \"text\": \"▶▶▶▶▶▶▶\", \"underlined\": \"true\", \"clickEvent\": { \"action\": \"change_page\", \"value\": \"2CDB9778C7A30044\" } }" ] + icon: "gtceu:ev_vanadium_battery" id: "595C5A01358B9550" subtitle: "{quests.high_voltage.linked_quest_energy.subtitle}" tasks: [{ @@ -1261,8 +1273,8 @@ type: "checkmark" }] title: "{quests.high_voltage.linked_quest_energy.title}" - x: 0.0d - y: 11.0d + x: -4.5d + y: 6.0d } { description: ["{quests.high_voltage.kaolinite_powder.desc}"] @@ -1619,6 +1631,7 @@ { id: "5B94BB35A8480214" item: "greate:titanium_cogwheel" + optional_task: true type: "item" } { @@ -1629,6 +1642,7 @@ { id: "2E602B31550041B9" item: "greate:titanium_shaft" + optional_task: true type: "item" } ] diff --git a/config/ftbquests/quests/chapters/iv__insane_voltage.snbt b/config/ftbquests/quests/chapters/iv__insane_voltage.snbt index 35d11c2bc..b8e0d0de8 100644 --- a/config/ftbquests/quests/chapters/iv__insane_voltage.snbt +++ b/config/ftbquests/quests/chapters/iv__insane_voltage.snbt @@ -6,7 +6,13 @@ icon: "tfg:iv_universal_circuit" id: "32EF20533F323E02" order_index: 1 - quest_links: [ ] + quest_links: [{ + id: "0D1F45B8DE565153" + linked_quest: "6ECAD339C91EF194" + size: 0.75d + x: 1.5d + y: 4.875d + }] quests: [ { dependencies: [ @@ -283,7 +289,7 @@ icon: "gtceu:tungstensteel_large_boiler" id: "328CFD483C26EA44" shape: "rsquare" - size: 0.66d + size: 0.75d subtitle: "Good luck fueling this, lmao" tasks: [ { @@ -404,7 +410,7 @@ icon: "gtceu:iv_electric_motor" id: "01AB252C72B565FE" shape: "rsquare" - size: 0.66d + size: 0.75d tasks: [ { id: "382B9759383E1AC3" @@ -444,49 +450,8 @@ ] title: "There is no limit to \"Fun\"" x: 0.375d - y: 6.0d - } - { - dependencies: ["7CC79617A4965F25"] - description: [ - "Better Ore Processing for &6chanced Byproducts&r, only at the cost of this &3Macerator&r! A must have." - "" - "And now, it's finally time for mass ore processing automation." - "" - "The next Quest will kick things off!" - ] - id: "05003665368F5A57" - size: 0.75d - tasks: [{ - id: "4043CFB3C4E0DB90" - item: "gtceu:iv_macerator" - type: "item" - }] - title: "Shredding your Ores with further more Byproducts" - x: 1.5d y: 4.875d } - { - dependencies: ["05003665368F5A57"] - description: [ - "Welcome to the age of automation!" - "" - "Ore Processing is now at your fingertips." - "" - "&6This quest unlocks a definitive tutorial on Ore Processing in the &lTips and Tricks&r&6 tab - check it out to learn more!&r" - ] - icon: "gtceu:refined_almandine_ore" - id: "724FB950CC472BB4" - shape: "circle" - size: 0.66d - tasks: [{ - id: "496C00BA0D8F5445" - type: "checkmark" - }] - title: "Setting up Ore Processing" - x: 1.5d - y: 6.0d - } { dependencies: [ "12B4423F055BFBF5" diff --git a/config/ftbquests/quests/chapters/lv__low_voltage.snbt b/config/ftbquests/quests/chapters/lv__low_voltage.snbt index 9097d9d30..09d2663e7 100644 --- a/config/ftbquests/quests/chapters/lv__low_voltage.snbt +++ b/config/ftbquests/quests/chapters/lv__low_voltage.snbt @@ -18,15 +18,8 @@ { id: "0EA7766FE6845121" linked_quest: "0FFBB6177DEB0A23" - x: -8.5d - y: 10.5d - } - { - id: "5A47760FCD164E74" - linked_quest: "61F58B402F1AE40B" - shape: "heart" - x: -7.5d - y: 4.5d + x: -8.0d + y: 11.5d } ] quests: [ @@ -43,8 +36,8 @@ type: "item" }] title: "{quests.low_voltage.lv_fluid_regulator.title}" - x: 5.5d - y: -2.0d + x: 6.0d + y: -1.5d } { dependencies: ["38993B4697B0E16C"] @@ -63,8 +56,8 @@ type: "item" }] title: "{quests.low_voltage.lv_robot_arm.title}" - x: 5.5d - y: -4.0d + x: 6.0d + y: -4.5d } { dependencies: ["7EED0084BA59FED1"] @@ -96,7 +89,7 @@ }] title: "{quests.low_voltage.lv_pump.title}" x: 4.5d - y: -2.0d + y: -1.5d } { dependencies: ["7EED0084BA59FED1"] @@ -112,7 +105,7 @@ }] title: "{quests.low_voltage.lv_piston.title}" x: 4.5d - y: -4.0d + y: -4.5d } { dependencies: ["2CDB9778C7A30044"] @@ -132,11 +125,11 @@ type: "item" }] title: "{quests.low_voltage.lv_steam_turbine.title}" - x: 7.0d - y: 9.0d + x: 7.5d + y: 9.5d } { - dependencies: ["6431381FBE07D6EF"] + dependencies: ["2CDB9778C7A30044"] description: ["{quests.low_voltage.lv_amp_explanation.desc}"] id: "7B0FF43022F6C2EC" optional: true @@ -150,8 +143,8 @@ type: "item" }] title: "{quests.low_voltage.lv_amp_explanation.title}" - x: 7.0d - y: 2.5d + x: 5.5d + y: 10.5d } { dependencies: ["45B71324028F6E68"] @@ -168,7 +161,7 @@ }] title: "{quests.low_voltage.aluminium_ingot.title}" x: -10.0d - y: 10.5d + y: 11.5d } { dependencies: [ @@ -197,8 +190,8 @@ } ] title: "{quests.low_voltage.lv_battery_preparation.title}" - x: 7.0d - y: -0.5d + x: 7.5d + y: 0.0d } { dependencies: [ @@ -224,7 +217,7 @@ type: "checkmark" }] title: "{quests.low_voltage.cover_behaviour.title}" - x: 5.5d + x: 6.0d y: -3.0d } { @@ -250,8 +243,8 @@ type: "checkmark" }] title: "{quests.low_voltage.machine_auto_output_behaviour.title}" - x: -3.5d - y: 1.5d + x: -5.0d + y: -0.5d } { dependencies: ["22510C5F2386B453"] @@ -279,7 +272,7 @@ type: "item" }] title: "{quests.low_voltage.lv_wiremill.title}" - x: -2.5d + x: -3.0d y: 0.5d } { @@ -304,8 +297,8 @@ type: "item" }] title: "{quests.low_voltage.lv_bender.title}" - x: -2.5d - y: 2.5d + x: -5.0d + y: 1.5d } { dependencies: ["22510C5F2386B453"] @@ -330,8 +323,8 @@ type: "item" }] title: "{quests.low_voltage.lv_lathe.title}" - x: -2.5d - y: 1.5d + x: -4.0d + y: 1.0d } { dependencies: ["22510C5F2386B453"] @@ -345,8 +338,8 @@ type: "item" }] title: "{quests.low_voltage.lv_polariser.title}" - x: 4.5d - y: -0.5d + x: 5.5d + y: 2.5d } { dependencies: ["6E186F9C57155BFA"] @@ -368,8 +361,8 @@ type: "item" }] title: "{quests.low_voltage.lbb.title}" - x: 8.0d - y: 9.0d + x: 9.0d + y: 9.5d } { dependencies: ["1E9BE8D3F8A602DC"] @@ -389,18 +382,18 @@ type: "item" }] title: "{quests.low_voltage.lv_superconductor.title}" - x: -11.5d + x: -12.0d y: 7.5d } { - dependencies: ["701BCADAE5CF6CA5"] + dependencies: ["22510C5F2386B453"] description: [ "{quests.low_voltage.lv_chemical_bath.desc.1}" "{@pagebreak}" "{quests.low_voltage.lv_chemical_bath.desc.2}" ] + hide_dependency_lines: true id: "330BDB559A7BAB35" - optional: true size: 1.0d subtitle: "{quests.low_voltage.lv_chemical_bath.subtitle}" tasks: [{ @@ -409,8 +402,8 @@ type: "item" }] title: "{quests.low_voltage.lv_chemical_bath.title}" - x: -5.5d - y: 7.5d + x: -4.0d + y: 13.5d } { dependencies: ["64E1E87B8AF72968"] @@ -436,8 +429,8 @@ type: "checkmark" }] title: "{quests.low_voltage.programmed_circuits.title}" - x: -4.5d - y: 1.5d + x: -6.5d + y: -0.5d } { dependencies: ["22510C5F2386B453"] @@ -451,8 +444,8 @@ type: "item" }] title: "{quests.low_voltage.lv_canner.title}" - x: 4.5d - y: 0.5d + x: 5.0d + y: 1.5d } { dependencies: [ @@ -480,8 +473,8 @@ type: "item" }] title: "{quests.low_voltage.lv_battery.title}" - x: 7.0d - y: 0.5d + x: 7.5d + y: 1.5d } { dependencies: ["3E6DC423FE4A99F7"] @@ -510,8 +503,8 @@ type: "item" }] title: "{quests.low_voltage.lv_battery_buffer_4x.title}" - x: 7.0d - y: 1.5d + x: 7.5d + y: 3.0d } { dependencies: ["1646BF9194100E57"] @@ -545,6 +538,7 @@ { dependencies: ["22510C5F2386B453"] description: ["{quests.low_voltage.other_machines.desc}"] + hide_dependency_lines: false icon: "gtceu:crushed_sulfur_ore" id: "701BCADAE5CF6CA5" shape: "circle" @@ -556,8 +550,8 @@ type: "checkmark" }] title: "{quests.low_voltage.other_machines.title}" - x: -4.5d - y: 6.5d + x: 5.5d + y: 4.5d } { description: ["{quests.low_voltage.lv_age_progression.desc}"] @@ -591,7 +585,7 @@ type: "item" }] title: "{quests.low_voltage.lv_fluid_solidifier.title}" - x: -7.5d + x: -8.0d y: 3.5d } { @@ -617,8 +611,8 @@ type: "item" }] title: "{quests.low_voltage.lv_ore_prospector.title}" - x: 8.0d - y: 0.5d + x: 9.0d + y: 1.5d } { dependencies: [ @@ -643,7 +637,7 @@ type: "item" }] title: "{quests.low_voltage.cupronickel_coil.title}" - x: -8.5d + x: -8.0d y: 7.5d } { @@ -660,7 +654,7 @@ }] title: "{quests.low_voltage.lv_gas_collector.title}" x: -4.0d - y: 8.5d + y: 9.5d } { dependencies: ["22510C5F2386B453"] @@ -693,7 +687,7 @@ } ] title: "{quests.low_voltage.lv_chemical_reactor.title}" - x: -6.5d + x: -6.0d y: 3.5d } { @@ -703,20 +697,24 @@ "{@pagebreak}" "{quests.low_voltage.universal_cell.desc.2}" ] - icon: "gtceu:fluid_cell" id: "292938760AB9A12B" - optional: true - shape: "heart" size: 1.0d subtitle: "{quests.low_voltage.universal_cell.subtitle}" tasks: [{ - id: "012C90A73EC79E11" - item: "gtceu:universal_fluid_cell" + id: "4CEC0D86500C2A5B" + item: { + Count: 1 + id: "ftbfiltersystem:smart_filter" + tag: { + "ftbfiltersystem:filter": "or(item(gtceu:fluid_cell)item(gtceu:universal_fluid_cell)item(gtceu:steel_fluid_cell)item(gtceu:aluminium_fluid_cell)item(gtceu:stainless_steel_fluid_cell)item(gtceu:titanium_fluid_cell)item(gtceu:tungsten_steel_fluid_cell)item(gtceu:glass_vial))" + } + } + title: "{quests.low_voltage.universal_cell.task}" type: "item" }] title: "{quests.low_voltage.universal_cell.title}" - x: -3.5d - y: 2.5d + x: -6.5d + y: 1.5d } { dependencies: ["581CDF545E1EA1FD"] @@ -740,7 +738,7 @@ } ] title: "{quests.low_voltage.mold_rotor.title}" - x: -8.5d + x: -9.5d y: 3.5d } { @@ -758,11 +756,11 @@ type: "item" }] title: "{quests.low_voltage.soldering_alloy.title}" - x: 3.0d - y: 10.5d + x: 4.0d + y: 11.5d } { - dependencies: ["701BCADAE5CF6CA5"] + dependencies: ["22510C5F2386B453"] description: [ "{quests.low_voltage.lv_electroliser.desc.1}" "{@pagebreak}" @@ -770,7 +768,6 @@ "{@pagebreak}" "{quests.low_voltage.lv_electroliser.desc.3}" ] - hide_dependent_lines: true id: "32B08E6F414A00C0" optional: true size: 1.0d @@ -781,8 +778,8 @@ type: "item" }] title: "{quests.low_voltage.lv_electroliser.title}" - x: -5.5d - y: 6.5d + x: -6.0d + y: 7.5d } { dependencies: ["22510C5F2386B453"] @@ -806,8 +803,8 @@ type: "item" }] title: "{quests.low_voltage.lv_cutter.title}" - x: -2.5d - y: -0.5d + x: -2.0d + y: 0.0d } { dependencies: ["22510C5F2386B453"] @@ -819,8 +816,7 @@ "{quests.low_voltage.lv_centrifuge.desc.3}" ] id: "5263F866638D875C" - shape: "octagon" - size: 2.0d + size: 1.0d subtitle: "{quests.low_voltage.lv_centrifuge.subtitle}" tasks: [{ id: "20EDB55B8D5CDAD6" @@ -829,7 +825,7 @@ }] title: "{quests.low_voltage.lv_centrifuge.title}" x: -2.0d - y: 8.5d + y: 9.5d } { dependencies: ["37307A46E70011D3"] @@ -846,8 +842,8 @@ type: "item" }] title: "{quests.low_voltage.lv_sprayer.title}" - x: 5.5d - y: 1.5d + x: 5.0d + y: 0.0d } { dependencies: ["22510C5F2386B453"] @@ -867,7 +863,7 @@ }] title: "{quests.low_voltage.lv_assembler.title}" x: 0.0d - y: 8.5d + y: 9.5d } { dependencies: ["22510C5F2386B453"] @@ -885,8 +881,8 @@ type: "item" }] title: "{quests.low_voltage.lv_extractor.title}" - x: -6.5d - y: 4.5d + x: -6.0d + y: 5.5d } { dependencies: ["0DBC148D92A9F69F"] @@ -906,7 +902,7 @@ }] title: "{quests.low_voltage.lv_circuit_assembler.title}" x: 0.0d - y: 15.5d + y: 16.5d } { dependencies: ["1A77CA35F054F988"] @@ -924,13 +920,14 @@ type: "item" }] title: "{quests.low_voltage.lv_arc_furnace.title}" - x: -4.0d + x: -6.0d y: 11.5d } { dependencies: [ - "15928F50AE80A5CF" "5263F866638D875C" + "32B08E6F414A00C0" + "15928F50AE80A5CF" ] dependency_requirement: "one_completed" description: [ @@ -966,8 +963,8 @@ } ] title: "{quests.low_voltage.lv_oxygen.title}" - x: -4.0d - y: 10.5d + x: -6.0d + y: 9.5d } { dependencies: ["5263F866638D875C"] @@ -998,7 +995,7 @@ ] title: "{quests.low_voltage.lv_glue.title}" x: -2.0d - y: 10.5d + y: 11.5d } { dependencies: ["5B891BA4897FD73C"] @@ -1014,12 +1011,13 @@ }] title: "{quests.low_voltage.gallium_arsenide.title}" x: 2.0d - y: 10.5d + y: 11.5d } { dependencies: [ - "63CD0236B337EAAD" "0EAC071414AEC07E" + "330BDB559A7BAB35" + "63CD0236B337EAAD" ] description: [ "{quests.low_voltage.t2_circuit_board.desc.1}" @@ -1034,8 +1032,8 @@ item: "gtceu:phenolic_printed_circuit_board" type: "item" }] - x: -0.5d - y: 10.5d + x: -2.0d + y: 13.5d } { dependencies: [ @@ -1052,8 +1050,8 @@ type: "item" }] title: "{quests.low_voltage.lv_diode.title}" - x: 0.5d - y: 10.5d + x: 0.0d + y: 11.5d } { dependencies: [ @@ -1072,7 +1070,7 @@ }] title: "{quests.low_voltage.1_mv_circuit.title}" x: 0.0d - y: 12.5d + y: 13.5d } { dependencies: ["1E9BE8D3F8A602DC"] @@ -1087,7 +1085,7 @@ }] title: "{quests.low_voltage.aluminium_dust.title}" x: -10.0d - y: 9.0d + y: 9.5d } { dependencies: ["1E9BE8D3F8A602DC"] @@ -1190,8 +1188,8 @@ type: "item" }] title: "{quests.low_voltage.lv_rock_crusher.title}" - x: 4.5d - y: 3.5d + x: 4.0d + y: 1.0d } { dependencies: ["3E6DC423FE4A99F7"] @@ -1218,8 +1216,8 @@ type: "item" }] title: "{quests.low_voltage.lv_turbo_charge.title}" - x: 8.0d - y: -0.5d + x: 9.0d + y: 0.0d } { dependencies: ["22510C5F2386B453"] @@ -1246,15 +1244,13 @@ type: "item" }] title: "{quests.low_voltage.lv_fisher.title}" - x: 4.5d - y: 2.5d + x: 3.0d + y: 0.5d } { dependencies: ["22510C5F2386B453"] description: ["{quests.low_voltage.lv_mixer.desc}"] id: "5B891BA4897FD73C" - shape: "octagon" - size: 2.0d subtitle: "{quests.low_voltage.lv_mixer.subtitle}" tasks: [{ id: "337A6B670842F80A" @@ -1273,7 +1269,7 @@ }] title: "{quests.low_voltage.lv_mixer.title}" x: 2.0d - y: 8.5d + y: 9.5d } { dependencies: ["12565AB92A2BF976"] @@ -1284,7 +1280,7 @@ ] id: "22510C5F2386B453" shape: "gear" - size: 2.0d + size: 2.5d subtitle: "{quests.low_voltage.lv_machine_hull.subtitle}" tasks: [{ id: "499CACFF0350B3CA" @@ -1323,8 +1319,8 @@ } ] title: "{quests.low_voltage.lv_nitrogen.title}" - x: -6.0d - y: 10.5d + x: -4.0d + y: 11.5d } { dependencies: ["648BCF486E16CCB2"] @@ -1364,7 +1360,7 @@ } ] title: "{quests.low_voltage.mold_plate.title}" - x: -7.5d + x: -9.5d y: 2.5d } { @@ -1381,8 +1377,8 @@ } type: "item" }] - x: 8.0d - y: 1.5d + x: 9.0d + y: 3.0d } { dependencies: ["2CDB9778C7A30044"] @@ -1413,7 +1409,7 @@ } ] title: "{quests.steam_age.alternator.title}" - x: 7.0d + x: 7.5d y: 8.0d } { @@ -1434,14 +1430,12 @@ }] title: "{quests.low_voltage.mv_hull.title}" x: -10.0d - y: 14.0d + y: 15.0d } { dependencies: ["648BCF486E16CCB2"] description: ["{quests.low_voltage.lv_machine_casing.desc}"] id: "12565AB92A2BF976" - shape: "octagon" - size: 2.0d subtitle: "{quests.low_voltage.lv_machine_casing.subtitle}" tasks: [{ id: "7459A24E5EBE148D" @@ -1473,8 +1467,8 @@ type: "item" }] title: "{quests.low_voltage.lv_greenhouse.title}" - x: 3.0d - y: 12.5d + x: 2.25d + y: 13.5d } { dependencies: ["22510C5F2386B453"] @@ -1497,8 +1491,8 @@ type: "item" }] title: "{quests.low_voltage.lv_aqueous_accumulator.title}" - x: 4.5d - y: 4.5d + x: 2.0d + y: 0.0d } { dependencies: [ @@ -1518,8 +1512,8 @@ type: "item" }] title: "{quests.low_voltage.lv_combuston_gen.title}" - x: 7.0d - y: 10.0d + x: 7.5d + y: 11.0d } { dependencies: ["2CDB9778C7A30044"] @@ -1561,8 +1555,8 @@ type: "item" }] title: "{quests.low_voltage.lv_seeds.title}" - x: 7.5d - y: 13.0d + x: 11.0d + y: 11.0d } { dependencies: ["55213ACBF5F5D398"] @@ -1577,8 +1571,8 @@ type: "item" }] title: "{quests.low_voltage.lv_seed_oil.title}" - x: 7.5d - y: 12.0d + x: 10.0d + y: 11.0d } { dependencies: ["1D979CB5862BD480"] @@ -1593,7 +1587,7 @@ type: "item" }] title: "{quests.low_voltage.lv_biodiesel.title}" - x: 7.5d + x: 9.0d y: 11.0d } { @@ -1609,8 +1603,8 @@ type: "item" }] title: "{quests.low_voltage.cupronickel_ingot.title}" - x: -8.5d - y: 8.5d + x: -8.0d + y: 9.5d } { dependencies: ["7567E885B7166603"] @@ -1623,6 +1617,7 @@ { id: "1483488F0E301BCC" item: "greate:aluminium_cogwheel" + optional_task: true type: "item" } { @@ -1633,12 +1628,13 @@ { id: "32C96E141753187B" item: "greate:aluminium_shaft" + optional_task: true type: "item" } ] title: "{quests.low_voltage.aluminium_greate.title}" - x: -11.5d - y: 10.5d + x: -12.0d + y: 11.5d } { dependencies: [ @@ -1659,7 +1655,7 @@ type: "checkmark" }] title: "{quests.low_voltage.oil.title}" - x: 6.5d + x: 10.0d y: 12.0d } { @@ -1678,8 +1674,8 @@ type: "item" }] title: "{quests.low_voltage.lv_gas_turbine.title}" - x: 7.0d - y: 7.0d + x: 7.5d + y: 6.5d } { dependencies: ["2CEE3C0972650C81"] @@ -1700,6 +1696,7 @@ { id: "34153032225B76BB" item: "gtceu:light_fuel_bucket" + optional_task: true type: "item" } { @@ -1709,8 +1706,8 @@ } ] title: "{quests.low_voltage.lv_naphtha_light.title}" - x: 6.5d - y: 11.0d + x: 9.0d + y: 12.0d } { dependencies: ["5F3063C539C9CBBF"] @@ -1726,8 +1723,26 @@ type: "item" }] title: "{quests.low_voltage.lv_gas_syngas.title}" - x: 7.0d - y: 6.0d + x: 9.0d + y: 6.5d + } + { + dependencies: [ + "581CDF545E1EA1FD" + "5B2696206205CB2E" + ] + dependency_requirement: "one_completed" + description: ["{quests.low_voltage.glowstone.desc}"] + id: "45CEDBD3A2092C71" + subtitle: "{quests.low_voltage.glowstone.subtitle}" + tasks: [{ + id: "19C401FA4D964FA1" + item: "minecraft:glowstone" + type: "item" + }] + title: "{quests.low_voltage.glowstone.title}" + x: -8.0d + y: 5.5d } ] subtitle: ["{quests.low_voltage.subtitle}"] diff --git a/config/ftbquests/quests/chapters/mv__medium_voltage.snbt b/config/ftbquests/quests/chapters/mv__medium_voltage.snbt index a4132aec7..a6cb44d8f 100644 --- a/config/ftbquests/quests/chapters/mv__medium_voltage.snbt +++ b/config/ftbquests/quests/chapters/mv__medium_voltage.snbt @@ -10,7 +10,7 @@ id: "4EEC4E3BE1B3D3B1" linked_quest: "222295CD03AF00DC" x: -1.5d - y: -5.5d + y: -6.0d }] quests: [ { @@ -36,7 +36,7 @@ type: "item" }] title: "{quests.medium_voltage.pyrolyse.title}" - x: -2.5d + x: -1.0d y: -0.5d } { @@ -63,14 +63,11 @@ type: "item" }] title: "{quests.medium_voltage.mv_biomass.title}" - x: -5.5d + x: -4.0d y: -0.5d } { - dependencies: [ - "22E462070F8B027A" - "499CACFF0350B3CA" - ] + dependencies: ["22E462070F8B027A"] dependency_requirement: "one_completed" description: [ "{quests.medium_voltage.mv_brewery.desc.1}" @@ -84,27 +81,19 @@ shape: "square" size: 1.0d subtitle: "{quests.medium_voltage.mv_brewery.subtitle}" - tasks: [ - { - id: "1CB0F32E8293B5D7" - item: "gtceu:lubricant_bucket" - optional_task: true - type: "item" - } - { - id: "29393DEB346EC4D2" - item: { - Count: 1 - id: "ftbfiltersystem:smart_filter" - tag: { - "ftbfiltersystem:filter": "or(item(gtceu:lv_brewery)item(gtceu:mv_brewery))" - } + tasks: [{ + id: "29393DEB346EC4D2" + item: { + Count: 1 + id: "ftbfiltersystem:smart_filter" + tag: { + "ftbfiltersystem:filter": "or(item(gtceu:lv_brewery)item(gtceu:mv_brewery))" } - type: "item" } - ] + type: "item" + }] title: "{quests.medium_voltage.mv_brewery.title}" - x: -5.5d + x: -4.0d y: -2.0d } { @@ -163,7 +152,7 @@ } ] title: "{quests.medium_voltage.mv_ethanol.title}" - x: -8.0d + x: -7.5d y: -0.5d } { @@ -206,7 +195,7 @@ } ] title: "{quests.medium_voltage.mv_naphtha.title}" - x: -7.5d + x: -7.0d y: 2.5d } { @@ -241,7 +230,7 @@ } ] title: "{quests.medium_voltage.mv_fuel_cracking.title}" - x: -8.5d + x: -8.0d y: 2.5d } { @@ -277,8 +266,8 @@ type: "item" }] title: "{quests.medium_voltage.mv_energy.title}" - x: 7.0d - y: -1.0d + x: 6.0d + y: -2.0d } { dependencies: ["2AD44111B9B39C90"] @@ -298,7 +287,7 @@ type: "item" }] title: "{quests.medium_voltage.mv_stainless.title}" - x: 1.5d + x: 1.0d y: 7.5d } { @@ -390,7 +379,7 @@ }] title: "{quests.medium_voltage.electrolyzer.title}" x: -1.5d - y: -3.5d + y: -4.0d } { dependencies: ["22E462070F8B027A"] @@ -420,8 +409,8 @@ type: "item" }] title: "{quests.medium_voltage.mv_miner.title}" - x: 0.5d - y: 3.0d + x: 4.5d + y: -4.0d } { dependencies: ["4A92AFD2532EED26"] @@ -437,7 +426,7 @@ type: "item" }] title: "{quests.medium_voltage.mv_steel_alloy.title}" - x: 7.0d + x: 8.0d y: 1.0d } { @@ -457,10 +446,11 @@ "ftbfiltersystem:filter": "or(item(gtceu:mv_cutter)item(greate:aluminium_mechanical_saw))" } } + title: "{quests.medium_voltage.mv_cutter.task}" type: "item" }] title: "{quests.medium_voltage.mv_cutter.title}" - x: 7.0d + x: 8.0d y: 4.0d } { @@ -480,7 +470,7 @@ type: "item" }] title: "{quests.medium_voltage.mv_laser_engraver.title}" - x: 7.0d + x: 8.0d y: 8.0d } { @@ -501,7 +491,7 @@ }] title: "{quests.medium_voltage.mv_energy_hatch.title}" x: 3.0d - y: 10.0d + y: 9.0d } { dependencies: ["22E462070F8B027A"] @@ -540,7 +530,7 @@ type: "item" }] title: "{quests.medium_voltage.mv_kanthal_coil.title}" - x: 1.5d + x: 1.0d y: 10.0d } { @@ -591,7 +581,7 @@ } ] title: "{quests.medium_voltage.mv_ram.title}" - x: 8.5d + x: 8.0d y: 10.0d } { @@ -657,7 +647,7 @@ } ] title: "{quests.medium_voltage.mv_silicon_boule.title}" - x: 9.0d + x: 10.0d y: 8.0d } { @@ -674,7 +664,7 @@ type: "item" }] title: "{quests.medium_voltage.mv_circuit_assembler.title}" - x: 1.0d + x: 0.0d y: 14.0d } { @@ -711,7 +701,7 @@ type: "item" }] title: "{quests.medium_voltage.mv_best_lv.title}" - x: -1.0d + x: -3.0d y: 12.0d } { @@ -731,7 +721,7 @@ type: "item" }] title: "{quests.medium_voltage.mv_best_mv.title}" - x: -1.0d + x: -3.0d y: 14.0d } { @@ -748,7 +738,7 @@ type: "item" }] title: "{quests.medium_voltage.mv_second_hv.title}" - x: -1.0d + x: -3.0d y: 16.5d } { @@ -777,8 +767,15 @@ size: 3.0d subtitle: "{quests.medium_voltage.mv_polyethylene.subtitle}" tasks: [{ - id: "15E5F008339B8964" - item: "gtceu:polyethylene_plate" + id: "1605293EDC9EAFCB" + item: { + Count: 1 + id: "ftbfiltersystem:smart_filter" + tag: { + "ftbfiltersystem:filter": "or(nbt(fuzzy:{fluid:{FluidName:\"gtceu:polyethylene\"}})nbt(fuzzy:{Fluid:{FluidName:\"gtceu:polyethylene\"}})item(gtceu:polyethylene_bucket))" + } + } + title: "{material.gtceu.polyethylene}" type: "item" }] title: "{quests.medium_voltage.mv_polyethylene.title}" @@ -794,8 +791,15 @@ size: 1.0d subtitle: "{quests.medium_voltage.mv_pvc.subtitle}" tasks: [{ - id: "72696AD2B77F805B" - item: "gtceu:polyvinyl_chloride_plate" + id: "1EDAC09CA0F55A2B" + item: { + Count: 1 + id: "ftbfiltersystem:smart_filter" + tag: { + "ftbfiltersystem:filter": "or(nbt(fuzzy:{fluid:{FluidName:\"gtceu:polyvinyl_chloride\"}})nbt(fuzzy:{Fluid:{FluidName:\"gtceu:polyvinyl_chloride\"}})item(gtceu:polyvinyl_chloride_bucket))" + } + } + title: "{material.gtceu.polyvinyl_chloride}" type: "item" }] title: "{quests.medium_voltage.mv_pvc.title}" @@ -826,7 +830,7 @@ } ] title: "{quests.medium_voltage.mv_boards.title}" - x: -5.0d + x: -7.0d y: 12.0d } { @@ -868,7 +872,7 @@ } ] title: "{quests.medium_voltage.mv_sodium_iron.title}" - x: -5.0d + x: -7.0d y: 14.0d } { @@ -933,7 +937,7 @@ ] title: "{quests.medium_voltage.mv_hydrochloric.title}" x: -10.0d - y: -2.5d + y: -3.0d } { dependencies: [ @@ -958,7 +962,7 @@ }] title: "{quests.medium_voltage.mv_aciditic.title}" x: -10.0d - y: -1.5d + y: -1.75d } { dependencies: ["6F898B934BB79016"] @@ -981,8 +985,8 @@ type: "item" }] title: "{quests.medium_voltage.mv_batteries.title}" - x: 9.5d - y: -1.0d + x: 10.0d + y: -2.0d } { dependencies: ["22E462070F8B027A"] @@ -999,7 +1003,7 @@ }] title: "{quests.medium_voltage.mv_extruder.title}" x: 3.0d - y: -3.5d + y: -4.0d } { dependencies: ["75F38905DEA60F15"] @@ -1042,11 +1046,10 @@ type: "item" }] title: "{quests.medium_voltage.mv_fluid_rig.title}" - x: -2.5d + x: -1.0d y: 2.5d } { - dependencies: ["648BCF486E16CCB2"] description: ["{quests.medium_voltage.mv_oilsands.desc}"] id: "575B07D390D9D079" optional: true @@ -1059,7 +1062,7 @@ type: "item" }] title: "{quests.medium_voltage.mv_oilsands.title}" - x: -2.5d + x: -1.0d y: 1.0d } { @@ -1097,7 +1100,7 @@ type: "item" }] title: "{quests.medium_voltage.mv_distillery.title}" - x: -5.5d + x: -4.0d y: 1.0d } { @@ -1139,7 +1142,7 @@ } ] title: "{quests.medium_voltage.mv_lpg.title}" - x: -2.5d + x: -1.0d y: 4.0d } { @@ -1163,8 +1166,8 @@ type: "item" }] title: "{quests.medium_voltage.mv_benzene.title}" - x: -5.0d - y: 2.5d + x: -3.0d + y: 3.0d } { dependencies: ["6A304E453D74C57C"] @@ -1189,8 +1192,8 @@ } ] title: "{quests.medium_voltage.mv_light_fuel.title}" - x: -6.0d - y: 2.5d + x: -5.0d + y: 3.0d } { dependency_requirement: "one_started" @@ -1207,14 +1210,14 @@ Count: 1 id: "ftbfiltersystem:smart_filter" tag: { - "ftbfiltersystem:filter": "or(item(gtceu:aluminium_quadruple_fluid_pipe)item(gtceu:blue_steel_quadruple_fluid_pipe)item(gtceu:steel_quadruple_fluid_pipe))" + "ftbfiltersystem:filter": "or(item_tag(forge:quadruple_fluid_pipes)item_tag(forge:nonuple_fluid_pipes))" } } title: "Multiple Channel Potin Pipes, please" type: "item" }] title: "{quests.medium_voltage.mv_mutli_channel.title}" - x: -8.0d + x: -7.5d y: 1.0d } { @@ -1245,7 +1248,7 @@ } ] title: "{quests.medium_voltage.mv_ic.title}" - x: 7.0d + x: 6.0d y: 10.0d } { @@ -1276,8 +1279,8 @@ } ] title: "{quests.medium_voltage.mv_ulpic.title}" - x: 5.5d - y: 10.0d + x: 6.0d + y: 8.0d } { dependencies: ["45769156F4253C86"] @@ -1298,8 +1301,8 @@ type: "item" }] title: "{quests.medium_voltage.mv_jetpack.title}" - x: -6.0d - y: 4.5d + x: -5.0d + y: 5.0d } { dependencies: ["75F38905DEA60F15"] @@ -1350,7 +1353,7 @@ } ] title: "{quests.medium_voltage.mv_electronic_components.title}" - x: 0.5d + x: -0.5d y: 10.0d } { @@ -1378,8 +1381,8 @@ } ] title: "{quests.medium_voltage.mv_chlorine.title}" - x: -9.5d - y: -3.5d + x: -9.0d + y: -4.0d } { dependencies: ["45449ECE4F8128E7"] @@ -1401,8 +1404,8 @@ } ] title: "{quests.medium_voltage.mv_hydrogen.title}" - x: -10.5d - y: -3.5d + x: -11.0d + y: -4.0d } { dependency_requirement: "one_started" @@ -1418,7 +1421,7 @@ }] title: "{quests.medium_voltage.mv_seawater.title}" x: -10.0d - y: -4.5d + y: -5.5d } { dependencies: ["583D0CC4FAA4FC98"] @@ -1439,7 +1442,7 @@ }] title: "{quests.medium_voltage.mv_battery.title}" x: 8.5d - y: -1.0d + y: -2.0d } { dependencies: [ @@ -1512,15 +1515,13 @@ } ] title: "{quests.medium_voltage.mv_kanthal_ingot.title}" - x: 1.5d - y: 9.0d + x: 1.0d + y: 11.0d } { dependencies: ["22E462070F8B027A"] description: ["{quests.medium_voltage.mv_chemical_reactor.desc}"] id: "79E8DC4D9B5F6B97" - shape: "octagon" - size: 2.0d subtitle: "{quests.medium_voltage.mv_chemical_reactor.subtitle}" tasks: [{ id: "04A6D4858DA3CE94" @@ -1528,8 +1529,8 @@ type: "item" }] title: "{quests.medium_voltage.mv_chemical_reactor.title}" - x: 7.0d - y: -3.5d + x: 1.5d + y: -4.0d } { description: [ @@ -1545,7 +1546,7 @@ type: "item" }] title: "{quests.medium_voltage.mv_silicon.title}" - x: 9.0d + x: 10.0d y: 6.0d } { @@ -1566,7 +1567,7 @@ type: "item" }] title: "{quests.medium_voltage.lsb.title}" - x: 1.28d + x: 0.0d y: 16.5d } { @@ -1593,8 +1594,8 @@ } ] title: "{quests.medium_voltage.mv_cpu.title}" - x: 5.0d - y: 8.0d + x: 10.0d + y: 10.0d } { dependencies: ["5D9D01EF219A31C5"] @@ -1608,7 +1609,7 @@ type: "item" }] title: "{quests.medium_voltage.mv_bio_diesel.title}" - x: -8.0d + x: -7.5d y: -2.0d } { @@ -1622,6 +1623,7 @@ { id: "53919EE5BCCA618A" item: "greate:stainless_steel_cogwheel" + optional_task: true type: "item" } { @@ -1632,12 +1634,13 @@ { id: "6DF7F28AABF6785F" item: "greate:stainless_steel_shaft" + optional_task: true type: "item" } ] title: "{quests.medium_voltage.stainless_greate.title}" - x: 0.5d - y: 6.75d + x: 0.0d + y: 6.5d } { dependencies: ["54A255C1C6E33165"] @@ -1652,8 +1655,8 @@ type: "item" }] title: "{quests.medium_voltage.reformate_gas.title}" - x: -5.0d - y: 4.5d + x: -3.0d + y: 5.0d } { dependencies: ["00E1A728E6F6D6A0"] @@ -1671,8 +1674,8 @@ item: "gtceu:coal_liquefaction_tower" type: "item" }] - x: -5.0d - y: 3.5d + x: -3.0d + y: 4.0d } { dependencies: ["61972B16805FC9EE"] @@ -1695,8 +1698,8 @@ type: "item" }] title: "{quests.medium_voltage.mv_diesel.title}" - x: -6.0d - y: 3.5d + x: -5.0d + y: 4.0d } ] subtitle: ["{quests.medium_voltage.subtitle}"] diff --git a/config/ftbquests/quests/chapters/ore_processing.snbt b/config/ftbquests/quests/chapters/ore_processing.snbt index ecf402cfc..05323720f 100644 --- a/config/ftbquests/quests/chapters/ore_processing.snbt +++ b/config/ftbquests/quests/chapters/ore_processing.snbt @@ -463,86 +463,13 @@ id: "1F185450C1FF7379" item: { Count: 1 - ForgeCaps: { - "tfc:item_heat": { - heat: 0.0f - ticks: 0L - } + id: "ftbfiltersystem:smart_filter" + tag: { + "ftbfiltersystem:filter": "ftbfiltersystem:item_tag(tfg:platinum_ore_group)" } - id: "gtceu:purified_chalcocite_ore" - } - optional_task: true - type: "item" - } - { - disable_toast: true - id: "6140EA15476B4A16" - item: { - Count: 1 - ForgeCaps: { - "tfc:item_heat": { - heat: 0.0f - ticks: 0L - } - } - id: "gtceu:purified_chalcopyrite_ore" - } - optional_task: true - type: "item" - } - { - disable_toast: true - id: "6F239C59DC002095" - item: { - Count: 1 - ForgeCaps: { - "tfc:item_heat": { - heat: 0.0f - ticks: 0L - } - } - id: "gtceu:purified_bornite_ore" - } - optional_task: true - type: "item" - } - { - disable_toast: true - id: "29D38459E25A0D3E" - item: { - Count: 1 - ForgeCaps: { - "tfc:item_heat": { - heat: 0.0f - ticks: 0L - } - } - id: "gtceu:purified_pentlandite_ore" - } - optional_task: true - type: "item" - } - { - disable_toast: true - id: "22DF4DB3FF6976EA" - item: "gtceu:purified_cooperite_ore" - optional_task: true - type: "item" - } - { - disable_toast: true - id: "1A8C5E755FE82C59" - item: { - Count: 1 - ForgeCaps: { - "tfc:item_heat": { - heat: 0.0f - ticks: 0L - } - } - id: "gtceu:purified_tetrahedrite_ore" } optional_task: true + title: "Any #tfg:platinum_ore_group" type: "item" } ] diff --git a/config/ftbquests/quests/chapters/questsmetallurgy.snbt b/config/ftbquests/quests/chapters/questsmetallurgy.snbt index 210362d91..132a73332 100644 --- a/config/ftbquests/quests/chapters/questsmetallurgy.snbt +++ b/config/ftbquests/quests/chapters/questsmetallurgy.snbt @@ -44,7 +44,7 @@ id: "227B6C88FFE99435" linked_quest: "4EBABACAB444244D" shape: "heart" - x: 16.5d + x: 17.0d y: -24.5d } { @@ -57,7 +57,7 @@ { id: "3249AB9EB552BB77" linked_quest: "4B79026C8D2DACC4" - x: 17.5d + x: 18.5d y: -28.0d } ] @@ -122,6 +122,7 @@ { dependencies: ["5996A3A0D475B8A6"] description: ["{quests.metal_age.steel_anvil.desc}"] + guide_page: "tfc:field_guide tfc:mechanics/steel" id: "04DE7C58F20B535A" shape: "octagon" size: 2.0d @@ -205,6 +206,7 @@ "7B2068B200631D5C" ] description: ["{quests.metal_age.bloomery.desc}"] + guide_page: "tfc:field_guide tfc:mechanics/bloomery" id: "0A92F5C4BB6AF972" size: 2.0d subtitle: "{quests.metal_age.bloomery.subtitle}" @@ -285,6 +287,7 @@ } { description: ["{quests.metal_age.bellows.desc}"] + guide_page: "tfc:field_guide tfc:mechanics/bellows" hide_dependency_lines: true id: "021D3DEEB15A3D17" subtitle: "{quests.metal_age.bellows.subtitle}" @@ -392,6 +395,7 @@ { dependencies: ["2C76EE197C14B0DC"] description: ["{quests.metal_age.crucible.desc}"] + guide_page: "tfc:field_guide tfc:mechanics/crucible" icon: "tfc:crucible" id: "12CB3B9ADC586521" shape: "octagon" @@ -484,6 +488,7 @@ dependencies: ["2C76EE197C14B0DC"] dependency_requirement: "one_completed" description: ["{quests.metal_age.fire_bricks.desc}"] + guide_page: "tfc:field_guide tfc:mechanics/blast_furnace_insulation" icon: "tfc:fire_bricks" id: "7CD2922D9F6FA6C5" shape: "octagon" @@ -664,7 +669,7 @@ type: "item" }] title: "{quests.metal_age.red_steel_flask.title}" - x: 16.5d + x: 17.0d y: -27.5d } { @@ -1271,6 +1276,27 @@ x: 17.0d y: -29.5d } + { + dependencies: ["56CA2EB7812529C5"] + description: ["{quests.metal_age.temperature_protection.desc}"] + id: "310D96268266D787" + subtitle: "{quests.metal_age.temperature_protection.subtitle}" + tasks: [{ + id: "334F07058A050458" + item: { + Count: 1 + id: "ftbfiltersystem:smart_filter" + tag: { + "ftbfiltersystem:filter": "or(item(tfc:metal/boots/red_steel)item(sns:red_steel_toe_hiking_boots)item(tfc:metal/chestplate/red_steel)item(tfc:metal/boots/blue_steel)item(sns:blue_steel_toe_hiking_boots)item(minecraft:netherite_boots)item(create:netherite_diving_boots)item(tfc:metal/chestplate/blue_steel)item(create:netherite_backtank))" + } + } + title: "{quests.metal_age.temperature_protection.task}" + type: "item" + }] + title: "{quests.metal_age.temperature_protection.title}" + x: 18.5d + y: -24.0d + } ] subtitle: ["{quests.metal_age.subtitle}"] title: "{quests.metal_age}" diff --git a/config/ftbquests/quests/chapters/questssteam_age.snbt b/config/ftbquests/quests/chapters/questssteam_age.snbt index 4841ea4b5..f1d6fdf7f 100644 --- a/config/ftbquests/quests/chapters/questssteam_age.snbt +++ b/config/ftbquests/quests/chapters/questssteam_age.snbt @@ -378,11 +378,13 @@ { id: "23DE370285589CB4" item: "greate:steel_shaft" + optional_task: true type: "item" } { id: "4FDD99090C920E21" item: "greate:steel_cogwheel" + optional_task: true type: "item" } { @@ -1699,8 +1701,6 @@ description: ["{quests.steam_age.supers.desc}"] icon: "gtceu:ulv_super_chest" id: "671405A9F3A8DFDB" - optional: true - shape: "heart" subtitle: "{quests.steam_age.supers.subtitle}" tasks: [{ id: "5F5A6967B674C05A" diff --git a/config/ftbquests/quests/chapters/questsstoneage.snbt b/config/ftbquests/quests/chapters/questsstoneage.snbt index 9c7ebc5ef..b429838d3 100644 --- a/config/ftbquests/quests/chapters/questsstoneage.snbt +++ b/config/ftbquests/quests/chapters/questsstoneage.snbt @@ -485,6 +485,7 @@ "1D40CAE675C4BB91" ] description: ["{quests.stone_age.leather_flask.desc}"] + guide_page: "tfc:field_guide tfc:waterflasks/bladders" id: "62BD1E75FD629161" subtitle: "{quests.stone_age.leather_flask.subtitle}" tasks: [{ @@ -508,6 +509,7 @@ "174DA15847665CF8" ] description: ["{quests.stone_age.iron_flask.desc}"] + guide_page: "tfc:field_guide tfc:waterflasks/recipes" id: "11C45DBB20ED7647" optional: true shape: "heart" @@ -1663,6 +1665,7 @@ { dependencies: ["1D40CAE675C4BB91"] description: ["{quests.stone_age.hydration.desc}"] + guide_page: "tfc:field_guide tfc:mechanics/hydration" icon: { Count: 1 id: "minecraft:potion" @@ -1723,6 +1726,7 @@ { dependencies: ["560B17BFBE8D477D"] description: ["{quests.stone_age.leather_armor.desc}"] + guide_page: "tfc:field_guide tfc:mechanics/armor" id: "04E900CFE39D6A6C" optional: true subtitle: "{quests.stone_age.leather_armor.subtitle}" @@ -1819,6 +1823,7 @@ { dependencies: ["1D40CAE675C4BB91"] description: ["{quests.stone_age.glass_bottles.desc}"] + guide_page: "tfc:field_guide tfc:mechanics/glassworking" id: "4F7B5C34B7CD27F2" subtitle: "{quests.stone_age.glass_bottles.subtitle}" tasks: [{ @@ -2284,6 +2289,43 @@ x: -1.0d y: 8.0d } + { + dependencies: ["669F84C6A2A64145"] + description: [ + "{quests.stone_age.medical_conditions.desc.1}" + "{@pagebreak}" + "{quests.stone_age.medical_conditions.desc.2}" + ] + icon: "createdeco:decal_skull" + id: "00117AD40FACB89D" + rewards: [ + { + id: "260BA8E2AB90DDF7" + item: "tfg:poison_pill" + type: "item" + } + { + id: "6402410E15263863" + item: "tfg:regeneration_pill" + type: "item" + } + { + id: "2135759D738A8AA1" + item: "tfg:antipoison_tablet" + type: "item" + } + ] + shape: "circle" + subtitle: "{quests.stone_age.medical_conditions.subtitle}" + tasks: [{ + id: "400064E41CACA499" + title: "{quests.stone_age.medical_conditions.task}" + type: "checkmark" + }] + title: "{quests.stone_age.medical_conditions.title}" + x: 14.0d + y: 7.0d + } ] subtitle: ["{quests.stone_age.subtitle}"] title: "{quests.stone_age}" diff --git a/config/ftbquests/quests/chapters/queststfc_tips.snbt b/config/ftbquests/quests/chapters/queststfc_tips.snbt index 843a2eb36..73a72333a 100644 --- a/config/ftbquests/quests/chapters/queststfc_tips.snbt +++ b/config/ftbquests/quests/chapters/queststfc_tips.snbt @@ -52,6 +52,7 @@ dependencies: ["173F6FA60A5B280B"] description: ["{quests.tfg_tips.arborfirmacraft.desc}"] disable_toast: true + guide_page: "tfc:field_guide tfc:arborfirmacraft/tapping_index" icon: "afc:wood/sapling/weeping_maple" id: "1469936B5DE3AC28" shape: "octagon" @@ -72,7 +73,8 @@ dependencies: ["173F6FA60A5B280B"] description: ["{quests.tfg_tips.beneath.desc}"] disable_toast: true - icon: "minecraft:netherrack" + guide_page: "tfc:field_guide tfc:beneath/beneath" + icon: "minecraft:deepslate" id: "4AA0EBFBA5D8788C" shape: "octagon" size: 2.0d @@ -120,6 +122,7 @@ { dependencies: ["1469936B5DE3AC28"] description: ["{quests.tfg_tips.treetap.desc}"] + guide_page: "tfc:field_guide tfc:arborfirmacraft/tree_tapping" id: "128483FFDC8277A0" subtitle: "{quests.tfg_tips.treetap.subtitle}" tasks: [{ @@ -173,6 +176,7 @@ { dependencies: ["128483FFDC8277A0"] description: ["{quests.tfg_tips.find_latex_tree.desc}"] + guide_page: "tfc:field_guide tfc:arborfirmacraft/making_rubber" id: "4891E995D3EC2BD1" subtitle: "{quests.tfg_tips.find_latex_tree.subtitle}" tasks: [{ @@ -194,6 +198,7 @@ { dependencies: ["128483FFDC8277A0"] description: ["{quests.tfg_tips.find_syrup_tree.desc}"] + guide_page: "tfc:field_guide tfc:arborfirmacraft/making_syrups" id: "308BB7D9D210C8DA" subtitle: "{quests.tfg_tips.find_syrup_tree.subtitle}" tasks: [{ @@ -254,6 +259,7 @@ { dependencies: ["2EFB241490502DB3"] description: ["{quests.tfg_tips.beekeeping.desc}"] + guide_page: "tfc:field_guide tfc:firmalife/beekeeping" icon: "firmalife:beeswax" id: "1071B804483BB882" subtitle: "{quests.tfg_tips.beekeeping.subtitle}" @@ -409,6 +415,7 @@ ] dependency_requirement: "one_completed" description: ["{quests.tfg_tips.cellar.desc}"] + guide_page: "tfc:field_guide tfc:firmalife/cellar" id: "3D1FF501DE2E56FE" size: 1.5d subtitle: "{quests.tfg_tips.cellar.subtitle}" @@ -439,6 +446,7 @@ { dependencies: ["3D1FF501DE2E56FE"] description: ["{quests.tfg_tips.cellar_blocks.desc}"] + guide_page: "tfc:field_guide tfc:firmalife/food_shelves" id: "32CD6D2EADA0DCA3" subtitle: "{quests.tfg_tips.cellar_blocks.subtitle}" tasks: [{ @@ -460,6 +468,7 @@ { dependencies: ["2EFB241490502DB3"] description: ["{quests.tfg_tips.oven.desc}"] + guide_page: "tfc:field_guide tfc:firmalife/ovens" id: "029264BCA5477837" subtitle: "{quests.tfg_tips.oven.subtitle}" tasks: [ @@ -513,6 +522,7 @@ { dependencies: ["029264BCA5477837"] description: ["{quests.tfg_tips.oven_appliances.desc}"] + guide_page: "tfc:field_guide tfc:firmalife/oven_appliances" id: "73D5ED4099F99A47" subtitle: "{quests.tfg_tips.oven_appliances.subtitle}" tasks: [ @@ -585,6 +595,7 @@ { dependencies: ["73D5ED4099F99A47"] description: ["{quests.tfg_tips.jam.desc}"] + guide_page: "tfc:field_guide tfc:mechanics/jarring" id: "5D373432F0C22C93" subtitle: "{quests.tfg_tips.jam.subtitle}" tasks: [ @@ -613,6 +624,7 @@ { dependencies: ["2EFB241490502DB3"] description: ["{quests.tfg_tips.preservation.desc}"] + guide_page: "tfc:field_guide tfc:mechanics/decay" icon: "minecraft:clock" id: "4047EE998BC4CD03" subtitle: "{quests.tfg_tips.preservation.subtitle}" @@ -937,6 +949,7 @@ { dependencies: ["52D944ADA884EFEF"] description: ["{quests.tfg_tips.dry_fruit.desc}"] + guide_page: "tfc:field_guide tfc:firmalife/drying" id: "4417A395801DC4E5" subtitle: "{quests.tfg_tips.dry_fruit.subtitle}" tasks: [ @@ -1028,6 +1041,7 @@ ] dependency_requirement: "one_completed" description: ["{quests.tfg_tips.smoke_meat.desc}"] + guide_page: "tfc:field_guide tfc:firmalife/smoking" id: "1FC019B45383695E" subtitle: "{quests.tfg_tips.smoke_meat.subtitle}" tasks: [ @@ -1113,6 +1127,7 @@ { dependencies: ["3C7F170E065B60E1"] description: ["{quests.tfg_tips.create_cheese.desc}"] + guide_page: "tfc:field_guide tfc:firmalife/cheese" id: "0FCB88A64D3FBF0F" subtitle: "{quests.tfg_tips.create_cheese.subtitle}" tasks: [{ @@ -1193,6 +1208,7 @@ { dependencies: ["2EFB241490502DB3"] description: ["{quests.tfg_tips.greenhouse.desc}"] + guide_page: "tfc:field_guide tfc:firmalife/greenhouse" icon: "firmalife:large_planter" id: "07FBA022050DA24A" subtitle: "{quests.tfg_tips.greenhouse.subtitle}" @@ -1223,6 +1239,7 @@ "{@pagebreak}" "{quests.tfg_tips.charcoal_pile.desc.4}" ] + guide_page: "tfc:field_guide tfc:mechanics/charcoal_pit" id: "7B2068B200631D5C" subtitle: "{quests.tfg_tips.charcoal_pile.subtitle}" tasks: [ @@ -1249,6 +1266,7 @@ { dependencies: ["150B7C5CD152E1BA"] description: ["{quests.tfg_tips.thatch_bed.desc}"] + guide_page: "tfc:field_guide tfc:getting_started/a_place_to_sleep" id: "4D11F11CE0E9F379" subtitle: "{quests.tfg_tips.thatch_bed.subtitle}" tasks: [ @@ -1312,6 +1330,7 @@ ] dependency_requirement: "one_completed" description: ["{quests.tfg_tips.loom.desc}"] + guide_page: "tfc:field_guide tfc:mechanics/weaving" id: "1766C916084261AA" subtitle: "{quests.tfg_tips.loom.subtitle}" tasks: [{ @@ -1389,6 +1408,7 @@ { dependencies: ["1766C916084261AA"] description: ["{quests.tfg_tips.unrefined_paper.desc}"] + guide_page: "tfc:field_guide tfc:mechanics/papermaking" id: "4CD3F04793CE47A2" subtitle: "{quests.tfg_tips.unrefined_paper.subtitle}" tasks: [{ @@ -1406,6 +1426,7 @@ "{quests.tfg_tips.panning.desc}" "{image:tfg:textures/quests/ore_deposit.png width:100 height:100 align:center}" ] + guide_page: "tfc:field_guide tfc:mechanics/panning" id: "082310DF9BEA92CE" subtitle: "{quests.tfg_tips.panning.subtitle}" tasks: [ @@ -1437,6 +1458,7 @@ "{quests.tfg_tips.sluice.desc}" "{image:tfg:textures/quests/sluice.png width:100 height:100 align:center}" ] + guide_page: "tfc:field_guide tfc:mechanics/sluices" id: "5261ECBE3438B05E" subtitle: "{quests.tfg_tips.sluice.subtitle}" tasks: [{ @@ -1458,6 +1480,7 @@ { dependencies: ["79FA776C414AE8E5"] description: ["{quests.tfg_tips.candles.desc}"] + guide_page: "tfc:field_guide tfc:mechanics/lighting" id: "368E3C94EEDC11BB" subtitle: "{quests.tfg_tips.candles.subtitle}" tasks: [{ @@ -1720,6 +1743,7 @@ { dependencies: ["4A8910950F638BB5"] description: ["{quests.tfg_tips.beneath_temp_management.desc}"] + guide_page: "tfc:field_guide tfc:beneath/cooling" id: "39C21134FD02F94B" subtitle: "{quests.tfg_tips.beneath_temp_management.subtitle}" tasks: [ @@ -1798,6 +1822,7 @@ { dependencies: ["4A8910950F638BB5"] description: ["{quests.tfg_tips.beneath_clothes.desc}"] + guide_page: "tfc:field_guide tfc:beneath/cooling" icon: { Count: 1 id: "tfcambiental:silk_shirt" @@ -1819,6 +1844,7 @@ { dependencies: ["4A8910950F638BB5"] description: ["{quests.tfg_tips.juicer.desc}"] + guide_page: "tfc:field_guide tfc:beneath:water" id: "3D845616A2F7083F" subtitle: "{quests.tfg_tips.juicer.subtitle}" tasks: [{ @@ -1847,12 +1873,13 @@ { dependencies: ["5E2E37673AD87A4B"] description: ["{quests.tfg_tips.reach_the_beneath.desc}"] + guide_page: "tfc:field_guide tfc:beneath:biomes" id: "70DA01DFDAE54224" size: 2.0d subtitle: "{quests.tfg_tips.reach_the_beneath.subtitle}" tasks: [{ dimension: "minecraft:the_nether" - icon: "minecraft:netherrack" + icon: "minecraft:gilded_blackstone" id: "253320A57FAE6D0A" title: "{quests.tfg_tips.reach_the_beneath.task}" type: "dimension" @@ -1864,6 +1891,7 @@ { dependencies: ["70DA01DFDAE54224"] description: ["{quests.tfg_tips.piglin_bartering.desc}"] + guide_page: "tfc:field_guide tfc:beneath/piglins" id: "3D5C898F953FECFC" subtitle: "{quests.tfg_tips.piglin_bartering.subtitle}" tasks: [{ @@ -2080,6 +2108,7 @@ { dependencies: ["07FBA022050DA24A"] description: ["{quests.tfg_tips.greenhouse_automation.desc}"] + guide_page: "tfc:field_guide tfc:firmalife/planters" id: "30DD0DDF86C96926" optional: true shape: "gear" diff --git a/config/ftbquests/quests/chapters/queststfg.snbt b/config/ftbquests/quests/chapters/queststfg.snbt index e3058149c..2862604f9 100644 --- a/config/ftbquests/quests/chapters/queststfg.snbt +++ b/config/ftbquests/quests/chapters/queststfg.snbt @@ -154,7 +154,7 @@ Count: 1 ForgeCaps: { "tfc:food": { - creationDate: 18000L + creationDate: 99999999999L traits: [ ] } } diff --git a/config/ftbquests/quests/chapters/tips__tools.snbt b/config/ftbquests/quests/chapters/tips__tools.snbt index 88f05be92..6ec2de534 100644 --- a/config/ftbquests/quests/chapters/tips__tools.snbt +++ b/config/ftbquests/quests/chapters/tips__tools.snbt @@ -1122,6 +1122,7 @@ { dependencies: ["2D959136A5FC5F46"] description: ["{quests.tfg_tips.lamps.desc}"] + guide_page: "tfc:field_guide tfc:mechanics/lamps" id: "037CDA933FBE2CBE" subtitle: "{quests.tfg_tips.lamps.subtitle}" tasks: [ @@ -1273,6 +1274,7 @@ { dependencies: ["2D959136A5FC5F46"] description: ["{quests.tfg_tips.glass_blocks.desc}"] + guide_page: "tfc:field_guide tfc:mechanics/glassworking_applications" id: "382FC8824F311665" subtitle: "{quests.tfg_tips.glass_blocks.subtitle}" tasks: [ @@ -1329,6 +1331,7 @@ { dependencies: ["150B7C5CD152E1BA"] description: ["{quests.tfg_tips.glassblowing.desc}"] + guide_page: "tfc:field_guide tfc:mechanics/glassworking" icon: { Count: 1 ForgeCaps: { @@ -1385,6 +1388,7 @@ { dependencies: ["150B7C5CD152E1BA"] description: ["{quests.tfg_tips.trowel.desc}"] + guide_page: "tfc:field_guide tfc:mechanics/trowel" id: "26DFC32AD5DED4E9" subtitle: "{quests.tfg_tips.trowel.subtitle}" tasks: [{ @@ -1405,6 +1409,7 @@ { dependencies: ["150B7C5CD152E1BA"] description: ["{quests.tfg_tips.fishing_net.desc}"] + guide_page: "tfc:field_guide tfc:mechanics/fishing_nets" id: "2A57C41D681E4611" subtitle: "{quests.tfg_tips.fishing_net.subtitle}" tasks: [{ @@ -2452,6 +2457,7 @@ { dependencies: ["150B7C5CD152E1BA"] description: ["{quests.tfg_tips.tools_tips.harvest_basket.desc}"] + guide_page: "tfc:field_guide tfc:mechanics/harvest_baskets" id: "5B0A9757F1EF1B9E" subtitle: "{quests.tfg_tips.tools_tips.harvest_basket.subtitle}" tasks: [{ @@ -2528,6 +2534,7 @@ { dependencies: ["7FA5B6354A49C396"] description: ["{quests.tfg_tips.first_sacks.desc}"] + guide_page: "tfc:field_guide tfc:sns/leather_sack" id: "509C064AA92FD78F" subtitle: "{quests.tfg_tips.first_sacks.subtitle}" tasks: [ @@ -2571,6 +2578,7 @@ { dependencies: ["7178843BCD50A012"] description: ["{quests.tfg_tips.frame_pack.desc}"] + guide_page: "tfc:field_guide tfc:sns/frame_pack" id: "5443F4F5AE53B91A" shape: "octagon" size: 2.0d @@ -2597,6 +2605,7 @@ { dependencies: ["509C064AA92FD78F"] description: ["{quests.tfg_tips.special_sacks.desc}"] + guide_page: "tfc:field_guide tfc:sns/ore_sack" id: "21C58B2541BFA2EE" shape: "heart" subtitle: "{quests.tfg_tips.special_sacks.subtitle}" @@ -2663,6 +2672,7 @@ { dependencies: ["7FA5B6354A49C396"] description: ["{quests.tfg_tips.straw_basket.desc}"] + guide_page: "tfc:field_guide tfc:sns/straw_basket" id: "67F40A90844EC0FC" subtitle: "{quests.tfg_tips.straw_basket.subtitle}" tasks: [{ @@ -2687,6 +2697,7 @@ { dependencies: ["150B7C5CD152E1BA"] description: ["{quests.tfg_tips.hiking.desc}"] + guide_page: "tfc:field_guide tfc:sns/hiking_boots" icon: { Count: 1 id: "sns:hiking_boots" @@ -2780,6 +2791,7 @@ } { dependencies: ["379F434116632A89"] + guide_page: "tfc:field_guide tfc:roadsandroofs/making_a_road" id: "15277C12EEB517E1" shape: "diamond" subtitle: "{quests.tfg_tips.tools_tips.base_course.subtitle}" @@ -2839,6 +2851,7 @@ dependencies: ["15277C12EEB517E1"] description: ["{quests.tfg_tips.tools_tips.gravel_roads.desc}"] disable_toast: true + guide_page: "tfc:field_guide tfc:roadsandroofs/gravel_roads" id: "7E46F50FEBEE9003" subtitle: "{quests.tfg_tips.tools_tips.gravel_roads.subtitle}" tasks: [{ diff --git a/config/ftbquests/quests/chapters/tips__transportation.snbt b/config/ftbquests/quests/chapters/tips__transportation.snbt index 38762674d..0d8a1a5f3 100644 --- a/config/ftbquests/quests/chapters/tips__transportation.snbt +++ b/config/ftbquests/quests/chapters/tips__transportation.snbt @@ -543,6 +543,7 @@ dependencies: ["2B84F34BFA37C828"] dependency_requirement: "one_completed" description: ["{quests.tfg_tips.canoe_materials.desc}"] + guide_page: "tfc:field_guide tfc:firmaciv/canoe" id: "32C854110D49A77D" subtitle: "{quests.tfg_tips.canoe_materials.subtitle}" tasks: [ @@ -603,6 +604,7 @@ { dependencies: ["2B84F34BFA37C828"] description: ["{quests.tfg_tips.kayak_materials.desc}"] + guide_page: "tfc:field_guide tfc:firmaciv/kayak" id: "03696C9BBC53AB26" subtitle: "{quests.tfg_tips.kayak_materials.subtitle}" tasks: [ @@ -649,6 +651,7 @@ "2B84F34BFA37C828" ] description: ["{quests.tfg_tips.rowboat_materials.desc}"] + guide_page: "tfc:field_guide tfc:firmaciv/rowboat" id: "3DF4F4848B231980" subtitle: "{quests.tfg_tips.rowboat_materials.subtitle}" tasks: [ @@ -722,6 +725,7 @@ dependencies: ["2B84F34BFA37C828"] dependency_requirement: "one_completed" description: ["{quests.tfg_tips.sloop_under_construction_materials.desc}"] + guide_page: "tfc:field_guide tfc:firmaciv/sloop" id: "2746958D3D4A0885" subtitle: "{quests.tfg_tips.sloop_under_construction_materials.subtitle}" tasks: [ @@ -844,6 +848,7 @@ { dependencies: ["78358ED2C6F6FCFD"] description: ["{quests.tfg_tips.warfare.desc}"] + guide_page: "tfc:field_guide tfc:firmaciv/cannon" id: "66FDACC7E7F9180C" subtitle: "{quests.tfg_tips.warfare.subtitle}" tasks: [ @@ -890,6 +895,7 @@ { dependencies: ["60497014785301EB"] description: ["{quests.tfg_tips.firmaciv.desc}"] + guide_page: "tfc:field_guide tfc:firmaciv/watercraft" icon: { Count: 1 ForgeCaps: { @@ -916,6 +922,7 @@ { dependencies: ["2B84F34BFA37C828"] description: ["{quests.tfg_tips.firmaciv_info.desc}"] + guide_page: "tfc:field_guide tfc:firmaciv/navigation" id: "5EDE435F876349CD" optional: true shape: "heart" @@ -1462,6 +1469,7 @@ { dependencies: ["1594C2564FC7982D"] description: ["{quests.tfg_tips.horseshoes.desc}"] + guide_page: "tfc:field_guide tfc:sns/horseshoes" id: "40566F6665A095C6" subtitle: "{quests.tfg_tips.horseshoes.subtitle}" tasks: [{ @@ -1482,6 +1490,7 @@ } { description: ["{quests.tfg_tips.hiking_boots.desc}"] + guide_page: "tfc:field_guide tfc:sns/safety_toe_hiking_boots" id: "598CA763D195C84E" subtitle: "{quests.tfg_tips.hiking_boots.subtitle}" tasks: [{ diff --git a/config/gtceu.yaml b/config/gtceu.yaml index 9a896aede..08f62e909 100644 --- a/config/gtceu.yaml +++ b/config/gtceu.yaml @@ -89,15 +89,35 @@ recipes: # Default: false enchantedTools: false + # Whether to enable macerator decomposition recycling + # Default: true + enableMaceratorRecycling: true + + # Percentage yield of macerator decomposition recycling outputs, 1.0 means 100% + # Default: 1.0f + maceratorRecyclingYield: 1.0 + + # Whether to enable arc furnace decomposition recycling + # Default: true + enableArcRecycling: true + + # Percentage yield of arc furnace decomposition recycling outputs, 1.0 means 100% + # Default: 1.0f + arcRecyclingYield: 1.0 + + # Whether to enable extractor decomposition recycling + # Default: true + enableExtractorRecycling: true + + # Percentage yield of extractor decomposition recycling outputs, 1.0 means 100% + # Default: 1.0f + extractorRecyclingYield: 1.0 + worldgen: # Rubber Tree spawn chance (decimal % per chunk) # Default: 0.5 rubberTreeSpawnChance: 0.0 - # Should all Stone Types drop unique Ore Item Blocks? - # Default: false (meaning only Stone, Netherrack, and Endstone) - allUniqueStoneTypes: true - # Should Sand-like ores fall? # This includes gravel, sand, and red sand ores. # Default: false (no falling ores) @@ -199,6 +219,10 @@ machines: # Default: false cleanMultiblocks: false + # Whether the miner should attempt to replace the block mined with a cobbled version of the ore + # Default: true + replaceWithCobbleVersion: true + # Block to replace mined ores with in the miner and multiblock miner. # Default: minecraft:cobblestone replaceMinedBlocksWith: tfc:rock/hardened/rhyolite @@ -211,9 +235,10 @@ machines: # Default: true enableMaintenance: true - # Time in ticks between when Multiblocks can require Maintenance. By default, 48 hours. - # Default: 3456000 - maintenanceTime: 3456000 + # How often to check for maintenance, rolling a 1/6000 chance every X ticks (before secondary effects like Configurable Maintenance Hatch). + # In default settings, this equates to a 5% chance every hour of a machine running. + # Default: 1000 (ticks) + maintenanceCheckRate: 1000 # Whether to enable World Accelerators, which accelerate ticks for surrounding Tile Entities, Crops, etc. # Default: true @@ -288,6 +313,9 @@ machines: # Default: 8 steamMultiParallelAmount: 8 + # Whether the Drums can input fluids from the output side (bottom). + allowDrumsInputFluidsFromOutputSide: false + # Small Steam Boiler Options smallBoilers: # The amount of steam a Steam Solid Boiler produces per second at max temperature. @@ -415,6 +443,10 @@ client: # Default: true renderFluids: true + # Render growing plants in multiblocks that support them? + # Default: true + renderGrowingPlants: true + # Whether or not to color tiered machine highlights in the tier color # Default: true coloredTieredMachineOutline: true @@ -423,6 +455,13 @@ client: # Default: true coloredWireOutline: true + tankItemFluidPreview: + # Set true to render the including fluid icons to GT Drums + drum: false + + # Set true to render the including fluid icons to Super (Quantum) Tanks + quantumTank: false + # Config options for Tools and Armor tools: # Random chance for electric tools to take actual damage @@ -470,7 +509,7 @@ tools: voltageTierQuarkTech: 5 # Advanced QuarkTech Suit Chestplate Voltage Tier. - # Default: 5 (LuV) + # Default: 6 (LuV) voltageTierAdvQuarkTech: 6 # Electric Impeller Jetpack Voltage Tier. @@ -606,6 +645,10 @@ compat: # Default: false showDimensionTier: false + # Whether Create compatibility will be available. + # Default: true + createCompat: true + dev: # Debug general events? (will print recipe conficts etc. to server's debug.log) # Default: false diff --git a/config/tfchotornot-common.toml b/config/tfchotornot-common.toml index fa6a16ee1..44eb98f1c 100644 --- a/config/tfchotornot-common.toml +++ b/config/tfchotornot-common.toml @@ -19,7 +19,7 @@ hotFluidTemperature = 1300 #This sets the temperature when a cold fluid should add effects to the player (in kelvin). #Range: > -2147483648 - coldFluidTemperature = 273 + coldFluidTemperature = 223 #Modifier for how much the offhand item should heat up when holding hot items. Holding multiple hot items will heat your insulating items faster! #Range: 4.9E-324 ~ 1.7976931348623157E308 itemTemperatureModifier = 2.0 diff --git a/defaultconfigs/ftbranks/README.txt b/defaultconfigs/ftbranks/README.txt index 2a9bc74e0..f21e942e5 100644 --- a/defaultconfigs/ftbranks/README.txt +++ b/defaultconfigs/ftbranks/README.txt @@ -1,6 +1,6 @@ === FTB Ranks === -Last README file update: Thu Oct 23 13:15:38 YEKT 2025 +Last README file update: Tue Dec 16 23:03:36 MSK 2025 Wiki: https://www.notion.so/feedthebeast/FTB-Mod-Documentation-da2e359bad2449459d58d787edda3168 To refresh this file, run /ftbranks refresh_readme @@ -169,6 +169,11 @@ command.aptweaks.kill.entities command.aptweaks.kill.items command.aptweaks.load command.aptweaks.playerPositions +command.atl +command.atl.force_refresh +command.atl.reset_statistics +command.atl.run_explicit_gc +command.atl.thread_dump command.attribute command.attribute.target command.attribute.target.attribute @@ -194,9 +199,6 @@ command.attribute.target.attribute.modifier.value.get command.attribute.target.attribute.modifier.value.get.uuid command.attribute.target.attribute.modifier.value.get.uuid.scale command.back -command.backup -command.backup.command -command.backup.command.name command.balm command.balm.dev command.balm.export @@ -204,6 +206,15 @@ command.balm.export.config command.balm.export.config.mod command.balm.export.icons command.balm.export.icons.filter +command.ban +command.ban-ip +command.ban-ip.target +command.ban-ip.target.reason +command.ban.targets +command.ban.targets.reason +command.banlist +command.banlist.ips +command.banlist.players command.bookshelf command.bookshelf.font command.bookshelf.font.block @@ -569,8 +580,6 @@ command.clone.from.sourceDimension.begin.end.to.targetDimension.destination.repl command.clone.from.sourceDimension.begin.end.to.targetDimension.destination.replace.force command.clone.from.sourceDimension.begin.end.to.targetDimension.destination.replace.move command.clone.from.sourceDimension.begin.end.to.targetDimension.destination.replace.normal -command.closeguiscreen -command.closeguiscreen.target_players command.compass_server command.compass_server.build_scene command.compass_server.build_scene.start @@ -1266,20 +1275,24 @@ command.debug.start command.debug.stop command.defaultgamemode command.defaultgamemode.gamemode -command.defaultoptions -command.defaultoptions.saveAll -command.defaultoptions.saveKeys -command.defaultoptions.saveOptions -command.defaultoptions.saveServers command.delhome command.delhome.name command.delwarp command.delwarp.name +command.deop +command.deop.targets command.difficulty command.difficulty.easy command.difficulty.hard command.difficulty.normal command.difficulty.peaceful +command.discord +command.discord.ignore +command.discord.link +command.discord.migrate +command.discord.rawmsg +command.discord.reload +command.discord.unlink command.effect command.effect.clear command.effect.clear.targets @@ -1543,17 +1556,6 @@ command.firmaciv.navigation.pos command.firmaciv.navigation.pos.type command.fly command.fly.player -command.fmlayout -command.fmlayout.layout_name -command.fmlayout.layout_name.is_layout_enabled -command.fmlayout.layout_name.is_layout_enabled.target_players -command.fmvariable -command.fmvariable.get -command.fmvariable.get.variable_name -command.fmvariable.set -command.fmvariable.set.variable_name -command.fmvariable.set.variable_name.send_chat_feedback -command.fmvariable.set.variable_name.send_chat_feedback.set_to_value command.forceload command.forceload.add command.forceload.add.from @@ -1924,23 +1926,13 @@ command.gtceu.place_vein.vein command.gtceu.place_vein.vein.position command.gtceu.ui_editor command.guideme -command.guideme.exportstructure -command.guideme.exportstructure.origin -command.guideme.exportstructure.origin.sizeX -command.guideme.exportstructure.origin.sizeX.sizeY -command.guideme.exportstructure.origin.sizeX.sizeY.sizeZ command.guideme.give command.guideme.give.targets command.guideme.give.targets.guide -command.guideme.importstructure -command.guideme.importstructure.origin command.guideme.open command.guideme.open.targets command.guideme.open.targets.guide command.guideme.open.targets.guide.page -command.guideme.placeallstructures -command.guideme.placeallstructures.origin -command.guideme.placeallstructures.origin.guide command.hat command.heal command.heal.player @@ -2439,6 +2431,7 @@ command.medical_condition.clear.targets.condition command.medical_condition.query command.medical_condition.query.target command.mfsrc +command.mobcaps command.modernfix command.modernfix.mcfunctions command.modernfix.upgradeStructures @@ -2462,14 +2455,17 @@ command.octolib.config command.octolib.config.reload command.octolib.config.reload.all command.octolib.config.reload.path +command.op +command.op.targets command.open-patchouli-book command.open-patchouli-book.targets command.open-patchouli-book.targets.book command.open-patchouli-book.targets.book.entry command.open-patchouli-book.targets.book.entry.page -command.openguiscreen -command.openguiscreen.screen_identifier -command.openguiscreen.screen_identifier.target_players +command.pardon +command.pardon-ip +command.pardon-ip.target +command.pardon.targets command.particle command.particle.name command.particle.name.pos @@ -2480,6 +2476,9 @@ command.particle.name.pos.delta.speed.count.force command.particle.name.pos.delta.speed.count.force.viewers command.particle.name.pos.delta.speed.count.normal command.particle.name.pos.delta.speed.count.normal.viewers +command.perf +command.perf.start +command.perf.stop command.ping command.ping.target command.place @@ -2575,10 +2574,6 @@ command.ponder.reload command.ponder.scene command.ponder.scene.targets command.ponder.tags -command.publish -command.publish.allowCommands -command.publish.allowCommands.gamemode -command.publish.allowCommands.gamemode.port command.railways command.railways.split_train command.railways.split_train.train_id @@ -2608,6 +2603,10 @@ command.ride.target.dismount command.ride.target.mount command.ride.target.mount.vehicle command.rtp +command.save-all +command.save-all.flush +command.save-off +command.save-on command.say command.say.message command.sbp @@ -2618,6 +2617,36 @@ command.sbp.list command.sbp.list.playerName command.sbp.removeNonPlayer command.sbp.removeNonPlayer.onlyWithEmptyInventory +command.sbp.template +command.sbp.template.create +command.sbp.template.create.templateName +command.sbp.template.create.templateName.override +command.sbp.template.delete +command.sbp.template.delete.templateName +command.sbp.template.dynamic +command.sbp.template.dynamic.addItem +command.sbp.template.dynamic.addItem.templateName +command.sbp.template.dynamic.addItem.templateName.item +command.sbp.template.dynamic.addItem.templateName.item.count +command.sbp.template.dynamic.addItem.templateName.slot +command.sbp.template.dynamic.addItem.templateName.slot.item +command.sbp.template.dynamic.addItem.templateName.slot.item.count +command.sbp.template.dynamic.addUpgrade +command.sbp.template.dynamic.addUpgrade.templateName +command.sbp.template.dynamic.addUpgrade.templateName.item +command.sbp.template.dynamic.begin +command.sbp.template.dynamic.begin.templateName +command.sbp.template.dynamic.begin.templateName.backpackItem +command.sbp.template.dynamic.begin.templateName.baseTemplateName +command.sbp.template.dynamic.end +command.sbp.template.dynamic.end.templateName +command.sbp.template.export +command.sbp.template.export.templateName +command.sbp.template.export.templateName.delete +command.sbp.template.give +command.sbp.template.give.templateName +command.sbp.template.give.templateName.targets +command.sbp.template.list command.schedule command.schedule.clear command.schedule.clear.function @@ -2676,6 +2705,18 @@ command.scoreboard.players.set.targets command.scoreboard.players.set.targets.objective command.scoreboard.players.set.targets.objective.score command.seed +command.servercore +command.servercore.reload +command.servercore.settings +command.servercore.settings.chunk_tick_distance +command.servercore.settings.chunk_tick_distance.value +command.servercore.settings.mobcap_percentage +command.servercore.settings.mobcap_percentage.value +command.servercore.settings.simulation_distance +command.servercore.settings.simulation_distance.value +command.servercore.settings.view_distance +command.servercore.settings.view_distance.value +command.servercore.status command.setblock command.setblock.pos command.setblock.pos.block @@ -2684,6 +2725,8 @@ command.setblock.pos.block.keep command.setblock.pos.block.replace command.sethome command.sethome.name +command.setidletimeout +command.setidletimeout.minutes command.setwarp command.setwarp.name command.setworldspawn @@ -2725,7 +2768,25 @@ command.spreadplayers.center.spreadDistance.maxRange.under command.spreadplayers.center.spreadDistance.maxRange.under.maxHeight command.spreadplayers.center.spreadDistance.maxRange.under.maxHeight.respectTeams command.spreadplayers.center.spreadDistance.maxRange.under.maxHeight.respectTeams.targets +command.statistics +command.statistics.block-entities +command.statistics.block-entities.byPlayer +command.statistics.block-entities.byPlayer.page +command.statistics.block-entities.byType +command.statistics.block-entities.byType.page +command.statistics.block-entities.byType.player +command.statistics.block-entities.byType.player.page +command.statistics.block-entities.page +command.statistics.entities +command.statistics.entities.byPlayer +command.statistics.entities.byPlayer.page +command.statistics.entities.byType +command.statistics.entities.byType.page +command.statistics.entities.byType.player +command.statistics.entities.byType.player.page +command.statistics.entities.page command.stonecutter +command.stop command.stopsound command.stopsound.targets command.stopsound.targets.all @@ -2990,6 +3051,15 @@ command.weather.rain.duration.intensity command.weather.thunder command.weather.thunder.duration command.weather.thunder.duration.intensity +command.whitelist +command.whitelist.add +command.whitelist.add.targets +command.whitelist.list +command.whitelist.off +command.whitelist.on +command.whitelist.reload +command.whitelist.remove +command.whitelist.remove.targets command.worldborder command.worldborder.add command.worldborder.add.distance diff --git a/kubejs/assets/ad_astra/lang/ru_ru.json b/kubejs/assets/ad_astra/lang/ru_ru.json index 92efa0e61..70ccf24ed 100644 --- a/kubejs/assets/ad_astra/lang/ru_ru.json +++ b/kubejs/assets/ad_astra/lang/ru_ru.json @@ -129,10 +129,10 @@ "item.ad_astra.steel_engine": "Ракетный двигатель (Сталь)", "item.ad_astra.desh_engine": "Ракетный двигатель (Деш)", "item.ad_astra.ostrum_engine": "Ракетный двигатель (Острум)", - "item.ad_astra.netherite_space_helmet": "§bКосмический шлем из вольфармовой стали", - "item.ad_astra.netherite_space_suit": "§bКосмический костюм из вольфармовой стали", - "item.ad_astra.netherite_space_pants": "§bКосмические штаны из вольфармовой стали", - "item.ad_astra.netherite_space_boots": "§bКосмические ботинки из вольфармовой стали", + "item.ad_astra.netherite_space_helmet": "§bКосмический шлем из вольфрамовой стали", + "item.ad_astra.netherite_space_suit": "§bКосмический костюм из вольфрамовой стали", + "item.ad_astra.netherite_space_pants": "§bКосмические штаны из вольфрамовой стали", + "item.ad_astra.netherite_space_boots": "§bКосмические ботинки из вольфрамовой стали", "item.ad_astra.cheese": "Лунный сыр", "dimension.ad_astra.glacio": "Европа", "dimension.ad_astra.glacio_orbit": "Орбита Европы", diff --git a/kubejs/assets/ae2/lang/en_us.json b/kubejs/assets/ae2/lang/en_us.json index 21c8b4547..c8cfd5d83 100644 --- a/kubejs/assets/ae2/lang/en_us.json +++ b/kubejs/assets/ae2/lang/en_us.json @@ -2,5 +2,22 @@ "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.", "gui.ae2.inWorldCraftingPresses": "Crafting Presses are obtained by breaking a Mysterious Cube. Mysterious Cubes are in the center of meteorites which can be found on the moon.", "gui.advanced_ae.AdvPatternProvider": "", - "gui.expandedae.exp_pattern_provider": "" + "gui.expandedae.exp_pattern_provider": "", + "item.ae2.sky_dust": "Suevite Dust", + "block.ae2.sky_stone_block": "Raw Suevite", + "block.ae2.sky_stone_stairs": "Suevite Stairs", + "block.ae2.sky_stone_wall": "Suevite Wall", + "block.ae2.sky_stone_slab": "Suevite Slab", + "block.ae2.smooth_sky_stone_block": "Smooth Suevite", + "block.ae2.smooth_sky_stone_stairs": "Smooth Suevite Stairs", + "block.ae2.smooth_sky_stone_wall": "Smooth Suevite Wall", + "block.ae2.smooth_sky_stone_slab": "Smooth Suevite Slab", + "block.ae2.sky_stone_brick": "Suevite Bricks", + "block.ae2.sky_stone_brick_stairs": "Suevite Brick Stairs", + "block.ae2.sky_stone_brick_wall": "Suevite Brick Wall", + "block.ae2.sky_stone_brick_slab": "Suevite Brick Slab", + "block.ae2.sky_stone_small_brick": "Suevite Small Bricks", + "block.ae2.sky_stone_small_brick_stairs": "Suevite Small Brick Stairs", + "block.ae2.sky_stone_small_brick_wall": "Suevite Small Brick Wall", + "block.ae2.sky_stone_small_brick_slab": "Suevite Small Brick Slab" } \ No newline at end of file diff --git a/kubejs/assets/ae2/lang/zh_cn.json b/kubejs/assets/ae2/lang/zh_cn.json index d02af0331..626e45052 100644 --- a/kubejs/assets/ae2/lang/zh_cn.json +++ b/kubejs/assets/ae2/lang/zh_cn.json @@ -2,5 +2,22 @@ "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.", "gui.ae2.inWorldCraftingPresses": "压印模板可通过破坏神秘方块获得，而神秘方块位于月球陨石的中心。", "gui.advanced_ae.AdvPatternProvider": "", - "gui.expandedae.exp_pattern_provider": "" + "gui.expandedae.exp_pattern_provider": "", + "item.ae2.sky_dust": "冲击岩粉", + "block.ae2.sky_stone_block": "天然冲击岩", + "block.ae2.sky_stone_stairs": "冲击岩楼梯", + "block.ae2.sky_stone_wall": "冲击岩墙", + "block.ae2.sky_stone_slab": "冲击岩台阶", + "block.ae2.smooth_sky_stone_block": "平滑冲击岩", + "block.ae2.smooth_sky_stone_stairs": "平滑冲击岩楼梯", + "block.ae2.smooth_sky_stone_wall": "平滑冲击岩墙", + "block.ae2.smooth_sky_stone_slab": "平滑冲击岩台阶", + "block.ae2.sky_stone_brick": "冲击岩砖", + "block.ae2.sky_stone_brick_stairs": "冲击岩砖楼梯", + "block.ae2.sky_stone_brick_wall": "冲击岩砖墙", + "block.ae2.sky_stone_brick_slab": "冲击岩砖台阶", + "block.ae2.sky_stone_small_brick": "小型冲击岩砖", + "block.ae2.sky_stone_small_brick_stairs": "小型冲击岩砖楼梯", + "block.ae2.sky_stone_small_brick_wall": "小型冲击岩砖墙", + "block.ae2.sky_stone_small_brick_slab": "小型冲击岩砖台阶" } \ No newline at end of file diff --git a/kubejs/assets/beneath/lang/zh_cn.json b/kubejs/assets/beneath/lang/zh_cn.json index 74d646d27..73bfe44ee 100644 --- a/kubejs/assets/beneath/lang/zh_cn.json +++ b/kubejs/assets/beneath/lang/zh_cn.json @@ -263,7 +263,7 @@ "block.beneath.warped_thatch": "诡异干草块", "block.beneath.crimson_thatch": "绯红干草块", "block.beneath.hellbricks": "地狱砖", - "tfc.recipe.barrel.tfc.barrel.mortar": "灰泥", + "tfc.recipe.barrel.tfc.barrel.mortar": "砂浆", "item.beneath.cursed_hide": "耐火皮革", "item.beneath.blackstone_brick": "辉石岩砖", "item.beneath.cursecoal": "无烟煤", diff --git a/kubejs/assets/beneath/textures/item/blackstone_pebble.png b/kubejs/assets/beneath/textures/item/blackstone_pebble.png new file mode 100644 index 000000000..76d7bc81b Binary files /dev/null and b/kubejs/assets/beneath/textures/item/blackstone_pebble.png differ diff --git a/kubejs/assets/forge/models/tag/item/sand.json b/kubejs/assets/forge/models/tag/item/sand.json new file mode 100644 index 000000000..7a5974d0b --- /dev/null +++ b/kubejs/assets/forge/models/tag/item/sand.json @@ -0,0 +1,3 @@ +{ + "parent": "tfc:item/sand/yellow" +} \ No newline at end of file diff --git a/kubejs/assets/greate/blockstates/rose_quartz_bud_indicator.json b/kubejs/assets/greate/blockstates/rose_quartz_bud_indicator.json new file mode 100644 index 000000000..8f1495444 --- /dev/null +++ b/kubejs/assets/greate/blockstates/rose_quartz_bud_indicator.json @@ -0,0 +1,10 @@ +{ + "variants": { + "": [ + { "model": "greate:block/rose_quartz_bud_indicator" }, + { "model": "greate:block/rose_quartz_bud_indicator", "y": 90 }, + { "model": "greate:block/rose_quartz_bud_indicator", "y": 180 }, + { "model": "greate:block/rose_quartz_bud_indicator", "y": 270 } + ] + } +} \ No newline at end of file diff --git a/kubejs/assets/greate/lang/en_us.json b/kubejs/assets/greate/lang/en_us.json index aacdc7752..a4a4331f2 100644 --- a/kubejs/assets/greate/lang/en_us.json +++ b/kubejs/assets/greate/lang/en_us.json @@ -32,11 +32,11 @@ "block.greate.large_andesite_alloy_cogwheel": "Large Basic Cogwheel", "block.greate.metal_girder_encased_andesite_alloy_shaft": "Metal Girder Encased Basic Shaft", "block.greate.powered_andesite_alloy_shaft": "Powered Basic Shaft", - "item.greate.rubber_belt_connector": "Rubber Belt", - "item.greate.silicone_rubber_belt_connector": "Silicone Rubber Belt", - "block.greate.polyethylene_belt_titanium": "Styrene Butadiene Rubber Belt", - "block.greate.polyethylene_belt_tungsten_steel": "Styrene Butadiene Rubber Belt", - "item.greate.polyethylene_belt_connector": "Styrene Butadiene Rubber Belt", + "item.greate.andesite_alloy_belt_connector": "Plank Tread Mechanical Belt", + "item.greate.stone_belt_connector": "Leather Mechanical Belt", + "item.greate.rubber_belt_connector": "Rubber Mechanical Belt", + "item.greate.silicone_rubber_belt_connector": "Silicone Rubber Mechanical Belt", + "item.greate.styrene_butadiene_rubber_belt_connector": "Styrene Butadiene Rubber Mechanical Belt", "item.greate.andesite_alloy_vertical_gearbox": "Basic Vertical Gearbox", "greate.recipe.packing": "Welding & Packing", "greate.ponder.belt_casing.text_1": "Brass or Metal Casing can be used to decorate Mechanical Belts", diff --git a/kubejs/assets/greate/lang/zh_cn.json b/kubejs/assets/greate/lang/zh_cn.json index 7230a1344..c2d749888 100644 --- a/kubejs/assets/greate/lang/zh_cn.json +++ b/kubejs/assets/greate/lang/zh_cn.json @@ -368,11 +368,11 @@ "block.greate.large_andesite_alloy_cogwheel": "大型基础齿轮", "block.greate.metal_girder_encased_andesite_alloy_shaft": "金属梁包住的基础传动杆", "block.greate.powered_andesite_alloy_shaft": "基础动力曲轴", + "item.greate.andesite_alloy_belt_connector": "木板履带式传送带", + "item.greate.stone_belt_connector": "皮革传送带", "item.greate.rubber_belt_connector": "橡胶传送带", "item.greate.silicone_rubber_belt_connector": "硅橡胶传送带", - "block.greate.polyethylene_belt_titanium": "丁苯橡胶传送带", - "block.greate.polyethylene_belt_tungsten_steel": "丁苯橡胶传送带", - "item.greate.polyethylene_belt_connector": "丁苯橡胶传送带", + "item.greate.styrene_butadiene_rubber_belt_connector": "丁苯橡胶传送带", "item.greate.andesite_alloy_vertical_gearbox": "基础竖直十字齿轮箱", "greate.recipe.packing": "焊接 & 压缩", "greate.ponder.belt_casing.text_1": "你可以用黄铜或者金属机壳装饰你的传送带", diff --git a/kubejs/assets/gtceu/models/block/rose_quartz_bud_indicator.json b/kubejs/assets/greate/models/block/rose_quartz_bud_indicator.json similarity index 100% rename from kubejs/assets/gtceu/models/block/rose_quartz_bud_indicator.json rename to kubejs/assets/greate/models/block/rose_quartz_bud_indicator.json diff --git a/kubejs/assets/greate/textures/block/andesite_alloy/belt.png b/kubejs/assets/greate/textures/block/andesite_alloy/belt.png new file mode 100644 index 000000000..bd259c25d Binary files /dev/null and b/kubejs/assets/greate/textures/block/andesite_alloy/belt.png differ diff --git a/kubejs/assets/greate/textures/block/andesite_alloy/belt_diagonal.png b/kubejs/assets/greate/textures/block/andesite_alloy/belt_diagonal.png new file mode 100644 index 000000000..6dd58dd7d Binary files /dev/null and b/kubejs/assets/greate/textures/block/andesite_alloy/belt_diagonal.png differ diff --git a/kubejs/assets/greate/textures/block/andesite_alloy/belt_diagonal_scroll.png b/kubejs/assets/greate/textures/block/andesite_alloy/belt_diagonal_scroll.png new file mode 100644 index 000000000..b65fed607 Binary files /dev/null and b/kubejs/assets/greate/textures/block/andesite_alloy/belt_diagonal_scroll.png differ diff --git a/kubejs/assets/greate/textures/block/andesite_alloy/belt_offset.png b/kubejs/assets/greate/textures/block/andesite_alloy/belt_offset.png new file mode 100644 index 000000000..8ea0053a8 Binary files /dev/null and b/kubejs/assets/greate/textures/block/andesite_alloy/belt_offset.png differ diff --git a/kubejs/assets/greate/textures/block/andesite_alloy/belt_scroll.png b/kubejs/assets/greate/textures/block/andesite_alloy/belt_scroll.png new file mode 100644 index 000000000..751ec63b0 Binary files /dev/null and b/kubejs/assets/greate/textures/block/andesite_alloy/belt_scroll.png differ diff --git a/kubejs/assets/greate/textures/block/rubber/belt.png b/kubejs/assets/greate/textures/block/rubber/belt.png new file mode 100644 index 000000000..61e23bdd3 Binary files /dev/null and b/kubejs/assets/greate/textures/block/rubber/belt.png differ diff --git a/kubejs/assets/greate/textures/block/rubber/belt_diagonal.png b/kubejs/assets/greate/textures/block/rubber/belt_diagonal.png new file mode 100644 index 000000000..45b40ff7a Binary files /dev/null and b/kubejs/assets/greate/textures/block/rubber/belt_diagonal.png differ diff --git a/kubejs/assets/greate/textures/block/rubber/belt_diagonal_scroll.png b/kubejs/assets/greate/textures/block/rubber/belt_diagonal_scroll.png new file mode 100644 index 000000000..6ec8ee545 Binary files /dev/null and b/kubejs/assets/greate/textures/block/rubber/belt_diagonal_scroll.png differ diff --git a/kubejs/assets/greate/textures/block/rubber/belt_offset.png b/kubejs/assets/greate/textures/block/rubber/belt_offset.png new file mode 100644 index 000000000..bc4fe47aa Binary files /dev/null and b/kubejs/assets/greate/textures/block/rubber/belt_offset.png differ diff --git a/kubejs/assets/greate/textures/block/rubber/belt_scroll.png b/kubejs/assets/greate/textures/block/rubber/belt_scroll.png new file mode 100644 index 000000000..bd1074a78 Binary files /dev/null and b/kubejs/assets/greate/textures/block/rubber/belt_scroll.png differ diff --git a/kubejs/assets/greate/textures/block/silicone_rubber/belt.png b/kubejs/assets/greate/textures/block/silicone_rubber/belt.png new file mode 100644 index 000000000..12024e291 Binary files /dev/null and b/kubejs/assets/greate/textures/block/silicone_rubber/belt.png differ diff --git a/kubejs/assets/greate/textures/block/silicone_rubber/belt_diagonal.png b/kubejs/assets/greate/textures/block/silicone_rubber/belt_diagonal.png new file mode 100644 index 000000000..fab27e223 Binary files /dev/null and b/kubejs/assets/greate/textures/block/silicone_rubber/belt_diagonal.png differ diff --git a/kubejs/assets/greate/textures/block/silicone_rubber/belt_diagonal_scroll.png b/kubejs/assets/greate/textures/block/silicone_rubber/belt_diagonal_scroll.png new file mode 100644 index 000000000..3f3fa5237 Binary files /dev/null and b/kubejs/assets/greate/textures/block/silicone_rubber/belt_diagonal_scroll.png differ diff --git a/kubejs/assets/greate/textures/block/silicone_rubber/belt_offset.png b/kubejs/assets/greate/textures/block/silicone_rubber/belt_offset.png new file mode 100644 index 000000000..c6f9102c1 Binary files /dev/null and b/kubejs/assets/greate/textures/block/silicone_rubber/belt_offset.png differ diff --git a/kubejs/assets/greate/textures/block/silicone_rubber/belt_scroll.png b/kubejs/assets/greate/textures/block/silicone_rubber/belt_scroll.png new file mode 100644 index 000000000..db67db48e Binary files /dev/null and b/kubejs/assets/greate/textures/block/silicone_rubber/belt_scroll.png differ diff --git a/kubejs/assets/greate/textures/block/stone/belt.png b/kubejs/assets/greate/textures/block/stone/belt.png new file mode 100644 index 000000000..b1806dadc Binary files /dev/null and b/kubejs/assets/greate/textures/block/stone/belt.png differ diff --git a/kubejs/assets/greate/textures/block/stone/belt_diagonal.png b/kubejs/assets/greate/textures/block/stone/belt_diagonal.png new file mode 100644 index 000000000..a2ca94799 Binary files /dev/null and b/kubejs/assets/greate/textures/block/stone/belt_diagonal.png differ diff --git a/kubejs/assets/greate/textures/block/stone/belt_diagonal_scroll.png b/kubejs/assets/greate/textures/block/stone/belt_diagonal_scroll.png new file mode 100644 index 000000000..cf862379d Binary files /dev/null and b/kubejs/assets/greate/textures/block/stone/belt_diagonal_scroll.png differ diff --git a/kubejs/assets/greate/textures/block/stone/belt_offset.png b/kubejs/assets/greate/textures/block/stone/belt_offset.png new file mode 100644 index 000000000..2315f5d2a Binary files /dev/null and b/kubejs/assets/greate/textures/block/stone/belt_offset.png differ diff --git a/kubejs/assets/greate/textures/block/stone/belt_scroll.png b/kubejs/assets/greate/textures/block/stone/belt_scroll.png new file mode 100644 index 000000000..c9318f8e0 Binary files /dev/null and b/kubejs/assets/greate/textures/block/stone/belt_scroll.png differ diff --git a/kubejs/assets/greate/textures/block/styrene_butadiene_rubber/belt.png b/kubejs/assets/greate/textures/block/styrene_butadiene_rubber/belt.png new file mode 100644 index 000000000..e1607ede0 Binary files /dev/null and b/kubejs/assets/greate/textures/block/styrene_butadiene_rubber/belt.png differ diff --git a/kubejs/assets/greate/textures/block/styrene_butadiene_rubber/belt_diagonal.png b/kubejs/assets/greate/textures/block/styrene_butadiene_rubber/belt_diagonal.png new file mode 100644 index 000000000..3ba4c8824 Binary files /dev/null and b/kubejs/assets/greate/textures/block/styrene_butadiene_rubber/belt_diagonal.png differ diff --git a/kubejs/assets/greate/textures/block/styrene_butadiene_rubber/belt_diagonal_scroll.png b/kubejs/assets/greate/textures/block/styrene_butadiene_rubber/belt_diagonal_scroll.png new file mode 100644 index 000000000..4dba576c8 Binary files /dev/null and b/kubejs/assets/greate/textures/block/styrene_butadiene_rubber/belt_diagonal_scroll.png differ diff --git a/kubejs/assets/greate/textures/block/styrene_butadiene_rubber/belt_offset.png b/kubejs/assets/greate/textures/block/styrene_butadiene_rubber/belt_offset.png new file mode 100644 index 000000000..a994b49bd Binary files /dev/null and b/kubejs/assets/greate/textures/block/styrene_butadiene_rubber/belt_offset.png differ diff --git a/kubejs/assets/greate/textures/block/styrene_butadiene_rubber/belt_scroll.png b/kubejs/assets/greate/textures/block/styrene_butadiene_rubber/belt_scroll.png new file mode 100644 index 000000000..60d982b10 Binary files /dev/null and b/kubejs/assets/greate/textures/block/styrene_butadiene_rubber/belt_scroll.png differ diff --git a/kubejs/assets/greate/textures/item/andesite_alloy_belt_connector.png b/kubejs/assets/greate/textures/item/andesite_alloy_belt_connector.png new file mode 100644 index 000000000..170fe3f95 Binary files /dev/null and b/kubejs/assets/greate/textures/item/andesite_alloy_belt_connector.png differ diff --git a/kubejs/assets/greate/textures/item/rubber_belt_connector.png b/kubejs/assets/greate/textures/item/rubber_belt_connector.png new file mode 100644 index 000000000..cc459e5ef Binary files /dev/null and b/kubejs/assets/greate/textures/item/rubber_belt_connector.png differ diff --git a/kubejs/assets/greate/textures/item/silicone_rubber_belt_connector.png b/kubejs/assets/greate/textures/item/silicone_rubber_belt_connector.png new file mode 100644 index 000000000..0fa0a707b Binary files /dev/null and b/kubejs/assets/greate/textures/item/silicone_rubber_belt_connector.png differ diff --git a/kubejs/assets/greate/textures/item/stone_belt_connector.png b/kubejs/assets/greate/textures/item/stone_belt_connector.png new file mode 100644 index 000000000..f5b101e99 Binary files /dev/null and b/kubejs/assets/greate/textures/item/stone_belt_connector.png differ diff --git a/kubejs/assets/greate/textures/item/styrene_butadiene_rubber_belt_connector.png b/kubejs/assets/greate/textures/item/styrene_butadiene_rubber_belt_connector.png new file mode 100644 index 000000000..5f95e2bbd Binary files /dev/null and b/kubejs/assets/greate/textures/item/styrene_butadiene_rubber_belt_connector.png differ diff --git a/kubejs/assets/gtceu/blockstates/rose_quartz_bud_indicator.json b/kubejs/assets/gtceu/blockstates/rose_quartz_bud_indicator.json deleted file mode 100644 index dacf99e1c..000000000 --- a/kubejs/assets/gtceu/blockstates/rose_quartz_bud_indicator.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "": [ - { "model": "gtceu:block/rose_quartz_bud_indicator" }, - { "model": "gtceu:block/rose_quartz_bud_indicator", "y": 90 }, - { "model": "gtceu:block/rose_quartz_bud_indicator", "y": 180 }, - { "model": "gtceu:block/rose_quartz_bud_indicator", "y": 270 } - ] - } -} \ No newline at end of file diff --git a/kubejs/assets/gtceu/lang/en_us.json b/kubejs/assets/gtceu/lang/en_us.json index 3cb0b07be..af50b8063 100644 --- a/kubejs/assets/gtceu/lang/en_us.json +++ b/kubejs/assets/gtceu/lang/en_us.json @@ -14,7 +14,7 @@ "block.gtceu.ostrum_harvester": "Ostrum Harvester", "block.gtceu.moon_dust_harvester": "Moon Dust Harvester", "block.tfg.ostrum_linear_accelerator": "Ostrum Linear Accelerator", - "block.gtceu.coal_liquefaction_tower": "Coal Liquefaction Tower", + "block.gtceu.coal_liquefaction_tower": "Liquefaction Tower", "block.gtceu.ulv_super_tank": "Basic Super Tank", "block.gtceu.ulv_super_chest": "Basic Super Chest", "block.gtceu.ulv_hermetic_casing": "Basic Hermetic Casing", @@ -50,7 +50,7 @@ "gtceu.ostrum_linear_accelerator": "Ostrum Linear Accelerator", "gtceu.bioreactor": "Bioreactor", "gtceu.growth_chamber": "Growth Chamber", - "gtceu.coal_liquefaction_tower": "Coal Liquefaction", + "gtceu.coal_liquefaction_tower": "Liquefaction Tower", "gtceu.smr_generator": "Small Modular Turbine", "gtceu.tooltip.machine.moon_dust_harvester_1": "§7Extraterrestrial Vacuum Cleaner§r", "gtceu.tooltip.machine.moon_dust_harvester_2": "§7Harvests infinite Regolith Dust depending on the biome its placed in.§r", @@ -67,8 +67,8 @@ "gtceu.tooltip.machine.steam_bloomery_2": "§7Processes Iron-bearing Dusts or Ingots into Raw Iron Blooms.§r", "gtceu.tooltip.machine.steam_bloomery_3": "§7Fueling it with Coke or Anthracite will double the output.§r", "gtceu.tooltip.machine.steam_bloomery_4": "§7Can process up to 8 recipes at once, which changes how much Steam is required.§r", - "gtceu.tooltip.machine.coal_liquefaction_tower_1": "§7Carbon Smoothie Maker§r", - "gtceu.tooltip.machine.coal_liquefaction_tower_2": "§7Extracts gas fuels from carbonic solids and creosote§r", + "gtceu.tooltip.machine.coal_liquefaction_tower_1": "§7Smoothie Maker§r", + "gtceu.tooltip.machine.coal_liquefaction_tower_2": "§7Extracts gas and liquids from carbonic solids§r", "item.gtceu.tiny_wood_dust": "Tiny Pile of Softwood Pulp", "item.gtceu.small_wood_dust": "Small Pile of Softwood Pulp", "item.gtceu.wood_dust": "Softwood Pulp", @@ -210,8 +210,9 @@ "gtceu.jei.bedrock_fluid.heavy_ammoniacal_water": "Martian Heavy Ammoniacal Water Deposit", "gtceu.jei.bedrock_fluid.liquid_ice": "Martian Ice Deposit", "gtceu.recipe.category.ingot_molding": "Material Molding", - "block.gtceu.wire_coil.tooltip_pyro": "§8Pyrolyse Oven and Nuclear Fuel Factory:§r", - "block.gtceu.wire_coil.tooltip_cracking": "§8Cracking Unit, Coal Liquefaction Tower, Moon and Ostrum Harvesters:§r", + "block.gtceu.wire_coil.tooltip_pyro": "§8Pyrolyse Oven, Liquefaction Tower and Nuclear Fuel Factory:§r", + "block.gtceu.wire_coil.tooltip_cracking": "§8Cracking Unit, Moon and Ostrum Harvesters:§r", + "tooltip.moldraw.shift_view": "§7§oHold (Shift) for Molecular Structure§r", "tagprefix.sword_head": "%s Sword Head", "tagprefix.pickaxe_head": "%s Pickaxe Head", "tagprefix.shovel_head": "%s Shovel Head", diff --git a/kubejs/assets/gtceu/lang/ja_jp.json b/kubejs/assets/gtceu/lang/ja_jp.json index 7cdfb7d50..92adeb03e 100644 --- a/kubejs/assets/gtceu/lang/ja_jp.json +++ b/kubejs/assets/gtceu/lang/ja_jp.json @@ -14,6 +14,7 @@ "block.gtceu.ostrum_harvester": "オストラムハーベスター", "block.gtceu.moon_dust_harvester": "ムーンハーベスター", "block.tfg.ostrum_linear_accelerator": "オストラムリニアアクセラレーター", + "block.gtceu.coal_liquefaction_tower": "液化塔", "block.gtceu.ulv_super_tank": "基本型スーパータンク", "block.gtceu.ulv_super_chest": "基本型スーパーチェスト", "block.gtceu.ulv_hermetic_casing": "基本気密外装", @@ -49,6 +50,8 @@ "gtceu.ostrum_linear_accelerator": "オストラムリニアアクセラレーター", "gtceu.bioreactor": "Bioreactor", "gtceu.growth_chamber": "Growth Chamber", + "gtceu.coal_liquefaction_tower": "液化塔", + "gtceu.smr_generator": "Small Modular Turbine", "gtceu.tooltip.machine.moon_dust_harvester_1": "§7Extraterrestrial Vacuum Cleaner§r", "gtceu.tooltip.machine.moon_dust_harvester_2": "§7Harvests infinite Regolith Dust depending on the biome its placed in.§r", "gtceu.tooltip.machine.ostrum_harvester_1": "§7Legally Distinct Spice Crawler§r", @@ -64,8 +67,8 @@ "gtceu.tooltip.machine.steam_bloomery_2": "§7Processes Iron-bearing Dusts or Ingots into Raw Iron Blooms.§r", "gtceu.tooltip.machine.steam_bloomery_3": "§7Fueling it with Coke or Anthracite will double the output.§r", "gtceu.tooltip.machine.steam_bloomery_4": "§7Can process up to 8 recipes at once, which changes how much Steam is required.§r", - "gtceu.tooltip.machine.coal_liquefaction_tower_1": "§7Carbon Smoothie Maker§r", - "gtceu.tooltip.machine.coal_liquefaction_tower_2": "§7Extracts gas fuels from carbonic solids and creosote§r", + "gtceu.tooltip.machine.coal_liquefaction_tower_1": "§7Smoothie Maker§r", + "gtceu.tooltip.machine.coal_liquefaction_tower_2": "§7Extracts gas and liquids from carbonic solids§r", "item.gtceu.tiny_wood_dust": "極小の木のパルプ", "item.gtceu.small_wood_dust": "小さな木のパルプ", "item.gtceu.wood_dust": "木のパルプ", @@ -139,6 +142,7 @@ "material.gtceu.ostrum": "オストラム", "material.tfg.calorite": "カロライト", "material.tfg.etrium": "エトリウム", + "material.gtceu.tarkianite": "タキアン鉱", "material.gtceu.aluminium_silicate": "ケイ酸アルミニウム", "material.gtceu.rocket_alloy_t1": "R-AS ロケット合金", "material.gtceu.rocket_alloy_t2": "ASM-4914 チタニウムロケット合金", @@ -197,6 +201,7 @@ "item.gtceu.tool.tooltip.repair_material": "", "gtceu.machine.lp_steam_extractor.tooltip": "§7Does not extract fluids", "gtceu.machine.hp_steam_extractor.tooltip": "§7Does not extract fluids", + "gtceu.jei.bedrock_fluid.nether_natural_gas_deposit": "Beneath Natural Gas Deposit", "gtceu.jei.bedrock_fluid.moon_helium": "ヘリウム", "gtceu.jei.bedrock_fluid.moon_helium_3": "ヘリウム3", "gtceu.jei.bedrock_fluid.moon_argon": "アルゴン", @@ -205,6 +210,8 @@ "gtceu.jei.bedrock_fluid.heavy_ammoniacal_water": "アンモニア交じりの重水", "gtceu.jei.bedrock_fluid.liquid_ice": "氷", "gtceu.recipe.category.ingot_molding": "Material Molding", + "block.gtceu.wire_coil.tooltip_pyro": "§8Pyrolyse Oven and Nuclear Fuel Factory:§r", + "block.gtceu.wire_coil.tooltip_cracking": "§8Cracking Unit, Coal Liquefaction Tower, Moon and Ostrum Harvesters:§r", "tagprefix.sword_head": "%s製剣身", "tagprefix.pickaxe_head": "%s製ピッケルの頭", "tagprefix.shovel_head": "%s製シャベルの頭", diff --git a/kubejs/assets/gtceu/lang/uk_ua.json b/kubejs/assets/gtceu/lang/uk_ua.json index 076d84661..31a9abeb0 100644 --- a/kubejs/assets/gtceu/lang/uk_ua.json +++ b/kubejs/assets/gtceu/lang/uk_ua.json @@ -64,8 +64,8 @@ "gtceu.tooltip.machine.steam_bloomery_2": "§7Переробляє залізовмісний пил або злитки у сирі залізні криці.§r", "gtceu.tooltip.machine.steam_bloomery_3": "§7Використання коксу чи антрациту як палива подвоїть вихід.§r", "gtceu.tooltip.machine.steam_bloomery_4": "§7Може обробляти до 8 рецептів одночасно, що змінює кількість необхідної пари.§r", - "gtceu.tooltip.machine.coal_liquefaction_tower_1": "§7Carbon Smoothie Maker§r", - "gtceu.tooltip.machine.coal_liquefaction_tower_2": "§7Extracts gas fuels from carbonic solids and creosote§r", + "gtceu.tooltip.machine.coal_liquefaction_tower_1": "§7Smoothie Maker§r", + "gtceu.tooltip.machine.coal_liquefaction_tower_2": "§7Extracts gas and liquids from carbonic solids§r", "item.gtceu.tiny_wood_dust": "Маленька купа хвойної целюлози", "item.gtceu.small_wood_dust": "Мала купа хвойної целюлози", "item.gtceu.wood_dust": "Хвойна целюлоза", diff --git a/kubejs/assets/gtceu/lang/zh_cn.json b/kubejs/assets/gtceu/lang/zh_cn.json index ab5c5a070..48a78abd1 100644 --- a/kubejs/assets/gtceu/lang/zh_cn.json +++ b/kubejs/assets/gtceu/lang/zh_cn.json @@ -14,7 +14,7 @@ "block.gtceu.ostrum_harvester": "紫金采集器", "block.gtceu.moon_dust_harvester": "月壤采集器", "block.tfg.ostrum_linear_accelerator": "紫金线性加速器", - "block.gtceu.coal_liquefaction_tower": "煤炭液化塔", + "block.gtceu.coal_liquefaction_tower": "液化塔", "block.gtceu.ulv_super_tank": "基础超级缸", "block.gtceu.ulv_super_chest": "基础超级箱", "block.gtceu.ulv_hermetic_casing": "基础密封机械方块", @@ -50,7 +50,7 @@ "gtceu.ostrum_linear_accelerator": "紫金线性加速器", "gtceu.bioreactor": "生物反应器", "gtceu.growth_chamber": "生长室", - "gtceu.coal_liquefaction_tower": "煤炭液化", + "gtceu.coal_liquefaction_tower": "液化塔", "gtceu.smr_generator": "小型模块化涡轮", "gtceu.tooltip.machine.moon_dust_harvester_1": "§7地外真空吸尘器§r", "gtceu.tooltip.machine.moon_dust_harvester_2": "§7根据所处生物群系无限采集风化土粉尘。§r", @@ -67,8 +67,8 @@ "gtceu.tooltip.machine.steam_bloomery_2": "§7将含铁矿粉或锭加工成生铁方坯。§r", "gtceu.tooltip.machine.steam_bloomery_3": "§7使用焦煤或无烟煤可倍增产量。§r", "gtceu.tooltip.machine.steam_bloomery_4": "§7支持最多8组配方并行处理，相应调整蒸汽需求。§r", - "gtceu.tooltip.machine.coal_liquefaction_tower_1": "§7碳素奶昔制造机§r", - "gtceu.tooltip.machine.coal_liquefaction_tower_2": "§7从碳质固体与杂酚油中提取气体燃料§r", + "gtceu.tooltip.machine.coal_liquefaction_tower_1": "§7奶昔制造机§r", + "gtceu.tooltip.machine.coal_liquefaction_tower_2": "§7从碳质固体中提取燃气和流体§r", "item.gtceu.tiny_wood_dust": "小撮软木浆", "item.gtceu.small_wood_dust": "小堆软木浆", "item.gtceu.wood_dust": "软木浆", @@ -210,8 +210,9 @@ "gtceu.jei.bedrock_fluid.heavy_ammoniacal_water": "火星重氨水矿藏", "gtceu.jei.bedrock_fluid.liquid_ice": "火星冰矿藏", "gtceu.recipe.category.ingot_molding": "压模", - "block.gtceu.wire_coil.tooltip_pyro": "§8热解炉与核燃料工厂：§r", - "block.gtceu.wire_coil.tooltip_cracking": "§8裂化机，煤炭液化塔，月壤和紫金采集器：§r", + "block.gtceu.wire_coil.tooltip_pyro": "§8热解炉，液化塔与核燃料工厂：§r", + "block.gtceu.wire_coil.tooltip_cracking": "§8裂化机，月壤和紫金采集器：§r", + "tooltip.moldraw.shift_view": "§7§o按住(Shift)查看分子结构§r", "tagprefix.sword_head": "%s剑身", "tagprefix.pickaxe_head": "%s镐头", "tagprefix.shovel_head": "%s铲头", diff --git a/kubejs/assets/gtceu/models/block/machine/active_transformer.json b/kubejs/assets/gtceu/models/block/machine/active_transformer.json new file mode 100644 index 000000000..852f3edb9 --- /dev/null +++ b/kubejs/assets/gtceu/models/block/machine/active_transformer.json @@ -0,0 +1,82 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "gtceu:active_transformer", + "texture_overrides": { + "all": "tfg:item/deprecated" + }, + "variants": { + "is_formed=false,recipe_logic_status=idle": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "tfg:item/deprecated", + "overlay_front": "tfg:item/deprecated" + } + } + }, + "is_formed=false,recipe_logic_status=suspend": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "tfg:item/deprecated", + "overlay_front": "tfg:item/deprecated" + } + } + }, + "is_formed=false,recipe_logic_status=waiting": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "tfg:item/deprecated", + "overlay_front": "tfg:item/deprecated_active" + } + } + }, + "is_formed=false,recipe_logic_status=working": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "tfg:item/deprecated", + "overlay_front": "tfg:item/deprecated_active" + } + } + }, + "is_formed=true,recipe_logic_status=idle": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "tfg:item/deprecated", + "overlay_front": "tfg:item/deprecated" + } + } + }, + "is_formed=true,recipe_logic_status=suspend": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "tfg:item/deprecated", + "overlay_front": "tfg:item/deprecated" + } + } + }, + "is_formed=true,recipe_logic_status=waiting": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "tfg:item/deprecated", + "overlay_front": "tfg:item/deprecated_active" + } + } + }, + "is_formed=true,recipe_logic_status=working": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "tfg:item/deprecated", + "overlay_front": "tfg:item/deprecated_active" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/assets/minecraft/atlases/armor_trims.json b/kubejs/assets/minecraft/atlases/armor_trims.json index e69c5d5f9..e0d80f286 100644 --- a/kubejs/assets/minecraft/atlases/armor_trims.json +++ b/kubejs/assets/minecraft/atlases/armor_trims.json @@ -55,7 +55,7 @@ "salt_tfc": "tfc:color_palettes/trims/salt_tfc", "sapphire_tfc": "tfc:color_palettes/trims/sapphire_tfc", "sodalite_tfc": "tfc:color_palettes/trims/sodalite_tfc", - "coke_tfc": "tfc:color_palettes/trims/coke_tfc", + "armalcolite_tfc": "tfc:color_palettes/trims/armalcolite_tfc", "spessartine_tfc": "tfc:color_palettes/trims/spessartine_tfc", "topaz_tfc": "tfc:color_palettes/trims/topaz_tfc", "uvarovite_tfc": "tfc:color_palettes/trims/uvarovite_tfc", diff --git a/kubejs/assets/minecraft/atlases/blocks.json b/kubejs/assets/minecraft/atlases/blocks.json index d0a87f124..a00db2299 100644 --- a/kubejs/assets/minecraft/atlases/blocks.json +++ b/kubejs/assets/minecraft/atlases/blocks.json @@ -31,7 +31,7 @@ "salt_tfc": "tfc:color_palettes/trims/salt_tfc", "sapphire_tfc": "tfc:color_palettes/trims/sapphire_tfc", "sodalite_tfc": "tfc:color_palettes/trims/sodalite_tfc", - "coke_tfc": "tfc:color_palettes/trims/coke_tfc", + "armalcolite_tfc": "tfc:color_palettes/trims/armalcolite_tfc", "spessartine_tfc": "tfc:color_palettes/trims/spessartine_tfc", "topaz_tfc": "tfc:color_palettes/trims/topaz_tfc", "uvarovite_tfc": "tfc:color_palettes/trims/uvarovite_tfc", diff --git a/kubejs/assets/minecraft/models/tag/item/dirt.json b/kubejs/assets/minecraft/models/tag/item/dirt.json new file mode 100644 index 000000000..7dd03d568 --- /dev/null +++ b/kubejs/assets/minecraft/models/tag/item/dirt.json @@ -0,0 +1,3 @@ +{ + "parent": "tfc:item/dirt/loam" +} \ No newline at end of file diff --git a/kubejs/assets/rnr/textures/item/crushed_base_course.png b/kubejs/assets/rnr/textures/item/crushed_base_course.png new file mode 100644 index 000000000..ee9fce984 Binary files /dev/null and b/kubejs/assets/rnr/textures/item/crushed_base_course.png differ diff --git a/kubejs/assets/rnr/textures/item/flagstone/andesite.png b/kubejs/assets/rnr/textures/item/flagstone/andesite.png new file mode 100644 index 000000000..9798f4c80 Binary files /dev/null and b/kubejs/assets/rnr/textures/item/flagstone/andesite.png differ diff --git a/kubejs/assets/rnr/textures/item/flagstone/basalt.png b/kubejs/assets/rnr/textures/item/flagstone/basalt.png new file mode 100644 index 000000000..597d29918 Binary files /dev/null and b/kubejs/assets/rnr/textures/item/flagstone/basalt.png differ diff --git a/kubejs/assets/rnr/textures/item/flagstone/black_sandstone.png b/kubejs/assets/rnr/textures/item/flagstone/black_sandstone.png new file mode 100644 index 000000000..8ebad69b5 Binary files /dev/null and b/kubejs/assets/rnr/textures/item/flagstone/black_sandstone.png differ diff --git a/kubejs/assets/rnr/textures/item/flagstone/brown_sandstone.png b/kubejs/assets/rnr/textures/item/flagstone/brown_sandstone.png new file mode 100644 index 000000000..454edb4f0 Binary files /dev/null and b/kubejs/assets/rnr/textures/item/flagstone/brown_sandstone.png differ diff --git a/kubejs/assets/rnr/textures/item/flagstone/chalk.png b/kubejs/assets/rnr/textures/item/flagstone/chalk.png new file mode 100644 index 000000000..43f488feb Binary files /dev/null and b/kubejs/assets/rnr/textures/item/flagstone/chalk.png differ diff --git a/kubejs/assets/rnr/textures/item/flagstone/chert.png b/kubejs/assets/rnr/textures/item/flagstone/chert.png new file mode 100644 index 000000000..c87347087 Binary files /dev/null and b/kubejs/assets/rnr/textures/item/flagstone/chert.png differ diff --git a/kubejs/assets/rnr/textures/item/flagstone/claystone.png b/kubejs/assets/rnr/textures/item/flagstone/claystone.png new file mode 100644 index 000000000..e8fde2236 Binary files /dev/null and b/kubejs/assets/rnr/textures/item/flagstone/claystone.png differ diff --git a/kubejs/assets/rnr/textures/item/flagstone/conglomerate.png b/kubejs/assets/rnr/textures/item/flagstone/conglomerate.png new file mode 100644 index 000000000..fc2591af2 Binary files /dev/null and b/kubejs/assets/rnr/textures/item/flagstone/conglomerate.png differ diff --git a/kubejs/assets/rnr/textures/item/flagstone/dacite.png b/kubejs/assets/rnr/textures/item/flagstone/dacite.png new file mode 100644 index 000000000..d74b5a39e Binary files /dev/null and b/kubejs/assets/rnr/textures/item/flagstone/dacite.png differ diff --git a/kubejs/assets/rnr/textures/item/flagstone/diorite.png b/kubejs/assets/rnr/textures/item/flagstone/diorite.png new file mode 100644 index 000000000..437dda894 Binary files /dev/null and b/kubejs/assets/rnr/textures/item/flagstone/diorite.png differ diff --git a/kubejs/assets/rnr/textures/item/flagstone/dolomite.png b/kubejs/assets/rnr/textures/item/flagstone/dolomite.png new file mode 100644 index 000000000..a2cd00517 Binary files /dev/null and b/kubejs/assets/rnr/textures/item/flagstone/dolomite.png differ diff --git a/kubejs/assets/rnr/textures/item/flagstone/gabbro.png b/kubejs/assets/rnr/textures/item/flagstone/gabbro.png new file mode 100644 index 000000000..9083aabbf Binary files /dev/null and b/kubejs/assets/rnr/textures/item/flagstone/gabbro.png differ diff --git a/kubejs/assets/rnr/textures/item/flagstone/gneiss.png b/kubejs/assets/rnr/textures/item/flagstone/gneiss.png new file mode 100644 index 000000000..2376495d1 Binary files /dev/null and b/kubejs/assets/rnr/textures/item/flagstone/gneiss.png differ diff --git a/kubejs/assets/rnr/textures/item/flagstone/granite.png b/kubejs/assets/rnr/textures/item/flagstone/granite.png new file mode 100644 index 000000000..0e3d35e1c Binary files /dev/null and b/kubejs/assets/rnr/textures/item/flagstone/granite.png differ diff --git a/kubejs/assets/rnr/textures/item/flagstone/green_sandstone.png b/kubejs/assets/rnr/textures/item/flagstone/green_sandstone.png new file mode 100644 index 000000000..05a26066b Binary files /dev/null and b/kubejs/assets/rnr/textures/item/flagstone/green_sandstone.png differ diff --git a/kubejs/assets/rnr/textures/item/flagstone/limestone.png b/kubejs/assets/rnr/textures/item/flagstone/limestone.png new file mode 100644 index 000000000..58e92e6c6 Binary files /dev/null and b/kubejs/assets/rnr/textures/item/flagstone/limestone.png differ diff --git a/kubejs/assets/rnr/textures/item/flagstone/marble.png b/kubejs/assets/rnr/textures/item/flagstone/marble.png new file mode 100644 index 000000000..ec9ed5cff Binary files /dev/null and b/kubejs/assets/rnr/textures/item/flagstone/marble.png differ diff --git a/kubejs/assets/rnr/textures/item/flagstone/phyllite.png b/kubejs/assets/rnr/textures/item/flagstone/phyllite.png new file mode 100644 index 000000000..6b9cc423d Binary files /dev/null and b/kubejs/assets/rnr/textures/item/flagstone/phyllite.png differ diff --git a/kubejs/assets/rnr/textures/item/flagstone/pink_sandstone.png b/kubejs/assets/rnr/textures/item/flagstone/pink_sandstone.png new file mode 100644 index 000000000..b17ba9341 Binary files /dev/null and b/kubejs/assets/rnr/textures/item/flagstone/pink_sandstone.png differ diff --git a/kubejs/assets/rnr/textures/item/flagstone/quartzite.png b/kubejs/assets/rnr/textures/item/flagstone/quartzite.png new file mode 100644 index 000000000..dae64dcc5 Binary files /dev/null and b/kubejs/assets/rnr/textures/item/flagstone/quartzite.png differ diff --git a/kubejs/assets/rnr/textures/item/flagstone/red_sandstone.png b/kubejs/assets/rnr/textures/item/flagstone/red_sandstone.png new file mode 100644 index 000000000..eb7984a12 Binary files /dev/null and b/kubejs/assets/rnr/textures/item/flagstone/red_sandstone.png differ diff --git a/kubejs/assets/rnr/textures/item/flagstone/rhyolite.png b/kubejs/assets/rnr/textures/item/flagstone/rhyolite.png new file mode 100644 index 000000000..0fce29354 Binary files /dev/null and b/kubejs/assets/rnr/textures/item/flagstone/rhyolite.png differ diff --git a/kubejs/assets/rnr/textures/item/flagstone/schist.png b/kubejs/assets/rnr/textures/item/flagstone/schist.png new file mode 100644 index 000000000..5f38747cd Binary files /dev/null and b/kubejs/assets/rnr/textures/item/flagstone/schist.png differ diff --git a/kubejs/assets/rnr/textures/item/flagstone/shale.png b/kubejs/assets/rnr/textures/item/flagstone/shale.png new file mode 100644 index 000000000..b58e2415e Binary files /dev/null and b/kubejs/assets/rnr/textures/item/flagstone/shale.png differ diff --git a/kubejs/assets/rnr/textures/item/flagstone/slate.png b/kubejs/assets/rnr/textures/item/flagstone/slate.png new file mode 100644 index 000000000..669d671e3 Binary files /dev/null and b/kubejs/assets/rnr/textures/item/flagstone/slate.png differ diff --git a/kubejs/assets/rnr/textures/item/flagstone/white_sandstone.png b/kubejs/assets/rnr/textures/item/flagstone/white_sandstone.png new file mode 100644 index 000000000..0d328874b Binary files /dev/null and b/kubejs/assets/rnr/textures/item/flagstone/white_sandstone.png differ diff --git a/kubejs/assets/rnr/textures/item/flagstone/yellow_sandstone.png b/kubejs/assets/rnr/textures/item/flagstone/yellow_sandstone.png new file mode 100644 index 000000000..88cdb4ad5 Binary files /dev/null and b/kubejs/assets/rnr/textures/item/flagstone/yellow_sandstone.png differ diff --git a/kubejs/assets/rnr/textures/item/gravel_fill/andesite.png b/kubejs/assets/rnr/textures/item/gravel_fill/andesite.png new file mode 100644 index 000000000..666df4d57 Binary files /dev/null and b/kubejs/assets/rnr/textures/item/gravel_fill/andesite.png differ diff --git a/kubejs/assets/rnr/textures/item/gravel_fill/basalt.png b/kubejs/assets/rnr/textures/item/gravel_fill/basalt.png new file mode 100644 index 000000000..7bc5305b8 Binary files /dev/null and b/kubejs/assets/rnr/textures/item/gravel_fill/basalt.png differ diff --git a/kubejs/assets/rnr/textures/item/gravel_fill/chalk.png b/kubejs/assets/rnr/textures/item/gravel_fill/chalk.png new file mode 100644 index 000000000..12687cfbc Binary files /dev/null and b/kubejs/assets/rnr/textures/item/gravel_fill/chalk.png differ diff --git a/kubejs/assets/rnr/textures/item/gravel_fill/chert.png b/kubejs/assets/rnr/textures/item/gravel_fill/chert.png new file mode 100644 index 000000000..95befa88a Binary files /dev/null and b/kubejs/assets/rnr/textures/item/gravel_fill/chert.png differ diff --git a/kubejs/assets/rnr/textures/item/gravel_fill/claystone.png b/kubejs/assets/rnr/textures/item/gravel_fill/claystone.png new file mode 100644 index 000000000..d07f1f945 Binary files /dev/null and b/kubejs/assets/rnr/textures/item/gravel_fill/claystone.png differ diff --git a/kubejs/assets/rnr/textures/item/gravel_fill/conglomerate.png b/kubejs/assets/rnr/textures/item/gravel_fill/conglomerate.png new file mode 100644 index 000000000..cc9aeeb78 Binary files /dev/null and b/kubejs/assets/rnr/textures/item/gravel_fill/conglomerate.png differ diff --git a/kubejs/assets/rnr/textures/item/gravel_fill/dacite.png b/kubejs/assets/rnr/textures/item/gravel_fill/dacite.png new file mode 100644 index 000000000..767b2fd7b Binary files /dev/null and b/kubejs/assets/rnr/textures/item/gravel_fill/dacite.png differ diff --git a/kubejs/assets/rnr/textures/item/gravel_fill/diorite.png b/kubejs/assets/rnr/textures/item/gravel_fill/diorite.png new file mode 100644 index 000000000..1651d6b7f Binary files /dev/null and b/kubejs/assets/rnr/textures/item/gravel_fill/diorite.png differ diff --git a/kubejs/assets/rnr/textures/item/gravel_fill/dolomite.png b/kubejs/assets/rnr/textures/item/gravel_fill/dolomite.png new file mode 100644 index 000000000..0ca678304 Binary files /dev/null and b/kubejs/assets/rnr/textures/item/gravel_fill/dolomite.png differ diff --git a/kubejs/assets/rnr/textures/item/gravel_fill/gabbro.png b/kubejs/assets/rnr/textures/item/gravel_fill/gabbro.png new file mode 100644 index 000000000..90eed2397 Binary files /dev/null and b/kubejs/assets/rnr/textures/item/gravel_fill/gabbro.png differ diff --git a/kubejs/assets/rnr/textures/item/gravel_fill/gneiss.png b/kubejs/assets/rnr/textures/item/gravel_fill/gneiss.png new file mode 100644 index 000000000..ddd197d56 Binary files /dev/null and b/kubejs/assets/rnr/textures/item/gravel_fill/gneiss.png differ diff --git a/kubejs/assets/rnr/textures/item/gravel_fill/granite.png b/kubejs/assets/rnr/textures/item/gravel_fill/granite.png new file mode 100644 index 000000000..937bcb733 Binary files /dev/null and b/kubejs/assets/rnr/textures/item/gravel_fill/granite.png differ diff --git a/kubejs/assets/rnr/textures/item/gravel_fill/limestone.png b/kubejs/assets/rnr/textures/item/gravel_fill/limestone.png new file mode 100644 index 000000000..7dbca6f57 Binary files /dev/null and b/kubejs/assets/rnr/textures/item/gravel_fill/limestone.png differ diff --git a/kubejs/assets/rnr/textures/item/gravel_fill/marble.png b/kubejs/assets/rnr/textures/item/gravel_fill/marble.png new file mode 100644 index 000000000..cff31afd6 Binary files /dev/null and b/kubejs/assets/rnr/textures/item/gravel_fill/marble.png differ diff --git a/kubejs/assets/rnr/textures/item/gravel_fill/phyllite.png b/kubejs/assets/rnr/textures/item/gravel_fill/phyllite.png new file mode 100644 index 000000000..c06b92414 Binary files /dev/null and b/kubejs/assets/rnr/textures/item/gravel_fill/phyllite.png differ diff --git a/kubejs/assets/rnr/textures/item/gravel_fill/quartzite.png b/kubejs/assets/rnr/textures/item/gravel_fill/quartzite.png new file mode 100644 index 000000000..0ff8078df Binary files /dev/null and b/kubejs/assets/rnr/textures/item/gravel_fill/quartzite.png differ diff --git a/kubejs/assets/rnr/textures/item/gravel_fill/rhyolite.png b/kubejs/assets/rnr/textures/item/gravel_fill/rhyolite.png new file mode 100644 index 000000000..989bd4097 Binary files /dev/null and b/kubejs/assets/rnr/textures/item/gravel_fill/rhyolite.png differ diff --git a/kubejs/assets/rnr/textures/item/gravel_fill/schist.png b/kubejs/assets/rnr/textures/item/gravel_fill/schist.png new file mode 100644 index 000000000..cca945805 Binary files /dev/null and b/kubejs/assets/rnr/textures/item/gravel_fill/schist.png differ diff --git a/kubejs/assets/rnr/textures/item/gravel_fill/shale.png b/kubejs/assets/rnr/textures/item/gravel_fill/shale.png new file mode 100644 index 000000000..2b8284f3e Binary files /dev/null and b/kubejs/assets/rnr/textures/item/gravel_fill/shale.png differ diff --git a/kubejs/assets/rnr/textures/item/gravel_fill/slate.png b/kubejs/assets/rnr/textures/item/gravel_fill/slate.png new file mode 100644 index 000000000..660ee4c9e Binary files /dev/null and b/kubejs/assets/rnr/textures/item/gravel_fill/slate.png differ diff --git a/kubejs/assets/rnr/textures/item/hoggin_mix.png b/kubejs/assets/rnr/textures/item/hoggin_mix.png new file mode 100644 index 000000000..c47773a11 Binary files /dev/null and b/kubejs/assets/rnr/textures/item/hoggin_mix.png differ diff --git a/kubejs/assets/tacz/lang/en_us.json b/kubejs/assets/tacz/lang/en_us.json index 396fff866..8eeb7035a 100644 --- a/kubejs/assets/tacz/lang/en_us.json +++ b/kubejs/assets/tacz/lang/en_us.json @@ -6,6 +6,8 @@ "applied_armorer.attachment.extended_mid_mag_aa_1.name": "Fluix Grooved Magazine", "applied_armorer.attachment.extended_mid_mag_aa_2.name": "§9Fluix Grooved Magazine", "applied_armorer.attachment.extended_mid_mag_aa_3.name": "§dFluix Grooved Magazine", + "applied_armorer.ammo.cluster_quartz_bullet.name": "§bCluster Quartz Shell", + "applied_armorer.ammo.etched_quartz_bullet.name": "§bEtched Quartz Bullet", "applied_armorer.attachment.si_pricision.name": "§aPrecision Scope", "applied_armorer.attachment.si_double_sided_mirror.name": "\"Double Sided Mirror\" Scope", "applied_armorer.attachment.si_ms_12.name": "§aMS-12 Scope", @@ -24,12 +26,14 @@ "create_armorer.attachment.extended_mag_ca_1.name": "Invar Magazine", "create_armorer.attachment.extended_mag_ca_2.name": "Copper Plated Magazine", "create_armorer.attachment.extended_mag_ca_3.name": "Brass Plated Magazine", - "create_armorer.ammo.rbapb.name": "Rimmed Blunt Ammo", + "create_armorer.ammo.slap.name": "SLAP Bullet", + "create_armorer.ammo.rbapb.name": "Rimmed Blunt Bullet", "create_armorer.gun.pistol_auto_stress": "\"Stress\" Semi Pistol", "create_armorer.gun.mg_platemag_flywheel": "\"Flywheel\" Machine Gun", "create_armorer.gun.rifle_assult_crane": "\"Crane\" Assault Rifle", "create_armorer.gun.sniper_semi_clockwork": "\"Clockwork\" Rifle", - "tacz.ammo.30_06.name": ".30-06 SLAP Ammo", + "tacz.ammo.30_06.name": ".30-06 SLAP Bullet", + "tacz.ammo.12g.name": "12 Gauge Shell", "tacz.gun.m700.name": "\"Clutch\" Sniper Rifle", "item.tacz.ammo_box.iron": "Steel Ammo Box", "item.tacz.ammo_box.gold": "§9Magnalium Ammo Box", diff --git a/kubejs/assets/tacz/lang/zh_cn.json b/kubejs/assets/tacz/lang/zh_cn.json index d152e2b2b..f7be0fbb7 100644 --- a/kubejs/assets/tacz/lang/zh_cn.json +++ b/kubejs/assets/tacz/lang/zh_cn.json @@ -6,6 +6,8 @@ "applied_armorer.attachment.extended_mid_mag_aa_1.name": "福鲁伊克斯凹槽弹匣", "applied_armorer.attachment.extended_mid_mag_aa_2.name": "§9福鲁伊克斯凹槽弹匣", "applied_armorer.attachment.extended_mid_mag_aa_3.name": "§d福鲁伊克斯凹槽弹匣", + "applied_armorer.ammo.cluster_quartz_bullet.name": "§b集束石英弹", + "applied_armorer.ammo.etched_quartz_bullet.name": "§b蚀刻石英弹", "applied_armorer.attachment.si_pricision.name": "§a精密瞄准镜", "applied_armorer.attachment.si_double_sided_mirror.name": "“双面镜”瞄准镜", "applied_armorer.attachment.si_ms_12.name": "§aMS-12瞄准镜", @@ -24,12 +26,14 @@ "create_armorer.attachment.extended_mag_ca_1.name": "殷钢弹匣", "create_armorer.attachment.extended_mag_ca_2.name": "镀铜弹匣", "create_armorer.attachment.extended_mag_ca_3.name": "镀黄铜弹匣", + "create_armorer.ammo.slap.name": "脱壳穿甲弹", "create_armorer.ammo.rbapb.name": "凸缘式钝头弹", "create_armorer.gun.pistol_auto_stress": "“重压”半自动手枪", "create_armorer.gun.mg_platemag_flywheel": "“飞轮”机枪", "create_armorer.gun.rifle_assult_crane": "“鹤式”突击步枪", "create_armorer.gun.sniper_semi_clockwork": "“发条”步枪", "tacz.ammo.30_06.name": ".30-06脱壳穿甲弹", + "tacz.ammo.12g.name": "12号霰弹", "tacz.gun.m700.name": "“擒纵”狙击步枪", "item.tacz.ammo_box.iron": "钢弹药盒", "item.tacz.ammo_box.gold": "§9镁铝合金弹药盒", diff --git a/kubejs/assets/tfc/lang/en_us.json b/kubejs/assets/tfc/lang/en_us.json index b06749ae8..ecb8b205d 100644 --- a/kubejs/assets/tfc/lang/en_us.json +++ b/kubejs/assets/tfc/lang/en_us.json @@ -27,6 +27,7 @@ "tfc.recipe.barrel.tfg.barrel.gouda_wheel": "Gouda Wheel", "tfc.recipe.barrel.tfg.barrel.feta_wheel": "Feta Wheel", "tfc.recipe.barrel.tfg.barrel.shosha_wheel": "Shosha Wheel", + "tfc.field_guide.book_landing_text": "Welcome traveller! This book will be the source of all you need to know as you explore the world of TerraFirmaCraft (TFC) in $(bold)TerraFirmaGreg$().$(br)This book is accessible at any time via the icon on the right side of your inventory.$(br)You can find an online copy of this guide $(bold)$(l:https://terrafirmagreg-team.github.io/Field-Guide-Modern/en_us/)here$().$(br)Click on the $(italic)Entry Index$() and start typing to $(bold)search$().", "trim_material.tfc.almandine_tfc": "Almandine", "trim_material.tfc.andradite_tfc": "Andradite", "trim_material.tfc.blue_topaz_tfc": "Blue Topaz", @@ -44,7 +45,7 @@ "trim_material.tfc.salt_tfc": "salt", "trim_material.tfc.sapphire_tfc": "Sapphire", "trim_material.tfc.sodalite_tfc": "Sodalite", - "trim_material.tfc.coke_tfc": "Coke", + "trim_material.tfc.armalcolite_tfc": "Armalcolite", "trim_material.tfc.spessartine_tfc": "Spessartine", "trim_material.tfc.topaz_tfc": "Topaz", "trim_material.tfc.uvarovite_tfc": "Uvarovite", diff --git a/kubejs/assets/tfc/lang/ja_jp.json b/kubejs/assets/tfc/lang/ja_jp.json index 659114ff5..848f86219 100644 --- a/kubejs/assets/tfc/lang/ja_jp.json +++ b/kubejs/assets/tfc/lang/ja_jp.json @@ -40,7 +40,7 @@ "trim_material.tfc.salt_tfc": "salt", "trim_material.tfc.sapphire_tfc": "Sapphire", "trim_material.tfc.sodalite_tfc": "Sodalite", - "trim_material.tfc.coke_tfc": "Coke", + "trim_material.tfc.armalcolite_tfc": "Armalcolite", "trim_material.tfc.spessartine_tfc": "Spessartine", "trim_material.tfc.topaz_tfc": "Topaz", "trim_material.tfc.uvarovite_tfc": "Uvarovite", diff --git a/kubejs/assets/tfc/lang/zh_cn.json b/kubejs/assets/tfc/lang/zh_cn.json index 0ac583e1e..1e58a1ac0 100644 --- a/kubejs/assets/tfc/lang/zh_cn.json +++ b/kubejs/assets/tfc/lang/zh_cn.json @@ -27,6 +27,7 @@ "tfc.recipe.barrel.tfg.barrel.gouda_wheel": "荷兰高德奶酪轮", "tfc.recipe.barrel.tfg.barrel.feta_wheel": "希腊菲达奶酪轮", "tfc.recipe.barrel.tfg.barrel.shosha_wheel": "喜马拉雅奶酪轮", + "tfc.field_guide.book_landing_text": "旅行者，欢迎你！本书将是你探索$(bold)TFG$()整合包中群峦传说世界时，一切所需知识的源泉。$(br)你随时可以通过物品栏右侧的图标访问本书。$(br)你可以在$(bold)$(l:https://terrafirmagreg-team.github.io/Field-Guide-Modern/zh_cn/)此处$()找到本指南的在线版本。$(br)点击$(italic)条目索引$()并开始输入以$(bold)搜索$()。", "trim_material.tfc.almandine_tfc": "铁铝榴石", "trim_material.tfc.andradite_tfc": "钙铁榴石", "trim_material.tfc.blue_topaz_tfc": "蓝黄玉", @@ -44,7 +45,7 @@ "trim_material.tfc.salt_tfc": "盐", "trim_material.tfc.sapphire_tfc": "蓝宝石", "trim_material.tfc.sodalite_tfc": "方钠石", - "trim_material.tfc.coke_tfc": "焦煤", + "trim_material.tfc.armalcolite_tfc": "阿姆阿尔柯尔矿", "trim_material.tfc.spessartine_tfc": "锰铝榴石", "trim_material.tfc.topaz_tfc": "黄玉", "trim_material.tfc.uvarovite_tfc": "钙铬榴石", diff --git a/kubejs/assets/tfc/textures/color_palettes/trims/coke_tfc.png b/kubejs/assets/tfc/textures/color_palettes/trims/armalcolite_tfc.png similarity index 100% rename from kubejs/assets/tfc/textures/color_palettes/trims/coke_tfc.png rename to kubejs/assets/tfc/textures/color_palettes/trims/armalcolite_tfc.png diff --git a/kubejs/assets/tfc/textures/item/brick/andesite.png b/kubejs/assets/tfc/textures/item/brick/andesite.png new file mode 100644 index 000000000..14a11c6c0 Binary files /dev/null and b/kubejs/assets/tfc/textures/item/brick/andesite.png differ diff --git a/kubejs/assets/tfc/textures/item/brick/basalt.png b/kubejs/assets/tfc/textures/item/brick/basalt.png new file mode 100644 index 000000000..803b2eff9 Binary files /dev/null and b/kubejs/assets/tfc/textures/item/brick/basalt.png differ diff --git a/kubejs/assets/tfc/textures/item/brick/chalk.png b/kubejs/assets/tfc/textures/item/brick/chalk.png new file mode 100644 index 000000000..ffbe81567 Binary files /dev/null and b/kubejs/assets/tfc/textures/item/brick/chalk.png differ diff --git a/kubejs/assets/tfc/textures/item/brick/chert.png b/kubejs/assets/tfc/textures/item/brick/chert.png new file mode 100644 index 000000000..3a4ba0638 Binary files /dev/null and b/kubejs/assets/tfc/textures/item/brick/chert.png differ diff --git a/kubejs/assets/tfc/textures/item/brick/claystone.png b/kubejs/assets/tfc/textures/item/brick/claystone.png new file mode 100644 index 000000000..384c0c90f Binary files /dev/null and b/kubejs/assets/tfc/textures/item/brick/claystone.png differ diff --git a/kubejs/assets/tfc/textures/item/brick/conglomerate.png b/kubejs/assets/tfc/textures/item/brick/conglomerate.png new file mode 100644 index 000000000..075257065 Binary files /dev/null and b/kubejs/assets/tfc/textures/item/brick/conglomerate.png differ diff --git a/kubejs/assets/tfc/textures/item/brick/dacite.png b/kubejs/assets/tfc/textures/item/brick/dacite.png new file mode 100644 index 000000000..b334a380e Binary files /dev/null and b/kubejs/assets/tfc/textures/item/brick/dacite.png differ diff --git a/kubejs/assets/tfc/textures/item/brick/diorite.png b/kubejs/assets/tfc/textures/item/brick/diorite.png new file mode 100644 index 000000000..0f8294f26 Binary files /dev/null and b/kubejs/assets/tfc/textures/item/brick/diorite.png differ diff --git a/kubejs/assets/tfc/textures/item/brick/dolomite.png b/kubejs/assets/tfc/textures/item/brick/dolomite.png new file mode 100644 index 000000000..53e0294c6 Binary files /dev/null and b/kubejs/assets/tfc/textures/item/brick/dolomite.png differ diff --git a/kubejs/assets/tfc/textures/item/brick/gabbro.png b/kubejs/assets/tfc/textures/item/brick/gabbro.png new file mode 100644 index 000000000..ade2ac9cb Binary files /dev/null and b/kubejs/assets/tfc/textures/item/brick/gabbro.png differ diff --git a/kubejs/assets/tfc/textures/item/brick/gneiss.png b/kubejs/assets/tfc/textures/item/brick/gneiss.png new file mode 100644 index 000000000..b9b3fbe15 Binary files /dev/null and b/kubejs/assets/tfc/textures/item/brick/gneiss.png differ diff --git a/kubejs/assets/tfc/textures/item/brick/granite.png b/kubejs/assets/tfc/textures/item/brick/granite.png new file mode 100644 index 000000000..6d25e7ba1 Binary files /dev/null and b/kubejs/assets/tfc/textures/item/brick/granite.png differ diff --git a/kubejs/assets/tfc/textures/item/brick/limestone.png b/kubejs/assets/tfc/textures/item/brick/limestone.png new file mode 100644 index 000000000..eec960652 Binary files /dev/null and b/kubejs/assets/tfc/textures/item/brick/limestone.png differ diff --git a/kubejs/assets/tfc/textures/item/brick/marble.png b/kubejs/assets/tfc/textures/item/brick/marble.png new file mode 100644 index 000000000..b19973506 Binary files /dev/null and b/kubejs/assets/tfc/textures/item/brick/marble.png differ diff --git a/kubejs/assets/tfc/textures/item/brick/phyllite.png b/kubejs/assets/tfc/textures/item/brick/phyllite.png new file mode 100644 index 000000000..761506b49 Binary files /dev/null and b/kubejs/assets/tfc/textures/item/brick/phyllite.png differ diff --git a/kubejs/assets/tfc/textures/item/brick/quartzite.png b/kubejs/assets/tfc/textures/item/brick/quartzite.png new file mode 100644 index 000000000..bbcebecfe Binary files /dev/null and b/kubejs/assets/tfc/textures/item/brick/quartzite.png differ diff --git a/kubejs/assets/tfc/textures/item/brick/rhyolite.png b/kubejs/assets/tfc/textures/item/brick/rhyolite.png new file mode 100644 index 000000000..9b8c9010d Binary files /dev/null and b/kubejs/assets/tfc/textures/item/brick/rhyolite.png differ diff --git a/kubejs/assets/tfc/textures/item/brick/schist.png b/kubejs/assets/tfc/textures/item/brick/schist.png new file mode 100644 index 000000000..ae165bf0a Binary files /dev/null and b/kubejs/assets/tfc/textures/item/brick/schist.png differ diff --git a/kubejs/assets/tfc/textures/item/brick/shale.png b/kubejs/assets/tfc/textures/item/brick/shale.png new file mode 100644 index 000000000..926bdc878 Binary files /dev/null and b/kubejs/assets/tfc/textures/item/brick/shale.png differ diff --git a/kubejs/assets/tfc/textures/item/brick/slate.png b/kubejs/assets/tfc/textures/item/brick/slate.png new file mode 100644 index 000000000..afa4eaa88 Binary files /dev/null and b/kubejs/assets/tfc/textures/item/brick/slate.png differ diff --git a/kubejs/assets/tfc/textures/item/loose_rock/andesite.png b/kubejs/assets/tfc/textures/item/loose_rock/andesite.png new file mode 100644 index 000000000..1db960bd7 Binary files /dev/null and b/kubejs/assets/tfc/textures/item/loose_rock/andesite.png differ diff --git a/kubejs/assets/tfc/textures/item/loose_rock/basalt.png b/kubejs/assets/tfc/textures/item/loose_rock/basalt.png new file mode 100644 index 000000000..fa7940fc5 Binary files /dev/null and b/kubejs/assets/tfc/textures/item/loose_rock/basalt.png differ diff --git a/kubejs/assets/tfc/textures/item/loose_rock/chalk.png b/kubejs/assets/tfc/textures/item/loose_rock/chalk.png new file mode 100644 index 000000000..4de21f8a4 Binary files /dev/null and b/kubejs/assets/tfc/textures/item/loose_rock/chalk.png differ diff --git a/kubejs/assets/tfc/textures/item/loose_rock/chert.png b/kubejs/assets/tfc/textures/item/loose_rock/chert.png new file mode 100644 index 000000000..2f832a0e3 Binary files /dev/null and b/kubejs/assets/tfc/textures/item/loose_rock/chert.png differ diff --git a/kubejs/assets/tfc/textures/item/loose_rock/claystone.png b/kubejs/assets/tfc/textures/item/loose_rock/claystone.png new file mode 100644 index 000000000..a1cae9f4b Binary files /dev/null and b/kubejs/assets/tfc/textures/item/loose_rock/claystone.png differ diff --git a/kubejs/assets/tfc/textures/item/loose_rock/conglomerate.png b/kubejs/assets/tfc/textures/item/loose_rock/conglomerate.png new file mode 100644 index 000000000..073b771db Binary files /dev/null and b/kubejs/assets/tfc/textures/item/loose_rock/conglomerate.png differ diff --git a/kubejs/assets/tfc/textures/item/loose_rock/dacite.png b/kubejs/assets/tfc/textures/item/loose_rock/dacite.png new file mode 100644 index 000000000..9512f732b Binary files /dev/null and b/kubejs/assets/tfc/textures/item/loose_rock/dacite.png differ diff --git a/kubejs/assets/tfc/textures/item/loose_rock/diorite.png b/kubejs/assets/tfc/textures/item/loose_rock/diorite.png new file mode 100644 index 000000000..a2c7b84de Binary files /dev/null and b/kubejs/assets/tfc/textures/item/loose_rock/diorite.png differ diff --git a/kubejs/assets/tfc/textures/item/loose_rock/dolomite.png b/kubejs/assets/tfc/textures/item/loose_rock/dolomite.png new file mode 100644 index 000000000..fa7f42986 Binary files /dev/null and b/kubejs/assets/tfc/textures/item/loose_rock/dolomite.png differ diff --git a/kubejs/assets/tfc/textures/item/loose_rock/gabbro.png b/kubejs/assets/tfc/textures/item/loose_rock/gabbro.png new file mode 100644 index 000000000..bea40c9c3 Binary files /dev/null and b/kubejs/assets/tfc/textures/item/loose_rock/gabbro.png differ diff --git a/kubejs/assets/tfc/textures/item/loose_rock/gneiss.png b/kubejs/assets/tfc/textures/item/loose_rock/gneiss.png new file mode 100644 index 000000000..7597a0ca6 Binary files /dev/null and b/kubejs/assets/tfc/textures/item/loose_rock/gneiss.png differ diff --git a/kubejs/assets/tfc/textures/item/loose_rock/granite.png b/kubejs/assets/tfc/textures/item/loose_rock/granite.png new file mode 100644 index 000000000..40a31899f Binary files /dev/null and b/kubejs/assets/tfc/textures/item/loose_rock/granite.png differ diff --git a/kubejs/assets/tfc/textures/item/loose_rock/limestone.png b/kubejs/assets/tfc/textures/item/loose_rock/limestone.png new file mode 100644 index 000000000..0eb6148b0 Binary files /dev/null and b/kubejs/assets/tfc/textures/item/loose_rock/limestone.png differ diff --git a/kubejs/assets/tfc/textures/item/loose_rock/marble.png b/kubejs/assets/tfc/textures/item/loose_rock/marble.png new file mode 100644 index 000000000..9fac9199d Binary files /dev/null and b/kubejs/assets/tfc/textures/item/loose_rock/marble.png differ diff --git a/kubejs/assets/tfc/textures/item/loose_rock/moss_igneous_extrusive.png b/kubejs/assets/tfc/textures/item/loose_rock/moss_igneous_extrusive.png new file mode 100644 index 000000000..7a96014ca Binary files /dev/null and b/kubejs/assets/tfc/textures/item/loose_rock/moss_igneous_extrusive.png differ diff --git a/kubejs/assets/tfc/textures/item/loose_rock/moss_igneous_intrusive.png b/kubejs/assets/tfc/textures/item/loose_rock/moss_igneous_intrusive.png new file mode 100644 index 000000000..3e98abc20 Binary files /dev/null and b/kubejs/assets/tfc/textures/item/loose_rock/moss_igneous_intrusive.png differ diff --git a/kubejs/assets/tfc/textures/item/loose_rock/moss_metamorphic.png b/kubejs/assets/tfc/textures/item/loose_rock/moss_metamorphic.png new file mode 100644 index 000000000..f5164d30c Binary files /dev/null and b/kubejs/assets/tfc/textures/item/loose_rock/moss_metamorphic.png differ diff --git a/kubejs/assets/tfc/textures/item/loose_rock/moss_sedementary.png b/kubejs/assets/tfc/textures/item/loose_rock/moss_sedementary.png new file mode 100644 index 000000000..f012b6816 Binary files /dev/null and b/kubejs/assets/tfc/textures/item/loose_rock/moss_sedementary.png differ diff --git a/kubejs/assets/tfc/textures/item/loose_rock/phyllite.png b/kubejs/assets/tfc/textures/item/loose_rock/phyllite.png new file mode 100644 index 000000000..687d991eb Binary files /dev/null and b/kubejs/assets/tfc/textures/item/loose_rock/phyllite.png differ diff --git a/kubejs/assets/tfc/textures/item/loose_rock/quartzite.png b/kubejs/assets/tfc/textures/item/loose_rock/quartzite.png new file mode 100644 index 000000000..04222dcdf Binary files /dev/null and b/kubejs/assets/tfc/textures/item/loose_rock/quartzite.png differ diff --git a/kubejs/assets/tfc/textures/item/loose_rock/rhyolite.png b/kubejs/assets/tfc/textures/item/loose_rock/rhyolite.png new file mode 100644 index 000000000..949109bff Binary files /dev/null and b/kubejs/assets/tfc/textures/item/loose_rock/rhyolite.png differ diff --git a/kubejs/assets/tfc/textures/item/loose_rock/schist.png b/kubejs/assets/tfc/textures/item/loose_rock/schist.png new file mode 100644 index 000000000..933ea1092 Binary files /dev/null and b/kubejs/assets/tfc/textures/item/loose_rock/schist.png differ diff --git a/kubejs/assets/tfc/textures/item/loose_rock/shale.png b/kubejs/assets/tfc/textures/item/loose_rock/shale.png new file mode 100644 index 000000000..df6194290 Binary files /dev/null and b/kubejs/assets/tfc/textures/item/loose_rock/shale.png differ diff --git a/kubejs/assets/tfc/textures/item/loose_rock/slate.png b/kubejs/assets/tfc/textures/item/loose_rock/slate.png new file mode 100644 index 000000000..3a1afc258 Binary files /dev/null and b/kubejs/assets/tfc/textures/item/loose_rock/slate.png differ diff --git a/kubejs/assets/tfcbetterbf/lang/zh_cn.json b/kubejs/assets/tfcbetterbf/lang/zh_cn.json index f3c42786c..f001f1f8e 100644 --- a/kubejs/assets/tfcbetterbf/lang/zh_cn.json +++ b/kubejs/assets/tfcbetterbf/lang/zh_cn.json @@ -1,5 +1,5 @@ { "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.", - "block.tfcbetterbf.insulated_fire_bricks": "保温耐火砖", - "item.tfcbetterbf.insulation": "高炉保温板" + "block.tfcbetterbf.insulated_fire_bricks": "隔热耐火砖", + "item.tfcbetterbf.insulation": "高炉隔热板" } \ No newline at end of file diff --git a/kubejs/assets/tfclunchbox/lang/ja_jp.json b/kubejs/assets/tfclunchbox/lang/ja_jp.json index 928c0fb96..7eaf303f1 100644 --- a/kubejs/assets/tfclunchbox/lang/ja_jp.json +++ b/kubejs/assets/tfclunchbox/lang/ja_jp.json @@ -2,13 +2,13 @@ "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.", "item.tfclunchbox.cooling_lunchbox": "保冷ランチボックス", "item.tfclunchbox.lunchbox": "ランチボックス", - "item.tfclunchbox.electric_lunchbox": "電気ランチボックス", + "item.tfclunchbox.electric_lunchbox": "電動ランチボックス", "gui.tfclunchbox.cooling_lunchbox": "保冷ランチボックス", "gui.tfclunchbox.lunchbox": "ランチボックス", - "gui.tfclunchbox.electric_lunchbox": "電気ランチボックス", + "gui.tfclunchbox.electric_lunchbox": "電動ランチボックス", "container.tfclunchbox.cooling_lunchbox": "保冷ランチボックス", "container.tfclunchbox.lunchbox": "ランチボックス", - "container.tfclunchbox.electric_lunchbox": "電気ランチボックス", + "container.tfclunchbox.electric_lunchbox": "電動ランチボックス", "item.tfclunchbox.cooling_lunchbox.main": "中身を新鮮に保ってくれる、冒険のお供", "item.tfclunchbox.electric_lunchbox.main": "電気の力で食品を冷蔵保存する最先端の弁当箱", "tooltip.tfclunchbox.cooling_lunchbox.hold_shift": "§eShift§7で詳細を表示", @@ -23,7 +23,7 @@ "tooltip.tfclunchbox.ice_slots_help.line2": "§b•氷ブロック類", "tooltip.tfclunchbox.ice_slots_help.line3": "§b•ドライアイス", "tooltip.tfclunchbox.ice_slots_help.line4": "§b•氷泥入りセル", - "tooltip.tfclunchbox.ice_slots_help.line5": "§7入れるとランチボックス内食物を保冷してくれます", + "tooltip.tfclunchbox.ice_slots_help.line5": "§7入れるとランチボックス内の食料を保冷してくれます", "tooltip.tfclunchbox.battery_slot_help": "バッテリースロット", "tooltip.tfclunchbox.battery_slot_help.line1": "§7使用可能：", "tooltip.tfclunchbox.battery_slot_help.line2": "§e•Gregtechのバッテリー", diff --git a/kubejs/assets/tfg/blockstates/active_power_transformer.json b/kubejs/assets/tfg/blockstates/active_power_transformer.json new file mode 100644 index 000000000..9a0e2d7bb --- /dev/null +++ b/kubejs/assets/tfg/blockstates/active_power_transformer.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "tfg:block/machines/active_power_transformer", + "y": 90 + }, + "facing=north": { + "model": "tfg:block/machines/active_power_transformer" + }, + "facing=south": { + "model": "tfg:block/machines/active_power_transformer", + "y": 180 + }, + "facing=west": { + "model": "tfg:block/machines/active_power_transformer", + "y": 270 + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/flax.json b/kubejs/assets/tfg/blockstates/flax.json index 0b8a1e705..629893c44 100644 --- a/kubejs/assets/tfg/blockstates/flax.json +++ b/kubejs/assets/tfg/blockstates/flax.json @@ -21,6 +21,9 @@ "age=6,part=bottom": { "model": "tfg:block/crop/flax_age_6_bottom" }, + "age=7,part=bottom": { + "model": "tfg:block/crop/flax_age_6_bottom" + }, "age=4,part=top": { "model": "tfg:block/crop/flax_age_4_top" }, @@ -29,6 +32,9 @@ }, "age=6,part=top": { "model": "tfg:block/crop/flax_age_6_top" + }, + "age=7,part=top": { + "model": "tfg:block/crop/flax_age_6_top" } } } \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/machine_casing_power_casing.json b/kubejs/assets/tfg/blockstates/machine_casing_power_casing.json new file mode 100644 index 000000000..4d1dfb56f --- /dev/null +++ b/kubejs/assets/tfg/blockstates/machine_casing_power_casing.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "tfg:block/casings/machine_casing_power_casing" + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/rapeseed.json b/kubejs/assets/tfg/blockstates/rapeseed.json index 45d32774b..a7baeaf1f 100644 --- a/kubejs/assets/tfg/blockstates/rapeseed.json +++ b/kubejs/assets/tfg/blockstates/rapeseed.json @@ -21,6 +21,9 @@ "age=6,part=bottom": { "model": "tfg:block/crop/rapeseed_age_5_bottom" }, + "age=7,part=bottom": { + "model": "tfg:block/crop/rapeseed_age_5_bottom" + }, "age=3,part=top": { "model": "tfg:block/crop/rapeseed_age_3_top" }, @@ -32,6 +35,9 @@ }, "age=6,part=top": { "model": "tfg:block/crop/rapeseed_age_5_top" + }, + "age=7,part=top": { + "model": "tfg:block/crop/rapeseed_age_5_top" } } } \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/rock/halite.json b/kubejs/assets/tfg/blockstates/rock/halite.json index 16caaacf8..5cda97198 100644 --- a/kubejs/assets/tfg/blockstates/rock/halite.json +++ b/kubejs/assets/tfg/blockstates/rock/halite.json @@ -2,18 +2,37 @@ "variants": { "": [ { - "model": "tfg:block/rock/halite" + "model": "tfg:block/rock/halite", + "weight": 6 }, { "model": "tfg:block/rock/halite", + "weight": 6, "y": 90 }, { "model": "tfg:block/rock/halite", + "weight": 6, "y": 180 }, { "model": "tfg:block/rock/halite", + "weight": 6, + "y": 270 + }, + { + "model": "tfg:block/rock/halite2" + }, + { + "model": "tfg:block/rock/halite2", + "y": 90 + }, + { + "model": "tfg:block/rock/halite2", + "y": 180 + }, + { + "model": "tfg:block/rock/halite2", "y": 270 } ] diff --git a/kubejs/assets/tfg/blockstates/rock/halite2.json b/kubejs/assets/tfg/blockstates/rock/halite2.json deleted file mode 100644 index e488b49d3..000000000 --- a/kubejs/assets/tfg/blockstates/rock/halite2.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "variants": { - "": [ - { - "model": "tfg:block/rock/halite2" - }, - { - "model": "tfg:block/rock/halite2", - "y": 90 - }, - { - "model": "tfg:block/rock/halite2", - "y": 180 - }, - { - "model": "tfg:block/rock/halite2", - "y": 270 - } - ] - } -} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/sunflower.json b/kubejs/assets/tfg/blockstates/sunflower.json index 8708a43c7..0860279df 100644 --- a/kubejs/assets/tfg/blockstates/sunflower.json +++ b/kubejs/assets/tfg/blockstates/sunflower.json @@ -21,6 +21,9 @@ "age=6,part=bottom": { "model": "tfg:block/crop/sunflower_age_5_bottom" }, + "age=7,part=bottom": { + "model": "tfg:block/crop/sunflower_age_5_bottom" + }, "age=4,part=top": { "model": "tfg:block/crop/sunflower_age_4_top" }, @@ -29,6 +32,9 @@ }, "age=6,part=top": { "model": "tfg:block/crop/sunflower_age_5_top" + }, + "age=7,part=top": { + "model": "tfg:block/crop/sunflower_age_5_top" } } } \ No newline at end of file diff --git a/kubejs/assets/tfg/lang/en_us.json b/kubejs/assets/tfg/lang/en_us.json index 886bd5662..97c3fa262 100644 --- a/kubejs/assets/tfg/lang/en_us.json +++ b/kubejs/assets/tfg/lang/en_us.json @@ -251,20 +251,24 @@ "block.tfg.rock.aqueduct_nether": "Keratophyre Aqueduct", "block.tfg.rock.hardened_moon_stone": "Hardened Anorthosite", "block.tfg.rock.moon_stone_wall": "Raw Anorthosite Wall", - "block.tfg.rock.cobble_moon_stone_wall": "Anorthosite Cobble Wall", + "block.tfg.rock.cobble_moon_wall": "Anorthosite Cobble Wall", "block.tfg.rock.mossy_cobble_moon": "Anorthosite Mossy Cobble", "block.tfg.rock.mossy_cobble_moon_stairs": "Anorthosite Mossy Cobble Stairs", "block.tfg.rock.mossy_cobble_moon_slab": "Anorthosite Mossy Cobble Slab", "block.tfg.rock.mossy_cobble_moon_wall": "Anorthosite Mossy Cobble Wall", - "block.tfg.rock.mossy_bricks_moon_stone": "Mossy Anorthosite Bricks", - "block.tfg.rock.mossy_bricks_moon_stone_stairs": "Mossy Anorthosite Brick Stairs", - "block.tfg.rock.mossy_bricks_moon_stone_slab": "Mossy Anorthosite Brick Slab", - "block.tfg.rock.mossy_bricks_moon_stone_wall": "Mossy Anorthosite Brick Wall", + "block.tfg.rock.mossy_bricks_moon": "Mossy Anorthosite Bricks", + "block.tfg.rock.mossy_bricks_moon_stairs": "Mossy Anorthosite Brick Stairs", + "block.tfg.rock.mossy_bricks_moon_slab": "Mossy Anorthosite Brick Slab", + "block.tfg.rock.mossy_bricks_moon_wall": "Mossy Anorthosite Brick Wall", "block.tfg.rock.chiseled_bricks_moon_wall": "Chiseled Anorthosite Wall", "block.tfg.rock.gravel_moon": "Anorthosite Gravel", "block.tfg.spike.moon_stone_spike": "Anorthosite Spike", "block.tfg.loose.moon_stone": "Loose Anorthosite Rock", "block.tfg.rock.aqueduct_moon_stone": "Anorthosite Aqueduct", + "block.tfg.rock.polished_moon_wall": "Polished Anorthosite Wall", + "block.tfg.rock.cracked_bricks_moon_stairs": "Cracked Anorthosite Brick Stairs", + "block.tfg.rock.cracked_bricks_moon_slab": "Cracked Anorthosite Brick Slab", + "block.tfg.rock.cracked_bricks_moon_wall": "Cracked Anorthosite Brick Wall", "block.tfg.rock.hardened_moon_deepslate": "Hardened Norite", "block.tfg.rock.moon_deepslate_stairs": "Raw Norite Stairs", "block.tfg.rock.moon_deepslate_slab": "Raw Norite Slab", @@ -298,19 +302,25 @@ "block.tfg.spike.moon_deepslate_spike": "Norite Spike", "block.tfg.loose.moon_deepslate": "Loose Norite Rock", "block.tfg.rock.aqueduct_moon_deepslate": "Norite Aqueduct", + "block.tfg.rock.mossy_bricks_moon_deepslate": "Mossy Norite Bricks", + "block.tfg.rock.mossy_bricks_moon_deepslate_stairs": "Mossy Norite Brick Stairs", + "block.tfg.rock.mossy_bricks_moon_deepslate_slab": "Mossy Norite Brick Slab", + "block.tfg.rock.mossy_bricks_moon_deepslate_wall": "Mossy Norite Brick Wall", "block.tfg.rock.hardened_mars_stone": "Hardened Argillite", "block.tfg.rock.mars_stone_wall": "Raw Argillite Wall", - "block.tfg.rock.cobble_mars_stone_wall": "Argillite Cobble Wall", + "block.tfg.rock.cobble_mars_wall": "Argillite Cobble Wall", "block.tfg.rock.mossy_cobble_mars": "Argillite Mossy Cobble", "block.tfg.rock.mossy_cobble_mars_stairs": "Argillite Mossy Cobble Stairs", "block.tfg.rock.mossy_cobble_mars_slab": "Argillite Mossy Cobble Slab", "block.tfg.rock.mossy_cobble_mars_wall": "Argillite Mossy Cobble Wall", "block.tfg.rock.polished_mars_wall": "Polished Argillite Wall", - "block.tfg.rock.mossy_bricks_mars_stone": "Mossy Argillite Bricks", - "block.tfg.rock.mossy_bricks_mars_stone_stairs": "Mossy Argillite Brick Stairs", - "block.tfg.rock.mossy_bricks_mars_stone_slab": "Mossy Argillite Brick Slab", - "block.tfg.rock.mossy_bricks_mars_stone_wall": "Mossy Argillite Brick Wall", - "block.tfg.rock.cracked_bricks_mars_stone_wall": "Cracked Argillite Brick Wall", + "block.tfg.rock.mossy_bricks_mars": "Mossy Argillite Bricks", + "block.tfg.rock.mossy_bricks_mars_stairs": "Mossy Argillite Brick Stairs", + "block.tfg.rock.mossy_bricks_mars_slab": "Mossy Argillite Brick Slab", + "block.tfg.rock.mossy_bricks_mars_wall": "Mossy Argillite Brick Wall", + "block.tfg.rock.cracked_bricks_mars_stairs": "Cracked Argillite Brick Stairs", + "block.tfg.rock.cracked_bricks_mars_slab": "Cracked Argillite Brick Slab", + "block.tfg.rock.cracked_bricks_mars_wall": "Cracked Argillite Brick Wall", "block.tfg.rock.chiseled_bricks_mars_wall": "Chiseled Argillite Wall", "block.tfg.rock.gravel_mars": "Argillite Gravel", "block.tfg.spike.mars_stone_spike": "Argillite Spike", @@ -318,17 +328,19 @@ "block.tfg.rock.aqueduct_mars_stone": "Argillite Aqueduct", "block.tfg.rock.hardened_venus_stone": "Hardened Trachyte", "block.tfg.rock.venus_stone_wall": "Raw Trachyte Wall", - "block.tfg.rock.cobble_venus_stone_wall": "Trachyte Cobble Wall", + "block.tfg.rock.cobble_venus_wall": "Trachyte Cobble Wall", "block.tfg.rock.mossy_cobble_venus": "Trachyte Mossy Cobble", "block.tfg.rock.mossy_cobble_venus_stairs": "Trachyte Mossy Cobble Stairs", "block.tfg.rock.mossy_cobble_venus_slab": "Trachyte Mossy Cobble Slab", "block.tfg.rock.mossy_cobble_venus_wall": "Trachyte Mossy Cobble Wall", "block.tfg.rock.polished_venus_wall": "Polished Trachyte Wall", - "block.tfg.rock.mossy_bricks_venus_stone": "Mossy Trachyte Bricks", - "block.tfg.rock.mossy_bricks_venus_stone_stairs": "Mossy Trachyte Brick Stairs", - "block.tfg.rock.mossy_bricks_venus_stone_slab": "Mossy Trachyte Brick Slab", - "block.tfg.rock.mossy_bricks_venus_stone_wall": "Mossy Trachyte Brick Wall", - "block.tfg.rock.cracked_bricks_venus_stone_wall": "Cracked Trachyte Brick Wall", + "block.tfg.rock.mossy_bricks_venus": "Mossy Trachyte Bricks", + "block.tfg.rock.mossy_bricks_venus_stairs": "Mossy Trachyte Brick Stairs", + "block.tfg.rock.mossy_bricks_venus_slab": "Mossy Trachyte Brick Slab", + "block.tfg.rock.mossy_bricks_venus_wall": "Mossy Trachyte Brick Wall", + "block.tfg.rock.cracked_bricks_venus_stairs": "Cracked Trachyte Brick Stairs", + "block.tfg.rock.cracked_bricks_venus_slab": "Cracked Trachyte Brick Slab", + "block.tfg.rock.cracked_bricks_venus_wall": "Cracked Trachyte Brick Wall", "block.tfg.rock.chiseled_bricks_venus_wall": "Chiseled Trachyte Wall", "block.tfg.rock.gravel_venus": "Trachyte Gravel", "block.tfg.spike.venus_stone_spike": "Trachyte Spike", @@ -336,17 +348,19 @@ "block.tfg.rock.aqueduct_venus_stone": "Trachyte Aqueduct", "block.tfg.rock.hardened_mercury_stone": "Hardened Komatiite", "block.tfg.rock.mercury_stone_wall": "Raw Komatiite Wall", - "block.tfg.rock.cobble_mercury_stone_wall": "Komatiite Cobble Wall", + "block.tfg.rock.cobble_mercury_wall": "Komatiite Cobble Wall", "block.tfg.rock.mossy_cobble_mercury": "Komatiite Mossy Cobble", "block.tfg.rock.mossy_cobble_mercury_stairs": "Komatiite Mossy Cobble Stairs", "block.tfg.rock.mossy_cobble_mercury_slab": "Komatiite Mossy Cobble Slab", "block.tfg.rock.mossy_cobble_mercury_wall": "Komatiite Mossy Cobble Wall", "block.tfg.rock.polished_mercury_wall": "Polished Komatiite Wall", - "block.tfg.rock.mossy_bricks_mercury_stone": "Mossy Komatiite Bricks", - "block.tfg.rock.mossy_bricks_mercury_stone_stairs": "Mossy Komatiite Brick Stairs", - "block.tfg.rock.mossy_bricks_mercury_stone_slab": "Mossy Komatiite Brick Slab", - "block.tfg.rock.mossy_bricks_mercury_stone_wall": "Mossy Komatiite Brick Wall", - "block.tfg.rock.cracked_bricks_mercury_stone_wall": "Cracked Komatiite Brick Wall", + "block.tfg.rock.mossy_bricks_mercury": "Mossy Komatiite Bricks", + "block.tfg.rock.mossy_bricks_mercury_stairs": "Mossy Komatiite Brick Stairs", + "block.tfg.rock.mossy_bricks_mercury_slab": "Mossy Komatiite Brick Slab", + "block.tfg.rock.mossy_bricks_mercury_wall": "Mossy Komatiite Brick Wall", + "block.tfg.rock.cracked_bricks_mercury_stairs": "Cracked Komatiite Brick Stairs", + "block.tfg.rock.cracked_bricks_mercury_slab": "Cracked Komatiite Brick Slab", + "block.tfg.rock.cracked_bricks_mercury_wall": "Cracked Komatiite Brick Wall", "block.tfg.rock.chiseled_bricks_mercury_wall": "Chiseled Komatiite Wall", "block.tfg.rock.gravel_mercury": "Komatiite Gravel", "block.tfg.spike.mercury_stone_spike": "Komatiite Spike", @@ -354,17 +368,19 @@ "block.tfg.rock.aqueduct_mercury_stone": "Komatiite Aqueduct", "block.tfg.rock.hardened_glacio_stone": "Hardened Phonolite", "block.tfg.rock.glacio_stone_wall": "Raw Phonolite Wall", - "block.tfg.rock.cobble_glacio_stone_wall": "Phonolite Cobble Wall", + "block.tfg.rock.cobble_glacio_wall": "Phonolite Cobble Wall", "block.tfg.rock.mossy_cobble_glacio": "Phonolite Mossy Cobble", "block.tfg.rock.mossy_cobble_glacio_stairs": "Phonolite Mossy Cobble Stairs", "block.tfg.rock.mossy_cobble_glacio_slab": "Phonolite Mossy Cobble Slab", "block.tfg.rock.mossy_cobble_glacio_wall": "Phonolite Mossy Cobble Wall", "block.tfg.rock.polished_glacio_wall": "Polished Phonolite Wall", - "block.tfg.rock.mossy_bricks_glacio_stone": "Mossy Phonolite Bricks", - "block.tfg.rock.mossy_bricks_glacio_stone_stairs": "Mossy Phonolite Brick Stairs", - "block.tfg.rock.mossy_bricks_glacio_stone_slab": "Mossy Phonolite Brick Slab", - "block.tfg.rock.mossy_bricks_glacio_stone_wall": "Mossy Phonolite Brick Wall", - "block.tfg.rock.cracked_bricks_glacio_stone_wall": "Cracked Phonolite Brick Wall", + "block.tfg.rock.mossy_bricks_glacio": "Mossy Phonolite Bricks", + "block.tfg.rock.mossy_bricks_glacio_stairs": "Mossy Phonolite Brick Stairs", + "block.tfg.rock.mossy_bricks_glacio_slab": "Mossy Phonolite Brick Slab", + "block.tfg.rock.mossy_bricks_glacio_wall": "Mossy Phonolite Brick Wall", + "block.tfg.rock.cracked_bricks_glacio_stairs": "Cracked Phonolite Brick Stairs", + "block.tfg.rock.cracked_bricks_glacio_slab": "Cracked Phonolite Brick Slab", + "block.tfg.rock.cracked_bricks_glacio_wall": "Cracked Phonolite Brick Wall", "block.tfg.rock.chiseled_bricks_glacio_wall": "Chiseled Phonolite Wall", "block.tfg.rock.gravel_glacio": "Phonolite Gravel", "block.tfg.spike.glacio_stone_spike": "Phonolite Spike", @@ -378,15 +394,19 @@ "block.tfg.rock.cobble_permafrost_stairs": "Permafrost Cobble Stairs", "block.tfg.rock.cobble_permafrost_slab": "Permafrost Cobble Slab", "block.tfg.rock.cobble_permafrost_wall": "Permafrost Cobble Wall", - "block.tfg.rock.mossy_cobble_permafrost_stairs": "Permafrost Mossy Cobble Stairs", - "block.tfg.rock.mossy_cobble_permafrost_slab": "Permafrost Mossy Cobble Slab", - "block.tfg.rock.mossy_cobble_permafrost_wall": "Permafrost Mossy Cobble Wall", + "block.tfg.rock.mossy_cobble_permafrost": "Mossy Cobble Permafrost", + "block.tfg.rock.mossy_cobble_permafrost_stairs": "Mossy Cobble Permafrost Stairs", + "block.tfg.rock.mossy_cobble_permafrost_slab": "Mossy Cobble Permafrost Slab", + "block.tfg.rock.mossy_cobble_permafrost_wall": "Mossy Cobble Permafrost Wall", "block.tfg.rock.polished_permafrost_wall": "Polished Permafrost Wall", "block.tfg.rock.mossy_bricks_permafrost": "Mossy Permafrost Bricks", "block.tfg.rock.mossy_bricks_permafrost_stairs": "Mossy Permafrost Brick Stairs", "block.tfg.rock.mossy_bricks_permafrost_slab": "Mossy Permafrost Brick Slab", "block.tfg.rock.mossy_bricks_permafrost_wall": "Mossy Permafrost Brick Wall", - "block.tfg.rock.cracked_bricks_permafrost_stone_wall": "Cracked Permafrost Brick Wall", + "block.tfg.rock.cracked_bricks_permafrost_stairs": "Cracked Permafrost Brick Stairs", + "block.tfg.rock.cracked_bricks_permafrost_slab": "Cracked Permafrost Brick Slab", + "block.tfg.rock.cracked_bricks_permafrost_wall": "Cracked Permafrost Brick Wall", + "block.tfg.rock.chiseled_bricks_permafrost_wall": "Chiseled Permafrost Wall", "block.tfg.rock.gravel_permafrost": "Permafrost Gravel", "block.tfg.spike.permafrost_spike": "Permafrost Spike", "block.tfg.loose.permafrost": "Loose Permafrost Rock", @@ -425,13 +445,21 @@ "block.tfg.rock.cracked_bricks_stone_wall": "Cracked Reconstituted Stone Brick Wall", "block.tfg.rock.aqueduct_stone": "Reconstituted Stone Aqueduct", "block.tfg.rock.smooth_red_sandstone_wall": "Smooth Hematitic Sandstone Wall", + "block.tfg.rock.cut_red_sandstone_stairs": "Cut Hematitic Sandstone Stairs", "block.tfg.rock.cut_red_sandstone_wall": "Cut Hematitic Sandstone Wall", + "block.tfg.rock.bricks_venus_sandstone_wall": "Trachyte Sandstone Brick Wall", + "block.tfg.rock.cracked_bricks_venus_sandstone_stairs": "Cracked Trachyte Sandstone Brick Stairs", + "block.tfg.rock.cracked_bricks_venus_sandstone_slab": "Cracked Trachyte Sandstone Brick Slab", + "block.tfg.rock.cracked_bricks_venus_sandstone_wall": "Cracked Trachyte Sandstone Brick Wall", + "block.tfg.rock.quartz_wall": "Quartz Wall", + "block.tfg.rock.smooth_quartz_wall": "Smooth Quartz Wall", "block.tfg.rock.raw.stromatolite": "Raw Stromatolite", "block.tfg.rock.spike.stromatolite": "Stromatolite Spike", "block.tfg.stromatolite_cluster_small": "Small Stromatolite Cluster", "block.tfg.stromatolite_cluster_medium": "Large Stromatolite Cluster", "block.tfg.rock.raw.geyserite": "Raw Geyserite", "block.tfg.rock.spike.geyserite": "Geyserite Spike", + "block.tfg.rock.halite": "Halite", "block.tfg.mushroom_roots": "Mushroom Roots", "block.tfg.mushroom_sprouts": "Mushroom Sprouts", "block.tfg.charred_log": "Charred Log", @@ -588,6 +616,8 @@ "block.tfg.casings.heat_pipe_casing": "Heat Pipe Casing", "block.tfg.glacian_wool_frame": "Framed Glacian Wool", "block.tfg.aes_insulation_frame": "Framed AES Insulation", + "block.tfg.machine_casing_power_casing": "Insulated Power Casing", + "block.tfg.active_power_transformer": "Active Energy Transformer", "block.tfg.sand.fluorapatite.blue": "Blue Fluorapatite Sand", "block.tfg.sandstone.raw.fluorapatite.blue": "Raw Blue Fluorapatite Sandstone", "block.tfg.sandstone.wall.raw.fluorapatite.blue": "Raw Blue Fluorapatite Sandstone Wall", @@ -1054,6 +1084,9 @@ "item.tfg.rough_endoplasmic_reticula": "Rough Endoplasmic Reticula", "item.tfg.alpha_keratin": "α-Keratin", "item.tfg.progenitor_cells": "Progenitor Cells", + "item.tfg.catalyser_pt_re_zsm": "Catalyser Pt-Re ZSM-5", + "item.tfg.used_catalyser": "Used Catalyser Pt-Re ZSM-5", + "item.tfg.loaded_resin": "Re-Loaded Resin", "material.tfg.latex": "Latex", "material.tfg.vulcanized_latex": "Vulcanized Latex", "material.tfg.fluix": "Fluix", @@ -1174,7 +1207,7 @@ "material.tfg.reformed_aromatic_feedstock": "Reformed Aromatic Feedstock", "material.tfg.reformate_gas": "Reformate Gas", "material.tfg.cracker_off_gas": "Cracked Reformate Off-Gas", - "material.tfg.btx_fuel": "BTX Gas", + "material.tfg.btx_fuel": "BTX Fuel", "material.tfg.critical_steam": "Critical Steam", "material.tfg.americium_241": "Americium-241", "material.tfg.californium_252": "Californium-252", @@ -1203,6 +1236,21 @@ "material.tfg.linolenic_acid": "α-Linolenic Acid", "material.tfg.isosorbide_ln": "Isosorbide Linolenate", "material.tfg.epox_isosorbide_ln": "Epoxidized Isosorbide Linolenate", + "material.tfg.ozone": "Ozone", + "material.tfg.tin_chloride": "Stannous Chloride", + "material.tfg.cyclohexanone": "Cyclohexanone", + "material.tfg.cyclohex_diperoxide": "1,1-Cyclohexanediyl Dihydroperoxide", + "material.tfg.aciditic_waste": "Aciditic Waste", + "material.tfg.propylene": "Propylene", + "material.tfg.tpaoh": "Tetrapropylammonium Hydroxide", + "material.tfg.sodium_silicate": "Sodium Silicate", + "material.tfg.metal_rich_solution": "Metal Rich Solution", + "material.tfg.crude_mixed_gas": "Crude Mixed Gas", + "material.tfg.zsm5_gel": "ZSM-5 Gel", + "material.tfg.leachate": "Rhenium Leachate", + "material.tfg.clean_powder": "Re-Silicate Clean Powder", + "material.tfg.catalyser_powder": "Catalyser Re ZSM-5 Powder", + "material.tfg.sodium_aluminium": "Sodium Aluminium", "ore_vein.tfg.deep_sheldonite": "Cooperite & Bornite", "ore_vein.tfg.deep_garnet_amethyst": "Amethyst & Garnet", "ore_vein.tfg.deep_garnet_opal": "Opal & Garnet", @@ -1382,6 +1430,19 @@ "entity.tfg.rnr_plow": "Paving Cart", "effect.tfg.cooling": "§bCooling", "effect.tfg.warming": "§6Warming", + "effect.tfg.instant_radiation": "Instant Radiation", + "effect.tfg.chemical_burns_warning": "Suffering Chemical Burns", + "effect.tfg.poison_warning": "Toxic Material", + "effect.tfg.weak_poison_warning": "Weakly Toxic Material", + "effect.tfg.irritant_warning": "Irritant Material", + "effect.tfg.nausea_warning": "Nauseous Material", + "effect.tfg.carcinogen_warning": "Carcinogenic Material", + "effect.tfg.asbestosis_warning": "Asbestosis", + "effect.tfg.arsenicosis_warning": "Arsenicosis", + "effect.tfg.silicosis_warning": "Silicosis", + "effect.tfg.berylliosis_warning": "Berylliosis", + "effect.tfg.methanol_poisoning_warning": "Methanol Poisoning", + "effect.tfg.carbon_monoxide_poisoning_warning": "Carbon Monoxide Poisoning", "tfg.greate.uls_limit": "§432§r (§8ULS§r)", "tfg.greate.ls_limit": "§f128§r (§7LS§r)", "tfg.greate.windmill_hint_1": "Windmills are affected by relative", @@ -1404,7 +1465,7 @@ "trim_material.tfc.salt_tfc": "salt", "trim_material.tfc.sapphire_tfc": "Sapphire", "trim_material.tfc.sodalite_tfc": "Sodalite", - "trim_material.tfc.coke_tfc": "Coke", + "trim_material.tfc.armalcolite_tfc": "Armalcolite", "trim_material.tfc.spessartine_tfc": "Spessartine", "trim_material.tfc.topaz_tfc": "Topaz", "trim_material.tfc.uvarovite_tfc": "Uvarovite", @@ -1502,6 +1563,10 @@ "tfg.tooltip.cooling_foods": "§bCools you by: 2°C", "tfg.tooltip.cooling_foods_strong": "§bCools you by: 10°C", "tfg.tooltip.warming_foods": "§6Warms you by: 4°C", + "tfg.tooltip.hotornot_container": "§aSafely contains §6hot§a, §bcold§a, and §elighter-than-air§a items and fluids.§r", + "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.subtick": "This machine supports §2Subticking§r!", @@ -1517,6 +1582,8 @@ "tfg.tooltip.machine.cooling_tower_1": "§7Heating up the Atmosphere§r", "tfg.tooltip.machine.cooling_tower_2": "§7Cools the hot coolant by dissipitating excess heat to the atmosphere.§r", "tfg.tooltip.obsolete.depreciated": "§cDeprecated, cannot be crafted any more", + "tfg.tooltip.antipoison_pill": "§9Cures Poison", + "tfg.tooltip.antipoison_tablet": "§9Cures All Active Harmful Effects", "tfg.tooltip.dna_syringe.empty": "§7An empty syringe.§r", "tfg.tooltip.dna_syringe.dirty1": "§7A used syringe.§r", "tfg.tooltip.dna_syringe.dirty2": "§7Be careful not to poke anyone with this...§r", @@ -1803,6 +1870,69 @@ "quests.ae2.cell_component_64m.desc": "The &c64M MEGA Storage Component&r is the biggest one you can make in &8TerraFirmaGreg&r. Honestly, we believe you'll never need it, but it’s there for completionists.", "quests.ae2.oversize_interface.desc": "The &dME Oversize Interface&r is a &dME Extended Interface&r but each slot can hold 16x more items or fluids. If you have processes that need huge quantities, this could be your go-to.", "quests.ae2.assembler_matrix.desc": "The &6Assembler Matrix&r is basically a customizable multiblock Molecular Assembler. The requirements for this quest should let you build one that we deem quite strong enough. You could add more layers of &bPattern Core&r or &aCraft Core&r if you want to.\n\nAs usual, check the in-game guide for detailed informations.", + "quests.combat_tips.stone_main.title": "Stone Age", + "quests.combat_tips.hammer.title": "Hammers", + "quests.combat_tips.hammer.subtitle": "It's hammer time!", + "quests.combat_tips.hammer.description": "While combat may not be the first thing you think to do with your hammer, it can be surprisingly effective. Hammers deal &2Crushing&r damage which can help you against Skeletons. \n\nFor more information on &cDamage Types&r consult the &3Field Guide&r.", + "quests.combat_tips.hammer.task": "Any Hammer", + "quests.combat_tips.javelin.title": "Javelins", + "quests.combat_tips.javelin.subtitle": "Caveman's bow", + "quests.combat_tips.javelin.description": "If you want to keep your foes away from you, javelins are the weapon for you. They are the earliest ranged weapons you will have available to you. They deal &9Piercing&r damage, which can help you against Zombies. \n\nFor more information on &cDamage Types&r consult the &3Field Guide&r. \n\nOnce you acquire leather you will be able to craft a &5Quiver&r which allows you to have easy access to up to 8 javelins! ", + "quests.combat_tips.javelin.task": "Any Javelin", + "quests.combat_tips.axe.title": "Axes", + "quests.combat_tips.axe.subtitle": "Good for more than wood", + "quests.combat_tips.axe.description": "Until you can upgrade, an axe will be your most reliable weapon. Along with high damage, they deal &6Slashing&r damage, which will help you against Creepers. \n\nFor more information on &cDamage Types&r consult the &3Field Guide&r.", + "quests.combat_tips.axe.task": "Any Axe", + "quests.combat_tips.knife.title": "Knives", + "quests.combat_tips.knife.subtitle": "Stabby stabby", + "quests.combat_tips.knife.description": "Knives are most useful for crafting, but they can be a weapon in a pinch. They deal &9Piercing&r damage, which can help you against Zombies. \n\nFor more information on &cDamage Types&r consult the &3Field Guide&r.", + "quests.combat_tips.knife.task": "Any Knife", + "quests.combat_tips.club.title": "Flint Club", + "quests.combat_tips.club.subtitle": "Gronk Bonk", + "quests.combat_tips.club.description": "The flint clubs are rather unconventional weapons. Instead of dealing damage, they will break your target's bones, stopping them in their tracks.\n\nBoth the standard and fortified flint clubs can be crafted with primitive materials. The fortified flint club boasts a faster attack speed and more durability.", + "quests.combat_tips.mold_main.title": "Primitive Metallurgy", + "quests.combat_tips.wood_shield.title": "Wooden Shield", + "quests.combat_tips.wood_shield.subtitle": "Skeletons hurt, like a lot", + "quests.combat_tips.wood_shield.description": "A shield will protect you from most damage sources you point it at. Be warned, it will &4not&r protect you from explosions.", + "quests.combat_tips.leather.title": "Leather Armor", + "quests.combat_tips.leather.subtitle": "Clothes at last", + "quests.combat_tips.leather.description": "Once you have leather, you will be able to get your first true armor. It isn't great, but it will provide that extra protection you may need. \n\nThey also give you a slight resistance to &6Slashing&r damage.", + "quests.combat_tips.mold_weapons.title": "Molded Weapons", + "quests.combat_tips.mold_weapons.subtitle": "The power of metal", + "quests.combat_tips.mold_weapons.description": "Molds allow you to make copper and bronze versions of all weapons, including three new types: Swords, Scythes, and Maces. \n\nSwords: These well rounded weapons deal &6Slashing&r damage. \n\nScythes: They do more damage than swords, but are slower. They deal &6Slashing&r damage. \n\nMaces: They are the best weapons that deal &2Crushing&r damage.", + "quests.combat_tips.mold_weapons.task1": "Any Sword", + "quests.combat_tips.mold_weapons.task2": "Any Scythe", + "quests.combat_tips.mold_weapons.task3": "Any Mace", + "quests.combat_tips.bow.title": "Bow and Arrow", + "quests.combat_tips.bow.subtitle": "Then I took an arrow to the knee...", + "quests.combat_tips.bow.description": "While javelins are cool, it's hard to beat a bow and arrow. Arrows can be expensive, so setting up a bird farm isn't a bad idea. Arrows deal &9Piercing&r damage. \n\nOnce you have leather you will be able to craft a &5Quiver&r which allows you to have easy access to up to 8 stacks of arrows!", + "quests.combat_tips.bow.task2": "Any Arrow", + "quests.combat_tips.bronze_main.title": "Bronze Age", + "quests.combat_tips.forged_weapons.title": "Forged Weapons", + "quests.combat_tips.forged_weapons.subtitle": "To wrought iron and beyond!", + "quests.combat_tips.forged_weapons.description": "From wrought iron and above you will need the appropriate anvil to forge them. Additionally, the anvil unlocks butchery knives. \n\nButchery Knives: Faster than swords, but do less damage. They allow you to get &cdouble&r meat from mobs. This doesn't affect any other drops.", + "quests.combat_tips.forged_weapons.task": "Any Butchery Knife", + "quests.combat_tips.shield.title": "Metal Shield", + "quests.combat_tips.shield.subtitle": "Premium protection", + "quests.combat_tips.shield.description": "Now these are some real shields. Using one of these will protect you from any damage, including explosions. \n\nThey also come in a bunch of fun shapes!", + "quests.combat_tips.shield.task": "Any Metal Shield", + "quests.combat_tips.armor.title": "Metal Armor", + "quests.combat_tips.armor.subtitle": "Only the shiniest suit of armor", + "quests.combat_tips.armor.description": "Metal armor requires a two-step forging process, but don't be scared off by its difficulty. Metal armor will boost your survival chances going into the &dBeneath&r or if you fight off a group of &3Illagers&r.\n\nAll metal armor will give you bonus protection to &6Slashing&r, &9Piercing&r, and &2Crushing&r damage", + "quests.combat_tips.armor.task1": "Any Metal Helmet", + "quests.combat_tips.armor.task2": "Any Metal Chestplate", + "quests.combat_tips.armor.task3": "Any Metal Greaves", + "quests.combat_tips.armor.task4": "Any Metal Boots", + "quests.combat_tips.iron_main.title": "Iron Age", + "quests.combat_tips.crossbow.title": "Crossbow", + "quests.combat_tips.crossbow.subtitle": "It's like a manual gun", + "quests.combat_tips.crossbow.description": "Quite simply, it functions the same as the vanilla crossbow. Similar to the bow you can use a &5Quiver&r to hold up to 8 stacks of arrows.", + "quests.combat_tips.flintlock_mechanism.title": "Flintlock Mechanism", + "quests.combat_tips.flintlock_mechanism.subtitle": "Sparks on demand!", + "quests.combat_tips.flintlock_mechanism.description": "This is your first &2Gun Mechanism&r, which are the main crafting components of most guns. The &6Flintlock Mechanism&r allows you to make your first two guns! The first of which is the &9Flintlock Pistol&r.\n\nOnce you acquire steel you will be able to make a much cheaper &6Flintlock Mechanism&r.", + "quests.combat_tips.flintlock_gun.title": "Flintlock Pistol", + "quests.combat_tips.flintlock_gun.subtitle": "Eat Lead!", + "quests.combat_tips.flintlock_gun.description": "Well this is the moment you have been waiting for, it's a gun. Now it's not that good of a gun, but technology has to start somewhere. Guns have many advantages compared to other ranged weapons, useful to you now is that &3Glayzes&r and &2Klayzes&r cannot block bullets.\n\nFor more information on how TACZ guns work view the gun at the top of this quest chapter.", "quests.tasktype.checkmark": "Click here to complete this quest/task", "quests.tasktype.item.any": "Any Item of type:", "quests.tasktype.lookat": "Look at a:", @@ -2181,6 +2311,17 @@ "quests.extreme_voltage.large_generators.desc": "The various single-block generators only go up to HV, so from here on, you'll have to use multiblocks to generate more power. Two of the best options at EV are the &dLarge Gas Turbine&r and &dLarge Combustion Engine&r, so head over to the GregTech Energy chapter to learn more about them.", "quests.extreme_voltage.large_centrifuge.subtitle": "Material Carousel", "quests.extreme_voltage.large_centrifuge.desc": "The &6Large Centrifugal Unit&r is a mandatory multiblock for your Fission Line.\n\nIt supports up to &52x EV Energy Hatches&r, allowing it to process &1IV-tier&r recipes using the same mechanic as the EBF, so it should feel familiar.\n\nThis machine can operate in two modes: &bCentrifuge&r and &6Thermal Centrifuge&r. You can easily switch between them directly in the controller interface, but unfortunately can't be controlled with AE2 or other automation.\n\nWith this upgrade, you can finally bring your &aore processing&r to a whole new level of speed.", + "quests.extreme_voltage.btx.title": "BTX Fuel", + "quests.extreme_voltage.btx.subtitle": "Long lost cousin of Nitrobenzene", + "quests.extreme_voltage.btx.desc.1": "The &eBTX Fuel&r is an upgrade over &eReformate Gas&r, being around five times more potent per mB. The process is much more tedious, but it provides a significant upgrade for running your &6Large Gas Turbines&r. Like its predecessor, this fuel is fully renewable and can be produced entirely through &aTree Processing&r.\n\nTo explain how &eBTX Fuel&r is made, we divide its processing into three parts: the &bBTX Fuel crafting&r itself, the crafting of the &eCatalyst&r, and finally how to loop &eRhenium&r and &ePlatinum&r.", + "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_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.", + "quests.extreme_voltage.btx_loop.desc.2": "A small remark regarding &9Diluted Hydrochloric Acid&r: it can be easily produced by reacting &bWater&r with &aChlorine&r. You could store your &dHypochlorous Acid&r, or &7Electrolyze&r it if you wish to recover &fhalf of your Chlorine&r.\n\nAs for &6Sulfuric Acid&r, you should already have access to an &ainfinite source of Sulfur&r through your &ePetrochemical Distillation&r setup. If this is not yet the case, we strongly advise you to address this as soon as possible. Alternatively, the &8Coal Tar&r obtained while producing &bReformate Gas&r can be reconverted into &2Hydrogen Sulfide&r and ultimately refined back into &6Sulfur&r.", "quests.gregtech_energy": "GregTech Energy", "quests.gregtech_energy.subtitle": "So how does all of that work?", "quests.gregtech_energy.start.title": "Let's do some explaining", @@ -2193,7 +2334,7 @@ "quests.gregtech_energy.moving.task": "I understand", "quests.gregtech_energy.transformer.title": "The Super Transformer", "quests.gregtech_energy.transformer.subtitle": "Better than Optimus Prime", - "quests.gregtech_energy.transformer.desc": "For every problem, GregTech has a multiblock solution. Enter the &dActive Transformer&r.\n\nThis beast is your ultimate transformer. It can channel energy between any tiers — from &aLV&r to &cUHV&r — with no explosions. But that's not even the best part.\n\nIt can transmit energy using Laser Pipes.\n&8•&r Lasers send absurd amounts of Amps.\n&8•&r No loss. No cables. Just pure energy.\n&8•&r Only one catch: it &chas to be in a perfectly straight line&r.\n\nWhen cables feel weak, &luse lasers.", + "quests.gregtech_energy.transformer.desc": "For every problem, GregTech has a multiblock solution. Enter the &dActive Transformer&r.\n\nThis beast is your ultimate transformer. It can transform energy between any tiers — from &aLV&r to &cUHV&r — without caring about amps or a mess of single block transformers.\n\nBut that's not even the best part: it can transmit energy using Laser Pipes.\n&8•&r Lasers send absurd amounts of Amps.\n&8•&r No loss. No cables. Just pure energy.\n&8•&r Only one catch: it &chas to be in a perfectly straight line&r.\n\nWhen cables feel weak, &luse lasers.", "quests.gregtech_energy.moving_wire.title": "Moving with wires", "quests.gregtech_energy.moving_wire.subtitle": "Funky to place", "quests.gregtech_energy.moving_wire.desc": "Moving energy around in GregTech can be tricky — &bmost cables are lossy&r. For every block, for every amp, you might lose energy as it travels through your wires. But don’t worry, there are solutions:\n\n&8•&r Cover your wires with rubber. By doing so, you'll significantly reduce energy loss over distance. Just check the quest items for a reference.\n\n&8•&r Use higher-tier cables. Platinum cables, for example, only lose 1 EU per block — practically nothing when compared to the 8192 EU it can carry.\n\n&8•&r &bSuperconductors&r. These beauties are a bit pricier, but they have &9zero loss&r. They don’t need rubber covers, and won't zap you either. Just be aware that they're usually only craftable near the end of their tier.\n\nOptimize your energy flow — &breduce losses&r and make your systems more efficient.", @@ -2262,11 +2403,11 @@ "quests.gregtech_energy.syngas.desc": "The &eSyngas&r is a new TFG gas fuel. You can unlock it very early at &8ULV&r and use it in your first &6Gas Turbines&r during &7LV&r. It is not a particularly strong fuel, but it can be transformed into valuable byproducts such as &eLubricant&r, &eMethane&r, and &eHydrogen&r.\n\nEven though it is not the most powerful option and can be difficult to scale, using only three &6Coke Ovens&r and one &6Brewery&r or &6Vacuum Chamber&r you can produce a steady supply that should be sufficient to reach &bMV&r and unlock the far stronger &eReformate Gas&r.", "quests.gregtech_energy.reformate_gas.title": "Reformate Gas", "quests.gregtech_energy.reformate_gas.subtitle": "Is that reformate Benzene?", - "quests.gregtech_energy.reformate_gas.desc.1": "The &9Reformate Gas&r is a strong and new gas fuel taking the usual role of Benzene at &bMV&r.\n\nTo produce it, you will need to build a &6Coal Liquefaction Tower&r and obtain some &5Rhenium&r from the &6Tarkianite&r veins found only in dry and hot climates. Two &6Pyrolyse Ovens&r — one producing Creosote and the other Wood Tar — will provide all the materials required to generate this fuel. Remember that you can produce steam with a &6Fluid Heater&r if you want to simplify the setup.", + "quests.gregtech_energy.reformate_gas.desc.1": "The &9Reformate Gas&r is a strong and new gas fuel taking the usual role of Benzene at &bMV&r.\n\nTo produce it, you will need to build a &6Liquefaction Tower&r and obtain some &5Rhenium&r from the &6Tarkianite&r veins found only in dry and hot climates. Two &6Pyrolyse Ovens&r — one producing Creosote and the other Wood Tar — will provide all the materials required to generate this fuel. Remember that you can produce steam with a &6Fluid Heater&r if you want to simplify the setup.", "quests.gregtech_energy.reformate_gas.desc.2": "It is also important to consider the improved yield available at &6HV&r when using a &6Cracker&r. This will allow you to loop most of your &5Rhenium&r, making Reformate Gas effectively an infinite fuel.\n\nAdding &9Nitrogen&r and &9Hydrogen&r to the process will further strengthen your production throughput.", - "quests.gregtech_energy.btx.title": "BTX", - "quests.gregtech_energy.btx.subtitle": "Not a korean band", - "quests.gregtech_energy.btx.desc": "The BTX Fuel is NYI", + "quests.gregtech_energy.btx.title": "BTX Fuel", + "quests.gregtech_energy.btx.subtitle": "Not a Korean boy band", + "quests.gregtech_energy.btx.desc": "Obtaining the &5EV Energy Hatches&r means you can finally get &eBTX Fuel&r (Benzene-Toluene-Xylene) production started. This fuel will last you for a very long time and remains competitive in a &6Large Turbine&r well into the late game. Even if it looks like a massive undertaking at first, rest assured that it will be well worth the effort.\n\nThis production line requires a large number of wood-based products. Sap becomes relevant again due to the need for &eGlue&r — you can either tap your trees passively or extract it directly from logs. You will also need to distill &eWood Tar&r in a &6Distillation Tower&r. Beyond that, make sure you can produce infinite amounts of &eEthanol&r, &eNether Quartz&r, &eSodium&r, &eAmmonia&r, &eLye&r, and &eReinforced Epoxy Resin Sheets&r.\n\nIf you want a more detailed breakdown of the BTX Fuel production chain, refer to the &5EV&r Chapter.", "quests.gregtech_energy.fission_rod.title": "Fission Fuels", "quests.gregtech_energy.fission_rod.subtitle": "Don't get me too hot", "quests.gregtech_energy.fission_rod.desc.1": "The Earth Fission materials are NYI but may come sooner than later", @@ -2428,6 +2569,7 @@ "quests.high_voltage.cleanroom.subtitle": "They put me in a room... a clean room", "quests.high_voltage.cleanroom.desc.1": "The &3Cleanroom&r is a hollow multiblock free of contaminants. Going forward, most new âuit-related recipes&r, as well as some unique blocks like &3Fusion Casings&r, will need to be run in machines inside a Cleanroom.\n\nCreating it will put your &aPolyethylene&r automation to the test for all the &dPlascrete&r and/or &dCleanroom Glass&r you will make.\n\nWe'll start you off with a 5x5x5 Cleanroom, but you should upgrade its size when you start feeling cramped.", "quests.high_voltage.cleanroom.desc.2": "&l&3Lore:&r&o The Cleanroom comes from GregTech 5, but as is often the case, the GT5 implementation is much more punishing. The recipes would run without regard to cleanliness, but had a %% chance of completion equal to the cleanliness of the Cleanroom. This caused a lot of accidental voiding.\n\n&oFurthermore, if the Cleanroom had a maintenance issue, the cleanliness would cap out at 90%%, which means 10%% of items would be voided.\n\n&oThe GTCEu Cleanroom will &6never void&f recipe outputs.", + "quests.high_voltage.cleanroom.task": "Maintenance Hatch or Auto Maintenance Hatch", "quests.high_voltage.prospector.title": "HV Prospector", "quests.high_voltage.prospector.desc.1": "This prospector boasts a &6higher range&r than its &7LV&r counterpart.\n\nSneak right-clicking with the Prospector in your hand will change its mode to &6Fluid Vein Mode&r. This will instead display the base &dyield&r of Fluid veins, along with how full they are.\n\nThis will be really useful to find &9Helium-3&r and &9Bedrock Veins&r on the moon.", "quests.high_voltage.prospector.desc.2": "&9Reminder:&r The yield of a &3Fluid Drilling Rig&r is directly proportional to the \"fullness\" of the vein. When low enough, the output will default to a yield that can be defined in the CEu config.\n\n&9Tip:&r When the fullness drops below 30%% (alright, rough estimate), you should consider moving to another vein for the sake of power-to-yield efficiency. Aiming for the &3Advanced Fluid Drilling Rig&r in &5EV&r may interest you, as not only does it significantly boost the output, but it also reduces the rate at which it drains the vein!\n\n&cCaution:&r Due to a bug, the Prospector display may be offset by one chunk, so avoid placing your Rig in the corners of a fluid vein, or you may end up pumping the wrong fluid!", @@ -2576,7 +2718,7 @@ "quests.low_voltage.lv_machine_hull.title": "Your second machine hull", "quests.low_voltage.lv_machine_hull.subtitle": "It's time to get into electricity", "quests.low_voltage.lv_machine_hull.desc.1": "You're getting real close to your &6first LV Machine&r and the beginning of the electric age! If you haven't made any &4Red Steel&r yet, you'll now have to, but in return you will get &6new ways&r to improve your production.\n\nThis is the GregTech philosophy: &6the further you progress, the better the new recipes become&r.\n\nTry to make at least 3 or 4 casings to begin.", - "quests.low_voltage.lv_machine_hull.desc.2": "For some players, reaching a new tier is marked by crafting the first &6circuit&r, for others it's the &6machine hull&r or the &6energy hatch&r. You can use whatever works best for you, but for the sake of organization, these quests will use the machine hull.", + "quests.low_voltage.lv_machine_hull.desc.2": "For some players, reaching a new tier is marked by crafting the first &6circuit&r, for others it's the &6machine hull&r or the &6energy hatch&r. You can use whatever works best for you, but for the sake of organization, these quests will use the machine hull.\n\nLost on where to start? We recommend looking for machines that will make everything else cheaper, starting with the thing you hate the most.", "quests.low_voltage.lv_machine_casing.title": "LV Machine Casing for Create?", "quests.low_voltage.lv_machine_casing.subtitle": "More options!", "quests.low_voltage.lv_machine_casing.desc": "To make getting into LV less intimidating, &5TFG&r gives you the option to use &6Create&r machines in place of some &6GregTech&r machines.\n\nWe introduced them &6last chapter&r, but just know that if there is an alternative to a GregTech machine, you will have the choice within the quest.", @@ -2587,7 +2729,7 @@ "quests.low_voltage.lv_age_progression.subtitle": "Too many options, too little time!", "quests.low_voltage.lv_age_progression.desc": "&7LV&r will require you to craft a lot of different machines! Here's a friendly tip if you're struggling to set goals: pick an item in a later quest and go backwards from there.\n\nWith that in mind... why don't we start with a &5Fusion Controller&r? Never mind, slightly too ambitious - let's check a closer goal instead. Ah, yes, the &3Electric Blast Furnace&r - the main end goal of &7LV&r - should be a good target.\n\nThe EBF is &aexpensive&r, which is why you should initially focus on machines to make components and materials cheaper. Our quests will try to will guide you in the right direction.\n\nOther important goals are crafting the &3LV Assembler&r, making your first &aMV Circuits&r and getting your first &bCircuit Assembler&r.", "quests.low_voltage.lv_age_progression.task": "I... might have some sense of direction now", - "quests.low_voltage.lv_steam_turbine.title": "Electricity Generation", + "quests.low_voltage.lv_steam_turbine.title": "The Steam Turbine", "quests.low_voltage.lv_steam_turbine.subtitle": "You must construct additional turbines", "quests.low_voltage.lv_steam_turbine.desc.1": "The &3Steam Turbine&r is one of the only generators you can realistically use in &7LV&r. &2Later, you'll unlock more interesting Power options&r, such as natural gases or petrols.\n\nWhen provided Steam, the turbine will output EU at a ratio of &d2 mB = 1 EU&r.", "quests.low_voltage.lv_steam_turbine.desc.2": "If you're using a single &3Steam Turbine&r, you only need &a1x Tin Cables&r. On the other hand, if you upgrade to &32 Steam Turbines&r, you should use &a2x Tin Cables&r - else they may end up &cburning&r.\n\nThis is because of the &9Amperage&r mechanic... but that will be explained later so you can enjoy playing. Don't worry!", @@ -2622,7 +2764,7 @@ "quests.low_voltage.lv_gas_syngas.title": "Syngas", "quests.low_voltage.lv_gas_syngas.subtitle": "Not Wood Gas", "quests.low_voltage.lv_gas_syngas.desc": "Making &7Syngas&r is really easy. You simply need &b3 Coke Ovens&r for each &6Brewery&r or &6Vacuum Chamber&r. Then you collect &7wood&r with the help of a &bCreate Tree Farm&r to minimize the energy costs, and you can enjoy this weak but easy-to-make &7gas fuel&r.", - "quests.low_voltage.lv_naphtha_light.title": "Naphtha and Light Oil", + "quests.low_voltage.lv_naphtha_light.title": "Naphtha and Light Fuel", "quests.low_voltage.lv_naphtha_light.subtitle": "You can make plastic with them", "quests.low_voltage.lv_naphtha_light.desc": "If you really hate farming and prefer adventuring in the &6desert&r or mining massive amounts of &7Oilsands&r, then maybe &7Naphtha&r (better from &7Raw Oil&r) or &7Light Fuel&r (better from &7Oil&r) should be fuels you could look at.\n\nBeing quite good for how easy they are to produce, they need to be manually harvested at that point though.", "quests.low_voltage.lv_turbo_charge.title": "Turbo Charger", @@ -2658,9 +2800,9 @@ "quests.low_voltage.lv_lathe.task": "Any of these", "quests.low_voltage.universal_cell.title": "Better bucket", "quests.low_voltage.universal_cell.subtitle": "You can see inside, unlike those drums...", - "quests.low_voltage.universal_cell.desc.1": "Cells are an alternative form of Fluid storage. All Cell types with the same type and amount of Fluid inside them &6stack&r. They can be automatically filled with a &3Canning Machine&r.\n\nCells hold &done bucket&r of Fluid.", + "quests.low_voltage.universal_cell.desc.1": "Cells are an alternative form of Fluid storage. All Cell types with the same type and amount of Fluid inside them &6stack&r. They can be automatically filled with a &3Canning Machine&r.\n\nFluid Cells hold &done bucket&r of Fluid.\n\nNot sold on them yet? Unlike drums and buckets, cells &asafely contain&r their contents, preventing you from getting burnt, frozen, or floating.", "quests.low_voltage.universal_cell.desc.2": "Universal Cells hold up to &done bucket&r, but also can store &9fractions&r of Buckets. They're particularly ideal if you want to store leftover Fluid without crafting a whole Drum. \n\nCells made from higher tier materials can hold even more fluid, but &9Drums&r and &9Super Tanks&r will hold more by then.\n\nLike Drums, Cells can be placed into a crafting grid to clear their contents.", - "quests.low_voltage.universal_cell.task": "", + "quests.low_voltage.universal_cell.task": "Any cell", "quests.low_voltage.machine_auto_output_behaviour.title": "Machine Auto-Output Behaviour", "quests.low_voltage.machine_auto_output_behaviour.subtitle": "Let's learn.", "quests.low_voltage.machine_auto_output_behaviour.desc.1": "All machines typically have one &7Front Face&r, and one &9Output Face&r.\n\nThe &7Front Face&r should be obvious.\nThe &9Output Face&r is the face with a dot or hole on it. By default, this is at the back of the machine as you place it.\n\nMachines can &aauto-output&r through their output face. To enable auto-output, click the appropriate button in the GUI. Fluid and item auto-outputs are toggled separately. Further control over auto-outputs can be achieved with &dFilters&r and &dCovers&r, which are explained in the &dCover Behavior&r quest found in this chapter.", @@ -2731,7 +2873,7 @@ "quests.low_voltage.lv_electroliser.desc.3": "&cTake caution!&r Due to how ores work, directly smelting dusts into Ingots can give higher metal yields than electrolysis. However, it means you lose the other products in the dust. You will have to decide whether you want to prioritise direct value, or byproduct count.", "quests.low_voltage.lv_mixer.title": "Basic Mixer", "quests.low_voltage.lv_mixer.subtitle": "The Mixer mixes...", - "quests.low_voltage.lv_mixer.desc": "Using the mixer will &6significantly speed up&r the process of making colored steel, especially the &4red steel&r for your machine hulls. Even if you don't think you need it now, you'll find it &6essential&r later on.", + "quests.low_voltage.lv_mixer.desc": "Using the mixer will &6significantly speed up&r the process of making colored steel, especially the &4red steel&r for your machine hulls. Even if you don't think you need it now, you'll find it &6essential&r later on.\n\nYou're used to alloying things in a Crucible, but for any new alloys (as well as all of the old ones), the GregTech way of alloying is to &amix together dusts&r and then heat them into ingots or extract them into fluids. Don't look at the Alloy Blast Smelter in JEI, that's not until &5EV&r.", "quests.low_voltage.lv_mixer.task": "From Create or GregTech", "quests.low_voltage.soldering_alloy.title": "Soldering Alloy", "quests.low_voltage.soldering_alloy.subtitle": "I got soul but I'm not a solder", @@ -2749,7 +2891,7 @@ "quests.low_voltage.t2_circuit_board.desc.2": "&l&3Lore:&r&o Back in GTCEu 1.12.2, these circuit boards were called &2Good Circuit Boards&f. Not exactly a fitting name, as they're &4rather evil&f to craft.", "quests.low_voltage.lv_diode.title": "Diode", "quests.low_voltage.lv_diode.subtitle": "Don't be swayed by EMI!", - "quests.low_voltage.lv_diode.desc": "Don't let JEI fool you... there's only one possible recipe right now for this Primitive Diode -- the liquid glass one.\n\nDiodes have a infamously &4nasty recipe&r, but they will become cheaper and more convenient once you can obtain &ePolyethylene&r.\n\nThis is required for &dMV Circuits&r.", + "quests.low_voltage.lv_diode.desc": "Don't let JEI fool you... there's only two possible recipes right now for this Primitive Diode -- the liquid glass ones.\n\nDiodes have a infamously &4nasty recipe&r, but they will become cheaper and more convenient once you can obtain &ePolyethylene&r.\n\nThis is required for &dMV Circuits&r.", "quests.low_voltage.1_mv_circuit.title": "First MV Circuit!", "quests.low_voltage.1_mv_circuit.subtitle": "Does that mean we're at MV yet?", "quests.low_voltage.1_mv_circuit.desc": "Well... got any Aluminium Ingots yet?\n\nEach Electric Age has Circuits corresponding to its tier. The Good Electronic Circuit is the &dfirst MV Circuit&r you can make out of the three tiers of &bMV&r Circuitry.\n\nAlways be on the lookout for a cheaper way to make your circuits - new sets of recipes become available each time you make a new tier of &2Circuit Assembler&r. Conveniently, this tier of Circuit unlocks one now! Its recipes are far, far cheaper than the Deployers.\n\n&6Having this and Aluminium will grant access to MV Machines.&r\n\nIf you are having trouble understanding the mess that is GregTech circuits, check out the &6Progression Table&r chapter.", @@ -2848,6 +2990,9 @@ "quests.low_voltage.oil.title": "Found Oil early?", "quests.low_voltage.oil.subtitle": "For LV overachievers", "quests.low_voltage.oil.desc": "If you've found any Oilsands ores or Oil spouts (in deserts) in your travels, you can actually start using a little bit of it in LV.\n\nYou can either convert it into Heavy Fuel and put it in your boilers, or better yet, use it to make a little &bPolyethylene&r!\n\nThe details of this are in the MV chapter, but at this point you can use the polyethylene to make a few things such as cheaper Machine Hulls and Diodes.", + "quests.low_voltage.glowstone.title": "Permanent Lighting", + "quests.low_voltage.glowstone.subtitle": "A roundabout way of inventing light bulbs", + "quests.low_voltage.glowstone.desc": "Looking for some cheap, permanent light sources? Now that you've got an LV Extractor (and soon an LV Fluid Solidifer), you can put all that &6Glowstone Dust&r you found in The Beneath to work. Ran out? You can make more in a Mixer.\n\nCheck out JEI for all the new light sources you can make with both liquid glowstone and glowstone blocks. GregTech also has some made with glowstone dust in an assembler.\n\nAs a bonus, you can also use liquid glowstone as an infinite fuel for your lamps!", "quests.medium_voltage": "&bMV&r - Medium Voltage", "quests.medium_voltage.subtitle": "Venture into petrochemistry and refine electronics", "quests.medium_voltage.mv_machine_hull.title": "Welcome to MV!", @@ -2863,7 +3008,7 @@ "quests.medium_voltage.mv_miner.desc.3": "&cNote:&r Do not forget to &dchunkload&r all 9 chunks of the ore vein &7(open the map, claim the chunks with ctrl left-click, and enable force loading after claiming them)&r.\n\n&9Tip:&r You can either use an &3ME Chest&r, a &3Backpack&r, or a &3GT Crate&r as the output inventory to make transporting the ores back home a simple task. The &3ME Chest&r can be powered with EU directly, by the way.", "quests.medium_voltage.mv_miner.task": "Any miner", "quests.medium_voltage.mv_component.title": "The MV Components", - "quests.medium_voltage.mv_component_.subtitle": "Hated crafting these in previous tier?", + "quests.medium_voltage.mv_component_.subtitle": "Hated crafting these in the previous tier?", "quests.medium_voltage.mv_component.desc": "Here's a list of the components you will need in &bMV&r. To alleviate the pain, be sure to autocraft or &dbulk-craft&r these parts, especially &aMotors&r.\n\nFamiliar with the &aEmitter&r? This tier's Emitter requires a &dFlawless Emerald&r in its recipe, which'll be only attainable with the &3Sifting Machine&r for now.\n\nConveyors, Pumps and Robot Arms are objective upgrades to &7LV&r versions if you use them as covers.", "quests.medium_voltage.electrolyzer.title": "MV Electrolyzer", "quests.medium_voltage.electrolyzer.subtitle": "We made it to MV, and, well...", @@ -2937,7 +3082,7 @@ "quests.medium_voltage.mv_benzene.desc.3": "&l&3Lore:&r&o Benzene has been one of the most powerful gas fuels since GTCEu - so good that it became a meme. Nowadays, its days are numbered everywhere.", "quests.medium_voltage.reformate_gas.title": "The Reformate Church", "quests.medium_voltage.reformate_gas.subtitle": "When one giant falls, a new one arises", - "quests.medium_voltage.reformate_gas.desc": "The &8Reformate Gas&r is your new go-to gas fuel at &bMV&r if that's the path you want to take. For perfect efficiency, you only need &61 Coal Liquefaction Tower&r and &62 Pyrolyze Ovens&r, and you can start producing this precious gas non-stop.\n\nOh wait, first you need to find &5Rhenium&r, a new material only found within the hot and dry region of &7TerraFirmaCraft&r. The amounts consumed are so low that one vein should last you to the end of the modpack, or at the very least to &6HV&r, where - with the help of the &6Cracker&r - this gas can become truly infinite.", + "quests.medium_voltage.reformate_gas.desc": "The &8Reformate Gas&r is your new go-to gas fuel at &bMV&r if that's the path you want to take. For perfect efficiency, you only need &61 Liquefaction Tower&r and &62 Pyrolyze Ovens&r, and you can start producing this precious gas non-stop.\n\nOh wait, first you need to find &5Rhenium&r, a new material only found within the hot and dry region of &7TerraFirmaCraft&r. The amounts consumed are so low that one vein should last you to the end of the modpack, or at the very least to &6HV&r, where - with the help of the &6Cracker&r - this gas can become truly infinite.", "quests.medium_voltage.mv_light_fuel.title": "Light Fuel", "quests.medium_voltage.mv_light_fuel.subtitle": "Turn up the lights in here, baby", "quests.medium_voltage.mv_light_fuel.desc": "Distillating &aOil&r will give you Fuel that you will need to desulfurize.\n\n&aHydrogen Sulfide&r is perfectly &drecycled&r in an &3Electrolyzer&r.\n\nTo automate this process, simply place your &3Chemical Reactor&r and your &3Electrolyzer&r next to each other. Be sure to use your &5Screwdriver&r to &4enable input from the output side&r.\n\n&aLight Fuel&r is a good &9Power&r option, but there's something even greater... check the Quest to the left.", @@ -2946,10 +3091,10 @@ "quests.medium_voltage.mv_diesel.desc.1": "&aDiesel&r is a &dOil-based &9Combustion Fuel&r.\n\nTo mix &aLight Fuel&r and &aHeavy Fuel&r, the right ratio for &3Distilleries&r is &63:2&r from &dOil&r or &dRaw Oil&r.\n\nThis would necessitate 3 Distilleries for Light Fuel, or 2 Distilleries for Heavy Fuel.", "quests.medium_voltage.mv_diesel.desc.2": "You can cut the amount of &dOil&r required &6drastically&r by using &dHeavy Oil&r for &aHeavy Fuel&r specifically. &dOilsands&r is a great option if you wish to go down this route!\n\n&o(For the math nerds, you go from 8.33 Oil -> 6 Diesel, to 5 Oil + 0.4 Heavy Oil -> 6 Diesel)&r\n\n&eNote:&r Do &cnot attempt&r to put Oil in the &3Distillation Tower&r You might think it's a good idea because it gives both Light Fuel and Heavy Fuel. However, this process requires a lot of overclocking to be worth your time, and you will lose more energy than what the byproducts are worth.", "quests.medium_voltage.mv_diesel.desc.3": "In general, it is better to prioritize placing down more machines (&dparallelisation&r) over overclocking the recipes. That way, you end up losing less energy processing the resources.\n\n&aDiesel&r is burned in a &3Combustion Generator&r. It can be further refined to &6Cetane-Boosted Diesel&r in &6HV&r. Compared to the other power sources, it is generally more efficient, but a more demanding processing line. If you take the &eOil&r route for &aPolyethylene&r, this can work great with existing infrastructure. Ultimately, the power source you want to use is your choice.", - "quests.medium_voltage.coal_tower.title": "Coal Liquefaction Tower", + "quests.medium_voltage.coal_tower.title": "Liquefaction Tower", "quests.medium_voltage.coal_tower.subtitle": "Who doesn't love new Multiblocks", - "quests.medium_voltage.coal_tower.desc.1": "The &bCoal Liquefaction Tower&r is a new &bmultiblock&r used in the process of making &aReformate Gas&r and its byproducts, &7Coal Tar&r and &7Syngas&r. Depending on the &9Coil&r you use, you will get a discount on the &7EU/t&r cost of every recipe. Simply use shift-click while hovering on a coil to know its bonuses.\n\nNotice that the &9Coal Liquefaction Tower&r can be boosted by using &8Hydrogen&r, reducing the duration and therefore the cost. Don't forget to set the right &6circuit&r so it works.\n\nBy the way, if you don't know, a second is 20 ticks. So the amount it consumes per tick has to be multiplied by 20 to know how much it consumes per second.", - "quests.medium_voltage.coal_tower.desc.2": "&l&3Lore:&r&o The same person who made the Fission Reactor also made the first design of the Coal Liquefaction Tower, isn't it crazy.", + "quests.medium_voltage.coal_tower.desc.1": "The &bLiquefaction Tower&r is a new &bmultiblock&r used in the process of making &aReformate Gas&r and its byproducts, &7Coal Tar&r and &7Syngas&r. Depending on the &9Coil&r you use, you will get a discount on the &7recipe duration&r of every recipe. Simply use shift-click while hovering on a coil to know its bonuses.\n\nNotice that the &9Liquefaction Tower&r can be boosted by using &8Hydrogen&r, reducing the duration and therefore the cost. Don't forget to set the right &6circuit&r so it works.\n\nBy the way, if you don't know, a second is 20 ticks. So the amount it consumes per tick has to be multiplied by 20 to know how much it consumes per second.", + "quests.medium_voltage.coal_tower.desc.2": "&l&3Lore:&r&o The same person who made the Fission Reactor also made the first design of the Liquefaction Tower, isn't it crazy.", "quests.medium_voltage.mv_jetpack.title": "I Believe I Can Fly", "quests.medium_voltage.mv_jetpack.subtitle": "...well, almost Fly", "quests.medium_voltage.mv_jetpack.desc": "This Jetpack takes most &aCombustion Fuels&r (excluding oils) to enable a primitive form of flight.\n\nFill it like you would fill a Drum, or with a &3Canning Machine&r.\n\nPress &4H&r (default) to enable Hover Mode.", @@ -3070,8 +3215,8 @@ "quests.medium_voltage.mv_jetpack_2.desc": "This jetpack enables flight, and requires energy.\n\nCharge it like you would charge a Battery.\n\nPress &4H&r (default) to enable Hover Mode.\n\n&o&8(Yeah, yeah, a jetpack is supposed to work off propellants. Y'all are always here to nitpick.)&r", "quests.medium_voltage.mv_cutter.title": "Advanced Cutter", "quests.medium_voltage.mv_cutter.subtitle": "Upgrades, people, upgrades!", - "quests.medium_voltage.mv_cutter.desc": "The &3MV Cutter&r is required to cut &7Silicon Boules&r to prepare them for &aLaser Engraving&r.\n\nWe recommend you supply this machine with a steady stream of &dLubricant&r to cut down on the processing time.\n\nLubricant can be &3brewed&r from &eOil&r and &aTalc&r, &2Soapstone&r or &cRedstone&r.\n\n&7Note : You could use the &6Greate&r &7version, it has now a tank to fill with it fluid&r&r", - "quests.medium_voltage.mv_cutter.task": "Any Brewery", + "quests.medium_voltage.mv_cutter.desc": "The &3MV Cutter&r is required to cut &7Silicon Boules&r to prepare them for &aLaser Engraving&r.\n\nWe recommend you supply this machine with a steady stream of &dLubricant&r to cut down on the processing time.\n\nLubricant can be &3brewed&r from &eOil&r and &aTalc&r, &2Soapstone&r or &cRedstone&r.\n\n&7Note: You could use the &6Greate&r &7version, it has a tank to fill with fluid&r", + "quests.medium_voltage.mv_cutter.task": "Any Cutter", "quests.medium_voltage.mv_laser_engraver.title": "Laser Engraving", "quests.medium_voltage.mv_laser_engraver.subtitle": "This is peak technology, this is slow also", "quests.medium_voltage.mv_laser_engraver.desc": "The &3Laser Engraver&r engraves patterns into &9Silicon Wafers&r based on the type of &9Lens&r it is given. After the wafers are engraved, they must be passed through a &3Cutting Machine&r to turn them into components ready to be put into Circuits.\n\nHigher tier Engravers can etch more complex wafers for more efficient Circuits.", @@ -3079,7 +3224,7 @@ "quests.medium_voltage.mv_silicon_boule.subtitle": "These wafers are fully fungible", "quests.medium_voltage.mv_silicon_boule.desc": "&9Silicon Boules&r are made in the &3EBF&r with half a stack of &aSilicon Dust&r and a pinch of &aGallium Arsenide&r. Their primary purpose is engraving &6Circuit Wafers&r.\n\nAfter making the Boule, process it in the &3Cutter&r to get 16 Silicon Wafers ready for engraving.\n\n&cWarning:&r Each Silicon Boule takes &47.5 minutes&r to make at 120 EU/t, or 1,080,000 EU! If the EBF loses power midway, the recipe will start to &close progress&r.\n\nWith that being said, Silicon Boules take an absolute age to craft, so consider parallelizing the recipe in multiple &3EBF&rs and stockpiling them.", "quests.medium_voltage.mv_silicon.title": "Silicon Dust", - "quests.medium_voltage.mv_silicon.subtitle": "", + "quests.medium_voltage.mv_silicon.subtitle": "Sillycon", "quests.medium_voltage.mv_silicon.desc.1": "You’ll need to get used to it: in &dGregTech&r, there are always &amultiple ways&r to reach what you want—a philosophy we made sure to preserve in &aTerrafirmaGreg&r.\n\nTo obtain &5Silicon&r, we’ll suggest &ctwo main methods&r so you have clear directions. As always, it’s up to you to figure out what’s &abest for your situation&r.", "quests.medium_voltage.mv_silicon.desc.2": "First method: &amining silicon-rich ores&r. Look for &9Mica&r or &9Kyanite&r veins—they also contain &dAluminium&r. Alternatively, you can &aElectrolyze Zeolite Dust&r, found in &9Chalcopyrite&r and &dRealgar&r veins.\n\nSecond method: &eAdvanced but powerful&r. Although more expensive to set up and slower early on, it becomes the &ebest method&r at &6HV&r and beyond. Plus, it generates &9Oxygen&r as a bonus! The idea is simple: &aElectrolyze Silicon Dioxide Dust&r into &9Oxygen&r and &5Silicon&r. You can get &aSilicon Dioxide Dust&r by &9centrifuging Flint Dust&r, which itself comes from &9Flint&r collected by &asifting Gravel&r.\n\nThis setup can become &afully passive&r easily. Try using the &aEMI Recipe Tree&r tool (bottom left of your screen) to plan your builds—it really helps!", "quests.medium_voltage.mv_ulpic.title": "ULPIC Chips", @@ -3171,7 +3316,7 @@ "quests.metal_age.crucible.desc": "The Crucible is placed on top of a Forge. It comes with 9 inventory slots and has a capacity for 4032mB of fluid, including an interface to check your alloying ratios. They also retain their contents when broken. They can also collect Pig Iron when placed below a Blast Furnace.\n\nKeep in mind that the crucible WILL try to alloy everything inside it - it does not keep metals separate like a TC Smeltery - so it's a good idea to keep it clean when you aren't using it.", "quests.metal_age.fire_bricks.title": "Fire Bricks", "quests.metal_age.fire_bricks.subtitle": "For the Blast Furnace", - "quests.metal_age.fire_bricks.desc": "Fire Bricks are used in the construction of the Blast Furnace, you need at the very least 4 Bricks to make the furnace.\n\nThe Bricks will require insulation to make sure the process of making steel is effective, you can either place 3 Wrought Iron Sheets around the Fire Bricks, or use Blast Furnace Insulation", + "quests.metal_age.fire_bricks.desc": "Fire Bricks are used in the construction of the Blast Furnace, you need at the very least 4 Bricks to make the furnace.\n\nThe Bricks will require insulation to make sure the process of making steel is effective, you can either place 3 Wrought Iron Plates around the Fire Bricks, or use Blast Furnace Insulation", "quests.metal_age.fully_stacked_blast_furnace.title": "Fully Stacked Blast Furnace", "quests.metal_age.fully_stacked_blast_furnace.subtitle": "The completed Blast Furnace", "quests.metal_age.fully_stacked_blast_furnace.desc": "A full size Blast Furnace is able to melt and process large amounts of iron at once. It's a good idea to make it bigger when you can, because you'll need a lot of steel for the future.\n\nAfter you've got your first Steam Alloy Smelter, you'll be able to create more Fire Bricks more cheaply.", @@ -3237,6 +3382,10 @@ "quests.metal_age.this_is_a_bucket.title": "This... is a Bucket.", "quests.metal_age.this_is_a_bucket.subtitle": "Dear God...", "quests.metal_age.this_is_a_bucket.desc": "Congratulations on crafting the Bucket. The Metallurgy Age is officially over.\n\nGo and start working on those Low Voltage components!", + "quests.metal_age.temperature_protection.title": "Colored Steel Equipment", + "quests.metal_age.temperature_protection.subtitle": "Permanent Temperature Protection", + "quests.metal_age.temperature_protection.desc": "Tired of holding tongs? The excellent thermal protection properties of colored steel carries over to their equipment!\n\n&9Blue Steel&r equipment can protect against extreme heat, such as holding hot ingots or stepping on pipes full of steam, while &cRed Steel&r equipment does the same but for the cold. Chestplate items protects your inventory, while boot items protect against pipes.\n\nCheck the &6#hot_protection_equipment&r and &b#cold_protection_equipment&r tags for a full list!", + "quests.metal_age.temperature_protection.task": "Any red or blue steel equipment", "quests.ore_proc": "Ore Processing", "quests.ore_proc.subtitle": "Everything you'll need to get the most out of your ores", "quests.ore_proc.native_ore.title": "Welcome to Ore Processing", @@ -3450,7 +3599,7 @@ "quests.space_survival.sandworm.desc": "If you make too much noise in the desert, you might attract the attention of the mighty &6Sandworm&r! It's more of an environmental hazard than a boss to kill, so your best way of surviving it is to run away!\n\nIf you manage to hit its head enough times with &bexplosion damage&r, it will leave you alone... for a while.\n\nThankfully, the Sandworm can only damage entities, not buildings, and is only attracted to the &6footsteps of players&r, so any way to keep &byour own feet&r off the ground won't anger it. The atmosphere is too thin for airplanes and hang gliders, but there are other tools...", "quests.space_survival.spice.title": "Ostrum Deposits", "quests.space_survival.spice.subtitle": "Spice Melange", - "quests.space_survival.spice.desc": "&dOstrum Deposits&r are immovable blocks that you can only find in the Martian Deep Desert, far away from any of the more lush areas. They spawn in small blobs, and can be broken to make space for your Ostrum Harvester if they're on a slope. Try using a &6Spyglass&r to find them from a distance!\n\nYou'll have to figure out some long-distance logistics to ship your Ostrum back to your base. (Try a train, Accumulators can transport power!)\n\nOstrum is a crucial resource for both &5EV&r progression and making infinite ores from Mars.", + "quests.space_survival.spice.desc": "&dOstrum Deposits&r are immovable blocks that you can only find in the Martian Deep Desert, far away from any of the more lush areas. They spawn in small blobs, and can be broken to make space for your Ostrum Harvester if they're on a slope. Try using a &6Spyglass&r to find them from a distance!\n\nYou'll have to figure out some long-distance logistics to ship your Ostrum back to your base. (Try a train!)\n\nOstrum is a crucial resource for both &5EV&r progression and making infinite ores from Mars.", "quests.space_survival.spice.task": "The spice must flow", "quests.space_survival.mars_islands.title": "The Martian Jungles", "quests.space_survival.mars_islands.subtitle": "Is that a dinosaur?!", @@ -3536,19 +3685,19 @@ "quests.steam_age.horse_crank.title": "Your First Power Source", "quests.steam_age.horse_crank.subtitle": "Make your livestock pay rent", "quests.steam_age.horse_crank.desc.1": "The &3Animal Crank&r is your first accessible source of mechanical power. To use it, place the crank on the center of a 7x7 cleared area and leash an animal to it. Different animals will provide different amounts of power, while the blocks underneath will increase the speed of the output power. The area of multiple cranks can overlap.\n\nYou may need to hold a second lead to attach an animal.", - "quests.steam_age.horse_crank.desc.2": "&3Small Animals (4 SU):&r\nWolf, Dog, Pig, Sheep, Goat, Alpaca\n\n&3Medium Animals (6 SU):&r\nCow, Donkey\n\n&3Large Animals (8 SU):&r\nHorse, Mule, Musk Ox, Yak", + "quests.steam_age.horse_crank.desc.2": "&3Small Animals (8 SU):&r\nWolf, Dog, Pig, Sheep, Goat, Alpaca\n\n&3Medium Animals (12 SU):&r\nCow, Donkey\n\n&3Large Animals (16 SU):&r\nHorse, Mule, Musk Ox, Yak", "quests.steam_age.poor_paths.title": "Poor Paths", "quests.steam_age.poor_paths.subtitle": "This is just dirt", - "quests.steam_age.poor_paths.desc": "This is the worst kind of road you could use. The animal crank will operate at 2 RPM.", + "quests.steam_age.poor_paths.desc": "This is the worst kind of road you could use. The animal crank will operate at 8 RPM.", "quests.steam_age.normal_paths.title": "Medium Paths", "quests.steam_age.normal_paths.subtitle": "Ok, you put a little effort in", - "quests.steam_age.normal_paths.desc": "Medium paths are a little better and will let your animals turn the crank at 4 RPM.\n\nNote: You can't have a Dirt Path block directly under the animal crank, so that one will have to be Gravel.", + "quests.steam_age.normal_paths.desc": "Medium paths are a little better and will let your animals turn the crank at 16 RPM.\n\nNote: You can't have a Dirt Path block directly under the animal crank, so that one will have to be Gravel.", "quests.steam_age.good_paths.title": "Great Paths", "quests.steam_age.good_paths.subtitle": "No horseshoes required!", - "quests.steam_age.good_paths.desc": "These are the best kind of paths you could use, letting your crank output at 8 RPM. These kinds of paths also increases the player's move speed too, so they're great to pave your base with!", + "quests.steam_age.good_paths.desc": "These are the best kind of paths you could use, letting your crank output at 32 RPM. These kinds of paths also increases the player's move speed too, so they're great to pave your base with!", "quests.steam_age.helve_hammer.title": "Helve Hammer", "quests.steam_age.helve_hammer.subtitle": "CLANG... CLANG... CLANG...", - "quests.steam_age.helve_hammer.desc": "Does crafting all those plates for a Bloomery look tedious? The &3Helve Hammer&r will automatically (but slowly) flatten double ingots into plates for you. You'll still have to do the welding yourself though. Simply place an anvil directly under the hammer and throw your double ingots onto it, then right-click the hammer to get your plates out.\n\nHigher tier anvils will also require fewer hits to make plates from the previous tier.", + "quests.steam_age.helve_hammer.desc": "Does crafting all those plates for a Bloomery look tedious? The &3Helve Hammer&r will automatically (but slowly) flatten double ingots into plates for you. You'll still have to do the welding yourself though. Simply place an anvil directly under the hammer and throw your double ingots onto it by pressing the &2Throw Item key (Default: Q)&r, then right-click the hammer to get your plates out.\n\nHigher tier anvils will also require fewer hits to make plates from the previous tier.", "quests.steam_age.water_wheel.title": "Water Wheels", "quests.steam_age.water_wheel.subtitle": "Hope you set up your base near a river!", "quests.steam_age.water_wheel.desc": "Water wheels provide much more power than the Animal Crank, at the expense of requiring flowing water. You don't have the ability to move water sources yet, so you'll need to find a river to power these. Oceans and Lakes can also provide a little power, but if you're far inland, you're better off looking at building a windmill.\n\nYou can get treated wood by soaking any planks in creosote from your Coke Oven.", @@ -3596,7 +3745,7 @@ "quests.steam_age.mold_table.desc.2": "If you'd like, you can also use a Chute to drop your items into the top of the blast furnace, and a Deployer to automatically work the bellows. Excessive bellow blowing will quickly use up the durability of your Tuyere, though item pipes can push a new one in.\n\nYou could even have a pump pull from both your blast furnace and your crucible, using a Fluid Valve to stop the pump while you're alloying, and turn it back on once you're finished.", "quests.steam_age.fluid_pipes.title": "Fluid Pipes", "quests.steam_age.fluid_pipes.subtitle": "Liquids, gases... we don't discriminate", - "quests.steam_age.fluid_pipes.desc.1": "&bFluid Pipes&r will transport &7Steam&r between machines for you.\n\nEach Pipe has a certain throughput in mB/t, and a &6Temperature Limit&r. This is relevant right now, as Steam will burn Wooden Pipes. Some pipes have &bspecial&r attributes you don't need to worry about for now.\n\nEach material has several sizes for Pipes. The bigger the Pipe, the &ahigher&r the throughput, but the more &dexpensive&r the craft. For example, a normal &6Bronze Fluid Pipe&r transfers 120 mB/t. (It also has a 1,200 mB internal buffer!)\n\nTo start off, we recommend using Wood pipes for cold fluids, and Bronze ones for hot fluids.", + "quests.steam_age.fluid_pipes.desc.1": "&bFluid Pipes&r will transport &7Steam&r between machines for you.\n\nEach Pipe has a certain throughput in mB/t, and a &6Temperature Limit&r. This is relevant right now, as Steam will burn Wooden Pipes. Some pipes have &bspecial&r attributes you don't need to worry about for now.\n\nEach material has several sizes for Pipes. The bigger the Pipe, the &ahigher&r the throughput, but the more &dexpensive&r the craft. For example, a normal &6Bronze Fluid Pipe&r transfers 120 mB/t. (It also has a 1,200 mB internal buffer!)\n\nTo start off, we recommend using Wood pipes for room-temperature fluids, and Bronze ones for hot fluids.", "quests.steam_age.fluid_pipes.desc.2": "&aReminder:&r 1 second = 20 ticks... assuming the server isn't lagging.\n\n&dNote:&r GT6-style Pipes are enabled. It means that placing Pipes connects them only to the block they were placed against. To open more connections, use your Wrench on the pipe.\n\nYou can also shift-right click with your Wrench to disable input from a side. This can help counteract sloshing (liquids travelling in an undesired direction).", "quests.steam_age.fluid_drums.title": "Efficient Fluid Storage", "quests.steam_age.fluid_drums.subtitle": "I don't think a wooden barrel can hold molten steel", @@ -3753,7 +3902,7 @@ "quests.steam_age.steel_mech_press.desc.2": "&l&3Lore:&r&o The Create Mechanical Press used to be a key piece of late steam age progression prior to version 0.9 of TerraFirmaGreg, because it produced plates at an even better ratio of 5 to 4. However, its implementation was actually \"20 percent of the time, you get nothing\", which caused many people to proclaim how much they loved gambling while using it.", "quests.steam_age.supers.title": "Super Chests and Super Tanks", "quests.steam_age.supers.subtitle": "Super Storage Drawers", - "quests.steam_age.supers.desc": "This is the &cu&6l&et&ai&bm&9a&5t&4e&r portable item and storage solution if you have a lot of single items or fluids. While these &dBasic&r (&8ULV&r) ones start out relatively small, higher tiers of Super chests and tanks can hold an insane amount of stuff - all in one single block without any regards to temperature or acidity!\n\nLike Drums, Super Tanks and Chests &6keep their contents when broken&r, can be cleared in the crafting grid, and can automatically void any overflow.\n\nIf you hunger for &9even more&r storage, take a look at higher tier Quantum Chests and Tanks or AE2 Storage Cells.", + "quests.steam_age.supers.desc": "This is the &cu&6l&et&ai&bm&9a&5t&4e&r portable item and storage solution if you have a lot of single items or fluids. While these &dBasic&r (&8ULV&r) ones start out relatively small, higher tiers of Super chests and tanks can hold an insane amount of stuff - all in one single block without any regards to temperature or acidity!\n\nLike Drums, Super Tanks and Chests &6keep their contents when broken&r, can be cleared in the crafting grid, and can automatically void any overflow. Unlike drums, however, Super Tanks also &asafely contain&r their contents, preventing you from getting burnt, frozen, or floating.\n\nIf you hunger for &9even more&r storage, take a look at higher tier Quantum Chests and Tanks or AE2 Storage Cells.", "quests.steam_age.supers.task": "Any super chest or tank", "quests.stone_age": "Stone Age", "quests.stone_age.subtitle": "Humble Beginnings", @@ -3913,6 +4062,11 @@ "quests.stone_age.hazards.subtitle": "Thought the surface was difficult? Think again.", "quests.stone_age.hazards.desc.1": "Besides the monsters, the biggest challenge when mining is dealing with cave-ins. If a Raw stone or ore block has air below it, it's considered 'unsupported' and has a chance to start a cave-in every time a nearby block is mined. Cave roofs are covered with Hardened stone, which won't cause a collapse. To mitigate this, the safest thing you can do is just mine the floor, but if you want to safely mine anything else you'll have to learn how to use support beams! These are crafted with logs and a saw.", "quests.stone_age.hazards.desc.2": "The Field Guide has more details and diagrams about how exactly support beams work, but the short version is you'll want to place them down like this within four blocks of each other. Only the top vertical beams will actually support anything, and they have a small radius.", + "quests.stone_age.medical_conditions.title": "Medical Conditions", + "quests.stone_age.medical_conditions.subtitle": "Don't eat the Asbestos", + "quests.stone_age.medical_conditions.desc.1": "Be careful what you pick up! Not all ores or dusts are safe to touch, and some will cause a buildup of a &6Medical Condition&r.\n\nEverything &cHazardous&r is written on its tooltip, so if you suddenly notice a debuff appearing, get that item out of your inventory! Putting it inside a container like a small vessel or backpack is safe.\n\nMost of these effects will slowly go away on their own, but if you let them build up long enough, you'll start getting a host of other nasty effects, up to and including &cdeath&r.", + "quests.stone_age.medical_conditions.desc.2": "You will eventually need to work with some of these materials, so you have ways to deal with them.\n\nThe best way is to avoid getting any conditions in the first place - a Face Mask and Rubber Gloves will prevent inhalation and contact hazards respectively.\n\nThe second-best way is a cure: check out some of the &aPills, Tablets, and Salvos&r you can craft - they all help cure certain effects (and provide helpful buffs!), though the stronger cures have more annoying side-effects.", + "quests.stone_age.medical_conditions.task": "I'm my own doctor", "quests.stone_age.copper_for_anvil.title": "Copper for the Anvil", "quests.stone_age.copper_for_anvil.subtitle": "You better get used to getting 14 ingots of something.", "quests.stone_age.copper_for_anvil.desc": "Anvils aren't cheap! Each anvil will require 14 ingots, which are then welded into 7 double ingots.\n\nYou might want to start mining at this point if you haven't already, gathering 126 pieces of small copper is difficult.", @@ -3942,7 +4096,7 @@ "quests.stone_age.flux.desc": "Flux is an item that is primarily used in metal working to weld things together, though it has some other uses too.\nCertain types of Rocks such as Chalk, Limestone and Marble can be crushed down to make Flux, as well as the shells of various ocean animals.", "quests.stone_age.weld_copper_ingots.title": "Welding Copper", "quests.stone_age.weld_copper_ingots.subtitle": "So close to the Copper Anvil", - "quests.stone_age.weld_copper_ingots.desc": "Light up your Forge and give it at least 2 Copper Ingots. Keep an eye on their tooltip as they heat up - once they get hot, it'll show \"Can Work\", but we need to wait until they get to \"Can Weld\", which is just before their melting point.\n\nOnce they reach it, quickly pull them out of the forge (while holding some wooden tongs in your off-hand!) and into the Rock Anvil's interface, along with a little bit of flux. Lastly, right-click the anvil while sneaking to weld the two ingots together while they're still hot. You can use water or snow to cool down your new double ingot faster.", + "quests.stone_age.weld_copper_ingots.desc": "Light up your Forge and give it at least 2 Copper Ingots. Keep an eye on their tooltip as they heat up - once they get hot, it'll show \"Can Work\", but we need to wait until they get to \"Can Weld\", which is just before their melting point.\n\nOnce they reach it, quickly pull them out of the forge (while holding some &ewooden tongs&r in your off-hand!) and into the Rock Anvil's interface, along with a little bit of flux. Lastly, right-click the anvil while sneaking to weld the two ingots together while they're still hot. You can use water or snow to cool down your new double ingot faster.", "quests.metal_age.copper_anvil.title": "T1 Anvil: Copper", "quests.metal_age.copper_anvil.subtitle": "It's all been building up to this!", "quests.metal_age.copper_anvil.desc": "Congratulations! You've officially finished the Stone Age and entered the Metallurgy Age! With your Copper Anvil, the next step is to climb up the Anvil Tiers, and each time you unlock a new Tier, new tools and possibilities will be available to make your life progressively easier. Now go and become a master smith!", @@ -4428,7 +4582,7 @@ "quests.tfg_tips.firmaciv_info.desc": "&3Firma:Civ&r comes with 4 different navigational tools, each giving you important information about your position in the world.\nIncludes the &dSextant&r, &dNavigator's Timepiece&r, &dBarometer&r, and &dCompass&r; more information about the tools in the &2Field Guide.&r\n\n&3&lLore:&r&o: Firma:Civ by default removes coordinates to make you use its navigational tools. We can't do that here, so uh, use them if you want to LARP.", "quests.tfg_tips.warfare.title": "Sea Warfare", "quests.tfg_tips.warfare.subtitle": "FIRE ALL CANNONS!", - "quests.tfg_tips.warfare.desc": "You can outfit your &bSloop&r with firepower via the &dCannon&r and cannon balls, in case you want to blow something to smithereens.\nTo fire a cannon, you'll need to load it with some &aGunpowder, Unrefined Paper&r and your &aCannon Ball&r. Then light the wick with &cFlint and Steel.&r", + "quests.tfg_tips.warfare.desc": "You can outfit your &bSloop&r with firepower via the &dCannon&r and cannon balls, in case you want to blow something to smithereens.\nTo fire a cannon, you'll need to load it with some &aGunpowder, Unrefined Paper&r and your &aCannon Ball&r. Then light the wick with &cFlint and Steel.&r\n\nDon't have a &bSloop&r? Don't worry! Cannons can be placed and fired on the ground the same way you would fire one on a &bSloop&r.", "quests.tfg_tips.kayak_materials.title": "The Kayak", "quests.tfg_tips.kayak_materials.subtitle": "Get yourself that Kayak.", "quests.tfg_tips.kayak_materials.desc": "The &dKayak&r is the second most simple boat you can craft, requiring &bWaxes&r for the &aWaterproof Hides&r. It is also the &conly&r boat that can be picked up as an item. Despite having a &dsingle passenger&r slot, it is the fastest boat in the game until the steel age &dSloop!&r", diff --git a/kubejs/assets/tfg/lang/fr_fr.json b/kubejs/assets/tfg/lang/fr_fr.json index b24b4f7cb..08bcf52cb 100644 --- a/kubejs/assets/tfg/lang/fr_fr.json +++ b/kubejs/assets/tfg/lang/fr_fr.json @@ -1210,7 +1210,7 @@ "trim_material.tfc.salt_tfc": "salt", "trim_material.tfc.sapphire_tfc": "Sapphire", "trim_material.tfc.sodalite_tfc": "Sodalite", - "trim_material.tfc.coke_tfc": "Coke", + "trim_material.tfc.armalcolite_tfc": "Armalcolite", "trim_material.tfc.spessartine_tfc": "Spessartine", "trim_material.tfc.topaz_tfc": "Topaz", "trim_material.tfc.uvarovite_tfc": "Uvarovite", @@ -2610,7 +2610,7 @@ "quests.metal_age.crucible.desc": "The Crucible is placed on top of a Forge. It comes with 9 inventory slots and has a capacity for 4032mB of fluid, including an interface to check your alloying ratios. They also retain their contents when broken. They can also collect Pig Iron when placed below a Blast Furnace.\n\nKeep in mind that the crucible WILL try to alloy everything inside it - it does not keep metals separate like a TC Smeltery - so it's a good idea to keep it clean when you aren't using it.", "quests.metal_age.fire_bricks.title": "Fire Bricks", "quests.metal_age.fire_bricks.subtitle": "For the Blast Furnace", - "quests.metal_age.fire_bricks.desc": "Fire Bricks are used in the construction of the Blast Furnace, you need at the very least 4 Bricks to make the furnace.\n\nThe Bricks will require insulation to make sure the process of making steel is effective, you can either place 3 Wrought Iron Sheets around the Fire Bricks, or use Blast Furnace Insulation", + "quests.metal_age.fire_bricks.desc": "Fire Bricks are used in the construction of the Blast Furnace, you need at the very least 4 Bricks to make the furnace.\n\nThe Bricks will require insulation to make sure the process of making steel is effective, you can either place 3 Wrought Iron Plates around the Fire Bricks, or use Blast Furnace Insulation", "quests.metal_age.fully_stacked_blast_furnace.title": "Fully Stacked Blast Furnace", "quests.metal_age.fully_stacked_blast_furnace.subtitle": "The completed Blast Furnace", "quests.metal_age.fully_stacked_blast_furnace.desc": "A full size Blast Furnace is able to melt and process large amounts of iron at once. It's a good idea to make it bigger when you can, because you'll need a lot of steel for the future.\n\nAfter you've got your first Steam Alloy Smelter, you'll be able to create more Fire Bricks more cheaply.", @@ -2893,19 +2893,19 @@ "quests.steam_age.horse_crank.title": "Your First Power Source", "quests.steam_age.horse_crank.subtitle": "Make your livestock pay rent", "quests.steam_age.horse_crank.desc.1": "The &3Animal Crank&r is your first accessible source of mechanical power. To use it, place the crank on the center of a 7x7 cleared area and leash an animal to it. Different animals will provide different amounts of power, while the blocks underneath will increase the speed of the output power. The area of multiple cranks can overlap.\n\nYou may need to hold a second lead to attach an animal.", - "quests.steam_age.horse_crank.desc.2": "&3Small Animals (4 SU):&r\nWolf, Dog, Pig, Sheep, Goat, Alpaca\n\n&3Medium Animals (6 SU):&r\nCow, Donkey\n\n&3Large Animals (8 SU):&r\nHorse, Mule, Musk Ox, Yak", + "quests.steam_age.horse_crank.desc.2": "&3Small Animals (8 SU):&r\nWolf, Dog, Pig, Sheep, Goat, Alpaca\n\n&3Medium Animals (12 SU):&r\nCow, Donkey\n\n&3Large Animals (16 SU):&r\nHorse, Mule, Musk Ox, Yak", "quests.steam_age.poor_paths.title": "Poor Paths", "quests.steam_age.poor_paths.subtitle": "This is just dirt", - "quests.steam_age.poor_paths.desc": "This is the worst kind of road you could use. The animal crank will operate at 2 RPM.", + "quests.steam_age.poor_paths.desc": "This is the worst kind of road you could use. The animal crank will operate at 8 RPM.", "quests.steam_age.normal_paths.title": "Medium Paths", "quests.steam_age.normal_paths.subtitle": "Ok, you put a little effort in", - "quests.steam_age.normal_paths.desc": "Medium paths are a little better and will let your animals turn the crank at 4 RPM.\n\nNote: You can't have a Dirt Path block directly under the animal crank, so that one will have to be Gravel.", + "quests.steam_age.normal_paths.desc": "Medium paths are a little better and will let your animals turn the crank at 16 RPM.\n\nNote: You can't have a Dirt Path block directly under the animal crank, so that one will have to be Gravel.", "quests.steam_age.good_paths.title": "Great Paths", "quests.steam_age.good_paths.subtitle": "No horseshoes required!", - "quests.steam_age.good_paths.desc": "These are the best kind of paths you could use, letting your crank output at 8 RPM. These kinds of paths also increases the player's move speed too, so they're great to pave your base with!", + "quests.steam_age.good_paths.desc": "These are the best kind of paths you could use, letting your crank output at 32 RPM. These kinds of paths also increases the player's move speed too, so they're great to pave your base with!", "quests.steam_age.helve_hammer.title": "Helve Hammer", "quests.steam_age.helve_hammer.subtitle": "CLANG... CLANG... CLANG...", - "quests.steam_age.helve_hammer.desc": "Does crafting all those plates for a Bloomery look tedious? The &3Helve Hammer&r will automatically (but slowly) flatten double ingots into plates for you. You'll still have to do the welding yourself though. Simply place an anvil directly under the hammer and throw your double ingots onto it, then right-click the hammer to get your plates out.\n\nHigher tier anvils will also require fewer hits to make plates from the previous tier.", + "quests.steam_age.helve_hammer.desc": "Does crafting all those plates for a Bloomery look tedious? The &3Helve Hammer&r will automatically (but slowly) flatten double ingots into plates for you. You'll still have to do the welding yourself though. Simply place an anvil directly under the hammer and throw your double ingots onto it by pressing the &2Throw Item key (Default: Q)&r, then right-click the hammer to get your plates out.\n\nHigher tier anvils will also require fewer hits to make plates from the previous tier.", "quests.steam_age.water_wheel.title": "Water Wheels", "quests.steam_age.water_wheel.subtitle": "Hope you set up your base near a river!", "quests.steam_age.water_wheel.desc": "Water wheels provide much more power than the Animal Crank, at the expense of requiring flowing water. You don't have the ability to move water sources yet, so you'll need to find some sort of river or waterfall to power these.\n\nYou can get treated wood by soaking any planks in creosote from your Coke Oven.", diff --git a/kubejs/assets/tfg/lang/ja_jp.json b/kubejs/assets/tfg/lang/ja_jp.json index 316dabe38..879e317a5 100644 --- a/kubejs/assets/tfg/lang/ja_jp.json +++ b/kubejs/assets/tfg/lang/ja_jp.json @@ -141,8 +141,8 @@ "block.tfg.granite_support": "花崗岩の梁", "block.tfg.pyroxenite_support_horizontal": "輝岩の梁", "block.tfg.pyroxenite_support": "輝岩の梁", - "block.tfg.Migmatite_support_horizontal": "混成岩の梁", - "block.tfg.Migmatite_support": "混成岩の梁", + "block.tfg.migmatite_support_horizontal": "混成岩の梁", + "block.tfg.migmatite_support": "混成岩の梁", "block.tfg.travertine_support_horizontal": "鍾乳石の梁", "block.tfg.travertine_support": "鍾乳石の梁", "block.tfg.glacian_support": "グラシアンの梁", @@ -419,6 +419,8 @@ "block.tfg.rock.cut_red_sandstone_wall": "研がれた赤鉄質の砂岩の塀", "block.tfg.rock.raw.stromatolite": "ストロマトライト", "block.tfg.rock.spike.stromatolite": "ストロマトライトのつらら石", + "block.tfg.stromatolite_cluster_small": "小さいストロマトライトの塊", + "block.tfg.stromatolite_cluster_medium": "大きいストロマトライトの塊", "block.tfg.rock.raw.geyserite": "ガイザライト", "block.tfg.rock.spike.geyserite": "ガイザライトのつらら石", "block.tfg.mushroom_roots": "キノコの根", @@ -437,8 +439,8 @@ "block.tfg.pile.mars_sand_covering": "粘土質岩の砂", "block.tfg.pile.venus_sand": "粗面岩の砂", "block.tfg.pile.venus_sand_covering": "粗面岩の砂", - "block.tfg.pile.Hematitic_sand": "赤鉄質の砂", - "block.tfg.pile.Hematitic_sand_covering": "赤鉄質の砂", + "block.tfg.pile.hematitic_sand": "赤鉄質の砂", + "block.tfg.pile.hematitic_sand_covering": "赤鉄質の砂", "block.tfg.lunar_roots": "月光のライトブルーム", "block.tfg.lunar_sprouts": "月光のライトグラス", "block.tfg.lunar_chorus_plant": "コーラスプラント", @@ -577,6 +579,8 @@ "block.tfg.casings.heat_pipe_casing": "ヒートパイプ外装", "block.tfg.glacian_wool_frame": "氷塊羊毛の耐熱フレーム", "block.tfg.aes_insulation_frame": "AES断熱材の耐熱フレーム", + "block.tfg.machine_casing_power_casing": "Insulated Power Casing", + "block.tfg.active_power_transformer": "Active Energy Transformer", "block.tfg.sand.fluorapatite.blue": "青いフッ素燐灰石の砂", "block.tfg.sandstone.raw.fluorapatite.blue": "青いフッ素燐灰石砂岩", "block.tfg.sandstone.wall.raw.fluorapatite.blue": "青いフッ素燐灰石砂岩の塀", @@ -656,6 +660,8 @@ "block.tfg.nuclear_turbine": "原子力蒸気タービン", "block.tfg.evaporation_tower": "蒸発塔", "block.tfg.cooling_tower": "Nuclear Cooling Tower", + "block.tfg.smr_generator": "Small Modular Turbine", + "block.tfg.casings.machine_casing_desh_ptfe": "Radiation-Safe Desh Casing", "block.tfg.growth_monitor": "Growth Monitor", "block.tfg.sample_rack": "Sample Rack", "block.tfg.casings.machine_casing_sterilizing_pipes": "Sterilizing Pipes", @@ -663,9 +669,9 @@ "block.tfg.impure_moderate_core": "不純なモデレートコア", "block.tfg.moderate_core_frame": "モデレートコアフレーム", "block.tfg.impure_moderate_core_frame": "不純なモデレートコアフレーム", - "fluid.tfg.semiheavy_ammoniacal_water": "アンモニア交じりの半重水", "fluid.tfg.heavy_ammoniacal_water": "アンモニア交じりの重水", - "fluid.tfg.sulfur_fumes": "Sulfur Fumes", + "fluid.tfg.semiheavy_ammoniacal_water": "アンモニア交じりの半重水", + "fluid.tfg.sulfur_fumes": "Dense Sulfuric Fumes", "fluid.tfg.geyser_slurry": "Super Heated Slurry", "fluid.tfg.cryogenized_fluix": "超低温液化フルーシュ", "item.tfg.antipoison_pill": "解毒の丸薬", @@ -838,19 +844,19 @@ "item.tfg.food.cooked_crusher_meat": "焼いたクラッシャー肉", "item.tfg.food.raw_goober_meat": "生のグーバー肉", "item.tfg.food.cooked_goober_meat": "焼いたグーバー肉", - "item.tfg.food.raw_long_pig_filet": "生の奇妙な肉", - "item.tfg.food.cooked_long_pig_filet": "焼き奇妙な肉", + "item.tfg.food.raw_long_pig_filet": "奇妙な肉", + "item.tfg.food.cooked_long_pig_filet": "こんがり奇妙な肉", "item.tfg.food.raw_surfer_steak": "生のサーファー肉", "item.tfg.food.cooked_surfer_steak": "サーファーステーキ", - "item.tfg.food.raw_stackatick_chunks": "Raw Stackatick Chunks", - "item.tfg.food.raw_stickastackatick": "Raw Stick'a'Stackatick", - "item.tfg.food.cooked_stickastackatick": "Cooked Stick'a'Stackatick", - "item.tfg.food.raw_cruncher_ribs": "Raw Cruncher Ribs", - "item.tfg.food.cooked_cruncher_ribs": "Cooked Cruncher Ribs", - "item.tfg.food.raw_dino_nugget": "Prepared Dinosaur Nugget", - "item.tfg.food.cooked_dino_nugget": "Beer Battered Dinosaur Nugget", - "item.tfg.food.raw_beer_battered_cheese_curds": "Beer Battered Cheese Curds", - "item.tfg.food.cooked_beer_battered_cheese_curds": "Fried Beer Battered Cheese Curds", + "item.tfg.food.raw_stackatick_chunks": "生のStackatick Chunks", + "item.tfg.food.raw_stickastackatick": "生のStick'a'Stackatick", + "item.tfg.food.cooked_stickastackatick": "焼いたStick'a'Stackatick", + "item.tfg.food.raw_cruncher_ribs": "生のCruncher Ribs", + "item.tfg.food.cooked_cruncher_ribs": "焼いたCruncher Ribs", + "item.tfg.food.raw_dino_nugget": "衣をつけた恐竜ナゲット", + "item.tfg.food.cooked_dino_nugget": "恐竜ナゲットのビール衣揚げ", + "item.tfg.food.raw_beer_battered_cheese_curds": "衣をつけたチーズカード", + "item.tfg.food.cooked_beer_battered_cheese_curds": "チーズカードのビール衣揚げ", "item.tfg.food.raw_fries": "刻んだジャガイモ", "item.tfg.food.cooked_fries": "フライドポテト", "item.tfg.food.poutine": "プーティン", @@ -937,8 +943,8 @@ "item.tfg.rocket_cone_t3": "発展型ロケットノーズコーン", "item.tfg.rocket_fin_t3": "発展型ロケットフィン", "item.tfg.elite_power_thruster": "§a精鋭型パワースラスター", - "item.tfg.vｆ": "シリカエアロゲル", - "item.tfg.bｆtter_space_suit_fabric": "宇宙服の強化生地", + "item.tfg.silica_aerogel": "シリカエアロゲル", + "item.tfg.better_space_suit_fabric": "宇宙服の強化生地", "item.tfg.universal_compost_browns": "茶色の堆肥源", "item.tfg.universal_compost_greens": "緑の堆肥源", "item.tfg.etching_diamond_tip": "エッチング用ダイアモンドの針", @@ -981,8 +987,8 @@ "item.tfg.bundled_scraped_flax": "束ねた亜麻屑", "item.tfg.linen_thread": "リネンの糸", "item.tfg.linen_cloth": "リネン", - "item.tfg.ulled": "§dウルトラヴァイオレット§fLED", - "item.tfg.smd_uv_led": "§fSMD§dウルトラヴァイオレット§fLED", + "item.tfg.uv_led": "§dウルトラバイオレット§fLED", + "item.tfg.smd_uv_led": "§fSMD§dウルトラバイオレット§fLED", "item.tfg.empty_dna_syringe": "空の注射器", "item.tfg.filled_dna_syringe": "中身入りの注射器", "item.tfg.dirty_dna_syringe": "汚染された注射器", @@ -1041,6 +1047,9 @@ "item.tfg.rough_endoplasmic_reticula": "粗面小胞体", "item.tfg.alpha_keratin": "α-ケラチン", "item.tfg.progenitor_cells": "前駆細胞", + "item.tfg.catalyser_pt_re_zsm": "Catalyser Pt-Re ZSM-5", + "item.tfg.used_catalyser": "Used Catalyser Pt-Re ZSM-5", + "item.tfg.loaded_resin": "Re-Loaded Resin", "material.tfg.latex": "ラテックス", "material.tfg.vulcanized_latex": "加硫処理ラテックス", "material.tfg.fluix": "フルーシュ", @@ -1155,6 +1164,56 @@ "material.tfg.zirconium_bromide": "臭化ジルコニウム(IV)", "material.tfg.zirconium_diboride": "二ホウ化ジルコニウム", "material.tfg.boron_carbide": "炭化ホウ素", + "material.tfg.syngas": "合成ガス", + "material.tfg.raw_aromatic_mix": "天然芳香族混合物", + "material.tfg.aromatic_feedstock": "芳香族原料", + "material.tfg.reformed_aromatic_feedstock": "改質芳香族原料", + "material.tfg.reformate_gas": "改質ガス", + "material.tfg.cracker_off_gas": "接触改質されたオフガス", + "material.tfg.btx_fuel": "BTXガス", + "material.tfg.critical_steam": "Critical Steam", + "material.tfg.americium_241": "アメリシウム241", + "material.tfg.californium_252": "カリホルニウム252", + "material.tfg.neptunium_237": "ネプツニウム237", + "material.tfg.mixed_radioactive_fluid": "放射性混合液体", + "material.tfg.degraded_solvent_stream": "Degraded Solvent Stream", + "material.tfg.boron_enriched_coolant": "濃縮ホウ素冷却液", + "material.tfg.hot_boron_enriched_coolant": "熱い濃縮ホウ素冷却液", + "material.tfg.polyalkylene_lubricant": "ポリアルキレン潤滑剤", + "material.tfg.organic_degradation_slurry": "有機分解泥漿", + "material.tfg.gas_fraction": "Gas Fraction", + "material.tfg.isotopic_solvent": "同位体溶媒", + "material.tfg.residual_sludge": "Residual Sludge", + "material.tfg.sodium_fluoride": "フッ化ナトリウム", + "material.tfg.trace_catalyst_salt_e": "Trace Catalyst Salt E", + "material.tfg.copper_trace_catalyst_dust": "Copper Trace Catalyst", + "material.tfg.organic_stabilizer": "Organic Stabilizer", + "material.tfg.inert_dust_fraction": "Inert Fraction", + "material.tfg.recovered_ionic_complex": "Recovered Ionic Complex", + "material.tfg.glucose": "グルコース", + "material.tfg.galactose": "ガラクトース", + "material.tfg.fructose": "フルクトース", + "material.tfg.sorbitol": "ソルビトール", + "material.tfg.14_sorbitan": "1,4-ソルビタン", + "material.tfg.isosorbide": "イソソルビド", + "material.tfg.linolenic_acid": "α-リノレン酸", + "material.tfg.isosorbide_ln": "Isosorbide Linolenate", + "material.tfg.epox_isosorbide_ln": "Epoxidized Isosorbide Linolenate", + "material.tfg.ozone": "Ozone", + "material.tfg.tin_chloride": "Stannous Chloride", + "material.tfg.cyclohexanone": "Cyclohexanone", + "material.tfg.cyclohex_diperoxide": "1,1-Cyclohexanediyl Dihydroperoxide", + "material.tfg.aciditic_waste": "Aciditic Waste", + "material.tfg.propylene": "Propylene", + "material.tfg.tpaoh": "Tetrapropylammonium Hydroxide", + "material.tfg.sodium_silicate": "Sodium Silicate", + "material.tfg.metal_rich_solution": "Metal Rich Solution", + "material.tfg.crude_mixed_gas": "Crude Mixed Gas", + "material.tfg.zsm5_gel": "ZSM-5 Gel", + "material.tfg.leachate": "Rhenium Leachate", + "material.tfg.clean_powder": "Re-Silicate Clean Powder", + "material.tfg.catalyser_powder": "Catalyser Re ZSM-5 Powder", + "material.tfg.sodium_aluminium": "Sodium Aluminium", "ore_vein.tfg.deep_sheldonite": "Cooperite & Bornite", "ore_vein.tfg.deep_garnet_amethyst": "Amethyst & Garnet", "ore_vein.tfg.deep_garnet_opal": "Opal & Garnet", @@ -1323,8 +1382,22 @@ "tfg.tooltip.surfer_variant.fire": "Sangnum Hide", "tfg.tooltip.surfer_variant.brain": "Glacian Hide", "tfg.tooltip.attribution.surfer": "§9§oCredit: Wan's Ancient Beasts", + "entity.tfg.rnr_plow": "Paving Cart", "effect.tfg.cooling": "§bCooling", "effect.tfg.warming": "§6Warming", + "effect.tfg.instant_radiation": "Instant Radiation", + "effect.tfg.chemical_burns_warning": "Suffering Chemical Burns", + "effect.tfg.poison_warning": "Toxic Material", + "effect.tfg.weak_poison_warning": "Weakly Toxic Material", + "effect.tfg.irritant_warning": "Irritant Material", + "effect.tfg.nausea_warning": "Nauseous Material", + "effect.tfg.carcinogen_warning": "Carcinogenic Material", + "effect.tfg.asbestosis_warning": "Asbestosis", + "effect.tfg.arsenicosis_warning": "Arsenicosis", + "effect.tfg.silicosis_warning": "Silicosis", + "effect.tfg.berylliosis_warning": "Berylliosis", + "effect.tfg.methanol_poisoning_warning": "Methanol Poisoning", + "effect.tfg.carbon_monoxide_poisoning_warning": "Carbon Monoxide Poisoning", "tfg.greate.uls_limit": "§432§r (§8ULS§r)", "tfg.greate.ls_limit": "§f128§r (§7LS§r)", "tfg.greate.windmill_hint_1": "Windmills are affected by relative", @@ -1347,7 +1420,7 @@ "trim_material.tfc.salt_tfc": "salt", "trim_material.tfc.sapphire_tfc": "Sapphire", "trim_material.tfc.sodalite_tfc": "Sodalite", - "trim_material.tfc.coke_tfc": "Coke", + "trim_material.tfc.armalcolite_tfc": "Armalcolite", "trim_material.tfc.spessartine_tfc": "Spessartine", "trim_material.tfc.topaz_tfc": "Topaz", "trim_material.tfc.uvarovite_tfc": "Uvarovite", @@ -1381,10 +1454,14 @@ "tfg.emi.ore_veins.rock_types": "Found in rock types:", "tfg.emi.ore_veins.rarity": "Rarity: %d", "tfg.emi.ore_veins.density": "Density: %d", - "tfg.emi.ore_veins.y_ranges": "Depth: %d to %d", + "tfg.emi.ore_veins.y_ranges": "Y Level: %d to %d", "tfg.emi.ore_veins.size": "Size: %d", "tfg.emi.ore_veins.height": "Height: %d", "tfg.emi.ore_veins.radius": "Radius: %d", + "ore_vein.tfg.rose_quartz": "Rose Quartz", + "ore_vein.tfg.rose_quartz.emi.0": "Found in low-elevation", + "ore_vein.tfg.rose_quartz.emi.1": "biomes in climates", + "ore_vein.tfg.rose_quartz.emi.2": "below -10°C.", "emi.category.tfg.ore_vein_info": "Ore Veins", "tfg.emi.liquid_bb_burn_time": "Duration: %d secs", "tfg.emi.liquid_bb_superheat": "§lSuperheated", @@ -1441,10 +1518,30 @@ "tfg.tooltip.cooling_foods": "§bCools you by: 2°C", "tfg.tooltip.cooling_foods_strong": "§bCools you by: 10°C", "tfg.tooltip.warming_foods": "§6Warms you by: 4°C", + "tfg.tooltip.hotornot_container": "§aSafely contains §6hot§a, §bcold§a, and §elighter-than-air§a items and fluids.§r", + "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.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.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", + "tfg.tooltip.machine.growth_chamber_2": "§7Contains everything needed for Biological Engineering.§r", + "tfg.tooltip.machine.evaporation_tower_1": "§7Not to be confused with the Distillation Tower§r", + "tfg.tooltip.machine.evaporation_tower_2": "§7Gets rid of excess solvent to condense solutions.§r", + "tfg.tooltip.machine.electric_greenhouse_1": "§7Putting the Factory in Factory Farming§r", + "tfg.tooltip.machine.electric_greenhouse_2": "§7Uses water to grow trees, crops, and other plants. Can be sped up with fertilizer. Faster and easier than other ways of growing plants, at the cost of energy.§r", + "tfg.tooltip.machine.cooling_tower_1": "§7Heating up the Atmosphere§r", + "tfg.tooltip.machine.cooling_tower_2": "§7Cools the hot coolant by dissipitating excess heat to the atmosphere.§r", "tfg.tooltip.obsolete.depreciated": "§cDeprecated, cannot be crafted any more", - "tfg.tooltip.dna_syringe.empty": "An empty syringe.", - "tfg.tooltip.dna_syringe.dirty1": "A used syringe.", - "tfg.tooltip.dna_syringe.dirty2": "Be careful not to poke anyone with this...", + "tfg.tooltip.antipoison_pill": "§9Cures Poison", + "tfg.tooltip.antipoison_tablet": "§9Cures All Active Harmful Effects", + "tfg.tooltip.dna_syringe.empty": "§7An empty syringe.§r", + "tfg.tooltip.dna_syringe.dirty1": "§7A used syringe.§r", + "tfg.tooltip.dna_syringe.dirty2": "§7Be careful not to poke anyone with this...§r", "tfg.tooltip.dna_syringe.full": "DNA sample: ", "tfg.tooltip.dna_syringe.explain": "Right-click on a mob to obtain a DNA sample. Place in a crafting grid to clear contents.", "tfg.tooltip.shift_hint": "[Hold-Shift]", @@ -1464,9 +1561,30 @@ "tfg.tooltip.component.moderate_core_frame": "Can be placed inside a Fission Reactor to increase the maximum heat by §910§r", "tfg.tooltip.component.dry_ice": "Can be used as an input in the Fission Reactor to cool it down, requires a Material Holder", "tfg.tooltip.component.refrigerant_pellet": "Can be used as an input in the Fission Reactor to cool it down, requires a Material Holder", - "tfg.tooltip.component.nuclear_turbine_1": "§eBase Production:§r 4096 EU/t", + "tfg.tooltip.component.nuclear_turbine_1": "§eBase Production:§r 8192 EU/t", "tfg.tooltip.component.nuclear_turbine_2": "Each Rotor Holder above §5EV§r §7adds§r 10% efficiency and multiplies EU/t by 2.", + "tfg.tooltip.component.smr_generator_1": "§eBase Production:§r 4096 EU/t", + "tfg.tooltip.component.smr_generator_2": "Dedicated to produce power from sCO2 and the Small Modular Reactor.\n Use Lubricant and Booster to increase its efficiency and manage the cooling loop of the SMR.", + "tfg.gui.refrigerator.unify_dates.enabled": "Expiration Date Unification is: §aOn", + "tfg.gui.refrigerator.unify_dates.disabled": "Expiration Date Unification is: §cOff", "tfg.machine.food_refrigerator_power_usage": "§7Consumes§r %s EU/t §7while active to keep your food fresh.§r", + "tfg.gui.rnr_plow.random_mode": "Randomize Materials", + "tfg.gui.rnr_plow.width": "Path Width: %d Blocks", + "tfg.gui.rnr_plow.empty_crushed_base_course": "§cMissing Crushed Base Course!!", + "tfg.tooltip.progenitor_cells.mob": "Animal culture: ", + "tfg.tooltip.fake_nutrition_info_listener": "§7§oHold (Shift) for Nutrition Info", + "tfg.tooltip.fake_nutrition_info": "§7Nutrition:", + "tfg.tooltip.cheese_slice_microplastics": "§b- Microplastics: 1.9", + "tfg.gui.menu.field_guide_splash_text": "Tip: Read the field guide!!!", + "tfg.gui.menu.ram_usage": "RAM:", + "tfg.gui.menu.fps_count": "FPS:", + "tfg.gui.smr_generator.credit": "Credits to Frontiers Team", + "tfg.gui.smr_generator.lubricant_used": "Lubricant: %s", + "tfg.gui.smr_generator.booster_used": "Booster: %s", + "tfg.gui.max_energy_per_tick_amps.prefix": "Max EU/t:", + "tfg.gui.consumes": "Consumes: ", + "tfg.gui.per_cycle": "per cycle", + "tfg.gui.cycle_duration": "Cycle duration: ", "tfc.jei.flint_knapping": "Flint Knapping", "tfc.jei.straw_knapping": "Straw Knapping", "tfc.recipe.barrel.tfg.barrel.dyeing.decorative_vase.black": "Dyeing", @@ -1907,10 +2025,10 @@ "quests.extreme_voltage.ev_superconductor.subtitle": "超高電圧・高電流両対応", "quests.extreme_voltage.ev_superconductor.desc": "&eウラン&rの処理を進めたら、&5三白金ウランワイヤー&rを作ってみてもいいでしょう。\n\nこの超伝導ケーブルはより多くのアンペアを流せるため、基地全体でエネルギーを効率よく送電でき、&6原子力蒸気タービン&rからの出力を損失なく各機械へ届けることができます。", "quests.extreme_voltage.uraninite_dust.subtitle": "膨大な数の棒", - "quests.extreme_voltage.uraninite_dust.desc": "&eウラン燃料棒&rを作るには大量の&e閃ウラン鉱&rを掘り出すことが必要で、1本あたりおよそ&c240個&rほど使います。そのため、後で不足しないよう早めに採掘を始めておくことをおすすめします。\n\n火星には最大規模の鉱脈が存在するため、一つの鉱脈から大量に確保することができます。\n\nゲームを進めると、&6Ostrum Linear Accelerator&rを使って瀝青ウラン鉱や閃ウラン鉱を&無限&rに生産できるようになります。詳しい説明は先のクエストで確認できます。", + "quests.extreme_voltage.uraninite_dust.desc": "&eウラン燃料棒&rを作るには大量の&e閃ウラン鉱&rを掘り出すことが必要で、1本あたりおよそ&c240個&rほど使います。そのため、後で不足しないよう早めに採掘を始めておくことをおすすめします。\n\n火星には最大規模の鉱脈が存在するため、一つの鉱脈から大量に確保することができます。\n\nゲームを進めると、&6Ostrum Linear Accelerator&rを使って瀝青ウラン鉱や閃ウラン鉱を&a無限&rに生産できるようになります。詳しい説明は先のクエストで確認できます。", "quests.extreme_voltage.uranium_line.title": "ウランライン", "quests.extreme_voltage.uranium_line.subtitle": "新しい処理ライン", - "quests.extreme_voltage.uranium_line.desc": "&eウラン&rと、その同位体である&eウラン235&rを処理するには、専用の小規模な処理ラインを用意する必要があります。\n\n安心して下さい、フッ素は&ループ可能&rなので、必要なものは&e閃ウラン鉱の粉&rだけです。\n\nこのラインは地球でも組めますが、閃ウラン鉱の大半は火星で採掘することになるため、火星で稼働させた方が便利な場合もあります。", + "quests.extreme_voltage.uranium_line.desc": "&eウラン&rと、その同位体である&eウラン235&rを処理するには、専用の小規模な処理ラインを用意する必要があります。\n\n安心して下さい、フッ素は&aループ可能&rなので、必要なものは&e閃ウラン鉱の粉&rだけです。\n\nこのラインは地球でも組めますが、閃ウラン鉱の大半は火星で採掘することになるため、火星で稼働させた方が便利な場合もあります。", "quests.extreme_voltage.radioactive_waste.title": "放射性廃棄物", "quests.extreme_voltage.radioactive_waste.subtitle": "ガラクタだっていう人もいるけど、俺は宝物って呼んでる", "quests.extreme_voltage.radioactive_waste.desc": "放射性廃棄物は次の燃料棒づくりに欠かせない&c重要資源&rです。必ず搬出ハッチに十分な空き容量を確保しておいて下さい。搬出先がないと、&c放射性廃棄物は消滅してしまい&r、大切な資源を失うことになります。\n\n対策としては以下がおすすめです：\n-&b液体ロックを有効&rに設定した専用の搬出ハッチを使う\n-スーパータンクと発展型液体検出器の組み合わせで管理する\n\n火星で&dMEネットワーク&rを構築済みなら、新たに解禁された&6ME搬出ハッチ&rを使ってみるのもいいかもしれません。", @@ -2006,7 +2124,7 @@ "quests.extreme_voltage.epichlorohydrin.title": "エピクロロヒドリン", "quests.extreme_voltage.epichlorohydrin.desc": "最初の&aエピクロロヒドリン&rは、&3LCR&rレシピでスムーズにつくることができます。\n\nただしこのレシピには&aプロペン&rが必要です。そのためには本格的に&d原油処理&rや&dクラッキング&rに手を出す必要があります。もしあなたが原油処理を後回しにし続けていたのだとしたら、ついに向き合う時が来たということですよ。\n\nまた、&3蒸留塔&rは絶対に建てておきましょう。原油処理において非常に重要な機械です。\n\nそして副産物の&d塩水&rはループさせることで&d水酸化ナトリウム&rを自給できるので、気づいていなかった場合はぜひ活用してください。", "quests.extreme_voltage.phenol.title": "フェノール", - "quests.extreme_voltage.phenol.desc.1": "&aフェノール&rの製作経路は多岐に渡るため、ここでは特に主流な4つの方法を紹介します：\n\n&9（１）&r&a木質タール&rを蒸留する。もっともシンプルな方法です。\n\n&9（２）&r&aベンゼン&r、&d塩素&r、&d水酸化ナトリウム&rの化学反応。&3LCR&rで行えば塩素を完全に循環できるため、とても安定した作り方です。\n\n&9（３）&r上のレシピから&d水酸化ナトリウム&rを抜いて時短する方法。ただし&d塩素&rが減っていくのでコストは悪めです。\n\n&9（４）&r &aベンゼン&r、&dプロペン&r、&d酸素&rを少量の&4リン酸&rと反応させる「クメン法」。リン酸は本来触媒ですが、このレシピでは少しずつ消費されます。", + "quests.extreme_voltage.phenol.desc.1": "&aフェノール&rの製作経路は多岐に渡るため、ここでは特に主流な4つの方法を紹介します：\n\n&9（１）&r&a木質タール&rを蒸留する。もっともシンプルな方法です。\n\n&9（２）&r&aベンゼン&r、&d塩素&r、&d水酸化ナトリウム&rの化学反応。&3LCR&rで行えば塩素を完全に循環できるため、とても安定した作り方です。\n\n&9（３）&r上のレシピから&d水酸化ナトリウム&rを抜いて時短する方法。ただし&d塩素&rが減っていくのでコストは悪めです。\n\n&9（４）&r&aベンゼン&r、&dプロペン&r、&d酸素&rを少量の&4リン酸&rと反応させる「クメン法」。リン酸は本来触媒ですが、このレシピでは少しずつ消費されます。", "quests.extreme_voltage.phenol.desc.2": "どの選択肢にするか悩んでいる方に向けて、それぞれの魅力を紹介します。\n\n&9（１）&rは&3熱分解炉&rと&3蒸留塔&rをセットで稼働させる余裕があれば、とても良い方法です。\n\n&9（２）&rは私たちがおすすめする方法です！副産物の&d塩&rから&d塩水&rを作り、それを電解することでベンゼン以外を循環させられるので扱いやすいです。\n\n&9（３）&rは&d塩素&rを無限に確保できていれば優秀な方法です。たとえば塩水の鉱脈に&3大型液体採掘機&rを設置するなどの方法があります。\n\n&9（４）&rは...&4リン酸&rの製造には本当に手間がかかるので...このルートはかなり厳しいですよ。", "quests.extreme_voltage.phenol.desc.3": "&l&3余談：&r&o昔は大型化学反応炉がなかったから、足りない化学レシピを補う目的でベンゼン＋酸素のレシピがGTCEに追加されてたんだ。でも今はCEuで現実的な処理方法が用意されたから、このレシピは将来削除されるかも。", "quests.extreme_voltage.acetone.title": "アセトン", @@ -2035,7 +2153,7 @@ "quests.extreme_voltage.tunsgten_line_step.title": "炭酸ナトリウムの循環構成", "quests.extreme_voltage.tunsgten_line_step.subtitle": "もう採掘は必要なし！", "quests.extreme_voltage.tunsgten_line_step.desc.1": "&5タングステンライン&rを完全に循環させるのは簡単ではないため、このクエストでは正しい進め方を案内します。\n\nまず&b塩&r、&a二酸化炭素&r、&6アンモニア&rを組み合わせて&3塩化アンモニウム&rを作ります。その後、これを電解することで&6アンモニア&rを再利用でき、さらに&eタングステン酸ナトリウム&rの作成に必要な&9塩酸&rを得られます。また、この工程では &b炭酸水素ナトリウム&rも生成されるため、電解して&d炭酸ナトリウム&rを回収しましょう。", - "quests.extreme_voltage.tunsgten_line_step.desc.2": "完全な閉鎖ループを作るには、&a二酸化炭素&rの管理が必要になります。これには&d炭酸ナトリウム&r の一部を分解して電解し、&a炭素&rと&9酸素&rを回収して、そこから&a二酸化炭素&rを回収する方法があります。\n\n力技ですが、&b液体空気&rの蒸留で無限生産した&a二酸化炭素&rを供給し続けるという方法もあります。", + "quests.extreme_voltage.tunsgten_line_step.desc.2": "完全な閉鎖ループを作るには、&a二酸化炭素&rの管理が必要になります。&d炭酸水素ナトリウム&rの電解から出る二酸化炭素だけでは足りないため、方解石の電解またはリチウムと一緒に出た&b炭素&rと&b酸素&rを組み合わせて処理する方法があります。\n\n力技ですが、&b液体空気&rの蒸留で無限生産した&a二酸化炭素&rを供給し続けるという方法もあります。", "quests.extreme_voltage.tunsgten_line_step_1.title": "新しいタングステンライン", "quests.extreme_voltage.tunsgten_line_step_1.subtitle": "どうしてそんなことするの？", "quests.extreme_voltage.tunsgten_line_step_1.desc": "TerraFirmaGregの&eタングステンライン&rは全面的に改修されており、以前より&cかなり難解&rになっています。嬉しいですね！（嬉しいですよね？）\n\nタングステンラインに含まれる全ての素材は&a完全にループ&rさせることが可能ですが、そのためには高度なライン構築の技術が必要です。一方で、必要な資源を&c大量生産&rしてゴリ押しで進めることもできます。\n\nちょっとしたヒントですが、&4火星&rには&e炭酸ナトリウム&rと&eタングステン&rのための&a大きい鉱脈&rがいくつか存在しています。\n\nタングステンラインは中盤から終盤にかけての進行の土台となるため、時間をかけてでも最適化しておきましょう。", @@ -2081,6 +2199,8 @@ "quests.extreme_voltage.martian_sludge.desc": "六フッ化ケイ酸を遠心分離すると、フッ素を回収できるほか、&6火星の泥漿&rも得られます。これはラドンや核分裂残留物の生成に必要な素材です。", "quests.extreme_voltage.large_generators.title": "大型発電機", "quests.extreme_voltage.large_generators.desc": "シングルブロックの発電機はHVまでしか対応していないため、これ以降はより大きな発電量を確保するには大型の発電機を使う必要があります。EV帯で特に優秀なのは、&d大型ガスタービン&rと&d大型燃焼エンジン&rの2つです。\n\n詳しく知りたい場合は、「GregTechの電力システム」の章をご覧ください。", + "quests.extreme_voltage.large_centrifuge.subtitle": "素材のメリーゴーランド", + "quests.extreme_voltage.large_centrifuge.desc": "&6大型遠心分離機&rは核分裂ラインのために必須な大型機械です。\n\nこの装置は&5EVエネルギーハッチ２つ&r取り付けることで、EBFと同じように&1IV-tier&rのレシピを処理できます。使い勝手がいいですね。\n\nこの機械は&b遠心分離モード&rと&6熱遠心分離モード&rの2つのモードを利用できます。コントローラーのインターフェースから簡単に切り替えられますが、残念ながらAE2などの自動化システムを経由して操作することはできません。\n\nこの機械があれば革新的なスピードで&a鉱石処理&rを終わらせることができます。", "quests.gregtech_energy": "GregTechの電力システム", "quests.gregtech_energy.subtitle": "第一種電気主任技術者を目指して", "quests.gregtech_energy.start.title": "説明しよう", @@ -2113,6 +2233,7 @@ "quests.gregtech_energy.lv_generator.desc.2": "&e1.蒸気力&r：\n\n最も基本的で伝統的な発電方法です。ボイラーで作った蒸気を蒸気タービンに送ることで電力へと変換できます。&e64mB/t&rの蒸気から&e32EU/t&rを発電可能です。\n\nこの方式で進めるなら、ブロンズ製大型ボイラーを作るのがおすすめです。溶岩やクレオソート、その他の固体燃料などで簡単に動かせます(使える燃料はEMIで確認できます)。", "quests.gregtech_energy.lv_generator.desc.3": "&e2.回転力&r：\n\nCreateの回転動力をオルタネーターに繋げてRFを発電し、それを&7LV&rエネルギー変換機でEUに変換できます。詳しくは、「LV」の章の中のオルタネーターのクエストをチェックしましょう。", "quests.gregtech_energy.lv_generator.desc.4": "&e3.バイオディーゼル燃料（TFG限定）&r：\n\nキャノーラやヒマワリから大量の種油を作れます。これをアルコール類と調合することでバイオディーゼルを精製できます。\n\nこの方法は少し手間がかかりますが、バイオディーゼルは&7LV&r～&bMV&rまでの間で使える優秀な燃料になります。さらに、&eセタン添加ディーゼル&rにすれば&5EV&rまで使える非常に優秀な燃料になります。\n\n使用するには&7LV&r燃焼発電機が必要です。これはやや高価な代わりに1mBあたりの発電量が多く、燃料の運搬や保管がとても効率的です。どの発電方法から始めるかはあなたの自由です。", + "quests.gregtech_energy.lv_generator.desc.5": "&e4.合成ガス発電（TFG限定）&r：\n\n&6コークス炉&rと&6Vacuum Chamber&rを利用することで、序盤からこのガス燃料を作ることができます。性能はまずまずですが、&eガス発電&rこだわる方にとっては十分実用的です。最大限の効率を引き出すために、&6Create&rを活用した自動植林場の構築を強く推奨します。", "quests.gregtech_energy.lv_generator.task": "Any LV Generator", "quests.gregtech_energy.mv_generator.title": "MVの発電方法", "quests.gregtech_energy.mv_generator.subtitle": "LVと大体同じです", @@ -2153,16 +2274,43 @@ "quests.gregtech_energy.lpt_fuel.task": "I don't want to make a bucket of Plasma", "quests.gregtech_energy.lgt_fuel.title": "ガス燃料", "quests.gregtech_energy.lgt_fuel.subtitle": "みんな大好き", - "quests.gregtech_energy.lgt_fuel.desc.1": "ガス燃料といえば、これでしょう。その名も&eニトロベンゼン&r。\n\n&6HV&rに到達すれば作れるようになります。&a大型ガスタービンを運用するならぜひこれを使いましょう&r。\n\nニトロベンゼンまでは、&eベンゼン&rが便利です。木から精製するか、重油を加工して作ることができます。", - "quests.gregtech_energy.lgt_fuel.desc.2": "ニトロベンゼンを作るにはいくつか工程があります。最初に&6大型化学反応炉&r(LCR)を組めば、多くの中間工程を省いて作業がずっと簡単になります。\n\n流れ自体は難しくありません。水素・窒素・酸素を組み合わせれば&e硝酸&rをいくらでも作れます。硫酸はご存知の通り硫黄と水から作れます。\n\nこの生産ラインを回せるようになると、ニトロベンゼンはガス燃料としてとても役に立ってくれることでしょう。", + "quests.gregtech_energy.lgt_fuel.desc.1": "これらの燃料はすべて &2ガスタービン発電機&rで使用されます。ここでは、効率が低いものから高いものまでを順に並べています。\n\n&bガスタービン発電機&rは、同じ時期に作れる&b燃焼発電機&rと比べて安価に作れますが、&eガス燃料&rは燃焼系燃料よりも全体的に燃料価が低くなっています。ただし、これは劣っているという意味ではなく、同じ出力を得るために必要な量（mB）が多くなるというだけです。進行が進むと、より多くの管理を必要とする非常に強力なマルチブロックである &2大型ガスタービン&rでも使用できるようになります。", + "quests.gregtech_energy.lgt_fuel.desc.2": "TerraFirmaGregにおいて、&eガス燃料&rは全体的なバランス調整が行われています。&eベンゼン&rや&eニトロベンゼン&rは大幅に弱体化されているため、これらに依存することは&6推奨しません&r。&7LV&rの序盤で、オイルサンドを処理する際などには&e合成ガス&rや&eLPG&rを使用することをおすすめします。その後、&bMV&rで&e改質ガス&rにアップグレードでき、さらに&2クラッカー&rが解禁されると生産効率はより一層高まります。", "quests.gregtech_energy.lgt_fuel.task": "Gas in a bucket?", + "quests.gregtech_energy.syngas.title": "合成ガス", + "quests.gregtech_energy.syngas.subtitle": "LVでもガス発電がしたい！", + "quests.gregtech_energy.syngas.desc": "&e合成ガス&rは、TFGにて新しく追加されたガス燃料です。&8ULV&rという非常に早い段階で解禁でき、&7LV&rでは&6基本型ガスタービン発電機&rに使用できます。特別に強力な燃料というわけではありませんが、&e潤滑剤&r、&eメタン&r、&e水素&rといった価値の高い副産物へと変換することが可能です。\n\n最強の発電方法！...というわけではなく、大規模な発電には向いていないですが、&6コークス炉&rを3基と、&6醸造機&rまたは&6Vacuum Chamber&rを1基だけ使用すれば安定して生産することができます。&bMV&rに到達し、さらに強力な&e改質ガス&rを解禁するまでのつなぎには十分でしょう。", + "quests.gregtech_energy.reformate_gas.title": "改質ガス", + "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を2基用意し、一方でクレオソート、もう一方で木質タールを生産することで、この燃料を生成するために必要な素材がすべて揃います。\n\n構成を簡略化したい場合は、&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": "BTX", + "quests.gregtech_energy.btx.subtitle": "Not a korean band", + "quests.gregtech_energy.btx.desc": "The BTX Fuel is NYI", + "quests.gregtech_energy.fission_rod.title": "Fission Fuels", + "quests.gregtech_energy.fission_rod.subtitle": "Don't get me too hot", + "quests.gregtech_energy.fission_rod.desc.1": "The Earth Fission materials are NYI but may come sooner than later", + "quests.gregtech_energy.fission_rod.desc.2": "", + "quests.gregtech_energy.fission_rod.task": "", + "quests.gregtech_energy.smr.title": "Small Modular Reactor", + "quests.gregtech_energy.smr.subtitle": "Finally Power for these far outposts", + "quests.gregtech_energy.smr.desc.1": "The Small Modular Reactor is NYI but may come sooner than later", + "quests.gregtech_energy.smr.desc.2": "", + "quests.gregtech_energy.smr.task": "", + "quests.gregtech_energy.gasoline.title": "ガソリン", + "quests.gregtech_energy.gasoline.subtitle": "燃料界のスーパースター", + "quests.gregtech_energy.gasoline.desc": "&aガソリン&rは&6HV&rで解禁される非常に強力な燃焼燃料ですが、&6蒸留塔&rを建設してから本格的な生産を始めるのが現実的です。&7トルエン&rは&7木質タール&rや&7重質燃料&rから簡単に作成でき、それ以外に必要なものは&d精製ガス&r、&8ナフサ&r、そして&3酸素&r・&b水素&r・&1炭素&rの化合物たちです。\n\n高い性能を持ち、比較的簡単に製造できるうえ、さらに&c高オクタン価ガソリン&rへとアップグレードすることも可能です。", + "quests.gregtech_energy.high_gasoline.title": "高オクタン価ガソリン(ハイオク)", + "quests.gregtech_energy.high_gasoline.subtitle": "ハイオク満タンで", + "quests.gregtech_energy.high_gasoline.desc": "&cガソリン&rの直接的なアップグレードで、&5性能が2倍に強化された燃料&rです。名前からは分かりにくいですが、&dオクタン&rだけでなく、&8石油化学&r由来の他の素材も追加する必要があります。\n\nこの段階まで来れたあなたなら、&bEMI&rを使ってレシピを把握し、この非常に強力な燃料を自力で製造できるようになっていることでしょう。", "quests.gregtech_energy.lst_fuel.title": "蒸気", "quests.gregtech_energy.lst_fuel.subtitle": "ある意味水力発電", "quests.gregtech_energy.lst_fuel.desc": "蒸気を作るのは簡単です。ただ水を沸かすだけですから。\n\n大量の蒸気を生産するなら&6大型ボイラー&rの使用をおすすめします。バージョンは4種類で、それぞれ&8ULV&r、&bMV&r、&5EV&r、&1IV&r用のものがあります。ティアが上がるごとに蒸気の生産量も大幅に増えます。\n\n注意：これらのボイラーを使ったとしても、&d大型蒸気タービン&rの性能は他の発電方法ほどではありません。\n\nほとんどのプレイヤーはチタンやタングステンスチールボイラーを使うことはありません。作れはしますが、その価値がほとんどありません。蒸気は単純ですが、性能が頭打ちになりがちです。\n\n参考までに：&e2mB&rの蒸気=&e1EU&r。", "quests.gregtech_energy.lst_fuel.task": "I will switch to a denser fuel", + "quests.gregtech_energy.lst_fuel.task.1": "Large Boilers", "quests.gregtech_energy.lce_fuel.title": "液体燃料", "quests.gregtech_energy.lce_fuel.subtitle": "環境破壊を楽しもう", - "quests.gregtech_energy.lce_fuel.desc.1": "これらの液体燃料は&6燃焼発電機&rで使えます。弱いものから順に並べました。\n\n&bMV&rの段階では、まずディーゼルかバイオディーゼルを使うのがおすすめです。\n&6HV&rに進んだら、窒素・水素・酸素を混ぜてセタン添加ディーゼルにアップグレードできます。", + "quests.gregtech_energy.lce_fuel.desc.1": "これらの液体燃料は&6燃焼発電機&rで使えます。弱いものから順に並べました。\n\n序盤は、まずディーゼルかバイオディーゼルを使うのがおすすめです。\n&6HV&rに進んだら、窒素・水素・酸素を混ぜてセタン添加ディーゼルにアップグレードできます。", "quests.gregtech_energy.lce_fuel.desc.2": "&5EV&rに到達して&6蒸留塔&rを本格的に運用し始めたら、ガソリンまたはハイオクガソリンに切り替えるタイミングです。\n早とちりしないでください。原油はきちんと蒸留する必要があり、通常の蒸留機では効率が非常に悪いです。\n\n作るには、原油の蒸留といくつかの有機化合物処理を組み合わせる必要があります。熱分解炉と蒸留塔を使えばスムーズに処理できます。\n\nハイオクガソリンを安定供給できれば、燃焼発電機だけでクリアすることも夢ではありません。", "quests.gregtech_energy.lce_fuel.task": "I got enough", "quests.gregtech_energy.large_solar.subtitle": "メガソーラー", @@ -2201,8 +2349,8 @@ "quests.gregtech_energy.spending_energy.title": "電力運用について", "quests.gregtech_energy.spending_energy.subtitle": "電力の消費", "quests.gregtech_energy.spending_energy.desc.1": "電力はあるけれど、何に使えばいいんだろう？\n\n機械を使いましょう！とはいえ、実際のところそう単純な話ではないのです...\n&3TerraFirmaGreg&rを攻略するために、知っておくべき電力の基本知識をお教えします。\n\n基本的な機械：\n-各機械は最大で&a2A&rまで要求できます\n-上位の電圧を流すと...&4\uD83D\uDCA5爆発します&r。\n\n大型機械:\nここからが本番です。マルチブロックの構造は、仕組みを理解して、うまく扱うことが重要です。", - "quests.gregtech_energy.spending_energy.desc.2": "標準的な仕組み：\n-マルチブロックが2つのエネルギーハッチを組み込める場合(ほとんどの機械がそうです)、その機械の基本電圧よりも1つ上位の電圧のレシピを使用できます。\n\n例：\n大型混合機を使用し、そこにIVエネルギーハッチを2つ取り付けると、&cLuV&rのミキサーレシピを処理できるようになります。\n\nこれは、大型機械の大きな利点の1つです。そして、アップグレードしたい場合は、機械全体を交換するのではなく、エネルギーハッチを交換するだけで次のティアに引き上げることができます。", - "quests.gregtech_energy.spending_energy.desc.3": "一部の大型機械は1つのエネルギーハッチしか組み込むことができません。その場合も4Aや16Aのエネルギーハッチを使用することで、レシピの&bオーバークロック&rは可能です。ただし、レシピのティア自体は変わりません。\n\n例：\n大型回路作成機は1つのエネルギーハッチしか取り付けられません。しかし、4AのIVエネルギーハッチを設置すれば、IVおよびそれ以下のレシピをすべてオーバークロックすることができます。\n\nただし、複数のハッチをサポートしていないため、LuVティアのレシピを作成することはできません。この制限は意図的なもので、GregTechの進行システムを飛ばすことを防ぐための設計です。", + "quests.gregtech_energy.spending_energy.desc.2": "標準的な仕組み：\n-マルチブロックが2つのエネルギーハッチを組み込める場合(ほとんどの機械がそうです)、その機械の基本電圧よりも1つ上位の電圧のレシピを使用できます。\n\n例：\nEBFを組み立てる際に、LVエネルギーハッチを2つ取り付けると、&cMV&rのレシピを処理できるようになります。\n\nこれは、大型機械の大きな利点の1つです。アップグレードしたい場合は、機械全体を交換するのではなく、エネルギーハッチを交換するだけで次のティアに引き上げることができます。", + "quests.gregtech_energy.spending_energy.desc.3": "一部の大型機械はエネルギーハッチを1つまでしか組み込むことができません。その場合も4Aや16Aのエネルギーハッチを使用することで、レシピの&bオーバークロック&rは可能です。ただし、レシピのティア自体は変わりません。\n\n例：\n大型回路作成機は1つのエネルギーハッチしか取り付けられません。しかし、4AのIVエネルギーハッチを設置すれば、IVおよびそれ以下のレシピをすべてオーバークロックすることができます。\n\nただし、複数のハッチをサポートしていないため、LuVティアのレシピを作成することはできません。この制限は意図的なもので、GregTechの進行システムを飛ばすことを防ぐための設計です。", "quests.gregtech_energy.spending_energy.desc.4": "要するに、1つのエネルギーハッチに多くのアンペアを流せば処理は速くなりますが、上位ティアのレシピを使いたい場合はエネルギーハッチを2つ取り付ける必要があります。", "quests.gregtech_energy.spending_energy.task": "I understand", "quests.gregtech_energy.overclock.title": "オーバークロック", @@ -2310,7 +2458,8 @@ "quests.high_voltage.ptfe.subtitle": "またの名をテフロン", "quests.high_voltage.ptfe.desc": "&aポリテトラフルオロエチレン（通称：PTFE）&rは、&7炭素&rと&bフッ素&rからなる高分子化合物です。PVCと同様に、PTFEはプラスチック製回路基板などの製作効率を向上させる用途に使えます。現在では、&3大型化学反応炉&rの素材としても使用されています。\n\nこの生成過程では&3塩素&rも要求されていますが、生成される&a塩化水素&rを電解すれば、&6完全にループ&rさせることができます。\n\n&bフッ素&rは、今後&aウラン&rや&7ナクアダ&rの精製にも使います。\n\n&9Tips：&rこれ以降は、ポリマー類は&dインゴット&rの形で保管しておくのがおすすめです。&3押出機&rを使って、簡単に成形できます。", "quests.high_voltage.nitrobenzene.title": "ニトロベンゼン", - "quests.high_voltage.nitrobenzene.desc": "&aニトロベンゼン&rを作ると、&aベンゼン&rの燃料価が約&64倍&rに向上します。素晴らしいですね。\n\nただし、作るには&d蒸留水&rが必要で、&d硫黄&rを消費します。", + "quests.high_voltage.nitrobenzene.subtitle": "かつての栄光は見る影もなく", + "quests.high_voltage.nitrobenzene.desc": "TerraFirmaGregでは、&aニトロベンゼン&rと&aベンゼン&rは大幅に弱体化されています。燃料として使うこともできますが、基本的には素材として利用することになるでしょう。\n\nまた、ニトロベンゼンは、作る過程で少しずつ&d硫黄&rを消費していくため注意してください。", "quests.high_voltage.lcr.title": "大型化学反応炉", "quests.high_voltage.lcr.desc.1": "&3大型化学反応炉（通称：LCR）&rは、通常の&3化学反応器&rの大型機械であり、より多くの搬入・搬出スロットを備えています。外装にはPTFE（テフロン）が使われており、これによって通常の化学反応器では扱えないレシピも処理できます。\n\n&3LCR&rでは、一部の&3化学反応器&rのレシピを&6一気に処理することができます&r。以下がその例です：\n\n&9-&r&a二酸化窒素&r（硝酸や四酸化二窒素の製造用）\n&9-&r&a硫酸&r\n&9-&r&aフェノール&r\n&9-&r&aエピクロロヒドリン&r（エポキシ樹脂の製造に必要）\n&9-&r&aエポキシ&r", "quests.high_voltage.lcr.desc.2": "&3LCR&rには専用レシピも存在します。たとえば、&d直留ガソリン&rはLCRでしか作ることができません。\n\nLCRの&dオーバークロック&rは完全に&6100％効率&r、いわゆる「パーフェクトオーバークロック」(POC)です。つまり、各段階で処理速度が&54倍&rずつ向上していきます（通常は2倍です）。\n\nさらにもう一つの&6利点&rとして、&32基のエネルギーハッチ&rを取り付けることで、&5上位電圧&rのレシピを利用できるようになります。これは&3EBF&rと同様の仕組みです。", @@ -2440,6 +2589,8 @@ "quests.high_voltage.final_dust.title": "無限の粉製", "quests.high_voltage.final_dust.subtitle": "アンリミテッドダストワークス", "quests.high_voltage.final_dust.desc": "&e金星&rに到達するまでは、&7月&rで確保できる&c無限資源&rはこれだけです。\n\nこれらの資源が無限化されていれば、&dGregTech&rをかなり快適に進められるでしょう。&a月面基地&rの維持にも欠かせません。\n\n具体的な用途：\n•&dAE2コンポーネント&rの作成\n•&6レールガンの弾&rの&c無限&r生産\n\n資源が無限化されたことで、いくつかのパッシブラインを組むことができるようになったと思います。そちらに注力してもいいかもしれません。", + "quests.high_voltage.titanium_greate.title": "Greate-チタニウムエディション", + "quests.high_voltage.titanium_greate.desc": "TerraFirmaGregにおいてGreateの要素はこれで最後です。超高電圧にふさわしい超高性能ではありますが...今さら歯車を回したいですか？", "quests.low_voltage": "&7LV&r - 低電圧時代", "quests.low_voltage.subtitle": "どんな元素も無駄にしない優しい工業mod", "quests.low_voltage.lv_machine_hull.title": "第二のマシン筐体", @@ -2485,9 +2636,18 @@ "quests.low_voltage.lv_seeds.subtitle": "種だらけの場所", "quests.low_voltage.lv_seeds.desc": "キャノーラまたはヒマワリを見つけたら、採取して栽培を始めましょう。これらは&a種油&r作りに最適な植物です。\n\nキャノーラは寒さに強く、ヒマワリは暖かい環境を好みます。もし農作業にあまり時間をかけたくない場合は、電気温室を利用することもできます。", "quests.low_voltage.lv_seeds.task": "Canola or Sunflowers", + "quests.low_voltage.lv_gas_turbine.title": "ガスタービン発電", + "quests.low_voltage.lv_gas_turbine.subtitle": "ちょっと背伸びした発電", + "quests.low_voltage.lv_gas_turbine.desc": "&7合成ガス&rがあれば、&7LV&rでも&8ガスタービン&rを実用的に使うことができます。他の&6発電機&rと扱いはほとんど変わりませんが、&6燃焼発電機&rよりもわずかにコストパフォーマンスの面で優れています。", + "quests.low_voltage.lv_gas_syngas.title": "合成ガス", + "quests.low_voltage.lv_gas_syngas.subtitle": "木質ガスじゃないよ", + "quests.low_voltage.lv_gas_syngas.desc": "&7合成ガス&rの作成はとても簡単です。&6醸造機&rまたは&6Vacuum Chamber&r1台につき、&bコークス炉&rを3台用意するだけで十分です。そのうえで、エネルギー消費の不要な&bCreate式の自動植林施設&rで&7原木&rを集めれば、初期から&7ガス燃料&rを気軽に利用できるようになります。", + "quests.low_voltage.lv_naphtha_light.title": "ナフサと軽質燃料", + "quests.low_voltage.lv_naphtha_light.subtitle": "プラスチックづくりのついででも", + "quests.low_voltage.lv_naphtha_light.desc": "もし農業が本当に嫌いで、&6砂漠&rを探検したり、大量の&7オイルサンド&rを採掘したりする方が性に合うのであれば、&7ナフサ&r（&7原料油&r向け）や、&7軽質燃料&r（&7原油&r向け）といった燃料を検討するとよいかもしれません。\n\nどちらも比較的簡単に作れるわりに性能が良い燃料ですが、現段階では手作業で採取する必要があります。", "quests.low_voltage.lv_turbo_charge.title": "高速充電器", "quests.low_voltage.lv_turbo_charge.subtitle": "急速充電対応！", - "quests.low_voltage.lv_turbo_charge.desc": "&oこのクエストは進行に必須ではありません。快適な充電に興味のある人は参考にしてください。&r\n\n&3高速充電器&rは、&9ドリル&rなどの&6電力(RFやEU)&rを使うツールを非常に高速で充電できる装置です。\n\n1つのアイテムにつき最大4アンペアで充電することができるため、&3蓄電器&rなどの&6約2倍のスピード&rで充電できます。\nただし、蓄めた電力は、他の機械を動かすためには使えません！\n\n&eどの充電器でも&rこのクエストは達成できます。", + "quests.low_voltage.lv_turbo_charge.desc": "&oこのクエストは進行に必須ではありません。快適な充電に興味のある人は参考にしてください。&r\n\n&3高速充電器&rは、&9ドリル&rなどの&6電力(RFやEU)&rを使うツールを非常に高速で充電できる装置です。\n\n1つのアイテムにつき最大4アンペアで充電することができるため、&3蓄電器&rなどの&6約2倍のスピード&rで充電できます。\nただし、ためた電力は、他の機械を動かすためには使えません！\n\n&eどの充電器でも&rこのクエストは達成できます。", "quests.low_voltage.lv_turbo_charge.task": "Any Turbo Charger will do", "quests.low_voltage.lv_fisher.title": "魚釣り機", "quests.low_voltage.lv_fisher.subtitle": "魚と糸の等価交換", @@ -2673,7 +2833,7 @@ "quests.low_voltage.mold_plate.desc": "&6合金精錬炉&rを使うのはもうおしまいです。これから大量の&6ゴムシート&rが必要になりますし、将来のプラスチックの成型にも使えません。\n\n押出機でゴムシートを作ろうと思うかもしれませんが、&6液体成型機&rはそれ以外の様々な加工にも使え、押出機は&bMV&rに達するまではほとんど使い道がありません。", "quests.low_voltage.cupronickel_ingot.title": "キュプロニッケルインゴット", "quests.low_voltage.cupronickel_ingot.subtitle": "簡単な合金さ", - "quests.low_voltage.cupronickel_ingot.desc": "&7GregTechを進めていくには、新しい素材をどうにかして確保し、それによって機械をアップグレードしたり、高度な機械部品を解禁していくことが主要な流れになります。&r\n\n長い旅路の始まりに、最初に出会う合金は&bキュプロニッケル&rです。この素材は&6工業用電気炉&r(通称：EBF)を構築するために使われ、これは産業発展には欠かせません。\n\n幸い、キュプロニッケルの作成は&7基本型合金精錬炉&rで十分に対応できます。EBFのためには&b128個&r必要になりますが、思ったより簡単に作れます！&r\n\n後に要求される合金はどんどん複雑になっていきます。今のうちにこのシンプルさを楽しんでおきましょう。", + "quests.low_voltage.cupronickel_ingot.desc": "GregTechを進めていくには、新しい素材をどうにかして確保し、それによって機械をアップグレードしたり、高度な機械部品を解禁していくことが主要な流れになります。\n\n長い旅路の始まりに、&bキュプロニッケル&rという合金に出会います。この合金は&6工業用電気炉&r(通称：EBF)を初めて構築する時のために使うものであり、産業発展には欠かせません。\n\n幸い、キュプロニッケルの作成は&7合金精錬炉&rで十分に対応できます。EBFのためには&b128個&r必要になりますが、思ったより簡単に作れます！&r\n\n後に要求される合金はどんどん複雑になっていきます。今のうちにこのシンプルさを楽しんでおきましょう。", "quests.low_voltage.cupronickel_coil.title": "キュプロニッケルコイル", "quests.low_voltage.cupronickel_coil.subtitle": "コイルの赤ちゃん", "quests.low_voltage.cupronickel_coil.desc": "最初のEBF用のコイルを作るために、&aキュプロニッケルを128個&r、&aブロンズを32個&r、&a錫合金を16個&r用意しましょう。\n\nこれはEBFのコイルの部分の要求素材に過ぎません。さらにインバーとスチールをそれぞれ1スタックずつ用意する必要があるので、採掘も進めてください。\n\nキュプロニッケルコイルを使うことで、EBFは最大&d1,800K&rのレシピを処理できるようになります(電圧ボーナスは無視)。なかなかアツいですね。\n\n「&6GregTechの電力システム&r&6」の章にある機械高炉に関する説明も確認して、さらに詳しく学んでください！&r", @@ -2681,6 +2841,7 @@ "quests.low_voltage.lv_ebf.subtitle": "GregTechの中心で、愛を叫ぶ", "quests.low_voltage.lv_ebf.desc.1": "このクエストでは&3工業用電気炉&r(通称：EBF)の基本的な仕組みを学べます。一つ上のクエストでは、マルチブロック構造の仕組みを解説するので、そちらも忘れずにチェックしましょう。\n\nさて、&3EBF&rはあなたにとって&e初めての電動大型機械&rです！おめでとうございます！\nEBFは高温で素材を加工するために使います。\n\nEBFを使えば、&aアルミニウム&rを作って&d&bMV時代&rへ進めます。また、&7スチール&rを&6TFCの高炉&rよりも速く作れるので、愛着がなければ、もう時代遅れなTFCの鍛冶場を取り壊しても問題ありません。", "quests.low_voltage.lv_ebf.desc.2": "EBFはかなりの電力を必要とする機械です。稼働には最低&9120EU/t&rが必要で、これは&7LV&r発電機約4基分に相当します。\n\nEBFと蓄電器の近くに新しく発電機を用意して、専用の発電ラインを作ることを検討しましょう。ケーブルによる電力損失には注意してください。", + "quests.low_voltage.lv_ebf.desc.3": "EBFが点滅したり、必要な量の電力を受け取れていなかったりしませんか？その場合、おそらく&eケーブルによる電力損失&rが発生しています。詳しくは「GregTechの電力システム」の章を読んで、この仕組みを理解しておくと良いでしょう。\n\n発電機はできるだけEBFの近くに配置し、適切なケーブルを使ってください。上の画像のように配置した2倍錫ケーブルを使うことをおすすめします。", "quests.low_voltage.multiblock_tech.title": "マルチブロック構造について", "quests.low_voltage.multiblock_tech.subtitle": "デカいことはいいことだ", "quests.low_voltage.multiblock_tech.desc": "これは、初めて&bEBF&rを作る方に向けた、マルチブロックの&6基本&rの説明です。\n\nマルチブロックのカスタマイズの幅は広いです。マルチブロックの本体となるブロック(コントローラーといいます)に&6U&rキーを押し&6EMI&rのマルチブロック情報を開き、構造ブロックを&6左クリック&rしてどの種類のブロックが使えるかを確認してみましょう。\n\n重要なポイントとして、エネルギーハッチはそれぞれ１つで&a2A&rまで対応でき、&7LV&rでは&a64EU/t&rを受け取れます。つまり、2つあれば&eEBF&rは&a128EU/t&r(MV相当の電圧)で動かせます。\n\n詳しい仕組みは「&eGregTech電力システム&r」章の「&e電力運用について&r」の項目を参照してください。\n\nマルチブロックにはさまざまな面白い仕組みがありますが、最初は難しく考える必要はありません。進めながら少しずつ理解していきましょう。", @@ -2701,6 +2862,12 @@ "quests.low_voltage.mv_hull.subtitle": "MVへの入り口", "quests.low_voltage.mv_hull.desc1": "よくぞここまで来ましたね！&bMVマシン筐体&r、&b改良型電子回路&r、&6基本型回路作成機&rがあれば、正真正銘、MV時代に到達です！\n\nこれが&6GregTech&rの基本的な流れです。新しいティアに進むたびに、新たな&6素材&rや&6化学物質&rを使って、より高度な&6機械&rを作っていくことになります。\nこんなにすばらしい体験をすることができるなんて、羨ましい限りです。", "quests.low_voltage.mv_hull.desc2": "&bMV&rに進む前に、&6TFG&rでは、&6Create&rのマシンを使ってインフラを補強することも可能です。アルミニウム製のシャフトや歯車はスチール製のものより許容応力が4倍あるので、それらを活用すればマシンをより高速に、安全に稼働させられます。", + "quests.low_voltage.aluminium_greate.title": "Greate-アルミニウムの世界", + "quests.low_voltage.aluminium_greate.subtitle": "中応力（Medium Stress）の時代", + "quests.low_voltage.aluminium_greate.desc": "前回のアップグレードから少し時間が経ちましたが、ここでさらに上位のGreateの機構が使えるようになります。以前と同様に、アルミニウム製のものはスチール製のものよりも &b4倍&rの応力容量があります。\n\nこの先からは、Greateに全く触れずとも進められますが、もしGreateに愛着がある場合は、この機会にこれまで使っていた機構を取り換えることをおすすめします。\n\n応力供給をさらに強化したいなら&e蒸気エンジン&rの利用や、&9Create Additions&rの&e電動モーター&rを使ってEUをSUに変換することなどもできます。", + "quests.low_voltage.oil.title": "Found Oil early?", + "quests.low_voltage.oil.subtitle": "For LV overachievers", + "quests.low_voltage.oil.desc": "旅の途中でオイルサンドの鉱石や、砂漠にある原油噴出口を見つけていれば、LVの段階でも原油の活用ができます。まだフル活用はできませんが...\n\n重質燃料にしてボイラーの燃料として使うこともできますが、&bポリエチレン&rの作成に使うのもおすすめです！\n\nポリエチレンの本格的な活用についてはMVの章で説明しますが、この時点でもマシン筐体やダイオードなどを安価に作るために使うことができます。", "quests.medium_voltage": "&bMV&r - 中電圧時代", "quests.medium_voltage.subtitle": "新たな電気機械と石油化学の時代", "quests.medium_voltage.mv_machine_hull.title": "MVへようこそ", @@ -2712,7 +2879,7 @@ "quests.medium_voltage.mv_miner.title": "自動採掘", "quests.medium_voltage.mv_miner.subtitle": "鉱脈採掘がめんｄな人向け", "quests.medium_voltage.mv_miner.desc.1": "採掘機はあなたの代わりに鉱石を掘ってくれます。\n\n採掘できる範囲については、垂直方向は無制限、水平方向はアイテムの説明に書いてあります。\n\n&bMV&r採掘機の採掘範囲はそこそこ、鉱脈全体を掘るには至りませんが、&6HV&r採掘機なら鉱脈全体を掘ることができます。いずれかの種類の採掘機を作成することで、クエストクリアとなります。", - "quests.medium_voltage.mv_miner.desc.2": "採掘機の稼働には&9電力&rが必要です。&aバッテリー&rでも良いですが、電池切れになりがちです。\n\nおすすめの方法は、燃料を入れた&3ドラム&rと&3発電機&rを置いておくことです。\n\n発電機の上に燃料ドラムを置き、&5ソフトマレット&rで自動搬出をオンにすれば、ドラムから燃料を供給してくれます。", + "quests.medium_voltage.mv_miner.desc.2": "採掘機の稼働には&9電力&rが必要です。&aバッテリー&rでも良いですが、電池切れになりがちです。\n\nおすすめの方法は、燃料を入れた&3ドラム&rと&3発電機&rを置いておくことです。\n\n発電機の上に燃料ドラムを置き、&5ソフトマレット&rまたは&5スクリュードライバー&rで自動搬出をオンにすれば、ドラムから燃料を供給してくれます。", "quests.medium_voltage.mv_miner.desc.3": "&c注:&r稼働の際には、採掘したい範囲の&dチャンクロード&rを忘れずに。FTBmapのチャンクロード機能で行うのが一番簡単です。\n\n&9まめちしき:&r&3MEチェスト&rや&3クレート&rを使うことで、採掘したアイテムの持ち帰りが楽になります。&3MEチェスト&rはEU電力でも稼働出来ますが、現時点では作れません。", "quests.medium_voltage.mv_miner.task": "いずれかの採掘機", "quests.medium_voltage.mv_component.title": "MVの中間素材", @@ -2760,14 +2927,14 @@ "quests.medium_voltage.mv_fluid_rig.desc.1": "&3液体採掘機&rのコストは猛烈に高いです。しかし、MV時点では最強の&6石油入手手段&rでもあります。\n\n液体採掘機は、地底の岩盤から液体を掘り出す機械です。岩盤から掘り出すといっても、実際に掘っているわけではなく、チャンクごとに設定されている液体を生成する、というのが正確です。\n\nGT環境ではチャンクごとに液体の油田が設定されています。それぞれに異なる液体が設定されていますが、大半は石油系の液体です。\n\nMVの段階では、チャンクごとに埋蔵されている液体の種類を事前に確認する手段は存在しません。&6HV&rまで待ちましょう。", "quests.medium_voltage.mv_fluid_rig.desc.2": "各チャンクからは、おおよそ秒間&d150&r～&d300&rL程度液体が生成されます。\n\n液体採掘機の稼働を続けると、次第にこの生成量が減少していき、最終的には枯渇します。枯渇したら他の場所に移動しましょう。\n\nMVの液体採掘機は、1か所の油田につき、枯渇までに10万サイクル(毎秒1サイクル)採掘処理を行います。この10万サイクルの間に、合計で&6バケツ1万杯分&rをゆうに超える量の液体を入手できます。上位のモデルになると、液体の入手速度が上昇する一方で、より早く液体が枯渇するようになります。", "quests.medium_voltage.mv_fluid_rig.desc.3": "&l&2地上世界&rで見つかる油田&l:&r\n\n&9原油:&r&a軽質燃料&rが多く得られる。汎用性が高い。\n&9軽油:&r&a精製ガス&rが多く得られる。発電手段として有用。\n&9重油:&r&a重質燃料&rが多く得られる。トルエンの材料。\n&9原料油:&r&aナフサ&rが多く得られる。石油化学工業のお供。\n&9天然ガス:&r&a精製ガス&rが簡単に得られる。\n&9海水:&r&aナトリウム&rと&a塩素&rが得られる。", - "quests.medium_voltage.mv_fluid_rig.desc.4": "&l&c地下世界&rで見つかる油田&l:&r\n\n&9天然ガス:&r&a精製ガス&rが得られる。地上世界より産出量が多い。\n&9溶岩:&r説明不要。\n\n最初はとりあえず色々な場所を掘ってみるのが吉です。多くの場合、堀った液体はそのまま採掘機の稼働に使えます。", + "quests.medium_voltage.mv_fluid_rig.desc.4": "&l&c地下世界&r（Beneath）で見つかる油田&l:&r\n\n&9天然ガス:&r&a精製ガス&rが得られる。地上世界より産出量が多い。\n&9溶岩:&r説明不要。\n\n最初はとりあえず色々な場所を掘ってみるのが吉です。多くの場合、堀った液体はそのまま採掘機の稼働に使えます。", "quests.medium_voltage.mv_oilsands.title": "アメリカごっこ", "quests.medium_voltage.mv_oilsands.subtitle": "本クエストは米軍の提供でお送りしています", "quests.medium_voltage.mv_oilsands.desc": "地下にはオイルサンドの鉱脈が存在します。オイルサンドの粉を&3遠心分離&rすると、&a原油&rが入手できます。\n\n&9&lまめちしき:&r&l&9&lエチレン&r&lの作成方法には、他にも植物から採れるエタノールを使った方法があります。&r&r\n\n現段階では石油は不要ですが、&5EV&r時代には必須となります。\n\nまた、石油からは&a軽質燃料&r&aディーゼル&r、&aガソリン&rなど有用な燃料が得られます。\n\nゆえに、プラスチックの作成に石油を使うのであれば、石油を使った発電も検討することをおすすめします。\n\nオイルサンドは、この先液体採掘機を作成するまで、長くお世話になるアイテムです。", "quests.medium_voltage.mv_lpg.title": "燃料紹介シリーズ:ガス編", "quests.medium_voltage.mv_lpg.subtitle": "くさそう", "quests.medium_voltage.mv_lpg.desc.1": "&a精製ガス&r、&aLPG&r、&aメタン&rは&9ガス燃料&rに分類されます。LPGは炭素と水素からなるガスで、燃焼させて利用します。\n\n精製ガスは&d天然ガス&rまたは&d軽油&rから作成されます。後者は生成量が多いですが、作成にやや複雑な手順が要求されます。\n\n&3遠心分離機&rで&aLPG&rと&aメタン&rを作るのは必ず行うようにしましょう。", - "quests.medium_voltage.mv_lpg.desc.2": "&a&aLPG&rや&aMethane&rは&3ガスタービン&r発電に利用されます。天然ガス系燃料の強みは、精製の簡単さです。しかしながら、より高性能な上位燃料に再精製することができないため、長期的には天然ガスの採掘量自体を増やす必要があります。\n\nまた、&aメタン&rは&a植物&rから生産することもできます。他にも様々な燃料があるので、確認しておきましょう。", + "quests.medium_voltage.mv_lpg.desc.2": "&a&aLPG&rや&aメタン&rは&3ガスタービン&r発電に利用されます。天然ガス系燃料の強みは、精製の簡単さです。しかしながら、より高性能な上位燃料に再精製することができないため、長期的には天然ガスの採掘量自体を増やす必要があります。\n\nまた、&aメタン&rは&a植物&rから生産することもできます。他にも様々な燃料があるので、確認しておきましょう。", "quests.medium_voltage.mv_brewery.title": "発酵の時間", "quests.medium_voltage.mv_brewery.subtitle": "かもすぞー", "quests.medium_voltage.mv_brewery.desc.1": "醸造機は、&a潤滑油&rの作成に使える機械です。材料には&aレッドストーン&rと&aクレオソート&rまたは&a石油&rを使用します。潤滑油の用途には、たとえば&3裁断機&rの加工速度を大幅に向上させる、などがあります。\n\n醸造機の加工速度はとても遅いですが、代わりに電力消費がとても少ないです。プラスチックに必要な分のバイオマスを作成するには、複数台の醸造機を設置するとよいでしょう。\n\n&9ヒント:&r醸造機でなく、&3熱分解炉&rでも&9エチレン&rを作成することは可能です。また、石油から作成する方法も存在します。&r", @@ -2784,9 +2951,13 @@ "quests.medium_voltage.mv_distillery.desc.3": "しかし、だからといって&3蒸留機&rが完全な劣化版かといえば、そうではありません。蒸留機は蒸留塔よりも早く解禁されるうえ、&d小型&rかつ&d低コスト&rで、さらに&d省エネ&rです。\n\nそもそも、蒸留されるすべての液体が必要になることは滅多にありません。\n\nまた、&3蒸留機&rは&aディーゼル&rや&aベンゼン&rといった、燃料の作成にも必要となります。\n\nたいていの場合、将来的には下位の蒸留機を大量に作成することになります。", "quests.medium_voltage.mv_distillery.task": "LVまたはMVの蒸留機", "quests.medium_voltage.mv_benzene.title": "燃料紹介シリーズ:ベンゼン編", - "quests.medium_voltage.mv_benzene.subtitle": "伝家の宝刀", + "quests.medium_voltage.mv_benzene.subtitle": "かつての栄光", "quests.medium_voltage.mv_benzene.desc.1": "&aベンゼン&rは&9ガス燃料&rのひとつです。説明を読んでいられない人のために、まずは入手方法から紹介していきます。\n\n1つ目の入手方法は、&d原木&rから作成する方法です。&3熱分解炉&rで原木を加工することで、&9木質タール&rを作成することができます。木炭も、&3抽出機&rで&9木質タール&rに加工することができます。作成した木質タールを&3蒸留&rすることで、&aベンゼン&rを作ることができます。\n\nもうひとつの方法は、&d重油&rを精製する方法です。重油を&3醸造機&rで加工することにより、&9重質燃料&rを作ることができます。これを&a蒸気で分解&rし、&3蒸留&rすることで、&aベンゼン&rになります。", - "quests.medium_voltage.mv_benzene.desc.2": "石油関連のレシピについては、軽質燃料とナフサに関するクエストを参照してください。\n\nなお、Gregtechにおいては、多くの下位機械で並列作業する方が、少数の上位機械で加工するよりも良いことが多いです。これは、上位機械になるほど消費電力が多いからです。\n\n&aベンゼン&rは&3ガスタービン&rで使用することができます。&eディーゼル&rに比べてベンゼンの発電効率は悪いですが、 &6HV&r時代になると&6ニトロベンゼン&rへの加工が可能となり、大幅に発電効率が上昇します。", + "quests.medium_voltage.mv_benzene.desc.2": "石油関連のレシピについては、軽質燃料とナフサに関するクエストを参照してください。\n\nなお、Gregtechにおいては、多くの下位機械で並列作業する方が、少数の上位機械で加工するよりも良いことが多いです。これは、上位機械になるほど消費電力が多いからです。\n\n&aベンゼン&rは&3ガスタービン&rで使用することができます。&eディーゼル&rに比べてベンゼンの発電効率は悪いですが、&6改質ガス&rに精製すれば性能を底上げできます。どの発電方式を選ぶかは、最終的にはプレイヤーであるあなたの判断に委ねられています。", + "quests.medium_voltage.mv_benzene.desc.3": "&l&3余談：&r&oベンゼンはGTCEuの頃からずっと抜群に強力なガス燃料で、あまりにも強力だったのでミームにまでなってたんだよ。でも今は、その栄光は見る影もなくなって...以前ほどの活躍は見込めないかもね。", + "quests.medium_voltage.reformate_gas.title": "ガス革命", + "quests.medium_voltage.reformate_gas.subtitle": "引導を渡す", + "quests.medium_voltage.reformate_gas.desc": "&8改質ガス&rは、&bMV&rでのガス燃料として非常に優秀です。MVでガス発電を選ぶならぜひ主力にしたい燃料です。最適な効率で運用するには、&61基の液化塔&rと&62基の熱分解炉&rをそろえるだけでよく、そこからはこの優秀なガスを安定して生産できます。\n\nただし、その前に&5レニウム&rを確保する必要があります。これは&7TerraFirmaCraft&rの暑く乾燥したバイオームでのみ入手できる新しい素材です。使用量はごく少ないため、鉱脈を1つ見つけてしまえば、モッドパックの終盤まで、少なくとも&6HV&rに到達するまでは十分足りるでしょう。&6HV&rに到達し、&6クラッカー&rを使えるようになれば、このガスは事実上無限供給も可能になります。", "quests.medium_voltage.mv_light_fuel.title": "軽質燃料", "quests.medium_voltage.mv_light_fuel.subtitle": "とてもかるい", "quests.medium_voltage.mv_light_fuel.desc": "石油の蒸留で得られる燃料には硫黄が含まれているため、それらを除去するための手順が必要です。\n\n水素との反応で作られる&a硫化水素&rは、&3電解槽&rを用いることで再利用することができます。\n\n&3化学反応器&rと&3電解槽&rを隣接させることで、このプロセスを簡単に自動化することができます。この方法を使う場合、機械の設定画面を開き、搬出面からの搬入を許可するように設定しましょう。\n\n&a軽質燃料&rは、そこそこ高性能な燃料です。ただし、次のクエストではさらに高性能な燃料が紹介されています。", @@ -2795,6 +2966,10 @@ "quests.medium_voltage.mv_diesel.desc.1": "&aディーゼル&rは、&d石油から作れる&9液体燃料&rです。\n\n原油または原料油から&a軽質燃料&rと&a重質燃料&rを作成し、それらを混合してディーゼルにする場合、前者の作成に蒸留機を3基、後者に2基用いることで、ちょうどよい割合になります。", "quests.medium_voltage.mv_diesel.desc.2": "また、&d重油&rから&a重質燃料&rを作成することで、コストを大幅に減らすことができます。また、&dオイルサンド&rから得られる石油を使うのも有効です。\n\n&o(詳細:原油8.33->ディーゼル6、原油5+重油0.4->ディーゼル6)&r\n\n&eヒント:&r&3蒸留塔&rの使用はおすすめしません。蒸留塔では重質燃料と軽質燃料の両方が一気に得られますが、消費電力に対して得られる燃料の量が少なく、効率がとても悪いです。", "quests.medium_voltage.mv_diesel.desc.3": "したがって、下位の蒸留機を多数作成して加工する方が、結果的にはお得です。\n\n&aディーゼル&rは&3燃焼発電機&rで使用することができます。また、&6HV&r時代になると、&6セタン添加ディーゼル&rへの加工が解禁されます。他の燃料に比べ、ディーゼルはより高効率ですが、引き換えに精製プロセスがやや複雑です。&e石油プラスチック&rを目指す場合であれば、既存の機械で作成できるため、選択肢として有効でしょう。", + "quests.medium_voltage.coal_tower.title": "液化塔", + "quests.medium_voltage.coal_tower.subtitle": "マルチブロックなんてあればあるだけいいですからね", + "quests.medium_voltage.coal_tower.desc.1": "&b液化塔&r は、&a改質ガス&rをはじめ、&7コールタール&rや&7合成ガス&rなどの副産物を作るための新しい&bマルチブロック機械&rです。使う&9コイル&rの素材によって、&7EU/t&rの消費量が割引されます。コイルにカーソルを合わせてshiftを押せば、その割引効果を確認できます。\n\nまた、&9液化塔&rは&8水素&rを投入することで稼働をブーストでき、処理時間が短くなる分、消費エネルギーも削減されます。動かす際は、適切な&6回路番号&rの設定を忘れないようにしてください。\n\n補足として、1秒＝20tickです。そのため、tickごとの消費量に20を掛ければ、1秒あたりの消費量が求められます。", + "quests.medium_voltage.coal_tower.desc.2": "&l&3余談：&r&o実は、核分裂炉を作った人と、液化塔の初期デザインを作った人は同じなんだよ。すごいな。", "quests.medium_voltage.mv_jetpack.title": "鳥人間あらわる", "quests.medium_voltage.mv_jetpack.subtitle": "鳥……鳥？", "quests.medium_voltage.mv_jetpack.desc": "ジェットパックと&a液体燃料&rがあれば、飛行することができます。\n\nジェットパックに燃料を入れるには、ドラムまたは缶詰機が必要です。\n\n&4H&r(初期設定)を押すと、ホバーモードへの切り替えが可能です。", @@ -2846,9 +3021,6 @@ "quests.medium_voltage.mv_polyethylene.title": "ポリエチレン", "quests.medium_voltage.mv_polyethylene.subtitle": "はじめてのポリマー素材", "quests.medium_voltage.mv_polyethylene.desc": "要するにプラスチックです。\n\n&a酸素&rを材料に使用することで、普通の空気よりも多くのポリエチレンが得られます。液体ポリエチレンは、ゴムと同様に、液体成型機で固体にすることができます。\n\n&aポリエチレン(PE)&rは多くのレシピで使用されます。特に、&dシート&rや&d液体ポリエチレン&rが使われることが多いです。\n\n&l&3おまけ:&r&o1.12.2時代、ポリエチレンの鉱石辞書における名称は&bplastic&fでした。これは互換性を重視したためです。", - "quests.medium_voltage.mv_tank.title": "スーパータンク", - "quests.medium_voltage.mv_tank.subtitle": "最強タンク1選！", - "quests.medium_voltage.mv_tank.desc": "スーパータンクは、携帯可能な中では文字通り最強のタンクです。バケツ&64000杯&r分もの容量を持ち、温度や酸性による制限もありません。\n\nドラムと同様に、スーパータンクは破壊されても液体を保持します。単体クラフトで、内部の液体を除去することができます。\n\nさらに強力な液体貯蔵手段が欲しいのであれば、上位のスーパータンクを使用するか、AE2の液体セルを使用しましょう。", "quests.medium_voltage.mv_pvc.title": "ポリ塩化ビニル", "quests.medium_voltage.mv_pvc.subtitle": "第二のポリマー", "quests.medium_voltage.mv_pvc.desc": "&aポリ塩化ビニル(PVC)&rは、現実世界において3番目に多く製造されているプラスチックです。ポリエチレンの代わりに&aプラスチック製回路基板&rの作成に使用することで、製造数を倍にすることができます。&5EV&r時代以降では、ケーブルの被覆にも必要になります。\n\nまた、PVCアイテムパイプは非常に高性能で、これ以上のものは当面解禁されません。MV時点ではそれほどの性能を要求される場面はありませんが、今後のために覚えておきましょう。\n\n&9ヒント:&rGTCEuにおいてPVCを液体で使用する場面は存在しないため、すべてシートに加工してしまっても問題ありません。", @@ -2944,7 +3116,10 @@ "quests.medium_voltage.mv_cpu.desc": "&a&eCPU&rは最も重要な技術のひとつです。\n\n特に&eCPUウェハー&rは、&2化学反応器&rでさらに強化することができます。\n\nひとまず、今は&eCPUチップ&rを使って、上位&bMV&r回路の作成をめざしましょう。\n\nいくらか余らせておくと、将来役に立ちます。", "quests.medium_voltage.lsb.title": "もっとたくさんの蒸気を", "quests.medium_voltage.lsb.subtitle": "有用(燃料が十分にあるなら)", - "quests.medium_voltage.lsb.desc": "今後も&3蒸気ボイラー&rを使い続けるのであれば、そろそろ&3スチール製大型蒸気ボイラー&rを作成した方がよいです。\n\nブロンズ製よりもやや高効率で、最大&d1800mB/t&rの蒸気を生成します。\n\nとはいえ、MV以降は他の発電方法を使った方がよいです。", + "quests.medium_voltage.lsb.desc": "今後も&3蒸気発電&rを使い続けるのであれば、そろそろ&3スチール製大型蒸気ボイラー&rを作成した方がよいです。\n\nブロンズ製よりもやや高効率で、最大&d1800mB/t&rの蒸気を生成します。\n\nとはいえ、MV以降は他の発電方法を使った方がよいです。", + "quests.medium_voltage.stainless_greate.title": "Greate-ステンレスバージョン", + "quests.medium_voltage.stainless_greate.subtitle": "HS - 高応力時代", + "quests.medium_voltage.stainless_greate.desc": "このクエストは、今のタイミングでGreateに新たなアップグレードが追加されていることを知らせるためのものです。\n\n特に新しい破砕ホイールはかなり役立ってくれるでしょう。HV粉砕機と同じように副産物を回収できるうえ、複数のアイテムを同時処理できるので、作業効率が大幅に上がります！", "quests.metal_age": "金属時代", "quests.metal_age.subtitle": "鉱石を捧げよ", "quests.metal_age.weld_bronze_ingots.title": "ブロンズの溶接", @@ -3040,7 +3215,7 @@ "quests.metal_age.weak_steel.task3": "1つのブラックブロンズ", "quests.metal_age.highcarb_black_steel.title": "黒鋼の材料", "quests.metal_age.highcarb_black_steel.subtitle": "質量保存の法則は適用されません", - "quests.metal_age.highcarb_black_steel.desc": "最後の2つの金床は、作成に多くの金属を必要とする複雑な合金で作ることができます。\n軟鋼と銑鉄を溶接して高炭素黒鋼を作成し、それを金床で鍛造して黒鋼にすることができます。", + "quests.metal_age.highcarb_black_steel.desc": "最後の2つの金床は、作成に多くの金属を必要とする複雑な合金で作ることができます。\n軟鋼と銑鉄を溶接して高炭素黒鋼を作成し、それを金床で鍛造して黒鋼にすることができます。\n\n高圧蒸気式合金精錬炉があれば、黒鋼などの色つき鋼の&6生産効率が2倍&rになります。", "quests.metal_age.black_steel_anvil.title": "第五の金床:黒鋼", "quests.metal_age.black_steel_anvil.subtitle": "蒸気の力をその手の中に！", "quests.metal_age.black_steel_anvil.desc": "黒鋼の金床を使用すると、黒鋼のインゴットをさまざまなアイテムに加工できるようになります。\n\nまた、「初期の自動化」の章の中で高圧蒸気力に関連する大規模な項目が解放されました！\n\nここから、工業化に向けてまっすぐ進むことも、あるいは必要に応じて最上位の金床を完成させることもできます。\nただし、色つきの鋼を永遠に避けることはできません！", @@ -3066,10 +3241,10 @@ "quests.metal_age.weak_blue_steel.bismuth_bronze": "1つのビスマスブロンズ", "quests.metal_age.highcarb_red_steel.title": "赤鋼の材料", "quests.metal_age.highcarb_red_steel.subtitle": "核分裂反応ってこんな感じだっけ？", - "quests.metal_age.highcarb_red_steel.desc": "赤鋼のための高炭素赤鋼は、軟赤鋼と黒鋼を溶接することによって作られます。\nこれを赤鋼にするには、金床で鍛造する必要があります", + "quests.metal_age.highcarb_red_steel.desc": "赤鋼のための高炭素赤鋼は、軟赤鋼と黒鋼を溶接することによって作られます。\nこれを赤鋼にするには、金床で鍛造する必要があります。\n\n高圧蒸気式合金精錬炉があれば、赤鋼などの色つき鋼の&6生産効率が2倍&rになります。", "quests.metal_age.highcarb_blu_steel.title": "青鋼の材料", "quests.metal_age.highcarb_blu_steel.subtitle": "このレシピ、ラボアジエがみたらどう思うでしょう", - "quests.metal_age.highcarb_blu_steel.desc": "青鋼のための高炭素青鋼は、軟青鋼と黒鋼を溶接することによって作られます。\nこれを青鋼にするには、金床で鍛造する必要があります", + "quests.metal_age.highcarb_blu_steel.desc": "青鋼のための高炭素青鋼は、軟青鋼と黒鋼を溶接することによって作られます。\nこれを青鋼にするには、金床で鍛造する必要があります。\n\n高圧蒸気式合金精錬炉があれば、青鋼などの色つき鋼の&6生産効率が2倍&rになります。", "quests.metal_age.redblu_anvil.title": "第六の金床:赤鋼・青鋼", "quests.metal_age.redblu_anvil.subtitle": "おしまい？それともはじまり？", "quests.metal_age.redblu_anvil.desc": "最上級の金床である赤鋼・青鋼の金床を使用すると、赤鋼と青鋼の両方のインゴットをさまざまなアイテムに加工できます。\n\nこれはTerraFirmaCraftの進行の終わりを示しています。これからは本格的なGregの進行が始まります。", @@ -3211,17 +3386,18 @@ "quests.space_survival.flag.task": "いずれかの旗", "quests.space_survival.chorus.title": "コーラスフルーツ", "quests.space_survival.chorus.subtitle": "エンド？", - "quests.space_survival.chorus.desc": "月面において得られる中で、&5コーラスフルーツ&rはかなり重要なアイテムです。コーラスフルーツからは、窒素が入手できます。コーラスプラントを見つけたら、かならず頂上の花を破壊して回収しましょう。さもなくば、コーラスフラワーは手に入りません。コーラスフラワーを電動グリーンハウスで育てることで、コーラスフルーツを手に入れることができます。これを醸造機に入れるとバイオマスが、発酵槽に入れれば窒素が得られます。バイオマスは、蒸留することで炭素になるため、ロケット燃料の材料にもなります。", + "quests.space_survival.chorus.desc": "月面において得られる中で、&5コーラスフルーツ&rはかなり重要なアイテムです。コーラスフルーツからは、窒素が入手できます。コーラスプラントを見つけたら、かならず頂上の花を破壊して回収しましょう。さもなくば、コーラスフラワーは手に入りません。コーラスフラワーを電気温室で育てることで、コーラスフルーツを手に入れることができます。これを醸造機に入れるとバイオマスが、発酵槽に入れれば窒素が得られます。バイオマスは、蒸留することで炭素になるため、ロケット燃料の材料にもなります。", "quests.space_survival.rover.title": "スペースローバー", "quests.space_survival.rover.subtitle": "脱出用ビークル", "quests.space_survival.rover.desc": "宇宙にはジェットパックを持ち込めません。飛行機は大気圏外では飛びません。馬は生存できません。そんな中で、移動手段があるのでしょうか？\n\n実はあります。&b探査車&rは液体燃料で走る2人乗りのビークルです。内部にインベントリを備えており、加えてラジオも搭載。ラジオでは、現実世界のラジオをストリーミング再生することができます。", "quests.space_survival.solar_panels.title": "ソーラーパネル", "quests.space_survival.solar_panels.subtitle": "お天道様は見ているぞ", "quests.space_survival.solar_panels.desc": "月面で使える発電手段はあまり多くありません。そんな中で活躍するのが&eソーラーパネル&rです。\n\n昼間限定にはなりますが、月面のソーラーパネルはノーコストで&932EU/t&r相当の電力を生み出します。地球上での発電量は、月面の8分の1になります。大量に用意して、月に並べておきましょう。", + "quests.space_survival.solar_panels.task": "Any FE to EU converter", "quests.space_survival.stone_dust_centrifuging.title": "ヘリウム3", "quests.space_survival.stone_dust_centrifuging.subtitle": "声が高くなるやつ", "quests.space_survival.stone_dust_centrifuging.desc.1": "月面には大量の&eヘリウム3&rが存在します。月の石の成分として含まれるヘリウム3は、重要資源のひとつです。主な入手方法は2種類あります。\n\n1.石を粉砕し、遠心分離する。砕石機では生石を無限生産することができるので、これで得られる石を使いましょう。\n\n月面で生産できるのは、斜長岩・ノーライト・響岩の3種です。これらを加工することで、ヘリウム3は無限資源になります。", - "quests.space_survival.stone_dust_centrifuging.desc.2": "2.&9液体採掘機&rで掘る。こちらは簡単ですが、副産物は特に得られません。\n\nヘリウム3の用途はいくつか挙げられますが、特に重要なのは呼吸するための空気の確保でしょう。また、ヘリウム3は電動グリーンハウスの肥料としても使用でき、コーラスフルーツの成長を加速することができます。さらには、将来核融合炉が完成すれば、核融合発電の燃料にもなります。", + "quests.space_survival.stone_dust_centrifuging.desc.2": "2.&9液体採掘機&rで掘る。こちらは簡単ですが、副産物は特に得られません。\n\nヘリウム3の用途はいくつか挙げられますが、特に重要なのは呼吸するための空気の確保でしょう。また、ヘリウム3は電気温室の肥料としても使用でき、コーラスフルーツの成長を加速することができます。さらには、将来核融合炉が完成すれば、核融合発電の燃料にもなります。", "quests.space_survival.stone_dust_centrifuging.task": "いずれかのアイテム", "quests.space_survival.compressed_gases.title": "圧縮空気", "quests.space_survival.compressed_gases.subtitle": "純粋酸素を吸うのはやめましょう", @@ -3320,7 +3496,7 @@ "quests.space_survival.t2_space_suit.desc": "この宇宙服があれば、&b極低温&r、&c極高温&rのいずれにも対応できます。さもなくば、&6金星&rや&5水星&rでは、足を踏み入れた途端に死んでしまうでしょう。\n\nちなみに、防御力と酸素の容量も上昇しています。", "quests.space_survival.mars_tapping.title": "赤い樹液と歪んだ樹液", "quests.space_survival.mars_tapping.subtitle": "樹液集めはお好き？", - "quests.space_survival.mars_tapping.desc": "真紅のキノコ、歪んだキノコからは、それぞれ専用の樹液が得られます。\n\n&9ヨウ素&rを作るには、両方の樹液が必要です。ただし、両者は多くの場合別々の場所に生えているため、ある程度探索も必要になるでしょう。真紅のキノコは主に東側で、歪んだキノコは西側でみられます。\n\nちなみに、樹液はGregtechのパイプでも集めることができます。\n\n&9おまけ:&r真紅のキノコからはカヌーを、歪んだキノコからはボートやスループを作成することができます。", + "quests.space_survival.mars_tapping.desc": "真紅のキノコ、歪んだキノコからは、それぞれ専用の樹液が得られます。\n\n&9ヨウ素&rを作るには、両方の樹液が必要です。ただし、両者は多くの場合別々の場所に生えているため、ある程度探索も必要になるでしょう。真紅のキノコは主に東側で、歪んだキノコは西側でみられます。それらに対応したエンダーマンを倒すことでも入手することができます。\n\nちなみに、樹液はGregtechのパイプでも集めることができます。\n\n&9おまけ:&r真紅のキノコからはカヌーを、歪んだキノコからはボートやスループを作成することができます。", "quests.space_survival.iodine.title": "ヨウ素", "quests.space_survival.iodine.subtitle": "キノコ化学のはじまり", "quests.space_survival.iodine.desc": "歪んだキノコ、真紅のキノコの樹液を混ぜたものに、火星の大気を蒸留して得られるクリプトンを加え、それを核分裂炉の熱で熱することにより、ヨウ素を手に入れることができます。\n\nこの加工には時間がかかりますが、使用量は多くないので心配ご無用。Ad Astraをさらに進めれば、もっと簡単にヨウ素を作れるようになります。", @@ -3380,7 +3556,7 @@ "quests.steam_age.horse_crank.title": "最初の動力源", "quests.steam_age.horse_crank.subtitle": "24時間働けますか？", "quests.steam_age.horse_crank.desc.1": "&3アニマルクランク&rは、最初に利用できる動力源です。使用するには、7x7の整地されたエリアの中央に設置し、動物をリードでつなぎます。\n動物の種類によって出力される応力の大きさが異なり、下のブロックによって回転速度が向上します。それぞれのクランク同士の領域は重なっていても問題ありません。\n\n注意:動物を取り付けるには、リードを2本持っている必要がある場合があります。", - "quests.steam_age.horse_crank.desc.2": "&3小型動物(4 SU):&r\nオオカミ、犬、豚、羊、ヤギ、アルパカ\n\n&3中型動物(6 SU):&r\n牛、ロバ\n\n&3大きな動物(8 SU):&r\n馬、ラバ、ジャコウウシ、ヤク", + "quests.steam_age.horse_crank.desc.2": "&3小型動物(8 SU):&r\nオオカミ、犬、豚、羊、ヤギ、アルパカ\n\n&3中型動物(12 SU):&r\n牛、ロバ\n\n&3大きな動物(16 SU):&r\n馬、ラバ、ジャコウウシ、ヤク", "quests.steam_age.poor_paths.title": "貧弱な道", "quests.steam_age.poor_paths.subtitle": "奴隷労働", "quests.steam_age.poor_paths.desc": "これは使用できる中で最悪の道路です。アニマルクランクは2RPMで動作します。", @@ -3444,7 +3620,7 @@ "quests.steam_age.fluid_pipes.desc.2": "&aメモ:&r1秒は20ティックです。これはサーバーに遅延が発生していないときの話ですが...\n\n&d注:&r GT6スタイルのパイプが有効になっています。つまり、パイプを配置すると、パイプを置いた面のブロックにのみ接続されます。もっといろんなブロックにつなげたいなら、パイプにレンチを使用しましょう。\n\nパイプをレンチでスニーク右クリックして、一方通行にすることができます。これは、液体が望ましくない方向に移動することを防ぐのに役立ちます。", "quests.steam_age.fluid_drums.title": "効率的な液体ストレージ", "quests.steam_age.fluid_drums.subtitle": "木の樽に融けた鋼を入れておけると思います？", - "quests.steam_age.fluid_drums.desc.1": "&6TFG&rをやっていて、扱う液体の種類の多さに&4圧倒&rされてませんか？ それらを保管しておく方法を探していたら読んでください。\n\nご紹介しましょう... &aドラム&r！これらには大きな内部容量があります。&aドラム&rは壊されても内部の液体を&d保持します&r。ソフトマレットで右クリックすると、ドラムは下方向に内容物を自動搬出してくれます。", + "quests.steam_age.fluid_drums.desc.1": "&6TFG&rをやっていて、扱う液体の種類の多さに&4圧倒&rされてませんか？ それらを保管しておく方法を探していたら読んでください。\n\nご紹介しましょう... &aドラム&r！これらには大きな内部容量があります。&aドラム&rは壊されても内部の液体を&d保持します&r。ソフトマレットまたはスクリュードライバーで右クリックすると、ドラムは下方向に内容物を自動搬出してくれます。", "quests.steam_age.fluid_drums.desc.2": "&l&3余談：&r&oこのドラムたちは、実はGregTech6から移植されたものなんだぜ。", "quests.steam_age.boilers.title": "蒸気ボイラー", "quests.steam_age.boilers.subtitle": "ポータブルサウナ", @@ -3556,7 +3732,7 @@ "quests.steam_age.lathe.desc": "&3Belt_Grinder&rは、一つのインゴットを2つの棒に切削したり、ボルトをスクリューに加工したり、あるいは、宝石を研磨したりなど、様々な加工が行えます。\n多くの棒とスクリューが必要な場合は、このマシンが役に立ってくれるでしょう。", "quests.steam_age.steel_saw.title": "鋼鉄製メカニカルソー", "quests.steam_age.steel_saw.subtitle": "石切り台と基本型裁断機が1つに！", - "quests.steam_age.steel_saw.desc": "鋼鉄製メカニカルソーは、棒を4つのボルトに変えたり、ブロックをプレートに裁断したりするなど、いくつかの金属レシピも処理できるようになりました。\nこれらのレシピを実行するためには液体が必要ですが、今のところは水を使えばよいでしょう。\n\n最初に合金精錬機を使用してゴムパルプをブロックに変えると、より安価にゴムシートを作ることができます。", + "quests.steam_age.steel_saw.desc": "鋼鉄製メカニカルソーは、棒を4つのボルトに変えたり、ブロックをプレートに裁断したりするなど、いくつかの金属レシピも処理できるようになりました。\nこれらのレシピを実行するためには液体が必要ですが、今のところは水を使えばよいでしょう。\n\n最初に合金精錬機を使用してゴムパルプをブロックに変えると、より安価にゴムシートを作ることができます。\n\nコバルトブラスをまだ作ったことがない場合は、ケイ酸アルミニウムになる素材をるつぼで合金として溶かすか、鉱石処理で出るアルミニウムの粉を使ってミキサーで作る方法があります。", "quests.steam_age.rolling_mill.title": "Rolling Mill", "quests.steam_age.rolling_mill.subtitle": "金属加工機の残り半分", "quests.steam_age.rolling_mill.desc.1": "蒸気時代に作れるマシンの中でも、&3Rolling_Mill&rは、最高のものの1つです。なんと、1つのインゴットから1つのプレートが作れるようになるんですよ！\nまた、薄いシートを手作業よりも安価に作成することもできます！", @@ -3595,6 +3771,10 @@ "quests.steam_age.steel_mech_press.subtitle": "ほぼ鍛造機", "quests.steam_age.steel_mech_press.desc.1": "高圧蒸気式鍛造機はあとちょっとで作れますし、それがあればこのマシンにできることは、ほとんどすべてできてしまいますが、より上位の自動溶接レシピを切実に必要としている場合は作りましょう。\n\n鍛造機では鋼鉄製メカニカルプレスと同じように、鉱石を(副産物なしで)粉砕したり、岩を丸石に変えたり、砂利を砂に変えたり、レンガを割ったりすることができます。\nただし、鍛造機のみが金属プレートの&3より安価なレシピ&rを実行できます...", "quests.steam_age.steel_mech_press.desc.2": "&l&3余談：&r&oCreateのメカニカルプレスって、バージョン0.9より前のTerraFirmaGregだと、蒸気時代の結構重要なマシンだったんだよね。なぜかって、4/5っていうまあまあ良い比率でプレート作ってくれたから。でも実は、それを「20％の確率で、アイテムが消える」っていう仕様で実装してたんだよ！あのギャンブルはサイコーだったなあ。", + "quests.steam_age.supers.title": "スーパーチェストとスーパータンク", + "quests.steam_age.supers.subtitle": "スーパーストレージドロワー", + "quests.steam_age.supers.desc": "これはまさに&cu&6l&et&ai&bm&9a&5t&4e&rな収納機器です。現時点で作れる&d基本型&r（&8ULV&r）のものは比較的容量が小さいと思うかもしれませんが、上位のスーパーチェストやスーパータンクになると、温度・酸性度といった制限をまったく受けず、1ブロックで膨大な量を収納できるようになります！\n\nこれらは樽などと同じく、&6壊しても中身が消えず&r、さらには単体でクラフトして中身を空にする機能や、容量を超えた分を自動で破棄する機能まで備わっています。\n\nもっと大容量を求める場合は、さらに上位のクアンタムチェスト／タンクや、AE2のストレージセルをつかうことができます。", + "quests.steam_age.supers.task": "Any super chest or tank", "quests.stone_age": "石器時代", "quests.stone_age.subtitle": "そして伝説へ...", "quests.stone_age.foods.title": "お腹が空いた？", @@ -3796,7 +3976,9 @@ "quests.tfg.create_team.desc": "チームを組むことで同時にクエストを攻略することができます。 チームを作るには、インベントリを開き、左上にあるカラフルな人が3人描かれたボタンを選択すると、チームを作成できる画面が開きます。§aCreate_a_team§r と書かれたボタンをクリックし、チーム名やその他のパラメータを設定して、チームの作成に成功したら、右上の緑色の丸の中にあるプラスボタンを使って他のプレイヤーを招待できます。これ以降、クエストは同期され、チームメンバーは誰でもクエストを完了できるようになります。頑張ってくださいね！", "quests.tfg.capture_territory.title": "領有主張の方法", "quests.tfg.capture_territory.subtitle": "それとチャンクロードのしかた", - "quests.tfg.capture_territory.desc": "マルチプレイをしているとき、他のプレイヤーに邪魔されないように自分の領地を確保したいと思うことがあるかもしれません。そんな時はOpen_Claimキー(デフォルトだとCtrl+M)を使ってウィンドウを開き、左クリックでチャンクを確保、右クリックで解放することができます。 ただし、これには制限があります。世界のすべてを領地にすることはできないですよ。また、Shift+左クリックでチャンクロード状態にすることもできます。Shift+右クリックで解除することができます。そして、これらは同じチーム内で共有されます。", + "quests.tfg.capture_territory.desc": "マルチプレイをしているとき、他のプレイヤーに邪魔されないように自分の領地を確保したいと思うことがあるかもしれません。そんな時はOpen_Claimキー(デフォルトだとCtrl+M)を使ってウィンドウを開き、左クリックでチャンクを確保、右クリックで解放することができます。\n\nただし、これには制限があります。世界のすべてを領地にすることはできないですよ。また、Shift+左クリックでチャンクロード状態にすることもできます。Shift+右クリックで解除することができます。そして、これらは同じチーム内で共有されます。", + "quests.tfg.chunk_limit.title": "How to increase my chunkload limit?", + "quests.tfg.chunk_limit.desc": "サーバーで遊んでいる場合、デフォルトのフォースロード設定できるチャンク数はかなり少なく抑えられています。\n\nサーバー管理者であれば、README.txtに従ってこの上限を変更できます。また、自分にOP権限がある、あるいはチートをオンにしている場合は、「&a/ftbchunks admin extra_force_load_chunks @p set X&r」というコマンドを使えば、自分のフォースロード上限をXの値に設定できます。", "quests.tfg.field_guide.title": "クエストに関する重要な情報！", "quests.tfg.field_guide.subtitle": "もっといろいろ知りたいですか？", "quests.tfg.field_guide.desc": "クエストはまだ開発中で、常に改善に努めています！特定のゲーム内の仕様に関する多くの情報は、インベントリの「本」タブからアクセスできるフィールドガイドにも記載されています。\n\nクエストですべてが説明されるわけではないので、EMIとフィールドガイドはあなたの強い味方になることを覚えておいてください。\n\n追記：この文章は日本語の時のみ表示されます。クエストの文章がおかしなところで改行されることなどで悩んでいる場合は「Better Line Break」というModを導入することをお勧めします。このModは日本語でのクエストの表示を改善してくれます。\nまた、クエストは日本語で読みたいけれど、アイテムは英語で検索したいという場合は「Untranslated Items」というModの導入をお勧めします。ツールチップに日本語名と英語名の両方が表示されるようにしてくれます。", @@ -3874,15 +4056,52 @@ "quests.tfg_tips.gt.title": "GregTech", "quests.tfg_tips.gt.subtitle": "このModPackの名前の3分の1", "quests.tfg_tips.gt.desc": "&3GregTech&rはかなり難解です。このクエストラインはあなたの理解の助けになるでしょう。", + "quests.tfg_tips.gt_power_tools.title": "電動ツール", + "quests.tfg_tips.gt_power_tools.subtitle": "男の子ってこういうのが好きなんでしょ", + "quests.tfg_tips.gt_power_tools.desc.1": "多くの工業Modと同じように、&5GregTech&rにもさまざまな種類の便利な&6ツール&rが登場します。それらを使うには、まず&a充電する&r必要があります。充電をする方法として、蓄電器に入れる、機械のエネルギースロットに差し込むなどでもいいですが、&e高速充電器&rというツールの充電に特化した装置も存在します。\n\nただし注意点として、ツールを充電できるのは&7同等&rか&aそれ以上のティア&rの電圧だけです。つまり、&c低い電圧&rでは高い電圧のツールを充電できません──ああ大丈夫ですよ、間違えても&c爆発したりはしないはず&rですから。ええ。", + "quests.tfg_tips.gt_power_tools.desc.2": "ほとんどの&5GregTech&r製ツールは&6パワーユニット&rと&6ツールヘッド&rが素材として要求されます。どんな種類のツールが作れるのかは、&aEMI&rで一覧を調べると分かりやすいです。ただし、次の2つのポイントだけは要注意です：\n\n-パワーユニットのティアが高いほど、ツール自体の&c性能が上がり&r、その分だけ必要とする&6バッテリー容量&rも大きくなります。\n-全てのツールが全てのティアに対応しているわけではありません。たとえば&6チェーンソー&rは&7LVパワーユニット&rでしか作れません。.", "quests.tfg_tips.nano_saber.title": "ナノセイバー", "quests.tfg_tips.nano_saber.subtitle": "龍が我が身に宿る", "quests.tfg_tips.nano_saber.desc": "&6ナノセイバー&rは、&5EV&rに到達すると解禁される強力な武器です。\n&dShift+右クリック&rで、&cbzzzzzモード&rをアクティブにし、真の力を解き放ちましょう。", - "quests.tfg_tips.gt_tools.title": "GregTechツール", - "quests.tfg_tips.gt_tools.subtitle": "", - "quests.tfg_tips.gt_tools.desc": "ほとんどの&5GregTech&rツールは、&6パワーユニット&rから作成されます。\n&aEMI&rで、どのようなツール作ることができるのか確認できます。その際、2つの重要なことを覚えておいてください。\n\n-&eパワーユニットのティアが高いほど&r、ツールはより&c強力&rになり、使用するバッテリーも&6上位のもの&rになります。\n-すべてのツールがすべてのティアーのパワーユニットから作れるわけではありません。たとえば、&6チェーンソー&rは&7LVパワーユニット&rでのみ作成できます。", "quests.tfg_tips.magnets.title": "アイテムマグネット", - "quests.tfg_tips.magnets.subtitle": "", - "quests.tfg_tips.magnets.desc": "&6アイテムマグネット&rは想像通り、近くの&6アイテム&rをあなたのもとに直接引き寄せるマグネットです。&a本当に便利です&r。これ以上のものが必要ありますか？", + "quests.tfg_tips.magnets.subtitle": "Simplest Magnet", + "quests.tfg_tips.magnets.desc": "&6アイテムマグネット&rは、想像通り、近くの&6アイテム&rをあなたのもとに直接引き寄せるマグネットです。&a本当に便利です&r。これ以上のものが必要ありますか？", + "quests.tfg_tips.long_distance_items.title": "長距離アイテムパイプ", + "quests.tfg_tips.long_distance_items.subtitle": "お急ぎ便", + "quests.tfg_tips.long_distance_items.desc": "&3長距離アイテムパイプ&rは、その名の通り長距離のアイテムを輸送に使える専用のパイプです。使い方は簡単で、送り元と送り先に接続口を置き、その間をパイプラインブロックでつなぐだけです。\n\n入力されたアイテムは即座に反対側へ転送されるため、高速で輸送できます。\n\nただし、接続口同士には一定以上の距離が必要なので、近距離の輸送には向きません。", + "quests.tfg_tips.long_distance_fluids.title": "長距離液体パイプ", + "quests.tfg_tips.long_distance_fluids.subtitle": "ウーバードリンク", + "quests.tfg_tips.long_distance_fluids.desc": "&3長距離液体パイプ&r は、液体を遠くまで一瞬で送り届けられる便利な長距離用パイプです。送り元と送り先に接続口を置き、その間をパイプラインブロックでつなげば使えます。\n\n液体は入力側から出力側へ即座に移動するため、高速での輸送が可能です。\n\nただし、接続口同士には一定以上の距離が必要で、近距離の搬送には使えません。\n\nまた、設置時に&4不具合が起きやすい&rと言われています。もし最初に動かなかった場合には、&eレンチ&rで接続口の向きを変えてみると解決することがあります。", + "quests.tfg_tips.crates.title": "GregTechのストレージ", + "quests.tfg_tips.crates.subtitle": "序盤のバッファ", + "quests.tfg_tips.crates.desc": "クレートはチェストの上位互換と言えます。1ブロックのスペースで、多くのアイテムを収納できるのですから、これ以上のものは必要ありませんね！\n\n通常のチェストより素材コストは高く、Createの仕掛けに組み込むことはできませんが、アイテムのサイズに関係なく収納でき、さらにGregTechの&6カバー&rを取り付けることができます。そのため、自動化工程におけるバッファとして最適な選択肢になります。", + "quests.tfg_tips.tape.title": "クレート用テープ", + "quests.tfg_tips.tape.subtitle": "Carry on", + "quests.tfg_tips.tape.desc": "クレートにテープを右クリックで貼り付けると、壊しても中身がそのまま維持されるようになり、簡単に持ち運べるようになります。ただし、テープは使い捨てです。\nテープ自体は簡単につくれるので問題はないでしょう！", + "quests.tfg_tips.terminal.subtitle": "自動マルチブロック組み立て機", + "quests.tfg_tips.terminal.desc": "&bターミナル&rは間違いなく役に立ってくれるため、&a作成することを強くおすすめいたします&r。\n\n&eマルチブロック&rを組み立てるのが、少し&c面倒に思う&rこともあると思います。そんなときはマルチブロックの構成材料を所持した状態で、ターミナルを手に持ち、&6マルチブロックコントローラー&rを&dShift+右クリック&rするだけで、&a構造全体を自動で組み上げてくれます&r！\n\n&eバスやハッチを配置し直す&r必要はあるかもしれませんが、とはいえこの機能を活用すれば&aかなりの時間と手間を節約&rできます。", + "quests.tfg_tips.memory_card.subtitle": "コピー＆ペースト", + "quests.tfg_tips.memory_card.desc": "大量の機械で&a並列化した構成&rを作ろうとすると、各機械ごとに&e入力&rや&e出力&rをいちいち設定するのが面倒になるでしょう。&dスーパーチェスト&r・&dタンク&rなんかは特に。\n\n必要だと感じたらためらわず使いましょう。", + "quests.tfg_tips.portable_scanner.subtitle": "どしたん？話聞こか？", + "quests.tfg_tips.portable_scanner.desc.1": "&aポータブルスキャナー&r（または&aトリコーダー&r）は、GTCEuにおけるデバッグ用ツールです。\n\nこれを使うと、ブロックの詳細情報、エネルギーネットワークの状況、現在の状態や内部内容、そしてパフォーマンスへの影響まで確認できます。\n\nさらに、&3液体採掘機&rを使う際には、その液体脈にどれだけ液体が残っているかを％表示で確認することもできます。", + "quests.tfg_tips.portable_scanner.desc.2": "&l&3余談：&r&oこの小型で便利な装置はGT5から来たものだよ。当時は、GUIやWAILAから得られる情報がほとんど（というより全く）無かったから、非常に重宝されていました。", + "quests.tfg_tips.duct_tape.subtitle": "テープで直せないものは、たくさんのテープを使いましょう", + "quests.tfg_tips.duct_tape.desc": "多くの&eマルチブロック&rには&6メンテナンスハッチ&rが必要だということに、おそらくお気づきかと思います。&6HV&rに到達して&a自動メンテナンスハッチ&rを入手できるようになるまでは、このアイテムを使うことで、メンテナンスツールを使わずにハッチを修理できます。\n\nまだ&a自動メンテナンスハッチ&rに投資したくない場合や、単純にまだ&cそこに到達していない&r場合には、とても役立つアイテムです。", + "quests.tfg_tips.gt_filters.title": "フィルター", + "quests.tfg_tips.gt_filters.desc": "&5GregTech&rには、&a自動化&rをスムーズに進めるための様々な&6フィルター&rが存在します。これらはすべて、&dカバー&rと組み合わせて使用することができます。（カバーの詳細な説明は&「7LV&r」の章のクエストに載っています。）\n\nここでは、特定の状況で&b便利&rに使える、さらに2種類の特化フィルターをご紹介します。\n\nフィルターを使う場合は、&5機械またはカバーのGUI内で取り付ける&rか、もしくは&6機械やパイプ&rに&dカバー&rとして取り付けることができます。", + "quests.tfg_tips.smart_item_filter.subtitle": "Knock, knock - who's that? It's MENSA!", + "quests.tfg_tips.smart_item_filter.desc.1": "このクエストでは、あなたに&5禁断の知識&r――すなわち、電解槽を簡単に自動化する能力を授けましょう。\n\n&9スマートアイテムフィルター&rは、機械で動作するレシピを認識できるフィルターです。機械の側面に取り付けて「&3電解槽&r」を指定すれば、電解可能なアイテムだけを自動で投入するよう設定できます。そうです、もう手動でフィルタリングする必要はありません！\n\nさらに&aもっと便利&rにすることもできますよ！このフィルターを&aロボットアーム&rと組み合わせると、機械がレシピを成立させるために必要な&6ぴったりの量&rだけを供給するようになってくれます。", + "quests.tfg_tips.smart_item_filter.desc.2": "&aロボットアーム&rを電解槽に取り付け、ロボットアームのGUIを開いて&9スマートフィルター&rをセットします。スマートフィルターが電解槽に設定されていることを確認してくださいね。\n\n次に、動作モードを「&d&lモード：搬入&r」と「&d&l供給モード&r」に設定します。最後に、&aロボットアーム&rを取り付けた側面に、インベントリ（&7チェストなどで十分です&r）を接続してください。これで&6すべて&rの電解槽レシピの処理に対応しました！\n\nでは、&3電解槽&rの排出物はどうしましょう？液体は複数のタンクへ、あるいは進行度次第では&3スーパータンク&rへ流すと良いでしょう。液体を破棄するような方法は極力避けることを強くおすすめいたします。&7.&8.まあ、水なんかは別ですが。", + "quests.tfg_tips.smart_item_filter.desc.3": "&9注意：&rロボットアームのフィルタリング機能を正しく動作させるには、必ずロボットアーム自身がアイテム搬入を担当している必要があります！\n\n機械へ直接アイテムを入れてしまう（&7例：ホッパーなどによる搬入&r）と、ロボットアームの&d供給モード&r設定は無視されてしまいますのでご注意ください。", + "quests.tfg_tips.hazard_materials.title": "危険物", + "quests.tfg_tips.hazard_materials.subtitle": "対象年齢：3歳以上", + "quests.tfg_tips.hazard_materials.desc": "新しいバージョンの&5Gregtech&rでは、&c危険物システム&rが導入されました。&dShift&rを押しながら&c危険物&rにカーソルを合わせると、その物質の影響と原因を確認できます。\n\n&6防護装備&rを正しく使用し、汚染から&c身を守りましょう&r。", + "quests.tfg_tips.face_mask.desc": "&6フェイスマスク&rは、&c有害な粉塵の吸引&rによる健康被害を防いでくれます。比較的&a簡単に作れる&rため、&5ヒ素&rを扱う際などには用意しておきましょう", + "quests.tfg_tips.rubber_gloves.desc": "&6ゴム手袋&rは、見てわかるように&c皮膚接触によって起こる健康被害&rを防いでくれます。作り方は2通りあります。&2TerrafirmaCraft&rを経由する&7時間がかかる手順&rと、&6合金精錬機&rを使った&aとても簡単な方法&rのどちらを選んでも構いません。", + "quests.tfg_tips.hazmat.title": "危険物用スーツ", + "quests.tfg_tips.hazmat.desc": "&6危険物用スーツ&rは、&cどんな危険にも対応できる最高の防護服&rです。&bMV&rまで進めば作成可能になるため、&a身の安全のためにも必ず作っておくことを強くお勧めします&r。", + "quests.tfg_tips.armor.title": "GregTech - パワードスーツ", + "quests.tfg_tips.armor.desc": "&5GregTech&rには専用のハイテクな装備が存在します。これまで使ってきた7金属の鎧&rもたしかにイカしていますが、工業化が進み&b新たな技術を得た&r今、その技術の粋を結集した&aパワードスーツ&rの開発に乗り出すこともできます。\n\n最初のモデルは&6HV&rに到達すると作成可能になり、そこらへんの防具を大きく上回る防御性能を持ちます。また、地球環境の厳しさに耐えるための&e高い断熱性能&rを備え、必要に応じて&dジェットパック&rを追加して機能拡張することもできます。\n\n2つ目のモデルは大幅に進んだ段階、すなわち &1IV&rや&dLuV&rに達した頃に解禁されます。このモデルでは、&3酸素&rを利用することで&9宇宙空間での呼吸&rさえ可能になります。", "quests.tfg_tips.terrafirmacraft.title": "TerraFirmaCraftの追加要素", "quests.tfg_tips.terrafirmacraft.subtitle": "ModPackの名前の3分の2", "quests.tfg_tips.terrafirmacraft.desc": "&3TerraFirmaCraft&rは、&2TerraFirmaGreg&rの主要なmodの1つです。\nここでは主に、そのサバイバルに関するものと、TFCの&dアドオン&rに関するものに焦点を当てています。", @@ -3894,6 +4113,10 @@ "quests.tfg_tips.hiking.subtitle": "登山用の靴", "quests.tfg_tips.hiking.desc": "&d登山靴&rを使用すると、世界をより楽に探索できます！\n&d登山靴&rを履けば、背の高い草むらも抵抗なく通り抜けることができます。\nさらに、&d登山靴&rのティアが上がるごとに、&9防御力&r、&9歩行速度&r、&9落下耐性&r、そしてその他の能力も強化されていきます。", "quests.tfg_tips.hiking.task": "任意の登山靴", + "quests.tfg_tips.feeding_troughs.title": "給餌箱", + "quests.tfg_tips.feeding_troughs.subtitle": "規則正しい牧場", + "quests.tfg_tips.feeding_troughs.desc": "給餌箱（別名Grooming Stations）は、動物に毎朝自動で餌を与える便利な仕組みです。繁殖を望まない場合には、親密度が最大の動物には給餌しない設定にもできます。\n\nティアが上がるほど、対応できる範囲が広くなり、より多くの動物を管理できます。\n\n&3&lTip：&r&o柵のすぐそばに設置すると、動物がそこを足場にして脱走を試みることがあるため、少し距離を置いて設置することを推奨します。", + "quests.tfg_tips.feeding_troughs.task": "Any feeding trough", "quests.tfg_tips.glassblowing.title": "ガラス吹き", "quests.tfg_tips.glassblowing.subtitle": "リアルなガラス細工体験！", "quests.tfg_tips.glassblowing.desc": "&dガラス板&rや&dガラスブロック&rを作るには、&3ガラス吹き&r道具一式の準備が必要です。\n\n&3ガラス吹き&rには、&a吹き竿&rと、熱したガラスを注ぐためのガラス吹き用のブロックで作られた台座が必要です。\n台座の形状と有効なブロックの詳細については、&2フィールドガイド&rを参照してください。&a真鍮&rを成形できるようになったらすぐに、ガラス吹きが可能になります！", @@ -4138,7 +4361,7 @@ "quests.tfg_tips.find_latex_tree.desc": "&aラテックス&rを採ることができるゴムの木は、大量の降雨がある&2温暖な&r地域で見つけることができます。\n抽出した&bラテックス&rは、&d粘性樹脂&rと&d加硫処理ラテックス&rの2つの使い道があります。後者は、&3ゴム&rや&aゴム手袋&rの製造に使用されます。ゴム手袋は&4有毒物質&rとの接触時に保護してくれます。\n\nこのクエストを完了するには、&o#tfg:latex_logs&rのタグが付いたブロックを&c見る&r必要があります。EMIを使用して、#を入れて検索することにより、どのブロックにこのタグが付いているかを知ることができます。", "quests.tfg_tips.find_syrup_tree.title": "シロップの木", "quests.tfg_tips.find_syrup_tree.subtitle": "甘い匂いに誘われた", - "quests.tfg_tips.find_syrup_tree.desc": "&aシロップの木&rは、それなりの降水量がある&2温暖な&r地域で見つけることができます。\n抽出した&bシロップ&rは、&dツリーシュガー&rを作るために使用できます。これは、砂糖の代替品です。\n\nこのクエストを完了するには、&o#tfg:syrup_logs&rのタグが付いたブロックを&c見る&r必要があります。EMIを使用して、#を入れて検索することにより、どのブロックにこのタグが付いているかを知ることができます。", + "quests.tfg_tips.find_syrup_tree.desc": "&aシロップの木&rは、それなりの降水量がある&2温帯&r地域で見つけることができます。\n抽出した&bシロップ&rは、&dツリーシュガー&rを作るために使用できます。これは、砂糖の代替品です。\n\nこのクエストを完了するには、&o#tfg:syrup_logs&rのタグが付いたブロックを&c見る&r必要があります。EMIを使用して、#を入れて検索することにより、どのブロックにこのタグが付いているかを知ることができます。", "quests.tfg_tips.create_conifer_rosin.title": "針葉樹脂", "quests.tfg_tips.create_conifer_rosin.subtitle": "「故郷」を思い出す", "quests.tfg_tips.create_conifer_rosin.desc": "&d針葉樹脂&rは&bワックス&rとして利用でき、ろうそくやその他のアイテムを作成できます。\n\n針葉樹脂を作るには、&a針葉樹液&rと&a木炭の粉&rを&3鍋や釜&rに入れて加熱する必要があります。", @@ -4151,7 +4374,7 @@ "quests.tfg_tips.create_tree_sugar.task": "メープルまたはバーチシュガー", "quests.tfg_tips.create_rubber_ingot.title": "ゴムインゴット", "quests.tfg_tips.create_rubber_ingot.subtitle": "太陽の神のインゴット", - "quests.tfg_tips.create_rubber_ingot.desc": "&bVacuum_Chamber&rの加熱クラフトなどの様々な工程を経て、&aラテックス&rは&d粗ゴムパルプ&rに加工することができます。\n3つの&d粗ゴムパルプ&rを&b合金精錬炉&rで&e硫黄粉末&rと混ぜることで、&dゴムインゴット&rを作成できます。\nこれは、ケーブルの絶縁に最適であり、&2先進時代&r以降に進むために非常に必要になります...", + "quests.tfg_tips.create_rubber_ingot.desc": "&bVacuum_Chamber&rの加熱クラフトなどの様々な工程を経て、&aラテックス&rは&d粗ゴムパルプ&rに加工することができます。\n3つの&d粗ゴムパルプ&rを&b合金精錬炉&rで&e硫黄粉末&rと混ぜることで、&dゴムインゴット&rを作成できます。\nこれは、ケーブルの絶縁に最適であり、&2先進時代&r以降において非常に重要な素材になります...\n\n&9Tip：&r先に進むにつれて、低コストかつ効率的に作るための手段が次々と開放されていきます。詳しくは随時EMIを確認するとよいでしょう。ゴムは今後ずっと使い続ける重要素材なので、早めに自動化しておくと本当に楽になります。", "quests.tfg_tips.transportation.title": "移動手段", "quests.tfg_tips.transportation.subtitle": "この広い地上を旅するために", "quests.tfg_tips.transportation.desc": "世界は非常に広大であり、生存と進歩のための資源を求めて、あなたは遠くまで旅することになるかもしれません。\nここでは、さまざまな移動手段について説明します。", @@ -4159,8 +4382,8 @@ "quests.tfg_tips.glider.subtitle": "ブレスオブザワイルドが見える！", "quests.tfg_tips.glider.desc": "&dHang_Glider&rを使えば、滑空することができます。&c高く飛び上がることはできません&rが、高所から飛び立てば、長距離を移動するのにも役立つでしょう。\n&bジェットパック&rとの相性も抜群です！", "quests.tfg_tips.reinforced_glider.title": "強化グライダー", - "quests.tfg_tips.reinforced_glider.subtitle": "エリトラはお好きですか...？", - "quests.tfg_tips.reinforced_glider.desc": "&5EV&r時代に到達すると作れるようになる&aエリトラ&rを&aハンググライダー&rと組み合わせることで、&d強化グライダー&rを作ることができます。\nこれは耐久性が高く、最高速度も上昇しています。", + "quests.tfg_tips.reinforced_glider.subtitle": "羽根のように軽い！", + "quests.tfg_tips.reinforced_glider.desc": "&d強化グライダー&rは、標準の&aハンググライダー&rを大幅に強化した上位版です。&aアルミニウム&rフレームを採用し、布地に &a強化布&rまたは&a軽量の生地&rを使うことで、通常の2倍の速度で滑空できるようになっています。さらに耐久力も向上しており、組立機で修理が可能なため、長期間使い続けられます。\n\n&3Protip：&r\n&4Beneath&rで手に入る&a絹の布&rや&aファントムの布&rを使うと、作成・修理のどちらも必要な布の量が&e3分の1に減り&r、とても経済的です。\n&6HV&rに到達すれば、&aポリカプロラクタム製の布&rも利用できるようになります。", "quests.tfg_tips.immersive_aircraft.title": "Immersive Aircraft", "quests.tfg_tips.immersive_aircraft.subtitle": "さあ、大空を翔けよう。", "quests.tfg_tips.immersive_aircraft.desc": "&2Immersive_Aircraft&rは航空機に関するModであり、空を飛び、長距離を移動できます。", diff --git a/kubejs/assets/tfg/lang/pt_br.json b/kubejs/assets/tfg/lang/pt_br.json index 1a0a0f1b9..d2366efae 100644 --- a/kubejs/assets/tfg/lang/pt_br.json +++ b/kubejs/assets/tfg/lang/pt_br.json @@ -1827,16 +1827,16 @@ "quests.steam_age.horse_crank.title": "Sua Primeira Fonte de Energia", "quests.steam_age.horse_crank.subtitle": "Hora de fazer o gado pagar o aluguel", "quests.steam_age.horse_crank.desc.1": "A &3Manivela de Tração&r é sua primeira fonte viável de energia mecânica. Para usá-la, coloque a manivela no centro de uma área limpa de 7x7 blocos e prenda um animal a ela. Diferentes animais geram diferentes quantidades de energia, e os blocos sob eles afetam a velocidade da rotação. Manivelas próximas podem compartilhar parte da área de atuação.\n\nTalvez você precise segurar uma segunda corda na hora de prender o animal.", - "quests.steam_age.horse_crank.desc.2": "&3Animais Pequenos (4 SU):&r\nLobo, Cachorro, Porco, Ovelha, Cabra, Alpaca\n\n&3Animais Médios (6 SU):&r\nVaca, Burro\n\n&3Animais Grandes (8 SU):&r\nCavalo, Mula, Boi-Almiscarado, Iaque", + "quests.steam_age.horse_crank.desc.2": "&3Animais Pequenos (8 SU):&r\nLobo, Cachorro, Porco, Ovelha, Cabra, Alpaca\n\n&3Animais Médios (12 SU):&r\nVaca, Burro\n\n&3Animais Grandes (16 SU):&r\nCavalo, Mula, Boi-Almiscarado, Iaque", "quests.steam_age.poor_paths.title": "Caminhos Ruins", "quests.steam_age.poor_paths.subtitle": "Isso é só terra mesmo", - "quests.steam_age.poor_paths.desc": "Esse é o pior tipo de estrada possível. A manivela vai girar a 2 RPM aqui.", + "quests.steam_age.poor_paths.desc": "Esse é o pior tipo de estrada possível. A manivela vai girar a 8 RPM aqui.", "quests.steam_age.normal_paths.title": "Caminhos Médios", "quests.steam_age.normal_paths.subtitle": "Pelo menos você tentou...", - "quests.steam_age.normal_paths.desc": "Caminhos médios são um pouco melhores e permitem que os animais girem a manivela a 4 RPM.\n\nNota: Não é possível ter um bloco de Caminho de Terra diretamente sob a manivela, então use Cascalho nesse ponto.", + "quests.steam_age.normal_paths.desc": "Caminhos médios são um pouco melhores e permitem que os animais girem a manivela a 16 RPM.\n\nNota: Não é possível ter um bloco de Caminho de Terra diretamente sob a manivela, então use Cascalho nesse ponto.", "quests.steam_age.good_paths.title": "Caminhos Bons", "quests.steam_age.good_paths.subtitle": "Nem precisa de ferradura!", - "quests.steam_age.good_paths.desc": "Esses são os melhores caminhos disponíveis, permitindo que a manivela gire a 8 RPM. Também aumentam a velocidade de movimento do jogador, então são ótimos para pavimentar sua base!", + "quests.steam_age.good_paths.desc": "Esses são os melhores caminhos disponíveis, permitindo que a manivela gire a 32 RPM. Também aumentam a velocidade de movimento do jogador, então são ótimos para pavimentar sua base!", "quests.steam_age.helve_hammer.title": "Martinete", "quests.steam_age.helve_hammer.subtitle": "CLANG... CLANG... CLANG...", "quests.steam_age.helve_hammer.desc": "Está cansado de fazer placas para a Forja Catalã? O &3Martinete&r achata lingotes duplos automaticamente (mas lentamente) em placas. Você ainda terá que fazer as soldagens manualmente. Coloque uma bigorna sob o martinete, jogue os lingotes sobre ela e clique com o botão direito no martinete para pegar as placas.\n\nBigornas de nível superior exigem menos batidas para formar placas do nível anterior.", diff --git a/kubejs/assets/tfg/lang/ru_ru.json b/kubejs/assets/tfg/lang/ru_ru.json index 78cd12896..1b2b2cb5e 100644 --- a/kubejs/assets/tfg/lang/ru_ru.json +++ b/kubejs/assets/tfg/lang/ru_ru.json @@ -458,40 +458,40 @@ "block.tfg.mv_aqueous_accumulator": "§bУлучшенный жидкостный коллектор§r", "block.tfg.hv_aqueous_accumulator": "§6Улучшенный жидкостный коллектор II§r", "block.tfg.ev_aqueous_accumulator": "§5Улучшенный жидкостный коллектор III§r", - "block.tfg.iv_aqueous_accumulator": "§9Elite Aqueous Accumulator§r", - "block.tfg.luv_aqueous_accumulator": "§dElite Aqueous Accumulator II§r", - "block.tfg.zpm_aqueous_accumulator": "§cElite Aqueous Accumulator III§r", - "block.tfg.uv_aqueous_accumulator": "§3Ultimate Aqueous Accumulator§r", + "block.tfg.iv_aqueous_accumulator": "§9Превосходный жидкостный коллектор§r", + "block.tfg.luv_aqueous_accumulator": "§dПревосходный жидкостный коллектор II§r", + "block.tfg.zpm_aqueous_accumulator": "§cПревосходный жидкостный коллектор III§r", + "block.tfg.uv_aqueous_accumulator": "§3Безупречный жидкостный коллектор§r", "block.tfg.electric_greenhouse": "Электротеплица", - "block.tfg.lv_food_processor": "Basic Food Processor", - "block.tfg.mv_food_processor": "§bAdvanced Food Processor§r", - "block.tfg.hv_food_processor": "§6Advanced Food Processor II§r", - "block.tfg.ev_food_processor": "§5Advanced Food Processor III§r", - "block.tfg.iv_food_processor": "§9Elite Food Processor§r", - "block.tfg.luv_food_processor": "§dElite Food Processor II§r", - "block.tfg.zpm_food_processor": "§cElite Food Processor III§r", - "block.tfg.uv_food_processor": "§3Ultimate Food Processor§r", - "block.tfg.lv_food_oven": "Basic Electric Oven", - "block.tfg.mv_food_oven": "§bAdvanced Electric Oven§r", - "block.tfg.hv_food_oven": "§6Advanced Electric Oven II§r", - "block.tfg.ev_food_oven": "§5Advanced Electric Oven III§r", - "block.tfg.iv_food_oven": "§9Elite Electric Oven§r", - "block.tfg.luv_food_oven": "§dElite Electric Oven II§r", - "block.tfg.zpm_food_oven": "§cElite Electric Oven III§r", - "block.tfg.uv_food_oven": "§3Ultimate Electric Oven§r", - "block.tfg.lv_food_refrigerator": "Basic Refrigerator", - "block.tfg.mv_food_refrigerator": "§bAdvanced Refrigerator", - "block.tfg.hv_food_refrigerator": "§6Advanced Refrigerator II§r", - "block.tfg.ev_food_refrigerator": "§5Advanced Refrigerator III§r", - "block.tfg.iv_food_refrigerator": "§9Elite Refrigerator§r", - "block.tfg.lv_gas_pressurizer": "Basic Gas Pressurizer", - "block.tfg.mv_gas_pressurizer": "§bAdvanced Gas Pressurizer§r", - "block.tfg.hv_gas_pressurizer": "§6Advanced Gas Pressurizer II§r", - "block.tfg.ev_gas_pressurizer": "§5Advanced Gas Pressurizer III§r", - "block.tfg.iv_gas_pressurizer": "§9Elite Gas Pressurizer§r", - "block.tfg.luv_gas_pressurizer": "§dElite Gas Pressurizer II§r", - "block.tfg.zpm_gas_pressurizer": "§cElite Gas Pressurizer III§r", - "block.tfg.uv_gas_pressurizer": "§3Ultimate Gas Pressurizer§r", + "block.tfg.lv_food_processor": "Обычный кухонный комбайн", + "block.tfg.mv_food_processor": "§bУлучшенный кухонный комбайн§r", + "block.tfg.hv_food_processor": "§6Улучшенный кухонный комбайн II§r", + "block.tfg.ev_food_processor": "§5Улучшенный кухонный комбайн III§r", + "block.tfg.iv_food_processor": "§9Превосходный кухонный комбайн§r", + "block.tfg.luv_food_processor": "§dПревосходный кухонный комбайн II§r", + "block.tfg.zpm_food_processor": "§cПревосходный кухонный комбайн III§r", + "block.tfg.uv_food_processor": "§3Безупречный кухонный комбайн§r", + "block.tfg.lv_food_oven": "Обычная электрическая духовка", + "block.tfg.mv_food_oven": "§bУлучшенная электрическая духовка§r", + "block.tfg.hv_food_oven": "§6Улучшенная электрическая духовка II§r", + "block.tfg.ev_food_oven": "§5Улучшенная электрическая духовка III§r", + "block.tfg.iv_food_oven": "§9Превосходная электрическая духовка§r", + "block.tfg.luv_food_oven": "§dПревосходная электрическая духовка II§r", + "block.tfg.zpm_food_oven": "§cПревосходная электрическая духовка III§r", + "block.tfg.uv_food_oven": "§3Безупречная электрическая духовка§r", + "block.tfg.lv_food_refrigerator": "Обычный холодильник", + "block.tfg.mv_food_refrigerator": "§bУлучшенный холодильник", + "block.tfg.hv_food_refrigerator": "§6Улучшенный холодильник II§r", + "block.tfg.ev_food_refrigerator": "§5Улучшенный холодильник III§r", + "block.tfg.iv_food_refrigerator": "§9Превосходный холодильник§r", + "block.tfg.lv_gas_pressurizer": "Обычный газовый компрессор", + "block.tfg.mv_gas_pressurizer": "§bУлучшенный газовый компрессор§r", + "block.tfg.hv_gas_pressurizer": "§6Улучшенный газовый компрессор II§r", + "block.tfg.ev_gas_pressurizer": "§5Улучшенный газовый компрессор III§r", + "block.tfg.iv_gas_pressurizer": "§9Превосходный газовый компрессор§r", + "block.tfg.luv_gas_pressurizer": "§dПревосходный газовый компрессор II§r", + "block.tfg.zpm_gas_pressurizer": "§cПревосходный газовый компрессор III§r", + "block.tfg.uv_gas_pressurizer": "§3Безупречный газовый компрессор§r", "block.tfg.fluid.semiheavy_ammoniacal_water": "Полутяжёлая аммиачная вода", "block.tfg.fluid.sulfur_fumes": "Пары серы", "block.tfg.fluid.geyser_slurry": "Метастабильный шлам", @@ -523,34 +523,34 @@ "block.tfg.groundcover.alphacene_stick": "Веточка альфаценового гриба", "block.tfg.mars_ice": "Полутяжёлый аммиачный лёд", "block.tfg.mars_icicle": "Полутяжёлая аммиачная сосулька", - "block.tfg.electromagnetic_accelerator": "Electromagnetic Accelerator", - "block.tfg.superconductor_coil_large": "Large Superconductor Coil", - "block.tfg.superconductor_coil_small": "Small Superconductor Coil", - "block.tfg.interplanetary_item_launcher": "Interplanetary Railgun", - "block.tfg.interplanetary_item_receiver": "Interplanetary Receiver", - "block.tfg.interplanetary_logistics_monitor": "Interplanetary Logistics Monitor", - "block.tfg.railgun_ammo_loader": "Railgun Ammo Loader", - "block.tfg.ulv_railgun_item_loader_in": "§8ULV Interplanetary Railgun Input Bus§r", - "block.tfg.lv_railgun_item_loader_in": "§7LV Interplanetary Railgun Input Bus§r", - "block.tfg.mv_railgun_item_loader_in": "§bMV Interplanetary Railgun Input Bus§r", - "block.tfg.hv_railgun_item_loader_in": "§6HV Interplanetary Railgun Input Bus§r", - "block.tfg.ev_railgun_item_loader_in": "§5EV Interplanetary Railgun Input Bus§r", - "block.tfg.iv_railgun_item_loader_in": "§9IV Interplanetary Railgun Input Bus§r", - "block.tfg.luv_railgun_item_loader_in": "§dLuV Interplanetary Railgun Input Bus§r", - "block.tfg.zpm_railgun_item_loader_in": "§cZPM Interplanetary Railgun Input Bus§r", - "block.tfg.uv_railgun_item_loader_in": "§3UV Interplanetary Railgun Input Bus§r", - "block.tfg.uhv_railgun_item_loader_in": "§4UHV Interplanetary Railgun Input Bus§r", - "block.tfg.ulv_railgun_item_loader_out": "§8ULV Interplanetary Railgun Output Bus§r", - "block.tfg.lv_railgun_item_loader_out": "§7LV Interplanetary Railgun Output Bus§r", - "block.tfg.mv_railgun_item_loader_out": "§bMV Interplanetary Railgun Output Bus§r", - "block.tfg.hv_railgun_item_loader_out": "§6HV Interplanetary Railgun Output Bus§r", - "block.tfg.ev_railgun_item_loader_out": "§5EV Interplanetary Railgun Output Bus§r", - "block.tfg.iv_railgun_item_loader_out": "§9IV Interplanetary Railgun Output Bus§r", - "block.tfg.luv_railgun_item_loader_out": "§dLuV Interplanetary Railgun Output Bus§r", - "block.tfg.zpm_railgun_item_loader_out": "§cZPM Interplanetary Railgun Output Bus§r", - "block.tfg.uv_railgun_item_loader_out": "§3UV Interplanetary Railgun Output Bus§r", - "block.tfg.uhv_railgun_item_loader_out": "§4UHV Interplanetary Railgun Output Bus§r", - "block.tfg.reflector": "Reflector Block", + "block.tfg.electromagnetic_accelerator": "Электромагнитый ускоритель", + "block.tfg.superconductor_coil_large": "Большая сверхпроводящая катушка", + "block.tfg.superconductor_coil_small": "Маленькая сверхпроводящая катушка", + "block.tfg.interplanetary_item_launcher": "Межпланетный рельсотрон", + "block.tfg.interplanetary_item_receiver": "Межпланетный приемник", + "block.tfg.interplanetary_logistics_monitor": "Межпланетный логистический монитор", + "block.tfg.railgun_ammo_loader": "Загрузчик патронов рельсотрона", + "block.tfg.ulv_railgun_item_loader_in": "§8Входной люк межпланетного рельсотрона(ULV)§r", + "block.tfg.lv_railgun_item_loader_in": "§7Входной люк межпланетного рельсотрона(LV)§r", + "block.tfg.mv_railgun_item_loader_in": "§bВходной люк межпланетного рельсотрона(MV)§r", + "block.tfg.hv_railgun_item_loader_in": "§6Входной люк межпланетного рельсотрона(HV)§r", + "block.tfg.ev_railgun_item_loader_in": "§5Входной люк межпланетного рельсотрона(EV)§r", + "block.tfg.iv_railgun_item_loader_in": "§9Входной люк межпланетного рельсотрона(IV)§r", + "block.tfg.luv_railgun_item_loader_in": "§dВходной люк межпланетного рельсотрона(LuV)§r", + "block.tfg.zpm_railgun_item_loader_in": "§cВходной люк межпланетного рельсотрона(ZPM)§r", + "block.tfg.uv_railgun_item_loader_in": "§3Входной люк межпланетного рельсотрона(UV)§r", + "block.tfg.uhv_railgun_item_loader_in": "§4Входной люк межпланетного рельсотрона(UHV)§r", + "block.tfg.ulv_railgun_item_loader_out": "§8Выходной люк межпланетного рельсотрона(ULV)§r", + "block.tfg.lv_railgun_item_loader_out": "§7Выходной люк межпланетного рельсотрона(LV)§r", + "block.tfg.mv_railgun_item_loader_out": "§bВыходной люк межпланетного рельсотрона(MV)§r", + "block.tfg.hv_railgun_item_loader_out": "§6Выходной люк межпланетного рельсотрона(HV)§r", + "block.tfg.ev_railgun_item_loader_out": "§5Выходной люк межпланетного рельсотрона(EV)§r", + "block.tfg.iv_railgun_item_loader_out": "§9Выходной люк межпланетного рельсотрона(IV)§r", + "block.tfg.luv_railgun_item_loader_out": "§dВыходной люк межпланетного рельсотрона(LuV)§r", + "block.tfg.zpm_railgun_item_loader_out": "§cВыходной люк межпланетного рельсотрона(ZPM)§r", + "block.tfg.uv_railgun_item_loader_out": "§3Выходной люк межпланетного рельсотрона(UV)§r", + "block.tfg.uhv_railgun_item_loader_out": "§4Выходной люк межпланетного рельсотрона(UHV)§r", + "block.tfg.reflector": "Блок отражателя", "block.tfg.sunflower": "Подсолнух", "block.tfg.sunflower_wild": "Дикорастущий подсолнух", "block.tfg.sunflower_dead": "Погибший подсолнух", @@ -560,23 +560,23 @@ "block.tfg.flax": "Лён", "block.tfg.flax_wild": "Дикорастущий лён", "block.tfg.flax_dead": "Погибший лён", - "block.tfg.casings.machine_casing_iron_desh": "Desh Machine Casing", - "block.tfg.casings.machine_casing_stainless_evaporation": "Stainless Evaporation Machine Casing", - "block.tfg.casings.machine_casing_vacuum_engine_intake": "Vacuum Engine Intake Machine Casing", - "block.tfg.casings.machine_casing_mars": "Robust Dust-Proof Machine Casing", - "block.tfg.casings.machine_casing_blue_solar_panel": "Basic Solar Panel Casing", - "block.tfg.casings.machine_casing_green_solar_panel": "Advanced Solar Panel Casing", - "block.tfg.casings.machine_casing_red_solar_panel": "Elite Solar Panel Casing", - "block.tfg.machine_casing_aluminium_plated_steel": "Aluminium Plated Steel Machine Casing", - "block.tfg.casings.machine_casing_ultraviolet": "§dUltraviolet §fMachine Casing", - "block.tfg.casings.machine_casing_bioculture": "Bioculture Machine Casing", - "block.tfg.casings.machine_casing_bioculture_glass": "Bioculture Glass", - "block.tfg.casings.bioculture_rotor_primary": "Primary Bioculture Rotor", - "block.tfg.casings.bioculture_rotor_secondary": "Secondary Bioculture Rotor", - "block.tfg.casings.machine_casing_ostrum_carbon": "Ostrum Machine Casing", - "block.tfg.casings.heat_pipe_casing": "Heat Pipe Casing", - "block.tfg.glacian_wool_frame": "Framed Glacian Wool", - "block.tfg.aes_insulation_frame": "Framed AES Insulation", + "block.tfg.casings.machine_casing_iron_desh": "Корпус из деша", + "block.tfg.casings.machine_casing_stainless_evaporation": "Нержавеющий корпус испарительных машин", + "block.tfg.casings.machine_casing_vacuum_engine_intake": "Корпус вакуумного впускного механизма двигателя", + "block.tfg.casings.machine_casing_mars": "Крепкий пылезащищенный корпус", + "block.tfg.casings.machine_casing_blue_solar_panel": "Корпус для обычных солнечных панелей", + "block.tfg.casings.machine_casing_green_solar_panel": "Корпус для улучшенных солнечных панелей", + "block.tfg.casings.machine_casing_red_solar_panel": "Корпус для превосходных солнечных панелей", + "block.tfg.machine_casing_aluminium_plated_steel": "Обитый алюминием стальной корпус", + "block.tfg.casings.machine_casing_ultraviolet": "§dУльтрафиолетовый§f корпус", + "block.tfg.casings.machine_casing_bioculture": "Биокультурный лабораторный корпус", + "block.tfg.casings.machine_casing_bioculture_glass": "Биокультурное лабораторное стекло", + "block.tfg.casings.bioculture_rotor_primary": "Основной биокультурный лабораторный ротор", + "block.tfg.casings.bioculture_rotor_secondary": "Дополнительный биокультурный лабораторный ротор", + "block.tfg.casings.machine_casing_ostrum_carbon": "Острумный корпус", + "block.tfg.casings.heat_pipe_casing": "Теплопроводный корпус", + "block.tfg.glacian_wool_frame": "Гласианская шерсть в каркасе", + "block.tfg.aes_insulation_frame": "ЩЗС-изоляция в каркасе", "block.tfg.sand.fluorapatite.blue": "Синий фторапатитный песок", "block.tfg.sandstone.raw.fluorapatite.blue": "Синий фторапатитный песчаник", "block.tfg.sandstone.wall.raw.fluorapatite.blue": "Ограда из синего фторапатитного песчаника", @@ -653,17 +653,17 @@ "block.tfg.titanium_concrete_bricks": "Кирпичи из бетона на титановых арматурных стержнях", "block.tfg.titanium_concrete_bricks_small": "Маленькие кирпичи из бетона на титановых арматурных стержнях", "block.tfg.titanium_concrete_bricks_square": "Квадратные кирпичи из бетона на титановых арматурных стержнях", - "block.tfg.nuclear_turbine": "Nuclear Steam Turbine", - "block.tfg.evaporation_tower": "Evaporation Tower", - "block.tfg.cooling_tower": "Nuclear Cooling Tower", - "block.tfg.growth_monitor": "Growth Monitor", + "block.tfg.nuclear_turbine": "Ядерная паровая турбина", + "block.tfg.evaporation_tower": "Испарительная колонна", + "block.tfg.cooling_tower": "Градирня ядерного охлаждения", + "block.tfg.growth_monitor": "Монитор роста", "block.tfg.sample_rack": "Стойка для образцов", "block.tfg.casings.machine_casing_sterilizing_pipes": "Стерилизующие трубы", - "fluid.tfg.heavy_ammoniacal_water": "Heavy Ammoniacal Water", + "fluid.tfg.heavy_ammoniacal_water": "Тяжёлая аммиачная вода", "fluid.tfg.semiheavy_ammoniacal_water": "Полутяжёлая аммиачная вода", "fluid.tfg.sulfur_fumes": "Пары серы", "fluid.tfg.geyser_slurry": "Метастабильный шлам", - "fluid.tfg.cryogenized_fluix": "Cryogenized Fluix", + "fluid.tfg.cryogenized_fluix": "Криогенный флюис", "item.tfg.antipoison_pill": "Пилюля противоядия", "item.tfg.haste_pill": "Пилюля спешки", "item.tfg.night_vision_pill": "Пилюля ночного зрения", @@ -959,27 +959,27 @@ "item.tfg.dirty_dna_syringe": "Грязный шприц", "item.tfg.clean_dna_syringe": "Чистый шприц", "item.tfg.stainless_steel_needle": "Игла из нержавеющей стали", - "item.tfg.empty_rod": "Empty Fissile Fuel Rod", - "item.tfg.thorium_rod": "Thorium Fuel Rod", - "item.tfg.uranium_rod": "Uranium Fuel Rod", - "item.tfg.plutonium_rod": "Plutonium Fuel Rod", - "item.tfg.tbu_232_rod": "TBU-232 Fuel Rod", - "item.tfg.refrigerant_pellet": "Refrigerant Pellet", - "item.tfg.graphite_compound": "Graphite Compound", - "item.tfg.raw_graphite_briquette": "Raw Graphite Briquette", - "item.tfg.faulty_graphite_briquette": "Faulty Graphite Briquette", - "item.tfg.washed_graphite_briquette": "Washed Graphite Briquette", - "item.tfg.pure_graphite_rod": "Pure Graphite Rod", - "item.tfg.impure_graphite_rod": "Impure Graphite Rod", - "item.tfg.annealed_graphite_rod": "Annealed Graphite Rod", - "item.tfg.impure_annealed_graphite_row": "Impure Annealed Graphite Rod", - "item.tfg.moderate_core": "Moderate Core", - "item.tfg.impure_moderate_core": "Impure Moderate Core", - "item.tfg.moderate_core_frame": "Moderate Core Frame", - "item.tfg.impure_moderate_core_frame": "Impure Moderate Core Frame", - "item.tfg.graphite_moderator": "Graphite Moderator", - "item.tfg.impure_graphite_moderator": "Impure Graphite Moderator", - "item.tfg.advanced_polymer_binder": "Advanced Polymer Binder", + "item.tfg.empty_rod": "Пустой топливный стержень", + "item.tfg.thorium_rod": "Ториевый топливный стержень", + "item.tfg.uranium_rod": "Ураниевый топливный стержень", + "item.tfg.plutonium_rod": "Плутоневый топливный стержень", + "item.tfg.tbu_232_rod": "Ториево-ураниевый (TBU-232) топливный стержень", + "item.tfg.refrigerant_pellet": "Охлаждающая гранула", + "item.tfg.graphite_compound": "Графитовый компаунд", + "item.tfg.raw_graphite_briquette": "Брикет из необработанного графита", + "item.tfg.faulty_graphite_briquette": "Бракованный графитовый брикет", + "item.tfg.washed_graphite_briquette": "Брикет из промытого графита", + "item.tfg.pure_graphite_rod": "Стержень из чистого графита", + "item.tfg.impure_graphite_rod": "Стержень из нечистого графита", + "item.tfg.annealed_graphite_rod": "Отожженный графитовый стержень", + "item.tfg.impure_annealed_graphite_row": "Нечистый отожженный графитовый стержень", + "item.tfg.moderate_core": "Стабилизирующее ядро", + "item.tfg.impure_moderate_core": "Нечистый стабилизирующее ядро", + "item.tfg.moderate_core_frame": "Каркас с стабилизирующее ядром", + "item.tfg.impure_moderate_core_frame": "Каркас с нечистым стабилизирующее ядром", + "item.tfg.graphite_moderator": "Графитный стабилизатор", + "item.tfg.impure_graphite_moderator": "Нечистый графитный стабилизатор", + "item.tfg.advanced_polymer_binder": "Усовершенствованное полимерное связующее", "item.tfg.beaker": "Химический стакан", "item.tfg.beaker.filled": "Химический стакан (%s)", "item.tfg.flask": "Колба", @@ -1011,7 +1011,7 @@ "item.tfg.bell_casting_mold": "Отливная форма (Колокол)", "material.tfg.latex": "Латекс", "material.tfg.vulcanized_latex": "Вулканический латекс", - "material.tfg.fluix": "Флакс", + "material.tfg.fluix": "Флюис", "material.tfg.conifer_pitch": "Хвойная смола", "material.gtceu.lactose": "Лактоза", "material.tfg.gabbro": "Габбро", @@ -1037,61 +1037,61 @@ "material.gtceu.thermochemically_treated_hardwood": "Термохимически обработанная твёрдая древесина", "material.gtceu.hardwood": "Твёрдая древесина", "material.gtceu.asurine": "Азурин", - "material.gtceu.ochrum": "Ochrum", - "material.gtceu.veridium": "Veridium", - "material.gtceu.crimsite": "Crimsite", - "material.gtceu.scoria": "Scoria", - "material.gtceu.scorchia": "Scorchia", + "material.gtceu.ochrum": "Охрум", + "material.gtceu.veridium": "Веридий", + "material.gtceu.crimsite": "Кримит", + "material.gtceu.scoria": "Пепел", + "material.gtceu.scorchia": "Тёмный пепел", "material.tfg.kaolinite": "Каолинит", - "material.tfg.vitrified_pearl": "Vitrified Ender", - "material.tfg.aes_mix": "Alkaline Earth Silicate Mixture", - "material.tfg.molten_aes": "Molten Alkaline Earth Silicate", - "material.tfg.compressed_nitrox": "Compressed Nitrox", - "material.tfg.compressed_heliox": "Compressed Heliox", - "material.tfg.compressed_heliox_3": "Compressed Heliox-3", - "material.tfg.compressed_trimix": "Compressed 50/30/20 Trimix", - "material.tfg.compressed_trimix_3": "Compressed 50/30/20 Trimix-3", - "material.tfg.chlorodifluoromethane": "Chlorodifluoromethane", - "material.tfg.acetylene": "Acetylene", - "material.tfg.1_1_1_2_tetrafluoroethane": "1,1,1,2-Tetrafluoroethane", - "material.tfg.isobutane": "Isobutane", - "material.tfg.chloryl_fluoride": "Chloryl Fluoride", - "material.tfg.chlorine_pentafluoride": "Chlorine Pentafluoride", - "material.tfg.solar_coolant": "Solar Coolant", - "material.tfg.solar_coolant_tier2": "Aerospatial Solar Coolant", - "material.tfg.sodium_hydride": "Sodium Hydride", - "material.tfg.boric_acid": "Boric Acid", - "material.tfg.trimethyl_borate": "Trimethyl Borate", - "material.tfg.sodium_borohydride": "Sodium Borohydride", - "material.tfg.sodium_methoxide": "Sodium Methoxide", - "material.tfg.ammonia_borane": "Ammonia Borane", - "material.tfg.aniline": "Aniline", - "material.tfg.dimethyl_carbonate": "Dimethyl Carbonate", - "material.tfg.methyl_phenylcarbamate": "Methyl N-Phenylcarbamate", - "material.tfg.methylene_diphenyl_dicarbamate": "Methylene Diphenyl-4,4'-dicarbamate", - "material.tfg.methylene_diphenyl_diisocyanate": "Methylene Diphenyl-4,4'-diisocyanate", - "material.tfg.tmos": "Tetramethoxysilane", - "material.tfg.silica_gel": "Silica Gel", - "material.tfg.soaked_silica_gel": "Acetone Soaked Silica Gel", - "material.tfg.heavy_water": "Heavy Water", - "material.tfg.semiheavy_water": "Semiheavy Water", - "material.tfg.nuclear_residue": "Nuclear Residue", - "material.tfg.oxidized_nuclear_residue": "Oxidized Nuclear Residue", - "material.tfg.refined_nuclear_residue": "Refined Nuclear Residue", - "material.tfg.mars_air": "Mars Air", - "material.tfg.liquid_mars_air": "Liquid Mars Air", - "material.tfg.certus_regolith": "Certus Regolith", - "material.tfg.goethe_regolith": "Goethe Regolith", - "material.tfg.bright_regolith": "Bright Regolith", - "material.tfg.cassiterite_regolith": "Cassiterite Regolith", - "material.tfg.regolith_mush": "Regolith Mush", - "material.tfg.apt": "Ammonium Paratungstate", - "material.tfg.ammonium_tungstate": "Ammonium Tungstate", - "material.tfg.tungsten_bismuth_oxide_composite": "Tungsten-Bismuth Oxide Composite", - "material.tfg.tungsten_oxide": "Tungsten Oxide", - "material.tfg.sodium_tungstate": "Sodium Tungstate", - "material.tfg.tetrafluoroethane": "Tetrafluoroethane", - "material.tfg.thermally_conductive_fluid": "Thermally Conductive Fluid", + "material.tfg.vitrified_pearl": "Остеклованный эндер", + "material.tfg.aes_mix": "Щелочноземельный силикат", + "material.tfg.molten_aes": "Расплавленный щелочноземельный силикат", + "material.tfg.compressed_nitrox": "Сжатый нитрокс", + "material.tfg.compressed_heliox": "Сжатый гелиокс", + "material.tfg.compressed_heliox_3": "Сжатый гелиокс-3", + "material.tfg.compressed_trimix": "Сжатый 50/30/20 тримикс", + "material.tfg.compressed_trimix_3": "Сжатый 50/30/20 тримикс-3", + "material.tfg.chlorodifluoromethane": "Хлордифторметан", + "material.tfg.acetylene": "Ацетилен", + "material.tfg.1_1_1_2_tetrafluoroethane": "1,1,1,2-тетрафторэтан", + "material.tfg.isobutane": "Изобутан", + "material.tfg.chloryl_fluoride": "Хлорилфторид", + "material.tfg.chlorine_pentafluoride": "Пентафторид хлора", + "material.tfg.solar_coolant": "Солнечный хладагент", + "material.tfg.solar_coolant_tier2": "Авиационно-космический солнечный хладагент", + "material.tfg.sodium_hydride": "Гидрид натрия", + "material.tfg.boric_acid": "Борная кислота", + "material.tfg.trimethyl_borate": "Борно-триметиловый эфир", + "material.tfg.sodium_borohydride": "Боргидрит натрия", + "material.tfg.sodium_methoxide": "Метоксид натрия", + "material.tfg.ammonia_borane": "Боразан", + "material.tfg.aniline": "Анилин", + "material.tfg.dimethyl_carbonate": "Диметил-карбонат", + "material.tfg.methyl_phenylcarbamate": "Метил N-Фенилкарбамат", + "material.tfg.methylene_diphenyl_dicarbamate": "Метилен дифенил-4,4'-дикарбамат", + "material.tfg.methylene_diphenyl_diisocyanate": "Метилен дифенил-4,4'-диизоцианат", + "material.tfg.tmos": "Тетраметоксисилан", + "material.tfg.silica_gel": "Силикагель", + "material.tfg.soaked_silica_gel": "Наполненный ацетоном силикагель", + "material.tfg.heavy_water": "Тяжёлая вода", + "material.tfg.semiheavy_water": "Полутяжелая вода", + "material.tfg.nuclear_residue": "Ядерные отходы", + "material.tfg.oxidized_nuclear_residue": "Окисленные ядерные отходы", + "material.tfg.refined_nuclear_residue": "Переработанные ядерные отходы", + "material.tfg.mars_air": "Марсианский воздух", + "material.tfg.liquid_mars_air": "Жидкий марсианский воздух", + "material.tfg.certus_regolith": "Кварцевый реголит", + "material.tfg.goethe_regolith": "Гётитовый реголит", + "material.tfg.bright_regolith": "Яркий реголит", + "material.tfg.cassiterite_regolith": "Кассеритовый реголит", + "material.tfg.regolith_mush": "Реголитовая каша", + "material.tfg.apt": "Паравольфрамат аммония", + "material.tfg.ammonium_tungstate": "Вольфрамат аммония", + "material.tfg.tungsten_bismuth_oxide_composite": "Композит оксида вольфрама-висмута", + "material.tfg.tungsten_oxide": "Оксид вольфрама", + "material.tfg.sodium_tungstate": "Вольфрамат натрия", + "material.tfg.tetrafluoroethane": "Тетрафторэтан", + "material.tfg.thermally_conductive_fluid": "Теплопроводящая жидкость", "material.tfg.crimsene": "Багреллий", "material.tfg.warpane": "Искажеллий", "material.tfg.mycelienzene": "Мицезоллий", @@ -1487,7 +1487,7 @@ "tfg.food_recipe.drying": "Сушка", "tfg.food_recipe.freeze_drying": "Лиофилизация", "tfg.recipe.macerator_warning": "Only outputs first slot until HV", - "tfg.grapplemod.repair": "Рецепт починки, сохраняет ваши улучшения. §НИКОГДА не объединяйте две крюк-кошки или вы потеряете ВСЕ ваши улучшения!§r", + "tfg.grapplemod.repair": "Рецепт починки, сохраняет ваши улучшения. §rНИКОГДА не объединяйте две крюк-кошки или вы потеряете ВСЕ ваши улучшения!§r", "tfg.grapplemod.upgrades.maxlen": "Increases §lMax Length§r by 20, up to 200.", "tfg.grapplemod.downgrades.maxlen": "Decreases §lMax Length§r by 20, down to 20. (Jute Rope is Returned).", "tfg.grapplemod.upgrades.motor.lv": "Enables the §lMotor§r Upgrade, automatically reeling you in.\n§lMotorMaxSpeed§r set to 1\n§lMotorAcceleration§r set to 0.125", @@ -2027,167 +2027,194 @@ "quests.extreme_voltage.martian_sludge.desc": "Centrifuge the Hexafluorosilic Acid to get your Fluorine back, along with some &6Martian Sludge&r - required for Radon and Nuclear Residue.", "quests.extreme_voltage.large_generators.title": "Extreme Power Generation", "quests.extreme_voltage.large_generators.desc": "The various single-block generators only go up to HV, so from here on, you'll have to use multiblocks to generate more power. Two of the best options at EV are the &dLarge Gas Turbine&r and &dLarge Combustion Engine&r, so head over to the GregTech Energy chapter to learn more about them.", - "quests.gregtech_energy": "Энергетика GregTech", - "quests.gregtech_energy.subtitle": "Итак, как всё это работает?", - "quests.gregtech_energy.start.title": "Let's do some explaining", - "quests.gregtech_energy.start.desc": "We know that GregTech isn’t the easiest mod to get into — especially when it comes to the &cenergy system&r. That’s why we’ll take our time in this chapter to explain as much as we can.\n\nSome things here might not make full sense until later in your progression, so don’t stress yourself. Just try to understand what you can for now, and feel free to &dcome back to this chapter&r whenever you have questions.\n\nWe’ve split this chapter into &efour categories&r, each one covering a topic related to the GregTech Energy System. We’ll provide as many examples as possible to help you understand how it all works.", - "quests.gregtech_energy.start.task": "Welcome aboard", - "quests.gregtech_energy.start.subtitle": "It's not as bad as you think", - "quests.gregtech_energy.moving.title": "Moving your Energy", - "quests.gregtech_energy.moving.subtitle": "So, energy transfer, huh", - "quests.gregtech_energy.moving.desc": "Moving Energy in GregTech means understanding a few core mechanics.\n\nFirst, &bEnergy Tiers&r. From &aLV&r to &cUHV&r, everything in GregTech — wires, machines, recipes — is tied to a tier. You’ll need the &ecorrect cable material&r to move energy. For example:\n&8•&r Tin wire = &aLV&r\n&8•&r Copper wire= &bMV&r\n\nSecond, you’ve got the &bAmperage&r mechanic. Think of 1 Amp (or 1A) as &ea packet of energy&r. Machines request energy \"packets\", which then get sent down the wire.\n&8•&r 1A of LV = &a32 EU&r\n&8•&r 1A of HV = &e512 EU&r\n\nMost machines and energy hatches will only request &62A at maximum&r.\n\nMastering these two ideas is key before going further into energy distribution.", - "quests.gregtech_energy.moving.task": "I understand", - "quests.gregtech_energy.transformer.title": "The Super Transformer", - "quests.gregtech_energy.transformer.subtitle": "Better than Optimus Prime", - "quests.gregtech_energy.transformer.desc": "For every problem, GregTech has a multiblock solution. Enter the &dActive Transformer&r.\n\nThis beast is your ultimate transformer. It can channel energy between any tiers — from &aLV&r to &cUHV&r — with no explosions. But that's not even the best part.\n\nIt can transmit energy using Laser Pipes.\n&8•&r Lasers send absurd amounts of Amps.\n&8•&r No loss. No cables. Just pure energy.\n&8•&r Only one catch: it &chas to be in a perfectly straight line&r.\n\nWhen cables feel weak, &luse lasers.", - "quests.gregtech_energy.moving_wire.title": "Moving with wires", - "quests.gregtech_energy.moving_wire.subtitle": "Funky to place", - "quests.gregtech_energy.moving_wire.desc": "Moving energy around in GregTech can be tricky — &bmost cables are lossy&r. For every block, for every amp, you might lose energy as it travels through your wires. But don’t worry, there are solutions:\n\n&8•&r Cover your wires with rubber. By doing so, you'll significantly reduce energy loss over distance. Just check the quest items for a reference.\n&8•&r Use higher-tier cables. Platinum cables, for example, only lose 1 EU per block — practically nothing when compared to the 8192 EU it can carry.\n&8•&r &bSuperconductors&r. These beauties are a bit pricier, but they have &9zero loss&r. They don’t need rubber covers, and won't zap you either. Just be aware that they're usually only craftable near the end of their tier.\n\nOptimize your energy flow — &breduce losses&r and make your systems more efficient.", - "quests.gregtech_energy.moving_wire.task": "I finished looking at wires", - "quests.gregtech_energy.moving_amp.title": "Managing Amp", - "quests.gregtech_energy.moving_amp.subtitle": "It burns?", - "quests.gregtech_energy.moving_amp.desc.1": "You’ll notice each wire has its own &eMax Amperage&r — that’s the amount of amps a cable can safely carry before burning.\nTo know how many amps will flow through a cable, you must consider two things:\n\n- A Generator or Battery outputs a specific amount of Amps:\nBattery Buffers will output as many amps as they have batteries inside.\nEvery single-block generator outputs &e1A&r.\nFor multiblock generators, it depends on the &aDynamo Energy Hatch&r — the value is shown in its tooltip.\n\nAmperage output is also based on what is needed: each machine connected to a power line will request amps to fill its internal buffer.", - "quests.gregtech_energy.moving_amp.desc.2": "Let’s look at an example:\nYou have &e6 machines&r connected to an &e8x Battery Buffer&r filled with 8 batteries.\nThe buffer will try to send &e1A&r to each machine — that’s &e6A&r total.\nThe amps are delivered in order: the closest machines get power first, and the furthest ones last.\nIf your cables only support &c4A&r, they’ll &cBURN&r. You’ll need &a8A cables&r in this case.\n\n&bTip:&r The first machine in the line might need a cable that handles &e8A&r,\nbut the last machine may only need &e1A&r, as it’s only receiving what’s left.\n&c⚠ Be careful:&r adding another machine at the end could cause the cable to burn if it exceeds the limit.", - "quests.gregtech_energy.moving_amp.task": "I got it", - "quests.gregtech_energy.produce_energy.title": "Producing Energy", - "quests.gregtech_energy.produce_energy.subtitle": "Gas or Oil?", - "quests.gregtech_energy.produce_energy.desc": "It’s all about making energy, right? This part won’t be the most complicated one, since &eproducing energy&r in &2TerraFirmaGreg&r works pretty much like in &5standard GregTech&r.\n\nYou’ll learn about the various &6methods to generate energy&r, as well as some of the &afuels&r you can use to get the most out of your setup.", - "quests.gregtech_energy.produce_energy.task": "Let's go!", - "quests.gregtech_energy.lv_generator.title": "Let's make energy", - "quests.gregtech_energy.lv_generator.subtitle": "Welcome to LV", - "quests.gregtech_energy.lv_generator.desc.1": "All of these are your basic &61-block Generators&r. They have a single &9input&r for their fuel — whether it’s &esteam&r, &agas&r, or &6liquid fuel&r — and they output exactly &e1A&r of power at their energy tier.\n\nThey’re simple to work with and will be your &ofirst source of power&r in &5GregTech&r until you reach the &dlarge multiblock generators&r later on.\n\nTo know what fuels can be used, &aEMI&r is your best friend — or you can check the &bquests on the left&r, where we’ve listed the most &aoptimal inputs&r. For now here are the <hree ways&r to begin your power production, all of them are &aviable&r the choice is yours.", - "quests.gregtech_energy.lv_generator.desc.2": "&e1. Steam Power&r:\n\nThis is the most classic method. You can convert the steam produced by your High Pressure Boilers into EU using a Steam Turbine.\n\nIt generates &e32 EU/t&r with &e64 mB/t&r of steam. If you follow this path, we highly recommend making a Large Bronze Boiler, which can easily be fueled with Lava, Creosote, or other burnable solid fuels (check JEI!).", - "quests.gregtech_energy.lv_generator.desc.3": "&e2. Rotational Power&r:\n\nYou can use Create's rotational power with an Alternator to generate RF, then convert it into EU using an &7LV&r Converter.\n\n(Check the Alternators quest in the LV Chapter for more details.)", - "quests.gregtech_energy.lv_generator.desc.4": "&e3. Biodiesel Power (TFG Exclusive)&r:\n\nCanola and Sunflowers can be processed into large amounts of Seed Oil. Combine it with TFC Alcohol to produce Biodiesel.\n\nThis method may seem more complex, but Biodiesel is extremely powerful during &7LV&r and &bMV&r tiers. It scales well into &5EV&r with &eCetane-Boosted Diesel&r later on.\n\nTo use Biodiesel, you’ll need a &7LV&r Combustion Generator. While it may be slightly more expensive, every mB of Biodiesel provides a high amount of EU, making it easier to transport and store.\n\nIt's your choice how you want to start your energy production.", - "quests.gregtech_energy.lv_generator.task": "Any LV Generator", - "quests.gregtech_energy.mv_generator.title": "The MV Generators", - "quests.gregtech_energy.mv_generator.subtitle": "Basically the same as the LV ones", - "quests.gregtech_energy.mv_generator.desc": "To run your &bMV&r machines, you will need to upgrade your power production.\n\nIf an &7LV&r Generator produces &e32 EU/t&r, the &bMV&r Generator runs at &e128 EU/t&r.\nIt consumes four times more fuel to produce four times more energy.\n\nTo better understand power generation at &bMV&r, we strongly recommend checking the dedicated quest in the &bMV&r chapter, located right at the beginning.\n\nAt &bMV&r, you also gain access to more options:\n\n- Oil-based fuels like Diesel or Light Fuel\n- Gas-based fuels like Benzene, LPG, or Methane\n- You can continue using Biodiesel or Steam, though you may need larger pipes (Aluminium, Steel, or Potin can handle it)\n\nExplore your options carefully to optimize your energy setup.", - "quests.gregtech_energy.mv_generator.task": "Any MV Generator", - "quests.gregtech_energy.hv_single_generator.title": "The last single block generators", - "quests.gregtech_energy.hv_single_generator.subtitle": "Third time's the charm?", - "quests.gregtech_energy.hv_single_generator.desc": "If you don’t want to build the &eLarge Steam Turbine&r, these are your only options for &6HV&r.\n\nHowever, keep in mind that they won’t be available for &5EV&r and beyond.\n\nStill, they remain strong choices for energy generation at the &6HV&r tier.", - "quests.gregtech_energy.hv_single_generator.task": "Any HV Generator", - "quests.gregtech_energy.hv_fuel.title": "The obtainable HV fuels", - "quests.gregtech_energy.hv_fuel.subtitle": "To each their own", - "quests.gregtech_energy.hv_fuel.desc": "These are the three fuels respectively used for the Combustion, Steam, and Gas Generators.\n\nIf you have reached &6HV&r, we highly recommend choosing one of these three options.\n\nHowever, don’t worry—other fuels are not necessarily bad.\n\nYou should always pick the solution that works best for your setup and playstyle.", - "quests.gregtech_energy.hv_fuel.task": "I got it", - "quests.gregtech_energy.hv_choice.title": "Producing at HV", - "quests.gregtech_energy.hv_choice.subtitle": "Your choice", - "quests.gregtech_energy.hv_choice.desc": "By reaching &6HV&r, you now have access to your first multiblock for power generation.\n\nIt’s also considered the worst one… but it can still work well if you really want to use it.\n\nYour other option is to continue using the previous generators—you now have access to new and better fuels.", - "quests.gregtech_energy.hv_choice.task": "I understand", - "quests.gregtech_energy.lpt.title": "The Large Plasma Turbine", - "quests.gregtech_energy.lpt.subtitle": "You need a Fusion Reactor", - "quests.gregtech_energy.lpt.desc.1": "The &6Large Plasma Turbine&r — also known as &dLPT&r — is a real powerhouse. Not in size (it’s fairly standard), but in capacity. You’ll need LuV Circuits, a LuV Machine Hull, and tons of Tungstensteel to craft it. It’s considered the most powerful generator in TerraFirmaGreg.\n\nSo, how does it work? You’ll need Plasma produced by a Fusion Reactor. That plasma is cooled down inside the LPT while generating energy. You will need an output hatch to get the cooled plasma out.", - "quests.gregtech_energy.lpt.desc.2": "By default, the LPT starts at &e16384 EU/t&r, which doesn't look like much, but that energy output &cdoubles&r with each increase in the Rotor Holder after &1IV&r.\n\nFor example, using a LuV Rotor Holder (x2) with an HSS-E Turbine Rotor (x2.8) will give you a staggering &e91750 EU/t&r — that’s about &a2.8A of LuV&r power!\n\nLike other turbines, it will slow down and stop if the Dynamo Hatch is full so you won't waste plasma, but unlike the others, this one doesn’t require a Muffler Hatch.", - "quests.gregtech_energy.lgt.title": "The Large Gas Turbine", - "quests.gregtech_energy.lgt.subtitle": "The fan favorite", - "quests.gregtech_energy.lgt.desc.1": "The &6Large Gas Turbine&r — also known as &dLGT&r — is one of your two main sources of energy production for most of the modpack. You’ll be able to build your first one at &5EV&r using Stainless Steel. It can carry you from &5EV&r all the way to &dLuV&r, until you feel ready to upgrade to the Large Plasma Turbine.\n\nThat said, many players can finish TerraFirmaGreg using only these turbines — provided you have a strong infrastructure to handle the gas demands of high-tier LGTs.\n\nTo build the LGT, you’ll need the usual Maintenance Hatch and Input Hatch. This turbine requires a Muffler Hatch, but it does not use an Output Hatch.", - "quests.gregtech_energy.lgt.desc.2": "The default output is &e4096 EU/t&r. That output &cdoubles&r with each upgrade to the Rotor Holder after &5EV&r. For example, an LGT using an IV Rotor Holder (×2) with a HSS-E Turbine Rotor (280%% power) will produce:\n4096 × 2 × 2.8 = &e22,937.6 EU/t&r — that's about &a2.8A of IV&r.\n\nTo fully extract that energy, you’ll need at least a IV 4A Dynamo Hatch, since a normal Dynamo Hatch only handles 2A.\n\nJust so you know: the Efficiency stat of a Turbine Rotor increases the duration of the recipe, which means you get more power from each mB of fuel.\n\nLastly, if the Dynamo Hatch fills up, the LGT will automatically slow down and pause fuel usage, gradually reducing rotor speed until it resumes again. So you won't lose any fuel during a backup.", - "quests.gregtech_energy.lst.title": "The Large Steam Turbine", - "quests.gregtech_energy.lst.subtitle": "It... exists", - "quests.gregtech_energy.lst.desc.1": "The &6Large Steam Turbine&r — or &dLST&r — might not be the most common Large Generator in standard GregTech, but thanks to its early unlock at &6HV&r and the fact that Large Boilers are stronger in TerraFirmaGreg, it definitely has its place.\n\nTo make it work, you’ll need an Input Hatch for steam, an Output Hatch for Distilled Water, and of course a Maintenance Hatch. That’s all you need!\n\nLike all Large Turbines, you’ll place a Rotor Holder on one side and a Dynamo Hatch on the other to extract power. For the LST, the Rotor Holder must be at least &6HV-tier&r. Each Rotor Holder upgrade &cdoubles&r the output and increases efficiency slightly.", - "quests.gregtech_energy.lst.desc.2": "The base output of the LST is &e1024 EU/t&r. Let’s take an example: with an IV Rotor Holder (×4) and a HSS-E Turbine Rotor (280%% power), you’ll get:\n1024 × 4 × 2.8 = &e11,468.8 EU/t&r — that’s about &a1.4A of IV&r.\n\nTo extract that energy, you’d need either an IV Dynamo Hatch or an EV 16A Dynamo Hatch.\n\nWhile the LST isn’t the best turbine out there, if you have plenty of Large Boilers or access to a large amount of fuel, these steel-based, affordable turbines could absolutely serve you well.", - "quests.gregtech_energy.lce.title": "The Large Combustion Generator", - "quests.gregtech_energy.lce.subtitle": "Don't belive its GUI", - "quests.gregtech_energy.lce.desc.1": "The &6Large Combustion Engine&r (&dLCE&r) and the &5Extreme Combustion Engine&r (&dECE&r) are your champions if you’re into transforming Oils into fuels. These two &6bad boys&r share the same fuel types and even look alike — but they require different materials to build.\n\nTo craft the LCE, you’ll need to reach &5EV&r and unlock Titanium, along with at least one IV Circuit. For the ECE, it’ll be Tungstensteel and a LuV Circuit — something you should be able to build comfortably during &1IV&r.", - "quests.gregtech_energy.lce.desc.2": "Both machines require an Input Hatch for fuel and also Lubricant. For the &dECE&r, adding Oxygen or Liquid Oxygen will grant you a &cmassive energy boost&r. Check the tooltip of your fuel to compare how much extra energy you get with oxidizers — it's well worth it.\n\nKeep in mind: both engines need a Muffler Hatch.", - "quests.gregtech_energy.lpt_fuel.title": "Plasma Fuels", - "quests.gregtech_energy.lpt_fuel.subtitle": "It's very hot", + "quests.gregtech_energy": "Энергия в GregTech", + "quests.gregtech_energy.subtitle": "Так как там все это работает?", + "quests.gregtech_energy.start.title": "Давай немного объясним", + "quests.gregtech_energy.start.desc": "Все мы знаем, что GregTech простой мод для изучений, в особенности его &cсистема энергии&r. Именно поэтому для этой системы выделена отдельная глава.\n\nНекоторые вещи могут не иметь смысла, пока вы не пройдёте дальше по прогрессии, так что не переусердствуете. Попытайся, что можешь сейчас, и не стесняйся &dвозращаться к этой главе&r, когда у тебя появятся вопросы.\n\nМы разделили главу на &e4 категории&r, каждая из которых относится к одному из элементов системы энергии GregTech. Мы постараемся привести как можно больше примеров, чтобы помочь тебе понять, как это все работает.", + "quests.gregtech_energy.start.task": "Добро пожаловать на борт", + "quests.gregtech_energy.start.subtitle": "Все не на столько плохо, как ты думаешь", + "quests.gregtech_energy.moving.title": "Перемещение энергии", + "quests.gregtech_energy.moving.subtitle": "Перемещение энергии... Каво?", + "quests.gregtech_energy.moving.desc": "Для того, чтобы понять, как перемещать энергию в GregTech сперва нужно понять несколько ключевых механик.\n\nВо-первых, &bуровни напряжения&r. От &aLV&r до &cUHV&r, все в GregTech — провода, машины, рецепты — привязано к уровню напряжения. Тебе нужен будет &eправильный материал провода&r для перемещения энергии. Например:\n&8•&r Оловянный провод = &aLV&r\n&8•&r Медный провод = &bMV&r\n\nВо-вторых, есть механика &bАмпеража&r. 1 ампер (или 1А) можно представить в виде &eпакета энергии&r. Машины запращивают эти \"пакеты\" энергии, которые перемещаются по проводу.\n&8•&r 1A LV = &a32 EU&r\n&8•&r 1A HV = &e512 EU&r\n\nБольшинство машин запрашивают до &62A максимум&r.\n\nПонимание этих двух идей - ключ к правильному распределению энергии.", + "quests.gregtech_energy.moving.task": "Я понял", + "quests.gregtech_energy.transformer.title": "Супер трансформер(трансформатор)", + "quests.gregtech_energy.transformer.subtitle": "Лучше Оптимуса Прайма", + "quests.gregtech_energy.transformer.desc": "Для каждой проблемы у GregTech есть свое мультиблочное решение. Представляем вам &dАктивный трансформатор&r.\n\nЭтот зверь - ваш ультымативный трансформатор. Он может передавать энергию любого уровня — от &aLV&r до &cUHV&r, и без взрывов. И это даже не лучшее.\n\nОн может передавать энергию с помощью Передающих лазерных кабелей.\n&8•&r Лазеры передают огромное колличество ампер.\n&8•&r Без потерь. Без проводов. Просто чистая энергия.\n&8•&r Но есь нюанс: он &c может передавать энергию только по прямой&r.\n\nКогда кабелей не достаточно, &lиспользуй лазеры.", + "quests.gregtech_energy.moving_wire.title": "Перемещение с помощью проводов", + "quests.gregtech_energy.moving_wire.subtitle": "Затейливы при размещении", + "quests.gregtech_energy.moving_wire.desc": "Перемещать энергию в GregTech может быть каверзно — &bбольшинство проводов имеют потери&r. За каждый блок, за каждый ампер, ты можешь терять энергию по мере прохождении энергии через провода. Не бойся, этому есть решение:\n\n&8•&r Покрой свои провода резиной. Таким образом ты значительно снизишь потери с расстоянием. Посмотри квестовые предметы для примера.\n\n&8•&r Используй кабели более высокого напряжения. Платиновый кабель, например, теряет лишь 1 EU за блок — практически ничего по сравнению с 8192 EU, которые он может переместить.\n\n&8•&r &bСверхпроводники&r. Эти красавцы дороговатые, но они &9без потерь&r. Им не нужна изоляция и они не будут бить тебя током. Однако стоит знать, что обычно возможность их скрафтить появляется только в конце тира.\n\nОптимизируй потоки энергии — &bуменьши потери&r и делай свои системы более энергоэффективными.", + "quests.gregtech_energy.moving_wire.task": "Я закончил смотреть на провода", + "quests.gregtech_energy.moving_amp.title": "Управление амперами", + "quests.gregtech_energy.moving_amp.subtitle": "Оно горит?", + "quests.gregtech_energy.moving_amp.desc.1": "Ты заметил, что у каждого провода есть своя &eмаксимальная сила тока&r — это безопасное колличество ампер, которое провод может пропустить.\nЧтобы понять, сколько ампер пройдет через провод, нужно учесть следующие вещи:\n\n- Генератор и батарейки выдают конкретное колличество ампер:\nБатарейные буферы выдают столько ампер, сколько внутри батарей.\nКаждый одноблочный генератор выдает&e1A&r.\nВыход мультиблочных генераторов зависит от &aвыходного энергетического люка&r — значения, указанного в тултипе.\n\nТак же колличество выдаваемых ампер зависит от запрашивамых ампер: каждая подключенная машина будет требовать силу тока для заполнения внутреннего буфера.", + "quests.gregtech_energy.moving_amp.desc.2": "Например:\nУ тебя есть &e6 машин&r соединенных к &e8x батарейному буферу&r заполненному 8-ю батарейками.\nБуфер попытается отправить &e1A&r каждой машине — это в сумме &e6A&r.\nАмперы будут доставляться поочерёдно: Ближайшая машина получит энергию первой, а дальнейшая - последней.\nЕсли максимальная сила тока проводов &c4A&r, то они &cгорят&r. В этом случае стоит использовать &a8A провода&r.\n\n&bСовет:&r Первой машине понадобится провод на &e8A&r,\nно последней машине нужен провод лишь на &e1A&r, так как он примерт, что осталось.\n&c⚠ Осторожно:&r добавление еще одной машины в конце может привести к сгораню проводов, если сила тока превысит лимит.", + "quests.gregtech_energy.moving_amp.task": "Я понял", + "quests.gregtech_energy.produce_energy.title": "Производство энергии", + "quests.gregtech_energy.produce_energy.subtitle": "Газ или нефть?", + "quests.gregtech_energy.produce_energy.desc": "Это ведь всё о производстве энергии, верно? Это часть не будет сложной, так как &eпроизводство энергии&r в &2TerraFirmaGreg&r работает примерно как в &5стандартном GregTech&r.\n\nТы узнаешь о разнообразных &6методах производства энергии&r, в том числе некоторые виды &aтоплива&r, которые ты можешь использовать.", + "quests.gregtech_energy.produce_energy.task": "Погнали!", + "quests.gregtech_energy.lv_generator.title": "Давайте делать энергию", + "quests.gregtech_energy.lv_generator.subtitle": "Добро пожаловать в LV", + "quests.gregtech_energy.lv_generator.desc.1": "Все это - базовые &6одноблочные генераторы&r. У них 1 &9вход&r для их топлива — будь это &eпар&r, &aгаз&r, или &6жидкое топливо&r — и они генерируют ровно &e1A&r соответствующего уровня напряжения.\n\nС ними легко работать и они будут твоими &oпервыми источниками энергии&r в &5GregTech&r пока ты не дойдешь до &dмультиблочных генераторов&r, доступных позже.\n\nЧтобы узнать, что подходит в качестве топлива, проверь &aEMI&r, или посмотри а &bквестах слева&r, где указаны &aоптимальные виды топлива&r. Сейчас тебе доступно &lтри пути&r производства энергии, все &aвалидны&r, так что выбор за тобой.", + "quests.gregtech_energy.lv_generator.desc.2": "&e1. Сила пара&r:\n\nЭто самый классический метод. Ты можешь конвертировть пар с твоих паровых котлов высокого давления в EU используя паровые турбины.\n\nОна генерирует &e32 EU/t&r используя &e64 mB/t&r пара. Если ты пойдешь этим путем, мы крайней рекомендуем создать Большой бронзовый котел, который можно запитывать лавой, креозотом или другим твердым топливом (проверь JEI!).", + "quests.gregtech_energy.lv_generator.desc.3": "&e2. Сила крутящего момента&r:\n\nТы можешь использовать крутящий момент Create-а для генерации FE с помощью Генератора, затем конвертировать в EU используя Преобразоатель энергии &7LV&r.\n\n(Проверь квест Альтернаторы в главе Low Voltage(Низкий Вольтаж) для подробностей.)", + "quests.gregtech_energy.lv_generator.desc.4": "&e3. Сила биодизеля (Эксклюзивно для TFG)&r:\n\nКанола и подсолнухи могут быть переработаны в большое колличество Растительного масла. Смешай с алкоголем из TFC для производства биодизеля.\n\nЭтот метод более сложный, но Биодизель крайне мощное топливо на &7LV&r и &bMV&r тирах. Он хорошо масштабируется к &5EV&r с &eНитро-Дизелем&r, доступным позже.\n\nДля использования биодизеля, тебе нужен &7LV&r Дизельный генератор. Возможно он немного дороже, но каждый мБ Биодизеля дает большое колличество EU, то есть его проще перемещать и хранить.\n\nЭто твой выбор как ты хочешь начать свое производство энергии.", + "quests.gregtech_energy.lv_generator.desc.5": "&e4. Сила сингаза (Эксклюзивно для TFG)&r:\n\nС помощью &6Коксовой печи&r и &6Вакуумной камеры&r, ты сможешь получить это начальное газовое топливо. Это может быть не самым вариантом, но этого достаточно, если ты захочешь последовать по пути &eтолько газового&r топлива. &6Create&r-овская ферма дерева крайне рекомендуется, чтобы получить наибольшую эффективности из него.", + "quests.gregtech_energy.lv_generator.task": "Любой LV генератор", + "quests.gregtech_energy.mv_generator.title": "MV генераторы", + "quests.gregtech_energy.mv_generator.subtitle": "По сути те же самые, что и LV-шные", + "quests.gregtech_energy.mv_generator.desc": "Чтобы запустить твои машины &bMV&r, тебе потребуется улучшить производство энергии.\n\nЕсли генератор &7LV&r производит &e32 EU/t&r, то генератор &bMV&r вырабатывает &e128 EU/t&r.\nОни потребляют в четыре раза больше топлива, чтобы производить в четыре раза больше энергии.\n\nЧтобы лучше понять варианты генерации энергии на &bMV&r, мы настоятельно рекомендуем ознакомиться с посвящённым этому квестом в главе &bMV&r, расположенной в самом начале.\n\nНа уровне &bMV&r у тебя также появляется доступ к большему количеству вариантов:\n\n- Топливо на основе нефти, такое как дизель или лёгкое топливо\n- Газообразное топливо, такие как бензол, СУГ или метан\n- Ты можешь продолжать использовать биодизель или пар, хотя тебе могут понадобиться трубы побольше (алюминиевые, стальные или из потина подойдут)\n\nИзучи доступные варианты, чтобы оптимизировать вашу энергетическую систему.", + "quests.gregtech_energy.mv_generator.task": "Любой MV Generator", + "quests.gregtech_energy.hv_single_generator.title": "Последние одноблочные генераторы", + "quests.gregtech_energy.hv_single_generator.subtitle": "Бог любит троицу?", + "quests.gregtech_energy.hv_single_generator.desc": "Если ты не хочешь строить &eБольшую паровую машину&r, это твои единственные варианты для &6HV&r.\n\nОднако имей в виду, что они не будут доступны для &5EV&r и выше.\n\nТем не менее, они остаются надёжными вариантами генерации энергии на &6HV&r.", + "quests.gregtech_energy.hv_single_generator.task": "Любой HV генератор", + "quests.gregtech_energy.hv_fuel.title": "Доступное на HV топливо", + "quests.gregtech_energy.hv_fuel.subtitle": "Каждому свое", + "quests.gregtech_energy.hv_fuel.desc": "Это три вида топлива, которые соответственно используются в дизельных, паровых и газовых генераторах.\n\nЕсли ты достиг &6HV&r, мы настоятельно рекомендуем выбрать один из этих трёх вариантов.\n\nОднако не переживай — другие виды топлива вовсе не обязательно плохи.\n\nВсегда выбирай решение, которое лучше всего подходит под твою базу и стиль игры.", + "quests.gregtech_energy.hv_fuel.task": "Я понял", + "quests.gregtech_energy.hv_choice.title": "Производство энергии в HV", + "quests.gregtech_energy.hv_choice.subtitle": "На твой выбор", + "quests.gregtech_energy.hv_choice.desc": "Достигнув &6HV&r, ты получаешь доступ к своему первому мультиблоку для генерации энергии.\n\nОн также считается худшим… но всё ещё может работать неплохо, если ты действительно хочешь его использовать.\n\nДругой вариант — продолжать использовать предыдущие генераторы: теперь у тебя есть доступ к новым и более эффективным видам топлива.", + "quests.gregtech_energy.hv_choice.task": "Я понял", + "quests.gregtech_energy.lpt.title": "Большая плазменная турбина", + "quests.gregtech_energy.lpt.subtitle": "Тебе понадобится термоядерный реактор", + "quests.gregtech_energy.lpt.desc.1": "&6Большая плазменная турбина&r — также известная как &dLPT или БПТ&r — является настоящей энергетической махиной. Не по размеру (он вполне стандартный), а по мощности. Для её создания тебе понадобятся LuV схемы, LuV оболочка машины и огромное количество вольфрамовой стали. Она считается самым мощным генератором в TerraFirmaGreg.\n\nИтак, как она работает? Вам понадобится плазма, производимая термоядерным реактором. Эта плазма охлаждается внутри БПТ с одновременной генерацией энергии. Для вывода охлаждённой плазмы вам потребуется выходной разъем.", + "quests.gregtech_energy.lpt.desc.2": "По умолчанию БПТ начинает с &e16384 EU/t&r, что выглядит не слишком впечатляюще, но эта выходная мощность &cудваивается&r при каждом повышении уровня держателя ротора после &1IV&r.\n\nНапример, использование держателя ротора LuV (x2) с турбинным ротором HSS-E (x2.8) даст тебе ошеломляющие &e91750 EU/t&r — это примерно &a2.8A LuV&r!\n\nКак и другие турбины, она будет замедляться и останавливаться, если выходной энергетический разъем заполнен, так что ты не будешь тратить плазму впустую, но в отличие от остальных генераторов, этому не требуется люк глушителя.", + "quests.gregtech_energy.lgt.title": "Большая газовая турбина", + "quests.gregtech_energy.lgt.subtitle": "Выбор фанатов", + "quests.gregtech_energy.lgt.desc.1": "&6Большая газовая турбина&r — также известная как &dБГТ&r — является одним из двух основных источников выработки энергии на протяжении большей части модпака. Ты сможешь построить свою первую такую турбину на &5EV&r, используя нержавеющую сталь. Она способна провести тебя от &5EV&r вплоть до &dLuV&r, пока ты не будешь готов перейти на БПТ.\n\nТем не менее, многие игроки могут пройти TerraFirmaGreg, используя только эти турбины — при условии, что у тебя есть мощная инфраструктура для обеспечения газовых потребностей высокоуровневых БГТ.\n\nДля постройки БГТ вам понадобятся стандартные люки обслуживания и входной люк. Эта турбина требует люк глушителя, но не использует выходной люк.", + "quests.gregtech_energy.lgt.desc.2": "Стандартная выходная мощность составляет &e4096 EU/t&r. Эта мощность &cудваивается&r при каждом улучшении держателя ротора после &5EV&r. Например, БГТ с держателем ротора IV (×2) и турбинным ротором HSS-E (280%% мощности) будет производить:\n4096 × 2 × 2.8 = &e22,937.6 EU/t&r — это примерно &a2.8A IV&r.\n\nДля полного извлечения этой энергии потребуется как минимум IV 4A выходной энергетический разъем, так как обычный выходной разъем способен выдавать лишь 2A.\n\nК твоему сведению: Эффективность ротора турбины увеличивает длительность рецепта, что означает больше энергии с каждого миллибакета топлива.\n\nИ наконец, если выходной энергетический разъем заполнится, БГТ автоматически замедлится и приостановит использование топлива, постепенно снижая скорость ротора до возобновления работы. Так ты не будешь терять топливо.", + "quests.gregtech_energy.lst.title": "Большая паровая турбина", + "quests.gregtech_energy.lst.subtitle": "Она... существует", + "quests.gregtech_energy.lst.desc.1": "&6Большая паровая турбина&r — или &dБПТ&r — может быть не самым распространённым мультиблочным генератором в стандартном GregTech, но благодаря раннему разблокированию на &6HV&r и тому, что Большие котлы сильнее в TerraFirmaGreg, он определённо имеет своё место.\n\nЧтобы его запустить, тебе понадобится входной люк для пара, выходной люк для дистиллированной воды и, конечно же, люк обслуживания. Это всё, что нужно! Как и все большие турбины, ты ставишь держатель ротора с одной стороны и выходной энергетический разъем с другой для извлечения энергии. Для БПТ держатель ротора должен быть как минимум &6HV&r. Каждое улучшение держателя ротора &cудваивает&r выход и слегка повышает эффективность.", + "quests.gregtech_energy.lst.desc.2": "Базовая выходная мощность LST составляет &e1024 EU/t&r. Рассмотрим пример: с держателем ротора IV (×4) и ротором турбины HSS-E (280%% мощности) ты получишь:\n1024 × 4 × 2.8 = &e11,468.8 EU/t&r — это примерно &a1.4A IV&r.\n\nЧтобы извлечь эту энергию, тебе понадобится либо IV выходной энергетический разъем, либо EV 16A выходной энергетический разъем.\n\nХотя БПТ не является популярным решением, если у тебя есть много больших котлов или доступ к большому количеству топлива, эти стальные недорогие турбины могут послужить вам очень неплохо.", + "quests.gregtech_energy.lce.title": "Большой дизельный генератор", + "quests.gregtech_energy.lce.subtitle": "Сжигает не только дизель", + "quests.gregtech_energy.lce.desc.1": "&6Большой дизельный генератор&r (&dБДГ&r) и &Улучшенный дизельный генератор&r (&dУДГ&r) — ваши главные варианты, если ты любишь перерабатывать нефть в топливо. Эти два &6плохих парня&r используют одни и те же виды топлива и даже выглядят почти одинаково — но для их создания требуются разные материалы.\n\nЧтобы скрафтить БДГ, тебе нужно достичь &5EV&r и открыть Титан, а также иметь как минимум одну схему IV. Для УДГ потребуется Вольфрамовая сталь и схема LuV — то, что ты уже должен уметь крафтить без особых проблем на &1IV&r.", + "quests.gregtech_energy.lce.desc.2": "Обе машины требуют входной люк для топлива, а также смазку. Для &dБДГ&r и &dУДГ&r добавление кислорода или жидкого кислорода соответственно даст вам &cогромный прирост энергии&r. Проверьте тултип у вашего топлива, чтобы сравнить, сколько дополнительной энергии вы получаете с окислителями — это действительно того стоит.\n\nИмейте в виду: обоим двигателям нужен люк глушителя.", + "quests.gregtech_energy.lpt_fuel.title": "Плазма", + "quests.gregtech_energy.lpt_fuel.subtitle": "Она горячая", "quests.gregtech_energy.lpt_fuel.desc.1": "&6Large Plasma Turbines&r require high-tech fuels to run, and we recommend two strong options:\n\nThe first option becomes available with your MK1 Fusion Reactor: &eHelium Plasma&r.\nYou can create it using Deuterium and Tritium Gas — both gases are obtained by distilling &aLiquid Ender Air&r.\nThis fuel isn't the most powerful, but it's by far the easiest and earliest to produce.", "quests.gregtech_energy.lpt_fuel.desc.2": "The second option requires a MK3 Fusion Reactor and allows you to generate &eNickel Plasma&r.\nTo make it, you’ll need Liquid Potassium — which you can extract from various ores — and the infamous Fluorine, which you should already know how to produce by now.\n\n⚠ Don’t forget: Helium Gas and Liquid Nickel should be collected and returned to your storage for future reuse.\n\nThese two fuels are your best candidates for powering the &dLPT&r, depending on how far you've progressed in your industrial madness.", - "quests.gregtech_energy.lpt_fuel.task": "I don't want to make a bucket of Plasma", - "quests.gregtech_energy.lgt_fuel.title": "Gas Fuels", - "quests.gregtech_energy.lgt_fuel.subtitle": "Everyone's favorite", - "quests.gregtech_energy.lgt_fuel.desc.1": "When we speak about gas fuels, we’re really talking about just one — &eNitrobenzene&r.\n\nYou’ll be able to produce it once you reach &6HV&r, and we &astrongly recommend it&r if you’re planning to use the Large Gas Turbine.\n\nBefore reaching Nitrobenzene, &eBenzene&r is a solid option to get started. You can obtain it from a tree farm or by processing Heavy Oil, if you’re lucky enough to have some nearby.", - "quests.gregtech_energy.lgt_fuel.desc.2": "Making Nitrobenzene involves several steps — until you craft your first Large Chemical Reactor (LCR), which will let you skip many sub-steps and simplify the process.\n\nIt’s nothing too complicated: combine Hydrogen, Nitrogen, and Oxygen to make &eNitric Acid&r in infinite quantities. As for Sulfuric Acid, you probably already know it’s just Sulfur and Water — right?\n\nOnce you get this chain going, Nitrobenzene becomes one of the most powerful fuels for gas burning.", - "quests.gregtech_energy.lgt_fuel.task": "Gas in a bucket?", - "quests.gregtech_energy.lst_fuel.title": "This is Steam", - "quests.gregtech_energy.lst_fuel.subtitle": "Not much of a choice", - "quests.gregtech_energy.lst_fuel.desc": "Steam isn’t complicated — just boil water.\n\nTo do it efficiently, we recommend using &6Large Boilers&r. There's four versions: one each for &8ULV&r, &bMV&r, &5EV&r, and &1IV&r. Each tier provides a strong increase in steam output.\n\nHowever, be aware: the scaling of the &dLarge Steam Turbine&r with these boilers is not the best compared to other power generation methods.\n\nMost players will skip the Titanium and Tungstensteel Boilers — they exist if you want them, but aren’t worth building. Steam just doesn't scale very well!\n\nAs a reminder: &e2 mB&r of steam = &e1 EU&r.", - "quests.gregtech_energy.lst_fuel.task": "I will switch to a denser fuel", - "quests.gregtech_energy.lst_fuel.task.1": "Large Boilers", - "quests.gregtech_energy.lce_fuel.title": "Liquid Fuel", - "quests.gregtech_energy.lce_fuel.subtitle": "The polluter's favourite", - "quests.gregtech_energy.lce_fuel.desc.1": "All of these fuels are used for &6Combustion Generators&r — ranked here from the least efficient to the best.\n\nDuring &bMV&r, we recommend starting with Diesel or Biodiesel. Later on, you can upgrade to Cetane-Boosted Diesel at &6HV&r by mixing it with Nitrogen, Hydrogen, and Oxygen.", - "quests.gregtech_energy.lce_fuel.desc.2": "Once you reach &5EV&r and get your hands on a &6Distillation Tower&r, it's time to switch over to Gasoline and High Octane Gasoline. Don’t attempt this too early — oils need to be distilled properly, and doing it with a regular Distillery is not efficient at all.\n\nTo make this work, you'll need a combination of oil distillation and some organic compound processing. Thankfully, a Pyrolyse Oven and a Distillation Tower will handle it all smoothly.\n\nIf you manage a steady supply of High Octane Gasoline, you should be able to finish the entire modpack running only on Combustion Generators.", - "quests.gregtech_energy.lce_fuel.task": "I got enough", - "quests.gregtech_energy.large_solar.subtitle": "Huge Easy Power", - "quests.gregtech_energy.large_solar.desc.1": "The Large Solar Array MK I will be your go-to solution if you want to set up a larger base on the Moon.\n\nIt’s especially useful for &bAE2&r processing lines, and it can also power your Bedrock Miners.\n\nDon’t forget that you can use the GregTech Terminal item to build the multiblock instantly by sneak-right-clicking on the controller.\n\nCheck the available recipes by simply pressing &eU&r on the controller to see your options.", - "quests.gregtech_energy.large_solar.desc.2": "&6The Large Solar Array MK I&r comes with &92 different recipes&r:\n\n&9• Passive Mode&r —\nThis mode slowly consumes &dPhotovoltaic Cells&r, meaning it's fine when you're actively setting up your base if you throw a stack in there, but won't last forever. It will only generate &62A HV&r during the day — enough for basic systems, but far from optimal.\n\n&9• Active Mode&r —\nIf you want to &amaximize the energy output&r, you’ll need to manage coolant. This will require your Moon Base to be more built up, but the reward is you get &52A EV&r instead!\n\nThere's also MK II and MK III versions for higher tiers, requiring more advanced coolants.", - "quests.gregtech_energy.large_solar_t2.subtitle": "Even stronger", - "quests.gregtech_energy.large_solar_t2.desc.1": "If you're building an &dAE2 base on the Moon&r, chances are you'll need a lot more energy. That's where the &6Large Solar Array MK II&r comes in!\n\nJust like the MK I, it offers 2 different recipes — but this time, neither is fully passive.", - "quests.gregtech_energy.large_solar_t2.desc.2": "Both &bSolar Coolant&r and &bCryogenized Fluix&r are fully renewable on the Moon. In fact, the Solar Coolant loop recycles its &eFluorine&r and &eChlorine&r inputs — meaning you only need a steady supply of:\n\n• Helium-3 — can be extracted with a &aFluid Drill Rig&r\n• Water — collect it passively with an &aAqueous Accumulator&r\n\n&cPower emergency fallback:&r\nIf your fluid supply is interrupted, the LSA MK II can still operate using Photovoltaic Cells.\nThis fallback method keeps your base online while you troubleshoot the issue.\n\nA must-have for any serious off-world AE2 infrastructure.", - "quests.gregtech_energy.large_solar_t3.subtitle": "Maximal Power", - "quests.gregtech_energy.large_solar_t3.desc": "The final tier is the &6Large Solar Array MK III&r. It works the same way as the MK II, but its new Solar Coolant requires the addition of &aArgon&r and &bSilica Aerogel&r.\n\nYou should already be familiar with &bSilica Aerogel&r — you used it in your &dRocket Tier 3&r.\nHowever, it's much harder to produce on the Moon, and you may need a constant supply shipped from &aEarth&r.\n\nWe’ll let you decide how to handle this logistical challenge — whether it’s through automation, or interplanetary transport, the choice is yours.\n\n&eHigh-tech energy&r demands &chigh-level infrastructure&r. Plan wisely!", - "quests.gregtech_energy.solar_panel.subtitle": "Light in the Dark", - "quests.gregtech_energy.solar_panel.desc": "The Solar Panel will be your first source of power on the Moon.\n\nThey produce 32 EU/t during daytime, but keep in mind they actually generate RF, so you’ll need a Converter to transform it into EU.\n\nYou can use one &bMV Converter&r for up to 2 Solar Panels or a &6HV Converter&r for up to 4 Solar Panels.", - "quests.gregtech_energy.storage.title": "Storing Energy", - "quests.gregtech_energy.storage.subtitle": "Gotta put all that juice somewhere", - "quests.gregtech_energy.storage.desc": "Storing your energy is one of the most fundamental pillars of the power system in GregTech.\n\nWhy is that? Simply because even the strongest generators won't be enough to keep up when you start a big craft — especially in late game.\n\nTo deal with this, GregTech provides multiple solutions to store astronomical amounts of EU. These storages act as a buffer between your energy production and the machines that drain it during complex operations.\n\nWhether you’re preparing for a Fusion Reactor, an LCR, or any HV-IV scale crafting chain, you’ll need that extra backup of energy to keep everything stable.\n\nDon’t underestimate the power of a good battery — it may just be the thing that saves your base from a blackout during critical moments.", - "quests.gregtech_energy.storage.task": "I understand", - "quests.gregtech_energy.tank.title": "Storing Fuel", - "quests.gregtech_energy.tank.subtitle": "There's more kinds of batteries than just electric ones", - "quests.gregtech_energy.tank.desc.1": "Obviously, storing energy can also mean storing the fuel that makes it.\n\nFor this scenario, while Drums and Crates are decent early options, you should not overlook the &dSuper Tank&r and the &dSuper Chest&r.", - "quests.gregtech_energy.tank.desc.2": "These beasts are capable of storing tremendous amounts of fluid or items — perfect for automated energy setups, especially when you want to generate power far away from your main base without having to build an entire cable network.\n\nJust load them up with gas, fuel, steam or even plasma, and let them handle the rest. With proper planning, your outposts can be fully operational with no live connection to your central grid.\n\nEnergy doesn’t always come in wires — sometimes, it comes in barrels.", - "quests.gregtech_energy.tank.task": "Any Super Tank", - "quests.gregtech_energy.battery_buffer.title": "Battery Buffer", - "quests.gregtech_energy.battery_buffer.subtitle": "The basic battery buffer beckons batteries", - "quests.gregtech_energy.battery_buffer.desc.1": "Battery Buffers are your basic machines to store and manage energy — though technically, they don’t store energy on their own. They simply serve as a housing for your batteries.\n\n&c⚠ If you don’t want them to explode&r:\n- &4Never input higher-tier energy&r into a lower-tier Battery Buffer.\n- Batteries can only be charged if they are of &cequal or lower tier&r than the Battery Buffer.", - "quests.gregtech_energy.battery_buffer.desc.2": "A Battery Buffer can accept up to 2x its output amperage.\nSo for example, a 4x Battery Buffer can take in &a8A&r — but will only output &e4A&r max (1A per battery slot).\n\n&eReminder&r:\n- No batteries = no output.\n- The number of batteries determines the number of Amps it outputs. (That means a &68x Battery Buffer&r with only &e3 batteries&r will only output &e3A&r.)\n\nUse them wisely — they are the foundation of any stable energy network.", - "quests.gregtech_energy.battery_buffer.task.1": "Any battery buffer", - "quests.gregtech_energy.battery_buffer.task.2": "Another one", - "quests.gregtech_energy.pss.title": "The Power Substation", - "quests.gregtech_energy.pss.subtitle": "All your eggs in one basket", - "quests.gregtech_energy.pss.desc.1": "The &dPower Substation&r — also known as the &dPSS&r — is the &6ultimate custom battery multiblock&r. Once you're able to craft it in &1IV&r, it should easily serve as your base's central source of power, so it can be a good thing to focus towards.\n\nIt can store so much energy... you’d probably need multiple lifetimes to fill it.", - "quests.gregtech_energy.pss.desc.2": "&eHow it works&r:\n- Build the structure using &aPalladium Substation Casings&r.\n- Add at least &b1 Energy Hatch&r (input) and &b1 Dynamo Hatch&r (output).\n- It accepts &aany hatch&r — &8Amperage-based&r or &6Laser&r.\n- &cNo risk of explosion&r — transformers are &aintegrated&r.\n\n&eCapacitor Layers&r:\n- You can add up to &d17 layers&r of &9Capacitor Blocks&r on top of the structure.\n- Each layer must be &cfully filled&r — no gaps.\n- Mix &fempty&r and &6full&r capacitors however you like.\n\nSurround each layer with &bLaminated Glass&r.\n\nLet’s be honest: &cYou’ll never need 17 layers&r... but hey, it’s nice to dream big.\nIf you ever do build a full 17-layer PSS, &lplease send help&r — you’ve gone too far.", - "quests.gregtech_energy.batteries.title": "Super Batteries", - "quests.gregtech_energy.batteries.subtitle": "Sci-Fi power storage", - "quests.gregtech_energy.batteries.desc": "In &7LV&r and &bMV&r, you probably built your first batteries made of Sodium or Lithium.\n\nBut let’s be real — these are the weakest batteries GregTech has to offer.\n\nIn this quest, we’ll look at the powerful alternatives: the &acrystal batteries&r.\nThey are much more potent, store way more energy, and can help you push your factory to the next tier.\n\nAre they more expensive? Of course. But let’s be real...\nPower is Power. Who’s counting?", - "quests.gregtech_energy.batteries.task": "Any crystal battery", - "quests.gregtech_energy.spending_energy.title": "Spending Energy", - "quests.gregtech_energy.spending_energy.subtitle": "Oh you will spend energy", - "quests.gregtech_energy.spending_energy.desc.1": "How to spend all this energy?\n\nUse your machines! Sounds simple, right?\nWell... not exactly. There are many small details that you should learn to help you on your quest to completing &3TerraFirmaGreg&r.\n\nBasic Machines:\n- These machines are simple.\n- They can request up to &a2A&r each.\n- If you input a higher tier of energy... &4\uD83D\uDCA5 they explode&r.\n\nGregTech Multiblocks:\nNow things get interesting. Multiblocks offer more flexibility and power — &eif&r you understand how they work.", - "quests.gregtech_energy.spending_energy.desc.2": "Standard Mechanics:\n- If a multiblock can accept two Energy Hatches (most of them), this allows you to use higher-tier recipes than the machine’s base tier.\n\nExample:\nIf you're using a Large Mixing Vessel and you install two IV Energy Hatches, it will be able to process &cLuV&r-tier Mixer recipes.\n\nThis is one of the key benefits of multiblocks over single-block machines — to upgrade them to the next tier, you only have to swap out their energy hatches instead of replacing the whole machine.", - "quests.gregtech_energy.spending_energy.desc.3": "Some multiblocks only accept one Energy Hatch, but that doesn't mean you're limited to 1A!\n\nYou can still use a 4A or 16A Energy Hatch. This will allow &bOverclocking&r of recipes but not the recipe tier.\n\nExample:\nThe Large Circuit Assembler only allows one Energy Hatch. If you install a 4A IV Energy Hatch, you will be able to overclock all IV and lower recipes.\n\nHowever, it cannot craft LuV-tier recipes because the machine doesn't support multiple hatches. That limitation is intentional, to prevent skipping the GregTech progression system.", - "quests.gregtech_energy.spending_energy.desc.4": "So remember: More amps on a single hatch means faster processing, but two hatches are required to unlock higher-tier recipes.", - "quests.gregtech_energy.spending_energy.task": "I understand", - "quests.gregtech_energy.overclock.title": "Overclock", - "quests.gregtech_energy.overclock.subtitle": "Basic upgrade mechanic", - "quests.gregtech_energy.overclock.desc.1": "Have you heard about Overclocking, but don't really understand what it is? Let's take some time to explain it.\n\nWe should start with the basics:\n&dLV&r represents a maximum of 32 EU/t — sometimes less, but never more.\n&dMV&r goes up to 128 EU/t.\n&dHV&r reaches 512 EU/t.\nBasically, every tier is a 4x increase in power usage.", - "quests.gregtech_energy.overclock.desc.2": "What happens when you run a lower-tier recipe in a higher-tier machine? That's what we call &eOverclocking&r!\n\nAn &dMV&r recipe (33–128 EU/t) run in an &dHV&r machine will both: 1) Use 4x more energy, and 2) Be 2x faster.\n\nThe same MV recipe in an &dEV&r machine? 16x the energy cost, but only 4x faster.\n\nAs you can see, it's more power efficient to use multiple machines rather than overclocking a single one.\nBut let's be real: in most setups, you’ll prefer overclocking to building a ton of the same machines.\n\nStill, it's good to know this early on, when energy is tight.", - "quests.gregtech_energy.overclock.desc.3": "There’s a special kind of overclocking exclusive to just a few multiblocks: &ePerfect Overclocking&r.\nHere, instead of 4x energy for 2x speed, you get &a4x energy&r for &a4x speed&r! This makes it just as efficient as running multiple machines.\n\nCurrently in TerraFirmaGreg, only the following multiblocks support this:\n- Electric Blast Furnace\n- Alloy Blast Smelter\n- Rotary Heat Furnace\n- Large Chemical Reactor\n- Electric Greenhouse", - "quests.gregtech_energy.overclock.task": "So the red ones go faster, got it", - "quests.gregtech_energy.blast_oc.title": "The Blast Overclocking", - "quests.gregtech_energy.blast_oc.subtitle": "You don't need to understand this one", - "quests.gregtech_energy.blast_oc.desc.1": "If you haven't learnt about Perfect Overclocking yet, you should read the quest right above this one first.\n\nThese three multiblocks share a special ability: they can &ePerfect Overclock&r recipes depending on the &ctemperature of the machine&r. You can check the current temperature by clicking on the controller.\n\nThere are two ways to increase the temperature:\n1) Use higher-tier energy inputs\n2) Upgrade the coils", - "quests.gregtech_energy.blast_oc.desc.2": "To see the temperature of a coil, simply &3hold Shift&r while hovering over it.\n\nOnce you know your machine's temperature, you’ll need the temperature of the recipe. The easiest way to find it is to use EMI.\n\nWith both values, you can do a quick calculation to see if Perfect Overclocking applies:\n&bYour machine must be at least 1800K hotter per overclock tier than the recipe requires.&r", - "quests.gregtech_energy.blast_oc.desc.3": "Example:\n- Stainless Steel recipe requires &c1700K&r and is &aHV&r tier.\n- Your EBF is at &bLuV&r and has a temperature of &c5900K&r.\n- HV to LuV is &a3 overclock tiers&r.\n- 1800 x 3 = &c5400K&r → Add the recipe's base: 5400 + 1700 = &c7100K&r needed for full Perfect Overclock.\n- Since your machine is only at &c5900K&r, you will Perfect Overclock from HV to EV and EV to IV, but only a normal overclock from IV to LuV.\n\nSo the recipe will take 1.7 seconds instead of 0.85 seconds if it were fully overclocked.\n\nFeeling overwhelmed? Just remember this: better coils = faster and cheaper recipes.", - "quests.gregtech_energy.blast_oc.task": "Better coils more gooder, got it", - "quests.gregtech_energy.subtick.title": "Subtick", - "quests.gregtech_energy.subtick.subtitle": "Parallel?", - "quests.gregtech_energy.subtick.desc.1": "Another hidden mechanic in GregTech Multiblocks: the &dSubtick&r.\n\nWhat is it? Subtick activates when a recipe becomes so fast it takes less than one tick to process. Normally, machines can’t go faster than one recipe per tick — but with Subtick, they can!\n\nHow does it work? Once a recipe hits 1 tick duration, upgrading the Energy Hatch further won’t make it faster.\nBut thanks to Subtick, instead of wasting power, the machine will &aparallel the recipe internally&r.", - "quests.gregtech_energy.subtick.desc.2": "For example: If your Large Chemical Reactor (LCR) runs a LuV recipe at 1 tick, then at ZPM, it will run &e2 recipes per tick&r. Even faster hatches mean more internal parallel.\n\n&dNote&r: As of now, all the Large Machines can subtick in a limited way, but &aonly the LCR&r supports both Subtick and Perfect Overclocking. That’s also why there's no IV multiblock with parallel hatches for the LCR: it’s already doing it... but better.", - "quests.gregtech_energy.parallel_hatch.title": "Parallel Hatch", - "quests.gregtech_energy.parallel_hatch.subtitle": "Parallel again?", - "quests.gregtech_energy.parallel_hatch.desc.1": "The &dParallel Hatch&r is the main draw of the Large Multiblocks.\n\nWhat does it do?\nWhere allowed (mostly on the Multiblocks crafted from the Alloy Blast Smelter), it lets you run &amultiple recipes at the same time&r.\n\nIt does this by consuming more energy per tick, but massively increasing throughput. Perfect if you’re mass-producing alloys, circuits, or plates.", - "quests.gregtech_energy.parallel_hatch.desc.2": "Just place a Parallel Hatch on the Multiblock and make sure it’s fed with enough energy and input materials. Most multiblocks that allow it will show so in EMI or in the questbook.\n\n&dNote&r: The Large Chemical Reactor does not use Parallel Hatches — it already comes with something better called &bSubtick&r — read the nearby quest to find out more.", - "quests.gregtech_energy.parallel_hatch.task": "Any Parallel Hatch", - "quests.gregtech_energy.rotor.title": "Turbine Rotors", - "quests.gregtech_energy.rotor.subtitle": "So many choices!", - "quests.gregtech_energy.rotor.desc.1": "Rotor Holders naturally require a Rotor to use, but there's a lot of options and they all have different stats, so what do they all mean?\n\nHigher &9Efficiency&r will increase the time each mB of fuel is used for, effectively reducing fuel usage. Meanwhile, &9Power&r will increase how much EU the turbine will generate. Lastly, &9Durability&r should be obvious.", - "quests.gregtech_energy.rotor.desc.2": "Ideally, you'll want to maximize all three, but the choice will depend on how much fuel you're producing, how many turbines you have, and how often you want to replace them, so there's no definitive correct answer. &8(Besides neutronium, of course...)&r\n\nThat being said, if you're completely lost, we recommend Vanadium Steel in &6HV&r, Ultimet in &5EV&r, and HSS-S in &9IV&r.\n\nUnfortunately, you can't automatically pipe new rotors into rotor holders as they need the block in front of them to be completely empty, but a &aMechanical Arm&r will work!", - "quests.gregtech_energy.rotor.task": "Any Turbine Rotor", - "quests.gregtech_energy.fission_reactor.title": "Fission Reactor MK I", - "quests.gregtech_energy.fission_reactor.subtitle": "Strap yourself in, this is complicated", - "quests.gregtech_energy.fission_reactor.desc.1": "The &dFission Reactor&r is certainly an uncommon sight in GregTech - both in theme, and how it works. But fear not, we are here to guide you with this multi-purpose big-brain multiblock!\n\nWe'll spare you the physics for now, &efellow engineer&r. The most important thing you should know is that the reactor is like a big thermal &dbattery-generator&r. You input proper fuel, and get &cheat&r (just like &6EU/t&r) that gets stored in the reactor as &crising temperature&r (stored &6EU&r).\n\nYou can then transfer this heat to &9coolant fluids&r for running turbines, or performing EBF-style crafting recipes. Sometimes you may even have &ctoo much&r of it. And oh, you also get new elements to make new fuels and circuits and stuff. Maybe explore the solar system a bit more? Boring stuff.", - "quests.gregtech_energy.fission_reactor.desc.2": "To start off, get your hands on some &dThorium&r. Remember to wear all the relevant PPE - &eDeatek Intergalactic&r is not responsible for any bodily harm resulting from improper handling of fissile materials. We really shouldn't have to remind you at this point anymore. Check the hazards quest if you need a refresher.\n\nNext, craft some empty &dFuel Rods&r and fill them with the &dNuclear Fuel Processing Plant&r. The rods are reusable, so you don't have to make too many. In fact, you might want to make just a single one for now.\n\nYou'll of course need a completed reactor, too. Check the EMI preview. Note how there is a central column of Fuel Holders, and then some optional columns for Components and Material Holders - more of these later.\n\nWait. Why just a &osingle&r rod? Oh, are &ewe&r glad you asked. Let's delve deep into the reactor mechanics in the next page.", - "quests.gregtech_energy.fission_reactor.desc.3": "The more fuel rods you have installed in the reactor, the &chotter&r it gets. And the hotter it is, the more heat it is able to transfer out to the coolant fluid and processable items. But physics has its limits, and the reactor can only ever get &cso hot&r, so don't install too many fuel cells.\n\nBut fear not! Unlike how the &0big-oil&r propaganda machine insists, nuclear energy is &aperfectly safe&r. Should the heat level of the reactor border dangerous territory, the reactor enters an &9automatic cooldown sequence&r, and won't start again until all heat has been &asafely dissipated&r. It's quite slow, though.\n\nThere has to be a way to make it hotter and faster? Once again, good thing you asked! &eOur brilliant engineers&r have a solution for you!", - "quests.gregtech_energy.fission_reactor.desc.4": "In addition to the 5 &dFuel Holders&r, you can install &oup to&r 20 &dComponents&r. The reactors from some other manufacturers require very exact positioning, but our reactor is smarter. The &6stats&r of all installed ones will simply be &6summed up&r, and that's it!\n\nCurrently, the reactor is able to utilize them in three&8*&r different ways:\n&e1)&r Max temperature &7(insulator)&r\n&e2)&r Efficiency &7(fuel lasts longer)&r\n&e3)&r Throttle &7(slows down the reactions)&r\n\n&8*)&r It's possible your local galaxy doesn't have the necessary materials for all of them. We estimate to find materials only for the first category.\n\nBut be wary. Rising the &ctemperature&r comes with a &cdownside&r.", - "quests.gregtech_energy.fission_reactor.desc.5": "While a &chotter&r reactor makes coolants and processing &cfaster&r, it is also more demaning for the fuel rods. Each fuel rod has limited durability, and this scales linearly with the temperature.\n\nAs you need more fuel rods for the higher heat, this in effect makes the damage scale &nquadratically&r. If you want to heat coolants the most efficiently, you'll use low temperature. But if you want faster fissile conversion, use as high a heat as the insulation allows.", - "quests.gregtech_energy.fission_reactor.desc.6": "You are finally ready to take a look at the various recipes involving the reactor; check where the &dcontroller&r is used, and you'll find three &eEMI&r tabs:\n\n&e1)&r Fission Reactor &7(fuels and compatible coolants)&r\n&e2)&r Fission Heat Processing &7(think: EBF)&r\n&e3)&r Fission Products &7(when the fuel runs out)&r\n&e4)&r The multiblock preview\n\nVarious &afuels&r are only compatible with certain &9coolant fluids&r, so pay attention to this. And once a fuel rod is completely used up, statistical certainty can safely state it having &btra&dns&rf&dor&bmed&r into new elements.\n\nThe processing recipes on the other hand can run regardless of the fuel, as long as the temperature level is high enough.", - "quests.gregtech_energy.fission_reactor.desc.7": "The simplified math is as follows: with sufficient coolant fluid and a &c100%%&r heat fuel rod, the reactor will reach a temperature of about &c200&r. This can also be referred to as heat level, or just heat. Having &dtwo&r &c100%%&r fuel cells is equal to &done&r &c200%%&r cell, and both lead to about &c400&r heat.\n\nThis is because the fuel rod generates &6200 HU/t&r (heat units). Coolant fluids are able to extract &61 HU/t&r per &c1&r degree of heat.\n\nIf the reactor's max heat is &c190&r, a &c100%%&r fuel cell will overheat it. You can increase this with the components, or alternatively &dactive coolants&r via the processing system. Each recipe has a heat impact.", - "quests.gregtech_energy.fission_reactor.desc.8": "For example, if the recipe's temperature is &c100&r, and impact &6-10 HU/t&r, it is able to cool down the reactor by &619 HU/t &rat &c190&r degrees.\n\nThat makes it possible to run the reactor with lower max heat, and not overheat! If the temperature is below &c100&r, it won't run at all - just like EBF recipes have limits.\n\nThis is all &ewe&r can teach you for now. Come back later to see if there was been any advancements, &efellow nuclear engineer&r!", + "quests.gregtech_energy.lpt_fuel.task": "Я не хочу делать ведро плазмы", + "quests.gregtech_energy.lgt_fuel.title": "Газовое топливо", + "quests.gregtech_energy.lgt_fuel.subtitle": "Любимчик сообщества", + "quests.gregtech_energy.lgt_fuel.desc.1": "Все эти виды топлива используются для &2газовых турбин&r — здесь они отсортированы от наименее эффективных к лучшим.\n\nВ целом &bГазовая турбина&r немного дешевле своего аналога — &bдизельного генератора&r, однако &eгазовое топливо&r обладает меньшей энергетической плотностью по сравнению с жидким топливом. Это не значит, что оно хуже — лишь то, что для достижения той же выработки вам потребуется больше миллибакетов (mB). На более поздних этапах прогрессии их можно использовать в &2Большой газовой турбине&r — очень мощном многоблочном механизме, который требует чуть больше внимания и управления.", + "quests.gregtech_energy.lgt_fuel.desc.2": "В TerraFirmaGreg &eгазовое топливо&r было значительно переработано и перебалансировано. &6Мы не рекомендуем полагаться на &eБензол&r или &eНитробензол&r, так как они были сильно ослаблены.&r В начале &7LV&r мы советуем использовать &eСингаз&r или &eСУГ&r, если вы хотите перерабатывать нефтяной песок. Позже вы сможете перейти на &eРиформат-газ&r на этапе &bMV&r и ещё больше улучшить его производство после открытия &2Крекингового завода&r.", + "quests.gregtech_energy.lgt_fuel.task": "Газ... В ведре?", + "quests.gregtech_energy.syngas.title": "Сингаз", + "quests.gregtech_energy.syngas.subtitle": "А почему он не синий?", + "quests.gregtech_energy.syngas.desc": "&eСинтез-газ&r — это новое газовое топливо в TFG. Его можно открыть очень рано, уже на этапе &8ULV&r, и использовать в ваших первых &6газовых турбинах&r во время &7LV&r. Это не особо мощное топливо, но его можно перерабатывать в ценные побочные продукты, такие как &eСмазка&r, &eМетан&r и &eВодород&r.\n\nНесмотря на то, что это не самый сильный вариант и его может быть сложно масштабировать, используя всего три &6Коксовые печи&r и одну &6Варочную машину&r или &6Вакуумную камеру&r, ты сможешь обеспечить стабильное производство, которого должно хватить, чтобы дойти до этапа &bMV&r и открыть значительно более мощный &eРиформат-газ&r.", + "quests.gregtech_energy.reformate_gas.title": "Риформат-газ", + "quests.gregtech_energy.reformate_gas.subtitle": "Это реформат Бензола?", + "quests.gregtech_energy.reformate_gas.desc.1": "&9Риформат-газ&r — это новое и мощное газовое топливо, которое на этапе &bMV&r выполняет привычную роль бензола.\n\nДля его производства вам потребуется построить &6Башню сжижения угля&r и получить немного &5Рения&r из жил &6Таркианита&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": "BTX", + "quests.gregtech_energy.btx.subtitle": "Not a korean band", + "quests.gregtech_energy.btx.desc": "The BTX Fuel is NYI", + "quests.gregtech_energy.fission_rod.title": "Fission Fuels", + "quests.gregtech_energy.fission_rod.subtitle": "Don't get me too hot", + "quests.gregtech_energy.fission_rod.desc.1": "The Earth Fission materials are NYI but may come sooner than later", + "quests.gregtech_energy.fission_rod.desc.2": "", + "quests.gregtech_energy.fission_rod.task": "", + "quests.gregtech_energy.smr.title": "Small Modular Reactor", + "quests.gregtech_energy.smr.subtitle": "Finally Power for these far outposts", + "quests.gregtech_energy.smr.desc.1": "The Small Modular Reactor is NYI but may come sooner than later", + "quests.gregtech_energy.smr.desc.2": "", + "quests.gregtech_energy.smr.task": "", + "quests.gregtech_energy.gasoline.title": "Бензин", + "quests.gregtech_energy.gasoline.subtitle": "Средний ребёнок", + "quests.gregtech_energy.gasoline.desc": "&aБензин&r — это действительно мощное жидкое топливо, которое вы открываете на этапе &6HV&r, но на практике начинаете производить его лишь после постройки первых &6Ректификационных колонн&r. &7Толуол&r легко получается из &7Древесной смолы&r или &7Тяжёлого топлива&r, а всё остальное, что вам понадобится, — это &dНефтяной газ&r, &8Нафта&r и смесь из &3Кислорода&r, &bВодорода&r и &1Углерода&r.\n\nОн мощный, довольно простой в производстве и, что ещё лучше, его можно улучшить до &cВысокооктанового бензина&r.", + "quests.gregtech_energy.high_gasoline.title": "Высокооктановый бензин", + "quests.gregtech_energy.high_gasoline.subtitle": "Крайне мощный", + "quests.gregtech_energy.high_gasoline.desc": "Прямое улучшение &cБензина&r — это &5топливо в два раза мощнее&r. Как ни странно, по названию этого не скажешь: вам нужно добавить не только &dОктан&r, но и другие продукты &8Нефтепродуктов&r. На этом этапе мы ожидаем, что вы уже умеете ориентироваться в &bEMI&r и можете начать производство этого безумно мощного топлива.", + "quests.gregtech_energy.lst_fuel.title": "Это пар", + "quests.gregtech_energy.lst_fuel.subtitle": "Не в масть тебе такие котлы", + "quests.gregtech_energy.lst_fuel.desc": "Пар — это несложно: просто вскипяти воду.\n\nДля эффективного производства мы рекомендуем использовать &6Большие котлы&r. Существует четыре версии: для &8ULV&r, &bMV&r, &5EV&r и &1IV&r. Каждый уровень даёт значительный прирост выхода пара.\n\nОднако имейте в виду: масштабирование &dБольшой паровой турбины&r с этими котлами не самое эффективное по сравнению с другими способами генерации энергии.\n\nБольшинство игроков пропускают титановые и вольфрамстальные котлы — они существуют, если тебе очень хочется, но строить их невыгодно. Пар просто плохо масштабируется!\n\nНапоминание: &e2 mB&r пара = &e1 EU&r.", + "quests.gregtech_energy.lst_fuel.task": "Я перейду на более энергоемкое топливо", + "quests.gregtech_energy.lst_fuel.task.1": "Большие котлы", + "quests.gregtech_energy.lce_fuel.title": "Жидкое топливо", + "quests.gregtech_energy.lce_fuel.subtitle": "Любимец тех, кому плевать на экологию", + "quests.gregtech_energy.lce_fuel.desc.1": "Все эти виды топлива используются для &6Дизельного генератора&r — здесь они отсортированы от наименее эффективных к лучшим.\n\nНа ранних этапах игры мы рекомендуем начинать с дизеля или биодизеля. Позже ты сможешь улучшить их до &6нитро-дизеля&r на этапе &6HV&r, смешав его с азотом, водородом и кислородом.", + "quests.gregtech_energy.lce_fuel.desc.2": "Как только ты достигнешь &5EV&r и получишь в своё распоряжение &6Ректификационные колонны&r, самое время перейти на бензин и высокооктановый бензин. Не пытайтся делать это слишком рано — нефть нужно правильно дистиллировать, а использование обычных дистилляторов для этого совершенно неэффективно.\n\nЧтобы всё заработало, вам понадобится сочетание дистилляции нефти и переработки некоторой органики. К счастью, пиролизная печь и Ректификационная колонна справятся с этим без проблем.\n\nЕсли тебе удастся обеспечить стабильное производство высокооктанового бензина, ты сможешь пройти весь модпак, используя только дизельные генераторы.", + "quests.gregtech_energy.lce_fuel.task": "Пон", + "quests.gregtech_energy.large_solar.subtitle": "Огромная лёгкая энергия", + "quests.gregtech_energy.large_solar.desc.1": "Большой солнечный массив MK I станет для тебя основным решением, если ты хочешь обустроить крупную базу на Луне.\n\nОна особенно полезна для производственных линий &bAE2&r и также может питать твои добытчики лунной пыли.\n\nНе забывай, что ты можешь использовать «Терминал» из GregTech, чтобы мгновенно построить мультиблок, зажав Shift и кликнув ПКМ по контроллеру.\n\nПроверь доступные рецепты, просто нажав &eU&r на контроллере, чтобы увидеть все варианты.", + "quests.gregtech_energy.large_solar.desc.2": "&6Большой солнечный массив MK I&r имеет &92 разных рецепта&r:\n\n&9• Пассивный режим&r —\nВ этом режиме она медленно расходует &dбазовые фотооэлектрические ячейки&r, так что он подходит, когда ты активно обустраиваешь базу и просто закидываешь туда стак, но вечно так работать не будет. Днём она будет генерировать всего &62A HV&r — достаточно для базовых систем, но далеко не оптимально.\n\n&9• Активный режим&r —\nЕсли ты хочешь &aмаксимизировать выработку энергии&r, тебе придётся управлять охлаждающей жидкостью. Для этого лунная база должна быть более развитой, но награда того стоит: вместо этого ты получишь &52A EV&r!\n\nТакже существуют версии MK II и MK III для более высоких тиров, которым требуются более продвинутое охлаждение.", + "quests.gregtech_energy.large_solar_t2.subtitle": "Еще сильнее", + "quests.gregtech_energy.large_solar_t2.desc.1": "Если ты строишь &dбазу AE2 на Луне&r, скорее всего, тебе понадобится гораздо больше энергии. И тут на помощь приходит &6Большой солнечный массив MK II&r!\n\nКак и версия MK I, она предлагает 2 разных рецепта — но на этот раз ни один из них не является полностью пассивным.", + "quests.gregtech_energy.large_solar_t2.desc.2": "И &bСолнечный хладагент&r, и &bКриогенизированный флюис&r полностью возобновляемы на Луне. Более того, цикл солнечного охладителя возращает входящие &eФтор&r и &eХлор&r — а значит, тебе нужен лишь стабильный приток:\n\n• Гелия-3 — его можно добывать с помощью &aЖидкостной буровой установки&r\n• Воды — собирай её пассивно с помощью &aжидкостного коллектора&r\n\n&cАварийный режим питания:&r\nЕсли подача жидкостей прервётся, MK II всё равно сможет работать, используя фотооэлектрические ячейки.\nЭтот резервный режим позволит базе оставаться со светом, пока ты разбираешься с проблемой.\n\nОбязательный элемент для любой серьёзной внеземной AE2-инфраструктуры.", + "quests.gregtech_energy.large_solar_t3.subtitle": "Максимальная мощность", + "quests.gregtech_energy.large_solar_t3.desc": "Финальный уровень — это &6Большой солнечный массив MK III&r. Она работает так же, как и MK II, но её новый солнечный хладагент требует добавления &aАргона&r и &bСиликаьного аэрогеля&r.\n\nС С &bСиликаьным аэрогелем&r ты уже должен быть знаком — ты использовал его в своей &dРакете 3-го тира&r.\nОднако на Луне производить его гораздо сложнее, и тебе может понадобиться постоянная поставка с &aЗемли&r.\n\nКак справляться с этой логистической задачей — решать тебе: будь то автоматизация или межпланетная транспортировка.\n\n&eВысокотехнологичная энергия&r требует &cинфраструктуры высокого уровня&r. Планируй с умом!", + "quests.gregtech_energy.solar_panel.subtitle": "Свет во тьме", + "quests.gregtech_energy.solar_panel.desc": "Солнечная панель станет для тебя первым источником энергии на Луне.\n\nДнём она вырабатывает 32 EU/t, но имей в виду, что на самом деле она генерирует RF, так что тебе понадобится конвертер, чтобы преобразовать его в EU.\n\nТы можешь использовать один &bMV преобразователь энергии&r максимум для 4 солнечных панелей.", + "quests.gregtech_energy.storage.title": "Хранение энергии", + "quests.gregtech_energy.storage.subtitle": "Нужно же куда-то девать всю эту энергию", + "quests.gregtech_energy.storage.desc": "Хранение энергии — один из самых фундаментальных столпов энергосистемы в GregTech.\n\nПочему так? Всё просто: даже самые мощные генераторы не смогут справляться, когда ты запускаешь крупный крафт — особенно в поздней игре.\n\nЧтобы решить эту проблему, GregTech предлагает несколько способов хранения астрономических объёмов EU. Эти хранилища работают как буфер между твоей генерацией энергии и машинами, которые резко её потребляют во время сложных операций.\n\nГотовишься ли ты к термоядерному реактору, БХР или к масштабной крафтовой цепочке уровня HV–IV — тебе обязательно понадобится этот дополнительный запас энергии, чтобы всё работало стабильно.\n\nНе недооценивай силу хорошей батареи — именно она может спасти твою базу от блэкаута в самый критический момент.", + "quests.gregtech_energy.storage.task": "Я понял", + "quests.gregtech_energy.tank.title": "Хранение топлива", + "quests.gregtech_energy.tank.subtitle": "Существует больше видов батарей, чем просто электрические", + "quests.gregtech_energy.tank.desc.1": "Очевидно, что хранение энергии может означать и хранение топлива, из которого она производится.\n\nДля такого случая, хотя бочки и ящики — неплохие варианты на ранних этапах, тебе не стоит игнорировать &dСупер резервуар&r и &dСупер сундук&r.", + "quests.gregtech_energy.tank.desc.2": "Эти монстры способны хранить колоссальные объёмы жидкостей или предметов — идеально для автоматизированных энергетических схем, особенно если ты хочешь генерировать энергию далеко от основной базы, не прокладывая целую сеть кабелей.\n\nПросто загрузи их газом, топливом, паром или даже плазмой — и пусть они делают всё остальное. При правильном планировании твои аванпосты могут полностью работать автономно, без прямого подключения к центральной энергосети.\n\nЭнергия не всегда передаётся по проводам — иногда она приходит в бочках.", + "quests.gregtech_energy.tank.task": "Любой супер резервуар", + "quests.gregtech_energy.battery_buffer.title": "Батарейный буфер", + "quests.gregtech_energy.battery_buffer.subtitle": "Батарейный буфер так и просит, чтобы в него вставляли батареи", + "quests.gregtech_energy.battery_buffer.desc.1": "Батарейные буферы — это базовые машины для хранения и управления энергией, хотя технически сами по себе они энергию не хранят. Они просто служат хранилищем для твоих батарей.\n\n&c⚠ Если не хочешь, чтобы они взорвались&r:\n- &4Никогда не подавай энергию более высокого тира&r в батарейный буфер низшего тира.\n- Батареи могут заряжаться только если они &cтого же или более низкого тира&r, чем сам батарейный буфер.", + "quests.gregtech_energy.battery_buffer.desc.2": "Батарейный буфер может принимать до 2× своего выходного ампеража.\nТак, например, 4× батарейный буфер может принять &a8A&r — но выдаст максимум &e4A&r (по 1A на каждый слот батареи).\n\n&eНапоминание&r:\n- Нет батарей = нет выхода энергии.\n- Количество батарей определяет число ампер на выходе. (То есть &68× батарейный буфер&r с всего &e3 батареями&r будет выдавать лишь &e3A&r.)\n\nИспользуй их с умом — это основа любой стабильной энергосети.", + "quests.gregtech_energy.battery_buffer.task.1": "Любой батарейный буфер", + "quests.gregtech_energy.battery_buffer.task.2": "Тык", + "quests.gregtech_energy.pss.title": "Силовая подстанция", + "quests.gregtech_energy.pss.subtitle": "Все яйца в одну корзину", + "quests.gregtech_energy.pss.desc.1": "&dСиловая подстанция&r — это &6ультимативный настраиваемый батарейный мультиблок&r. Как только ты сможешь скрафтить её на этапе &1IV&r, она без проблем станет центральным источником энергии твоей базы, так что имеет смысл сделать её одной из ключевых целей.\n\nОна способна хранить столько энергии… что, возможно, тебе понадобится несколько жизней, чтобы заполнить её полностью.", + "quests.gregtech_energy.pss.desc.2": "&eКак это работает&r:\n- Построй структуру, используя &aПаладиевые корпуса подстанции&r.\n- Добавь как минимум &b1 энергетический входной разъем&r и &b1 энергетический выходной разъем&r.\n- Она принимает &aлюбой тип разъемов&r — &8амперные&r или &6лазерные&r.\n- &cНикакого риска взрыва&r — трансформаторы &aвстроены&r.\n\n&eСлои накопителей&r:\n- Ты можешь добавить до &d17 слоёв&r &9блоков накопителей&r поверх структуры.\n- Каждый слой должен быть &cполностью заполнен&r — без пустот.\n- Смешивай &fпустые&r и &6заполненные&r накопители как угодно.\n\nКаждый слой должен быть окружён &bЛаминированным стеклом&r.\n\nДавай честно: &cтебе никогда не понадобится 17 слоёв&r... но мечтать масштабно никто не запрещал.\nЕсли ты всё же построишь подстанцию с полными 17 слоями, &lпожалуйста, пришли помощь&r — ты зашёл слишком далеко.", + "quests.gregtech_energy.batteries.title": "Супер батарейки", + "quests.gregtech_energy.batteries.subtitle": "Фантастическое хранилище энергии", + "quests.gregtech_energy.batteries.desc": "На этапах &7LV&r и &bMV&r ты, скорее всего, собрал свои первые батареи из натрия или лития.\n\nНо давай честно — это самые слабые батареи, которые может предложить GregTech.\n\nВ этом задании мы рассмотрим мощные альтернативы: &aкристальные батареи&r.\nОни значительно сильнее, хранят куда больше энергии и помогут тебе продвинуть свою фабрику на следующий тир.\n\nОни дороже? Конечно.\nНо давай будем честны…\nЭнергия есть энергия. Кто тут вообще считает?", + "quests.gregtech_energy.batteries.task": "Любая кристальная батарея", + "quests.gregtech_energy.spending_energy.title": "Трата энергии", + "quests.gregtech_energy.spending_energy.subtitle": "Ох, ты будешь тратить энергию", + "quests.gregtech_energy.spending_energy.desc.1": "Как потратить всю эту энергию?\n\nИспользуй свои машины! Звучит просто, да?\nНу… не совсем. Есть множество мелких деталей, которые тебе стоит изучить, чтобы помочь себе на пути к прохождению &3TerraFirmaGreg&r.\n\nБазовые машины:\n- Эти машины просты.\n- Каждая из них может запрашивать до &a2A&r.\n- Если подать энергию более высокого тира… &4\uD83D\uDCA5 они взорвутся&r.\n\nМультиблоки GregTech:\nВот тут становится действительно интересно. Мультиблоки дают больше гибкости и мощности — &eесли&r ты понимаешь, как они работают.", + "quests.gregtech_energy.spending_energy.desc.2": "Стандартная механика:\n- Если мультиблок может принимать два энергетических разъема (а большинство из них может), это позволяет тебе использовать рецепты более высокого тира, чем тир машины.\n\nПример:\nЕсли ты строишь электрическую доменную печь и устанавливаешь в неё два энергетических разъема &7LV&r, она сможет обрабатывать рецепты ЭДП тира &6MV&r.\n\nЭто одно из ключевых преимуществ мультиблоков по сравнению с одноблочными машинами — чтобы повысить их тир, тебе достаточно заменить энергетические люки, а не перестраивать всю машину целиком.", + "quests.gregtech_energy.spending_energy.desc.3": "Некоторые мультиблоки принимают только один энергетический разъем, но это не значит, что ты ограничен всего 1 ампером!\n\nТы всё равно можешь использовать энергетический разъем на 4A или 16A. Это позволит &bускорять&r рецепты, но не повышать их тир.\n\nПример:\nБольшой сборщик схем принимает только один энергетический люк. Если ты установишь энергетический люк IV на 4A, ты сможешь ускорять все рецепты тира IV и ниже.\n\nОднако он не сможет крафтить рецепты тира LuV, потому что машина не поддерживает несколько люков. Это ограничение сделано намеренно, чтобы предотвратить пропуск системы прогрессии GregTech.", + "quests.gregtech_energy.spending_energy.desc.4": "Так что запомни: больше ампер на одном люке означает более быструю обработку, но для открытия рецептов более высокого тира нужны два энергетических люка.", + "quests.gregtech_energy.spending_energy.task": "Я понял", + "quests.gregtech_energy.overclock.title": "Ускорение", + "quests.gregtech_energy.overclock.subtitle": "Базовая механика улучшения", + "quests.gregtech_energy.overclock.desc.1": "Ты слышал про ускорение (Overclocking), но не до конца понимаешь, что это такое? Давай разберёмся.\n\nНачнём с основ:\n&dLV&r соответствует максимуму в 32 EU/t — иногда меньше, но никогда больше.\n&dMV&r доходит до 128 EU/t.\n&dHV&r достигает 512 EU/t.\nПроще говоря, каждый следующий тир — это увеличение потребления энергии в 4 раза.", + "quests.gregtech_energy.overclock.desc.2": "Что происходит, когда ты запускаешь рецепт более низкого тира в машине более высокого тира? Это и называется &eускорением (Overclocking)&r!\n\nРецепт &dMV&r (33–128 EU/t), запущенный в машине &dHV&r, будет одновременно: 1) потреблять в 4 раза больше энергии и 2) выполняться в 2 раза быстрее.\n\nТот же рецепт MV в машине &dEV&r? Потребление энергии вырастет в 16 раз, но скорость увеличится лишь в 4 раза.\n\nКак видишь, с точки зрения энергоэффективности выгоднее использовать несколько машин, чем разгонять одну.\nНо давай честно: в большинстве сетапов ты предпочтёшь ускорение строительству кучи одинаковых машин.\n\nТем не менее, полезно понимать это заранее — особенно на ранних этапах, когда энергии не хватает.", + "quests.gregtech_energy.overclock.desc.3": "Существует особый вид ускорения, доступный лишь для некоторых мультиблоков: &eидеальное ускорение (Perfect Overclocking)&r.\nЗдесь вместо 4× энергии за 2× скорости ты получаешь &a4× энергии&r за &a4× скорости&r! Это делает его столь же эффективным, как использование нескольких машин одновременно.\n\nВ настоящее время в TerraFirmaGreg идеальный разгон поддерживают только следующие мультиблоки:\n- Электрическая доменная печь\n- Доменная печь для сплавов\n- Карусельная печь\n- Большой химический реактор\n- Электротеплица\n- Теплообменник", + "quests.gregtech_energy.overclock.task": "Значит красненькие быстрее, понял", + "quests.gregtech_energy.blast_oc.title": "Доменное ускорение", + "quests.gregtech_energy.blast_oc.subtitle": "Это тебе не нужно понимать", + "quests.gregtech_energy.blast_oc.desc.1": "Если ты ещё не разобрался с идеальным ускорением, сначала прочитай задание прямо над этим.\n\nЭти три мультиблока обладают особой способностью: они могут &eидеально разгонять&r рецепты в зависимости от &cтемпературы машины&r. Текущую температуру ты можешь посмотреть, кликнув по контроллеру.\n\nЕсть два способа повысить температуру:\n1) Использовать энергетические входы более высокого тира\n2) Улучшить катушки", + "quests.gregtech_energy.blast_oc.desc.2": "Чтобы увидеть температуру катушки, просто &3зажми Shift&r, наведя на неё курсор.\n\nКогда ты знаешь температуру машины, тебе понадобится температура рецепта. Проще всего узнать её через EMI.\n\nИмея оба значения, можно быстро прикинуть, применяется ли идеальное ускорение:\n&bТвоя машина должна быть как минимум на 1800K горячее на каждый уровень разгона, чем требуется рецептом.&r", + "quests.gregtech_energy.blast_oc.desc.3": "Пример:\n- Рецепт нержавеющей стали требует &c1700K&r и относится к тиру &aHV&r.\n- Твоя ЭДП работает на &bLuV&r и имеет температуру &c5900K&r.\n- От HV до LuV — это &a3 уровня разгона&r.\n- 1800 × 3 = &c5400K&r → добавляем базовое требование рецепта: 5400 + 1700 = &c7100K&r нужно для полного идеального разгона.\n- Поскольку температура твоей машины всего &c5900K&r, ты получишь идеальный разгон с HV до EV и с EV до IV, но лишь обычное ускорение с IV до LuV.\n\nВ итоге рецепт будет выполняться за 1,7 секунды вместо 0,85 секунды при полном идеальном разгоне.\n\nКажется слишком сложно? Просто запомни: лучшие катушки = более быстрые и дешёвые рецепты.", + "quests.gregtech_energy.blast_oc.task": "Хорошие катушки есть хорошо, понял", + "quests.gregtech_energy.subtick.title": "Сабтик", + "quests.gregtech_energy.subtick.subtitle": "Параллели?", + "quests.gregtech_energy.subtick.desc.1": "Ещё одна скрытая механика мультиблоков GregTech — &dсабтик (Subtick)&r.\n\nЧто это такое? Сабтик срабатывает, когда рецепт становится настолько быстрым, что занимает меньше одного тика. В обычных условиях машины не могут выполнять больше одного рецепта за тик — но с сабтиком могут!\n\nКак это работает? Как только длительность рецепта достигает 1 тика, дальнейшее улучшение энергетического люка уже не делает его быстрее.\nЗато благодаря сабтику, вместо пустой траты энергии, машина будет &aпараллелить рецепт внутри себя&r.", + "quests.gregtech_energy.subtick.desc.2": "Например: если твой Большой химический реактор выполняет рецепт тира LuV за 1 тик, то на ZPM он будет выполнять уже &e2 рецепта за тик&r. Ещё более быстрые люки дадут ещё больше внутренних параллелей.\n\n&dПримечание&r: на данный момент все большие машины могут использовать субтик в ограниченном виде, но &aтолько БХР и теплообменик&r поддерживает одновременно и субтик, и идеальный разгон. Именно поэтому для БХР нет IV-мультиблока с параллельными люками — он и так делает это… только лучше.", + "quests.gregtech_energy.parallel_hatch.title": "Люк контроля параллелей", + "quests.gregtech_energy.parallel_hatch.subtitle": "Опять параллели?", + "quests.gregtech_energy.parallel_hatch.desc.1": "&dЛюк контроля параллелей&r — главная фишка больших мультиблоков.\n\nЧто он делает?\nТам, где это разрешено (в основном у мультиблоков, созданных из сплавов Доменной печи для сплавов), он позволяет запускать &aнесколько рецептов одновременно&r.\n\nЭто достигается за счёт большего потребления энергии за тик, но с колоссальным ростом производительности. Идеально, если ты массово производишь сплавы, схемы или пластины.", + "quests.gregtech_energy.parallel_hatch.desc.2": "Просто установи параллельный люк на мультиблок и убедись, что в него подаётся достаточно энергии и входных материалов. Большинство мультиблоков, которые это поддерживают, указывают это в EMI или в квестбуке.\n\n&dПримечание&r: Большой химический реактор не использует люки контроля параллелей — у него уже есть кое-что получше под названием &bсабтик&r. Подробнее об этом читай в соседнем задании.", + "quests.gregtech_energy.parallel_hatch.task": "Любой люк контроля параллелей", + "quests.gregtech_energy.rotor.title": "Роторы турбин", + "quests.gregtech_energy.rotor.subtitle": "Так много вариантов!", + "quests.gregtech_energy.rotor.desc.1": "Держатели роторов, разумеется, требуют установленный ротор, но вариантов существует много, и у каждого свои характеристики — так что же всё это значит?\n\nБолее высокая &9Эффективность&r увеличивает время, в течение которого используется каждый мБ топлива, фактически снижая его расход. В то же время &9Мощность&r повышает количество EU, которое будет вырабатывать турбина. Ну а &9Прочность&r, думаю, объяснять не нужно.", + "quests.gregtech_energy.rotor.desc.2": "В идеале тебе хочется максимизировать все три показателя, но выбор будет зависеть от того, сколько топлива ты производишь, сколько у тебя турбин и как часто ты готов их заменять, так что единственно правильного ответа здесь нет. &8(Ну, кроме нейтрония, конечно...)&r\n\nТем не менее, если ты совсем теряешься, мы рекомендуем: ванадиевую сталь на этапе &6HV&r, ультимет на &5EV&r и HSS-S на &9IV&r.\n\nК сожалению, автоматически подавать новые роторы в держатели с помощью труб нельзя, так как блок перед ними должен быть полностью пустым, но &aмеханическая рука&r с этим отлично справится!", + "quests.gregtech_energy.rotor.task": "Любой ротор турбины", + "quests.gregtech_energy.fission_reactor.title": "Ядерный реактор MK I", + "quests.gregtech_energy.fission_reactor.subtitle": "Пристегните ремни, это сложно.", + "quests.gregtech_energy.fission_reactor.desc.1": "&dЯдерный реактор&r — безусловно редкое зрелище в GregTech, как по тематике, так и по принципу работы. Но не бойся — мы здесь, чтобы провести тебя через этот многоцелевой мультиблок для настоящих технарей!\n\nФизику мы пока опустим, &eколлега-инженер&r. Самое важное, что тебе нужно знать: этот реактор — как большая тепловая &dбатарея-генератор&r. Ты подаёшь подходящее топливо и получаешь &cтепло&r (по сути как &6EU/t&r), которое накапливается в реакторе в виде &cрастущей температуры&r (сохранённой &6EU&r).\n\nЗатем ты можешь передать это тепло в &9охлаждающие жидкости&r для работы турбин или выполнения рецептов крафта в стиле ЭДП. Иногда этого тепла может быть даже &cслишком много&r. Ах да, ещё ты получаешь новые элементы для создания новых топлив, схем и прочих вещей. Может, стоит ещё немного исследовать Солнечную систему? Скукотища.", + "quests.gregtech_energy.fission_reactor.desc.2": "Для начала добудь немного &dТория&r. Не забудь надеть зазитный костюм — &eDeatek Intergalactic&r не несёт ответственности за любые телесные повреждения, полученные в результате неправильного обращения с нестабильными материалами. Честно говоря, на этом этапе нам уже не стоило бы тебе об этом напоминать. Если нужно освежить память — загляни в задание про опасности.\n\nДалее скрафть несколько пустых &dтопливных стержней&r и заполни их с помощью &dЗавода по производству ядерного топлива&r. Стержни многоразовые, так что делать их слишком много не нужно. На самом деле, на первое время тебе вполне хватит всего &oодного&r.\n\nРазумеется, тебе также понадобится полностью собранный реактор. Посмотри превью в EMI. Обрати внимание: в центре находится колонна держателей топлива, а вокруг — дополнительные колонны для компонентов и держателей материалов. К ним мы вернёмся позже.\n\nПодожди. Почему всего &oодин&r стержень? О, &eкак же мы&r рады, что ты спросил. Давай погрузимся в механику реактора подробнее на следующей странице.", + "quests.gregtech_energy.fission_reactor.desc.3": "Чем больше топливных стержней ты установишь в реактор, тем &cгорячее&r он станет. А чем он горячее, тем больше тепла сможет передать в охлаждающую жидкость и обрабатываемые материалы. Но у физики есть свои пределы, и реактор не может нагреваться бесконечно — есть максимум, &cнасколько горячим&r он может быть, так что не стоит устанавливать слишком много топливных стержней.\n\nНо не бойся! Вопреки тому, что утверждает пропагандистская большая машина &0нефти&r, ядерная энергия &aабсолютно безопасна&r. Если уровень тепла реактора приближается к опасной зоне, он запускает &9автоматическую последовательность охлаждения&r и не запустится снова, пока всё тепло не будет &aбезопасно рассеяно&r. Правда, процесс это довольно медленный.\n\nДолжен же быть способ сделать его горячее и быстрее? И снова — хорошо, что ты спросил! &eНаши гениальные инженеры&r уже подготовили для тебя решение!", + "quests.gregtech_energy.fission_reactor.desc.4": "Помимо 5 &dдержателей топлива&r, ты можешь установить &oдо&r 20 &dкомпонентов&r. Реакторы от некоторых других производителей требуют очень точного размещения, но наш реактор умнее. &6Характеристики&r всех установленных компонентов просто &6суммируются&r — и на этом всё!\n\nНа данный момент реактор умеет использовать их тремя&8*&r разными способами:\n&e1)&r Максимальная температура &7(изоляция)&r\n&e2)&r Эффективность &7(топливо служит дольше)&r\n&e3)&r Дросселирование &7(замедляет реакции)&r\n\n&8*)&r Возможно, в твоей галактике нет необходимых материалов для всех вариантов. Мы предполагаем, что материалы доступны только для первой категории.\n\nНо будь осторожен. Повышение &cтемпературы&r имеет и &cобратную сторону&r.", + "quests.gregtech_energy.fission_reactor.desc.5": "Хотя более &cгорячий&r реактор делает производство охлаждающих жидкостей и обработку &cбыстрее&r, он также становится более требовательным к топливным стержням. Каждый топливный стержень имеет ограниченную прочность, и её расход линейно зависит от температуры.\n\nПоскольку для более высокой температуры тебе требуется больше топливных стержней, в итоге износ масштабируется &nквадратично&r. Если ты хочешь максимально эффективно нагревать охлаждающие жидкости, используй низкую температуру. А если тебе нужна более быстрая переработка ядерных материалов — поднимай температуру настолько высоко, насколько позволяет изоляция.", + "quests.gregtech_energy.fission_reactor.desc.6": "Ты наконец готов взглянуть на различные рецепты, связанные с реактором. Посмотри, где используется &dконтроллер&r, и ты увидишь три вкладки &eEMI&r:\n\n&e1)&r Ядерный реактор &7(топливо и совместимые охлаждающие жидкости)&r\n&e2)&r Теплообмен ядерного реактора &7(по принципу ЭДП)&r\n&e3)&r Продукты деления &7(когда топливо заканчивается)&r\n&e4)&r Превью мультиблока\n\nРазличные &aтоплива&r совместимы только с определёнными &9охлаждающими жидкостями&r, так что обязательно обращай на это внимание. А когда топливный стержень полностью выработается, статистическая вероятность с уверенностью говорит о том, что он &bт&dра&dнс&r&dф&bо&dр&bм&dи&bр&dо&bв&dа&bл&dс&bя&r в новые элементы.\n\nРецепты переработки, в свою очередь, могут выполняться независимо от топлива — при условии, что уровень температуры достаточно высок.", + "quests.gregtech_energy.fission_reactor.desc.7": "Упрощённая математика выглядит так: при достаточном количестве охлаждающей жидкости и топливном стержне с &c100%%&r тепловыделением реактор достигнет температуры примерно &c200&r. Это также можно называть уровнем тепла или просто теплом. Наличие &dдвух&r топливных стержней с &c100%%&r эквивалентно &dодному&r стержню с &c200%%&r — в обоих случаях это приводит примерно к &c400&r тепла.\n\nЭто происходит потому, что топливный стержень генерирует &6200 HU/t&r (единиц тепла). Охлаждающие жидкости способны забирать &61 HU/t&r на каждый &c1&r градус тепла.\n\nЕсли максимальное тепло реактора составляет &c190&r, то топливный стержень с &c100%%&r его перегреет. Ты можешь увеличить этот предел с помощью изоляции или, альтернативно, использовать &dактивные охлаждающие жидкости&r через систему переработки. У каждого рецепта есть своё тепловое воздействие.", + "quests.gregtech_energy.fission_reactor.desc.8": "Например, если температура рецепта составляет &c100&r, а его воздействие равно &6-10 HU/t&r, он сможет охлаждать реактор на &619 HU/t&r при &c190&r градусах.\n\nЭто позволяет запускать реактор с более низким максимальным уровнем тепла и не перегреваться! Если температура ниже &c100&r, рецепт вообще не запустится — точно так же, как и у рецептов ЭДП есть свои ограничения.\n\nНа этом &eмы&r пока можем тебя научить всему. Возвращайся позже, чтобы узнать, появились ли новые улучшения, &eколлега-ядерщик&r!", "quests.high_voltage": "&6HV&r - Высокое Напряжение", "quests.high_voltage.subtitle": "Увеличивайте свои мощности, узнайте о чистых комнатах, делайте больше химикатов и готовьтесь к полёту в космос.", "quests.high_voltage.energium_crystals.title": "Супер батареи", @@ -3242,7 +3269,7 @@ "quests.space_survival.sandworm.desc": "If you make too much noise in the desert, you might attract the attention of the mighty &6Sandworm&r! It's more of an environmental hazard than a boss to kill, so your best way of surviving it is to run away!\n\nIf you manage to hit its head enough times with &bexplosion damage&r, it will leave you alone... for a while.\n\nThankfully, the Sandworm can only damage entities, not buildings, and is only attracted to the &6footsteps of players&r, so any way to keep &byour own feet&r off the ground won't anger it. The atmosphere is too thin for airplanes and hang gliders, but there are other tools...", "quests.space_survival.spice.title": "Ostrum Deposits", "quests.space_survival.spice.subtitle": "Spice Melange", - "quests.space_survival.spice.desc": "&dOstrum Deposits&r are immovable blocks that you can only find in the Martian Deep Desert, far away from any of the more lush areas. They spawn in small blobs, and can be broken to make space for your Ostrum Harvester if they're on a slope. Try using a &6Spyglass&r to find them from a distance!\n\nYou'll have to figure out some long-distance logistics to ship your Ostrum back to your base. (Try a train, Accumulators can transport power!)\n\nOstrum is a crucial resource for both &5EV&r progression and making infinite ores from Mars.", + "quests.space_survival.spice.desc": "&dOstrum Deposits&r are immovable blocks that you can only find in the Martian Deep Desert, far away from any of the more lush areas. They spawn in small blobs, and can be broken to make space for your Ostrum Harvester if they're on a slope. Try using a &6Spyglass&r to find them from a distance!\n\nYou'll have to figure out some long-distance logistics to ship your Ostrum back to your base. (Try a train!)\n\nOstrum is a crucial resource for both &5EV&r progression and making infinite ores from Mars.", "quests.space_survival.spice.task": "The spice must flow", "quests.space_survival.mars_islands.title": "The Martian Jungles", "quests.space_survival.mars_islands.subtitle": "Is that a dinosaur?!", @@ -3328,7 +3355,7 @@ "quests.steam_age.horse_crank.title": "Твой Первый Источник Энергии", "quests.steam_age.horse_crank.subtitle": "Пусть домашние животные платят за жильё", "quests.steam_age.horse_crank.desc.1": "&3Конный Привод&r — это твой первый доступный источник механической энергии. Чтобы его использовать, размести привод в центре очищенной площадки 7x7 и привяжи к нему животное. Разные животные дают разное количество энергии, а блоки под ними могут увеличить скорость вращения. Площадки нескольких приводов могут перекрываться.\n\nИногда может понадобиться удерживать второй поводок, чтобы прикрепить животное.", - "quests.steam_age.horse_crank.desc.2": "&3Мелкие животные (4 SU):&r\nВолк, Собака, Свинья, Овца, Коза, Альпака\n\n&3Средние животные (6 SU):&r\nКорова, Осёл\n\n&3Крупные животные (8 SU):&r\nЛошадь, Мул, Мускусный бык, Як", + "quests.steam_age.horse_crank.desc.2": "&3Мелкие животные (8 SU):&r\nВолк, Собака, Свинья, Овца, Коза, Альпака\n\n&3Средние животные (12 SU):&r\nКорова, Осёл\n\n&3Крупные животные (16 SU):&r\nЛошадь, Мул, Мускусный бык, Як", "quests.steam_age.poor_paths.title": "Плохие Дорожки", "quests.steam_age.poor_paths.subtitle": "Это просто грязь", "quests.steam_age.poor_paths.desc": "Худший тип дороги, который можно использовать. Конный привод будет работать на скорости 2 об/мин.", diff --git a/kubejs/assets/tfg/lang/uk_ua.json b/kubejs/assets/tfg/lang/uk_ua.json index eb51c104e..6929d180e 100644 --- a/kubejs/assets/tfg/lang/uk_ua.json +++ b/kubejs/assets/tfg/lang/uk_ua.json @@ -3408,7 +3408,7 @@ "quests.steam_age.horse_crank.title": "Ваше перше джерело енергії", "quests.steam_age.horse_crank.subtitle": "Змусьте свою худобу платити оренду", "quests.steam_age.horse_crank.desc.1": "&3Тваринний Привід&r — це твій перше доступне джерело механічної енергії. Щоб ним скористатися, постав привід у центрі очищеної ділянки розміром 7x7 блоків і прив’яжи до нього тварину. Різні тварини генерують різну кількість потужності, а блоки під ним впливають на швидкість вихідної енергії. Зони кількох приводів можуть перекриватися.\n\nМожливо, доведеться тримати другий поводок, щоб приєднати тварину.", - "quests.steam_age.horse_crank.desc.2": "&3Маленькі тварини (4 SU):&r\nВовк, Собака, Свиня, Вівця, Коза, Альпака\n\n&3Середні тварини (6 SU):&r\nКорова, Осел\n\n&3Великі тварини (8 SU):&r\nКінь, Мул, Мускусний віл, Як", + "quests.steam_age.horse_crank.desc.2": "&3Маленькі тварини (8 SU):&r\nВовк, Собака, Свиня, Вівця, Коза, Альпака\n\n&3Середні тварини (12 SU):&r\nКорова, Осел\n\n&3Великі тварини (16 SU):&r\nКінь, Мул, Мускусний віл, Як", "quests.steam_age.poor_paths.title": "Погані шляхи", "quests.steam_age.poor_paths.subtitle": "Це просто бруд", "quests.steam_age.poor_paths.desc": "Це найгірший тип дороги, яку можна використовувати. Тваринний привід працюватиме зі швидкістю 2 об/хв.", diff --git a/kubejs/assets/tfg/lang/zh_cn.json b/kubejs/assets/tfg/lang/zh_cn.json index bff72f71c..3d1eb0881 100644 --- a/kubejs/assets/tfg/lang/zh_cn.json +++ b/kubejs/assets/tfg/lang/zh_cn.json @@ -35,6 +35,15 @@ "biome.tfg.mars/sangnum_edge": "赤血边缘", "biome.tfg.mars/sangnum_plains": "赤血草原", "biome.tfg.mars/sangnum_hills": "赤血沼地", + "biome.tfg.venus/arachnoids": "金星蛛网状地貌", + "biome.tfg.venus/fractured_pools": "破裂池", + "biome.tfg.venus/fumaroles": "气态喷气孔", + "biome.tfg.venus/geysers": "滚烫间歇泉", + "biome.tfg.venus/jagged_tablelands": "锯齿状台地", + "biome.tfg.venus/salt_flats": "盐滩", + "biome.tfg.venus/stromatolite_beach": "叠层石滩", + "biome.tfg.venus/sulfuric_ravine": "硫酸峡谷", + "biome.tfg.venus/volcanic_mountains": "灼热火山", "block.tfg.piglin_disguise": "猪灵伪装", "block.tfg.piglin_disguise_block": "猪灵伪装", "block.tfg.dry_ice": "干冰", @@ -242,20 +251,24 @@ "block.tfg.rock.aqueduct_nether": "角斑岩引水桥", "block.tfg.rock.hardened_moon_stone": "硬化斜长岩", "block.tfg.rock.moon_stone_wall": "天然斜长岩墙", - "block.tfg.rock.cobble_moon_stone_wall": "斜长岩圆石墙", + "block.tfg.rock.cobble_moon_wall": "斜长岩圆石墙", "block.tfg.rock.mossy_cobble_moon": "覆苔斜长岩圆石", "block.tfg.rock.mossy_cobble_moon_stairs": "覆苔斜长岩圆石楼梯", "block.tfg.rock.mossy_cobble_moon_slab": "覆苔斜长岩圆石台阶", "block.tfg.rock.mossy_cobble_moon_wall": "覆苔斜长岩圆石墙", - "block.tfg.rock.mossy_bricks_moon_stone": "覆苔斜长岩砖", - "block.tfg.rock.mossy_bricks_moon_stone_stairs": "覆苔斜长岩砖楼梯", - "block.tfg.rock.mossy_bricks_moon_stone_slab": "覆苔斜长岩砖台阶", - "block.tfg.rock.mossy_bricks_moon_stone_wall": "覆苔斜长岩砖墙", + "block.tfg.rock.mossy_bricks_moon": "覆苔斜长岩砖", + "block.tfg.rock.mossy_bricks_moon_stairs": "覆苔斜长岩砖楼梯", + "block.tfg.rock.mossy_bricks_moon_slab": "覆苔斜长岩砖台阶", + "block.tfg.rock.mossy_bricks_moon_wall": "覆苔斜长岩砖墙", "block.tfg.rock.chiseled_bricks_moon_wall": "雕纹斜长岩墙", "block.tfg.rock.gravel_moon": "斜长岩沙砾", "block.tfg.spike.moon_stone_spike": "斜长岩尖刺", "block.tfg.loose.moon_stone": "斜长岩石子", "block.tfg.rock.aqueduct_moon_stone": "斜长岩引水桥", + "block.tfg.rock.polished_moon_wall": "磨制斜长岩墙", + "block.tfg.rock.cracked_bricks_moon_stairs": "裂纹斜长岩砖楼梯", + "block.tfg.rock.cracked_bricks_moon_slab": "裂纹斜长岩砖台阶", + "block.tfg.rock.cracked_bricks_moon_wall": "裂纹斜长岩砖墙", "block.tfg.rock.hardened_moon_deepslate": "硬化苏长岩", "block.tfg.rock.moon_deepslate_stairs": "天然苏长岩楼梯", "block.tfg.rock.moon_deepslate_slab": "天然苏长岩台阶", @@ -289,19 +302,25 @@ "block.tfg.spike.moon_deepslate_spike": "苏长岩尖刺", "block.tfg.loose.moon_deepslate": "苏长岩石子", "block.tfg.rock.aqueduct_moon_deepslate": "苏长岩引水桥", + "block.tfg.rock.mossy_bricks_moon_deepslate": "覆苔苏长岩砖", + "block.tfg.rock.mossy_bricks_moon_deepslate_stairs": "覆苔苏长岩砖楼梯", + "block.tfg.rock.mossy_bricks_moon_deepslate_slab": "覆苔苏长岩砖台阶", + "block.tfg.rock.mossy_bricks_moon_deepslate_wall": "覆苔苏长岩砖墙", "block.tfg.rock.hardened_mars_stone": "硬化泥板岩", "block.tfg.rock.mars_stone_wall": "天然泥板岩墙", - "block.tfg.rock.cobble_mars_stone_wall": "泥板岩圆石墙", + "block.tfg.rock.cobble_mars_wall": "泥板岩圆石墙", "block.tfg.rock.mossy_cobble_mars": "覆苔泥板岩圆石", "block.tfg.rock.mossy_cobble_mars_stairs": "覆苔泥板岩圆石楼梯", "block.tfg.rock.mossy_cobble_mars_slab": "覆苔泥板岩圆石台阶", "block.tfg.rock.mossy_cobble_mars_wall": "覆苔泥板岩圆石墙", "block.tfg.rock.polished_mars_wall": "磨制泥板岩墙", - "block.tfg.rock.mossy_bricks_mars_stone": "覆苔泥板岩砖", - "block.tfg.rock.mossy_bricks_mars_stone_stairs": "覆苔泥板岩砖楼梯", - "block.tfg.rock.mossy_bricks_mars_stone_slab": "覆苔泥板岩砖台阶", - "block.tfg.rock.mossy_bricks_mars_stone_wall": "覆苔泥板岩砖墙", - "block.tfg.rock.cracked_bricks_mars_stone_wall": "裂纹泥板岩砖墙", + "block.tfg.rock.mossy_bricks_mars": "覆苔泥板岩砖", + "block.tfg.rock.mossy_bricks_mars_stairs": "覆苔泥板岩砖楼梯", + "block.tfg.rock.mossy_bricks_mars_slab": "覆苔泥板岩砖台阶", + "block.tfg.rock.mossy_bricks_mars_wall": "覆苔泥板岩砖墙", + "block.tfg.rock.cracked_bricks_mars_stairs": "裂纹泥板岩砖楼梯", + "block.tfg.rock.cracked_bricks_mars_slab": "裂纹泥板岩砖台阶", + "block.tfg.rock.cracked_bricks_mars_wall": "裂纹泥板岩砖墙", "block.tfg.rock.chiseled_bricks_mars_wall": "雕纹泥板岩墙", "block.tfg.rock.gravel_mars": "泥板岩沙砾", "block.tfg.spike.mars_stone_spike": "泥板岩尖刺", @@ -309,17 +328,19 @@ "block.tfg.rock.aqueduct_mars_stone": "泥板岩引水桥", "block.tfg.rock.hardened_venus_stone": "硬化粗面岩", "block.tfg.rock.venus_stone_wall": "天然粗面岩墙", - "block.tfg.rock.cobble_venus_stone_wall": "粗面岩圆石墙", + "block.tfg.rock.cobble_venus_wall": "粗面岩圆石墙", "block.tfg.rock.mossy_cobble_venus": "覆苔粗面岩圆石", "block.tfg.rock.mossy_cobble_venus_stairs": "覆苔粗面岩圆石楼梯", "block.tfg.rock.mossy_cobble_venus_slab": "覆苔粗面岩圆石台阶", "block.tfg.rock.mossy_cobble_venus_wall": "覆苔粗面岩圆石墙", "block.tfg.rock.polished_venus_wall": "磨制粗面岩墙", - "block.tfg.rock.mossy_bricks_venus_stone": "覆苔粗面岩砖", - "block.tfg.rock.mossy_bricks_venus_stone_stairs": "覆苔粗面岩砖楼梯", - "block.tfg.rock.mossy_bricks_venus_stone_slab": "覆苔粗面岩砖台阶", - "block.tfg.rock.mossy_bricks_venus_stone_wall": "覆苔粗面岩砖墙", - "block.tfg.rock.cracked_bricks_venus_stone_wall": "裂纹粗面岩砖墙", + "block.tfg.rock.mossy_bricks_venus": "覆苔粗面岩砖", + "block.tfg.rock.mossy_bricks_venus_stairs": "覆苔粗面岩砖楼梯", + "block.tfg.rock.mossy_bricks_venus_slab": "覆苔粗面岩砖台阶", + "block.tfg.rock.mossy_bricks_venus_wall": "覆苔粗面岩砖墙", + "block.tfg.rock.cracked_bricks_venus_stairs": "裂纹粗面岩砖楼梯", + "block.tfg.rock.cracked_bricks_venus_slab": "裂纹粗面岩砖台阶", + "block.tfg.rock.cracked_bricks_venus_wall": "裂纹粗面岩砖墙", "block.tfg.rock.chiseled_bricks_venus_wall": "雕纹粗面岩墙", "block.tfg.rock.gravel_venus": "粗面岩沙砾", "block.tfg.spike.venus_stone_spike": "粗面岩尖刺", @@ -327,17 +348,19 @@ "block.tfg.rock.aqueduct_venus_stone": "粗面岩引水桥", "block.tfg.rock.hardened_mercury_stone": "硬化科马提岩", "block.tfg.rock.mercury_stone_wall": "天然科马提岩墙", - "block.tfg.rock.cobble_mercury_stone_wall": "科马提岩圆石墙", + "block.tfg.rock.cobble_mercury_wall": "科马提岩圆石墙", "block.tfg.rock.mossy_cobble_mercury": "覆苔科马提岩圆石", "block.tfg.rock.mossy_cobble_mercury_stairs": "覆苔科马提岩圆石楼梯", "block.tfg.rock.mossy_cobble_mercury_slab": "覆苔科马提岩圆石台阶", "block.tfg.rock.mossy_cobble_mercury_wall": "覆苔科马提岩圆石墙", "block.tfg.rock.polished_mercury_wall": "磨制科马提岩墙", - "block.tfg.rock.mossy_bricks_mercury_stone": "覆苔科马提岩砖", - "block.tfg.rock.mossy_bricks_mercury_stone_stairs": "覆苔科马提岩砖楼梯", - "block.tfg.rock.mossy_bricks_mercury_stone_slab": "覆苔科马提岩砖台阶", - "block.tfg.rock.mossy_bricks_mercury_stone_wall": "覆苔科马提岩砖墙", - "block.tfg.rock.cracked_bricks_mercury_stone_wall": "裂纹科马提岩砖墙", + "block.tfg.rock.mossy_bricks_mercury": "覆苔科马提岩砖", + "block.tfg.rock.mossy_bricks_mercury_stairs": "覆苔科马提岩砖楼梯", + "block.tfg.rock.mossy_bricks_mercury_slab": "覆苔科马提岩砖台阶", + "block.tfg.rock.mossy_bricks_mercury_wall": "覆苔科马提岩砖墙", + "block.tfg.rock.cracked_bricks_mercury_stairs": "裂纹科马提岩砖楼梯", + "block.tfg.rock.cracked_bricks_mercury_slab": "裂纹科马提岩砖台阶", + "block.tfg.rock.cracked_bricks_mercury_wall": "裂纹科马提岩砖墙", "block.tfg.rock.chiseled_bricks_mercury_wall": "雕纹科马提岩墙", "block.tfg.rock.gravel_mercury": "科马提岩沙砾", "block.tfg.spike.mercury_stone_spike": "科马提岩尖刺", @@ -345,17 +368,19 @@ "block.tfg.rock.aqueduct_mercury_stone": "科马提岩引水桥", "block.tfg.rock.hardened_glacio_stone": "硬化响岩", "block.tfg.rock.glacio_stone_wall": "天然响岩墙", - "block.tfg.rock.cobble_glacio_stone_wall": "响岩圆石墙", + "block.tfg.rock.cobble_glacio_wall": "响岩圆石墙", "block.tfg.rock.mossy_cobble_glacio": "覆苔响岩圆石", "block.tfg.rock.mossy_cobble_glacio_stairs": "覆苔响岩圆石楼梯", "block.tfg.rock.mossy_cobble_glacio_slab": "覆苔响岩圆石台阶", "block.tfg.rock.mossy_cobble_glacio_wall": "覆苔响岩圆石墙", "block.tfg.rock.polished_glacio_wall": "磨制响岩墙", - "block.tfg.rock.mossy_bricks_glacio_stone": "覆苔响岩砖", - "block.tfg.rock.mossy_bricks_glacio_stone_stairs": "覆苔响岩砖楼梯", - "block.tfg.rock.mossy_bricks_glacio_stone_slab": "覆苔响岩砖台阶", - "block.tfg.rock.mossy_bricks_glacio_stone_wall": "覆苔响岩砖墙", - "block.tfg.rock.cracked_bricks_glacio_stone_wall": "裂纹响岩砖墙", + "block.tfg.rock.mossy_bricks_glacio": "覆苔响岩砖", + "block.tfg.rock.mossy_bricks_glacio_stairs": "覆苔响岩砖楼梯", + "block.tfg.rock.mossy_bricks_glacio_slab": "覆苔响岩砖台阶", + "block.tfg.rock.mossy_bricks_glacio_wall": "覆苔响岩砖墙", + "block.tfg.rock.cracked_bricks_glacio_stairs": "裂纹响岩砖楼梯", + "block.tfg.rock.cracked_bricks_glacio_slab": "裂纹响岩砖台阶", + "block.tfg.rock.cracked_bricks_glacio_wall": "裂纹响岩砖墙", "block.tfg.rock.chiseled_bricks_glacio_wall": "雕纹响岩墙", "block.tfg.rock.gravel_glacio": "响岩沙砾", "block.tfg.spike.glacio_stone_spike": "响岩尖刺", @@ -369,6 +394,7 @@ "block.tfg.rock.cobble_permafrost_stairs": "冻土圆石楼梯", "block.tfg.rock.cobble_permafrost_slab": "冻土圆石台阶", "block.tfg.rock.cobble_permafrost_wall": "冻土圆石墙", + "block.tfg.rock.mossy_cobble_permafrost": "覆苔冻土圆石", "block.tfg.rock.mossy_cobble_permafrost_stairs": "覆苔冻土圆石楼梯", "block.tfg.rock.mossy_cobble_permafrost_slab": "覆苔冻土圆石台阶", "block.tfg.rock.mossy_cobble_permafrost_wall": "覆苔冻土圆石墙", @@ -377,7 +403,10 @@ "block.tfg.rock.mossy_bricks_permafrost_stairs": "覆苔冻土砖楼梯", "block.tfg.rock.mossy_bricks_permafrost_slab": "覆苔冻土砖台阶", "block.tfg.rock.mossy_bricks_permafrost_wall": "覆苔冻土砖墙", - "block.tfg.rock.cracked_bricks_permafrost_stone_wall": "裂纹冻土砖墙", + "block.tfg.rock.cracked_bricks_permafrost_stairs": "裂纹冻土砖楼梯", + "block.tfg.rock.cracked_bricks_permafrost_slab": "裂纹冻土砖台阶", + "block.tfg.rock.cracked_bricks_permafrost_wall": "裂纹冻土砖墙", + "block.tfg.rock.chiseled_bricks_permafrost_wall": "雕纹冻土墙", "block.tfg.rock.gravel_permafrost": "冻土沙砾", "block.tfg.spike.permafrost_spike": "冻土尖刺", "block.tfg.loose.permafrost": "冻土岩石子", @@ -416,13 +445,21 @@ "block.tfg.rock.cracked_bricks_stone_wall": "裂纹再生石砖墙", "block.tfg.rock.aqueduct_stone": "再生石引水桥", "block.tfg.rock.smooth_red_sandstone_wall": "平滑赤铁矿砂岩墙", + "block.tfg.rock.cut_red_sandstone_stairs": "切制赤铁矿砂岩楼梯", "block.tfg.rock.cut_red_sandstone_wall": "切制赤铁矿砂岩墙", + "block.tfg.rock.bricks_venus_sandstone_wall": "粗面岩砂岩砖墙", + "block.tfg.rock.cracked_bricks_venus_sandstone_stairs": "裂纹粗面岩砂岩砖楼梯", + "block.tfg.rock.cracked_bricks_venus_sandstone_slab": "裂纹粗面岩砂岩砖台阶", + "block.tfg.rock.cracked_bricks_venus_sandstone_wall": "裂纹粗面岩砂岩砖墙", + "block.tfg.rock.quartz_wall": "石英墙", + "block.tfg.rock.smooth_quartz_wall": "平滑石英墙", "block.tfg.rock.raw.stromatolite": "天然叠层石", "block.tfg.rock.spike.stromatolite": "叠层石尖刺", "block.tfg.stromatolite_cluster_small": "小型叠层石簇", "block.tfg.stromatolite_cluster_medium": "大型叠层石簇", "block.tfg.rock.raw.geyserite": "天然硅华", "block.tfg.rock.spike.geyserite": "硅华尖刺", + "block.tfg.rock.halite": "岩晶", "block.tfg.mushroom_roots": "菌丝根须", "block.tfg.mushroom_sprouts": "菌丝嫩芽", "block.tfg.charred_log": "焦化原木", @@ -579,6 +616,8 @@ "block.tfg.casings.heat_pipe_casing": "高温管道外壳", "block.tfg.glacian_wool_frame": "霜原羊毛框架", "block.tfg.aes_insulation_frame": "碱土硅酸盐隔热框架", + "block.tfg.machine_casing_power_casing": "绝缘动力机械方块", + "block.tfg.active_power_transformer": "有源能量变压器", "block.tfg.sand.fluorapatite.blue": "蓝色氟磷灰石沙", "block.tfg.sandstone.raw.fluorapatite.blue": "天然蓝色氟磷灰石砂岩", "block.tfg.sandstone.wall.raw.fluorapatite.blue": "天然蓝色氟磷灰石砂岩墙", @@ -1139,6 +1178,9 @@ "item.tfg.rough_endoplasmic_reticula": "粗糙内质网", "item.tfg.alpha_keratin": "α-角蛋白", "item.tfg.progenitor_cells": "祖细胞", + "item.tfg.catalyser_pt_re_zsm": "铂-铼/ZSM-5催化剂", + "item.tfg.used_catalyser": "废铂-铼/ZSM-5催化剂", + "item.tfg.loaded_resin": "再负载树脂", "material.tfg.latex": "乳胶", "material.tfg.vulcanized_latex": "硫化乳胶", "material.tfg.fluix": "福鲁伊克斯", @@ -1259,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", @@ -1288,6 +1330,21 @@ "material.tfg.linolenic_acid": "α-亚麻酸", "material.tfg.isosorbide_ln": "亚麻酸异山梨醇酯", "material.tfg.epox_isosorbide_ln": "环氧化亚麻酸异山梨醇酯", + "material.tfg.ozone": "臭氧", + "material.tfg.tin_chloride": "氯化亚锡", + "material.tfg.cyclohexanone": "环己酮", + "material.tfg.cyclohex_diperoxide": "1,1-环己烷二基二氢过氧化物", + "material.tfg.aciditic_waste": "酸性废料", + "material.tfg.propylene": "丙烯", + "material.tfg.tpaoh": "四丙基氢氧化铵", + "material.tfg.sodium_silicate": "硅酸钠", + "material.tfg.metal_rich_solution": "富金属溶液", + "material.tfg.crude_mixed_gas": "粗混合气", + "material.tfg.zsm5_gel": "ZSM-5凝胶", + "material.tfg.leachate": "铼浸出液", + "material.tfg.clean_powder": "纯净铼硅酸盐粉末", + "material.tfg.catalyser_powder": "铼/ZSM-5催化剂粉末", + "material.tfg.sodium_aluminium": "铝钠合金", "ore_vein.tfg.deep_sheldonite": "硫铂矿, 斑铜矿", "ore_vein.tfg.deep_garnet_amethyst": "紫水晶, 石榴石", "ore_vein.tfg.deep_garnet_opal": "蛋白石, 石榴石", @@ -1460,6 +1517,19 @@ "entity.tfg.rnr_plow": "铺路车", "effect.tfg.cooling": "§b降温", "effect.tfg.warming": "§6保暖", + "effect.tfg.instant_radiation": "瞬间辐射", + "effect.tfg.chemical_burns_warning": "化学烧伤", + "effect.tfg.poison_warning": "剧毒物质", + "effect.tfg.weak_poison_warning": "弱毒物质", + "effect.tfg.irritant_warning": "刺激性物质", + "effect.tfg.nausea_warning": "致呕物质", + "effect.tfg.carcinogen_warning": "致癌物质", + "effect.tfg.asbestosis_warning": "石棉肺", + "effect.tfg.arsenicosis_warning": "砷中毒", + "effect.tfg.silicosis_warning": "硅肺病", + "effect.tfg.berylliosis_warning": "铍中毒", + "effect.tfg.methanol_poisoning_warning": "甲醇中毒", + "effect.tfg.carbon_monoxide_poisoning_warning": "一氧化碳中毒", "tfg.greate.uls_limit": "§432§r (§8ULS§r)", "tfg.greate.ls_limit": "§f128§r (§7LS§r)", "tfg.greate.windmill_hint_1": "§7风力磨坊的效率受其相对", @@ -1482,7 +1552,7 @@ "trim_material.tfc.salt_tfc": "盐", "trim_material.tfc.sapphire_tfc": "蓝宝石", "trim_material.tfc.sodalite_tfc": "方钠石", - "trim_material.tfc.coke_tfc": "焦煤", + "trim_material.tfc.armalcolite_tfc": "阿姆阿尔柯尔矿", "trim_material.tfc.spessartine_tfc": "锰铝榴石", "trim_material.tfc.topaz_tfc": "黄玉", "trim_material.tfc.uvarovite_tfc": "钙铬榴石", @@ -1580,6 +1650,10 @@ "tfg.tooltip.cooling_foods": "§b使你体温降低：2°C", "tfg.tooltip.cooling_foods_strong": "§b使你体温降低：10°C", "tfg.tooltip.warming_foods": "§6使你体温升高：4°C", + "tfg.tooltip.hotornot_container": "§a可安全容纳§6高温§a、§b低温§a以及§e比空气轻§a的物品与流体。§r", + "tfg.tooltip.hotornot_hot_equipment": "§7提供对所有§6高温§7物品、流体和管道的防护。§r", + "tfg.tooltip.hotornot_cold_equipment": "§7提供对所有§b低温§7物品、流体和管道的防护。§r", + "tfg.tooltip.hotornot_floating_equipment": "§7提供对所有§e比空气轻§7d的气体的防护。§r", "tfg.tooltip.machine.one_energy_hatch": "只允许有且仅有§61个§f能源仓", "tfg.tooltip.machine.two_energy_hatches": "允许有最多§62个§r能源仓", "tfg.tooltip.machine.subtick": "这台机器支持§2子刻机制§r！", @@ -1595,6 +1669,8 @@ "tfg.tooltip.machine.cooling_tower_1": "§7给空气加热§r", "tfg.tooltip.machine.cooling_tower_2": "§7通过向空气散逸余热来给热冷却剂制冷。§r", "tfg.tooltip.obsolete.depreciated": "§c已弃用，无法再合成", + "tfg.tooltip.antipoison_pill": "§9解毒", + "tfg.tooltip.antipoison_tablet": "§9治愈所有有害状态", "tfg.tooltip.dna_syringe.empty": "§7一支空注射器。§r", "tfg.tooltip.dna_syringe.dirty1": "§7一支使用过的注射器。§r", "tfg.tooltip.dna_syringe.dirty2": "§7注意不要用它刺伤任何人...§r", @@ -1881,6 +1957,69 @@ "quests.ae2.cell_component_64m.desc": "&c64M存储组件&r是你在&8TerraFirmaGreg&r中可以制作的最大组件。老实说，我们相信你永远不需要它，但它为完美主义者而存在。", "quests.ae2.oversize_interface.desc": "&dME超大接口&r是一个&dME扩展接口&r，但每个槽位可以容纳16倍多的物品或流体。如果你有需要大量物品或流体的流程，这可能是你的首选。", "quests.ae2.assembler_matrix.desc": "&6装配矩阵&r基本上是一个可定制的多方块分子装配室。此任务的要求应让你能够构建一个我们认为足够强大的装配矩阵。如果你愿意，可以添加更多&b样板核心&r或&a合成核心&r层。\n\n像往常一样，查看游戏内指南以获取详细信息。", + "quests.combat_tips.stone_main.title": "石器时代", + "quests.combat_tips.hammer.title": "锤", + "quests.combat_tips.hammer.subtitle": "战锤时刻！", + "quests.combat_tips.hammer.description": "虽然战斗可能不是锤子的首要用途，但它的效果出人意料。锤子可造成&2打击&r伤害，能帮助你对付骷髅。\n\n更多关于&c伤害类型&r的信息，请查阅&3野外指南&r。", + "quests.combat_tips.hammer.task": "任意锤", + "quests.combat_tips.javelin.title": "标枪", + "quests.combat_tips.javelin.subtitle": "穴居人的弓", + "quests.combat_tips.javelin.description": "如果想和敌人保持距离，标枪就是为你准备的武器。这是你最早能获得的远程武器。它们造成&9突刺&r伤害，能帮助你对付僵尸。\n\n更多关于&c伤害类型&r的信息，请查阅&3野外指南&r。\n\n一旦你获得皮革，就可以制作一个&5箭袋&r，它让你能便捷地取用最多8支标枪！", + "quests.combat_tips.javelin.task": "任意标枪", + "quests.combat_tips.axe.title": "斧", + "quests.combat_tips.axe.subtitle": "不止能砍木头", + "quests.combat_tips.axe.description": "在你能升级装备之前，斧头将是你最可靠的武器。除了高伤害，它们还造成&6斩击&r伤害，这将帮助你对付苦力怕。\n\n更多关于&c伤害类型&r的信息，请查阅&3野外指南&r。", + "quests.combat_tips.axe.task": "任意斧", + "quests.combat_tips.knife.title": "刀", + "quests.combat_tips.knife.subtitle": "戳戳刺刺", + "quests.combat_tips.knife.description": "刀主要用于合成，但紧急时也能作为武器。它们造成&9突刺&r伤害，能帮助你对付僵尸。\n\n更多关于&c伤害类型&r的信息，请查阅&3野外指南&r。", + "quests.combat_tips.knife.task": "任意刀", + "quests.combat_tips.club.title": "燧石棒", + "quests.combat_tips.club.subtitle": "梆梆！", + "quests.combat_tips.club.description": "燧石棒是相当非主流的武器。它们不直接造成伤害，而是会打断目标的骨头，使其动弹不得。\n\n普通和强化燧石棒都可以用原始材料制作。强化燧石棒拥有更快的攻击速度和更高的耐久度。", + "quests.combat_tips.mold_main.title": "原始冶金术", + "quests.combat_tips.wood_shield.title": "木盾", + "quests.combat_tips.wood_shield.subtitle": "骷髅的箭，真的很痛", + "quests.combat_tips.wood_shield.description": "盾牌会保护你免受其朝向的大部分伤害源。请注意，它&4不能&r保护你免受爆炸伤害。", + "quests.combat_tips.leather.title": "皮革护甲", + "quests.combat_tips.leather.subtitle": "终于有衣服穿了", + "quests.combat_tips.leather.description": "一旦你有了皮革，就能获得第一套真正的护甲。它不算很棒，但能提供你可能需要的额外保护。\n\n它们还能让你对&6斩击&r伤害有轻微抗性。", + "quests.combat_tips.mold_weapons.title": "铸模武器", + "quests.combat_tips.mold_weapons.subtitle": "金属的力量", + "quests.combat_tips.mold_weapons.description": "模具让你可以制作所有武器的铜和青铜版本，包括三种新类型：剑、镰刀和狼牙棒。\n\n剑：这种均衡的武器造成&6斩击&r伤害。\n\n镰刀：它们比剑伤害更高，但速度更慢。造成&6斩击&r伤害。\n\n狼牙棒：它们是造成&2打击&r伤害的最佳武器。", + "quests.combat_tips.mold_weapons.task1": "任意剑", + "quests.combat_tips.mold_weapons.task2": "任意镰刀", + "quests.combat_tips.mold_weapons.task3": "任意狼牙棒", + "quests.combat_tips.bow.title": "弓与箭", + "quests.combat_tips.bow.subtitle": "然后我膝盖就中了一箭……", + "quests.combat_tips.bow.description": "虽然标枪很酷，但很难打败弓和箭。箭可能很昂贵，所以建个禽类养殖场不是个坏主意。箭造成&9突刺&r伤害。\n\n一旦你有了皮革，就可以制作一个&5箭袋&r，它让你能便捷地取用最多8组箭！", + "quests.combat_tips.bow.task2": "任意箭", + "quests.combat_tips.bronze_main.title": "青铜时代", + "quests.combat_tips.forged_weapons.title": "锻造武器", + "quests.combat_tips.forged_weapons.subtitle": "迈向锻铁及更高阶段！", + "quests.combat_tips.forged_weapons.description": "从锻铁阶段开始，你将需要相应的砧来锻造它们。此外，铁砧解锁了屠宰刀。\n\n屠宰刀：比剑更快，但伤害较低。它们允许你从生物身上获得&c双倍&r肉。这不影响任何其他掉落物。", + "quests.combat_tips.forged_weapons.task": "任意屠宰刀", + "quests.combat_tips.shield.title": "金属盾牌", + "quests.combat_tips.shield.subtitle": "高级防护", + "quests.combat_tips.shield.description": "现在这些才是真正的盾牌。使用其中之一将保护你免受任何伤害，包括爆炸。\n\n它们还有一堆有趣的形状！", + "quests.combat_tips.shield.task": "任意金属盾牌", + "quests.combat_tips.armor.title": "金属盔甲", + "quests.combat_tips.armor.subtitle": "只有最闪亮的盔甲", + "quests.combat_tips.armor.description": "金属盔甲需要两步锻造过程，但别被它的难度吓倒。金属盔甲将提升你进入&d幽冥之地&r或对抗一群&3灾厄村民&r时的生存几率。\n\n所有金属盔甲都会为你提供对&6斩击&r、&9突刺&r和&2打击&r伤害的额外防护。", + "quests.combat_tips.armor.task1": "任意金属头盔", + "quests.combat_tips.armor.task2": "任意金属胸甲", + "quests.combat_tips.armor.task3": "任意金属护腿", + "quests.combat_tips.armor.task4": "任意金属靴子", + "quests.combat_tips.iron_main.title": "铁器时代", + "quests.combat_tips.crossbow.title": "弩", + "quests.combat_tips.crossbow.subtitle": "就像手动操作的枪", + "quests.combat_tips.crossbow.description": "很简单，它的功能和原版弩一样。与弓类似，你可以使用&5箭袋&r来容纳最多8组箭。", + "quests.combat_tips.flintlock_mechanism.title": "燧发机构", + "quests.combat_tips.flintlock_mechanism.subtitle": "随时迸发火花！", + "quests.combat_tips.flintlock_mechanism.description": "这是你的第一个&2枪械机构&r，是大多数枪支的主要合成部件。&6燧发机构&r让你可以制作前两把枪！第一把是&9燧发手枪&r。\n\n一旦你获得钢，就能制作便宜得多的&6燧发机构&r。", + "quests.combat_tips.flintlock_gun.title": "燧发手枪", + "quests.combat_tips.flintlock_gun.subtitle": "吃铅子去吧！", + "quests.combat_tips.flintlock_gun.description": "好吧，这就是你一直等待的时刻，这是一把枪。虽然它不是一把很好的枪，但科技总得有个起点。与其他远程武器相比，枪有许多优势，现在对你有用的是&3石墨黏土灵&r和&2高岭黏土灵&r无法格挡子弹。\n\n关于TACZ枪械工作原理的更多信息，请查看本章节顶部的枪械图鉴。", "quests.tasktype.checkmark": "点击这里完成任务/目标", "quests.tasktype.item.any": "任意类型物品：", "quests.tasktype.lookat": "看向：", @@ -2259,6 +2398,17 @@ "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.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_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。好消息是，铂和铼在此过程中都会被完全回收，因此无需担心，你只需要开采一次即可。", + "quests.extreme_voltage.btx_loop.title": "回收使废催化剂", + "quests.extreme_voltage.btx_loop.subtitle": "尽可能多地回收利用", + "quests.extreme_voltage.btx_loop.desc.1": "这条生产链的最后一部分是回收废催化剂。整个过程相当简单，主要的挑战将是维持&a强化环氧树脂板&r和&e胶水&r的持续供应。\n\n如果你的&2树脂采集系统&r仍在运行，它应该足以生产制作胶水所需的所有树脂。或者，对原木使用&b提取机&r也是一个完全可行的选择。这种方法稍微更&c耗电&r，但选择完全取决于你的基础设施。", + "quests.extreme_voltage.btx_loop.desc.2": "关于&9稀盐酸&r的一点说明：它可以很容易地通过&b水&r与&a氯气&r反应制得。你可以储存&d次氯酸&r，或选择电解它以回收&f一半的氯气&r。\n\n至于&6硫酸&r，你应该已经通过&e石油化工蒸馏&r装置获得了无限的硫磺来源。如果还没有，我们强烈建议你尽快解决这个问题。此外，生产&b重整气&r时获得的&8煤焦油&r可以重新转化为&2硫化氢&r，并最终精炼回&6硫&r。", "quests.gregtech_energy": "格雷科技能源", "quests.gregtech_energy.subtitle": "这一切到底是怎么工作的？", "quests.gregtech_energy.start.title": "让我们做些解释", @@ -2340,11 +2490,11 @@ "quests.gregtech_energy.syngas.desc": "&e合成气&r是一种新的TFG气体燃料。你可以在&8ULV&r阶段很早解锁它，并在&7LV&r阶段用于你的首批&6燃气轮机&r中。它并非特别强效的燃料，但可以转化为有价值的副产品，例如&e润滑剂&r、&e甲烷&r和&e氢气&r。\n\n尽管它不是最强大的选择且难以规模化生产，但仅需三座&6焦炉&r和一台&6酿造室&r或&6真空腔室&r，你就能稳定供应，这足以支撑你到达&bMV&r阶段并解锁更强大的&e重整气&r。", "quests.gregtech_energy.reformate_gas.title": "重整气", "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.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.title": "轻质芳烃燃料", "quests.gregtech_energy.btx.subtitle": "并非韩国乐队", - "quests.gregtech_energy.btx.desc": "轻质芳烃燃料尚未实装", + "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.fission_rod.title": "裂变燃料", "quests.gregtech_energy.fission_rod.subtitle": "别让我过热了", "quests.gregtech_energy.fission_rod.desc.1": "地球裂变材料尚未实装，但或许即将到来", @@ -2506,6 +2656,7 @@ "quests.high_voltage.cleanroom.subtitle": "他们把我关进一个房间……一个洁净的房间", "quests.high_voltage.cleanroom.desc.1": "&3超净间&r是一种无污染的空心多方块结构。今后，大多数新的&a电路相关配方&r，以及&3聚变外壳&r等特殊方块，都需在超净间内部的机器中运行。\n\n建造过程将消耗大量&d塑料混凝土&r和/或&d超净间玻璃&r——这会全面考验你的&a聚乙烯&r自动化产线。\n\n我们将从5x5x5的基础结构开始，当感到空间局促时请及时扩建。", "quests.high_voltage.cleanroom.desc.2": "&l&3背景知识：&r&o超净间概念源自格雷科技5，但GT5的实现机制更为严苛：配方执行时不会检测清洁度，但完成概率与超净间洁净等级直接挂钩，这导致大量材料无故消失。\n\n&o此外，若超净间存在维护问题，洁净度上限将锁定在90%%，意味着10%%的物品会被损毁。\n\n&oGTCEu版本的超净间将&6永不损耗&r配方产物。", + "quests.high_voltage.cleanroom.task": "维护仓或自动维护仓", "quests.high_voltage.prospector.title": "HV探矿仪", "quests.high_voltage.prospector.desc.1": "这款探矿仪具备比&7LV&r型号&6更广的探测范围&r。\n\n手持探矿仪时潜行右键可切换至&6流体矿脉模式&r，该模式将显示流体矿脉的&d基础产量&r及其充盈程度。\n\n此功能对于在月球上定位&9氦-3&r矿脉与&9基岩矿脉&r非常有用。", "quests.high_voltage.prospector.desc.2": "&9提醒：&r&3流体钻机&r的产量与矿脉的\"充盈度\"直接相关。当充盈度过低时，产出将默认切换至GTCEu配置文件中设定的保底产量。\n\n&9提示：&r当充盈度低于30%（此为粗略估值）时，出于能效比考虑，建议转移至其他矿脉。你可瞄准&5EV&r阶段的&3高级流体钻机&r，它不仅显著提升产量，更能降低矿脉消耗速率！\n\n&c注意：&r因程序缺陷，探矿仪显示坐标可能存在1区块偏移，请避免将钻机放置在流体矿脉边缘，否则可能抽取到错误流体！", @@ -2654,7 +2805,7 @@ "quests.low_voltage.lv_machine_hull.title": "你的第二个机器外壳", "quests.low_voltage.lv_machine_hull.subtitle": "是时候接触电力了", "quests.low_voltage.lv_machine_hull.desc.1": "你离你的&6第一台LV机器&r和电气时代的开端非常近了！如果你还没有制作任何&4红钢&r，现在你必须做了，但作为回报，你将获得&6新的方法&r来改进你的生产。\n\n这就是格雷科技的理念：&6你进步得越远，新的配方就越好&r。\n\n开始时尝试制作至少3或4个外壳。", - "quests.low_voltage.lv_machine_hull.desc.2": "对于某些玩家来说，达到一个新的等级是以制作第一个&6电路&r为标志，对于其他人则是&6机器外壳&r或&6能源舱&r。你可以使用任何最适合你的方式，但为了组织有序，这些任务将使用机器外壳作为标志。", + "quests.low_voltage.lv_machine_hull.desc.2": "对于某些玩家来说，达到一个新的等级是以制作第一个&6电路&r为标志，对于其他人则是&6机器外壳&r或&6能源舱&r。你可以使用任何最适合你的方式，但为了组织有序，这些任务将使用机器外壳作为标志。\n\n不知道从何开始？我们建议寻找那些能让其他所有东西都变得更便宜（事半功倍）的机器，从你最讨厌的事情开始。", "quests.low_voltage.lv_machine_casing.title": "用于机械动力的LV机械方块？", "quests.low_voltage.lv_machine_casing.subtitle": "更多选择！", "quests.low_voltage.lv_machine_casing.desc": "为降低入门LV阶段的难度，&5TFG&r允许你使用&6机械动力&r的机器替代部分&6格雷科技&r机器。\n\n我们在&6上一章节&r已介绍过这些内容，只需记住：当存在格雷科技机器的替代方案时，你都能在任务中自行选择。", @@ -2665,7 +2816,7 @@ "quests.low_voltage.lv_age_progression.subtitle": "选择太多，时间太少！", "quests.low_voltage.lv_age_progression.desc": "&7LV&r阶段需要你制作多种不同的机器！如果你在目标规划上遇到困难，这里有个友好提示：可以选择后续任务中的某个物品，然后倒推所需的制作步骤。\n\n既然如此……我们何不从&5聚变控制器&r开始呢？好吧，这目标有点好高骛远——还是先定个更接近的目标吧。对了，&3电力高炉&r作为&7LV&r阶段的终极目标，应该是个不错的目标。\n\n电力高炉的&a造价昂贵&r，因此你应该先专注于制造能降低组件和材料成本的机器。我们的任务体系会为你指引正确方向。\n\n其他重要目标包括制作&3LV组装机&r、生产首批&aMV电路&r，以及获得第一台&b电路组装器&r。", "quests.low_voltage.lv_age_progression.task": "我……现在可能有点方向感了", - "quests.low_voltage.lv_steam_turbine.title": "发电", + "quests.low_voltage.lv_steam_turbine.title": "蒸汽轮机", "quests.low_voltage.lv_steam_turbine.subtitle": "你必须建造更多的涡轮机", "quests.low_voltage.lv_steam_turbine.desc.1": "&3蒸汽轮机&r是你在&7LV&r阶段实际上可以使用的为数不多的发电机之一。&2稍后，你将解锁更有趣的能源选项&r，例如天然气或汽油。\n\n当提供蒸汽时，涡轮机将以&d2mB=1EU&r的比例输出电力。", "quests.low_voltage.lv_steam_turbine.desc.2": "如果你使用单个&3蒸汽轮机&r，只需要&a1x锡电缆&r。但若升级到&32台蒸汽涡轮&r，则应使用&a2x锡电缆&r——否则它们可能会&c烧毁&r。\n\n这涉及&9电流&r机制……不过具体原理将留待后续说明，现在你只需专注享受游戏。别担心！", @@ -2700,7 +2851,7 @@ "quests.low_voltage.lv_gas_syngas.title": "合成气", "quests.low_voltage.lv_gas_syngas.subtitle": "并非木煤气", "quests.low_voltage.lv_gas_syngas.desc": "制造&7合成气&r非常简单。你只需为每台&6酿造室&r或&6真空腔室&r配备&b3座焦炉&r。然后借助&b机械动力树场&r收集&7木材&r以最大程度降低能耗，就能享受这种虽弱但易于生产的&7气体燃料&r了。", - "quests.low_voltage.lv_naphtha_light.title": "石脑油和轻油", + "quests.low_voltage.lv_naphtha_light.title": "石脑油和轻燃油", "quests.low_voltage.lv_naphtha_light.subtitle": "你可以用它们来制造塑料", "quests.low_voltage.lv_naphtha_light.desc": "如果你实在厌恶种地，更偏爱在&6沙漠&r探险或开采大量&7油砂&r，那么或许&7石脑油&r（从&7原油&r中提取更佳）或&7轻燃油&r（从&7石油&r中提取更佳）会是值得你考虑的燃料。\n\n鉴于其易于生产的特性，它们的性价比相当不错，只不过在现阶段仍需手动采收。", "quests.low_voltage.lv_turbo_charge.title": "闪聚充电箱", @@ -2736,9 +2887,9 @@ "quests.low_voltage.lv_lathe.task": "以下任何一个", "quests.low_voltage.universal_cell.title": "更好的桶", "quests.low_voltage.universal_cell.subtitle": "内部结构一目了然，不像那些桶完全封闭得严严实实……", - "quests.low_voltage.universal_cell.desc.1": "单元是流体存储的另一种形式。所有储存同类等量流体的单元均可&6堆叠&r，并可通过&3装罐机&r实现自动灌装。\n\n每个单元容量为&d一桶&r流体。", + "quests.low_voltage.universal_cell.desc.1": "单元是流体存储的另一种形式。所有储存同类等量流体的单元均可&6堆叠&r，并可通过&3装罐机&r实现自动灌装。\n\n每个流体单元可容纳&d一桶&r流体。\n\n还没被说服吗？与桶和大木桶不同，单元能&a安全地容纳&r其中的内容，防止你被烫伤、冻伤或飘起来。", "quests.low_voltage.universal_cell.desc.2": "通用单元最多可容纳&d一桶&r流体，同时支持存储&9微量&r流体。若需暂存残余流体而不想专门制作整只桶，这类容器尤为理想。\n\n采用高阶材料制造的单元能承载更多流体，不过届时&9桶&r和&9超级缸&r将提供更大容量。\n\n与桶类似，将单元放入合成栏即可清空其内容物。", - "quests.low_voltage.universal_cell.task": "", + "quests.low_voltage.universal_cell.task": "任意单元", "quests.low_voltage.machine_auto_output_behaviour.title": "机器自动输出行为", "quests.low_voltage.machine_auto_output_behaviour.subtitle": "我们来了解相关知识。", "quests.low_voltage.machine_auto_output_behaviour.desc.1": "所有机器通常包含一个&7正面&r与一个&9输出面&r。\n\n&7正面&r应该很明显。\n&9输出面&r则是带有点状或孔洞标记的面，默认位于机器放置时的背面。\n\n机器可通过输出面实现&a自动输出&r功能。需在图形界面中点击对应按钮启用该功能，流体与物品的自动输出需分别设置。通过&d过滤卡&r和&d覆盖板&r可对自动输出进行精细化控制，具体机制请参阅本章节中的&d覆盖板行为&r任务。。", @@ -2809,7 +2960,7 @@ "quests.low_voltage.lv_electroliser.desc.3": "&c注意！&r受矿物特性影响，将金属粉尘直接冶炼成锭相比电解分解能获得更高金属产量，但代价是你会损失粉尘中蕴含的其他副产品。必须根据需求权衡：优先追求直接收益，还是最大化获取副产物种类。", "quests.low_voltage.lv_mixer.title": "基础搅拌机", "quests.low_voltage.lv_mixer.subtitle": "搅拌机用于搅拌……", - "quests.low_voltage.lv_mixer.desc": "使用搅拌机将&6大幅加快&r彩色钢的制备过程，尤其是制作机器外壳所需的&4红钢&r。即使现在认为不需要，后续阶段你会发现它&6不可或缺&r。", + "quests.low_voltage.lv_mixer.desc": "使用搅拌机将&6大幅加快&r彩色钢的制备过程，尤其是制作机器外壳所需的&4红钢&r。即使现在认为不需要，后续阶段你会发现它&6不可或缺&r。\n\n你可能已经习惯了在坩埚中进行合金冶炼，但对于任何新合金（以及所有旧合金），格雷科技的合金制作方式是&a将粉末混合&r，然后将其加热成锭或提取为流体。先别去JEI里查看合金冶炼炉，那要到&5EV&r阶段才有。", "quests.low_voltage.lv_mixer.task": "来自机械动力或格雷科技", "quests.low_voltage.soldering_alloy.title": "焊锡", "quests.low_voltage.soldering_alloy.subtitle": "我拥有灵魂却非焊将（注：英文谐音梗）", @@ -2827,7 +2978,7 @@ "quests.low_voltage.t2_circuit_board.desc.2": "&l&3背景故事：&r&o在GTCEu1.12.2中，这些电路板被称为&2优质电路板&f。这个名字并不完全合适，因为它们&4相当邪恶&f。", "quests.low_voltage.lv_diode.title": "二极管", "quests.low_voltage.lv_diode.subtitle": "不要被EMI动摇！", - "quests.low_voltage.lv_diode.desc": "别被JEI误导了……目前这种原始二极管 (Primitive Diode) 只有一种可行配方——需要液态玻璃的那个。\n\n二极管的配方是出了名的&4棘手&r，但一旦你能获取&e聚乙烯&r，它们的制作就会变得更便宜、更方便。\n\n这是制作&dMV电路&r所必需的。", + "quests.low_voltage.lv_diode.desc": "别被JEI误导了……目前这种原始二极管只有2种可行配方——需要液态玻璃的那些。\n\n二极管的配方是出了名的&4棘手&r，但一旦你能获取&e聚乙烯&r，它们的制作就会变得更便宜、更方便。\n\n这是制作&dMV电路&r所必需的。", "quests.low_voltage.1_mv_circuit.title": "第一个MV电路！", "quests.low_voltage.1_mv_circuit.subtitle": "这是否意味着我们已经进入MV阶段了？", "quests.low_voltage.1_mv_circuit.desc": "唔…你已经有铝锭了吗？\n\n每个电气时代都有与其等级对应的电路。优质电子电路是你在三级&bMV电路&r体系中能制作的&d第一个MV电路&r。\n\n请持续关注更经济的电路制作方案——每当你制造出新等级的&2电路组装器&r，都会解锁全新配方体系。值得庆幸的是，当前这级电路正好能立即解锁新配方！其成本效益远超机械手体系。\n\n&6拥有铝材和本电路后，即可解锁MV机器。&r\n\n若你对格雷科技复杂的电路体系感到困惑，请查阅&6发展进程表&r章节获取详解。", @@ -2926,6 +3077,9 @@ "quests.low_voltage.oil.title": "提前发现石油了？", "quests.low_voltage.oil.subtitle": "致LV阶段的卷王", "quests.low_voltage.oil.desc": "若你在旅途中发现任何油砂矿或（沙漠中的）石油喷口，其实在LV阶段便可稍加利用。\n\n你可将其转化为重燃油用于锅炉，或更佳——用它生产少量&b聚乙烯&r！\n\n相关细节虽在MV章节，但此刻你已可用聚乙烯制造数种物品，例如成本更低的机器外壳与二极管。", + "quests.low_voltage.glowstone.title": "永久照明", + "quests.low_voltage.glowstone.subtitle": "发明电灯泡的迂回方式", + "quests.low_voltage.glowstone.desc": "想找一些廉价的永久光源？现在你有了LV提取机（很快还会有LV流体固化机），正好可以好好利用在下界攒下的那些&6荧石粉&r。不够用？用搅拌机还能自己造。\n\n打开JEI看看，所有用液态荧石和荧石块合成的新光源都在里面。格雷科技还提供了直接用荧石粉在组装机里制作的款式。\n\n还有个福利：液态荧石可以直接作为灯笼的无限燃料！", "quests.medium_voltage": "&bMV&r - 中压", "quests.medium_voltage.subtitle": "进军石油化工，精炼电子技术", "quests.medium_voltage.mv_machine_hull.title": "欢迎来到MV！", @@ -3015,7 +3169,7 @@ "quests.medium_voltage.mv_benzene.desc.3": "&l&3背景知识：&r&o自GTCEu以来，苯一直是最强大的气体燃料之一——其性能之强甚至成了一个梗。如今，它的辉煌时代在任何地方都屈指可数了。", "quests.medium_voltage.reformate_gas.title": "重整气教派", "quests.medium_voltage.reformate_gas.subtitle": "当一位巨人倒下，新的巨人已然崛起。", - "quests.medium_voltage.reformate_gas.desc": "如果这是你选择的路径，那么&8重整气&r将是你在&bMV&r阶段新的首选气体燃料。为实现完美效率，你只需要 &61座煤炭液化塔&r和&62座热解炉&r，便能开始不间断地产出这种珍贵气体。\n\n哦等等，首先你需要找到&5铼&r，这是一种仅在&7群峦传说&r干热区域发现的新材料。其消耗量极低，一个矿脉就足以支撑你直到整合包毕业，或者至少到&6HV&r阶段——届时，在 &6裂解机&r的帮助下，这种气体才能真正实现无限生产。", + "quests.medium_voltage.reformate_gas.desc": "如果这是你选择的路径，那么&8重整气&r将是你在&bMV&r阶段新的首选气体燃料。为实现完美效率，你只需要 &61座液化塔&r和&62座热解炉&r，便能开始不间断地产出这种珍贵气体。\n\n哦等等，首先你需要找到&5铼&r，这是一种仅在&7群峦传说&r干热区域发现的新材料。其消耗量极低，一个矿脉就足以支撑你直到整合包毕业，或者至少到&6HV&r阶段——届时，在 &6裂解机&r的帮助下，这种气体才能真正实现无限生产。", "quests.medium_voltage.mv_light_fuel.title": "轻燃油", "quests.medium_voltage.mv_light_fuel.subtitle": "把这里的灯点亮，宝贝", "quests.medium_voltage.mv_light_fuel.desc": "蒸馏&a原油&r可获得需要脱硫处理的燃料。\n\n&a硫化氢&r能在&3电解机&r中完美&d循环利用&r。\n\n要实现自动化流程，只需将&3化学反应釜&r与&3电解机&r相邻放置。记得使用&5螺丝刀&r&4启用输出面的输入功能&r。\n\n&a轻燃油&r是不错的&9发电&r选择，但还有更高效的方案……请查看左侧任务指引。", @@ -3024,10 +3178,10 @@ "quests.medium_voltage.mv_diesel.desc.1": "&a柴油&r是一种&d基于石油的&9内燃机燃料&r。\n\n要混合&a轻燃料&r和&a重燃料&r，使用&3蒸馏室&r时，从&d石油&r或&d原油&r中提取的合适比例是&63:2&r。\n\n这意味着需配备3台蒸馏室生产轻燃油，或2台蒸馏室生产重燃油。", "quests.medium_voltage.mv_diesel.desc.2": "通过专门使用&d重油&r来制备&a重燃油&r，可&6大幅削减&r所需&d石油&r用量。若选择此路线，&d油砂矿&r是绝佳选择！\n\n&o（给数据控：从8.33石油->6柴油，优化为5石油+0.4重油->6柴油）&r\n\n&e注意：&r请&c不要尝试&r将石油直接放入&3蒸馏塔&r处理！表面看来它能同时产出轻燃油和重燃油似乎很划算，但此过程需要大量超频才能达到理想效率，最终损耗的能量会远超副产品价值。", "quests.medium_voltage.mv_diesel.desc.3": "总体而言，优先部署更多机器（&d并行处理&r）比超频配方更有效率。这种方式能在处理资源时减少能量损耗。\n\n&a柴油&r通过&3内燃发电机&r燃烧发电。在&6HV&r阶段可进一步精炼成&6高十六烷值柴油&r。与其他能源相比，柴油总体效率更高，但加工流程更为复杂。若你选择&e石油&r路线生产&a聚乙烯&r，现有基础设施便能完美适配此方案。最终选择何种能源仍取决于你。", - "quests.medium_voltage.coal_tower.title": "煤炭液化塔", + "quests.medium_voltage.coal_tower.title": "液化塔", "quests.medium_voltage.coal_tower.subtitle": "谁会不爱新的多方块结构呢", - "quests.medium_voltage.coal_tower.desc.1": "&b煤炭液化塔&r是一个新的&b多方块结构&r，用于生产&a重整气&r及其副产品&7煤焦油&r和&7合成气&r。根据你使用的&9线圈&r，每个配方所需的&7EU/t&r消耗将获得折扣。将鼠标悬停在线圈上并按shift键即可查看其加成效果。\n\n注意，&9煤炭液化塔&r可通过使用&8氢气&r来加速，从而减少耗时并降低总能耗。别忘了设置正确的&6电路配置&r以确保其正常运行。\n\n顺带一提，游戏内1秒等于20游戏刻。因此，要计算其每秒消耗，需将每游戏刻消耗量乘以20。", - "quests.medium_voltage.coal_tower.desc.2": "&l&3背景知识：&r&o设计出核裂变反应堆的同一个人，也绘制了煤炭液化塔的初版蓝图，这难道不疯狂吗。", + "quests.medium_voltage.coal_tower.desc.1": "&b液化塔&r是一个新的&b多方块结构&r，用于生产&a重整气&r及其副产品&7煤焦油&r和&7合成气&r。根据你使用的&9线圈&r，每个配方所需的&执行时间&r将获得折扣。将鼠标悬停在线圈上并按shift键即可查看其加成效果。\n\n注意，&9液化塔&r可通过使用&8氢气&r来加速，从而减少耗时并降低总能耗。别忘了设置正确的&6电路配置&r以确保其正常运行。\n\n顺带一提，游戏内1秒等于20游戏刻。因此，要计算其每秒消耗，需将每游戏刻消耗量乘以20。", + "quests.medium_voltage.coal_tower.desc.2": "&l&3背景知识：&r&o设计出核裂变反应堆的同一个人，也绘制了液化塔的初版蓝图，这难道不疯狂吗。", "quests.medium_voltage.mv_jetpack.title": "我相信我能飞", "quests.medium_voltage.mv_jetpack.subtitle": "...嗯，几乎能飞", "quests.medium_voltage.mv_jetpack.desc": "这款喷气背包可使用多数&a内燃机燃料&r（不包括石油类）来提供基础飞行功能。\n\n填充方式与流体桶相同，或通过&3罐装机&r进行填充。\n\n按下&4H&r键（默认按键）可开启悬停模式。", @@ -3148,8 +3302,8 @@ "quests.medium_voltage.mv_jetpack_2.desc": "这款喷气背包可实现飞行功能，但需消耗能量。\n\n充电方式与电池相同。\n\n按&4H&r（默认）启用悬停模式。\n\n&o&8（是是是，喷气背包本该靠推进剂工作——你们总爱吹毛求疵。）&r", "quests.medium_voltage.mv_cutter.title": "进阶切割机", "quests.medium_voltage.mv_cutter.subtitle": "升级，大伙，升级啊！", - "quests.medium_voltage.mv_cutter.desc": "&3MV切割机&r用于切割&7单晶硅&r，为后续的&a激光蚀刻机&r做准备。\n\n建议持续供应&d润滑剂&r以大幅缩短加工时间。\n\n润滑剂可通过&e石油&r与&a滑石&r、&2皂石&r或&c红石&r通过&3酿造室&r制备。\n\n&7注：也可选用&6格雷机械&r版本的切割机，现在它可以用流体储罐来填充液体&r", - "quests.medium_voltage.mv_cutter.task": "任何酿造室", + "quests.medium_voltage.mv_cutter.desc": "&3MV切割机&r用于切割&7单晶硅&r，为后续的&a激光蚀刻机&r做准备。\n\n建议持续供应&d润滑剂&r以大幅缩短加工时间。\n\n润滑剂可通过&e石油&r与&a滑石&r、&2皂石&r或&c红石&r通过&3酿造室&r制备。\n\n&7注：也可选用&6格雷机械&r版本的切割机，它可以用流体储罐来填充液体&r", + "quests.medium_voltage.mv_cutter.task": "任何切割机", "quests.medium_voltage.mv_laser_engraver.title": "激光蚀刻机", "quests.medium_voltage.mv_laser_engraver.subtitle": "这是顶尖技术，这也很慢", "quests.medium_voltage.mv_laser_engraver.desc": "&3激光蚀刻机&r根据给定的&9透镜&r类型在&9硅晶圆&r上蚀刻电路图案。完成蚀刻的晶圆需经&3切割机&r加工，才能转化为可组装电路的元器件。\n\n更高级别的蚀刻机能处理更复杂的晶圆，从而制造出效率更高的电路。", @@ -3157,7 +3311,7 @@ "quests.medium_voltage.mv_silicon_boule.subtitle": "通用晶圆任选即用", "quests.medium_voltage.mv_silicon_boule.desc": "&9单晶硅&r需在&3电力高炉&r中使用半组&a硅粉&r与少量&a砷化镓&r合成，其主要用途是蚀刻&6电路晶圆&r。\n\n获得单晶硅后，通过&3切割机&r加工可得到16个待蚀刻的硅晶圆。\n\n&c警告：&r每个单晶硅在120EU/t的功率下需耗时&47.5分钟&r，总耗能达1,080,000EU！若电力高炉中途断电，配方进度将&c开始流失&r。\n\n鉴于单晶硅制作耗时极长，建议在多个&3电力高炉&r中并行处理并囤积它们。", "quests.medium_voltage.mv_silicon.title": "硅粉", - "quests.medium_voltage.mv_silicon.subtitle": "", + "quests.medium_voltage.mv_silicon.subtitle": "石圭", "quests.medium_voltage.mv_silicon.desc.1": "你得习惯这点：在&d格雷科技&r中达成目标总有&a多种途径&r——这正是我们在&a群峦格雷&r中始终坚持的设计理念。\n\n为获取&5硅&r，我们将推荐&c两种主流方法&r以提供明确指引。当然，最终还需由你判断哪种方案&a最适合当前状况&r。", "quests.medium_voltage.mv_silicon.desc.2": "第一种方法：&a开采富含硅的矿石&r。寻找&9云母&r或&9蓝晶石&r矿脉——它们同时蕴含&d铝&r。替代方案是&a电解沸石粉&r，该材料分布于&9黄铜矿&r和&d雄黄&r矿脉中。\n\n第二种方法：&e高效且强大&r。虽然初期投入成本较高且效率偏低，但在&6HV&r阶段后将成为&e最优解&r，而且还能产生&9氧气&r作为奖励！原理很简单：&a电解二氧化硅粉&r分解为&9氧气&r与&5硅&r。可通过&9离心燧石粉&r获取&a二氧化硅粉&r，而燧石粉则来自&a筛选沙砾&r获得的&9燧石&r。\n\n此产线易实现&a全自动化运行&r。推荐使用&aEMI配方树&r工具（屏幕左下角）规划建造——它真的很有帮助！", "quests.medium_voltage.mv_ulpic.title": "ULPIC芯片", @@ -3249,7 +3403,7 @@ "quests.metal_age.crucible.desc": "将坩埚放置在木炭炉上方。它带有9个物品栏槽位，可容纳4032mB的流体，包括一个检查你合金化比例的界面。它们在破碎时也会保留其内容物。当放置在高炉下方时，它们也可以收集生铁。\n\n请记住，坩埚会尝试合金化里面的所有东西——它不像匠魂冶炼炉那样将金属分开保存——所以当你不使用它时，保持清洁是一个好主意。", "quests.metal_age.fire_bricks.title": "耐火砖", "quests.metal_age.fire_bricks.subtitle": "用于高炉", - "quests.metal_age.fire_bricks.desc": "耐火砖用于建造高炉，你至少需要4块砖来制作炉子。\n\n这些砖需要隔热以确保炼钢过程有效，你可以在耐火砖周围放置3块锻铁薄板，或者使用高炉隔热材料", + "quests.metal_age.fire_bricks.desc": "耐火砖用于建造高炉，你至少需要4块砖来制作炉子。\n\n这些砖需要隔热以确保炼钢过程有效，你可以在耐火砖周围放置3块锻铁板，或者使用高炉隔热板。", "quests.metal_age.fully_stacked_blast_furnace.title": "全尺寸高炉", "quests.metal_age.fully_stacked_blast_furnace.subtitle": "完工的高炉", "quests.metal_age.fully_stacked_blast_furnace.desc": "全尺寸的高炉能够一次熔化和处理大量的铁。在可能的情况下把它建得更大是一个好主意，因为你将来需要大量的钢。\n\n在你有了第一个蒸汽合金炉之后，你将能够更便宜地制造更多的耐火砖。", @@ -3263,7 +3417,7 @@ "quests.metal_age.steel_anvil.subtitle": "相比锻铁的巨大飞跃", "quests.metal_age.steel_anvil.desc": "有了钢砧，你将能够将钢锭加工成不同的形式。\n\n钢制工具和设备相比青铜和锻铁对应物有显著提升，因此如果你现有的工具即将损坏，它们值得制作。你很快将需要制造大量合金，因此一些新的采矿设备将是一项明智的投资。", "quests.metal_age.steel_goodies.title": "钢级机械动力", - "quests.metal_age.steel_goodies.subtitle": "吹风、粉碎和管道运输", + "quests.metal_age.steel_goodies.subtitle": "鼓风、粉碎和管道运输", "quests.metal_age.steel_goodies.desc": "钢解锁了新的格雷机械等级，具有更高的最大应力容量！你现在还可以制造诸如鼓风机（可以自动化矿石清洗）和动力泵（让你更容易进行流体物流）之类的东西。\n\n动力泵特别有用，因为通过巧妙设计，你可以轻松实现高炉的自动化操作。\n\n为了给这些机械提供动力，你还可以使用蒸汽引擎，从而将燃料和水转化为巨量的机械能！", "quests.metal_age.weak_steel.title": "脆钢成分", "quests.metal_age.weak_steel.subtitle": "希望你喜欢数学", @@ -3315,6 +3469,10 @@ "quests.metal_age.this_is_a_bucket.title": "这……是一个桶。", "quests.metal_age.this_is_a_bucket.subtitle": "亲爱的上帝……", "quests.metal_age.this_is_a_bucket.desc": "恭喜你制作了桶。冶金时代正式结束。\n\n去开始研究那些低电压组件吧！", + "quests.metal_age.temperature_protection.title": "彩色钢装备", + "quests.metal_age.temperature_protection.subtitle": "永久温度防护", + "quests.metal_age.temperature_protection.desc": "厌倦了总是拿着钳子吗？彩色钢优异的隔热性能同样体现在它们的装备上！\n\n&9蓝钢&r装备可以抵御极端高温，例如手持热铸锭或踩在充满蒸汽的管道上；而&c红钢&r装备则对低温提供同样的防护。胸甲类物品保护你的物品栏，靴子类物品则专门防护管道。\n\n查看&6#hot_protection_equipment&r和&b#cold_protection_equipment&r标签以获取完整列表！", + "quests.metal_age.temperature_protection.task": "任意红钢或蓝钢装备", "quests.ore_proc": "矿石处理", "quests.ore_proc.subtitle": "让你的矿石物尽其用所需的一切", "quests.ore_proc.native_ore.title": "欢迎来到矿石处理", @@ -3528,7 +3686,7 @@ "quests.space_survival.sandworm.desc": "在沙漠中制造过大声响可能会引来强大的&6沙虫&r！它更像是需要规避的环境威胁而非可讨伐的首领，因此存活下来的最佳方式就是立即逃离！\n\n若能用&b爆炸伤害&r多次击中其头部，它会暂时停止追击…但效果仅能维持片刻。\n\n所幸沙虫仅能伤害生物而非建筑，且只会被&6玩家的脚步声&r吸引——只要确保&b双脚&r不接触地面便不会激怒它。稀薄的大气层不支持飞机与滑翔伞，但总有其他工具……", "quests.space_survival.spice.title": "紫金矿床", "quests.space_survival.spice.subtitle": "美琅脂", - "quests.space_survival.spice.desc": "&d紫金矿床&r是仅分布于火星深层沙漠的固定生成方块，远离所有富饶区域。它们以小型矿簇形态生成，若位于斜坡位置可被破坏以便为紫金采集器腾出空间。建议使用&6望远镜&r进行远距离定位！\n\n你需要建立长距离物流系统将紫金输送回基地（可尝试铁路运输，蓄电器能实现电力同步传输！）\n\n紫金是&5EV&r阶段发展及从火星获取无限矿石的关键资源。", + "quests.space_survival.spice.desc": "&d紫金矿床&r是仅分布于火星深层沙漠的固定生成方块，远离所有富饶区域。它们以小型矿簇形态生成，若位于斜坡位置可被破坏以便为紫金采集器腾出空间。建议使用&6望远镜&r进行远距离定位！\n\n你需要建立长距离物流系统将紫金输送回基地（尝试一下铁路运输！）\n\n紫金是&5EV&r阶段发展及从火星获取无限矿石的关键资源。", "quests.space_survival.spice.task": "美琅脂的流转永不停息", "quests.space_survival.mars_islands.title": "火星丛林", "quests.space_survival.mars_islands.subtitle": "那是恐龙吗？！", @@ -3614,19 +3772,19 @@ "quests.steam_age.horse_crank.title": "你的第一个动力源", "quests.steam_age.horse_crank.subtitle": "让你的牲畜付租金", "quests.steam_age.horse_crank.desc.1": "&3动物曲柄&r 是你第一个可获得的机械动力源。要使用它，将曲柄放在一个7x7清空区域的中心，并用拴绳将动物拴在上面。不同的动物会提供不同数量的动力，而下面的方块会增加输出动力的速度。多个曲柄的区域可以重叠。\n\n你可能需要手持第二根拴绳来拴住动物。", - "quests.steam_age.horse_crank.desc.2": "&3小型动物 (4 SU):&r\n狼, 狗, 猪, 绵羊, 山羊, 羊驼\n\n&3中型动物 (6 SU):&r\n牛, 驴\n\n&3大型动物 (8 SU):&r\n马, 骡, 麝牛, 牦牛", + "quests.steam_age.horse_crank.desc.2": "&3小型动物 (8 SU):&r\n狼, 狗, 猪, 绵羊, 山羊, 羊驼\n\n&3中型动物 (12 SU):&r\n牛, 驴\n\n&3大型动物 (16 SU):&r\n马, 骡, 麝牛, 牦牛", "quests.steam_age.poor_paths.title": "劣质路面", "quests.steam_age.poor_paths.subtitle": "这只是土", - "quests.steam_age.poor_paths.desc": "这是你能使用的最差的道路。动物曲柄将以 2 RPM 运行。", + "quests.steam_age.poor_paths.desc": "这是你能使用的最差的道路。动物曲柄将以8RPM运行。", "quests.steam_age.normal_paths.title": "中等路面", "quests.steam_age.normal_paths.subtitle": "好吧，你花了一点功夫", - "quests.steam_age.normal_paths.desc": "中等路面稍微好一点，会让你的动物以4RPM转动曲柄。\n\n注意：你不能在动物曲柄正下方放置土径方块，所以那个位置必须是沙砾。", + "quests.steam_age.normal_paths.desc": "中等路面稍微好一点，能让你的动物以16RPM的速度转动曲柄。\n\n注意：你不能在动物曲柄正下方放置土径方块，所以那个位置必须是沙砾。", "quests.steam_age.good_paths.title": "优质路面", "quests.steam_age.good_paths.subtitle": "不需要马蹄铁！", - "quests.steam_age.good_paths.desc": "这是你能使用的最好的路面，让你的曲柄以8RPM输出。这类小路也会增加玩家的移动速度，所以用它们铺设你的基地很棒！", + "quests.steam_age.good_paths.desc": "这是你能使用的最好的路面，能让的曲柄输出32RPM。这类小路也会增加玩家的移动速度，所以用它们铺设你的基地很棒！", "quests.steam_age.helve_hammer.title": "杠杆锤", "quests.steam_age.helve_hammer.subtitle": "哐……哐……哐……", - "quests.steam_age.helve_hammer.desc": "觉得为锻铁炉制作所有那些板件很繁琐吗？&3杠杆锤&r 会自动（但缓慢地）将双锭锻造成板件给你。不过，焊接仍然需要你自己完成。只需在锤子正下方放置一个砧，并将你的双锭扔上去，然后右键单击锤子取出你的板件。\n\n更高级的砧也需要更少的锻打次数来用前一级的材料制作板件。", + "quests.steam_age.helve_hammer.desc": "觉得为锻铁炉制作所有那些板件很繁琐吗？&3杠杆锤&r 能自动（但缓慢地）将双锭锻造成板材。不过，焊接工作仍需你亲自动手。只需在锤头正下方放置一个砧，按&2丢弃物品键（默认为Q）&r将双锭扔到上面，最后右键点击锤头即可取出板材。\n\n更高级的砧也能以更少的锤击次数，将前一级的材料加工成板件。", "quests.steam_age.water_wheel.title": "水车", "quests.steam_age.water_wheel.subtitle": "希望你把基地建在河边！", "quests.steam_age.water_wheel.desc": "水车提供的动力远胜于动物曲柄，但代价是需要依赖流动的水源。目前你尚无法自主移动水源，因此需要寻找河流来驱动它们。海洋与湖泊虽也能提供少量动力，但若身处内陆，建造风车会是更明智的选择。\n\n你可以将任何木板浸泡在焦炉产出的杂酚油中，以此获得防腐木。", @@ -3670,11 +3828,11 @@ "quests.steam_age.steel_pump.desc.3": "另一方面，格雷科技的管道则拥有自身的内部流体容量，一旦流体进入其中，就无需泵持续驱动。与物品管道类似，其连接也可以通过潜行状态下使用扳手右键点击（注意副手不要拿任何东西）来进行全面控制。我们建议你对所有管道都进行此操作，否则流体会在管道内来回晃荡。\n\n如果你的动力泵和格雷科技管道无法连接？用扳手右键点击泵两次，这通常能让它们协同工作。", "quests.steam_age.mold_table.title": "高炉自动化", "quests.steam_age.mold_table.subtitle": "电力高炉还遥遥无期", - "quests.steam_age.mold_table.desc.1": "你一段时间内将需要 &3大量&r 的钢，所以自动化你的高炉绝对是一项值得的投资。机械泵可以直接从高炉中抽出流体（比它滴入坩埚快得多）进入铸模台，而且泵还会让锭瞬间冷却！然后你可以在铸模台正下方放一个溜槽或漏斗来把锭取出来。从那里，你可以将生铁锭送到你的杠杆锤。", + "quests.steam_age.mold_table.desc.1": "在一段时间内你将需要&3海量&r的钢，因此将高炉自动化绝对是一项值得的投资。动力泵可以直接从高炉中抽取流体（比它滴入坩埚的快得多）进入铸模台，而且泵还能让铸锭瞬间冷却！然后，你可以在铸模台正下方放置一个溜槽或漏斗来取出铸锭。之后，你可以将生铁锭送到杠杆锤进行处理。", "quests.steam_age.mold_table.desc.2": "当然，你也可以利用溜槽将物品从高炉顶部投入，并使用机械手自动操作风箱。不过过度鼓风会快速消耗吹风管的耐久度——好在物品管道能自动推送新吹风管进行补充。\n\n你甚至可以让动力泵同时从高炉和坩埚抽取流体，通过流体阀门在合金冶炼期间暂停输送，待完成后重新开启。", "quests.steam_age.fluid_pipes.title": "流体管道", "quests.steam_age.fluid_pipes.subtitle": "液体、气体……我们一视同仁", - "quests.steam_age.fluid_pipes.desc.1": "&b流体管道&r可为你在机器之间输送&7蒸汽&r。\n\n每种管道都有特定的吞吐量（mB/t）和&6温度上限&r。当前阶段需特别注意，因为蒸汽会烧毁木质管道。部分管道还具有&b特殊&r属性，目前无需深究。\n\n每种材料都有多种尺寸的管道。管道尺寸&a越大&r，吞吐量越高，但制作成本也&d越高&r。例如，标准&6青铜流体管道&r可传输120 mB/t（同时拥有1200 mB的内部缓冲容量！）。\n\n建议初期使用木质管道输送低温流体，青铜管道则用于高温流体。", + "quests.steam_age.fluid_pipes.desc.1": "&b流体管道&r可为你在机器之间输送&7蒸汽&r。\n\n每种管道都有特定的吞吐量（mB/t）和&6温度上限&r。当前阶段需特别注意，因为蒸汽会烧毁木质管道。部分管道还具有&b特殊&r属性，目前无需深究。\n\n每种材料都有多种尺寸的管道。管道尺寸&a越大&r，吞吐量越高，但制作成本也&d越高&r。例如，标准&6青铜流体管道&r可传输120 mB/t（同时拥有1200 mB的内部缓冲容量！）。\n\n建议初期使用木质管道输送常温流体，青铜管道则用于高温流体。", "quests.steam_age.fluid_pipes.desc.2": "&a提醒：&r1秒=20游戏刻……前提是服务器没有卡顿。\n\n&d注意：&r 已启用格雷科技6风格的管道。这意味着放置管道时，它们仅会连接到其放置时所对准的方块。需要使用扳手点击管道以打开更多连接。\n\n你也可以在潜行状态下使用扳手右键点击来禁用特定侧的输入。这有助于防止回流（液体向非预期方向流动）。", "quests.steam_age.fluid_drums.title": "高效流体存储", "quests.steam_age.fluid_drums.subtitle": "木桶恐怕无法盛放熔融的钢水。", @@ -3831,7 +3989,7 @@ "quests.steam_age.steel_mech_press.desc.2": "&l&3背景知识：&r&o在TerraFirmaGreg的0.9版本之前，机械动力冲压机曾是蒸汽时代后期的关键设备，因其能以5:4的更优比例生成板材。然而当时的实现机制实为“20%%概率血本无归”，这让许多使用者一边高呼自己热爱赌博一边继续使用。", "quests.steam_age.supers.title": "超级箱与超级缸", "quests.steam_age.supers.subtitle": "超级存储抽屉", - "quests.steam_age.supers.desc": "如果你有大量单一物品或流体，这是&c终&6极&e便&a携&b式&物&5品&4存储解决方案。虽然这些&d基础&r（&8ULV&r）型号起初容量相对较小，但更高级的超级箱和超级缸能容纳惊人数量的物品——所有东西都储存在单个方块中，且完全无视温度或酸度影响！\n\n与桶类似，超级缸和超级箱在&6被破坏时会保留内部物品&r，可通过合成栏清空其内容，并能自动清空任何溢出的内容。\n\n如果你渴望&9更大&r的存储空间，可以看看更高级的量子箱、量子缸或AE2存储元件。", + "quests.steam_age.supers.desc": "如果你有大量单一物品或流体，这是&c终&6极&e便&a携&b式&物&5品&4存储解决方案。虽然这些&d基础&r（&8ULV&r）型号起初容量相对较小，但更高级的超级箱和超级缸能容纳惊人数量的物品——所有东西都储存在单个方块中，且完全无视温度或酸度影响！\n\n与桶类似，超级缸和超级箱在&6被破坏时会保留内部物品&r，可通过合成栏清空其内容，并能自动清空任何溢出的内容。然而，与桶不同的是，超级缸还能&a安全地容纳&r其中的流体，防止你被烫伤、冻伤或飘起来。\n\n如果你渴望&9更大&r的存储空间，可以看看更高级的量子箱、量子缸或AE2存储元件。", "quests.steam_age.supers.task": "任何超级箱或超级缸", "quests.stone_age": "石器时代", "quests.stone_age.subtitle": "简陋开端", @@ -3976,7 +4134,7 @@ "quests.stone_age.portable_storage.desc": "在&lTerraFirmaGreg提示与技巧&r章节中，有一个部分涵盖了你的所有不同便携式存储选项，用于扩展你在世界各地旅行时可以携带的物品数量。如果你很难找到这些任务，它们位于任务树最右边的分支上。", "quests.stone_age.barrels.title": "桶", "quests.stone_age.barrels.subtitle": "斯蒂法诺？", - "quests.stone_age.barrels.desc": "与原版不同，此模组中的木桶用作液体储存器。单个木桶可储存总量达10桶的流体，为实现流体存储提供了相对简单的解决方案。\n\n你还可以将这些流体与其他物品结合，用以制造皮革、粘合剂、灰泥等物品。", + "quests.stone_age.barrels.desc": "与原版不同，此模组中的木桶用作液体储存器。单个木桶可储存总量达10桶的流体，为实现流体存储提供了相对简单的解决方案。\n\n你还可以将这些流体与其他物品结合，用以制造皮革、胶水、砂浆等物品。", "quests.stone_age.leather.title": "皮革", "quests.stone_age.leather.subtitle": "确实，凡事总是要更复杂些才对味。", "quests.stone_age.leather.desc": "野生动物被击杀时会掉落生皮。生皮无法直接当作皮革使用，需要先经过鞣制加工方可使用。\n\n与黏土、石材类似，皮革也可以通过剥制工艺进行加工。通过剥制皮革可以制作出皮革盔甲、水囊等物品。\n若你不愿为获取皮革而猎杀动物，且生活在热带环境中，可将菠萝加工为菠萝布作为皮革替代品。这种方式尤其适合素食主义玩家。", @@ -3991,6 +4149,11 @@ "quests.stone_age.hazards.subtitle": "以为地表很困难？再想想。", "quests.stone_age.hazards.desc.1": "除了怪物，采矿时最大的挑战是处理塌方。如果一个天然石头或矿石方块下面有空气，它被认为是“无支撑的”，并且每次附近方块被开采时都有几率开始塌方。洞穴顶部覆盖着硬化石头，这不会导致坍塌。为了减轻这种情况，最安全的事情就是只挖掘地板，但如果你想安全地挖掘任何其他东西，你必须学习如何使用支撑梁！这些是用原木和锯子制作的。", "quests.stone_age.hazards.desc.2": "《野外指南》中有关于支撑梁工作原理的详细说明和图解，但简而言之：你需要以不超过四格的间距进行布置。只有顶部垂直放置的梁才能实际承重，且其作用范围有限。", + "quests.stone_age.medical_conditions.title": "健康状况", + "quests.stone_age.medical_conditions.subtitle": "别吃石棉", + "quests.stone_age.medical_conditions.desc.1": "小心你捡起的东西！并非所有矿石或粉尘都可以安全触碰，有些会导致&6健康状况&r的累积。\n\n所有&c危险&r信息都会写在物品提示上，所以如果你突然发现身上出现了负面效果，赶紧把那件物品移出你的物品栏！把它放进像小缸或背包这样的容器里是安全的。\n\n大多数这类效果会随着时间慢慢自行消退，但如果你让它们累积得足够久，就会开始引发一大堆其他讨厌的效果，甚至包括&c死亡&r。", + "quests.stone_age.medical_conditions.desc.2": "你终究需要处理其中一些材料，因此也有应对它们的方法。\n\n最好的方法是首先避免染上任何病症——口罩和橡胶手套能分别防止吸入危害和接触危害。\n\n次优的方法是进行治疗：查看一些你可以合成的&a药丸、药片和药膏&r——它们都有助于治愈特定的效果（并能提供有用的增益！），不过更强效的药物也会有更恼人的副作用。", + "quests.stone_age.medical_conditions.task": "做自己的医生", "quests.stone_age.copper_for_anvil.title": "为制作砧准备铜锭", "quests.stone_age.copper_for_anvil.subtitle": "你最好习惯弄到14个某种锭。", "quests.stone_age.copper_for_anvil.desc": "砧的制作确实所费不菲！每个砧需要消耗14块金属锭，这些金属锭还需经过焊接加工成7块双锭。\n\n若你尚未开始采矿，现在是时候行动了——毕竟要收集126块小铜粒可是项艰巨的任务。", @@ -4020,7 +4183,7 @@ "quests.stone_age.flux.desc": "助焊剂是一种主要用于焊接金属的物品，尽管它也有一些别的用途。\n某些类型的岩石，如白垩、石灰石和大理石，可以被粉碎制成助焊剂，各种海洋动物的壳也可以。", "quests.stone_age.weld_copper_ingots.title": "焊接铜锭", "quests.stone_age.weld_copper_ingots.subtitle": "离铜砧如此之近", - "quests.stone_age.weld_copper_ingots.desc": "点燃木炭炉并投入至少2块铜锭。密切关注铜锭加热时的状态提示——当显示\"可加工\"时仍需等待，直至达到\"可焊接\"状态（即将达到熔点的临界阶段）。\n\n一旦达到可焊接温度，请立即用副手持木钳将其快速夹取至石台界面，同时添加少量助焊剂。最后潜行状态下右键点击砧台，趁热将两块铜锭焊接为一体。可使用水或雪快速冷却新制成的双锭。", + "quests.stone_age.weld_copper_ingots.desc": "点燃木炭炉并投入至少2块铜锭。密切关注铜锭加热时的状态提示——当显示\"可加工\"时仍需等待，直至达到\"可焊接\"状态（即将达到熔点的临界阶段）。\n\n一旦达到可焊接温度，请立即用副手持&e木钳&r将其快速夹取至石台界面，同时添加少量助焊剂。最后潜行状态下右键点击砧台，趁热将两块铜锭焊接为一体。可使用水或雪快速冷却新制成的双锭。", "quests.metal_age.copper_anvil.title": "一级砧：铜", "quests.metal_age.copper_anvil.subtitle": "至此所有努力终见成果！", "quests.metal_age.copper_anvil.desc": "恭喜！你正式完成了石器时代，进入了冶金时代！凭借铜砧，下一步将是攀登砧等级，每解锁新的等级，都会开放新工具与制造可能性，让你的生活逐渐变得更容易。现在，去成为真正的铁匠大师吧！", @@ -4506,7 +4669,7 @@ "quests.tfg_tips.firmaciv_info.desc": "&3群峦传说：航海文明&r模组配备了4种不同的导航工具，每一种都能为你提供在世界中所处位置的重要信息。\n包括&d六分仪&r、&d领航员时计&r、&d晴雨表&r和&d指南针&r；关于这些工具的更多信息，请查阅&2野外指南&r。\n\n&3&l背景知识：&r&o默认情况下，Firma:Civ会移除坐标显示，以促使你使用其导航工具。但在此处我们无法这样做，所以，呃，如果你想体验沉浸式角色扮演的话，就用用它们吧。", "quests.tfg_tips.warfare.title": "海战", "quests.tfg_tips.warfare.subtitle": "全舰火炮齐射！", - "quests.tfg_tips.warfare.desc": "你可以为&b单桅纵帆船&r配备&d加农炮&r与炮弹，以便将目标轰成碎片。\n发射加农炮需要先装入&a火药&r、&a粗制纸&r和&a炮弹&r，然后用&c打火石&r点燃引信。", + "quests.tfg_tips.warfare.desc": "你可以为&b单桅纵帆船&r配备&d加农炮&r与炮弹，以便将目标轰成碎片。\n发射加农炮需要先装入&a火药&r、&a粗制纸&r和&a炮弹&r，然后用&c打火石&r点燃引信。\n\n没有&b帆船&r？别担心！火炮也可以放置在地面上，并以和在&b帆船&r上同样的方式发射。", "quests.tfg_tips.kayak_materials.title": "皮划艇", "quests.tfg_tips.kayak_materials.subtitle": "给自己弄艘皮划艇", "quests.tfg_tips.kayak_materials.desc": "&d皮划艇&r是第二简单的船，需用&b蜡&r制作&a防水皮&r。作为&c唯一&r可拾取的船只，虽然仅限&d单人乘坐&r，但在钢铁时代的&d单桅纵帆船&r前是最快的船！", diff --git a/kubejs/assets/tfg/models/block/casings/machine_casing_power_casing.json b/kubejs/assets/tfg/models/block/casings/machine_casing_power_casing.json new file mode 100644 index 000000000..18d68ef40 --- /dev/null +++ b/kubejs/assets/tfg/models/block/casings/machine_casing_power_casing.json @@ -0,0 +1 @@ +{"parent":"minecraft:block/cube_all","textures":{"all":"tfg:block/casings/machine_casing_power_casing"}} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/machines/active_power_transformer.json b/kubejs/assets/tfg/models/block/machines/active_power_transformer.json new file mode 100644 index 000000000..c2960ee1c --- /dev/null +++ b/kubejs/assets/tfg/models/block/machines/active_power_transformer.json @@ -0,0 +1,86 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "tfg:active_power_transformer", + "texture_overrides": { + "all": "tfg:block/casings/machine_casing_power_casing" + }, + "variants": { + "is_formed=false,recipe_logic_status=idle": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "tfg:block/casings/machine_casing_power_casing", + "overlay_front": "gtceu:block/multiblock/power_substation/overlay_front" + } + } + }, + "is_formed=false,recipe_logic_status=suspend": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "tfg:block/casings/machine_casing_power_casing", + "overlay_front": "gtceu:block/multiblock/power_substation/overlay_front" + } + } + }, + "is_formed=false,recipe_logic_status=waiting": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "tfg:block/casings/machine_casing_power_casing", + "overlay_front": "gtceu:block/multiblock/power_substation/overlay_front_active", + "overlay_front_emissive": "gtceu:block/multiblock/power_substation/overlay_front_active_emissive" + } + } + }, + "is_formed=false,recipe_logic_status=working": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "tfg:block/casings/machine_casing_power_casing", + "overlay_front": "gtceu:block/multiblock/power_substation/overlay_front_active", + "overlay_front_emissive": "gtceu:block/multiblock/power_substation/overlay_front_active_emissive" + } + } + }, + "is_formed=true,recipe_logic_status=idle": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "tfg:block/casings/machine_casing_power_casing", + "overlay_front": "gtceu:block/multiblock/power_substation/overlay_front" + } + } + }, + "is_formed=true,recipe_logic_status=suspend": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "tfg:block/casings/machine_casing_power_casing", + "overlay_front": "gtceu:block/multiblock/power_substation/overlay_front" + } + } + }, + "is_formed=true,recipe_logic_status=waiting": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "tfg:block/casings/machine_casing_power_casing", + "overlay_front": "gtceu:block/multiblock/power_substation/overlay_front_active", + "overlay_front_emissive": "gtceu:block/multiblock/power_substation/overlay_front_active_emissive" + } + } + }, + "is_formed=true,recipe_logic_status=working": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "tfg:block/casings/machine_casing_power_casing", + "overlay_front": "gtceu:block/multiblock/power_substation/overlay_front_active", + "overlay_front_emissive": "gtceu:block/multiblock/power_substation/overlay_front_active_emissive" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/machines/electric_greenhouse.json b/kubejs/assets/tfg/models/block/machines/electric_greenhouse.json index 9aec638bb..297392db3 100644 --- a/kubejs/assets/tfg/models/block/machines/electric_greenhouse.json +++ b/kubejs/assets/tfg/models/block/machines/electric_greenhouse.json @@ -1,90 +1,222 @@ { - "parent": "minecraft:block/block", - "loader": "gtceu:machine", - "machine": "tfg:electric_greenhouse", - "texture_overrides": { - "all": "gtceu:block/casings/steam/steel/side" - }, - "variants": { - "is_formed=false,recipe_logic_status=idle": { - "model": { - "parent": "gtceu:block/machine/template/cube_all/sided", - "textures": { - "all": "gtceu:block/casings/steam/steel/side", - "overlay_front": "gtceu:block/multiblock/implosion_compressor/overlay_front", - "overlay_front_emissive": "gtceu:block/multiblock/implosion_compressor/overlay_front_emissive" - } - } + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "tfg:electric_greenhouse", + "texture_overrides": { + "all": "gtceu:block/casings/steam/steel/side" }, - "is_formed=false,recipe_logic_status=suspend": { - "model": { - "parent": "gtceu:block/machine/template/cube_all/sided", - "textures": { - "all": "gtceu:block/casings/steam/steel/side", - "overlay_front": "gtceu:block/multiblock/implosion_compressor/overlay_front_paused", - "overlay_front_emissive": "gtceu:block/multiblock/implosion_compressor/overlay_front_paused_emissive" + "variants": { + "is_formed=false,recipe_logic_status=idle": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "gtceu:block/casings/steam/steel/side", + "overlay_front": "gtceu:block/multiblock/implosion_compressor/overlay_front", + "overlay_front_emissive": "gtceu:block/multiblock/implosion_compressor/overlay_front_emissive" + } + } + }, + "is_formed=false,recipe_logic_status=suspend": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "gtceu:block/casings/steam/steel/side", + "overlay_front": "gtceu:block/multiblock/implosion_compressor/overlay_front_paused", + "overlay_front_emissive": "gtceu:block/multiblock/implosion_compressor/overlay_front_paused_emissive" + } + } + }, + "is_formed=false,recipe_logic_status=waiting": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "gtceu:block/casings/steam/steel/side", + "overlay_front": "gtceu:block/multiblock/implosion_compressor/overlay_front_active", + "overlay_front_emissive": "gtceu:block/multiblock/implosion_compressor/overlay_front_active_emissive" + } + } + }, + "is_formed=false,recipe_logic_status=working": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "gtceu:block/casings/steam/steel/side", + "overlay_front": "gtceu:block/multiblock/implosion_compressor/overlay_front_active", + "overlay_front_emissive": "gtceu:block/multiblock/implosion_compressor/overlay_front_active_emissive" + } + } + }, + "is_formed=true,recipe_logic_status=idle": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "gtceu:block/casings/steam/steel/side", + "overlay_front": "gtceu:block/multiblock/implosion_compressor/overlay_front", + "overlay_front_emissive": "gtceu:block/multiblock/implosion_compressor/overlay_front_emissive" + } + } + }, + "is_formed=true,recipe_logic_status=suspend": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "gtceu:block/casings/steam/steel/side", + "overlay_front": "gtceu:block/multiblock/implosion_compressor/overlay_front_paused", + "overlay_front_emissive": "gtceu:block/multiblock/implosion_compressor/overlay_front_paused_emissive" + } + } + }, + "is_formed=true,recipe_logic_status=waiting": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "gtceu:block/casings/steam/steel/side", + "overlay_front": "gtceu:block/multiblock/implosion_compressor/overlay_front_active", + "overlay_front_emissive": "gtceu:block/multiblock/implosion_compressor/overlay_front_active_emissive" + } + } + }, + "is_formed=true,recipe_logic_status=working": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "gtceu:block/casings/steam/steel/side", + "overlay_front": "gtceu:block/multiblock/implosion_compressor/overlay_front_active", + "overlay_front_emissive": "gtceu:block/multiblock/implosion_compressor/overlay_front_active_emissive" + } + } } - } }, - "is_formed=false,recipe_logic_status=waiting": { - "model": { - "parent": "gtceu:block/machine/template/cube_all/sided", - "textures": { - "all": "gtceu:block/casings/steam/steel/side", - "overlay_front": "gtceu:block/multiblock/implosion_compressor/overlay_front_active", - "overlay_front_emissive": "gtceu:block/multiblock/implosion_compressor/overlay_front_active_emissive" + "dynamic_renders": [ + { + "type": "gtceu:growing_plant", + "offsets": [ + [ + -2.0, + 1.0, + -1.0 + ], + [ + -1.0, + 1.0, + -1.0 + ], + [ + 0.0, + 1.0, + -1.0 + ], + [ + 1.0, + 1.0, + -1.0 + ], + [ + 2.0, + 1.0, + -1.0 + ], + [ + -2.0, + 1.0, + -2.0 + ], + [ + -1.0, + 1.0, + -2.0 + ], + [ + 0.0, + 1.0, + -2.0 + ], + [ + 1.0, + 1.0, + -2.0 + ], + [ + 2.0, + 1.0, + -2.0 + ], + [ + -2.0, + 1.0, + -3.0 + ], + [ + -1.0, + 1.0, + -3.0 + ], + [ + 0.0, + 1.0, + -3.0 + ], + [ + 1.0, + 1.0, + -3.0 + ], + [ + 2.0, + 1.0, + -3.0 + ], + [ + -2.0, + 1.0, + -4.0 + ], + [ + -1.0, + 1.0, + -4.0 + ], + [ + 0.0, + 1.0, + -4.0 + ], + [ + 1.0, + 1.0, + -4.0 + ], + [ + 2.0, + 1.0, + -4.0 + ], + [ + -2.0, + 1.0, + -5.0 + ], + [ + -1.0, + 1.0, + -5.0 + ], + [ + 0.0, + 1.0, + -5.0 + ], + [ + 1.0, + 1.0, + -5.0 + ], + [ + 2.0, + 1.0, + -5.0 + ] + ] } - } - }, - "is_formed=false,recipe_logic_status=working": { - "model": { - "parent": "gtceu:block/machine/template/cube_all/sided", - "textures": { - "all": "gtceu:block/casings/steam/steel/side", - "overlay_front": "gtceu:block/multiblock/implosion_compressor/overlay_front_active", - "overlay_front_emissive": "gtceu:block/multiblock/implosion_compressor/overlay_front_active_emissive" - } - } - }, - "is_formed=true,recipe_logic_status=idle": { - "model": { - "parent": "gtceu:block/machine/template/cube_all/sided", - "textures": { - "all": "gtceu:block/casings/steam/steel/side", - "overlay_front": "gtceu:block/multiblock/implosion_compressor/overlay_front", - "overlay_front_emissive": "gtceu:block/multiblock/implosion_compressor/overlay_front_emissive" - } - } - }, - "is_formed=true,recipe_logic_status=suspend": { - "model": { - "parent": "gtceu:block/machine/template/cube_all/sided", - "textures": { - "all": "gtceu:block/casings/steam/steel/side", - "overlay_front": "gtceu:block/multiblock/implosion_compressor/overlay_front_paused", - "overlay_front_emissive": "gtceu:block/multiblock/implosion_compressor/overlay_front_paused_emissive" - } - } - }, - "is_formed=true,recipe_logic_status=waiting": { - "model": { - "parent": "gtceu:block/machine/template/cube_all/sided", - "textures": { - "all": "gtceu:block/casings/steam/steel/side", - "overlay_front": "gtceu:block/multiblock/implosion_compressor/overlay_front_active", - "overlay_front_emissive": "gtceu:block/multiblock/implosion_compressor/overlay_front_active_emissive" - } - } - }, - "is_formed=true,recipe_logic_status=working": { - "model": { - "parent": "gtceu:block/machine/template/cube_all/sided", - "textures": { - "all": "gtceu:block/casings/steam/steel/side", - "overlay_front": "gtceu:block/multiblock/implosion_compressor/overlay_front_active", - "overlay_front_emissive": "gtceu:block/multiblock/implosion_compressor/overlay_front_active_emissive" - } - } - } - } + ] } \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/absorption_salvo.json b/kubejs/assets/tfg/models/item/absorption_salvo.json new file mode 100644 index 000000000..44e8ed81a --- /dev/null +++ b/kubejs/assets/tfg/models/item/absorption_salvo.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "tfg:item/absorption_salvo" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/active_power_transformer.json b/kubejs/assets/tfg/models/item/active_power_transformer.json new file mode 100644 index 000000000..b3073fdff --- /dev/null +++ b/kubejs/assets/tfg/models/item/active_power_transformer.json @@ -0,0 +1,3 @@ +{ + "parent": "tfg:block/machines/active_power_transformer" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/antipoison_pill.json b/kubejs/assets/tfg/models/item/antipoison_pill.json new file mode 100644 index 000000000..c45f964dd --- /dev/null +++ b/kubejs/assets/tfg/models/item/antipoison_pill.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "tfg:item/antipoison_pill" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/antipoison_tablet.json b/kubejs/assets/tfg/models/item/antipoison_tablet.json new file mode 100644 index 000000000..41b9bbd3c --- /dev/null +++ b/kubejs/assets/tfg/models/item/antipoison_tablet.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "tfg:item/antipoison_tablet" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/fire_resistance_salvo.json b/kubejs/assets/tfg/models/item/fire_resistance_salvo.json new file mode 100644 index 000000000..c94e842f3 --- /dev/null +++ b/kubejs/assets/tfg/models/item/fire_resistance_salvo.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "tfg:item/fire_resistance_salvo" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/haste_pill.json b/kubejs/assets/tfg/models/item/haste_pill.json new file mode 100644 index 000000000..78f50953e --- /dev/null +++ b/kubejs/assets/tfg/models/item/haste_pill.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "tfg:item/haste_pill" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/haste_tablet.json b/kubejs/assets/tfg/models/item/haste_tablet.json new file mode 100644 index 000000000..f9c391d9f --- /dev/null +++ b/kubejs/assets/tfg/models/item/haste_tablet.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "tfg:item/haste_tablet" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/instant_health_salvo.json b/kubejs/assets/tfg/models/item/instant_health_salvo.json new file mode 100644 index 000000000..ce53f77de --- /dev/null +++ b/kubejs/assets/tfg/models/item/instant_health_salvo.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "tfg:item/instant_health_salvo" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/invisibility_salvo.json b/kubejs/assets/tfg/models/item/invisibility_salvo.json new file mode 100644 index 000000000..21b5ce0d6 --- /dev/null +++ b/kubejs/assets/tfg/models/item/invisibility_salvo.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "tfg:item/invisibility_salvo" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/luck_salvo.json b/kubejs/assets/tfg/models/item/luck_salvo.json new file mode 100644 index 000000000..600e33637 --- /dev/null +++ b/kubejs/assets/tfg/models/item/luck_salvo.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "tfg:item/luck_salvo" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/machine_casing_power_casing.json b/kubejs/assets/tfg/models/item/machine_casing_power_casing.json new file mode 100644 index 000000000..a77205b25 --- /dev/null +++ b/kubejs/assets/tfg/models/item/machine_casing_power_casing.json @@ -0,0 +1,3 @@ +{ + "parent": "tfg:block/casings/machine_casing_power_casing" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/night_vision_pill.json b/kubejs/assets/tfg/models/item/night_vision_pill.json new file mode 100644 index 000000000..9326a59eb --- /dev/null +++ b/kubejs/assets/tfg/models/item/night_vision_pill.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "tfg:item/night_vision_pill" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/night_vision_tablet.json b/kubejs/assets/tfg/models/item/night_vision_tablet.json new file mode 100644 index 000000000..b1cd8fd85 --- /dev/null +++ b/kubejs/assets/tfg/models/item/night_vision_tablet.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "tfg:item/night_vision_tablet" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/poison_pill.json b/kubejs/assets/tfg/models/item/poison_pill.json new file mode 100644 index 000000000..541236b03 --- /dev/null +++ b/kubejs/assets/tfg/models/item/poison_pill.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "tfg:item/poison_pill" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/poison_tablet.json b/kubejs/assets/tfg/models/item/poison_tablet.json new file mode 100644 index 000000000..5e13ef48a --- /dev/null +++ b/kubejs/assets/tfg/models/item/poison_tablet.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "tfg:item/poison_tablet" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/regeneration_pill.json b/kubejs/assets/tfg/models/item/regeneration_pill.json new file mode 100644 index 000000000..5a4e8026e --- /dev/null +++ b/kubejs/assets/tfg/models/item/regeneration_pill.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "tfg:item/regeneration_pill" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/regeneration_tablet.json b/kubejs/assets/tfg/models/item/regeneration_tablet.json new file mode 100644 index 000000000..27fb807c7 --- /dev/null +++ b/kubejs/assets/tfg/models/item/regeneration_tablet.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "tfg:item/regeneration_tablet" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/resistance_salvo.json b/kubejs/assets/tfg/models/item/resistance_salvo.json new file mode 100644 index 000000000..2b4bba5a4 --- /dev/null +++ b/kubejs/assets/tfg/models/item/resistance_salvo.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "tfg:item/resistance_salvo" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/slowness_pill.json b/kubejs/assets/tfg/models/item/slowness_pill.json new file mode 100644 index 000000000..5b66f6a7b --- /dev/null +++ b/kubejs/assets/tfg/models/item/slowness_pill.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "tfg:item/slowness_pill" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/slowness_tablet.json b/kubejs/assets/tfg/models/item/slowness_tablet.json new file mode 100644 index 000000000..61af42074 --- /dev/null +++ b/kubejs/assets/tfg/models/item/slowness_tablet.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "tfg:item/slowness_tablet" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/speed_pill.json b/kubejs/assets/tfg/models/item/speed_pill.json new file mode 100644 index 000000000..faa19459c --- /dev/null +++ b/kubejs/assets/tfg/models/item/speed_pill.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "tfg:item/speed_pill" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/speed_tablet.json b/kubejs/assets/tfg/models/item/speed_tablet.json new file mode 100644 index 000000000..881364bd1 --- /dev/null +++ b/kubejs/assets/tfg/models/item/speed_tablet.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "tfg:item/speed_tablet" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/water_breathing_pill.json b/kubejs/assets/tfg/models/item/water_breathing_pill.json new file mode 100644 index 000000000..5d8919992 --- /dev/null +++ b/kubejs/assets/tfg/models/item/water_breathing_pill.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "tfg:item/water_breathing_pill" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/water_breathing_tablet.json b/kubejs/assets/tfg/models/item/water_breathing_tablet.json new file mode 100644 index 000000000..0417d1a21 --- /dev/null +++ b/kubejs/assets/tfg/models/item/water_breathing_tablet.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "tfg:item/water_breathing_tablet" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/weakness_pill.json b/kubejs/assets/tfg/models/item/weakness_pill.json new file mode 100644 index 000000000..c39e145a4 --- /dev/null +++ b/kubejs/assets/tfg/models/item/weakness_pill.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "tfg:item/weakness_pill" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/weakness_tablet.json b/kubejs/assets/tfg/models/item/weakness_tablet.json new file mode 100644 index 000000000..811a696a2 --- /dev/null +++ b/kubejs/assets/tfg/models/item/weakness_tablet.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "tfg:item/weakness_tablet" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/molecules/cyclohex_diperoxide.json b/kubejs/assets/tfg/molecules/cyclohex_diperoxide.json new file mode 100644 index 000000000..0ebf1c623 --- /dev/null +++ b/kubejs/assets/tfg/molecules/cyclohex_diperoxide.json @@ -0,0 +1,150 @@ +{ + "contents": [ + { + "type": "atom", + "index": 0, + "x": -0.0008, + "y": -2.0001 + }, + { + "type": "atom", + "index": 1, + "x": 1.7296, + "y": -1.9996 + }, + { + "type": "atom", + "index": 2, + "x": 0.866, + "y": -1.5 + }, + { + "type": "atom", + "index": 3, + "x": 1.7296, + "y": -3.0005 + }, + { + "type": "atom", + "index": 4, + "x": -0.0008, + "y": -3.005 + }, + { + "type": "atom", + "index": 5, + "x": 0.8682, + "y": -3.5 + }, + { + "type": "atom", + "element": "O", + "index": 6, + "x": 0.0, + "y": -1.0 + }, + { + "type": "atom", + "element": "O", + "index": 7, + "x": 1.7321, + "y": -1.0 + }, + { + "type": "atom", + "element": "O", + "right": "H", + "index": 8, + "x": 1.7321, + "y": 0.0 + }, + { + "type": "atom", + "element": "O", + "right": "H", + "index": 9, + "x": 0.0, + "y": 0.0 + }, + { + "type": "bond", + "a": 2, + "b": 0, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 0, + "b": 4, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 4, + "b": 5, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 5, + "b": 3, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 3, + "b": 1, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 1, + "b": 2, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 2, + "b": 6, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 2, + "b": 7, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 7, + "b": 8, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 6, + "b": 9, + "lines": [ + "solid" + ] + } + ] +} \ No newline at end of file diff --git a/kubejs/assets/tfg/molecules/cyclohexanone.json b/kubejs/assets/tfg/molecules/cyclohexanone.json new file mode 100644 index 000000000..e7a216261 --- /dev/null +++ b/kubejs/assets/tfg/molecules/cyclohexanone.json @@ -0,0 +1,105 @@ +{ + "contents": [ + { + "type": "atom", + "index": 0, + "x": -0.8674, + "y": -1.5001 + }, + { + "type": "atom", + "index": 1, + "x": 0.863, + "y": -1.4996 + }, + { + "type": "atom", + "index": 2, + "x": -0.0006, + "y": -1.0 + }, + { + "type": "atom", + "index": 3, + "x": 0.863, + "y": -2.5005 + }, + { + "type": "atom", + "index": 4, + "x": -0.8674, + "y": -2.505 + }, + { + "type": "atom", + "index": 5, + "x": 0.0016, + "y": -3.0 + }, + { + "type": "atom", + "element": "O", + "index": 6, + "x": 0.0, + "y": 0.0 + }, + { + "type": "bond", + "a": 2, + "b": 0, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 0, + "b": 4, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 4, + "b": 5, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 5, + "b": 3, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 3, + "b": 1, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 1, + "b": 2, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 2, + "b": 6, + "lines": [ + "solid", + "solid" + ], + "centered": true + } + ] +} \ No newline at end of file diff --git a/kubejs/assets/tfg/molecules/ozone.json b/kubejs/assets/tfg/molecules/ozone.json new file mode 100644 index 000000000..5c22af778 --- /dev/null +++ b/kubejs/assets/tfg/molecules/ozone.json @@ -0,0 +1,43 @@ +{ + "contents": [ + { + "type": "atom", + "element": "O", + "index": 0, + "x": 0.0, + "y": 0.0 + }, + { + "type": "atom", + "element": "O", + "index": 1, + "x": 0.866, + "y": 0.5 + }, + { + "type": "atom", + "element": "O", + "index": 2, + "x": 1.7321, + "y": 0.0 + }, + { + "type": "bond", + "a": 0, + "b": 1, + "lines": [ + "solid", + "dotted" + ] + }, + { + "type": "bond", + "a": 1, + "b": 2, + "lines": [ + "solid", + "dotted" + ] + } + ] +} \ No newline at end of file diff --git a/kubejs/assets/tfg/particles/cooling_steam.json b/kubejs/assets/tfg/particles/cooling_steam.json index 572b52060..32df59ab7 100644 --- a/kubejs/assets/tfg/particles/cooling_steam.json +++ b/kubejs/assets/tfg/particles/cooling_steam.json @@ -1,5 +1,14 @@ { "textures": [ - "tfg:cooling_steam_particle" + "tfg:cooling_steam_particle_0", + "tfg:cooling_steam_particle_1", + "tfg:cooling_steam_particle_2", + "tfg:cooling_steam_particle_3", + "tfg:cooling_steam_particle_4", + "tfg:cooling_steam_particle_5", + "tfg:cooling_steam_particle_6", + "tfg:cooling_steam_particle_7", + "tfg:cooling_steam_particle_8", + "tfg:cooling_steam_particle_9" ] } diff --git a/kubejs/assets/tfg/textures/block/casings/machine_casing_power_casing.png b/kubejs/assets/tfg/textures/block/casings/machine_casing_power_casing.png new file mode 100644 index 000000000..651e8d468 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/casings/machine_casing_power_casing.png differ diff --git a/kubejs/assets/tfg/textures/block/casings/machine_casing_power_casing.png.mcmeta b/kubejs/assets/tfg/textures/block/casings/machine_casing_power_casing.png.mcmeta new file mode 100644 index 000000000..eaf3aa63d --- /dev/null +++ b/kubejs/assets/tfg/textures/block/casings/machine_casing_power_casing.png.mcmeta @@ -0,0 +1,5 @@ +{ + "ldlib": { + "connection": "tfg:block/casings/machine_casing_power_casing_ctm" + } +} diff --git a/kubejs/assets/tfg/textures/block/casings/machine_casing_power_casing_ctm.png b/kubejs/assets/tfg/textures/block/casings/machine_casing_power_casing_ctm.png new file mode 100644 index 000000000..65abe574f Binary files /dev/null and b/kubejs/assets/tfg/textures/block/casings/machine_casing_power_casing_ctm.png differ diff --git a/kubejs/assets/tfg/textures/block/casings/machine_casing_power_casing_ctm_n.png b/kubejs/assets/tfg/textures/block/casings/machine_casing_power_casing_ctm_n.png new file mode 100644 index 000000000..f618836e2 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/casings/machine_casing_power_casing_ctm_n.png differ diff --git a/kubejs/assets/tfg/textures/block/casings/machine_casing_power_casing_ctm_s.png b/kubejs/assets/tfg/textures/block/casings/machine_casing_power_casing_ctm_s.png new file mode 100644 index 000000000..caa8b7323 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/casings/machine_casing_power_casing_ctm_s.png differ diff --git a/kubejs/assets/tfg/textures/block/casings/machine_casing_power_casing_n.png b/kubejs/assets/tfg/textures/block/casings/machine_casing_power_casing_n.png new file mode 100644 index 000000000..17163a5b1 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/casings/machine_casing_power_casing_n.png differ diff --git a/kubejs/assets/tfg/textures/block/casings/machine_casing_power_casing_s.png b/kubejs/assets/tfg/textures/block/casings/machine_casing_power_casing_s.png new file mode 100644 index 000000000..a9472dbe1 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/casings/machine_casing_power_casing_s.png differ diff --git a/kubejs/assets/tfg/textures/block/casings/test_casing.png b/kubejs/assets/tfg/textures/block/casings/test_casing.png new file mode 100644 index 000000000..ebe3418a7 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/casings/test_casing.png differ diff --git a/kubejs/assets/tfg/textures/block/casings/test_casing.png.mcmeta b/kubejs/assets/tfg/textures/block/casings/test_casing.png.mcmeta new file mode 100644 index 000000000..620b7685a --- /dev/null +++ b/kubejs/assets/tfg/textures/block/casings/test_casing.png.mcmeta @@ -0,0 +1,5 @@ +{ + "ldlib": { + "connection": "tfg:block/casings/test_casing_ctm" + } +} diff --git a/kubejs/assets/tfg/textures/block/casings/test_casing_ctm.png b/kubejs/assets/tfg/textures/block/casings/test_casing_ctm.png new file mode 100644 index 000000000..76241a5fa Binary files /dev/null and b/kubejs/assets/tfg/textures/block/casings/test_casing_ctm.png differ diff --git a/kubejs/assets/tfg/textures/item/brick/deepslate.png b/kubejs/assets/tfg/textures/item/brick/deepslate.png index d61268f64..9f93f2337 100644 Binary files a/kubejs/assets/tfg/textures/item/brick/deepslate.png and b/kubejs/assets/tfg/textures/item/brick/deepslate.png differ diff --git a/kubejs/assets/tfg/textures/item/brick/permafrost.png b/kubejs/assets/tfg/textures/item/brick/permafrost.png index b931afeef..46143685d 100644 Binary files a/kubejs/assets/tfg/textures/item/brick/permafrost.png and b/kubejs/assets/tfg/textures/item/brick/permafrost.png differ diff --git a/kubejs/assets/tfg/textures/item/btx/catalyser_zsm.png b/kubejs/assets/tfg/textures/item/btx/catalyser_zsm.png new file mode 100644 index 000000000..f8d93fddb Binary files /dev/null and b/kubejs/assets/tfg/textures/item/btx/catalyser_zsm.png differ diff --git a/kubejs/assets/tfg/textures/item/btx/loaded_resin.png b/kubejs/assets/tfg/textures/item/btx/loaded_resin.png new file mode 100644 index 000000000..cebb88752 Binary files /dev/null and b/kubejs/assets/tfg/textures/item/btx/loaded_resin.png differ diff --git a/kubejs/assets/tfg/textures/item/btx/used_catalyser.png b/kubejs/assets/tfg/textures/item/btx/used_catalyser.png new file mode 100644 index 000000000..571b23671 Binary files /dev/null and b/kubejs/assets/tfg/textures/item/btx/used_catalyser.png differ diff --git a/kubejs/assets/tfg/textures/item/loose/deepslate.png b/kubejs/assets/tfg/textures/item/loose/deepslate.png index be72ac98b..4981e249c 100644 Binary files a/kubejs/assets/tfg/textures/item/loose/deepslate.png and b/kubejs/assets/tfg/textures/item/loose/deepslate.png differ diff --git a/kubejs/assets/tfg/textures/item/loose/dripstone.png b/kubejs/assets/tfg/textures/item/loose/dripstone.png index 3c32afdcb..af04dd77f 100644 Binary files a/kubejs/assets/tfg/textures/item/loose/dripstone.png and b/kubejs/assets/tfg/textures/item/loose/dripstone.png differ diff --git a/kubejs/assets/tfg/textures/item/loose/glacio_stone.png b/kubejs/assets/tfg/textures/item/loose/glacio_stone.png index fdf9de909..b94142de7 100644 Binary files a/kubejs/assets/tfg/textures/item/loose/glacio_stone.png and b/kubejs/assets/tfg/textures/item/loose/glacio_stone.png differ diff --git a/kubejs/assets/tfg/textures/item/loose/mars_stone.png b/kubejs/assets/tfg/textures/item/loose/mars_stone.png index f3ef23b0a..b5b553d29 100644 Binary files a/kubejs/assets/tfg/textures/item/loose/mars_stone.png and b/kubejs/assets/tfg/textures/item/loose/mars_stone.png differ diff --git a/kubejs/assets/tfg/textures/item/loose/mercury_stone.png b/kubejs/assets/tfg/textures/item/loose/mercury_stone.png index a39f9e3f2..e72c1aadb 100644 Binary files a/kubejs/assets/tfg/textures/item/loose/mercury_stone.png and b/kubejs/assets/tfg/textures/item/loose/mercury_stone.png differ diff --git a/kubejs/assets/tfg/textures/item/loose/moon_deepslate.png b/kubejs/assets/tfg/textures/item/loose/moon_deepslate.png index 9f74b724d..2d4c65713 100644 Binary files a/kubejs/assets/tfg/textures/item/loose/moon_deepslate.png and b/kubejs/assets/tfg/textures/item/loose/moon_deepslate.png differ diff --git a/kubejs/assets/tfg/textures/item/loose/moon_stone.png b/kubejs/assets/tfg/textures/item/loose/moon_stone.png index 991127684..0b502e6c9 100644 Binary files a/kubejs/assets/tfg/textures/item/loose/moon_stone.png and b/kubejs/assets/tfg/textures/item/loose/moon_stone.png differ diff --git a/kubejs/assets/tfg/textures/item/loose/red_granite.png b/kubejs/assets/tfg/textures/item/loose/red_granite.png index 2a68bc48b..36648f836 100644 Binary files a/kubejs/assets/tfg/textures/item/loose/red_granite.png and b/kubejs/assets/tfg/textures/item/loose/red_granite.png differ diff --git a/kubejs/assets/tfg/textures/item/loose/venus_stone.png b/kubejs/assets/tfg/textures/item/loose/venus_stone.png index 0b9d23b10..511f54d1c 100644 Binary files a/kubejs/assets/tfg/textures/item/loose/venus_stone.png and b/kubejs/assets/tfg/textures/item/loose/venus_stone.png differ diff --git a/kubejs/assets/tfg/textures/mob_effect/arsenicosis_warning.png b/kubejs/assets/tfg/textures/mob_effect/arsenicosis_warning.png new file mode 100644 index 000000000..9c8054a5e Binary files /dev/null and b/kubejs/assets/tfg/textures/mob_effect/arsenicosis_warning.png differ diff --git a/kubejs/assets/tfg/textures/mob_effect/asbestosis_warning.png b/kubejs/assets/tfg/textures/mob_effect/asbestosis_warning.png new file mode 100644 index 000000000..93dc9a5dc Binary files /dev/null and b/kubejs/assets/tfg/textures/mob_effect/asbestosis_warning.png differ diff --git a/kubejs/assets/tfg/textures/mob_effect/berylliosis_warning.png b/kubejs/assets/tfg/textures/mob_effect/berylliosis_warning.png new file mode 100644 index 000000000..a660d82ac Binary files /dev/null and b/kubejs/assets/tfg/textures/mob_effect/berylliosis_warning.png differ diff --git a/kubejs/assets/tfg/textures/mob_effect/carbon_monoxide_poisoning_warning.png b/kubejs/assets/tfg/textures/mob_effect/carbon_monoxide_poisoning_warning.png new file mode 100644 index 000000000..90025b975 Binary files /dev/null and b/kubejs/assets/tfg/textures/mob_effect/carbon_monoxide_poisoning_warning.png differ diff --git a/kubejs/assets/tfg/textures/mob_effect/carcinogen_warning.png b/kubejs/assets/tfg/textures/mob_effect/carcinogen_warning.png new file mode 100644 index 000000000..f41bf0c11 Binary files /dev/null and b/kubejs/assets/tfg/textures/mob_effect/carcinogen_warning.png differ diff --git a/kubejs/assets/tfg/textures/mob_effect/chemical_burns_warning.png b/kubejs/assets/tfg/textures/mob_effect/chemical_burns_warning.png new file mode 100644 index 000000000..914655869 Binary files /dev/null and b/kubejs/assets/tfg/textures/mob_effect/chemical_burns_warning.png differ diff --git a/kubejs/assets/tfg/textures/mob_effect/hazard2.png b/kubejs/assets/tfg/textures/mob_effect/hazard2.png new file mode 100644 index 000000000..7a5981db1 Binary files /dev/null and b/kubejs/assets/tfg/textures/mob_effect/hazard2.png differ diff --git a/kubejs/assets/tfg/textures/mob_effect/irritant_warning.png b/kubejs/assets/tfg/textures/mob_effect/irritant_warning.png new file mode 100644 index 000000000..9b4b506ae Binary files /dev/null and b/kubejs/assets/tfg/textures/mob_effect/irritant_warning.png differ diff --git a/kubejs/assets/tfg/textures/mob_effect/methanol_poisoning_warning.png b/kubejs/assets/tfg/textures/mob_effect/methanol_poisoning_warning.png new file mode 100644 index 000000000..085a413ea Binary files /dev/null and b/kubejs/assets/tfg/textures/mob_effect/methanol_poisoning_warning.png differ diff --git a/kubejs/assets/tfg/textures/mob_effect/nausea_warning.png b/kubejs/assets/tfg/textures/mob_effect/nausea_warning.png new file mode 100644 index 000000000..fcbb86607 Binary files /dev/null and b/kubejs/assets/tfg/textures/mob_effect/nausea_warning.png differ diff --git a/kubejs/assets/tfg/textures/mob_effect/poison_warning.png b/kubejs/assets/tfg/textures/mob_effect/poison_warning.png new file mode 100644 index 000000000..ed4c02655 Binary files /dev/null and b/kubejs/assets/tfg/textures/mob_effect/poison_warning.png differ diff --git a/kubejs/assets/tfg/textures/mob_effect/prion_disease_warning.png b/kubejs/assets/tfg/textures/mob_effect/prion_disease_warning.png new file mode 100644 index 000000000..e9034f34e Binary files /dev/null and b/kubejs/assets/tfg/textures/mob_effect/prion_disease_warning.png differ diff --git a/kubejs/assets/tfg/textures/mob_effect/silicosis_warning.png b/kubejs/assets/tfg/textures/mob_effect/silicosis_warning.png new file mode 100644 index 000000000..53075bc68 Binary files /dev/null and b/kubejs/assets/tfg/textures/mob_effect/silicosis_warning.png differ diff --git a/kubejs/assets/tfg/textures/mob_effect/weak_poison_warning.png b/kubejs/assets/tfg/textures/mob_effect/weak_poison_warning.png new file mode 100644 index 000000000..657e1fa46 Binary files /dev/null and b/kubejs/assets/tfg/textures/mob_effect/weak_poison_warning.png differ diff --git a/kubejs/assets/tfg/textures/particle/cooling_steam_particle.png b/kubejs/assets/tfg/textures/particle/cooling_steam_particle.png deleted file mode 100644 index ed4f5f44d..000000000 Binary files a/kubejs/assets/tfg/textures/particle/cooling_steam_particle.png and /dev/null differ diff --git a/kubejs/assets/tfg/textures/particle/cooling_steam_particle_0.png b/kubejs/assets/tfg/textures/particle/cooling_steam_particle_0.png new file mode 100644 index 000000000..f62467d9c Binary files /dev/null and b/kubejs/assets/tfg/textures/particle/cooling_steam_particle_0.png differ diff --git a/kubejs/assets/tfg/textures/particle/cooling_steam_particle_1.png b/kubejs/assets/tfg/textures/particle/cooling_steam_particle_1.png new file mode 100644 index 000000000..0b0516643 Binary files /dev/null and b/kubejs/assets/tfg/textures/particle/cooling_steam_particle_1.png differ diff --git a/kubejs/assets/tfg/textures/particle/cooling_steam_particle_2.png b/kubejs/assets/tfg/textures/particle/cooling_steam_particle_2.png new file mode 100644 index 000000000..314f9570e Binary files /dev/null and b/kubejs/assets/tfg/textures/particle/cooling_steam_particle_2.png differ diff --git a/kubejs/assets/tfg/textures/particle/cooling_steam_particle_3.png b/kubejs/assets/tfg/textures/particle/cooling_steam_particle_3.png new file mode 100644 index 000000000..ed2347d8d Binary files /dev/null and b/kubejs/assets/tfg/textures/particle/cooling_steam_particle_3.png differ diff --git a/kubejs/assets/tfg/textures/particle/cooling_steam_particle_4.png b/kubejs/assets/tfg/textures/particle/cooling_steam_particle_4.png new file mode 100644 index 000000000..7c7167f82 Binary files /dev/null and b/kubejs/assets/tfg/textures/particle/cooling_steam_particle_4.png differ diff --git a/kubejs/assets/tfg/textures/particle/cooling_steam_particle_5.png b/kubejs/assets/tfg/textures/particle/cooling_steam_particle_5.png new file mode 100644 index 000000000..ca380242b Binary files /dev/null and b/kubejs/assets/tfg/textures/particle/cooling_steam_particle_5.png differ diff --git a/kubejs/assets/tfg/textures/particle/cooling_steam_particle_6.png b/kubejs/assets/tfg/textures/particle/cooling_steam_particle_6.png new file mode 100644 index 000000000..0e8117aaa Binary files /dev/null and b/kubejs/assets/tfg/textures/particle/cooling_steam_particle_6.png differ diff --git a/kubejs/assets/tfg/textures/particle/cooling_steam_particle_7.png b/kubejs/assets/tfg/textures/particle/cooling_steam_particle_7.png new file mode 100644 index 000000000..c0d8c3ed9 Binary files /dev/null and b/kubejs/assets/tfg/textures/particle/cooling_steam_particle_7.png differ diff --git a/kubejs/assets/tfg/textures/particle/cooling_steam_particle_8.png b/kubejs/assets/tfg/textures/particle/cooling_steam_particle_8.png new file mode 100644 index 000000000..07208ef20 Binary files /dev/null and b/kubejs/assets/tfg/textures/particle/cooling_steam_particle_8.png differ diff --git a/kubejs/assets/tfg/textures/particle/cooling_steam_particle_9.png b/kubejs/assets/tfg/textures/particle/cooling_steam_particle_9.png new file mode 100644 index 000000000..b9386dda5 Binary files /dev/null and b/kubejs/assets/tfg/textures/particle/cooling_steam_particle_9.png differ diff --git a/kubejs/client_scripts/tooltips.js b/kubejs/client_scripts/tooltips.js index 9c49c075c..cff423a37 100644 --- a/kubejs/client_scripts/tooltips.js +++ b/kubejs/client_scripts/tooltips.js @@ -18,6 +18,12 @@ const registerTooltips = (event) => { event.addAdvanced(['create:blaze_burner'], (item, advanced, text) => { text.add(1, Text.translate('tfg.tooltip.blaze_burner')) }) + event.addAdvanced(['tfg:antipoison_pill'], (item, advanced, text) => { + text.add(1, Text.translate('tfg.tooltip.antipoison_pill')) + }) + event.addAdvanced(['tfg:antipoison_tablet'], (item, advanced, text) => { + text.add(1, Text.translate('tfg.tooltip.antipoison_tablet')) + }) event.addAdvanced(['tfg:electric_greenhouse'], (item, advanced, text) => { text.add(1, Text.translate('tfg.tooltip.machine.electric_greenhouse_1')); text.add(2, Text.translate('tfg.tooltip.machine.electric_greenhouse_2')); @@ -94,37 +100,52 @@ const registerTooltips = (event) => { text.add(3, Text.translate('tfg.tooltip.machine.one_energy_hatch')); }) + // Hot or not containers + event.addAdvanced(['#tfg:insulating_container'], (item, advanced, text) => { + text.add(1, Text.translate("tfg.tooltip.hotornot_container")) + }) + // Do these in reverse order so the hot one appears on top + event.addAdvanced(['#tfg:floating_protection_equipment'], (item, advanced, text) => { + text.add(1, Text.translate("tfg.tooltip.hotornot_floating_equipment")) + }) + event.addAdvanced(['#tfg:cold_protection_equipment'], (item, advanced, text) => { + text.add(1, Text.translate("tfg.tooltip.hotornot_cold_equipment")) + }) + event.addAdvanced(['#tfg:hot_protection_equipment'], (item, advanced, text) => { + text.add(1, Text.translate("tfg.tooltip.hotornot_hot_equipment")) + }) + // Insulation event.addAdvanced(['create:copper_diving_helmet', 'create:copper_backtank', 'create:copper_diving_boots'], (item, advanced, text) => { - text.add(1, Text.translate('tfg.tooltip.armor.copper_diving_suit_warmth')), - text.add(2, Text.translate('tfg.tooltip.armor.copper_diving_suit_insulation')) + text.add(1, Text.translate('tfg.tooltip.armor.copper_diving_suit_warmth')); + text.add(2, Text.translate('tfg.tooltip.armor.copper_diving_suit_insulation')); }) event.addAdvanced(['create:netherite_diving_helmet', 'create:netherite_backtank', 'create:netherite_diving_boots', 'minecraft:netherite_leggings', 'minecraft:netherite_boots'], (item, advanced, text) => { - text.add(1, Text.translate('tfg.tooltip.armor.netherite_diving_suit_warmth')), - text.add(2, Text.translate('tfg.tooltip.armor.netherite_diving_suit_insulation')) - text.add(3, Text.translate('tfg.tooltip.armor.netherite_diving_suit_set')) + text.add(1, Text.translate('tfg.tooltip.armor.netherite_diving_suit_warmth')); + text.add(2, Text.translate('tfg.tooltip.armor.netherite_diving_suit_insulation')); + text.add(3, Text.translate('tfg.tooltip.armor.netherite_diving_suit_set')); }) event.addAdvanced(['gtceu:nanomuscle_helmet', 'gtceu:nanomuscle_chestplate', 'gtceu:nanomuscle_leggings', 'gtceu:nanomuscle_boots', 'gtceu:advanced_nanomuscle_chestplate'], (item, advanced, text) => { - text.add(1, Text.translate('tfg.tooltip.armor.nanomuscle_warmth')), - text.add(2, Text.translate('tfg.tooltip.armor.nanomuscle_insulation')) - text.add(3, Text.translate('tfg.tooltip.armor.nanomuscle_set')) + text.add(1, Text.translate('tfg.tooltip.armor.nanomuscle_warmth')); + text.add(2, Text.translate('tfg.tooltip.armor.nanomuscle_insulation')); + text.add(3, Text.translate('tfg.tooltip.armor.nanomuscle_set')); if (item === 'gtceu:nanomuscle_leggings') { - text.add(4, Text.translate('tfg.tooltip.armor.nanomuscle_legs_buff')) + text.add(4, Text.translate('tfg.tooltip.armor.nanomuscle_legs_buff')); } }) event.addAdvanced(['gtceu:quarktech_helmet', 'gtceu:quarktech_chestplate', 'gtceu:quarktech_leggings', 'gtceu:quarktech_boots', 'gtceu:advanced_quarktech_chestplate'], (item, advanced, text) => { - text.add(1, Text.translate('tfg.tooltip.armor.quarktech_warmth')), - text.add(2, Text.translate('tfg.tooltip.armor.quarktech_insulation')) - text.add(3, Text.translate('tfg.tooltip.armor.quarktech_set')) + text.add(1, Text.translate('tfg.tooltip.armor.quarktech_warmth')); + text.add(2, Text.translate('tfg.tooltip.armor.quarktech_insulation')); + text.add(3, Text.translate('tfg.tooltip.armor.quarktech_set')); }) event.addAdvanced([ 'ad_astra:space_helmet', 'ad_astra:space_suit', 'ad_astra:space_pants', 'ad_astra:space_boots', 'ad_astra:netherite_space_helmet', 'ad_astra:netherite_space_suit', 'ad_astra:netherite_space_pants', 'ad_astra:netherite_space_boots', 'ad_astra:jet_suit_helmet', 'ad_astra:jet_suit', 'ad_astra:jet_suit_pants', 'ad_astra:jet_suit_boots' ], (item, advanced, text) => { - text.add(1, Text.translate('tfg.tooltip.armor.space_suit_warmth')), - text.add(2, Text.translate('tfg.tooltip.armor.space_suit_insulation')) - text.add(3, Text.translate('tfg.tooltip.armor.space_suit_set')) + text.add(1, Text.translate('tfg.tooltip.armor.space_suit_warmth')); + text.add(2, Text.translate('tfg.tooltip.armor.space_suit_insulation')); + text.add(3, Text.translate('tfg.tooltip.armor.space_suit_set')); }) // Supports @@ -178,7 +199,7 @@ const registerTooltips = (event) => { }) event.addAdvanced(['gtceu:large_solar_panel_tier3'], (item, advanced, text) => { - text.add(1, Text.translate('tfg.tooltip.solar_panel.large_tier3')) + text.add(1, Text.translate('tfg.tooltip.solar_panel.large_tier3')); text.add(2, Text.translate('tfg.tooltip.machine.parallel')) }) @@ -188,12 +209,12 @@ const registerTooltips = (event) => { }) event.addAdvanced(['tfg:sniffer_egg'], (item, advanced, text) => { - text.add(1, Text.translate('tfg.tooltip.attribution.sniffer')), + text.add(1, Text.translate('tfg.tooltip.attribution.sniffer')); text.add(2, Text.translate('tfg.tooltip.large_egg')) }) event.addAdvanced(['tfg:wraptor_egg'], (item, advanced, text) => { - text.add(1, Text.translate('tfg.tooltip.attribution.wraptor')), + text.add(1, Text.translate('tfg.tooltip.attribution.wraptor')); text.add(2, Text.translate('tfg.tooltip.large_egg')) }) @@ -284,7 +305,6 @@ const registerTooltips = (event) => { }) //Nuclear Fission Tooltips - event.addAdvanced(['minecraft:blue_ice'], (item, advanced, text) => { text.add(1, Text.translate("tfg.tooltip.component.blue_ice")) }) @@ -308,15 +328,15 @@ const registerTooltips = (event) => { }) event.addAdvanced(['tfg:nuclear_turbine'], (item, advanced, text) => { - text.add(1, Text.translate("tfg.tooltip.component.nuclear_turbine_1")) - text.add(2, Text.translate("tfg.tooltip.component.nuclear_turbine_2")) + text.add(1, Text.translate("tfg.tooltip.component.nuclear_turbine_1")); + text.add(2, Text.translate("tfg.tooltip.component.nuclear_turbine_2")); }) event.addAdvanced(['tfg:food/slice_of_cheese'], (item, advanced, text) => { if (!event.isShift()) { text.add(1, Text.translate("tfg.tooltip.fake_nutrition_info_listener")) } else { - text.add(1, Text.translate("tfg.tooltip.fake_nutrition_info")) + text.add(1, Text.translate("tfg.tooltip.fake_nutrition_info")); text.add(2, Text.translate("tfg.tooltip.cheese_slice_microplastics")) }; }); @@ -324,9 +344,9 @@ const registerTooltips = (event) => { // AE2 event.addAdvanced(['tfg:wireless_card'], (item, advanced, text) => { - text.add(1, Text.translate('tfg.tooltip.wireless_card_1')) - text.add(2, Text.translate('tfg.tooltip.wireless_card_2')) - text.add(3, Text.translate('tfg.tooltip.wireless_card_3')) + text.add(1, Text.translate('tfg.tooltip.wireless_card_1')); + text.add(2, Text.translate('tfg.tooltip.wireless_card_2')); + text.add(3, Text.translate('tfg.tooltip.wireless_card_3')); }) // Deprecated Items diff --git a/kubejs/data/minecraft/loot_tables/chests/bastion_bridge.json b/kubejs/data/minecraft/loot_tables/chests/bastion_bridge.json index d61eacbd3..6aaa98888 100644 --- a/kubejs/data/minecraft/loot_tables/chests/bastion_bridge.json +++ b/kubejs/data/minecraft/loot_tables/chests/bastion_bridge.json @@ -217,7 +217,7 @@ }, { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 3}" + "tag": "{\"tfc:forging_bonus\": 3, \"GT.Behaviours\":{\"DisableShields\":1, \"TreeFelling\":1},}" } ], "weight": 100 diff --git a/kubejs/data/minecraft/loot_tables/chests/bastion_hoglin_stable.json b/kubejs/data/minecraft/loot_tables/chests/bastion_hoglin_stable.json index d61eacbd3..3c73933cf 100644 --- a/kubejs/data/minecraft/loot_tables/chests/bastion_hoglin_stable.json +++ b/kubejs/data/minecraft/loot_tables/chests/bastion_hoglin_stable.json @@ -217,7 +217,7 @@ }, { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 3}" + "tag": "{\"tfc:forging_bonus\": 3, \"GT.Behaviours\":{\"DisableShields\":1, \"TreeFelling\": 1}" } ], "weight": 100 diff --git a/kubejs/data/minecraft/loot_tables/chests/bastion_other.json b/kubejs/data/minecraft/loot_tables/chests/bastion_other.json index d61eacbd3..e43b9d277 100644 --- a/kubejs/data/minecraft/loot_tables/chests/bastion_other.json +++ b/kubejs/data/minecraft/loot_tables/chests/bastion_other.json @@ -217,7 +217,7 @@ }, { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 3}" + "tag": "{\"tfc:forging_bonus\": 3, \"GT.Behaviours\":{\"DisableShields\":1, \"TreeFelling\":1}" } ], "weight": 100 diff --git a/kubejs/data/minecraft/loot_tables/chests/bastion_treasure.json b/kubejs/data/minecraft/loot_tables/chests/bastion_treasure.json index 5e70329c4..54f8f5cba 100644 --- a/kubejs/data/minecraft/loot_tables/chests/bastion_treasure.json +++ b/kubejs/data/minecraft/loot_tables/chests/bastion_treasure.json @@ -89,7 +89,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\":4, \"GT.Behaviours\":{\"MaxAoEColumn\":5, \"MaxAoERow\":5, \"MaxAoELayer\":3}, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" + "tag": "{\"tfc:forging_bonus\":4, \"GT.Behaviours\":{\"MaxAoEColumn\":2, \"MaxAoERow\":2, \"MaxAoELayer\":3}, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] }, @@ -177,7 +177,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" + "tag": "{\"tfc:forging_bonus\": 4, \"GT.Behaviours\":{\"HarvestIce\":1}, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] }, diff --git a/kubejs/data/minecraft/trim_material/armalcolite_tfc.json b/kubejs/data/minecraft/trim_material/armalcolite_tfc.json new file mode 100644 index 000000000..ba7b1f0e1 --- /dev/null +++ b/kubejs/data/minecraft/trim_material/armalcolite_tfc.json @@ -0,0 +1,9 @@ +{ + "asset_name": "armalcolite_tfc", + "description": { + "color": "#424847", + "translate": "trim_material.tfc.armalcolite_tfc" + }, + "ingredient": "gtceu:exquisite_armalcolite_gem", + "item_model_index": 0.199 +} \ No newline at end of file diff --git a/kubejs/data/minecraft/trim_material/coke_tfc.json b/kubejs/data/minecraft/trim_material/coke_tfc.json deleted file mode 100644 index f66488835..000000000 --- a/kubejs/data/minecraft/trim_material/coke_tfc.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "asset_name": "coke_tfc", - "description": { - "color": "#424847", - "translate": "trim_material.tfc.coke_tfc" - }, - "ingredient": "gtceu:exquisite_coke_gem", - "item_model_index": 0.199 -} \ No newline at end of file diff --git a/kubejs/data/minecraft/trim_material/rose_quartz_tfc.json b/kubejs/data/minecraft/trim_material/rose_quartz_tfc.json index 28d2d8250..72802bbc8 100644 --- a/kubejs/data/minecraft/trim_material/rose_quartz_tfc.json +++ b/kubejs/data/minecraft/trim_material/rose_quartz_tfc.json @@ -4,6 +4,6 @@ "color": "#ba3458", "translate": "trim_material.tfc.rose_quartz_tfc" }, - "ingredient": "gtceu:exquisite_rose_quartz_gem", + "ingredient": "greate:exquisite_rose_quartz_gem", "item_model_index": 0.161 } \ No newline at end of file diff --git a/kubejs/data/primitive_creatures/forge/biome_modifier/all_biome_modifier.json b/kubejs/data/primitive_creatures/forge/biome_modifier/all_biome_modifier.json index 6afd60ede..963625e96 100644 --- a/kubejs/data/primitive_creatures/forge/biome_modifier/all_biome_modifier.json +++ b/kubejs/data/primitive_creatures/forge/biome_modifier/all_biome_modifier.json @@ -5,13 +5,17 @@ }, "entity_types": [ "primitive_creatures:beast", + "primitive_creatures:iloger_1", + "primitive_creatures:iloger_2", "primitive_creatures:iloger_3", "primitive_creatures:iloger_4", "primitive_creatures:iloger_5", "primitive_creatures:iloger_6", "primitive_creatures:musselwarden", + "primitive_creatures:nahida", "primitive_creatures:piloger_9", "primitive_creatures:iloger_10", + "primitive_creatures:viloger_10", "primitive_creatures:wiloger" ] } \ No newline at end of file diff --git a/kubejs/data/primitive_creatures/forge/biome_modifier/iloger_1_biome_modifier.json b/kubejs/data/primitive_creatures/forge/biome_modifier/iloger_1_biome_modifier.json index c4380d1a2..2d96022cf 100644 --- a/kubejs/data/primitive_creatures/forge/biome_modifier/iloger_1_biome_modifier.json +++ b/kubejs/data/primitive_creatures/forge/biome_modifier/iloger_1_biome_modifier.json @@ -1,20 +1,3 @@ { - "type": "forge:add_spawns", - "biomes": [ - "tfc:highlands", - "tfc:hills", - "tfc:lowlands", - "tfc:plains", - "tfc:plateau", - "tfc:rolling_hills", - "tfc:salt_marsh", - "tfc:shore", - "tfc:tidal_flats" - ], - "spawners": { - "type": "primitive_creatures:iloger_1", - "weight": 1, - "minCount": 2, - "maxCount": 3 - } + "type": "forge:none" } \ No newline at end of file diff --git a/kubejs/data/primitive_creatures/forge/biome_modifier/iloger_2_biome_modifier.json b/kubejs/data/primitive_creatures/forge/biome_modifier/iloger_2_biome_modifier.json index e416f61c2..2d96022cf 100644 --- a/kubejs/data/primitive_creatures/forge/biome_modifier/iloger_2_biome_modifier.json +++ b/kubejs/data/primitive_creatures/forge/biome_modifier/iloger_2_biome_modifier.json @@ -1,20 +1,3 @@ { - "type": "forge:add_spawns", - "biomes": [ - "tfc:highlands", - "tfc:hills", - "tfc:lowlands", - "tfc:plains", - "tfc:plateau", - "tfc:rolling_hills", - "tfc:salt_marsh", - "tfc:shore", - "tfc:tidal_flats" - ], - "spawners": { - "type": "primitive_creatures:iloger_2", - "weight": 1, - "minCount": 2, - "maxCount": 3 - } + "type": "forge:none" } \ No newline at end of file diff --git a/kubejs/data/primitive_creatures/forge/biome_modifier/nahida_biome_modifier.json b/kubejs/data/primitive_creatures/forge/biome_modifier/nahida_biome_modifier.json index 1396763f1..2d96022cf 100644 --- a/kubejs/data/primitive_creatures/forge/biome_modifier/nahida_biome_modifier.json +++ b/kubejs/data/primitive_creatures/forge/biome_modifier/nahida_biome_modifier.json @@ -1,29 +1,3 @@ { - "type": "forge:add_spawns", - "biomes": [ - "tfc:badlands", - "tfc:canyons", - "tfc:highlands", - "tfc:hills", - "tfc:inverted_badlands", - "tfc:low_canyons", - "tfc:lowlands", - "tfc:mountains", - "tfc:oceanic_mountains", - "tfc:old_mountains", - "tfc:plains", - "tfc:plateau", - "tfc:rolling_hills", - "tfc:salt_marsh", - "tfc:shore", - "tfc:tidal_flats", - "tfc:volcanic_mountains", - "tfc:volcanic_oceanic_mountains" - ], - "spawners": { - "type": "primitive_creatures:nahida", - "weight": 1, - "minCount": 1, - "maxCount": 1 - } + "type": "forge:none" } \ No newline at end of file diff --git a/kubejs/data/primitive_creatures/forge/biome_modifier/viloger_10_biome_modifier.json b/kubejs/data/primitive_creatures/forge/biome_modifier/viloger_10_biome_modifier.json index b89e19b65..2d96022cf 100644 --- a/kubejs/data/primitive_creatures/forge/biome_modifier/viloger_10_biome_modifier.json +++ b/kubejs/data/primitive_creatures/forge/biome_modifier/viloger_10_biome_modifier.json @@ -1,20 +1,3 @@ { - "type": "forge:add_spawns", - "biomes": [ - "tfc:badlands", - "tfc:canyons", - "tfc:inverted_badlands", - "tfc:low_canyons", - "tfc:mountains", - "tfc:oceanic_mountains", - "tfc:old_mountains", - "tfc:volcanic_mountains", - "tfc:volcanic_oceanic_mountains" - ], - "spawners": { - "type": "primitive_creatures:viloger_10", - "weight": 1, - "minCount": 2, - "maxCount": 3 - } + "type": "forge:none" } \ No newline at end of file diff --git a/kubejs/data/tfc/tfc/drinkables/aged_corn_whiskey.json b/kubejs/data/tfc/tfc/drinkables/aged_corn_whiskey.json deleted file mode 100644 index 17de1eb99..000000000 --- a/kubejs/data/tfc/tfc/drinkables/aged_corn_whiskey.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "ingredient": "tfcagedalcohol:aged_corn_whiskey", - "thirst": 15, - "intoxication": 2000, - "effects": [ - { - "type": "minecraft:haste", - "duration": 6400, - "amplifier": 0 - } - ] -} \ No newline at end of file diff --git a/kubejs/data/tfc/tfc/drinkables/aged_rye_whiskey.json b/kubejs/data/tfc/tfc/drinkables/aged_rye_whiskey.json deleted file mode 100644 index a2a4645ea..000000000 --- a/kubejs/data/tfc/tfc/drinkables/aged_rye_whiskey.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "ingredient": "tfcagedalcohol:aged_rye_whiskey", - "thirst": 15, - "intoxication": 2000, - "effects": [ - { - "type": "minecraft:haste", - "duration": 6400, - "amplifier": 0 - } - ] -} \ No newline at end of file diff --git a/kubejs/data/tfc/tfc/drinkables/aged_sake.json b/kubejs/data/tfc/tfc/drinkables/aged_sake.json deleted file mode 100644 index 1657f4f89..000000000 --- a/kubejs/data/tfc/tfc/drinkables/aged_sake.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "ingredient": "tfcagedalcohol:aged_sake", - "thirst": 15, - "intoxication": 2000, - "effects": [ - { - "type": "minecraft:resistance", - "duration": 6400, - "amplifier": 0 - } - ] -} \ No newline at end of file diff --git a/kubejs/data/tfc/tfc/drinkables/aged_vodka.json b/kubejs/data/tfc/tfc/drinkables/aged_vodka.json deleted file mode 100644 index baa19f8dd..000000000 --- a/kubejs/data/tfc/tfc/drinkables/aged_vodka.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "ingredient": "tfcagedalcohol:aged_vodka", - "thirst": 15, - "intoxication": 2000, - "effects": [ - { - "type": "minecraft:resistance", - "duration": 3200, - "amplifier": 1 - } - ] -} \ No newline at end of file diff --git a/kubejs/data/tfc/tfc/drinkables/aged_whiskey.json b/kubejs/data/tfc/tfc/drinkables/aged_whiskey.json deleted file mode 100644 index 740b7380a..000000000 --- a/kubejs/data/tfc/tfc/drinkables/aged_whiskey.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "ingredient": "tfcagedalcohol:aged_whiskey", - "thirst": 15, - "intoxication": 2000, - "effects": [ - { - "type": "minecraft:haste", - "duration": 3200, - "amplifier": 1 - } - ] -} \ No newline at end of file diff --git a/kubejs/data/tfc/trim_material/armalcolite_tfc.json b/kubejs/data/tfc/trim_material/armalcolite_tfc.json new file mode 100644 index 000000000..ba7b1f0e1 --- /dev/null +++ b/kubejs/data/tfc/trim_material/armalcolite_tfc.json @@ -0,0 +1,9 @@ +{ + "asset_name": "armalcolite_tfc", + "description": { + "color": "#424847", + "translate": "trim_material.tfc.armalcolite_tfc" + }, + "ingredient": "gtceu:exquisite_armalcolite_gem", + "item_model_index": 0.199 +} \ No newline at end of file diff --git a/kubejs/data/tfc/trim_material/coke_tfc.json b/kubejs/data/tfc/trim_material/coke_tfc.json deleted file mode 100644 index f66488835..000000000 --- a/kubejs/data/tfc/trim_material/coke_tfc.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "asset_name": "coke_tfc", - "description": { - "color": "#424847", - "translate": "trim_material.tfc.coke_tfc" - }, - "ingredient": "gtceu:exquisite_coke_gem", - "item_model_index": 0.199 -} \ No newline at end of file diff --git a/kubejs/data/tfc/trim_material/rose_quartz_tfc.json b/kubejs/data/tfc/trim_material/rose_quartz_tfc.json index 28d2d8250..72802bbc8 100644 --- a/kubejs/data/tfc/trim_material/rose_quartz_tfc.json +++ b/kubejs/data/tfc/trim_material/rose_quartz_tfc.json @@ -4,6 +4,6 @@ "color": "#ba3458", "translate": "trim_material.tfc.rose_quartz_tfc" }, - "ingredient": "gtceu:exquisite_rose_quartz_gem", + "ingredient": "greate:exquisite_rose_quartz_gem", "item_model_index": 0.161 } \ No newline at end of file diff --git a/kubejs/data/tfc/tfc/drinkables/cocoa.json b/kubejs/data/tfc_gurman/tfc/drinkables/cocoa.json similarity index 100% rename from kubejs/data/tfc/tfc/drinkables/cocoa.json rename to kubejs/data/tfc_gurman/tfc/drinkables/cocoa.json diff --git a/kubejs/data/tfc/tfc/drinkables/coffee.json b/kubejs/data/tfc_gurman/tfc/drinkables/coffee.json similarity index 100% rename from kubejs/data/tfc/tfc/drinkables/coffee.json rename to kubejs/data/tfc_gurman/tfc/drinkables/coffee.json diff --git a/kubejs/data/tfc/tfc/drinkables/compote.json b/kubejs/data/tfc_gurman/tfc/drinkables/compote.json similarity index 100% rename from kubejs/data/tfc/tfc/drinkables/compote.json rename to kubejs/data/tfc_gurman/tfc/drinkables/compote.json diff --git a/kubejs/data/tfc/tfc/drinkables/kvass.json b/kubejs/data/tfc_gurman/tfc/drinkables/kvass.json similarity index 100% rename from kubejs/data/tfc/tfc/drinkables/kvass.json rename to kubejs/data/tfc_gurman/tfc/drinkables/kvass.json diff --git a/kubejs/data/tfc/tfc/drinkables/lemonade.json b/kubejs/data/tfc_gurman/tfc/drinkables/lemonade.json similarity index 100% rename from kubejs/data/tfc/tfc/drinkables/lemonade.json rename to kubejs/data/tfc_gurman/tfc/drinkables/lemonade.json diff --git a/kubejs/data/tfc/tfc/drinkables/nalivka.json b/kubejs/data/tfc_gurman/tfc/drinkables/nalivka.json similarity index 100% rename from kubejs/data/tfc/tfc/drinkables/nalivka.json rename to kubejs/data/tfc_gurman/tfc/drinkables/nalivka.json diff --git a/kubejs/data/tfc/tfc/drinkables/tea_chamomile.json b/kubejs/data/tfc_gurman/tfc/drinkables/tea_chamomile.json similarity index 100% rename from kubejs/data/tfc/tfc/drinkables/tea_chamomile.json rename to kubejs/data/tfc_gurman/tfc/drinkables/tea_chamomile.json diff --git a/kubejs/data/tfc/tfc/drinkables/tea_mint.json b/kubejs/data/tfc_gurman/tfc/drinkables/tea_mint.json similarity index 100% rename from kubejs/data/tfc/tfc/drinkables/tea_mint.json rename to kubejs/data/tfc_gurman/tfc/drinkables/tea_mint.json diff --git a/kubejs/data/tfc/tfc/drinkables/tea_nettle.json b/kubejs/data/tfc_gurman/tfc/drinkables/tea_nettle.json similarity index 100% rename from kubejs/data/tfc/tfc/drinkables/tea_nettle.json rename to kubejs/data/tfc_gurman/tfc/drinkables/tea_nettle.json diff --git a/kubejs/data/tfc/tfc/drinkables/tea_rosehip.json b/kubejs/data/tfc_gurman/tfc/drinkables/tea_rosehip.json similarity index 100% rename from kubejs/data/tfc/tfc/drinkables/tea_rosehip.json rename to kubejs/data/tfc_gurman/tfc/drinkables/tea_rosehip.json diff --git a/kubejs/data/tfg/lithostitched/worldgen_modifier/contains_illages.json b/kubejs/data/tfg/lithostitched/worldgen_modifier/avoid_water_large.json similarity index 100% rename from kubejs/data/tfg/lithostitched/worldgen_modifier/contains_illages.json rename to kubejs/data/tfg/lithostitched/worldgen_modifier/avoid_water_large.json diff --git a/kubejs/data/tfg/lithostitched/worldgen_modifier/contains_temperate_house.json b/kubejs/data/tfg/lithostitched/worldgen_modifier/avoid_water_small.json similarity index 75% rename from kubejs/data/tfg/lithostitched/worldgen_modifier/contains_temperate_house.json rename to kubejs/data/tfg/lithostitched/worldgen_modifier/avoid_water_small.json index 620e0a23a..5e692b623 100644 --- a/kubejs/data/tfg/lithostitched/worldgen_modifier/contains_temperate_house.json +++ b/kubejs/data/tfg/lithostitched/worldgen_modifier/avoid_water_small.json @@ -1,7 +1,9 @@ { "type": "lithostitched:set_structure_spawn_condition", "structures": [ - "tfg:temperate/plains_temperate_house_0" + "tfg:temperate/plains_temperate_house_0", + "tfg:illagers/camps", + "tfg:illagers/forest_roaming" ], "spawn_condition": { "type": "lithostitched:grid", diff --git a/kubejs/data/tfg/loot_tables/chests/illager_camps.json b/kubejs/data/tfg/loot_tables/chests/illager_camps.json new file mode 100644 index 000000000..70b923fb9 --- /dev/null +++ b/kubejs/data/tfg/loot_tables/chests/illager_camps.json @@ -0,0 +1,379 @@ +{ + "type": "minecraft:chest", + "pools": [ + { + "bonus_rolls": 0, + "entries": [ + { + "type": "minecraft:item", + "name": "tfc:wool", + "weight": 80, + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 3, + "min": 1 + }, + "function": "minecraft:set_count" + } + ] + }, + { + "type": "minecraft:item", + "name": "tfc:wool_yarn", + "weight": 100, + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 9, + "min": 5 + }, + "function": "minecraft:set_count" + } + ] + }, + { + "type": "minecraft:item", + "name": "minecraft:leather", + "weight": 50, + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 2, + "min": 1 + }, + "function": "minecraft:set_count" + } + ] + }, + { + "type": "minecraft:item", + "name": "tfc:ceramic/gray_glazed_vessel", + "weight": 50 + }, + { + "type": "minecraft:item", + "name": "tfc:ceramic/light_gray_glazed_vessel", + "weight": 50 + }, + { + "type": "minecraft:item", + "name": "minecraft:sentry_armor_trim_smithing_template", + "weight": 10 + }, + { + "type": "minecraft:item", + "name": "minecraft:vex_armor_trim_smithing_template", + "weight": 10 + }, + { + "type": "minecraft:item", + "name": "minecraft:wild_armor_trim_smithing_template", + "weight": 10 + }, + { + "type": "minecraft:item", + "name": "minecraft:coast_armor_trim_smithing_template", + "weight": 10 + }, + { + "type": "minecraft:item", + "name": "tfc:powder/salt", + "weight": 100, + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 8, + "min": 4 + }, + "function": "minecraft:set_count" + } + ] + }, + { + "type": "minecraft:item", + "name": "tfc:powder/saltpeter", + "weight": 100, + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 6, + "min": 3 + }, + "function": "minecraft:set_count" + } + ] + }, + { + "type": "minecraft:item", + "name": "tfc:powder/sulfur", + "weight": 50, + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 6, + "min": 3 + }, + "function": "minecraft:set_count" + } + ] + }, + { + "type": "minecraft:item", + "name": "tfc:candle", + "weight": 100, + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 4, + "min": 2 + }, + "function": "minecraft:set_count" + } + ] + }, + { + "type": "minecraft:item", + "name": "tfc:candle/gray", + "weight": 100, + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 4, + "min": 2 + }, + "function": "minecraft:set_count" + } + ] + }, + { + "type": "minecraft:item", + "name": "tfc:candle/light_gray", + "weight": 100, + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 4, + "min": 2 + }, + "function": "minecraft:set_count" + } + ] + }, + { + "type": "minecraft:item", + "name": "minecraft:emerald", + "weight": 50, + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 4, + "min": 2 + }, + "function": "minecraft:set_count" + } + ] + }, + { + "type": "minecraft:item", + "name": "minecraft:arrow", + "weight": 100, + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 20, + "min": 12 + }, + "function": "minecraft:set_count" + } + ] + }, + { + "type": "minecraft:item", + "name": "firmalife:jar/compost", + "weight": 80 + }, + { + "type": "minecraft:item", + "name": "firmalife:jar/guano", + "weight": 80 + }, + { + "type": "minecraft:item", + "name": "firmalife:jar/honey", + "weight": 80 + }, + { + "type": "minecraft:item", + "name": "minecraft:paper", + "weight": 50, + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 2, + "min": 1 + }, + "function": "minecraft:set_count" + } + ] + }, + { + "type": "minecraft:item", + "name": "tfc:groundcover/pumice", + "weight": 50, + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 4, + "min": 2 + }, + "function": "minecraft:set_count" + } + ] + }, + { + "type": "minecraft:item", + "name": "tfg:conifer_rosin", + "weight": 100, + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 3, + "min": 1 + }, + "function": "minecraft:set_count" + } + ] + }, + { + "type": "minecraft:item", + "name": "firmalife:beeswax", + "weight": 100, + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 3, + "min": 1 + }, + "function": "minecraft:set_count" + } + ] + }, + { + "type": "minecraft:item", + "name": "minecraft:flint", + "weight": 100, + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 6, + "min": 3 + }, + "function": "minecraft:set_count" + } + ] + }, + { + "type": "minecraft:item", + "name": "gtceu:tricalcium_phosphate_dust", + "weight": 100, + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 5, + "min": 2 + }, + "function": "minecraft:set_count" + } + ] + }, + { + "type": "minecraft:item", + "name": "minecraft:charcoal", + "weight": 100, + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 5, + "min": 2 + }, + "function": "minecraft:set_count" + } + ] + }, + { + "type": "minecraft:item", + "name": "tfc:glue", + "weight": 100, + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 5, + "min": 2 + }, + "function": "minecraft:set_count" + } + ] + }, + { + "type": "minecraft:item", + "name": "chalk:gray_chalk", + "weight": 70 + }, + { + "type": "minecraft:item", + "name": "chalk:light_gray_chalk", + "weight": 70 + }, + { + "type": "minecraft:item", + "name": "species:music_disc_lapidarian", + "weight": 10 + } + ], + "rolls": { + "type": "minecraft:uniform", + "max": 8, + "min": 6 + } + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/structures/illager_generic/gatherers.nbt b/kubejs/data/tfg/structures/illager_generic/gatherers.nbt new file mode 100644 index 000000000..5f000a202 Binary files /dev/null and b/kubejs/data/tfg/structures/illager_generic/gatherers.nbt differ diff --git a/kubejs/data/tfg/structures/illager_generic/huntmaster_camp.nbt b/kubejs/data/tfg/structures/illager_generic/huntmaster_camp.nbt new file mode 100644 index 000000000..c3dcea4f5 Binary files /dev/null and b/kubejs/data/tfg/structures/illager_generic/huntmaster_camp.nbt differ diff --git a/kubejs/data/tfg/structures/illager_generic/mobs/huntmaster.nbt b/kubejs/data/tfg/structures/illager_generic/mobs/huntmaster.nbt new file mode 100644 index 000000000..66352151f Binary files /dev/null and b/kubejs/data/tfg/structures/illager_generic/mobs/huntmaster.nbt differ diff --git a/kubejs/data/tfg/structures/illager_generic/small_camp_1.nbt b/kubejs/data/tfg/structures/illager_generic/small_camp_1.nbt new file mode 100644 index 000000000..a74a15a4f Binary files /dev/null and b/kubejs/data/tfg/structures/illager_generic/small_camp_1.nbt differ diff --git a/kubejs/data/tfg/structures/illager_generic/small_camp_2.nbt b/kubejs/data/tfg/structures/illager_generic/small_camp_2.nbt new file mode 100644 index 000000000..6119022e5 Binary files /dev/null and b/kubejs/data/tfg/structures/illager_generic/small_camp_2.nbt differ diff --git a/kubejs/data/tfg/worldgen/configured_feature/earth/rose_quartz/rose_quartz_bud_air.json b/kubejs/data/tfg/worldgen/configured_feature/earth/rose_quartz/rose_quartz_bud_air.json index a40bfa57d..89788d80c 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/earth/rose_quartz/rose_quartz_bud_air.json +++ b/kubejs/data/tfg/worldgen/configured_feature/earth/rose_quartz/rose_quartz_bud_air.json @@ -4,7 +4,7 @@ "to_place": { "type": "minecraft:simple_state_provider", "state": { - "Name": "gtceu:rose_quartz_bud_indicator" + "Name": "greate:rose_quartz_bud_indicator" } } } diff --git a/kubejs/data/tfg/worldgen/configured_feature/earth/rose_quartz/rose_quartz_bud_water.json b/kubejs/data/tfg/worldgen/configured_feature/earth/rose_quartz/rose_quartz_bud_water.json index 78ee7755e..df316bbd8 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/earth/rose_quartz/rose_quartz_bud_water.json +++ b/kubejs/data/tfg/worldgen/configured_feature/earth/rose_quartz/rose_quartz_bud_water.json @@ -4,7 +4,7 @@ "to_place": { "type": "minecraft:simple_state_provider", "state": { - "Name": "gtceu:rose_quartz_bud_indicator", + "Name": "greate:rose_quartz_bud_indicator", "Properties": { "waterlogged": "true" } diff --git a/kubejs/data/tfg/worldgen/configured_feature/earth/rose_quartz/rose_quartz_geode.json b/kubejs/data/tfg/worldgen/configured_feature/earth/rose_quartz/rose_quartz_geode.json index ba4f8c8f2..07d03ac3d 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/earth/rose_quartz/rose_quartz_geode.json +++ b/kubejs/data/tfg/worldgen/configured_feature/earth/rose_quartz/rose_quartz_geode.json @@ -5,13 +5,13 @@ "filling_provider": { "type": "minecraft:simple_state_provider", "state": { - "Name": "gtceu:raw_rose_quartz_block" + "Name": "greate:raw_rose_quartz_block" } }, "inner_layer_provider": { "type": "minecraft:simple_state_provider", "state": { - "Name": "gtceu:quartzite_rose_quartz_ore" + "Name": "greate:quartzite_rose_quartz_ore" } }, "alternate_inner_layer_provider": { @@ -34,7 +34,7 @@ }, "inner_placements": [ { - "Name": "gtceu:quartzite_rose_quartz_ore" + "Name": "greate:quartzite_rose_quartz_ore" } ], "cannot_replace": "#minecraft:features_cannot_replace", diff --git a/kubejs/data/tfg/worldgen/noise_settings/venus_noise.json b/kubejs/data/tfg/worldgen/noise_settings/venus_noise.json index 6cc67118b..80bcb2e05 100644 --- a/kubejs/data/tfg/worldgen/noise_settings/venus_noise.json +++ b/kubejs/data/tfg/worldgen/noise_settings/venus_noise.json @@ -417,30 +417,10 @@ } }, "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "tfg:venus_salt", - "min_threshold": 0.1, - "max_threshold": 0.3 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "tfg:rock/halite2" - } - } - }, - { - "type": "minecraft:block", - "result_state": { - "Name": "tfg:rock/halite" - } - } - ] + "type": "minecraft:block", + "result_state": { + "Name": "tfg:rock/halite" + } } } ] diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/tree/warped.json b/kubejs/data/tfg/worldgen/placed_feature/mars/tree/warped.json index cdec23129..7cec1cdd5 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/mars/tree/warped.json +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/tree/warped.json @@ -1,4 +1,4 @@ { - "feature": "tfg:mars/tree/crimson", + "feature": "tfg:mars/tree/warped", "placement": [] } \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/tree/warped_dirt.json b/kubejs/data/tfg/worldgen/placed_feature/mars/tree/warped_dirt.json index 349608694..caa95e71b 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/mars/tree/warped_dirt.json +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/tree/warped_dirt.json @@ -1,4 +1,4 @@ { - "feature": "tfg:mars/tree/warped_amber", + "feature": "tfg:mars/tree/warped_dirt", "placement": [] } \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/structure/illagers/camps.json b/kubejs/data/tfg/worldgen/structure/illagers/camps.json new file mode 100644 index 000000000..1c97dd910 --- /dev/null +++ b/kubejs/data/tfg/worldgen/structure/illagers/camps.json @@ -0,0 +1,25 @@ +{ + "type": "minecraft:jigsaw", + "start_pool": "tfg:illagers/camp_start_pool", + "size": 3, + "max_distance_from_center": 50, + "biomes": "#tfg:has_structure/illager_camp", + "step": "surface_structures", + "terrain_adaptation": "beard_thin", + "start_height": { + "absolute": 0 + }, + "project_start_to_heightmap": "MOTION_BLOCKING", + "use_expansion_hack": false, + "adapt_noise": true, + "spawn_overrides": { + "creature": { + "bounding_box": "full", + "spawns": [] + }, + "monster": { + "bounding_box": "full", + "spawns": [] + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/structure/illagers/forest_roaming.json b/kubejs/data/tfg/worldgen/structure/illagers/forest_roaming.json new file mode 100644 index 000000000..d4ebf1721 --- /dev/null +++ b/kubejs/data/tfg/worldgen/structure/illagers/forest_roaming.json @@ -0,0 +1,25 @@ +{ + "type": "minecraft:jigsaw", + "start_pool": "tfg:illagers/forest_roaming_start_pool", + "size": 3, + "max_distance_from_center": 12, + "biomes": "#tfg:has_structure/illager_roaming", + "step": "surface_structures", + "terrain_adaptation": "beard_thin", + "start_height": { + "absolute": 0 + }, + "project_start_to_heightmap": "MOTION_BLOCKING", + "use_expansion_hack": false, + "adapt_noise": true, + "spawn_overrides": { + "creature": { + "bounding_box": "full", + "spawns": [] + }, + "monster": { + "bounding_box": "full", + "spawns": [] + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/structure/illagers/norse_village_living.json b/kubejs/data/tfg/worldgen/structure/illagers/norse_village_living.json index 6f79900ef..a61dd11c0 100644 --- a/kubejs/data/tfg/worldgen/structure/illagers/norse_village_living.json +++ b/kubejs/data/tfg/worldgen/structure/illagers/norse_village_living.json @@ -1,7 +1,7 @@ { "type": "minecraft:jigsaw", "start_pool": "tfg:illagers/norse_village_living_start_pool", - "size": 4, + "size": 5, "max_distance_from_center": 116, "biomes": "#tfg:has_structure/illages", "step": "surface_structures", diff --git a/kubejs/data/tfg/worldgen/structure/illagers/norse_village_ruined.json b/kubejs/data/tfg/worldgen/structure/illagers/norse_village_ruined.json index 85e8d895a..249966a32 100644 --- a/kubejs/data/tfg/worldgen/structure/illagers/norse_village_ruined.json +++ b/kubejs/data/tfg/worldgen/structure/illagers/norse_village_ruined.json @@ -1,7 +1,7 @@ { "type": "minecraft:jigsaw", "start_pool": "tfg:illagers/norse_village_ruined_start_pool", - "size": 4, + "size": 5, "max_distance_from_center": 116, "biomes": "#tfg:has_structure/illages", "step": "surface_structures", diff --git a/kubejs/data/tfg/worldgen/structure_set/illagers/illager_camps.json b/kubejs/data/tfg/worldgen/structure_set/illagers/illager_camps.json new file mode 100644 index 000000000..4096f4a32 --- /dev/null +++ b/kubejs/data/tfg/worldgen/structure_set/illagers/illager_camps.json @@ -0,0 +1,19 @@ +{ + "structures": [ + { + "structure": "tfg:illagers/camps", + "weight": 100 + } + ], + "placement": { + "type": "tfc:climate", + "salt": 96263635, + "spacing": 40, + "separation": 30, + "climate": { + "min_temperature": -12, + "max_temperature": 25, + "max_forest": "edge" + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/structure_set/illagers/illager_forest_roaming.json b/kubejs/data/tfg/worldgen/structure_set/illagers/illager_forest_roaming.json new file mode 100644 index 000000000..7f55a757a --- /dev/null +++ b/kubejs/data/tfg/worldgen/structure_set/illagers/illager_forest_roaming.json @@ -0,0 +1,19 @@ +{ + "structures": [ + { + "structure": "tfg:illagers/forest_roaming", + "weight": 100 + } + ], + "placement": { + "type": "tfc:climate", + "salt": 74256242524, + "spacing": 35, + "separation": 25, + "climate": { + "min_temperature": -12, + "max_temperature": 25, + "min_forest": "edge" + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/structure_set/moon/cheese_ores.json b/kubejs/data/tfg/worldgen/structure_set/moon/cheese_ores.json index 7c0422b12..196bbb2e4 100644 --- a/kubejs/data/tfg/worldgen/structure_set/moon/cheese_ores.json +++ b/kubejs/data/tfg/worldgen/structure_set/moon/cheese_ores.json @@ -7,12 +7,12 @@ ], "placement": { "salt": 486424619, - "spacing": 4, + "spacing": 3, "separation": 1, "type": "minecraft:random_spread", "exclusion_zone": { "other_set": "tfg:moon/meteors", - "chunk_count": 3 + "chunk_count": 6 } } } \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/structure_set/moon/moon_rabbit_houses.json b/kubejs/data/tfg/worldgen/structure_set/moon/moon_rabbit_houses.json index 1ab645f7a..79d7d2cc9 100644 --- a/kubejs/data/tfg/worldgen/structure_set/moon/moon_rabbit_houses.json +++ b/kubejs/data/tfg/worldgen/structure_set/moon/moon_rabbit_houses.json @@ -12,7 +12,7 @@ "type": "minecraft:random_spread", "exclusion_zone": { "other_set": "tfg:moon/meteors", - "chunk_count": 3 + "chunk_count": 6 } } } \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/template_pool/illagers/camp_start_pool.json b/kubejs/data/tfg/worldgen/template_pool/illagers/camp_start_pool.json new file mode 100644 index 000000000..520cebad0 --- /dev/null +++ b/kubejs/data/tfg/worldgen/template_pool/illagers/camp_start_pool.json @@ -0,0 +1,33 @@ +{ + "name": "tfg:illagers/camp_start_pool", + "fallback": "minecraft:empty", + "elements": [ + { + "weight": 100, + "element": { + "location": "tfg:illager_generic/small_camp_1", + "processors": "minecraft:empty", + "projection": "terrain_matching", + "element_type": "minecraft:single_pool_element" + } + }, + { + "weight": 100, + "element": { + "location": "tfg:illager_generic/small_camp_2", + "processors": "minecraft:empty", + "projection": "terrain_matching", + "element_type": "minecraft:single_pool_element" + } + }, + { + "weight": 100, + "element": { + "location": "tfg:illager_generic/huntmaster_camp", + "processors": "minecraft:empty", + "projection": "terrain_matching", + "element_type": "minecraft:single_pool_element" + } + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/template_pool/illagers/forest_roaming_start_pool.json b/kubejs/data/tfg/worldgen/template_pool/illagers/forest_roaming_start_pool.json new file mode 100644 index 000000000..003ed5a50 --- /dev/null +++ b/kubejs/data/tfg/worldgen/template_pool/illagers/forest_roaming_start_pool.json @@ -0,0 +1,15 @@ +{ + "name": "tfg:illagers/forest_roaming_start_pool", + "fallback": "minecraft:empty", + "elements": [ + { + "weight": 100, + "element": { + "location": "tfg:illager_generic/gatherers", + "processors": "minecraft:empty", + "projection": "terrain_matching", + "element_type": "minecraft:single_pool_element" + } + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/template_pool/illagers/mob_gatherer.json b/kubejs/data/tfg/worldgen/template_pool/illagers/mob_gatherer.json new file mode 100644 index 000000000..8c6aab2f1 --- /dev/null +++ b/kubejs/data/tfg/worldgen/template_pool/illagers/mob_gatherer.json @@ -0,0 +1,24 @@ +{ + "name": "tfg:illagers/mob_gatherer", + "fallback": "minecraft:empty", + "elements": [ + { + "weight": 100, + "element": { + "location": "tfg:illager_generic/mobs/forager", + "processors": "minecraft:empty", + "projection": "rigid", + "element_type": "minecraft:single_pool_element" + } + }, + { + "weight": 70, + "element": { + "location": "tfg:illager_generic/mobs/herbalist", + "processors": "minecraft:empty", + "projection": "rigid", + "element_type": "minecraft:single_pool_element" + } + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/template_pool/illagers/mob_huntmaster.json b/kubejs/data/tfg/worldgen/template_pool/illagers/mob_huntmaster.json new file mode 100644 index 000000000..fed392c0b --- /dev/null +++ b/kubejs/data/tfg/worldgen/template_pool/illagers/mob_huntmaster.json @@ -0,0 +1,15 @@ +{ + "name": "tfg:illagers/mob_huntmaster", + "fallback": "minecraft:empty", + "elements": [ + { + "weight": 100, + "element": { + "location": "tfg:illager_generic/mobs/huntmaster", + "processors": "minecraft:empty", + "projection": "rigid", + "element_type": "minecraft:single_pool_element" + } + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/template_pool/moon/moonbase_hubs.json b/kubejs/data/tfg/worldgen/template_pool/moon/moonbase_hubs.json index 5db8aa6f8..8f8ab06e8 100644 --- a/kubejs/data/tfg/worldgen/template_pool/moon/moonbase_hubs.json +++ b/kubejs/data/tfg/worldgen/template_pool/moon/moonbase_hubs.json @@ -96,7 +96,7 @@ } }, { - "weight": 100, + "weight": 25, "element": { "element_type": "lithostitched:limited", "delegate": { diff --git a/kubejs/server_scripts/ad_astra/tags.js b/kubejs/server_scripts/ad_astra/tags.js index b6578ed62..a705ac40f 100644 --- a/kubejs/server_scripts/ad_astra/tags.js +++ b/kubejs/server_scripts/ad_astra/tags.js @@ -31,7 +31,7 @@ const registerAdAstraFluidTags = (event) => { event.add('ad_astra:freezes_in_space', 'tfc:spring_water') event.add('ad_astra:evaporates_in_space', 'tfc:salt_water') event.add('ad_astra:evaporates_in_space', 'tfc:spring_water') - event.add('ad_astra:evaporates_in_space', '#tfc:alcohols') + event.add('ad_astra:evaporates_in_space', '#tfg:alcohols') event.add('ad_astra:evaporates_in_space', '#tfc:milks') event.add('ad_astra:evaporates_in_space', '#tfc:dyes') event.add('ad_astra:evaporates_in_space', '#tfc:drinkables') diff --git a/kubejs/server_scripts/afc/recipes.js b/kubejs/server_scripts/afc/recipes.js index 305f4ff47..3cf811739 100644 --- a/kubejs/server_scripts/afc/recipes.js +++ b/kubejs/server_scripts/afc/recipes.js @@ -250,21 +250,15 @@ const registerAFCRecipes = (event) => { .duration(50) .EUt(2) - event.custom({ - type: 'vintageimprovements:polishing', - ingredients: [{ item: `afc:wood/log/${wood}` }], - results: [{ item: `afc:wood/stripped_log/${wood}` }], - speed_limits: 0, - processingTime: 50 - }).id(`tfg:vi/lathe/stripping_${wood}_log`) + event.recipes.vintageimprovements.polishing(`afc:wood/stripped_log/${wood}`, `afc:wood/log/${wood}`) + .speedLimits(0) + .processingTime(50 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER) + .id(`tfg:vi/lathe/stripping_${wood}_log`) - event.custom({ - type: 'vintageimprovements:polishing', - ingredients: [{ item: `afc:wood/wood/${wood}` }], - results: [{ item: `afc:wood/stripped_wood/${wood}` }], - speed_limits: 0, - processingTime: 50 - }).id(`tfg:vi/lathe/stripping_${wood}_wood`) + event.recipes.vintageimprovements.polishing(`afc:wood/stripped_wood/${wood}`, `afc:wood/wood/${wood}`) + .speedLimits(0) + .processingTime(50 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER) + .id(`tfg:vi/lathe/stripping_${wood}_wood`) }) const MORE_STRIPPING = [ @@ -289,20 +283,14 @@ const registerAFCRecipes = (event) => { .duration(50) .EUt(2) - event.custom({ - type: 'vintageimprovements:polishing', - ingredients: [{ item: `afc:wood/log/${x.wood}` }], - results: [{ item: `${x.stripped_mod}:wood/stripped_log/${x.stripped}` }], - speed_limits: 0, - processingTime: 50 - }).id(`tfg:vi/lathe/stripping_${x.wood}_log`) + event.recipes.vintageimprovements.polishing(`${x.stripped_mod}:wood/stripped_log/${x.stripped}`, `afc:wood/log/${x.wood}`) + .speedLimits(0) + .processingTime(50 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER) + .id(`tfg:vi/lathe/stripping_${x.wood}_log`) - event.custom({ - type: 'vintageimprovements:polishing', - ingredients: [{ item: `afc:wood/wood/${x.wood}` }], - results: [{ item: `${x.stripped_mod}:wood/stripped_wood/${x.stripped}` }], - speed_limits: 0, - processingTime: 50 - }).id(`tfg:vi/lathe/stripping_${x.wood}_wood`) + event.recipes.vintageimprovements.polishing(`${x.stripped_mod}:wood/stripped_wood/${x.stripped}`, `afc:wood/wood/${x.wood}`) + .speedLimits(0) + .processingTime(50 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER) + .id(`tfg:vi/lathe/stripping_${x.wood}_wood`) }) } diff --git a/kubejs/server_scripts/create/recipes.js b/kubejs/server_scripts/create/recipes.js index bf6d47c34..36ee3d403 100644 --- a/kubejs/server_scripts/create/recipes.js +++ b/kubejs/server_scripts/create/recipes.js @@ -1929,14 +1929,6 @@ const registerCreateRecipes = (event) => { .duration(32) .EUt(GTValues.VA[GTValues.ULV]) - //event.custom({ - // type: 'vintageimprovements:laser_cutting', - // ingredients: [{ item: x.base }], - // results: [{item: x.cut }], - // energy: GTValues.VA[GTValues.ULV] * 32 * 4, - // maxChargeRate: GTValues.VA[GTValues.ULV] * 4 - //}).id(`tfg:vi/laser/create/${x.cut.split(':')[1]}`) - event.shaped(`2x create:layered_${x.cut.split('_')[1]}`, [ 'AA' ], { @@ -2086,7 +2078,8 @@ const registerCreateRecipes = (event) => { .duration(50) .EUt(GTValues.VA[GTValues.ULV]) .circuit(17) - .addMaterialInfo(true) + + TFGHelpers.registerMaterialInfo('create:redstone_link', { 'wrought_iron': 3 }); event.shaped('create:display_link', [ 'FED', diff --git a/kubejs/server_scripts/create_additions/recipes.js b/kubejs/server_scripts/create_additions/recipes.js index 91ea8892b..5ba0b86fc 100644 --- a/kubejs/server_scripts/create_additions/recipes.js +++ b/kubejs/server_scripts/create_additions/recipes.js @@ -30,27 +30,6 @@ const registerCreateAdditionsRecipes = (event) => { C: 'computercraft:wired_modem', }).addMaterialInfo().id('tfg:create_additions/shaped/digital_adapter') - // Портативный энергетический интерфейс - event.recipes.gtceu.shaped('createaddition:portable_energy_interface', [ - 'ABC', - 'DEC', - 'ADC' - ], { - A: '#forge:plates/brass', - B: 'create:chute', - C: 'gtceu:copper_octal_wire', - D: 'gtceu:copper_single_cable', - E: 'create:brass_casing' - }).addMaterialInfo().id('tfg:create_additions/shaped/portable_energy_interface') - - // Батарейный блок - event.recipes.gtceu.assembler('create_additions/battery') - .itemInputs('gtceu:bronze_frame', '4x #forge:plates/brass', '8x #forge:screws/bronze', '#gtceu:batteries/hv') - .itemOutputs('createaddition:modular_accumulator') - .duration(400) - .EUt(30) - .addMaterialInfo(true) - // Колючая проволка event.shapeless('4x createaddition:barbed_wire', [ '#forge:rods/wrought_iron', diff --git a/kubejs/server_scripts/domum_ornamentum/tags.js b/kubejs/server_scripts/domum_ornamentum/tags.js index 5a85f632a..9d793dc97 100644 --- a/kubejs/server_scripts/domum_ornamentum/tags.js +++ b/kubejs/server_scripts/domum_ornamentum/tags.js @@ -95,6 +95,7 @@ function registerDomumOrnamentumBlockTags(event) { "gtceu:dark_concrete_windmill_b", "gtceu:small_dark_concrete_bricks", "gtceu:square_dark_concrete_bricks", + "gtceu:treated_wood_planks", //createdeco blocks "createdeco:dean_bricks", "createdeco:short_dean_bricks", diff --git a/kubejs/server_scripts/greate/recipes.js b/kubejs/server_scripts/greate/recipes.js index 113e23839..b7117ab1f 100644 --- a/kubejs/server_scripts/greate/recipes.js +++ b/kubejs/server_scripts/greate/recipes.js @@ -93,7 +93,6 @@ function registerGreateRecipes(event) { .circuit(5) .duration(50) .EUt(GTValues.VA[GTValues.ULV]) - .removePreviousMaterialInfo() TFGHelpers.registerMaterialInfo('greate:andesite_alloy_gearbox', { 'wood': 1, 'wrought_iron': 1 }); TFGHelpers.registerMaterialInfo('greate:andesite_alloy_vertical_gearbox', { 'wood': 1, 'wrought_iron': 1 }); @@ -104,8 +103,6 @@ function registerGreateRecipes(event) { .circuit(5) .duration(50) .EUt(GTValues.VA[GTValues.ULV]) - .removePreviousMaterialInfo() - .addMaterialInfo(true) TFGHelpers.registerMaterialInfo('greate:steel_gearbox', { 'wood': 1, 'wrought_iron': 1, 'steel': 4/9 }); TFGHelpers.registerMaterialInfo('greate:steel_vertical_gearbox', { 'wood': 1, 'wrought_iron': 1, 'steel': 4/9 }); @@ -116,8 +113,6 @@ function registerGreateRecipes(event) { .circuit(5) .duration(50) .EUt(GTValues.VA[GTValues.ULV]) - .removePreviousMaterialInfo() - .addMaterialInfo(true) TFGHelpers.registerMaterialInfo('greate:aluminium_gearbox', { 'wood': 1, 'wrought_iron': 1, 'aluminium': 4/9 }); TFGHelpers.registerMaterialInfo('greate:aluminium_vertical_gearbox', { 'wood': 1, 'wrought_iron': 1, 'aluminium': 4/9 }); @@ -128,8 +123,6 @@ function registerGreateRecipes(event) { .circuit(5) .duration(50) .EUt(GTValues.VA[GTValues.ULV]) - .removePreviousMaterialInfo() - .addMaterialInfo(true) TFGHelpers.registerMaterialInfo('greate:stainless_steel_gearbox', { 'wood': 1, 'wrought_iron': 1, 'stainless_steel': 4/9 }); TFGHelpers.registerMaterialInfo('greate:stainless_steel_vertical_gearbox', { 'wood': 1, 'wrought_iron': 1, 'stainless_steel': 4/9 }); @@ -140,8 +133,6 @@ function registerGreateRecipes(event) { .circuit(5) .duration(50) .EUt(GTValues.VA[GTValues.ULV]) - .removePreviousMaterialInfo() - .addMaterialInfo(true) TFGHelpers.registerMaterialInfo('greate:titanium_gearbox', { 'wood': 1, 'wrought_iron': 1, 'titanium': 4/9 }); TFGHelpers.registerMaterialInfo('greate:titanium_vertical_gearbox', { 'wood': 1, 'wrought_iron': 1, 'titanium': 4/9 }); @@ -645,70 +636,118 @@ function registerGreateRecipes(event) { // #region Belt Connector - removeMaceratorRecipe(event, 'macerate_rubber_belt_connector') - removeMaceratorRecipe(event, 'macerate_silicone_rubber_belt_connector') - removeMaceratorRecipe(event, 'macerate_polyethylene_belt_connector') - event.remove({ id: 'gtceu:extractor/extract_rubber_belt_connector' }) - event.remove({ id: 'gtceu:extractor/extract_silicone_rubber_belt_connector' }) - event.remove({ id: 'gtceu:extractor/extract_polyethylene_belt_connector' }) - - event.shaped('3x greate:rubber_belt_connector', [ - 'C ', + // Wood + event.shaped('greate:andesite_alloy_belt_connector', [ 'AAA', - 'B ' + 'CBC', + 'AAA' + ], { + A: '#tfc:lumber', + B: '#forge:tools/hammers', + C: '#tfg:metal_chains' + }).id('tfg:shaped/wood_belt_connector') + + removeMaceratorRecipe(event, 'macerate_andesite_alloy_belt_connector') + event.remove({ id: 'gtceu:shaped/andesite_alloy_belt_connector' }) + event.remove({ id: 'gtceu:extractor/extract_andesite_alloy_belt_connector' }) + event.remove({ id: 'gtceu:arc_furnace/arc_andesite_alloy_belt_connector' }) + + TFGHelpers.registerMaterialInfo('greate:andesite_alloy_belt_connector', { 'wood': 1 }); + + // Leather + event.recipes.tfc.damage_inputs_shaped_crafting( + event.shaped('greate:stone_belt_connector', [ + 'AAA', + 'CBC' + ], { + A: '#forge:leather', + B: '#tfc:sewing_needles', + C: '#forge:string', + })).id('tfg:shaped/leather_belt_connector') + + event.recipes.gtceu.assembler('leather_belt_connector') + .itemInputs('3x #forge:leather', '2x #forge:string') + .itemOutputs('greate:stone_belt_connector') + .circuit(11) + .duration(50) + .EUt(GTValues.VA[GTValues.ULV]) + + removeMaceratorRecipe(event, 'macerate_stone_belt_connector') + event.remove({ id: 'gtceu:shaped/stone_belt_connector' }) + + TFGHelpers.registerMaterialInfo('greate:stone_belt_connector', { 'air': 1 }); + + // Rubber + event.shaped('greate:rubber_belt_connector', [ + 'AAA', + 'B C' ], { A: '#forge:plates/rubber', - B: '#forge:tools/knives', - C: '#forge:tools/hammers', - }).id('gtceu:shaped/rubber_belt_connector') + B: '#forge:tools/hammers', + C: '#forge:tools/wrenches', + }).id('tfg:shaped/rubber_belt_connector') event.recipes.gtceu.assembler('rubber_belt_connector') - .itemInputs('gtceu:rubber_plate') + .itemInputs('3x gtceu:rubber_plate') .itemOutputs('greate:rubber_belt_connector') .circuit(11) .duration(50) .EUt(GTValues.VA[GTValues.ULV]) - .removePreviousMaterialInfo() .addMaterialInfo(true) - event.shaped('3x greate:silicone_rubber_belt_connector', [ - 'C ', + event.remove({ id: 'gtceu:shaped/rubber_belt_connector' }) + removeMaceratorRecipe(event, 'macerate_rubber_belt_connector') + event.remove({ id: 'gtceu:extractor/extract_rubber_belt_connector' }) + + TFGHelpers.registerMaterialInfo('greate:rubber_belt_connector', { 'rubber': 3 }); + + // Silicone rubber + event.shaped('greate:silicone_rubber_belt_connector', [ 'AAA', - 'B ' + 'B C' ], { A: '#forge:plates/silicone_rubber', - B: '#forge:tools/knives', - C: '#forge:tools/hammers', - }).id('gtceu:shaped/silicone_rubber_belt_connector') + B: '#forge:tools/hammers', + C: '#forge:tools/wrenches', + }).id('tfg:shaped/silicone_rubber_belt_connector') event.recipes.gtceu.assembler('silicone_rubber_belt_connector') - .itemInputs('gtceu:silicone_rubber_plate') + .itemInputs('3x gtceu:silicone_rubber_plate') .itemOutputs('greate:silicone_rubber_belt_connector') .circuit(11) .duration(50) .EUt(GTValues.VA[GTValues.ULV]) - .removePreviousMaterialInfo() .addMaterialInfo(true) - event.shaped('3x greate:polyethylene_belt_connector', [ - 'C ', + event.remove({ id: 'gtceu:shaped/silicone_rubber_belt_connector' }) + removeMaceratorRecipe(event, 'macerate_silicone_rubber_belt_connector') + event.remove({ id: 'gtceu:extractor/extract_silicone_rubber_belt_connector' }) + + TFGHelpers.registerMaterialInfo('greate:silicone_rubber_belt_connector', { 'silicone_rubber': 3 }); + + // SBR rubber + event.shaped('greate:styrene_butadiene_rubber_belt_connector', [ 'AAA', - 'B ' + 'B C' ], { A: '#forge:plates/styrene_butadiene_rubber', - B: '#forge:tools/knives', - C: '#forge:tools/hammers', - }).id('gtceu:shaped/polyethylene_belt_connector') + B: '#forge:tools/hammers', + C: '#forge:tools/wrenches', + }).id('tfg:shaped/styrene_butadiene_rubber_belt_connector') - event.recipes.gtceu.assembler('polyethylene_belt_connector') - .itemInputs('gtceu:styrene_butadiene_rubber_plate') - .itemOutputs('greate:polyethylene_belt_connector') + event.recipes.gtceu.assembler('styrene_butadiene_rubber_belt_connector') + .itemInputs('3x gtceu:styrene_butadiene_rubber_plate') + .itemOutputs('greate:styrene_butadiene_rubber_belt_connector') .circuit(11) .duration(50) .EUt(GTValues.VA[GTValues.ULV]) - .removePreviousMaterialInfo() .addMaterialInfo(true) + event.remove({ id: 'gtceu:shaped/styrene_butadiene_rubber_belt_connector' }) + removeMaceratorRecipe(event, 'macerate_styrene_butadiene_rubber_belt_connector') + event.remove({ id: 'gtceu:extractor/extract_styrene_butadiene_rubber_belt_connector' }) + + TFGHelpers.registerMaterialInfo('greate:styrene_butadiene_rubber_belt_connector', { 'styrene_butadiene_rubber': 3 }); // #endregion // #region Mixer diff --git a/kubejs/server_scripts/greate/recipes.recycling.js b/kubejs/server_scripts/greate/recipes.recycling.js index 3bf5677d1..c9a55500e 100644 --- a/kubejs/server_scripts/greate/recipes.recycling.js +++ b/kubejs/server_scripts/greate/recipes.recycling.js @@ -58,29 +58,4 @@ function registerGreateRecyclingRecipes(event) { event.shapeless('create:andesite_casing', ['greate:titanium_gearbox', '#forge:tools/hammers'])) // #endregion - - // #region Belts - - event.recipes.gtceu.macerator('greate:rubber_belt_connector') - .itemInputs('greate:rubber_belt_connector') - .itemOutputs(ChemicalHelper.get(TagPrefix.dust, GTMaterials.Rubber, 1)) - .duration(GTMaterials.Rubber.getMass() * 3) - .category(GTRecipeCategories.MACERATOR_RECYCLING) - .EUt(GTValues.VA[GTValues.ULV]) - - event.recipes.gtceu.macerator('greate:silicone_rubber_belt_connector') - .itemInputs('greate:silicone_rubber_belt_connector') - .itemOutputs(ChemicalHelper.get(TagPrefix.dust, GTMaterials.SiliconeRubber, 1)) - .duration(GTMaterials.SiliconeRubber.getMass() * 3) - .category(GTRecipeCategories.MACERATOR_RECYCLING) - .EUt(GTValues.VA[GTValues.ULV]) - - event.recipes.gtceu.macerator('greate:polyethylene_belt_connector') - .itemInputs('greate:polyethylene_belt_connector') - .itemOutputs(ChemicalHelper.get(TagPrefix.dust, GTMaterials.StyreneButadieneRubber, 1)) - .duration(GTMaterials.StyreneButadieneRubber.getMass() * 3) - .category(GTRecipeCategories.MACERATOR_RECYCLING) - .EUt(GTValues.VA[GTValues.ULV]) - - // #region } \ No newline at end of file diff --git a/kubejs/server_scripts/greate/recipes.removes.js b/kubejs/server_scripts/greate/recipes.removes.js index 31570b8db..71722cfe8 100644 --- a/kubejs/server_scripts/greate/recipes.removes.js +++ b/kubejs/server_scripts/greate/recipes.removes.js @@ -114,4 +114,5 @@ function removeGreateRecipes(event) { event.remove({ id: 'toomanyrecipeviewers:/greate/milling/integration/gtceu/macerator/macerate_cocoa' }) event.remove({ id: 'greate:milling/integration/gtceu/macerator/macerate_honeycomb' }) event.remove({ id: 'greate:milling/integration/gtceu/macerator/macerate_honeycomb_block'}) + event.remove({ id: 'greate:milling/integration/gtceu/macerator/quartz_sand_from_sand' }) } diff --git a/kubejs/server_scripts/gregtech/recipes.materials.js b/kubejs/server_scripts/gregtech/recipes.materials.js index f23616bcc..c3fea2f30 100644 --- a/kubejs/server_scripts/gregtech/recipes.materials.js +++ b/kubejs/server_scripts/gregtech/recipes.materials.js @@ -90,17 +90,9 @@ function registerGTCEUMetalRecipes(event) { .duration(material.getMass() * 6) .EUt(GTValues.VA[GTValues.LV]) - let ingotArray = []; - for (let i = 0; i < materialAmount; i++) - ingotArray.push(ingotItem) - - event.custom({ - type: 'vintageimprovements:curving', - ingredients: ingotArray, - itemAsHead: extruderMold, - results: [toolHeadItem], - processingTime: material.getMass() * 6 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER - }).id(`tfg:vi/curving/${material.getName()}_ingot_to_${tagPrefixName}`) + event.recipes.vintageimprovements.curving(toolHeadItem, ingotItem.copyWithCount(materialAmount)) + .head(extruderMold) + .id(`tfg:vi/curving/${material.getName()}_ingot_to_${tagPrefixName}`) if (GTMaterials.Stone !== material) { removeMaceratorRecipe(event, `macerate_${material.getName()}_${tagPrefixName}`) @@ -187,6 +179,7 @@ function registerGTCEUMetalRecipes(event) { if (material.hasFlag(MaterialFlags.GENERATE_PLATE) && material !== GTMaterials.Wood && material !== GTMaterials.TreatedWood + && material !== GTMaterials.Stone && !material.hasProperty(PropertyKey.POLYMER)) { const plateStack = ChemicalHelper.get(TagPrefix.plate, material, 1) @@ -717,15 +710,12 @@ function registerGTCEUMetalRecipes(event) { // Centrifuging let byproductMaterial = material.getProperty(PropertyKey.ORE).getOreByProduct(0, material); - let byproductItem = ChemicalHelper.get(TagPrefix.dust, byproductMaterial, 1).toJson() - byproductItem.add("chance", 0.111); - event.custom({ - type: 'vintageimprovements:centrifugation', - ingredients: [impureDustItem], - results: [dustItem, byproductItem], - processingTime: material.getMass() * 10 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER - }).id(`tfg:vi/centrifuge/${material.getName()}_dust_from_impure`) + event.recipes.vintageimprovements.centrifugation( + [dustItem, Item.of(ChemicalHelper.get(TagPrefix.dust, byproductMaterial, 1)).withChance(0.111)], + impureDustItem) + .processingTime(material.getMass() * 10 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER) + .id(`tfg:vi/centrifuge/${material.getName()}_dust_from_impure`) // Dropping in water event.custom({ @@ -763,15 +753,12 @@ function registerGTCEUMetalRecipes(event) { // Centrifuging let byproductMaterial = material.getProperty(PropertyKey.ORE).getOreByProduct(1, material); - let byproductItem = ChemicalHelper.get(TagPrefix.dust, byproductMaterial, 1).toJson() - byproductItem.add("chance", 0.111); - event.custom({ - type: 'vintageimprovements:centrifugation', - ingredients: [pureDust], - results: [dustItem, byproductItem], - processingTime: material.getMass() * 10 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER - }).id(`tfg:vi/centrifuge/${material.getName()}_dust_from_pure`) + event.recipes.vintageimprovements.centrifugation( + [dustItem, Item.of(ChemicalHelper.get(TagPrefix.dust, byproductMaterial, 1)).withChance(0.111)], + pureDust) + .processingTime(material.getMass() * 10 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER) + .id(`tfg:vi/centrifuge/${material.getName()}_dust_from_pure`) // Dropping in water event.custom({ @@ -800,7 +787,7 @@ function registerGTCEUMetalRecipes(event) { let smallDust = ChemicalHelper.get(TagPrefix.dustSmall, material, 1) event.recipes.tfc.damage_inputs_shapeless_crafting(event.recipes.minecraft.crafting_shapeless( - `gtceu:${material.getName()}_bud_indicator`, [gem, '#tfc:chisels'])) + ChemicalHelper.get(TagPrefix.surfaceRock, material, 1), [gem, '#tfc:chisels'])) .id(`shapeless/${material.getName()}_bud_indicator`) event.shaped(smallDust, @@ -1115,13 +1102,10 @@ function registerGTCEUMetalRecipes(event) { .EUt(GTValues.VA[isLowTier ? GTValues.LV : GTValues.MV]) if (isLowTier) { - event.custom({ - type: 'vintageimprovements:polishing', - ingredients: [doublePlateItem], - results: [buzzsawBladeItem], - speed_limits: 0, - processingTime: material.getMass() * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER - }).id(`tfg:vi/lathe/${material.getName()}_buzzsaw`) + event.recipes.vintageimprovements.polishing(buzzsawBladeItem, doublePlateItem) + .speedLimits(0) + .processingTime(material.getMass() * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER) + .id(`tfg:vi/lathe/${material.getName()}_buzzsaw`) } removeMaceratorRecipe(event, `macerate_${material.getName()}_buzz_saw_blade`) @@ -1184,13 +1168,15 @@ function registerGTCEUMetalRecipes(event) { removeMaceratorRecipe(event, `macerate_iv_${material.getName()}_wirecutter`) event.remove({ id: `gtceu:arc_furnace/arc_iv_${material.getName()}_wirecutter` }) } + + const $GreateMaterials = Java.loadClass("electrolyte.greate.registry.GreateMaterials") forEachMaterial(material => { // greate moment - if (material === GTMaterials.get("andesite_alloy") - || material === GTMaterials.get("refined_radiance") - || material === GTMaterials.get("shadow_steel") - || material === GTMaterials.get("chromatic_compound") + if (material === $GreateMaterials.AndesiteAlloy + || material === $GreateMaterials.RefinedRadiance + || material === $GreateMaterials.ShadowSteel + || material === $GreateMaterials.ChromaticCompound || material === GTMaterials.DamascusSteel) { return; } diff --git a/kubejs/server_scripts/gregtech/recipes.removes.js b/kubejs/server_scripts/gregtech/recipes.removes.js index 6377deb5c..dd8639443 100644 --- a/kubejs/server_scripts/gregtech/recipes.removes.js +++ b/kubejs/server_scripts/gregtech/recipes.removes.js @@ -51,6 +51,9 @@ function removeGTCEURecipes(event) { removeMaceratorRecipe(event, 'macerate_cobblestone') removeMaceratorRecipe(event, 'gravel_to_flint') removeMaceratorRecipe(event, 'macerate_furnace') + removeCutterRecipe(event, 'cut_stone_block_to_plate') + removeCutterRecipe(event, 'cut_stone_block_to_plate_water') + removeCutterRecipe(event, 'cut_stone_block_to_plate_distilled_water') //#endregion @@ -821,9 +824,14 @@ function removeGTCEURecipes(event) { event.remove({ id: 'gtceu:electrolyzer/decomposition_electrolyzing_chromatic_compound' }); - event.remove({ id: 'gtceu:chemical_reactor/soda_ash_from_carbon_dioxide' }) event.remove({ id: 'gtceu:large_chemical_reactor/soda_ash_from_carbon_dioxide' }) + + event.remove({ id: 'gtceu:macerator/macerate_chiseled_sandstone' }) + event.remove({ id: 'gtceu:macerator/macerate_sandstone_wall' }) + event.remove({ id: 'gtceu:macerator/macerate_smooth_sandstone' }) + event.remove({ id: 'gtceu:macerator/macerate_sandstone' }) + event.remove({ id: 'gtceu:macerator/macerate_cut_sandstone' }) } function removeMaceratorRecipe(event, id) { diff --git a/kubejs/server_scripts/gregtech/utility.js b/kubejs/server_scripts/gregtech/utility.js index bbda57007..0f000d949 100644 --- a/kubejs/server_scripts/gregtech/utility.js +++ b/kubejs/server_scripts/gregtech/utility.js @@ -377,13 +377,10 @@ function woodBuilder(event, name, lumber, logs, log, stripped_log, plank, stair, .duration(50) .EUt(GTValues.VA[GTValues.ULV]) - event.custom({ - type: 'vintageimprovements:polishing', - ingredients: [{ item: log }], - results: [{ item: stripped_log }], - speed_limits: 0, - processingTime: 50 - }).id(`tfg:vi/lathe/stripping_${name}_log`) + event.recipes.vintageimprovements.polishing(stripped_log, log) + .speedLimits(0) + .processingTime(50 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER) + .id(`tfg:vi/lathe/stripping_${name}_log`) } if (logs && lumber && name) { diff --git a/kubejs/server_scripts/hotornot/tags.js b/kubejs/server_scripts/hotornot/tags.js deleted file mode 100644 index bcc28c7b6..000000000 --- a/kubejs/server_scripts/hotornot/tags.js +++ /dev/null @@ -1,23 +0,0 @@ -// priority: 0 -"use strict"; - -const registerHotOrNotItemTags = (event) => { - - // Удаление тегов у отключенных предметов - global.HOT_OR_NOT_DISABLED_ITEMS.forEach(item => { - event.removeAllTagsFrom(item) - event.add('c:hidden_from_recipe_viewers', item) - }) - - event.add('tfchotornot:hot_whitelist', '#forge:hot_ingots') - - event.add('firmalife:usable_on_oven', '#tfchotornot:insulating') -} - -const registerHotOrNotBlockTags = (event) => { - - // Удаление тегов у отключенных предметов - global.HOT_OR_NOT_DISABLED_ITEMS.forEach(item => { - event.removeAllTagsFrom(item) - }) -} \ No newline at end of file diff --git a/kubejs/server_scripts/macaws_for_tfc/recipes.js b/kubejs/server_scripts/macaws_for_tfc/recipes.js index 0f3d9282a..352f5cca6 100644 --- a/kubejs/server_scripts/macaws_for_tfc/recipes.js +++ b/kubejs/server_scripts/macaws_for_tfc/recipes.js @@ -6,11 +6,12 @@ * @param {Internal.RecipesEventJS} event */ function registerMacawsForTFCRecipes(event) { - event.replaceInput({ mod: 'mcw_tfc_aio' }, 'minecraft:stick', '#forge:rods/wooden') event.replaceInput({ mod: 'mcw_tfc_aio' }, 'minecraft:string', '#forge:string') event.replaceInput({ mod: 'mcw_tfc_aio' }, 'minecraft:glass', '#forge:glass') event.replaceInput({ mod: 'mcw_tfc_aio' }, 'minecraft:glass_pane', '#forge:glass_panes') + event.remove({ input: '@mcw_tfc_aio', type: 'gtceu:steam_boiler' }) + event.remove({ input: '@mcw_tfc_aio', type: 'gtceu:large_boiler' }) global.TFC_WOOD_TYPES.forEach(wood => { event.shaped(`8x mcw_tfc_aio:fences/${wood}_fences/${wood}_wired_fence`, [ @@ -22,4 +23,4 @@ function registerMacawsForTFCRecipes(event) { C: `tfc:wood/log/${wood}` }).id(`tfg:shaped/${wood}_wired_fence`) }) -} \ No newline at end of file +} diff --git a/kubejs/server_scripts/main_server_script.js b/kubejs/server_scripts/main_server_script.js index ac9749489..3bea31680 100644 --- a/kubejs/server_scripts/main_server_script.js +++ b/kubejs/server_scripts/main_server_script.js @@ -105,6 +105,7 @@ ServerEvents.tags('fluid', event => { registerCreateAdditionsFluidTags(event) registerGTCEUFluidTags(event) registerGreateFluidTags(event) + registerHotOrNotFluidTags(event) registerFirmaLifeFluidTags(event) registerTFCFluidTags(event) registerTFGFluidTags(event) diff --git a/kubejs/server_scripts/minecraft/events.js b/kubejs/server_scripts/minecraft/events.js index 32d8af04b..3802c853d 100644 --- a/kubejs/server_scripts/minecraft/events.js +++ b/kubejs/server_scripts/minecraft/events.js @@ -3,11 +3,12 @@ PlayerEvents.tick(event => { // make levitation last shorter, so shulkers aren't so deadly on the moon - - if (event.player.hasEffect('minecraft:levitation')) { - event.server.scheduleInTicks(0, () => { }) - event.server.scheduleInTicks(40, () => { - event.player.removeEffect('minecraft:levitation') - }) + const { player } = event; + if (player.age % 20 === 0) { + if (event.player.hasEffect('minecraft:levitation')) { + if (event.player.getEffect('minecraft:levitation').getDuration() > 60) { + event.player.potionEffects.add('minecraft:levitation', 60, 0, true, true) + } + } } }); diff --git a/kubejs/server_scripts/minecraft/recipes.js b/kubejs/server_scripts/minecraft/recipes.js index acfe66bc3..64bf70cae 100644 --- a/kubejs/server_scripts/minecraft/recipes.js +++ b/kubejs/server_scripts/minecraft/recipes.js @@ -8,7 +8,6 @@ const registerMinecraftRecipes = (event) => { removeMinecraftRecipes(event) - registerMinecraftDyeRecipes(event) //#region Добавление, copper diff --git a/kubejs/server_scripts/primitive_creatures/loot.js b/kubejs/server_scripts/primitive_creatures/loot.js index d71855fc6..e96ef7a91 100644 --- a/kubejs/server_scripts/primitive_creatures/loot.js +++ b/kubejs/server_scripts/primitive_creatures/loot.js @@ -6,13 +6,13 @@ function registerPrimitiveCreaturesLoots(event) { // kaolin klayze event.addEntityLootModifier('primitive_creatures:tfc') .removeLoot(ItemFilter.ALWAYS_TRUE) - .addWeightedLoot([12,16], ['tfc:kaolin_clay', 'minecraft:clay_ball']) + .addWeightedLoot([12, 16], ['tfc:kaolin_clay', 'minecraft:clay_ball']) .addLoot('tfc:plant/blood_lily') // graphite glayze event.addEntityLootModifier('primitive_creatures:golem_2') .removeLoot(ItemFilter.ALWAYS_TRUE) - .addWeightedLoot([2,4], ['gtceu:rich_raw_graphite']) + .addWeightedLoot([2, 4], ['gtceu:rich_raw_graphite']) const CLOTHING_DROP_RATE = 0.1 @@ -20,7 +20,7 @@ function registerPrimitiveCreaturesLoots(event) { // forager - light tan clothes, holds a stone axe event.addEntityLootModifier('primitive_creatures:iloger_1') .removeLoot(ItemFilter.ALWAYS_TRUE) - .addWeightedLoot([5, 8], ['tfg:food/raw_long_pig_filet']) + .addWeightedLoot([2, 3], ['tfg:food/raw_long_pig_filet']) .addWeightedLoot([ // the illusion of randomness Item.of('tfc:food/bunchberry', 3), @@ -47,15 +47,12 @@ function registerPrimitiveCreaturesLoots(event) { Item.of('tfc_textile:raw_shirt'), Item.of('tfc_textile:raw_pants'), Item.of('tfc_textile:raw_socks')]) - event.addEntityLootModifier('primitive_creatures:iloger_1') - .matchMainHand('#forge:tools/butchery_knives') - .addWeightedLoot([2, 4], ['tfg:food/raw_long_pig_filet']) // herbalist - brown clothes with a mask that looks like a Creaking event.addEntityLootModifier('primitive_creatures:iloger_2') .removeLoot(ItemFilter.ALWAYS_TRUE) - .addWeightedLoot([5, 8], ['tfg:food/raw_long_pig_filet']) - .addWeightedLoot([3,4], ['gtceu:tricalcium_phosphate_dust']) + .addWeightedLoot([2, 3], ['tfg:food/raw_long_pig_filet']) + .addWeightedLoot([3, 4], ['gtceu:tricalcium_phosphate_dust']) .addAlternativesLoot( LootEntry.of('gtceu:cobalt_brass_mortar').damage([0.3, 0.9]).when(c => c.randomChance(0.3)), LootEntry.of('primitive_creatures:totem_0').when(c => c.randomChance(0.05)), @@ -68,16 +65,13 @@ function registerPrimitiveCreaturesLoots(event) { Item.of('tfc_textile:grizzly_bear_shirt'), Item.of('tfc_textile:grizzly_bear_pants'), Item.of('tfc_textile:grizzly_bear_boots')]) - event.addEntityLootModifier('primitive_creatures:iloger_2') - .matchMainHand('#forge:tools/butchery_knives') - .addWeightedLoot([2, 4], ['tfg:food/raw_long_pig_filet']) // bonebreaker - skull helmet, bone armor? hits harder, has knockback event.addEntityLootModifier('primitive_creatures:iloger_3') .removeLoot(ItemFilter.ALWAYS_TRUE) - .addWeightedLoot([5, 8], ['tfg:food/raw_long_pig_filet']) - .addWeightedLoot([0,2], ['minecraft:flint']) - .addWeightedLoot([1,3], ['minecraft:bone']) + .addWeightedLoot([2, 3], ['tfg:food/raw_long_pig_filet']) + .addWeightedLoot([0, 2], ['minecraft:flint']) + .addWeightedLoot([1, 3], ['minecraft:bone']) .addAlternativesLoot( LootEntry.of('gtceu:cobalt_brass_shovel').damage([0.3, 0.9]).when(c => c.randomChance(0.5)), LootEntry.of('minecraft:skeleton_skull').when(c => c.randomChance(0.3)), @@ -89,16 +83,13 @@ function registerPrimitiveCreaturesLoots(event) { Item.of('tfc_textile:direwolf_shirt'), Item.of('tfc_textile:direwolf_pants'), Item.of('tfc_textile:direwolf_boots')]) - event.addEntityLootModifier('primitive_creatures:iloger_3') - .matchMainHand('#forge:tools/butchery_knives') - .addWeightedLoot([2, 4], ['tfg:food/raw_long_pig_filet']) // ambusher - leaf on head, leafy clothes (like the swamp vanilla villager type), ranged with poison event.addEntityLootModifier('primitive_creatures:iloger_4') .removeLoot(ItemFilter.ALWAYS_TRUE) - .addWeightedLoot([8,12], LootEntry.of('minecraft:tipped_arrow')).addPotion("poison") - .addWeightedLoot([4,8], ['firmalife:food/nightshade_berry']) - .addWeightedLoot([5, 8], ['tfg:food/raw_long_pig_filet']) + .addWeightedLoot([8, 12], LootEntry.of('minecraft:tipped_arrow')).addPotion("poison") + .addWeightedLoot([4, 8], ['firmalife:food/nightshade_berry']) + .addWeightedLoot([2, 3], ['tfg:food/raw_long_pig_filet']) .addAlternativesLoot( LootEntry.of('minecraft:bow').damage([0.3, 0.9]).when(c => c.randomChance(0.5)), LootEntry.of('primitive_creatures:totem_0').when(c => c.randomChance(0.05)), @@ -111,15 +102,12 @@ function registerPrimitiveCreaturesLoots(event) { Item.of('tfc_textile:crocodile_shirt'), Item.of('tfc_textile:crocodile_pants'), Item.of('tfc_textile:crocodile_boots')]) - event.addEntityLootModifier('primitive_creatures:iloger_4') - .matchMainHand('#forge:tools/butchery_knives') - .addWeightedLoot([2, 4], ['tfg:food/raw_long_pig_filet']) // hunter - wears brown and white fur, briefly disappears when hit, ranged with weakness event.addEntityLootModifier('primitive_creatures:iloger_5') .removeLoot(ItemFilter.ALWAYS_TRUE) - .addWeightedLoot([8,12], LootEntry.of('minecraft:tipped_arrow')).addPotion("weakness") - .addWeightedLoot([5, 8], ['tfg:food/raw_long_pig_filet']) + .addWeightedLoot([8, 12], LootEntry.of('minecraft:tipped_arrow')).addPotion("weakness") + .addWeightedLoot([2, 3], ['tfg:food/raw_long_pig_filet']) .addAlternativesLoot( // placeholder for a blowpipe LootEntry.of('minecraft:bamboo').when(c => c.randomChance(0.5)), @@ -133,16 +121,13 @@ function registerPrimitiveCreaturesLoots(event) { Item.of('tfc_textile:sabertooth_shirt'), Item.of('tfc_textile:sabertooth_pants'), Item.of('tfc_textile:sabertooth_boots')]) - event.addEntityLootModifier('primitive_creatures:iloger_5') - .matchMainHand('#forge:tools/butchery_knives') - .addWeightedLoot([2, 4], ['tfg:food/raw_long_pig_filet']) // shaman - yellow clothes, throws fireballs event.addEntityLootModifier('primitive_creatures:iloger_6') .removeLoot(ItemFilter.ALWAYS_TRUE) - .addWeightedLoot([5, 8], ['tfg:food/raw_long_pig_filet']) - .addWeightedLoot([1,2], ['primitive_creatures:f_1']) // primitive explosives - .addWeightedLoot([1,3], ['minecraft:gunpowder']) + .addWeightedLoot([2, 3], ['tfg:food/raw_long_pig_filet']) + .addWeightedLoot([1, 2], ['primitive_creatures:f_1']) // primitive explosives + .addWeightedLoot([2, 4], ['minecraft:gunpowder']) .addAlternativesLoot( LootEntry.of('gtceu:cobalt_brass_mortar').damage([0.5, 0.9]).when(c => c.randomChance(0.3)), LootEntry.of('primitive_creatures:totem_2').when(c => c.randomChance(0.05)), @@ -155,15 +140,12 @@ function registerPrimitiveCreaturesLoots(event) { Item.of('tfc_textile:cougar_shirt'), Item.of('tfc_textile:cougar_pants'), Item.of('tfc_textile:cougar_boots')]) - event.addEntityLootModifier('primitive_creatures:iloger_6') - .matchMainHand('#forge:tools/butchery_knives') - .addWeightedLoot([2, 4], ['tfg:food/raw_long_pig_filet']) // beast tamer - wears tiger fur, holds vanilla sugarcane? fucking summons ravagers event.addEntityLootModifier('primitive_creatures:wiloger') .removeLoot(ItemFilter.ALWAYS_TRUE) - .addWeightedLoot([5, 8], ['tfg:food/raw_long_pig_filet']) - .addWeightedLoot([0,2], ['primitive_creatures:grh']) // battered wool + .addWeightedLoot([2, 3], ['tfg:food/raw_long_pig_filet']) + .addWeightedLoot([0, 2], ['primitive_creatures:grh']) // battered wool .addAlternativesLoot( LootEntry.of('gtceu:cobalt_brass_butchery_knife').damage([0.3, 0.9]).when(c => c.randomChance(0.3)), LootEntry.of('primitive_creatures:totem_0').when(c => c.randomChance(0.05)), @@ -176,14 +158,11 @@ function registerPrimitiveCreaturesLoots(event) { Item.of('tfc_textile:tiger_shirt'), Item.of('tfc_textile:tiger_pants'), Item.of('tfc_textile:tiger_boots')]) - event.addEntityLootModifier('primitive_creatures:wiloger') - .matchMainHand('#forge:tools/butchery_knives') - .addWeightedLoot([2, 4], ['tfg:food/raw_long_pig_filet']) // warrior - lion fur, holds flint club - stuns you in place when hit event.addEntityLootModifier('primitive_creatures:piloger_9') .removeLoot(ItemFilter.ALWAYS_TRUE) - .addWeightedLoot([5, 8], ['tfg:food/raw_long_pig_filet']) + .addWeightedLoot([2, 3], ['tfg:food/raw_long_pig_filet']) .addAlternativesLoot( LootEntry.of('primitive_creatures:yhgi').when(c => c.randomChance(0.8)), // flint club LootEntry.of('tfc:small_raw_hide').when(c => c.randomChance(0.4)), @@ -195,15 +174,12 @@ function registerPrimitiveCreaturesLoots(event) { Item.of('tfc_textile:lion_shirt'), Item.of('tfc_textile:lion_pants'), Item.of('tfc_textile:lion_boots')]) - event.addEntityLootModifier('primitive_creatures:piloger_9') - .matchMainHand('#forge:tools/butchery_knives') - .addWeightedLoot([2, 4], ['tfg:food/raw_long_pig_filet']) // mercenary event.addEntityLootModifier('primitive_creatures:viloger_10') .removeLoot(ItemFilter.ALWAYS_TRUE) - .addWeightedLoot([5, 8], ['tfg:food/raw_long_pig_filet']) - .addWeightedLoot([1,2], ['minecraft:emerald']) + .addWeightedLoot([2, 3], ['tfg:food/raw_long_pig_filet']) + .addWeightedLoot([2, 4], ['minecraft:emerald']) .addAlternativesLoot( LootEntry.of('gtceu:cobalt_brass_knife').damage([0.3, 0.7]).when(c => c.randomChance(0.3)), LootEntry.of('primitive_creatures:totem_2').when(c => c.randomChance(0.05)), @@ -216,19 +192,16 @@ function registerPrimitiveCreaturesLoots(event) { Item.of('tfc_textile:raw_shirt'), Item.of('tfc_textile:raw_pants'), Item.of('tfc_textile:raw_socks')]) - event.addEntityLootModifier('primitive_creatures:viloger_10') - .matchMainHand('#forge:tools/butchery_knives') - .addWeightedLoot([2, 4], ['tfg:food/raw_long_pig_filet']) // huntmaster - miniboss event.addEntityLootModifier('primitive_creatures:nahida') .removeLoot(ItemFilter.ALWAYS_TRUE) - .addWeightedLoot([5, 8], ['tfg:food/raw_long_pig_filet']) + .addWeightedLoot([2, 3], ['tfg:food/raw_long_pig_filet']) .addWeightedLoot([ - LootEntry.of('gtceu:cobalt_brass_spade').damage([0.85, 1]), - LootEntry.of('gtceu:cobalt_brass_sickle').damage([0.85, 1]), - LootEntry.of('gtceu:cobalt_brass_mining_hammer').damage([0.85, 1]), - LootEntry.of('gtceu:cobalt_brass_sword').damage([0.85, 1])]) + Item.of('gtceu:cobalt_brass_spade', '{Damage:0,DisallowContainerItem:0b,GT.Behaviours:{AoEColumn:1,AoELayer:0,AoERow:1,MaxAoEColumn:1,MaxAoELayer:0,MaxAoERow:1},GT.Tool:{AttackDamage:3.5f,AttackSpeed:-3.4f,DefaultEnchantments:[],HarvestLevel:2,MaxDamage:18431,ToolSpeed:5.0f},HideFlags:2}'), + Item.of('gtceu:cobalt_brass_scythe', '{Damage:0,DisallowContainerItem:0b,GT.Behaviours:{AoEColumn:2,AoELayer:2,AoERow:2,MaxAoEColumn:2,MaxAoELayer:2,MaxAoERow:2},GT.Tool:{AttackDamage:7.0f,AttackSpeed:-3.2f,DefaultEnchantments:[],HarvestLevel:2,MaxDamage:18431,ToolSpeed:6.5f},HideFlags:2}'), + Item.of('gtceu:cobalt_brass_mining_hammer', '{Damage:0,DisallowContainerItem:0b,GT.Behaviours:{AoEColumn:1,AoELayer:0,AoERow:1,MaxAoEColumn:1,MaxAoELayer:0,MaxAoERow:1,TorchPlacing:1b},GT.Tool:{AttackDamage:3.5f,AttackSpeed:-3.4f,DefaultEnchantments:[],HarvestLevel:2,MaxDamage:18431,ToolSpeed:5.0f},HideFlags:2}'), + Item.of('gtceu:cobalt_brass_sword')]) event.addEntityLootModifier('primitive_creatures:nahida') .addWeightedLoot([ Item.of('sns:leather_sack'), @@ -246,16 +219,14 @@ function registerPrimitiveCreaturesLoots(event) { Item.of('tfc_textile:panther_shirt'), Item.of('tfc_textile:panther_pants'), Item.of('tfc_textile:panther_boots')]) - event.addEntityLootModifier('primitive_creatures:nahida') - .matchMainHand('#forge:tools/butchery_knives') - .addWeightedLoot([2, 4], ['tfg:food/raw_long_pig_filet']) // berserker - guy with celtic blue face paint event.addEntityLootModifier('primitive_creatures:iloger_10') .removeLoot(ItemFilter.ALWAYS_TRUE) - .addWeightedLoot([5, 8], ['tfg:food/raw_long_pig_filet']) + .addWeightedLoot([2, 3], ['tfg:food/raw_long_pig_filet']) .addWeightedLoot([ - LootEntry.of('gtceu:cobalt_brass_sword').damage([0.85, 1]), + Item.of('gtceu:cobalt_brass_sword'), + Item.of('gtceu:cobalt_brass_axe', '{Damage:0,DisallowContainerItem:0b,GT.Behaviours:{DisableShields:1b,TreeFelling:1b},GT.Tool:{AttackDamage:7.0f,AttackSpeed:-3.4f,DefaultEnchantments:[],HarvestLevel:2,MaxDamage:6143,ToolSpeed:4.5f},HideFlags:2}'), LootEntry.of('sns:burlap_sack'), LootEntry.of('sns:seed_pouch'), LootEntry.of('sns:ore_sack')]) @@ -266,18 +237,14 @@ function registerPrimitiveCreaturesLoots(event) { Item.of('tfc_textile:sabertooth_shirt'), Item.of('tfc_textile:sabertooth_pants'), Item.of('tfc_textile:sabertooth_boots')]) - event.addEntityLootModifier('primitive_creatures:iloger_10') - .matchMainHand('#forge:tools/butchery_knives') - .addWeightedLoot([2, 4], ['tfg:food/raw_long_pig_filet']) // mistah beeeaaaasssstt event.addEntityLootModifier('primitive_creatures:beast') .removeLoot(ItemFilter.ALWAYS_TRUE) - .addWeightedLoot([20, 30], ['tfg:food/raw_long_pig_filet']) - .addWeightedLoot([12,16], ['minecraft:bone']) - .addWeightedLoot([2,3], ['tfc:large_raw_hide']) - .addWeightedLoot([4,6], ['tfc:blubber']) + .addWeightedLoot([4, 6], ['tfg:food/raw_long_pig_filet']) + .addWeightedLoot([6, 9], ['minecraft:bone']) + .addWeightedLoot([1, 2], ['tfc:large_raw_hide']) event.addEntityLootModifier('primitive_creatures:beast') .matchMainHand('#forge:tools/butchery_knives') - .addWeightedLoot([10, 15], ['tfg:food/raw_long_pig_filet']) + .addWeightedLoot([2, 3], ['tfg:food/raw_long_pig_filet']) } \ No newline at end of file diff --git a/kubejs/server_scripts/rnr/recipes.js b/kubejs/server_scripts/rnr/recipes.js index 06b762c3d..54bb5abdd 100644 --- a/kubejs/server_scripts/rnr/recipes.js +++ b/kubejs/server_scripts/rnr/recipes.js @@ -82,7 +82,7 @@ const registerRnrRecipes = (event) => { event.recipes.gtceu.mixer('rnr:mixer/wet_concrete_mix') - .inputFluids('gtceu:concrete 192', "#tfg:clean_water 808") + .inputFluids('gtceu:concrete 200', "#tfg:clean_water 800") .outputFluids('rnr:concrete 1000') .circuit(7) .duration(200) diff --git a/kubejs/server_scripts/sacksnstuff/recipes.js b/kubejs/server_scripts/sacksnstuff/recipes.js index 216fdee8c..f49d33ae7 100644 --- a/kubejs/server_scripts/sacksnstuff/recipes.js +++ b/kubejs/server_scripts/sacksnstuff/recipes.js @@ -156,14 +156,10 @@ const registerSNSRecipes = (event) => { .itemOutputs('sns:buckle') .duration(40) .EUt(GTValues.VA[GTValues.LV]) - - event.custom({ - type: 'vintageimprovements:curving', - ingredients: [{ tag: 'forge:plates/wrought_iron' }], - itemAsHead: 'gtceu:small_pipe_extruder_mold', - results: [{ item: 'sns:buckle' }], - processingTime: 50 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER - }).id('sns:vi/curving/buckle') + + event.recipes.vintageimprovements.curving('sns:buckle', '#forge:plates/wrought_iron') + .head('gtceu:small_pipe_extruder_mold') + .id('sns:vi/curving/buckle') event.recipes.gtceu.extruder('sns:buckle2') .itemInputs('#forge:plates/steel') @@ -172,13 +168,10 @@ const registerSNSRecipes = (event) => { .duration(80) .EUt(GTValues.VA[GTValues.LV]) - event.custom({ - type: 'vintageimprovements:curving', - ingredients: [{ tag: 'forge:plates/steel' }], - itemAsHead: 'gtceu:small_pipe_extruder_mold', - results: [{ item: 'sns:buckle', count: 2 }], - processingTime: 80 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER - }).id('sns:vi/curving/buckle2') + event.recipes.vintageimprovements.curving('2x sns:buckle', '#forge:plates/steel') + .head('gtceu:small_pipe_extruder_mold') + .id('sns:vi/curving/buckle2') + event.shaped('sns:pack_frame', [ 'AAA', diff --git a/kubejs/server_scripts/sophisticated_backpacks/recipes.js b/kubejs/server_scripts/sophisticated_backpacks/recipes.js index 4c0611e36..0873a71f5 100644 --- a/kubejs/server_scripts/sophisticated_backpacks/recipes.js +++ b/kubejs/server_scripts/sophisticated_backpacks/recipes.js @@ -181,7 +181,7 @@ const registerSophisticatedBackpacksRecipes = (event) => { ], { A: '#forge:cogwheels', B: 'gtceu:item_filter', - C: '#greate:belts', + C: '#forge:belt_connectors', D: 'sophisticatedbackpacks:upgrade_base', E: 'create:mechanical_arm', F: '#gtceu:circuits/ulv', diff --git a/kubejs/server_scripts/tfc/data.js b/kubejs/server_scripts/tfc/data.js index 982310c93..a1a852315 100644 --- a/kubejs/server_scripts/tfc/data.js +++ b/kubejs/server_scripts/tfc/data.js @@ -34,11 +34,27 @@ const registerTFCFuels = (event) => { event.fuel('beneath:cursecoal', 1540, 2200, 1.0) - event.fuel('minecraft:coal', 1415, 2200, 1.0) + event.fuel('minecraft:charcoal_block', 1350, 1800 * 9, 1.0) + event.fuel('gtceu:charcoal_dust', 1350, 600, 1.0) + + event.fuel('minecraft:coal', 1415, 1900, 1.0) + event.fuel('minecraft:coal_block', 1415, 1900 * 9, 1.0) + event.fuel('gtceu:flawless_coal_gem', 1415, 1900 * 2, 1.0) + event.fuel('gtceu:exquisite_coal_gem', 1415, 1900 * 4, 1.0) + event.fuel('gtceu:flawed_coal_gem', 1415, 1900 / 2, 1.0) + event.fuel('gtceu:chipped_coal_gem', 1415, 1900 / 4, 1.0) + + event.fuel('gtceu:crushed_coal_ore', 1415, 1000, 0.8) + event.fuel('gtceu:purified_coal_ore', 1415, 1000, 1.0) + event.fuel('gtceu:refined_coal_ore', 1415, 1000, 1.0) + event.fuel('gtceu:impure_coal_dust', 1415, 500, 0.8) + event.fuel('gtceu:rich_raw_coal', 1415, 2200, 0.95) event.fuel('gtceu:raw_coal', 1415, 1900, 0.95) event.fuel('gtceu:poor_raw_coal', 1415, 1600, 0.95) - event.fuel('gtceu:coal_dust', 1415, 600, 0.95) + event.fuel('gtceu:coal_dust', 1415, 600, 0.85) + event.fuel('gtceu:small_coal_dust', 1415, 600 / 4, 0.85) + event.fuel('gtceu:tiny_coal_dust', 1415, 600 / 9, 0.85) } diff --git a/kubejs/server_scripts/tfc/loot.js b/kubejs/server_scripts/tfc/loot.js index 62e9e1909..ab68c15ca 100644 --- a/kubejs/server_scripts/tfc/loot.js +++ b/kubejs/server_scripts/tfc/loot.js @@ -6,6 +6,8 @@ function registerTFCLoots(event) { event.addEntityLootModifier('tfc:black_bear') .addWeightedLoot([8, 12], ['tfc:food/bear']) + .addWeightedLoot([1, 2], ['tfc:blubber']) + event.addEntityLootModifier('tfc:black_bear') .matchMainHand('#forge:tools/butchery_knives') .addWeightedLoot([4, 6], ['tfc:food/bear']) @@ -13,6 +15,7 @@ function registerTFCLoots(event) { event.addEntityLootModifier('tfc:grizzly_bear') .addWeightedLoot([10, 16], ['tfc:food/bear']) + .addWeightedLoot([1, 2], ['tfc:blubber']) event.addEntityLootModifier('tfc:grizzly_bear') .matchMainHand('#forge:tools/butchery_knives') @@ -21,11 +24,12 @@ function registerTFCLoots(event) { event.addEntityLootModifier('tfc:polar_bear') .addWeightedLoot([14, 20], ['tfc:food/bear']) - .addWeightedLoot([2, 5], ['tfc:blubber']) + .addWeightedLoot([6, 12], ['tfc:blubber']) event.addEntityLootModifier('tfc:polar_bear') .matchMainHand('#forge:tools/butchery_knives') .addWeightedLoot([7, 10], ['tfc:food/bear']) + .addWeightedLoot([3, 6], ['tfc:blubber']) event.addEntityLootModifier('tfc:cougar') @@ -46,8 +50,9 @@ function registerTFCLoots(event) { event.addEntityLootModifier('tfc:sabertooth') .addWeightedLoot([9, 14], ['tfc:food/gran_feline']) + .addWeightedLoot([1, 2], ['tfc:blubber']) - event.addEntityLootModifier('tfc:sabertooth') + event.addEntityLootModifier('tfc:sabertooth') .matchMainHand('#forge:tools/butchery_knives') .addWeightedLoot([4, 7], ['tfc:food/gran_feline']) @@ -94,6 +99,7 @@ function registerTFCLoots(event) { event.addEntityLootModifier('tfc:dog') .addWeightedLoot([5, 8], ['tfc:food/wolf']) + .addWeightedLoot([1, 2], ['tfc:blubber']) event.addEntityLootModifier('tfc:dog') .matchMainHand('#forge:tools/butchery_knives') @@ -140,147 +146,197 @@ function registerTFCLoots(event) { .matchMainHand('#forge:tools/butchery_knives') .addWeightedLoot([2, 5], ['tfc:food/bluegill', 'tfc:food/crappie', 'tfc:food/lake_trout', 'tfc:food/rainbow_trout', 'tfc:food/frog_legs']) + // Passive animals event.addEntityLootModifier('tfc:alpaca') .matchMainHand('#forge:tools/butchery_knives') .addWeightedLoot([5, 10], ['tfc:food/camelidae']) + .addWeightedLoot([1, 2], ['tfc:blubber']) + event.addEntityLootModifier('tfc:boar') .matchMainHand('#forge:tools/butchery_knives') .addWeightedLoot([2, 4], ['tfc:food/pork']) + .addWeightedLoot([3, 5], ['tfc:blubber']) + event.addEntityLootModifier('tfc:bongo') .matchMainHand('#forge:tools/butchery_knives') .addWeightedLoot([2, 4], ['tfc:food/venison']) + .addWeightedLoot([1, 2], ['tfc:blubber']) + event.addEntityLootModifier('tfc:caribou') - .addWeightedLoot([1, 3], ['tfc:blubber']) + .addWeightedLoot([3, 6], ['tfc:blubber']) + event.addEntityLootModifier('tfc:caribou') .matchMainHand('#forge:tools/butchery_knives') .addWeightedLoot([3, 5], ['tfc:food/venison']) + event.addEntityLootModifier('tfc:chicken') .matchMainHand('#forge:tools/butchery_knives') .addWeightedLoot([1, 3], ['tfc:food/chicken']) + event.addEntityLootModifier('tfc:cow') .matchMainHand('#forge:tools/butchery_knives') .addWeightedLoot([8, 12], ['tfc:food/beef']) + .addWeightedLoot([2, 4], ['tfc:blubber']) + event.addEntityLootModifier('tfc:deer') .matchMainHand('#forge:tools/butchery_knives') .addWeightedLoot([2, 4], ['tfc:food/venison']) + .addWeightedLoot([1, 2], ['tfc:blubber']) + event.addEntityLootModifier('tfc:dolphin') .removeLoot(ItemFilter.ALWAYS_TRUE) - .addWeightedLoot([5, 12], ['tfc:blubber']) - .addWeightedLoot([1, 5], ['minecraft:bone']) + .addWeightedLoot([6, 12], ['tfc:blubber']) + .addWeightedLoot([3, 5], ['minecraft:bone']) + event.addEntityLootModifier('tfc:dolphin') .matchMainHand('#forge:tools/butchery_knives') - .addWeightedLoot([2, 6], ['tfc:blubber']) + .addWeightedLoot([3, 6], ['tfc:blubber']) + event.addEntityLootModifier('tfc:donkey') .matchMainHand('#forge:tools/butchery_knives') .addWeightedLoot([7, 10], ['tfc:food/horse_meat']) + .addWeightedLoot([1, 2], ['tfc:blubber']) + event.addEntityLootModifier('tfc:duck') .matchMainHand('#forge:tools/butchery_knives') .addWeightedLoot([1, 3], ['tfc:food/duck']) + event.addEntityLootModifier('tfc:frog') .matchMainHand('#forge:tools/butchery_knives') .addWeightedLoot([1, 2], ['tfc:food/frog_legs']) + event.addEntityLootModifier('tfc:gazelle') .matchMainHand('#forge:tools/butchery_knives') .addWeightedLoot([2, 4], ['tfc:food/venison']) + .addWeightedLoot([1, 2], ['tfc:blubber']) + event.addEntityLootModifier('tfc:goat') .matchMainHand('#forge:tools/butchery_knives') .addWeightedLoot([4, 6], ['tfc:food/chevon']) + .addWeightedLoot([1, 2], ['tfc:blubber']) + event.addEntityLootModifier('tfc:grouse') .matchMainHand('#forge:tools/butchery_knives') .addWeightedLoot([1, 2], ['tfc:food/grouse']) + event.addEntityLootModifier('tfc:horse') .matchMainHand('#forge:tools/butchery_knives') .addWeightedLoot([7, 10], ['tfc:food/horse_meat']) + .addWeightedLoot([1, 2], ['tfc:blubber']) + event.addEntityLootModifier('tfc:manatee') .removeLoot(ItemFilter.ALWAYS_TRUE) .addWeightedLoot([5, 12], ['tfc:blubber']) .addWeightedLoot([1, 5], ['minecraft:bone']) + event.addEntityLootModifier('tfc:manatee') .matchMainHand('#forge:tools/butchery_knives') .addWeightedLoot([2, 6], ['tfc:blubber']) + event.addEntityLootModifier('tfc:moose') .matchMainHand('#forge:tools/butchery_knives') .addWeightedLoot([5, 10], ['tfc:food/venison']) - .addWeightedLoot([1, 2], ['tfc:blubber']) + .addWeightedLoot([3, 6], ['tfc:blubber']) + event.addEntityLootModifier('tfc:mule') .matchMainHand('#forge:tools/butchery_knives') .addWeightedLoot([7, 10], ['tfc:food/horse_meat']) - - event.addEntityLootModifier('tfc:musk_ox') .addWeightedLoot([1, 2], ['tfc:blubber']) + + + event.addEntityLootModifier('tfc:musk_ox') + .addWeightedLoot([2, 4], ['tfc:blubber']) + event.addEntityLootModifier('tfc:musk_ox') .matchMainHand('#forge:tools/butchery_knives') .addWeightedLoot([7, 10], ['tfc:food/mutton']) + event.addEntityLootModifier('tfc:peafowl') .matchMainHand('#forge:tools/butchery_knives') .addWeightedLoot([1, 2], ['tfc:food/peafowl']) + event.addEntityLootModifier('tfc:pheasant') .matchMainHand('#forge:tools/butchery_knives') .addWeightedLoot([1, 2], ['tfc:food/pheasant']) + event.addEntityLootModifier('tfc:pig') - .addWeightedLoot([3, 6], ['tfc:blubber']) + .addWeightedLoot([4, 6], ['tfc:blubber']) + event.addEntityLootModifier('tfc:pig') .matchMainHand('#forge:tools/butchery_knives') .addWeightedLoot([5, 7], ['tfc:food/pork']) - .addWeightedLoot([1, 3], ['tfc:blubber']) + .addWeightedLoot([2, 3], ['tfc:blubber']) + event.addEntityLootModifier('tfc:orca') .removeLoot(ItemFilter.ALWAYS_TRUE) - .addWeightedLoot([8, 20], ['tfc:blubber']) + .addWeightedLoot([12, 20], ['tfc:blubber']) .addWeightedLoot([3, 7], ['minecraft:bone']) + event.addEntityLootModifier('tfc:orca') .matchMainHand('#forge:tools/butchery_knives') - .addWeightedLoot([4, 10], ['tfc:blubber']) + .addWeightedLoot([6, 10], ['tfc:blubber']) + event.addEntityLootModifier('tfc:quail') .matchMainHand('#forge:tools/butchery_knives') .addWeightedLoot([1, 3], ['tfc:food/quail']) + event.addEntityLootModifier('tfc:rabbit') .matchMainHand('#forge:tools/butchery_knives') .addLoot('tfc:food/rabbit') + .addWeightedLoot([0, 1], ['tfc:blubber']) + event.addEntityLootModifier('tfc:sheep') .matchMainHand('#forge:tools/butchery_knives') .addWeightedLoot([6, 9], ['tfc:food/mutton']) + .addWeightedLoot([1, 2], ['tfc:blubber']) + event.addEntityLootModifier('tfc:turkey') .matchMainHand('#forge:tools/butchery_knives') .addWeightedLoot([1, 2], ['tfc:food/turkey']) + event.addEntityLootModifier('tfc:turtle') .matchMainHand('#forge:tools/butchery_knives') .addLoot('tfc:food/turtle') + event.addEntityLootModifier('tfc:wildebeest') .matchMainHand('#forge:tools/butchery_knives') .addWeightedLoot([4, 7], ['tfc:food/beef']) + .addWeightedLoot([2, 3], ['tfc:blubber']) + event.addEntityLootModifier('tfc:yak') .matchMainHand('#forge:tools/butchery_knives') .addWeightedLoot([7, 10], ['tfc:food/chevon']) + .addWeightedLoot([3, 6], ['tfc:blubber']) // Blocks diff --git a/kubejs/server_scripts/tfc/recipes.js b/kubejs/server_scripts/tfc/recipes.js index a6da50e30..c67e8352b 100644 --- a/kubejs/server_scripts/tfc/recipes.js +++ b/kubejs/server_scripts/tfc/recipes.js @@ -241,4 +241,52 @@ const registerTFCRecipes = (event) => { .itemOutputs('tfc:wrought_iron_grill') .duration(60) .EUt(8) + + //Jigabit's stupid acetic acid to vinegar conversion + + event.recipes.gtceu.mixer('vinegar_from_acetic_acid') + .inputFluids( + Fluid.of('minecraft:water', 950), + Fluid.of('gtceu:acetic_acid', 50) + ) + .outputFluids( + Fluid.of('tfc:vinegar', 1000) + ) + .circuit(1) + .duration(30) + .EUt(GTValues.VA[GTValues.MV]) + + event.recipes.gtceu.distillery('acetic_acid_from_vinegar') + .inputFluids( + Fluid.of('tfc:vinegar', 1000) + ) + .outputFluids( + Fluid.of('gtceu:acetic_acid', 50) + ) + .circuit(1) + .duration(50) + .EUt(GTValues.VA[GTValues.MV]) + + event.recipes.gtceu.distillery('water_from_vinegar') + .inputFluids( + Fluid.of('tfc:vinegar', 1000) + ) + .outputFluids( + Fluid.of('minecraft:water', 950) + ) + .circuit(2) + .duration(50) + .EUt(GTValues.VA[GTValues.MV]) + + event.recipes.gtceu.distillation_tower('vinegar_distillation') + .inputFluids( + Fluid.of('tfc:vinegar', 1000) + ) + .outputFluids( + Fluid.of('gtceu:acetic_acid', 50), + Fluid.of('minecraft:water', 950) + ) + .duration(80) + .EUt(GTValues.VA[GTValues.MV]) + } diff --git a/kubejs/server_scripts/tfc/recipes.materials.js b/kubejs/server_scripts/tfc/recipes.materials.js index 5fc44fd5e..850c48c2f 100644 --- a/kubejs/server_scripts/tfc/recipes.materials.js +++ b/kubejs/server_scripts/tfc/recipes.materials.js @@ -240,15 +240,9 @@ function registerTFCMaterialsRecipes(event) { // These aren't TFC recipes but they go here since they don't have a tag prefix // and I'm too lazy to make them one - event.custom({ - type: 'vintageimprovements:curving', - ingredients: [doublePlateItem], - // tuyeres are roughly bottle shaped, right? - // (there's no other mold that wouldn't conflict and this seems close enough) - itemAsHead: 'gtceu:bottle_extruder_mold', - results: [{ item: `tfc:metal/tuyere/${material.getName()}` }], - processingTime: material.getMass() * 6 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER - }).id(`tfg:vi/curving/${material.getName()}_tuyere`) + event.recipes.vintageimprovements.curving(`tfc:metal/tuyere/${material.getName()}`, doublePlateItem) + .head('gtceu:bottle_extruder_mold') + .id(`tfg:vi/curving/${material.getName()}_tuyere`) event.recipes.gtceu.extruder(`tfg:${material.getName()}_tuyere`) .itemInputs(doublePlateItem) @@ -271,13 +265,9 @@ function registerTFCMaterialsRecipes(event) { .tier(tfcProperty.getTier()) .id(`tfc:anvil/${material.getName()}_shield`) - event.custom({ - type: 'vintageimprovements:curving', - ingredients: [doublePlateItem], - itemAsHead: 'gtceu:plate_extruder_mold', - results: [{ item: `tfc:metal/shield/${material.getName()}` }], - processingTime: material.getMass() * 6 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER - }).id(`tfg:vi/curving/${material.getName()}_shield`) + event.recipes.vintageimprovements.curving(`tfc:metal/shield/${material.getName()}`, doublePlateItem) + .head('gtceu:plate_extruder_mold') + .id(`tfg:vi/curving/${material.getName()}_shield`) event.recipes.gtceu.extruder(`tfg:${material.getName()}_shield`) .itemInputs(doublePlateItem) @@ -1324,22 +1314,40 @@ function registerTFCMaterialsRecipes(event) { let tongPartStack = Item.of(`tfchotornot:tong_part/${material.getName()}`) if (!tongsStack.isEmpty() && !tongPartStack.isEmpty() && material !== GTMaterials.Iron) { + // tong parts + event.recipes.vintageimprovements.curving(tongPartStack, `#forge:rods/long/${material.getName()}`) + .head('gtceu:rod_extruder_mold') + .id(`tfg:vi/curving/${material.getName()}_tong`) + + event.recipes.gtceu.extruder(`tfg:${material.getName()}_tong`) + .itemInputs(`#forge:rods/long/${material.getName()}`) + .notConsumable('gtceu:rod_extruder_mold') + .itemOutputs(tongPartStack) + .duration(material.getMass()) + .EUt(GTValues.VA[GTValues.LV]) + + // tongs event.recipes.tfc.advanced_shaped_crafting( TFC.isp.of(tongsStack).copyForgingBonus(), [ 'AA', 'BC' ], { A: tongPartStack, - B: '#forge:bolts', + B: Ingredient.of('#forge:bolts').subtract('gtceu:wood_bolt'), C: '#forge:tools/hammers' }, 0, 0).id(`tfchotornot:crafting/tongs/${material.getName()}`) - // tong parts + event.recipes.gtceu.forge_hammer(`tfg:${material.getName()}_tong`) + .itemInputs(tongPartStack.withCount(2)) + .itemOutputs(tongsStack) + .duration(material.getMass()) + .EUt(GTValues.VA[GTValues.ULV]) + + // tong heating event.recipes.tfc.heating(tongPartStack, tfcProperty.getMeltTemp()) .resultFluid(Fluid.of(outputMaterial.getFluid(), 144)) .id(`tfchotornot:heating/tong_part/${material.getName()}`) - // tong heating event.recipes.tfc.heating(tongsStack, tfcProperty.getMeltTemp()) .resultFluid(Fluid.of(outputMaterial.getFluid(), 288)) .useDurability(true) diff --git a/kubejs/server_scripts/tfc/tags.js b/kubejs/server_scripts/tfc/tags.js index 16edea41c..aa2caae27 100644 --- a/kubejs/server_scripts/tfc/tags.js +++ b/kubejs/server_scripts/tfc/tags.js @@ -38,6 +38,8 @@ function registerTFCItemTags(event) { "#forge:tools/drills", "#forge:tools/fishing_nets", "#tfc:buckets", + "tfc:lens", + "#forge:lenses", "buildinggadgets2:gadget_building", "buildinggadgets2:gadget_exchanging", "buildinggadgets2:gadget_copy_paste", @@ -70,6 +72,7 @@ function registerTFCItemTags(event) { "framedblocks:framed_hammer", "framedblocks:framed_key", "mcw_tfc_aio:roofing_hammer", + "mcw_tfc_aio:pliers", "tfclunchbox:lunchbox", "tfclunchbox:cooling_lunchbox", "tfclunchbox:electric_lunchbox", @@ -584,6 +587,10 @@ function registerTFCFluidTags(event) { if (temp >= 1300) { event.add("tfchotornot:hot_whitelist", idStr); } + // Frostburns ya. (The zero check is to stop 'invalid' fluids from counting as too cold) + if (temp < 223 && temp > 0) { + event.add("tfchotornot:cold_whitelist", idStr); + } // Blue steel: can do heat, can't do cryo. if (temp >= 120) { event.add("tfc:usable_in_blue_steel_bucket", idStr); @@ -611,7 +618,9 @@ function registerTFCFluidTags(event) { const isPlasmatic = wrapperHas(plasmaticWrapper); const isHidden = wrapperHas(hiddenWrapper); - if (isGaseous || isPlasmatic || isHidden) return; + if (isGaseous || isPlasmatic || isHidden) + return; + event.add('forge:liquid', idString); }; @@ -671,16 +680,17 @@ function registerTFCFluidTags(event) { event.add("tfc:ingredients", "tfc:spring_water"); event.add('tfc:drinkables', 'tfc:spring_water') - event.add("tfc:alcohols", "tfcagedalcohol:aged_beer"); - event.add("tfc:alcohols", "tfcagedalcohol:aged_cider"); - event.add("tfc:alcohols", "tfcagedalcohol:aged_rum"); - event.add("tfc:alcohols", "tfcagedalcohol:aged_sake"); - event.add("tfc:alcohols", "tfcagedalcohol:aged_vodka"); - event.add("tfc:alcohols", "tfcagedalcohol:aged_whiskey"); - event.add("tfc:alcohols", "tfcagedalcohol:aged_corn_whiskey"); - event.add("tfc:alcohols", "tfcagedalcohol:aged_rye_whiskey"); - event.add("tfc:alcohols", "tfcagedalcohol:aged_mead"); - event.add("tfc:alcohols", "tfc_gurman:nalivka"); + event.add('tfg:alcohols', '#tfc:alcohols') + event.add("tfg:alcohols", "tfcagedalcohol:aged_beer"); + event.add("tfg:alcohols", "tfcagedalcohol:aged_cider"); + event.add("tfg:alcohols", "tfcagedalcohol:aged_rum"); + event.add("tfg:alcohols", "tfcagedalcohol:aged_sake"); + event.add("tfg:alcohols", "tfcagedalcohol:aged_vodka"); + event.add("tfg:alcohols", "tfcagedalcohol:aged_whiskey"); + event.add("tfg:alcohols", "tfcagedalcohol:aged_corn_whiskey"); + event.add("tfg:alcohols", "tfcagedalcohol:aged_rye_whiskey"); + event.add("tfg:alcohols", "tfcagedalcohol:aged_mead"); + event.add("tfg:alcohols", "tfc_gurman:nalivka"); // Добавляем тег для скрытия в EMI event.add("c:hidden_from_recipe_viewers", "tfc:metal/bismuth"); diff --git a/kubejs/server_scripts/tfcgurman/recipes.js b/kubejs/server_scripts/tfc_gurman/recipes.js similarity index 100% rename from kubejs/server_scripts/tfcgurman/recipes.js rename to kubejs/server_scripts/tfc_gurman/recipes.js diff --git a/kubejs/server_scripts/hotornot/recipes.js b/kubejs/server_scripts/tfchotornot/recipes.js similarity index 100% rename from kubejs/server_scripts/hotornot/recipes.js rename to kubejs/server_scripts/tfchotornot/recipes.js diff --git a/kubejs/server_scripts/tfchotornot/tags.js b/kubejs/server_scripts/tfchotornot/tags.js new file mode 100644 index 000000000..9bb1a6891 --- /dev/null +++ b/kubejs/server_scripts/tfchotornot/tags.js @@ -0,0 +1,86 @@ +// priority: 0 +"use strict"; + +const registerHotOrNotItemTags = (event) => { + + // Удаление тегов у отключенных предметов + global.HOT_OR_NOT_DISABLED_ITEMS.forEach(item => { + event.removeAllTagsFrom(item) + event.add('c:hidden_from_recipe_viewers', item) + }) + + event.add('tfchotornot:hot_whitelist', '#forge:hot_ingots') + event.add('tfchotornot:cold_whitelist', 'minecraft:blue_ice') + event.add('tfchotornot:cold_whitelist', 'tfg:dry_ice') + + event.add('firmalife:usable_on_oven', '#tfchotornot:insulating') + + event.add('tfg:insulating_container', 'gtceu:ulv_super_tank') + event.add('tfg:insulating_container', 'gtceu:lv_super_tank') + event.add('tfg:insulating_container', 'gtceu:mv_super_tank') + event.add('tfg:insulating_container', 'gtceu:hv_super_tank') + event.add('tfg:insulating_container', 'gtceu:ev_super_tank') + event.add('tfg:insulating_container', 'gtceu:iv_quantum_tank') + event.add('tfg:insulating_container', 'gtceu:luv_quantum_tank') + event.add('tfg:insulating_container', 'gtceu:zpm_quantum_tank') + event.add('tfg:insulating_container', 'gtceu:uv_quantum_tank') + event.add('tfg:insulating_container', 'gtceu:uhv_quantum_tank') + event.add('tfg:insulating_container', 'gtceu:glass_vial') + event.add('tfg:insulating_container', 'gtceu:fluid_cell') + event.add('tfg:insulating_container', 'gtceu:universal_fluid_cell') + event.add('tfg:insulating_container', 'gtceu:steel_fluid_cell') + event.add('tfg:insulating_container', 'gtceu:aluminium_fluid_cell') + event.add('tfg:insulating_container', 'gtceu:stainless_steel_fluid_cell') + event.add('tfg:insulating_container', 'gtceu:titanium_fluid_cell') + event.add('tfg:insulating_container', 'gtceu:tungsten_steel_fluid_cell') + + event.add('tfg:hot_protection_equipment', 'tfc:metal/chestplate/blue_steel') + event.add('tfg:hot_protection_equipment', 'tfc:metal/boots/blue_steel') + event.add('tfg:hot_protection_equipment', 'sns:blue_steel_toe_hiking_boots') + event.add('tfg:hot_protection_equipment', 'minecraft:netherite_boots') + event.add('tfg:hot_protection_equipment', 'create:netherite_backtank') + event.add('tfg:hot_protection_equipment', 'create:netherite_diving_boots') + event.add('tfg:hot_protection_equipment', 'ad_astra:netherite_space_suit') + event.add('tfg:hot_protection_equipment', 'ad_astra:netherite_space_boots') + event.add('tfg:hot_protection_equipment', 'gtceu:hazmat_chestpiece') + event.add('tfg:hot_protection_equipment', 'gtceu:hazmat_boots') + event.add('tfg:hot_protection_equipment', 'gtceu:quarktech_chestplate') + event.add('tfg:hot_protection_equipment', 'gtceu:advanced_quarktech_chestplate') + event.add('tfg:hot_protection_equipment', 'gtceu:quarktech_boots') + + event.add('tfg:cold_protection_equipment', 'tfc:metal/chestplate/red_steel') + event.add('tfg:cold_protection_equipment', 'tfc:metal/boots/red_steel') + event.add('tfg:cold_protection_equipment', 'sns:red_steel_toe_hiking_boots') + event.add('tfg:cold_protection_equipment', 'ad_astra:space_boots') + event.add('tfg:cold_protection_equipment', 'ad_astra:space_suit') + event.add('tfg:cold_protection_equipment', 'ad_astra:netherite_space_suit') + event.add('tfg:cold_protection_equipment', 'ad_astra:netherite_space_boots') + event.add('tfg:cold_protection_equipment', 'gtceu:hazmat_chestpiece') + event.add('tfg:cold_protection_equipment', 'gtceu:hazmat_boots') + event.add('tfg:cold_protection_equipment', 'gtceu:quarktech_chestplate') + event.add('tfg:cold_protection_equipment', 'gtceu:advanced_quarktech_chestplate') + event.add('tfg:cold_protection_equipment', 'gtceu:quarktech_boots') + + event.add('tfg:floating_protection_equipment', 'create:copper_diving_boots') + event.add('tfg:floating_protection_equipment', 'create:netherite_diving_boots') + event.add('tfg:floating_protection_equipment', 'ad_astra:space_boots') + event.add('tfg:floating_protection_equipment', 'ad_astra:netherite_space_boots') + event.add('tfg:floating_protection_equipment', 'gtceu:hazmat_boots') + event.add('tfg:floating_protection_equipment', 'gtceu:quarktech_boots') +} + +const registerHotOrNotFluidTags = (event) => { + event.add("tfchotornot:gaseous_whitelist", 'gtceu:helium') + event.add("tfchotornot:gaseous_whitelist", 'gtceu:helium_3') + event.add("tfchotornot:gaseous_whitelist", 'gtceu:hydrogen') + event.add("tfchotornot:gaseous_whitelist", 'gtceu:coal_gas') + event.add("tfchotornot:gaseous_whitelist", 'gtceu:methane') +} + +const registerHotOrNotBlockTags = (event) => { + + // Удаление тегов у отключенных предметов + global.HOT_OR_NOT_DISABLED_ITEMS.forEach(item => { + event.removeAllTagsFrom(item) + }) +} \ No newline at end of file diff --git a/kubejs/server_scripts/tfg/equipment/events.equipment.js b/kubejs/server_scripts/tfg/equipment/events.equipment.js index 3ec2ba29d..6451241e6 100644 --- a/kubejs/server_scripts/tfg/equipment/events.equipment.js +++ b/kubejs/server_scripts/tfg/equipment/events.equipment.js @@ -3,11 +3,15 @@ PlayerEvents.tick((event) => { const { player } = event; if (player.age % 100 === 0) { - if (player.headArmorItem === 'create:netherite_diving_helmet' - && player.chestArmorItem === 'create:netherite_backtank' - && player.legsArmorItem === 'minecraft:netherite_leggings' + if ((player.headArmorItem === 'create:netherite_diving_helmet' + || player.headArmorItem === 'ad_astra:netherite_space_helmet') + && (player.chestArmorItem === 'create:netherite_backtank' + || player.chestArmorItem === 'ad_astra:netherite_space_suit') + && (player.legsArmorItem === 'minecraft:netherite_leggings' + || player.legsArmorItem === 'ad_astra:netherite_space_pants') && (player.feetArmorItem === 'create:netherite_diving_boots' - || player.feetArmorItem === 'minecraft:netherite_boots')) { + || player.feetArmorItem === 'minecraft:netherite_boots' + || player.feetArmorItem === 'ad_astra:netherite_space_boots')) { player.potionEffects.add("minecraft:fire_resistance", 350, 0, true, false); } diff --git a/kubejs/server_scripts/tfg/events.interactions.js b/kubejs/server_scripts/tfg/events.interactions.js index c7ca21bf3..963d0160d 100644 --- a/kubejs/server_scripts/tfg/events.interactions.js +++ b/kubejs/server_scripts/tfg/events.interactions.js @@ -503,19 +503,20 @@ BlockEvents.rightClicked(event => { }); // Makes scythes, hoes, and knives take damage when cutting grass -BlockEvents.broken('tfc:mineable_with_sharp_tool', event => { - let player = event.player; - let toolUsed = player.mainHandItem; +BlockEvents.broken(event => { + const { server, item, player, block } = event; - if (!toolUsed.hasTag('tfc:sharp_tools')) { + let toolUsed = player.mainHandItem; + + if (!block.hasTag('tfc:mineable_with_sharp_tool') || !toolUsed.hasTag('tfc:sharp_tools')) { return; } if (!player.isCreative()) { toolUsed.damageValue++; if (toolUsed.damageValue >= toolUsed.maxDamage) { - event.server.runCommandSilent(`playsound minecraft:item.shield.break player ${player.username} ${player.x} ${player.y} ${player.z} 1 1 1`); + server.runCommandSilent(`playsound minecraft:item.shield.break player ${player.username} ${player.x} ${player.y} ${player.z} 1 1 1`); toolUsed.count--; } } -}); \ No newline at end of file +}); diff --git a/kubejs/server_scripts/tfg/food/recipes.biomass.js b/kubejs/server_scripts/tfg/food/recipes.biomass.js index 65aeb4fcf..82455ef59 100644 --- a/kubejs/server_scripts/tfg/food/recipes.biomass.js +++ b/kubejs/server_scripts/tfg/food/recipes.biomass.js @@ -70,14 +70,14 @@ function registerTFGBiomassRecipes(event) { event.recipes.gtceu.brewery('biomass_from_minecraft_plants') .itemInputs('#createaddition:plants') .inputFluids("#tfc:any_water 20") - .outputFluids(Fluid.of('gtceu:biomass', 100)) + .outputFluids(Fluid.of('gtceu:biomass', 20)) .duration(100) .EUt(3) event.recipes.gtceu.brewery('biomass_from_wart_blocks') .itemInputs('#minecraft:wart_blocks') .inputFluids("#tfc:any_water 20") - .outputFluids(Fluid.of('gtceu:biomass', 50)) + .outputFluids(Fluid.of('gtceu:biomass', 100)) .duration(100) .EUt(3) @@ -131,7 +131,7 @@ function registerTFGBiomassRecipes(event) { .EUt(2) event.recipes.gtceu.compressor('plant_ball_from_misc_plants') - .itemInputs('4x #createaddition:plants') + .itemInputs('10x #createaddition:plants') .itemOutputs('gtceu:plant_ball') .duration(300) .EUt(2) @@ -152,7 +152,7 @@ function registerTFGBiomassRecipes(event) { .duration(800) .EUt(6) - event.recipes.gtceu.centrifuge('sugar_from_honey') + event.recipes.gtceu.extractor('sugar_from_honey') .itemInputs('firmalife:raw_honey') .itemOutputs('minecraft:sugar') .duration(400) diff --git a/kubejs/server_scripts/tfg/food/recipes.food.js b/kubejs/server_scripts/tfg/food/recipes.food.js index c99e8b67e..1210e0ab4 100644 --- a/kubejs/server_scripts/tfg/food/recipes.food.js +++ b/kubejs/server_scripts/tfg/food/recipes.food.js @@ -575,8 +575,6 @@ function registerTFGFoodRecipes(event) { cookingRecipe("baked_potato", "tfc:food/potato", "tfc:food/baked_potato") - cookingRecipe("boiled_egg", "#firmalife:foods/raw_eggs", "tfc:food/boiled_egg", "#tfg:clean_water 200") - cookingRecipe("cooked_rice", "tfc:food/rice_grain", "tfc:food/cooked_rice", "#tfg:clean_water 200") processorRecipe("pasta_tomato_sauce", 60, 8, { @@ -667,6 +665,14 @@ function registerTFGFoodRecipes(event) { itemOutputProvider: TFC.isp.of('tfg:food/calorie_paste').copyOldestFood().addTrait('tfg:freeze_dried') }) + processorRecipe("boiled_egg", 200, 16, { + circuit: 1, + itemInputs: ["#firmalife:foods/raw_eggs"], + fluidInputs: ["#tfg:clean_water 200"], + itemOutputs: ["tfc:food/boiled_egg"], + itemOutputProvider: TFC.isp.of("tfc:food/boiled_egg").copyFood() + }) + //Kelp cookingRecipe("dried_kelp_a", "tfc:plant/winged_kelp", "tfc:food/dried_kelp") cookingRecipe("dried_kelp_b", "tfc:plant/leafy_kelp", "tfc:food/dried_kelp") @@ -680,7 +686,7 @@ function registerTFGFoodRecipes(event) { processorRecipe('vinegar_alcohol', 600, GTValues.VA[GTValues.LV], { circuit: 5, itemInputs: ['#tfc:foods/fruits'], - fluidInputs: ['#tfc:alcohols 250'], + fluidInputs: ['#tfg:alcohols 250'], fluidOutputs: [Fluid.of('tfc:vinegar', 250)] }) @@ -922,7 +928,7 @@ function registerTFGFoodRecipes(event) { itemOutputProvider: TFC.isp.of('4x firmalife:food/bacon').copyFood() }) - processorRecipe("picked_egg", 1000, 8, { + processorRecipe("pickled_egg", 1000, 8, { circuit: 1, itemInputs: ['minecraft:clay_ball', 'tfc:powder/wood_ash', 'tfc:powder/salt', 'tfc:food/boiled_egg'], itemOutputs: ['firmalife:food/pickled_egg'], diff --git a/kubejs/server_scripts/tfg/food/recipes.meal_bags.js b/kubejs/server_scripts/tfg/food/recipes.meal_bags.js index 172352b7e..6eef4f4da 100644 --- a/kubejs/server_scripts/tfg/food/recipes.meal_bags.js +++ b/kubejs/server_scripts/tfg/food/recipes.meal_bags.js @@ -49,7 +49,7 @@ function registerTFGMealBagRecipes(event) { .circuit(1) .EUt(GTValues.VA[GTValues.LV]) - event.recipes.gtceu.ore_washer('tfg:ore_washer/distilled/clean_foil_pack') + event.recipes.gtceu.chemical_bath('tfg:ore_washer/distilled/clean_foil_pack') .itemInputs('1x tfg:used_foil_pack') .inputFluids(Fluid.of('gtceu:distilled_water', 10)) .itemOutputs('1x tfg:clean_foil_pack') diff --git a/kubejs/server_scripts/tfg/food/tags.food.js b/kubejs/server_scripts/tfg/food/tags.food.js index 02aa366af..9e5d65464 100644 --- a/kubejs/server_scripts/tfg/food/tags.food.js +++ b/kubejs/server_scripts/tfg/food/tags.food.js @@ -175,7 +175,8 @@ function registerTFGFoodItemTags(event) { const cheeses = [ '#firmalife:foods/cheeses', 'tfg:food/slice_of_cheese', - 'firmalife:food/shredded_cheese' + 'firmalife:food/shredded_cheese', + '#tfc_gurman:foods/brinza' ]; cheeses.forEach(item => { event.add('tfg:foods/cheeses', item); diff --git a/kubejs/server_scripts/tfg/json_tool.armor_trim.js b/kubejs/server_scripts/tfg/json_tool.armor_trim.js index 35346486e..d7bbc80b6 100644 --- a/kubejs/server_scripts/tfg/json_tool.armor_trim.js +++ b/kubejs/server_scripts/tfg/json_tool.armor_trim.js @@ -29,7 +29,7 @@ const materials = [ {materialName: 'salt_tfc', nameColor: '#bebec2', itemName: 'gtceu:exquisite_salt_gem', indexNumber: 0.196}, {materialName: 'sapphire_tfc', nameColor: '#2628b0', itemName: 'gtceu:exquisite_sapphire_gem', indexNumber: 0.197}, {materialName: 'sodalite_tfc', nameColor: '#2e40c6', itemName: 'gtceu:exquisite_sodalite_gem', indexNumber: 0.198}, - {materialName: 'coke_tfc', nameColor: '#424847', itemName: 'gtceu:exquisite_coke_gem', indexNumber: 0.199}, + {materialName: 'armalcolite_tfc', nameColor: '#424847', itemName: 'gtceu:exquisite_armalcolite_gem', indexNumber: 0.199}, {materialName: 'spessartine_tfc', nameColor: '#c28017', itemName: 'gtceu:exquisite_spessartine_gem', indexNumber: 0.181}, {materialName: 'topaz_tfc', nameColor: '#b1a42d', itemName: 'gtceu:exquisite_topaz_gem', indexNumber: 0.182}, {materialName: 'uvarovite_tfc', nameColor: '#22b43b', itemName: 'gtceu:exquisite_uvarovite_gem', indexNumber: 0.183}, @@ -48,7 +48,7 @@ const materials = [ {materialName: 'red_garnet_tfc', nameColor: '#710910', itemName: 'gtceu:exquisite_red_garnet_gem', indexNumber: 0.177}, {materialName: 'yellow_garnet_tfc', nameColor: '#bbc207', itemName: 'gtceu:exquisite_yellow_garnet_gem', indexNumber: 0.178}, {materialName: 'monazite_tfc', nameColor: '#9eb576', itemName: 'gtceu:exquisite_monazite_gem', indexNumber: 0.179}, - {materialName: 'rose_quartz_tfc', nameColor: '#ba3458', itemName: 'gtceu:exquisite_rose_quartz_gem', indexNumber: 0.161}, + {materialName: 'rose_quartz_tfc', nameColor: '#ba3458', itemName: 'greate:exquisite_rose_quartz_gem', indexNumber: 0.161}, {materialName: 'fluix_tfc', nameColor: '#53458d', itemName: 'tfg:exquisite_fluix_gem', indexNumber: 0.162}, //Metals {materialName: 'silver_tfc', nameColor: '#d8d8f4', itemName: 'vintageimprovements:silver_sheet', indexNumber: 0.162}, diff --git a/kubejs/server_scripts/tfg/machines/recipes.casings.js b/kubejs/server_scripts/tfg/machines/recipes.casings.js index 08dcf5c8a..ecdc8cdaa 100644 --- a/kubejs/server_scripts/tfg/machines/recipes.casings.js +++ b/kubejs/server_scripts/tfg/machines/recipes.casings.js @@ -178,5 +178,12 @@ function registerTFGCasingRecipes(event) { .EUt(GTValues.VH[GTValues.LV]) .circuit(2) - + event.recipes.gtceu.assembler('tfg:casings/machine_casing_power_casing') + .itemInputs('gtceu:ostrum_frame', '4x #forge:plates/titanium_tungsten_carbide', '16x #forge:fine_wires/copper', + '16x #forge:fine_wires/tungsten_bismuth_oxide_composite') + .inputFluids(Fluid.of('gtceu:reinforced_epoxy_resin', 288)) + .itemOutputs('2x tfg:machine_casing_power_casing') + .circuit(6) + .duration(2.5 * 20) + .EUt(GTValues.VA[GTValues.EV]) } \ No newline at end of file diff --git a/kubejs/server_scripts/tfg/machines/recipes.multiblocks.js b/kubejs/server_scripts/tfg/machines/recipes.multiblocks.js index 2d6a21215..29dc5e567 100644 --- a/kubejs/server_scripts/tfg/machines/recipes.multiblocks.js +++ b/kubejs/server_scripts/tfg/machines/recipes.multiblocks.js @@ -187,4 +187,15 @@ function registerTFGMultiblockRecipes(event) { F: 'gtceu:mv_electric_piston' }).addMaterialInfo().id('gtceu:shaped/coal_liquefaction_tower') + event.remove({output: 'gtceu:active_transformer'}) + + event.recipes.gtceu.assembler('tfg:active_power_transformer') + .itemInputs('1x gtceu:iv_transformer_1a', '1x #gtceu:circuits/iv', '8x gtceu:uranium_triplatinum_single_wire', + '2x gtceu:hpic_chip') + .inputFluids(Fluid.of('gtceu:ostrum_iodide', 288)) + .itemOutputs('tfg:active_power_transformer') + .duration(300) + .EUt(GTValues.VA[GTValues.EV]) + .circuit(2) + } \ No newline at end of file diff --git a/kubejs/server_scripts/tfg/machines/tags.facades.js b/kubejs/server_scripts/tfg/machines/tags.facades.js index 33a59ebbd..97fd56085 100644 --- a/kubejs/server_scripts/tfg/machines/tags.facades.js +++ b/kubejs/server_scripts/tfg/machines/tags.facades.js @@ -72,6 +72,7 @@ function registerTFGFacadeWhitelistItemTags(event) { 'gtceu:laminated_glass', 'gtceu:plascrete', 'gtceu:cleanroom_glass', + 'gtceu:treated_wood_planks', //gtceu casing 'gtceu:steam_machine_casing', diff --git a/kubejs/server_scripts/tfg/mars/recipes.mars.js b/kubejs/server_scripts/tfg/mars/recipes.mars.js index 1e3f8e1b4..35439105a 100644 --- a/kubejs/server_scripts/tfg/mars/recipes.mars.js +++ b/kubejs/server_scripts/tfg/mars/recipes.mars.js @@ -119,13 +119,10 @@ function registerTFGMarsRecipes(event) { .duration(50) .EUt(GTValues.VA[GTValues.ULV]) - event.custom({ - type: 'vintageimprovements:polishing', - ingredients: [{ item: 'beneath:wood/wood/crimson' }], - results: [{ item: 'beneath:wood/stripped_wood/crimson' }], - speed_limits: 0, - processingTime: 50 - }).id(`tfg:vi/lathe/stripping_crimson_wood`) + event.recipes.vintageimprovements.polishing('beneath:wood/stripped_wood/crimson', 'beneath:wood/wood/crimson') + .speedLimits(0) + .processingTime(50 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER) + .id(`tfg:vi/lathe/stripping_crimson_wood`) woodBuilder(event, 'warped', 'beneath:wood/lumber/warped', '#tfc:warped_logs', 'beneath:wood/log/warped', 'beneath:wood/stripped_log/warped', 'beneath:wood/planks/warped', null, @@ -138,13 +135,10 @@ function registerTFGMarsRecipes(event) { .duration(50) .EUt(GTValues.VA[GTValues.ULV]) - event.custom({ - type: 'vintageimprovements:polishing', - ingredients: [{ item: 'beneath:wood/wood/warped' }], - results: [{ item: 'beneath:wood/stripped_wood/warped' }], - speed_limits: 0, - processingTime: 50 - }).id(`tfg:vi/lathe/stripping_warped_wood`) + event.recipes.vintageimprovements.polishing('beneath:wood/stripped_wood/warped', 'beneath:wood/wood/warped') + .speedLimits(0) + .processingTime(50 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER) + .id(`tfg:vi/lathe/stripping_warped_wood`) // Alphacene diff --git a/kubejs/server_scripts/tfg/natural_blocks/recipes.dirt.js b/kubejs/server_scripts/tfg/natural_blocks/recipes.dirt.js index 714706f91..da3f7600f 100644 --- a/kubejs/server_scripts/tfg/natural_blocks/recipes.dirt.js +++ b/kubejs/server_scripts/tfg/natural_blocks/recipes.dirt.js @@ -74,13 +74,9 @@ function registerTFGDirtRecipes(event) { .duration(100) .EUt(2) - event.custom({ - type: 'vintageimprovements:curving', - ingredients: [{ item: `tfc:mud/${mud}` }], - itemAsHead: 'gtceu:ingot_extruder_mold', - results: [{ item: `tfc:drying_bricks/${mud}`, count: 4 }], - processingTime: 100 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER - }).id(`tfg:vi/curving/${mud}_bricks`) + event.recipes.vintageimprovements.curving(`4x tfc:drying_bricks/${mud}`, `tfc:mud/${mud}`) + .head('gtceu:ingot_extruder_mold') + .id(`tfg:vi/curving/${mud}_bricks`) // Влажный кирпич -> Кирпич event.smelting(`tfc:mud_brick/${mud}`, `tfc:drying_bricks/${mud}`) diff --git a/kubejs/server_scripts/tfg/natural_blocks/recipes.rocks.js b/kubejs/server_scripts/tfg/natural_blocks/recipes.rocks.js index 0988e5a3f..50f268ca4 100644 --- a/kubejs/server_scripts/tfg/natural_blocks/recipes.rocks.js +++ b/kubejs/server_scripts/tfg/natural_blocks/recipes.rocks.js @@ -14,13 +14,13 @@ function registerTFGRockRecipes(event) { { loose: 'tfg:brick/deepslate', block: '4x minecraft:deepslate_bricks' }, { loose: 'beneath:blackstone_pebble', block: 'tfg:rock/cobble_blackstone' }, - { loose: 'beneath:blackstone_brick', block: 'minecraft:polished_blackstone_bricks' }, + { loose: 'beneath:blackstone_brick', block: '4x minecraft:polished_blackstone_bricks' }, { loose: 'tfg:loose/dripstone', block: 'tfg:rock/cobble_dripstone' }, { loose: 'tfg:brick/dripstone', block: '4x create:cut_dripstone_bricks' }, { loose: 'tfg:loose/crackrack', block: 'tfg:rock/cobble_crackrack' }, - { loose: 'minecraft:nether_brick', block: 'minecraft:nether_bricks' }, + { loose: 'minecraft:nether_brick', block: '4x minecraft:nether_bricks' }, { loose: 'tfg:loose/moon_stone', block: 'ad_astra:moon_cobblestone' }, { loose: 'tfg:brick/moon_stone', block: '4x ad_astra:moon_stone_bricks' }, @@ -346,14 +346,6 @@ function registerTFGRockRecipes(event) { .notConsumable('tfc:lens') .duration(30) .EUt(GTValues.VA[GTValues.ULV]) - - //event.custom({ - // type: 'vintageimprovements:laser_cutting', - // ingredients: [{ item: x.raw }], - // results: [{item: x.polished }], - // energy: GTValues.VA[GTValues.ULV] * 30 * 4, - // maxChargeRate: GTValues.VA[GTValues.ULV] * 4 - //}).id(`tfg:vi/laser/tfg/${x.raw.replace(/:/g, '_')}_to_${x.polished.replace(/:/g, '_')}`) }) // #endregion RAW_TO_POLISHED @@ -1145,6 +1137,7 @@ function registerTFGRockRecipes(event) { { block: 'beneath:crackrack', dimension: null }, { block: 'tfg:rock/cobble_crackrack', dimension: null }, { block: 'minecraft:basalt', dimension: null }, + { block: 'minecraft:calcite', dimension: null }, { block: 'ad_astra:moon_stone', dimension: 'ad_astra:moon' }, { block: 'ad_astra:moon_cobblestone', dimension: 'ad_astra:moon' }, { block: 'ad_astra:moon_deepslate', dimension: 'ad_astra:moon' }, @@ -1270,4 +1263,11 @@ function registerTFGRockRecipes(event) { .itemOutputs('6x minecraft:polished_blackstone_button') .EUt(7) .duration(100) + + // Misc + event.recipes.gtceu.cutter('tfg:vanilla_stone_slab_to_plate') + .itemInputs('minecraft:stone_slab') + .itemOutputs('#forge:plates/stone') + .duration(20) + .EUt(GTValues.VA[GTValues.LV]) } \ No newline at end of file diff --git a/kubejs/server_scripts/tfg/natural_blocks/recipes.stone_dusts.js b/kubejs/server_scripts/tfg/natural_blocks/recipes.stone_dusts.js index f805affa3..e753c0c09 100644 --- a/kubejs/server_scripts/tfg/natural_blocks/recipes.stone_dusts.js +++ b/kubejs/server_scripts/tfg/natural_blocks/recipes.stone_dusts.js @@ -6,13 +6,6 @@ */ function registerTFGStoneDustRecipes(event) { - event.recipes.gtceu.electrolyzer('gtceu:decomposition_electrolyzing_clay') - .itemInputs('13x #forge:dusts/clay') - .itemOutputs('2x #forge:dusts/sodium', '1x #forge:dusts/lithium', '2x #forge:dusts/aluminium', '2x #forge:dusts/silicon') - .outputFluids(Fluid.of('minecraft:water', 6000)) - .duration(GTMaterials.Clay.getMass() * 13) - .EUt(GTValues.VA[GTValues.HV]) - event.recipes.gtceu.centrifuge('gtceu:stone_dust_separation') .itemInputs('gtceu:stone_dust') .chancedOutput('#forge:small_dusts/quartzite', 2500, 0) diff --git a/kubejs/server_scripts/tfg/ores_and_materials/loot.ores.js b/kubejs/server_scripts/tfg/ores_and_materials/loot.ores.js index 0d8f49c3d..c7bc3b175 100644 --- a/kubejs/server_scripts/tfg/ores_and_materials/loot.ores.js +++ b/kubejs/server_scripts/tfg/ores_and_materials/loot.ores.js @@ -34,8 +34,7 @@ const STONE_TYPES_TO_COBBLE = { permafrost: 'gtceu:ice_dust' } -const registerTFGOreLoots = (event) => { - +const registerTFGOreLoots = (event) => { // Have to define these here because normal loot table jsons don't support checking for hammers // Crush raw rock into cobble @@ -61,8 +60,10 @@ const registerTFGOreLoots = (event) => { LootEntry.of('tfg:rock/cobble_blackstone'), LootEntry.of('tfc:powder/native_gold') ) - + // Go through all materials + const $GreateMaterials = Java.loadClass("electrolyte.greate.registry.GreateMaterials") + forEachMaterial(material => { if (material.hasProperty(PropertyKey.ORE)) { @@ -70,8 +71,7 @@ const registerTFGOreLoots = (event) => { if (material.hasProperty(PropertyKey.GEM)) { let normalDrop = ChemicalHelper.get(TagPrefix.gemChipped, material, 1) let sawDrop = ChemicalHelper.get(TagPrefix.gem, material, 1) - - let bud = `gtceu:${material.getName()}_bud_indicator`; + let bud = ChemicalHelper.get(TagPrefix.surfaceRock, material, 1) event.addBlockLootModifier(bud) .matchMainHand("tfc:gem_saw") @@ -89,23 +89,25 @@ const registerTFGOreLoots = (event) => { // I LOVE LOOTJS I LOVE LOOTJS I LOVE LOOTJS let rawOreBlock = `:${ChemicalHelper.get(TagPrefix.rawOreBlock, material, 1).getItem()}`; if (material === GTMaterials.Copper || material === GTMaterials.Gold || material === GTMaterials.Iron) { - rawOreBlock = `minecraft${ rawOreBlock}`; + rawOreBlock = `minecraft${rawOreBlock}`; } else if (material === TFGHelpers.getMaterial('desh') || material === TFGHelpers.getMaterial('ostrum') || material === TFGHelpers.getMaterial('calorite')) { - rawOreBlock = `ad_astra${ rawOreBlock}`; + rawOreBlock = `ad_astra${rawOreBlock}`; + } else if (material === $GreateMaterials.RoseQuartz) { + rawOreBlock = `greate${rawOreBlock}`; } else { - rawOreBlock = `gtceu${ rawOreBlock}`; + rawOreBlock = `gtceu${rawOreBlock}`; } event.addBlockLootModifier(rawOreBlock) .removeLoot(ItemFilter.ALWAYS_TRUE) .addWeightedLoot([4, 6], - [ - richRawOre.withChance(0.2), - normalRawOre.withChance(0.6), - poorRawOre.withChance(0.2) - ]); + [ + richRawOre.withChance(0.2), + normalRawOre.withChance(0.6), + poorRawOre.withChance(0.2) + ]); // Stone ores global.ORE_BEARING_STONES.forEach(stoneType => { @@ -121,9 +123,10 @@ const registerTFGOreLoots = (event) => { } let stoneTypeDust = ChemicalHelper.get(TagPrefix.dust, stoneTypeMaterial, 1) + let namespace = material === $GreateMaterials.RoseQuartz ? 'greate' : 'gtceu'; // break with pickaxe/mining hammer/drill/mining machine - event.addBlockLootModifier(`gtceu:${stoneType}_${material.getName()}_ore`) + event.addBlockLootModifier(`${namespace}:${stoneType}_${material.getName()}_ore`) .removeLoot(ItemFilter.ALWAYS_TRUE) .addWeightedLoot([ richRawOre.withChance(0.2), @@ -135,7 +138,7 @@ const registerTFGOreLoots = (event) => { ) // break with hammer - event.addBlockLootModifier(`gtceu:${stoneType}_${material.getName()}_ore`) + event.addBlockLootModifier(`${namespace}:${stoneType}_${material.getName()}_ore`) .matchMainHand('#forge:tools/hammers') .addLoot(STONE_TYPES_TO_COBBLE[stoneType]); }) diff --git a/kubejs/server_scripts/tfg/ores_and_materials/recipes.quartzes.js b/kubejs/server_scripts/tfg/ores_and_materials/recipes.quartzes.js index aef120457..876cf4955 100644 --- a/kubejs/server_scripts/tfg/ores_and_materials/recipes.quartzes.js +++ b/kubejs/server_scripts/tfg/ores_and_materials/recipes.quartzes.js @@ -6,8 +6,8 @@ function registerTFGQuartzRecipes(event) { event.remove({ id: 'gtceu:autoclave/autoclave_dust_rose_quartz_water' }) event.remove({ id: 'gtceu:autoclave/autoclave_dust_rose_quartz_distilled' }) - generateMixerRecipe(event, ['gtceu:nether_quartz_dust', '8x minecraft:redstone'], [], '9x gtceu:rose_quartz_dust', 2, [], 180, 60, 64, 'rose_quartz_dust_mixing') - generateMixerRecipe(event, ['gtceu:tiny_nether_quartz_dust', '8x gtceu:tiny_redstone_dust'], [], 'gtceu:rose_quartz_dust', 2, [], 20, 60, 64, 'tiny_rose_quartz_dust_mixing') + generateMixerRecipe(event, ['gtceu:nether_quartz_dust', '8x minecraft:redstone'], [], '9x #forge:dusts/rose_quartz', 2, [], 180, 60, 64, 'rose_quartz_dust_mixing') + generateMixerRecipe(event, ['gtceu:tiny_nether_quartz_dust', '8x gtceu:tiny_redstone_dust'], [], '#forge:dusts/rose_quartz', 2, [], 20, 60, 64, 'tiny_rose_quartz_dust_mixing') event.recipes.gtceu.autoclave("autoclave_dust_rose_quartz_ice") .itemInputs('#forge:dusts/rose_quartz') @@ -17,8 +17,8 @@ function registerTFGQuartzRecipes(event) { .EUt(120) event.recipes.gtceu.electrolyzer('electrolyze_rose_quartz_dust') - .itemInputs('9x gtceu:rose_quartz_dust') - .itemOutputs('1x gtceu:nether_quartz_dust', '8x minecraft:redstone') + .itemInputs('9x #forge:dusts/rose_quartz') + .itemOutputs('1x #forge:dusts/nether_quartz', '8x minecraft:redstone') .duration(7 * 20) .EUt(60) //#endregion diff --git a/kubejs/server_scripts/tfg/ores_and_materials/recipes.zirconium.js b/kubejs/server_scripts/tfg/ores_and_materials/recipes.zirconium.js index e1b8dc933..50666ac21 100644 --- a/kubejs/server_scripts/tfg/ores_and_materials/recipes.zirconium.js +++ b/kubejs/server_scripts/tfg/ores_and_materials/recipes.zirconium.js @@ -9,6 +9,7 @@ function registerTFGZirconiumRecipes(event) { .inputFluids('gtceu:chlorine 4000') .outputFluids('tfg:silicon_tetrachloride 1000') .duration(20 * 20) + .circuit(1) .EUt(GTValues.VA[GTValues.MV]) event.recipes.gtceu.chemical_reactor('tfg:silicon_tetrachloride_decomp') @@ -58,4 +59,4 @@ function registerTFGZirconiumRecipes(event) { .EUt(GTValues.VA[GTValues.HV]) // #endregion -} \ No newline at end of file +} diff --git a/kubejs/server_scripts/tfg/powergen/nuclear/recipes.nuclear.js b/kubejs/server_scripts/tfg/powergen/nuclear/recipes.nuclear.js index 5562aac3f..ce0b60834 100644 --- a/kubejs/server_scripts/tfg/powergen/nuclear/recipes.nuclear.js +++ b/kubejs/server_scripts/tfg/powergen/nuclear/recipes.nuclear.js @@ -432,7 +432,7 @@ function registerTFGNuclearRecipes(event) { //#endregion //#region Cooling Tower - /* + event.recipes.gtceu.assembler('tfg:ostrum_carbon_casing') .itemInputs('2x #forge:plates/ostrum', '2x #forge:plates/titanium_carbide', '#forge:dense_plates/hsla_steel', '#forge:frames/black_steel') .itemOutputs('2x tfg:casings/machine_casing_ostrum_carbon') @@ -440,6 +440,7 @@ function registerTFGNuclearRecipes(event) { .duration(20 * (2.5)) .EUt(GTValues.VH[GTValues.LV]) .addMaterialInfo(true) + /* event.recipes.gtceu.mixer('tfg:thermally_conductive_fluid') .itemInputs('7x #forge:dusts/gallium', '2x #forge:dusts/tin', '#forge:dusts/zinc') diff --git a/kubejs/server_scripts/tfg/powergen/nuclear/recipes.smr_additives.js b/kubejs/server_scripts/tfg/powergen/nuclear/recipes.smr_additives.js new file mode 100644 index 000000000..f525b0887 --- /dev/null +++ b/kubejs/server_scripts/tfg/powergen/nuclear/recipes.smr_additives.js @@ -0,0 +1,40 @@ +// priority: 0 + +function registerTFGSMRAdditives(event) { + + event.recipes.gtceu.chemical_reactor('tfg:ozone_synthesis') + .inputFluids(Fluid.of('gtceu:oxygen', 3000)) + .outputFluids(Fluid.of('tfg:ozone', 1000)) + .notConsumable('#tfg:components/uv_leds') + .duration(200) + .EUt(GTValues.VA[GTValues.EV]) + + event.recipes.gtceu.chemical_reactor('tfg:tin_chloride_combining') + .itemInputs('#forge:dusts/tin') + .inputFluids(Fluid.of('gtceu:chlorine', 2000)) + .itemOutputs('3x #forge:dusts/tin_chloride') + .duration(100) + .EUt(GTValues.VA[GTValues.MV]) + + event.recipes.gtceu.chemical_reactor('tfg:cyclohexanone_synthesis') + .inputFluids(Fluid.of('gtceu:phenol', 1000), Fluid.of('gtceu:hydrogen', 4000)) + .outputFluids(Fluid.of('tfg:cyclohexanone', 1000)) + .notConsumable('#forge:dusts/palladium') + .duration(120) + .EUt(GTValues.VA[GTValues.HV]) + + event.recipes.gtceu.chemical_reactor('tfg:cyclohexanone_add_oxime') + .itemInputs('#forge:dusts/tin') + .inputFluids(Fluid.of('tfg:cyclohexanone', 1000), Fluid.of('gtceu:ammonia', 1000), Fluid.of('gtceu:hydrogen_peroxide', 1000)) + .itemOutputs('19x #forge:dusts/cyclohexanone_oxime') + .outputFluids(Fluid.of('minecraft:water', 2000)) + .duration(200) + .EUt(GTValues.VA[GTValues.HV]) + + event.recipes.gtceu.chemical_reactor('tfg:cyclohexanone_peroxidation') + .inputFluids(Fluid.of('tfg:cyclohexanone', 1000), Fluid.of('gtceu:hydrogen_peroxide', 2000)) + .outputFluids(Fluid.of('tfg:cyclohex_diperoxide', 1000)) + .notConsumable('#forge:dusts/tin_chloride') + .duration(120) + .EUt(GTValues.VA[GTValues.IV]) +} diff --git a/kubejs/server_scripts/tfg/powergen/recipes.biodiesel.js b/kubejs/server_scripts/tfg/powergen/recipes.biodiesel.js index f9eab5cf2..861184069 100644 --- a/kubejs/server_scripts/tfg/powergen/recipes.biodiesel.js +++ b/kubejs/server_scripts/tfg/powergen/recipes.biodiesel.js @@ -5,7 +5,7 @@ function registerTFGBiodieselRecipes(event) { // Biofuels event.recipes.gtceu.chemical_reactor(`seed_oil_alcohol_biodiesel`) - .inputFluids("#tfc:alcohols 1000", Fluid.of('gtceu:seed_oil', 6000)) + .inputFluids("#tfg:alcohols 1000", Fluid.of('gtceu:seed_oil', 6000)) .itemInputs('#forge:tiny_dusts/sodium_hydroxide') .outputFluids(Fluid.of('gtceu:bio_diesel', 6000)) .duration(20 * 10) @@ -13,14 +13,14 @@ function registerTFGBiodieselRecipes(event) { // So you can craft Biodiesel without Chemical Reactor event.recipes.gtceu.mixer(`tfg:seed_oil_alcohol_biodiesel`) - .inputFluids("#tfc:alcohols 1000", Fluid.of('gtceu:seed_oil', 1000)) + .inputFluids("#tfg:alcohols 1000", Fluid.of('gtceu:seed_oil', 1000)) .itemInputs('#forge:tiny_dusts/sodium_hydroxide') .outputFluids(Fluid.of('gtceu:bio_diesel', 500)) .duration(20 * 10) .EUt(GTValues.VHA[GTValues.ULV]) event.recipes.gtceu.chemical_reactor(`olive_oil_alcohol_biodiesel`) - .inputFluids("#tfc:alcohols 1000", Fluid.of('tfc:olive_oil', 4000)) + .inputFluids("#tfg:alcohols 1000", Fluid.of('tfc:olive_oil', 4000)) .itemInputs('#forge:tiny_dusts/sodium_hydroxide') .outputFluids(Fluid.of('gtceu:bio_diesel', 6000)) .duration(20 * 10) @@ -28,14 +28,14 @@ function registerTFGBiodieselRecipes(event) { // So you can craft Biodiesel without Chemical Reactor event.recipes.gtceu.mixer(`tfg:olive_oil_alcohol_biodiesel`) - .inputFluids("#tfc:alcohols 1000", Fluid.of('tfc:olive_oil', 1000)) + .inputFluids("#tfg:alcohols 1000", Fluid.of('tfc:olive_oil', 1000)) .itemInputs('#forge:tiny_dusts/sodium_hydroxide') .outputFluids(Fluid.of('gtceu:bio_diesel', 500)) .duration(20 * 10) .EUt(GTValues.VHA[GTValues.ULV]) event.recipes.gtceu.chemical_reactor(`soybean_oil_alcohol_biodiesel`) - .inputFluids("#tfc:alcohols 1000", Fluid.of('firmalife:soybean_oil', 4000)) + .inputFluids("#tfg:alcohols 1000", Fluid.of('firmalife:soybean_oil', 4000)) .itemInputs('#forge:tiny_dusts/sodium_hydroxide') .outputFluids(Fluid.of('gtceu:bio_diesel', 6000)) .duration(20 * 10) @@ -43,21 +43,21 @@ function registerTFGBiodieselRecipes(event) { // So you can craft Biodiesel without Chemical Reactor event.recipes.gtceu.mixer(`tfg:soybean_oil_alcohol_biodiesel`) - .inputFluids("#tfc:alcohols 1000", Fluid.of('firmalife:soybean_oil', 1000)) + .inputFluids("#tfg:alcohols 1000", Fluid.of('firmalife:soybean_oil', 1000)) .itemInputs('#forge:tiny_dusts/sodium_hydroxide') .outputFluids(Fluid.of('gtceu:bio_diesel', 500)) .duration(20 * 10) .EUt(GTValues.VHA[GTValues.ULV]) event.recipes.gtceu.chemical_reactor(`fish_oil_alcohol_biodiesel`) - .inputFluids("#tfc:alcohols 1000", Fluid.of('gtceu:fish_oil', 6000)) + .inputFluids("#tfg:alcohols 1000", Fluid.of('gtceu:fish_oil', 6000)) .itemInputs('#forge:tiny_dusts/sodium_hydroxide') .outputFluids(Fluid.of('gtceu:bio_diesel', 6000)) .duration(20 * 10) .EUt(GTValues.VHA[GTValues.ULV]) event.recipes.gtceu.chemical_reactor(`tallow_alcohol_biodiesel`) - .inputFluids("#tfc:alcohols 1000", Fluid.of('tfc:tallow', 6000)) + .inputFluids("#tfg:alcohols 1000", Fluid.of('tfc:tallow', 6000)) .itemInputs('#forge:tiny_dusts/sodium_hydroxide') .outputFluids(Fluid.of('gtceu:bio_diesel', 6000)) .duration(20 * 10) @@ -66,7 +66,7 @@ function registerTFGBiodieselRecipes(event) { // So you can craft Biodiesel without Chemical Reactor event.recipes.gtceu.mixer(`tfg:fish_oil_alcohol_biodiesel`) - .inputFluids("#tfc:alcohols 1000", Fluid.of('gtceu:fish_oil', 1000)) + .inputFluids("#tfg:alcohols 1000", Fluid.of('gtceu:fish_oil', 1000)) .itemInputs('#forge:tiny_dusts/sodium_hydroxide') .outputFluids(Fluid.of('gtceu:bio_diesel', 500)) .duration(20 * 10) @@ -74,7 +74,7 @@ function registerTFGBiodieselRecipes(event) { event.recipes.gtceu.mixer(`tfg:tallow_alcohol_biodiesel`) - .inputFluids("#tfc:alcohols 1000", Fluid.of('tfc:tallow', 1000)) + .inputFluids("#tfg:alcohols 1000", Fluid.of('tfc:tallow', 1000)) .itemInputs('#forge:tiny_dusts/sodium_hydroxide') .outputFluids(Fluid.of('gtceu:bio_diesel', 500)) .duration(20 * 10) diff --git a/kubejs/server_scripts/tfg/powergen/recipes.boiler.js b/kubejs/server_scripts/tfg/powergen/recipes.boiler.js index 5b6bd9caa..8a042cb78 100644 --- a/kubejs/server_scripts/tfg/powergen/recipes.boiler.js +++ b/kubejs/server_scripts/tfg/powergen/recipes.boiler.js @@ -2,17 +2,63 @@ function registerTFGBoilerRecipes(event) { - // The 9x buff for large boiler recipes above does not apply to this for some reason, so it gets 3x duration for an effective 1/3 reduction instead + //Remove boiler recipes that are unlikely to be used and pollute the recipe tab (most everything excluding coke/charcoal) + event.remove({ id: /gtceu:....._boiler\/mcw.+/ }) + event.remove({ id: /gtceu:....._boiler\/.*button.*/ }) + event.remove({ id: /gtceu:....._boiler\/.*trapdoor.*/ }) + event.remove({ id: /gtceu:....._boiler\/.*banner.*/ }) + event.remove({ id: /gtceu:....._boiler\/.*wool.*/ }) + event.remove({ id: /gtceu:....._boiler\/.*fence.*/ }) + event.remove({ id: /gtceu:....._boiler\/.*treated.*/ }) + event.remove({ id: /gtceu:....._boiler\/.*cardboard.*/ }) + event.remove({ id: /gtceu:....._boiler\/.*pressure_plate.*/ }) + event.remove({ id: /gtceu:....._boiler\/.*carpet.*/ }) + event.remove({ id: /gtceu:....._boiler\/.*stairs.*/ }) + event.remove({ id: /gtceu:....._boiler\/.*sign.*/ }) + event.remove({ id: /gtceu:....._boiler\/.*door.*/ }) + event.remove({ id: /gtceu:....._boiler\/.*planks.*/ }) + event.remove({ id: /gtceu:....._boiler\/.*slab.*/ }) + event.remove({ id: /gtceu:....._boiler\/.*biomass.*/ }) + event.remove({ id: /gtceu:....._boiler\/.*bio_chaff.*/ }) + event.remove({ id: /gtceu:....._boiler\/.*chest.*/ }) + event.remove({ id: /gtceu:....._boiler\/.*bundle.*/ }) + event.remove({ id: /gtceu:....._boiler\/.*lectern.*/ }) + event.remove({ id: /gtceu:....._boiler\/.*cartography.*/}) + event.remove({ id: /gtceu:....._boiler\/.*ladder.*/ }) + event.remove({ id: /gtceu:....._boiler\/.*crossbow.*/ }) + event.remove({ id: /gtceu:....._boiler\/.*jukebox.*/ }) + event.remove({ id: /gtceu:....._boiler\/.*resin.*/ }) + event.remove({ id: /gtceu:....._boiler\/.*daylight_detector.*/ }) + event.remove({ id: /gtceu:....._boiler\/.*bow.*/ }) + event.remove({ id: /gtceu:....._boiler\/.*scaffolding.*/ }) + 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.forEachRecipe({ id: /gtceu:large_boiler\/(minecraft_ladder|gtceu_wood_frame)/ }, recipe => { - var newDuration = recipe.get("duration") - recipe.set("duration", newDuration*3) - }) + //Re-add some recipes to the boiler under tags + event.recipes.gtceu.steam_boiler('tfg:logs') + .itemInputs('#minecraft:logs') + .duration(300) + .dimension('minecraft:overworld') - event.forEachRecipe({ id: /gtceu:steam_boiler\/(minecraft_ladder|gtceu_wood_frame)/ }, recipe => { - var newDuration = recipe.get("duration") - recipe.set("duration", newDuration/3) - }) + event.recipes.gtceu.steam_boiler('tfg:saplings') + .itemInputs('#minecraft:saplings') + .duration(100) + .dimension('minecraft:overworld') + + event.recipes.gtceu.steam_boiler('tfg:planks') + .itemInputs('#minecraft:planks') + .duration(75) + .dimension('minecraft:overworld') // Small nerf to charcoal diff --git a/kubejs/server_scripts/tfg/powergen/recipes.early_gas.js b/kubejs/server_scripts/tfg/powergen/recipes.early_gas.js index 54e74632f..d960d60b3 100644 --- a/kubejs/server_scripts/tfg/powergen/recipes.early_gas.js +++ b/kubejs/server_scripts/tfg/powergen/recipes.early_gas.js @@ -8,37 +8,29 @@ function registerTFGEarlyGasRecipes(event) { //#region Syngas - event.custom({ - type: 'vintageimprovements:vacuumizing', - ingredients: [{ item: 'minecraft:charcoal' }, { fluid: 'gtceu:creosote', amount: 250 }], - results: [{ fluid: 'tfg:syngas', amount: 100 }], - heatRequirement: "heated", - processingTime: 4000 - }).id('tfg:vi/vacuumizing/syngas_from_charcoal') + event.recipes.vintageimprovements.vacuumizing(Fluid.of('tfg:syngas', 100), ['minecraft:charcoal', Fluid.of('gtceu:creosote', 250)]) + .secondaryFluidOutput(0) + .processingTime(4000) + .heated() + .id('tfg:vi/vacuumizing/syngas_from_charcoal') - event.custom({ - type: 'vintageimprovements:vacuumizing', - ingredients: [{ item: 'minecraft:coal' }, { fluid: 'gtceu:creosote', amount: 250 }], - results: [{ fluid: 'tfg:syngas', amount: 200 }], - heatRequirement: "heated", - processingTime: 4000 - }).id('tfg:vi/vacuumizing/syngas_from_coal') + event.recipes.vintageimprovements.vacuumizing(Fluid.of('tfg:syngas', 200), ['minecraft:coal', Fluid.of('gtceu:creosote', 250)]) + .secondaryFluidOutput(0) + .processingTime(4000) + .heated() + .id('tfg:vi/vacuumizing/syngas_from_coal') + + event.recipes.vintageimprovements.vacuumizing(Fluid.of('tfg:syngas', 400), ['gtceu:coke_gem', Fluid.of('gtceu:creosote', 250)]) + .secondaryFluidOutput(0) + .processingTime(4000) + .heated() + .id('tfg:vi/vacuumizing/syngas_from_coke') - event.custom({ - type: 'vintageimprovements:vacuumizing', - ingredients: [{ item: 'gtceu:coke_gem' }, { fluid: 'gtceu:creosote', amount: 250 }], - results: [{ fluid: 'tfg:syngas', amount: 400 }], - heatRequirement: "heated", - processingTime: 4000 - }).id('tfg:vi/vacuumizing/syngas_from_coke') - - event.custom({ - type: 'vintageimprovements:vacuumizing', - ingredients: [{ item: 'beneath:cursecoal' }, { fluid: 'gtceu:creosote', amount: 250 }], - results: [{ fluid: 'tfg:syngas', amount: 400 }], - heatRequirement: "heated", - processingTime: 4000 - }).id('tfg:vi/vacuumizing/syngas_from_anthracite') + event.recipes.vintageimprovements.vacuumizing(Fluid.of('tfg:syngas', 400), ['beneath:cursecoal', Fluid.of('gtceu:creosote', 250)]) + .secondaryFluidOutput(0) + .processingTime(4000) + .heated() + .id('tfg:vi/vacuumizing/syngas_from_anthracite') event.recipes.gtceu.brewery('tfg:syngas_from_charcoal') .itemInputs('minecraft:charcoal') @@ -78,7 +70,7 @@ function registerTFGEarlyGasRecipes(event) { .itemInputs(Item.of('minecraft:charcoal', 40)) .inputFluids(Fluid.of('gtceu:creosote', 4000)) .outputFluids(Fluid.of('gtceu:coal_tar', 500), Fluid.of('tfg:syngas', 4400), Fluid.of('tfg:raw_aromatic_mix', 4000)) - .duration(20*150) + .duration(20*64) .circuit(1) .EUt(GTValues.VHA[GTValues.MV]) @@ -89,7 +81,7 @@ function registerTFGEarlyGasRecipes(event) { .chancedFluidInput(Fluid.of('gtceu:hydrogen', 1), 1000, 0) .perTick(false) .outputFluids(Fluid.of('gtceu:coal_tar', 500), Fluid.of('tfg:syngas', 4400), Fluid.of('tfg:raw_aromatic_mix', 4000)) - .duration(20*50) + .duration(20*32) .circuit(2) .EUt(GTValues.VHA[GTValues.MV]) @@ -99,7 +91,7 @@ function registerTFGEarlyGasRecipes(event) { .itemInputs(Item.of('minecraft:coal', 10)) .inputFluids(Fluid.of('gtceu:creosote', 4000)) .outputFluids(Fluid.of('gtceu:coal_tar', 1000), Fluid.of('tfg:syngas', 6400), Fluid.of('tfg:raw_aromatic_mix', 4000)) - .duration(20*150) + .duration(20*64) .circuit(1) .EUt(GTValues.VHA[GTValues.MV]) @@ -110,7 +102,7 @@ function registerTFGEarlyGasRecipes(event) { .chancedFluidInput(Fluid.of('gtceu:hydrogen', 1), 1000, 0) .perTick(false) .outputFluids(Fluid.of('gtceu:coal_tar', 1000), Fluid.of('tfg:syngas', 6400), Fluid.of('tfg:raw_aromatic_mix', 4000)) - .duration(20*50) + .duration(20*32) .circuit(2) .EUt(GTValues.VHA[GTValues.MV]) @@ -120,7 +112,7 @@ function registerTFGEarlyGasRecipes(event) { .itemInputs(Item.of('gtceu:coke_gem', 8)) .inputFluids(Fluid.of('gtceu:creosote', 4000)) .outputFluids(Fluid.of('gtceu:coal_tar', 2000), Fluid.of('tfg:syngas', 12800), Fluid.of('tfg:raw_aromatic_mix', 4000)) - .duration(20*150) + .duration(20*64) .circuit(1) .EUt(GTValues.VHA[GTValues.MV]) @@ -131,7 +123,7 @@ function registerTFGEarlyGasRecipes(event) { .chancedFluidInput(Fluid.of('gtceu:hydrogen', 1), 1000, 0) .perTick(false) .outputFluids(Fluid.of('gtceu:coal_tar', 2000), Fluid.of('tfg:syngas', 12800), Fluid.of('tfg:raw_aromatic_mix', 4000)) - .duration(20*50) + .duration(20*32) .circuit(2) .EUt(GTValues.VHA[GTValues.MV]) @@ -141,7 +133,7 @@ function registerTFGEarlyGasRecipes(event) { .itemInputs(Item.of('beneath:cursecoal', 5)) .inputFluids(Fluid.of('gtceu:creosote', 4000)) .outputFluids(Fluid.of('gtceu:coal_tar', 2000), Fluid.of('tfg:syngas', 12800), Fluid.of('tfg:raw_aromatic_mix', 4000)) - .duration(20*150) + .duration(20*64) .circuit(1) .EUt(GTValues.VHA[GTValues.MV]) @@ -152,7 +144,7 @@ function registerTFGEarlyGasRecipes(event) { .chancedFluidInput(Fluid.of('gtceu:hydrogen', 1), 1000, 0) .perTick(false) .outputFluids(Fluid.of('gtceu:coal_tar', 2000), Fluid.of('tfg:syngas', 12800), Fluid.of('tfg:raw_aromatic_mix', 4000)) - .duration(20*50) + .duration(20*32) .circuit(2) .EUt(GTValues.VHA[GTValues.MV]) @@ -206,8 +198,6 @@ function registerTFGEarlyGasRecipes(event) { //#endregion - //#region Rebalance Fuel - // Increase Pyrolyse Oven duration event.forEachRecipe({ id: /gtceu:pyrolyse_oven\/(log_to_creosote|log_to_creosote_nitrogen)/ }, recipe => { @@ -220,7 +210,7 @@ function registerTFGEarlyGasRecipes(event) { recipe.set("duration", newDuration*2) }) - //#region New Power Generation + //#region Power Gen // Add Syngas @@ -236,10 +226,143 @@ function registerTFGEarlyGasRecipes(event) { .EUt(-(32)) .duration(20*0.6) + // BTX Fuel + + event.recipes.gtceu.gas_turbine('tfg:btx_fuel') // Gas Turbine + .inputFluids(Fluid.of('tfg:btx_fuel', 1)) + .EUt(-(32)) + .duration(20*2.6) + //#endregion // Process Syngas + event.recipes.gtceu.chemical_reactor('tfg:electrolyze_syngas') + .notConsumable(Item.of('gtceu:copper_dust', 1)) + .inputFluids(Fluid.of('tfg:syngas', 1000)) + .outputFluids(Fluid.of('gtceu:methanol', 4000), Fluid.of('minecraft:water', 2000)) + .duration(20*12) + .EUt(GTValues.VA[GTValues.MV]) + + //#region BTX Fuel + + // ZSM - 5 + + event.recipes.gtceu.chemical_reactor('tfg:sodium_silicate') + .itemInputs(Item.of('#forge:dusts/nether_quartz')) + .inputFluids(Fluid.of('tfc:lye', 1000)) + .outputFluids(Fluid.of('tfg:sodium_silicate', 1000)) + .duration(20*26) + .EUt(GTValues.VA[GTValues.LV]) + + event.recipes.gtceu.chemical_reactor('tfg:sodium_aluminum') + .itemInputs(Item.of('#forge:dusts/aluminium')) + .inputFluids(Fluid.of('tfc:lye', 1000)) + .itemOutputs(Item.of('#forge:dusts/sodium_aluminium', 1)) + .duration(20*26) + .EUt(GTValues.VA[GTValues.LV]) + + event.recipes.gtceu.chemical_reactor('tfg:tpaoh') + .itemInputs(Item.of('2x #forge:dusts/sodium')) + .inputFluids(Fluid.of('gtceu:ammonia', 1000), Fluid.of('gtceu:ethanol', 1000)) + .outputFluids(Fluid.of('tfg:tpaoh', 1000)) + .duration(20*8) + .EUt(GTValues.VA[GTValues.EV]) + + event.recipes.gtceu.chemical_reactor('tfg:zsm_5_gel') + .itemInputs(Item.of('#forge:dusts/sodium_aluminium')) + .inputFluids(Fluid.of('tfg:tpaoh', 12000)) + .inputFluids(Fluid.of('tfg:sodium_silicate', 5000)) + .outputFluids(Fluid.of('tfg:zsm5_gel', 1000)) + .duration(20*16) + .EUt(GTValues.VA[GTValues.HV]) + + event.recipes.gtceu.chemical_reactor('tfg:catalyser_zsm') + .itemInputs(Item.of('#forge:dusts/platinum'), Item.of('10x #forge:dusts/rhenium')) + .inputFluids(Fluid.of('gtceu:hydrogen', 1000)) + .inputFluids(Fluid.of('tfg:zsm5_gel', 1000)) + .itemOutputs(Item.of('tfg:catalyser_pt_re_zsm', 1)) + .duration(20*60) + .EUt(GTValues.VA[GTValues.HV]) + + // BTX + + event.recipes.gtceu.distillation_tower('tfg:methanol_distil_propylene') + .inputFluids(Fluid.of('gtceu:methanol', 6000)) + .outputFluids(Fluid.of('gtceu:hydrogen', 10000), Fluid.of('gtceu:oxygen', 6000), Fluid.of('gtceu:methane', 1000), Fluid.of('gtceu:ethylene', 1000), Fluid.of('gtceu:propene', 1000)) + .duration(20*30) + .EUt(GTValues.VA[GTValues.HV]) + + event.recipes.gtceu.cracker('tfg:crude_mixed_gas') + .itemInputs(Item.of('tfg:catalyser_pt_re_zsm')) + .inputFluids(Fluid.of('tfg:reformate_gas', 8000)) + .inputFluids(Fluid.of('gtceu:propene', 2000)) + .outputFluids(Fluid.of('tfg:crude_mixed_gas', 10000)) + .duration(20*240) + .EUt(GTValues.VA[GTValues.LV]) + + event.recipes.gtceu.large_chemical_reactor('tfg:btx_fuel') + .inputFluids(Fluid.of('tfg:crude_mixed_gas', 10000)) + .inputFluids(Fluid.of('gtceu:benzene', 20000)) + .inputFluids(Fluid.of('gtceu:toluene', 6000)) + .inputFluids(Fluid.of('gtceu:dimethylbenzene', 12000)) + .itemOutputs(Item.of('tfg:used_catalyser', 1)) + .outputFluids(Fluid.of('tfg:btx_fuel', 48000)) + .duration(20*6) + .EUt(GTValues.VA[GTValues.IV]) + + // Loop + + event.recipes.gtceu.macerator('tfg:catalyser_power') + .itemInputs(Item.of('tfg:used_catalyser', 1)) + .itemOutputs(Item.of('tfg:catalyser_powder_dust', 1), Item.of('gtceu:platinum_dust', 1)) + .duration(20*30) + .EUt(GTValues.VA[GTValues.ULV]) + + event.recipes.gtceu.chemical_reactor('tfg:clean_powder') + .itemInputs(Item.of('tfg:catalyser_powder_dust', 1)) + .inputFluids(Fluid.of('gtceu:hydrogen_peroxide', 2000)) + .itemOutputs(Item.of('tfg:clean_powder_dust', 1), Item.of('gtceu:sodium_dust', 1)) + .duration(20*14) + .EUt(GTValues.VA[GTValues.MV]) + + event.recipes.gtceu.coal_liquefaction_tower('tfg:leachate') + .itemInputs(Item.of('tfg:clean_powder_dust', 1)) + .inputFluids(Fluid.of('gtceu:diluted_hydrochloric_acid', 1000)) + .outputFluids(Fluid.of('tfg:leachate', 1000)) + .duration(20*45) + .EUt(GTValues.VA[GTValues.MV]) + + event.recipes.gtceu.centrifuge('tfg:metal_rich_solution') + .inputFluids(Fluid.of('tfg:leachate', 1000)) + .itemOutputs(Item.of('gtceu:nether_quartz_dust', 2), Item.of('gtceu:aluminium_dust', 1)) + .outputFluids(Fluid.of('tfg:metal_rich_solution', 1000)) + .duration(20*45) + .EUt(GTValues.VA[GTValues.HV]) + + event.recipes.gtceu.mixer('tfg:aciditic_waste') + .itemInputs(Item.of('gtceu:reinforced_epoxy_resin_plate', 1)) + .inputFluids(Fluid.of('tfg:metal_rich_solution', 200), Fluid.of('gtceu:glue', 200)) + .outputFluids(Fluid.of('tfg:aciditic_waste', 200)) + .itemOutputs(Item.of('tfg:loaded_resin', 2)) + .duration(20*15) + .EUt(GTValues.VA[GTValues.ULV]) + + event.recipes.gtceu.distillery('tfg:rhenium_dust') + .inputFluids(Fluid.of('gtceu:sulfuric_acid', 100)) + .itemInputs(Item.of('tfg:loaded_resin', 1)) + .itemOutputs(Item.of('gtceu:rhenium_dust', 1)) + .duration(20*8) + .EUt(GTValues.VA[GTValues.MV]) + + event.recipes.gtceu.electrolyzer('tfg:aciditic_waste_electrolyzing') + .inputFluids(Fluid.of('tfg:aciditic_waste', 1000)) + .outputFluids(Fluid.of('gtceu:ammonia', 500)) + .outputFluids(Fluid.of('gtceu:ethanol', 500)) + .duration(20*4) + .EUt(GTValues.VA[GTValues.HV]) + + } \ No newline at end of file diff --git a/kubejs/server_scripts/tfg/primitive/medicine/events.medicine.js b/kubejs/server_scripts/tfg/primitive/medicine/events.medicine.js index 115e3caf7..3d8231c38 100644 --- a/kubejs/server_scripts/tfg/primitive/medicine/events.medicine.js +++ b/kubejs/server_scripts/tfg/primitive/medicine/events.medicine.js @@ -14,38 +14,32 @@ const pill_event = [ pill_event.forEach(pill_event => { - ItemEvents.rightClicked(event => { + ItemEvents.foodEaten(event => { const { item, server, player, player: { x, y, z } } = event if (item.id !== `tfg:${pill_event}_pill`) return - item.count-- player.addItemCooldown(item, 100) - server.runCommandSilent(`effect give ${player.username} minecraft:${pill_event} 480 0 true`) server.runCommandSilent(`playsound minecraft:item.honey_bottle.drink player ${player.username} ${x} ${y} ${z} 10 1.5 1`) }); - ItemEvents.rightClicked(event => { + ItemEvents.foodEaten(event => { const { item, server, player, player: { x, y, z } } = event if (item.id !== `tfg:${pill_event}_tablet`) return - item.count-- player.addItemCooldown(item, 100) - server.runCommandSilent(`effect give ${player.username} minecraft:${pill_event} 1800 0 true`) server.runCommandSilent(`playsound minecraft:item.honey_bottle.drink player ${player.username} ${x} ${y} ${z} 10 1.5 1`) }); }); -ItemEvents.rightClicked(event => { +ItemEvents.foodEaten(event => { const { item, server, player, player: { x, y, z } } = event if (item.id !== `tfg:antipoison_pill`) return - item.count-- player.addItemCooldown(item, 50) event.player.removeEffect('minecraft:poison') server.runCommandSilent(`playsound minecraft:item.honey_bottle.drink player ${player.username} ${x} ${y} ${z} 10 1.5 1`) }); -ItemEvents.rightClicked(event => { +ItemEvents.foodEaten(event => { const { item, server, player, player: { x, y, z } } = event if (item.id !== `tfg:antipoison_tablet`) return - item.count-- player.addItemCooldown(item, 50) event.player.removeEffect('minecraft:poison') event.player.removeEffect('minecraft:wither') @@ -70,31 +64,24 @@ const salvo_event = [ ]; salvo_event.forEach(salvo_event => { - - ItemEvents.rightClicked(event => { + ItemEvents.foodEaten(event => { const { item, server, player, player: { x, y, z } } = event if (item.id !== `tfg:${salvo_event}_salvo`) return - item.count-- player.addItemCooldown(item, 100) - server.runCommandSilent(`effect give ${player.username} minecraft:${salvo_event} 480 0 true`) server.runCommandSilent(`playsound minecraft:item.glow_ink_sac.use player ${player.username} ${x} ${y} ${z} 10 2 1`) }); }); -ItemEvents.rightClicked(event => { +ItemEvents.foodEaten(event => { const { item, server, player, player: { x, y, z } } = event if (item.id !== `tfg:absorption_salvo`) return - item.count-- player.addItemCooldown(item, 200) - server.runCommandSilent(`effect give ${player.username} minecraft:absorption 480 4 true`) server.runCommandSilent(`playsound minecraft:item.glow_ink_sac.use player ${player.username} ${x} ${y} ${z} 10 2 1`) }); -ItemEvents.rightClicked(event => { +ItemEvents.foodEaten(event => { const { item, server, player, player: { x, y, z } } = event if (item.id !== `tfg:instant_health_salvo`) return - item.count-- player.addItemCooldown(item, 100) - server.runCommandSilent(`effect give ${player.username} minecraft:instant_health 1 1 true`) server.runCommandSilent(`playsound minecraft:item.glow_ink_sac.use player ${player.username} ${x} ${y} ${z} 10 2 1`) }); \ No newline at end of file diff --git a/kubejs/server_scripts/tfg/primitive/medicine/recipes.medicine.js b/kubejs/server_scripts/tfg/primitive/medicine/recipes.medicine.js index 306daecd4..59d431279 100644 --- a/kubejs/server_scripts/tfg/primitive/medicine/recipes.medicine.js +++ b/kubejs/server_scripts/tfg/primitive/medicine/recipes.medicine.js @@ -570,13 +570,4 @@ function registerTFGMedicineRecipes(event) { .EUt(GTValues.VA[GTValues.LV]) //#endregion - - //#region Paracetamol - - event.recipes.firmalife.mixing_bowl() - .ingredients(['tfg:regeneration_pill', 'tfg:weakness_pill', 'tfg:antipoison_pill', 'tfg:slowness_pill'], Fluid.of('tfc:vinegar', 250)) - .outputItem('4x gtceu:paracetamol_pill') - .id(`tfg:mixing_bowl/paracetamol`) - - //#endregion } \ No newline at end of file diff --git a/kubejs/server_scripts/tfg/primitive/medicine/tags.medicine.js b/kubejs/server_scripts/tfg/primitive/medicine/tags.medicine.js index edfe6bceb..ace86bfef 100644 --- a/kubejs/server_scripts/tfg/primitive/medicine/tags.medicine.js +++ b/kubejs/server_scripts/tfg/primitive/medicine/tags.medicine.js @@ -2,6 +2,33 @@ function registerTFGMedicineItemTags(event) { + event.add('tfg:medicine', 'tfg:antipoison_pill') + event.add('tfg:medicine', 'tfg:antipoison_tablet') + event.add('tfg:medicine', 'tfg:haste_pill') + event.add('tfg:medicine', 'tfg:haste_tablet') + event.add('tfg:medicine', 'tfg:night_vision_pill') + event.add('tfg:medicine', 'tfg:night_vision_tablet') + event.add('tfg:medicine', 'tfg:poison_pill') + event.add('tfg:medicine', 'tfg:poison_tablet') + event.add('tfg:medicine', 'tfg:regeneration_pill') + event.add('tfg:medicine', 'tfg:regeneration_tablet') + event.add('tfg:medicine', 'tfg:slowness_pill') + event.add('tfg:medicine', 'tfg:slowness_tablet') + event.add('tfg:medicine', 'tfg:speed_pill') + event.add('tfg:medicine', 'tfg:speed_tablet') + event.add('tfg:medicine', 'tfg:water_breathing_pill') + event.add('tfg:medicine', 'tfg:water_breathing_tablet') + event.add('tfg:medicine', 'tfg:weakness_pill') + event.add('tfg:medicine', 'tfg:weakness_tablet') + event.add('tfg:medicine', 'tfg:absorption_salvo') + event.add('tfg:medicine', 'tfg:fire_resistance_salvo') + event.add('tfg:medicine', 'tfg:invisibility_salvo') + event.add('tfg:medicine', 'tfg:luck_salvo') + event.add('tfg:medicine', 'tfg:resistance_salvo') + event.add('tfg:medicine', 'tfg:instant_health_salvo') + event.add('tfg:medicine', 'gtceu:paracetamol_pill') + event.add('tfg:medicine', 'gtceu:rad_away_pill') + event.add('tfg:antipoison_ingredients', 'tfc:plant/blood_lily') event.add('tfg:antipoison_ingredients', 'tfc:plant/pistia') event.add('tfg:antipoison_ingredients', 'tfc:powder/bismuthinite') @@ -46,6 +73,9 @@ function registerTFGMedicineItemTags(event) { event.add('tfg:night_vision_ingredients', 'tfg:sunflower_product') event.add('tfg:invisibility_ingredients', 'tfc:plant/calendula') + event.add('tfg:invisibility_ingredients', 'tfc:plant/snapdragon_pink') + + event.add('tfg:absorption_ingredients', 'tfc:plant/poppy') event.add('tfg:absorption_ingredients', 'beneath:burpflower') event.add('tfg:fire_resistance_ingredients', 'tfc:plant/cattail') @@ -59,9 +89,6 @@ function registerTFGMedicineItemTags(event) { event.add('tfg:instant_health_ingredients', 'tfc:plant/foxglove') event.add('tfg:instant_health_ingredients', 'tfc:plant/artists_conk') - event.add('tfg:absorption_ingredients', 'tfc:plant/poppy') - event.add('tfg:invisibility_ingredients', 'tfc:plant/snapdragon_pink') - event.add('tfg:luck_ingredients', 'tfc:plant/goldenrod') event.add('tfg:luck_ingredients', 'tfc:plant/heather') } \ No newline at end of file diff --git a/kubejs/server_scripts/tfg/primitive/recipes.clay.js b/kubejs/server_scripts/tfg/primitive/recipes.clay.js index 153455c8a..5660650cb 100644 --- a/kubejs/server_scripts/tfg/primitive/recipes.clay.js +++ b/kubejs/server_scripts/tfg/primitive/recipes.clay.js @@ -141,4 +141,15 @@ function registerTFGClayRecipes(event) { .category(GTRecipeCategories.MACERATOR_RECYCLING) .duration(20) .EUt(2) + + // Renewable clay + + event.remove({ id: 'gtceu:electrolyzer/decomposition_electrolyzing_clay' }) + + event.recipes.gtceu.rock_breaker("clay_duping") + .notConsumable('minecraft:clay') + .itemOutputs('minecraft:clay') + .adjacentFluids(["tfc:salt_water", "tfc:spring_water"]) + .duration(50) + .EUt(GTValues.VA[GTValues.LV]) } \ No newline at end of file diff --git a/kubejs/server_scripts/tfg/primitive/recipes.cloth.js b/kubejs/server_scripts/tfg/primitive/recipes.cloth.js index 284666095..624402e90 100644 --- a/kubejs/server_scripts/tfg/primitive/recipes.cloth.js +++ b/kubejs/server_scripts/tfg/primitive/recipes.cloth.js @@ -116,14 +116,14 @@ function registerTFGClothRecipes(event) { event.recipes.gtceu.packer('tfg:packer/flax_bundle') .itemInputs('9x tfg:flax_product') .itemOutputs('tfg:flax_bundle') - .duration('100') + .duration(100) .EUt(GTValues.VA[GTValues.ULV]) event.shapeless('1x tfg:bundled_scraped_flax', ['9x tfg:flax_waste']) event.recipes.gtceu.packer('tfg:packer/bundled_scraped_flax') .itemInputs('9x tfg:flax_waste') .itemOutputs('tfg:bundled_scraped_flax') - .duration('100') + .duration(100) .EUt(GTValues.VA[GTValues.ULV]) event.recipes.tfc.scraping( @@ -194,19 +194,13 @@ function registerTFGClothRecipes(event) { .duration(1800) .EUt(GTValues.VA[GTValues.LV]) - event.custom({ - type: 'vintageimprovements:centrifugation', - ingredients: [{ item: 'tfg:flax_product' }], - results: [{ item: 'tfg:flax_line', count: 2 }, { item: 'tfg:flax_tow' }, { item: 'tfc:groundcover/humus' }], - processingTime: 40 * 10 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER - }).id('tfg:vi_seperate_flax') - - event.custom({ - type: 'vintageimprovements:centrifugation', - ingredients: [{ item: 'tfg:flax_bundle' }], - results: [{ item: 'tfg:flax_line', count: 18 }, { item: 'tfg:flax_tow', count: 9 }, { item: 'tfc:groundcover/humus', count: 9 }], - processingTime: 360 * 90 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER - }).id('tfg:vi_seperate_flax_from_bundle') + event.recipes.vintageimprovements.centrifugation(['2x tfg:flax_line', 'tfg:flax_tow', 'tfc:groundcover/humus'], 'tfg:flax_product') + .processingTime(200 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER) + .id('tfg:vi_seperate_flax') + + event.recipes.vintageimprovements.centrifugation(['18x tfg:flax_line', '9x tfg:flax_tow', '9x tfc:groundcover/humus'], 'tfg:flax_bundle') + .processingTime(1500 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER) + .id('tfg:vi_seperate_flax_from_bundle') // #endregion @@ -218,12 +212,10 @@ function registerTFGClothRecipes(event) { ]).id('tfg:shapeless/linen_thread') ) - event.custom({ - type: 'vintageimprovements:coiling', - ingredients: [{ item: 'tfg:flax_line' }], - results: [{ item: 'tfg:linen_thread', count: 4 }], - processingTime: 2 * 10 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER - }).id('tfg:vi_spin_flax_line') + event.recipes.vintageimprovements.coiling('4x tfg:linen_thread', 'tfg:flax_line') + .processingTime(20 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER) + .springColor('F6E6B5') + .id('tfg:vi_spin_flax_line') event.recipes.gtceu.wiremill('tfg:spin_flax_line') .itemInputs('tfg:flax_line') @@ -260,4 +252,4 @@ function registerTFGClothRecipes(event) { .duration(100) .EUt(4) //#endregion -} \ No newline at end of file +} diff --git a/kubejs/server_scripts/minecraft/recipes.dyes.js b/kubejs/server_scripts/tfg/primitive/recipes.dyes.js similarity index 95% rename from kubejs/server_scripts/minecraft/recipes.dyes.js rename to kubejs/server_scripts/tfg/primitive/recipes.dyes.js index 0bc7e9350..a7f97bc90 100644 --- a/kubejs/server_scripts/minecraft/recipes.dyes.js +++ b/kubejs/server_scripts/tfg/primitive/recipes.dyes.js @@ -1,7 +1,7 @@ // priority: 0 "use strict"; -function registerMinecraftDyeRecipes(event) { +function registerTFGDyeRecipes(event) { global.MINECRAFT_DYE_NAMES.forEach(dye => { event.remove({ id: `minecraft:dye_${dye}_wool` }) @@ -9,8 +9,7 @@ function registerMinecraftDyeRecipes(event) { event.remove({ id: `minecraft:dye_${dye}_carpet` }) event.remove({ id: `minecraft:${dye}_bed` }) event.remove({ id: `minecraft:dye_${dye}_bed` }) - - //#region Выход: Ковры, Кровати + event.remove({ id: `tfc:crafting/vanilla/color/${dye}_concrete_powder` }) event.shapeless(`2x minecraft:${dye}_carpet`, [ '#tfc:saws', @@ -27,7 +26,10 @@ function registerMinecraftDyeRecipes(event) { .category(GTRecipeCategories.CHEM_DYES) } - //#endregion + event.recipes.tfc.barrel_instant() + .inputs(`minecraft:${dye}_concrete_powder`, TFC.fluidStackIngredient('minecraft:water', 100)) + .outputItem(`minecraft:${dye}_concrete`) + .id(`tfg:barrel/dye/${dye}_concrete`); }) // White diff --git a/kubejs/server_scripts/tfg/primitive/recipes.supports.js b/kubejs/server_scripts/tfg/primitive/recipes.supports.js index 741a821e9..90a296b6d 100644 --- a/kubejs/server_scripts/tfg/primitive/recipes.supports.js +++ b/kubejs/server_scripts/tfg/primitive/recipes.supports.js @@ -13,20 +13,20 @@ function registerTFGSupportRecipes(event) { .itemInputs('1x tfg:rebar_support') .duration(60) .EUt(GTValues.VA[GTValues.ULV]) - - event.recipes.gtceu.assembler('tfg:gtceu/assembler/reinforced_light_concrete_support') + + event.recipes.gtceu.assembler('tfg:gtceu/assembler/reinforced_light_concrete_support') .inputFluids(Fluid.of('gtceu:concrete', 96)) .itemOutputs('1x tfg:reinforced_light_concrete_support') .itemInputs('1x tfg:rebar_support') .duration(120) .EUt(GTValues.VA[GTValues.ULV]) - event.recipes.gtceu.macerator(`reinforced_light_concrete_support_to_dust`) - .itemInputs('tfg:reinforced_light_concrete_support') - .itemOutputs('gtceu:tiny_steel_dust') - .duration(150) - .EUt(2) - .category(GTRecipeCategories.MACERATOR_RECYCLING); + event.recipes.gtceu.macerator(`reinforced_light_concrete_support_to_dust`) + .itemInputs('tfg:reinforced_light_concrete_support') + .itemOutputs('gtceu:tiny_steel_dust') + .duration(150) + .EUt(2) + .category(GTRecipeCategories.MACERATOR_RECYCLING); event.recipes.gtceu.chemical_bath('tfg:gtceu/chemical_bath/reinforced_dark_concrete_support') .inputFluids(Fluid.of('tfc:black_dye', 10)) @@ -130,19 +130,19 @@ function registerTFGSupportRecipes(event) { // REDO w/ table and loop const EXO_STONE_SUPPORTS = [ - { loose: 'tfg:loose/deepslate', support: 'tfg:migmatite_support', material: 'deepslate' }, - { loose: 'beneath:blackstone_pebble', support: 'tfg:pyroxenite_support', material: 'blackstone', }, - { loose: 'tfg:loose/dripstone', support: 'tfg:travertine_support', material: 'dripstone' }, - { loose: 'tfg:loose/crackrack', support: 'tfg:keratophyre_support', material: 'netherrack'}, - { loose: 'tfg:loose/moon_stone', support: 'tfg:anorthosite_support', material: 'moon_stone' }, - { loose: 'tfg:loose/moon_deepslate', support: 'tfg:norite_support', material: 'moon_deepslate' }, - { loose: 'tfg:loose/mars_stone', support: 'tfg:argillite_support', material: 'mars_stone' }, - { loose: 'tfg:loose/venus_stone', support: 'tfg:trachyte_support', material: 'venus_stone', }, - { loose: 'tfg:loose/mercury_stone', support: 'tfg:komatiite_support', material: 'mercury_stone' }, - { loose: 'tfg:loose/glacio_stone', support: 'tfg:phonolite_support', material: 'glacio_stone' }, - { loose: 'tfg:loose/permafrost', support: 'tfg:permafrost_support', material: 'ice' }, - { loose: 'tfg:loose/red_granite', support: 'tfg:red_granite_support', material: 'granite_red' }, - { loose: 'gtceu:stone_ingot', support: 'tfg:stone_support', material: 'stone' } + { loose: 'tfg:loose/deepslate', support: 'tfg:migmatite_support', material: 'deepslate' }, + { loose: 'beneath:blackstone_pebble', support: 'tfg:pyroxenite_support', material: 'blackstone', }, + { loose: 'tfg:loose/dripstone', support: 'tfg:travertine_support', material: 'dripstone' }, + { loose: 'tfg:loose/crackrack', support: 'tfg:keratophyre_support', material: 'netherrack' }, + { loose: 'tfg:loose/moon_stone', support: 'tfg:anorthosite_support', material: 'moon_stone' }, + { loose: 'tfg:loose/moon_deepslate', support: 'tfg:norite_support', material: 'moon_deepslate' }, + { loose: 'tfg:loose/mars_stone', support: 'tfg:argillite_support', material: 'mars_stone' }, + { loose: 'tfg:loose/venus_stone', support: 'tfg:trachyte_support', material: 'venus_stone', }, + { loose: 'tfg:loose/mercury_stone', support: 'tfg:komatiite_support', material: 'mercury_stone' }, + { loose: 'tfg:loose/glacio_stone', support: 'tfg:phonolite_support', material: 'glacio_stone' }, + { loose: 'tfg:loose/permafrost', support: 'tfg:permafrost_support', material: 'ice' }, + { loose: 'tfg:loose/red_granite', support: 'tfg:red_granite_support', material: 'granite_red' }, + { loose: 'gtceu:stone_ingot', support: 'tfg:stone_support', material: 'stone' } ] EXO_STONE_SUPPORTS.forEach(s => { @@ -166,7 +166,6 @@ function registerTFGSupportRecipes(event) { .duration(40) .EUt(GTValues.VA[GTValues.ULV]) - console.log(s.material); let regexMatch = s.support.match(/tfg:(.*?)_support/); let supportName = regexMatch[1]; let stoneMaterial = TFGHelpers.getMaterial(s.material); diff --git a/kubejs/server_scripts/tfg/primitive/recipes.wood.js b/kubejs/server_scripts/tfg/primitive/recipes.wood.js index 23367a412..79017f62a 100644 --- a/kubejs/server_scripts/tfg/primitive/recipes.wood.js +++ b/kubejs/server_scripts/tfg/primitive/recipes.wood.js @@ -217,20 +217,14 @@ function registerTFGWoodRecipes(event) { .duration(50) .EUt(2) - event.custom({ - type: 'vintageimprovements:polishing', - ingredients: [{ item: `tfc:wood/log/${wood}` }], - results: [{ item: `tfc:wood/stripped_log/${wood}` }], - speed_limits: 0, - processingTime: 50 - }).id(`tfg:vi/lathe/stripping_${wood}_log`) + event.recipes.vintageimprovements.polishing(`tfc:wood/stripped_log/${wood}`, `tfc:wood/log/${wood}`) + .speedLimits(0) + .processingTime(50 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER) + .id(`tfg:vi/lathe/stripping_${wood}_log`) - event.custom({ - type: 'vintageimprovements:polishing', - ingredients: [{ item: `tfc:wood/wood/${wood}` }], - results: [{ item: `tfc:wood/stripped_wood/${wood}` }], - speed_limits: 0, - processingTime: 50 - }).id(`tfg:vi/lathe/stripping_${wood}_wood`) + event.recipes.vintageimprovements.polishing(`tfc:wood/stripped_wood/${wood}`, `tfc:wood/wood/${wood}`) + .speedLimits(0) + .processingTime(50 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER) + .id(`tfg:vi/lathe/stripping_${wood}_wood`) }) } \ No newline at end of file diff --git a/kubejs/server_scripts/tfg/recipes.js b/kubejs/server_scripts/tfg/recipes.js index 4424c0a17..f6d91db2c 100644 --- a/kubejs/server_scripts/tfg/recipes.js +++ b/kubejs/server_scripts/tfg/recipes.js @@ -44,6 +44,7 @@ const registerTFGRecipes = (event) => { registerTFGLeatherRecipes(event) registerTFGClayRecipes(event) registerTFGEquipmentRecipes(event) + registerTFGDyeRecipes(event) registerTFGCasingRecipes(event) registerTFGEnderPearlRecipes(event) @@ -55,6 +56,7 @@ const registerTFGRecipes = (event) => { registerTFGBoilerRecipes(event) registerTFGBiodieselRecipes(event) registerTFGNuclearRecipes(event) + registerTFGSMRAdditives(event) registerTFGNuclearComponentsRecipes(event) registerTFGSolarRecipes(event) registerTFGCoalRecipes(event) diff --git a/kubejs/server_scripts/tfg/recipes.miscellaneous.js b/kubejs/server_scripts/tfg/recipes.miscellaneous.js index 65cb9248a..3499e2494 100644 --- a/kubejs/server_scripts/tfg/recipes.miscellaneous.js +++ b/kubejs/server_scripts/tfg/recipes.miscellaneous.js @@ -99,7 +99,7 @@ function registerTFGMiscellaneousRecipes(event) { // Replace bronze drums & crates with a tag containing the 3 different bronzes // NOTE: A better way to do this would be to overwrite GTCraftingComponents.CRATE and GTCraftingComponents.DRUM in crafting_components.js, but tags seem to get populated after the recipes get registed, so... event.replaceInput({ input: 'gtceu:bronze_crate' }, 'gtceu:bronze_crate', '#tfg:any_bronze_crate') - event.replaceInput({ input: 'gtceu:bronze_drum' }, 'gtceu:bronze_drum', '#tfg:any_bronze_drum') + event.replaceInput({ input: 'gtceu:bronze_drum' , not: { id: 'gtceu:shapeless/drum_nbt_bronze' }}, 'gtceu:bronze_drum', '#tfg:any_bronze_drum') //#region RNR Paving Cart const rubber_types = [ diff --git a/kubejs/server_scripts/tfg/recipes.temporary.js b/kubejs/server_scripts/tfg/recipes.temporary.js index f92d746de..349d3e852 100644 --- a/kubejs/server_scripts/tfg/recipes.temporary.js +++ b/kubejs/server_scripts/tfg/recipes.temporary.js @@ -10,6 +10,24 @@ function registerTFGTemporaryRecipes(event) { event.shapeless('tfg:ostrum_linear_accelerator', 'gtceu:ostrum_linear_accelerator') + event.shapeless('greate:rose_quartz_dust', 'gtceu:rose_quartz_dust') + event.shapeless('greate:tiny_rose_quartz_dust', 'gtceu:tiny_rose_quartz_dust') + event.shapeless('greate:small_rose_quartz_dust', 'gtceu:small_rose_quartz_dust') + event.shapeless('greate:poor_raw_rose_quartz', 'gtceu:poor_raw_rose_quartz') + event.shapeless('greate:raw_rose_quartz', 'gtceu:raw_rose_quartz') + event.shapeless('greate:rich_raw_rose_quartz', 'gtceu:rich_raw_rose_quartz') + event.shapeless('greate:chipped_rose_quartz_gem', 'gtceu:chipped_rose_quartz_gem') + event.shapeless('greate:flawed_rose_quartz_gem', 'gtceu:flawed_rose_quartz_gem') + event.shapeless('greate:flawless_rose_quartz_gem', 'gtceu:flawless_rose_quartz_gem') + event.shapeless('greate:exquisite_rose_quartz_gem', 'gtceu:exquisite_rose_quartz_gem') + event.shapeless('greate:pure_rose_quartz_dust', 'gtceu:pure_rose_quartz_dust') + event.shapeless('greate:impure_rose_quartz_dust', 'gtceu:impure_rose_quartz_dust') + event.shapeless('greate:purified_rose_quartz_ore', 'gtceu:purified_rose_quartz_ore') + event.shapeless('greate:crushed_rose_quartz_ore', 'gtceu:crushed_rose_quartz_ore') + event.shapeless('greate:refined_rose_quartz_ore', 'gtceu:refined_rose_quartz_ore') + event.shapeless('greate:rose_quartz_lens', 'gtceu:rose_quartz_lens') + event.shapeless('greate:rose_quartz_plate', 'gtceu:rose_quartz_plate') + // TODO: remove nether/ender air in 0.12 diff --git a/kubejs/server_scripts/tfg/tags.js b/kubejs/server_scripts/tfg/tags.js index 0362ce7d9..e9344dd39 100644 --- a/kubejs/server_scripts/tfg/tags.js +++ b/kubejs/server_scripts/tfg/tags.js @@ -123,6 +123,7 @@ const registerTFGBlockTags = (event) => { event.add('forge:mineable/wrench', 'tfg:electromagnetic_accelerator') event.add('forge:mineable/wrench', 'tfg:reflector') event.add('forge:mineable/wrench', 'tfg:machine_casing_aluminium_plated_steel') + event.add('forge:mineable/wrench', 'tfg:machine_casing_power_casing') event.add('minecraft:mineable/pickaxe', 'tfg:mars_ice') event.add('minecraft:mineable/pickaxe', 'tfg:dry_ice') diff --git a/kubejs/server_scripts/tfg/worldgen/tags.overworld.js b/kubejs/server_scripts/tfg/worldgen/tags.overworld.js index 7bd81d8d9..594d832ca 100644 --- a/kubejs/server_scripts/tfg/worldgen/tags.overworld.js +++ b/kubejs/server_scripts/tfg/worldgen/tags.overworld.js @@ -22,6 +22,33 @@ function registerTFGOverworldBiomeTags(event) { event.add('tfg:has_structure/illages', 'tfc:plateau') event.add('tfg:has_structure/illages', 'tfc:old_mountains') + event.add('tfg:has_structure/illager_camp', 'tfc:badlands') + event.add('tfg:has_structure/illager_camp', 'tfc:canyons') + event.add('tfg:has_structure/illager_camp', 'tfc:highlands') + event.add('tfg:has_structure/illager_camp', 'tfc:hills') + event.add('tfg:has_structure/illager_camp', 'tfc:inverted_badlands') + event.add('tfg:has_structure/illager_camp', 'tfc:low_canyons') + event.add('tfg:has_structure/illager_camp', 'tfc:lowlands') + event.add('tfg:has_structure/illager_camp', 'tfc:mountains') + event.add('tfg:has_structure/illager_camp', 'tfc:oceanic_mountains') + event.add('tfg:has_structure/illager_camp', 'tfc:old_mountains') + event.add('tfg:has_structure/illager_camp', 'tfc:plains') + event.add('tfg:has_structure/illager_camp', 'tfc:plateau') + event.add('tfg:has_structure/illager_camp', 'tfc:rolling_hills') + event.add('tfg:has_structure/illager_camp', 'tfc:salt_marsh') + event.add('tfg:has_structure/illager_camp', 'tfc:shore') + event.add('tfg:has_structure/illager_camp', 'tfc:tidal_flats') + event.add('tfg:has_structure/illager_camp', 'tfc:volcanic_mountains') + event.add('tfg:has_structure/illager_camp', 'tfc:volcanic_oceanic_mountains') + + event.add('tfg:has_structure/illager_roaming', 'tfc:highlands') + event.add('tfg:has_structure/illager_roaming', 'tfc:hills') + event.add('tfg:has_structure/illager_roaming', 'tfc:lowlands') + event.add('tfg:has_structure/illager_roaming', 'tfc:plains') + event.add('tfg:has_structure/illager_roaming', 'tfc:plateau') + event.add('tfg:has_structure/illager_roaming', 'tfc:rolling_hills') + event.add('tfg:has_structure/illager_roaming', 'tfc:salt_marsh') + event.add('tfg:never_has_structure/illages', '#tfc:is_lake') event.add('tfg:never_has_structure/illages', '#tfc:is_ocean') event.add('tfg:never_has_structure/illages', '#tfc:is_river') diff --git a/kubejs/server_scripts/vintage_improvements/recipes.js b/kubejs/server_scripts/vintage_improvements/recipes.js index d2099231b..516b529bc 100644 --- a/kubejs/server_scripts/vintage_improvements/recipes.js +++ b/kubejs/server_scripts/vintage_improvements/recipes.js @@ -258,9 +258,9 @@ function registerVintageImprovementsRecipes(event) { }) // #endregion - + const $GreateMaterials = Java.loadClass("electrolyte.greate.registry.GreateMaterials") forEachMaterial(material => { - if (material == GTMaterials.get("andesite_alloy")) + if (material == $GreateMaterials.AndesiteAlloy) return; const ingotItem = ChemicalHelper.get(TagPrefix.ingot, material, 1); @@ -277,48 +277,46 @@ function registerVintageImprovementsRecipes(event) { // #region Coiling if (material.hasFlag(MaterialFlags.GENERATE_ROD) && material.hasFlag(MaterialFlags.GENERATE_SPRING_SMALL)) { - event.custom({ - type: 'vintageimprovements:coiling', - ingredients: [ChemicalHelper.get(TagPrefix.rod, material, 1)], - results: [ChemicalHelper.get(TagPrefix.springSmall, material, 2)], - processingTime: (material.getMass() / 2) * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER - }).id(`tfg:vi/coiling/${material.getName()}_small_spring`) + event.recipes.vintageimprovements.coiling( + ChemicalHelper.get(TagPrefix.springSmall, material, 2), + ChemicalHelper.get(TagPrefix.rod, material, 1)) + .processingTime((material.getMass() / 2) * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER) + .id(`tfg:vi/coiling/${material.getName()}_small_spring`) + .springColor(material.getMaterialRGB().toString(16)) } if (material.hasFlag(MaterialFlags.GENERATE_LONG_ROD) && material.hasFlag(MaterialFlags.GENERATE_SPRING)) { - event.custom({ - type: 'vintageimprovements:coiling', - ingredients: [ChemicalHelper.get(TagPrefix.rodLong, material, 1)], - results: [ChemicalHelper.get(TagPrefix.spring, material, 1)], - processingTime: material.getMass() * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER - }).id(`tfg:vi/coiling/${material.getName()}_spring`) + event.recipes.vintageimprovements.coiling( + ChemicalHelper.get(TagPrefix.spring, material, 1), + ChemicalHelper.get(TagPrefix.rodLong, material, 1)) + .processingTime(material.getMass() * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER) + .id(`tfg:vi/coiling/${material.getName()}_spring`) + .springColor(material.getMaterialRGB().toString(16)) } const singleWire = ChemicalHelper.get(TagPrefix.wireGtSingle, material, 2) if (singleWire !== null) { - event.custom({ - type: 'vintageimprovements:coiling', - ingredients: [ChemicalHelper.get(TagPrefix.ingot, material, 1)], - results: [singleWire], - processingTime: material.getMass() * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER - }).id(`tfg:vi/coiling/${material.getName()}_single_wire`) + event.recipes.vintageimprovements.coiling(singleWire, ChemicalHelper.get(TagPrefix.ingot, material, 1)) + .processingTime(material.getMass() * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER) + .id(`tfg:vi/coiling/${material.getName()}_single_wire`) + .springColor(material.getMaterialRGB().toString(16)) } if (material.hasFlag(MaterialFlags.GENERATE_FINE_WIRE)) { if (singleWire !== null) { - event.custom({ - type: 'vintageimprovements:coiling', - ingredients: [ChemicalHelper.get(TagPrefix.wireGtSingle, material, 1)], - results: [ChemicalHelper.get(TagPrefix.wireFine, material, 4)], - processingTime: material.getMass() * 3 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER - }).id(`tfg:vi/coiling/${material.getName()}_fine_wire`) + event.recipes.vintageimprovements.coiling( + ChemicalHelper.get(TagPrefix.wireFine, material, 4), + ChemicalHelper.get(TagPrefix.wireGtSingle, material, 1)) + .processingTime(material.getMass() * 3 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER) + .id(`tfg:vi/coiling/${material.getName()}_fine_wire`) + .springColor(material.getMaterialRGB().toString(16)) } else { - event.custom({ - type: 'vintageimprovements:coiling', - ingredients: [ChemicalHelper.get(TagPrefix.ingot, material, 1)], - results: [ChemicalHelper.get(TagPrefix.wireFine, material, 8)], - processingTime: material.getMass() * 3 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER - }).id(`tfg:vi/coiling/${material.getName()}_fine_wire`) + event.recipes.vintageimprovements.coiling( + ChemicalHelper.get(TagPrefix.wireFine, material, 8), + ChemicalHelper.get(TagPrefix.ingot, material, 1)) + .processingTime(material.getMass() * 3 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER) + .id(`tfg:vi/coiling/${material.getName()}_fine_wire`) + .springColor(material.getMaterialRGB().toString(16)) } } @@ -330,38 +328,18 @@ function registerVintageImprovementsRecipes(event) { let highYield = material.hasFlag(MaterialFlags.HIGH_SIFTER_OUTPUT) - // aaaaargh I hate these custom type recipes - let gem = `gtceu:${material.getName()}_gem`; - if (material === GTMaterials.Coal) - gem = 'minecraft:coal' - else if (material === GTMaterials.Diamond) - gem = 'minecraft:diamond' - else if (material === GTMaterials.Emerald) - gem = 'minecraft:emerald' - else if (material === GTMaterials.Lapis) - gem = 'minecraft:lapis_lazuli' - else if (material === GTMaterials.NetherQuartz) - gem = 'minecraft:quartz' - else if (material === GTMaterials.Amethyst) - gem = 'minecraft:amethyst_shard' - else if (material === GTMaterials.CertusQuartz) - gem = 'ae2:certus_quartz_crystal' - else if (material === TFGHelpers.getMaterial('rose_quartz')) - gem = 'create:rose_quartz' - - event.custom({ - type: 'vintageimprovements:vibrating', - ingredients: [{ item: `gtceu:purified_${material.getName()}_ore` }], - results: [ - { item: `gtceu:exquisite_${material.getName()}_gem`, chance: highYield ? 0.05 : 0.03 }, - { item: `gtceu:flawless_${material.getName()}_gem`, chance: highYield ? 0.15 : 0.10 }, - { item: gem, chance: highYield ? 0.50 : 0.35 }, - { item: `gtceu:pure_${material.getName()}_dust`, chance: highYield ? 0.25 : 0.50 }, - { item: `gtceu:flawed_${material.getName()}_gem`, chance: highYield ? 0.20 : 0.25 }, - { item: `gtceu:chipped_${material.getName()}_gem`, chance: highYield ? 0.30 : 0.35 } - ], - processingTime: 200 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER - }).id(`tfg:vi/vibrating/${material.getName()}`) + event.recipes.vintageimprovements.vibrating( + [ + Item.of(ChemicalHelper.get(TagPrefix.gemExquisite, material, 1)).withChance(highYield ? 0.05 : 0.03), + Item.of(ChemicalHelper.get(TagPrefix.gemFlawless, material, 1)).withChance(highYield ? 0.15 : 0.10), + Item.of(ChemicalHelper.get(TagPrefix.gem, material, 1)).withChance(highYield ? 0.50 : 0.35), + Item.of(ChemicalHelper.get(TagPrefix.dustPure, material, 1)).withChance(highYield ? 0.25 : 0.50), + Item.of(ChemicalHelper.get(TagPrefix.gemFlawed, material, 1)).withChance(highYield ? 0.20 : 0.25), + Item.of(ChemicalHelper.get(TagPrefix.gemChipped, material, 1)).withChance(highYield ? 0.30 : 0.35) + ], + ChemicalHelper.get(TagPrefix.crushedPurified, material, 1)) + .processingTime(200 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER) + .id(`tfg:vi/vibrating/${material.getName()}`) } // #endregion @@ -375,13 +353,10 @@ function registerVintageImprovementsRecipes(event) { : ChemicalHelper.get(TagPrefix.ingot, material, 1) if (latheInput !== null) { - event.custom({ - type: 'vintageimprovements:polishing', - ingredients: [latheInput], - results: [ChemicalHelper.get(TagPrefix.rod, material, 2)], - speed_limits: 3, - processingTime: material.getMass() * 4 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER - }).id(`tfg:vi/lathe/${material.getName()}_to_rod`) + event.recipes.vintageimprovements.polishing(ChemicalHelper.get(TagPrefix.rod, material, 2), latheInput) + .speedLimits(3) + .processingTime(material.getMass() * 4 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER) + .id(`tfg:vi/lathe/${material.getName()}_to_rod`) } if (material.hasProperty(PropertyKey.GEM)) { @@ -391,13 +366,12 @@ function registerVintageImprovementsRecipes(event) { } if (material.hasFlag(MaterialFlags.GENERATE_BOLT_SCREW)) { - event.custom({ - type: 'vintageimprovements:polishing', - ingredients: [ChemicalHelper.get(TagPrefix.bolt, material, 1)], - results: [ChemicalHelper.get(TagPrefix.screw, material, 1)], - speed_limits: 2, - processingTime: Math.max(1, material.getMass() / 8) * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER - }).id(`tfg:vi/lathe/${material.getName()}_bolt_to_screw`) + event.recipes.vintageimprovements.polishing( + ChemicalHelper.get(TagPrefix.screw, material, 1), + ChemicalHelper.get(TagPrefix.bolt, material, 1)) + .speedLimits(2) + .processingTime(Math.max(1, material.getMass() / 8) * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER) + .id(`tfg:vi/lathe/${material.getName()}_bolt_to_screw`) } // #endregion @@ -406,109 +380,81 @@ function registerVintageImprovementsRecipes(event) { // #region Vibrating - event.custom({ - type: 'vintageimprovements:vibrating', - ingredients: [{ tag: 'tfc:rock/gravel' }], - results: [ - { item: 'minecraft:flint' }, - { item: 'minecraft:flint', chance: 0.9 }, - { item: 'minecraft:flint', chance: 0.8 }, - { item: 'minecraft:flint', chance: 0.6 }, - { item: 'minecraft:flint', chance: 0.33 }, - { item: 'minecraft:flint', chance: 0.25 } - ], - processingTime: 100 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER - }).id(`tfg:vi/vibrating/gravel`) + event.recipes.vintageimprovements.vibrating([ + Item.of('minecraft:flint'), + Item.of('minecraft:flint').withChance(0.9), + Item.of('minecraft:flint').withChance(0.8), + Item.of('minecraft:flint').withChance(0.6), + Item.of('minecraft:flint').withChance(0.33), + Item.of('minecraft:flint').withChance(0.25) + ], '#tfc:rock/gravel') + .processingTime(100 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER) + .id(`tfg:vi/vibrating/gravel`) global.TFC_STONE_TYPES.forEach(stone => { - event.custom({ - type: 'vintageimprovements:vibrating', - ingredients: [{ item: `tfc:deposit/native_gold/${stone}` }], - results: [ChemicalHelper.get(TagPrefix.rawOre, GTMaterials.Gold, 1)], - processingTime: 100 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER - }).id(`tfg:vi/vibrating/deposits/${stone}_gold`) + event.recipes.vintageimprovements.vibrating( + ChemicalHelper.get(TagPrefix.rawOre, GTMaterials.Gold, 1), + `tfc:deposit/native_gold/${stone}`) + .processingTime(100 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER) + .id(`tfg:vi/vibrating/deposits/${stone}_gold`) - event.custom({ - type: 'vintageimprovements:vibrating', - ingredients: [{ item: `tfc:deposit/native_copper/${stone}` }], - results: [ChemicalHelper.get(TagPrefix.rawOre, GTMaterials.Copper, 1)], - processingTime: 100 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER - }).id(`tfg:vi/vibrating/deposits/${stone}_copper`) + event.recipes.vintageimprovements.vibrating( + ChemicalHelper.get(TagPrefix.rawOre, GTMaterials.Copper, 1), + `tfc:deposit/native_copper/${stone}`) + .processingTime(100 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER) + .id(`tfg:vi/vibrating/deposits/${stone}_copper`) - event.custom({ - type: 'vintageimprovements:vibrating', - ingredients: [{ item: `tfc:deposit/native_silver/${stone}` }], - results: [ChemicalHelper.get(TagPrefix.rawOre, GTMaterials.Silver, 1)], - processingTime: 100 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER - }).id(`tfg:vi/vibrating/deposits/${stone}_silver`) + event.recipes.vintageimprovements.vibrating( + ChemicalHelper.get(TagPrefix.rawOre, GTMaterials.Silver, 1), + `tfc:deposit/native_silver/${stone}`) + .processingTime(100 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER) + .id(`tfg:vi/vibrating/deposits/${stone}_silver`) - event.custom({ - type: 'vintageimprovements:vibrating', - ingredients: [{ item: `tfc:deposit/cassiterite/${stone}` }], - results: [ChemicalHelper.get(TagPrefix.rawOre, GTMaterials.Cassiterite, 1)], - processingTime: 100 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER - }).id(`tfg:vi/vibrating/deposits/${stone}_cassiterite`) + event.recipes.vintageimprovements.vibrating( + ChemicalHelper.get(TagPrefix.rawOre, GTMaterials.Cassiterite, 1), + `tfc:deposit/cassiterite/${stone}`) + .processingTime(100 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER) + .id(`tfg:vi/vibrating/deposits/${stone}_cassiterite`) }) // #endregion // #region Lathe - event.custom({ - type: 'vintageimprovements:polishing', - ingredients: [{ tag: 'forge:glass' }], - results: [{ item: 'tfc:lens' }], - speed_limits: 1, - processingTime: 100 - }).id(`tfg:vi/lathe/lens`) + event.recipes.vintageimprovements.polishing('tfc:lens', '#forge:glass') + .speedLimits(1) + .processingTime(100 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER) + .id(`tfg:vi/lathe/lens`) - event.custom({ - type: 'vintageimprovements:polishing', - ingredients: [{ tag: 'forge:exquisite_gems/rose_quartz' }], - results: [{ item: 'gtceu:rose_quartz_lens' }, { item: 'gtceu:rose_quartz_dust', count: 2 }], - speed_limits: 1, - processingTime: 100 - }).id(`tfg:vi/lathe/rose_quartz_lens`) + event.recipes.vintageimprovements.polishing(['#forge:lenses/rose_quartz', '2x #forge:dusts/rose_quartz'], '#forge:exquisite_gems/rose_quartz') + .speedLimits(1) + .processingTime(100 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER) + .id(`tfg:vi/lathe/rose_quartz_lens`) - event.custom({ - type: 'vintageimprovements:polishing', - ingredients: [{ tag: 'forge:exquisite_gems/diamond' }], - results: [{ item: 'gtceu:diamond_lens' }, { item: 'gtceu:diamond_dust', count: 2 }], - speed_limits: 1, - processingTime: 100 - }).id(`tfg:vi/lathe/diamond_lens`) + event.recipes.vintageimprovements.polishing(['#forge:lenses/diamond', '2x #forge:dusts/diamond'], '#forge:exquisite_gems/diamond') + .speedLimits(1) + .processingTime(100 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER) + .id(`tfg:vi/lathe/diamond_lens`) - event.custom({ - type: 'vintageimprovements:polishing', - ingredients: [{ tag: 'forge:exquisite_gems/emerald' }], - results: [{ item: 'gtceu:emerald_lens' }, { item: 'gtceu:emerald_dust', count: 2 }], - speed_limits: 1, - processingTime: 100 - }).id(`tfg:vi/lathe/emerald_lens`) + event.recipes.vintageimprovements.polishing(['#forge:lenses/emerald', '2x #forge:dusts/emerald'], '#forge:exquisite_gems/emerald') + .speedLimits(1) + .processingTime(100 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER) + .id(`tfg:vi/lathe/emerald_lens`) - event.custom({ - type: 'vintageimprovements:polishing', - ingredients: [{ tag: 'forge:exquisite_gems/ruby' }], - results: [{ item: 'gtceu:ruby_lens' }, { item: 'gtceu:ruby_dust', count: 2 }], - speed_limits: 1, - processingTime: 100 - }).id(`tfg:vi/lathe/ruby_lens`) + event.recipes.vintageimprovements.polishing(['#forge:lenses/ruby', '2x #forge:dusts/ruby'], '#forge:exquisite_gems/ruby') + .speedLimits(1) + .processingTime(100 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER) + .id(`tfg:vi/lathe/ruby_lens`) - event.custom({ - type: 'vintageimprovements:polishing', - ingredients: [{ tag: 'forge:exquisite_gems/sapphire' }], - results: [{ item: 'gtceu:sapphire_lens' }, { item: 'gtceu:sapphire_dust', count: 2 }], - speed_limits: 1, - processingTime: 100 - }).id(`tfg:vi/lathe/sapphire_lens`) + event.recipes.vintageimprovements.polishing(['#forge:lenses/sapphire', '2x #forge:dusts/sapphire'], '#forge:exquisite_gems/sapphire') + .speedLimits(1) + .processingTime(100 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER) + .id(`tfg:vi/lathe/sapphire_lens`) - event.custom({ - type: 'vintageimprovements:polishing', - ingredients: [{ tag: 'forge:exquisite_gems/amethyst' }], - results: [{ item: 'gtceu:amethyst_lens' }, { item: 'gtceu:amethyst_dust', count: 2 }], - speed_limits: 1, - processingTime: 100 - }).id(`tfg:vi/lathe/amethyst_lens`) + event.recipes.vintageimprovements.polishing(['#forge:lenses/amethyst', '2x #forge:dusts/amethyst'], '#forge:exquisite_gems/amethyst') + .speedLimits(1) + .processingTime(100 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER) + .id(`tfg:vi/lathe/amethyst_lens`) // #endregion @@ -522,7 +468,7 @@ function registerVintageImprovementsRecipes(event) { // LV recipes only let EUt = (r.tickInputs && r.tickInputs.eu) ? r.tickInputs.eu[0].content : null; - if (!(EUt <= 32)) return + if (EUt > 32) return // Skip this one if (r.outputs.item[0].content.ingredient.item === "gtceu:nan_certificate") return // Skip glass too @@ -538,13 +484,9 @@ function registerVintageImprovementsRecipes(event) { let output = r.outputs.item[0].content.ingredient; output.count = r.outputs.item[0].content.count; - event.custom({ - type: 'vintageimprovements:curving', - ingredients: input_array, - itemAsHead: r.inputs.item[1].content.ingredient.item, - results: [output], - processingTime: r.duration * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER - }).id(`tfg:vi/curving/${recipe.getId().split(':')[1]}`) + event.recipes.vintageimprovements.curving(output, input_array) + .head(r.inputs.item[1].content.ingredient.item) + .id(`tfg:vi/curving/${recipe.getId().split(':')[1]}`) } ) @@ -555,238 +497,144 @@ function registerVintageImprovementsRecipes(event) { // Item to fluids: vacuumizing // Fluids to item: pressurizing - event.custom({ - type: 'vintageimprovements:vacuumizing', - ingredients: [{ item: 'tfc:glue' }], - results: [{ fluid: 'gtceu:glue', amount: 50 }], - heatRequirement: "heated", - processingTime: 100 - }).id('tfg:vi/vacuumizing/glue_melting') + event.recipes.vintageimprovements.vacuumizing(Fluid.of('gtceu:glue', 50), 'tfc:glue') + .heated() + .processingTime(50 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER) + .id('tfg:vi/vacuumizing/glue_melting') - event.custom({ - type: 'vintageimprovements:vacuumizing', - ingredients: [{ item: 'gtceu:sticky_resin' }], - results: [{ fluid: 'gtceu:glue', amount: 100 }], - heatRequirement: "heated", - processingTime: 200 - }).id('tfg:vi/vacuumizing/glue_from_resin') + event.recipes.vintageimprovements.vacuumizing(Fluid.of('gtceu:glue', 100), 'gtceu:sticky_resin') + .heated() + .processingTime(100 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER) + .id('tfg:vi/vacuumizing/glue_from_resin') - event.custom({ - type: 'vintageimprovements:vacuumizing', - ingredients: [{ item: 'tfg:conifer_rosin' }], - results: [{ fluid: 'gtceu:glue', amount: 50 }], - heatRequirement: "heated", - processingTime: 200 - }).id('tfg:vi/vacuumizing/glue_from_rosin') + event.recipes.vintageimprovements.vacuumizing(Fluid.of('gtceu:glue', 50), 'tfg:conifer_rosin') + .heated() + .processingTime(100 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER) + .id('tfg:vi/vacuumizing/glue_from_rosin') - event.custom({ - type: 'vintageimprovements:vacuumizing', - ingredients: [{ item: 'minecraft:bone_meal' }, { fluid: 'tfc:limewater', amount: 500 }], - results: [{ fluid: 'gtceu:glue', amount: 50 }], - heatRequirement: "heated", - processingTime: 100 - }).id('tfg:vi/vacuumizing/glue_from_bone_meal') + event.recipes.vintageimprovements.vacuumizing(Fluid.of('gtceu:glue', 50), [Fluid.of('tfc:limewater', 500), 'minecraft:bone_meal']) + .heated() + .processingTime(50 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER) + .id('tfg:vi/vacuumizing/glue_from_bone_meal') - event.custom({ - type: 'vintageimprovements:pressurizing', - ingredients: [{ fluid: 'gtceu:glue', amount: 50 }], - results: [{ item: 'tfc:glue' }], - processingTime: 100 - }).id('tfg:vi/pressurizing/glue_solidifying') + event.recipes.vintageimprovements.pressurizing('tfc:glue', Fluid.of('gtceu:glue', 50)) + .heated() + .processingTime(50 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER) + .id('tfg:vi/pressurizing/glue_solidifying') - event.custom({ - type: 'vintageimprovements:vacuumizing', - ingredients: [{ item: 'gtceu:rubber_dust' }], - results: [{ fluid: 'gtceu:rubber', amount: 144 }], - heatRequirement: "heated", - processingTime: 100 - }).id('tfg:vi/vacuum/rubber') + event.recipes.vintageimprovements.vacuumizing(Fluid.of('gtceu:rubber', 144), '#forge:dusts/rubber') + .heated() + .processingTime(50 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER) + .id('tfg:vi/vacuum/rubber') // Vaccuming rubber wood stuff for latex - event.custom({ - type: 'vintageimprovements:vacuumizing', - ingredients: [{ tag: 'tfg:latex_logs' }], - results: [{ fluid: 'tfg:latex', amount: 100 }], - processingTime: 600 - }).id('tfg:vi/vacuumizing/latex_from_rubber_logs') + event.recipes.vintageimprovements.vacuumizing(Fluid.of('tfg:latex', 100), '#tfg:latex_logs') + .processingTime(300 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER) + .id('tfg:vi/vacuumizing/latex_from_rubber_logs') - event.custom({ - type: 'vintageimprovements:vacuumizing', - ingredients: [{ tag: 'tfg:rubber_saplings' }], - results: [{ fluid: 'tfg:latex', amount: 25 }], - processingTime: 300 - }).id('tfg:vi/vacuumizing/latex_from_rubber_sapling') + event.recipes.vintageimprovements.vacuumizing(Fluid.of('tfg:latex', 25), '#tfg:rubber_saplings') + .processingTime(150 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER) + .id('tfg:vi/vacuumizing/latex_from_rubber_sapling') - event.custom({ - type: 'vintageimprovements:vacuumizing', - ingredients: [{ tag: 'tfg:rubber_leaves' }], - results: [{ fluid: 'tfg:latex', amount: 10 }], - processingTime: 150 - }).id('tfg:vi/vacuumizing/latex_from_rubber_leaves') + event.recipes.vintageimprovements.vacuumizing(Fluid.of('tfg:latex', 10), '#tfg:rubber_leaves') + .processingTime(75 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER) + .id('tfg:vi/vacuumizing/latex_from_rubber_leaves') - event.custom({ - type: 'vintageimprovements:vacuumizing', - ingredients: [{ tag: 'tfg:rubber_plants' }, { item: 'tfc:powder/soda_ash' }, { fluid: 'tfc:salt_water', amount: 50 }], - results: [{ fluid: 'tfg:latex', amount: 50 }], - heatRequirement: "heated", - processingTime: 40 - }).id('tfg:vi/vacuumizing/latex_from_rubber_plants') + event.recipes.vintageimprovements.vacuumizing(Fluid.of('tfg:latex', 50), ['#tfg:rubber_plants', 'tfc:powder/soda_ash', Fluid.of('tfc:salt_water', 50)]) + .heated() + .processingTime(20 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER) + .id('tfg:vi/vacuumizing/latex_from_rubber_plants') // Vulc. latex to raw rubber pulp - event.custom({ - type: 'vintageimprovements:pressurizing', - ingredients: [{ fluid: 'tfg:vulcanized_latex', amount: 250 }], - results: [{ item: 'gtceu:raw_rubber_dust' }], - heatRequirement: "heated", - processingTime: 120 - }).id('tfg:vi/pressurizing/vulcanized_latex_to_raw_rubber') + event.recipes.vintageimprovements.pressurizing(Fluid.of('tfg:vulcanized_latex', 250), '#forge:dusts/raw_rubber') + .heated() + .processingTime(60 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER) + .id('tfg:vi/pressurizing/vulcanized_latex_to_raw_rubber') // Seed oils - event.custom({ - type: 'vintageimprovements:vacuumizing', - ingredients: [{ item: 'tfg:sunflower_product' }], - results: [{ fluid: 'gtceu:seed_oil', amount: 350 }], - processingTime: 1000 - }).id('tfg:vi/vacuumizing/sunflower') + event.recipes.vintageimprovements.vacuumizing(Fluid.of('gtceu:seed_oil', 350), 'tfg:sunflower_product') + .processingTime(500 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER) + .id('tfg:vi/vacuumizing/sunflower') + + event.recipes.vintageimprovements.vacuumizing(Fluid.of('gtceu:seed_oil', 600), 'tfg:rapeseed_product') + .processingTime(500 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER) + .id('tfg:vi/vacuumizing/rapeseed') - event.custom({ - type: 'vintageimprovements:vacuumizing', - ingredients: [{ item: 'tfg:rapeseed_product' }], - results: [{ fluid: 'gtceu:seed_oil', amount: 600 }], - processingTime: 1000 - }).id('tfg:vi/vacuumizing/rapeseed') - - event.custom({ - type: 'vintageimprovements:vacuumizing', - ingredients: [{ tag: 'forge:seeds' }], - results: [{ fluid: 'gtceu:seed_oil', amount: 16 }], - processingTime: 100 - }).id('tfg:vi/vacuumizing/seed_oil') - - event.custom({ - type: 'vintageimprovements:pressurizing', - ingredients: [{ fluid: 'tfc:lye', amount: 1000 }], - results: [{ item: 'gtceu:sodium_hydroxide_dust' }], - heatRequirement: "heated", - processingTime: 300 - }).id('tfg:vi/pressurizing/lye') + event.recipes.vintageimprovements.vacuumizing(Fluid.of('gtceu:seed_oil', 16), '#forge:seeds') + .processingTime(50 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER) + .id('tfg:vi/vacuumizing/seed_oil') + + event.recipes.vintageimprovements.pressurizing('#forge:dusts/sodium_hydroxide', Fluid.of('tfc:lye', 1000)) + .processingTime(150 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER) + .heated() + .id('tfg:vi/pressurizing/lye') // #endregion // #region Coiling + event.recipes.vintageimprovements.coiling('8x tfc:wool_yarn', 'tfc:wool') + .processingTime(100 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER) + .id(`tfg:vi/coiling/wool_yarn`) - event.custom({ - type: 'vintageimprovements:coiling', - ingredients: [{ item: 'tfc:wool' }], - results: [{ item: 'tfc:wool_yarn', count: 8 }], - processingTime: 100 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER - }).id(`tfg:vi/coiling/wool_yarn`) + event.recipes.vintageimprovements.coiling('8x tfc:wool_yarn', 'tfg:glacian_wool') + .processingTime(100 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER) + .id(`tfg:vi/coiling/glacian_wool_yarn`) + .springColor('FFCCFC') - event.custom({ - type: 'vintageimprovements:coiling', - ingredients: [{ item: 'tfg:glacian_wool' }], - results: [{ item: 'tfc:wool_yarn', count: 8 }], - processingTime: 100 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER - }).id(`tfg:vi/coiling/glacian_wool_yarn`) + event.recipes.vintageimprovements.coiling('16x tfg:phantom_thread', 'minecraft:phantom_membrane') + .processingTime(100 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER) + .id(`tfg:vi/coiling/phantom_thread`) + .springColor('E1C4C4') - event.custom({ - type: 'vintageimprovements:coiling', - ingredients: [{ item: 'minecraft:phantom_membrane' }], - results: [{ item: 'tfg:phantom_thread', count: 16 }], - processingTime: 100 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER - }).id(`tfg:vi/coiling/phantom_thread`) + event.recipes.vintageimprovements.coiling('8x firmalife:pineapple_yarn', 'firmalife:pineapple_fiber') + .processingTime(100 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER) + .id(`tfg:vi/coiling/pineapple_yarn`) + .springColor('FFFCCC') - event.custom({ - type: 'vintageimprovements:coiling', - ingredients: [{ item: 'firmalife:pineapple_fiber' }], - results: [{ item: 'firmalife:pineapple_yarn', count: 8 }], - processingTime: 100 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER - }).id(`tfg:vi/coiling/pineapple_yarn`) - - event.custom({ - type: 'vintageimprovements:coiling', - ingredients: [ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Polycaprolactam, 1)], - results: [{ item: 'tfg:polycaprolactam_string', count: 32 }], - processingTime: 100 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER - }).id(`tfg:vi/coiling/nylon_string`) + event.recipes.vintageimprovements.coiling('32x tfg:polycaprolactam_string', ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Polycaprolactam, 1)) + .processingTime(100 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER) + .id(`tfg:vi/coiling/nylon_string`) + .springColor('000000') // #endregion // #region Curving - event.custom({ - type: 'vintageimprovements:curving', - ingredients: [{ item: 'minecraft:clay_ball' }], - itemAsHead: 'gtceu:ingot_extruder_mold', - results: [{ item: 'tfc:ceramic/unfired_brick' }], - processingTime: 50 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER - }).id(`tfg:vi/curving/clay_brick`) + event.recipes.vintageimprovements.curving('tfc:ceramic/unfired_brick', 'minecraft:clay_ball') + .head('gtceu:ingot_extruder_mold') + .id(`tfg:vi/curving/clay_brick`) - event.custom({ - type: 'vintageimprovements:curving', - ingredients: [{ item: 'tfc:fire_clay' }], - itemAsHead: 'gtceu:ingot_extruder_mold', - results: [{ item: 'tfc:ceramic/unfired_fire_brick' }], - processingTime: 50 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER - }).id(`tfg:vi/curving/fire_brick`) + event.recipes.vintageimprovements.curving('tfc:ceramic/unfired_fire_brick', 'tfc:fire_clay') + .head('gtceu:ingot_extruder_mold') + .id(`tfg:vi/curving/fire_brick`) - event.custom({ - type: 'vintageimprovements:curving', - ingredients: [{ tag: 'forge:ingots/copper' }], - itemAsHead: 'gtceu:bottle_extruder_mold', - results: [{ item: 'afc:tree_tap' }], - processingTime: 50 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER - }).id(`tfg:vi/curving/tree_tap`) + event.recipes.vintageimprovements.curving('afc:tree_tap', '#forge:ingots/copper') + .head('gtceu:bottle_extruder_mold') + .id(`tfg:vi/curving/tree_tap`) - event.custom({ - type: 'vintageimprovements:curving', - ingredients: [{ tag: 'forge:plates/copper' }], - itemAsHead: 'tfg:small_casing_extruder_mold', - results: [{ item: 'firmalife:sprinkler' }], - processingTime: 50 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER - }).id(`tfg:vi/curving/sprinkler`) + event.recipes.vintageimprovements.curving('firmalife:sprinkler', '#forge:plates/copper') + .head('tfg:small_casing_extruder_mold') + .id(`tfg:vi/curving/sprinkler`) - event.custom({ - type: 'vintageimprovements:curving', - ingredients: [{ tag: 'forge:double_plates/wrought_iron' }], - itemAsHead: 'tfg:large_casing_extruder_mold', - results: [{ item: 'tfc:wrought_iron_grill' }], - processingTime: 50 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER - }).id(`tfg:vi/curving/wrought_iron_grill`) - - // #endregion - - // #region Centrifuging - - //event.custom({ - // type: 'vintageimprovements:centrifugation', - // ingredients: [{ tag: 'forge:dusts/oilsands' }], - // results: [ - // { item: "tfc:sand/yellow", chance: 0.5 }, - // { fluid: "gtceu:oil", amount: 2000 } - // ], - // processingTime: 10 * 20 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER - //}).id(`tfg:vi/centrifuge/oilsands`) + event.recipes.vintageimprovements.curving('tfc:wrought_iron_grill', '#forge:double_plates/wrought_iron') + .head('tfg:large_casing_extruder_mold') + .id(`tfg:vi/curving/wrought_iron_grill`) // #endregion } function generateHammeringRecipe(event, material, blows, anvil) { - event.custom({ - type: 'vintageimprovements:hammering', - hammerBlows: blows, - ingredients: [ChemicalHelper.get(TFGTagPrefix.ingotDouble, material, 1)], - results: [ChemicalHelper.get(TagPrefix.plate, material, 1)], - anvilBlock: `tfc:metal/anvil/${anvil}` - }).id(`tfg:vi/hammer/${material.getName()}_plate_on_${anvil}_anvil`) + event.recipes.vintageimprovements.hammering( + ChemicalHelper.get(TagPrefix.plate, material, 1), + ChemicalHelper.get(TFGTagPrefix.ingotDouble, material, 1)) + .anvilBlock(`tfc:metal/anvil/${anvil}`) + .hammerBlows(blows) + .id(`tfg:vi/hammer/${material.getName()}_plate_on_${anvil}_anvil`) } function generateHammeringRecipeFromItem(event, input, output, blows, anvil) { - event.custom({ - type: 'vintageimprovements:hammering', - hammerBlows: blows, - ingredients: [{ item: input }], - results: [{ item: output }], - anvilBlock: `tfc:metal/anvil/${anvil}` - }).id(`tfg:vi/hammer/${input.replace(/[#:]/g, '_')}_on_${anvil}_anvil`) + event.recipes.vintageimprovements.hammering(output, input) + .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/ad_astra/modifications.js b/kubejs/startup_scripts/ad_astra/modifications.js index fbdf2b383..36a8c4333 100644 --- a/kubejs/startup_scripts/ad_astra/modifications.js +++ b/kubejs/startup_scripts/ad_astra/modifications.js @@ -31,4 +31,23 @@ function registerAdAstraBlockModifications(event) { event.modify('ad_astra:aeronos_cap', block => { block.lightEmission = 0 }) +} + +function registerAdAstraItemModifications(event) { + + const space_suits = [ + 'ad_astra:space_helmet', + 'ad_astra:space_suit', + 'ad_astra:space_pants', + 'ad_astra:space_boots', + 'ad_astra:netherite_space_helmet', + 'ad_astra:netherite_space_suit', + 'ad_astra:netherite_space_pants', + 'ad_astra:netherite_space_boots' + ] + space_suits.forEach(e => { + event.modify(e, item => { + item.maxDamage = item.maxDamage * 2 + }) + }) } \ No newline at end of file diff --git a/kubejs/startup_scripts/computer_craft/constants.js b/kubejs/startup_scripts/computer_craft/constants.js index a345baf46..e255a52d1 100644 --- a/kubejs/startup_scripts/computer_craft/constants.js +++ b/kubejs/startup_scripts/computer_craft/constants.js @@ -17,5 +17,5 @@ global.COMPUTER_CRAFT_DISCS = [ '{Color:8349260}', '{Color:5744206}', '{Color:13388876}', - '{Color:1118481}', + '{Color:1118481}' ] \ No newline at end of file diff --git a/kubejs/startup_scripts/create_additions/constants.js b/kubejs/startup_scripts/create_additions/constants.js index 036d69ab2..4627fdf2c 100644 --- a/kubejs/startup_scripts/create_additions/constants.js +++ b/kubejs/startup_scripts/create_additions/constants.js @@ -36,5 +36,6 @@ global.CREATE_ADDITIONS_DISABLED_ITEMS = [ 'createaddition:small_light_connector', 'createaddition:electrum_block', 'createaddition:portable_energy_interface', - 'createaddition:straw' + 'createaddition:straw', + 'createaddition:modular_accumulator' ]; diff --git a/kubejs/startup_scripts/greate/constants.js b/kubejs/startup_scripts/greate/constants.js index 395ae8812..5155df690 100644 --- a/kubejs/startup_scripts/greate/constants.js +++ b/kubejs/startup_scripts/greate/constants.js @@ -3,19 +3,20 @@ global.GREATE_DISABLED_ITEMS = /** @type {const} */ ([ "create:andesite_alloy", - "gtceu:steel_alloy", - "gtceu:aluminium_alloy", - "gtceu:stainless_steel_alloy", - "gtceu:titanium_alloy", - "gtceu:tungsten_steel_alloy", - "gtceu:rhodium_plated_palladium_alloy", - "gtceu:naquadah_alloy_alloy", - "gtceu:darmstadtium_alloy", - "gtceu:neutronium_alloy", + "greate:steel_alloy", + "greate:aluminium_alloy", + "greate:stainless_steel_alloy", + "greate:titanium_alloy", + "greate:tungsten_steel_alloy", + "greate:rhodium_plated_palladium_alloy", + "greate:naquadah_alloy_alloy", + "greate:darmstadtium_alloy", + "greate:neutronium_alloy", "gtceu:neutronium_whisk", - "greate:polybenzimidazole_belt_connector", + "greate:polyethylene_belt_connector", "greate:polytetrafluoroethylene_belt_connector", + "greate:polybenzimidazole_belt_connector", "greate:andesite_alloy_crushing_wheel", "greate:andesite_alloy_encased_fan", @@ -93,66 +94,66 @@ global.GREATE_DISABLED_ITEMS = /** @type {const} */ ([ "greate:neutronium_vertical_gearbox", // Adding these here because they're greate's fault - "gtceu:andesite_alloy_bucket", - "gtceu:andesite_alloy_ring", - "gtceu:tiny_andesite_alloy_dust", - "gtceu:small_andesite_alloy_dust", - "gtceu:andesite_alloy_dust", - "gtceu:andesite_alloy_plate", - "gtceu:double_andesite_alloy_plate", - "gtceu:andesite_alloy_nugget", - "gtceu:andesite_alloy_rotor", - "gtceu:andesite_alloy_whisk", - "gtceu:andesite_alloy_bolt", - "gtceu:andesite_alloy_ingot", - "gtceu:andesite_alloy_rod", - "gtceu:andesite_alloy_screw", - "gtceu:andesite_alloy_buzz_saw_blade", - "gtceu:andesite_alloy_block", - "gtceu:andesite_alloy_buzzsaw", + "greate:andesite_alloy_bucket", + "greate:andesite_alloy_ring", + "greate:tiny_andesite_alloy_dust", + "greate:small_andesite_alloy_dust", + "greate:andesite_alloy_dust", + "greate:andesite_alloy_plate", + "greate:double_andesite_alloy_plate", + "greate:andesite_alloy_nugget", + "greate:andesite_alloy_rotor", + "greate:andesite_alloy_whisk", + "greate:andesite_alloy_bolt", + "greate:andesite_alloy_ingot", + "greate:andesite_alloy_rod", + "greate:andesite_alloy_screw", + "greate:andesite_alloy_buzz_saw_blade", + "greate:andesite_alloy_block", + "greate:andesite_alloy_buzzsaw", - "gtceu:refined_radiance_bucket", - "gtceu:tiny_refined_radiance_dust", - "gtceu:small_refined_radiance_dust", - "gtceu:refined_radiance_dust", - "gtceu:refined_radiance_plate", - "gtceu:double_refined_radiance_plate", - "gtceu:refined_radiance_nugget", - "gtceu:refined_radiance_bolt", - "gtceu:refined_radiance_ingot", - "gtceu:refined_radiance_rod", - "gtceu:refined_radiance_screw", - "gtceu:long_refined_radiance_rod", - "gtceu:refined_radiance_block", + "greate:refined_radiance_bucket", + "greate:tiny_refined_radiance_dust", + "greate:small_refined_radiance_dust", + "greate:refined_radiance_dust", + "greate:refined_radiance_plate", + "greate:double_refined_radiance_plate", + "greate:refined_radiance_nugget", + "greate:refined_radiance_bolt", + "greate:refined_radiance_ingot", + "greate:refined_radiance_rod", + "greate:refined_radiance_screw", + "greate:long_refined_radiance_rod", + "greate:refined_radiance_block", - "gtceu:chromatic_compound_bucket", - "gtceu:tiny_chromatic_compound_dust", - "gtceu:small_chromatic_compound_dust", - "gtceu:chromatic_compound_dust", - "gtceu:chromatic_compound_nugget", - "gtceu:chromatic_compound_ingot", - "gtceu:chromatic_compound_block", + "greate:chromatic_compound_bucket", + "greate:tiny_chromatic_compound_dust", + "greate:small_chromatic_compound_dust", + "greate:chromatic_compound_dust", + "greate:chromatic_compound_nugget", + "greate:chromatic_compound_ingot", + "greate:chromatic_compound_block", - "gtceu:shadow_steel_bucket", - "gtceu:tiny_shadow_steel_dust", - "gtceu:small_shadow_steel_dust", - "gtceu:shadow_steel_dust", - "gtceu:shadow_steel_plate", - "gtceu:double_shadow_steel_plate", - "gtceu:shadow_steel_nugget", - "gtceu:shadow_steel_bolt", - "gtceu:shadow_steel_ingot", - "gtceu:shadow_steel_rod", - "gtceu:shadow_steel_screw", - "gtceu:long_shadow_steel_rod", - "gtceu:shadow_steel_block" + "greate:shadow_steel_bucket", + "greate:tiny_shadow_steel_dust", + "greate:small_shadow_steel_dust", + "greate:shadow_steel_dust", + "greate:shadow_steel_plate", + "greate:double_shadow_steel_plate", + "greate:shadow_steel_nugget", + "greate:shadow_steel_bolt", + "greate:shadow_steel_ingot", + "greate:shadow_steel_rod", + "greate:shadow_steel_screw", + "greate:long_shadow_steel_rod", + "greate:shadow_steel_block" ]); global.GREATE_DISABLED_FLUIDS = /** @type {const} */ ([ - "gtceu:andesite_alloy", - "gtceu:refined_radiance", - "gtceu:chromatic_compound", - "gtceu:shadow_steel" + "greate:andesite_alloy", + "greate:refined_radiance", + "greate:chromatic_compound", + "greate:shadow_steel" ]); global.GREATE_DISABLED_TAGS = /** @type {const} */ ([ diff --git a/kubejs/startup_scripts/greate/materials.js b/kubejs/startup_scripts/greate/materials.js index 910e6125c..8a176bd71 100644 --- a/kubejs/startup_scripts/greate/materials.js +++ b/kubejs/startup_scripts/greate/materials.js @@ -1,14 +1,40 @@ "use strict"; -const registerGreateMaterials = (event) => { +const registerGreateMaterials = (event) => { + // Belt materials should already have an ingot and plate item already + const $BeltProperty = Java.loadClass("electrolyte.greate.content.gtceu.material.BeltProperty") + const $GreateMaterials = Java.loadClass("electrolyte.greate.registry.GreateMaterials") + + // Wood belt + $GreateMaterials.AndesiteAlloy.setProperty(GreatePropertyKeys.BELT, new $BeltProperty([$GreateMaterials.AndesiteAlloy], 5)) + + // Leather belt + GTMaterials.Stone.setProperty(GreatePropertyKeys.BELT, new $BeltProperty([GTMaterials.Steel, $GreateMaterials.AndesiteAlloy], 10)) + + // Remove plastic belts + GTMaterials.Polyethylene.getProperties().removeProperty(GreatePropertyKeys.BELT); + GTMaterials.Polytetrafluoroethylene.getProperties().removeProperty(GreatePropertyKeys.BELT); + GTMaterials.Polybenzimidazole.getProperties().removeProperty(GreatePropertyKeys.BELT); + + // Change properties of other rubber belts + GTMaterials.Rubber.getProperties().removeProperty(GreatePropertyKeys.BELT); + GTMaterials.Rubber.setProperty(GreatePropertyKeys.BELT, new $BeltProperty([GTMaterials.Steel, $GreateMaterials.AndesiteAlloy], 20)) + + GTMaterials.SiliconeRubber.getProperties().removeProperty(GreatePropertyKeys.BELT); + GTMaterials.SiliconeRubber.setProperty(GreatePropertyKeys.BELT, new $BeltProperty([GTMaterials.StainlessSteel, GTMaterials.Aluminium], 25)) + + GTMaterials.StyreneButadieneRubber.setProperty(GreatePropertyKeys.BELT, new $BeltProperty([GTMaterials.Titanium, GTMaterials.StainlessSteel], 30)) } const registerGreateMaterialModification = (event) => { - GTMaterials.get("rose_quartz").addFlags( + + const $GreateMaterials = Java.loadClass("electrolyte.greate.registry.GreateMaterials") + + $GreateMaterials.RoseQuartz.addFlags( GTMaterialFlags.GENERATE_LENS ); - GTMaterials.get('andesite_alloy').setComponents([]) - GTMaterials.get('andesite_alloy').setFormula("?") + $GreateMaterials.AndesiteAlloy.setComponents([]) + $GreateMaterials.AndesiteAlloy.setFormula("?") } \ No newline at end of file diff --git a/kubejs/startup_scripts/gtceu/constants.js b/kubejs/startup_scripts/gtceu/constants.js index 40de05b4a..69fb165d4 100644 --- a/kubejs/startup_scripts/gtceu/constants.js +++ b/kubejs/startup_scripts/gtceu/constants.js @@ -123,7 +123,7 @@ global.GTCEU_DISABLED_ITEMS = /** @type {const} */ ([ "gtceu:damascus_steel_plate", "gtceu:double_damascus_steel_plate", "gtceu:damascus_steel_gear", - "gtceu:damascus_steel_buzzsaw_blade", + "gtceu:damascus_steel_buzz_saw_blade", "gtceu:damascus_steel_drill_head", "gtceu:damascus_steel_chainsaw_head", "gtceu:damascus_steel_bolt", @@ -141,6 +141,27 @@ global.GTCEU_DISABLED_ITEMS = /** @type {const} */ ([ "gtceu:lv_damascus_steel_chainsaw", "gtceu:damascus_steel_buzzsaw", "gtceu:damascus_steel_bucket", + "gtceu:damascus_steel_wire_cutter_head", + "gtceu:lv_damascus_steel_wire_cutter", + "gtceu:hv_damascus_steel_wire_cutter", + "gtceu:iv_damascus_steel_wire_cutter", + "gtceu:damascus_steel_butchery_knife_head", + "gtceu:damascus_steel_sword_head", + "gtceu:damascus_steel_screwdriver_tip", + "gtceu:damascus_steel_file_head", + "gtceu:damascus_steel_spade_head", + "gtceu:damascus_steel_mining_hammer_head", + "gtceu:damascus_steel_hoe_head", + "gtceu:damascus_steel_hammer_head", + "gtceu:damascus_steel_knife_head", + "gtceu:damascus_steel_pickaxe_head", + "gtceu:damascus_steel_axe_head", + "gtceu:damascus_steel_saw_head", + "gtceu:damascus_steel_shovel_head", + "gtceu:damascus_steel_scythe_head", + + "gtceu:molten_black_bronze_bucket", + "gtceu:molten_bismuth_bronze_bucket", //armor "gtceu:bronze_helmet", diff --git a/kubejs/startup_scripts/gtceu/machines.js b/kubejs/startup_scripts/gtceu/machines.js index 6bef61a11..7f2d2099f 100644 --- a/kubejs/startup_scripts/gtceu/machines.js +++ b/kubejs/startup_scripts/gtceu/machines.js @@ -456,7 +456,7 @@ const registerGTCEuMachines = (event) => { .machine((holder) => new CoilWorkableElectricMultiblockMachine(holder)) .rotationState(RotationState.NON_Y_AXIS) .recipeType('coal_liquefaction_tower') - .recipeModifiers([(machine, recipe) => GTRecipeModifiers.crackerOverclock(machine, recipe), GTRecipeModifiers.BATCH_MODE]) + .recipeModifiers([(machine, recipe) => GTRecipeModifiers.pyrolyseOvenOverclock(machine, recipe), GTRecipeModifiers.BATCH_MODE]) .appearanceBlock(() => Block.getBlock('gtceu:solid_machine_casing')) .pattern(definition => FactoryBlockPattern.start() .aisle('CCC', 'D D', 'D D', 'DED', 'DED', 'BBB') diff --git a/kubejs/startup_scripts/gtceu/material_modification.js b/kubejs/startup_scripts/gtceu/material_modification.js index cd9294168..f31a4a31c 100644 --- a/kubejs/startup_scripts/gtceu/material_modification.js +++ b/kubejs/startup_scripts/gtceu/material_modification.js @@ -13,11 +13,12 @@ const registerGTCEuMaterialModification = (event) => { const $FLUID_PIPE_PROPERTY = Java.loadClass('com.gregtechceu.gtceu.api.data.chemical.material.properties.FluidPipeProperties') const $HAZARD_PROPERTY = Java.loadClass('com.gregtechceu.gtceu.api.data.chemical.material.properties.HazardProperty') - const $MATERIAL_FLAGS = Java.loadClass('com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags') const $FluidStorageKeys = Java.loadClass('com.gregtechceu.gtceu.api.fluids.store.FluidStorageKeys') + const $GreateMaterials = Java.loadClass("electrolyte.greate.registry.GreateMaterials") + const { HAS_TFC_TOOL, // used to generate new TFC items like javelins HAS_GT_TOOL, // does not generate items, just TFC recipes for GT tools @@ -259,6 +260,7 @@ const registerGTCEuMaterialModification = (event) => { GTMaterials.BismuthBronze.addFlags(GENERATE_SMALL_GEAR); GTMaterials.Nickel.addFlags(GENERATE_ROD, GENERATE_LONG_ROD); + GTMaterials.Zinc.addFlags(GENERATE_LONG_ROD); GTMaterials.BlackSteel.addFlags(GENERATE_LONG_ROD, GENERATE_BOLT_SCREW); GTMaterials.BlueSteel.addFlags(GENERATE_LONG_ROD, GENERATE_BOLT_SCREW); GTMaterials.RedSteel.addFlags(GENERATE_LONG_ROD, GENERATE_BOLT_SCREW, GENERATE_FOIL); @@ -341,18 +343,19 @@ const registerGTCEuMaterialModification = (event) => { // Blue steel fluid pipe - same flow rate as aluminium, same temp tolerance as tungsten GTMaterials.BlueSteel.setProperty(PropertyKey.FLUID_PIPE, new $FLUID_PIPE_PROPERTY(4618, 75, true, false, false, false)); // Ostrum fluid pipe - same flow rate as titanium, higher temp range - TFGHelpers.getMaterial('ostrum').setProperty(PropertyKey.FLUID_PIPE, new $FLUID_PIPE_PROPERTY(3700, 150, true, false, true, false)); + GTMaterials.get('ostrum').setProperty(PropertyKey.FLUID_PIPE, new $FLUID_PIPE_PROPERTY(3700, 150, true, false, true, false)); - // Add some hazards back + // int is how fast the condition progresses (default 1.0) + // bool is whether or not the condition applies to anything made with the material, other than dusts (default false) GTMaterials.Realgar.setProperty(PropertyKey.HAZARD, new $HAZARD_PROPERTY($HAZARD_PROPERTY.HazardTrigger.INHALATION, GTMedicalConditions.ARSENICOSIS, 1, false)); GTMaterials.Cobaltite.setProperty(PropertyKey.HAZARD, new $HAZARD_PROPERTY($HAZARD_PROPERTY.HazardTrigger.INHALATION, GTMedicalConditions.ARSENICOSIS, 1, false)); GTMaterials.Galena.setProperty(PropertyKey.HAZARD, new $HAZARD_PROPERTY($HAZARD_PROPERTY.HazardTrigger.INHALATION, GTMedicalConditions.WEAK_POISON, 1, false)); GTMaterials.Chromite.setProperty(PropertyKey.HAZARD, new $HAZARD_PROPERTY($HAZARD_PROPERTY.HazardTrigger.SKIN_CONTACT, GTMedicalConditions.IRRITANT, 1, false)); GTMaterials.Thorium.setProperty(PropertyKey.HAZARD, new $HAZARD_PROPERTY($HAZARD_PROPERTY.HazardTrigger.ANY, GTMedicalConditions.CARCINOGEN, 1, true)); - + // This contains hazardous elements so GT tags it as hazardous automatically - TFGHelpers.getMaterial('ostrum').getProperties().removeProperty(PropertyKey.HAZARD); - TFGHelpers.getMaterial('ostrum_iodide').getProperties().removeProperty(PropertyKey.HAZARD); + GTMaterials.get('ostrum').getProperties().removeProperty(PropertyKey.HAZARD); + GTMaterials.get('ostrum_iodide').getProperties().removeProperty(PropertyKey.HAZARD); // Superconductors being radioactive at EV is a little evil GTMaterials.UraniumTriplatinum.getProperties().removeProperty(PropertyKey.HAZARD); @@ -428,7 +431,7 @@ const registerGTCEuMaterialModification = (event) => { }); - let rose_quartz = GTMaterials.get('greate:rose_quartz'); + let rose_quartz = $GreateMaterials.RoseQuartz; rose_quartz.setProperty(PropertyKey.ORE, new $ORE_PROPERTY()); rose_quartz.getProperty(PropertyKey.ORE).setOreByProducts(rose_quartz, GTMaterials.Redstone, rose_quartz); rose_quartz.setMaterialIconSet(GTMaterialIconSet.getByName('nether_quartz')) @@ -439,4 +442,4 @@ const registerGTCEuMaterialModification = (event) => { GTMaterials.CertusQuartz.setComponents('1x unknown', '1x silicon', '2x oxygen') GTMaterials.GraniteRed.setComponents([]) GTMaterials.GraniteRed.setFormula("?") -} +} \ No newline at end of file diff --git a/kubejs/startup_scripts/main_startup_script.js b/kubejs/startup_scripts/main_startup_script.js index b651df6fb..8d41ff94e 100644 --- a/kubejs/startup_scripts/main_startup_script.js +++ b/kubejs/startup_scripts/main_startup_script.js @@ -15,6 +15,7 @@ BlockEvents.modification(event => { }) ItemEvents.modification(event => { + registerAdAstraItemModifications(event) registerBeneathItemModifications(event) registerCreateItemModifications(event) registerFirmalifeItemModifications(event) diff --git a/kubejs/startup_scripts/minecraft/constants.js b/kubejs/startup_scripts/minecraft/constants.js index 658c290f9..e406882eb 100644 --- a/kubejs/startup_scripts/minecraft/constants.js +++ b/kubejs/startup_scripts/minecraft/constants.js @@ -620,6 +620,7 @@ global.MINECRAFT_DISABLED_ITEMS = [ 'minecraft:furnace', 'minecraft:amethyst_cluster', 'minecraft:rabbit_hide', + 'minecraft:raw_copper', 'minecraft:raw_iron', 'minecraft:raw_gold', 'minecraft:compass', diff --git a/kubejs/startup_scripts/tfc/constants.js b/kubejs/startup_scripts/tfc/constants.js index b9ac3f4c6..7e4034245 100644 --- a/kubejs/startup_scripts/tfc/constants.js +++ b/kubejs/startup_scripts/tfc/constants.js @@ -306,7 +306,7 @@ global.TFC_DISABLED_ITEMS = /** @type {const} */ ([ "tfc:ore/ruby", "tfc:ore/sapphire", "tfc:ore/topaz", - + "tfc:ore/gypsum", "tfc:ore/graphite", "tfc:ore/sulfur", "tfc:ore/cinnabar", @@ -315,7 +315,6 @@ global.TFC_DISABLED_ITEMS = /** @type {const} */ ([ "tfc:ore/borax", "tfc:ore/bituminous_coal", "tfc:ore/lignite", - "tfc:ore/halite", // Axles "tfc:wood/axle/acacia", @@ -836,7 +835,7 @@ global.TFC_CLAY_TO_UNFIRED_MOLD_RECIPE_COMPONENTS = /** @type {const} */ ([ { input: "5x minecraft:clay_ball", output: "10x rnr:unfired_roof_tile", name: "roof_tile" }, { input: "5x minecraft:clay_ball", output: "firmalife:oven_top", name: "oven_top" }, { input: "5x minecraft:clay_ball", output: "firmalife:oven_chimney", name: "oven_chimney" }, - { input: "5x minecraft:clay_ball", output: "firmalife:oven_bottom", name: "oven_bottom" }, + { input: "5x minecraft:clay_ball", output: "firmalife:oven_bottom", name: "oven_bottom" } ]); global.TFC_FIRE_CLAY_TO_UNFIRED_MOLD_RECIPE_COMPONENTS = /** @type {const} */ ([ diff --git a/kubejs/startup_scripts/tfc/tag_prefixes.js b/kubejs/startup_scripts/tfc/tag_prefixes.js index 3bb8c59c8..8b864f8ac 100644 --- a/kubejs/startup_scripts/tfc/tag_prefixes.js +++ b/kubejs/startup_scripts/tfc/tag_prefixes.js @@ -5,7 +5,6 @@ const registerTFCTagPrefixes = (event) => { // These ores break worldgen if removed somehow? // TagPrefix.ORES.remove(TagPrefix.ore) - TagPrefix.ORES.remove(TagPrefix.oreDeepslate) TagPrefix.ORES.remove(TagPrefix.oreTuff) TagPrefix.ORES.remove(TagPrefix.oreSand) TagPrefix.ORES.remove(TagPrefix.oreRedSand) @@ -34,6 +33,8 @@ const registerTFCTagPrefixes = (event) => { .materialSupplier(() => material) .materialIconType(GTMaterialIconType.ore) .generationCondition(shouldGenerateOre) + + TFGHelpers.registerCobbleBlock(stoneTypeName, `tfc:rock/cobble/${stoneTypeName}`); }) // Custom stone types @@ -48,6 +49,8 @@ const registerTFCTagPrefixes = (event) => { .materialIconType(GTMaterialIconType.ore) .generationCondition(shouldGenerateOre) .materialSupplier(() => GTMaterials.Blackstone) + + TFGHelpers.registerCobbleBlock('pyroxenite', 'tfg:rock/cobble_blackstone'); event.create('dripstone', 'ore') .stateSupplier(() => Block.getBlock('minecraft:dripstone_block').defaultBlockState()) @@ -56,14 +59,8 @@ const registerTFCTagPrefixes = (event) => { .materialIconType(GTMaterialIconType.ore) .generationCondition(shouldGenerateOre) .materialSupplier(() => GTCEuAPI.materialManager.getMaterial('dripstone')) - // Redefine deepslate so it has the correct sound effects (yes I fixed this in GTM as well) - event.create('deepslate', 'ore') - .stateSupplier(() => Block.getBlock('minecraft:deepslate').defaultBlockState()) - .baseModelLocation('minecraft:block/deepslate') - .unificationEnabled(true) - .materialIconType(GTMaterialIconType.ore) - .generationCondition(shouldGenerateOre) - .materialSupplier(() => GTMaterials.Deepslate) + + TFGHelpers.registerCobbleBlock('dripstone', 'tfg:rock/cobble_dripstone'); event.create('moon_stone', 'ore') .stateSupplier(() => Block.getBlock('tfg:rock/hardened_moon_stone').defaultBlockState()) @@ -71,6 +68,8 @@ const registerTFCTagPrefixes = (event) => { .unificationEnabled(true) .materialIconType(GTMaterialIconType.ore) .generationCondition(shouldGenerateOre) + + TFGHelpers.registerCobbleBlock('moon_stone', 'ad_astra:moon_cobblestone'); event.create('moon_deepslate', 'ore') .stateSupplier(() => Block.getBlock('tfg:rock/hardened_moon_deepslate').defaultBlockState()) @@ -79,6 +78,8 @@ const registerTFCTagPrefixes = (event) => { .materialIconType(GTMaterialIconType.ore) .generationCondition(shouldGenerateOre) + TFGHelpers.registerCobbleBlock('moon_deepslate', 'tfg:rock/cobble_moon_deepslate'); + event.create('mars_stone', 'ore') .stateSupplier(() => Block.getBlock('tfg:rock/hardened_mars_stone').defaultBlockState()) .baseModelLocation('ad_astra:block/mars_stone') @@ -86,6 +87,8 @@ const registerTFCTagPrefixes = (event) => { .materialIconType(GTMaterialIconType.ore) .generationCondition(shouldGenerateOre) + TFGHelpers.registerCobbleBlock('mars_stone', 'ad_astra:mars_cobblestone'); + event.create('venus_stone', 'ore') .stateSupplier(() => Block.getBlock('tfg:rock/hardened_venus_stone').defaultBlockState()) .baseModelLocation('ad_astra:block/venus_stone') @@ -93,6 +96,8 @@ const registerTFCTagPrefixes = (event) => { .materialIconType(GTMaterialIconType.ore) .generationCondition(shouldGenerateOre) + TFGHelpers.registerCobbleBlock('venus_stone', 'ad_astra:venus_cobblestone'); + event.create('mercury_stone', 'ore') .stateSupplier(() => Block.getBlock('tfg:rock/hardened_mercury_stone').defaultBlockState()) .baseModelLocation('ad_astra:block/mercury_stone') @@ -100,10 +105,14 @@ const registerTFCTagPrefixes = (event) => { .materialIconType(GTMaterialIconType.ore) .generationCondition(shouldGenerateOre) + TFGHelpers.registerCobbleBlock('mercury_stone', 'ad_astra:mercury_cobblestone'); + event.create('glacio_stone', 'ore') .stateSupplier(() => Block.getBlock('tfg:rock/hardened_glacio_stone').defaultBlockState()) .baseModelLocation('ad_astra:block/glacio_stone') .unificationEnabled(true) .materialIconType(GTMaterialIconType.ore) .generationCondition(shouldGenerateOre) + + TFGHelpers.registerCobbleBlock('glacio_stone', 'ad_astra:glacio_cobblestone'); } \ No newline at end of file diff --git a/kubejs/startup_scripts/tfg/biotech/items.medicine.js b/kubejs/startup_scripts/tfg/biotech/items.medicine.js deleted file mode 100644 index a3584c88f..000000000 --- a/kubejs/startup_scripts/tfg/biotech/items.medicine.js +++ /dev/null @@ -1,69 +0,0 @@ -// priority: 0 -"use strict"; - -function registerTFGMedicineItems(event) { - const pill = [ - 'haste', - 'night_vision', - 'poison', - 'regeneration', - 'slowness', - 'speed', - 'water_breathing', - 'weakness' - ] - - const pill_names = [ - 'Haste', - 'Night Vision', - 'Poison', - 'Regeneration', - 'Slowness', - 'Speed', - 'Water Breathing', - 'Weakness' - ] - - pill.forEach((pill_array, index) => { - const pill_names_array = pill_names[index]; - - event.create(`tfg:${pill_array}_pill`) - .tooltip(`§9${pill_names_array} (08:00)`) - - event.create(`tfg:${pill_array}_tablet`) - .tooltip(`§9${pill_names_array} (30:00)`) - }) - - event.create(`tfg:antipoison_pill`) - .tooltip(`§9Cures Poison`) - - event.create(`tfg:antipoison_tablet`) - .tooltip(`§9Cures All Harmful Effects`) - - //salvos - - const salvo = [ - 'absorption', - 'fire_resistance', - 'invisibility', - 'luck', - 'resistance' - ] - const salvo_names = [ - 'Absorption', - 'Fire Resistance', - 'Invisibility', - 'Luck', - 'Resistance' - ] - - salvo.forEach((salvo_array, index) => { - const salvo_names_array = salvo_names[index]; - - event.create(`tfg:${salvo_array}_salvo`) - .tooltip(`§9${salvo_names_array} (08:00)`) - }) - - event.create(`tfg:instant_health_salvo`) - .tooltip(`§9Instant Health II`) -} \ No newline at end of file diff --git a/kubejs/startup_scripts/tfg/blocks.casings.js b/kubejs/startup_scripts/tfg/blocks.casings.js index b11f03bdd..0faab3877 100644 --- a/kubejs/startup_scripts/tfg/blocks.casings.js +++ b/kubejs/startup_scripts/tfg/blocks.casings.js @@ -116,6 +116,10 @@ function registerTFGCasingBlocks(event) { .tagBlock('gtceu:mineable/pickaxe_or_wrench') .mapColor('color_brown') + event.create('tfg:casings/test_casing') + .soundType('copper') + .hardness(5) + .resistance(6) + .tagBoth('c:hidden_from_recipe_viewers') - } \ No newline at end of file diff --git a/kubejs/startup_scripts/tfg/icon_sets.js b/kubejs/startup_scripts/tfg/icon_sets.js index 39e0c7b21..78a554510 100644 --- a/kubejs/startup_scripts/tfg/icon_sets.js +++ b/kubejs/startup_scripts/tfg/icon_sets.js @@ -91,6 +91,9 @@ function modifyTFGIconSets(event) { GTMaterials.BlackBronze.setMaterialIconSet(GTMaterialIconSet.SHINY) GTMaterials.Potin.setMaterialIconSet(GTMaterialIconSet.SHINY) GTMaterials.Cupronickel.setMaterialIconSet(GTMaterialIconSet.SHINY) + GTMaterials.ManganesePhosphide.setMaterialIconSet(GTMaterialIconSet.DULL) + GTMaterials.Osmium.setMaterialIconSet(GTMaterialIconSet.DULL) + GTMaterials.Invar.setMaterialIconSet(GTMaterialIconSet.DULL) GTMaterials.Aluminium.setMaterialIconSet(GTMaterialIconSet.getByName('tfc_silver')) GTMaterials.Asbestos.setMaterialIconSet(GTMaterialIconSet.getByName('tfc_gold')) diff --git a/kubejs/startup_scripts/tfg/items.food.js b/kubejs/startup_scripts/tfg/items.food.js index 2ff882c35..5ecfb2b58 100644 --- a/kubejs/startup_scripts/tfg/items.food.js +++ b/kubejs/startup_scripts/tfg/items.food.js @@ -92,6 +92,7 @@ function registerTFGFoodItems(event) { .texture('tfg:item/food/raw_moon_rabbit') .food(food => food.hunger(2).saturation(2) .effect('minecraft:hunger', 100, 0, 1)) + .tag('tfc:foods') .tag('tfc:foods/meats') .tag('tfc:foods/raw_meats') @@ -99,6 +100,7 @@ function registerTFGFoodItems(event) { .translationKey('item.tfg.food.cooked_moon_rabbit') .texture('tfg:item/food/cooked_moon_rabbit') .food(food => food.hunger(4).saturation(8)) + .tag('tfc:foods') .tag('tfc:foods/meats') .tag('tfc:foods/cooked_meats') @@ -108,6 +110,7 @@ function registerTFGFoodItems(event) { .texture('tfg:item/food/raw_glacian_mutton') .food(food => food.hunger(2).saturation(2) .effect('minecraft:hunger', 100, 0, 1)) + .tag('tfc:foods') .tag('tfc:foods/meats') .tag('tfc:foods/raw_meats') @@ -115,6 +118,7 @@ function registerTFGFoodItems(event) { .translationKey('item.tfg.food.cooked_glacian_mutton') .texture('tfg:item/food/cooked_glacian_mutton') .food(food => food.hunger(5).saturation(8)) + .tag('tfc:foods') .tag('tfc:foods/meats') .tag('tfc:foods/cooked_meats') @@ -124,6 +128,7 @@ function registerTFGFoodItems(event) { .texture('tfg:item/food/raw_sniffer_beef') .food(food => food.hunger(3).saturation(2) .effect('minecraft:hunger', 100, 0, 1)) + .tag('tfc:foods') .tag('tfc:foods/meats') .tag('tfc:foods/raw_meats') @@ -131,6 +136,7 @@ function registerTFGFoodItems(event) { .translationKey('item.tfg.food.cooked_sniffer_beef') .texture('tfg:item/food/cooked_sniffer_beef') .food(food => food.hunger(8).saturation(9)) + .tag('tfc:foods') .tag('tfc:foods/meats') .tag('tfc:foods/cooked_meats') @@ -140,6 +146,7 @@ function registerTFGFoodItems(event) { .texture('tfg:item/food/raw_wraptor') .food(food => food.hunger(3).saturation(2) .effect('minecraft:hunger', 100, 0, 1)) + .tag('tfc:foods') .tag('tfc:foods/meats') .tag('tfc:foods/raw_meats') @@ -147,6 +154,7 @@ function registerTFGFoodItems(event) { .translationKey('item.tfg.food.cooked_wraptor') .texture('tfg:item/food/cooked_wraptor') .food(food => food.hunger(6).saturation(8)) + .tag('tfc:foods') .tag('tfc:foods/meats') .tag('tfc:foods/cooked_meats') @@ -156,6 +164,7 @@ function registerTFGFoodItems(event) { .texture('tfg:item/food/raw_springling_collar') .food(food => food.hunger(2).saturation(2) .effect('minecraft:hunger', 100, 0, 1)) + .tag('tfc:foods') .tag('tfc:foods/meats') .tag('tfc:foods/raw_meats') @@ -163,6 +172,7 @@ function registerTFGFoodItems(event) { .translationKey('item.tfg.food.cooked_springling_chops') .texture('tfg:item/food/cooked_springling_collar') .food(food => food.hunger(4).saturation(4)) + .tag('tfc:foods') .tag('tfc:foods/meats') .tag('tfc:foods/cooked_meats') @@ -172,6 +182,7 @@ function registerTFGFoodItems(event) { .texture('tfg:item/food/raw_walker_steak') .food(food => food.hunger(3).saturation(2) .effect('minecraft:hunger', 100, 0, 1)) + .tag('tfc:foods') .tag('tfc:foods/meats') .tag('tfc:foods/raw_meats') @@ -179,6 +190,7 @@ function registerTFGFoodItems(event) { .translationKey('item.tfg.food.cooked_walker_steak') .texture('tfg:item/food/cooked_walker_steak') .food(food => food.hunger(8).saturation(10)) + .tag('tfc:foods') .tag('tfc:foods/meats') .tag('tfc:foods/cooked_meats') @@ -188,6 +200,7 @@ function registerTFGFoodItems(event) { .texture('tfg:item/food/raw_glider_wings') .food(food => food.hunger(1).saturation(1) .effect('minecraft:hunger', 100, 0, 1)) + .tag('tfc:foods') .tag('tfc:foods/meats') .tag('tfc:foods/raw_meats') @@ -195,6 +208,7 @@ function registerTFGFoodItems(event) { .translationKey('item.tfg.food.cooked_glider_wings') .texture('tfg:item/food/cooked_glider_wings') .food(food => food.hunger(2).saturation(3)) + .tag('tfc:foods') .tag('tfc:foods/meats') .tag('tfc:foods/cooked_meats') @@ -204,6 +218,7 @@ function registerTFGFoodItems(event) { .texture('tfg:item/food/raw_whole_soarer') .food(food => food.hunger(2).saturation(2) .effect('minecraft:hunger', 100, 0, 1)) + .tag('tfc:foods') .tag('tfc:foods/meats') .tag('tfc:foods/raw_meats') @@ -211,6 +226,7 @@ function registerTFGFoodItems(event) { .translationKey('item.tfg.food.cooked_whole_soarer') .texture('tfg:item/food/cooked_whole_soarer') .food(food => food.hunger(6).saturation(6)) + .tag('tfc:foods') .tag('tfc:foods/meats') .tag('tfc:foods/cooked_meats') @@ -220,6 +236,7 @@ function registerTFGFoodItems(event) { .texture('tfg:item/food/raw_crusher_meat') .food(food => food.hunger(3).saturation(2) .effect('minecraft:hunger', 100, 0, 1)) + .tag('tfc:foods') .tag('tfc:foods/meats') .tag('tfc:foods/raw_meats') @@ -227,6 +244,7 @@ function registerTFGFoodItems(event) { .translationKey('item.tfg.food.cooked_crusher_meat') .texture('tfg:item/food/cooked_crusher_meat') .food(food => food.hunger(5).saturation(6)) + .tag('tfc:foods') .tag('tfc:foods/meats') .tag('tfc:foods/cooked_meats') @@ -236,6 +254,7 @@ function registerTFGFoodItems(event) { .texture('tfg:item/food/raw_goober_meat') .food(food => food.hunger(1).saturation(2) .effect('minecraft:hunger', 100, 0, 1)) + .tag('tfc:foods') .tag('tfc:foods/meats') .tag('tfc:foods/raw_meats') @@ -243,6 +262,7 @@ function registerTFGFoodItems(event) { .translationKey('item.tfg.food.cooked_goober_meat') .texture('tfg:item/food/cooked_goober_meat') .food(food => food.hunger(3).saturation(9)) + .tag('tfc:foods') .tag('tfc:foods/meats') .tag('tfc:foods/cooked_meats') @@ -252,6 +272,7 @@ function registerTFGFoodItems(event) { .texture('tfg:item/food/raw_stackatick_chunks') .food(food => food.hunger(1).saturation(1) .effect('minecraft:hunger', 100, 0, 1)) + .tag('tfc:foods') .tag('tfc:foods/meats') .tag('tfc:foods/raw_meats') @@ -263,6 +284,7 @@ function registerTFGFoodItems(event) { .eaten(ctx => { ctx.player.give('minecraft:stick') })) + .tag('tfc:foods') .tag('tfc:foods/meats') .tag('tfc:foods/raw_meats') @@ -273,6 +295,7 @@ function registerTFGFoodItems(event) { .eaten(ctx => { ctx.player.give('minecraft:stick') })) + .tag('tfc:foods') .tag('tfc:foods/meats') .tag('tfc:foods/cooked_meats') @@ -282,6 +305,7 @@ function registerTFGFoodItems(event) { .texture('tfg:item/food/raw_cruncher_ribs') .food(food => food.hunger(2).saturation(2) .effect('minecraft:hunger', 100, 0, 1)) + .tag('tfc:foods') .tag('tfc:foods/meats') .tag('tfc:foods/raw_meats') @@ -289,6 +313,7 @@ function registerTFGFoodItems(event) { .translationKey('item.tfg.food.cooked_cruncher_ribs') .texture('tfg:item/food/cooked_cruncher_ribs') .food(food => food.hunger(10).saturation(14)) + .tag('tfc:foods') .tag('tfc:foods/meats') .tag('tfc:foods/cooked_meats') @@ -298,6 +323,7 @@ function registerTFGFoodItems(event) { .texture('tfg:item/food/raw_surfer_steak') .food(food => food.hunger(2).saturation(2) .effect('minecraft:hunger', 100, 0, 1)) + .tag('tfc:foods') .tag('tfc:foods/meats') .tag('tfc:foods/raw_meats') @@ -305,6 +331,7 @@ function registerTFGFoodItems(event) { .translationKey('item.tfg.food.cooked_surfer_steak') .texture('tfg:item/food/cooked_surfer_steak') .food(food => food.hunger(8).saturation(8)) + .tag('tfc:foods') .tag('tfc:foods/meats') .tag('tfc:foods/cooked_meats') @@ -314,6 +341,7 @@ function registerTFGFoodItems(event) { .texture('tfg:item/food/raw_long_pig_filet') .food(food => food.hunger(2).saturation(1) .effect('minecraft:hunger', 100, 0, 1)) + .tag('tfc:foods') .tag('tfc:foods/meats') .tag('tfc:foods/raw_meats') @@ -321,6 +349,7 @@ function registerTFGFoodItems(event) { .translationKey('item.tfg.food.cooked_long_pig_filet') .texture('tfg:item/food/cooked_long_pig_filet') .food(food => food.hunger(4).saturation(2)) + .tag('tfc:foods') .tag('tfc:foods/meats') .tag('tfc:foods/cooked_meats') @@ -358,7 +387,7 @@ function registerTFGFoodItems(event) { .texture('tfg:item/food/cooked_beer_battered_cheese_curds') .food(food => food.hunger(3).saturation(2)) .tag('tfc:foods') - .tag('tfc:foods/usable_in_burgers'); + .tag('tfg:foods/usable_in_burgers'); // French Fries event.create('tfg:food/raw_fries') @@ -372,7 +401,7 @@ function registerTFGFoodItems(event) { .texture('tfg:item/food/cooked_fries') .food(food => food.hunger(3).saturation(2)) .tag('tfc:foods') - .tag('tfc:foods/usable_in_burgers'); + .tag('tfg:foods/usable_in_burgers'); // Poutine event.create('tfg:food/poutine') @@ -438,13 +467,15 @@ function registerTFGFoodItems(event) { .tag('tfc:foods/usable_in_jam_sandwich_2') .tag('tfc:foods/usable_in_sandwich') .tag('tfg:foods/usable_in_meal_bag') - .tag('tfc:foods/dairy'); + .tag('tfc:foods/dairy') + .tag('tfc:pig_food') // Oatmeal event.create('tfg:food/oatmeal') .translationKey('item.tfg.food.oatmeal') .texture('tfg:item/food/oatmeal') - .food(food => food.hunger(8).saturation(8)); + .food(food => food.hunger(8).saturation(8)) + .tag('tfc:foods'); // Instant Mac event.create('tfg:food/raw_instant_mac') @@ -453,7 +484,8 @@ function registerTFGFoodItems(event) { .food(food => food.hunger(2).saturation(2) .eaten(ctx => { ctx.player.give('create:cardboard') - })); + })) + .tag('tfc:foods'); event.create('tfg:food/cooked_instant_mac') .translationKey('item.tfg.food.cooked_instant_mac') @@ -461,7 +493,8 @@ function registerTFGFoodItems(event) { .food(food => food.hunger(4).saturation(4) .eaten(ctx => { ctx.player.give('create:cardboard') - })); + })) + .tag('tfc:foods'); //#region Spices diff --git a/kubejs/startup_scripts/tfg/items.js b/kubejs/startup_scripts/tfg/items.js index 4183c56a8..a3c941093 100644 --- a/kubejs/startup_scripts/tfg/items.js +++ b/kubejs/startup_scripts/tfg/items.js @@ -11,7 +11,6 @@ const registerTFGItems = (event) => { registerTFGPrimitiveItems(event); registerTFGNuclearItems(event); registerTFGWoodItems(event); - registerTFGMedicineItems(event); registerTFGAircraftItems(event); registerTFGSpaceItems(event); registerTFGMarsItems(event); @@ -49,4 +48,38 @@ const registerTFGItems = (event) => { event.create('tfg:zpm_universal_circuit') event.create('tfg:uv_universal_circuit') event.create('tfg:uhv_universal_circuit') + + + // Temporary + event.create('gtceu:rose_quartz_dust').texture('tfg:item/deprecated') + event.create('gtceu:tiny_rose_quartz_dust').texture('tfg:item/deprecated') + event.create('gtceu:small_rose_quartz_dust').texture('tfg:item/deprecated') + event.create('gtceu:poor_raw_rose_quartz').texture('tfg:item/deprecated') + event.create('gtceu:raw_rose_quartz').texture('tfg:item/deprecated') + event.create('gtceu:rich_raw_rose_quartz').texture('tfg:item/deprecated') + event.create('gtceu:chipped_rose_quartz_gem').texture('tfg:item/deprecated') + event.create('gtceu:flawed_rose_quartz_gem').texture('tfg:item/deprecated') + event.create('gtceu:flawless_rose_quartz_gem').texture('tfg:item/deprecated') + event.create('gtceu:exquisite_rose_quartz_gem').texture('tfg:item/deprecated') + event.create('gtceu:pure_rose_quartz_dust').texture('tfg:item/deprecated') + event.create('gtceu:impure_rose_quartz_dust').texture('tfg:item/deprecated') + event.create('gtceu:purified_rose_quartz_ore').texture('tfg:item/deprecated') + event.create('gtceu:crushed_rose_quartz_ore').texture('tfg:item/deprecated') + event.create('gtceu:refined_rose_quartz_ore').texture('tfg:item/deprecated') + event.create('gtceu:rose_quartz_lens').texture('tfg:item/deprecated') + event.create('gtceu:rose_quartz_plate').texture('tfg:item/deprecated') + + // Add item for BTX Fuel + + event.create('tfg:catalyser_pt_re_zsm') + .translationKey('item.tfg.catalyser_pt_re_zsm') + .texture('tfg:item/btx/catalyser_zsm') + + event.create('tfg:used_catalyser') + .translationKey('item.tfg.used_catalyser') + .texture('tfg:item/btx/used_catalyser') + + event.create('tfg:loaded_resin') + .translationKey('item.tfg.loaded_resin') + .texture('tfg:item/btx/loaded_resin') } diff --git a/kubejs/startup_scripts/tfg/mars/materials.mars.js b/kubejs/startup_scripts/tfg/mars/materials.mars.js index e03e5dc76..58eeab18a 100644 --- a/kubejs/startup_scripts/tfg/mars/materials.mars.js +++ b/kubejs/startup_scripts/tfg/mars/materials.mars.js @@ -96,6 +96,7 @@ function registerTFGMarsMaterials(event) { event.create("ostrum_iodide") .ingot() + .liquid() .components('2x ostrum', 'iodine') .blastTemp(3700, 'mid', GTValues.VA[GTValues.IV], (20*120)) .iconSet(GTMaterialIconSet.BRIGHT) diff --git a/kubejs/startup_scripts/tfg/materials.js b/kubejs/startup_scripts/tfg/materials.js index 707ad6423..47c0f10df 100644 --- a/kubejs/startup_scripts/tfg/materials.js +++ b/kubejs/startup_scripts/tfg/materials.js @@ -20,6 +20,7 @@ const registerTFGMaterials = (event) => { registerTFGPowerReworkMaterials(event); registerTFGNuclearMaterials(event); + registerTFGSMRAdditiveMaterials(event) registerTFGBiolineMaterials(event); registerTFGPrimitiveMaterials(event); registerTFGRockMaterials(event); @@ -112,7 +113,9 @@ const registerTFGMaterials = (event) => { GTMaterialFlags.GENERATE_ROD, GTMaterialFlags.GENERATE_BOLT_SCREW, GTMaterialFlags.EXCLUDE_BLOCK_CRAFTING_BY_HAND_RECIPES, - GTMaterialFlags.GENERATE_GEAR + GTMaterialFlags.GENERATE_GEAR, + GTMaterialFlags.GENERATE_FOIL, + GTMaterialFlags.GENERATE_FINE_WIRE ) .fluidPipeProperties(4250, 1700, true, false, false, false) diff --git a/kubejs/startup_scripts/tfg/materials.power_rework.js b/kubejs/startup_scripts/tfg/materials.power_rework.js index 7c062d24b..30e215278 100644 --- a/kubejs/startup_scripts/tfg/materials.power_rework.js +++ b/kubejs/startup_scripts/tfg/materials.power_rework.js @@ -52,4 +52,90 @@ const registerTFGPowerReworkMaterials = (event) => { .gas(new GTFluidBuilder().state(GTFluidState.GAS).customStill().temperature(540)) .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) + //#region Materials for BTX + + // Propylene + event.create('tfg:propylene') + .gas(new GTFluidBuilder().state(GTFluidState.GAS).temperature(350)) + .components('3x carbon', '6x hydrogen') + .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) + .color(0xffb347) + .secondaryColor(0xffe0b2) + + // Crude Mixed Gas + event.create('tfg:crude_mixed_gas') + .gas(new GTFluidBuilder().state(GTFluidState.GAS).temperature(500)) + .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) + .color(0x9bb6c9) + .secondaryColor(0xd7e7ef) + + // Sodium Silicate + event.create('tfg:sodium_silicate') + .liquid(new GTFluidBuilder().temperature(293)) + .components('1x sodium', '1x silicon', '4x oxygen', '4x hydrogen') + .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) + .color(0xcce0f0) + .secondaryColor(0xa9c6db) + + // Sodium Aluminium + event.create('tfg:sodium_aluminium') + .dust() + .components('2x sodium', '1x aluminium', '2x oxygen') + .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) + .iconSet(GTMaterialIconSet.FLINT) + .color(0xf0e68c) + .secondaryColor(0xded7a8) + + // TPAOH + event.create('tfg:tpaoh') + .liquid(new GTFluidBuilder().temperature(293)) + .components('2x carbon', '9x hydrogen', '1x nitrogen', '1x oxygen', '2x sodium') + .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) + .color(0xffd8b1) + .secondaryColor(0xe6b88f) + + // ZSM-5 Gel + event.create('tfg:zsm5_gel') + .liquid(new GTFluidBuilder().temperature(323)) + .components('24x carbon', '128x hydrogen', '12x nitrogen', '5x silicon', '1x aluminium', '34x oxygen', '31x sodium') + .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) + .color(0xf2e8d6) + .secondaryColor(0xd0c4b0) + + // Catalyser Powder + event.create('tfg:catalyser_powder') + .dust() + .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) + .iconSet(GTMaterialIconSet.FLINT) + .color(0x7f7f7f) + .secondaryColor(0xcfcfcf) + + // Clean Powder + event.create('tfg:clean_powder') + .dust() + .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) + .iconSet(GTMaterialIconSet.FLINT) + .color(0xffffff) + .secondaryColor(0xdfe6e6) + + // Leachate + event.create('tfg:leachate') + .liquid(new GTFluidBuilder().temperature(298)) + .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) + .color(0xbfd6d0) + .secondaryColor(0x8fbdb0) + + // Metal Rich Solution + event.create('tfg:metal_rich_solution') + .liquid(new GTFluidBuilder().temperature(298)) + .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) + .color(0xb56f5a) + .secondaryColor(0xd9b0a3) + + // Aciditic Waste + event.create('tfg:aciditic_waste') + .liquid(new GTFluidBuilder().attribute(GTFluidAttributes.ACID)) + .color(0x9df2b4) + .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) + } diff --git a/kubejs/startup_scripts/tfg/nuclear/blocks.nuclear.js b/kubejs/startup_scripts/tfg/nuclear/blocks.nuclear.js index e1a5954ae..ca75d5ef3 100644 --- a/kubejs/startup_scripts/tfg/nuclear/blocks.nuclear.js +++ b/kubejs/startup_scripts/tfg/nuclear/blocks.nuclear.js @@ -51,13 +51,14 @@ function registerTFGNuclearBlocks(event) { .tagBlock('gtceu:mineable/pickaxe_or_wrench') .mapColor('color_black') .speedFactor(1.1) - .activeOffset(3.5, 2, 3.5) + .activeOffset(2, 2, 2) .activeVelocity(0.0, 0.0, 0.0) .activeParticle('tfg:cooling_steam') - .activeBase(0.0, 12.5, 0.0) - .activeCount(8) + .activeBase(0.0, 13.5, 0.0) + .activeCount(2) .activeForced(false) - .hasTicker(true) + .hasTicker(true) + .emitDelay(4); event.create('tfg:titanium_concrete') .translationKey('block.tfg.titanium_concrete') diff --git a/kubejs/startup_scripts/tfg/nuclear/materials.smr_additives.js b/kubejs/startup_scripts/tfg/nuclear/materials.smr_additives.js new file mode 100644 index 000000000..0e60005c2 --- /dev/null +++ b/kubejs/startup_scripts/tfg/nuclear/materials.smr_additives.js @@ -0,0 +1,28 @@ +// priority: 0 +"use strict"; + +const registerTFGSMRAdditiveMaterials = (event) => { + + event.create('tfg:ozone') + .gas() + .components('3x oxygen') + .color(0x00FBFF) + + event.create('tfg:tin_chloride') + .dust() + .components('1x tin', '2x chlorine') + .color(0x77CF67) + .iconSet(GTMaterialIconSet.ROUGH) + + event.create('tfg:cyclohexanone') + .liquid() + .components('6x carbon', '10x hydrogen', '1x oxygen') + .color(0xFCB16F) + + event.create('tfg:cyclohex_diperoxide') + .liquid() + .components('6x carbon', '12x hydrogen', '4x oxygen') + .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) + .color(0xBC8E63) + +} \ No newline at end of file diff --git a/kubejs/startup_scripts/tfg/tag_prefixes.js b/kubejs/startup_scripts/tfg/tag_prefixes.js index 4e1ef1d21..8d9f53cb6 100644 --- a/kubejs/startup_scripts/tfg/tag_prefixes.js +++ b/kubejs/startup_scripts/tfg/tag_prefixes.js @@ -7,6 +7,7 @@ function registerTFGTagPrefixes(event) { excludeAllGemsButNormal(TFGHelpers.getMaterial('tfg:tetrafluoroethane')); excludeAllGemsButNormal(TFGHelpers.getMaterial('tfg:crimsene')); excludeAllGemsButNormal(TFGHelpers.getMaterial('tfg:warpane')); + excludeAllGemsButNormal(GTMaterials.Coke) TagPrefix.nugget.setIgnored(GTMaterials.RawRubber); TagPrefix.ingot.setIgnored(GTMaterials.RawRubber); diff --git a/kubejs/startup_scripts/tfg/venus/blocks.venus_deco.js b/kubejs/startup_scripts/tfg/venus/blocks.venus_deco.js index 225b263e2..48ebb4aa1 100644 --- a/kubejs/startup_scripts/tfg/venus/blocks.venus_deco.js +++ b/kubejs/startup_scripts/tfg/venus/blocks.venus_deco.js @@ -56,15 +56,6 @@ function registerTFGWorldGenVenusDecoBlocks(event) { .tagBlock('minecraft:mineable/pickaxe') .fullBlock(true) .opaque(true) - event.create('tfg:rock/halite2') - .mapColor('snow') - .soundType('deepslate') - .hardness(0.8) - .resistance(0.8) - .requiresTool(true) - .tagBlock('minecraft:mineable/pickaxe') - .fullBlock(true) - .opaque(true) //Stromatolite event.create('tfg:rock/raw/stromatolite', 'tfc:raw_rock') diff --git a/pakku-lock.json b/pakku-lock.json index 580a6d6fe..60da72190 100644 --- a/pakku-lock.json +++ b/pakku-lock.json @@ -960,33 +960,9 @@ "modrinth": "fM515JnW" }, "files": [ - { - "type": "curseforge", - "file_name": "AmbientSounds_FORGE_v6.1.11_mc1.20.1.jar", - "mc_versions": [ - "1.20.1" - ], - "loaders": [ - "neoforge", - "forge" - ], - "release_type": "release", - "url": "https://edge.forgecdn.net/files/6570/130/AmbientSounds_FORGE_v6.1.11_mc1.20.1.jar", - "id": "6570130", - "parent_id": "254284", - "hashes": { - "sha1": "af412170c07febfb5c611b7237d806230dc83584", - "md5": "78270b771d833d9f2936a2bd95a7ec21" - }, - "required_dependencies": [ - "257814" - ], - "size": 51722248, - "date_published": "2025-05-26T09:57:49.020Z" - }, { "type": "modrinth", - "file_name": "AmbientSounds_FORGE_v6.1.11_mc1.20.1.jar", + "file_name": "AmbientSounds_FORGE_v6.3.1_mc1.20.1.jar", "mc_versions": [ "1.20.1" ], @@ -995,18 +971,42 @@ "neoforge" ], "release_type": "release", - "url": "https://cdn.modrinth.com/data/fM515JnW/versions/lDrRWaFm/AmbientSounds_FORGE_v6.1.11_mc1.20.1.jar", - "id": "lDrRWaFm", + "url": "https://cdn.modrinth.com/data/fM515JnW/versions/5b052xpX/AmbientSounds_FORGE_v6.3.1_mc1.20.1.jar", + "id": "5b052xpX", "parent_id": "fM515JnW", "hashes": { - "sha512": "0754b6afd97f0b3d2a991303e9f1d70512dabe5f490a6b86de99602f4d787da17222c3aa6ffff74633e4b40472e1ccaab5b5a1d7a967c788b89334749d475ad9", - "sha1": "af412170c07febfb5c611b7237d806230dc83584" + "sha512": "c453e9a79725d54db8a754a0ed9f94c51b5cbe448dae46af2fa7de39dc109ce9d3d28ab448127271fa75fb5d6156534e36d9b6a9efd6bb85bd4022cc173935ac", + "sha1": "b6c676fbe4e586de6c266190943c069a0a49104d" }, "required_dependencies": [ "OsZiaDHq" ], - "size": 51722248, - "date_published": "2025-05-26T09:58:10.235049Z" + "size": 52449474, + "date_published": "2025-12-11T19:02:45.759230Z" + }, + { + "type": "curseforge", + "file_name": "AmbientSounds_FORGE_v6.3.1_mc1.20.1.jar", + "mc_versions": [ + "1.20.1" + ], + "loaders": [ + "forge", + "neoforge" + ], + "release_type": "release", + "url": "https://edge.forgecdn.net/files/7321/586/AmbientSounds_FORGE_v6.3.1_mc1.20.1.jar", + "id": "7321586", + "parent_id": "254284", + "hashes": { + "sha1": "b6c676fbe4e586de6c266190943c069a0a49104d", + "md5": "ce88224be844787f70b3e2d0ea40ffac" + }, + "required_dependencies": [ + "257814" + ], + "size": 52449474, + "date_published": "2025-12-11T19:02:20.783Z" } ] }, @@ -1424,39 +1424,15 @@ "type": "MOD", "side": "SERVER", "slug": { - "curseforge": "baguettelib", - "modrinth": "baguettelib" + "curseforge": "baguettelib" }, "name": { - "curseforge": "BaguetteLib", - "modrinth": "BaguetteLib" + "curseforge": "BaguetteLib" }, "id": { - "curseforge": "1264423", - "modrinth": "OfKzpbRU" + "curseforge": "1264423" }, "files": [ - { - "type": "modrinth", - "file_name": "baguettelib-1.20.1-Forge-1.1.1.jar", - "mc_versions": [ - "1.20.1" - ], - "loaders": [ - "forge" - ], - "release_type": "release", - "url": "https://cdn.modrinth.com/data/OfKzpbRU/versions/zcwsIJEa/baguettelib-1.20.1-Forge-1.1.1.jar", - "id": "zcwsIJEa", - "parent_id": "OfKzpbRU", - "hashes": { - "sha512": "0e9f34e0e8d8703269fd6d26a3635268d8f01d79c17355a85f07cd3cf382e84d23635c9715522e3839091caed6db723984b4df569fd06b042557fcf7f46f0f08", - "sha1": "eb060d8ed625c2ed9182db62e60154bb94c69046" - }, - "required_dependencies": [], - "size": 30312, - "date_published": "2025-09-27T08:33:58.185785Z" - }, { "type": "curseforge", "file_name": "baguettelib-1.20.1-Forge-1.1.5.jar", @@ -5147,7 +5123,7 @@ "files": [ { "type": "modrinth", - "file_name": "entityculling-forge-1.9.3-mc1.20.1.jar", + "file_name": "entityculling-forge-1.9.4-mc1.20.1.jar", "mc_versions": [ "1.20.1" ], @@ -5155,20 +5131,20 @@ "forge" ], "release_type": "release", - "url": "https://cdn.modrinth.com/data/NNAgCjsB/versions/H7zaVcD6/entityculling-forge-1.9.3-mc1.20.1.jar", - "id": "H7zaVcD6", + "url": "https://cdn.modrinth.com/data/NNAgCjsB/versions/GpUlMGON/entityculling-forge-1.9.4-mc1.20.1.jar", + "id": "GpUlMGON", "parent_id": "NNAgCjsB", "hashes": { - "sha512": "62429153a72f509877bae38c6e3e651ff241114c3608fdf6f2e412a6df0acec1da318e50a8dd3a2468fbddcc16c3e412910e0e09b9d1f94d6b0312bfe8b07e9d", - "sha1": "8faea4818faab6b870ee370b52434b016542b519" + "sha512": "f8f9ce531f7f878443a29cb12eed5dd40b25faf83d8fab8fef99b2e6058c5e6ac3d3fb6602abb4669e79b294dc8a9ecec324f632e0a637f70b09a5b6f402b70e", + "sha1": "2b19c5c38f88285aed2aad6a61eb622003540ee5" }, "required_dependencies": [], - "size": 477884, - "date_published": "2025-10-30T19:05:52.890832Z" + "size": 1568324, + "date_published": "2025-12-09T21:09:58.011151Z" }, { "type": "curseforge", - "file_name": "entityculling-forge-1.9.3-mc1.20.1.jar", + "file_name": "entityculling-forge-1.9.4-mc1.20.1.jar", "mc_versions": [ "1.20.1" ], @@ -5176,16 +5152,16 @@ "forge" ], "release_type": "release", - "url": "https://edge.forgecdn.net/files/7167/800/entityculling-forge-1.9.3-mc1.20.1.jar", - "id": "7167800", + "url": "https://edge.forgecdn.net/files/7313/354/entityculling-forge-1.9.4-mc1.20.1.jar", + "id": "7313354", "parent_id": "448233", "hashes": { - "sha1": "8faea4818faab6b870ee370b52434b016542b519", - "md5": "ae4f74f187b64f3b107e97b949e4a9e8" + "sha1": "2b19c5c38f88285aed2aad6a61eb622003540ee5", + "md5": "fdc791c2247535f6602650a3cc6f8f36" }, "required_dependencies": [], - "size": 477884, - "date_published": "2025-10-30T19:05:50.793Z" + "size": 1568324, + "date_published": "2025-12-09T21:09:55.243Z" } ] }, @@ -6049,34 +6025,9 @@ "modrinth": "9mtu0sUO" }, "files": [ - { - "type": "curseforge", - "file_name": "fast-ip-ping-v1.0.7-mc1.20.4-forge.jar", - "mc_versions": [ - "1.20.2", - "1.20.3", - "1.20.1", - "1.20", - "1.20.4" - ], - "loaders": [ - "forge" - ], - "release_type": "release", - "url": "https://edge.forgecdn.net/files/6666/671/fast-ip-ping-v1.0.7-mc1.20.4-forge.jar", - "id": "6666671", - "parent_id": "904356", - "hashes": { - "sha1": "253d21fd87657e6dc1e451c9758f5daaa71b86c8", - "md5": "d1e81c87cc785a956f5972a3b0d2e7f2" - }, - "required_dependencies": [], - "size": 10557, - "date_published": "2025-06-18T15:25:05.557Z" - }, { "type": "modrinth", - "file_name": "fast-ip-ping-v1.0.7-mc1.20.4-forge.jar", + "file_name": "fast-ip-ping-v1.0.8-mc1.20.4-forge.jar", "mc_versions": [ "1.20", "1.20.1", @@ -6088,16 +6039,41 @@ "forge" ], "release_type": "release", - "url": "https://cdn.modrinth.com/data/9mtu0sUO/versions/W1Wnmkqh/fast-ip-ping-v1.0.7-mc1.20.4-forge.jar", - "id": "W1Wnmkqh", + "url": "https://cdn.modrinth.com/data/9mtu0sUO/versions/1Psj7GtQ/fast-ip-ping-v1.0.8-mc1.20.4-forge.jar", + "id": "1Psj7GtQ", "parent_id": "9mtu0sUO", "hashes": { - "sha512": "5223cd922b4f32faf8e6263976d39ead51e12dc332a16eacfddd11196872609b1d905673ab707f38d62f5d3f9c243dc51bb62bf3f8179d15a006c616feb48be8", - "sha1": "253d21fd87657e6dc1e451c9758f5daaa71b86c8" + "sha512": "4c016afaf112b8664529a419f1188d2a4211d41a8a4fe1420d6b679eb134d5c1085e53e06f83ec7a0686c8faf5f59c2c3c0d7c321ed868f075731d7681cfb313", + "sha1": "ceeeae222c51ae100e5126c4a5a7a05f4f3f4712" }, "required_dependencies": [], - "size": 10557, - "date_published": "2025-06-18T15:27:06.998981Z" + "size": 10331, + "date_published": "2025-12-10T19:52:27.401005Z" + }, + { + "type": "curseforge", + "file_name": "fast-ip-ping-v1.0.8-mc1.20.4-forge.jar", + "mc_versions": [ + "1.20.2", + "1.20.1", + "1.20", + "1.20.4", + "1.20.3" + ], + "loaders": [ + "forge" + ], + "release_type": "release", + "url": "https://edge.forgecdn.net/files/7317/271/fast-ip-ping-v1.0.8-mc1.20.4-forge.jar", + "id": "7317271", + "parent_id": "904356", + "hashes": { + "sha1": "ceeeae222c51ae100e5126c4a5a7a05f4f3f4712", + "md5": "cc7cb94b42e4da21a1010f906d0e149a" + }, + "required_dependencies": [], + "size": 10331, + "date_published": "2025-12-10T19:52:26.030Z" } ] }, @@ -6676,33 +6652,9 @@ "modrinth": "hYykXjDp" }, "files": [ - { - "type": "curseforge", - "file_name": "fzzy_config-0.7.3+1.20.1+forge.jar", - "mc_versions": [ - "1.20.1" - ], - "loaders": [ - "neoforge", - "forge" - ], - "release_type": "release", - "url": "https://edge.forgecdn.net/files/7085/17/fzzy_config-0.7.3+1.20.1+forge.jar", - "id": "7085017", - "parent_id": "1005914", - "hashes": { - "sha1": "e771e543e930bd7c733f803bdbc0d3f2ecfb46c4", - "md5": "bcbfb7e94f16a15ad5d13fb4999a5b78" - }, - "required_dependencies": [ - "351264" - ], - "size": 2312969, - "date_published": "2025-10-09T02:39:14.310Z" - }, { "type": "modrinth", - "file_name": "fzzy_config-0.7.3+1.20.1+forge.jar", + "file_name": "fzzy_config-0.7.4+1.20.1+forge.jar", "mc_versions": [ "1.20.1" ], @@ -6711,18 +6663,42 @@ "neoforge" ], "release_type": "release", - "url": "https://cdn.modrinth.com/data/hYykXjDp/versions/17Wzgyxp/fzzy_config-0.7.3+1.20.1+forge.jar", - "id": "17Wzgyxp", + "url": "https://cdn.modrinth.com/data/hYykXjDp/versions/wnhd0CI1/fzzy_config-0.7.4+1.20.1+forge.jar", + "id": "wnhd0CI1", "parent_id": "hYykXjDp", "hashes": { - "sha512": "32d44d05790f9ac9fb4d04385beefbd2d59822d48288239068ae1cc0c10d3b60567b388a0bcd4b98b4bf8716bd94b6a934596c1766f31e8788aa069e76bb178c", - "sha1": "e771e543e930bd7c733f803bdbc0d3f2ecfb46c4" + "sha512": "108f00ce546fd87ae2be853233bfe8f4deeb6abad6a61769a4ddf2735db098fd42d9b0a6ab1f98974717235e9fdf122767bdff82c042cd972cdbc14add039ebf", + "sha1": "b0213984f7591c3d1ec4ab5eebd87c605728d451" }, "required_dependencies": [ "ordsPcFz" ], - "size": 2312969, - "date_published": "2025-10-09T02:39:22.899396Z" + "size": 2353402, + "date_published": "2025-12-14T05:56:34.040088Z" + }, + { + "type": "curseforge", + "file_name": "fzzy_config-0.7.4+1.20.1+forge.jar", + "mc_versions": [ + "1.20.1" + ], + "loaders": [ + "forge", + "neoforge" + ], + "release_type": "release", + "url": "https://edge.forgecdn.net/files/7331/237/fzzy_config-0.7.4+1.20.1+forge.jar", + "id": "7331237", + "parent_id": "1005914", + "hashes": { + "sha1": "b0213984f7591c3d1ec4ab5eebd87c605728d451", + "md5": "b6bcf0a1abc530257fcaa054157a8a16" + }, + "required_dependencies": [ + "351264" + ], + "size": 2353402, + "date_published": "2025-12-14T05:56:25.963Z" } ] }, @@ -6946,7 +6922,7 @@ "files": [ { "type": "modrinth", - "file_name": "greate-0.0.57.jar", + "file_name": "greate-0.0.58.jar", "mc_versions": [ "1.20.1" ], @@ -6955,23 +6931,23 @@ "neoforge" ], "release_type": "alpha", - "url": "https://cdn.modrinth.com/data/8wDcQuht/versions/D1FDmRDa/greate-0.0.57.jar", - "id": "D1FDmRDa", + "url": "https://cdn.modrinth.com/data/8wDcQuht/versions/TT9ck8vt/greate-0.0.58.jar", + "id": "TT9ck8vt", "parent_id": "8wDcQuht", "hashes": { - "sha512": "47b814782e431dc9dc8f17cc6591c6fc8874f094d80b311065e3b6bebed8d8559313d7de3b8613b17c66bf6f2c1311141995e65a34bced89ff862d0d2a0696c6", - "sha1": "de882a9d6be660e27834823ce33caaaca834d24c" + "sha512": "646589a6f6278e42af03860a85dfd864fd620f1b4825f340781285736417307f4803c32ec5615045c207fd75d64a137268bff661432f35f4431f339a1905a82f", + "sha1": "52e244f91ecb56a69bcdec6d22a83047475eeb34" }, "required_dependencies": [ - "LNytGWDc", - "7tG215v7" + "7tG215v7", + "LNytGWDc" ], - "size": 1518380, - "date_published": "2025-11-25T19:56:33.474491Z" + "size": 1466358, + "date_published": "2025-12-14T02:44:12.871560Z" }, { "type": "curseforge", - "file_name": "greate-0.0.57.jar", + "file_name": "greate-0.0.58.jar", "mc_versions": [ "1.20.1" ], @@ -6980,19 +6956,19 @@ "neoforge" ], "release_type": "alpha", - "url": "https://edge.forgecdn.net/files/7262/33/greate-0.0.57.jar", - "id": "7262033", + "url": "https://edge.forgecdn.net/files/7330/800/greate-0.0.58.jar", + "id": "7330800", "parent_id": "901996", "hashes": { - "sha1": "de882a9d6be660e27834823ce33caaaca834d24c", - "md5": "2a74c594a5e559ca63ef375f1286afda" + "sha1": "52e244f91ecb56a69bcdec6d22a83047475eeb34", + "md5": "137b5a28b5ec63caaeb004f2520a7b9c" }, "required_dependencies": [ "328085", "890405" ], - "size": 1518380, - "date_published": "2025-11-25T19:56:30.993Z" + "size": 1466358, + "date_published": "2025-12-14T02:44:10.940Z" } ] }, @@ -7489,7 +7465,7 @@ "files": [ { "type": "modrinth", - "file_name": "ImmediatelyFast-Forge-1.5.2+1.20.4.jar", + "file_name": "ImmediatelyFast-Forge-1.5.3+1.20.4.jar", "mc_versions": [ "1.20", "1.20.1", @@ -7501,41 +7477,41 @@ "forge" ], "release_type": "release", - "url": "https://cdn.modrinth.com/data/5ZwdcRci/versions/aFMmx5Ig/ImmediatelyFast-Forge-1.5.2+1.20.4.jar", - "id": "aFMmx5Ig", + "url": "https://cdn.modrinth.com/data/5ZwdcRci/versions/a4stvpj6/ImmediatelyFast-Forge-1.5.3+1.20.4.jar", + "id": "a4stvpj6", "parent_id": "5ZwdcRci", "hashes": { - "sha512": "648cd5c451f8e5b4c7404179b75d4044aa14501c832a38e09877de74902e2ce3156af1cb936c91b48cd6210d1e576f0808142ca24a0d291990fdf245ff2da993", - "sha1": "2eeca5deb063ed49bb9c6be8b162ca6270202239" + "sha512": "ef57ecc7aa7138c1b06fac6d6b49707d6ef324b6220cd604f567cfdbabd5b9ca0e76a2a4ed354d08029976c773f40c65b7692372a3f70637d7ae446be2b3ace0", + "sha1": "d4695d013e9da7089e2906db3f56bc5398e478e2" }, "required_dependencies": [], - "size": 425140, - "date_published": "2025-09-14T19:20:09.156785Z" + "size": 426980, + "date_published": "2025-12-09T20:19:33.206344Z" }, { "type": "curseforge", - "file_name": "ImmediatelyFast-Forge-1.5.2+1.20.4.jar", + "file_name": "ImmediatelyFast-Forge-1.5.3+1.20.4.jar", "mc_versions": [ "1.20.2", - "1.20.3", "1.20.1", "1.20", - "1.20.4" + "1.20.4", + "1.20.3" ], "loaders": [ "forge" ], "release_type": "release", - "url": "https://edge.forgecdn.net/files/6997/261/ImmediatelyFast-Forge-1.5.2+1.20.4.jar", - "id": "6997261", + "url": "https://edge.forgecdn.net/files/7313/94/ImmediatelyFast-Forge-1.5.3+1.20.4.jar", + "id": "7313094", "parent_id": "686911", "hashes": { - "sha1": "2eeca5deb063ed49bb9c6be8b162ca6270202239", - "md5": "a9497bda5f3fd160c248d4a8d4499e15" + "sha1": "d4695d013e9da7089e2906db3f56bc5398e478e2", + "md5": "1e5278b2585bab1db76d4b1ab61e82c1" }, "required_dependencies": [], - "size": 425140, - "date_published": "2025-09-14T19:20:08.770Z" + "size": 426980, + "date_published": "2025-12-09T20:19:33.393Z" } ] }, @@ -9269,27 +9245,6 @@ "modrinth": "efD07SBK" }, "files": [ - { - "type": "curseforge", - "file_name": "ags_modernmarkings-0.4.3-1.20.1.jar", - "mc_versions": [ - "1.20.1" - ], - "loaders": [ - "forge" - ], - "release_type": "release", - "url": "https://edge.forgecdn.net/files/6768/454/ags_modernmarkings-0.4.3-1.20.1.jar", - "id": "6768454", - "parent_id": "1267477", - "hashes": { - "sha1": "45d788e6a37c3bdcf5a235caa6a43694cb09e8b4", - "md5": "04d0df2ac6d6ccda0683771c8112256f" - }, - "required_dependencies": [], - "size": 305660, - "date_published": "2025-07-14T16:27:45.340Z" - }, { "type": "modrinth", "file_name": "ags_modernmarkings-0.4.3-1.20.1.jar", @@ -9310,6 +9265,27 @@ "required_dependencies": [], "size": 305660, "date_published": "2025-07-14T16:28:57.389265Z" + }, + { + "type": "curseforge", + "file_name": "ags_modernmarkings-0.4.4-1.20.1.jar", + "mc_versions": [ + "1.20.1" + ], + "loaders": [ + "forge" + ], + "release_type": "release", + "url": "https://edge.forgecdn.net/files/7339/889/ags_modernmarkings-0.4.4-1.20.1.jar", + "id": "7339889", + "parent_id": "1267477", + "hashes": { + "sha1": "8102920535de97d06c4c7b05a39f44dd237a13f3", + "md5": "0f577579897a88bb2244634dc64a8e7d" + }, + "required_dependencies": [], + "size": 307489, + "date_published": "2025-12-16T10:02:13.160Z" } ] }, @@ -9825,7 +9801,7 @@ "files": [ { "type": "modrinth", - "file_name": "notenoughanimations-forge-1.10.6-mc1.20.1.jar", + "file_name": "notenoughanimations-forge-1.11.1-mc1.20.1.jar", "mc_versions": [ "1.20.1" ], @@ -9833,20 +9809,20 @@ "forge" ], "release_type": "release", - "url": "https://cdn.modrinth.com/data/MPCX6s5C/versions/7KhtEU40/notenoughanimations-forge-1.10.6-mc1.20.1.jar", - "id": "7KhtEU40", + "url": "https://cdn.modrinth.com/data/MPCX6s5C/versions/cfiRPrQF/notenoughanimations-forge-1.11.1-mc1.20.1.jar", + "id": "cfiRPrQF", "parent_id": "MPCX6s5C", "hashes": { - "sha512": "d6c3322b260fdf7ad5e06c5340593b84df601ee638b2195712e31834936c4d8a96b3afb4f9a673163bea20283a01c1ef6c186ebc6b5e3bb83b966bba79945b7a", - "sha1": "408c8497c263c03edfe432549ef08dc48c6230ed" + "sha512": "9335ace46a9f6477df026f19cab08c656fc7c0a7f1069eedfdadbba01bfd2ad43f9e90a0bb5ef8e867d51608dddcf85fa9653eb178f4a0e6e6bcfb45d0959270", + "sha1": "9aa8917d7c0a5311dc495da3c720434de49e0e24" }, "required_dependencies": [], - "size": 843250, - "date_published": "2025-10-20T12:41:37.262065Z" + "size": 1933839, + "date_published": "2025-12-12T19:11:52.494096Z" }, { "type": "curseforge", - "file_name": "notenoughanimations-forge-1.10.6-mc1.20.1.jar", + "file_name": "notenoughanimations-forge-1.11.1-mc1.20.1.jar", "mc_versions": [ "1.20.1" ], @@ -9854,16 +9830,16 @@ "forge" ], "release_type": "release", - "url": "https://edge.forgecdn.net/files/7129/302/notenoughanimations-forge-1.10.6-mc1.20.1.jar", - "id": "7129302", + "url": "https://edge.forgecdn.net/files/7325/366/notenoughanimations-forge-1.11.1-mc1.20.1.jar", + "id": "7325366", "parent_id": "433760", "hashes": { - "sha1": "408c8497c263c03edfe432549ef08dc48c6230ed", - "md5": "228f7b821bb9e475e1ec38868da56f65" + "sha1": "9aa8917d7c0a5311dc495da3c720434de49e0e24", + "md5": "34fd79756da8b5278a5b0905d98ffeca" }, "required_dependencies": [], - "size": 843250, - "date_published": "2025-10-20T12:41:36.527Z" + "size": 1933839, + "date_published": "2025-12-12T19:11:51.067Z" } ] }, @@ -11146,34 +11122,9 @@ "modrinth": "ca9X1Phr" }, "files": [ - { - "type": "curseforge", - "file_name": "rnr-0.2.1-1.20.1.jar", - "mc_versions": [ - "1.20.1" - ], - "loaders": [ - "neoforge", - "forge" - ], - "release_type": "release", - "url": "https://edge.forgecdn.net/files/5852/507/rnr-0.2.1-1.20.1.jar", - "id": "5852507", - "parent_id": "1048212", - "hashes": { - "sha1": "046e086b2d4861fbc74bbeb18031102d09622197", - "md5": "451fe8a1c496f44d20d73bfb4cb51a57" - }, - "required_dependencies": [ - "306770", - "302973" - ], - "size": 3557362, - "date_published": "2024-10-27T23:10:58.567Z" - }, { "type": "modrinth", - "file_name": "rnr-0.2.1-1.20.1.jar", + "file_name": "rnr-0.2.2-1.20.1.jar", "mc_versions": [ "1.20.1" ], @@ -11182,19 +11133,45 @@ "neoforge" ], "release_type": "release", - "url": "https://cdn.modrinth.com/data/ca9X1Phr/versions/msv0XMkD/rnr-0.2.1-1.20.1.jar", - "id": "msv0XMkD", + "url": "https://cdn.modrinth.com/data/ca9X1Phr/versions/quVtWEPo/rnr-0.2.2-1.20.1.jar", + "id": "quVtWEPo", "parent_id": "ca9X1Phr", "hashes": { - "sha512": "e0f7b50c0da47f449fe03427859a1a33d0b8bef59a676b7ac88f518c99a0a6f02b255b576716c0d5d3a7810bd48e8cc9d74d4f9ed8e519485949c6e2ff8e469a", - "sha1": "046e086b2d4861fbc74bbeb18031102d09622197" + "sha512": "abf0dfbf5bc201c75a688bdcd6232e038fc5d5c9f540ec7057b0ea42455655233059c91ce5e63fc17a7a0422960740abcc02079f181e27e39a5b4dee16e72c91", + "sha1": "ab28d720eb0094bd40c37726199831f4f60b4299" }, "required_dependencies": [ - "nU0bVIaL", - "JaCEZUhg" + "JaCEZUhg", + "1VSGxqkt", + "nU0bVIaL" ], - "size": 3557362, - "date_published": "2024-10-27T23:13:57.176874Z" + "size": 3568839, + "date_published": "2025-12-16T05:13:25.666668Z" + }, + { + "type": "curseforge", + "file_name": "rnr-0.2.2-1.20.1.jar", + "mc_versions": [ + "1.20.1" + ], + "loaders": [ + "forge", + "neoforge" + ], + "release_type": "release", + "url": "https://edge.forgecdn.net/files/7339/318/rnr-0.2.2-1.20.1.jar", + "id": "7339318", + "parent_id": "1048212", + "hashes": { + "sha1": "ab28d720eb0094bd40c37726199831f4f60b4299", + "md5": "82c946ea6261a82d60290f93d91a12cd" + }, + "required_dependencies": [ + "302973", + "306770" + ], + "size": 3568839, + "date_published": "2025-12-16T05:14:29.893Z" } ] }, @@ -12383,6 +12360,67 @@ } ] }, + { + "pakku_id": "oO0Fr45i8SO2Lg2x", + "type": "RESOURCE_PACK", + "side": "CLIENT", + "slug": { + "curseforge": "tfc-ambiental-refreshed", + "modrinth": "tfc-ambiental-refreshed" + }, + "name": { + "curseforge": "TFC Ambiental Refreshed", + "modrinth": "TFC Ambiental Refreshed" + }, + "id": { + "curseforge": "1379694", + "modrinth": "RVuHApuv" + }, + "redistributable": false, + "files": [ + { + "type": "curseforge", + "file_name": "TFC_Ambiental_Refreshed_1.18-1.21.1.zip", + "mc_versions": [ + "1.20.1" + ], + "release_type": "release", + "url": "https://edge.forgecdn.net/files/7223/628/TFC_Ambiental_Refreshed_1.18-1.21.1.zip", + "id": "7223628", + "parent_id": "1379694", + "hashes": { + "sha1": "73561b96df5b4ead380bdca8f01db3ae11f63daf", + "md5": "df3d1a50ea8f109f29939a722fb084a3" + }, + "required_dependencies": [], + "size": 458406, + "date_published": "2025-11-15T06:25:33.587Z" + }, + { + "type": "modrinth", + "file_name": "TFC_Ambiental_Refreshed_1.18-1.21.1.zip", + "mc_versions": [ + "1.18.2", + "1.20.1", + "1.21.1" + ], + "loaders": [ + "minecraft" + ], + "release_type": "release", + "url": "https://cdn.modrinth.com/data/RVuHApuv/versions/SAxnWzwK/TFC_Ambiental_Refreshed_1.18-1.21.1.zip", + "id": "SAxnWzwK", + "parent_id": "RVuHApuv", + "hashes": { + "sha512": "f272ba3bc3c97bc0156b61a3a44d36b7e0bcbd2d85479fa4182fb85c858745737266ca63215490198c125a6e5b626baf449c07eb9d1d5e0bb2a72ab60e209fb9", + "sha1": "73561b96df5b4ead380bdca8f01db3ae11f63daf" + }, + "required_dependencies": [], + "size": 458406, + "date_published": "2025-11-15T06:27:57.385Z" + } + ] + }, { "pakku_id": "73uV6QykaOBW9DSj", "type": "RESOURCE_PACK", @@ -13011,6 +13049,75 @@ } ] }, + { + "pakku_id": "ajFTZODDe9JA6OiW", + "pakku_links": [ + "64uacGcEw697jVGs" + ], + "type": "MOD", + "side": "SERVER", + "slug": { + "curseforge": "tfc-ruins", + "modrinth": "tfc-ruins" + }, + "name": { + "curseforge": "TFC Ruins - Structures for TerraFirmaCraft", + "modrinth": "TFC Ruins" + }, + "id": { + "curseforge": "1383031", + "modrinth": "2JRpLCvK" + }, + "redistributable": false, + "files": [ + { + "type": "curseforge", + "file_name": "tfc_ruins-1.0.1-forge-1.20.1.jar", + "mc_versions": [ + "1.20.1" + ], + "loaders": [ + "forge" + ], + "release_type": "release", + "url": "https://edge.forgecdn.net/files/7270/344/tfc_ruins-1.0.1-forge-1.20.1.jar", + "id": "7270344", + "parent_id": "1383031", + "hashes": { + "sha1": "a3759bcb6545195e680121c145608eeefc70a18a", + "md5": "008d9c033ab830c67a77576a64277232" + }, + "required_dependencies": [ + "302973" + ], + "size": 62230, + "date_published": "2025-11-28T08:18:23.587Z" + }, + { + "type": "modrinth", + "file_name": "tfc_ruins-1.0.1-forge-1.20.1.jar", + "mc_versions": [ + "1.20.1" + ], + "loaders": [ + "forge" + ], + "release_type": "release", + "url": "https://cdn.modrinth.com/data/2JRpLCvK/versions/upy38bFL/tfc_ruins-1.0.1-forge-1.20.1.jar", + "id": "upy38bFL", + "parent_id": "2JRpLCvK", + "hashes": { + "sha512": "d2d7d1426215e6252281a53daf56127f66a27da20f7c5160d7275a1326197961998f1df05d1917beb6f792ff211108ec845f624b2bc2ad78f2901a3b70426b2b", + "sha1": "a3759bcb6545195e680121c145608eeefc70a18a" + }, + "required_dependencies": [ + "JaCEZUhg" + ], + "size": 62230, + "date_published": "2025-11-28T08:17:29.408127Z" + } + ] + }, { "pakku_id": "LPHqtA4kbNpa7ADR", "pakku_links": [ @@ -13815,7 +13922,7 @@ "files": [ { "type": "modrinth", - "file_name": "TerraFirmaGreg-Core-Modern-0.8.8.jar", + "file_name": "TerraFirmaGreg-Core-Modern-0.8.10.jar", "mc_versions": [ "1.20.1" ], @@ -13824,23 +13931,23 @@ "neoforge" ], "release_type": "release", - "url": "https://cdn.modrinth.com/data/lNttW2Xl/versions/6FdOjis1/TerraFirmaGreg-Core-Modern-0.8.8.jar", - "id": "6FdOjis1", + "url": "https://cdn.modrinth.com/data/lNttW2Xl/versions/EY4KluIB/TerraFirmaGreg-Core-Modern-0.8.10.jar", + "id": "EY4KluIB", "parent_id": "lNttW2Xl", "hashes": { - "sha512": "ebc09725e0662ff8059a605397f12fb49c300807aacd27742c858ac436e8730350516ed7697925047686a838932371812f58bee49e11802a387cbe9d315121f0", - "sha1": "75551167d5d6c8c61ae7ae713b3a767bf1bcb321" + "sha512": "f9b39b905a066ef4d0a131080d076c007d348ad700cb56a8ee52e607046f1564d28993ebd3ae8f0d48ee874770b7ab1cab9fdfe4e36c918b05d6fc697bee402b", + "sha1": "eb6603cfaa8d84cf6fe747732f97d7b3b10bb274" }, "required_dependencies": [ - "JaCEZUhg", - "7tG215v7" + "7tG215v7", + "JaCEZUhg" ], - "size": 9321318, - "date_published": "2025-12-09T11:16:17.379839Z" + "size": 9347264, + "date_published": "2025-12-18T21:55:26.799768Z" }, { "type": "curseforge", - "file_name": "TerraFirmaGreg-Core-Modern-0.8.8.jar", + "file_name": "TerraFirmaGreg-Core-Modern-0.8.9.jar", "mc_versions": [ "1.20.1" ], @@ -13849,19 +13956,19 @@ "neoforge" ], "release_type": "release", - "url": "https://edge.forgecdn.net/files/7311/305/TerraFirmaGreg-Core-Modern-0.8.8.jar", - "id": "7311305", + "url": "https://edge.forgecdn.net/files/7351/217/TerraFirmaGreg-Core-Modern-0.8.9.jar", + "id": "7351217", "parent_id": "513402", "hashes": { - "sha1": "75551167d5d6c8c61ae7ae713b3a767bf1bcb321", - "md5": "5f9e1df5cbe3f1421d23e1c15b712aca" + "sha1": "40b2d01116d9f879d8b49d78e09657c4277f02b7", + "md5": "e032d7fb422eaf1e3793250f67ef5d62" }, "required_dependencies": [ - "890405", - "302973" + "302973", + "890405" ], - "size": 9321318, - "date_published": "2025-12-09T11:16:13.343Z" + "size": 9347264, + "date_published": "2025-12-18T20:54:23.127Z" } ] }, @@ -14330,6 +14437,43 @@ } ] }, + { + "pakku_id": "Z3KE8gJoOsh7EQNZ", + "type": "RESOURCE_PACK", + "side": "CLIENT", + "slug": { + "curseforge": "terrafirmacraft-vexxed-visuals", + "modrinth": "vexxed-visuals-terrafirmacraft" + }, + "name": { + "curseforge": "Vexxed Visuals: TerraFirmaCraft", + "modrinth": "Vexxed Visuals: TerraFirmaCraft" + }, + "id": { + "curseforge": "664832", + "modrinth": "TAEibNyf" + }, + "files": [ + { + "type": "curseforge", + "file_name": "Vexxed_Visuals_TFC_v1.2.7.1.zip", + "mc_versions": [ + "1.20.1" + ], + "release_type": "release", + "url": "https://edge.forgecdn.net/files/5538/604/Vexxed_Visuals_TFC_v1.2.7.1.zip", + "id": "5538604", + "parent_id": "664832", + "hashes": { + "sha1": "d0ff9540d2980b59664feacfa451b3f928416fcf", + "md5": "d05b7f0c083e73019634a6e914666db9" + }, + "required_dependencies": [], + "size": 29693735, + "date_published": "2024-07-16T20:02:30.937Z" + } + ] + }, { "pakku_id": "ExgdsZjG51N3WrBe", "pakku_links": [ @@ -14371,6 +14515,81 @@ } ] }, + { + "pakku_id": "X1DT7EtiEggkatMR", + "pakku_links": [ + "i4wWe6A2zvX01n9S", + "bf2svog06ajj5JHE", + "Y6Da87s1FKPYq0UK", + "Nw8xTCQngHA15ilh" + ], + "type": "MOD", + "side": "BOTH", + "slug": { + "curseforge": "vintage-kubejs", + "modrinth": "vintage-kubejs" + }, + "name": { + "curseforge": "Vintage KubeJS", + "modrinth": "Vintage KubeJS" + }, + "id": { + "curseforge": "1077532", + "modrinth": "u2r2GYRW" + }, + "files": [ + { + "type": "curseforge", + "file_name": "vintage_kubejs-1.20.1-1.0.0rc-2.jar", + "mc_versions": [ + "1.20.1" + ], + "loaders": [ + "forge" + ], + "release_type": "beta", + "url": "https://edge.forgecdn.net/files/5607/145/vintage_kubejs-1.20.1-1.0.0rc-2.jar", + "id": "5607145", + "parent_id": "1077532", + "hashes": { + "sha1": "ca49a4163794cc0f94a31a17f6956be11979db53", + "md5": "23321f4db3ec489d8605f54efecf813e" + }, + "required_dependencies": [ + "238086", + "429371", + "328085" + ], + "size": 53779, + "date_published": "2024-08-08T08:54:11.013Z" + }, + { + "type": "modrinth", + "file_name": "vintage_kubejs-1.20.1-1.0.0rc-2.jar", + "mc_versions": [ + "1.20.1" + ], + "loaders": [ + "forge" + ], + "release_type": "beta", + "url": "https://cdn.modrinth.com/data/u2r2GYRW/versions/TUKYnKui/vintage_kubejs-1.20.1-1.0.0rc-2.jar", + "id": "TUKYnKui", + "parent_id": "u2r2GYRW", + "hashes": { + "sha512": "d1bab6515b6353294adc98f0bd44e184ecb08d4091b5654d86edef1735c4a8260e46300acb5431bced3a1994e8326f5fdee33effb81e438176a3685900f20d20", + "sha1": "ca49a4163794cc0f94a31a17f6956be11979db53" + }, + "required_dependencies": [ + "umyGl7zF", + "T38eAZQC", + "LNytGWDc" + ], + "size": 53779, + "date_published": "2024-08-08T08:56:55.124370Z" + } + ] + }, { "pakku_id": "qM5Yyq0zqqJc8XtT", "pakku_links": [ @@ -14685,30 +14904,6 @@ }, "redistributable": false, "files": [ - { - "type": "curseforge", - "file_name": "applied_ammo_box-0.4.0.jar", - "mc_versions": [ - "1.20.1" - ], - "loaders": [ - "forge" - ], - "release_type": "release", - "url": "https://edge.forgecdn.net/files/7025/159/applied_ammo_box-0.4.0.jar", - "id": "7025159", - "parent_id": "1338332", - "hashes": { - "sha1": "7ed8caf15bd7662b10c0e0e327d595e9b5bcd924", - "md5": "b0a7924ff04ea4fb3af53da11f221984" - }, - "required_dependencies": [ - "1028108", - "223794" - ], - "size": 67461, - "date_published": "2025-09-23T10:29:35.687Z" - }, { "type": "modrinth", "file_name": "applied_ammo_box-0.3.0.jar", @@ -14727,11 +14922,35 @@ "sha1": "cad73c6a3e78233bed25f1d4255f12ffc6f97baf" }, "required_dependencies": [ - "SzzJttH8", - "XxWD5pD3" + "XxWD5pD3", + "SzzJttH8" ], "size": 67381, "date_published": "2025-09-05T14:26:22.489897Z" + }, + { + "type": "curseforge", + "file_name": "applied_ammo_box-0.4.1.jar", + "mc_versions": [ + "1.20.1" + ], + "loaders": [ + "forge" + ], + "release_type": "release", + "url": "https://edge.forgecdn.net/files/7344/136/applied_ammo_box-0.4.1.jar", + "id": "7344136", + "parent_id": "1338332", + "hashes": { + "sha1": "0e8adc7538611a1ffc964b739f50d8ef0fa0fcb3", + "md5": "62dfb0ed8cdafaf5985897d6fc6bfa09" + }, + "required_dependencies": [ + "223794", + "1028108" + ], + "size": 67748, + "date_published": "2025-12-17T14:13:03.837Z" } ] },