diff --git a/.github/ISSUE_TEMPLATE/BUG_REPORT.yml b/.github/ISSUE_TEMPLATE/BUG_REPORT.yml index a0514eeeb..319198c73 100644 --- a/.github/ISSUE_TEMPLATE/BUG_REPORT.yml +++ b/.github/ISSUE_TEMPLATE/BUG_REPORT.yml @@ -1,5 +1,5 @@ name: "[🐛]: Bug report" -description: "Report a bug where something is not working as expected, which does not crash the game." +description: "Report a bug where something is not working as expected, but does not crash the game." title: "[🐛]: " labels: [ "Status: Backlog" ] projects: ["TerraFirmaGreg-Team/10"] @@ -10,28 +10,65 @@ body: id: exists attributes: label: "Was this bug reported before?" - description: "Please search open/closed issues before submitting, as the issue may have already been reported/addressed." + description: "Please search OPEN/CLOSED issues before submitting, as the issue may have already been reported/addressed." options: - label: "No, it was not." required: true + - type: dropdown + id: launcher + validations: + required: true + attributes: + label: "Are you using Prism or Curseforge?" + description: "Prism and Curseforge are the only supported launchers for TFG. Some others may not work. TLAUNCHER DOES NOT WORK." + options: + - "Yes, I am using Prism or Curseforge." + - "No, I am not using Prism or Curseforge." + + - type: checkboxes + id: redownload + attributes: + label: "Have you tried redownloading the pack?" + description: "For issues that you are experiencing singularly, redownloading the pack may fix the issue." + options: + - label: "Not Applicable / Yes, I have tried downloading a new instance." + required: true + + - type: input + id: os + validations: + required: true + attributes: + label: Computer OS + description: Write which OS your PC is running on. + placeholder: "Example: Windows 11" + - type: input id: version validations: required: true attributes: - label: "Version modpack used" - description: "Write which version of the modpack you are using." + label: Modpack Version Used + description: Write which version of the modpack you are using. placeholder: "Example: 0.1.1" - - type: input + - type: dropdown id: environment validations: required: true attributes: - label: Environment - description: "How you were playing on the world. Typical answers include: Singleplayer, Open to LAN, Forge Server, Sponge Server, or Mohist Server." - placeholder: "Example: Singleplayer" + label: Minecraft Environment + options: + - "Singleplayer" + - "LAN" + - "Forge Server" + - "Sponge Server" + - "Magma Server" + - "Mohist Server" + - "E4MC" + - "Essential" + - "Other" - type: dropdown id: world diff --git a/.github/ISSUE_TEMPLATE/CRASH_REPORT.yml b/.github/ISSUE_TEMPLATE/CRASH_REPORT.yml index 6520e1409..37bb57c86 100644 --- a/.github/ISSUE_TEMPLATE/CRASH_REPORT.yml +++ b/.github/ISSUE_TEMPLATE/CRASH_REPORT.yml @@ -9,29 +9,74 @@ body: - type: checkboxes id: exists attributes: - label: "Was this crash report before?" - description: "Please search open/closed issues before submitting, as the issue may have already been reported/addressed." + label: "Was this crash reported before?" + description: "Please search OPEN/CLOSED issues before submitting, as the issue may have already been reported/addressed." options: - label: "No, it was not." required: true + - type: dropdown + id: launcher + validations: + required: true + attributes: + label: "Are you using Prism or Curseforge?" + description: "Prism and Curseforge are the only supported launchers for TFG. Some others may not work. TLAUNCHER DOES NOT WORK." + options: + - "Yes, I am using Prism or Curseforge." + - "No, I am not using Prism or Curseforge." + + - type: checkboxes + id: dependencies + attributes: + label: "Did you install required dependencies?" + description: "If you are using Prism or Modrinth you will be instructed to install required mods. Do so." + options: + - label: "Not Applicable / Yes, I have all required dependencies installed." + required: true + + - type: checkboxes + id: redownload + attributes: + label: "Have you tried redownloading the pack?" + description: "For issues that you are experiencing singularly, redownloading the pack may fix the issue." + options: + - label: "Not Applicable / Yes, I have tried downloading a new instance." + required: true + + - type: input + id: os + validations: + required: true + attributes: + label: Computer OS + description: Write which OS your PC is running on. + placeholder: "Example: Windows 10" + - type: input id: version validations: required: true attributes: - label: Version modpack used + label: Modpack Version Used description: Write which version of the modpack you are using. placeholder: "Example: 0.1.1" - - type: input + - type: dropdown id: environment validations: required: true attributes: - label: Environment - description: "How you were playing on the world. Typical answers include: Singleplayer, Open to LAN, Forge Server, Sponge Server, or Mohist Server." - placeholder: "Example: Singleplayer" + label: Minecraft Environment + options: + - "Singleplayer" + - "LAN" + - "Forge Server" + - "Sponge Server" + - "Mohist Server" + - "E4MC" + - "Essential" + - "Other" - type: dropdown id: crash diff --git a/.github/ISSUE_TEMPLATE/ENHANCEMENT.yml b/.github/ISSUE_TEMPLATE/ENHANCEMENT.yml index 2e4288bc9..0e86bfcb0 100644 --- a/.github/ISSUE_TEMPLATE/ENHANCEMENT.yml +++ b/.github/ISSUE_TEMPLATE/ENHANCEMENT.yml @@ -1,6 +1,6 @@ -name: "[ðŸŠĄ]: Enhancement" -description: "Provide supporting details for a feature in development" -title: "[ðŸŠĄ]: " +name: "[💎]: Enhancement" +description: "Provide details for a gameplay enhancement or improvement." +title: "[💎]: " labels: [ "Status: Backlog" ] projects: ["TerraFirmaGreg-Team/10"] type: "Enhancement" @@ -9,8 +9,8 @@ body: - type: checkboxes id: exists attributes: - label: "Was this enhancement asked before?" - description: "Please search open/closed issues before submitting, as the issue may have already been reported/addressed." + label: "Was this enhancement suggested before?" + description: "Please search OPEN/CLOSED issues before submitting, as the enhancement may have already been reported/addressed." options: - label: "No, it was not." required: true @@ -20,8 +20,8 @@ body: validations: required: true attributes: - label: What would you like to be added? - description: Feature requests are unlikely to make progress as issues. + label: What would you like to be added/ changed? + description: Enhancement requests should focus on gameplay improvements or additions that can be achieved without completely new features. Ex. Rebalancing the energy cost of a recipe. - type: textarea id: rationale @@ -32,4 +32,4 @@ body: - type: markdown attributes: - value: "Thanks for taking the time to fill out this request enhancement." \ No newline at end of file + value: "Thanks for taking the time to fill out this enhancement request." \ No newline at end of file diff --git a/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.yml b/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.yml index a73f7aa56..735dc2c3c 100644 --- a/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.yml +++ b/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.yml @@ -1,6 +1,6 @@ -name: "[ðŸŠķ]: Feature request" -description: "Request a new feature or a change to an existing one." -title: "[ðŸŠķ]: " +name: "[ðŸ’Ą]: Feature request" +description: "Request a new feature or a new mod." +title: "[ðŸ’Ą]: " labels: [ "Status: Backlog" ] projects: ["TerraFirmaGreg-Team/10"] type: "Feature" @@ -10,46 +10,44 @@ body: id: exists attributes: label: "Was this feature suggested before?" - description: "Please search open/closed issues before submitting, as the issue may have already been reported/addressed." + description: "Please search OPEN/CLOSED issues before submitting, as the feature may have already been reported/addressed." options: - label: "No, it was not." required: true - - type: input - id: version + - type: checkboxes + id: blacklist + attributes: + label: "A list of popular features/mods the team has already considered and will not implement." + description: | + ### Mod Requests: + - Other large tech mods (Immersive Engineering, Mekanism, etc.) will not be added to the pack due to overlap with Gregtech. + - Magic mods (Thaumcraft, Botania, etc.) will not be added to the pack as we wish to be grounded in plausibility. + - Create: the factory must grow. And other large Create mods. They do not work with Greate and we do not wish to focus on Create too much. + - Create Clockworks & Valkyrian Skies. Both cool mods, but impossible to balance in TFG. + - Stargate. Overdone in GT packs. We will work on something unique as an endgame goal. + + ### Feature Requests: + - Dyson Spheres. Boring and overdone. + - More GT Voltage Tiers. We would prefer to have larger more rounded tiers than many small ones. + options: + - label: "I understand :(" + required: true + + - type: textarea + id: feature validations: required: true attributes: - label: "Version modpack used" - description: Write which version of the modpack you are using. - placeholder: "Example: 0.1.1" + label: What would you like to be added? + description: Feature requests should focus on new gameplay experiences or QoL additions. - type: textarea - id: problem - validations: - required: false - attributes: - label: "Related problem" - description: If the feature you wish to change is related to a problem, please desscribe it. Leave this field blank if it is not related to a problem. - placeholder: "Example: I'm always frustrated when..." - - - type: textarea - id: solution + id: rationale validations: required: true attributes: - label: "Your solution" - description: Describe the solution you would like to have happen. - placeholder: "Example: If I could..." - - - type: textarea - id: additional-info - validations: - required: false - attributes: - label: "Additional information" - description: Any additional information you wish to provide. Please add anything which did not fit into the other sections here. - placeholder: "Example: This is likely achieveable by doing X because..." + label: Why is this needed? - type: markdown attributes: diff --git a/.github/ISSUE_TEMPLATE/QUESTION.yml b/.github/ISSUE_TEMPLATE/QUESTION.yml index ba1b89c57..ac1db729d 100644 --- a/.github/ISSUE_TEMPLATE/QUESTION.yml +++ b/.github/ISSUE_TEMPLATE/QUESTION.yml @@ -9,7 +9,7 @@ body: id: exists attributes: label: "Was this question asked before?" - description: "Please search open/closed issues before submitting, as the issue may have already been reported/addressed." + description: "Please search OPEN/CLOSED issues before submitting, as the issue may have already been reported/addressed." options: - label: "No, it was not." required: true @@ -17,9 +17,13 @@ body: - type: markdown attributes: value: | - If you are in need of quick response, Discord may be a better place. You can find a link to join in our README.md for this project. + If you are in need of a quick response, [Discord](https://discord.gg/AEaCzCTUwQ) may be a better place. - If you are looking for a game wiki, we are currently developing it, however most information is available in-game info through tooltips, JEI/HEI and quest. You can also ask any question on Discord, and someone will most likely have a response. + Most information is available in-game through Tooltips, EMI, Field Guide, or Quests. + An online version of the [Field Guide](https://terrafirmagreg-team.github.io/Field-Guide-Modern/en_us/) is also available. + + For installing a development environment, please refer to the [Contributing Guide](https://github.com/TerraFirmaGreg-Team/Modpack-Modern/blob/dev/.github/CONTRIBUTING.md) + For information about translating please read our [Localization Guide](https://github.com/TerraFirmaGreg-Team/Modpack-Modern/blob/dev/kubejs/README_IF_TRANSLATING.md) - type: textarea id: question diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index c09d1b5d1..98025f0b1 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -7,3 +7,7 @@ contact_links: - name: TerraFirmaGreg CurseForge url: https://www.curseforge.com/minecraft/modpacks/terrafirmagreg-modern about: Download page. + + - name: TerraFirmaGreg YouTube + url: https://www.youtube.com/@TFG-modern + about: YouTube channel. diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0b2db7eee..140f229f2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -34,7 +34,7 @@ jobs: steps: - name: ðŸ“Ķ Checkout - uses: actions/checkout@v6.0.1 + uses: actions/checkout@v6.0.2 with: fetch-depth: 0 @@ -229,7 +229,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v6.0.1 + uses: actions/checkout@v6.0.2 with: fetch-depth: 0 @@ -313,7 +313,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v6.0.1 + uses: actions/checkout@v6.0.2 - name: 🔄 Replace strings shell: bash @@ -347,7 +347,7 @@ jobs: sed -i -e "s/MINECRAFT_VERSION/${MINECRAFT_VERSION}/g" .pakku/docker-overrides/docker-compose.yml - name: 📝 Cache Pakku - uses: actions/cache@v5.0.2 + uses: actions/cache@v5.0.3 id: cache with: path: build/.cache @@ -460,7 +460,7 @@ jobs: steps: - name: ðŸ“Ķ Checkout - uses: actions/checkout@v6.0.1 + uses: actions/checkout@v6.0.2 - name: ðŸ“Ķ Download artifact uses: actions/download-artifact@v7.0.0 diff --git a/.pakku/server-overrides/defaultconfigs/tfc-server.toml b/.pakku/server-overrides/defaultconfigs/tfc-server.toml index 90d7eb41a..5b61836ec 100644 --- a/.pakku/server-overrides/defaultconfigs/tfc-server.toml +++ b/.pakku/server-overrides/defaultconfigs/tfc-server.toml @@ -167,7 +167,7 @@ familiarityDecayLimit = 0.3 # # Tank capacity of a crucible (in mB). #Range: 0 ~ 2147483645 - crucibleCapacity = 4032 + crucibleCapacity = 4608 # # A modifier for how fast fluid containers empty into crucibles. Containers will empty 1 mB every (this) number of ticks. #Range: > 1 diff --git a/CHANGELOG.md b/CHANGELOG.md index f11a43eb2..f081702d6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,123 @@ ### Bug fixes ### Translation updates +## [0.11.19] - 03-02-2026 +### Breaking changes +- The chemical reactor recipe for making Kaolinite Powder now uses circuit 3 @Pyritie +- The two chemical reactor recipes for Tetramethoxysilane now have circuits (1 and 2) (#2898) @Pyritie +- Toluene + Benzene = Biphenyl + Methane now uses circuit 1 (#2928) @Pyritie +- TFC Gurman changed its name and recipe IDs to TFC Gourmet. There will be conversion items, but not fluids, so drink all your lemonade and kvass before updating. +- The BTX line has been modified, with the Cracker now outputting the used Catalyser instead of the LCR +#### Energy Update +- Cetane Boosted Diesel's duration is buffed by 30% +- Diesel's duration is nerfed by 25%, but can now be crafted at ULV +- Added distillation recipe to get fuel from oil with the Vacuum Chamber +- Light Fuel isn't a fuel anymore (make Diesel with it!) +- High Octane Gasoline now requires an IV Energy Hatch +- Add Small Fission Reactor, Small Turbine Generator, and the Cooling Tower. You can now make power from Fission on Earth! +- BTX has been buffed by 10%, and also produces 12.5% more with each craft! +#### ULV changes +- The vacuum chamber requires a blue steel spring now, so the colored steel anvil can't be skipped +- The steel mechanical mixer can now only make weak red/blue steel dust, not regular (it can still make black steel dust though). The LV mixer can make normal red/blue steel dust +- Changed ULV hulls to needing lead plates instead of wood plates +- Adjusted a few other machine recipes slightly +- Deserts now contain oil spouts for heavy, raw, light, and normal oils +- Oilsands veins are now smaller across most of the world, except the huge ones have been moved to the desert +- Unhid and added a recipe for the kinetic bridge (#2881) @Pyritie +- High speed on a Belt Grinder now only requires 64 RPM instead of 128 RPM +- Added steam alloy smelter glass batch recipes (#2853) @Pyritie +#### LV changes +- Completely rearranged the quest chapter! Now it should be much less intimidating for new players +- Added Bakelite, a new early plastic used for Phenolic Boards and MV machine hulls (instead of wrought iron plates) +- Removed the other fiberboard that was previously used for phenolic boards +- Added some recipes to get Phenol and Methane in LV +- Added new ceramics required to craft Cupronickel Coils, made out of your recycled TFC blast furnace, Magnesia, and some resin +- Cupronickel coils now also need blue steel foil instead of bronze +- Polyethylene now requires an MV chemical reactor +- Added the Artisan Table to "knap" circuit boards and GT extruder and casting molds, replacing their crafting table recipes. @BlueBoat29 @Redeix +#### EV changes +- Added Radon to EV Superconductor so they are gated behind the Uranium Reactor +- Active Energy Transformer and Normal Laser Pipe are moved to EV behind the Uranium Reactor +- Change to Refrigerant Pellet, you now need the TerraFirmaGuard PA6 to run your first Plutonium Rods +- Added the Heat Battery - a new multiblock that stores heat from your fission coolant +- Rework of the Ostrum Linear Accelerator - it can now be expanded in height, requires heat from a Heat Battery to run and used for many new resources +- Every Fission Reactor recipe now outputs a depleted rod that you have to process to get the product from fission +- The depleted rod now has an average heat depending on the temperature of the fission reactor while it was in it. Every time the reactor goes on cooldown, it adds 10,000 heat to your rod +- RTM Coils were modified to require resources from Mars (from the martian trees) and Rockwool, but now you don't need them as early in EV +- Blocks (such as sand piles) in the Nuclear Turbine's chimney or turbine area will now just stop it from working instead of unforming the multiblock +#### IV changes +- Multi-Layer Insulated Shielding is now required for HSS-G coils. +#### Electric Greenhouse changes +- You can now use glass casings and trapdoors for the EGH floor. @Redeix +- Aquaponic multiblocks now only need half an amp to run. (#2950) @Redeix +- Base recipe duration has been reduced to 600/450/300 seconds. (#2950) @Redeix +- More circuit options for recipes that priorities seeds/saplings and recipes that prioritize leaves have been added. (#2950) @Redeix +- More plants have been added for production. @Redeix & @thederpysockdude123 +- The EGH and the Pisciculture recipes now require 50% less energy +#### Other major changes +- The railgun should actually work on servers now! (#2820, #2702, #2030, #2031, #2057, #2010) @gustovafing, @asere +- Added two-person rockets! @BlueBoat29 +- Added new advanced GTCEu Terminals @TomPlop +- Added much more music to the different dimensions @Pyritie +### Changes +- Vanadium magnetite is now usable as an iron ore for TFC purposes (#2834) @Pyritie +- Paracetamol now cures a small amount of the Radioactive condition, and RadAway now cures everything completely @Pyritie +- Glow ink now just requires a fluid solidifier and a ball mold, instead of whatever it was doing before @Pyritie +- TFC "pure" fertilisers are now all craftable and provide 100 fertiliser instead of 15 (#2884) @Coox1e +- Added shapeless recipes to convert any old stone dusts into their new equivalents (#2900) @Pyritie +- Added recipe to convert sedimentary carbonate stone dust into flux (#2862) @Pyritie +- Fixed the crucible capacity config on servers (#2899) @Pyritie +- Some volcanoes should now have much bigger amounts of lava underneath them, for more lava needs, but also infinite obsidian via the rock breaker has been removed. (Use a fluid solidifier instead) @Pyritie +- Added manual/automated sanding recipes for making smooth stone (#2876) @Pyritie +- Added deployer recipes for all the in-world block modification recipes (#2876) @Pyritie +- Added recipe to convert kaolin clay blocks back into kaolin clay (#2904) @Pyritie +- Axolotls now have genders @Pyritie +- Piglins can now spawn with crossbows @Pyritie +- Piglin brutes now always spawn with full armor and harder-hitting weapons @Pyritie +- Added quartzite as a mars stone type @Pyritie +- Added assembler recipe for framed cubes (#2889) @Coox1e +- Added a furnace recipe for dead grass to thatch (#2935) @Coox1e +- Added support for Bluemap (#2922) @trisjob +- Added mixer and barrel recipes for dye fluids (#2925, #2938) @OLOXpl +- Added recipes to convert leaves into leaf piles. (#2950) @Redeix +- Added a recipe to convert fruit leaf blocks into firmalife fruit leaf items. (#2950) @Redeix +- Added a recipe to turn leaf blocks into hedges. (#2950) @Redeix +- Added recipes to make krummholz. (#2950) @Redeix +- Added config file for Via Romana support. (#2950) @Redeix +- Backpack void upgrades are now cheaper @Pyritie +- All tools should now have TFC damage types (#2868) @Pyritie +- TFC magma blocks, lightblooms, and bulbkins now correctly have emissive textures @Pyritie +- Quivers can now also go in the belt curios slot (#2927) @Pyritie +- Various quest fixes and improvements @ashleney @Tinchik @TomPlop @Pyritie +### Bug fixes +- Fixed being able to right-click crops with a scythe to harvest them (#1724) @Ujhik +- Fixed large miners not outputting crushed ore when mining Migmatite @Pyritie +- Fixed red granite ores never dropping poor or rich raw ores @Pyritie +- Fixed rosin leaves and saplings having tags the wrong way around (#2840) @TanJeeSchuan +- Fixed missing borax to flux recipe @Pyritie +- Fixed lavaproof blue steel boots not having armor resistances (#2872) @Paradalope +- Fixed the dye colors used to make Create Deco's bricks (#2859) @silllil +- Fixed the Electric Greenhouse outputting way less Chorus Fruit than before @Pyritie +- Fixed the hot ingot icons for Ostrum and Vanadium ingots looking inconsistent with the regular ingots (#2875) @RubenVerg +- Fixed pyrogallol and black and white film developer requiring too high of a heat on the pot recipe (#2909) @Pyritie +- Fixed not being able to fire scraping blade clay mold (#2905) @Pyritie +- Fixed stair and slab versions of road blocks not having speed bonuses (#2912) @Pyritie +- Fixed RNR roofs not having mineable tags, and blocked the stair/slab frame from Additional Placements (#2870) @Pyritie +- Fixed piglin brutes not dropping meat or bones @Pyritie +- Fixed not being able to put rings, wrench tips, screwdriver tips, buzzsaw blades, or wire cutter tips in a crucible (#2913) @Pyritie +- Fixed a concrete dupe (#2948) and some other stone-related recycling recipes @Pyritie +- Fixed the rendering of adjacent large martian nests @Mqrius +- Fixed the interdimensional wireless card so it should actually work again (the crafting requests aren't fixed yet though) @Mqrius +- Fixed the position of the dimension indicator on recipes that are valid on multiple dimensions @BlueBoat29 +- Fixed rockets breaking when you were carrying something @BlueBoat29 +- Fixed a rare crash with beneath to overworld teleporting @Lolens +- Added Sacks 'n' Such's containers to the Toolbelt blacklist, preventing a dupe (#2926) @Pyritie +- Fixed a dupe with steam miner and steam rock crusher recycling @Pyritie +### Translation updates +- Chinese (simplified) @jmecn +- Russian @Petr211071 + @Nixieeunrare +- Spanish @NikoNeko17 + ## [0.11.18] - 23-01-2026 ### Important notes If you missed it, 0.11.17 was a Beta version with other important breaking changes. Be sure to [read it](https://github.com/TerraFirmaGreg-Team/Modpack-Modern/releases/tag/0.11.17) as well! diff --git a/config/additionalplacements-startup.toml b/config/additionalplacements-startup.toml index 90d42c665..60f7f30c2 100644 --- a/config/additionalplacements-startup.toml +++ b/config/additionalplacements-startup.toml @@ -14,13 +14,13 @@ [startup.types.additionalplacements.slab] #Blocklist for controlling which blocks (that are valid for this type) will generate variants of this type #See https://github.com/FirEmerald/AdditionalPlacements/wiki/Blocklist-Format for blocklist format - enabled = ["+*"] + enabled = ["+*", "-rnr:roof_frame_slab"] #Stairs [startup.types.additionalplacements.stairs] #Blocklist for controlling which blocks (that are valid for this type) will generate variants of this type #See https://github.com/FirEmerald/AdditionalPlacements/wiki/Blocklist-Format for blocklist format - enabled = ["+*"] + enabled = ["+*", "-rnr:roof_frame_stairs"] #Blocklist to control which blocks will allow for vertical stair connections. #Keep in mind vertical is RELATIVE to the placement of the stair - "vertical" for a vertically placed stair will be one of the two horizontal directions. #See https://github.com/FirEmerald/AdditionalPlacements/wiki/Blocklist-Format for blocklist format diff --git a/config/blockrunner.json b/config/blockrunner.json index 670147277..0c82a0edd 100644 --- a/config/blockrunner.json +++ b/config/blockrunner.json @@ -5,11 +5,21 @@ "rnr:hoggin_slab": 1.1, "rnr:hoggin_stairs": 1.1, "#rnr:gravel_road_blocks": 1.1, + "#rnr:gravel_road_stairs": 1.1, + "#rnr:gravel_road_slabs": 1.1, "#rnr:overheight_gravel_blocks": 1.1, "#rnr:macadam_road_blocks": 1.2, + "#rnr:macadam_road_stairs": 1.2, + "#rnr:macadam_road_slabs": 1.2, "#rnr:sett_road_blocks": 1.2, + "#rnr:sett_road_stairs": 1.2, + "#rnr:sett_road_slabs": 1.2, "#rnr:flagstones_blocks": 1.2, + "#rnr:flagstones_stairs": 1.2, + "#rnr:flagstones_slabs": 1.2, "#rnr:cobbled_road_blocks": 1.2, + "#rnr:cobbled_road_stairs": 1.2, + "#rnr:cobbled_road_slabs": 1.2, "#rnr:functional_concrete_roads": 1.3, "#rnr:functional_concrete_road_stairs": 1.3, "#rnr:functional_concrete_road_slabs": 1.3 diff --git a/config/bluemap/packs/TFG_fix/assets/afc/blockColors.json b/config/bluemap/packs/TFG_fix/assets/afc/blockColors.json new file mode 100644 index 000000000..3aaaa1ee5 --- /dev/null +++ b/config/bluemap/packs/TFG_fix/assets/afc/blockColors.json @@ -0,0 +1,95 @@ +{ +//AFC leaves + "afc:wood/leaves/boabab": "@foliage", + "afc:wood/leaves/eucalyptus": "@foliage", + "afc:wood/leaves/mahogany": "@foliage", + "afc:wood/leaves/hevea": "@foliage", + "afc:wood/leaves/tualang": "@foliage", + "afc:wood/leaves/teak": "@foliage", + "afc:wood/leaves/cypress": "@foliage", + "afc:wood/leaves/fig": "@foliage", + "afc:wood/leaves/ironwood": "@foliage", + "afc:wood/leaves/ipe": "@foliage", + "afc:wood/leaves/gum_arabic": "@foliage", + "afc:wood/leaves/acacia_koa": "@foliage", + "afc:wood/leaves/poplar": "@foliage", + "afc:wood/leaves/mpingo_blackwood": "@foliage", + "afc:wood/leaves/mountain_fir": "@foliage", + "afc:wood/leaves/balsam_fir": "@foliage", + "afc:wood/leaves/scrub_hickory": "@foliage", + "afc:wood/leaves/red_silk_cotton": "@foliage", + "afc:wood/leaves/bigleaf_maple": "@foliage", + "afc:wood/leaves/weeping_maple": "@foliage", + "afc:wood/leaves/black_oak": "@foliage", + "afc:wood/leaves/live_oak": "@foliage", + "afc:wood/leaves/jaggery_palm": "@foliage", + "afc:wood/leaves/stone_pine": "@foliage", + "afc:wood/leaves/red_pine": "@foliage", + "afc:wood/leaves/tamarack": "@foliage", + "afc:wood/leaves/giant_rosewood": "@foliage", + "afc:wood/leaves/coast_redwood": "@foliage", + "afc:wood/leaves/coast_spruce": "@foliage", + "afc:wood/leaves/sitka_spruce": "@foliage", + "afc:wood/leaves/black_spruce": "@foliage", + "afc:wood/leaves/atlas_cedar": "@foliage", + "afc:wood/leaves/weeping_willow": "@foliage", + "afc:wood/leaves/rainbow_eucalyptus": "@foliage", + "afc:wood/leaves/mountain_ash": "@foliage", + "afc:wood/leaves/rubber_fig": "@foliage", + "afc:wood/leaves/redcedar": "@foliage", + "afc:wood/leaves/weeping_cypress": "@foliage", + "afc:wood/leaves/bald_cypress": "@foliage", + "afc:wood/leaves/sapele_mahogany": "@foliage", + "afc:wood/leaves/small_leaf_mahogany": "@foliage", + "afc:wood/leaves/iroko_teak": "@foliage", + "afc:wood/leaves/flame_of_the_forest": "@foliage", + "afc:wood/leaves/lebombo_ironwood": "@foliage", + "afc:wood/leaves/horsetail_ironwood": "@foliage", + +//AFC fallen_leaves + "afc:wood/fallen_leaves/boabab": "@foliage", + "afc:wood/fallen_leaves/eucalyptus": "@foliage", + "afc:wood/fallen_leaves/mahogany": "@foliage", + "afc:wood/fallen_leaves/hevea": "@foliage", + "afc:wood/fallen_leaves/tualang": "@foliage", + "afc:wood/fallen_leaves/teak": "@foliage", + "afc:wood/fallen_leaves/cypress": "@foliage", + "afc:wood/fallen_leaves/fig": "@foliage", + "afc:wood/fallen_leaves/ironwood": "@foliage", + "afc:wood/fallen_leaves/ipe": "@foliage", + "afc:wood/fallen_leaves/gum_arabic": "@foliage", + "afc:wood/fallen_leaves/acacia_koa": "@foliage", + "afc:wood/fallen_leaves/poplar": "@foliage", + "afc:wood/fallen_leaves/mpingo_blackwood": "@foliage", + "afc:wood/fallen_leaves/mountain_fir": "@foliage", + "afc:wood/fallen_leaves/balsam_fir": "@foliage", + "afc:wood/fallen_leaves/scrub_hickory": "@foliage", + "afc:wood/fallen_leaves/red_silk_cotton": "@foliage", + "afc:wood/fallen_leaves/bigleaf_maple": "@foliage", + "afc:wood/fallen_leaves/weeping_maple": "@foliage", + "afc:wood/fallen_leaves/black_oak": "@foliage", + "afc:wood/fallen_leaves/live_oak": "@foliage", + "afc:wood/fallen_leaves/jaggery_palm": "@foliage", + "afc:wood/fallen_leaves/stone_pine": "@foliage", + "afc:wood/fallen_leaves/red_pine": "@foliage", + "afc:wood/fallen_leaves/tamarack": "@foliage", + "afc:wood/fallen_leaves/giant_rosewood": "@foliage", + "afc:wood/fallen_leaves/coast_redwood": "@foliage", + "afc:wood/fallen_leaves/coast_spruce": "@foliage", + "afc:wood/fallen_leaves/sitka_spruce": "@foliage", + "afc:wood/fallen_leaves/black_spruce": "@foliage", + "afc:wood/fallen_leaves/atlas_cedar": "@foliage", + "afc:wood/fallen_leaves/weeping_willow": "@foliage", + "afc:wood/fallen_leaves/rainbow_eucalyptus": "@foliage", + "afc:wood/fallen_leaves/mountain_ash": "@foliage", + "afc:wood/fallen_leaves/rubber_fig": "@foliage", + "afc:wood/fallen_leaves/redcedar": "@foliage", + "afc:wood/fallen_leaves/weeping_cypress": "@foliage", + "afc:wood/fallen_leaves/bald_cypress": "@foliage", + "afc:wood/fallen_leaves/sapele_mahogany": "@foliage", + "afc:wood/fallen_leaves/small_leaf_mahogany": "@foliage", + "afc:wood/fallen_leaves/iroko_teak": "@foliage", + "afc:wood/fallen_leaves/flame_of_the_forest": "@foliage", + "afc:wood/fallen_leaves/lebombo_ironwood": "@foliage", + "afc:wood/fallen_leaves/horsetail_ironwood": "@foliage", +} \ No newline at end of file diff --git a/config/bluemap/packs/TFG_fix/assets/afc/blockProperties.json b/config/bluemap/packs/TFG_fix/assets/afc/blockProperties.json new file mode 100644 index 000000000..2a317d01f --- /dev/null +++ b/config/bluemap/packs/TFG_fix/assets/afc/blockProperties.json @@ -0,0 +1,1087 @@ +{ + //afc leaves + "afc:wood/leaves/boabab[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/leaves/boabab[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/leaves/eucalyptus[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/leaves/eucalyptus[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/leaves/mahogany[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/leaves/mahogany[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/leaves/hevea[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/leaves/hevea[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/leaves/tualang[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/leaves/tualang[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/leaves/teak[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/leaves/teak[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/leaves/cypress[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/leaves/cypress[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/leaves/fig[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/leaves/fig[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/leaves/ironwood[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/leaves/ironwood[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/leaves/ipe[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/leaves/ipe[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/leaves/horsetail_ironwood[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/leaves/horsetail_ironwood[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/leaves/gum_arabic[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/leaves/gum_arabic[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/leaves/acacia_koa[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/leaves/acacia_koa[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/leaves/poplar[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/leaves/poplar[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/leaves/mpingo_blackwood[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/leaves/mpingo_blackwood[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/leaves/mountain_fir[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/leaves/mountain_fir[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/leaves/balsam_fir[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/leaves/balsam_fir[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/leaves/scrub_hickory[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/leaves/scrub_hickory[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/leaves/red_silk_cotton[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/leaves/red_silk_cotton[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/leaves/bigleaf_maple[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/leaves/bigleaf_maple[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/leaves/weeping_maple[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/leaves/weeping_maple[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/leaves/black_oak[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/leaves/black_oak[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/leaves/live_oak[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/leaves/live_oak[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/leaves/jaggery_palmjaggery_palm[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/leaves/jaggery_palm[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/leaves/stone_pinestone_pine[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/leaves/stone_pine[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/leaves/red_pine[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/leaves/red_pine[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, +"afc:wood/leaves/tamarack[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/leaves/tamarack[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/leaves/giant_rosewood[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/leaves/giant_rosewood[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/leaves/coast_redwood[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/leaves/coast_redwood[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/leaves/coast_spruce[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/leaves/coast_spruce[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/leaves/sitka_spruce[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/leaves/sitka_spruce[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/leaves/black_spruce[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/leaves/black_spruce[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/leaves/atlas_cedar[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/leaves/atlas_cedar[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/leaves/weeping_willow[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/leaves/weeping_willow[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/leaves/rainbow_eucalyptus[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/leaves/rainbow_eucalyptus[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/leaves/mountain_ash[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/leaves/mountain_ash[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/leaves/rubber_fig[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/leaves/rubber_fig[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/leaves/redcedar[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/leaves/redcedar[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/leaves/weeping_cypress[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/leaves/weeping_cypress[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/leaves/bald_cypress[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/leaves/bald_cypress[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/leaves/sapele_mahogany[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/leaves/sapele_mahogany[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/leaves/small_leaf_mahogany[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/leaves/small_leaf_mahogany[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/leaves/iroko_teak[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/leaves/iroko_teak[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/leaves/flame_of_the_forest[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/leaves/flame_of_the_forest[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/leaves/lebombo_ironwood[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/leaves/lebombo_ironwood[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + +//afc fallen_leaves + "afc:wood/fallen_leaves/boabab[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/fallen_leaves/boabab[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/fallen_leaves/eucalyptus[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/fallen_leaves/eucalyptus[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/fallen_leaves/mahogany[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/fallen_leaves/mahogany[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/fallen_leaves/hevea[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/fallen_leaves/hevea[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/fallen_leaves/tualang[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/fallen_leaves/tualang[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/fallen_leaves/teak[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/fallen_leaves/teak[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/fallen_leaves/cypress[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/fallen_leaves/cypress[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/fallen_leaves/fig[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/fallen_leaves/fig[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/fallen_leaves/ironwood[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/fallen_leaves/ironwood[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/fallen_leaves/ipe[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/fallen_leaves/ipe[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/fallen_leaves/horsetail_ironwood[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/fallen_leaves/horsetail_ironwood[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/fallen_leaves/gum_arabic[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/fallen_leaves/gum_arabic[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/fallen_leaves/acacia_koa[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/fallen_leaves/acacia_koa[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/fallen_leaves/poplar[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/fallen_leaves/poplar[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/fallen_leaves/mpingo_blackwood[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/fallen_leaves/mpingo_blackwood[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/fallen_leaves/mountain_fir[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/fallen_leaves/mountain_fir[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/fallen_leaves/balsam_fir[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/fallen_leaves/balsam_fir[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/fallen_leaves/scrub_hickory[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/fallen_leaves/scrub_hickory[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/fallen_leaves/red_silk_cotton[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/fallen_leaves/red_silk_cotton[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/fallen_leaves/bigleaf_maple[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/fallen_leaves/bigleaf_maple[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/fallen_leaves/weeping_maple[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/fallen_leaves/weeping_maple[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/fallen_leaves/black_oak[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/fallen_leaves/black_oak[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/fallen_leaves/live_oak[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/fallen_leaves/live_oak[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/fallen_leaves/jaggery_palmjaggery_palm[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/fallen_leaves/jaggery_palm[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/fallen_leaves/stone_pinestone_pine[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/fallen_leaves/stone_pine[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/fallen_leaves/red_pine[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/fallen_leaves/red_pine[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, +"afc:wood/fallen_leaves/tamarack[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/fallen_leaves/tamarack[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/fallen_leaves/giant_rosewood[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/fallen_leaves/giant_rosewood[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/fallen_leaves/coast_redwood[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/fallen_leaves/coast_redwood[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/fallen_leaves/coast_spruce[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/fallen_leaves/coast_spruce[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/fallen_leaves/sitka_spruce[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/fallen_leaves/sitka_spruce[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/fallen_leaves/black_spruce[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/fallen_leaves/black_spruce[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/fallen_leaves/atlas_cedar[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/fallen_leaves/atlas_cedar[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/fallen_leaves/weeping_willow[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/fallen_leaves/weeping_willow[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/fallen_leaves/rainbow_eucalyptus[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/fallen_leaves/rainbow_eucalyptus[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/fallen_leaves/mountain_ash[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/fallen_leaves/mountain_ash[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/fallen_leaves/rubber_fig[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/fallen_leaves/rubber_fig[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/fallen_leaves/redcedar[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/fallen_leaves/redcedar[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/fallen_leaves/weeping_cypress[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/fallen_leaves/weeping_cypress[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/fallen_leaves/bald_cypress[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/fallen_leaves/bald_cypress[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/fallen_leaves/sapele_mahogany[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/fallen_leaves/sapele_mahogany[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/fallen_leaves/small_leaf_mahogany[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/fallen_leaves/small_leaf_mahogany[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/fallen_leaves/iroko_teak[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/fallen_leaves/iroko_teak[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/fallen_leaves/flame_of_the_forest[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/fallen_leaves/flame_of_the_forest[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/fallen_leaves/lebombo_ironwood[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/fallen_leaves/lebombo_ironwood[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + +//afc twig + "afc:wood/twig/boabab[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/twig/boabab[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/twig/eucalyptus[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/twig/eucalyptus[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/twig/mahogany[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/twig/mahogany[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/twig/hevea[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/twig/hevea[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/twig/tualang[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/twig/tualang[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/twig/teak[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/twig/teak[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/twig/cypress[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/twig/cypress[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/twig/fig[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/twig/fig[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/twig/ironwood[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/twig/ironwood[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/twig/ipe[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/twig/ipe[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/twig/horsetail_ironwood[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/twig/horsetail_ironwood[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/twig/gum_arabic[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/twig/gum_arabic[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/twig/acacia_koa[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/twig/acacia_koa[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/twig/poplar[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/twig/poplar[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/twig/mpingo_blackwood[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/twig/mpingo_blackwood[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/twig/mountain_fir[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/twig/mountain_fir[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/twig/balsam_fir[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/twig/balsam_fir[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/twig/scrub_hickory[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/twig/scrub_hickory[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/twig/red_silk_cotton[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/twig/red_silk_cotton[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/twig/bigleaf_maple[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/twig/bigleaf_maple[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/twig/weeping_maple[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/twig/weeping_maple[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/twig/black_oak[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/twig/black_oak[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/twig/live_oak[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/twig/live_oak[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/twig/jaggery_palmjaggery_palm[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/twig/jaggery_palm[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/twig/stone_pinestone_pine[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/twig/stone_pine[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/twig/red_pine[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/twig/red_pine[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, +"afc:wood/twig/tamarack[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/twig/tamarack[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/twig/giant_rosewood[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/twig/giant_rosewood[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/twig/coast_redwood[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/twig/coast_redwood[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/twig/coast_spruce[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/twig/coast_spruce[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/twig/sitka_spruce[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/twig/sitka_spruce[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/twig/black_spruce[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/twig/black_spruce[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/twig/atlas_cedar[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/twig/atlas_cedar[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/twig/weeping_willow[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/twig/weeping_willow[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/twig/rainbow_eucalyptus[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/twig/rainbow_eucalyptus[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/twig/mountain_ash[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/twig/mountain_ash[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/twig/rubber_fig[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/twig/rubber_fig[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/twig/redcedar[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/twig/redcedar[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/twig/weeping_cypress[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/twig/weeping_cypress[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/twig/bald_cypress[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/twig/bald_cypress[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/twig/sapele_mahogany[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/twig/sapele_mahogany[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/twig/small_leaf_mahogany[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/twig/small_leaf_mahogany[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/twig/iroko_teak[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/twig/iroko_teak[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/twig/flame_of_the_forest[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/twig/flame_of_the_forest[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/twig/lebombo_ironwood[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "afc:wood/twig/lebombo_ironwood[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, +} \ No newline at end of file diff --git a/config/bluemap/packs/TFG_fix/assets/tfc/blockColors.json b/config/bluemap/packs/TFG_fix/assets/tfc/blockColors.json new file mode 100644 index 000000000..33a0419a6 --- /dev/null +++ b/config/bluemap/packs/TFG_fix/assets/tfc/blockColors.json @@ -0,0 +1,245 @@ +{ +//TFC plants + "tfc:peat_grass": "@grass", + "tfc:kaolin_clay_grass": "@grass", + "tfc:grass/silt": "@grass", + "tfc:clay_grass/silt": "@grass", + "tfc:grass/loam": "@grass", + "tfc:clay_grass/loam": "@grass", + "tfc:grass/sandy": "@grass", + "tfc:clay_grass/sandy": "@grass", + "tfc:grass/silty_loam": "@grass", + "tfc:clay_grass/silty_loam": "@grass", + "tfc:grass/sandy_loam": "@grass", + "tfc:clay_grass/sandy_loam": "@grass", + "tfc:plant/sagebrush": "@foliage", + "tfc:plant/cordgrass": "@foliage", + "tfc:plant/guzmania": "@foliage", + "tfc:plant/pine_krummholz": "@foliage", + "tfc:plant/king_fern": "@foliage", + "tfc:plant/perovskia": "@foliage", + "tfc:plant/gooseberry_bush": "@foliage", + "tfc:plant/saguaro_fruit": "@foliage", + "tfc:plant/olive_growing_branch": "@foliage", + "tfc:plant/manatee_grass": "@foliage", + "tfc:plant/spanish_moss": "@foliage", + "tfc:plant/hanging_vines_plant": "@foliage", + "tfc:plant/philodendron": "@foliage", + "tfc:plant/maiden_pink": "@foliage", + "tfc:plant/switchgrass": "@foliage", + "tfc:plant/red_apple_branch": "@foliage", + "tfc:plant/lily_of_the_valley": "@foliage", + "tfc:plant/licorice_fern": "@foliage", + "tfc:plant/cloudberry_bush": "@foliage", + "tfc:plant/ivy": "@foliage", + "tfc:plant/peach_branch": "@foliage", + "tfc:plant/plum_leaves": "@foliage", + "tfc:plant/cattail": "@foliage", + "tfc:plant/butterfly_milkweed": "@foliage", + "tfc:plant/saguaro": "@foliage", + "tfc:plant/laminaria": "@foliage", + "tfc:plant/poppy": "@foliage", + "tfc:plant/snapdragon_yellow": "@foliage", + "tfc:plant/plum_sapling": "@foliage", + "tfc:plant/olive_sapling": "@foliage", + "tfc:plant/tulip_pink": "@foliage", + "tfc:plant/dead_bush": "@foliage", + "tfc:plant/peach_leaves": "@foliage", + "tfc:plant/canna": "@foliage", + "tfc:plant/green_apple_sapling": "@foliage", + "tfc:plant/orange_sapling": "@foliage", + "tfc:plant/strawberry_bush": "@foliage", + "tfc:plant/raddia_grass": "@foliage", + "tfc:plant/bromegrass": "@foliage", + "tfc:plant/kangaroo_paw": "@foliage", + "tfc:plant/green_apple_growing_branch": "@foliage", + "tfc:plant/gutweed": "@foliage", + "tfc:plant/phragmite": "@foliage", + "tfc:plant/tulip_red": "@foliage", + "tfc:plant/banana_sapling": "@foliage", + "tfc:plant/sword_fern": "@foliage", + "tfc:plant/lemon_growing_branch": "@foliage", + "tfc:plant/elderberry_bush_cane": "@foliage", + "tfc:plant/red_apple_growing_branch": "@foliage", + "tfc:plant/anthurium": "@foliage", + "tfc:plant/goldenrod": "@foliage", + "tfc:plant/peach_growing_branch": "@foliage", + "tfc:plant/elderberry_bush": "@foliage", + "tfc:plant/duckweed": "@foliage", + "tfc:plant/cranberry_bush": "@foliage", + "tfc:plant/field_horsetail": "@foliage", + "tfc:plant/olive_branch": "@foliage", + "tfc:plant/giant_kelp_plant": "@foliage", + "tfc:plant/blood_lily": "@foliage", + "tfc:plant/raspberry_bush": "@foliage", + "tfc:plant/leafy_kelp_plant": "@foliage", + "tfc:plant/orange_branch": "@foliage", + "tfc:plant/allium": "@foliage", + "tfc:plant/lotus": "@foliage", + "tfc:plant/strelitzia": "@foliage", + "tfc:plant/peach_sapling": "@foliage", + "tfc:plant/red_algae": "@foliage", + "tfc:plant/dead_berry_bush": "@foliage", + "tfc:plant/bur_reed": "@foliage", + "tfc:plant/cherry_growing_branch": "@foliage", + "tfc:plant/pulsatilla": "@foliage", + "tfc:plant/orange_leaves": "@foliage", + "tfc:plant/sea_palm": "@foliage", + "tfc:plant/silver_spurflower": "@foliage", + "tfc:plant/coontail": "@foliage", + "tfc:plant/sapphire_tower": "@foliage", + "tfc:plant/scutch_grass": "@foliage", + "tfc:plant/sago": "@foliage", + "tfc:plant/winged_kelp_plant": "@foliage", + "tfc:plant/aspen_krummholz": "@foliage", + "tfc:plant/raspberry_bush_cane": "@foliage", + "tfc:plant/timothy_grass": "@foliage", + "tfc:plant/cobblestone_lichen": "@foliage", + "tfc:plant/snapdragon_pink": "@foliage", + "tfc:plant/red_apple_leaves": "@foliage", + "tfc:plant/winged_kelp": "@foliage", + "tfc:plant/saguaro_plant": "@foliage", + "tfc:plant/sargassum": "@foliage", + "tfc:plant/artists_conk": "@foliage", + "tfc:plant/black_orchid": "@foliage", + "tfc:plant/dry_phragmite_plant": "@foliage", + "tfc:plant/tree_fern_plant": "@foliage", + "tfc:plant/oxeye_daisy": "@foliage", + "tfc:plant/vriesea": "@foliage", + "tfc:plant/toquilla_palm": "@foliage", + "tfc:plant/badderlocks": "@foliage", + "tfc:plant/grape_hyacinth": "@foliage", + "tfc:plant/red_sealing_wax_palm": "@foliage", + "tfc:plant/lemon_sapling": "@foliage", + "tfc:plant/spanish_moss_plant": "@foliage", + "tfc:plant/blueberry_bush_cane": "@foliage", + "tfc:plant/bluegrass": "@foliage", + "tfc:plant/spruce_krummholz": "@foliage", + "tfc:plant/heliconia": "@foliage", + "tfc:plant/water_taro": "@foliage", + "tfc:plant/green_apple_branch": "@foliage", + "tfc:plant/dry_phragmite": "@foliage", + "tfc:plant/barrel_cactus": "@foliage", + "tfc:plant/rose": "@foliage", + "tfc:plant/houstonia": "@foliage", + "tfc:plant/labrador_tea": "@foliage", + "tfc:plant/nasturtium": "@foliage", + "tfc:plant/leafy_kelp": "@foliage", + "tfc:plant/moss": "@foliage", + "tfc:plant/yucca": "@foliage", + "tfc:plant/lemon_leaves": "@foliage", + "tfc:plant/snowberry_bush": "@foliage", + "tfc:plant/orchard_grass": "@foliage", + "tfc:plant/morning_glory": "@foliage", + "tfc:plant/hanging_vines": "@foliage", + "tfc:plant/water_lily": "@foliage", + "tfc:plant/blueberry_bush": "@foliage", + "tfc:plant/blue_orchid": "@foliage", + "tfc:plant/banana_plant": "@foliage", + "tfc:plant/blackberry_bush_cane": "@foliage", + "tfc:plant/reindeer_lichen": "@foliage", + "tfc:plant/athyrium_fern": "@foliage", + "tfc:plant/trillium": "@foliage", + "tfc:plant/white_cedar_krummholz": "@foliage", + "tfc:plant/turtle_grass": "@foliage", + "tfc:plant/arrowhead": "@foliage", + "tfc:plant/blackberry_bush": "@foliage", + "tfc:plant/tall_fescue_grass": "@foliage", + "tfc:plant/blue_ginger": "@foliage", + "tfc:plant/arundo": "@foliage", + "tfc:plant/sacred_datura": "@foliage", + "tfc:plant/tree_fern": "@foliage", + "tfc:plant/heather": "@foliage", + "tfc:plant/foxglove": "@foliage", + "tfc:plant/liana": "@foliage", + "tfc:plant/douglas_fir_krummholz": "@foliage", + "tfc:plant/lemon_branch": "@foliage", + "tfc:plant/giant_kelp_flower": "@foliage", + "tfc:plant/meads_milkweed": "@foliage", + "tfc:plant/tulip_orange": "@foliage", + "tfc:plant/arundo_plant": "@foliage", + "tfc:plant/olive_leaves": "@foliage", + "tfc:plant/pistia": "@foliage", + "tfc:plant/snapdragon_red": "@foliage", + "tfc:plant/water_canna": "@foliage", + "tfc:plant/ryegrass": "@foliage", + "tfc:plant/fountain_grass": "@foliage", + "tfc:plant/bunchberry_bush": "@foliage", + "tfc:plant/lady_fern": "@foliage", + "tfc:plant/dandelion": "@foliage", + "tfc:plant/tulip_white": "@foliage", + "tfc:plant/cherry_leaves": "@foliage", + "tfc:plant/cherry_sapling": "@foliage", + "tfc:plant/orange_growing_branch": "@foliage", + "tfc:plant/dead_banana_plant": "@foliage", + "tfc:plant/star_grass": "@foliage", + "tfc:plant/desert_flame": "@foliage", + "tfc:plant/eel_grass": "@foliage", + "tfc:plant/wintergreen_berry_bush": "@foliage", + "tfc:plant/beachgrass": "@foliage", + "tfc:plant/milfoil": "@foliage", + "tfc:plant/pickerelweed": "@foliage", + "tfc:plant/primrose": "@foliage", + "tfc:plant/sea_lavender": "@foliage", + "tfc:plant/marigold": "@foliage", + "tfc:plant/tropical_milkweed": "@foliage", + "tfc:plant/pampas_grass": "@foliage", + "tfc:plant/ostrich_fern": "@foliage", + "tfc:plant/green_algae": "@foliage", + "tfc:plant/liana_plant": "@foliage", + "tfc:plant/hibiscus": "@foliage", + "tfc:plant/green_apple_leaves": "@foliage", + "tfc:plant/jungle_vines": "@foliage", + "tfc:plant/dead_cane": "@foliage", + "tfc:plant/red_apple_sapling": "@foliage", + "tfc:plant/calendula": "@foliage", + "tfc:plant/plum_growing_branch": "@foliage", + "tfc:plant/snapdragon_white": "@foliage", + "tfc:plant/cherry_branch": "@foliage", + "tfc:plant/plum_branch": "@foliage", + "tfc:plant/lilac": "@foliage", + +//TFC leaves + "tfc:wood/leaves/willow": "@foliage", + "tfc:wood/leaves/acacia": "@foliage", + "tfc:wood/leaves/maple": "@foliage", + "tfc:wood/leaves/douglas_fir": "@foliage", + "tfc:wood/leaves/chestnut": "@foliage", + "tfc:wood/leaves/kapok": "@foliage", + "tfc:wood/leaves/blackwood": "@foliage", + "tfc:wood/leaves/oak": "@foliage", + "tfc:wood/leaves/sequoia": "@foliage", + "tfc:wood/leaves/mangrove": "@foliage", + "tfc:wood/leaves/white_cedar": "@foliage", + "tfc:wood/leaves/ash": "@foliage", + "tfc:wood/leaves/hickory": "@foliage", + "tfc:wood/leaves/birch": "@foliage", + "tfc:wood/leaves/rosewood": "@foliage", + "tfc:wood/leaves/spruce": "@foliage", + "tfc:wood/leaves/palm": "@foliage", + "tfc:wood/leaves/aspen": "@foliage", + "tfc:wood/leaves/pine": "@foliage", + "tfc:wood/leaves/sycamore": "@foliage", + +//TFC fallen leaves + "tfc:wood/fallen_leaves/willow": "@foliage", + "tfc:wood/fallen_leaves/acacia": "@foliage", + "tfc:wood/fallen_leaves/maple": "@foliage", + "tfc:wood/fallen_leaves/douglas_fir": "@foliage", + "tfc:wood/fallen_leaves/chestnut": "@foliage", + "tfc:wood/fallen_leaves/kapok": "@foliage", + "tfc:wood/fallen_leaves/blackwood": "@foliage", + "tfc:wood/fallen_leaves/oak": "@foliage", + "tfc:wood/fallen_leaves/sequoia": "@foliage", + "tfc:wood/fallen_leaves/mangrove": "@foliage", + "tfc:wood/fallen_leaves/white_cedar": "@foliage", + "tfc:wood/fallen_leaves/ash": "@foliage", + "tfc:wood/fallen_leaves/hickory": "@foliage", + "tfc:wood/fallen_leaves/birch": "@foliage", + "tfc:wood/fallen_leaves/rosewood": "@foliage", + "tfc:wood/fallen_leaves/spruce": "@foliage", + "tfc:wood/fallen_leaves/palm": "@foliage", + "tfc:wood/fallen_leaves/aspen": "@foliage", + "tfc:wood/fallen_leaves/pine": "@foliage", + "tfc:wood/fallen_leaves/sycamore": "@foliage" +} \ No newline at end of file diff --git a/config/bluemap/packs/TFG_fix/assets/tfc/blockProperties.json b/config/bluemap/packs/TFG_fix/assets/tfc/blockProperties.json new file mode 100644 index 000000000..a765a45ce --- /dev/null +++ b/config/bluemap/packs/TFG_fix/assets/tfc/blockProperties.json @@ -0,0 +1,1793 @@ +{ + "tfc:fluid/river_water": { + "alwaysWaterlogged": true + }, + "tfc:fluid/salt_water": { + "alwaysWaterlogged": true + }, + "tfc:fluid/spring_water": { + "alwaysWaterlogged": true + }, + "tfc:plant/eel_grass[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:plant/water_taro[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:plant/leafy_kelp_plant[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:plant/leafy_kelp[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:plant/giant_kelp_plant[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:plant/giant_kelp_flower[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:plant/winged_kelp_plant[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:plant/winged_kelp[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:plant/star_grass[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:plant/gutweed[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:plant/phragmite[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:plant/cattail[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:plant/coontail[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:plant/arrowhead[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:plant/sago[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:plant/marigold[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:plant/pickerelweed[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:plant/milfoil[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/leaves/acacia[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/leaves/ash[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/leaves/aspen[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/leaves/birch[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/leaves/blackwood[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/leaves/chestnut[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/leaves/douglas_fir[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/leaves/hickory[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/leaves/kapok[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/leaves/mangrove[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/leaves/maple[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/leaves/oak[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/leaves/palm[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/leaves/pine[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/leaves/rosewood[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/leaves/sequoia[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/leaves/spruce[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/leaves/sycamore[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/leaves/white_cedar[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/twig/acacia[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/twig/ash[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/twig/aspen[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/twig/birch[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/twig/blackwood[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/twig/chestnut[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/twig/douglas_fir[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/twig/hickory[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/twig/kapok[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/twig/mangrove[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/twig/maple[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/twig/oak[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/twig/palm[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/twig/pine[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/twig/rosewood[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/twig/sequoia[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/twig/spruce[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/twig/sycamore[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/twig/white_cedar[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/twig/willow[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/leaves/willow[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:ore/small_bismuthinite[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:ore/small_cassiterite[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:ore/small_garnierite[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:ore/small_hematite[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:ore/small_magnetite[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:ore/small_malachite[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:ore/small_native_copper[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:ore/small_native_gold[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:ore/small_native_silver[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:ore/small_sphalerite[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:ore/small_tetrahedrite[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:ore/small_limonite[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc_ie_addon:ore/small_galena[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc_ie_addon:ore/small_bauxite[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc_ie_addon:ore/small_uraninite[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc_ie_addon:ore/small_galena[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc_ie_addon:ore/small_bauxite[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc_ie_addon:ore/small_uraninite[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:groundcover/bone[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:groundcover/clam[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:groundcover/driftwood[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:groundcover/flint[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:groundcover/mollusk[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:groundcover/mussel[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:groundcover/pinecone[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:groundcover/pumice[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:groundcover/sea_urchin[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:groundcover/stick[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:groundcover/seaweed[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:rock/loose/andesite[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:rock/loose/basalt[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:rock/loose/chalk[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:rock/loose/chert[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:rock/loose/claystone[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:rock/loose/conglomerate[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:rock/loose/dacite[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:rock/loose/diorite[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:rock/loose/dolomite[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:rock/loose/gabbro[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:rock/loose/gneiss[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:rock/loose/granite[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:rock/loose/limestone[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:rock/loose/marble[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:rock/loose/phyllite[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:rock/loose/quartzite[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:rock/loose/rhyolite[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:rock/loose/schist[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:rock/loose/shale[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:rock/loose/slate[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:rock/mossy_loose/andesite[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:rock/mossy_loose/basalt[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:rock/mossy_loose/chalk[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:rock/mossy_loose/chert[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:rock/mossy_loose/claystone[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:rock/mossy_loose/conglomerate[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:rock/mossy_loose/dacite[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:rock/mossy_loose/diorite[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:rock/mossy_loose/dolomite[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:rock/mossy_loose/gabbro[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:rock/mossy_loose/gneiss[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:rock/mossy_loose/granite[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:rock/mossy_loose/limestone[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:rock/mossy_loose/marble[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:rock/mossy_loose/phyllite[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:rock/mossy_loose/quartzite[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:rock/mossy_loose/rhyolite[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:rock/mossy_loose/schist[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:rock/mossy_loose/shale[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:rock/mossy_loose/slate[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:plant/eel_grass[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:plant/salt_water_taro[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:plant/leafy_kelp_plant[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:plant/leafy_kelp[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:plant/giant_kelp_plant[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:plant/giant_kelp_flower[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:plant/winged_kelp_plant[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:plant/winged_kelp[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:plant/star_grass[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:plant/gutweed[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:plant/phragmite[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:plant/cattail[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:plant/coontail[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:plant/arrowhead[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:plant/sago[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:plant/marigold[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:plant/pickerelweed[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:plant/milfoil[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/leaves/acacia[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/leaves/ash[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/leaves/aspen[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/leaves/birch[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/leaves/blackwood[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/leaves/chestnut[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/leaves/douglas_fir[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/leaves/hickory[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/leaves/kapok[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/leaves/mangrove[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/leaves/maple[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/leaves/oak[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/leaves/palm[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/leaves/pine[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/leaves/rosewood[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/leaves/sequoia[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/leaves/spruce[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/leaves/sycamore[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/leaves/white_cedar[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/twig/acacia[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/twig/ash[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/twig/aspen[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/twig/birch[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/twig/blackwood[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/twig/chestnut[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/twig/douglas_fir[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/twig/hickory[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/twig/kapok[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/twig/mangrove[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/twig/maple[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/twig/oak[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/twig/palm[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/twig/pine[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/twig/rosewood[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/twig/sequoia[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/twig/spruce[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/twig/sycamore[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/twig/white_cedar[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/twig/willow[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/leaves/willow[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:ore/small_bismuthinite[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:ore/small_cassiterite[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:ore/small_garnierite[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:ore/small_hematite[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:ore/small_magnetite[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:ore/small_malachite[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:ore/small_native_copper[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:ore/small_native_gold[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:ore/small_native_silver[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:ore/small_sphalerite[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:ore/small_tetrahedrite[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:ore/small_limonite[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:groundcover/bone[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:groundcover/clam[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:groundcover/driftwood[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:groundcover/flint[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:groundcover/mollusk[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:groundcover/mussel[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:groundcover/pinecone[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:groundcover/pumice[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:groundcover/sea_urchin[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:groundcover/stick[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:groundcover/seaweed[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:rock/loose/andesite[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:rock/loose/basalt[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:rock/loose/chalk[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:rock/loose/chert[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:rock/loose/claystone[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:rock/loose/conglomerate[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:rock/loose/dacite[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:rock/loose/diorite[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:rock/loose/dolomite[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:rock/loose/gabbro[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:rock/loose/gneiss[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:rock/loose/granite[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:rock/loose/limestone[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:rock/loose/marble[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:rock/loose/phyllite[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:rock/loose/quartzite[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:rock/loose/rhyolite[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:rock/loose/schist[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:rock/loose/shale[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:rock/loose/slate[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:rock/mossy_loose/andesite[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:rock/mossy_loose/basalt[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:rock/mossy_loose/chalk[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:rock/mossy_loose/chert[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:rock/mossy_loose/claystone[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:rock/mossy_loose/conglomerate[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:rock/mossy_loose/dacite[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:rock/mossy_loose/diorite[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:rock/mossy_loose/dolomite[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:rock/mossy_loose/gabbro[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:rock/mossy_loose/gneiss[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:rock/mossy_loose/granite[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:rock/mossy_loose/limestone[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:rock/mossy_loose/marble[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:rock/mossy_loose/phyllite[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:rock/mossy_loose/quartzite[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:rock/mossy_loose/rhyolite[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:rock/mossy_loose/schist[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:rock/mossy_loose/shale[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:rock/mossy_loose/slate[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "firmalife:hollow_shell[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/fallen_leaves/acacia[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/fallen_leaves/acacia[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/fallen_leaves/ash[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/fallen_leaves/ash[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/fallen_leaves/aspen[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/fallen_leaves/aspen[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/fallen_leaves/birch[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/fallen_leaves/birch[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/fallen_leaves/blackwood[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/fallen_leaves/blackwood[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/fallen_leaves/chestnut[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/fallen_leaves/chestnut[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/fallen_leaves/douglas_fir[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/fallen_leaves/douglas_fir[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/fallen_leaves/hickory[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/fallen_leaves/hickory[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/fallen_leaves/kapok[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/fallen_leaves/kapok[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/fallen_leaves/mangrove[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/fallen_leaves/mangrove[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/fallen_leaves/maple[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/fallen_leaves/maple[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/fallen_leaves/oak[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/fallen_leaves/oak[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/fallen_leaves/palm[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/fallen_leaves/palm[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/fallen_leaves/pine[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/fallen_leaves/pine[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/fallen_leaves/rosewood[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/fallen_leaves/rosewood[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/fallen_leaves/sequoia[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/fallen_leaves/sequoia[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/fallen_leaves/spruce[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/fallen_leaves/spruce[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/fallen_leaves/sycamore[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/fallen_leaves/sycamore[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/fallen_leaves/white_cedar[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/fallen_leaves/white_cedar[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/fallen_leaves/willow[fluid=water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:wood/fallen_leaves/willow[fluid=salt_water]": { + "alwaysWaterlogged": true, + "occluding": false + }, + "tfc:peat_grass": { + "culling": true, + "occluding": true + }, + "tfc:kaolin_clay_grass": { + "culling": true, + "occluding": true + }, + "tfc:grass/silt": { + "culling": true, + "occluding": true + }, + "tfc:clay_grass/silt": { + "culling": true, + "occluding": true + }, + "tfc:grass_path/silt": { + "culling": true, + "occluding": true + }, + "tfc:grass/loam": { + "culling": true, + "occluding": true + }, + "tfc:clay_grass/loam": { + "culling": true, + "occluding": true + }, + "tfc:grass_path/loam": { + "culling": true, + "occluding": true + }, + "tfc:grass/sandy": { + "culling": true, + "occluding": true + }, + "tfc:clay_grass/sandy": { + "culling": true, + "occluding": true + }, + "tfc:grass_path/sandy": { + "culling": true, + "occluding": true + }, + "tfc:grass/silty_loam": { + "culling": true, + "occluding": true + }, + "tfc:clay_grass/silty_loam": { + "culling": true, + "occluding": true + }, + "tfc:grass_path/silty_loam": { + "culling": true, + "occluding": true + }, + "tfc:grass/sandy_loam": { + "culling": true, + "occluding": true + }, + "tfc:clay_grass/sandy_loam": { + "culling": true, + "occluding": true + }, + "tfc:grass_path/sandy_loam": { + "culling": true, + "occluding": true + }, + "tfc:plant/allium": { + "randomOffset": true + }, + "tfc:plant/anthurium": { + "randomOffset": true + }, + "tfc:plant/arrowhead": { + "randomOffset": true + }, + "tfc:plant/artists_conk": { + "randomOffset": true + }, + "tfc:plant/arundo": { + "randomOffset": true + }, + "tfc:plant/arundo_plant": { + "randomOffset": true + }, + "tfc:plant/aspen_krummholz": { + "randomOffset": true + }, + "tfc:plant/athyrium_fern": { + "randomOffset": true + }, + "tfc:plant/badderlocks": { + "randomOffset": true + }, + "tfc:plant/banana_plant": { + "randomOffset": true + }, + "tfc:plant/banana_sapling": { + "randomOffset": true + }, + "tfc:plant/barrel_cactus": { + "randomOffset": true + }, + "tfc:plant/beachgrass": { + "randomOffset": true + }, + "tfc:plant/blackberry_bush": { + "randomOffset": true + }, + "tfc:plant/blackberry_bush_cane": { + "randomOffset": true + }, + "tfc:plant/black_orchid": { + "randomOffset": true + }, + "tfc:plant/blood_lily": { + "randomOffset": true + }, + "tfc:plant/blueberry_bush": { + "randomOffset": true + }, + "tfc:plant/blueberry_bush_cane": { + "randomOffset": true + }, + "tfc:plant/bluegrass": { + "randomOffset": true + }, + "tfc:plant/blue_ginger": { + "randomOffset": true + }, + "tfc:plant/blue_orchid": { + "randomOffset": true + }, + "tfc:plant/bromegrass": { + "randomOffset": true + }, + "tfc:plant/bunchberry_bush": { + "randomOffset": true + }, + "tfc:plant/bur_reed": { + "randomOffset": true + }, + "tfc:plant/butterfly_milkweed": { + "randomOffset": true + }, + "tfc:plant/calendula": { + "randomOffset": true + }, + "tfc:plant/canna": { + "randomOffset": true + }, + "tfc:plant/cattail": { + "randomOffset": true + }, + "tfc:plant/cherry_branch": { + "randomOffset": true + }, + "tfc:plant/cherry_growing_branch": { + "randomOffset": true + }, + "tfc:plant/cherry_leaves": { + "randomOffset": true + }, + "tfc:plant/cherry_sapling": { + "randomOffset": true + }, + "tfc:plant/cloudberry_bush": { + "randomOffset": true + }, + "tfc:plant/cobblestone_lichen": { + "randomOffset": true + }, + "tfc:plant/coontail": { + "randomOffset": true + }, + "tfc:plant/cordgrass": { + "randomOffset": true + }, + "tfc:plant/cranberry_bush": { + "randomOffset": true + }, + "tfc:plant/dandelion": { + "randomOffset": true + }, + "tfc:plant/dead_banana_plant": { + "randomOffset": true + }, + "tfc:plant/dead_berry_bush": { + "randomOffset": true + }, + "tfc:plant/dead_bush": { + "randomOffset": true + }, + "tfc:plant/dead_cane": { + "randomOffset": true + }, + "tfc:plant/desert_flame": { + "randomOffset": true + }, + "tfc:plant/douglas_fir_krummholz": { + "randomOffset": true + }, + "tfc:plant/dry_phragmite": { + "randomOffset": true + }, + "tfc:plant/dry_phragmite_plant": { + "randomOffset": true + }, + "tfc:plant/duckweed": { + "randomOffset": true + }, + "tfc:plant/eel_grass": { + "randomOffset": true + }, + "tfc:plant/elderberry_bush": { + "randomOffset": true + }, + "tfc:plant/elderberry_bush_cane": { + "randomOffset": true + }, + "tfc:plant/field_horsetail": { + "randomOffset": true + }, + "tfc:plant/fountain_grass": { + "randomOffset": true + }, + "tfc:plant/foxglove": { + "randomOffset": true + }, + "tfc:plant/giant_kelp_flower": { + "randomOffset": true + }, + "tfc:plant/giant_kelp_plant": { + "randomOffset": true + }, + "tfc:plant/goldenrod": { + "randomOffset": true + }, + "tfc:plant/gooseberry_bush": { + "randomOffset": true + }, + "tfc:plant/grape_hyacinth": { + "randomOffset": true + }, + "tfc:plant/green_algae": { + "randomOffset": true + }, + "tfc:plant/green_apple_branch": { + "randomOffset": true + }, + "tfc:plant/green_apple_growing_branch": { + "randomOffset": true + }, + "tfc:plant/green_apple_leaves": { + "randomOffset": true + }, + "tfc:plant/green_apple_sapling": { + "randomOffset": true + }, + "tfc:plant/gutweed": { + "randomOffset": true + }, + "tfc:plant/guzmania": { + "randomOffset": true + }, + "tfc:plant/hanging_vines": { + "randomOffset": true + }, + "tfc:plant/hanging_vines_plant": { + "randomOffset": true + }, + "tfc:plant/heather": { + "randomOffset": true + }, + "tfc:plant/heliconia": { + "randomOffset": true + }, + "tfc:plant/hibiscus": { + "randomOffset": true + }, + "tfc:plant/houstonia": { + "randomOffset": true + }, + "tfc:plant/ivy": { + "randomOffset": true + }, + "tfc:plant/jungle_vines": { + "randomOffset": true + }, + "tfc:plant/kangaroo_paw": { + "randomOffset": true + }, + "tfc:plant/king_fern": { + "randomOffset": true + }, + "tfc:plant/labrador_tea": { + "randomOffset": true + }, + "tfc:plant/lady_fern": { + "randomOffset": true + }, + "tfc:plant/laminaria": { + "randomOffset": true + }, + "tfc:plant/leafy_kelp": { + "randomOffset": true + }, + "tfc:plant/leafy_kelp_plant": { + "randomOffset": true + }, + "tfc:plant/lemon_branch": { + "randomOffset": true + }, + "tfc:plant/lemon_growing_branch": { + "randomOffset": true + }, + "tfc:plant/lemon_leaves": { + "randomOffset": true + }, + "tfc:plant/lemon_sapling": { + "randomOffset": true + }, + "tfc:plant/liana": { + "randomOffset": true + }, + "tfc:plant/liana_plant": { + "randomOffset": true + }, + "tfc:plant/licorice_fern": { + "randomOffset": true + }, + "tfc:plant/lilac": { + "randomOffset": true + }, + "tfc:plant/lily_of_the_valley": { + "randomOffset": true + }, + "tfc:plant/lotus": { + "randomOffset": true + }, + "tfc:plant/maiden_pink": { + "randomOffset": true + }, + "tfc:plant/manatee_grass": { + "randomOffset": true + }, + "tfc:plant/marigold": { + "randomOffset": true + }, + "tfc:plant/meads_milkweed": { + "randomOffset": true + }, + "tfc:plant/milfoil": { + "randomOffset": true + }, + "tfc:plant/morning_glory": { + "randomOffset": true + }, + "tfc:plant/moss": { + "randomOffset": true + }, + "tfc:plant/nasturtium": { + "randomOffset": true + }, + "tfc:plant/olive_branch": { + "randomOffset": true + }, + "tfc:plant/olive_growing_branch": { + "randomOffset": true + }, + "tfc:plant/olive_leaves": { + "randomOffset": true + }, + "tfc:plant/olive_sapling": { + "randomOffset": true + }, + "tfc:plant/orange_branch": { + "randomOffset": true + }, + "tfc:plant/orange_growing_branch": { + "randomOffset": true + }, + "tfc:plant/orange_leaves": { + "randomOffset": true + }, + "tfc:plant/orange_sapling": { + "randomOffset": true + }, + "tfc:plant/orchard_grass": { + "randomOffset": true + }, + "tfc:plant/ostrich_fern": { + "randomOffset": true + }, + "tfc:plant/oxeye_daisy": { + "randomOffset": true + }, + "tfc:plant/pampas_grass": { + "randomOffset": true + }, + "tfc:plant/peach_branch": { + "randomOffset": true + }, + "tfc:plant/peach_growing_branch": { + "randomOffset": true + }, + "tfc:plant/peach_leaves": { + "randomOffset": true + }, + "tfc:plant/peach_sapling": { + "randomOffset": true + }, + "tfc:plant/perovskia": { + "randomOffset": true + }, + "tfc:plant/philodendron": { + "randomOffset": true + }, + "tfc:plant/phragmite": { + "randomOffset": true + }, + "tfc:plant/pickerelweed": { + "randomOffset": true + }, + "tfc:plant/pine_krummholz": { + "randomOffset": true + }, + "tfc:plant/pistia": { + "randomOffset": true + }, + "tfc:plant/plum_branch": { + "randomOffset": true + }, + "tfc:plant/plum_growing_branch": { + "randomOffset": true + }, + "tfc:plant/plum_leaves": { + "randomOffset": true + }, + "tfc:plant/plum_sapling": { + "randomOffset": true + }, + "tfc:plant/poppy": { + "randomOffset": true + }, + "tfc:plant/primrose": { + "randomOffset": true + }, + "tfc:plant/pulsatilla": { + "randomOffset": true + }, + "tfc:plant/raddia_grass": { + "randomOffset": true + }, + "tfc:plant/raspberry_bush": { + "randomOffset": true + }, + "tfc:plant/raspberry_bush_cane": { + "randomOffset": true + }, + "tfc:plant/red_algae": { + "randomOffset": true + }, + "tfc:plant/red_apple_branch": { + "randomOffset": true + }, + "tfc:plant/red_apple_growing_branch": { + "randomOffset": true + }, + "tfc:plant/red_apple_leaves": { + "randomOffset": true + }, + "tfc:plant/red_apple_sapling": { + "randomOffset": true + }, + "tfc:plant/red_sealing_wax_palm": { + "randomOffset": true + }, + "tfc:plant/reindeer_lichen": { + "randomOffset": true + }, + "tfc:plant/rose": { + "randomOffset": true + }, + "tfc:plant/ryegrass": { + "randomOffset": true + }, + "tfc:plant/sacred_datura": { + "randomOffset": true + }, + "tfc:plant/sagebrush": { + "randomOffset": true + }, + "tfc:plant/sago": { + "randomOffset": true + }, + "tfc:plant/saguaro": { + "randomOffset": true + }, + "tfc:plant/saguaro_fruit": { + "randomOffset": true + }, + "tfc:plant/saguaro_plant": { + "randomOffset": true + }, + "tfc:plant/sapphire_tower": { + "randomOffset": true + }, + "tfc:plant/sargassum": { + "randomOffset": true + }, + "tfc:plant/scutch_grass": { + "randomOffset": true + }, + "tfc:plant/sea_lavender": { + "randomOffset": true + }, + "tfc:plant/sea_palm": { + "randomOffset": true + }, + "tfc:plant/silver_spurflower": { + "randomOffset": true + }, + "tfc:plant/snapdragon_pink": { + "randomOffset": true + }, + "tfc:plant/snapdragon_red": { + "randomOffset": true + }, + "tfc:plant/snapdragon_white": { + "randomOffset": true + }, + "tfc:plant/snapdragon_yellow": { + "randomOffset": true + }, + "tfc:plant/snowberry_bush": { + "randomOffset": true + }, + "tfc:plant/spanish_moss": { + "randomOffset": true + }, + "tfc:plant/spanish_moss_plant": { + "randomOffset": true + }, + "tfc:plant/spruce_krummholz": { + "randomOffset": true + }, + "tfc:plant/star_grass": { + "randomOffset": true + }, + "tfc:plant/strawberry_bush": { + "randomOffset": true + }, + "tfc:plant/strelitzia": { + "randomOffset": true + }, + "tfc:plant/switchgrass": { + "randomOffset": true + }, + "tfc:plant/sword_fern": { + "randomOffset": true + }, + "tfc:plant/tall_fescue_grass": { + "randomOffset": true + }, + "tfc:plant/timothy_grass": { + "randomOffset": true + }, + "tfc:plant/toquilla_palm": { + "randomOffset": true + }, + "tfc:plant/tree_fern": { + "randomOffset": true + }, + "tfc:plant/tree_fern_plant": { + "randomOffset": true + }, + "tfc:plant/trillium": { + "randomOffset": true + }, + "tfc:plant/tropical_milkweed": { + "randomOffset": true + }, + "tfc:plant/tulip_orange": { + "randomOffset": true + }, + "tfc:plant/tulip_pink": { + "randomOffset": true + }, + "tfc:plant/tulip_red": { + "randomOffset": true + }, + "tfc:plant/tulip_white": { + "randomOffset": true + }, + "tfc:plant/turtle_grass": { + "randomOffset": true + }, + "tfc:plant/vriesea": { + "randomOffset": true + }, + "tfc:plant/water_canna": { + "randomOffset": true + }, + "tfc:plant/water_lily": { + "randomOffset": true + }, + "tfc:plant/water_taro": { + "randomOffset": true + }, + "tfc:plant/white_cedar_krummholz": { + "randomOffset": true + }, + "tfc:plant/winged_kelp": { + "randomOffset": true + }, + "tfc:plant/winged_kelp_plant": { + "randomOffset": true + }, + "tfc:plant/wintergreen_berry_bush": { + "randomOffset": true + }, + "tfc:plant/yucca": { + "randomOffset": true + } +} \ No newline at end of file diff --git a/config/bluemap/packs/TFG_fix/assets/tfc/models/block/fluid/river_water.json b/config/bluemap/packs/TFG_fix/assets/tfc/models/block/fluid/river_water.json new file mode 100644 index 000000000..0967ef424 --- /dev/null +++ b/config/bluemap/packs/TFG_fix/assets/tfc/models/block/fluid/river_water.json @@ -0,0 +1 @@ +{} diff --git a/config/bluemap/packs/TFG_fix/assets/tfc/models/block/fluid/salt_water.json b/config/bluemap/packs/TFG_fix/assets/tfc/models/block/fluid/salt_water.json new file mode 100644 index 000000000..0967ef424 --- /dev/null +++ b/config/bluemap/packs/TFG_fix/assets/tfc/models/block/fluid/salt_water.json @@ -0,0 +1 @@ +{} diff --git a/config/bluemap/packs/TFG_fix/assets/tfc/models/block/fluid/spring_water.json b/config/bluemap/packs/TFG_fix/assets/tfc/models/block/fluid/spring_water.json new file mode 100644 index 000000000..0967ef424 --- /dev/null +++ b/config/bluemap/packs/TFG_fix/assets/tfc/models/block/fluid/spring_water.json @@ -0,0 +1 @@ +{} diff --git a/config/bluemap/packs/TFG_fix/pack.mcmeta b/config/bluemap/packs/TFG_fix/pack.mcmeta new file mode 100644 index 000000000..9bb5431f7 --- /dev/null +++ b/config/bluemap/packs/TFG_fix/pack.mcmeta @@ -0,0 +1,6 @@ +{ + "pack": { + "pack_format": 8, + "description": "TFC Water and Grass Fix for BlueMap by dhs92 + AFC tree and leaves fix by WoopSmile" + } +} diff --git a/config/carryon-common.toml b/config/carryon-common.toml index bcd253142..c8fe92609 100644 --- a/config/carryon-common.toml +++ b/config/carryon-common.toml @@ -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", "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"] + 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", "wan_ancient_beasts:snatcher", "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/crash_assistant/modlist.json b/config/crash_assistant/modlist.json index 4ac65046b..75537b804 100644 --- a/config/crash_assistant/modlist.json +++ b/config/crash_assistant/modlist.json @@ -123,12 +123,12 @@ "curseForgeHash": 409215932, "modrinthHash": "f0b711df59cd589b088e536ca4134c5e6e73fd58" }, - "AmbientSounds_FORGE_v6.3.3_mc1.20.1.jar": { - "jarName": "AmbientSounds_FORGE_v6.3.3_mc1.20.1.jar", + "AmbientSounds_FORGE_v6.3.4_mc1.20.1.jar": { + "jarName": "AmbientSounds_FORGE_v6.3.4_mc1.20.1.jar", "modId": "ambientsounds", - "version": "6.3.3", - "curseForgeHash": 1083459992, - "modrinthHash": "b4a0e4937db9c83ec82a6809f8d53ab2b9e7a62c" + "version": "6.3.4", + "curseForgeHash": 2803957593, + "modrinthHash": "e84e7053c4c3a73c7f608c9da516bb5d393aab60" }, "applied_ammo_box-1.0.2.jar": { "jarName": "applied_ammo_box-1.0.2.jar", @@ -165,12 +165,12 @@ "curseForgeHash": 381211649, "modrinthHash": "6eb69343eb21d38f95d1b1d00e6bc777bdb336fa" }, - "baguettelib-1.20.1-Forge-1.1.5.jar": { - "jarName": "baguettelib-1.20.1-Forge-1.1.5.jar", + "baguettelib-1.20.1-Forge-1.1.6.jar": { + "jarName": "baguettelib-1.20.1-Forge-1.1.6.jar", "modId": "baguettelib", - "version": "1.1.5", - "curseForgeHash": 734602455, - "modrinthHash": "7aaab6216e7fc72e1606b1e35f1f56a18f01153f" + "version": "1.1.6", + "curseForgeHash": 2947245849, + "modrinthHash": "8d3c9551bbed4c2f2e8cb2b9a10d31bad4edb52d" }, "balm-forge-1.20.1-7.3.38-all.jar": { "jarName": "balm-forge-1.20.1-7.3.38-all.jar", @@ -396,12 +396,12 @@ "curseForgeHash": 2156032012, "modrinthHash": "b13d912b9247a38d66d11598c121442585a1c1e9" }, - "create_connected-1.1.10-mc1.20.1-all.jar": { - "jarName": "create_connected-1.1.10-mc1.20.1-all.jar", + "create_connected-1.1.12-mc1.20.1-all.jar": { + "jarName": "create_connected-1.1.12-mc1.20.1-all.jar", "modId": "create_connected", - "version": "1.1.10-mc1.20.1", - "curseForgeHash": 198954090, - "modrinthHash": "eea1d04aee638689a99acf66457327b13a4b3f96" + "version": "1.1.12-mc1.20.1", + "curseForgeHash": 658641737, + "modrinthHash": "6a27b27ad502429650fa621009daacc876bd3e28" }, "create_factory_logistics-1.20.1-1.4.7.jar": { "jarName": "create_factory_logistics-1.20.1-1.4.7.jar", @@ -452,13 +452,6 @@ "curseForgeHash": 3915242941, "modrinthHash": "338704cdf6623ad96983e72e81e8a9d97e8b28d8" }, - "createstockbridge-1.20-0.1.5.jar": { - "jarName": "createstockbridge-1.20-0.1.5.jar", - "modId": "createstockbridge", - "version": "0.1.5", - "curseForgeHash": 3147522607, - "modrinthHash": "0fa15f11788e3bc3a812fc597ade17af33888952" - }, "CreativeCore_FORGE_v2.12.32_mc1.20.1.jar": { "jarName": "CreativeCore_FORGE_v2.12.32_mc1.20.1.jar", "modId": "creativecore", @@ -515,12 +508,12 @@ "curseForgeHash": 4053708632, "modrinthHash": "08b58bfbdf20660bdc5a0c4a0b088f7d89f40a38" }, - "domum_ornamentum-1.20.1-1.0.295-snapshot-universal.jar": { - "jarName": "domum_ornamentum-1.20.1-1.0.295-snapshot-universal.jar", + "domum_ornamentum-1.20.1-1.0.295-universal.jar": { + "jarName": "domum_ornamentum-1.20.1-1.0.295-universal.jar", "modId": "domum_ornamentum", - "version": "1.20.1-1.0.295-snapshot", - "curseForgeHash": 2324950079, - "modrinthHash": "f5fc47a7006445e4f999611d1cc95bda55c70b1f" + "version": "1.20.1-1.0.295", + "curseForgeHash": 2550579719, + "modrinthHash": "29950245b98ec35184d806e3b9ace700e67ac585" }, "drippyloadingscreen_forge_3.1.0_MC_1.20.1.jar": { "jarName": "drippyloadingscreen_forge_3.1.0_MC_1.20.1.jar", @@ -627,12 +620,12 @@ "curseForgeHash": 3575355395, "modrinthHash": "ceeeae222c51ae100e5126c4a5a7a05f4f3f4712" }, - "FastSuite-1.20.1-5.1.1.jar": { - "jarName": "FastSuite-1.20.1-5.1.1.jar", + "FastSuite-1.20.1-5.1.2.jar": { + "jarName": "FastSuite-1.20.1-5.1.2.jar", "modId": "fastsuite", - "version": "5.1.1", - "curseForgeHash": 4161769711, - "modrinthHash": "dfceb81524a9e1be19bf89d0281c05b6edf5326c" + "version": "5.1.2", + "curseForgeHash": 2881858684, + "modrinthHash": "32ea4495b0e646f8f060e4e97d17044dd9fdefbd" }, "FastWorkbench-1.20.1-8.0.4.jar": { "jarName": "FastWorkbench-1.20.1-8.0.4.jar", @@ -760,19 +753,19 @@ "curseForgeHash": 3895274001, "modrinthHash": "6f1e3a25c4a0258c2592fefb837f95a24eb3bfa0" }, - "fzzy_config-0.7.5+1.20.1+forge.jar": { - "jarName": "fzzy_config-0.7.5+1.20.1+forge.jar", + "fzzy_config-0.7.6+1.20.1+forge.jar": { + "jarName": "fzzy_config-0.7.6+1.20.1+forge.jar", "modId": "fzzy_config", - "version": "0.7.5+1.20.1+forge", - "curseForgeHash": 1765843012, - "modrinthHash": "7e890f8b527ccb4523fed54a2864549a53f65fed" + "version": "0.7.6+1.20.1+forge", + "curseForgeHash": 3620637257, + "modrinthHash": "2e9ca1c5f028c251e1bc18b9ebaa06d401c8e624" }, - "geckolib-forge-1.20.1-4.8.2.jar": { - "jarName": "geckolib-forge-1.20.1-4.8.2.jar", + "geckolib-forge-1.20.1-4.8.3.jar": { + "jarName": "geckolib-forge-1.20.1-4.8.3.jar", "modId": "geckolib", - "version": "4.8.2", - "curseForgeHash": 1555934041, - "modrinthHash": "395a9f21a36dc8466d67c2af67a904e7013460d1" + "version": "4.8.3", + "curseForgeHash": 4092514766, + "modrinthHash": "5428765c6c2e2135da6ee01f2f0478fa0db6aee7" }, "Glodium-1.20-1.5-forge.jar": { "jarName": "Glodium-1.20-1.5-forge.jar", @@ -795,12 +788,12 @@ "curseForgeHash": 3324262533, "modrinthHash": "aa53625ab5e145c6aa196645335b062b37ae82da" }, - "greate-0.0.62.jar": { - "jarName": "greate-0.0.62.jar", + "greate-0.0.64.jar": { + "jarName": "greate-0.0.64.jar", "modId": "greate", - "version": "0.0.62", - "curseForgeHash": 4030779299, - "modrinthHash": "0e4ffe5e88f97df724172b3061a1691028f45582" + "version": "0.0.64", + "curseForgeHash": 2026447132, + "modrinthHash": "7e779ac568c27ebb8cb9b16c6b8797b633ffdcdf" }, "gtceu-1.20.1-7.4.1.jar": { "jarName": "gtceu-1.20.1-7.4.1.jar", @@ -809,12 +802,19 @@ "curseForgeHash": 2174922911, "modrinthHash": "50ae5df1cc5213aa429a976b6393e0bd4e22238e" }, - "gtmoldraw-3.0.0.jar": { - "jarName": "gtmoldraw-3.0.0.jar", + "gtceuterminal-2.4.5.jar": { + "jarName": "gtceuterminal-2.4.5.jar", + "modId": "gtceuterminal", + "version": "1.0.2", + "curseForgeHash": 3654021553, + "modrinthHash": "d0e5cd6b8d6d5fe89f9e24434c35a61bc0294896" + }, + "gtmoldraw-3.0.1.jar": { + "jarName": "gtmoldraw-3.0.1.jar", "modId": "moldraw", - "version": "3.0.0", - "curseForgeHash": 586035337, - "modrinthHash": "9377694e2e3d8c62bdacd400e125acc732c54803" + "version": "3.0.1", + "curseForgeHash": 3258582267, + "modrinthHash": "caaf28b88afe1b01ec4180a4458c2795184255bc" }, "guideme-20.1.14.jar": { "jarName": "guideme-20.1.14.jar", @@ -844,12 +844,12 @@ "curseForgeHash": 726705548, "modrinthHash": "bc2d8febd3ddb7f5a0da5c840544ad49eb6e8625" }, - "ImmediatelyFast-Forge-1.5.3+1.20.4.jar": { - "jarName": "ImmediatelyFast-Forge-1.5.3+1.20.4.jar", + "ImmediatelyFast-Forge-1.5.4+1.20.4.jar": { + "jarName": "ImmediatelyFast-Forge-1.5.4+1.20.4.jar", "modId": "immediatelyfast", - "version": "1.5.3+1.20.4", - "curseForgeHash": 2056126318, - "modrinthHash": "d4695d013e9da7089e2906db3f56bc5398e478e2" + "version": "1.5.4+1.20.4", + "curseForgeHash": 4234781540, + "modrinthHash": "e2e60485a0c3efa72f1948c952b095150e3ba4fc" }, "immersive_aircraft-1.4.0+1.20.1-forge.jar": { "jarName": "immersive_aircraft-1.4.0+1.20.1-forge.jar", @@ -968,12 +968,12 @@ "curseForgeHash": 2035895651, "modrinthHash": "e6346060ae70cbf103b231d8a1536bcd044c84a8" }, - "lootjs-forge-1.20.1-2.13.0.jar": { - "jarName": "lootjs-forge-1.20.1-2.13.0.jar", + "lootjs-forge-1.20.1-2.13.1.jar": { + "jarName": "lootjs-forge-1.20.1-2.13.1.jar", "modId": "lootjs", - "version": "1.20.1-2.13.0", - "curseForgeHash": 4083554858, - "modrinthHash": "fdf90acf177c19bcbfaa08527f6568bd3e6e622e" + "version": "1.20.1-2.13.1", + "curseForgeHash": 1389353380, + "modrinthHash": "804deb0bd34d69cad873170642b9d7e47fa0d6ad" }, "lootr-forge-1.20-0.7.35.94.jar": { "jarName": "lootr-forge-1.20-0.7.35.94.jar", @@ -1024,12 +1024,12 @@ "curseForgeHash": 544928077, "modrinthHash": "24e6611df470afd957eafd16c43890b7214e3da9" }, - "modernfix-forge-5.26.1+mc1.20.1.jar": { - "jarName": "modernfix-forge-5.26.1+mc1.20.1.jar", + "modernfix-forge-5.26.2+mc1.20.1.jar": { + "jarName": "modernfix-forge-5.26.2+mc1.20.1.jar", "modId": "modernfix", - "version": "5.26.1+mc1.20.1", - "curseForgeHash": 424935770, - "modrinthHash": "fa0163b33e911b69af61fee8a3920820e7c617a0" + "version": "5.26.2+mc1.20.1", + "curseForgeHash": 2785638273, + "modrinthHash": "0adfc122e9f632d8847688c4c3ed20a1af182afa" }, "ModernUI-Forge-1.20.1-3.12.0.1-universal.jar": { "jarName": "ModernUI-Forge-1.20.1-3.12.0.1-universal.jar", @@ -1038,12 +1038,12 @@ "curseForgeHash": 2393054142, "modrinthHash": "fcebe51e3c2ca34793f9b132fa05b5494ffc76a4" }, - "moonlight-1.20-2.16.23-forge.jar": { - "jarName": "moonlight-1.20-2.16.23-forge.jar", + "moonlight-1.20-2.16.27-forge.jar": { + "jarName": "moonlight-1.20-2.16.27-forge.jar", "modId": "moonlight", - "version": "1.20-2.16.23", - "curseForgeHash": 3524849719, - "modrinthHash": "c63750ef54ac17d0dc1e58c246c6dac3d8d9ac87" + "version": "1.20-2.16.27", + "curseForgeHash": 827170608, + "modrinthHash": "0a1b384ec20d63e94c56123b53e264dc2afe5b17" }, "morered-1.20.1-4.0.0.4.jar": { "jarName": "morered-1.20.1-4.0.0.4.jar", @@ -1094,12 +1094,12 @@ "curseForgeHash": 1367373369, "modrinthHash": "c0806369f4257149664904db44efc60bd1785c17" }, - "notenoughanimations-forge-1.11.1-mc1.20.1.jar": { - "jarName": "notenoughanimations-forge-1.11.1-mc1.20.1.jar", + "notenoughanimations-forge-1.11.2-mc1.20.1.jar": { + "jarName": "notenoughanimations-forge-1.11.2-mc1.20.1.jar", "modId": "notenoughanimations", - "version": "1.11.1", - "curseForgeHash": 1394524316, - "modrinthHash": "9aa8917d7c0a5311dc495da3c720434de49e0e24" + "version": "1.11.2", + "curseForgeHash": 978006094, + "modrinthHash": "fe7898d27c15b76552a69b972abec0728be9ea8a" }, "OctoLib-FORGE-0.5.0.1+1.20.1.jar": { "jarName": "OctoLib-FORGE-0.5.0.1+1.20.1.jar", @@ -1129,12 +1129,12 @@ "curseForgeHash": 3233971835, "modrinthHash": "cc0332d3bbf7824b673abc59e231f1f5aafc6420" }, - "particle_core-0.3.1+1.20.1+forge.jar": { - "jarName": "particle_core-0.3.1+1.20.1+forge.jar", + "particle_core-0.3.2+1.20.1+forge.jar": { + "jarName": "particle_core-0.3.2+1.20.1+forge.jar", "modId": "particle_core", - "version": "0.3.1+1.20.1+forge", - "curseForgeHash": 4077743380, - "modrinthHash": "935a8c19cc7a72364fdfe494d9ddbd599f01588d" + "version": "0.3.2+1.20.1+forge", + "curseForgeHash": 1864908717, + "modrinthHash": "57079d1607ce044533fb076d2db0e2a3d277a4fb" }, "particular-1.20.1-Forge-1.2.7.jar": { "jarName": "particular-1.20.1-Forge-1.2.7.jar", @@ -1164,6 +1164,13 @@ "curseForgeHash": 3174429337, "modrinthHash": "e85f53de2e582a79ce25ff1df1e7b5b5fc08440f" }, + "playerrevive_compat-1.0.2-12c699b.jar": { + "jarName": "playerrevive_compat-1.0.2-12c699b.jar", + "modId": "playerrevive_compat", + "version": "1.0.2", + "curseForgeHash": 2120677158, + "modrinthHash": "a0f05d85155560b743d6ffab61741e3da3803611" + }, "PlayerRevive_FORGE_v2.0.31_mc1.20.1.jar": { "jarName": "PlayerRevive_FORGE_v2.0.31_mc1.20.1.jar", "modId": "playerrevive", @@ -1374,12 +1381,12 @@ "curseForgeHash": 218830698, "modrinthHash": "7d4f578a42c9b880744ea6058a495847aac9e4c3" }, - "tacz-tweaks-2.12.1-all.jar": { - "jarName": "tacz-tweaks-2.12.1-all.jar", + "tacz-tweaks-2.12.2-all.jar": { + "jarName": "tacz-tweaks-2.12.2-all.jar", "modId": "tacztweaks", - "version": "2.12.1", - "curseForgeHash": 769672337, - "modrinthHash": "92c9981e2e2f2edecab25ee48c5bade7a14298a8" + "version": "2.12.2", + "curseForgeHash": 493830591, + "modrinthHash": "f726c2d0ac2c77e3cc7f93fad7fd4338117c7a80" }, "taczammoquery-1.20.1-1.0.0.jar": { "jarName": "taczammoquery-1.20.1-1.0.0.jar", @@ -1402,19 +1409,19 @@ "curseForgeHash": 2679626739, "modrinthHash": "ea725f5bed9662aa22d4ec089a009bd52fb82275" }, - "TerraFirmaGreg-Core-Modern-0.8.18.jar": { - "jarName": "TerraFirmaGreg-Core-Modern-0.8.18.jar", + "TerraFirmaGreg-Core-Modern-0.8.19.jar": { + "jarName": "TerraFirmaGreg-Core-Modern-0.8.19.jar", "modId": "tfg", - "version": "0.8.18", - "curseForgeHash": 3264017794, - "modrinthHash": "b4f98b976aa7096b6ec0a6bd291fb16415dfeb3a" + "version": "0.8.19", + "curseForgeHash": 275630824, + "modrinthHash": "ff9b919b7afa7a8f921c50d29718d4a3f8115648" }, - "tfc_gurman-1.3.0.jar": { - "jarName": "tfc_gurman-1.3.0.jar", - "modId": "tfc_gurman", - "version": "1.3.0", - "curseForgeHash": 1214501371, - "modrinthHash": "c55512789128af89d57fe0c9a2f3b4d59a491724" + "tfc_gourmet-1.4.3.jar": { + "jarName": "tfc_gourmet-1.4.3.jar", + "modId": "tfc_gourmet", + "version": "1.4.3", + "curseForgeHash": 415442845, + "modrinthHash": "103326499c4a574c87474a5af52f97d7a730071f" }, "TFC_punishment_for_death-1.20.1-1.0.0.15.jar": { "jarName": "TFC_punishment_for_death-1.20.1-1.0.0.15.jar", @@ -1626,12 +1633,12 @@ "curseForgeHash": 1687292018, "modrinthHash": "d1416bd683464538a7615d1649eecc7027b227e2" }, - "wab-1.20.1-1.3.2.jar": { - "jarName": "wab-1.20.1-1.3.2.jar", + "wab-1.20.1-1.4.1.jar": { + "jarName": "wab-1.20.1-1.4.1.jar", "modId": "wan_ancient_beasts", - "version": "1.3.2", - "curseForgeHash": 2333549546, - "modrinthHash": "7298a59e383d2327e2acc49d8f1b132cedb8860b" + "version": "1.4.1", + "curseForgeHash": 194648790, + "modrinthHash": "6a9465b15671d7f1ea2f7b3ed44c881065b945f6" }, "wakes-1.20.1-Forge-1.0.9.jar": { "jarName": "wakes-1.20.1-Forge-1.0.9.jar", diff --git a/config/defaultoptions/keybindings.txt b/config/defaultoptions/keybindings.txt index de2c93287..a170c108b 100644 --- a/config/defaultoptions/keybindings.txt +++ b/config/defaultoptions/keybindings.txt @@ -78,7 +78,7 @@ key_key.astikorcarts.desc:key.keyboard.r:NONE key_key.curios.open.desc:key.keyboard.unknown:NONE key_create.keyinfo.toolmenu:key.keyboard.left.alt:NONE key_create.keyinfo.toolbelt:key.keyboard.left.alt:NONE -key_key.toolbelt.open:key.keyboard.unknown:NONE +key_key.toolbelt.open:key.keyboard.x:NONE key_key.toolbelt.slot:key.keyboard.unknown:NONE key_gui.xaero_switch_waypoint_set:key.keyboard.unknown:NONE key_gui.xaero_instant_waypoint:key.keyboard.unknown:NONE @@ -120,4 +120,9 @@ key_gtceu.key.armor_mode_switch:key.keyboard.o key_key.ftbchunks.map:key.keyboard.unknown:NONE key_key.ftbchunks.claim_manager:key.keyboard.unknown:NONE key_key.ad_astra.toggle_suit_flight:key.keyboard.h:NONE -key_key.ad_astra.open_radio:key.keyboard.r:NONE \ No newline at end of file +key_key.ad_astra.open_radio:key.keyboard.r:NONE +key_key.wan_ancient_beasts.special_ability:key.keyboard.c:NONE +key_key.saveToolbarActivator:key.keyboard.unknown:NONE +key_key.loadToolbarActivator:key.keyboard.unknown:NONE +key_key.tacz.crawl.desc:key.keyboard.c:NONE +key_key.prone:key.keyboard.c:NONE diff --git a/config/defaultoptions/options.txt b/config/defaultoptions/options.txt index 67d33be82..d5b550ee3 100644 --- a/config/defaultoptions/options.txt +++ b/config/defaultoptions/options.txt @@ -3,12 +3,12 @@ resourcePacks:["vanilla","mod_resources","gtceu:dynamic_assets","Moonlight Mods incompatibleResourcePacks:["firmalife_data","file/Perfected Anvil Helper.zip"] narrator:0 soundCategory_master:1.0 -soundCategory_music:0.3 +soundCategory_music:0.4 soundCategory_record:1.0 soundCategory_weather:1.0 soundCategory_block:1.0 soundCategory_hostile:1.0 soundCategory_neutral:1.0 soundCategory_player:1.0 -soundCategory_ambient:0.3 +soundCategory_ambient:0.7 soundCategory_voice:1.0 \ No newline at end of file diff --git a/config/ftbquests/quests/chapters/applied_energistics_2.snbt b/config/ftbquests/quests/chapters/applied_energistics_2.snbt index 4d9acd900..0cd2b7618 100644 --- a/config/ftbquests/quests/chapters/applied_energistics_2.snbt +++ b/config/ftbquests/quests/chapters/applied_energistics_2.snbt @@ -1288,21 +1288,6 @@ x: -2.0d y: -9.0d } - { - dependencies: ["25007C5E43D28DB2"] - description: ["{quests.ae2.stock_bridge.desc}"] - id: "0E54B3BCBBA34A00" - optional: true - shape: "heart" - tasks: [{ - id: "1F8D81C524CE694A" - item: "createstockbridge:ae_bridge" - type: "item" - }] - title: "{quests.ae2.stock_bridge.title}" - x: 5.0d - y: -8.0d - } ] subtitle: ["{quests.ae2.subtitle}"] title: "{quests.ae2}" diff --git a/config/ftbquests/quests/chapters/create_logistics.snbt b/config/ftbquests/quests/chapters/create_logistics.snbt index 9d7f8c168..914590ae0 100644 --- a/config/ftbquests/quests/chapters/create_logistics.snbt +++ b/config/ftbquests/quests/chapters/create_logistics.snbt @@ -131,6 +131,8 @@ dependencies: [ "572A8983FA12152A" "3AF956758FA289A8" + "07E7678095258EDB" + "383A14A5C65B3ADF" ] dependency_requirement: "one_completed" description: ["{quests.create_logistics.rose_quartz_lens.desc}"] @@ -209,8 +211,9 @@ { dependencies: [ "7C4807A247AF36A1" - "648BCF486E16CCB2" + "713C8D6A20BF3A0E" ] + dependency_requirement: "one_completed" description: ["{quests.create_logistics.stock_link.desc}"] id: "76490E046A44BCC3" size: 2.0d @@ -225,7 +228,11 @@ y: -1.0d } { - dependencies: ["76490E046A44BCC3"] + dependencies: [ + "76490E046A44BCC3" + "50FE830DA6F403B2" + ] + dependency_requirement: "one_completed" description: [ "{quests.create_logistics.stock_ticker.desc.1}" "{@pagebreak}" @@ -245,7 +252,11 @@ y: -2.5d } { - dependencies: ["76490E046A44BCC3"] + dependencies: [ + "76490E046A44BCC3" + "50FE830DA6F403B2" + ] + dependency_requirement: "one_completed" description: ["{quests.create_logistics.redstone_requester.desc}"] id: "3F44CFF8A6018F3E" subtitle: "{quests.create_logistics.redstone_requester.subtitle}" diff --git a/config/ftbquests/quests/chapters/ev__extreme_voltage.snbt b/config/ftbquests/quests/chapters/ev__extreme_voltage.snbt index 40fd2428b..73080192c 100644 --- a/config/ftbquests/quests/chapters/ev__extreme_voltage.snbt +++ b/config/ftbquests/quests/chapters/ev__extreme_voltage.snbt @@ -6,7 +6,7 @@ icon: "tfg:ev_universal_circuit" id: "6B1AD2350778D945" images: [{ - alpha: 64 + alpha: 32 height: 8.0d image: "gtceu:textures/gui/overlay/atomic_overlay_2.png" rotation: 0.0d @@ -19,8 +19,8 @@ { id: "0D951ADFB3AF2E74" linked_quest: "7B2EE67E37809269" - x: 4.5d - y: 0.0d + x: 5.0d + y: -1.0d } { id: "0E76B952D3BA3BDA" @@ -32,41 +32,55 @@ id: "66960076A74E9B79" linked_quest: "0CA5B715B76E4A5B" shape: "diamond" - x: 15.5d - y: 2.5d + x: 13.0d + y: 1.5d } { id: "6058CD9466BE0852" linked_quest: "00202200344F3456" - x: 13.0d - y: 4.0d + x: 12.5d + y: 3.0d } { id: "49FB3507B0FB3000" linked_quest: "155F421FC2F39C3C" - x: 12.0d - y: 4.0d + shape: "diamond" + x: 11.5d + y: 1.5d } { id: "7FDAA0AA0D463A49" linked_quest: "4B1F957EB41A5E9B" shape: "octagon" size: 1.5d - x: 5.5d - y: 5.5d + x: 5.25d + y: 2.0d } { id: "7B380A243C2C39FA" linked_quest: "13F2929C1C303A0B" - x: -1.0d - y: -5.0d + x: 5.5d + y: -2.5d } { id: "2151F8AA263F1D6E" linked_quest: "6ECAD339C91EF194" shape: "heart" - x: 4.0d - y: -5.5d + x: 17.5d + y: 7.5d + } + { + icon: { + Count: 1 + id: "tfg:tbu_232_rod" + tag: { + Damage: 0 + } + } + id: "2DD8555DDAA44979" + linked_quest: "0ABD326DC2551CBD" + x: 23.5d + y: 10.5d } ] quests: [ @@ -96,18 +110,26 @@ "3B18DE7395776B41" ] description: ["{quests.extreme_voltage.t2_rocket.desc}"] + icon: { + Count: 1 + id: "ad_astra:tier_2_rocket" + tag: { } + } icon_scale: 2.0d id: "52AB0BDC64293253" shape: "none" size: 2.0d subtitle: "{quests.extreme_voltage.t2_rocket.subtitle}" tasks: [{ - id: "00802CE875F2FB24" + id: "13C10613129C3692" item: { Count: 1 - id: "ad_astra:tier_2_rocket" - tag: { } + id: "ftbfiltersystem:smart_filter" + tag: { + "ftbfiltersystem:filter": "or(item(ad_astra:tier_2_rocket)item(tfg:tier_2_double_rocket))" + } } + title: "{quests.extreme_voltage.t2_rocket.task}" type: "item" }] title: "{quests.extreme_voltage.t2_rocket.title}" @@ -141,25 +163,17 @@ { dependencies: ["2931F887548A4A64"] description: ["{quests.extreme_voltage.tungsten.desc}"] - icon: "gtceu:tungsten_ingot" + icon: "gtceu:tungsten_dust" id: "5EC5566546591DEE" subtitle: "{quests.extreme_voltage.tungsten.subtitle}" - tasks: [ - { - id: "017BC39C681F5335" - item: "gtceu:tungsten_dust" - optional_task: true - type: "item" - } - { - id: "3A60698FD28B0CC5" - item: "gtceu:tungsten_ingot" - type: "item" - } - ] + tasks: [{ + id: "017BC39C681F5335" + item: "gtceu:tungsten_dust" + type: "item" + }] title: "{quests.extreme_voltage.tungsten.title}" - x: 7.5d - y: -2.0d + x: 7.0d + y: -4.5d } { dependencies: [ @@ -186,8 +200,8 @@ } ] title: "{quests.extreme_voltage.tunsgten_line_step_1.title}" - x: -2.0d - y: -2.0d + x: -3.75d + y: -4.5d } { dependencies: ["4EA8888B12D75BF1"] @@ -250,13 +264,22 @@ "{@pagebreak}" "{quests.extreme_voltage.epoxy.desc.3}" ] + icon: "gtceu:epoxy_bucket" id: "55FB2776B724FB63" subtitle: "{quests.extreme_voltage.epoxy.subtitle}" - tasks: [{ - id: "096B6E1EA8DBC186" - item: "gtceu:epoxy_bucket" - type: "item" - }] + tasks: [ + { + id: "096B6E1EA8DBC186" + item: "gtceu:epoxy_bucket" + optional_task: true + type: "item" + } + { + id: "33C7361EEFF2E4B5" + title: "{quests.tasktype.checkmark}" + type: "checkmark" + } + ] title: "{quests.extreme_voltage.epoxy.title}" x: -7.0d y: 4.5d @@ -264,19 +287,28 @@ { dependencies: ["3A2E442E4D84C891"] description: ["{quests.extreme_voltage.oil_distillation.desc}"] + icon: "gtceu:oil_bucket" id: "2DEC7AF917AAE4EC" - tasks: [{ - id: "559166D928E75B8F" - item: { - Count: 1 - id: "ftbfiltersystem:smart_filter" - tag: { - "ftbfiltersystem:filter": "or(item(gtceu:oil_bucket)item(gtceu:oil_light_bucket)item(gtceu:oil_medium_bucket)item(gtceu:oil_heavy_bucket))" + tasks: [ + { + id: "559166D928E75B8F" + item: { + Count: 1 + id: "ftbfiltersystem:smart_filter" + tag: { + "ftbfiltersystem:filter": "or(item(gtceu:oil_bucket)item(gtceu:oil_light_bucket)item(gtceu:oil_medium_bucket)item(gtceu:oil_heavy_bucket))" + } } + optional_task: true + title: "{quests.extreme_voltage.oil_distillation.task}" + type: "item" } - title: "{quests.extreme_voltage.oil_distillation.task}" - type: "item" - }] + { + id: "2B5D6C28550F3FD9" + title: "{quests.tasktype.checkmark}" + type: "checkmark" + } + ] title: "{quests.extreme_voltage.oil_distillation.title}" x: -7.0d y: -2.5d @@ -290,19 +322,28 @@ "{@pagebreak}" "{quests.extreme_voltage.wood_distillation.desc.3}" ] + icon: "gtceu:wood_tar_bucket" id: "43BBB9074608F9B1" - tasks: [{ - id: "4D90CDAAA91AE033" - item: { - Count: 1 - id: "ftbfiltersystem:smart_filter" - tag: { - "ftbfiltersystem:filter": "or(item(gtceu:wood_tar_bucket)item(gtceu:wood_vinegar_bucket)item(gtceu:charcoal_byproducts_bucket))" + tasks: [ + { + id: "4D90CDAAA91AE033" + item: { + Count: 1 + id: "ftbfiltersystem:smart_filter" + tag: { + "ftbfiltersystem:filter": "or(item(gtceu:wood_tar_bucket)item(gtceu:wood_vinegar_bucket)item(gtceu:charcoal_byproducts_bucket))" + } } + optional_task: true + title: "{quests.extreme_voltage.wood_distillation.task}" + type: "item" } - title: "{quests.extreme_voltage.wood_distillation.task}" - type: "item" - }] + { + id: "6EB7DA5D867B279C" + title: "{quests.tasktype.checkmark}" + type: "checkmark" + } + ] title: "{quests.extreme_voltage.wood_distillation.title}" x: -5.5d y: -2.5d @@ -322,16 +363,14 @@ item: "gtceu:alloy_blast_smelter" type: "item" }] - x: 10.0d - y: 1.5d + x: 14.5d + y: 0.0d } { dependencies: ["4EA8888B12D75BF1"] dependency_requirement: "all_started" description: ["{quests.extreme_voltage.ev_mixer.desc}"] id: "61D5055F344DDFAD" - shape: "octagon" - size: 1.5d subtitle: "{quests.extreme_voltage.ev_mixer.subtitle}" tasks: [{ id: "7A401E905A41C399" @@ -339,13 +378,14 @@ type: "item" }] title: "{quests.extreme_voltage.ev_mixer.title}" - x: 0.0d + x: 3.75d y: 0.0d } { dependencies: [ "61D5055F344DDFAD" "42C2B749B61B1FBE" + "5EC5566546591DEE" ] description: ["{quests.extreme_voltage.rtm.desc}"] icon: "gtceu:rtm_alloy_ingot" @@ -365,7 +405,7 @@ } ] title: "{quests.extreme_voltage.rtm.title}" - x: 1.5d + x: 7.0d y: 0.0d } { @@ -373,17 +413,20 @@ "37B7342CD1B3B76D" "601088B7920140B2" "6B08799BCFD01D3D" + "5CF70AC24D269279" ] description: ["{quests.extreme_voltage.rtm_coil.desc}"] id: "7F4E529627AD9148" + shape: "octagon" + size: 1.5d subtitle: "{quests.extreme_voltage.rtm_coil.subtitle}" tasks: [{ id: "00C380A4403239AA" item: "gtceu:rtm_alloy_coil_block" type: "item" }] - x: 1.5d - y: 1.5d + x: 10.0d + y: 3.0d } { dependencies: ["7F4E529627AD9148"] @@ -437,8 +480,8 @@ } ] title: "{quests.extreme_voltage.gcym_alloys.title}" - x: 8.5d - y: 1.5d + x: 10.0d + y: 0.0d } { dependencies: ["7B2EE67E37809269"] @@ -472,8 +515,8 @@ } ] title: "{quests.extreme_voltage.ruthenium.title}" - x: 3.0d - y: 0.0d + x: 6.0d + y: -1.0d } { dependencies: ["24ECDF70031B39C4"] @@ -485,8 +528,8 @@ item: "gtceu:large_centrifuge" type: "item" }] - x: 17.0d - y: 1.5d + x: 17.5d + y: 0.0d } { dependencies: [ @@ -511,14 +554,14 @@ } ] title: "{quests.extreme_voltage.tungsten_steel.title}" - x: 0.0d - y: -4.0d + x: 3.75d + y: -2.5d } { dependencies: [ - "2979AFD231E5B37B" - "5EC5566546591DEE" "0E2E93BE3364722D" + "4AD96212525517CD" + "37B7342CD1B3B76D" ] dependency_requirement: "one_completed" description: ["{quests.extreme_voltage.nuclear_fuel_factory.desc}"] @@ -530,7 +573,7 @@ type: "item" }] title: "{quests.extreme_voltage.nuclear_fuel_factory.title}" - x: 7.5d + x: 7.0d y: 7.0d } { @@ -548,7 +591,9 @@ y: 6.0d } { + dependencies: ["2979AFD231E5B37B"] description: ["{quests.extreme_voltage.heavy_water.desc}"] + hide_dependency_lines: true icon: "tfg:heavy_water_bucket" id: "4AD41E9FA7814EA1" subtitle: "{quests.extreme_voltage.heavy_water.subtitle}" @@ -572,7 +617,7 @@ } ] title: "{quests.extreme_voltage.heavy_water.title}" - x: 10.0d + x: 8.5d y: 5.5d } { @@ -583,6 +628,8 @@ "{quests.extreme_voltage.thorium_rod.desc.2}" "{@pagebreak}" "{quests.extreme_voltage.thorium_rod.desc.3}" + "{@pagebreak}" + "{quests.extreme_voltage.thorium_rod.desc.4}" ] id: "77CB4AE5B3AF5263" subtitle: "{quests.extreme_voltage.thorium_rod.subtitle}" @@ -679,7 +726,7 @@ } type: "item" }] - x: 12.5d + x: 13.0d y: 7.0d } { @@ -700,12 +747,16 @@ } ] title: "{quests.extreme_voltage.uranium_line.title}" - x: 12.5d - y: 8.0d + x: 13.0d + y: 9.0d } { - dependencies: ["00004BE1D77EA003"] + dependencies: [ + "00004BE1D77EA003" + "4EA8888B12D75BF1" + ] description: ["{quests.extreme_voltage.uraninite_dust.desc}"] + hide_dependency_lines: true icon: "gtceu:uraninite_dust" id: "2814C6FA71B07C95" subtitle: "{quests.extreme_voltage.uraninite_dust.subtitle}" @@ -714,7 +765,7 @@ item: "gtceu:uraninite_dust" type: "item" }] - x: 12.5d + x: 11.5d y: 9.0d } { @@ -767,6 +818,8 @@ item: "gtceu:machine_controller_cover" type: "item" }] + shape: "octagon" + size: 1.5d subtitle: "{quests.extreme_voltage.heat_exchanger.subtitle}" tasks: [{ id: "67CB661D4F20EC3A" @@ -775,10 +828,12 @@ }] title: "{quests.extreme_voltage.heat_exchanger.title}" x: 14.5d - y: 5.5d + y: 4.5d } { + dependencies: ["4EA8888B12D75BF1"] description: ["{quests.extreme_voltage.ammonium_formate.desc}"] + hide_dependency_lines: true icon: "gtceu:ammonium_formate_bucket" id: "075434DAB3D9F0EA" subtitle: "{quests.extreme_voltage.ammonium_formate.subtitle}" @@ -802,8 +857,8 @@ } ] title: "{quests.extreme_voltage.ammonium_formate.title}" - x: 13.5d - y: 5.5d + x: 13.0d + y: 4.5d } { dependencies: ["75725B3F6603F1D0"] @@ -825,8 +880,8 @@ } ] title: "{quests.extreme_voltage.formamide.title}" - x: 15.5d - y: 5.5d + x: 16.0d + y: 4.5d } { dependencies: [ @@ -858,8 +913,8 @@ } ] title: "{quests.extreme_voltage.nuclear_residue_dust.title}" - x: 17.0d - y: 5.5d + x: 17.5d + y: 4.5d } { dependencies: [ @@ -884,11 +939,13 @@ } ] title: "{quests.extreme_voltage.martian_sludge.title}" - x: 17.0d - y: 3.5d + x: 17.5d + y: 1.5d } { + dependencies: ["2979AFD231E5B37B"] description: ["{quests.extreme_voltage.hexafluorosilic_acid.desc}"] + hide_dependency_lines: true icon: "gtceu:dirty_hexafluorosilicic_acid_bucket" id: "05FED2FF1BEA05F1" subtitle: "{quests.extreme_voltage.hexafluorosilic_acid.subtitle}" @@ -900,20 +957,14 @@ type: "item" } { - id: "541418FD093548C2" - item: { - Count: 1 - id: "ftbfiltersystem:smart_filter" - tag: { - "ftbfiltersystem:filter": "item_tag(forge:dusts/ochrum)" - } - } + id: "1963DB3E483659FD" + item: "gtceu:ochrum_dust" type: "item" } ] title: "{quests.extreme_voltage.hexafluorosilic_acid.title}" - x: 18.5d - y: 3.5d + x: 16.0d + y: 1.5d } { dependencies: ["2B666F65B5F196E6"] @@ -929,8 +980,8 @@ item: "tfg:oxidized_nuclear_residue_dust" type: "item" }] - x: 18.5d - y: 5.5d + x: 19.0d + y: 4.5d } { dependencies: ["5523F60CE095BD0A"] @@ -942,8 +993,8 @@ item: "tfg:refined_nuclear_residue_dust" type: "item" }] - x: 18.5d - y: 7.0d + x: 19.0d + y: 6.0d } { dependencies: [ @@ -968,8 +1019,8 @@ } type: "item" }] - x: 18.5d - y: 10.5d + x: 19.0d + y: 9.0d } { dependencies: ["5523F60CE095BD0A"] @@ -991,8 +1042,8 @@ } ] title: "{quests.extreme_voltage.radioactive_concoction.title}" - x: 21.5d - y: 5.5d + x: 20.5d + y: 4.5d } { dependencies: ["4C0E5C517F0137B9"] @@ -1014,7 +1065,7 @@ } ] title: "{quests.extreme_voltage.tritiated_water.title}" - x: 16.0d + x: 19.0d y: 10.5d } { @@ -1160,7 +1211,7 @@ ] title: "{quests.extreme_voltage.ostrum_harvester.title}" x: 14.5d - y: 2.5d + y: 1.5d } { dependencies: ["017019EB38F7A18C"] @@ -1195,6 +1246,7 @@ { dependencies: ["55FB2776B724FB63"] description: ["{quests.extreme_voltage.aes_insulation.desc}"] + icon: "tfg:aes_insulation_roll" id: "3B18DE7395776B41" subtitle: "{quests.extreme_voltage.aes_insulation.subtitle}" tasks: [ @@ -1227,10 +1279,10 @@ type: "item" }] x: 1.5d - y: -5.5d + y: -2.5d } { - dependencies: ["2C000B45C23752D0"] + dependencies: ["2B666F65B5F196E6"] description: ["{quests.extreme_voltage.ev_superconductor.desc}"] icon: "gtceu:uranium_triplatinum_single_wire" id: "2BE373381980C85F" @@ -1256,8 +1308,8 @@ } ] title: "{quests.extreme_voltage.ev_superconductor.title}" - x: 13.5d - y: 8.0d + x: 17.5d + y: 6.0d } { dependencies: ["017019EB38F7A18C"] @@ -1424,13 +1476,22 @@ { dependencies: ["3A2E442E4D84C891"] description: ["{quests.extreme_voltage.liquid_mars_air.desc}"] + icon: "tfg:liquid_mars_air_bucket" id: "3A46387D683ADC58" subtitle: "{quests.extreme_voltage.liquid_mars_air.subtitle}" - tasks: [{ - id: "60D5C9CC89134D1E" - item: "tfg:liquid_mars_air_bucket" - type: "item" - }] + tasks: [ + { + id: "60D5C9CC89134D1E" + item: "tfg:liquid_mars_air_bucket" + optional_task: true + type: "item" + } + { + id: "7679D78CE272C509" + title: "{quests.tasktype.checkmark}" + type: "checkmark" + } + ] title: "{quests.extreme_voltage.liquid_mars_air.title}" x: -9.5d y: 1.0d @@ -1480,8 +1541,8 @@ type: "item" }] title: "{quests.extreme_voltage.me_part.title}" - x: 5.5d - y: 3.0d + x: 2.5d + y: 1.0d } { dependencies: ["70ABD1E3FC1CA672"] @@ -1506,8 +1567,8 @@ type: "item" }] title: "{quests.extreme_voltage.building_gadgets.title}" - x: 4.5d - y: 4.0d + x: 1.5d + y: 1.0d } { dependencies: ["70ABD1E3FC1CA672"] @@ -1535,8 +1596,8 @@ } ] title: "{quests.ae2.wireless_access.title}" - x: 5.5d - y: 4.0d + x: 3.5d + y: 2.0d } { dependencies: ["601088B7920140B2"] @@ -1549,8 +1610,8 @@ type: "checkmark" }] title: "{quests.extreme_voltage.new_qol.title}" - x: 4.5d - y: 3.0d + x: 1.5d + y: 2.0d } { dependencies: ["55FB2776B724FB63"] @@ -1578,8 +1639,6 @@ description: ["{quests.extreme_voltage.plutonium.desc}"] icon: "gtceu:plutonium_ingot" id: "41D968B30C11934C" - shape: "octagon" - size: 1.5d subtitle: "{quests.extreme_voltage.plutonium.subtitle}" tasks: [ { @@ -1595,28 +1654,43 @@ } ] title: "{quests.extreme_voltage.plutonium.title}" - x: 18.5d - y: 9.0d + x: 19.0d + y: 7.5d } { - dependencies: ["617CF3335584DC8D"] + dependencies: ["26AA29016BA23396"] description: ["{quests.extreme_voltage.ostrum_linear.desc}"] + icon: "tfg:ostrum_linear_accelerator" id: "691A36800DC755C1" shape: "octagon" - size: 2.0d + size: 1.5d subtitle: "{quests.extreme_voltage.ostrum_linear.subtitle}" - tasks: [{ - id: "130FE3E2CE8735F8" - item: "tfg:ostrum_linear_accelerator" - type: "item" - }] - x: 21.5d - y: 9.0d + tasks: [ + { + id: "130FE3E2CE8735F8" + item: "tfg:ostrum_linear_accelerator" + type: "item" + } + { + id: "5D1A52502962C948" + item: "deafission:battery_heat_port_ev" + type: "item" + } + { + id: "0FEF42CB8A6DC0F6" + item: "deafission:heat_input_hatch_ev" + type: "item" + } + ] + x: 22.0d + y: 6.0d } { dependencies: ["691A36800DC755C1"] + description: ["{quests.extreme_voltage.ostrum_vapor.desc}"] icon: "gtceu:ostrum_vapor_bucket" id: "58264E007C2D7CC6" + subtitle: "{quests.extreme_voltage.ostrum_vapor.subtitle}" tasks: [ { id: "5399332E050D8560" @@ -1630,13 +1704,20 @@ type: "checkmark" } ] - x: 21.5d - y: 12.5d + title: "{quests.extreme_voltage.ostrum_vapor.title}" + x: 20.5d + y: 6.0d } { - dependencies: ["691A36800DC755C1"] + dependencies: [ + "691A36800DC755C1" + "3E0ABDFCC0FC6928" + ] + dependency_requirement: "one_completed" + description: ["{quests.extreme_voltage.light_ostrum_vapor.desc}"] icon: "gtceu:lightweight_ostrum_vapor_bucket" id: "4F647D6A4949EDF7" + subtitle: "{quests.extreme_voltage.light_ostrum_vapor.subtitle}" tasks: [ { id: "3529CF130C73746E" @@ -1650,16 +1731,16 @@ type: "checkmark" } ] - x: 22.5d - y: 12.5d + title: "{quests.extreme_voltage.light_ostrum_vapor.title}" + x: 22.0d + y: 7.5d } { - dependencies: [ - "691A36800DC755C1" - "3E0ABDFCC0FC6928" - ] + dependencies: ["691A36800DC755C1"] + description: ["{quests.extreme_voltage.dense_ostrum_vapor.desc}"] icon: "gtceu:dense_ostrum_vapor_bucket" id: "4C29DDE89AE8D6EE" + subtitle: "{quests.extreme_voltage.dense_ostrum_vapor.subtitle}" tasks: [ { id: "24641F2651FFBE44" @@ -1673,21 +1754,33 @@ type: "checkmark" } ] - x: 20.5d - y: 12.5d + title: "{quests.extreme_voltage.dense_ostrum_vapor.title}" + x: 23.5d + y: 6.0d } { dependencies: ["4F647D6A4949EDF7"] id: "6ABD72F1C1971EE3" + optional: true shape: "heart" tasks: [ { - id: "02963B7E2699E185" - item: "gtceu:tricalcium_phosphate_dust" + id: "500E6AD918D6F37A" + item: "gtceu:thorium_dust" type: "item" } { - id: "0202E05696C78841" + id: "3F961A11EFDFA246" + item: "gtceu:pitchblende_dust" + type: "item" + } + { + id: "02A251EBEF64897C" + item: "gtceu:aluminium_dust" + type: "item" + } + { + id: "1CDA9E72C0CF6707" item: { Count: 1 ForgeCaps: { @@ -1701,26 +1794,7 @@ type: "item" } { - id: "07372F88634076C6" - item: "gtceu:pitchblende_dust" - type: "item" - } - ] - x: 22.5d - y: 13.5d - } - { - dependencies: ["58264E007C2D7CC6"] - id: "27804B847EE2CFF2" - shape: "heart" - tasks: [ - { - id: "19277D14081DE23B" - item: "gtceu:aluminium_dust" - type: "item" - } - { - id: "552DAD2E001E8D83" + id: "1F2D23F66866AFB4" item: { Count: 1 ForgeCaps: { @@ -1734,46 +1808,13 @@ type: "item" } { - id: "6AFCA6EE597B7F67" - item: "gtceu:beryllium_dust" + id: "4D619272F96C7EF6" + item: "gtceu:tricalcium_phosphate_dust" type: "item" } ] - x: 21.5d - y: 13.5d - } - { - dependencies: ["4C29DDE89AE8D6EE"] - id: "09A85FAD0786E667" - shape: "heart" - tasks: [ - { - id: "06B67B195C0429D5" - item: "gtceu:thorium_dust" - type: "item" - } - { - id: "0496A5C65EA6EA17" - item: "gtceu:uraninite_dust" - type: "item" - } - { - id: "43E02B6BE521142B" - item: { - Count: 1 - ForgeCaps: { - "tfc:item_heat": { - heat: 0.0f - ticks: 0L - } - } - id: "gtceu:hematite_dust" - } - type: "item" - } - ] - x: 20.5d - y: 13.5d + x: 22.0d + y: 9.0d } { dependencies: ["3A2E442E4D84C891"] @@ -1793,13 +1834,22 @@ { dependencies: ["3A2E442E4D84C891"] description: ["{quests.extreme_voltage.liquid_air.desc}"] + icon: "gtceu:liquid_air_bucket" id: "7EAA2149BD77A5E6" subtitle: "{quests.extreme_voltage.liquid_air.subtitle}" - tasks: [{ - id: "4B69CAB4467BBE1E" - item: "gtceu:liquid_air_bucket" - type: "item" - }] + tasks: [ + { + id: "4B69CAB4467BBE1E" + item: "gtceu:liquid_air_bucket" + optional_task: true + type: "item" + } + { + id: "001FF194BBEB98F1" + title: "{quests.tasktype.checkmark}" + type: "checkmark" + } + ] title: "{quests.extreme_voltage.liquid_air.title}" x: -9.5d y: 0.0d @@ -1820,6 +1870,7 @@ dependencies: ["4EA8888B12D75BF1"] description: ["{quests.extreme_voltage.nuclear_turbine.desc}"] hide_dependency_lines: true + icon: "tfg:nuclear_turbine" id: "1655573AE1C8484B" shape: "octagon" size: 1.5d @@ -1864,19 +1915,28 @@ y: 9.0d } { - dependencies: ["601088B7920140B2"] + dependencies: ["58264E007C2D7CC6"] description: ["{quests.extreme_voltage.refrigerant_pellet.desc}"] - hide_dependency_lines: true + icon: "tfg:terrafirmaguard_pa6" id: "08195E9FA1396936" + shape: "hexagon" subtitle: "{quests.extreme_voltage.refrigerant_pellet.subtitle}" - tasks: [{ - id: "1B4C7B8C2EDFE595" - item: "tfg:refrigerant_pellet" - type: "item" - }] + tasks: [ + { + id: "1B4C7B8C2EDFE595" + item: "tfg:refrigerant_pellet" + optional_task: true + type: "item" + } + { + id: "0AEA0612B833D029" + item: "tfg:terrafirmaguard_pa6" + type: "item" + } + ] title: "{quests.extreme_voltage.refrigerant_pellet.title}" - x: 19.5d - y: 10.5d + x: 20.5d + y: 7.5d } { dependencies: ["29E0829816B9DBA0"] @@ -1948,8 +2008,8 @@ type: "item" }] title: "{quests.extreme_voltage.large_miner.title}" - x: 7.5d - y: -3.5d + x: 9.5d + y: -4.5d } { dependencies: ["2979AFD231E5B37B"] @@ -1974,7 +2034,9 @@ y: 8.0d } { + dependencies: ["4EA8888B12D75BF1"] description: ["{quests.extreme_voltage.dense_lead.desc}"] + hide_dependency_lines: true id: "0E2E93BE3364722D" shape: "circle" subtitle: "{quests.extreme_voltage.dense_lead.subtitle}" @@ -1984,7 +2046,7 @@ type: "item" }] title: "{quests.extreme_voltage.dense_lead.title}" - x: 6.5d + x: 6.0d y: 8.0d } { @@ -2010,26 +2072,7 @@ ] title: "{quests.extreme_voltage.ostrum_dust.title}" x: 14.5d - y: 4.0d - } - { - dependencies: ["691A36800DC755C1"] - description: [ - "In a future update coming before Venus, the recipes within the Linear Accelerator will be change. Expect your recipes to break." - "" - "The multiblock itself won't so you are safe to use it for now." - ] - icon: "createdeco:decal_warning" - id: "3F59CD5ABE4E7510" - size: 1.5d - tasks: [{ - id: "2CCA527404CECA8C" - title: "Okay I understand this will break" - type: "checkmark" - }] - title: "Breaking changes in next update" - x: 24.0d - y: 9.0d + y: 3.0d } { dependencies: ["04682CD04FE0A56E"] @@ -2059,8 +2102,8 @@ } ] title: "{quests.extreme_voltage.tunsgten_line_step.title}" - x: -2.0d - y: -3.0d + x: -3.75d + y: -5.5d } { dependencies: ["04682CD04FE0A56E"] @@ -2073,19 +2116,28 @@ type: "item" }] title: "{quests.extreme_voltage.tunsgten_line_step_2.title}" - x: -1.0d - y: -2.0d + x: -2.75d + y: -4.5d } { dependencies: ["3A2E442E4D84C891"] description: ["{quests.extreme_voltage.epichlorohydrin.desc}"] hide_dependency_lines: true + icon: "gtceu:epichlorohydrin_bucket" id: "146E086823CEEF7A" - tasks: [{ - id: "7E1FFA943BAECDB9" - item: "gtceu:epichlorohydrin_bucket" - type: "item" - }] + tasks: [ + { + id: "7E1FFA943BAECDB9" + item: "gtceu:epichlorohydrin_bucket" + optional_task: true + type: "item" + } + { + id: "5FE5EC623F1412C0" + title: "{quests.tasktype.checkmark}" + type: "checkmark" + } + ] title: "{quests.extreme_voltage.epichlorohydrin.title}" x: -8.5d y: 3.5d @@ -2100,12 +2152,21 @@ "{quests.extreme_voltage.phenol.desc.3}" ] hide_dependency_lines: true + icon: "gtceu:phenol_bucket" id: "431063775DFA1519" - tasks: [{ - id: "6452431C90671E6D" - item: "gtceu:phenol_bucket" - type: "item" - }] + tasks: [ + { + id: "6452431C90671E6D" + item: "gtceu:phenol_bucket" + optional_task: true + type: "item" + } + { + id: "282831A0E103E0CE" + title: "{quests.tasktype.checkmark}" + type: "checkmark" + } + ] title: "{quests.extreme_voltage.phenol.title}" x: -9.0d y: 4.5d @@ -2118,17 +2179,27 @@ "{quests.extreme_voltage.acetone.desc.2}" ] hide_dependency_lines: true + icon: "gtceu:acetone_bucket" id: "461ABF74A9406752" - tasks: [{ - id: "4CE653FC4E438F02" - item: "gtceu:acetone_bucket" - type: "item" - }] + tasks: [ + { + id: "4CE653FC4E438F02" + item: "gtceu:acetone_bucket" + optional_task: true + type: "item" + } + { + id: "2BB3BED0A7927EDC" + title: "{quests.tasktype.checkmark}" + type: "checkmark" + } + ] title: "{quests.extreme_voltage.acetone.title}" x: -8.5d y: 5.5d } { + dependencies: ["2979AFD231E5B37B"] description: [ "{quests.extreme_voltage.radiation.desc.1}" "{@pagebreak}" @@ -2172,28 +2243,33 @@ type: "item" }] title: "{quests.extreme_voltage.advanced_fluid_rig.title}" - x: 9.0d - y: -2.0d + x: 7.0d + y: -6.0d } { dependencies: ["5CF58F7CBE255585"] - description: ["{quests.extreme_voltage.large_generators.desc}"] + description: [ + "{quests.extreme_voltage.large_generators.desc}" + "" + "{ \"text\": \"â–ķâ–ķâ–ķâ–ķâ–ķâ–ķâ–ķ\", \"underlined\": \"true\", \"clickEvent\": { \"action\": \"change_page\", \"value\": \"2CDB9778C7A30044\" } }" + ] disable_toast: true id: "40CBACE41B71C011" + optional: true shape: "octagon" size: 1.5d - tasks: [ - { - id: "229957FF419324F0" - item: "gtceu:large_combustion_engine" - type: "item" + tasks: [{ + id: "656484D8CCA0018E" + item: { + Count: 1 + id: "ftbfiltersystem:smart_filter" + tag: { + "ftbfiltersystem:filter": "or(item(gtceu:large_combustion_engine)item(gtceu:gas_large_turbine))" + } } - { - id: "49B66E0C0E22403A" - item: "gtceu:gas_large_turbine" - type: "item" - } - ] + title: "{quests.extreme_voltage.large_generators.task}" + type: "item" + }] title: "{quests.extreme_voltage.large_generators.title}" x: 2.0d y: 4.5d @@ -2240,8 +2316,8 @@ type: "item" }] title: "{quests.extreme_voltage.btx_catalyser.title}" - x: -4.0d - y: -4.5d + x: -5.5d + y: -6.0d } { dependencies: ["3EC1D337D9FC3F1B"] @@ -2257,8 +2333,53 @@ item: "gtceu:rhenium_dust" type: "item" }] - x: -4.0d - y: -5.5d + x: -5.5d + y: -7.0d + } + { + dependencies: ["617CF3335584DC8D"] + description: ["{quests.extreme_voltage.heat_battery.desc}"] + id: "26AA29016BA23396" + subtitle: "{quests.extreme_voltage.heat_battery.subtitle}" + tasks: [{ + id: "5C9A37E905A4030F" + item: "tfg:heat_battery_mk1" + type: "item" + }] + x: 22.0d + y: 4.5d + } + { + dependencies: [ + "155F421FC2F39C3C" + "29E0829816B9DBA0" + ] + description: ["{quests.extreme_voltage.nichromium_iode.desc}"] + icon: "tfg:nichromium_iodomethylate_bucket" + id: "5CF70AC24D269279" + subtitle: "{quests.extreme_voltage.nichromium_iode.subtitle}" + tasks: [ + { + id: "29015E8328231929" + item: "tfg:iodomethane_bucket" + optional_task: true + type: "item" + } + { + id: "195713F766EF130A" + item: "tfg:nichromium_iodomethylate_bucket" + optional_task: true + type: "item" + } + { + id: "20D7CE8211E091A6" + title: "{quests.tasktype.checkmark}" + type: "checkmark" + } + ] + title: "{quests.extreme_voltage.nichromium_iode.title}" + x: 11.5d + y: 3.0d } ] subtitle: ["{quests.extreme_voltage.subtitle}"] diff --git a/config/ftbquests/quests/chapters/gregtech_energy.snbt b/config/ftbquests/quests/chapters/gregtech_energy.snbt index a962839dd..1c658bad5 100644 --- a/config/ftbquests/quests/chapters/gregtech_energy.snbt +++ b/config/ftbquests/quests/chapters/gregtech_energy.snbt @@ -118,10 +118,7 @@ y: -7.0d } { - dependencies: [ - "06B2E38F7DCF2678" - "22510C5F2386B453" - ] + dependencies: ["06B2E38F7DCF2678"] dependency_requirement: "one_completed" description: ["{quests.gregtech_energy.produce_energy.desc}"] icon: "gtceu:lv_field_generator" @@ -235,7 +232,7 @@ dependencies: [ "60FF9249376DF9BD" "05E2F203DA46A5E8" - "3EC8D58DB73CEFE5" + "2BE373381980C85F" ] dependency_requirement: "one_completed" description: ["{quests.gregtech_energy.transformer.desc}"] @@ -1019,8 +1016,8 @@ } { dependencies: [ - "0AF286AA540A82E6" "0C718329245D9619" + "4C620105AAC49381" ] description: [ "{quests.medium_voltage.mv_diesel.desc.1}" @@ -1037,8 +1034,8 @@ type: "item" }] title: "{quests.medium_voltage.mv_diesel.title}" - x: -9.0d - y: -5.0d + x: -8.5d + y: -7.0d } { dependencies: ["7AF726555D721DFC"] @@ -1083,13 +1080,16 @@ "4C620105AAC49381" "0C718329245D9619" ] + description: ["{quests.low_voltage.lv_biodiesel.desc}"] id: "139C7DF629329753" + subtitle: "{quests.low_voltage.lv_biodiesel.subtitle}" tasks: [{ id: "7BA9FDD1F45B53F6" item: "gtceu:bio_diesel_bucket" type: "item" }] - x: -9.0d + title: "{quests.low_voltage.lv_biodiesel.title}" + x: -9.5d y: -7.0d } { @@ -1236,16 +1236,65 @@ "05E2F203DA46A5E8" "0ABD326DC2551CBD" ] - description: ["{quests.gregtech_energy.smr.desc.1}"] + description: [ + "{quests.gregtech_energy.smr.desc.1}" + "{@pagebreak}" + "{quests.gregtech_energy.smr.desc.2}" + "{@pagebreak}" + "{quests.gregtech_energy.smr.desc.3}" + ] + icon: "tfg:smr_generator" id: "4659447C85CDC058" subtitle: "{quests.gregtech_energy.smr.subtitle}" - tasks: [{ - id: "1D02468DD9869C72" - item: "deafission:fission_reactor_smr1" - type: "item" - }] + tasks: [ + { + id: "1D02468DD9869C72" + item: "deafission:fission_reactor_smr1" + type: "item" + } + { + id: "4DA2451D673DABE3" + item: "tfg:smr_generator" + type: "item" + } + { + id: "7647ABCBC805E3B3" + item: "tfg:uv_smr_fluid_import_hatch" + type: "item" + } + { + id: "4BDA2F8B0D5B310D" + item: "gtceu:lubricant_bucket" + optional_task: true + type: "item" + } + { + id: "5C5003050BCE8601" + item: "tfg:polyalkylene_lubricant_bucket" + optional_task: true + type: "item" + } + { + id: "79126D47F1236F45" + item: "tfg:ozone_bucket" + optional_task: true + type: "item" + } + { + id: "5075B6C62A7AB675" + item: "tfg:cyclohex_diperoxide_bucket" + optional_task: true + type: "item" + } + { + id: "28AAB372882C8996" + item: "tfg:ticl4_doped_supercritical_co2_bucket" + optional_task: true + type: "item" + } + ] title: "{quests.gregtech_energy.smr.title}" - x: -7.5d + x: -7.0d y: 1.0d } { @@ -1266,21 +1315,65 @@ y: -7.0d } { - dependencies: ["4512E5DE7A84F809"] - description: ["{quests.gregtech_energy.fission_rod.desc.1}"] + dependencies: [ + "4512E5DE7A84F809" + "4C29DDE89AE8D6EE" + "3E0ABDFCC0FC6928" + ] + dependency_requirement: "one_completed" + description: [ + "{quests.gregtech_energy.fission_rod.desc.1}" + "{@pagebreak}" + "{quests.gregtech_energy.fission_rod.desc.2}" + "{@pagebreak}" + "{quests.gregtech_energy.fission_rod.desc.3}" + ] + icon: { + Count: 1 + id: "tfg:tbu_232_rod" + tag: { + Damage: 0 + } + } id: "0ABD326DC2551CBD" subtitle: "{quests.gregtech_energy.fission_rod.subtitle}" - tasks: [{ - id: "68E3EE04F4931EFE" - item: { - Count: 1 - id: "tfg:tbu_232_rod" - tag: { - Damage: 0 + tasks: [ + { + id: "68E3EE04F4931EFE" + item: { + Count: 1 + id: "tfg:tbu_232_rod" + tag: { + Damage: 0 + } } + type: "item" } - type: "item" - }] + { + id: "21383A5C0CF976DD" + item: { + Count: 1 + id: "tfg:americium_241_rod" + tag: { + Damage: 0 + } + } + optional_task: true + type: "item" + } + { + id: "5B22DEC6694CDCCB" + item: { + Count: 1 + id: "tfg:neptunium_237_rod" + tag: { + Damage: 0 + } + } + optional_task: true + type: "item" + } + ] title: "{quests.gregtech_energy.fission_rod.title}" x: -7.5d y: 0.0d @@ -1320,6 +1413,41 @@ x: -9.0d y: -1.0d } + { + dependencies: [ + "05E2F203DA46A5E8" + "0ABD326DC2551CBD" + ] + description: [ + "{quests.gregtech_energy.cooling_tower.desc.1}" + "{@pagebreak}" + "{quests.gregtech_energy.cooling_tower.desc.2}" + ] + icon: "tfg:cooling_tower" + id: "7F2F435C727C7AB3" + subtitle: "{quests.gregtech_energy.cooling_tower.subtitle}" + tasks: [ + { + id: "0347D107FEC9761B" + item: "tfg:cooling_tower" + type: "item" + } + { + id: "7CD0D40C08CC42D2" + item: "tfg:boron_enriched_coolant_bucket" + optional_task: true + type: "item" + } + { + id: "23C1F8FEFBD23A5C" + item: "tfg:warm_water_bucket" + optional_task: true + type: "item" + } + ] + x: -8.0d + y: 1.0d + } ] subtitle: ["{quests.gregtech_energy.subtitle}"] title: "{quests.gregtech_energy}" diff --git a/config/ftbquests/quests/chapters/hv__high_voltage.snbt b/config/ftbquests/quests/chapters/hv__high_voltage.snbt index 92974c4a4..7fad3ab38 100644 --- a/config/ftbquests/quests/chapters/hv__high_voltage.snbt +++ b/config/ftbquests/quests/chapters/hv__high_voltage.snbt @@ -1010,18 +1010,26 @@ ] dependency_requirement: "one_completed" description: ["{quests.high_voltage.rocket_t1.desc}"] + icon: { + Count: 1 + id: "ad_astra:tier_1_rocket" + tag: { } + } icon_scale: 2.0d id: "3FBDC8552F7D8008" shape: "none" size: 2.0d subtitle: "{quests.high_voltage.rocket_t1.subtitle}" tasks: [{ - id: "76D1CE96C52F9963" + id: "6F40128FAA409B16" item: { Count: 1 - id: "ad_astra:tier_1_rocket" - tag: { } + id: "ftbfiltersystem:smart_filter" + tag: { + "ftbfiltersystem:filter": "or(item(ad_astra:tier_1_rocket)item(tfg:tier_1_double_rocket))" + } } + title: "{quests.high_voltage.rocket_t1.task}" type: "item" }] title: "{quests.high_voltage.rocket_t1.title}" @@ -1698,6 +1706,21 @@ x: -2.25d y: -11.0d } + { + dependencies: ["41D32C5178760F47"] + description: ["{quests.high_voltage.multi_structure_terminal.desc}"] + id: "3FC6D346B3EE4A92" + optional: true + shape: "heart" + subtitle: "{quests.high_voltage.multi_structure_terminal.subtitle}" + tasks: [{ + id: "32C53F040A2F0AD8" + item: "gtceuterminal:multi_structure_manager" + type: "item" + }] + x: 5.0d + y: 1.0d + } ] subtitle: ["{quests.high_voltage.subtitle}"] title: "{quests.high_voltage}" diff --git a/config/ftbquests/quests/chapters/lv__low_voltage.snbt b/config/ftbquests/quests/chapters/lv__low_voltage.snbt index 60e1d570a..6e5b94f55 100644 --- a/config/ftbquests/quests/chapters/lv__low_voltage.snbt +++ b/config/ftbquests/quests/chapters/lv__low_voltage.snbt @@ -10,20 +10,55 @@ { id: "0EA7766FE6845121" linked_quest: "0FFBB6177DEB0A23" - x: -8.0d - y: 11.5d + x: -14.5d + y: 15.0d } { id: "46612C429BCA8A18" linked_quest: "6BAC3BE1D4FE0F6B" - x: 7.5d - y: 4.0d + x: 4.5d + y: 14.0d } { id: "5E5AD44B50E0B15B" linked_quest: "31A6A236B6710B95" - x: 7.5d - y: 5.0d + x: 4.5d + y: 12.0d + } + { + id: "5BC9534E2B4A16A2" + linked_quest: "2262F1FD4EAB777F" + shape: "octagon" + size: 1.5d + x: -2.5d + y: 14.0d + } + { + id: "3E4C0AAC278DC9F1" + linked_quest: "341E2F290344BEEE" + shape: "octagon" + size: 1.5d + x: -10.5d + y: 4.0d + } + { + id: "00B51E50BEBF7E1D" + linked_quest: "3F44CFF8A6018F3E" + x: -8.5d + y: 6.0d + } + { + id: "34F6462681BB5D77" + linked_quest: "7C4807A247AF36A1" + x: -8.5d + y: 2.0d + } + { + id: "343F16805E04BFBE" + linked_quest: "2D2CB8104E40E808" + shape: "heart" + x: 7.0d + y: 5.5d } ] quests: [ @@ -41,8 +76,8 @@ type: "item" }] title: "{quests.low_voltage.lv_fluid_regulator.title}" - x: 6.0d - y: -1.5d + x: 7.0d + y: -8.5d } { dependencies: ["38993B4697B0E16C"] @@ -61,8 +96,8 @@ type: "item" }] title: "{quests.low_voltage.lv_robot_arm.title}" - x: 6.0d - y: -4.5d + x: 7.0d + y: -11.5d } { dependencies: ["7EED0084BA59FED1"] @@ -77,8 +112,8 @@ type: "item" }] title: "{quests.low_voltage.lv_conveyor.title}" - x: 4.5d - y: -3.0d + x: 5.0d + y: -10.0d } { dependencies: ["7EED0084BA59FED1"] @@ -93,8 +128,8 @@ type: "item" }] title: "{quests.low_voltage.lv_pump.title}" - x: 4.5d - y: -1.5d + x: 5.0d + y: -8.5d } { dependencies: ["7EED0084BA59FED1"] @@ -109,19 +144,14 @@ type: "item" }] title: "{quests.low_voltage.lv_piston.title}" - x: 4.5d - y: -4.5d + x: 5.0d + y: -11.5d } { dependencies: ["7FA1525D681C4B4A"] - description: [ - "{quests.low_voltage.lv_steam_turbine.desc.1}" - "{@pagebreak}" - "{quests.low_voltage.lv_steam_turbine.desc.2}" - ] + description: ["{quests.low_voltage.lv_steam_turbine.desc}"] id: "6E186F9C57155BFA" optional: true - shape: "hexagon" size: 1.0d subtitle: "{quests.low_voltage.lv_steam_turbine.subtitle}" tasks: [{ @@ -130,8 +160,8 @@ type: "item" }] title: "{quests.low_voltage.lv_steam_turbine.title}" - x: 7.5d - y: 9.5d + x: 1.0d + y: -6.0d } { dependencies: ["7FA1525D681C4B4A"] @@ -148,16 +178,20 @@ type: "item" }] title: "{quests.low_voltage.lv_amp_explanation.title}" - x: 5.5d - y: 10.5d + x: 2.0d + y: -8.0d } { - dependencies: ["45B71324028F6E68"] + dependencies: [ + "45B71324028F6E68" + "39F6BCF4B8DFC7D4" + ] + dependency_requirement: "one_completed" description: ["{quests.low_voltage.aluminium_ingot.desc}"] hide_dependency_lines: false id: "7567E885B7166603" shape: "octagon" - size: 1.5d + size: 2.0d subtitle: "{quests.low_voltage.aluminium_ingot.subtitle}" tasks: [{ id: "161B5813936E5E42" @@ -165,21 +199,19 @@ type: "item" }] title: "{quests.low_voltage.aluminium_ingot.title}" - x: -10.0d - y: 11.5d + x: -12.5d + y: 14.0d } { dependencies: [ - "49896161B31DB7B4" - "5B891BA4897FD73C" "1912758422EEB006" + "5B891BA4897FD73C" + "49896161B31DB7B4" ] dependency_requirement: "one_completed" description: ["{quests.low_voltage.lv_battery_preparation.desc}"] - hide_dependency_lines: true icon: "gtceu:battery_alloy_ingot" id: "6D9D54FAB21EC086" - size: 1.0d subtitle: "{quests.low_voltage.lv_battery_preparation.subtitle}" tasks: [ { @@ -195,8 +227,8 @@ } ] title: "{quests.low_voltage.lv_battery_preparation.title}" - x: 7.5d - y: -0.5d + x: 5.0d + y: 4.0d } { dependencies: [ @@ -213,7 +245,7 @@ ] icon: "gtceu:storage_cover" id: "1C767009F505A813" - shape: "square" + shape: "circle" size: 1.0d subtitle: "{quests.low_voltage.cover_behaviour.subtitle}" tasks: [{ @@ -222,15 +254,11 @@ type: "checkmark" }] title: "{quests.low_voltage.cover_behaviour.title}" - x: 6.0d - y: -3.0d + x: 7.0d + y: -10.0d } { - dependencies: [ - "32EA7E81885C8E87" - "10ECB471A77F5136" - "07E7678095258EDB" - ] + dependencies: ["47B899144B865516"] dependency_requirement: "one_completed" description: [ "{quests.low_voltage.machine_auto_output_behaviour.desc.1}" @@ -239,7 +267,7 @@ ] icon: "minecraft:hopper" id: "64E1E87B8AF72968" - shape: "square" + shape: "circle" size: 1.0d subtitle: "{quests.low_voltage.machine_auto_output_behaviour.subtitle}" tasks: [{ @@ -248,11 +276,11 @@ type: "checkmark" }] title: "{quests.low_voltage.machine_auto_output_behaviour.title}" - x: -5.0d - y: -0.5d + x: -2.5d + y: 2.0d } { - dependencies: ["22510C5F2386B453"] + dependencies: ["12565AB92A2BF976"] description: [ "{quests.low_voltage.lv_wiremill.desc.1}" "{@pagebreak}" @@ -277,11 +305,11 @@ type: "item" }] title: "{quests.low_voltage.lv_wiremill.title}" - x: -3.0d - y: 0.5d + x: -1.0d + y: -1.0d } { - dependencies: ["22510C5F2386B453"] + dependencies: ["12565AB92A2BF976"] description: ["{quests.low_voltage.lv_bender.desc}"] id: "10ECB471A77F5136" size: 1.0d @@ -302,11 +330,11 @@ type: "item" }] title: "{quests.low_voltage.lv_bender.title}" - x: -5.0d - y: 1.5d + x: -3.0d + y: -1.0d } { - dependencies: ["22510C5F2386B453"] + dependencies: ["12565AB92A2BF976"] description: [ "{quests.low_voltage.lv_lathe.desc.1}" "{@pagebreak}" @@ -328,11 +356,11 @@ type: "item" }] title: "{quests.low_voltage.lv_lathe.title}" - x: -4.0d - y: 1.0d + x: -5.0d + y: -1.0d } { - dependencies: ["22510C5F2386B453"] + dependencies: ["12565AB92A2BF976"] description: ["{quests.low_voltage.lv_polariser.desc}"] id: "29379C91D6E00436" size: 1.0d @@ -343,8 +371,8 @@ type: "item" }] title: "{quests.low_voltage.lv_polariser.title}" - x: -1.0d - y: -0.5d + x: 3.0d + y: -1.0d } { dependencies: [ @@ -370,8 +398,8 @@ type: "item" }] title: "{quests.low_voltage.lbb.title}" - x: 9.0d - y: 9.5d + x: 0.0d + y: -6.0d } { dependencies: ["1E9BE8D3F8A602DC"] @@ -391,18 +419,19 @@ type: "item" }] title: "{quests.low_voltage.lv_superconductor.title}" - x: -12.0d - y: 7.5d + x: -14.5d + y: 10.0d } { - dependencies: ["22510C5F2386B453"] + dependencies: ["47B899144B865516"] 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 + shape: "heart" size: 1.0d subtitle: "{quests.low_voltage.lv_chemical_bath.subtitle}" tasks: [{ @@ -411,8 +440,8 @@ type: "item" }] title: "{quests.low_voltage.lv_chemical_bath.title}" - x: -4.0d - y: 13.5d + x: 2.5d + y: 3.0d } { dependencies: ["64E1E87B8AF72968"] @@ -429,7 +458,7 @@ } } id: "59F0060B55307311" - shape: "square" + shape: "circle" size: 1.0d subtitle: "{quests.low_voltage.programmed_circuits.subtitle}" tasks: [{ @@ -438,11 +467,11 @@ type: "checkmark" }] title: "{quests.low_voltage.programmed_circuits.title}" - x: -6.5d - y: -0.5d + x: -4.5d + y: 2.0d } { - dependencies: ["22510C5F2386B453"] + dependencies: ["63CD0236B337EAAD"] description: ["{quests.low_voltage.lv_canner.desc}"] id: "37307A46E70011D3" size: 1.0d @@ -453,8 +482,8 @@ type: "item" }] title: "{quests.low_voltage.lv_canner.title}" - x: 5.0d - y: 1.5d + x: 2.5d + y: 6.0d } { dependencies: [ @@ -482,8 +511,8 @@ type: "item" }] title: "{quests.low_voltage.lv_battery.title}" - x: 7.5d - y: 1.0d + x: 5.0d + y: 6.0d } { dependencies: ["3E6DC423FE4A99F7"] @@ -512,11 +541,14 @@ type: "item" }] title: "{quests.low_voltage.lv_battery_buffer_4x.title}" - x: 7.5d - y: 2.5d + x: 5.0d + y: 8.0d } { - dependencies: ["1646BF9194100E57"] + dependencies: [ + "1646BF9194100E57" + "2FC7B1E867E4194E" + ] description: [ "{quests.low_voltage.lv_ebf.desc.1}" "{@pagebreak}" @@ -541,14 +573,22 @@ type: "item" }] title: "{quests.low_voltage.lv_ebf.title}" - x: -10.0d - y: 7.5d + x: -12.5d + y: 10.0d } { - dependencies: ["22510C5F2386B453"] description: ["{quests.low_voltage.other_machines.desc}"] hide_dependency_lines: false - icon: "gtceu:crushed_sulfur_ore" + icon: { + Count: 1 + ForgeCaps: { + "tfc:item_heat": { + heat: 0.0f + ticks: 0L + } + } + id: "gtceu:crushed_sphalerite_ore" + } id: "701BCADAE5CF6CA5" shape: "circle" size: 1.0d @@ -559,8 +599,8 @@ type: "checkmark" }] title: "{quests.low_voltage.other_machines.title}" - x: 5.5d - y: 4.5d + x: 2.5d + y: 12.0d } { description: ["{quests.low_voltage.lv_age_progression.desc}"] @@ -576,7 +616,7 @@ }] title: "{quests.low_voltage.lv_age_progression.title}" x: 0.0d - y: -3.0d + y: -12.5d } { dependencies: [ @@ -586,7 +626,8 @@ dependency_requirement: "one_completed" description: ["{quests.low_voltage.lv_fluid_solidifier.desc}"] id: "581CDF545E1EA1FD" - size: 1.0d + shape: "octagon" + size: 1.5d subtitle: "{quests.low_voltage.lv_fluid_solidifier.subtitle}" tasks: [{ id: "20B1CA4DB2750E84" @@ -594,8 +635,8 @@ type: "item" }] title: "{quests.low_voltage.lv_fluid_solidifier.title}" - x: -8.0d - y: 3.5d + x: -4.5d + y: 6.0d } { dependencies: [ @@ -621,13 +662,13 @@ type: "item" }] title: "{quests.low_voltage.lv_ore_prospector.title}" - x: 9.0d - y: 1.0d + x: 7.0d + y: 6.5d } { dependencies: [ "6042514C8FC54334" - "5B2696206205CB2E" + "02E5D186ABF719F0" ] description: ["{quests.low_voltage.cupronickel_coil.desc}"] icon: { @@ -647,11 +688,10 @@ type: "item" }] title: "{quests.low_voltage.cupronickel_coil.title}" - x: -8.0d - y: 7.5d + x: -10.5d + y: 10.0d } { - dependencies: ["22510C5F2386B453"] description: ["{quests.low_voltage.lv_gas_collector.desc}"] id: "15928F50AE80A5CF" shape: "square" @@ -663,11 +703,11 @@ type: "item" }] title: "{quests.low_voltage.lv_gas_collector.title}" - x: -4.0d - y: 9.5d + x: -8.5d + y: 12.0d } { - dependencies: ["22510C5F2386B453"] + dependencies: ["47B899144B865516"] description: [ "{quests.low_voltage.lv_chemical_reactor.desc.1}" "{@pagebreak}" @@ -697,17 +737,19 @@ } ] title: "{quests.low_voltage.lv_chemical_reactor.title}" - x: -6.0d - y: 3.5d + x: -2.5d + y: 6.0d } { - dependencies: ["10ECB471A77F5136"] + dependencies: ["63CD0236B337EAAD"] description: [ "{quests.low_voltage.universal_cell.desc.1}" "{@pagebreak}" "{quests.low_voltage.universal_cell.desc.2}" ] id: "292938760AB9A12B" + optional: true + shape: "heart" size: 1.0d subtitle: "{quests.low_voltage.universal_cell.subtitle}" tasks: [{ @@ -723,16 +765,14 @@ type: "item" }] title: "{quests.low_voltage.universal_cell.title}" - x: -6.5d - y: 1.5d + x: 1.0d + y: 8.0d } { dependencies: ["581CDF545E1EA1FD"] description: ["{quests.low_voltage.mold_rotor.desc}"] icon: "gtceu:rotor_casting_mold" id: "115C4226F6473F0C" - optional: true - shape: "heart" size: 1.0d subtitle: "{quests.low_voltage.mold_rotor.subtitle}" tasks: [ @@ -748,29 +788,35 @@ } ] title: "{quests.low_voltage.mold_rotor.title}" - x: -9.5d - y: 3.5d + x: -6.5d + y: 7.0d } { - dependencies: ["5B891BA4897FD73C"] + dependencies: ["5B2696206205CB2E"] dependency_requirement: "one_completed" description: ["{quests.low_voltage.soldering_alloy.desc}"] - icon: "gtceu:soldering_alloy_dust" + icon: "gtceu:soldering_alloy_bucket" id: "713C8D6A20BF3A0E" shape: "square" size: 1.0d subtitle: "{quests.low_voltage.soldering_alloy.subtitle}" - tasks: [{ - id: "67F9F84D66E32728" - item: "gtceu:soldering_alloy_dust" - type: "item" - }] + tasks: [ + { + id: "5F6344C5B4DCE4C8" + item: "gtceu:soldering_alloy_bucket" + optional_task: true + type: "item" + } + { + id: "1095906933C39F9A" + type: "checkmark" + } + ] title: "{quests.low_voltage.soldering_alloy.title}" - x: 4.0d - y: 11.5d + x: -6.5d + y: 4.0d } { - dependencies: ["22510C5F2386B453"] description: [ "{quests.low_voltage.lv_electroliser.desc.1}" "{@pagebreak}" @@ -788,11 +834,11 @@ type: "item" }] title: "{quests.low_voltage.lv_electroliser.title}" - x: -6.0d - y: 7.5d + x: -2.5d + y: 12.0d } { - dependencies: ["22510C5F2386B453"] + dependencies: ["12565AB92A2BF976"] description: ["{quests.low_voltage.lv_cutter.desc}"] id: "3A8D7FC6F316C38C" size: 1.0d @@ -813,11 +859,11 @@ type: "item" }] title: "{quests.low_voltage.lv_cutter.title}" - x: -2.0d - y: 0.0d + x: 1.0d + y: -1.0d } { - dependencies: ["22510C5F2386B453"] + dependencies: ["63CD0236B337EAAD"] description: [ "{quests.low_voltage.lv_centrifuge.desc.1}" "{@pagebreak}" @@ -834,8 +880,8 @@ type: "item" }] title: "{quests.low_voltage.lv_centrifuge.title}" - x: -2.0d - y: 9.5d + x: -2.5d + y: 10.0d } { dependencies: ["37307A46E70011D3"] @@ -852,11 +898,11 @@ type: "item" }] title: "{quests.low_voltage.lv_sprayer.title}" - x: 5.0d - y: 0.0d + x: 2.5d + y: 8.0d } { - dependencies: ["22510C5F2386B453"] + dependencies: ["47B899144B865516"] description: [ "{quests.low_voltage.lv_assembler.desc.1}" "{@pagebreak}" @@ -873,10 +919,10 @@ }] title: "{quests.low_voltage.lv_assembler.title}" x: 0.0d - y: 9.5d + y: 6.0d } { - dependencies: ["22510C5F2386B453"] + dependencies: ["47B899144B865516"] description: [ "{quests.low_voltage.lv_extractor.desc.1}" "{@pagebreak}" @@ -891,8 +937,8 @@ type: "item" }] title: "{quests.low_voltage.lv_extractor.title}" - x: -6.0d - y: 5.5d + x: -4.5d + y: 4.0d } { dependencies: ["0DBC148D92A9F69F"] @@ -911,8 +957,8 @@ type: "item" }] title: "{quests.low_voltage.lv_circuit_assembler.title}" - x: 0.0d - y: 16.5d + x: 4.0d + y: 17.5d } { dependencies: ["1A77CA35F054F988"] @@ -930,8 +976,8 @@ type: "item" }] title: "{quests.low_voltage.lv_arc_furnace.title}" - x: -6.0d - y: 11.5d + x: -4.5d + y: 13.0d } { dependencies: [ @@ -973,8 +1019,8 @@ } ] title: "{quests.low_voltage.lv_oxygen.title}" - x: -6.0d - y: 9.5d + x: -4.5d + y: 12.0d } { dependencies: ["5263F866638D875C"] @@ -1004,11 +1050,11 @@ } ] title: "{quests.low_voltage.lv_glue.title}" - x: -2.0d - y: 11.5d + x: -4.5d + y: 10.0d } { - dependencies: ["5B891BA4897FD73C"] + dependencies: ["701BCADAE5CF6CA5"] dependency_requirement: "one_completed" description: ["{quests.low_voltage.gallium_arsenide.desc}"] id: "4073577B7EF9B593" @@ -1020,14 +1066,13 @@ type: "item" }] title: "{quests.low_voltage.gallium_arsenide.title}" - x: 2.0d - y: 11.5d + x: 2.5d + y: 14.0d } { dependencies: [ - "0EAC071414AEC07E" - "330BDB559A7BAB35" - "63CD0236B337EAAD" + "1C5F5EDAEE355130" + "628C72BC441DAAB5" ] description: [ "{quests.low_voltage.t2_circuit_board.desc.1}" @@ -1042,8 +1087,8 @@ item: "gtceu:phenolic_printed_circuit_board" type: "item" }] - x: -2.0d - y: 13.5d + x: -4.5d + y: 17.5d } { dependencies: [ @@ -1061,7 +1106,7 @@ }] title: "{quests.low_voltage.lv_diode.title}" x: 0.0d - y: 11.5d + y: 14.0d } { dependencies: [ @@ -1070,8 +1115,8 @@ ] description: ["{quests.low_voltage.1_mv_circuit.desc}"] id: "0DBC148D92A9F69F" - shape: "gear" - size: 1.5d + shape: "octagon" + size: 2.0d subtitle: "{quests.low_voltage.1_mv_circuit.subtitle}" tasks: [{ id: "70313E1917121E14" @@ -1080,7 +1125,7 @@ }] title: "{quests.low_voltage.1_mv_circuit.title}" x: 0.0d - y: 13.5d + y: 17.5d } { dependencies: ["1E9BE8D3F8A602DC"] @@ -1094,19 +1139,20 @@ type: "item" }] title: "{quests.low_voltage.aluminium_dust.title}" - x: -10.0d - y: 9.5d + x: -12.5d + y: 12.0d } { - dependencies: ["1E9BE8D3F8A602DC"] description: ["{quests.low_voltage.multiblock_tech.desc}"] hide_text_until_complete: false icon: "gtceu:heatproof_machine_casing" id: "2FC7B1E867E4194E" + shape: "circle" size: 1.0d subtitle: "{quests.low_voltage.multiblock_tech.subtitle}" tasks: [ { + disable_toast: true id: "1B5378C55DC4AE73" item: { Count: 1 @@ -1119,23 +1165,13 @@ type: "item" } { - id: "3201D38691813B6D" - item: { - Count: 1 - id: "ftbfiltersystem:smart_filter" - tag: { - "ftbfiltersystem:filter": "or(item(gtceu:ulv_output_bus)item(gtceu:lv_output_bus))" - } - } - title: "{quests.low_voltage.multiblock_tech.task.2}" - type: "item" - } - { + disable_toast: true id: "1F39902E1FB41053" item: "gtceu:maintenance_hatch" type: "item" } { + disable_toast: true id: "705D4CC1AA36EF10" item: "gtceu:lv_muffler_hatch" type: "item" @@ -1147,6 +1183,7 @@ type: "item" } { + disable_toast: true id: "7E3D72FA8499654D" item: { Count: 1 @@ -1160,49 +1197,30 @@ } { count: 2L + disable_toast: true id: "64F174F0EDAED10E" item: "gtceu:lv_energy_input_hatch" type: "item" } + { + disable_toast: true + id: "226789AAB78CDC09" + item: "gtceu:lv_output_bus" + type: "item" + } ] title: "{quests.low_voltage.multiblock_tech.title}" - x: -10.0d - y: 5.5d + x: -12.5d + y: 8.0d } { - dependencies: ["22510C5F2386B453"] - description: [ - "{quests.low_voltage.lv_rock_crusher.desc.1}" - "{@pagebreak}" - "{quests.low_voltage.lv_rock_crusher.desc.2}" + dependencies: [ + "2E36E5755B2F551C" + "4B4F052F00435AFE" + "2D2CB8104E40E808" + "07EDEA9613D6F02D" ] - icon: "gtceu:lv_rock_crusher" - id: "1F2359106FC95603" - optional: true - shape: "heart" - size: 1.0d - subtitle: "{quests.low_voltage.lv_rock_crusher.subtitle}" - tasks: [{ - id: "37396BE76A4F64C5" - item: { - Count: 1 - id: "ftbfiltersystem:smart_filter" - tag: { - display: { - Name: "{\"text\":\"Any Rock Crusher\"}" - } - "ftbfiltersystem:filter": "or(item(gtceu:lv_rock_crusher)item(gtceu:mv_rock_crusher)item(gtceu:hv_rock_crusher)item(gtceu:ev_rock_crusher)item(gtceu:iv_rock_crusher)item(gtceu:luv_rock_crusher)item(gtceu:zpm_rock_crusher)item(gtceu:uv_rock_crusher))" - } - } - title: "{quests.low_voltage.lv_rock_crusher.task}" - type: "item" - }] - title: "{quests.low_voltage.lv_rock_crusher.title}" - x: 3.5d - y: 0.5d - } - { - dependencies: ["3E6DC423FE4A99F7"] + dependency_requirement: "one_completed" description: ["{quests.low_voltage.lv_turbo_charge.desc}"] icon: "gtceu:lv_charger_4x" id: "2DB259568F347C0E" @@ -1227,42 +1245,30 @@ }] title: "{quests.low_voltage.lv_turbo_charge.title}" x: 9.0d - y: -0.5d + y: 6.0d } { - dependencies: ["22510C5F2386B453"] + dependencies: ["12565AB92A2BF976"] description: ["{quests.low_voltage.lv_mixer.desc}"] id: "5B891BA4897FD73C" subtitle: "{quests.low_voltage.lv_mixer.subtitle}" tasks: [{ - id: "337A6B670842F80A" - item: { - Count: 1 - id: "ftbfiltersystem:smart_filter" - tag: { - display: { - Name: "{\"text\":\"LV Mixer\"}" - } - "ftbfiltersystem:filter": "or(item(greate:steel_mechanical_mixer)item(gtceu:lv_mixer))" - } - } - title: "{quests.low_voltage.lv_mixer.task}" + id: "7595657F7017B1F6" + item: "gtceu:lv_mixer" type: "item" }] title: "{quests.low_voltage.lv_mixer.title}" - x: 2.0d - y: 9.5d + x: 5.0d + y: -1.0d } { - dependencies: ["12565AB92A2BF976"] + dependencies: ["648BCF486E16CCB2"] description: [ "{quests.low_voltage.lv_machine_hull.desc.1}" "{@pagebreak}" "{quests.low_voltage.lv_machine_hull.desc.2}" ] id: "22510C5F2386B453" - shape: "gear" - size: 2.5d subtitle: "{quests.low_voltage.lv_machine_hull.subtitle}" tasks: [{ id: "499CACFF0350B3CA" @@ -1271,7 +1277,7 @@ }] title: "{quests.low_voltage.lv_machine_hull.title}" x: 0.0d - y: 4.5d + y: -10.0d } { dependencies: ["15928F50AE80A5CF"] @@ -1301,11 +1307,11 @@ } ] title: "{quests.low_voltage.lv_nitrogen.title}" - x: -4.0d - y: 11.5d + x: -10.5d + y: 12.0d } { - dependencies: ["648BCF486E16CCB2"] + dependencies: ["22510C5F2386B453"] description: ["{quests.low_voltage.lv_motor.desc}"] icon: "gtceu:lv_electric_motor" id: "7EED0084BA59FED1" @@ -1320,7 +1326,7 @@ }] title: "{quests.low_voltage.lv_motor.title}" x: 3.0d - y: -3.0d + y: -10.0d } { dependencies: ["581CDF545E1EA1FD"] @@ -1342,14 +1348,16 @@ } ] title: "{quests.low_voltage.mold_plate.title}" - x: -9.5d - y: 2.5d + x: -6.5d + y: 6.0d } { dependencies: ["3E6DC423FE4A99F7"] + description: ["{quests.low_voltage.night_vision_goggles.desc}"] id: "4B4F052F00435AFE" optional: true shape: "heart" + subtitle: "{quests.low_voltage.night_vision_goggles.subtitle}" tasks: [{ id: "00E6EDB1E4C1482F" item: { @@ -1359,15 +1367,15 @@ } type: "item" }] - x: 9.0d - y: 2.5d + x: 7.0d + y: 4.5d } { dependencies: ["7FA1525D681C4B4A"] description: ["{quests.steam_age.alternator.desc.1}"] + icon: "createaddition:alternator" id: "2DC24661CAD557B0" optional: true - shape: "hexagon" subtitle: "{quests.steam_age.alternator.subtitle}" tasks: [ { @@ -1391,11 +1399,14 @@ } ] title: "{quests.steam_age.alternator.title}" - x: 7.5d - y: 8.0d + x: -1.0d + y: -6.0d } { - dependencies: ["7567E885B7166603"] + dependencies: [ + "7567E885B7166603" + "1C5F5EDAEE355130" + ] description: [ "{quests.low_voltage.mv_hull.desc1}" "{@pagebreak}" @@ -1411,22 +1422,51 @@ type: "item" }] title: "{quests.low_voltage.mv_hull.title}" - x: -10.0d - y: 15.0d + x: -12.5d + y: 17.5d } { - dependencies: ["648BCF486E16CCB2"] + dependencies: [ + "170B544373A16112" + "2DC24661CAD557B0" + "1AD51E2B66EA7F67" + "6E186F9C57155BFA" + ] + dependency_requirement: "one_completed" description: ["{quests.low_voltage.lv_machine_casing.desc}"] + icon: { + Count: 1 + ForgeCaps: { + "tfc:item_heat": { + heat: 0.0f + ticks: 0L + } + } + id: "gtceu:red_steel_wire_cutter" + tag: { + Damage: 0 + DisallowContainerItem: 0b + GT.Behaviours: { } + GT.Tool: { + DefaultEnchantments: [ ] + HarvestLevel: 3 + MaxDamage: 15359 + ToolSpeed: 11.0f + } + HideFlags: 2 + } + } id: "12565AB92A2BF976" + shape: "circle" + size: 1.5d subtitle: "{quests.low_voltage.lv_machine_casing.subtitle}" tasks: [{ - id: "7459A24E5EBE148D" - item: "gtceu:lv_machine_casing" - type: "item" + id: "373E2FE9A8AB14B3" + type: "checkmark" }] title: "{quests.low_voltage.lv_machine_casing.title}" x: 0.0d - y: 1.0d + y: -3.5d } { dependencies: ["0DBC148D92A9F69F"] @@ -1451,11 +1491,11 @@ type: "item" }] title: "{quests.low_voltage.lv_greenhouse.title}" - x: 2.25d - y: 13.5d + x: 0.0d + y: 19.5d } { - dependencies: ["22510C5F2386B453"] + dependencies: ["47B899144B865516"] description: ["{quests.low_voltage.lv_aqueous_accumulator.desc}"] icon: "tfg:lv_aqueous_accumulator" id: "47E6F8AC20D51814" @@ -1475,8 +1515,8 @@ type: "item" }] title: "{quests.low_voltage.lv_aqueous_accumulator.title}" - x: 2.0d - y: 0.0d + x: 2.5d + y: 2.0d } { dependencies: [ @@ -1488,7 +1528,6 @@ description: ["{quests.low_voltage.lv_combuston_gen.desc}"] id: "170B544373A16112" optional: true - shape: "hexagon" subtitle: "{quests.low_voltage.lv_combuston_gen.subtitle}" tasks: [{ id: "2B36CA88F25D5449" @@ -1496,8 +1535,8 @@ type: "item" }] title: "{quests.low_voltage.lv_combuston_gen.title}" - x: 7.5d - y: 11.0d + x: -3.0d + y: -6.0d } { dependencies: ["22510C5F2386B453"] @@ -1516,8 +1555,8 @@ type: "checkmark" }] title: "{quests.low_voltage.link_chapter.title}" - x: 5.5d - y: 8.5d + x: 0.0d + y: -8.0d } { dependencies: ["5F3063C539C9CBBF"] @@ -1539,8 +1578,8 @@ type: "item" }] title: "{quests.low_voltage.lv_seeds.title}" - x: 11.0d - y: 11.0d + x: -7.0d + y: -6.5d } { dependencies: ["55213ACBF5F5D398"] @@ -1555,8 +1594,8 @@ type: "item" }] title: "{quests.low_voltage.lv_seed_oil.title}" - x: 10.0d - y: 11.0d + x: -6.0d + y: -6.5d } { dependencies: ["1D979CB5862BD480"] @@ -1571,12 +1610,10 @@ type: "item" }] title: "{quests.low_voltage.lv_biodiesel.title}" - x: 9.0d - y: 11.0d + x: -5.0d + y: -6.5d } { - dependencies: ["1912758422EEB006"] - dependency_requirement: "one_completed" description: ["{quests.low_voltage.cupronickel_ingot.desc}"] id: "6042514C8FC54334" shape: "diamond" @@ -1587,8 +1624,8 @@ type: "item" }] title: "{quests.low_voltage.cupronickel_ingot.title}" - x: -8.0d - y: 9.5d + x: -10.5d + y: 8.0d } { dependencies: ["7567E885B7166603"] @@ -1617,14 +1654,10 @@ } ] title: "{quests.low_voltage.aluminium_greate.title}" - x: -12.0d - y: 11.5d + x: -14.5d + y: 14.0d } { - dependencies: [ - "5263F866638D875C" - "3D98819A799D2E64" - ] dependency_requirement: "one_completed" description: ["{quests.low_voltage.oil.desc}"] hide_dependency_lines: true @@ -1639,8 +1672,8 @@ type: "checkmark" }] title: "{quests.low_voltage.oil.title}" - x: 10.0d - y: 12.0d + x: -6.0d + y: -5.5d } { dependencies: [ @@ -1650,7 +1683,6 @@ description: ["{quests.low_voltage.lv_gas_turbine.desc}"] id: "1AD51E2B66EA7F67" optional: true - shape: "hexagon" subtitle: "{quests.low_voltage.lv_gas_turbine.subtitle}" tasks: [{ id: "295425BB3FED8220" @@ -1658,8 +1690,8 @@ type: "item" }] title: "{quests.low_voltage.lv_gas_turbine.title}" - x: 7.5d - y: 6.5d + x: 3.0d + y: -6.0d } { dependencies: ["2CEE3C0972650C81"] @@ -1679,7 +1711,7 @@ } { id: "34153032225B76BB" - item: "gtceu:light_fuel_bucket" + item: "gtceu:diesel_bucket" optional_task: true type: "item" } @@ -1690,8 +1722,8 @@ } ] title: "{quests.low_voltage.lv_naphtha_light.title}" - x: 9.0d - y: 12.0d + x: -5.0d + y: -5.5d } { dependencies: ["5F3063C539C9CBBF"] @@ -1707,8 +1739,8 @@ type: "item" }] title: "{quests.low_voltage.lv_gas_syngas.title}" - x: 9.0d - y: 6.5d + x: 5.0d + y: -6.0d } { dependencies: [ @@ -1725,8 +1757,8 @@ type: "item" }] title: "{quests.low_voltage.glowstone.title}" - x: -8.0d - y: 5.5d + x: -6.5d + y: 5.0d } { dependencies: ["22510C5F2386B453"] @@ -1747,8 +1779,251 @@ type: "checkmark" }] title: "{quests.low_voltage.lost.title}" - x: 1.5d - y: 5.0d + x: -2.0d + y: -10.0d + } + { + dependencies: [ + "32EA7E81885C8E87" + "3A8D7FC6F316C38C" + "10ECB471A77F5136" + "5B891BA4897FD73C" + "07E7678095258EDB" + "29379C91D6E00436" + ] + dependency_requirement: "one_completed" + description: ["{quests.low_voltage.next_machines.desc}"] + icon: { + Count: 1 + id: "gtceu:lv_blue_steel_wrench" + tag: { + Charge: 2147483647L + Damage: 0 + DisallowContainerItem: 0b + GT.Behaviours: { + Mode: 2b + } + GT.Tool: { + DefaultEnchantments: [ ] + HarvestLevel: 3 + MaxDamage: 6143 + ToolSpeed: 34.0f + } + HideFlags: 2 + MaxCharge: 2147483647L + } + } + id: "47B899144B865516" + shape: "circle" + size: 1.5d + subtitle: "{quests.low_voltage.next_machines.subtitle}" + tasks: [{ + id: "4E3F61B3665C360D" + type: "checkmark" + }] + title: "{quests.low_voltage.next_machines.title}" + x: 0.0d + y: 2.0d + } + { + dependencies: ["3D98819A799D2E64"] + description: ["{quests.low_voltage.lv_distillery.desc}"] + id: "26C843A618A39A44" + subtitle: "{quests.low_voltage.lv_distillery.subtitle}" + tasks: [{ + id: "7A2467AC143CE86C" + item: "gtceu:lv_distillery" + type: "item" + }] + x: -4.5d + y: 8.0d + } + { + dependencies: ["26C843A618A39A44"] + description: [ + "{quests.low_voltage.phenolic_resin.desc.1}" + "{@pagebreak}" + "{quests.low_voltage.phenolic_resin.desc.2}" + ] + icon: "tfg:phenolic_resin_bucket" + id: "671F90ADCDF476A8" + subtitle: "{quests.low_voltage.phenolic_resin.subtitle}" + tasks: [ + { + id: "173ED252A38EC942" + item: { + Count: 1 + id: "ftbfiltersystem:smart_filter" + tag: { + "ftbfiltersystem:filter": "or(nbt(fuzzy:{fluid:{FluidName:\"tfg:phenolic_resin\"}})nbt(fuzzy:{Fluid:{FluidName:\"tfg:phenolic_resin\"}})item(tfg:phenolic_resin_bucket))" + } + } + optional_task: true + title: "{material.tfg.phenolic_resin}" + type: "item" + } + { + id: "7427C1BCD5B921B6" + type: "checkmark" + } + ] + title: "{material.tfg.phenolic_resin}" + x: -6.5d + y: 10.0d + } + { + dependencies: ["671F90ADCDF476A8"] + description: [ + "{quests.low_voltage.bakelite.desc.1}" + "{@pagebreak}" + "{quests.low_voltage.bakelite.desc.2}" + ] + id: "1C5F5EDAEE355130" + shape: "octagon" + size: 1.5d + subtitle: "{quests.low_voltage.bakelite.subtitle}" + tasks: [{ + id: "0938AC37E76A29D7" + item: "tfg:bakelite_plate" + type: "item" + }] + title: "{material.tfg.bakelite}" + x: -6.5d + y: 17.5d + } + { + description: ["{quests.low_voltage.lv_forming_press.desc}"] + icon: "gtceu:lv_forming_press" + id: "628C72BC441DAAB5" + subtitle: "{quests.low_voltage.lv_forming_press.subtitle}" + tasks: [{ + id: "60128F9B939ED982" + item: "gtceu:lv_forming_press" + type: "item" + }] + x: -4.5d + y: 15.5d + } + { + dependencies: [ + "671F90ADCDF476A8" + "6FFD4990FF07078A" + "698DCAB4F014EB3B" + ] + dependency_requirement: "one_completed" + description: ["{quests.low_voltage.refractory_brick.desc}"] + id: "02E5D186ABF719F0" + subtitle: "{quests.low_voltage.refractory_brick.subtitle}" + tasks: [{ + id: "5E377C9A0AD52487" + item: "tfg:magnesia_refractory_brick_ingot" + type: "item" + }] + x: -8.5d + y: 10.0d + } + { + description: ["{quests.low_voltage.magnesia.desc}"] + id: "698DCAB4F014EB3B" + shape: "diamond" + subtitle: "{quests.low_voltage.magnesia.subtitle}" + tasks: [{ + id: "57C83D16611E601A" + item: "gtceu:magnesia_dust" + type: "item" + }] + x: -8.5d + y: 8.0d + } + { + dependencies: ["47B899144B865516"] + description: ["{quests.low_voltage.food_machines.desc}"] + icon: "tfg:lv_food_processor" + id: "3B6A7B1E9114C2A9" + optional: true + shape: "heart" + subtitle: "{quests.low_voltage.food_machines.subtitle}" + tasks: [ + { + id: "12EE86BCBC04FCCE" + item: "tfg:lv_food_processor" + type: "item" + } + { + id: "4A3187B73528B908" + item: "tfg:lv_food_oven" + type: "item" + } + { + id: "2D6C7761076670A5" + item: "tfg:rotten_voiding_cover" + optional_task: true + type: "item" + } + ] + title: "{quests.low_voltage.food_machines.title}" + x: 2.5d + y: 4.0d + } + { + dependencies: [ + "713C8D6A20BF3A0E" + "7C4807A247AF36A1" + ] + dependency_requirement: "one_completed" + description: ["{quests.create_logistics.stock_link.desc}"] + disable_toast: true + id: "50FE830DA6F403B2" + subtitle: "{quests.create_logistics.stock_link.subtitle}" + tasks: [{ + id: "7B71B5DBEFD84C1F" + item: "create:stock_link" + type: "item" + }] + title: "{quests.create_logistics.stock_link.title}" + x: -8.5d + y: 4.0d + } + { + description: ["{quests.low_voltage.lv_laser_engraver.desc}"] + id: "383A14A5C65B3ADF" + subtitle: "{quests.low_voltage.lv_laser_engraver.subtitle}" + tasks: [{ + id: "4CB619C294C16642" + item: "gtceu:lv_laser_engraver" + type: "item" + }] + x: -10.5d + y: 2.0d + } + { + dependencies: ["3E6DC423FE4A99F7"] + description: ["{quests.tfg_tips.magnets.desc}"] + icon: { + Count: 1 + id: "gtceu:lv_item_magnet" + tag: { + Charge: 100000L + } + } + id: "07EDEA9613D6F02D" + optional: true + shape: "heart" + subtitle: "{quests.tfg_tips.magnets.subtitle}" + tasks: [{ + id: "10DEC029D9788B72" + item: { + Count: 1 + id: "ftbfiltersystem:smart_filter" + tag: { + "ftbfiltersystem:filter": "or(item(gtceu:lv_item_magnet)item(gtceu:hv_item_magnet))" + } + } + type: "item" + }] + title: "{quests.tfg_tips.magnets.title}" + x: 7.0d + y: 7.5d } ] subtitle: ["{quests.low_voltage.subtitle}"] diff --git a/config/ftbquests/quests/chapters/mars.snbt b/config/ftbquests/quests/chapters/mars.snbt index 48f971db3..fea88964f 100644 --- a/config/ftbquests/quests/chapters/mars.snbt +++ b/config/ftbquests/quests/chapters/mars.snbt @@ -153,7 +153,7 @@ type: "item" }] title: "{quests.space_survival.heavy_ammoniacal_water.title}" - x: 15.0d + x: 15.5d y: -4.0d } { @@ -174,7 +174,7 @@ { dependencies: ["5AC5AAB9B3758E30"] description: ["{quests.space_survival.soarer.desc}"] - guide_page: "tfc:field_guide tfc:tfg_tips/space_fauna 20" + guide_page: "tfc:field_guide tfc:tfg_tips/space_fauna 21" icon: "wan_ancient_beasts:soarer_egg" id: "2F711C064635EF2D" optional: true @@ -289,7 +289,7 @@ }] title: "{quests.space_survival.mars_crops.title}" x: 13.5d - y: -1.5d + y: -2.0d } { dependencies: ["0967CE7F5DFF5CF6"] @@ -460,7 +460,7 @@ ] title: "{quests.space_survival.bulbkin_pie.title}" x: 13.5d - y: 0.0d + y: -0.5d } { dependencies: ["155F421FC2F39C3C"] @@ -479,7 +479,7 @@ { dependencies: ["5AC5AAB9B3758E30"] description: ["{quests.space_survival.surfer.desc}"] - guide_page: "tfc:field_guide tfc:tfg_tips/space_fauna 17" + guide_page: "tfc:field_guide tfc:tfg_tips/space_fauna 20" id: "43EBECA48E341C47" optional: true shape: "heart" @@ -578,6 +578,65 @@ x: 12.0d y: -6.5d } + { + dependencies: ["5AC5AAB9B3758E30"] + description: ["{quests.space_survival.charger.desc}"] + guide_page: "tfc:field_guide tfc:tfg_tips/space_fauna 19" + icon: "wan_ancient_beasts:charger_egg" + id: "148C2DA8FB1D6DB1" + optional: true + shape: "heart" + subtitle: "{quests.space_survival.charger.subtitle}" + tasks: [ + { + icon: "wan_ancient_beasts:charger_egg" + id: "78EBECCA1C40A3BD" + observe_type: 5 + timer: 0L + title: "{quests.space_survival.charger.task}" + to_observe: "wan_ancient_beasts:charger" + type: "observation" + } + { + id: "33ADD26F6AA89CA7" + item: { + Count: 1 + id: "ftbfiltersystem:smart_filter" + tag: { + "ftbfiltersystem:filter": "ftbfiltersystem:item_tag(wan_ancient_beasts:charger_armors)" + } + } + optional_task: true + title: "Any #wan_ancient_beasts:charger_armors" + type: "item" + } + ] + title: "{quests.space_survival.charger.title}" + x: 9.0d + y: -4.0d + } + { + dependencies: ["5AC5AAB9B3758E30"] + description: ["{quests.space_survival.snatcher.desc}"] + guide_page: "tfc:field_guide tfc:tfg_tips/space_fauna 17" + icon: "wan_ancient_beasts:snatcher_egg" + id: "02A7FD58F462320F" + optional: true + shape: "heart" + subtitle: "{quests.space_survival.snatcher.subtitle}" + tasks: [{ + icon: "wan_ancient_beasts:snatcher_egg" + id: "4AC531B94CBA93CE" + observe_type: 5 + timer: 0L + title: "{quests.space_survival.snatchertask}" + to_observe: "wan_ancient_beasts:snatcher" + type: "observation" + }] + title: "{quests.space_survival.snatcher.title}" + x: 9.0d + y: -3.0d + } ] subtitle: ["{quests.mars.subtitle}"] title: "{quests.mars}" diff --git a/config/ftbquests/quests/chapters/mv__medium_voltage.snbt b/config/ftbquests/quests/chapters/mv__medium_voltage.snbt index 19b934cac..e41e02230 100644 --- a/config/ftbquests/quests/chapters/mv__medium_voltage.snbt +++ b/config/ftbquests/quests/chapters/mv__medium_voltage.snbt @@ -1325,7 +1325,7 @@ }] title: "{quests.medium_voltage.mv_jetpack_2.title}" x: 1.5d - y: 5.0d + y: 4.5d } { dependencies: [ @@ -1700,6 +1700,21 @@ x: -5.0d y: 4.0d } + { + dependencies: ["75F38905DEA60F15"] + description: ["{quests.medium_voltage.terminal_dismantler.desc}"] + id: "0053E98892F910BF" + shape: "heart" + subtitle: "{quests.medium_voltage.terminal_dismantler.subtitle}" + tasks: [{ + id: "6AE4D07F675A23D0" + item: "gtceuterminal:dismantler" + type: "item" + }] + title: "{quests.medium_voltage.terminal_dismantler.title}" + x: 1.5d + y: 5.5d + } ] subtitle: ["{quests.medium_voltage.subtitle}"] title: "{quests.medium_voltage}" diff --git a/config/ftbquests/quests/chapters/questsmetallurgy.snbt b/config/ftbquests/quests/chapters/questsmetallurgy.snbt index 132a73332..eca75da26 100644 --- a/config/ftbquests/quests/chapters/questsmetallurgy.snbt +++ b/config/ftbquests/quests/chapters/questsmetallurgy.snbt @@ -51,7 +51,7 @@ id: "19CF6D922179DFF9" linked_quest: "11C45DBB20ED7647" shape: "heart" - x: 9.0d + x: 8.5d y: -34.0d } { @@ -415,6 +415,7 @@ description: ["{quests.metal_age.anvil_recycling.desc}"] icon: "tfc:firepit" id: "3B2550394C94CEC9" + shape: "circle" size: 1.0d subtitle: "{quests.metal_age.anvil_recycling.subtitle}" tasks: [{ @@ -646,6 +647,7 @@ } } id: "5792DDAA82895E67" + shape: "circle" subtitle: "{quests.metal_age.red_blu.subtitle}" tasks: [{ id: "63890641DCD6659F" @@ -719,6 +721,7 @@ description: ["{quests.metal_age.wrought_iron_goodies.desc}"] icon: "create:chute" id: "20C2CE92459BE14A" + shape: "circle" subtitle: "{quests.metal_age.wrought_iron_goodies.subtitle}" tasks: [{ id: "60605AA92B6947D8" @@ -734,6 +737,7 @@ description: ["{quests.metal_age.fire_clay_ingredients.desc}"] icon: "minecraft:cartography_table" id: "5A936E9BCF30AA3D" + shape: "circle" subtitle: "{quests.metal_age.fire_clay_ingredients.subtitle}" tasks: [{ id: "39CA01175999A291" @@ -816,6 +820,7 @@ description: ["{quests.metal_age.steel_goodies.desc}"] icon: "greate:steel_mechanical_pump" id: "0C9B7745D812555A" + shape: "circle" subtitle: "{quests.metal_age.steel_goodies.subtitle}" tasks: [{ id: "3EB7C3AE88950E4B" @@ -1297,6 +1302,30 @@ x: 18.5d y: -24.0d } + { + dependencies: ["174DA15847665CF8"] + description: ["{quests.metal_age.toolbelt.desc}"] + icon: "toolbelt:belt" + id: "1DEC710C3570D5D0" + shape: "heart" + subtitle: "{quests.metal_age.toolbelt.subtitle}" + tasks: [ + { + id: "0233F2A323C9FF6F" + item: "toolbelt:belt" + type: "item" + } + { + id: "09A674FE4BA67280" + item: "toolbelt:pouch" + optional_task: true + type: "item" + } + ] + title: "{quests.metal_age.toolbelt.title}" + x: 9.5d + y: -34.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 063f32332..753639ff5 100644 --- a/config/ftbquests/quests/chapters/questssteam_age.snbt +++ b/config/ftbquests/quests/chapters/questssteam_age.snbt @@ -19,20 +19,22 @@ { id: "39027CF4DC307D33" linked_quest: "5E186CD5E83BFDF0" - x: -28.5d + x: -27.0d y: 2.0d } { id: "0CE64B9914191C56" linked_quest: "6FFD4990FF07078A" shape: "diamond" - x: -9.5d + x: -9.0d y: 11.5d } { id: "23A27702FF816291" linked_quest: "6903C72A254A7B08" - x: -12.5d + shape: "octagon" + size: 2.0d + x: -11.5d y: 8.0d } { @@ -40,27 +42,27 @@ linked_quest: "48A8E3210B2BAE1C" shape: "octagon" size: 2.0d - x: -28.5d + x: -27.0d y: 0.0d } { id: "7C03FE015586C652" linked_quest: "55213ACBF5F5D398" shape: "heart" - x: -12.0d + x: -10.5d y: 16.0d } { id: "65E0B13E245D2E5F" linked_quest: "379F434116632A89" - x: -26.0d + x: -24.5d y: 1.0d } { id: "68F5E521F2DB0A86" linked_quest: "0404FBCC34011053" shape: "heart" - x: -13.0d + x: -11.5d y: 16.0d } { @@ -77,6 +79,14 @@ x: -22.5d y: 4.0d } + { + id: "6C8C3BBD2BA9853B" + linked_quest: "56CA2EB7812529C5" + shape: "gear" + size: 1.5d + x: -13.0d + y: 13.5d + } ] quests: [ { @@ -84,7 +94,11 @@ "7B045998769930F0" "55FDF06AC0C01D0B" ] - description: ["{quests.steam_age.basic_millstone.desc}"] + description: [ + "{quests.steam_age.basic_millstone.desc.1}" + "{@pagebreak}" + "{quests.steam_age.basic_millstone.desc.2}" + ] id: "48C1E980F7D64317" size: 1.0d subtitle: "{quests.steam_age.basic_millstone.subtitle}" @@ -94,7 +108,7 @@ type: "item" }] title: "{quests.steam_age.basic_millstone.title}" - x: -20.5d + x: -19.0d y: 0.0d } { @@ -112,7 +126,7 @@ type: "item" }] title: "{quests.steam_age.horse_crank.title}" - x: -24.5d + x: -23.0d y: -2.0d } { @@ -131,7 +145,7 @@ type: "item" }] title: "{quests.steam_age.helve_hammer.title}" - x: -20.5d + x: -19.0d y: -4.0d } { @@ -159,7 +173,7 @@ } ] title: "{quests.steam_age.basic_greate.title}" - x: -20.5d + x: -19.0d y: -2.0d } { @@ -173,7 +187,7 @@ type: "item" }] title: "{quests.steam_age.water_wheel.title}" - x: -14.5d + x: -13.0d y: 0.0d } { @@ -195,7 +209,7 @@ } ] title: "{quests.steam_age.windmill.title}" - x: -14.5d + x: -13.0d y: -4.0d } { @@ -210,7 +224,7 @@ type: "item" }] title: "{quests.steam_age.metal_casing.title}" - x: -9.5d + x: -8.0d y: -2.0d } { @@ -227,7 +241,7 @@ type: "item" }] title: "{quests.steam_age.steel_encased_fan.title}" - x: -5.5d + x: -4.0d y: 4.0d } { @@ -247,7 +261,7 @@ type: "item" }] title: "{quests.steam_age.steel_pump.title}" - x: -3.5d + x: -2.0d y: 2.0d } { @@ -297,7 +311,7 @@ } ] title: "{quests.steam_age.steam_engine.title}" - x: -5.5d + x: -4.0d y: -2.0d } { @@ -316,7 +330,7 @@ type: "item" }] title: "{quests.steam_age.mechanical_saw.title}" - x: -9.5d + x: -8.0d y: 0.0d } { @@ -330,7 +344,7 @@ type: "item" }] title: "{quests.steam_age.mechanical_harvester.title}" - x: -9.5d + x: -8.0d y: -4.0d } { @@ -358,7 +372,7 @@ } ] title: "{quests.steam_age.chute.title}" - x: -12.0d + x: -10.5d y: 0.0d } { @@ -376,7 +390,7 @@ type: "item" }] title: "{quests.steam_age.mold_table.title}" - x: -3.5d + x: -2.0d y: 4.0d } { @@ -406,7 +420,7 @@ } ] title: "{quests.steam_age.steel_greate.title}" - x: -5.5d + x: -4.0d y: 2.0d } { @@ -424,7 +438,7 @@ type: "item" }] title: "{quests.steam_age.steel_millstone.title}" - x: -7.5d + x: -6.0d y: 2.0d } { @@ -523,8 +537,8 @@ } ] title: "{quests.steam_age.miner.title}" - x: -10.0d - y: 17.0d + x: -9.0d + y: 18.0d } { dependencies: [ @@ -681,7 +695,7 @@ type: "item" }] title: "{quests.steam_age.item_pipes.title}" - x: -12.0d + x: -10.5d y: 2.0d } { @@ -695,14 +709,21 @@ shape: "square" size: 1.0d subtitle: "{quests.steam_age.circuit_boards.subtitle}" - tasks: [{ - id: "2B8B038789480789" - item: "gtceu:resin_printed_circuit_board" - type: "item" - }] + tasks: [ + { + id: "2B8B038789480789" + item: "gtceu:resin_printed_circuit_board" + type: "item" + } + { + id: "171A20DD9F208437" + item: "tfg:artisan_table" + type: "item" + } + ] title: "{quests.steam_age.circuit_boards.title}" - x: -9.5d - y: 10.5d + x: -9.0d + y: 10.0d } { dependencies: ["46FA9DD4755A5548"] @@ -770,8 +791,8 @@ type: "item" }] title: "{quests.steam_age.vacuum_tubes.title}" - x: -8.0d - y: 14.0d + x: -7.0d + y: 15.0d } { dependencies: ["7DB7AB5349218605"] @@ -821,7 +842,7 @@ type: "item" }] title: "{quests.steam_age.resistors.title}" - x: -5.0d + x: -4.0d y: 11.5d } { @@ -837,8 +858,8 @@ type: "item" }] title: "{quests.steam_age.coiling_machine.title}" - x: -5.0d - y: 16.0d + x: -4.0d + y: 17.0d } { dependencies: ["2C35D4E01AEC02AA"] @@ -853,8 +874,8 @@ type: "item" }] title: "{quests.steam_age.steel_mixer.title}" - x: -5.0d - y: 14.5d + x: -4.0d + y: 15.5d } { dependencies: ["2C35D4E01AEC02AA"] @@ -868,8 +889,8 @@ type: "item" }] title: "{quests.steam_age.lathe.title}" - x: -6.0d - y: 17.0d + x: -5.0d + y: 18.0d } { dependencies: [ @@ -906,8 +927,8 @@ type: "item" }] title: "{quests.steam_age.vibrating_table.title}" - x: -8.0d - y: 17.0d + x: -7.0d + y: 18.0d } { dependencies: ["2C35D4E01AEC02AA"] @@ -926,8 +947,8 @@ type: "item" }] title: "{quests.steam_age.rolling_mill.title}" - x: -5.0d - y: 13.0d + x: -4.0d + y: 14.0d } { dependencies: ["2C35D4E01AEC02AA"] @@ -941,8 +962,8 @@ type: "item" }] title: "{quests.steam_age.steel_saw.title}" - x: -7.0d - y: 17.0d + x: -6.0d + y: 18.0d } { dependencies: ["2C35D4E01AEC02AA"] @@ -956,8 +977,8 @@ type: "item" }] title: "{quests.steam_age.curving_press.title}" - x: -9.0d - y: 17.0d + x: -8.0d + y: 18.0d } { dependencies: [ @@ -1117,7 +1138,7 @@ } ] title: "{quests.steam_age.fluid_pipes.title}" - x: -3.5d + x: -2.0d y: 0.0d } { @@ -1143,7 +1164,7 @@ type: "item" }] title: "{quests.steam_age.fluid_drums.title}" - x: -1.5d + x: 0.0d y: 2.0d } { @@ -1172,8 +1193,8 @@ type: "item" }] title: "{quests.steam_age.potin.title}" - x: -3.5d - y: 14.5d + x: -2.5d + y: 15.5d } { dependencies: ["6F1BC99BE641B671"] @@ -1200,7 +1221,7 @@ } ] title: "{quests.steam_age.create_tools.title}" - x: -22.5d + x: -21.0d y: -4.0d } { @@ -1233,7 +1254,10 @@ y: 16.0d } { - dependencies: ["6AA07588374B59AB"] + dependencies: [ + "6AA07588374B59AB" + "56CA2EB7812529C5" + ] description: ["{quests.steam_age.vacuum_chamber.desc}"] id: "5F3063C539C9CBBF" subtitle: "{quests.steam_age.vacuum_chamber.subtitle}" @@ -1243,7 +1267,7 @@ type: "item" }] title: "{quests.steam_age.vacuum_chamber.title}" - x: -12.5d + x: -11.5d y: 15.0d } { @@ -1314,7 +1338,7 @@ } ] title: "{quests.steam_age.poor_paths.title}" - x: -26.0d + x: -24.5d y: -3.5d } { @@ -1366,7 +1390,7 @@ } ] title: "{quests.steam_age.normal_paths.title}" - x: -26.5d + x: -25.0d y: -2.0d } { @@ -1424,7 +1448,7 @@ } ] title: "{quests.steam_age.good_paths.title}" - x: -26.0d + x: -24.5d y: -0.5d } { @@ -1446,7 +1470,7 @@ type: "item" }] title: "{quests.steam_age.lv_circuit.title}" - x: -8.0d + x: -7.0d y: 8.0d } { @@ -1461,7 +1485,7 @@ type: "item" }] title: "{quests.steam_age.paper.title}" - x: -3.5d + x: -2.5d y: 11.5d } { @@ -1484,7 +1508,7 @@ type: "item" }] title: "{quests.metal_age.bronze_goodies.title}" - x: -22.5d + x: -21.0d y: -2.0d } { @@ -1508,7 +1532,7 @@ type: "item" }] title: "{quests.metal_age.wrought_iron_goodies.title}" - x: -12.0d + x: -10.5d y: -2.0d } { @@ -1532,7 +1556,7 @@ type: "item" }] title: "{quests.metal_age.steel_goodies.title}" - x: -5.5d + x: -4.0d y: 0.0d } { @@ -1614,7 +1638,7 @@ type: "item" }] title: "{quests.steam_age.rotation_speed_controller.title}" - x: -7.5d + x: -6.0d y: 0.0d } { @@ -1631,7 +1655,7 @@ type: "item" }] title: "{quests.steam_age.resin_boards.title}" - x: -11.5d + x: -10.5d y: 11.5d } { @@ -1665,7 +1689,7 @@ } ] title: "{quests.metal_age.coke_oven.title}" - x: -14.5d + x: -13.0d y: -2.0d } { @@ -1700,7 +1724,7 @@ type: "item" }] title: "{quests.steam_age.basic_mech_press.title}" - x: -18.5d + x: -17.0d y: -2.0d } { @@ -1723,7 +1747,7 @@ type: "item" }] title: "{quests.steam_age.steel_mech_press.title}" - x: -7.5d + x: -6.0d y: 4.0d } { @@ -1738,7 +1762,7 @@ type: "checkmark" }] title: "{quests.steam_age.fuel_sources.title}" - x: -7.5d + x: -6.0d y: -2.0d } { @@ -1752,7 +1776,7 @@ type: "item" }] title: "{quests.steam_age.large_water_wheel.title}" - x: -3.5d + x: -2.0d y: -2.0d } { @@ -1774,8 +1798,8 @@ type: "item" }] title: "{quests.steam_age.supers.title}" - x: -10.5d - y: 13.5d + x: -6.0d + y: 13.0d } { dependencies: ["0D0D461AE3A3F7BF"] @@ -1804,7 +1828,7 @@ } ] title: "{quests.steam_age.multiblock_tank.title}" - x: -16.5d + x: -15.0d y: -2.0d } { diff --git a/config/ftbquests/quests/chapters/questsstoneage.snbt b/config/ftbquests/quests/chapters/questsstoneage.snbt index b429838d3..8945bdddc 100644 --- a/config/ftbquests/quests/chapters/questsstoneage.snbt +++ b/config/ftbquests/quests/chapters/questsstoneage.snbt @@ -1507,32 +1507,6 @@ shape: "heart" subtitle: "{quests.stone_age.meals.subtitle}" tasks: [ - { - id: "7D77C6BFE159FDC9" - item: { - Count: 1 - ForgeCaps: { - "tfc:food": { - creationDate: -2L - foodData: { - dairy: 0.0f - decay: 0.0f - food: 0 - fruit: 0.0f - grain: 0.0f - meat: 0.0f - sat: 0.0f - veg: 0.0f - water: 0.0f - } - ingredients: [ ] - traits: [ ] - } - } - id: "firmalife:food/cooked_pizza" - } - type: "item" - } { id: "597808680916715E" item: { @@ -1674,6 +1648,7 @@ } } id: "1562419608EB333D" + shape: "circle" size: 1.5d subtitle: "{quests.stone_age.hydration.subtitle}" tasks: [{ @@ -1847,6 +1822,7 @@ description: ["{quests.stone_age.water_bucket.desc}"] icon: "minecraft:water_bucket" id: "1F9321F1743A0B79" + shape: "circle" subtitle: "{quests.stone_age.water_bucket.subtitle}" tasks: [{ id: "64BE95016DF461FD" @@ -2295,6 +2271,8 @@ "{quests.stone_age.medical_conditions.desc.1}" "{@pagebreak}" "{quests.stone_age.medical_conditions.desc.2}" + "{@pagebreak}" + "{quests.stone_age.medical_conditions.desc.3}" ] icon: "createdeco:decal_skull" id: "00117AD40FACB89D" diff --git a/config/ftbquests/quests/chapters/queststfc_tips.snbt b/config/ftbquests/quests/chapters/queststfc_tips.snbt index ed36edbd7..257d7156c 100644 --- a/config/ftbquests/quests/chapters/queststfc_tips.snbt +++ b/config/ftbquests/quests/chapters/queststfc_tips.snbt @@ -685,7 +685,7 @@ Count: 1 id: "ftbfiltersystem:smart_filter" tag: { - "ftbfiltersystem:filter": "or(item(minecraft:milk_bucket)item(firmalife:bucket/yak_milk)item(firmalife:bucket/goat_milk)item(tfc_gurman:ox_milk_bucket)item(tfc_gurman:sheep_milk_bucket)item(tfc_gurman:alpaca_milk_bucket))" + "ftbfiltersystem:filter": "or(item(minecraft:milk_bucket)item(firmalife:bucket/yak_milk)item(firmalife:bucket/goat_milk)item(tfc_gourmet:ox_milk_bucket)item(tfc_gourmet:sheep_milk_bucket)item(tfc_gourmet:alpaca_milk_bucket))" } } optional_task: true @@ -2158,6 +2158,45 @@ x: 0.0d y: -10.5d } + { + dependencies: [ + "30DD0DDF86C96926" + "1F41C35890E2C44F" + ] + dependency_requirement: "one_completed" + description: ["{quests.tfg_tips.food_automation.desc}"] + icon: "tfg:lv_food_oven" + id: "46111F4D970EE3C5" + optional: true + subtitle: "{quests.tfg_tips.food_automation.subtitle}" + tasks: [ + { + id: "770BC20A8062A6BD" + item: "tfg:lv_food_processor" + optional_task: true + type: "item" + } + { + id: "3EB084CA435F8C19" + item: "tfg:lv_food_oven" + optional_task: true + type: "item" + } + { + id: "150B81D83DFFB9A1" + item: "gtceu:lv_robot_arm" + optional_task: true + type: "item" + } + { + id: "2332EB45D64DB9FB" + type: "checkmark" + } + ] + title: "{quests.tfg_tips.food_automation.title}" + x: 0.0d + y: -12.0d + } ] subtitle: ["{quests.tfg_tips.subtitle}"] title: "{quests.tfg_tips}" diff --git a/config/ftbquests/quests/chapters/tips__tools.snbt b/config/ftbquests/quests/chapters/tips__tools.snbt index 9f57ea394..897535008 100644 --- a/config/ftbquests/quests/chapters/tips__tools.snbt +++ b/config/ftbquests/quests/chapters/tips__tools.snbt @@ -790,7 +790,10 @@ y: 15.0d } { - dependencies: ["02FDECC931B5E8EF"] + dependencies: [ + "02FDECC931B5E8EF" + "3E6DC423FE4A99F7" + ] description: [ "{quests.tfg_tips.gt_power_tools.desc.1}" "{@pagebreak}" @@ -823,20 +826,13 @@ } } id: "2D2CB8104E40E808" + optional: true subtitle: "{quests.tfg_tips.gt_power_tools.subtitle}" - tasks: [ - { - id: "5DA224C235E227E3" - title: "GT Tool" - type: "checkmark" - } - { - id: "5B0BF3A94CA0D8A9" - item: "gtceu:lv_charger_4x" - optional_task: true - type: "item" - } - ] + tasks: [{ + id: "5DA224C235E227E3" + title: "GT Tool" + type: "checkmark" + }] title: "{quests.tfg_tips.gt_power_tools.title}" x: 10.5d y: 11.5d diff --git a/config/greate-recipes.yaml b/config/greate-recipes.yaml index 352b7b5fd..50dd46256 100644 --- a/config/greate-recipes.yaml +++ b/config/greate-recipes.yaml @@ -9,6 +9,10 @@ enableHardCreateRecipes: false # If false, GTCEu items will be used instead. useCreateItemsInRecipes: false +# Should recipes from create that conflict with GTCEu recipes be enabled? +# [WARNING]: This will not cover every single recipe conflict, only common conflicts (like components (plates/sheets)), or ore processing conflicts. +disableConflictingRecipes: true + # Recipe types that should not be copied to Greate machines. Ex. 'gtceu:macerator' for macerator recipes ignoredRecipeTypes: - gtceu:ore_washer diff --git a/config/sound_physics_remastered/occlusion.properties b/config/sound_physics_remastered/occlusion.properties index 53adea71f..d9f11a406 100644 --- a/config/sound_physics_remastered/occlusion.properties +++ b/config/sound_physics_remastered/occlusion.properties @@ -216,4 +216,4 @@ minecraft\:jukebox=0.0 # Lava (Block) minecraft\:lava=0.75 # Water (Block) -minecraft\:water=0.25 +\#minecraft\:water=0.25 diff --git a/config/via_romana.json b/config/via_romana.json new file mode 100644 index 000000000..faa359fe6 --- /dev/null +++ b/config/via_romana.json @@ -0,0 +1,62 @@ +{ + "infrastructure_check_radius": 1, + "path_quality_threshold": 0.6, + "node_distance_minimum": 10, + "node_distance_maximum": 20, + "path_block_ids": [ + ], + "path_block_tags": [ + "tfc:paths", + "forge:gravel", + "rnr:gravel_road_blocks", + "rnr:gravel_road_slabs", + "rnr:gravel_road_stairs", + "forge:cobblestone", + "minecraft:stairs", + "minecraft:slabs", + "rnr:cobbled_road_blocks", + "rnr:cobbled_road_stairs", + "rnr:cobbled_road_slabs", + "minecraft:mineable/pickaxe", + "minecraft:mineable/axe" + ], + "path_block_strings": [ + ], + "block_string_blacklist": [ + ], + "invalid_dimensions": [], + "no_gui_charting": false, + "invalid_entities": [], + "warp_block_ids": [ + "via_romana:warp_block" + ], + "warp_block_tags": [ + "minecraft:all_signs" + ], + "travel_fatigue_cooldown": 6, + "fast_movement_speed": 0.0, + "direct_warp": false, + "fog_of_war_distance": 10, + "spline_animation_time": 2.0, + "maximum_map_dimension": 512, + "map_refresh_interval": 10, + "map_refresh_threshold": 10, + "map_save_interval": 5, + "biome_color_pairs": [], + "use_biome_fallback_for_lowres": false, + "enable_remote_map_access": true, + "enable_surveyor_landmark": false, + "enable_surveyor_landmark_coloring": false, + "invalid_block_overlay_opacity": 0.4, + "biome_map_opacity": 0.3, + "node_vignette_opacity": 1.0, + "line_colors": [ + "#ffffff", + "#cccccc" + ], + "line_opacity": 1.0, + "enable_teleport_particles": true, + "enable_sign_particles": true, + "enable_custom_cursor": true, + "logging_enum": "NONE" +} \ No newline at end of file diff --git a/defaultconfigs/createhorsepower-server.toml b/defaultconfigs/createhorsepower-server.toml index a6a5b86ba..d97583958 100644 --- a/defaultconfigs/createhorsepower-server.toml +++ b/defaultconfigs/createhorsepower-server.toml @@ -30,5 +30,5 @@ smallCreatures = ["tfc:wolf", "tfc:dog", "tfc:pig", "tfc:sheep", "tfc:goat", "tf #Valid "Medium" creatures mediumCreatures = ["tfc:cow", "tfc:donkey", "tfc:dolphin", "wan_ancient_beasts:glider", "wan_ancient_beasts:soarer"] #Valid "Large" creatures -largeCreatures = ["tfc:horse", "tfc:mule", "tfc:musk_ox", "tfc:yak", "tfg:sniffer", "wan_ancient_beasts:walker", "species:cruncher"] +largeCreatures = ["tfc:horse", "tfc:mule", "tfc:musk_ox", "tfc:yak", "tfg:sniffer", "wan_ancient_beasts:walker", "species:cruncher", "wan_ancient_beasts:charger"] diff --git a/defaultconfigs/toolbelt-server.toml b/defaultconfigs/toolbelt-server.toml index 4da7870b0..47a11192c 100644 --- a/defaultconfigs/toolbelt-server.toml +++ b/defaultconfigs/toolbelt-server.toml @@ -3,7 +3,7 @@ #List of items to force-allow placing in the belt. Takes precedence over blacklist. whitelist = ["measurements:tape_measure"] #List of items to disallow from placing in the belt. (whitelist takes precedence) - blacklist = ["tfclunchbox:lunchbox", "tfclunchbox:cooling_lunchbox", "tfclunchbox:electric_lunchbox", "sophisticatedbackpacks:backpack", "sophisticatedbackpacks:iron_backpack", "sophisticatedbackpacks:gold_backpack", "sophisticatedbackpacks:diamond_backpack", "sophisticatedbackpacks:netherite_backpack", "tfc:ceramic/cyan_glazed_vessel", "tfc:ceramic/purple_glazed_vessel", "tfc:ceramic/blue_glazed_vessel", "tfc:ceramic/brown_glazed_vessel", "tfc:ceramic/green_glazed_vessel", "tfc:ceramic/red_glazed_vessel", "tfc:ceramic/black_glazed_vessel", "tfc:ceramic/large_vessel/gray", "tfc:ceramic/large_vessel/pink", "tfc:ceramic/large_vessel/lime", "tfc:ceramic/large_vessel/yellow", "tfc:ceramic/large_vessel/light_blue", "tfc:ceramic/large_vessel/magenta", "tfc:ceramic/large_vessel/orange", "tfc:ceramic/large_vessel/white", "tfc:ceramic/large_vessel", "tfc:ceramic/large_vessel/light_gray", "tfc:ceramic/large_vessel/cyan", "tfc:ceramic/large_vessel/purple", "tfc:ceramic/large_vessel/blue", "tfc:ceramic/large_vessel/brown", "tfc:ceramic/large_vessel/green", "tfc:ceramic/large_vessel/red", "tfc:ceramic/large_vessel/black", "tfc:ceramic/vessel", "tfc:ceramic/light_gray_glazed_vessel", "tfc:ceramic/gray_glazed_vessel", "tfc:ceramic/pink_glazed_vessel", "tfc:ceramic/lime_glazed_vessel", "tfc:ceramic/yellow_glazed_vessel", "tfc:ceramic/light_blue_glazed_vessel", "tfc:ceramic/magenta_glazed_vessel", "tfc:ceramic/orange_glazed_vessel", "tfc:ceramic/white_glazed_vessel"] + blacklist = ["tfclunchbox:lunchbox", "tfclunchbox:cooling_lunchbox", "tfclunchbox:electric_lunchbox", "sophisticatedbackpacks:backpack", "sophisticatedbackpacks:iron_backpack", "sophisticatedbackpacks:gold_backpack", "sophisticatedbackpacks:diamond_backpack", "sophisticatedbackpacks:netherite_backpack", "tfc:ceramic/cyan_glazed_vessel", "tfc:ceramic/purple_glazed_vessel", "tfc:ceramic/blue_glazed_vessel", "tfc:ceramic/brown_glazed_vessel", "tfc:ceramic/green_glazed_vessel", "tfc:ceramic/red_glazed_vessel", "tfc:ceramic/black_glazed_vessel", "tfc:ceramic/large_vessel/gray", "tfc:ceramic/large_vessel/pink", "tfc:ceramic/large_vessel/lime", "tfc:ceramic/large_vessel/yellow", "tfc:ceramic/large_vessel/light_blue", "tfc:ceramic/large_vessel/magenta", "tfc:ceramic/large_vessel/orange", "tfc:ceramic/large_vessel/white", "tfc:ceramic/large_vessel", "tfc:ceramic/large_vessel/light_gray", "tfc:ceramic/large_vessel/cyan", "tfc:ceramic/large_vessel/purple", "tfc:ceramic/large_vessel/blue", "tfc:ceramic/large_vessel/brown", "tfc:ceramic/large_vessel/green", "tfc:ceramic/large_vessel/red", "tfc:ceramic/large_vessel/black", "tfc:ceramic/vessel", "tfc:ceramic/light_gray_glazed_vessel", "tfc:ceramic/gray_glazed_vessel", "tfc:ceramic/pink_glazed_vessel", "tfc:ceramic/lime_glazed_vessel", "tfc:ceramic/yellow_glazed_vessel", "tfc:ceramic/light_blue_glazed_vessel", "tfc:ceramic/magenta_glazed_vessel", "tfc:ceramic/orange_glazed_vessel", "tfc:ceramic/white_glazed_vessel", "sns:burlap_sack", "sns:frame_pack", "sns:leather_sack", "sns:ore_sack", "sns:quiver", "sns:seed_pouch", "sns:straw_basket"] #When set to false, stackable items will no longer be allowed by default. allowAllNonStackableItems = true diff --git a/defaultconfigs/vintageimprovements-server.toml b/defaultconfigs/vintageimprovements-server.toml index acec72cc1..8a85d7c1f 100644 --- a/defaultconfigs/vintageimprovements-server.toml +++ b/defaultconfigs/vintageimprovements-server.toml @@ -21,7 +21,7 @@ #. #Medium speed value for grinder crafts, speedLimits = 2. #Range: 1 ~ 256 - mediumSpeedValue = 128 + mediumSpeedValue = 64 #. #Allows sandpaper crafts on belt grinder, when recipes collides belt grinder recipe have priority. allowSandpaperPolishingOnGrinder = true diff --git a/defaultconfigs/wan_ancient_beasts-server.toml b/defaultconfigs/wan_ancient_beasts-server.toml index c665ed8e1..607b1c43a 100644 --- a/defaultconfigs/wan_ancient_beasts-server.toml +++ b/defaultconfigs/wan_ancient_beasts-server.toml @@ -74,3 +74,30 @@ #Range: 1.0 ~ 1024.0 health = 80.0 +#Raider Attributes +[charger] + #Raider health [default: 60] + #Range: 1.0 ~ 1024.0 + health = 200.0 + #Raider armor [default: 4] + #Range: 0.0 ~ 30.0 + armor = 6.0 + #Raider attack damage [default: 15] + #Range: 0.0 ~ 1024.0 + armorToughness = 4.0 + +[raider] + #Raider health [default: 60] + #Range: 1.0 ~ 1024.0 + health = 200.0 + #Raider armor [default: 4] + #Range: 0.0 ~ 30.0 + armor = 6.0 + #Raider attack damage [default: 15] + #Range: 0.0 ~ 1024.0 + armorToughness = 4.0 + +[snatcher] + #Raider health [default: 60] + #Range: 1.0 ~ 1024.0 + health = 50.0 \ No newline at end of file diff --git a/kubejs/assets/ad_astra/lang/es_es.json b/kubejs/assets/ad_astra/lang/es_es.json new file mode 100644 index 000000000..5ec62777e --- /dev/null +++ b/kubejs/assets/ad_astra/lang/es_es.json @@ -0,0 +1,169 @@ +{ + "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.", + "block.ad_astra.oxygen_distributor": "Distribuidor de aire respirable", + "block.ad_astra.infernal_spire_block": "Chapitel infernal", + "block.ad_astra.moon_sand": "Arena Lunar", + "block.ad_astra.moon_stone": "Anortosita en bruto", + "block.ad_astra.moon_cobblestone": "Roca de anortosita", + "block.ad_astra.moon_cobblestone_slab": "Losa de roca de anortosita", + "block.ad_astra.moon_cobblestone_stairs": "Escaleras de roca de anortosita", + "block.ad_astra.moon_pillar": "Pilar de anortosita", + "block.ad_astra.moon_stone_brick_slab": "Losa de ladrillos de anortosita", + "block.ad_astra.moon_stone_brick_stairs": "Escaleras de ladrillos de anortosita", + "block.ad_astra.moon_stone_brick_wall": "Muro de ladrillos de anortosita", + "block.ad_astra.moon_stone_bricks": "Ladrillos de anortosita", + "block.ad_astra.moon_stone_slab": "Losa de anortosita en bruto", + "block.ad_astra.moon_stone_stairs": "Escaleras de anortosita en bruto", + "block.ad_astra.chiseled_moon_stone_bricks": "Ladrillos de anortosita cincelados", + "block.ad_astra.chiseled_moon_stone_slab": "Losa de ladrillos de anortosita cincelados", + "block.ad_astra.chiseled_moon_stone_stairs": "Escaleras de ladrillos de anortosita cincelados", + "block.ad_astra.cracked_moon_stone_bricks": "Ladrillos de anortosita agrietados", + "block.ad_astra.polished_moon_stone": "Anortosita pulida", + "block.ad_astra.polished_moon_stone_slab": "Losa de anortosita pulida", + "block.ad_astra.polished_moon_stone_stairs": "Escaleras de anortosita pulida", + "block.ad_astra.sky_stone": "Meteorito", + "block.ad_astra.moon_deepslate": "Norita en bruto", + "block.ad_astra.cheese_block": "Bloque de queso lunar", + "block.ad_astra.moon_cheese_ore": "Mena de queso de anortosita", + "block.ad_astra.glacian_log": "Tallo glacial", + "block.ad_astra.stripped_glacian_log": "Tallo glacial sin corteza", + "block.ad_astra.glacian_leaves": "Lamella glacial", + "block.ad_astra.mars_sand": "Arena de argilita", + "block.ad_astra.mars_stone": "Argilita en bruto", + "block.ad_astra.mars_cobblestone": "Roca de argilita", + "block.ad_astra.mars_cobblestone_slab": "Losa de roca de argilita", + "block.ad_astra.mars_cobblestone_stairs": "Escaleras de roca de argilita", + "block.ad_astra.mars_pillar": "Pilar de argilita", + "block.ad_astra.mars_stone_brick_slab": "Losa de ladrillos de argilita", + "block.ad_astra.mars_stone_brick_stairs": "Escaleras de ladrillos de argilita", + "block.ad_astra.mars_stone_brick_wall": "Muro de ladrillos de argilita", + "block.ad_astra.mars_stone_bricks": "Ladrillos de argilita", + "block.ad_astra.mars_stone_slab": "Losa de argilita en bruto", + "block.ad_astra.mars_stone_stairs": "Escaleras de argilita en bruto", + "block.ad_astra.chiseled_mars_stone_bricks": "Ladrillos de argilita cincelados", + "block.ad_astra.chiseled_mars_stone_slab": "Losa de argilita cincelada", + "block.ad_astra.chiseled_mars_stone_stairs": "Escaleras de argilita cincelada", + "block.ad_astra.cracked_mars_stone_bricks": "Ladrillos de argilita agrietados", + "block.ad_astra.polished_mars_stone": "Argilita pulida", + "block.ad_astra.polished_mars_stone_slab": "Losa de argilita pulida", + "block.ad_astra.polished_mars_stone_stairs": "Escaleras de argilita pulida", + "block.ad_astra.conglomerate": "Roca de cubierta de meseta", + "block.ad_astra.polished_conglomerate": "Roca de cubierta de meseta pulida", + "block.ad_astra.venus_sand": "Arena de traquita", + "block.ad_astra.venus_stone": "Traquita en bruto", + "block.ad_astra.venus_cobblestone": "Roca de traquita", + "block.ad_astra.venus_cobblestone_slab": "Losa de roca de traquita", + "block.ad_astra.venus_cobblestone_stairs": "Escaleras de roca de traquita", + "block.ad_astra.venus_pillar": "Pilar de traquita", + "block.ad_astra.venus_stone_brick_slab": "Losa de ladrillos de traquita", + "block.ad_astra.venus_stone_brick_stairs": "Escaleras de ladrillos de traquita", + "block.ad_astra.venus_stone_brick_wall": "Muro de ladrillos de traquita", + "block.ad_astra.venus_stone_bricks": "Ladrillos de traquita", + "block.ad_astra.venus_stone_slab": "Losa de traquita en bruto", + "block.ad_astra.venus_stone_stairs": "Escaleras de traquita en bruto", + "block.ad_astra.chiseled_venus_stone_bricks": "Ladrillos de traquita cincelados", + "block.ad_astra.chiseled_venus_stone_slab": "Losa de traquita cincelada", + "block.ad_astra.chiseled_venus_stone_stairs": "Escaleras de traquita cinceladas", + "block.ad_astra.cracked_venus_stone_bricks": "Ladrillos de traquita agrietados", + "block.ad_astra.polished_venus_stone": "Traquita pulida", + "block.ad_astra.polished_venus_stone_slab": "Losa de traquita pulida", + "block.ad_astra.polished_venus_stone_stairs": "Escaleras de traquita pulidas", + "block.ad_astra.venus_sandstone": "Arenisca de traquita", + "block.ad_astra.venus_sandstone_bricks": "Ladrillos de arenisca de traquita", + "block.ad_astra.venus_sandstone_brick_slab": "Losa de ladrillos de arenisca de traquita", + "block.ad_astra.venus_sandstone_brick_stairs": "Escaleras de ladrillos de arenisca de traquita", + "block.ad_astra.cracked_venus_sandstone_bricks": "Ladrillos de arenisca de traquita agrietados", + "block.ad_astra.mercury_stone": "Komatita en bruto", + "block.ad_astra.mercury_cobblestone": "Roca de komatita", + "block.ad_astra.mercury_cobblestone_slab": "Losa de roca de komatita", + "block.ad_astra.mercury_cobblestone_stairs": "Escaleras de roca de komatita", + "block.ad_astra.mercury_pillar": "Pilar de komatita", + "block.ad_astra.mercury_stone_brick_slab": "Losa de ladrillos de komatita", + "block.ad_astra.mercury_stone_brick_stairs": "Escaleras de ladrillos de komatita", + "block.ad_astra.mercury_stone_brick_wall": "Muro de ladrillos de komatita", + "block.ad_astra.mercury_stone_bricks": "Ladrillos de komatita", + "block.ad_astra.mercury_stone_slab": "Losa de komatita en bruto", + "block.ad_astra.mercury_stone_stairs": "Escaleras de komatita en bruto", + "block.ad_astra.chiseled_mercury_stone_bricks": "Ladrillos de komatita cincelados", + "block.ad_astra.chiseled_mercury_stone_slab": "Losa de komatita cincelados", + "block.ad_astra.chiseled_mercury_stone_stairs": "Escaleras de komatita cinceladas", + "block.ad_astra.cracked_mercury_stone_bricks": "Ladrillos de komatita agrietados", + "block.ad_astra.polished_mercury_stone": "Komatita pulida", + "block.ad_astra.polished_mercury_stone_slab": "Losa de komatita pulida", + "block.ad_astra.polished_mercury_stone_stairs": "Escaleras de komatita pulidas", + "block.ad_astra.glacio_stone": "Fonolita en bruto", + "block.ad_astra.glacio_cobblestone": "Roca de fonolita", + "block.ad_astra.glacio_cobblestone_slab": "Losa de roca de fonolita", + "block.ad_astra.glacio_cobblestone_stairs": "Escaleras de roca de fonolita", + "block.ad_astra.glacio_pillar": "Pilar de fonolita", + "block.ad_astra.glacio_stone_brick_slab": "Losa de ladrillos de fonolita", + "block.ad_astra.glacio_stone_brick_stairs": "Escaleras de ladrillos de fonolita", + "block.ad_astra.glacio_stone_brick_wall": "Muro de ladrillos de fonolita", + "block.ad_astra.glacio_stone_bricks": "Ladrillos de fonolita", + "block.ad_astra.glacio_stone_slab": "Losa de fonolita en bruto", + "block.ad_astra.glacio_stone_stairs": "Escaleras de fonolita en bruto", + "block.ad_astra.chiseled_glacio_stone_bricks": "Ladrillos de fonolita cincelados", + "block.ad_astra.chiseled_glacio_stone_slab": "Losa de fonolita cincelada", + "block.ad_astra.chiseled_glacio_stone_stairs": "Escaleras de fonolita cinceladas", + "block.ad_astra.cracked_glacio_stone_bricks": "Ladrillos de fonolita agrietados", + "block.ad_astra.polished_glacio_stone": "Fonolita pulida", + "block.ad_astra.polished_glacio_stone_slab": "Losa de fonolita pulida", + "block.ad_astra.polished_glacio_stone_stairs": "Escaleras de fonolita pulida", + "block.ad_astra.glacio_globe": "Globo de Europa", + "entity.ad_astra.corrupted_lunarian": "Zombi lunar", + "entity.ad_astra.martian_raptor": "Ave de presa esquelÃĐtica", + "entity.ad_astra.tier_1_rocket": "Cohete de R-Aluminacero", + "entity.ad_astra.tier_2_rocket": "Cohete de titanio ASM 4914", + "entity.ad_astra.tier_3_rocket": "Cohete de acero de tungsteno 45-Ti", + "entity.ad_astra.tier_1_rover": "AstromÃģvil", + "fluid_type.ad_astra.oxygen": "Aire respirable", + "item.ad_astra.steel_cable": "Cable RF bÃĄsico", + "item.ad_astra.desh_cable": "Cable RF avanzado", + "item.ad_astra.tier_1_rocket": "Cohete de R-Aluminacero", + "item.ad_astra.tier_2_rocket": "Cohete de titanio ASM 4914", + "item.ad_astra.tier_3_rocket": "Cohete de acero de tungsteno 45-Ti", + "item.ad_astra.oxygen_bucket": "Cubo con aire respirable", + "item.ad_astra.tier_1_rover": "AstromÃģvil", + "item.ad_astra.photovoltaic_etrium_cell": "Celda fotovoltÃĄica avanzada", + "item.ad_astra.photovoltaic_vesnium_cell": "Celda fotovoltÃĄica de energium", + "item.ad_astra.ostrum_tank": "Ostrum Booster Tank", + "item.ad_astra.steel_engine": "Motor de cohete de acero", + "item.ad_astra.desh_engine": "Motor de cohete de desh", + "item.ad_astra.ostrum_engine": "Motor de cohete de ostrum", + "item.ad_astra.netherite_space_helmet": "§bCasco espacial de acero de tungsteno", + "item.ad_astra.netherite_space_suit": "§bTraje espacial de acero de tungsteno", + "item.ad_astra.netherite_space_pants": "§bPantalones espaciales de acero de tungsteno", + "item.ad_astra.netherite_space_boots": "§bBotas espaciales de acero de tungsteno", + "item.ad_astra.cheese": "Queso lunar", + "dimension.ad_astra.glacio": "Europa", + "dimension.ad_astra.glacio_orbit": "Órbita de Europa", + "painting.ad_astra.glacio.title": "Europa", + "planet.ad_astra.glacio": "Europa", + "planet.ad_astra.glacio_orbit": "Órbita de Europa", + "tagprefix.moon_stone": "Mena de %s de anortosita", + "tagprefix.moon_deepslate": "Mena de %s de norita", + "tagprefix.mars_stone": "Mena de %s de argilita", + "tagprefix.venus_stone": "Mena de %s de traquita", + "tagprefix.mercury_stone": "Mena de %s de komatita", + "tagprefix.glacio_stone": "Mena de %s de fonolita", + "info.ad_astra.solar_panel": "Genera energía solar durante el día. La energía generada es dependiente del planeta.", + "tooltip.ad_astra.energy": "%s FE / %s FE", + "tooltip.ad_astra.energy_generation_per_tick": "Genera %s FE por tick", + "tooltip.ad_astra.energy_in": "Entrada: %s FE/t", + "tooltip.ad_astra.energy_out": "Salida: %s FE/t", + "tooltip.ad_astra.energy_per_tick": "%s FE/t", + "tooltip.ad_astra.energy_transfer_tick": "Transferencia: %s FE/t", + "tooltip.ad_astra.energy_use_per_tick": "Usa %s FE por tick", + "tooltip.ad_astra.max_energy_in": "Entrada mÃĄxima: %s FE/t", + "tooltip.ad_astra.max_energy_out": "Salida mÃĄxima: %s FE/t", + "tooltip.ad_astra.max_generation": "MÃĄximo: %s FE/t", + "tooltip.ad_astra.max_fluid_in": "Entrada mÃĄxima: %s mB/t", + "tooltip.ad_astra.max_fluid_out": "Salida mÃĄxima: %s mB/t", + "tooltip.ad_astra.fluid": "%s mB / %s mB %s", + "tooltip.ad_astra.fluid_generation_per_iteration": "Genera %s mB por iteraciÃģn", + "tooltip.ad_astra.fluid_in": "Entrada: %s mB/t", + "tooltip.ad_astra.fluid_out": "Salida: %s mB/t", + "tooltip.ad_astra.fluid_per_tick": "%s mB/t", + "tooltip.ad_astra.fluid_transfer_tick": "Transferencia: %s mB/t", + "tooltip.ad_astra.fluid_use_per_iteration": "Usa %s mB por iteraciÃģn" +} \ No newline at end of file diff --git a/kubejs/assets/ad_astra/lang/ru_ru.json b/kubejs/assets/ad_astra/lang/ru_ru.json index 70ccf24ed..f388f64f2 100644 --- a/kubejs/assets/ad_astra/lang/ru_ru.json +++ b/kubejs/assets/ad_astra/lang/ru_ru.json @@ -111,16 +111,16 @@ "block.ad_astra.glacio_globe": "ГÐŧÐūÐąŅƒŅ ЕÐēŅ€ÐūÐŋŅ‹", "entity.ad_astra.corrupted_lunarian": "ЛŅƒÐ―Ð―Ņ‹Ðđ зÐūÐžÐąÐļ", "entity.ad_astra.martian_raptor": "ÐĄÐšÐĩÐŧÐĩŅ‚ÐūÐūÐąŅ€Ð°Ð·Ð―Ņ‹Ðđ Ņ€Ð°ÐŋŅ‚ÐūŅ€", - "entity.ad_astra.tier_1_rocket": "КŅ€Ð°ŅÐ―аŅ аÐŧŅŽÐžÐļÐ―ÐļÐĩÐēÐū-ŅŅ‚аÐŧŅŒÐ―аŅ Ņ€Ð°ÐšÐĩŅ‚а", - "entity.ad_astra.tier_2_rocket": "ASM 4914 Titanium Rocket", - "entity.ad_astra.tier_3_rocket": "45-Ti Tungstensteel Rocket", + "entity.ad_astra.tier_1_rocket": "ЛÐĩÐģКаŅ Ņ€Ð°ÐšÐĩŅ‚а R (аÐŧŅŽÐžÐūŅŅ‚аÐŧŅŒ)", + "entity.ad_astra.tier_2_rocket": "ПŅ€ÐūŅ‡Ð―аŅ Ņ€Ð°ÐšÐĩŅ‚а ASM 4914 (Ņ‚ÐļŅ‚Ð°Ð―)", + "entity.ad_astra.tier_3_rocket": "ÐĒŅÐķŅ‘ÐŧаŅ Ņ€Ð°ÐšÐĩŅ‚а 45-Ti (ÐēÐūÐŧŅŒŅ„Ņ€Ð°ÐžÐūŅŅ‚аÐŧŅŒ)", "entity.ad_astra.tier_1_rover": "ВÐĩзÐīÐĩŅ…ÐūÐī", "fluid_type.ad_astra.oxygen": "ИŅÐšŅƒŅŅ‚ÐēÐĩÐ―Ð―Ņ‹Ðđ ÐēÐūзÐīŅƒŅ…", "item.ad_astra.steel_cable": "ÐžÐąŅ‹Ņ‡Ð―Ņ‹Ðđ RF ÐšÐ°ÐąÐĩÐŧŅŒ", "item.ad_astra.desh_cable": "ÐĢÐŧŅƒŅ‡ŅˆÐĩÐ―Ð―Ņ‹Ðđ RF ÐšÐ°ÐąÐĩÐŧŅŒ", - "item.ad_astra.tier_1_rocket": "КŅ€Ð°ŅÐ―аŅ аÐŧŅŽÐžÐļÐ―ÐļÐĩÐēÐū-ŅŅ‚аÐŧŅŒÐ―аŅ Ņ€Ð°ÐšÐĩŅ‚а", - "item.ad_astra.tier_2_rocket": "ASM 4914 Titanium Rocket", - "item.ad_astra.tier_3_rocket": "45-Ti Tungstensteel Rocket", + "item.ad_astra.tier_1_rocket": "ЛÐĩÐģКаŅ Ņ€Ð°ÐšÐĩŅ‚а R (аÐŧŅŽÐžÐūŅŅ‚аÐŧŅŒ)", + "item.ad_astra.tier_2_rocket": "ПŅ€ÐūŅ‡Ð―аŅ Ņ€Ð°ÐšÐĩŅ‚а ASM 4914 (Ņ‚ÐļŅ‚Ð°Ð―)", + "item.ad_astra.tier_3_rocket": "ÐĒŅÐķŅ‘ÐŧаŅ Ņ€Ð°ÐšÐĩŅ‚а 45-Ti (ÐēÐūÐŧŅŒŅ„Ņ€Ð°ÐžÐūŅŅ‚аÐŧŅŒ)", "item.ad_astra.oxygen_bucket": "ВÐĩÐīŅ€Ðū Ņ ÐļŅÐšŅƒŅŅ‚ÐēÐĩÐ―Ð―Ņ‹Ðž ÐēÐūзÐīŅƒŅ…ÐūО", "item.ad_astra.tier_1_rover": "ВÐĩзÐīÐĩŅ…ÐūÐī", "item.ad_astra.photovoltaic_etrium_cell": "ÐĢÐŧŅƒŅ‡ŅˆÐĩÐ―Ð―Ð°Ņ Ņ„ÐūŅ‚ÐūŅÐŧÐĩКŅ‚Ņ€ÐļŅ‡ÐĩŅÐšÐ°Ņ ŅŅ‡ÐĩÐđКа", diff --git a/kubejs/assets/ae2/lang/es_es.json b/kubejs/assets/ae2/lang/es_es.json new file mode 100644 index 000000000..7ca1fbcfd --- /dev/null +++ b/kubejs/assets/ae2/lang/es_es.json @@ -0,0 +1,23 @@ +{ + "__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": "Las prensas de fabricaciÃģn son obtenidas al romper un cubo misterioso. Los cubos misteriosos se ubican en el centro de meteoritos los cuales pueden ser hallados en La Luna.", + "gui.advanced_ae.AdvPatternProvider": "", + "gui.expandedae.exp_pattern_provider": "", + "item.ae2.sky_dust": "Polvo de suevita", + "block.ae2.sky_stone_block": "Suevita en bruto", + "block.ae2.sky_stone_stairs": "Escaleras de suevita", + "block.ae2.sky_stone_wall": "Muro de suevita", + "block.ae2.sky_stone_slab": "Losa de suevita", + "block.ae2.smooth_sky_stone_block": "Suevita lisa", + "block.ae2.smooth_sky_stone_stairs": "Escaleras de suevita lisas", + "block.ae2.smooth_sky_stone_wall": "Muro de suevita liso", + "block.ae2.smooth_sky_stone_slab": "Losa de suevita lisa", + "block.ae2.sky_stone_brick": "Ladrillos de suevita", + "block.ae2.sky_stone_brick_stairs": "Escaleras de ladrillos de suevita", + "block.ae2.sky_stone_brick_wall": "Muro de ladrillos de suevita", + "block.ae2.sky_stone_brick_slab": "Losa de ladrillos de suevita", + "block.ae2.sky_stone_small_brick": "Ladrillos pequeÃąos de suevita", + "block.ae2.sky_stone_small_brick_stairs": "Escaleras de ladrillos pequeÃąos de suevita", + "block.ae2.sky_stone_small_brick_wall": "Muro de ladrillos pequeÃąos de suevita", + "block.ae2.sky_stone_small_brick_slab": "Losa de ladrillos pequeÃąos de suevita" +} \ No newline at end of file diff --git a/kubejs/assets/beneath/lang/es_es.json b/kubejs/assets/beneath/lang/es_es.json new file mode 100644 index 000000000..e87d2d8ce --- /dev/null +++ b/kubejs/assets/beneath/lang/es_es.json @@ -0,0 +1,30 @@ +{ + "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.", + "block.beneath.blackstone_pebble": "Piroxenita suelta", + "block.beneath.blackstone_aqueduct": "Acueducto de piroxenita", + "block.beneath.loose_blackstone": "Piroxenita suelta", + "block.beneath.ore.nether_cursecoal": "Mena de antracita de migmatita", + "block.beneath.ore.nether_cursecoal.prospected": "Antracita", + "block.beneath.cursecoal_pile": "Pila de antracita", + "block.beneath.ore.blackstone_sylvite": "Mena de silvina de piroxenita", + "block.beneath.crackrack": "Queratofira en bruto", + "block.beneath.soul_clay": "Arcilla fangosa", + "block.beneath.wood.log.crimson": "Tallo carmesí", + "block.beneath.wood.stripped_log.crimson": "Tallo carmesí pelado", + "block.beneath.wood.wood.crimson": "Hifas carmesí", + "block.beneath.wood.stripped_wood.crimson": "Hifas carmesí peladas", + "block.beneath.wood.fallen_leaves.crimson": "Lamella carmesí caída", + "block.beneath.wood.leaves.crimson": "Lamella carmesí", + "block.beneath.wood.log.warped": "Tallo distorsionado", + "block.beneath.wood.stripped_log.warped": "Tallo distorsionado pelado", + "block.beneath.wood.wood.warped": "Hifas distorsionadas", + "block.beneath.wood.stripped_wood.warped": "Hifas distorsionadas peladas", + "block.beneath.wood.fallen_leaves.warped": "Lamella distorsionada caída", + "block.beneath.wood.leaves.warped": "Lamella distorsionada", + "block.beneath.ancient_altar": "Pedestal de piroxenita", + "item.beneath.cursed_hide": "Piel ignífuga", + "item.beneath.blackstone_brick": "Ladrillo de piroxenita", + "item.beneath.cursecoal": "Antracita", + "item.beneath.crackrack_rock": "Roca de queratofiro", + "item.beneath.loose_blackstone": "Piroxenita suelta" +} \ No newline at end of file diff --git a/kubejs/assets/betterend/blockstates/sandy_jadestone.json b/kubejs/assets/betterend/blockstates/sandy_jadestone.json new file mode 100644 index 000000000..a8b056a71 --- /dev/null +++ b/kubejs/assets/betterend/blockstates/sandy_jadestone.json @@ -0,0 +1,8 @@ +{ + "variants": { + "": [ + { "model": "betterend:block/sandy_jadestone" }, + { "model": "betterend:block/sandy_jadestone", "y": 180 } + ] + } +} diff --git a/kubejs/assets/betterend/lang/es_es.json b/kubejs/assets/betterend/lang/es_es.json new file mode 100644 index 000000000..eb5e160e3 --- /dev/null +++ b/kubejs/assets/betterend/lang/es_es.json @@ -0,0 +1,123 @@ +{ + "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.", + "block.betterend.aeridium": "Erídio", + "block.betterend.amaranita_stem": "Tallo de amaranita", + "block.betterend.amber_grass": "CÃĐsped de ÃĄmbar", + "block.betterend.amber_root_wild": "Brotes de ÃĄmbar silvestres", + "block.betterend.amber_root_dead": "Brotes de ÃĄmbar secos", + "block.betterend.amber_root": "Brotes de ÃĄmbar", + "block.betterend.aurant_polypore": "Poliporo ÃĄureo", + "block.betterend.blooming_cooksonia": "Coccionia floreciente", + "block.betterend.blossom_berry": "Bayaflor", + "block.betterend.blossom_berry_wild": "Bayaflor silvestre", + "block.betterend.blossom_berry_dead": "Bayaflor seca", + "block.betterend.bolux_mushroom": "Colonia de hongos Bolux", + "block.betterend.bolux_mushroom_wild": "Colonia de hongos Bolux silvestre", + "block.betterend.bolux_mushroom_dead": "Colonia de hongos Bolux seca", + "block.betterend.brimstone": "Azufrita", + "block.betterend.bushy_grass": "Hierbanueva", + "block.betterend.bulb_moss": "Musgo bulboso", + "block.betterend.cave_bush": "Lamella carmín", + "block.betterend.cave_bush_fallen": "Lamela carmín pequeÃąa", + "block.betterend.cave_grass": "Vermiligma", + "block.betterend.cave_pumpkin": "Bulbo cavernario", + "block.betterend.cave_pumpkin_wild": "Tallo de bulbo cavernario silvestre", + "block.betterend.cave_pumpkin_dead": "Tallo de bulbo cavernario seco", + "block.betterend.cave_pumpkin_plant": "Tallo de bulbo cavernario", + "block.betterend.charnia_cyan": "Carnia ciÃĄn", + "block.betterend.charnia_green": "Carnia verde", + "block.betterend.charnia_light_blue": "Carnia verdÃĄcea", + "block.betterend.charnia_orange": "Carnia naranja", + "block.betterend.charnia_purple": "Carnia morada", + "block.betterend.charnia_red": "Carnia roja", + "block.betterend.chorus_grass": "Hierba coral", + "block.betterend.chorus_lily": "Lirio coral", + "block.betterend.chorus_mushroom": "Colonia de hongos Calmia", + "block.betterend.chorus_mushroom_wild": "Colonia de hongos Calmia silvestre", + "block.betterend.chorus_mushroom_dead": "Colonia de hongos Calmia seca", + "block.betterend.clawfern": "Helecho acerado", + "block.betterend.crystal_grass": "Hierba cristalina", + "block.betterend.end_lily": "Lirio de Deimos", + "block.betterend.end_lily_seed": "Brote de lirio de Deimos", + "block.betterend.end_lotus_flower": "Flor de loto de Fobos", + "block.betterend.end_lotus_leaf": "Hoja de loto de Fobos", + "block.betterend.end_lotus_stem": "Tallo de loto de Fobos", + "block.betterend.end_lotus_seed": "Brote de loto de Fobos", + "block.betterend.filalux_wings": "Alas filalÚceas", + "block.betterend.flamaea": "Hongo flamigero", + "block.betterend.flammalix": "Hongo flamante", + "block.betterend.flavolite": "Ignimbrita en bruto", + "block.betterend.flavolite_bricks": "Ladrillos de ignimbrita", + "block.betterend.flavolite_pillar": "Pilar de ignimbrita", + "block.betterend.flavolite_polished": "Ignimbrita pulida", + "block.betterend.flavolite_tiles": "Baldosas de ignimbrita", + "block.betterend.fracturn": "Fracturno", + "block.betterend.glacian_hymenophore": "HimenÃģforo glacial", + "block.betterend.globulagus": "Globulago", + "block.betterend.hydrothermal_vent": "VentilaciÃģn tÃĐrmica", + "block.betterend.hydralux": "HidralÚz", + "block.betterend.hydralux_sapling": "Brote de hidralÚz", + "block.betterend.inflexia": "Inflexia", + "block.betterend.lacugrove": "Alga lacustre", + "block.betterend.lacugrove_bark": "Adaquita en bruto", + "block.betterend.lamellarium": "Lamellaria", + "block.betterend.lanceleaf": "Hoja lanceolada", + "block.betterend.lanceleaf_small": "Daga de hoja lanceolada", + "block.betterend.large_amaranita_mushroom": "Hongo de amaranita grande", + "block.betterend.lucernia_leaves": "Lamella de lucernia", + "block.betterend.lucernia_leaves_fallen": "Lamella de lucernia pequeÃąa", + "block.betterend.lucernia_outer_leaves": "Hifas de lucernia", + "block.betterend.lucernia_bark": "Chapitel siniestro", + "block.betterend.lutebus": "Lutebio", + "block.betterend.magnula": "Magnulea", + "block.betterend.nightshade_moss": "Musgo de Nox", + "block.betterend.orango": "Orango", + "block.betterend.pond_anemone": "Anemona", + "block.betterend.purple_polypore": "Poliporo morado", + "block.betterend.rubinea": "Rubineda", + "block.betterend.ruscus": "Hierba de rusco", + "block.betterend.salteago": "Salteago", + "block.betterend.sandy_jadestone": "Lamprita en bruto", + "block.betterend.sandy_jadestone_bricks": "Ladrillos de lamprita", + "block.betterend.sandy_jadestone_pillar": "Pilar de lamprita", + "block.betterend.sandy_jadestone_polished": "Lamprita pulida", + "block.betterend.sandy_jadestone_tiles": "Baldosa de lamprita", + "block.betterend.selagine": "Selegina", + "block.betterend.shadow_berry": "Bayas de Nox", + "block.betterend.shadow_berry_wild": "Bayas de Nox silvestres", + "block.betterend.shadow_berry_dead": "Bayas de Nox secas", + "block.betterend.small_amaranita_mushroom": "Hongo de Amaranita pequeÃąo", + "block.betterend.sulphur_crystal": "Cristal de azufre", + "block.betterend.sulphuric_rock": "Ignimbrita en bruto", + "block.betterend.sulphuric_rock_bricks": "Ladrillos de ignimbrita", + "block.betterend.sulphuric_rock_pillar": "Pilar de ignimbrita", + "block.betterend.sulphuric_rock_polished": "Ignimbrita pulida", + "block.betterend.sulphuric_rock_tiles": "Baldosa de ignimbrita", + "block.betterend.tube_worm": "Gusano de tubo", + "block.betterend.twisted_moss": "Musgo distorsionado", + "block.betterend.twisted_umbrella_moss": "Musgo paraguas distorsionado", + "block.betterend.twisted_umbrella_moss_tall": "Musgo paraguas distorsionado", + "block.betterend.twisted_vine": "Enredadera distorsionada", + "block.betterend.umbrella_moss": "Musgo paraguas", + "block.betterend.umbrella_moss_tall": "Musgo paraguas", + "block.betterend.vaiolush_fern": "Helecho vaciluceo", + "item.betterend.amber_root_product": "Brotes de ÃĄmbar", + "item.betterend.amber_root_seeds": "Semillas de brotes de ÃĄmbar", + "item.betterend.blossom_berry_product": "Bayaflor", + "item.betterend.blossom_berry_seeds": "Semillas de bayaflor", + "item.betterend.bolux_mushroom_cooked": "Hongo de Bolux cocinado", + "item.betterend.bolux_mushroom_product": "Hongo de Bolux", + "item.betterend.bolux_mushroom_seeds": "Esporas de hongos de Bolux", + "item.betterend.cave_pumpkin_chunks": "Porciones de bulbo cavernario", + "item.betterend.cave_pumpkin_product": "Bulbo cavernario", + "item.betterend.cave_pumpkin_plant_seeds": "Semillas de bulbo cavernario", + "item.betterend.cave_pumpkin_pie_dough": "Masa de bulbo cavernario", + "item.betterend.cave_pumpkin_pie_raw": "Pastel de bulbo cavernario crudo", + "item.betterend.cave_pumpkin_pie": "Pastel de bulbo cavernario", + "item.betterend.chorus_mushroom_cooked": "Hongo Calmia cocinado", + "item.betterend.chorus_mushroom_product": "Hongo Calmia", + "item.betterend.chorus_mushroom_seeds": "Esporas de hongo Calmia", + "item.betterend.shadow_berry_cooked": "Baya de Nox cocinada", + "item.betterend.shadow_berry_product": "Baya de Nox", + "item.betterend.shadow_berry_seeds": "Semillas de baya de Nox" +} \ No newline at end of file diff --git a/kubejs/assets/betterend/models/block/cave_pumpkin.json b/kubejs/assets/betterend/models/block/cave_pumpkin.json index a37a47661..05ba66f11 100644 --- a/kubejs/assets/betterend/models/block/cave_pumpkin.json +++ b/kubejs/assets/betterend/models/block/cave_pumpkin.json @@ -8,11 +8,13 @@ "top": "betterend:block/cave_pumpkin_top", "side": "betterend:block/cave_pumpkin_side" }, - "elements": [ + "elements": [ { "__comment": "Box1", "from": [ 1, 0, 1 ], "to": [ 15, 13, 15 ], + "forge_data": { "block_light": 15, "sky_light": 15 }, + "shade": false, "faces": { "down": { "uv": [ 1, 1, 15, 15 ], "texture": "#lantern_bottom" }, "north": { "uv": [ 1, 3, 15, 16 ], "texture": "#lantern_side" }, diff --git a/kubejs/assets/createstockbridge/lang/en_us.json b/kubejs/assets/createstockbridge/lang/en_us.json new file mode 100644 index 000000000..3fc0dec6e --- /dev/null +++ b/kubejs/assets/createstockbridge/lang/en_us.json @@ -0,0 +1,16 @@ +{ + "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.", + "block.createstockbridge.ae_bridge": "AE Stock Bridge", + "gui.createstockbridge.address": "Package Address:", + "gui.stockbridge.remote_items": "Create Stock System Items", + "tooltip.stockbridge.remote_item": "Item in Remote System", + "item.createstockbridge.request_pattern": "Request Pattern", + "createstockbridge.ponder.ae_stockbridge.header": "Connecting the Stock System to AE", + "createstockbridge.ponder.ae_stockbridge.text_1": "AE Stock Bridge links the Create Stock system with AE", + "createstockbridge.ponder.ae_stockbridge.text_2": "Right-Click to bind to the stock network before placing", + "createstockbridge.ponder.ae_stockbridge.text_3": "Set the AE Stock Bridge address to match the Frogport address", + "createstockbridge.ponder.ae_stockbridge.text_4": "AE", + "createstockbridge.ponder.ae_stockbridge.text_5": "AE", + "createstockbridge.ponder.ae_stockbridge.text_6": "AE can request items by 'crafting'", + "createstockbridge.ponder.ae_stockbridge.text_7": "Create can request stored items from AE" +} \ No newline at end of file diff --git a/kubejs/assets/createstockbridge/lang/ru_ru.json b/kubejs/assets/createstockbridge/lang/ru_ru.json new file mode 100644 index 000000000..e6a799fb7 --- /dev/null +++ b/kubejs/assets/createstockbridge/lang/ru_ru.json @@ -0,0 +1,16 @@ +{ + "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.", + "block.createstockbridge.ae_bridge": "AE МÐūŅŅ‚-Ņ…Ņ€Ð°Ð―ÐļÐŧÐļŅ‰Ðĩ", + "gui.createstockbridge.address": "АÐīŅ€ÐĩŅ ÐŋаКÐĩŅ‚а:", + "gui.stockbridge.remote_items": "ПŅ€ÐĩÐīОÐĩŅ‚Ņ‹ ŅÐļŅŅ‚ÐĩОŅ‹ Create Stock", + "tooltip.stockbridge.remote_item": "ПŅ€ÐĩÐīОÐĩŅ‚ Ðē ŅƒÐīаÐŧŅ‘Ð―Ð―ÐūÐđ ŅÐļŅŅ‚ÐĩОÐĩ", + "item.createstockbridge.request_pattern": "ÐĻÐ°ÐąÐŧÐūÐ― заÐŋŅ€ÐūŅÐ°", + "createstockbridge.ponder.ae_stockbridge.header": "ПÐūÐīКÐŧŅŽŅ‡ÐĩÐ―ÐļÐĩ ŅÐļŅŅ‚ÐĩОŅ‹ Stock К AE", + "createstockbridge.ponder.ae_stockbridge.text_1": "AE МÐūŅŅ‚-Ņ…Ņ€Ð°Ð―ÐļÐŧÐļŅ‰Ðĩ ŅÐēŅÐ·Ņ‹ÐēаÐĩŅ‚ ŅÐļŅŅ‚ÐĩОŅƒ Create Stock Ņ AE", + "createstockbridge.ponder.ae_stockbridge.text_2": "ПКМ ÐīÐŧŅ ÐŋŅ€ÐļÐēŅÐ·ÐšÐļ К ŅÐĩŅ‚Ðļ Stock ÐŋÐĩŅ€ÐĩÐī ŅƒŅŅ‚Ð°Ð―ÐūÐēКÐūÐđ", + "createstockbridge.ponder.ae_stockbridge.text_3": "НаŅŅ‚Ņ€ÐūÐđŅ‚Ðĩ аÐīŅ€ÐĩŅ AE МÐūŅŅ‚а-Ņ…Ņ€Ð°Ð―ÐļÐŧÐļŅ‰Ð° Ņ‚аК, Ņ‡Ņ‚ÐūÐąŅ‹ ÐūÐ― ŅÐūÐēÐŋаÐīаÐŧ Ņ аÐīŅ€ÐĩŅÐūО Frogport", + "createstockbridge.ponder.ae_stockbridge.text_4": "AE", + "createstockbridge.ponder.ae_stockbridge.text_5": "AE", + "createstockbridge.ponder.ae_stockbridge.text_6": "AE ОÐūÐķÐĩŅ‚ заÐŋŅ€Ð°ŅˆÐļÐēаŅ‚ŅŒ ÐŋŅ€ÐĩÐīОÐĩŅ‚Ņ‹ Ņ‡ÐĩŅ€Ðĩз 'КŅ€Ð°Ņ„Ņ‚'", + "createstockbridge.ponder.ae_stockbridge.text_7": "Create ОÐūÐķÐĩŅ‚ заÐŋŅ€Ð°ŅˆÐļÐēаŅ‚ŅŒ Ņ…Ņ€Ð°Ð―ŅŅ‰ÐļÐĩŅŅ ÐŋŅ€ÐĩÐīОÐĩŅ‚Ņ‹ Ðļз AE" +} \ No newline at end of file diff --git a/kubejs/assets/createstockbridge/lang/zh_cn.json b/kubejs/assets/createstockbridge/lang/zh_cn.json new file mode 100644 index 000000000..b243f3a6f --- /dev/null +++ b/kubejs/assets/createstockbridge/lang/zh_cn.json @@ -0,0 +1,16 @@ +{ + "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.", + "block.createstockbridge.ae_bridge": "AEäŧ“å‚ĻæĄĨæŽĨå™Ļ", + "gui.createstockbridge.address": "包čĢđ地址", + "gui.stockbridge.remote_items": "朚æĒ°åŠĻ力äŧ“å‚ĻįģŧįŧŸį‰Đ品", + "tooltip.stockbridge.remote_item": "ä―äšŽčŋœįŦŊįģŧįŧŸįš„į‰Đ品", + "item.createstockbridge.request_pattern": "čŊ·æą‚æ ·æŋ", + "createstockbridge.ponder.ae_stockbridge.header": "将äŧ“å‚ĻįģŧįŧŸčŋžæŽĨč‡ģåš”į”Ļčƒ―æš", + "createstockbridge.ponder.ae_stockbridge.text_1": "AEäŧ“å‚ĻæĄĨæŽĨå™ĻåŊčŪĐ朚æĒ°åŠĻ力įš„äŧ“å‚ĻįģŧįŧŸäļŽåš”į”Ļčƒ―æšïžˆAEį›ļčŋž", + "createstockbridge.ponder.ae_stockbridge.text_2": "æ”ūį―Ū前需先åģå‡ŧįŧ‘åŪšåš“å­˜į―‘įŧœ", + "createstockbridge.ponder.ae_stockbridge.text_3": "äļšč›™æļŊ和AEäŧ“å‚ĻæĄĨæŽĨå™ĻčŪūį―Ūį›ļ同įš„地址", + "createstockbridge.ponder.ae_stockbridge.text_4": "AE", + "createstockbridge.ponder.ae_stockbridge.text_5": "AE", + "createstockbridge.ponder.ae_stockbridge.text_6": "AEåŊäŧĨ通čŋ‡â€œč‡ŠåŠĻ合成”čŊ·æą‚į‰Đ品", + "createstockbridge.ponder.ae_stockbridge.text_7": "朚æĒ°åŠĻ力åŊäŧĨčŊ·æą‚AEįģŧįŧŸäļ­įš„į‰Đ品" +} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/ae2_condenser.json b/kubejs/assets/emi/category/properties/ae2_condenser.json index e5989a692..6d793d7a9 100644 --- a/kubejs/assets/emi/category/properties/ae2_condenser.json +++ b/kubejs/assets/emi/category/properties/ae2_condenser.json @@ -1 +1 @@ -{"ae2:condenser":{"order":158}} \ No newline at end of file +{"ae2:condenser":{"order":165}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/ae2_item_transformation.json b/kubejs/assets/emi/category/properties/ae2_item_transformation.json index c3db93797..b43191b1e 100644 --- a/kubejs/assets/emi/category/properties/ae2_item_transformation.json +++ b/kubejs/assets/emi/category/properties/ae2_item_transformation.json @@ -1 +1 @@ -{"ae2:item_transformation":{"order":49}} \ No newline at end of file +{"ae2:item_transformation":{"order":50}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/ae2_p2p_attunement.json b/kubejs/assets/emi/category/properties/ae2_p2p_attunement.json index bd9501a4b..144701206 100644 --- a/kubejs/assets/emi/category/properties/ae2_p2p_attunement.json +++ b/kubejs/assets/emi/category/properties/ae2_p2p_attunement.json @@ -1 +1 @@ -{"ae2:p2p_attunement":{"order":170}} \ No newline at end of file +{"ae2:p2p_attunement":{"order":177}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/afc_tree_tap.json b/kubejs/assets/emi/category/properties/afc_tree_tap.json index b74daf269..06826601c 100644 --- a/kubejs/assets/emi/category/properties/afc_tree_tap.json +++ b/kubejs/assets/emi/category/properties/afc_tree_tap.json @@ -1 +1 @@ -{"afc:tree_tap":{"order":29}} \ No newline at end of file +{"afc:tree_tap":{"order":30}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/create_deploying.json b/kubejs/assets/emi/category/properties/create_deploying.json index b87208177..dad06c61b 100644 --- a/kubejs/assets/emi/category/properties/create_deploying.json +++ b/kubejs/assets/emi/category/properties/create_deploying.json @@ -1 +1 @@ -{"create:deploying":{"order":52}} \ No newline at end of file +{"create:deploying":{"order":53}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/create_draining.json b/kubejs/assets/emi/category/properties/create_draining.json index ee5f9237c..57751beb1 100644 --- a/kubejs/assets/emi/category/properties/create_draining.json +++ b/kubejs/assets/emi/category/properties/create_draining.json @@ -1 +1 @@ -{"create:draining":{"order":173}} \ No newline at end of file +{"create:draining":{"order":180}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/create_item_application.json b/kubejs/assets/emi/category/properties/create_item_application.json index bbbc8bb09..b818d965b 100644 --- a/kubejs/assets/emi/category/properties/create_item_application.json +++ b/kubejs/assets/emi/category/properties/create_item_application.json @@ -1 +1 @@ -{"create:item_application":{"order":53}} \ No newline at end of file +{"create:item_application":{"order":54}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/create_sandpaper_polishing.json b/kubejs/assets/emi/category/properties/create_sandpaper_polishing.json index 345f16be3..ae6ea0d54 100644 --- a/kubejs/assets/emi/category/properties/create_sandpaper_polishing.json +++ b/kubejs/assets/emi/category/properties/create_sandpaper_polishing.json @@ -1 +1 @@ -{"create:sandpaper_polishing":{"order":50}} \ No newline at end of file +{"create:sandpaper_polishing":{"order":51}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/create_sequenced_assembly.json b/kubejs/assets/emi/category/properties/create_sequenced_assembly.json index 2dc37de33..acf9aafff 100644 --- a/kubejs/assets/emi/category/properties/create_sequenced_assembly.json +++ b/kubejs/assets/emi/category/properties/create_sequenced_assembly.json @@ -1 +1 @@ -{"create:sequenced_assembly":{"order":55}} \ No newline at end of file +{"create:sequenced_assembly":{"order":56}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/create_spout_filling.json b/kubejs/assets/emi/category/properties/create_spout_filling.json index dbc8fd535..a1245f2ca 100644 --- a/kubejs/assets/emi/category/properties/create_spout_filling.json +++ b/kubejs/assets/emi/category/properties/create_spout_filling.json @@ -1 +1 @@ -{"create:spout_filling":{"order":174}} \ No newline at end of file +{"create:spout_filling":{"order":181}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/createaddition_rolling.json b/kubejs/assets/emi/category/properties/createaddition_rolling.json index 3524eee33..a6981b0d3 100644 --- a/kubejs/assets/emi/category/properties/createaddition_rolling.json +++ b/kubejs/assets/emi/category/properties/createaddition_rolling.json @@ -1 +1 @@ -{"createaddition:rolling":{"order":81}} \ No newline at end of file +{"createaddition:rolling":{"order":88}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/deafission_component_fr.json b/kubejs/assets/emi/category/properties/deafission_component_fr.json index 23ab63472..a31c0142e 100644 --- a/kubejs/assets/emi/category/properties/deafission_component_fr.json +++ b/kubejs/assets/emi/category/properties/deafission_component_fr.json @@ -1 +1 @@ -{"deafission:component_fr":{"order":71}} \ No newline at end of file +{"deafission:component_fr":{"order":73}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/deafission_component_hb.json b/kubejs/assets/emi/category/properties/deafission_component_hb.json new file mode 100644 index 000000000..6fe0382cc --- /dev/null +++ b/kubejs/assets/emi/category/properties/deafission_component_hb.json @@ -0,0 +1 @@ +{"deafission:component_hb":{"order":76}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/deafission_fission_component.json b/kubejs/assets/emi/category/properties/deafission_fission_component.json index 41832a459..a10af10af 100644 --- a/kubejs/assets/emi/category/properties/deafission_fission_component.json +++ b/kubejs/assets/emi/category/properties/deafission_fission_component.json @@ -1 +1 @@ -{"deafission:fission_component":{"order":70}} \ No newline at end of file +{"deafission:fission_component":{"order":72}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/deafission_fission_reactor_coolant.json b/kubejs/assets/emi/category/properties/deafission_fission_reactor_coolant.json index 5f41b7113..07145076d 100644 --- a/kubejs/assets/emi/category/properties/deafission_fission_reactor_coolant.json +++ b/kubejs/assets/emi/category/properties/deafission_fission_reactor_coolant.json @@ -1 +1 @@ -{"deafission:fission_reactor_coolant":{"order":67}} \ No newline at end of file +{"deafission:fission_reactor_coolant":{"order":69}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/deafission_fission_reactor_coolant_smr.json b/kubejs/assets/emi/category/properties/deafission_fission_reactor_coolant_smr.json new file mode 100644 index 000000000..8a055828e --- /dev/null +++ b/kubejs/assets/emi/category/properties/deafission_fission_reactor_coolant_smr.json @@ -0,0 +1 @@ +{"deafission:fission_reactor_coolant_smr":{"order":75}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/deafission_fission_reactor_fuel.json b/kubejs/assets/emi/category/properties/deafission_fission_reactor_fuel.json index adc216b76..0cbac9942 100644 --- a/kubejs/assets/emi/category/properties/deafission_fission_reactor_fuel.json +++ b/kubejs/assets/emi/category/properties/deafission_fission_reactor_fuel.json @@ -1 +1 @@ -{"deafission:fission_reactor_fuel":{"order":69}} \ No newline at end of file +{"deafission:fission_reactor_fuel":{"order":71}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/deafission_fission_reactor_processing.json b/kubejs/assets/emi/category/properties/deafission_fission_reactor_processing.json index 87bf66379..91ecf310f 100644 --- a/kubejs/assets/emi/category/properties/deafission_fission_reactor_processing.json +++ b/kubejs/assets/emi/category/properties/deafission_fission_reactor_processing.json @@ -1 +1 @@ -{"deafission:fission_reactor_processing":{"order":68}} \ No newline at end of file +{"deafission:fission_reactor_processing":{"order":70}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/deafission_hb_export.json b/kubejs/assets/emi/category/properties/deafission_hb_export.json new file mode 100644 index 000000000..4f0921b66 --- /dev/null +++ b/kubejs/assets/emi/category/properties/deafission_hb_export.json @@ -0,0 +1 @@ +{"deafission:hb_export":{"order":78}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/deafission_hb_import.json b/kubejs/assets/emi/category/properties/deafission_hb_import.json new file mode 100644 index 000000000..ce94329b8 --- /dev/null +++ b/kubejs/assets/emi/category/properties/deafission_hb_import.json @@ -0,0 +1 @@ +{"deafission:hb_import":{"order":77}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/diggerhelmet_helmet_repair.json b/kubejs/assets/emi/category/properties/diggerhelmet_helmet_repair.json index 7715f2c79..1b882038b 100644 --- a/kubejs/assets/emi/category/properties/diggerhelmet_helmet_repair.json +++ b/kubejs/assets/emi/category/properties/diggerhelmet_helmet_repair.json @@ -1 +1 @@ -{"diggerhelmet:helmet_repair":{"order":165}} \ No newline at end of file +{"diggerhelmet:helmet_repair":{"order":172}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/domum_ornamentum_architects_cutter.json b/kubejs/assets/emi/category/properties/domum_ornamentum_architects_cutter.json index b8c07b028..07efe08f4 100644 --- a/kubejs/assets/emi/category/properties/domum_ornamentum_architects_cutter.json +++ b/kubejs/assets/emi/category/properties/domum_ornamentum_architects_cutter.json @@ -1 +1 @@ -{"domum_ornamentum:architects_cutter":{"order":169}} \ No newline at end of file +{"domum_ornamentum:architects_cutter":{"order":176}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/emi_info.json b/kubejs/assets/emi/category/properties/emi_info.json index de5b44335..3416b5a87 100644 --- a/kubejs/assets/emi/category/properties/emi_info.json +++ b/kubejs/assets/emi/category/properties/emi_info.json @@ -1 +1 @@ -{"emi:info":{"order":179}} \ No newline at end of file +{"emi:info":{"order":186}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/emi_tag.json b/kubejs/assets/emi/category/properties/emi_tag.json index 8913e2dd2..08545f84c 100644 --- a/kubejs/assets/emi/category/properties/emi_tag.json +++ b/kubejs/assets/emi/category/properties/emi_tag.json @@ -1 +1 @@ -{"emi:tag":{"order":180}} \ No newline at end of file +{"emi:tag":{"order":187}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/exposure_photograph_printing.json b/kubejs/assets/emi/category/properties/exposure_photograph_printing.json index d08557db7..8ffd17bc0 100644 --- a/kubejs/assets/emi/category/properties/exposure_photograph_printing.json +++ b/kubejs/assets/emi/category/properties/exposure_photograph_printing.json @@ -1 +1 @@ -{"exposure:photograph_printing":{"order":163}} \ No newline at end of file +{"exposure:photograph_printing":{"order":170}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/exposure_photograph_stacking.json b/kubejs/assets/emi/category/properties/exposure_photograph_stacking.json index c79168c91..ff12d914c 100644 --- a/kubejs/assets/emi/category/properties/exposure_photograph_stacking.json +++ b/kubejs/assets/emi/category/properties/exposure_photograph_stacking.json @@ -1 +1 @@ -{"exposure:photograph_stacking":{"order":164}} \ No newline at end of file +{"exposure:photograph_stacking":{"order":171}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/firmalife_bowl_pot.json b/kubejs/assets/emi/category/properties/firmalife_bowl_pot.json index 5c6d431f3..0b2540eca 100644 --- a/kubejs/assets/emi/category/properties/firmalife_bowl_pot.json +++ b/kubejs/assets/emi/category/properties/firmalife_bowl_pot.json @@ -1 +1 @@ -{"firmalife:bowl_pot":{"order":43}} \ No newline at end of file +{"firmalife:bowl_pot":{"order":44}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/firmalife_drying.json b/kubejs/assets/emi/category/properties/firmalife_drying.json index 9e393a878..bf367d13c 100644 --- a/kubejs/assets/emi/category/properties/firmalife_drying.json +++ b/kubejs/assets/emi/category/properties/firmalife_drying.json @@ -1 +1 @@ -{"firmalife:drying":{"order":35}} \ No newline at end of file +{"firmalife:drying":{"order":36}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/firmalife_mixing_bowl.json b/kubejs/assets/emi/category/properties/firmalife_mixing_bowl.json index f8d8e7108..bee11e631 100644 --- a/kubejs/assets/emi/category/properties/firmalife_mixing_bowl.json +++ b/kubejs/assets/emi/category/properties/firmalife_mixing_bowl.json @@ -1 +1 @@ -{"firmalife:mixing_bowl":{"order":36}} \ No newline at end of file +{"firmalife:mixing_bowl":{"order":37}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/firmalife_oven.json b/kubejs/assets/emi/category/properties/firmalife_oven.json index 3aff9e548..41eef1719 100644 --- a/kubejs/assets/emi/category/properties/firmalife_oven.json +++ b/kubejs/assets/emi/category/properties/firmalife_oven.json @@ -1 +1 @@ -{"firmalife:oven":{"order":37}} \ No newline at end of file +{"firmalife:oven":{"order":38}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/firmalife_smoking.json b/kubejs/assets/emi/category/properties/firmalife_smoking.json index d2d5eeaa1..dfda139c9 100644 --- a/kubejs/assets/emi/category/properties/firmalife_smoking.json +++ b/kubejs/assets/emi/category/properties/firmalife_smoking.json @@ -1 +1 @@ -{"firmalife:smoking":{"order":39}} \ No newline at end of file +{"firmalife:smoking":{"order":40}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/firmalife_stomping.json b/kubejs/assets/emi/category/properties/firmalife_stomping.json index 52133f4ce..dfdd42851 100644 --- a/kubejs/assets/emi/category/properties/firmalife_stomping.json +++ b/kubejs/assets/emi/category/properties/firmalife_stomping.json @@ -1 +1 @@ -{"firmalife:stomping":{"order":45}} \ No newline at end of file +{"firmalife:stomping":{"order":46}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/firmalife_vat.json b/kubejs/assets/emi/category/properties/firmalife_vat.json index 1032b5898..5f18c652d 100644 --- a/kubejs/assets/emi/category/properties/firmalife_vat.json +++ b/kubejs/assets/emi/category/properties/firmalife_vat.json @@ -1 +1 @@ -{"firmalife:vat":{"order":44}} \ No newline at end of file +{"firmalife:vat":{"order":45}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/framedblocks_framing_saw.json b/kubejs/assets/emi/category/properties/framedblocks_framing_saw.json index a95aa8971..3b7a0b11e 100644 --- a/kubejs/assets/emi/category/properties/framedblocks_framing_saw.json +++ b/kubejs/assets/emi/category/properties/framedblocks_framing_saw.json @@ -1 +1 @@ -{"framedblocks:framing_saw":{"order":168}} \ No newline at end of file +{"framedblocks:framing_saw":{"order":175}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/greate_automatic_packing.json b/kubejs/assets/emi/category/properties/greate_automatic_packing.json index f73592900..0d39e8a77 100644 --- a/kubejs/assets/emi/category/properties/greate_automatic_packing.json +++ b/kubejs/assets/emi/category/properties/greate_automatic_packing.json @@ -1 +1 @@ -{"greate:automatic_packing":{"order":177}} \ No newline at end of file +{"greate:automatic_packing":{"order":184}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/greate_automatic_shaped.json b/kubejs/assets/emi/category/properties/greate_automatic_shaped.json index a6906d2a3..0837dfed8 100644 --- a/kubejs/assets/emi/category/properties/greate_automatic_shaped.json +++ b/kubejs/assets/emi/category/properties/greate_automatic_shaped.json @@ -1 +1 @@ -{"greate:automatic_shaped":{"order":175}} \ No newline at end of file +{"greate:automatic_shaped":{"order":182}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/greate_automatic_shapeless.json b/kubejs/assets/emi/category/properties/greate_automatic_shapeless.json index 0e8bd0689..bf0202360 100644 --- a/kubejs/assets/emi/category/properties/greate_automatic_shapeless.json +++ b/kubejs/assets/emi/category/properties/greate_automatic_shapeless.json @@ -1 +1 @@ -{"greate:automatic_shapeless":{"order":176}} \ No newline at end of file +{"greate:automatic_shapeless":{"order":183}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/greate_block_cutting.json b/kubejs/assets/emi/category/properties/greate_block_cutting.json index 32291d555..a169ad942 100644 --- a/kubejs/assets/emi/category/properties/greate_block_cutting.json +++ b/kubejs/assets/emi/category/properties/greate_block_cutting.json @@ -1 +1 @@ -{"greate:block_cutting":{"order":167}} \ No newline at end of file +{"greate:block_cutting":{"order":174}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/greate_crushing.json b/kubejs/assets/emi/category/properties/greate_crushing.json index 3e8026cb5..bf8a5f071 100644 --- a/kubejs/assets/emi/category/properties/greate_crushing.json +++ b/kubejs/assets/emi/category/properties/greate_crushing.json @@ -1 +1 @@ -{"greate:crushing":{"order":119}} \ No newline at end of file +{"greate:crushing":{"order":126}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/greate_fan_washing.json b/kubejs/assets/emi/category/properties/greate_fan_washing.json index 1215ae3dc..666937c38 100644 --- a/kubejs/assets/emi/category/properties/greate_fan_washing.json +++ b/kubejs/assets/emi/category/properties/greate_fan_washing.json @@ -1 +1 @@ -{"greate:fan_washing":{"order":125}} \ No newline at end of file +{"greate:fan_washing":{"order":132}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/greate_milling.json b/kubejs/assets/emi/category/properties/greate_milling.json index 01f14ecb5..1f125ce31 100644 --- a/kubejs/assets/emi/category/properties/greate_milling.json +++ b/kubejs/assets/emi/category/properties/greate_milling.json @@ -1 +1 @@ -{"greate:milling":{"order":118}} \ No newline at end of file +{"greate:milling":{"order":125}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/greate_mixing.json b/kubejs/assets/emi/category/properties/greate_mixing.json index 67983151f..ca5f932ac 100644 --- a/kubejs/assets/emi/category/properties/greate_mixing.json +++ b/kubejs/assets/emi/category/properties/greate_mixing.json @@ -1 +1 @@ -{"greate:mixing":{"order":123}} \ No newline at end of file +{"greate:mixing":{"order":130}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/greate_packing.json b/kubejs/assets/emi/category/properties/greate_packing.json index 54da5b3e9..e8e4b2d6d 100644 --- a/kubejs/assets/emi/category/properties/greate_packing.json +++ b/kubejs/assets/emi/category/properties/greate_packing.json @@ -1 +1 @@ -{"greate:packing":{"order":21}} \ No newline at end of file +{"greate:packing":{"order":22}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/greate_pressing.json b/kubejs/assets/emi/category/properties/greate_pressing.json index 915a21b25..4508b0399 100644 --- a/kubejs/assets/emi/category/properties/greate_pressing.json +++ b/kubejs/assets/emi/category/properties/greate_pressing.json @@ -1 +1 @@ -{"greate:pressing":{"order":108}} \ No newline at end of file +{"greate:pressing":{"order":115}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/greate_sawing.json b/kubejs/assets/emi/category/properties/greate_sawing.json index b14496925..3c7f64bf2 100644 --- a/kubejs/assets/emi/category/properties/greate_sawing.json +++ b/kubejs/assets/emi/category/properties/greate_sawing.json @@ -1 +1 @@ -{"greate:sawing":{"order":95}} \ No newline at end of file +{"greate:sawing":{"order":102}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_air_scrubber.json b/kubejs/assets/emi/category/properties/gtceu_air_scrubber.json index f41aab06a..10abeaa89 100644 --- a/kubejs/assets/emi/category/properties/gtceu_air_scrubber.json +++ b/kubejs/assets/emi/category/properties/gtceu_air_scrubber.json @@ -1 +1 @@ -{"gtceu:air_scrubber":{"order":74}} \ No newline at end of file +{"gtceu:air_scrubber":{"order":81}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_alloy_blast_smelter.json b/kubejs/assets/emi/category/properties/gtceu_alloy_blast_smelter.json index f8fc50a7d..15bd8683a 100644 --- a/kubejs/assets/emi/category/properties/gtceu_alloy_blast_smelter.json +++ b/kubejs/assets/emi/category/properties/gtceu_alloy_blast_smelter.json @@ -1 +1 @@ -{"gtceu:alloy_blast_smelter":{"order":135}} \ No newline at end of file +{"gtceu:alloy_blast_smelter":{"order":142}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_alloy_smelter.json b/kubejs/assets/emi/category/properties/gtceu_alloy_smelter.json index 176573172..463b0b972 100644 --- a/kubejs/assets/emi/category/properties/gtceu_alloy_smelter.json +++ b/kubejs/assets/emi/category/properties/gtceu_alloy_smelter.json @@ -1 +1 @@ -{"gtceu:alloy_smelter":{"order":75}} \ No newline at end of file +{"gtceu:alloy_smelter":{"order":82}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_aqueous_accumulator.json b/kubejs/assets/emi/category/properties/gtceu_aqueous_accumulator.json index f14c7de77..25dd363dc 100644 --- a/kubejs/assets/emi/category/properties/gtceu_aqueous_accumulator.json +++ b/kubejs/assets/emi/category/properties/gtceu_aqueous_accumulator.json @@ -1 +1 @@ -{"gtceu:aqueous_accumulator":{"order":77}} \ No newline at end of file +{"gtceu:aqueous_accumulator":{"order":84}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_arc_furnace.json b/kubejs/assets/emi/category/properties/gtceu_arc_furnace.json index 169b35cfb..b472adc38 100644 --- a/kubejs/assets/emi/category/properties/gtceu_arc_furnace.json +++ b/kubejs/assets/emi/category/properties/gtceu_arc_furnace.json @@ -1 +1 @@ -{"gtceu:arc_furnace":{"order":78}} \ No newline at end of file +{"gtceu:arc_furnace":{"order":85}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_arc_furnace_recycling.json b/kubejs/assets/emi/category/properties/gtceu_arc_furnace_recycling.json index c3807af7f..997b4841c 100644 --- a/kubejs/assets/emi/category/properties/gtceu_arc_furnace_recycling.json +++ b/kubejs/assets/emi/category/properties/gtceu_arc_furnace_recycling.json @@ -1 +1 @@ -{"gtceu:arc_furnace_recycling":{"order":159}} \ No newline at end of file +{"gtceu:arc_furnace_recycling":{"order":166}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_assembler.json b/kubejs/assets/emi/category/properties/gtceu_assembler.json index e547ae894..d8025a7bd 100644 --- a/kubejs/assets/emi/category/properties/gtceu_assembler.json +++ b/kubejs/assets/emi/category/properties/gtceu_assembler.json @@ -1 +1 @@ -{"gtceu:assembler":{"order":79}} \ No newline at end of file +{"gtceu:assembler":{"order":86}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_assembly_line.json b/kubejs/assets/emi/category/properties/gtceu_assembly_line.json index dbce179a4..280a75cd6 100644 --- a/kubejs/assets/emi/category/properties/gtceu_assembly_line.json +++ b/kubejs/assets/emi/category/properties/gtceu_assembly_line.json @@ -1 +1 @@ -{"gtceu:assembly_line":{"order":136}} \ No newline at end of file +{"gtceu:assembly_line":{"order":143}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_autoclave.json b/kubejs/assets/emi/category/properties/gtceu_autoclave.json index 37a92f362..4e80ee6b5 100644 --- a/kubejs/assets/emi/category/properties/gtceu_autoclave.json +++ b/kubejs/assets/emi/category/properties/gtceu_autoclave.json @@ -1 +1 @@ -{"gtceu:autoclave":{"order":80}} \ No newline at end of file +{"gtceu:autoclave":{"order":87}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_bender.json b/kubejs/assets/emi/category/properties/gtceu_bender.json index ac1b79c9b..8b572933d 100644 --- a/kubejs/assets/emi/category/properties/gtceu_bender.json +++ b/kubejs/assets/emi/category/properties/gtceu_bender.json @@ -1 +1 @@ -{"gtceu:bender":{"order":83}} \ No newline at end of file +{"gtceu:bender":{"order":90}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_bioreactor.json b/kubejs/assets/emi/category/properties/gtceu_bioreactor.json index df5863ec1..53579c632 100644 --- a/kubejs/assets/emi/category/properties/gtceu_bioreactor.json +++ b/kubejs/assets/emi/category/properties/gtceu_bioreactor.json @@ -1 +1 @@ -{"gtceu:bioreactor":{"order":137}} \ No newline at end of file +{"gtceu:bioreactor":{"order":144}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_brewery.json b/kubejs/assets/emi/category/properties/gtceu_brewery.json index 8cc06a1e4..ab2cc4e21 100644 --- a/kubejs/assets/emi/category/properties/gtceu_brewery.json +++ b/kubejs/assets/emi/category/properties/gtceu_brewery.json @@ -1 +1 @@ -{"gtceu:brewery":{"order":84}} \ No newline at end of file +{"gtceu:brewery":{"order":91}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_canner.json b/kubejs/assets/emi/category/properties/gtceu_canner.json index 9ac566d07..144df42ea 100644 --- a/kubejs/assets/emi/category/properties/gtceu_canner.json +++ b/kubejs/assets/emi/category/properties/gtceu_canner.json @@ -1 +1 @@ -{"gtceu:canner":{"order":85}} \ No newline at end of file +{"gtceu:canner":{"order":92}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_centrifuge.json b/kubejs/assets/emi/category/properties/gtceu_centrifuge.json index 849e253b1..702ec374e 100644 --- a/kubejs/assets/emi/category/properties/gtceu_centrifuge.json +++ b/kubejs/assets/emi/category/properties/gtceu_centrifuge.json @@ -1 +1 @@ -{"gtceu:centrifuge":{"order":87}} \ No newline at end of file +{"gtceu:centrifuge":{"order":94}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_chem_dyes.json b/kubejs/assets/emi/category/properties/gtceu_chem_dyes.json index 0ac44f86d..6f6192cbd 100644 --- a/kubejs/assets/emi/category/properties/gtceu_chem_dyes.json +++ b/kubejs/assets/emi/category/properties/gtceu_chem_dyes.json @@ -1 +1 @@ -{"gtceu:chem_dyes":{"order":89}} \ No newline at end of file +{"gtceu:chem_dyes":{"order":96}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_chemical_bath.json b/kubejs/assets/emi/category/properties/gtceu_chemical_bath.json index 14bbcd091..fe711cc74 100644 --- a/kubejs/assets/emi/category/properties/gtceu_chemical_bath.json +++ b/kubejs/assets/emi/category/properties/gtceu_chemical_bath.json @@ -1 +1 @@ -{"gtceu:chemical_bath":{"order":88}} \ No newline at end of file +{"gtceu:chemical_bath":{"order":95}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_chemical_reactor.json b/kubejs/assets/emi/category/properties/gtceu_chemical_reactor.json index 0b579ef62..55b471812 100644 --- a/kubejs/assets/emi/category/properties/gtceu_chemical_reactor.json +++ b/kubejs/assets/emi/category/properties/gtceu_chemical_reactor.json @@ -1 +1 @@ -{"gtceu:chemical_reactor":{"order":91}} \ No newline at end of file +{"gtceu:chemical_reactor":{"order":98}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_circuit_assembler.json b/kubejs/assets/emi/category/properties/gtceu_circuit_assembler.json index 3c50acf2a..70c07ce3b 100644 --- a/kubejs/assets/emi/category/properties/gtceu_circuit_assembler.json +++ b/kubejs/assets/emi/category/properties/gtceu_circuit_assembler.json @@ -1 +1 @@ -{"gtceu:circuit_assembler":{"order":93}} \ No newline at end of file +{"gtceu:circuit_assembler":{"order":100}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_coal_liquefaction_tower.json b/kubejs/assets/emi/category/properties/gtceu_coal_liquefaction_tower.json index 7c3d1662f..57eadfa61 100644 --- a/kubejs/assets/emi/category/properties/gtceu_coal_liquefaction_tower.json +++ b/kubejs/assets/emi/category/properties/gtceu_coal_liquefaction_tower.json @@ -1 +1 @@ -{"gtceu:coal_liquefaction_tower":{"order":138}} \ No newline at end of file +{"gtceu:coal_liquefaction_tower":{"order":145}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_coke_oven.json b/kubejs/assets/emi/category/properties/gtceu_coke_oven.json index 7c5fb7c74..6e875cd64 100644 --- a/kubejs/assets/emi/category/properties/gtceu_coke_oven.json +++ b/kubejs/assets/emi/category/properties/gtceu_coke_oven.json @@ -1 +1 @@ -{"gtceu:coke_oven":{"order":59}} \ No newline at end of file +{"gtceu:coke_oven":{"order":60}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_combustion_generator.json b/kubejs/assets/emi/category/properties/gtceu_combustion_generator.json index 23a9fd588..cdfa90630 100644 --- a/kubejs/assets/emi/category/properties/gtceu_combustion_generator.json +++ b/kubejs/assets/emi/category/properties/gtceu_combustion_generator.json @@ -1 +1 @@ -{"gtceu:combustion_generator":{"order":61}} \ No newline at end of file +{"gtceu:combustion_generator":{"order":62}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_compressor.json b/kubejs/assets/emi/category/properties/gtceu_compressor.json index b4608cf12..939dd6cc7 100644 --- a/kubejs/assets/emi/category/properties/gtceu_compressor.json +++ b/kubejs/assets/emi/category/properties/gtceu_compressor.json @@ -1 +1 @@ -{"gtceu:compressor":{"order":94}} \ No newline at end of file +{"gtceu:compressor":{"order":101}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_cooling_tower.json b/kubejs/assets/emi/category/properties/gtceu_cooling_tower.json new file mode 100644 index 000000000..f7a0895eb --- /dev/null +++ b/kubejs/assets/emi/category/properties/gtceu_cooling_tower.json @@ -0,0 +1 @@ +{"gtceu:cooling_tower":{"order":68}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_cracker.json b/kubejs/assets/emi/category/properties/gtceu_cracker.json index f2f6ef99b..ad6b1e88e 100644 --- a/kubejs/assets/emi/category/properties/gtceu_cracker.json +++ b/kubejs/assets/emi/category/properties/gtceu_cracker.json @@ -1 +1 @@ -{"gtceu:cracker":{"order":139}} \ No newline at end of file +{"gtceu:cracker":{"order":146}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_cutter.json b/kubejs/assets/emi/category/properties/gtceu_cutter.json index 1af20f965..2cd4c8d25 100644 --- a/kubejs/assets/emi/category/properties/gtceu_cutter.json +++ b/kubejs/assets/emi/category/properties/gtceu_cutter.json @@ -1 +1 @@ -{"gtceu:cutter":{"order":96}} \ No newline at end of file +{"gtceu:cutter":{"order":103}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_distillation_tower.json b/kubejs/assets/emi/category/properties/gtceu_distillation_tower.json index 72a980557..678dd900a 100644 --- a/kubejs/assets/emi/category/properties/gtceu_distillation_tower.json +++ b/kubejs/assets/emi/category/properties/gtceu_distillation_tower.json @@ -1 +1 @@ -{"gtceu:distillation_tower":{"order":98}} \ No newline at end of file +{"gtceu:distillation_tower":{"order":105}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_distillery.json b/kubejs/assets/emi/category/properties/gtceu_distillery.json index 88cdd2fe7..b2cc1385d 100644 --- a/kubejs/assets/emi/category/properties/gtceu_distillery.json +++ b/kubejs/assets/emi/category/properties/gtceu_distillery.json @@ -1 +1 @@ -{"gtceu:distillery":{"order":97}} \ No newline at end of file +{"gtceu:distillery":{"order":104}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_electric_blast_furnace.json b/kubejs/assets/emi/category/properties/gtceu_electric_blast_furnace.json index a06f87714..ca5c2f3a9 100644 --- a/kubejs/assets/emi/category/properties/gtceu_electric_blast_furnace.json +++ b/kubejs/assets/emi/category/properties/gtceu_electric_blast_furnace.json @@ -1 +1 @@ -{"gtceu:electric_blast_furnace":{"order":140}} \ No newline at end of file +{"gtceu:electric_blast_furnace":{"order":147}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_electrolyzer.json b/kubejs/assets/emi/category/properties/gtceu_electrolyzer.json index 64bd5759c..bdc026e07 100644 --- a/kubejs/assets/emi/category/properties/gtceu_electrolyzer.json +++ b/kubejs/assets/emi/category/properties/gtceu_electrolyzer.json @@ -1 +1 @@ -{"gtceu:electrolyzer":{"order":99}} \ No newline at end of file +{"gtceu:electrolyzer":{"order":106}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_electromagnetic_separator.json b/kubejs/assets/emi/category/properties/gtceu_electromagnetic_separator.json index 5f99ad041..d0395585b 100644 --- a/kubejs/assets/emi/category/properties/gtceu_electromagnetic_separator.json +++ b/kubejs/assets/emi/category/properties/gtceu_electromagnetic_separator.json @@ -1 +1 @@ -{"gtceu:electromagnetic_separator":{"order":100}} \ No newline at end of file +{"gtceu:electromagnetic_separator":{"order":107}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_evaporation_tower.json b/kubejs/assets/emi/category/properties/gtceu_evaporation_tower.json index 6384d23bf..489f2125d 100644 --- a/kubejs/assets/emi/category/properties/gtceu_evaporation_tower.json +++ b/kubejs/assets/emi/category/properties/gtceu_evaporation_tower.json @@ -1 +1 @@ -{"gtceu:evaporation_tower":{"order":141}} \ No newline at end of file +{"gtceu:evaporation_tower":{"order":148}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_extractor.json b/kubejs/assets/emi/category/properties/gtceu_extractor.json index a31e5a37e..e4cd3af52 100644 --- a/kubejs/assets/emi/category/properties/gtceu_extractor.json +++ b/kubejs/assets/emi/category/properties/gtceu_extractor.json @@ -1 +1 @@ -{"gtceu:extractor":{"order":102}} \ No newline at end of file +{"gtceu:extractor":{"order":109}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_extractor_recycling.json b/kubejs/assets/emi/category/properties/gtceu_extractor_recycling.json index 6e0143e12..108124baa 100644 --- a/kubejs/assets/emi/category/properties/gtceu_extractor_recycling.json +++ b/kubejs/assets/emi/category/properties/gtceu_extractor_recycling.json @@ -1 +1 @@ -{"gtceu:extractor_recycling":{"order":161}} \ No newline at end of file +{"gtceu:extractor_recycling":{"order":168}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_extruder.json b/kubejs/assets/emi/category/properties/gtceu_extruder.json index 4d76a1d27..d6a9cc44f 100644 --- a/kubejs/assets/emi/category/properties/gtceu_extruder.json +++ b/kubejs/assets/emi/category/properties/gtceu_extruder.json @@ -1 +1 @@ -{"gtceu:extruder":{"order":104}} \ No newline at end of file +{"gtceu:extruder":{"order":111}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_fermenter.json b/kubejs/assets/emi/category/properties/gtceu_fermenter.json index 222919a16..eeb25baed 100644 --- a/kubejs/assets/emi/category/properties/gtceu_fermenter.json +++ b/kubejs/assets/emi/category/properties/gtceu_fermenter.json @@ -1 +1 @@ -{"gtceu:fermenter":{"order":105}} \ No newline at end of file +{"gtceu:fermenter":{"order":112}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_fission_reactor.json b/kubejs/assets/emi/category/properties/gtceu_fission_reactor.json index fad7a9f11..2e30a0629 100644 --- a/kubejs/assets/emi/category/properties/gtceu_fission_reactor.json +++ b/kubejs/assets/emi/category/properties/gtceu_fission_reactor.json @@ -1 +1 @@ -{"gtceu:fission_reactor":{"order":142}} \ No newline at end of file +{"gtceu:fission_reactor":{"order":149}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_fluid_heater.json b/kubejs/assets/emi/category/properties/gtceu_fluid_heater.json index 511826e95..9e2f560c6 100644 --- a/kubejs/assets/emi/category/properties/gtceu_fluid_heater.json +++ b/kubejs/assets/emi/category/properties/gtceu_fluid_heater.json @@ -1 +1 @@ -{"gtceu:fluid_heater":{"order":106}} \ No newline at end of file +{"gtceu:fluid_heater":{"order":113}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_fluid_solidifier.json b/kubejs/assets/emi/category/properties/gtceu_fluid_solidifier.json index c27aac3b2..1c1aa3f61 100644 --- a/kubejs/assets/emi/category/properties/gtceu_fluid_solidifier.json +++ b/kubejs/assets/emi/category/properties/gtceu_fluid_solidifier.json @@ -1 +1 @@ -{"gtceu:fluid_solidifier":{"order":107}} \ No newline at end of file +{"gtceu:fluid_solidifier":{"order":114}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_food_oven.json b/kubejs/assets/emi/category/properties/gtceu_food_oven.json index 8eb36875b..e34fe713b 100644 --- a/kubejs/assets/emi/category/properties/gtceu_food_oven.json +++ b/kubejs/assets/emi/category/properties/gtceu_food_oven.json @@ -1 +1 @@ -{"gtceu:food_oven":{"order":38}} \ No newline at end of file +{"gtceu:food_oven":{"order":39}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_food_processor.json b/kubejs/assets/emi/category/properties/gtceu_food_processor.json index 951432e03..619dd2ff7 100644 --- a/kubejs/assets/emi/category/properties/gtceu_food_processor.json +++ b/kubejs/assets/emi/category/properties/gtceu_food_processor.json @@ -1 +1 @@ -{"gtceu:food_processor":{"order":46}} \ No newline at end of file +{"gtceu:food_processor":{"order":47}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_forge_hammer.json b/kubejs/assets/emi/category/properties/gtceu_forge_hammer.json index 5c7caff41..0960dd3eb 100644 --- a/kubejs/assets/emi/category/properties/gtceu_forge_hammer.json +++ b/kubejs/assets/emi/category/properties/gtceu_forge_hammer.json @@ -1 +1 @@ -{"gtceu:forge_hammer":{"order":109}} \ No newline at end of file +{"gtceu:forge_hammer":{"order":116}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_forming_press.json b/kubejs/assets/emi/category/properties/gtceu_forming_press.json index ac1ab08a5..7bef3bd74 100644 --- a/kubejs/assets/emi/category/properties/gtceu_forming_press.json +++ b/kubejs/assets/emi/category/properties/gtceu_forming_press.json @@ -1 +1 @@ -{"gtceu:forming_press":{"order":111}} \ No newline at end of file +{"gtceu:forming_press":{"order":118}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_fusion_reactor.json b/kubejs/assets/emi/category/properties/gtceu_fusion_reactor.json index 696302445..01440a9e9 100644 --- a/kubejs/assets/emi/category/properties/gtceu_fusion_reactor.json +++ b/kubejs/assets/emi/category/properties/gtceu_fusion_reactor.json @@ -1 +1 @@ -{"gtceu:fusion_reactor":{"order":143}} \ No newline at end of file +{"gtceu:fusion_reactor":{"order":150}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_gas_collector.json b/kubejs/assets/emi/category/properties/gtceu_gas_collector.json index 0855a78a8..dba3edbe9 100644 --- a/kubejs/assets/emi/category/properties/gtceu_gas_collector.json +++ b/kubejs/assets/emi/category/properties/gtceu_gas_collector.json @@ -1 +1 @@ -{"gtceu:gas_collector":{"order":112}} \ No newline at end of file +{"gtceu:gas_collector":{"order":119}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_gas_pressurizer.json b/kubejs/assets/emi/category/properties/gtceu_gas_pressurizer.json index c55dcefef..b838b4b30 100644 --- a/kubejs/assets/emi/category/properties/gtceu_gas_pressurizer.json +++ b/kubejs/assets/emi/category/properties/gtceu_gas_pressurizer.json @@ -1 +1 @@ -{"gtceu:gas_pressurizer":{"order":113}} \ No newline at end of file +{"gtceu:gas_pressurizer":{"order":120}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_gas_turbine.json b/kubejs/assets/emi/category/properties/gtceu_gas_turbine.json index ae2caa47f..1e6ab6dee 100644 --- a/kubejs/assets/emi/category/properties/gtceu_gas_turbine.json +++ b/kubejs/assets/emi/category/properties/gtceu_gas_turbine.json @@ -1 +1 @@ -{"gtceu:gas_turbine":{"order":62}} \ No newline at end of file +{"gtceu:gas_turbine":{"order":63}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_greenhouse.json b/kubejs/assets/emi/category/properties/gtceu_greenhouse.json index 20d1e3946..6886aa56e 100644 --- a/kubejs/assets/emi/category/properties/gtceu_greenhouse.json +++ b/kubejs/assets/emi/category/properties/gtceu_greenhouse.json @@ -1 +1 @@ -{"gtceu:greenhouse":{"order":144}} \ No newline at end of file +{"gtceu:greenhouse":{"order":151}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_heat_exchanger.json b/kubejs/assets/emi/category/properties/gtceu_heat_exchanger.json index 11bb3eba1..09c6ddca7 100644 --- a/kubejs/assets/emi/category/properties/gtceu_heat_exchanger.json +++ b/kubejs/assets/emi/category/properties/gtceu_heat_exchanger.json @@ -1 +1 @@ -{"gtceu:heat_exchanger":{"order":145}} \ No newline at end of file +{"gtceu:heat_exchanger":{"order":152}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_hydroponics_facility.json b/kubejs/assets/emi/category/properties/gtceu_hydroponics_facility.json index 3c4d85d63..b44431281 100644 --- a/kubejs/assets/emi/category/properties/gtceu_hydroponics_facility.json +++ b/kubejs/assets/emi/category/properties/gtceu_hydroponics_facility.json @@ -1 +1 @@ -{"gtceu:hydroponics_facility":{"order":146}} \ No newline at end of file +{"gtceu:hydroponics_facility":{"order":153}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_implosion_compressor.json b/kubejs/assets/emi/category/properties/gtceu_implosion_compressor.json index 5aca7e4c1..2882e3981 100644 --- a/kubejs/assets/emi/category/properties/gtceu_implosion_compressor.json +++ b/kubejs/assets/emi/category/properties/gtceu_implosion_compressor.json @@ -1 +1 @@ -{"gtceu:implosion_compressor":{"order":147}} \ No newline at end of file +{"gtceu:implosion_compressor":{"order":154}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_ingot_molding.json b/kubejs/assets/emi/category/properties/gtceu_ingot_molding.json index 971a52dbe..823e59c0f 100644 --- a/kubejs/assets/emi/category/properties/gtceu_ingot_molding.json +++ b/kubejs/assets/emi/category/properties/gtceu_ingot_molding.json @@ -1 +1 @@ -{"gtceu:ingot_molding":{"order":76}} \ No newline at end of file +{"gtceu:ingot_molding":{"order":83}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_large_boiler.json b/kubejs/assets/emi/category/properties/gtceu_large_boiler.json index 767c4742a..311888a6b 100644 --- a/kubejs/assets/emi/category/properties/gtceu_large_boiler.json +++ b/kubejs/assets/emi/category/properties/gtceu_large_boiler.json @@ -1 +1 @@ -{"gtceu:large_boiler":{"order":57}} \ No newline at end of file +{"gtceu:large_boiler":{"order":58}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_large_chemical_reactor.json b/kubejs/assets/emi/category/properties/gtceu_large_chemical_reactor.json index 8d9aefd8f..73b5dbb07 100644 --- a/kubejs/assets/emi/category/properties/gtceu_large_chemical_reactor.json +++ b/kubejs/assets/emi/category/properties/gtceu_large_chemical_reactor.json @@ -1 +1 @@ -{"gtceu:large_chemical_reactor":{"order":92}} \ No newline at end of file +{"gtceu:large_chemical_reactor":{"order":99}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_large_solar_panel.json b/kubejs/assets/emi/category/properties/gtceu_large_solar_panel.json index 2ee7e3233..75fe09b10 100644 --- a/kubejs/assets/emi/category/properties/gtceu_large_solar_panel.json +++ b/kubejs/assets/emi/category/properties/gtceu_large_solar_panel.json @@ -1 +1 @@ -{"gtceu:large_solar_panel":{"order":63}} \ No newline at end of file +{"gtceu:large_solar_panel":{"order":64}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_large_solar_panel_tier2.json b/kubejs/assets/emi/category/properties/gtceu_large_solar_panel_tier2.json index 348ef5499..c4f897724 100644 --- a/kubejs/assets/emi/category/properties/gtceu_large_solar_panel_tier2.json +++ b/kubejs/assets/emi/category/properties/gtceu_large_solar_panel_tier2.json @@ -1 +1 @@ -{"gtceu:large_solar_panel_tier2":{"order":64}} \ No newline at end of file +{"gtceu:large_solar_panel_tier2":{"order":65}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_large_solar_panel_tier3.json b/kubejs/assets/emi/category/properties/gtceu_large_solar_panel_tier3.json index 579c5fe10..ed2df2f6e 100644 --- a/kubejs/assets/emi/category/properties/gtceu_large_solar_panel_tier3.json +++ b/kubejs/assets/emi/category/properties/gtceu_large_solar_panel_tier3.json @@ -1 +1 @@ -{"gtceu:large_solar_panel_tier3":{"order":65}} \ No newline at end of file +{"gtceu:large_solar_panel_tier3":{"order":66}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_laser_engraver.json b/kubejs/assets/emi/category/properties/gtceu_laser_engraver.json index 9f146f15f..52c58b778 100644 --- a/kubejs/assets/emi/category/properties/gtceu_laser_engraver.json +++ b/kubejs/assets/emi/category/properties/gtceu_laser_engraver.json @@ -1 +1 @@ -{"gtceu:laser_engraver":{"order":115}} \ No newline at end of file +{"gtceu:laser_engraver":{"order":122}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_lathe.json b/kubejs/assets/emi/category/properties/gtceu_lathe.json index 7659c2ad4..0d1a89e1d 100644 --- a/kubejs/assets/emi/category/properties/gtceu_lathe.json +++ b/kubejs/assets/emi/category/properties/gtceu_lathe.json @@ -1 +1 @@ -{"gtceu:lathe":{"order":117}} \ No newline at end of file +{"gtceu:lathe":{"order":124}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_macerator.json b/kubejs/assets/emi/category/properties/gtceu_macerator.json index 35d939495..2640912fa 100644 --- a/kubejs/assets/emi/category/properties/gtceu_macerator.json +++ b/kubejs/assets/emi/category/properties/gtceu_macerator.json @@ -1 +1 @@ -{"gtceu:macerator":{"order":120}} \ No newline at end of file +{"gtceu:macerator":{"order":127}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_macerator_recycling.json b/kubejs/assets/emi/category/properties/gtceu_macerator_recycling.json index 8f6be3973..ea2f4ad33 100644 --- a/kubejs/assets/emi/category/properties/gtceu_macerator_recycling.json +++ b/kubejs/assets/emi/category/properties/gtceu_macerator_recycling.json @@ -1 +1 @@ -{"gtceu:macerator_recycling":{"order":160}} \ No newline at end of file +{"gtceu:macerator_recycling":{"order":167}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_mixer.json b/kubejs/assets/emi/category/properties/gtceu_mixer.json index ca10c1c19..93b8ba65d 100644 --- a/kubejs/assets/emi/category/properties/gtceu_mixer.json +++ b/kubejs/assets/emi/category/properties/gtceu_mixer.json @@ -1 +1 @@ -{"gtceu:mixer":{"order":122}} \ No newline at end of file +{"gtceu:mixer":{"order":129}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_moon_dust_harvester.json b/kubejs/assets/emi/category/properties/gtceu_moon_dust_harvester.json index 7adafaf6b..32bac591a 100644 --- a/kubejs/assets/emi/category/properties/gtceu_moon_dust_harvester.json +++ b/kubejs/assets/emi/category/properties/gtceu_moon_dust_harvester.json @@ -1 +1 @@ -{"gtceu:moon_dust_harvester":{"order":148}} \ No newline at end of file +{"gtceu:moon_dust_harvester":{"order":155}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_nuclear_fuel_factory.json b/kubejs/assets/emi/category/properties/gtceu_nuclear_fuel_factory.json index 386165365..c7941f299 100644 --- a/kubejs/assets/emi/category/properties/gtceu_nuclear_fuel_factory.json +++ b/kubejs/assets/emi/category/properties/gtceu_nuclear_fuel_factory.json @@ -1 +1 @@ -{"gtceu:nuclear_fuel_factory":{"order":149}} \ No newline at end of file +{"gtceu:nuclear_fuel_factory":{"order":156}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_nuclear_turbine.json b/kubejs/assets/emi/category/properties/gtceu_nuclear_turbine.json index 95573260b..803a8afce 100644 --- a/kubejs/assets/emi/category/properties/gtceu_nuclear_turbine.json +++ b/kubejs/assets/emi/category/properties/gtceu_nuclear_turbine.json @@ -1 +1 @@ -{"gtceu:nuclear_turbine":{"order":66}} \ No newline at end of file +{"gtceu:nuclear_turbine":{"order":67}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_ore_bathing.json b/kubejs/assets/emi/category/properties/gtceu_ore_bathing.json index da316554a..5c8b84f03 100644 --- a/kubejs/assets/emi/category/properties/gtceu_ore_bathing.json +++ b/kubejs/assets/emi/category/properties/gtceu_ore_bathing.json @@ -1 +1 @@ -{"gtceu:ore_bathing":{"order":90}} \ No newline at end of file +{"gtceu:ore_bathing":{"order":97}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_ore_crushing.json b/kubejs/assets/emi/category/properties/gtceu_ore_crushing.json index e3e09a0f7..36f32ddf0 100644 --- a/kubejs/assets/emi/category/properties/gtceu_ore_crushing.json +++ b/kubejs/assets/emi/category/properties/gtceu_ore_crushing.json @@ -1 +1 @@ -{"gtceu:ore_crushing":{"order":121}} \ No newline at end of file +{"gtceu:ore_crushing":{"order":128}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_ore_forging.json b/kubejs/assets/emi/category/properties/gtceu_ore_forging.json index 2be9b523a..d90685f88 100644 --- a/kubejs/assets/emi/category/properties/gtceu_ore_forging.json +++ b/kubejs/assets/emi/category/properties/gtceu_ore_forging.json @@ -1 +1 @@ -{"gtceu:ore_forging":{"order":110}} \ No newline at end of file +{"gtceu:ore_forging":{"order":117}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_ore_washer.json b/kubejs/assets/emi/category/properties/gtceu_ore_washer.json index 99fc46d2e..2b7d07bdb 100644 --- a/kubejs/assets/emi/category/properties/gtceu_ore_washer.json +++ b/kubejs/assets/emi/category/properties/gtceu_ore_washer.json @@ -1 +1 @@ -{"gtceu:ore_washer":{"order":124}} \ No newline at end of file +{"gtceu:ore_washer":{"order":131}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_ostrum_harvester.json b/kubejs/assets/emi/category/properties/gtceu_ostrum_harvester.json index c9fdc1274..a4dc65f70 100644 --- a/kubejs/assets/emi/category/properties/gtceu_ostrum_harvester.json +++ b/kubejs/assets/emi/category/properties/gtceu_ostrum_harvester.json @@ -1 +1 @@ -{"gtceu:ostrum_harvester":{"order":150}} \ No newline at end of file +{"gtceu:ostrum_harvester":{"order":157}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_ostrum_linear_accelerator.json b/kubejs/assets/emi/category/properties/gtceu_ostrum_linear_accelerator.json index e609def97..d124449e2 100644 --- a/kubejs/assets/emi/category/properties/gtceu_ostrum_linear_accelerator.json +++ b/kubejs/assets/emi/category/properties/gtceu_ostrum_linear_accelerator.json @@ -1 +1 @@ -{"gtceu:ostrum_linear_accelerator":{"order":151}} \ No newline at end of file +{"gtceu:ostrum_linear_accelerator":{"order":158}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_packer.json b/kubejs/assets/emi/category/properties/gtceu_packer.json index 2f428dab9..91c970477 100644 --- a/kubejs/assets/emi/category/properties/gtceu_packer.json +++ b/kubejs/assets/emi/category/properties/gtceu_packer.json @@ -1 +1 @@ -{"gtceu:packer":{"order":126}} \ No newline at end of file +{"gtceu:packer":{"order":133}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_pisciculture_fishery.json b/kubejs/assets/emi/category/properties/gtceu_pisciculture_fishery.json index 2f137300b..e8a144719 100644 --- a/kubejs/assets/emi/category/properties/gtceu_pisciculture_fishery.json +++ b/kubejs/assets/emi/category/properties/gtceu_pisciculture_fishery.json @@ -1 +1 @@ -{"gtceu:pisciculture_fishery":{"order":152}} \ No newline at end of file +{"gtceu:pisciculture_fishery":{"order":159}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_plasma_generator.json b/kubejs/assets/emi/category/properties/gtceu_plasma_generator.json index 66f62c6f5..f366e419d 100644 --- a/kubejs/assets/emi/category/properties/gtceu_plasma_generator.json +++ b/kubejs/assets/emi/category/properties/gtceu_plasma_generator.json @@ -1 +1 @@ -{"gtceu:plasma_generator":{"order":72}} \ No newline at end of file +{"gtceu:plasma_generator":{"order":79}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_polarizer.json b/kubejs/assets/emi/category/properties/gtceu_polarizer.json index f77e2a7b1..77b36c91b 100644 --- a/kubejs/assets/emi/category/properties/gtceu_polarizer.json +++ b/kubejs/assets/emi/category/properties/gtceu_polarizer.json @@ -1 +1 @@ -{"gtceu:polarizer":{"order":127}} \ No newline at end of file +{"gtceu:polarizer":{"order":134}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_programmed_circuit.json b/kubejs/assets/emi/category/properties/gtceu_programmed_circuit.json index 1ca470d2f..2cef461f4 100644 --- a/kubejs/assets/emi/category/properties/gtceu_programmed_circuit.json +++ b/kubejs/assets/emi/category/properties/gtceu_programmed_circuit.json @@ -1 +1 @@ -{"gtceu:programmed_circuit":{"order":178}} \ No newline at end of file +{"gtceu:programmed_circuit":{"order":185}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_pyrolyse_oven.json b/kubejs/assets/emi/category/properties/gtceu_pyrolyse_oven.json index 3ee2775ce..3eca5299f 100644 --- a/kubejs/assets/emi/category/properties/gtceu_pyrolyse_oven.json +++ b/kubejs/assets/emi/category/properties/gtceu_pyrolyse_oven.json @@ -1 +1 @@ -{"gtceu:pyrolyse_oven":{"order":153}} \ No newline at end of file +{"gtceu:pyrolyse_oven":{"order":160}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_research_station.json b/kubejs/assets/emi/category/properties/gtceu_research_station.json index 2e9c56869..d4fc0e341 100644 --- a/kubejs/assets/emi/category/properties/gtceu_research_station.json +++ b/kubejs/assets/emi/category/properties/gtceu_research_station.json @@ -1 +1 @@ -{"gtceu:research_station":{"order":154}} \ No newline at end of file +{"gtceu:research_station":{"order":161}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_rock_breaker.json b/kubejs/assets/emi/category/properties/gtceu_rock_breaker.json index d43366b28..07966e920 100644 --- a/kubejs/assets/emi/category/properties/gtceu_rock_breaker.json +++ b/kubejs/assets/emi/category/properties/gtceu_rock_breaker.json @@ -1 +1 @@ -{"gtceu:rock_breaker":{"order":128}} \ No newline at end of file +{"gtceu:rock_breaker":{"order":135}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_scanner.json b/kubejs/assets/emi/category/properties/gtceu_scanner.json index bc3c9eb07..b789a642e 100644 --- a/kubejs/assets/emi/category/properties/gtceu_scanner.json +++ b/kubejs/assets/emi/category/properties/gtceu_scanner.json @@ -1 +1 @@ -{"gtceu:scanner":{"order":129}} \ No newline at end of file +{"gtceu:scanner":{"order":136}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_sifter.json b/kubejs/assets/emi/category/properties/gtceu_sifter.json index 91729a678..e873e76cb 100644 --- a/kubejs/assets/emi/category/properties/gtceu_sifter.json +++ b/kubejs/assets/emi/category/properties/gtceu_sifter.json @@ -1 +1 @@ -{"gtceu:sifter":{"order":131}} \ No newline at end of file +{"gtceu:sifter":{"order":138}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_smr_generator.json b/kubejs/assets/emi/category/properties/gtceu_smr_generator.json new file mode 100644 index 000000000..657500dbe --- /dev/null +++ b/kubejs/assets/emi/category/properties/gtceu_smr_generator.json @@ -0,0 +1 @@ +{"gtceu:smr_generator":{"order":74}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_steam_bloomery.json b/kubejs/assets/emi/category/properties/gtceu_steam_bloomery.json index cbf79f09e..b69c5987d 100644 --- a/kubejs/assets/emi/category/properties/gtceu_steam_bloomery.json +++ b/kubejs/assets/emi/category/properties/gtceu_steam_bloomery.json @@ -1 +1 @@ -{"gtceu:steam_bloomery":{"order":155}} \ No newline at end of file +{"gtceu:steam_bloomery":{"order":162}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_steam_boiler.json b/kubejs/assets/emi/category/properties/gtceu_steam_boiler.json index aa5444e77..1344362df 100644 --- a/kubejs/assets/emi/category/properties/gtceu_steam_boiler.json +++ b/kubejs/assets/emi/category/properties/gtceu_steam_boiler.json @@ -1 +1 @@ -{"gtceu:steam_boiler":{"order":56}} \ No newline at end of file +{"gtceu:steam_boiler":{"order":57}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_steam_turbine.json b/kubejs/assets/emi/category/properties/gtceu_steam_turbine.json index c04030c4c..2d062a1d3 100644 --- a/kubejs/assets/emi/category/properties/gtceu_steam_turbine.json +++ b/kubejs/assets/emi/category/properties/gtceu_steam_turbine.json @@ -1 +1 @@ -{"gtceu:steam_turbine":{"order":58}} \ No newline at end of file +{"gtceu:steam_turbine":{"order":59}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_thermal_centrifuge.json b/kubejs/assets/emi/category/properties/gtceu_thermal_centrifuge.json index e2c701368..8aae086a1 100644 --- a/kubejs/assets/emi/category/properties/gtceu_thermal_centrifuge.json +++ b/kubejs/assets/emi/category/properties/gtceu_thermal_centrifuge.json @@ -1 +1 @@ -{"gtceu:thermal_centrifuge":{"order":132}} \ No newline at end of file +{"gtceu:thermal_centrifuge":{"order":139}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_vacuum_freezer.json b/kubejs/assets/emi/category/properties/gtceu_vacuum_freezer.json index c35543341..4bd686e53 100644 --- a/kubejs/assets/emi/category/properties/gtceu_vacuum_freezer.json +++ b/kubejs/assets/emi/category/properties/gtceu_vacuum_freezer.json @@ -1 +1 @@ -{"gtceu:vacuum_freezer":{"order":156}} \ No newline at end of file +{"gtceu:vacuum_freezer":{"order":163}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_wire_coating.json b/kubejs/assets/emi/category/properties/gtceu_wire_coating.json index 0bcd70b8e..7a782ed2a 100644 --- a/kubejs/assets/emi/category/properties/gtceu_wire_coating.json +++ b/kubejs/assets/emi/category/properties/gtceu_wire_coating.json @@ -1 +1 @@ -{"gtceu:wire_coating":{"order":157}} \ No newline at end of file +{"gtceu:wire_coating":{"order":164}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_wiremill.json b/kubejs/assets/emi/category/properties/gtceu_wiremill.json index d6768e6e3..f9c899e7d 100644 --- a/kubejs/assets/emi/category/properties/gtceu_wiremill.json +++ b/kubejs/assets/emi/category/properties/gtceu_wiremill.json @@ -1 +1 @@ -{"gtceu:wiremill":{"order":134}} \ No newline at end of file +{"gtceu:wiremill":{"order":141}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/minecraft_smelting.json b/kubejs/assets/emi/category/properties/minecraft_smelting.json index 40e3a7239..bcafcd573 100644 --- a/kubejs/assets/emi/category/properties/minecraft_smelting.json +++ b/kubejs/assets/emi/category/properties/minecraft_smelting.json @@ -1 +1 @@ -{"minecraft:smelting":{"order":73}} \ No newline at end of file +{"minecraft:smelting":{"order":80}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/minecraft_smithing.json b/kubejs/assets/emi/category/properties/minecraft_smithing.json index 0884f8637..f72c12cbb 100644 --- a/kubejs/assets/emi/category/properties/minecraft_smithing.json +++ b/kubejs/assets/emi/category/properties/minecraft_smithing.json @@ -1 +1 @@ -{"minecraft:smithing":{"order":162}} \ No newline at end of file +{"minecraft:smithing":{"order":169}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/minecraft_stonecutting.json b/kubejs/assets/emi/category/properties/minecraft_stonecutting.json index 8e40f1250..ac498007e 100644 --- a/kubejs/assets/emi/category/properties/minecraft_stonecutting.json +++ b/kubejs/assets/emi/category/properties/minecraft_stonecutting.json @@ -1 +1 @@ -{"minecraft:stonecutting":{"order":166}} \ No newline at end of file +{"minecraft:stonecutting":{"order":173}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/rnr_block_mod.json b/kubejs/assets/emi/category/properties/rnr_block_mod.json index 8ab0b1d64..d24ca9768 100644 --- a/kubejs/assets/emi/category/properties/rnr_block_mod.json +++ b/kubejs/assets/emi/category/properties/rnr_block_mod.json @@ -1 +1 @@ -{"rnr:block_mod":{"order":47}} \ No newline at end of file +{"rnr:block_mod":{"order":48}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/rnr_mattock.json b/kubejs/assets/emi/category/properties/rnr_mattock.json index ef212895f..4964f4dc6 100644 --- a/kubejs/assets/emi/category/properties/rnr_mattock.json +++ b/kubejs/assets/emi/category/properties/rnr_mattock.json @@ -1 +1 @@ -{"rnr:mattock":{"order":48}} \ No newline at end of file +{"rnr:mattock":{"order":49}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/tacz_attachment_query.json b/kubejs/assets/emi/category/properties/tacz_attachment_query.json index 5a657c070..88f3ccee4 100644 --- a/kubejs/assets/emi/category/properties/tacz_attachment_query.json +++ b/kubejs/assets/emi/category/properties/tacz_attachment_query.json @@ -1 +1 @@ -{"tacz:attachment_query":{"order":171}} \ No newline at end of file +{"tacz:attachment_query":{"order":178}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/taczammoquery_ammo_query.json b/kubejs/assets/emi/category/properties/taczammoquery_ammo_query.json index df66f83aa..651aa5d75 100644 --- a/kubejs/assets/emi/category/properties/taczammoquery_ammo_query.json +++ b/kubejs/assets/emi/category/properties/taczammoquery_ammo_query.json @@ -1 +1 @@ -{"taczammoquery:ammo_query":{"order":172}} \ No newline at end of file +{"taczammoquery:ammo_query":{"order":179}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/tfc_alloying.json b/kubejs/assets/emi/category/properties/tfc_alloying.json index 73194c877..7befe3371 100644 --- a/kubejs/assets/emi/category/properties/tfc_alloying.json +++ b/kubejs/assets/emi/category/properties/tfc_alloying.json @@ -1 +1 @@ -{"tfc:alloying":{"order":28}} \ No newline at end of file +{"tfc:alloying":{"order":29}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/tfc_anvil.json b/kubejs/assets/emi/category/properties/tfc_anvil.json index 41ead7698..dbbd48fb3 100644 --- a/kubejs/assets/emi/category/properties/tfc_anvil.json +++ b/kubejs/assets/emi/category/properties/tfc_anvil.json @@ -1 +1 @@ -{"tfc:anvil":{"order":19}} \ No newline at end of file +{"tfc:anvil":{"order":20}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/tfc_blast_furnace.json b/kubejs/assets/emi/category/properties/tfc_blast_furnace.json index bcf2aeb66..d5bfd0031 100644 --- a/kubejs/assets/emi/category/properties/tfc_blast_furnace.json +++ b/kubejs/assets/emi/category/properties/tfc_blast_furnace.json @@ -1 +1 @@ -{"tfc:blast_furnace":{"order":27}} \ No newline at end of file +{"tfc:blast_furnace":{"order":28}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/tfc_bloomery.json b/kubejs/assets/emi/category/properties/tfc_bloomery.json index 64e2b0fc5..ca4669630 100644 --- a/kubejs/assets/emi/category/properties/tfc_bloomery.json +++ b/kubejs/assets/emi/category/properties/tfc_bloomery.json @@ -1 +1 @@ -{"tfc:bloomery":{"order":26}} \ No newline at end of file +{"tfc:bloomery":{"order":27}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/tfc_casting.json b/kubejs/assets/emi/category/properties/tfc_casting.json index 7ab19f53a..429cc3c55 100644 --- a/kubejs/assets/emi/category/properties/tfc_casting.json +++ b/kubejs/assets/emi/category/properties/tfc_casting.json @@ -1 +1 @@ -{"tfc:casting":{"order":18}} \ No newline at end of file +{"tfc:casting":{"order":19}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/tfc_chisel.json b/kubejs/assets/emi/category/properties/tfc_chisel.json index e1060b283..ca7e4f652 100644 --- a/kubejs/assets/emi/category/properties/tfc_chisel.json +++ b/kubejs/assets/emi/category/properties/tfc_chisel.json @@ -1 +1 @@ -{"tfc:chisel":{"order":33}} \ No newline at end of file +{"tfc:chisel":{"order":34}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/tfc_glassworking.json b/kubejs/assets/emi/category/properties/tfc_glassworking.json index 6e0a43dc4..eb9ecc48c 100644 --- a/kubejs/assets/emi/category/properties/tfc_glassworking.json +++ b/kubejs/assets/emi/category/properties/tfc_glassworking.json @@ -1 +1 @@ -{"tfc:glassworking":{"order":32}} \ No newline at end of file +{"tfc:glassworking":{"order":33}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/tfc_heating.json b/kubejs/assets/emi/category/properties/tfc_heating.json index 1d8ff6480..e96e69649 100644 --- a/kubejs/assets/emi/category/properties/tfc_heating.json +++ b/kubejs/assets/emi/category/properties/tfc_heating.json @@ -1 +1 @@ -{"tfc:heating":{"order":16}} \ No newline at end of file +{"tfc:heating":{"order":17}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/tfc_instant_barrel.json b/kubejs/assets/emi/category/properties/tfc_instant_barrel.json index d877178e4..bc8c355ee 100644 --- a/kubejs/assets/emi/category/properties/tfc_instant_barrel.json +++ b/kubejs/assets/emi/category/properties/tfc_instant_barrel.json @@ -1 +1 @@ -{"tfc:instant_barrel":{"order":23}} \ No newline at end of file +{"tfc:instant_barrel":{"order":24}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/tfc_instant_fluid_barrel.json b/kubejs/assets/emi/category/properties/tfc_instant_fluid_barrel.json index e7477e0f5..94fc2b3a4 100644 --- a/kubejs/assets/emi/category/properties/tfc_instant_fluid_barrel.json +++ b/kubejs/assets/emi/category/properties/tfc_instant_fluid_barrel.json @@ -1 +1 @@ -{"tfc:instant_fluid_barrel":{"order":24}} \ No newline at end of file +{"tfc:instant_fluid_barrel":{"order":25}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/tfc_jam_pot.json b/kubejs/assets/emi/category/properties/tfc_jam_pot.json index 0aef4616a..681c4b0ca 100644 --- a/kubejs/assets/emi/category/properties/tfc_jam_pot.json +++ b/kubejs/assets/emi/category/properties/tfc_jam_pot.json @@ -1 +1 @@ -{"tfc:jam_pot":{"order":42}} \ No newline at end of file +{"tfc:jam_pot":{"order":43}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/tfc_loom.json b/kubejs/assets/emi/category/properties/tfc_loom.json index e75a691b5..9cc1fda8b 100644 --- a/kubejs/assets/emi/category/properties/tfc_loom.json +++ b/kubejs/assets/emi/category/properties/tfc_loom.json @@ -1 +1 @@ -{"tfc:loom":{"order":31}} \ No newline at end of file +{"tfc:loom":{"order":32}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/tfc_quern.json b/kubejs/assets/emi/category/properties/tfc_quern.json index 236da9c3b..f63c00555 100644 --- a/kubejs/assets/emi/category/properties/tfc_quern.json +++ b/kubejs/assets/emi/category/properties/tfc_quern.json @@ -1 +1 @@ -{"tfc:quern":{"order":17}} \ No newline at end of file +{"tfc:quern":{"order":18}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/tfc_scraping.json b/kubejs/assets/emi/category/properties/tfc_scraping.json index e14d944ca..c4288360f 100644 --- a/kubejs/assets/emi/category/properties/tfc_scraping.json +++ b/kubejs/assets/emi/category/properties/tfc_scraping.json @@ -1 +1 @@ -{"tfc:scraping":{"order":30}} \ No newline at end of file +{"tfc:scraping":{"order":31}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/tfc_sealed_barrel.json b/kubejs/assets/emi/category/properties/tfc_sealed_barrel.json index e03845208..cc7562727 100644 --- a/kubejs/assets/emi/category/properties/tfc_sealed_barrel.json +++ b/kubejs/assets/emi/category/properties/tfc_sealed_barrel.json @@ -1 +1 @@ -{"tfc:sealed_barrel":{"order":25}} \ No newline at end of file +{"tfc:sealed_barrel":{"order":26}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/tfc_sewing.json b/kubejs/assets/emi/category/properties/tfc_sewing.json index 75fbf2ebf..c29ae1052 100644 --- a/kubejs/assets/emi/category/properties/tfc_sewing.json +++ b/kubejs/assets/emi/category/properties/tfc_sewing.json @@ -1 +1 @@ -{"tfc:sewing":{"order":34}} \ No newline at end of file +{"tfc:sewing":{"order":35}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/tfc_simple_pot.json b/kubejs/assets/emi/category/properties/tfc_simple_pot.json index 1fb8c60ce..479fb4384 100644 --- a/kubejs/assets/emi/category/properties/tfc_simple_pot.json +++ b/kubejs/assets/emi/category/properties/tfc_simple_pot.json @@ -1 +1 @@ -{"tfc:simple_pot":{"order":40}} \ No newline at end of file +{"tfc:simple_pot":{"order":41}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/tfc_soup_pot.json b/kubejs/assets/emi/category/properties/tfc_soup_pot.json index 2692e0a12..11e15e272 100644 --- a/kubejs/assets/emi/category/properties/tfc_soup_pot.json +++ b/kubejs/assets/emi/category/properties/tfc_soup_pot.json @@ -1 +1 @@ -{"tfc:soup_pot":{"order":41}} \ No newline at end of file +{"tfc:soup_pot":{"order":42}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/tfc_welding.json b/kubejs/assets/emi/category/properties/tfc_welding.json index 0d3fa1c3a..f8f98981d 100644 --- a/kubejs/assets/emi/category/properties/tfc_welding.json +++ b/kubejs/assets/emi/category/properties/tfc_welding.json @@ -1 +1 @@ -{"tfc:welding":{"order":20}} \ No newline at end of file +{"tfc:welding":{"order":21}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/tfg_artisan_table.json b/kubejs/assets/emi/category/properties/tfg_artisan_table.json new file mode 100644 index 000000000..1288ac4a4 --- /dev/null +++ b/kubejs/assets/emi/category/properties/tfg_artisan_table.json @@ -0,0 +1 @@ +{"tfg:artisan_table":{"order":16}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/tfg_blaze_burner.json b/kubejs/assets/emi/category/properties/tfg_blaze_burner.json index f5b18fcd8..697bd742c 100644 --- a/kubejs/assets/emi/category/properties/tfg_blaze_burner.json +++ b/kubejs/assets/emi/category/properties/tfg_blaze_burner.json @@ -1 +1 @@ -{"tfg:blaze_burner":{"order":60}} \ No newline at end of file +{"tfg:blaze_burner":{"order":61}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/tfg_block_interaction.json b/kubejs/assets/emi/category/properties/tfg_block_interaction.json index fa4725535..e4355d70b 100644 --- a/kubejs/assets/emi/category/properties/tfg_block_interaction.json +++ b/kubejs/assets/emi/category/properties/tfg_block_interaction.json @@ -1 +1 @@ -{"tfg:block_interaction":{"order":54}} \ No newline at end of file +{"tfg:block_interaction":{"order":55}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/vintageimprovements_centrifugation.json b/kubejs/assets/emi/category/properties/vintageimprovements_centrifugation.json index 05eea7f7b..7370eed06 100644 --- a/kubejs/assets/emi/category/properties/vintageimprovements_centrifugation.json +++ b/kubejs/assets/emi/category/properties/vintageimprovements_centrifugation.json @@ -1 +1 @@ -{"vintageimprovements:centrifugation":{"order":86}} \ No newline at end of file +{"vintageimprovements:centrifugation":{"order":93}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/vintageimprovements_coiling.json b/kubejs/assets/emi/category/properties/vintageimprovements_coiling.json index 185fc7f00..c22ef4e2d 100644 --- a/kubejs/assets/emi/category/properties/vintageimprovements_coiling.json +++ b/kubejs/assets/emi/category/properties/vintageimprovements_coiling.json @@ -1 +1 @@ -{"vintageimprovements:coiling":{"order":133}} \ No newline at end of file +{"vintageimprovements:coiling":{"order":140}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/vintageimprovements_curving.json b/kubejs/assets/emi/category/properties/vintageimprovements_curving.json index d08896541..7aec9d5b3 100644 --- a/kubejs/assets/emi/category/properties/vintageimprovements_curving.json +++ b/kubejs/assets/emi/category/properties/vintageimprovements_curving.json @@ -1 +1 @@ -{"vintageimprovements:curving":{"order":103}} \ No newline at end of file +{"vintageimprovements:curving":{"order":110}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/vintageimprovements_grinder_sandpaper_polishing.json b/kubejs/assets/emi/category/properties/vintageimprovements_grinder_sandpaper_polishing.json index ad40e3992..128e27e83 100644 --- a/kubejs/assets/emi/category/properties/vintageimprovements_grinder_sandpaper_polishing.json +++ b/kubejs/assets/emi/category/properties/vintageimprovements_grinder_sandpaper_polishing.json @@ -1 +1 @@ -{"vintageimprovements:grinder_sandpaper_polishing":{"order":51}} \ No newline at end of file +{"vintageimprovements:grinder_sandpaper_polishing":{"order":52}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/vintageimprovements_hammering.json b/kubejs/assets/emi/category/properties/vintageimprovements_hammering.json index 648a027a6..cadc583f1 100644 --- a/kubejs/assets/emi/category/properties/vintageimprovements_hammering.json +++ b/kubejs/assets/emi/category/properties/vintageimprovements_hammering.json @@ -1 +1 @@ -{"vintageimprovements:hammering":{"order":22}} \ No newline at end of file +{"vintageimprovements:hammering":{"order":23}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/vintageimprovements_laser_cutting.json b/kubejs/assets/emi/category/properties/vintageimprovements_laser_cutting.json index c014d6a25..bda0778a8 100644 --- a/kubejs/assets/emi/category/properties/vintageimprovements_laser_cutting.json +++ b/kubejs/assets/emi/category/properties/vintageimprovements_laser_cutting.json @@ -1 +1 @@ -{"vintageimprovements:laser_cutting":{"order":114}} \ No newline at end of file +{"vintageimprovements:laser_cutting":{"order":121}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/vintageimprovements_polishing.json b/kubejs/assets/emi/category/properties/vintageimprovements_polishing.json index 760cee391..d71b6efb1 100644 --- a/kubejs/assets/emi/category/properties/vintageimprovements_polishing.json +++ b/kubejs/assets/emi/category/properties/vintageimprovements_polishing.json @@ -1 +1 @@ -{"vintageimprovements:polishing":{"order":116}} \ No newline at end of file +{"vintageimprovements:polishing":{"order":123}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/vintageimprovements_pressurizing.json b/kubejs/assets/emi/category/properties/vintageimprovements_pressurizing.json index f6bb70239..f4728f967 100644 --- a/kubejs/assets/emi/category/properties/vintageimprovements_pressurizing.json +++ b/kubejs/assets/emi/category/properties/vintageimprovements_pressurizing.json @@ -1 +1 @@ -{"vintageimprovements:pressurizing":{"order":82}} \ No newline at end of file +{"vintageimprovements:pressurizing":{"order":89}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/vintageimprovements_vacuumizing.json b/kubejs/assets/emi/category/properties/vintageimprovements_vacuumizing.json index 8e01ce0e6..4e919b6ad 100644 --- a/kubejs/assets/emi/category/properties/vintageimprovements_vacuumizing.json +++ b/kubejs/assets/emi/category/properties/vintageimprovements_vacuumizing.json @@ -1 +1 @@ -{"vintageimprovements:vacuumizing":{"order":101}} \ No newline at end of file +{"vintageimprovements:vacuumizing":{"order":108}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/vintageimprovements_vibrating.json b/kubejs/assets/emi/category/properties/vintageimprovements_vibrating.json index 9cc5cbe70..4c48b860d 100644 --- a/kubejs/assets/emi/category/properties/vintageimprovements_vibrating.json +++ b/kubejs/assets/emi/category/properties/vintageimprovements_vibrating.json @@ -1 +1 @@ -{"vintageimprovements:vibrating":{"order":130}} \ No newline at end of file +{"vintageimprovements:vibrating":{"order":137}} \ No newline at end of file diff --git a/kubejs/assets/firmalife/textures/block/groundcover/ore/small_chromite.png b/kubejs/assets/firmalife/textures/block/groundcover/ore/small_chromite.png new file mode 100644 index 000000000..e47ea74ee Binary files /dev/null and b/kubejs/assets/firmalife/textures/block/groundcover/ore/small_chromite.png differ diff --git a/kubejs/assets/firmalife/textures/item/ore/normal_chromite.png b/kubejs/assets/firmalife/textures/item/ore/normal_chromite.png new file mode 100644 index 000000000..b5ccb9fa1 Binary files /dev/null and b/kubejs/assets/firmalife/textures/item/ore/normal_chromite.png differ diff --git a/kubejs/assets/firmalife/textures/item/ore/poor_chromite.png b/kubejs/assets/firmalife/textures/item/ore/poor_chromite.png new file mode 100644 index 000000000..99d8cfa7f Binary files /dev/null and b/kubejs/assets/firmalife/textures/item/ore/poor_chromite.png differ diff --git a/kubejs/assets/firmalife/textures/item/ore/rich_chromite.png b/kubejs/assets/firmalife/textures/item/ore/rich_chromite.png new file mode 100644 index 000000000..34675371f Binary files /dev/null and b/kubejs/assets/firmalife/textures/item/ore/rich_chromite.png differ diff --git a/kubejs/assets/firmalife/textures/item/ore/small_chromite.png b/kubejs/assets/firmalife/textures/item/ore/small_chromite.png new file mode 100644 index 000000000..a6919375a Binary files /dev/null and b/kubejs/assets/firmalife/textures/item/ore/small_chromite.png differ diff --git a/kubejs/assets/gtceu/lang/en_us.json b/kubejs/assets/gtceu/lang/en_us.json index 4f656545c..7e6050d1c 100644 --- a/kubejs/assets/gtceu/lang/en_us.json +++ b/kubejs/assets/gtceu/lang/en_us.json @@ -126,22 +126,14 @@ "material.gtceu.hydrogen_iodide": "Hydrogen Iodide", "material.gtceu.dense_steam": "High Pressure Steam", "material.gtceu.radioactive_steam": "Radioactive Steam", - "material.gtceu.radioactive_waste": "Radioactive Waste", + "material.gtceu.radioactive_waste": "Thorium Waste", "material.gtceu.irradiated_steam": "Irradiated Steam", - "material.gtceu.heavy_water": "Heavy Water", "material.gtceu.uranium_waste": "Uranium Waste", "material.gtceu.nuclear_waste": "Nuclear Waste", "material.gtceu.dirty_hexafluorosilicic_acid": "Dirty Hexafluorosilicic Acid", "material.gtceu.martian_sludge": "Martian Sludge", "material.gtceu.dioxygen_difluoride": "Dioxygen Difluoride", "material.gtceu.tritiated_water": "Tritiated Water", - "material.gtceu.raw_rich_brine": "Raw Rich Brine", - "material.gtceu.hot_iodine_brine": "Hot Iodine Brine", - "material.gtceu.brominated_iodine_vapor": "Brominated Iodine Vapor", - "material.gtceu.basic_bromine_exhaust": "Basic Bromine Exhaust", - "material.gtceu.dirty_flibe": "Dirty FLiBe", - "material.gtceu.flibe": "FLiBe", - "material.gtceu.hot_flibe": "Hot FLiBe", "material.gtceu.raw_brine": "Raw Brine", "material.gtceu.hot_brine": "Hot Brine", "material.gtceu.hot_chlorinated_brominated_brine": "Hot Chlorinated Brominated Brine", @@ -164,6 +156,11 @@ "material.gtceu.americium": "Americium 243", "material.gtceu.uranium": "Uranium 238", "material.gtceu.plutonium": "Plutonium 239", + "material.gtceu.neptunium_237": "Neptunium 237", + "material.gtceu.caesium_137": "Caesium 137", + "material.gtceu.americium_241": "Americium 241", + "material.gtceu.californium_252": "Californium 252", + "material.gtceu.boron_10": "Boron 10", "material.gtceu.residual_radioactive_concoction": "Residual Radioactive Concoction", "material.gtceu.regolith_vapor": "Regolith Vapor", "material.gtceu.dense_ostrum_vapor": "Dense Ostrum Vapor", @@ -190,6 +187,8 @@ "block.gtceu.wire_coil.tooltip_cracking": "§8Cracking Unit, Moon and Ostrum Harvesters:§r", "tooltip.moldraw.shift_view_molecule": "§7§oHold (Shift) for Molecular Structure§r", "tooltip.moldraw.shift_view_alloy": "§7§oHold (Shift) for Alloy Composition§r", + "gtceu.medical_condition.antidote.description.effect_removed": "Removes %s%% of the above conditions' effects", + "gtceu.medical_condition.antidote.description.effect_removed.all": "Removes all of the above conditions' effects", "gtceu.greenhouse": "Electric Greenhouse", "gtceu.steam_bloomery": "Steam Bloomery", "gtceu.food_oven": "Food Oven", @@ -200,6 +199,7 @@ "gtceu.gas_pressurizer": "Gas Pressurizer", "gtceu.nuclear_fuel_factory": "Nuclear Fuel Factory", "gtceu.nuclear_turbine": "Nuclear Steam Turbine", + "gtceu.cooling_tower": "Nuclear Cooling Tower", "gtceu.heat_exchanger": "Heat Exchanger", "gtceu.fission_reactor": "Fission Reactor", "gtceu.evaporation_tower": "Evaporation Tower", @@ -248,6 +248,8 @@ "tagprefix.deepslate": "Migmatite %s Ore", "tagprefix.pyroxenite": "Pyroxenite %s Ore", "tagprefix.dripstone": "Travertine %s Ore", + "tagprefix.sandy_jadestone": "Lamproite %s Ore", + "tagprefix.flavolite": "Ignimbrite %s Ore", "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", @@ -255,6 +257,7 @@ "gtceu.tooltip.machine.ostrum_harvester_3": "§7Requires drilling fluid to work.§r", "gtceu.tooltip.machine.ostrum_linear_accelerator_1": "§7Higgs Boson not included§r", "gtceu.tooltip.machine.ostrum_linear_accelerator_2": "§7Breaks down Ostrum Dust into its components. Requires various fluids from fission line.§r", + "gtceu.tooltip.machine.ostrum_linear_accelerator_3": "§7Cannot Overclock, use §eHeat§r§7 and §eTemperature§r§7 from an adjascent §bHeat Battery§r§7 to run.§r", "gtceu.tooltip.machine.heat_exchanger_1": "§7Heating up Fluids with other hot Fluids§r", "gtceu.tooltip.machine.heat_exchanger_2": "§7Transfers heat from one fluid to another.§r", "gtceu.tooltip.machine.nuclear_fuel_factory_1": "§7Producing extra spicy Rods§r", diff --git a/kubejs/assets/gtceu/lang/zh_cn.json b/kubejs/assets/gtceu/lang/zh_cn.json index ede962ce3..61fd14ab4 100644 --- a/kubejs/assets/gtceu/lang/zh_cn.json +++ b/kubejs/assets/gtceu/lang/zh_cn.json @@ -190,10 +190,12 @@ "block.gtceu.wire_coil.tooltip_cracking": "§8čĢ‚化朚月åĢĪ和įīŦ金采集å™Ļ§r", "tooltip.moldraw.shift_view_molecule": "§7§oæŒ‰ä―(Shift)æŸĨįœ‹åˆ†å­įŧ“构§r", "tooltip.moldraw.shift_view_alloy": "§7§oæŒ‰ä―(Shift)æŸĨįœ‹åˆé‡‘成分§r", + "gtceu.medical_condition.antidote.description.effect_removed": "äļŠčŋ°į–ūį—…效果持įŧ­æ—ķé—īé™ä―Ž%s%%", + "gtceu.medical_condition.antidote.description.effect_removed.all": "æķˆé™ĪäļŠčŋ°æ‰€æœ‰į–ūį—…效果", "gtceu.greenhouse": "į”ĩ力æļĐåŪĪ", "gtceu.steam_bloomery": "č’ļæą―é”ŧ铁į‚‰", "gtceu.food_oven": "į”ĩįƒĪįŪą", - "gtceu.food_processor": "éĢŸį‰ĐåĪ„į†æœš", + "gtceu.food_processor": "éĢŸå“åŠ å·Ĩ朚", "gtceu.large_solar_panel": "åĪ§åž‹åĪŠé˜ģčƒ―é˜ĩ列 MK I", "gtceu.large_solar_panel_tier2": "åĪ§åž‹åĪŠé˜ģčƒ―é˜ĩ列 MK II", "gtceu.large_solar_panel_tier3": "åĪ§åž‹åĪŠé˜ģčƒ―é˜ĩ列 MK III", diff --git a/kubejs/assets/gtceu/models/item/material_sets/cereal_box/ingot.json b/kubejs/assets/gtceu/models/item/material_sets/cereal_box/ingot.json new file mode 100644 index 000000000..66e76423a --- /dev/null +++ b/kubejs/assets/gtceu/models/item/material_sets/cereal_box/ingot.json @@ -0,0 +1,8 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gtceu:item/material_sets/cereal_box/ingot", + "layer1": "gtceu:item/material_sets/cereal_box/ingot_secondary", + "layer2": "gtceu:item/material_sets/cereal_box/ingot_overlay" + } +} diff --git a/kubejs/assets/gtceu/models/item/material_sets/cereal_box/ingot_hot.json b/kubejs/assets/gtceu/models/item/material_sets/cereal_box/ingot_hot.json new file mode 100644 index 000000000..3c7709efb --- /dev/null +++ b/kubejs/assets/gtceu/models/item/material_sets/cereal_box/ingot_hot.json @@ -0,0 +1,9 @@ +{ + "parent": "gtceu:item/material_sets/cereal_box/ingot", + "textures": { + "layer0": "gtceu:item/material_sets/cereal_box/ingot", + "layer1": "gtceu:item/material_sets/cereal_box/ingot_secondary", + "layer2": "gtceu:item/material_sets/cereal_box/ingot_overlay", + "layer3": "gtceu:item/material_sets/cereal_box/ingot_hot_overlay" + } +} \ No newline at end of file diff --git a/kubejs/assets/gtceu/models/item/material_sets/noodle/ingot.json b/kubejs/assets/gtceu/models/item/material_sets/noodle/ingot.json new file mode 100644 index 000000000..9351df688 --- /dev/null +++ b/kubejs/assets/gtceu/models/item/material_sets/noodle/ingot.json @@ -0,0 +1,8 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gtceu:item/material_sets/noodle/ingot", + "layer1": "gtceu:item/material_sets/noodle/ingot_secondary", + "layer2": "gtceu:item/material_sets/noodle/ingot_overlay" + } +} diff --git a/kubejs/assets/gtceu/models/item/material_sets/noodle/ingot_hot.json b/kubejs/assets/gtceu/models/item/material_sets/noodle/ingot_hot.json new file mode 100644 index 000000000..b1b980e91 --- /dev/null +++ b/kubejs/assets/gtceu/models/item/material_sets/noodle/ingot_hot.json @@ -0,0 +1,9 @@ +{ + "parent": "gtceu:item/material_sets/noodle/ingot", + "textures": { + "layer0": "gtceu:item/material_sets/noodle/ingot", + "layer1": "gtceu:item/material_sets/noodle/ingot_secondary", + "layer2": "gtceu:item/material_sets/noodle/ingot_overlay", + "layer3": "gtceu:item/material_sets/noodle/ingot_hot_overlay" + } +} \ No newline at end of file diff --git a/kubejs/assets/gtceu/models/item/material_sets/radioactive/ingot_hot.json b/kubejs/assets/gtceu/models/item/material_sets/radioactive/ingot_hot.json new file mode 100644 index 000000000..58452c41d --- /dev/null +++ b/kubejs/assets/gtceu/models/item/material_sets/radioactive/ingot_hot.json @@ -0,0 +1,6 @@ +{ + "parent": "gtceu:item/material_sets/metallic/ingot_hot", + "textures": { + "layer1": "gtceu:item/material_sets/radioactive/ingot_secondary" + } +} \ No newline at end of file diff --git a/kubejs/assets/gtceu/textures/block/fluids/fluid.dense_steam.png b/kubejs/assets/gtceu/textures/block/fluids/fluid.dense_steam.png index 8cca66fc9..922607cf6 100644 Binary files a/kubejs/assets/gtceu/textures/block/fluids/fluid.dense_steam.png and b/kubejs/assets/gtceu/textures/block/fluids/fluid.dense_steam.png differ diff --git a/kubejs/assets/gtceu/textures/block/fluids/fluid.dense_steam.png.mcmeta b/kubejs/assets/gtceu/textures/block/fluids/fluid.dense_steam.png.mcmeta index 33611385b..c5d457f93 100644 --- a/kubejs/assets/gtceu/textures/block/fluids/fluid.dense_steam.png.mcmeta +++ b/kubejs/assets/gtceu/textures/block/fluids/fluid.dense_steam.png.mcmeta @@ -1,45 +1,5 @@ { "animation": { - "frametime": 1, - "frames": [ - 0, - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8, - 9, - 10, - 11, - 12, - 13, - 14, - 15, - 16, - 17, - 18, - 19, - 18, - 17, - 16, - 15, - 14, - 13, - 12, - 11, - 10, - 9, - 8, - 7, - 6, - 5, - 4, - 3, - 2, - 1 - ] + "frametime": 1 } } \ No newline at end of file diff --git a/kubejs/assets/gtceu/textures/block/fluids/fluid.irradiated_steam.png b/kubejs/assets/gtceu/textures/block/fluids/fluid.irradiated_steam.png index 382800137..465c2a975 100644 Binary files a/kubejs/assets/gtceu/textures/block/fluids/fluid.irradiated_steam.png and b/kubejs/assets/gtceu/textures/block/fluids/fluid.irradiated_steam.png differ diff --git a/kubejs/assets/gtceu/textures/block/fluids/fluid.irradiated_steam.png.mcmeta b/kubejs/assets/gtceu/textures/block/fluids/fluid.irradiated_steam.png.mcmeta index 33611385b..c5d457f93 100644 --- a/kubejs/assets/gtceu/textures/block/fluids/fluid.irradiated_steam.png.mcmeta +++ b/kubejs/assets/gtceu/textures/block/fluids/fluid.irradiated_steam.png.mcmeta @@ -1,45 +1,5 @@ { "animation": { - "frametime": 1, - "frames": [ - 0, - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8, - 9, - 10, - 11, - 12, - 13, - 14, - 15, - 16, - 17, - 18, - 19, - 18, - 17, - 16, - 15, - 14, - 13, - 12, - 11, - 10, - 9, - 8, - 7, - 6, - 5, - 4, - 3, - 2, - 1 - ] + "frametime": 1 } } \ No newline at end of file diff --git a/kubejs/assets/gtceu/textures/block/fluids/fluid.lightweight_ostrum_vapor.png.mcmeta b/kubejs/assets/gtceu/textures/block/fluids/fluid.lightweight_ostrum_vapor.png.mcmeta index 744a3d54c..efc92f29e 100644 --- a/kubejs/assets/gtceu/textures/block/fluids/fluid.lightweight_ostrum_vapor.png.mcmeta +++ b/kubejs/assets/gtceu/textures/block/fluids/fluid.lightweight_ostrum_vapor.png.mcmeta @@ -42,8 +42,6 @@ 37, 38, 39, - 40, - 39, 38, 37, 36, diff --git a/kubejs/assets/gtceu/textures/block/fluids/fluid.radioactive_steam.png b/kubejs/assets/gtceu/textures/block/fluids/fluid.radioactive_steam.png index 608ba1eb2..e07a4eaae 100644 Binary files a/kubejs/assets/gtceu/textures/block/fluids/fluid.radioactive_steam.png and b/kubejs/assets/gtceu/textures/block/fluids/fluid.radioactive_steam.png differ diff --git a/kubejs/assets/gtceu/textures/block/fluids/fluid.radioactive_steam.png.mcmeta b/kubejs/assets/gtceu/textures/block/fluids/fluid.radioactive_steam.png.mcmeta index 33611385b..c5d457f93 100644 --- a/kubejs/assets/gtceu/textures/block/fluids/fluid.radioactive_steam.png.mcmeta +++ b/kubejs/assets/gtceu/textures/block/fluids/fluid.radioactive_steam.png.mcmeta @@ -1,45 +1,5 @@ { "animation": { - "frametime": 1, - "frames": [ - 0, - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8, - 9, - 10, - 11, - 12, - 13, - 14, - 15, - 16, - 17, - 18, - 19, - 18, - 17, - 16, - 15, - 14, - 13, - 12, - 11, - 10, - 9, - 8, - 7, - 6, - 5, - 4, - 3, - 2, - 1 - ] + "frametime": 1 } } \ No newline at end of file diff --git a/kubejs/assets/gtceu/textures/block/fluids/fluid.radioactive_waste.png b/kubejs/assets/gtceu/textures/block/fluids/fluid.radioactive_waste.png index c97f8bf25..e2bd21213 100644 Binary files a/kubejs/assets/gtceu/textures/block/fluids/fluid.radioactive_waste.png and b/kubejs/assets/gtceu/textures/block/fluids/fluid.radioactive_waste.png differ diff --git a/kubejs/assets/gtceu/textures/block/fluids/fluid.radioactive_waste.png.mcmeta b/kubejs/assets/gtceu/textures/block/fluids/fluid.radioactive_waste.png.mcmeta index 52c527b88..7e77c6485 100644 --- a/kubejs/assets/gtceu/textures/block/fluids/fluid.radioactive_waste.png.mcmeta +++ b/kubejs/assets/gtceu/textures/block/fluids/fluid.radioactive_waste.png.mcmeta @@ -1,69 +1,5 @@ { "animation": { - "frametime": 2, - "frames": [ - 0, - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8, - 9, - 10, - 11, - 12, - 13, - 14, - 15, - 16, - 17, - 18, - 19, - 20, - 21, - 22, - 23, - 24, - 25, - 26, - 27, - 28, - 29, - 30, - 31, - 30, - 29, - 28, - 27, - 26, - 25, - 24, - 23, - 22, - 21, - 20, - 19, - 18, - 17, - 16, - 15, - 14, - 13, - 12, - 11, - 10, - 9, - 8, - 7, - 6, - 5, - 4, - 3, - 2, - 1 - ] + "frametime": 2 } } \ No newline at end of file diff --git a/kubejs/assets/gtceu/textures/block/fluids/fluid.tritiated_water.png b/kubejs/assets/gtceu/textures/block/fluids/fluid.tritiated_water.png new file mode 100644 index 000000000..ac4f4a457 Binary files /dev/null and b/kubejs/assets/gtceu/textures/block/fluids/fluid.tritiated_water.png differ diff --git a/kubejs/assets/gtceu/textures/block/fluids/fluid.tritiated_water.png.mcmeta b/kubejs/assets/gtceu/textures/block/fluids/fluid.tritiated_water.png.mcmeta new file mode 100644 index 000000000..7e77c6485 --- /dev/null +++ b/kubejs/assets/gtceu/textures/block/fluids/fluid.tritiated_water.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 2 + } +} \ No newline at end of file diff --git a/kubejs/assets/gtceu/textures/block/fluids/fluid.uranium_waste.png b/kubejs/assets/gtceu/textures/block/fluids/fluid.uranium_waste.png index af5d59697..73eed58e6 100644 Binary files a/kubejs/assets/gtceu/textures/block/fluids/fluid.uranium_waste.png and b/kubejs/assets/gtceu/textures/block/fluids/fluid.uranium_waste.png differ diff --git a/kubejs/assets/gtceu/textures/block/fluids/fluid.uranium_waste.png.mcmeta b/kubejs/assets/gtceu/textures/block/fluids/fluid.uranium_waste.png.mcmeta index 744a3d54c..7e77c6485 100644 --- a/kubejs/assets/gtceu/textures/block/fluids/fluid.uranium_waste.png.mcmeta +++ b/kubejs/assets/gtceu/textures/block/fluids/fluid.uranium_waste.png.mcmeta @@ -1,87 +1,5 @@ { "animation": { - "frametime": 2, - "frames": [ - 0, - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8, - 9, - 10, - 11, - 12, - 13, - 14, - 15, - 16, - 17, - 18, - 19, - 20, - 21, - 22, - 23, - 24, - 25, - 26, - 27, - 28, - 29, - 30, - 31, - 32, - 33, - 34, - 35, - 36, - 37, - 38, - 39, - 40, - 39, - 38, - 37, - 36, - 35, - 34, - 33, - 32, - 31, - 30, - 29, - 28, - 27, - 26, - 25, - 24, - 23, - 22, - 21, - 20, - 19, - 18, - 17, - 16, - 15, - 14, - 13, - 12, - 11, - 10, - 9, - 8, - 7, - 6, - 5, - 4, - 3, - 2, - 1 - ] + "frametime": 2 } } \ No newline at end of file diff --git a/kubejs/assets/gtceu/textures/item/material_sets/cereal_box/ingot.png b/kubejs/assets/gtceu/textures/item/material_sets/cereal_box/ingot.png new file mode 100644 index 000000000..20b490e7b Binary files /dev/null and b/kubejs/assets/gtceu/textures/item/material_sets/cereal_box/ingot.png differ diff --git a/kubejs/assets/gtceu/textures/item/material_sets/cereal_box/ingot_hot_overlay.png b/kubejs/assets/gtceu/textures/item/material_sets/cereal_box/ingot_hot_overlay.png new file mode 100644 index 000000000..26055b670 Binary files /dev/null and b/kubejs/assets/gtceu/textures/item/material_sets/cereal_box/ingot_hot_overlay.png differ diff --git a/kubejs/assets/gtceu/textures/item/material_sets/cereal_box/ingot_overlay.png b/kubejs/assets/gtceu/textures/item/material_sets/cereal_box/ingot_overlay.png new file mode 100644 index 000000000..2afe4ed61 Binary files /dev/null and b/kubejs/assets/gtceu/textures/item/material_sets/cereal_box/ingot_overlay.png differ diff --git a/kubejs/assets/gtceu/textures/item/material_sets/cereal_box/ingot_secondary.png b/kubejs/assets/gtceu/textures/item/material_sets/cereal_box/ingot_secondary.png new file mode 100644 index 000000000..2c1d06a1d Binary files /dev/null and b/kubejs/assets/gtceu/textures/item/material_sets/cereal_box/ingot_secondary.png differ diff --git a/kubejs/assets/gtceu/textures/item/material_sets/dull/dusty_raw_ore_overlay.png.mcmeta b/kubejs/assets/gtceu/textures/item/material_sets/dull/dusty_raw_ore_overlay.png.mcmeta index 6439dab8e..cfc989020 100644 --- a/kubejs/assets/gtceu/textures/item/material_sets/dull/dusty_raw_ore_overlay.png.mcmeta +++ b/kubejs/assets/gtceu/textures/item/material_sets/dull/dusty_raw_ore_overlay.png.mcmeta @@ -32,8 +32,6 @@ 27, 28, 29, - 30, - 29, 28, 27, 26, diff --git a/kubejs/assets/gtceu/textures/item/material_sets/noodle/ingot.png b/kubejs/assets/gtceu/textures/item/material_sets/noodle/ingot.png new file mode 100644 index 000000000..b9532d4e6 Binary files /dev/null and b/kubejs/assets/gtceu/textures/item/material_sets/noodle/ingot.png differ diff --git a/kubejs/assets/gtceu/textures/item/material_sets/noodle/ingot_hot_overlay.png b/kubejs/assets/gtceu/textures/item/material_sets/noodle/ingot_hot_overlay.png new file mode 100644 index 000000000..49cdbba64 Binary files /dev/null and b/kubejs/assets/gtceu/textures/item/material_sets/noodle/ingot_hot_overlay.png differ diff --git a/kubejs/assets/gtceu/textures/item/material_sets/noodle/ingot_overlay.png b/kubejs/assets/gtceu/textures/item/material_sets/noodle/ingot_overlay.png new file mode 100644 index 000000000..d27dfaeba Binary files /dev/null and b/kubejs/assets/gtceu/textures/item/material_sets/noodle/ingot_overlay.png differ diff --git a/kubejs/assets/gtceu/textures/item/material_sets/noodle/ingot_secondary.png b/kubejs/assets/gtceu/textures/item/material_sets/noodle/ingot_secondary.png new file mode 100644 index 000000000..6bd4a2b56 Binary files /dev/null and b/kubejs/assets/gtceu/textures/item/material_sets/noodle/ingot_secondary.png differ diff --git a/kubejs/assets/minecraft/lang/en_us.json b/kubejs/assets/minecraft/lang/en_us.json index 48f1c9820..1c8fbe6ab 100644 --- a/kubejs/assets/minecraft/lang/en_us.json +++ b/kubejs/assets/minecraft/lang/en_us.json @@ -103,5 +103,6 @@ "item.minecraft.milk_bucket": "Cow Milk Bucket", "material.tfg.dripstone": "Travertine", "death.attack.magic": "%1$s was killed by deadly poison", - "death.attack.magic.player": "%1$s was killed by deadly poison whilst trying to escape %2$s" + "death.attack.magic.player": "%1$s was killed by deadly poison whilst trying to escape %2$s", + "effect.minecraft.dolphins_grace": "Swim Speed" } \ No newline at end of file diff --git a/kubejs/assets/minecraft/lang/ru_ru.json b/kubejs/assets/minecraft/lang/ru_ru.json index 6f0606390..14bed099b 100644 --- a/kubejs/assets/minecraft/lang/ru_ru.json +++ b/kubejs/assets/minecraft/lang/ru_ru.json @@ -99,6 +99,9 @@ "item.minecraft.nether_brick": "КÐĩŅ€Ð°Ņ‚ÐūŅ„ÐļŅ€ÐūÐēŅ‹Ðđ КÐļŅ€ÐŋÐļŅ‡", "item.minecraft.furnace_minecart": "ВаÐģÐūÐ―ÐĩŅ‚Ка Ņ ÐąÐūÐđÐŧÐĩŅ€ÐūО", "material.tfg.dripstone": "ÐĒŅ€Ð°ÐēÐĩŅ€Ņ‚ÐļÐ―", + "death.attack.magic": "%1$s ÐąŅ‹Ðŧ ŅƒÐąÐļŅ‚ ŅÐžÐĩŅ€Ņ‚ÐūÐ―ÐūŅÐ―Ņ‹Ðž ŅÐīÐūО", + "death.attack.magic.player": "%1$s ÐąŅ‹Ðŧ ŅƒÐąÐļŅ‚ ŅÐžÐĩŅ€Ņ‚ÐūÐ―ÐūŅÐ―Ņ‹Ðž ŅÐīÐūО ŅƒÐąÐĩÐģаŅ ÐūŅ‚ %2$s", + "effect.minecraft.dolphins_grace": "ÐĄÐšÐūŅ€ÐūŅŅ‚ŅŒ ÐŋÐŧаÐēÐ°Ð―ÐļŅ", "item.minecraft.gold_nugget": "ЗÐūÐŧÐūŅ‚Ðū (ÐĄÐ°ÐžÐūŅ€ÐūÐīÐūК)", "item.minecraft.gold_ingot": "ЗÐūÐŧÐūŅ‚Ðū (ÐĄÐŧÐļŅ‚ÐūК)", "item.minecraft.copper_ingot": "МÐĩÐīŅŒ (ÐĄÐŧÐļŅ‚ÐūК)", diff --git a/kubejs/assets/minecraft/lang/zh_cn.json b/kubejs/assets/minecraft/lang/zh_cn.json index 9249a8440..f44571d73 100644 --- a/kubejs/assets/minecraft/lang/zh_cn.json +++ b/kubejs/assets/minecraft/lang/zh_cn.json @@ -103,5 +103,6 @@ "item.minecraft.milk_bucket": "į‰›åĨķæĄķ", "material.tfg.dripstone": "įŸģį°åŽ", "death.attack.magic": "%1$s čĒŦæŊ’æ­ŧ乆", - "death.attack.magic.player": "%1$såœĻčŊ•å›ū逃įĶŧ%2$sæ—ķčĒŦæŊ’æ­ŧ乆" + "death.attack.magic.player": "%1$såœĻčŊ•å›ū逃įĶŧ%2$sæ—ķčĒŦæŊ’æ­ŧ乆", + "effect.minecraft.dolphins_grace": "æļļæģģ速åšĶ" } \ No newline at end of file diff --git a/kubejs/assets/minecraft/sounds.json b/kubejs/assets/minecraft/sounds.json new file mode 100644 index 000000000..1580bf5cf --- /dev/null +++ b/kubejs/assets/minecraft/sounds.json @@ -0,0 +1,210 @@ +{ + "music.game": { + "replace": true, + "sounds": [ + { + "name": "tfc:music/m0-dreams_of_the_phae", + "stream": true, + "weight": 4 + }, + { + "name": "tfc:music/m1-firmavista", + "stream": true, + "weight": 4 + }, + { + "name": "tfc:music/m2-sycamore_heights", + "stream": true, + "weight": 4 + }, + { + "name": "tfc:music/m3-terrafirmacraft", + "stream": true, + "weight": 4 + }, + { + "name": "tfc:music/m4-through_the_willows", + "stream": true, + "weight": 4 + }, + { + "name": "minecraft:music/game/creative/creative2", + "stream": true + }, + { + "name": "minecraft:music/game/creative/creative3", + "stream": true + }, + { + "name": "minecraft:music/game/creative/creative4", + "stream": true + }, + { + "name": "minecraft:music/game/nether/nether2", + "stream": true + }, + { + "name": "minecraft:music/game/swamp/aerie", + "stream": true, + "volume": 0.4 + }, + { + "name": "minecraft:music/game/swamp/firebugs", + "stream": true, + "volume": 0.4 + }, + { + "name": "minecraft:music/game/swamp/labyrinthine", + "stream": true, + "volume": 0.4 + }, + { + "name": "minecraft:music/game/water/axolotl", + "stream": true, + "volume": 0.4 + }, + { + "name": "minecraft:music/game/water/dragon_fish", + "stream": true, + "volume": 0.4 + }, + { + "name": "minecraft:music/game/water/shuniji", + "stream": true, + "volume": 0.4 + }, + { + "name": "minecraft:music/game/a_familiar_room", + "stream": true, + "volume": 0.4 + }, + { + "name": "minecraft:music/game/an_ordinary_day", + "stream": true, + "volume": 0.4 + }, + { + "name": "minecraft:music/game/bromeliad", + "stream": true, + "volume": 0.4 + }, + { + "name": "minecraft:music/game/comforting_memories", + "stream": true, + "volume": 0.4 + }, + { + "name": "minecraft:music/game/crescent_dunes", + "stream": true, + "volume": 0.4 + }, + { + "name": "minecraft:music/game/echo_in_the_wind", + "stream": true, + "volume": 0.4 + }, + { + "name": "minecraft:music/game/floating_dream", + "stream": true, + "volume": 0.4 + }, + { + "name": "minecraft:music/game/hal1", + "stream": true + }, + { + "name": "minecraft:music/game/hal2", + "stream": true + }, + { + "name": "minecraft:music/game/hal3", + "stream": true + }, + { + "name": "minecraft:music/game/hal4", + "stream": true + }, + { + "name": "minecraft:music/game/infinite_amethyst", + "stream": true, + "volume": 0.4 + }, + { + "name": "minecraft:music/game/left_to_bloom", + "stream": true, + "volume": 0.4 + }, + { + "name": "minecraft:music/game/one_more_day", + "stream": true, + "volume": 0.4 + }, + { + "name": "minecraft:music/game/stand_tall", + "stream": true, + "volume": 0.4 + }, + { + "name": "minecraft:music/game/wending", + "stream": true, + "volume": 0.4 + }, + { + "name": "minecraft:music/menu/menu1", + "stream": true + }, + { + "name": "minecraft:music/menu/menu2", + "stream": true + }, + { + "name": "minecraft:music/menu/menu3", + "stream": true + }, + { + "name": "minecraft:music/menu/menu4", + "stream": true + }, + { + "name": "minecraft:records/blocks", + "stream": true, + "volume": 0.4 + }, + { + "name": "minecraft:records/mall", + "stream": true, + "volume": 0.4 + }, + { + "name": "minecraft:records/strad", + "stream": true, + "volume": 0.4 + } + ] + }, + "music.menu": { + "replace": true, + "sounds": [ + { + "name": "tfc:music/m0-dreams_of_the_phae", + "stream": true + }, + { + "name": "tfc:music/m1-firmavista", + "stream": true + }, + { + "name": "tfc:music/m2-sycamore_heights", + "stream": true + }, + { + "name": "tfc:music/m3-terrafirmacraft", + "stream": true + }, + { + "name": "tfc:music/m4-through_the_willows", + "stream": true + } + ] + } +} \ No newline at end of file diff --git a/kubejs/assets/tfc/models/block/rock/magma/andesite.json b/kubejs/assets/tfc/models/block/rock/magma/andesite.json new file mode 100644 index 000000000..11668294a --- /dev/null +++ b/kubejs/assets/tfc/models/block/rock/magma/andesite.json @@ -0,0 +1,7 @@ +{ + "parent": "tfc:block/rock/magma/magma", + "textures": { + "0": "tfc:block/rock/magma/andesite", + "particle": "tfc:block/rock/magma/andesite" + } +} diff --git a/kubejs/assets/tfc/models/block/rock/magma/basalt.json b/kubejs/assets/tfc/models/block/rock/magma/basalt.json new file mode 100644 index 000000000..8a4654eb8 --- /dev/null +++ b/kubejs/assets/tfc/models/block/rock/magma/basalt.json @@ -0,0 +1,7 @@ +{ + "parent": "tfc:block/rock/magma/magma", + "textures": { + "0": "tfc:block/rock/magma/basalt", + "particle": "tfc:block/rock/magma/basalt" + } +} diff --git a/kubejs/assets/tfc/models/block/rock/magma/dacite.json b/kubejs/assets/tfc/models/block/rock/magma/dacite.json new file mode 100644 index 000000000..682d84608 --- /dev/null +++ b/kubejs/assets/tfc/models/block/rock/magma/dacite.json @@ -0,0 +1,7 @@ +{ + "parent": "tfc:block/rock/magma/magma", + "textures": { + "0": "tfc:block/rock/magma/dacite", + "particle": "tfc:block/rock/magma/dacite" + } +} diff --git a/kubejs/assets/tfc/models/block/rock/magma/diorite.json b/kubejs/assets/tfc/models/block/rock/magma/diorite.json new file mode 100644 index 000000000..7d100fee9 --- /dev/null +++ b/kubejs/assets/tfc/models/block/rock/magma/diorite.json @@ -0,0 +1,7 @@ +{ + "parent": "tfc:block/rock/magma/magma", + "textures": { + "0": "tfc:block/rock/magma/diorite", + "particle": "tfc:block/rock/magma/diorite" + } +} diff --git a/kubejs/assets/tfc/models/block/rock/magma/gabbro.json b/kubejs/assets/tfc/models/block/rock/magma/gabbro.json new file mode 100644 index 000000000..3f684ae32 --- /dev/null +++ b/kubejs/assets/tfc/models/block/rock/magma/gabbro.json @@ -0,0 +1,7 @@ +{ + "parent": "tfc:block/rock/magma/magma", + "textures": { + "0": "tfc:block/rock/magma/gabbro", + "particle": "tfc:block/rock/magma/gabbro" + } +} diff --git a/kubejs/assets/tfc/models/block/rock/magma/granite.json b/kubejs/assets/tfc/models/block/rock/magma/granite.json new file mode 100644 index 000000000..e7d1706f7 --- /dev/null +++ b/kubejs/assets/tfc/models/block/rock/magma/granite.json @@ -0,0 +1,7 @@ +{ + "parent": "tfc:block/rock/magma/magma", + "textures": { + "0": "tfc:block/rock/magma/granite", + "particle": "tfc:block/rock/magma/granite" + } +} diff --git a/kubejs/assets/tfc/models/block/rock/magma/magma.json b/kubejs/assets/tfc/models/block/rock/magma/magma.json new file mode 100644 index 000000000..9a3d09c75 --- /dev/null +++ b/kubejs/assets/tfc/models/block/rock/magma/magma.json @@ -0,0 +1,50 @@ +{ + "format_version": "1.9.0", + "elements": [ + { + "from": [0, 0, 0], + "to": [16, 16, 16], + "forge_data": { "block_light": 15, "sky_light": 15 }, + "faces": { + "north": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "east": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "south": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#0"} + } + } + ], + "display": { + "gui": { + "rotation": [ 30, 225, 0 ], + "translation": [ 0, 0, 0 ], + "scale": [ 0.625, 0.625, 0.625 ] + }, + "ground": { + "rotation": [ 0, 0, 0 ], + "translation": [ 0, 3, 0 ], + "scale": [ 0.25, 0.25, 0.25 ] + }, + "fixed": { + "rotation": [ 0, 0, 0 ], + "translation": [ 0, 0, 0 ], + "scale": [ 0.5, 0.5, 0.5 ] + }, + "thirdperson_righthand": { + "rotation": [ 75, 45, 0 ], + "translation": [ 0, 2.5, 0 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "firstperson_righthand": { + "rotation": [ 0, 45, 0 ], + "translation": [ 0, 0, 0 ], + "scale": [ 0.40, 0.40, 0.40 ] + }, + "firstperson_lefthand": { + "rotation": [ 0, 225, 0 ], + "translation": [ 0, 0, 0 ], + "scale": [ 0.40, 0.40, 0.40 ] + } + } +} diff --git a/kubejs/assets/tfc/models/block/rock/magma/rhyolite.json b/kubejs/assets/tfc/models/block/rock/magma/rhyolite.json new file mode 100644 index 000000000..f88af7a1a --- /dev/null +++ b/kubejs/assets/tfc/models/block/rock/magma/rhyolite.json @@ -0,0 +1,7 @@ +{ + "parent": "tfc:block/rock/magma/magma", + "textures": { + "0": "tfc:block/rock/magma/rhyolite", + "particle": "tfc:block/rock/magma/rhyolite" + } +} diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/mechanics/bloomery.json b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/mechanics/bloomery.json index 4bf3920e4..1c351fdd3 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/mechanics/bloomery.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/mechanics/bloomery.json @@ -34,7 +34,7 @@ }, { "type": "patchouli:text", - "text": "If you don't want to do the math, we recommend $(item)25 metal ore dusts$() and $(item)22 fuel items$().$(br2)After filling the bloomery with a combination of $(thing)Fuel$() and $(thing)Ore$(), light the bloomery block, and wait 15 hours for the bloomery to smelt. When the bloomery shuts off, it leaves behind a $(thing)Bloom$() block. This contains $(thing)Raw Iron Blooms$() which can be obtained by mining the $(thing)Bloom$() repeatedly with a pickaxe." + "text": "If you don't want to do the math, we recommend $(item)25 metal ore dusts$() and $(item)22 fuel items$().$(br2)After filling the bloomery with a combination of $(thing)Fuel$() and $(thing)Ore$(), light the bloomery doors, and wait 15 hours for the bloomery to smelt. When the bloomery shuts off, it leaves behind a $(thing)Bloom$() block. This contains $(thing)Raw Iron Blooms$() which can be obtained by mining the $(thing)Bloom$() repeatedly with a pickaxe." }, { "type": "patchouli:multiblock", diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/mechanics/crops.json b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/mechanics/crops.json index 4d4630e96..92926b373 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/mechanics/crops.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/mechanics/crops.json @@ -12,6 +12,15 @@ "type": "patchouli:text", "text": "In addition to finding wild crops, seeds can also be produced from existing crops. When a fully mature crop dies - either by weather, or leaving it to rot - it will go to seed, dropping more seeds that can be used to grow even more crops next season." }, + { + "type": "patchouli:text", + "title": "Contents", + "text": "$(li)$(l:tfc:mechanics/crops#barley)Barley$()$(li)$(l:tfc:mechanics/crops#beet)Beet$()$(li)$(l:tfc:mechanics/crops#cabbage)Cabbage$()$(li)$(l:tfc:mechanics/crops#canola)Canola$()$(li)$(l:tfc:mechanics/crops#carrot)Carrot$()$(li)$(l:tfc:mechanics/crops#flax)Flax$()$(li)$(l:tfc:mechanics/crops#garlic)Garlic$()$(li)$(l:tfc:mechanics/crops#green_bean)Green Bean$()$(li)$(l:tfc:mechanics/crops#jute)Jute$()$(li)$(l:tfc:mechanics/crops#maize)Maize$()$(li)$(l:tfc:mechanics/crops#melon)Melon$()$(li)$(l:tfc:mechanics/crops#oat)Oat$()$(li)$(l:tfc:mechanics/crops#onion)Onion$()" + }, + { + "type": "patchouli:text", + "text": "$(li)$(l:tfc:mechanics/crops#papyrus)Papyrus$()$(li)$(l:tfc:mechanics/crops#potato)Potato$()$(li)$(l:tfc:mechanics/crops#pumpkin)Pumpkin$()$(li)$(l:tfc:mechanics/crops#red_bell_pepper)Red Bell Pepper$()$(li)$(l:tfc:mechanics/crops#rice)Rice$()$(li)$(l:tfc:mechanics/crops#rye)Rye$()$(li)$(l:tfc:mechanics/crops#soybean)Soybean$()$(li)$(l:tfc:mechanics/crops#squash)Squash$()$(li)$(l:tfc:mechanics/crops#sugarcane)Sugarcane$()$(li)$(l:tfc:mechanics/crops#sunflower)Sunflower$()$(li)$(l:tfc:mechanics/crops#tomatoes)Tomato$()$(li)$(l:tfc:mechanics/crops#wheat)Wheat$()$(li)$(l:tfc:mechanics/crops#yellow_bell_pepper)Yellow Bell Pepper$()" + }, { "type": "tfc:rock_knapping_recipe", "recipes": [ @@ -3298,6 +3307,7 @@ }, { "type": "patchouli:text", + "anchor": "sunflower", "text": "$(bold)$(l:the_world/climate#temperature)Temperature$(): 5 - 40 °C$(br)$(bold)$(l:mechanics/hydration)Hydration$(): 20 - 80 %$(br)$(bold)Nutrient$(): Nitrogen$(br2)A Sunflower is a two block tall crop. Sunflower seeds can be planted on farmland, will grow two blocks tall, and will produce $(item)Sunflower Caps$() which can be processed into $(thing)Seed Oil$(). Seed Oil can both be used as Lamp Fuel, as well as $(thing)Bio Diesel$() later on.$(br)A Sunflower also counts as a Flower for the purposes of $(l:firmalife/beekeeping)Beekeeping$().", "title": "Sunflower" }, @@ -3456,6 +3466,7 @@ }, { "type": "patchouli:text", + "anchor": "canola", "text": "$(bold)$(l:the_world/climate#temperature)Temperature$(): -5 - 25 °C$(br)$(bold)$(l:mechanics/hydration)Hydration$(): 10 - 60 %$(br)$(bold)Nutrient$(): Phosphorus$(br2)Canola is a two block tall crop. Canola seeds can be planted on farmland, will grow two blocks tall, and will produce $(item)Canola Ovules$() which can be processed into $(thing)Seed Oil$(). Seed Oil can both be used as Lamp Fuel, as well as $(thing)Bio Diesel$() later on.$(br)Canola also counts as a Flower for the purposes of $(l:firmalife/beekeeping)Beekeeping$().", "title": "Canola" }, @@ -3615,6 +3626,7 @@ }, { "type": "patchouli:text", + "anchor": "flax", "text": "$(bold)$(l:the_world/climate#temperature)Temperature$(): -8 - 25 °C$(br)$(bold)$(l:mechanics/hydration)Hydration$(): 15 - 65 %$(br)$(bold)Nutrient$(): Nitrogen$(br2)Flax is a two block tall crop. Flax seeds can be planted on farmland, will grow two blocks tall, and will produce $(item)Flax Stems$() which can be processed into $(thing)Linen$() or $(thing)Burlap$().$(br)Flax also counts as a Flower for the purposes of $(l:firmalife/beekeeping)Beekeeping$().", "title": "Flax" }, diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/mechanics/drinks.json b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/mechanics/drinks.json index 38c1e6cb9..f4eefde87 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/mechanics/drinks.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/mechanics/drinks.json @@ -38,7 +38,7 @@ "type": "patchouli:spotlight", "title": "Teas", "text": "$(thing)Teas$() can be brewed using dried versions of certain plants.$(br2)They provide short but useful buffs and warm your body temperature by 4°C. Perfect for winters!", - "item": "tfc_gurman:tea_mint_bucket,tfc_gurman:tea_chamomile_bucket,tfc_gurman:tea_rosehip_bucket,tfc_gurman:tea_nettle_bucket" + "item": "tfc_gourmet:tea_mint_bucket,tfc_gourmet:tea_chamomile_bucket,tfc_gourmet:tea_rosehip_bucket,tfc_gourmet:tea_nettle_bucket" }, { "type": "patchouli:text", @@ -48,7 +48,7 @@ "type": "patchouli:spotlight", "title": "Treats", "text": "This is a category for more misc drinks with delicious taste and special effects. Enjoy!", - "item": "tfc_gurman:cocoa_bucket,tfc_gurman:coffee_bucket,tfc_gurman:nalivka_bucket,tfc_gurman:kvass_bucket,tfc_gurman:compote_bucket,tfc_gurman:lemonade_bucket" + "item": "tfc_gourmet:cocoa_bucket,tfc_gourmet:coffee_bucket,tfc_gourmet:nalivka_bucket,tfc_gourmet:kvass_bucket,tfc_gourmet:compote_bucket,tfc_gourmet:lemonade_bucket" }, { "type": "patchouli:text", @@ -58,7 +58,7 @@ "type": "patchouli:spotlight", "title": "Milks", "text": "$(thing)Milk$() can be aquired from most female livestock by simply right clicking them with a wood or metal bucket once familiarity is at a high enough level. (If the milking isn't working, make sure the buckets aren't stacked!)$(br)While it doesn't provide any buffs, it provides dairy nutrition if drank after eating, and can later be made into cheese.", - "item": "minecraft:milk_bucket,firmalife:bucket/yak_milk,firmalife:bucket/goat_milk,tfc_gurman:ox_milk_bucket,tfc_gurman:sheep_milk_bucket,tfc_gurman:alpaca_milk_bucket" + "item": "minecraft:milk_bucket,firmalife:bucket/yak_milk,firmalife:bucket/goat_milk,tfc_gourmet:ox_milk_bucket,tfc_gourmet:sheep_milk_bucket,tfc_gourmet:alpaca_milk_bucket" }, { "title": "Spring Water", diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/earth_ore_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/earth_ore_index.json index f7d325389..118ee2950 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/earth_ore_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/earth_ore_index.json @@ -34,7 +34,7 @@ }, { "Type": "patchouli:text", - "text": "$(li)Native Gold: $(l:tfg_ores/earth_vein_index#deep_gold)75%$(/l), $(l:tfg_ores/earth_vein_index#normal_gold)55%$(/l), $(l:tfg_ores/earth_vein_index#deep_magnetite)25%$(/l), $(l:tfg_ores/earth_vein_index#normal_magnetite)9%$(/l), $(l:tfg_ores/earth_vein_index#deep_hematite)5%$(/l), $(l:tfg_ores/earth_vein_index#normal_hematite)5%$(/l)$()$(li)Native Silver: $(l:tfg_ores/earth_vein_index#normal_silver)15%$(/l), $(l:tfg_ores/earth_vein_index#normal_bismuthinite)10%$(/l), $(l:tfg_ores/earth_vein_index#surface_bismuthinite)10%$(/l)$()$(li)Neodymium: $(l:tfg_ores/earth_vein_index#normal_monazite)6%$(/l)$()$(li)Nickel: $(l:tfg_ores/earth_vein_index#normal_garnierite)10%$(/l)$()$(li)Oilsands: $(l:tfg_ores/earth_vein_index#normal_oilsands)100%$(/l), $(l:tfg_ores/earth_vein_index#normal_tarkianite)35%$(/l)$()$(li)Olivine: $(l:tfg_ores/earth_vein_index#normal_olivine)25%$(/l)$()$(li)Opal: $(l:tfg_ores/earth_vein_index#deep_garnet_opal)55%$(/l), $(l:tfg_ores/earth_vein_index#deep_garnet_amethyst)15%$(/l)$()$(li)Pentlandite: $(l:tfg_ores/earth_vein_index#normal_garnierite)25%$(/l), $(l:tfg_ores/earth_vein_index#normal_lubricant)15%$(/l)$()$(li)Pitchblende: $(l:tfg_ores/earth_vein_index#deep_pitchblende)62%$(/l)$()$(li)Platinum: $(l:tfg_ores/earth_vein_index#deep_sheldonite)7%$(/l)$()$(li)Pollucite: $(l:tfg_ores/earth_vein_index#normal_mica)15%$(/l)$()$(li)Powellite: $(l:tfg_ores/earth_vein_index#deep_molybdenum)17%$(/l)$()$(li)Pyrite: $(l:tfg_ores/earth_vein_index#normal_sulfur)35%$(/l), $(l:tfg_ores/earth_vein_index#normal_sphalerite)25%$(/l), $(l:tfg_ores/earth_vein_index#normal_copper)10%$(/l), $(l:tfg_ores/earth_vein_index#surface_sphalerite)5%$(/l)$()$(li)Pyrochlore: $(l:tfg_ores/earth_vein_index#normal_apatite)15%$(/l)$()", + "text": "$(li)Native Gold: $(l:tfg_ores/earth_vein_index#deep_gold)75%$(/l), $(l:tfg_ores/earth_vein_index#normal_gold)55%$(/l), $(l:tfg_ores/earth_vein_index#deep_magnetite)25%$(/l), $(l:tfg_ores/earth_vein_index#normal_magnetite)9%$(/l), $(l:tfg_ores/earth_vein_index#deep_hematite)5%$(/l), $(l:tfg_ores/earth_vein_index#normal_hematite)5%$(/l)$()$(li)Native Silver: $(l:tfg_ores/earth_vein_index#normal_silver)15%$(/l), $(l:tfg_ores/earth_vein_index#normal_bismuthinite)10%$(/l), $(l:tfg_ores/earth_vein_index#surface_bismuthinite)10%$(/l)$()$(li)Neodymium: $(l:tfg_ores/earth_vein_index#normal_monazite)6%$(/l)$()$(li)Nickel: $(l:tfg_ores/earth_vein_index#normal_garnierite)10%$(/l)$()$(li)Oilsands: $(l:tfg_ores/earth_vein_index#desert_oilsands)100%$(/l), $(l:tfg_ores/earth_vein_index#normal_oilsands)100%$(/l), $(l:tfg_ores/earth_vein_index#normal_tarkianite)35%$(/l)$()$(li)Olivine: $(l:tfg_ores/earth_vein_index#normal_olivine)25%$(/l)$()$(li)Opal: $(l:tfg_ores/earth_vein_index#deep_garnet_opal)55%$(/l), $(l:tfg_ores/earth_vein_index#deep_garnet_amethyst)15%$(/l)$()$(li)Pentlandite: $(l:tfg_ores/earth_vein_index#normal_garnierite)25%$(/l), $(l:tfg_ores/earth_vein_index#normal_lubricant)15%$(/l)$()$(li)Pitchblende: $(l:tfg_ores/earth_vein_index#deep_pitchblende)62%$(/l)$()$(li)Platinum: $(l:tfg_ores/earth_vein_index#deep_sheldonite)7%$(/l)$()$(li)Pollucite: $(l:tfg_ores/earth_vein_index#normal_mica)15%$(/l)$()$(li)Powellite: $(l:tfg_ores/earth_vein_index#deep_molybdenum)17%$(/l)$()$(li)Pyrite: $(l:tfg_ores/earth_vein_index#normal_sulfur)35%$(/l), $(l:tfg_ores/earth_vein_index#normal_sphalerite)25%$(/l), $(l:tfg_ores/earth_vein_index#normal_copper)10%$(/l), $(l:tfg_ores/earth_vein_index#surface_sphalerite)5%$(/l)$()$(li)Pyrochlore: $(l:tfg_ores/earth_vein_index#normal_apatite)15%$(/l)$()", "type": "patchouli:text" }, { diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/earth_vein_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/earth_vein_index.json index 934ef99bb..4389eeb16 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/earth_vein_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/earth_vein_index.json @@ -14,22 +14,22 @@ }, { "Type": "patchouli:text", - "text": "$(li)$(l:tfg_ores/earth_vein_index#deep_garnet_amethyst)Amethyst & Garnet$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_apatite)Apatite & Pyrochlore$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_monazite)Bastnasite & Monazite$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_olivine)Bentonite & Olivine$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_bismuthinite)Bismuth (Normal)$()$()$(li)$(l:tfg_ores/earth_vein_index#surface_bismuthinite)Bismuth (Surface)$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_cassiterite)Cassiterite (Normal)$()$()$(li)$(l:tfg_ores/earth_vein_index#surface_cassiterite)Cassiterite (Surface)$()$()$(li)$(l:tfg_ores/earth_vein_index#surface_copper)Chalcopyrite & Realgar$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_magnetite)Chromite & Magnetite$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_coal)Coal$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_sheldonite)Cooperite & Bornite$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_copper)Copper & Chalcopyrite$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_beryllium)Emerald & Beryllium$()$()", + "text": "$(li)$(l:tfg_ores/earth_vein_index#deep_garnet_amethyst)Amethyst & Garnet$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_apatite)Apatite & Pyrochlore$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_monazite)Bastnasite & Monazite$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_olivine)Bentonite & Olivine$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_bismuthinite)Bismuth (Normal)$()$()$(li)$(l:tfg_ores/earth_vein_index#surface_bismuthinite)Bismuth (Surface)$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_cassiterite)Cassiterite (Normal)$()$()$(li)$(l:tfg_ores/earth_vein_index#surface_cassiterite)Cassiterite (Surface)$()$()$(li)$(l:tfg_ores/earth_vein_index#surface_copper)Chalcopyrite & Realgar$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_magnetite)Chromite & Magnetite$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_coal)Coal$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_sheldonite)Cooperite & Bornite$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_copper)Copper & Chalcopyrite$()$()$(li)$(l:tfg_ores/earth_vein_index#desert_oilsands)Desert Oilsands$()$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)$(l:tfg_ores/earth_vein_index#normal_garnet_tin)Garnet & Cassiterite Sands$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_garnierite)Garnierite & Cobaltite$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_limonite)Goethite & Malachite$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_gold)Gold (Deep)$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_gold)Gold, Limonite, & Hematite$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_graphite)Graphite & Diamond$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_gypsum)Gypsum & Calcite$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_hematite)Hematite & Limonite$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_hematite)Hematite, Goethite, & Ruby$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_mica)Kyanite, Mica, & Bauxite$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_lapis)Lapis, Lazurite, & Sodalite$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_limonite)Limonite$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_magnetite)Magnetite & Vanadium$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_manganese)Manganese & Tantalum$()$()", + "text": "$(li)$(l:tfg_ores/earth_vein_index#normal_beryllium)Emerald & Beryllium$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_garnet_tin)Garnet & Cassiterite Sands$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_garnierite)Garnierite & Cobaltite$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_limonite)Goethite & Malachite$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_gold)Gold (Deep)$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_gold)Gold, Limonite, & Hematite$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_graphite)Graphite & Diamond$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_gypsum)Gypsum & Calcite$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_hematite)Hematite & Limonite$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_hematite)Hematite, Goethite, & Ruby$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_mica)Kyanite, Mica, & Bauxite$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_lapis)Lapis, Lazurite, & Sodalite$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_limonite)Limonite$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_magnetite)Magnetite & Vanadium$()$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)$(l:tfg_ores/earth_vein_index#normal_basaltic_sands)Mineral Sands$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_oilsands)Oilsands$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_garnet_opal)Opal & Garnet$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_quartz)Quartzes$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_redstone)Redstone, Cinnabar, & Ruby$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_saltpeter)Saltpeter & Electrotine$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_salt)Salts & Borax$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_sapphire)Sapphire & Almandine$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_scheelite)Scheelite & Tungstate$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_silver)Silver, Galena, & Lead$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_lubricant)Soapstone, Talc, & Trona$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_sphalerite)Sphalerite & Pyrite$()$()$(li)$(l:tfg_ores/earth_vein_index#surface_sphalerite)Sphalerite & Sulfur$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_spodumene)Spodumene & Lepidolite$()$()", + "text": "$(li)$(l:tfg_ores/earth_vein_index#normal_manganese)Manganese & Tantalum$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_basaltic_sands)Mineral Sands$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_oilsands)Oilsands$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_garnet_opal)Opal & Garnet$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_quartz)Quartzes$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_redstone)Redstone, Cinnabar, & Ruby$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_saltpeter)Saltpeter & Electrotine$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_salt)Salts & Borax$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_sapphire)Sapphire & Almandine$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_scheelite)Scheelite & Tungstate$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_silver)Silver, Galena, & Lead$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_lubricant)Soapstone, Talc, & Trona$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_sphalerite)Sphalerite & Pyrite$()$()$(li)$(l:tfg_ores/earth_vein_index#surface_sphalerite)Sphalerite & Sulfur$()$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)$(l:tfg_ores/earth_vein_index#normal_sulfur)Sulfur & Pyrite$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_tarkianite)Tarkianite & Oilsands$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_tetrahedrite)Tetrahedrite (Normal)$()$()$(li)$(l:tfg_ores/earth_vein_index#surface_tetrahedrite)Tetrahedrite (Surface)$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_topaz)Topaz & Chalcocite$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_pitchblende)Uraninite & Pitchblende$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_molybdenum)Wulfenite & Molybdenite$()$()", + "text": "$(li)$(l:tfg_ores/earth_vein_index#normal_spodumene)Spodumene & Lepidolite$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_sulfur)Sulfur & Pyrite$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_tarkianite)Tarkianite & Oilsands$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_tetrahedrite)Tetrahedrite (Normal)$()$()$(li)$(l:tfg_ores/earth_vein_index#surface_tetrahedrite)Tetrahedrite (Surface)$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_topaz)Topaz & Chalcocite$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_pitchblende)Uraninite & Pitchblende$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_molybdenum)Wulfenite & Molybdenite$()$()", "type": "patchouli:text" }, { @@ -1060,7 +1060,34 @@ }, { "Type": "patchouli:text", - "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/250 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 35%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Tall and narrow)Pipe Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): -32 — 50$(br)$(thing)Height$(): 60$(br)$(thing)Radius$(): 10$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 20$(br2)$(thing)Stone Types$(): Andesite, Basalt, Dacite, Rhyolite", + "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/150 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 20%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 30 — 70$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 60$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 50$(br2)$(thing)Stone Types$(): Chalk, Chert, Claystone, Conglomerate, Dolomite, Limestone, Shale$(br2)Only appears in deserts to the $(thing)West$(), with a maximum rainfall of 120mm.", + "title": "Desert Oilsands", + "type": "patchouli:text", + "anchor": "desert_oilsands" + }, + { + "Type": "patchouli:multiblock", + "name": "Oilsands", + "multiblock": { + "mapping": { + "0": "#forge:ores/oilsands" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Percentage$(): 100%$(br)$(thing)Source of$(): Freedom \uD83D\uDEE2\uD83E\uDD85\uD83D\uDDFD", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:text", + "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/250 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 35%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Tall and narrow)Pipe Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): -32 — 30$(br)$(thing)Height$(): 60$(br)$(thing)Radius$(): 10$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 20$(br2)$(thing)Stone Types$(): Andesite, Basalt, Dacite, Rhyolite", "title": "Emerald & Beryllium", "type": "patchouli:text", "anchor": "normal_beryllium" @@ -1602,7 +1629,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/80 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 40%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Wide and flat)Disc Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): -64 — -16$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 16$(br)$(thing)Height$(): 6$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 20$(br2)$(thing)Stone Types$(): Andesite, Basalt, Chalk, Chert, Claystone, Conglomerate, Dacite, Diorite, Dolomite, Gabbro, Gneiss, Granite, Limestone, Marble, Phyllite, Quartzite, Rhyolite, Schist, Shale, Slate", + "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/80 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 40%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Wide and flat)Disc Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): -64 — -16$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 16$(br)$(thing)Height$(): 6$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 20$(br2)$(thing)Stone Types$(): Andesite, Basalt, Dacite, Diorite, Gabbro, Gneiss, Granite, Marble, Phyllite, Quartzite, Rhyolite, Schist, Slate", "title": "Graphite & Diamond", "type": "patchouli:text", "anchor": "normal_graphite" @@ -2512,7 +2539,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/185 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 20%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 0 — 70$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 55$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 20$(br2)$(thing)Stone Types$(): Chalk, Chert, Claystone, Conglomerate, Dolomite, Limestone, Shale", + "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/220 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 20%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 40 — 90$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 30$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 20$(br2)$(thing)Stone Types$(): Chalk, Chert, Claystone, Conglomerate, Dolomite, Limestone, Shale", "title": "Oilsands", "type": "patchouli:text", "anchor": "normal_oilsands" diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/mars_vein_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/mars_vein_index.json index a57acc1ba..5d35a238e 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/mars_vein_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/mars_vein_index.json @@ -228,7 +228,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/215 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 40%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 0 — 70$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 45$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 15$(br2)$(thing)Stone Types$(): Argillite, Basalt, Chalk, Chert, Diorite, Dolomite, Gabbro, Trachyte", + "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/215 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 40%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 0 — 70$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 45$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 15$(br2)$(thing)Stone Types$(): Argillite, Basalt, Chalk, Chert, Diorite, Dolomite, Gabbro, Quartzite, Trachyte", "title": "Bastnasite & Monazite", "type": "patchouli:text", "anchor": "mars_neodynium" @@ -320,7 +320,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/140 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 25%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 80 — 180$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 45$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 40$(br2)$(thing)Stone Types$(): Argillite, Basalt, Chalk, Chert, Claystone, Conglomerate, Dacite, Diorite, Dolomite, Gabbro, Granite, Limestone, Red Granite, Shale, Trachyte", + "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/140 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 25%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 80 — 180$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 45$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 40$(br2)$(thing)Stone Types$(): Argillite, Basalt, Chalk, Chert, Claystone, Conglomerate, Dacite, Diorite, Dolomite, Gabbro, Granite, Limestone, Quartzite, Red Granite, Shale, Trachyte", "title": "Bismuth", "type": "patchouli:text", "anchor": "mars_surface_bismuthinite" @@ -412,7 +412,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/370 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 30%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): -20 — 0$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 60$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 20$(br2)$(thing)Stone Types$(): Argillite, Basalt, Chalk, Chert, Conglomerate, Dacite, Diorite, Red Granite, Trachyte", + "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/370 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 30%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): -30 — 0$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 60$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 20$(br2)$(thing)Stone Types$(): Diorite, Gabbro, Granite, Red Granite", "title": "Bornite & Cooperite", "type": "patchouli:text", "anchor": "deep_mars_sheldonite" @@ -504,7 +504,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/135 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 25%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 80 — 180$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 45$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 40$(br2)$(thing)Stone Types$(): Argillite, Basalt, Chalk, Chert, Claystone, Conglomerate, Dacite, Diorite, Dolomite, Gabbro, Granite, Limestone, Red Granite, Shale, Trachyte", + "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/135 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 25%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 80 — 180$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 45$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 40$(br2)$(thing)Stone Types$(): Argillite, Basalt, Chalk, Chert, Claystone, Conglomerate, Dacite, Diorite, Dolomite, Gabbro, Granite, Limestone, Quartzite, Red Granite, Shale, Trachyte", "title": "Cassiterite", "type": "patchouli:text", "anchor": "mars_surface_cassiterite" @@ -623,7 +623,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/220 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 40%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 0 — 70$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 50$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 40$(br2)$(thing)Stone Types$(): Argillite, Basalt, Claystone, Conglomerate, Dacite, Dolomite, Limestone, Shale, Trachyte", + "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/220 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 40%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 0 — 70$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 50$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 40$(br2)$(thing)Stone Types$(): Argillite, Basalt, Claystone, Conglomerate, Dacite, Dolomite, Limestone, Quartzite, Shale, Trachyte", "title": "Copper & Chalcopyrite", "type": "patchouli:text", "anchor": "mars_copper" @@ -782,7 +782,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/250 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 40%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 0 — 70$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 55$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 40$(br2)$(thing)Stone Types$(): Argillite, Basalt, Chalk, Claystone, Dacite, Granite, Limestone, Red Granite, Shale", + "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/250 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 40%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 0 — 70$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 55$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 40$(br2)$(thing)Stone Types$(): Argillite, Basalt, Chalk, Claystone, Dacite, Granite, Limestone, Quartzite, Red Granite, Shale", "title": "Garnierite & Cobaltite", "type": "patchouli:text", "anchor": "mars_nickel" @@ -1058,7 +1058,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/210 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 40%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 0 — 70$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 40$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 30$(br2)$(thing)Stone Types$(): Argillite, Basalt, Claystone, Conglomerate, Dacite, Dolomite, Limestone, Red Granite", + "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/210 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 40%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 0 — 70$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 40$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 30$(br2)$(thing)Stone Types$(): Argillite, Basalt, Claystone, Conglomerate, Dacite, Dolomite, Limestone, Quartzite, Red Granite", "title": "Hematite & Limonite", "type": "patchouli:text", "anchor": "mars_hematite" @@ -1150,7 +1150,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/140 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 25%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 80 — 180$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 45$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 40$(br2)$(thing)Stone Types$(): Argillite, Basalt, Chalk, Chert, Claystone, Conglomerate, Dacite, Diorite, Dolomite, Gabbro, Granite, Limestone, Red Granite, Shale, Trachyte", + "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/140 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 25%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 80 — 180$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 45$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 40$(br2)$(thing)Stone Types$(): Argillite, Basalt, Chalk, Chert, Claystone, Conglomerate, Dacite, Diorite, Dolomite, Gabbro, Granite, Limestone, Quartzite, Red Granite, Shale, Trachyte", "title": "Hematite & Limonite", "type": "patchouli:text", "anchor": "mars_surface_hematite" @@ -1426,7 +1426,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/220 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 55%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 0 — 70$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 20$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 15$(br2)$(thing)Stone Types$(): Argillite, Conglomerate, Dacite, Diorite, Dolomite, Gabbro, Red Granite, Shale, Trachyte", + "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/220 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 55%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 0 — 70$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 20$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 15$(br2)$(thing)Stone Types$(): Argillite, Conglomerate, Dacite, Diorite, Dolomite, Gabbro, Quartzite, Red Granite, Shale, Trachyte", "title": "Pitchblende & Thorianite, & Hematite", "type": "patchouli:text", "anchor": "mars_pitchblende" @@ -1493,7 +1493,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/370 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 30%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): -20 — 0$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 60$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 20$(br2)$(thing)Stone Types$(): Argillite, Claystone, Dacite, Diorite, Gabbro, Shale, Trachyte", + "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/370 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 30%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): -30 — 0$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 60$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 20$(br2)$(thing)Stone Types$(): Diorite, Gabbro, Granite, Red Granite", "title": "Pitchblende, Thorianite, & Uraninite", "type": "patchouli:text", "anchor": "deep_mars_pitchblende" @@ -1560,7 +1560,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/210 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 30%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 0 — 70$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 40$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 15$(br2)$(thing)Stone Types$(): Argillite, Chalk, Chert, Claystone, Granite, Limestone, Red Granite, Shale, Trachyte", + "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/210 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 30%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 0 — 70$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 40$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 15$(br2)$(thing)Stone Types$(): Argillite, Chalk, Chert, Claystone, Granite, Limestone, Quartzite, Red Granite, Shale, Trachyte", "title": "Quartzite, Asbestos, & Barite", "type": "patchouli:text", "anchor": "mars_quartzite" @@ -1652,7 +1652,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/370 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 30%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): -20 — 0$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 60$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 20$(br2)$(thing)Stone Types$(): Argillite, Basalt, Chalk, Chert, Claystone, Dacite, Limestone, Shale", + "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/370 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 30%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): -30 — 0$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 60$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 20$(br2)$(thing)Stone Types$(): Diorite, Gabbro, Granite, Red Granite", "title": "Redstone & Chromite", "type": "patchouli:text", "anchor": "deep_mars_chromite" @@ -1719,7 +1719,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/210 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 40%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Wide and flat)Disc Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 0 — 70$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 40$(br)$(thing)Height$(): 6$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 15$(br2)$(thing)Stone Types$(): Argillite, Chalk, Chert, Claystone, Diorite, Granite, Limestone, Red Granite, Trachyte", + "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/210 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 40%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Wide and flat)Disc Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 0 — 70$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 40$(br)$(thing)Height$(): 6$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 15$(br2)$(thing)Stone Types$(): Argillite, Chalk, Chert, Claystone, Diorite, Granite, Limestone, Quartzite, Red Granite, Trachyte", "title": "Salts & Spodumene", "type": "patchouli:text", "anchor": "mars_salt" @@ -1995,7 +1995,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/150 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 25%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 80 — 180$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 45$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 40$(br2)$(thing)Stone Types$(): Argillite, Basalt, Chalk, Chert, Claystone, Conglomerate, Dacite, Diorite, Dolomite, Gabbro, Granite, Limestone, Red Granite, Shale, Trachyte", + "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/150 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 25%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 80 — 180$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 45$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 40$(br2)$(thing)Stone Types$(): Argillite, Basalt, Chalk, Chert, Claystone, Conglomerate, Dacite, Diorite, Dolomite, Gabbro, Granite, Limestone, Quartzite, Red Granite, Shale, Trachyte", "title": "Sphalerite & Galena", "type": "patchouli:text", "anchor": "mars_surface_nickel_galena" @@ -2194,7 +2194,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/210 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 40%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 0 — 70$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 40$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 40$(br2)$(thing)Stone Types$(): Argillite, Basalt, Chalk, Chert, Dacite, Diorite, Dolomite, Gabbro, Red Granite, Shale, Trachyte", + "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/210 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 40%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 0 — 70$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 40$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 40$(br2)$(thing)Stone Types$(): Argillite, Basalt, Chalk, Chert, Dacite, Diorite, Dolomite, Gabbro, Quartzite, Red Granite, Shale, Trachyte", "title": "Tetrahedrite (Normal)", "type": "patchouli:text", "anchor": "mars_stibnite" @@ -2286,7 +2286,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/140 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 25%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 80 — 180$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 45$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 40$(br2)$(thing)Stone Types$(): Argillite, Basalt, Chalk, Chert, Claystone, Conglomerate, Dacite, Diorite, Dolomite, Gabbro, Granite, Limestone, Red Granite, Shale, Trachyte", + "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/140 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 25%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 80 — 180$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 45$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 40$(br2)$(thing)Stone Types$(): Argillite, Basalt, Chalk, Chert, Claystone, Conglomerate, Dacite, Diorite, Dolomite, Gabbro, Granite, Limestone, Quartzite, Red Granite, Shale, Trachyte", "title": "Tetrahedrite (Surface)", "type": "patchouli:text", "anchor": "mars_surface_tetrahedrite" @@ -2378,7 +2378,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/220 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 25%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 0 — 70$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 40$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 15$(br2)$(thing)Stone Types$(): Argillite, Claystone, Conglomerate, Dacite, Diorite, Dolomite, Granite, Limestone, Red Granite, Shale", + "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/220 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 25%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 0 — 70$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 40$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 15$(br2)$(thing)Stone Types$(): Argillite, Claystone, Conglomerate, Dacite, Diorite, Dolomite, Granite, Limestone, Quartzite, Red Granite, Shale", "title": "Trona, Talc, & Glauconite", "type": "patchouli:text", "anchor": "mars_lubricant" diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/nether_vein_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/nether_vein_index.json index 3de956a2f..b52e37189 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/nether_vein_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/nether_vein_index.json @@ -732,7 +732,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/250 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 45%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Tall and narrow)Pipe Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 32 — 128$(br)$(thing)Height$(): 60$(br)$(thing)Radius$(): 12$(br2)$(thing)Stone Types$(): Basalt, Migmatite, Pyroxenite, Travertine", + "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/300 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 45%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Tall and narrow)Pipe Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 32 — 128$(br)$(thing)Height$(): 60$(br)$(thing)Radius$(): 12$(br2)$(thing)Stone Types$(): Basalt, Migmatite, Pyroxenite, Travertine", "title": "Emerald & Beryllium", "type": "patchouli:text", "anchor": "nether_beryllium" diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/venus_vein_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/venus_vein_index.json index b24ac9b4c..aa0337fbd 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/venus_vein_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/venus_vein_index.json @@ -19,7 +19,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/30 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 20%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Wide and flat)Disc Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 40 — 65$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 20$(br)$(thing)Height$(): 6$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 30$(br2)$(thing)Stone Types$(): Andesite, Basalt, Dacite, Rhyolite, Trachyte, Travertine$(br2)Only appears in the $(thing)Salt Flats$() biome.", + "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/30 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 20%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Wide and flat)Disc Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 40 — 65$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 20$(br)$(thing)Height$(): 6$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 30$(br2)$(thing)Stone Types$(): Andesite, Basalt, Dacite, Ignimbrite, Lamproite, Rhyolite, Trachyte, Travertine$(br2)Only appears in the $(thing)Salt Flats$() biome.", "title": "Salts & Spodumene", "type": "patchouli:text", "anchor": "venus_manual_salt" @@ -111,7 +111,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/30 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 20%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 40 — 65$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 20$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 30$(br2)$(thing)Stone Types$(): Andesite, Basalt, Dacite, Rhyolite, Trachyte, Travertine$(br2)Only appears in the $(thing)Sulfuric Ravines$() biome.", + "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/30 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 20%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 40 — 65$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 20$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 30$(br2)$(thing)Stone Types$(): Andesite, Basalt, Dacite, Ignimbrite, Lamproite, Rhyolite, Trachyte, Travertine$(br2)Only appears in the $(thing)Sulfuric Ravines$() biome.", "title": "Sulfur & Pyrite", "type": "patchouli:text", "anchor": "venus_manual_sulfur" diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_tips/space_fauna.json b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_tips/space_fauna.json index c9ccd1669..ca7950a17 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_tips/space_fauna.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_tips/space_fauna.json @@ -6,7 +6,7 @@ { "type": "patchouli:text", "title": "Extraterrestrial Fauna", - "text": "Space is home to many other kinds of animals than those you'd find on Earth. A few animals are hostile and will attack the player, but most are passive. Only a few of them are $(l:mechanics/animal_husbandry)domesticatable$() like the livestock on Earth.$(br)Animals you find on other worlds can be divided into two categories: $(item)hot$() and $(item)cold$(). Animals can only survive on planets that either have a similar climate to where they came from, or on $(thing)temperate$() planets like Earth." + "text": "Space is home to many other kinds of animals than those you'd find on Earth. A few animals are hostile and will attack the player, but most are passive. Only a few of them are $(l:mechanics/animal_husbandry)domesticatable$().$(br)Animals you find on other worlds can be divided into two categories: $(item)hot$() and $(item)cold$(). Animals can only survive on planets that either have a similar climate to where they came from, or on $(thing)temperate$() planets like Earth." }, { "type": "patchouli:text", @@ -105,14 +105,46 @@ "name": " ", "text": "A glacian ram/ewe." }, + { + "type": "patchouli:text", + "title": "Snatcher", + "text": "$(thing)Snatchers$() are passive animals that like to steal your stuff! Attack them to retrieve your items, or feed them $(item)Raw Fish$() to tame them.$(br2)Once tamed, you can carry them on your back and equip them with a wooden chest. Press $(k:key.wan_ancient_beasts.special_ability)$() to throw them, and they will steal the contents of a nearby chest and bring it to you." + }, + { + "type": "patchouli:entity", + "entity": "wan_ancient_beasts:snatcher", + "scale": 0.35, + "name": " ", + "text": "A snatcher." + }, + { + "type": "patchouli:text", + "title": "Charger", + "text": "$(thing)Chargers$() are semipassive animals. You can tame them with $(item)any Mars crop$() to use them as a combat land mount.$(br2)Press $(k:key.wan_ancient_beasts.special_ability)$() for a headbutt attack, or press and hold $(item)Spacebar$() for a charge attack.$(br2)They can also be equipped with $(item)dyeable armor$()." + }, + { + "type": "patchouli:entity", + "entity": "wan_ancient_beasts:charger", + "scale": 0.45, + "name": " ", + "text": "Chargers have a natural rivalry with $(thing)Raiders$(). They will attack each other on sight." + }, { "type": "patchouli:entity", "entity": "wan_ancient_beasts:surfer", - "scale": 0.35, + "scale": 0.4, "offset": 0.2, "name": "Surfer", "text": "$(thing)Surfers$() are semiaquatic passive animals. You can tame them with $(item)Raw Fish$() to ride them underwater. They can also be eaten." }, + { + "type": "patchouli:entity", + "entity": "wan_ancient_beasts:soarer", + "scale": 0.4, + "offset": 1.0, + "name": "Soarer", + "text": "$(thing)Soarers$() are passive animals found above -106°C. You can tame them with $(item)Raw Fish$() to use them as a flying mount. They can also be eaten." + }, { "type": "patchouli:entity", "entity": "wan_ancient_beasts:eater", @@ -127,14 +159,6 @@ "name": "Cruncher", "text": "$(thing)Crunchers$() are territorial $(item)miniboss$() predators. Feed them meat to stop their regeneration. They can also be eaten." }, - { - "type": "patchouli:entity", - "entity": "wan_ancient_beasts:soarer", - "scale": 0.4, - "offset": 1.0, - "name": "Soarer", - "text": "$(thing)Soarers$() are passive animals found above -106°C. You can tame them with $(item)Raw Fish$() to use them as a flying mount. They can also be eaten." - }, { "type": "patchouli:entity", "entity": "wan_ancient_beasts:glider", @@ -173,6 +197,13 @@ "name": "Walker", "text": "The gigantic $(thing)Walkers$() inhabit areas above -97°C. They are passive and can be eaten." }, + { + "type": "patchouli:entity", + "entity": "wan_ancient_beasts:raider", + "scale": 0.5, + "name": "Raider", + "text": "$(thing)Raiders$() are hostile animals found above -109°C. They have a natural rivalry with $(thing)Chargers$(). You can make them neutral by feeding them $(item)Raw Meat$()." + }, { "type": "patchouli:entity", "entity": "wan_ancient_beasts:toxlacanth", diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/fr_fr/entries/tfg_ores/earth_ore_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/fr_fr/entries/tfg_ores/earth_ore_index.json index f7d325389..118ee2950 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/fr_fr/entries/tfg_ores/earth_ore_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/fr_fr/entries/tfg_ores/earth_ore_index.json @@ -34,7 +34,7 @@ }, { "Type": "patchouli:text", - "text": "$(li)Native Gold: $(l:tfg_ores/earth_vein_index#deep_gold)75%$(/l), $(l:tfg_ores/earth_vein_index#normal_gold)55%$(/l), $(l:tfg_ores/earth_vein_index#deep_magnetite)25%$(/l), $(l:tfg_ores/earth_vein_index#normal_magnetite)9%$(/l), $(l:tfg_ores/earth_vein_index#deep_hematite)5%$(/l), $(l:tfg_ores/earth_vein_index#normal_hematite)5%$(/l)$()$(li)Native Silver: $(l:tfg_ores/earth_vein_index#normal_silver)15%$(/l), $(l:tfg_ores/earth_vein_index#normal_bismuthinite)10%$(/l), $(l:tfg_ores/earth_vein_index#surface_bismuthinite)10%$(/l)$()$(li)Neodymium: $(l:tfg_ores/earth_vein_index#normal_monazite)6%$(/l)$()$(li)Nickel: $(l:tfg_ores/earth_vein_index#normal_garnierite)10%$(/l)$()$(li)Oilsands: $(l:tfg_ores/earth_vein_index#normal_oilsands)100%$(/l), $(l:tfg_ores/earth_vein_index#normal_tarkianite)35%$(/l)$()$(li)Olivine: $(l:tfg_ores/earth_vein_index#normal_olivine)25%$(/l)$()$(li)Opal: $(l:tfg_ores/earth_vein_index#deep_garnet_opal)55%$(/l), $(l:tfg_ores/earth_vein_index#deep_garnet_amethyst)15%$(/l)$()$(li)Pentlandite: $(l:tfg_ores/earth_vein_index#normal_garnierite)25%$(/l), $(l:tfg_ores/earth_vein_index#normal_lubricant)15%$(/l)$()$(li)Pitchblende: $(l:tfg_ores/earth_vein_index#deep_pitchblende)62%$(/l)$()$(li)Platinum: $(l:tfg_ores/earth_vein_index#deep_sheldonite)7%$(/l)$()$(li)Pollucite: $(l:tfg_ores/earth_vein_index#normal_mica)15%$(/l)$()$(li)Powellite: $(l:tfg_ores/earth_vein_index#deep_molybdenum)17%$(/l)$()$(li)Pyrite: $(l:tfg_ores/earth_vein_index#normal_sulfur)35%$(/l), $(l:tfg_ores/earth_vein_index#normal_sphalerite)25%$(/l), $(l:tfg_ores/earth_vein_index#normal_copper)10%$(/l), $(l:tfg_ores/earth_vein_index#surface_sphalerite)5%$(/l)$()$(li)Pyrochlore: $(l:tfg_ores/earth_vein_index#normal_apatite)15%$(/l)$()", + "text": "$(li)Native Gold: $(l:tfg_ores/earth_vein_index#deep_gold)75%$(/l), $(l:tfg_ores/earth_vein_index#normal_gold)55%$(/l), $(l:tfg_ores/earth_vein_index#deep_magnetite)25%$(/l), $(l:tfg_ores/earth_vein_index#normal_magnetite)9%$(/l), $(l:tfg_ores/earth_vein_index#deep_hematite)5%$(/l), $(l:tfg_ores/earth_vein_index#normal_hematite)5%$(/l)$()$(li)Native Silver: $(l:tfg_ores/earth_vein_index#normal_silver)15%$(/l), $(l:tfg_ores/earth_vein_index#normal_bismuthinite)10%$(/l), $(l:tfg_ores/earth_vein_index#surface_bismuthinite)10%$(/l)$()$(li)Neodymium: $(l:tfg_ores/earth_vein_index#normal_monazite)6%$(/l)$()$(li)Nickel: $(l:tfg_ores/earth_vein_index#normal_garnierite)10%$(/l)$()$(li)Oilsands: $(l:tfg_ores/earth_vein_index#desert_oilsands)100%$(/l), $(l:tfg_ores/earth_vein_index#normal_oilsands)100%$(/l), $(l:tfg_ores/earth_vein_index#normal_tarkianite)35%$(/l)$()$(li)Olivine: $(l:tfg_ores/earth_vein_index#normal_olivine)25%$(/l)$()$(li)Opal: $(l:tfg_ores/earth_vein_index#deep_garnet_opal)55%$(/l), $(l:tfg_ores/earth_vein_index#deep_garnet_amethyst)15%$(/l)$()$(li)Pentlandite: $(l:tfg_ores/earth_vein_index#normal_garnierite)25%$(/l), $(l:tfg_ores/earth_vein_index#normal_lubricant)15%$(/l)$()$(li)Pitchblende: $(l:tfg_ores/earth_vein_index#deep_pitchblende)62%$(/l)$()$(li)Platinum: $(l:tfg_ores/earth_vein_index#deep_sheldonite)7%$(/l)$()$(li)Pollucite: $(l:tfg_ores/earth_vein_index#normal_mica)15%$(/l)$()$(li)Powellite: $(l:tfg_ores/earth_vein_index#deep_molybdenum)17%$(/l)$()$(li)Pyrite: $(l:tfg_ores/earth_vein_index#normal_sulfur)35%$(/l), $(l:tfg_ores/earth_vein_index#normal_sphalerite)25%$(/l), $(l:tfg_ores/earth_vein_index#normal_copper)10%$(/l), $(l:tfg_ores/earth_vein_index#surface_sphalerite)5%$(/l)$()$(li)Pyrochlore: $(l:tfg_ores/earth_vein_index#normal_apatite)15%$(/l)$()", "type": "patchouli:text" }, { diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/fr_fr/entries/tfg_ores/earth_vein_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/fr_fr/entries/tfg_ores/earth_vein_index.json index 934ef99bb..4389eeb16 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/fr_fr/entries/tfg_ores/earth_vein_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/fr_fr/entries/tfg_ores/earth_vein_index.json @@ -14,22 +14,22 @@ }, { "Type": "patchouli:text", - "text": "$(li)$(l:tfg_ores/earth_vein_index#deep_garnet_amethyst)Amethyst & Garnet$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_apatite)Apatite & Pyrochlore$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_monazite)Bastnasite & Monazite$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_olivine)Bentonite & Olivine$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_bismuthinite)Bismuth (Normal)$()$()$(li)$(l:tfg_ores/earth_vein_index#surface_bismuthinite)Bismuth (Surface)$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_cassiterite)Cassiterite (Normal)$()$()$(li)$(l:tfg_ores/earth_vein_index#surface_cassiterite)Cassiterite (Surface)$()$()$(li)$(l:tfg_ores/earth_vein_index#surface_copper)Chalcopyrite & Realgar$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_magnetite)Chromite & Magnetite$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_coal)Coal$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_sheldonite)Cooperite & Bornite$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_copper)Copper & Chalcopyrite$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_beryllium)Emerald & Beryllium$()$()", + "text": "$(li)$(l:tfg_ores/earth_vein_index#deep_garnet_amethyst)Amethyst & Garnet$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_apatite)Apatite & Pyrochlore$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_monazite)Bastnasite & Monazite$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_olivine)Bentonite & Olivine$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_bismuthinite)Bismuth (Normal)$()$()$(li)$(l:tfg_ores/earth_vein_index#surface_bismuthinite)Bismuth (Surface)$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_cassiterite)Cassiterite (Normal)$()$()$(li)$(l:tfg_ores/earth_vein_index#surface_cassiterite)Cassiterite (Surface)$()$()$(li)$(l:tfg_ores/earth_vein_index#surface_copper)Chalcopyrite & Realgar$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_magnetite)Chromite & Magnetite$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_coal)Coal$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_sheldonite)Cooperite & Bornite$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_copper)Copper & Chalcopyrite$()$()$(li)$(l:tfg_ores/earth_vein_index#desert_oilsands)Desert Oilsands$()$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)$(l:tfg_ores/earth_vein_index#normal_garnet_tin)Garnet & Cassiterite Sands$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_garnierite)Garnierite & Cobaltite$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_limonite)Goethite & Malachite$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_gold)Gold (Deep)$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_gold)Gold, Limonite, & Hematite$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_graphite)Graphite & Diamond$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_gypsum)Gypsum & Calcite$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_hematite)Hematite & Limonite$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_hematite)Hematite, Goethite, & Ruby$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_mica)Kyanite, Mica, & Bauxite$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_lapis)Lapis, Lazurite, & Sodalite$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_limonite)Limonite$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_magnetite)Magnetite & Vanadium$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_manganese)Manganese & Tantalum$()$()", + "text": "$(li)$(l:tfg_ores/earth_vein_index#normal_beryllium)Emerald & Beryllium$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_garnet_tin)Garnet & Cassiterite Sands$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_garnierite)Garnierite & Cobaltite$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_limonite)Goethite & Malachite$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_gold)Gold (Deep)$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_gold)Gold, Limonite, & Hematite$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_graphite)Graphite & Diamond$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_gypsum)Gypsum & Calcite$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_hematite)Hematite & Limonite$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_hematite)Hematite, Goethite, & Ruby$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_mica)Kyanite, Mica, & Bauxite$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_lapis)Lapis, Lazurite, & Sodalite$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_limonite)Limonite$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_magnetite)Magnetite & Vanadium$()$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)$(l:tfg_ores/earth_vein_index#normal_basaltic_sands)Mineral Sands$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_oilsands)Oilsands$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_garnet_opal)Opal & Garnet$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_quartz)Quartzes$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_redstone)Redstone, Cinnabar, & Ruby$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_saltpeter)Saltpeter & Electrotine$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_salt)Salts & Borax$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_sapphire)Sapphire & Almandine$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_scheelite)Scheelite & Tungstate$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_silver)Silver, Galena, & Lead$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_lubricant)Soapstone, Talc, & Trona$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_sphalerite)Sphalerite & Pyrite$()$()$(li)$(l:tfg_ores/earth_vein_index#surface_sphalerite)Sphalerite & Sulfur$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_spodumene)Spodumene & Lepidolite$()$()", + "text": "$(li)$(l:tfg_ores/earth_vein_index#normal_manganese)Manganese & Tantalum$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_basaltic_sands)Mineral Sands$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_oilsands)Oilsands$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_garnet_opal)Opal & Garnet$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_quartz)Quartzes$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_redstone)Redstone, Cinnabar, & Ruby$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_saltpeter)Saltpeter & Electrotine$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_salt)Salts & Borax$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_sapphire)Sapphire & Almandine$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_scheelite)Scheelite & Tungstate$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_silver)Silver, Galena, & Lead$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_lubricant)Soapstone, Talc, & Trona$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_sphalerite)Sphalerite & Pyrite$()$()$(li)$(l:tfg_ores/earth_vein_index#surface_sphalerite)Sphalerite & Sulfur$()$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)$(l:tfg_ores/earth_vein_index#normal_sulfur)Sulfur & Pyrite$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_tarkianite)Tarkianite & Oilsands$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_tetrahedrite)Tetrahedrite (Normal)$()$()$(li)$(l:tfg_ores/earth_vein_index#surface_tetrahedrite)Tetrahedrite (Surface)$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_topaz)Topaz & Chalcocite$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_pitchblende)Uraninite & Pitchblende$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_molybdenum)Wulfenite & Molybdenite$()$()", + "text": "$(li)$(l:tfg_ores/earth_vein_index#normal_spodumene)Spodumene & Lepidolite$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_sulfur)Sulfur & Pyrite$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_tarkianite)Tarkianite & Oilsands$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_tetrahedrite)Tetrahedrite (Normal)$()$()$(li)$(l:tfg_ores/earth_vein_index#surface_tetrahedrite)Tetrahedrite (Surface)$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_topaz)Topaz & Chalcocite$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_pitchblende)Uraninite & Pitchblende$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_molybdenum)Wulfenite & Molybdenite$()$()", "type": "patchouli:text" }, { @@ -1060,7 +1060,34 @@ }, { "Type": "patchouli:text", - "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/250 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 35%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Tall and narrow)Pipe Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): -32 — 50$(br)$(thing)Height$(): 60$(br)$(thing)Radius$(): 10$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 20$(br2)$(thing)Stone Types$(): Andesite, Basalt, Dacite, Rhyolite", + "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/150 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 20%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 30 — 70$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 60$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 50$(br2)$(thing)Stone Types$(): Chalk, Chert, Claystone, Conglomerate, Dolomite, Limestone, Shale$(br2)Only appears in deserts to the $(thing)West$(), with a maximum rainfall of 120mm.", + "title": "Desert Oilsands", + "type": "patchouli:text", + "anchor": "desert_oilsands" + }, + { + "Type": "patchouli:multiblock", + "name": "Oilsands", + "multiblock": { + "mapping": { + "0": "#forge:ores/oilsands" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Percentage$(): 100%$(br)$(thing)Source of$(): Freedom \uD83D\uDEE2\uD83E\uDD85\uD83D\uDDFD", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:text", + "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/250 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 35%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Tall and narrow)Pipe Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): -32 — 30$(br)$(thing)Height$(): 60$(br)$(thing)Radius$(): 10$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 20$(br2)$(thing)Stone Types$(): Andesite, Basalt, Dacite, Rhyolite", "title": "Emerald & Beryllium", "type": "patchouli:text", "anchor": "normal_beryllium" @@ -1602,7 +1629,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/80 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 40%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Wide and flat)Disc Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): -64 — -16$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 16$(br)$(thing)Height$(): 6$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 20$(br2)$(thing)Stone Types$(): Andesite, Basalt, Chalk, Chert, Claystone, Conglomerate, Dacite, Diorite, Dolomite, Gabbro, Gneiss, Granite, Limestone, Marble, Phyllite, Quartzite, Rhyolite, Schist, Shale, Slate", + "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/80 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 40%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Wide and flat)Disc Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): -64 — -16$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 16$(br)$(thing)Height$(): 6$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 20$(br2)$(thing)Stone Types$(): Andesite, Basalt, Dacite, Diorite, Gabbro, Gneiss, Granite, Marble, Phyllite, Quartzite, Rhyolite, Schist, Slate", "title": "Graphite & Diamond", "type": "patchouli:text", "anchor": "normal_graphite" @@ -2512,7 +2539,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/185 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 20%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 0 — 70$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 55$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 20$(br2)$(thing)Stone Types$(): Chalk, Chert, Claystone, Conglomerate, Dolomite, Limestone, Shale", + "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/220 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 20%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 40 — 90$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 30$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 20$(br2)$(thing)Stone Types$(): Chalk, Chert, Claystone, Conglomerate, Dolomite, Limestone, Shale", "title": "Oilsands", "type": "patchouli:text", "anchor": "normal_oilsands" diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/fr_fr/entries/tfg_ores/mars_vein_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/fr_fr/entries/tfg_ores/mars_vein_index.json index a57acc1ba..5d35a238e 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/fr_fr/entries/tfg_ores/mars_vein_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/fr_fr/entries/tfg_ores/mars_vein_index.json @@ -228,7 +228,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/215 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 40%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 0 — 70$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 45$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 15$(br2)$(thing)Stone Types$(): Argillite, Basalt, Chalk, Chert, Diorite, Dolomite, Gabbro, Trachyte", + "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/215 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 40%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 0 — 70$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 45$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 15$(br2)$(thing)Stone Types$(): Argillite, Basalt, Chalk, Chert, Diorite, Dolomite, Gabbro, Quartzite, Trachyte", "title": "Bastnasite & Monazite", "type": "patchouli:text", "anchor": "mars_neodynium" @@ -320,7 +320,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/140 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 25%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 80 — 180$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 45$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 40$(br2)$(thing)Stone Types$(): Argillite, Basalt, Chalk, Chert, Claystone, Conglomerate, Dacite, Diorite, Dolomite, Gabbro, Granite, Limestone, Red Granite, Shale, Trachyte", + "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/140 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 25%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 80 — 180$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 45$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 40$(br2)$(thing)Stone Types$(): Argillite, Basalt, Chalk, Chert, Claystone, Conglomerate, Dacite, Diorite, Dolomite, Gabbro, Granite, Limestone, Quartzite, Red Granite, Shale, Trachyte", "title": "Bismuth", "type": "patchouli:text", "anchor": "mars_surface_bismuthinite" @@ -412,7 +412,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/370 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 30%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): -20 — 0$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 60$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 20$(br2)$(thing)Stone Types$(): Argillite, Basalt, Chalk, Chert, Conglomerate, Dacite, Diorite, Red Granite, Trachyte", + "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/370 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 30%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): -30 — 0$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 60$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 20$(br2)$(thing)Stone Types$(): Diorite, Gabbro, Granite, Red Granite", "title": "Bornite & Cooperite", "type": "patchouli:text", "anchor": "deep_mars_sheldonite" @@ -504,7 +504,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/135 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 25%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 80 — 180$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 45$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 40$(br2)$(thing)Stone Types$(): Argillite, Basalt, Chalk, Chert, Claystone, Conglomerate, Dacite, Diorite, Dolomite, Gabbro, Granite, Limestone, Red Granite, Shale, Trachyte", + "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/135 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 25%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 80 — 180$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 45$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 40$(br2)$(thing)Stone Types$(): Argillite, Basalt, Chalk, Chert, Claystone, Conglomerate, Dacite, Diorite, Dolomite, Gabbro, Granite, Limestone, Quartzite, Red Granite, Shale, Trachyte", "title": "Cassiterite", "type": "patchouli:text", "anchor": "mars_surface_cassiterite" @@ -623,7 +623,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/220 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 40%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 0 — 70$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 50$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 40$(br2)$(thing)Stone Types$(): Argillite, Basalt, Claystone, Conglomerate, Dacite, Dolomite, Limestone, Shale, Trachyte", + "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/220 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 40%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 0 — 70$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 50$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 40$(br2)$(thing)Stone Types$(): Argillite, Basalt, Claystone, Conglomerate, Dacite, Dolomite, Limestone, Quartzite, Shale, Trachyte", "title": "Copper & Chalcopyrite", "type": "patchouli:text", "anchor": "mars_copper" @@ -782,7 +782,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/250 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 40%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 0 — 70$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 55$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 40$(br2)$(thing)Stone Types$(): Argillite, Basalt, Chalk, Claystone, Dacite, Granite, Limestone, Red Granite, Shale", + "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/250 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 40%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 0 — 70$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 55$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 40$(br2)$(thing)Stone Types$(): Argillite, Basalt, Chalk, Claystone, Dacite, Granite, Limestone, Quartzite, Red Granite, Shale", "title": "Garnierite & Cobaltite", "type": "patchouli:text", "anchor": "mars_nickel" @@ -1058,7 +1058,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/210 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 40%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 0 — 70$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 40$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 30$(br2)$(thing)Stone Types$(): Argillite, Basalt, Claystone, Conglomerate, Dacite, Dolomite, Limestone, Red Granite", + "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/210 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 40%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 0 — 70$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 40$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 30$(br2)$(thing)Stone Types$(): Argillite, Basalt, Claystone, Conglomerate, Dacite, Dolomite, Limestone, Quartzite, Red Granite", "title": "Hematite & Limonite", "type": "patchouli:text", "anchor": "mars_hematite" @@ -1150,7 +1150,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/140 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 25%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 80 — 180$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 45$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 40$(br2)$(thing)Stone Types$(): Argillite, Basalt, Chalk, Chert, Claystone, Conglomerate, Dacite, Diorite, Dolomite, Gabbro, Granite, Limestone, Red Granite, Shale, Trachyte", + "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/140 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 25%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 80 — 180$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 45$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 40$(br2)$(thing)Stone Types$(): Argillite, Basalt, Chalk, Chert, Claystone, Conglomerate, Dacite, Diorite, Dolomite, Gabbro, Granite, Limestone, Quartzite, Red Granite, Shale, Trachyte", "title": "Hematite & Limonite", "type": "patchouli:text", "anchor": "mars_surface_hematite" @@ -1426,7 +1426,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/220 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 55%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 0 — 70$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 20$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 15$(br2)$(thing)Stone Types$(): Argillite, Conglomerate, Dacite, Diorite, Dolomite, Gabbro, Red Granite, Shale, Trachyte", + "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/220 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 55%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 0 — 70$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 20$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 15$(br2)$(thing)Stone Types$(): Argillite, Conglomerate, Dacite, Diorite, Dolomite, Gabbro, Quartzite, Red Granite, Shale, Trachyte", "title": "Pitchblende & Thorianite, & Hematite", "type": "patchouli:text", "anchor": "mars_pitchblende" @@ -1493,7 +1493,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/370 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 30%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): -20 — 0$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 60$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 20$(br2)$(thing)Stone Types$(): Argillite, Claystone, Dacite, Diorite, Gabbro, Shale, Trachyte", + "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/370 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 30%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): -30 — 0$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 60$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 20$(br2)$(thing)Stone Types$(): Diorite, Gabbro, Granite, Red Granite", "title": "Pitchblende, Thorianite, & Uraninite", "type": "patchouli:text", "anchor": "deep_mars_pitchblende" @@ -1560,7 +1560,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/210 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 30%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 0 — 70$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 40$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 15$(br2)$(thing)Stone Types$(): Argillite, Chalk, Chert, Claystone, Granite, Limestone, Red Granite, Shale, Trachyte", + "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/210 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 30%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 0 — 70$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 40$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 15$(br2)$(thing)Stone Types$(): Argillite, Chalk, Chert, Claystone, Granite, Limestone, Quartzite, Red Granite, Shale, Trachyte", "title": "Quartzite, Asbestos, & Barite", "type": "patchouli:text", "anchor": "mars_quartzite" @@ -1652,7 +1652,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/370 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 30%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): -20 — 0$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 60$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 20$(br2)$(thing)Stone Types$(): Argillite, Basalt, Chalk, Chert, Claystone, Dacite, Limestone, Shale", + "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/370 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 30%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): -30 — 0$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 60$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 20$(br2)$(thing)Stone Types$(): Diorite, Gabbro, Granite, Red Granite", "title": "Redstone & Chromite", "type": "patchouli:text", "anchor": "deep_mars_chromite" @@ -1719,7 +1719,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/210 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 40%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Wide and flat)Disc Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 0 — 70$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 40$(br)$(thing)Height$(): 6$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 15$(br2)$(thing)Stone Types$(): Argillite, Chalk, Chert, Claystone, Diorite, Granite, Limestone, Red Granite, Trachyte", + "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/210 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 40%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Wide and flat)Disc Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 0 — 70$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 40$(br)$(thing)Height$(): 6$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 15$(br2)$(thing)Stone Types$(): Argillite, Chalk, Chert, Claystone, Diorite, Granite, Limestone, Quartzite, Red Granite, Trachyte", "title": "Salts & Spodumene", "type": "patchouli:text", "anchor": "mars_salt" @@ -1995,7 +1995,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/150 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 25%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 80 — 180$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 45$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 40$(br2)$(thing)Stone Types$(): Argillite, Basalt, Chalk, Chert, Claystone, Conglomerate, Dacite, Diorite, Dolomite, Gabbro, Granite, Limestone, Red Granite, Shale, Trachyte", + "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/150 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 25%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 80 — 180$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 45$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 40$(br2)$(thing)Stone Types$(): Argillite, Basalt, Chalk, Chert, Claystone, Conglomerate, Dacite, Diorite, Dolomite, Gabbro, Granite, Limestone, Quartzite, Red Granite, Shale, Trachyte", "title": "Sphalerite & Galena", "type": "patchouli:text", "anchor": "mars_surface_nickel_galena" @@ -2194,7 +2194,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/210 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 40%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 0 — 70$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 40$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 40$(br2)$(thing)Stone Types$(): Argillite, Basalt, Chalk, Chert, Dacite, Diorite, Dolomite, Gabbro, Red Granite, Shale, Trachyte", + "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/210 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 40%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 0 — 70$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 40$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 40$(br2)$(thing)Stone Types$(): Argillite, Basalt, Chalk, Chert, Dacite, Diorite, Dolomite, Gabbro, Quartzite, Red Granite, Shale, Trachyte", "title": "Tetrahedrite (Normal)", "type": "patchouli:text", "anchor": "mars_stibnite" @@ -2286,7 +2286,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/140 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 25%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 80 — 180$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 45$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 40$(br2)$(thing)Stone Types$(): Argillite, Basalt, Chalk, Chert, Claystone, Conglomerate, Dacite, Diorite, Dolomite, Gabbro, Granite, Limestone, Red Granite, Shale, Trachyte", + "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/140 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 25%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 80 — 180$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 45$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 40$(br2)$(thing)Stone Types$(): Argillite, Basalt, Chalk, Chert, Claystone, Conglomerate, Dacite, Diorite, Dolomite, Gabbro, Granite, Limestone, Quartzite, Red Granite, Shale, Trachyte", "title": "Tetrahedrite (Surface)", "type": "patchouli:text", "anchor": "mars_surface_tetrahedrite" @@ -2378,7 +2378,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/220 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 25%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 0 — 70$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 40$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 15$(br2)$(thing)Stone Types$(): Argillite, Claystone, Conglomerate, Dacite, Diorite, Dolomite, Granite, Limestone, Red Granite, Shale", + "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/220 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 25%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 0 — 70$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 40$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 15$(br2)$(thing)Stone Types$(): Argillite, Claystone, Conglomerate, Dacite, Diorite, Dolomite, Granite, Limestone, Quartzite, Red Granite, Shale", "title": "Trona, Talc, & Glauconite", "type": "patchouli:text", "anchor": "mars_lubricant" diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/fr_fr/entries/tfg_ores/nether_vein_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/fr_fr/entries/tfg_ores/nether_vein_index.json index 3de956a2f..b52e37189 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/fr_fr/entries/tfg_ores/nether_vein_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/fr_fr/entries/tfg_ores/nether_vein_index.json @@ -732,7 +732,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/250 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 45%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Tall and narrow)Pipe Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 32 — 128$(br)$(thing)Height$(): 60$(br)$(thing)Radius$(): 12$(br2)$(thing)Stone Types$(): Basalt, Migmatite, Pyroxenite, Travertine", + "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/300 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 45%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Tall and narrow)Pipe Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 32 — 128$(br)$(thing)Height$(): 60$(br)$(thing)Radius$(): 12$(br2)$(thing)Stone Types$(): Basalt, Migmatite, Pyroxenite, Travertine", "title": "Emerald & Beryllium", "type": "patchouli:text", "anchor": "nether_beryllium" diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/fr_fr/entries/tfg_ores/venus_vein_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/fr_fr/entries/tfg_ores/venus_vein_index.json index b24ac9b4c..aa0337fbd 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/fr_fr/entries/tfg_ores/venus_vein_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/fr_fr/entries/tfg_ores/venus_vein_index.json @@ -19,7 +19,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/30 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 20%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Wide and flat)Disc Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 40 — 65$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 20$(br)$(thing)Height$(): 6$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 30$(br2)$(thing)Stone Types$(): Andesite, Basalt, Dacite, Rhyolite, Trachyte, Travertine$(br2)Only appears in the $(thing)Salt Flats$() biome.", + "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/30 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 20%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Wide and flat)Disc Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 40 — 65$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 20$(br)$(thing)Height$(): 6$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 30$(br2)$(thing)Stone Types$(): Andesite, Basalt, Dacite, Ignimbrite, Lamproite, Rhyolite, Trachyte, Travertine$(br2)Only appears in the $(thing)Salt Flats$() biome.", "title": "Salts & Spodumene", "type": "patchouli:text", "anchor": "venus_manual_salt" @@ -111,7 +111,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/30 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 20%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 40 — 65$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 20$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 30$(br2)$(thing)Stone Types$(): Andesite, Basalt, Dacite, Rhyolite, Trachyte, Travertine$(br2)Only appears in the $(thing)Sulfuric Ravines$() biome.", + "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/30 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 20%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 40 — 65$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 20$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 30$(br2)$(thing)Stone Types$(): Andesite, Basalt, Dacite, Ignimbrite, Lamproite, Rhyolite, Trachyte, Travertine$(br2)Only appears in the $(thing)Sulfuric Ravines$() biome.", "title": "Sulfur & Pyrite", "type": "patchouli:text", "anchor": "venus_manual_sulfur" diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/ja_jp/entries/tfg_ores/earth_ore_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/ja_jp/entries/tfg_ores/earth_ore_index.json index f7d325389..118ee2950 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/ja_jp/entries/tfg_ores/earth_ore_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/ja_jp/entries/tfg_ores/earth_ore_index.json @@ -34,7 +34,7 @@ }, { "Type": "patchouli:text", - "text": "$(li)Native Gold: $(l:tfg_ores/earth_vein_index#deep_gold)75%$(/l), $(l:tfg_ores/earth_vein_index#normal_gold)55%$(/l), $(l:tfg_ores/earth_vein_index#deep_magnetite)25%$(/l), $(l:tfg_ores/earth_vein_index#normal_magnetite)9%$(/l), $(l:tfg_ores/earth_vein_index#deep_hematite)5%$(/l), $(l:tfg_ores/earth_vein_index#normal_hematite)5%$(/l)$()$(li)Native Silver: $(l:tfg_ores/earth_vein_index#normal_silver)15%$(/l), $(l:tfg_ores/earth_vein_index#normal_bismuthinite)10%$(/l), $(l:tfg_ores/earth_vein_index#surface_bismuthinite)10%$(/l)$()$(li)Neodymium: $(l:tfg_ores/earth_vein_index#normal_monazite)6%$(/l)$()$(li)Nickel: $(l:tfg_ores/earth_vein_index#normal_garnierite)10%$(/l)$()$(li)Oilsands: $(l:tfg_ores/earth_vein_index#normal_oilsands)100%$(/l), $(l:tfg_ores/earth_vein_index#normal_tarkianite)35%$(/l)$()$(li)Olivine: $(l:tfg_ores/earth_vein_index#normal_olivine)25%$(/l)$()$(li)Opal: $(l:tfg_ores/earth_vein_index#deep_garnet_opal)55%$(/l), $(l:tfg_ores/earth_vein_index#deep_garnet_amethyst)15%$(/l)$()$(li)Pentlandite: $(l:tfg_ores/earth_vein_index#normal_garnierite)25%$(/l), $(l:tfg_ores/earth_vein_index#normal_lubricant)15%$(/l)$()$(li)Pitchblende: $(l:tfg_ores/earth_vein_index#deep_pitchblende)62%$(/l)$()$(li)Platinum: $(l:tfg_ores/earth_vein_index#deep_sheldonite)7%$(/l)$()$(li)Pollucite: $(l:tfg_ores/earth_vein_index#normal_mica)15%$(/l)$()$(li)Powellite: $(l:tfg_ores/earth_vein_index#deep_molybdenum)17%$(/l)$()$(li)Pyrite: $(l:tfg_ores/earth_vein_index#normal_sulfur)35%$(/l), $(l:tfg_ores/earth_vein_index#normal_sphalerite)25%$(/l), $(l:tfg_ores/earth_vein_index#normal_copper)10%$(/l), $(l:tfg_ores/earth_vein_index#surface_sphalerite)5%$(/l)$()$(li)Pyrochlore: $(l:tfg_ores/earth_vein_index#normal_apatite)15%$(/l)$()", + "text": "$(li)Native Gold: $(l:tfg_ores/earth_vein_index#deep_gold)75%$(/l), $(l:tfg_ores/earth_vein_index#normal_gold)55%$(/l), $(l:tfg_ores/earth_vein_index#deep_magnetite)25%$(/l), $(l:tfg_ores/earth_vein_index#normal_magnetite)9%$(/l), $(l:tfg_ores/earth_vein_index#deep_hematite)5%$(/l), $(l:tfg_ores/earth_vein_index#normal_hematite)5%$(/l)$()$(li)Native Silver: $(l:tfg_ores/earth_vein_index#normal_silver)15%$(/l), $(l:tfg_ores/earth_vein_index#normal_bismuthinite)10%$(/l), $(l:tfg_ores/earth_vein_index#surface_bismuthinite)10%$(/l)$()$(li)Neodymium: $(l:tfg_ores/earth_vein_index#normal_monazite)6%$(/l)$()$(li)Nickel: $(l:tfg_ores/earth_vein_index#normal_garnierite)10%$(/l)$()$(li)Oilsands: $(l:tfg_ores/earth_vein_index#desert_oilsands)100%$(/l), $(l:tfg_ores/earth_vein_index#normal_oilsands)100%$(/l), $(l:tfg_ores/earth_vein_index#normal_tarkianite)35%$(/l)$()$(li)Olivine: $(l:tfg_ores/earth_vein_index#normal_olivine)25%$(/l)$()$(li)Opal: $(l:tfg_ores/earth_vein_index#deep_garnet_opal)55%$(/l), $(l:tfg_ores/earth_vein_index#deep_garnet_amethyst)15%$(/l)$()$(li)Pentlandite: $(l:tfg_ores/earth_vein_index#normal_garnierite)25%$(/l), $(l:tfg_ores/earth_vein_index#normal_lubricant)15%$(/l)$()$(li)Pitchblende: $(l:tfg_ores/earth_vein_index#deep_pitchblende)62%$(/l)$()$(li)Platinum: $(l:tfg_ores/earth_vein_index#deep_sheldonite)7%$(/l)$()$(li)Pollucite: $(l:tfg_ores/earth_vein_index#normal_mica)15%$(/l)$()$(li)Powellite: $(l:tfg_ores/earth_vein_index#deep_molybdenum)17%$(/l)$()$(li)Pyrite: $(l:tfg_ores/earth_vein_index#normal_sulfur)35%$(/l), $(l:tfg_ores/earth_vein_index#normal_sphalerite)25%$(/l), $(l:tfg_ores/earth_vein_index#normal_copper)10%$(/l), $(l:tfg_ores/earth_vein_index#surface_sphalerite)5%$(/l)$()$(li)Pyrochlore: $(l:tfg_ores/earth_vein_index#normal_apatite)15%$(/l)$()", "type": "patchouli:text" }, { diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/ja_jp/entries/tfg_ores/earth_vein_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/ja_jp/entries/tfg_ores/earth_vein_index.json index 934ef99bb..4389eeb16 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/ja_jp/entries/tfg_ores/earth_vein_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/ja_jp/entries/tfg_ores/earth_vein_index.json @@ -14,22 +14,22 @@ }, { "Type": "patchouli:text", - "text": "$(li)$(l:tfg_ores/earth_vein_index#deep_garnet_amethyst)Amethyst & Garnet$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_apatite)Apatite & Pyrochlore$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_monazite)Bastnasite & Monazite$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_olivine)Bentonite & Olivine$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_bismuthinite)Bismuth (Normal)$()$()$(li)$(l:tfg_ores/earth_vein_index#surface_bismuthinite)Bismuth (Surface)$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_cassiterite)Cassiterite (Normal)$()$()$(li)$(l:tfg_ores/earth_vein_index#surface_cassiterite)Cassiterite (Surface)$()$()$(li)$(l:tfg_ores/earth_vein_index#surface_copper)Chalcopyrite & Realgar$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_magnetite)Chromite & Magnetite$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_coal)Coal$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_sheldonite)Cooperite & Bornite$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_copper)Copper & Chalcopyrite$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_beryllium)Emerald & Beryllium$()$()", + "text": "$(li)$(l:tfg_ores/earth_vein_index#deep_garnet_amethyst)Amethyst & Garnet$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_apatite)Apatite & Pyrochlore$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_monazite)Bastnasite & Monazite$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_olivine)Bentonite & Olivine$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_bismuthinite)Bismuth (Normal)$()$()$(li)$(l:tfg_ores/earth_vein_index#surface_bismuthinite)Bismuth (Surface)$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_cassiterite)Cassiterite (Normal)$()$()$(li)$(l:tfg_ores/earth_vein_index#surface_cassiterite)Cassiterite (Surface)$()$()$(li)$(l:tfg_ores/earth_vein_index#surface_copper)Chalcopyrite & Realgar$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_magnetite)Chromite & Magnetite$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_coal)Coal$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_sheldonite)Cooperite & Bornite$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_copper)Copper & Chalcopyrite$()$()$(li)$(l:tfg_ores/earth_vein_index#desert_oilsands)Desert Oilsands$()$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)$(l:tfg_ores/earth_vein_index#normal_garnet_tin)Garnet & Cassiterite Sands$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_garnierite)Garnierite & Cobaltite$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_limonite)Goethite & Malachite$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_gold)Gold (Deep)$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_gold)Gold, Limonite, & Hematite$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_graphite)Graphite & Diamond$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_gypsum)Gypsum & Calcite$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_hematite)Hematite & Limonite$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_hematite)Hematite, Goethite, & Ruby$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_mica)Kyanite, Mica, & Bauxite$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_lapis)Lapis, Lazurite, & Sodalite$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_limonite)Limonite$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_magnetite)Magnetite & Vanadium$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_manganese)Manganese & Tantalum$()$()", + "text": "$(li)$(l:tfg_ores/earth_vein_index#normal_beryllium)Emerald & Beryllium$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_garnet_tin)Garnet & Cassiterite Sands$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_garnierite)Garnierite & Cobaltite$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_limonite)Goethite & Malachite$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_gold)Gold (Deep)$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_gold)Gold, Limonite, & Hematite$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_graphite)Graphite & Diamond$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_gypsum)Gypsum & Calcite$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_hematite)Hematite & Limonite$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_hematite)Hematite, Goethite, & Ruby$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_mica)Kyanite, Mica, & Bauxite$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_lapis)Lapis, Lazurite, & Sodalite$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_limonite)Limonite$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_magnetite)Magnetite & Vanadium$()$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)$(l:tfg_ores/earth_vein_index#normal_basaltic_sands)Mineral Sands$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_oilsands)Oilsands$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_garnet_opal)Opal & Garnet$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_quartz)Quartzes$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_redstone)Redstone, Cinnabar, & Ruby$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_saltpeter)Saltpeter & Electrotine$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_salt)Salts & Borax$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_sapphire)Sapphire & Almandine$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_scheelite)Scheelite & Tungstate$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_silver)Silver, Galena, & Lead$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_lubricant)Soapstone, Talc, & Trona$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_sphalerite)Sphalerite & Pyrite$()$()$(li)$(l:tfg_ores/earth_vein_index#surface_sphalerite)Sphalerite & Sulfur$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_spodumene)Spodumene & Lepidolite$()$()", + "text": "$(li)$(l:tfg_ores/earth_vein_index#normal_manganese)Manganese & Tantalum$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_basaltic_sands)Mineral Sands$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_oilsands)Oilsands$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_garnet_opal)Opal & Garnet$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_quartz)Quartzes$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_redstone)Redstone, Cinnabar, & Ruby$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_saltpeter)Saltpeter & Electrotine$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_salt)Salts & Borax$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_sapphire)Sapphire & Almandine$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_scheelite)Scheelite & Tungstate$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_silver)Silver, Galena, & Lead$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_lubricant)Soapstone, Talc, & Trona$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_sphalerite)Sphalerite & Pyrite$()$()$(li)$(l:tfg_ores/earth_vein_index#surface_sphalerite)Sphalerite & Sulfur$()$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)$(l:tfg_ores/earth_vein_index#normal_sulfur)Sulfur & Pyrite$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_tarkianite)Tarkianite & Oilsands$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_tetrahedrite)Tetrahedrite (Normal)$()$()$(li)$(l:tfg_ores/earth_vein_index#surface_tetrahedrite)Tetrahedrite (Surface)$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_topaz)Topaz & Chalcocite$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_pitchblende)Uraninite & Pitchblende$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_molybdenum)Wulfenite & Molybdenite$()$()", + "text": "$(li)$(l:tfg_ores/earth_vein_index#normal_spodumene)Spodumene & Lepidolite$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_sulfur)Sulfur & Pyrite$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_tarkianite)Tarkianite & Oilsands$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_tetrahedrite)Tetrahedrite (Normal)$()$()$(li)$(l:tfg_ores/earth_vein_index#surface_tetrahedrite)Tetrahedrite (Surface)$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_topaz)Topaz & Chalcocite$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_pitchblende)Uraninite & Pitchblende$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_molybdenum)Wulfenite & Molybdenite$()$()", "type": "patchouli:text" }, { @@ -1060,7 +1060,34 @@ }, { "Type": "patchouli:text", - "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/250 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 35%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Tall and narrow)Pipe Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): -32 — 50$(br)$(thing)Height$(): 60$(br)$(thing)Radius$(): 10$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 20$(br2)$(thing)Stone Types$(): Andesite, Basalt, Dacite, Rhyolite", + "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/150 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 20%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 30 — 70$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 60$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 50$(br2)$(thing)Stone Types$(): Chalk, Chert, Claystone, Conglomerate, Dolomite, Limestone, Shale$(br2)Only appears in deserts to the $(thing)West$(), with a maximum rainfall of 120mm.", + "title": "Desert Oilsands", + "type": "patchouli:text", + "anchor": "desert_oilsands" + }, + { + "Type": "patchouli:multiblock", + "name": "Oilsands", + "multiblock": { + "mapping": { + "0": "#forge:ores/oilsands" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Percentage$(): 100%$(br)$(thing)Source of$(): Freedom \uD83D\uDEE2\uD83E\uDD85\uD83D\uDDFD", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:text", + "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/250 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 35%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Tall and narrow)Pipe Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): -32 — 30$(br)$(thing)Height$(): 60$(br)$(thing)Radius$(): 10$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 20$(br2)$(thing)Stone Types$(): Andesite, Basalt, Dacite, Rhyolite", "title": "Emerald & Beryllium", "type": "patchouli:text", "anchor": "normal_beryllium" @@ -1602,7 +1629,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/80 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 40%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Wide and flat)Disc Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): -64 — -16$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 16$(br)$(thing)Height$(): 6$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 20$(br2)$(thing)Stone Types$(): Andesite, Basalt, Chalk, Chert, Claystone, Conglomerate, Dacite, Diorite, Dolomite, Gabbro, Gneiss, Granite, Limestone, Marble, Phyllite, Quartzite, Rhyolite, Schist, Shale, Slate", + "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/80 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 40%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Wide and flat)Disc Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): -64 — -16$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 16$(br)$(thing)Height$(): 6$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 20$(br2)$(thing)Stone Types$(): Andesite, Basalt, Dacite, Diorite, Gabbro, Gneiss, Granite, Marble, Phyllite, Quartzite, Rhyolite, Schist, Slate", "title": "Graphite & Diamond", "type": "patchouli:text", "anchor": "normal_graphite" @@ -2512,7 +2539,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/185 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 20%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 0 — 70$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 55$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 20$(br2)$(thing)Stone Types$(): Chalk, Chert, Claystone, Conglomerate, Dolomite, Limestone, Shale", + "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/220 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 20%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 40 — 90$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 30$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 20$(br2)$(thing)Stone Types$(): Chalk, Chert, Claystone, Conglomerate, Dolomite, Limestone, Shale", "title": "Oilsands", "type": "patchouli:text", "anchor": "normal_oilsands" diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/ja_jp/entries/tfg_ores/mars_vein_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/ja_jp/entries/tfg_ores/mars_vein_index.json index a57acc1ba..5d35a238e 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/ja_jp/entries/tfg_ores/mars_vein_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/ja_jp/entries/tfg_ores/mars_vein_index.json @@ -228,7 +228,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/215 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 40%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 0 — 70$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 45$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 15$(br2)$(thing)Stone Types$(): Argillite, Basalt, Chalk, Chert, Diorite, Dolomite, Gabbro, Trachyte", + "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/215 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 40%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 0 — 70$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 45$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 15$(br2)$(thing)Stone Types$(): Argillite, Basalt, Chalk, Chert, Diorite, Dolomite, Gabbro, Quartzite, Trachyte", "title": "Bastnasite & Monazite", "type": "patchouli:text", "anchor": "mars_neodynium" @@ -320,7 +320,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/140 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 25%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 80 — 180$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 45$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 40$(br2)$(thing)Stone Types$(): Argillite, Basalt, Chalk, Chert, Claystone, Conglomerate, Dacite, Diorite, Dolomite, Gabbro, Granite, Limestone, Red Granite, Shale, Trachyte", + "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/140 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 25%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 80 — 180$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 45$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 40$(br2)$(thing)Stone Types$(): Argillite, Basalt, Chalk, Chert, Claystone, Conglomerate, Dacite, Diorite, Dolomite, Gabbro, Granite, Limestone, Quartzite, Red Granite, Shale, Trachyte", "title": "Bismuth", "type": "patchouli:text", "anchor": "mars_surface_bismuthinite" @@ -412,7 +412,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/370 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 30%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): -20 — 0$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 60$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 20$(br2)$(thing)Stone Types$(): Argillite, Basalt, Chalk, Chert, Conglomerate, Dacite, Diorite, Red Granite, Trachyte", + "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/370 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 30%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): -30 — 0$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 60$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 20$(br2)$(thing)Stone Types$(): Diorite, Gabbro, Granite, Red Granite", "title": "Bornite & Cooperite", "type": "patchouli:text", "anchor": "deep_mars_sheldonite" @@ -504,7 +504,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/135 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 25%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 80 — 180$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 45$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 40$(br2)$(thing)Stone Types$(): Argillite, Basalt, Chalk, Chert, Claystone, Conglomerate, Dacite, Diorite, Dolomite, Gabbro, Granite, Limestone, Red Granite, Shale, Trachyte", + "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/135 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 25%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 80 — 180$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 45$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 40$(br2)$(thing)Stone Types$(): Argillite, Basalt, Chalk, Chert, Claystone, Conglomerate, Dacite, Diorite, Dolomite, Gabbro, Granite, Limestone, Quartzite, Red Granite, Shale, Trachyte", "title": "Cassiterite", "type": "patchouli:text", "anchor": "mars_surface_cassiterite" @@ -623,7 +623,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/220 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 40%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 0 — 70$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 50$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 40$(br2)$(thing)Stone Types$(): Argillite, Basalt, Claystone, Conglomerate, Dacite, Dolomite, Limestone, Shale, Trachyte", + "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/220 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 40%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 0 — 70$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 50$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 40$(br2)$(thing)Stone Types$(): Argillite, Basalt, Claystone, Conglomerate, Dacite, Dolomite, Limestone, Quartzite, Shale, Trachyte", "title": "Copper & Chalcopyrite", "type": "patchouli:text", "anchor": "mars_copper" @@ -782,7 +782,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/250 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 40%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 0 — 70$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 55$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 40$(br2)$(thing)Stone Types$(): Argillite, Basalt, Chalk, Claystone, Dacite, Granite, Limestone, Red Granite, Shale", + "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/250 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 40%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 0 — 70$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 55$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 40$(br2)$(thing)Stone Types$(): Argillite, Basalt, Chalk, Claystone, Dacite, Granite, Limestone, Quartzite, Red Granite, Shale", "title": "Garnierite & Cobaltite", "type": "patchouli:text", "anchor": "mars_nickel" @@ -1058,7 +1058,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/210 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 40%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 0 — 70$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 40$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 30$(br2)$(thing)Stone Types$(): Argillite, Basalt, Claystone, Conglomerate, Dacite, Dolomite, Limestone, Red Granite", + "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/210 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 40%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 0 — 70$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 40$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 30$(br2)$(thing)Stone Types$(): Argillite, Basalt, Claystone, Conglomerate, Dacite, Dolomite, Limestone, Quartzite, Red Granite", "title": "Hematite & Limonite", "type": "patchouli:text", "anchor": "mars_hematite" @@ -1150,7 +1150,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/140 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 25%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 80 — 180$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 45$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 40$(br2)$(thing)Stone Types$(): Argillite, Basalt, Chalk, Chert, Claystone, Conglomerate, Dacite, Diorite, Dolomite, Gabbro, Granite, Limestone, Red Granite, Shale, Trachyte", + "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/140 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 25%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 80 — 180$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 45$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 40$(br2)$(thing)Stone Types$(): Argillite, Basalt, Chalk, Chert, Claystone, Conglomerate, Dacite, Diorite, Dolomite, Gabbro, Granite, Limestone, Quartzite, Red Granite, Shale, Trachyte", "title": "Hematite & Limonite", "type": "patchouli:text", "anchor": "mars_surface_hematite" @@ -1426,7 +1426,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/220 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 55%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 0 — 70$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 20$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 15$(br2)$(thing)Stone Types$(): Argillite, Conglomerate, Dacite, Diorite, Dolomite, Gabbro, Red Granite, Shale, Trachyte", + "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/220 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 55%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 0 — 70$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 20$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 15$(br2)$(thing)Stone Types$(): Argillite, Conglomerate, Dacite, Diorite, Dolomite, Gabbro, Quartzite, Red Granite, Shale, Trachyte", "title": "Pitchblende & Thorianite, & Hematite", "type": "patchouli:text", "anchor": "mars_pitchblende" @@ -1493,7 +1493,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/370 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 30%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): -20 — 0$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 60$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 20$(br2)$(thing)Stone Types$(): Argillite, Claystone, Dacite, Diorite, Gabbro, Shale, Trachyte", + "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/370 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 30%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): -30 — 0$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 60$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 20$(br2)$(thing)Stone Types$(): Diorite, Gabbro, Granite, Red Granite", "title": "Pitchblende, Thorianite, & Uraninite", "type": "patchouli:text", "anchor": "deep_mars_pitchblende" @@ -1560,7 +1560,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/210 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 30%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 0 — 70$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 40$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 15$(br2)$(thing)Stone Types$(): Argillite, Chalk, Chert, Claystone, Granite, Limestone, Red Granite, Shale, Trachyte", + "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/210 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 30%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 0 — 70$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 40$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 15$(br2)$(thing)Stone Types$(): Argillite, Chalk, Chert, Claystone, Granite, Limestone, Quartzite, Red Granite, Shale, Trachyte", "title": "Quartzite, Asbestos, & Barite", "type": "patchouli:text", "anchor": "mars_quartzite" @@ -1652,7 +1652,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/370 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 30%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): -20 — 0$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 60$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 20$(br2)$(thing)Stone Types$(): Argillite, Basalt, Chalk, Chert, Claystone, Dacite, Limestone, Shale", + "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/370 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 30%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): -30 — 0$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 60$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 20$(br2)$(thing)Stone Types$(): Diorite, Gabbro, Granite, Red Granite", "title": "Redstone & Chromite", "type": "patchouli:text", "anchor": "deep_mars_chromite" @@ -1719,7 +1719,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/210 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 40%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Wide and flat)Disc Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 0 — 70$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 40$(br)$(thing)Height$(): 6$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 15$(br2)$(thing)Stone Types$(): Argillite, Chalk, Chert, Claystone, Diorite, Granite, Limestone, Red Granite, Trachyte", + "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/210 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 40%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Wide and flat)Disc Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 0 — 70$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 40$(br)$(thing)Height$(): 6$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 15$(br2)$(thing)Stone Types$(): Argillite, Chalk, Chert, Claystone, Diorite, Granite, Limestone, Quartzite, Red Granite, Trachyte", "title": "Salts & Spodumene", "type": "patchouli:text", "anchor": "mars_salt" @@ -1995,7 +1995,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/150 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 25%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 80 — 180$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 45$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 40$(br2)$(thing)Stone Types$(): Argillite, Basalt, Chalk, Chert, Claystone, Conglomerate, Dacite, Diorite, Dolomite, Gabbro, Granite, Limestone, Red Granite, Shale, Trachyte", + "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/150 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 25%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 80 — 180$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 45$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 40$(br2)$(thing)Stone Types$(): Argillite, Basalt, Chalk, Chert, Claystone, Conglomerate, Dacite, Diorite, Dolomite, Gabbro, Granite, Limestone, Quartzite, Red Granite, Shale, Trachyte", "title": "Sphalerite & Galena", "type": "patchouli:text", "anchor": "mars_surface_nickel_galena" @@ -2194,7 +2194,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/210 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 40%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 0 — 70$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 40$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 40$(br2)$(thing)Stone Types$(): Argillite, Basalt, Chalk, Chert, Dacite, Diorite, Dolomite, Gabbro, Red Granite, Shale, Trachyte", + "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/210 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 40%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 0 — 70$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 40$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 40$(br2)$(thing)Stone Types$(): Argillite, Basalt, Chalk, Chert, Dacite, Diorite, Dolomite, Gabbro, Quartzite, Red Granite, Shale, Trachyte", "title": "Tetrahedrite (Normal)", "type": "patchouli:text", "anchor": "mars_stibnite" @@ -2286,7 +2286,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/140 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 25%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 80 — 180$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 45$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 40$(br2)$(thing)Stone Types$(): Argillite, Basalt, Chalk, Chert, Claystone, Conglomerate, Dacite, Diorite, Dolomite, Gabbro, Granite, Limestone, Red Granite, Shale, Trachyte", + "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/140 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 25%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 80 — 180$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 45$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 40$(br2)$(thing)Stone Types$(): Argillite, Basalt, Chalk, Chert, Claystone, Conglomerate, Dacite, Diorite, Dolomite, Gabbro, Granite, Limestone, Quartzite, Red Granite, Shale, Trachyte", "title": "Tetrahedrite (Surface)", "type": "patchouli:text", "anchor": "mars_surface_tetrahedrite" @@ -2378,7 +2378,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/220 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 25%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 0 — 70$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 40$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 15$(br2)$(thing)Stone Types$(): Argillite, Claystone, Conglomerate, Dacite, Diorite, Dolomite, Granite, Limestone, Red Granite, Shale", + "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/220 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 25%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 0 — 70$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 40$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 15$(br2)$(thing)Stone Types$(): Argillite, Claystone, Conglomerate, Dacite, Diorite, Dolomite, Granite, Limestone, Quartzite, Red Granite, Shale", "title": "Trona, Talc, & Glauconite", "type": "patchouli:text", "anchor": "mars_lubricant" diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/ja_jp/entries/tfg_ores/nether_vein_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/ja_jp/entries/tfg_ores/nether_vein_index.json index 3de956a2f..b52e37189 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/ja_jp/entries/tfg_ores/nether_vein_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/ja_jp/entries/tfg_ores/nether_vein_index.json @@ -732,7 +732,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/250 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 45%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Tall and narrow)Pipe Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 32 — 128$(br)$(thing)Height$(): 60$(br)$(thing)Radius$(): 12$(br2)$(thing)Stone Types$(): Basalt, Migmatite, Pyroxenite, Travertine", + "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/300 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 45%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Tall and narrow)Pipe Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 32 — 128$(br)$(thing)Height$(): 60$(br)$(thing)Radius$(): 12$(br2)$(thing)Stone Types$(): Basalt, Migmatite, Pyroxenite, Travertine", "title": "Emerald & Beryllium", "type": "patchouli:text", "anchor": "nether_beryllium" diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/ja_jp/entries/tfg_ores/venus_vein_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/ja_jp/entries/tfg_ores/venus_vein_index.json index b24ac9b4c..b63bea0b9 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/ja_jp/entries/tfg_ores/venus_vein_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/ja_jp/entries/tfg_ores/venus_vein_index.json @@ -19,7 +19,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/30 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 20%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Wide and flat)Disc Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 40 — 65$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 20$(br)$(thing)Height$(): 6$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 30$(br2)$(thing)Stone Types$(): Andesite, Basalt, Dacite, Rhyolite, Trachyte, Travertine$(br2)Only appears in the $(thing)Salt Flats$() biome.", + "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/30 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 20%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Wide and flat)Disc Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 40 — 65$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 20$(br)$(thing)Height$(): 6$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 30$(br2)$(thing)Stone Types$(): Andesite, Basalt, Dacite, Rhyolite, Trachyte, Travertine, ã‚ĪグニãƒģブãƒĐã‚Īト, ãƒĐãƒģプロã‚Ēã‚Īト$(br2)Only appears in the $(thing)Salt Flats$() biome.", "title": "Salts & Spodumene", "type": "patchouli:text", "anchor": "venus_manual_salt" @@ -111,7 +111,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/30 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 20%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 40 — 65$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 20$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 30$(br2)$(thing)Stone Types$(): Andesite, Basalt, Dacite, Rhyolite, Trachyte, Travertine$(br2)Only appears in the $(thing)Sulfuric Ravines$() biome.", + "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/30 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 20%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 40 — 65$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 20$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 30$(br2)$(thing)Stone Types$(): Andesite, Basalt, Dacite, Rhyolite, Trachyte, Travertine, ã‚ĪグニãƒģブãƒĐã‚Īト, ãƒĐãƒģプロã‚Ēã‚Īト$(br2)Only appears in the $(thing)Sulfuric Ravines$() biome.", "title": "Sulfur & Pyrite", "type": "patchouli:text", "anchor": "venus_manual_sulfur" diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/pt_br/entries/tfg_ores/earth_ore_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/pt_br/entries/tfg_ores/earth_ore_index.json index f407ecfb2..2520734e3 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/pt_br/entries/tfg_ores/earth_ore_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/pt_br/entries/tfg_ores/earth_ore_index.json @@ -14,7 +14,7 @@ }, { "Type": "patchouli:text", - "text": "$(li)Almandina: $(l:tfg_ores/earth_vein_index#deep_sapphire)38%$(/l)$()$(li)Alunita: $(l:tfg_ores/earth_vein_index#normal_saltpeter)15%$(/l)$()$(li)Ametista: $(l:tfg_ores/earth_vein_index#deep_garnet_amethyst)65%$(/l), $(l:tfg_ores/earth_vein_index#deep_garnet_opal)25%$(/l)$()$(li)Amianto: $(l:tfg_ores/earth_vein_index#normal_garnet_tin)25%$(/l), $(l:tfg_ores/earth_vein_index#normal_quartz)18%$(/l)$()$(li)Apatita: $(l:tfg_ores/earth_vein_index#normal_apatite)50%$(/l)$()$(li)Areia Cassiterita: $(l:tfg_ores/earth_vein_index#normal_garnet_tin)35%$(/l)$()$(li)Areia Glauconita: $(l:tfg_ores/earth_vein_index#normal_lubricant)25%$(/l), $(l:tfg_ores/earth_vein_index#normal_olivine)15%$(/l)$()$(li)Areia Granada: $(l:tfg_ores/earth_vein_index#normal_garnet_tin)25%$(/l)$()$(li)Areia Mineral BasÃĄltica: $(l:tfg_ores/earth_vein_index#normal_basaltic_sands)35%$(/l)$()$(li)Areia Mineral Granítica: $(l:tfg_ores/earth_vein_index#normal_basaltic_sands)25%$(/l)$()$(li)Areias Petrolíferas: $(l:tfg_ores/earth_vein_index#normal_oilsands)100%$(/l), $(l:tfg_ores/earth_vein_index#normal_tarkianite)35%$(/l)$()$(li)Barita: $(l:tfg_ores/earth_vein_index#normal_quartz)37%$(/l)$()$(li)Bastnasita: $(l:tfg_ores/earth_vein_index#normal_monazite)62%$(/l)$()$(li)Bauxita: $(l:tfg_ores/earth_vein_index#normal_mica)25%$(/l)$()", + "text": "$(li)Almandina: $(l:tfg_ores/earth_vein_index#deep_sapphire)38%$(/l)$()$(li)Alunita: $(l:tfg_ores/earth_vein_index#normal_saltpeter)15%$(/l)$()$(li)Ametista: $(l:tfg_ores/earth_vein_index#deep_garnet_amethyst)65%$(/l), $(l:tfg_ores/earth_vein_index#deep_garnet_opal)25%$(/l)$()$(li)Amianto: $(l:tfg_ores/earth_vein_index#normal_garnet_tin)25%$(/l), $(l:tfg_ores/earth_vein_index#normal_quartz)18%$(/l)$()$(li)Apatita: $(l:tfg_ores/earth_vein_index#normal_apatite)50%$(/l)$()$(li)Areia Cassiterita: $(l:tfg_ores/earth_vein_index#normal_garnet_tin)35%$(/l)$()$(li)Areia Glauconita: $(l:tfg_ores/earth_vein_index#normal_lubricant)25%$(/l), $(l:tfg_ores/earth_vein_index#normal_olivine)15%$(/l)$()$(li)Areia Granada: $(l:tfg_ores/earth_vein_index#normal_garnet_tin)25%$(/l)$()$(li)Areia Mineral BasÃĄltica: $(l:tfg_ores/earth_vein_index#normal_basaltic_sands)35%$(/l)$()$(li)Areia Mineral Granítica: $(l:tfg_ores/earth_vein_index#normal_basaltic_sands)25%$(/l)$()$(li)Areias Petrolíferas: $(l:tfg_ores/earth_vein_index#desert_oilsands)100%$(/l), $(l:tfg_ores/earth_vein_index#normal_oilsands)100%$(/l), $(l:tfg_ores/earth_vein_index#normal_tarkianite)35%$(/l)$()$(li)Barita: $(l:tfg_ores/earth_vein_index#normal_quartz)37%$(/l)$()$(li)Bastnasita: $(l:tfg_ores/earth_vein_index#normal_monazite)62%$(/l)$()$(li)Bauxita: $(l:tfg_ores/earth_vein_index#normal_mica)25%$(/l)$()", "type": "patchouli:text" }, { diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/pt_br/entries/tfg_ores/earth_vein_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/pt_br/entries/tfg_ores/earth_vein_index.json index 00139dc21..3f3723398 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/pt_br/entries/tfg_ores/earth_vein_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/pt_br/entries/tfg_ores/earth_vein_index.json @@ -14,22 +14,22 @@ }, { "Type": "patchouli:text", - "text": "$(li)$(l:tfg_ores/earth_vein_index#deep_garnet_amethyst)Ametista e Granada$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_apatite)Apatita e Pirocloro$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_basaltic_sands)Areias Minerais$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_oilsands)Areias Petrolíferas$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_monazite)Bastnasita e Monazita$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_olivine)Bentonita e Olivina$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_bismuthinite)Bismuto (Normal)$()$()$(li)$(l:tfg_ores/earth_vein_index#surface_bismuthinite)Bismuto (Superfície)$()$()$(li)$(l:tfg_ores/earth_vein_index#surface_copper)Calcopirita e Realgar$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_coal)CarvÃĢo$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_cassiterite)Cassiterita (Normal)$()$()$(li)$(l:tfg_ores/earth_vein_index#surface_cassiterite)Cassiterita (Superfície)$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_mica)Cianita, Mica e Bauxita$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_copper)Cobre e Calcopirita$()$()", + "text": "$(li)$(l:tfg_ores/earth_vein_index#deep_garnet_amethyst)Ametista e Granada$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_apatite)Apatita e Pirocloro$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_basaltic_sands)Areias Minerais$()$()$(li)$(l:tfg_ores/earth_vein_index#desert_oilsands)Areias Petrolíferas$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_oilsands)Areias Petrolíferas$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_monazite)Bastnasita e Monazita$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_olivine)Bentonita e Olivina$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_bismuthinite)Bismuto (Normal)$()$()$(li)$(l:tfg_ores/earth_vein_index#surface_bismuthinite)Bismuto (Superfície)$()$()$(li)$(l:tfg_ores/earth_vein_index#surface_copper)Calcopirita e Realgar$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_coal)CarvÃĢo$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_cassiterite)Cassiterita (Normal)$()$()$(li)$(l:tfg_ores/earth_vein_index#surface_cassiterite)Cassiterita (Superfície)$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_mica)Cianita, Mica e Bauxita$()$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)$(l:tfg_ores/earth_vein_index#deep_sheldonite)Cooperita e Bornita$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_magnetite)Cromita e Magnetita$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_sulfur)Enxofre e Pirita$()$()$(li)$(l:tfg_ores/earth_vein_index#surface_sphalerite)Esfalerita e Enxofre$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_sphalerite)Esfalerita e Pirita$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_beryllium)Esmeralda e Berílio$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_spodumene)Espodumena e Lepidolita$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_garnierite)Garnierita e Cobaltita$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_gypsum)Gipsita e Calcita$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_limonite)Goethita e Malaquita$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_graphite)Grafite e Diamante$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_garnet_tin)Granada e Areia Cassiterita$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_hematite)Hematita e Limonita$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_hematite)Hematita, Goethita e Rubi$()$()", + "text": "$(li)$(l:tfg_ores/earth_vein_index#normal_copper)Cobre e Calcopirita$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_sheldonite)Cooperita e Bornita$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_magnetite)Cromita e Magnetita$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_sulfur)Enxofre e Pirita$()$()$(li)$(l:tfg_ores/earth_vein_index#surface_sphalerite)Esfalerita e Enxofre$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_sphalerite)Esfalerita e Pirita$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_beryllium)Esmeralda e Berílio$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_spodumene)Espodumena e Lepidolita$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_garnierite)Garnierita e Cobaltita$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_gypsum)Gipsita e Calcita$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_limonite)Goethita e Malaquita$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_graphite)Grafite e Diamante$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_garnet_tin)Granada e Areia Cassiterita$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_hematite)Hematita e Limonita$()$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)$(l:tfg_ores/earth_vein_index#normal_lapis)LÃĄpis-lazÚri, Lazurita e Sodalita$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_limonite)Limonita$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_magnetite)Magnetita e VanÃĄdio$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_manganese)ManganÊs e TÃĒntalo$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_garnet_opal)Opala e Granada$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_gold)Ouro (Profundo)$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_gold)Ouro, Limonita e Hematita$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_lubricant)Pedra-sabÃĢo, Talco e Trona$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_silver)Prata, Galena e Chumbo$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_quartz)Quartzos$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_redstone)Redstone, CinÃĄbrio e Rubi$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_sapphire)Safira e Almandina$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_salt)Sais e BÃģrax$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_saltpeter)Salitre e Eletrotina$()$()", + "text": "$(li)$(l:tfg_ores/earth_vein_index#deep_hematite)Hematita, Goethita e Rubi$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_lapis)LÃĄpis-lazÚri, Lazurita e Sodalita$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_limonite)Limonita$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_magnetite)Magnetita e VanÃĄdio$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_manganese)ManganÊs e TÃĒntalo$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_garnet_opal)Opala e Granada$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_gold)Ouro (Profundo)$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_gold)Ouro, Limonita e Hematita$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_lubricant)Pedra-sabÃĢo, Talco e Trona$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_silver)Prata, Galena e Chumbo$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_quartz)Quartzos$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_redstone)Redstone, CinÃĄbrio e Rubi$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_sapphire)Safira e Almandina$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_salt)Sais e BÃģrax$()$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)$(l:tfg_ores/earth_vein_index#deep_scheelite)Sheelita e Tungstato$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_tarkianite)Tarcianita e Areias Petrolíferas$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_tetrahedrite)Tetraedrita (Normal)$()$()$(li)$(l:tfg_ores/earth_vein_index#surface_tetrahedrite)Tetraedrita (Superfície)$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_topaz)TopÃĄzio e Calcocita$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_pitchblende)Uraninita e Pechblenda$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_molybdenum)Wulfenita e Molibdenita$()$()", + "text": "$(li)$(l:tfg_ores/earth_vein_index#normal_saltpeter)Salitre e Eletrotina$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_scheelite)Sheelita e Tungstato$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_tarkianite)Tarcianita e Areias Petrolíferas$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_tetrahedrite)Tetraedrita (Normal)$()$()$(li)$(l:tfg_ores/earth_vein_index#surface_tetrahedrite)Tetraedrita (Superfície)$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_topaz)TopÃĄzio e Calcocita$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_pitchblende)Uraninita e Pechblenda$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_molybdenum)Wulfenita e Molibdenita$()$()", "type": "patchouli:text" }, { @@ -290,7 +290,34 @@ }, { "Type": "patchouli:text", - "text": "$(thing)Raridade$(): 1/185 chunks$(br)$(thing)Densidade$(): 20%$(br)$(thing)Tipo$(): Veio Aglomerado$(br)$(thing)Y$(): 0 — 70$(br)$(thing)Tamanho$(): 55$(br)$(thing)Profundidade MÃĄxima do Indicador$(): 20$(br2)$(thing)Tipos de Pedra$(): Argilito, CalcÃĄrio, Cherte, Conglomerado, Dolomito, Folhelho, Giz", + "text": "$(thing)Raridade$(): 1/150 chunks$(br)$(thing)Densidade$(): 20%$(br)$(thing)Tipo$(): Veio Aglomerado$(br)$(thing)Y$(): 30 — 70$(br)$(thing)Tamanho$(): 60$(br)$(thing)Profundidade MÃĄxima do Indicador$(): 50$(br2)$(thing)Tipos de Pedra$(): Argilito, CalcÃĄrio, Cherte, Conglomerado, Dolomito, Folhelho, Giz", + "title": "Areias Petrolíferas", + "type": "patchouli:text", + "anchor": "desert_oilsands" + }, + { + "Type": "patchouli:multiblock", + "name": "Areias Petrolíferas", + "multiblock": { + "mapping": { + "0": "#forge:ores/oilsands" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Porcentagem$(): 100%$(br)$(thing)Fonte de$(): Liberdade \uD83D\uDEE2\uD83E\uDD85\uD83D\uDDFD", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:text", + "text": "$(thing)Raridade$(): 1/220 chunks$(br)$(thing)Densidade$(): 20%$(br)$(thing)Tipo$(): Veio Aglomerado$(br)$(thing)Y$(): 40 — 90$(br)$(thing)Tamanho$(): 30$(br)$(thing)Profundidade MÃĄxima do Indicador$(): 20$(br2)$(thing)Tipos de Pedra$(): Argilito, CalcÃĄrio, Cherte, Conglomerado, Dolomito, Folhelho, Giz", "title": "Areias Petrolíferas", "type": "patchouli:text", "anchor": "normal_oilsands" @@ -1472,7 +1499,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)Raridade$(): 1/250 chunks$(br)$(thing)Densidade$(): 35%$(br)$(thing)Tipo$(): Veio Tubular$(br)$(thing)Y$(): -32 — 50$(br)$(thing)Altura$(): 60$(br)$(thing)Raio$(): 10$(br)$(thing)Profundidade MÃĄxima do Indicador$(): 20$(br2)$(thing)Tipos de Pedra$(): Andesito, Basalto, Dacito, Riolito", + "text": "$(thing)Raridade$(): 1/250 chunks$(br)$(thing)Densidade$(): 35%$(br)$(thing)Tipo$(): Veio Tubular$(br)$(thing)Y$(): -32 — 30$(br)$(thing)Altura$(): 60$(br)$(thing)Raio$(): 10$(br)$(thing)Profundidade MÃĄxima do Indicador$(): 20$(br2)$(thing)Tipos de Pedra$(): Andesito, Basalto, Dacito, Riolito", "title": "Esmeralda e Berílio", "type": "patchouli:text", "anchor": "normal_beryllium" @@ -1922,7 +1949,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)Raridade$(): 1/80 chunks$(br)$(thing)Densidade$(): 40%$(br)$(thing)Tipo$(): Veio em Disco$(br)$(thing)Y$(): -64 — -16$(br)$(thing)Tamanho$(): 16$(br)$(thing)Altura$(): 6$(br)$(thing)Profundidade MÃĄxima do Indicador$(): 20$(br2)$(thing)Tipos de Pedra$(): Andesito, ArdÃģsia, Argilito, Basalto, CalcÃĄrio, Cherte, Conglomerado, Dacito, Diorito, Dolomito, Filito, Folhelho, Gabro, Giz, Gnaisse, Granito, MÃĄrmore, Quartzito, Riolito, Xisto", + "text": "$(thing)Raridade$(): 1/80 chunks$(br)$(thing)Densidade$(): 40%$(br)$(thing)Tipo$(): Veio em Disco$(br)$(thing)Y$(): -64 — -16$(br)$(thing)Tamanho$(): 16$(br)$(thing)Altura$(): 6$(br)$(thing)Profundidade MÃĄxima do Indicador$(): 20$(br2)$(thing)Tipos de Pedra$(): Andesito, ArdÃģsia, Basalto, Dacito, Diorito, Filito, Gabro, Gnaisse, Granito, MÃĄrmore, Quartzito, Riolito, Xisto", "title": "Grafite e Diamante", "type": "patchouli:text", "anchor": "normal_graphite" diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/pt_br/entries/tfg_ores/mars_vein_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/pt_br/entries/tfg_ores/mars_vein_index.json index fa27c0c04..1980fa0c6 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/pt_br/entries/tfg_ores/mars_vein_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/pt_br/entries/tfg_ores/mars_vein_index.json @@ -228,7 +228,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)Raridade$(): 1/215 chunks$(br)$(thing)Densidade$(): 40%$(br)$(thing)Tipo$(): Veio Aglomerado$(br)$(thing)Y$(): 0 — 70$(br)$(thing)Tamanho$(): 45$(br)$(thing)Profundidade MÃĄxima do Indicador$(): 15$(br2)$(thing)Tipos de Pedra$(): Argilita, Basalto, Cherte, Diorito, Dolomito, Gabro, Giz, Traquito", + "text": "$(thing)Raridade$(): 1/215 chunks$(br)$(thing)Densidade$(): 40%$(br)$(thing)Tipo$(): Veio Aglomerado$(br)$(thing)Y$(): 0 — 70$(br)$(thing)Tamanho$(): 45$(br)$(thing)Profundidade MÃĄxima do Indicador$(): 15$(br2)$(thing)Tipos de Pedra$(): Argilita, Basalto, Cherte, Diorito, Dolomito, Gabro, Giz, Quartzito, Traquito", "title": "Bastnasita e Monazita", "type": "patchouli:text", "anchor": "mars_neodynium" @@ -320,7 +320,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)Raridade$(): 1/140 chunks$(br)$(thing)Densidade$(): 25%$(br)$(thing)Tipo$(): Veio Aglomerado$(br)$(thing)Y$(): 80 — 180$(br)$(thing)Tamanho$(): 45$(br)$(thing)Profundidade MÃĄxima do Indicador$(): 40$(br2)$(thing)Tipos de Pedra$(): Argilita, Argilito, Basalto, CalcÃĄrio, Cherte, Conglomerado, Dacito, Diorito, Dolomito, Folhelho, Gabro, Giz, Granito, Red Granite, Traquito", + "text": "$(thing)Raridade$(): 1/140 chunks$(br)$(thing)Densidade$(): 25%$(br)$(thing)Tipo$(): Veio Aglomerado$(br)$(thing)Y$(): 80 — 180$(br)$(thing)Tamanho$(): 45$(br)$(thing)Profundidade MÃĄxima do Indicador$(): 40$(br2)$(thing)Tipos de Pedra$(): Argilita, Argilito, Basalto, CalcÃĄrio, Cherte, Conglomerado, Dacito, Diorito, Dolomito, Folhelho, Gabro, Giz, Granito, Quartzito, Red Granite, Traquito", "title": "Bismuto", "type": "patchouli:text", "anchor": "mars_surface_bismuthinite" @@ -412,7 +412,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)Raridade$(): 1/370 chunks$(br)$(thing)Densidade$(): 30%$(br)$(thing)Tipo$(): Veio Aglomerado$(br)$(thing)Y$(): -20 — 0$(br)$(thing)Tamanho$(): 60$(br)$(thing)Profundidade MÃĄxima do Indicador$(): 20$(br2)$(thing)Tipos de Pedra$(): Argilita, Basalto, Cherte, Conglomerado, Dacito, Diorito, Giz, Red Granite, Traquito", + "text": "$(thing)Raridade$(): 1/370 chunks$(br)$(thing)Densidade$(): 30%$(br)$(thing)Tipo$(): Veio Aglomerado$(br)$(thing)Y$(): -30 — 0$(br)$(thing)Tamanho$(): 60$(br)$(thing)Profundidade MÃĄxima do Indicador$(): 20$(br2)$(thing)Tipos de Pedra$(): Diorito, Gabro, Granito, Red Granite", "title": "Bornite & Cooperite", "type": "patchouli:text", "anchor": "deep_mars_sheldonite" @@ -504,7 +504,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)Raridade$(): 1/135 chunks$(br)$(thing)Densidade$(): 25%$(br)$(thing)Tipo$(): Veio Aglomerado$(br)$(thing)Y$(): 80 — 180$(br)$(thing)Tamanho$(): 45$(br)$(thing)Profundidade MÃĄxima do Indicador$(): 40$(br2)$(thing)Tipos de Pedra$(): Argilita, Argilito, Basalto, CalcÃĄrio, Cherte, Conglomerado, Dacito, Diorito, Dolomito, Folhelho, Gabro, Giz, Granito, Red Granite, Traquito", + "text": "$(thing)Raridade$(): 1/135 chunks$(br)$(thing)Densidade$(): 25%$(br)$(thing)Tipo$(): Veio Aglomerado$(br)$(thing)Y$(): 80 — 180$(br)$(thing)Tamanho$(): 45$(br)$(thing)Profundidade MÃĄxima do Indicador$(): 40$(br2)$(thing)Tipos de Pedra$(): Argilita, Argilito, Basalto, CalcÃĄrio, Cherte, Conglomerado, Dacito, Diorito, Dolomito, Folhelho, Gabro, Giz, Granito, Quartzito, Red Granite, Traquito", "title": "Cassiterita", "type": "patchouli:text", "anchor": "mars_surface_cassiterite" @@ -623,7 +623,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)Raridade$(): 1/220 chunks$(br)$(thing)Densidade$(): 40%$(br)$(thing)Tipo$(): Veio Aglomerado$(br)$(thing)Y$(): 0 — 70$(br)$(thing)Tamanho$(): 50$(br)$(thing)Profundidade MÃĄxima do Indicador$(): 40$(br2)$(thing)Tipos de Pedra$(): Argilita, Argilito, Basalto, CalcÃĄrio, Conglomerado, Dacito, Dolomito, Folhelho, Traquito", + "text": "$(thing)Raridade$(): 1/220 chunks$(br)$(thing)Densidade$(): 40%$(br)$(thing)Tipo$(): Veio Aglomerado$(br)$(thing)Y$(): 0 — 70$(br)$(thing)Tamanho$(): 50$(br)$(thing)Profundidade MÃĄxima do Indicador$(): 40$(br2)$(thing)Tipos de Pedra$(): Argilita, Argilito, Basalto, CalcÃĄrio, Conglomerado, Dacito, Dolomito, Folhelho, Quartzito, Traquito", "title": "Cobre e Calcopirita", "type": "patchouli:text", "anchor": "mars_copper" @@ -874,7 +874,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)Raridade$(): 1/250 chunks$(br)$(thing)Densidade$(): 40%$(br)$(thing)Tipo$(): Veio Aglomerado$(br)$(thing)Y$(): 0 — 70$(br)$(thing)Tamanho$(): 55$(br)$(thing)Profundidade MÃĄxima do Indicador$(): 40$(br2)$(thing)Tipos de Pedra$(): Argilita, Argilito, Basalto, CalcÃĄrio, Dacito, Folhelho, Giz, Granito, Red Granite", + "text": "$(thing)Raridade$(): 1/250 chunks$(br)$(thing)Densidade$(): 40%$(br)$(thing)Tipo$(): Veio Aglomerado$(br)$(thing)Y$(): 0 — 70$(br)$(thing)Tamanho$(): 55$(br)$(thing)Profundidade MÃĄxima do Indicador$(): 40$(br2)$(thing)Tipos de Pedra$(): Argilita, Argilito, Basalto, CalcÃĄrio, Dacito, Folhelho, Giz, Granito, Quartzito, Red Granite", "title": "Garnierita e Cobaltita", "type": "patchouli:text", "anchor": "mars_nickel" @@ -1150,7 +1150,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)Raridade$(): 1/210 chunks$(br)$(thing)Densidade$(): 40%$(br)$(thing)Tipo$(): Veio Aglomerado$(br)$(thing)Y$(): 0 — 70$(br)$(thing)Tamanho$(): 40$(br)$(thing)Profundidade MÃĄxima do Indicador$(): 30$(br2)$(thing)Tipos de Pedra$(): Argilita, Argilito, Basalto, CalcÃĄrio, Conglomerado, Dacito, Dolomito, Red Granite", + "text": "$(thing)Raridade$(): 1/210 chunks$(br)$(thing)Densidade$(): 40%$(br)$(thing)Tipo$(): Veio Aglomerado$(br)$(thing)Y$(): 0 — 70$(br)$(thing)Tamanho$(): 40$(br)$(thing)Profundidade MÃĄxima do Indicador$(): 30$(br2)$(thing)Tipos de Pedra$(): Argilita, Argilito, Basalto, CalcÃĄrio, Conglomerado, Dacito, Dolomito, Quartzito, Red Granite", "title": "Hematita e Limonita", "type": "patchouli:text", "anchor": "mars_hematite" @@ -1242,7 +1242,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)Raridade$(): 1/140 chunks$(br)$(thing)Densidade$(): 25%$(br)$(thing)Tipo$(): Veio Aglomerado$(br)$(thing)Y$(): 80 — 180$(br)$(thing)Tamanho$(): 45$(br)$(thing)Profundidade MÃĄxima do Indicador$(): 40$(br2)$(thing)Tipos de Pedra$(): Argilita, Argilito, Basalto, CalcÃĄrio, Cherte, Conglomerado, Dacito, Diorito, Dolomito, Folhelho, Gabro, Giz, Granito, Red Granite, Traquito", + "text": "$(thing)Raridade$(): 1/140 chunks$(br)$(thing)Densidade$(): 25%$(br)$(thing)Tipo$(): Veio Aglomerado$(br)$(thing)Y$(): 80 — 180$(br)$(thing)Tamanho$(): 45$(br)$(thing)Profundidade MÃĄxima do Indicador$(): 40$(br2)$(thing)Tipos de Pedra$(): Argilita, Argilito, Basalto, CalcÃĄrio, Cherte, Conglomerado, Dacito, Diorito, Dolomito, Folhelho, Gabro, Giz, Granito, Quartzito, Red Granite, Traquito", "title": "Hematita e Limonita", "type": "patchouli:text", "anchor": "mars_surface_hematite" @@ -1518,7 +1518,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)Raridade$(): 1/220 chunks$(br)$(thing)Densidade$(): 55%$(br)$(thing)Tipo$(): Veio Aglomerado$(br)$(thing)Y$(): 0 — 70$(br)$(thing)Tamanho$(): 20$(br)$(thing)Profundidade MÃĄxima do Indicador$(): 15$(br2)$(thing)Tipos de Pedra$(): Argilita, Conglomerado, Dacito, Diorito, Dolomito, Folhelho, Gabro, Red Granite, Traquito", + "text": "$(thing)Raridade$(): 1/220 chunks$(br)$(thing)Densidade$(): 55%$(br)$(thing)Tipo$(): Veio Aglomerado$(br)$(thing)Y$(): 0 — 70$(br)$(thing)Tamanho$(): 20$(br)$(thing)Profundidade MÃĄxima do Indicador$(): 15$(br2)$(thing)Tipos de Pedra$(): Argilita, Conglomerado, Dacito, Diorito, Dolomito, Folhelho, Gabro, Quartzito, Red Granite, Traquito", "title": "Pitchblende & Thorianite, & Hematite", "type": "patchouli:text", "anchor": "mars_pitchblende" @@ -1585,7 +1585,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)Raridade$(): 1/370 chunks$(br)$(thing)Densidade$(): 30%$(br)$(thing)Tipo$(): Veio Aglomerado$(br)$(thing)Y$(): -20 — 0$(br)$(thing)Tamanho$(): 60$(br)$(thing)Profundidade MÃĄxima do Indicador$(): 20$(br2)$(thing)Tipos de Pedra$(): Argilita, Argilito, Dacito, Diorito, Folhelho, Gabro, Traquito", + "text": "$(thing)Raridade$(): 1/370 chunks$(br)$(thing)Densidade$(): 30%$(br)$(thing)Tipo$(): Veio Aglomerado$(br)$(thing)Y$(): -30 — 0$(br)$(thing)Tamanho$(): 60$(br)$(thing)Profundidade MÃĄxima do Indicador$(): 20$(br2)$(thing)Tipos de Pedra$(): Diorito, Gabro, Granito, Red Granite", "title": "Pitchblende, Thorianite, & Uraninite", "type": "patchouli:text", "anchor": "deep_mars_pitchblende" @@ -1744,7 +1744,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)Raridade$(): 1/210 chunks$(br)$(thing)Densidade$(): 30%$(br)$(thing)Tipo$(): Veio Aglomerado$(br)$(thing)Y$(): 0 — 70$(br)$(thing)Tamanho$(): 40$(br)$(thing)Profundidade MÃĄxima do Indicador$(): 15$(br2)$(thing)Tipos de Pedra$(): Argilita, Argilito, CalcÃĄrio, Cherte, Folhelho, Giz, Granito, Red Granite, Traquito", + "text": "$(thing)Raridade$(): 1/210 chunks$(br)$(thing)Densidade$(): 30%$(br)$(thing)Tipo$(): Veio Aglomerado$(br)$(thing)Y$(): 0 — 70$(br)$(thing)Tamanho$(): 40$(br)$(thing)Profundidade MÃĄxima do Indicador$(): 15$(br2)$(thing)Tipos de Pedra$(): Argilita, Argilito, CalcÃĄrio, Cherte, Folhelho, Giz, Granito, Quartzito, Red Granite, Traquito", "title": "Quartzite, Asbestos, & Barite", "type": "patchouli:text", "anchor": "mars_quartzite" @@ -1836,7 +1836,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)Raridade$(): 1/370 chunks$(br)$(thing)Densidade$(): 30%$(br)$(thing)Tipo$(): Veio Aglomerado$(br)$(thing)Y$(): -20 — 0$(br)$(thing)Tamanho$(): 60$(br)$(thing)Profundidade MÃĄxima do Indicador$(): 20$(br2)$(thing)Tipos de Pedra$(): Argilita, Argilito, Basalto, CalcÃĄrio, Cherte, Dacito, Folhelho, Giz", + "text": "$(thing)Raridade$(): 1/370 chunks$(br)$(thing)Densidade$(): 30%$(br)$(thing)Tipo$(): Veio Aglomerado$(br)$(thing)Y$(): -30 — 0$(br)$(thing)Tamanho$(): 60$(br)$(thing)Profundidade MÃĄxima do Indicador$(): 20$(br2)$(thing)Tipos de Pedra$(): Diorito, Gabro, Granito, Red Granite", "title": "Redstone & Chromite", "type": "patchouli:text", "anchor": "deep_mars_chromite" @@ -1903,7 +1903,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)Raridade$(): 1/210 chunks$(br)$(thing)Densidade$(): 40%$(br)$(thing)Tipo$(): Veio em Disco$(br)$(thing)Y$(): 0 — 70$(br)$(thing)Tamanho$(): 40$(br)$(thing)Altura$(): 6$(br)$(thing)Profundidade MÃĄxima do Indicador$(): 15$(br2)$(thing)Tipos de Pedra$(): Argilita, Argilito, CalcÃĄrio, Cherte, Diorito, Giz, Granito, Red Granite, Traquito", + "text": "$(thing)Raridade$(): 1/210 chunks$(br)$(thing)Densidade$(): 40%$(br)$(thing)Tipo$(): Veio em Disco$(br)$(thing)Y$(): 0 — 70$(br)$(thing)Tamanho$(): 40$(br)$(thing)Altura$(): 6$(br)$(thing)Profundidade MÃĄxima do Indicador$(): 15$(br2)$(thing)Tipos de Pedra$(): Argilita, Argilito, CalcÃĄrio, Cherte, Diorito, Giz, Granito, Quartzito, Red Granite, Traquito", "title": "Salts & Spodumene", "type": "patchouli:text", "anchor": "mars_salt" @@ -2087,7 +2087,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)Raridade$(): 1/150 chunks$(br)$(thing)Densidade$(): 25%$(br)$(thing)Tipo$(): Veio Aglomerado$(br)$(thing)Y$(): 80 — 180$(br)$(thing)Tamanho$(): 45$(br)$(thing)Profundidade MÃĄxima do Indicador$(): 40$(br2)$(thing)Tipos de Pedra$(): Argilita, Argilito, Basalto, CalcÃĄrio, Cherte, Conglomerado, Dacito, Diorito, Dolomito, Folhelho, Gabro, Giz, Granito, Red Granite, Traquito", + "text": "$(thing)Raridade$(): 1/150 chunks$(br)$(thing)Densidade$(): 25%$(br)$(thing)Tipo$(): Veio Aglomerado$(br)$(thing)Y$(): 80 — 180$(br)$(thing)Tamanho$(): 45$(br)$(thing)Profundidade MÃĄxima do Indicador$(): 40$(br2)$(thing)Tipos de Pedra$(): Argilita, Argilito, Basalto, CalcÃĄrio, Cherte, Conglomerado, Dacito, Diorito, Dolomito, Folhelho, Gabro, Giz, Granito, Quartzito, Red Granite, Traquito", "title": "Sphalerite & Galena", "type": "patchouli:text", "anchor": "mars_surface_nickel_galena" @@ -2194,7 +2194,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)Raridade$(): 1/210 chunks$(br)$(thing)Densidade$(): 40%$(br)$(thing)Tipo$(): Veio Aglomerado$(br)$(thing)Y$(): 0 — 70$(br)$(thing)Tamanho$(): 40$(br)$(thing)Profundidade MÃĄxima do Indicador$(): 40$(br2)$(thing)Tipos de Pedra$(): Argilita, Basalto, Cherte, Dacito, Diorito, Dolomito, Folhelho, Gabro, Giz, Red Granite, Traquito", + "text": "$(thing)Raridade$(): 1/210 chunks$(br)$(thing)Densidade$(): 40%$(br)$(thing)Tipo$(): Veio Aglomerado$(br)$(thing)Y$(): 0 — 70$(br)$(thing)Tamanho$(): 40$(br)$(thing)Profundidade MÃĄxima do Indicador$(): 40$(br2)$(thing)Tipos de Pedra$(): Argilita, Basalto, Cherte, Dacito, Diorito, Dolomito, Folhelho, Gabro, Giz, Quartzito, Red Granite, Traquito", "title": "Tetraedrita (Normal)", "type": "patchouli:text", "anchor": "mars_stibnite" @@ -2286,7 +2286,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)Raridade$(): 1/140 chunks$(br)$(thing)Densidade$(): 25%$(br)$(thing)Tipo$(): Veio Aglomerado$(br)$(thing)Y$(): 80 — 180$(br)$(thing)Tamanho$(): 45$(br)$(thing)Profundidade MÃĄxima do Indicador$(): 40$(br2)$(thing)Tipos de Pedra$(): Argilita, Argilito, Basalto, CalcÃĄrio, Cherte, Conglomerado, Dacito, Diorito, Dolomito, Folhelho, Gabro, Giz, Granito, Red Granite, Traquito", + "text": "$(thing)Raridade$(): 1/140 chunks$(br)$(thing)Densidade$(): 25%$(br)$(thing)Tipo$(): Veio Aglomerado$(br)$(thing)Y$(): 80 — 180$(br)$(thing)Tamanho$(): 45$(br)$(thing)Profundidade MÃĄxima do Indicador$(): 40$(br2)$(thing)Tipos de Pedra$(): Argilita, Argilito, Basalto, CalcÃĄrio, Cherte, Conglomerado, Dacito, Diorito, Dolomito, Folhelho, Gabro, Giz, Granito, Quartzito, Red Granite, Traquito", "title": "Tetraedrita (Superfície)", "type": "patchouli:text", "anchor": "mars_surface_tetrahedrite" @@ -2378,7 +2378,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)Raridade$(): 1/220 chunks$(br)$(thing)Densidade$(): 25%$(br)$(thing)Tipo$(): Veio Aglomerado$(br)$(thing)Y$(): 0 — 70$(br)$(thing)Tamanho$(): 40$(br)$(thing)Profundidade MÃĄxima do Indicador$(): 15$(br2)$(thing)Tipos de Pedra$(): Argilita, Argilito, CalcÃĄrio, Conglomerado, Dacito, Diorito, Dolomito, Folhelho, Granito, Red Granite", + "text": "$(thing)Raridade$(): 1/220 chunks$(br)$(thing)Densidade$(): 25%$(br)$(thing)Tipo$(): Veio Aglomerado$(br)$(thing)Y$(): 0 — 70$(br)$(thing)Tamanho$(): 40$(br)$(thing)Profundidade MÃĄxima do Indicador$(): 15$(br2)$(thing)Tipos de Pedra$(): Argilita, Argilito, CalcÃĄrio, Conglomerado, Dacito, Diorito, Dolomito, Folhelho, Granito, Quartzito, Red Granite", "title": "Trona, Talc, & Glauconite", "type": "patchouli:text", "anchor": "mars_lubricant" diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/pt_br/entries/tfg_ores/nether_vein_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/pt_br/entries/tfg_ores/nether_vein_index.json index 0baeae0ae..6b0f4b8d2 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/pt_br/entries/tfg_ores/nether_vein_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/pt_br/entries/tfg_ores/nether_vein_index.json @@ -1025,7 +1025,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)Raridade$(): 1/250 chunks$(br)$(thing)Densidade$(): 45%$(br)$(thing)Tipo$(): Veio Tubular$(br)$(thing)Y$(): 32 — 128$(br)$(thing)Altura$(): 60$(br)$(thing)Raio$(): 12$(br2)$(thing)Tipos de Pedra$(): Basalto, Migmatito, Piroxenito, Travertino", + "text": "$(thing)Raridade$(): 1/300 chunks$(br)$(thing)Densidade$(): 45%$(br)$(thing)Tipo$(): Veio Tubular$(br)$(thing)Y$(): 32 — 128$(br)$(thing)Altura$(): 60$(br)$(thing)Raio$(): 12$(br2)$(thing)Tipos de Pedra$(): Basalto, Migmatito, Piroxenito, Travertino", "title": "Esmeralda e Berílio", "type": "patchouli:text", "anchor": "nether_beryllium" diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/pt_br/entries/tfg_ores/venus_vein_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/pt_br/entries/tfg_ores/venus_vein_index.json index 9fd5f17e3..b2d841c0c 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/pt_br/entries/tfg_ores/venus_vein_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/pt_br/entries/tfg_ores/venus_vein_index.json @@ -19,7 +19,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)Raridade$(): 1/30 chunks$(br)$(thing)Densidade$(): 20%$(br)$(thing)Tipo$(): Veio Aglomerado$(br)$(thing)Y$(): 40 — 65$(br)$(thing)Tamanho$(): 20$(br)$(thing)Profundidade MÃĄxima do Indicador$(): 30$(br2)$(thing)Tipos de Pedra$(): Andesito, Basalto, Dacito, Riolito, Traquito, Travertino", + "text": "$(thing)Raridade$(): 1/30 chunks$(br)$(thing)Densidade$(): 20%$(br)$(thing)Tipo$(): Veio Aglomerado$(br)$(thing)Y$(): 40 — 65$(br)$(thing)Tamanho$(): 20$(br)$(thing)Profundidade MÃĄxima do Indicador$(): 30$(br2)$(thing)Tipos de Pedra$(): Andesito, Basalto, Dacito, Ignimbrito, Lamproíto, Riolito, Traquito, Travertino", "title": "Enxofre e Pirita", "type": "patchouli:text", "anchor": "venus_manual_sulfur" @@ -86,7 +86,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)Raridade$(): 1/30 chunks$(br)$(thing)Densidade$(): 20%$(br)$(thing)Tipo$(): Veio em Disco$(br)$(thing)Y$(): 40 — 65$(br)$(thing)Tamanho$(): 20$(br)$(thing)Altura$(): 6$(br)$(thing)Profundidade MÃĄxima do Indicador$(): 30$(br2)$(thing)Tipos de Pedra$(): Andesito, Basalto, Dacito, Riolito, Traquito, Travertino$(br2)Only appears in the $(thing)Salt Flats$() biome.", + "text": "$(thing)Raridade$(): 1/30 chunks$(br)$(thing)Densidade$(): 20%$(br)$(thing)Tipo$(): Veio em Disco$(br)$(thing)Y$(): 40 — 65$(br)$(thing)Tamanho$(): 20$(br)$(thing)Altura$(): 6$(br)$(thing)Profundidade MÃĄxima do Indicador$(): 30$(br2)$(thing)Tipos de Pedra$(): Andesito, Basalto, Dacito, Ignimbrito, Lamproíto, Riolito, Traquito, Travertino$(br2)Only appears in the $(thing)Salt Flats$() biome.", "title": "Salts & Spodumene", "type": "patchouli:text", "anchor": "venus_manual_salt" diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/mechanics/blast_furnace.json b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/mechanics/blast_furnace.json new file mode 100644 index 000000000..712207330 --- /dev/null +++ b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/mechanics/blast_furnace.json @@ -0,0 +1,68 @@ +{ + "__comment__": "This file was automatically created by mcresources", + "name": "ДÐūОÐĩÐ―Ð―Ð°Ņ ÐŋÐĩŅ‡ŅŒ", + "category": "tfc:mechanics", + "icon": "tfc:blast_furnace", + "pages": [ + { + "type": "patchouli:text", + "text": "$(thing)ДÐūОÐĩÐ―Ð―Ð°Ņ ÐŋÐĩŅ‡ŅŒ$() — ŅŅ‚Ðū ÐŋŅ€ÐūÐīÐēÐļÐ―ŅƒŅ‚аŅ ŅƒŅŅ‚Ð°Ð―ÐūÐēКа, ÐļŅÐŋÐūÐŧŅŒÐ·ŅƒÐĩОаŅ ÐīÐŧŅ ŅÐūзÐīÐ°Ð―ÐļŅ $(thing)ÐĄŅ‚аÐŧÐļ$(). ÐĄÐžÐĩŅˆÐļÐēаŅ $(l:getting_started/finding_ores)ЖÐĩÐŧÐĩÐ·Ð―Ņ‹Ðĩ Ņ€ŅƒÐīŅ‹$(), $(l:tfg_tips/basic_automation)КÐūКŅ$() ÐļÐŧÐļ $(l:beneath/ores_and_minerals#cursecoal)ÐÐ―Ņ‚Ņ€Ð°Ņ†ÐļŅ‚$(), Ðļ $(thing)Ņ„ÐŧŅŽŅ$() Ðē КÐūÐ―Ņ‚Ņ€ÐūÐŧÐļŅ€ŅƒÐĩОÐūÐđ ÐģÐūŅ€ŅŅ‡ÐĩÐđ ŅŅ€ÐĩÐīÐĩ, ÐēŅ‹ ОÐūÐķÐĩŅ‚Ðĩ ŅÐūзÐīаŅ‚ŅŒ ОÐĩŅ‚аÐŧÐŧ, ÐŋŅ€ÐūŅ‡Ð―ÐĩÐĩ Ņ‡ŅƒÐģŅƒÐ―а ÐļÐŧÐļ КÐūÐēÐ°Ð―ÐūÐģÐū ÐķÐĩÐŧÐĩза.$(br2)ЧŅ‚ÐūÐąŅ‹ ÐŋÐūÐŧŅƒŅ‡ÐļŅ‚ŅŒ ÐīÐūОÐĩÐ―Ð―ŅƒŅŽ ÐŋÐĩŅ‡ŅŒ, ÐēаО ŅÐ―аŅ‡Ð°Ðŧа ÐŋÐūÐ―Ð°ÐīÐūÐąÐļŅ‚ŅŅ $(l:mechanics/crucible)ÐĒÐļÐģÐĩÐŧŅŒ$() Ðļ ÐžÐ―ÐūÐģÐū $(thing)ÐŧÐļŅŅ‚ÐūÐē КÐūÐēÐ°Ð―Ð―ÐūÐģÐū ÐķÐĩÐŧÐĩза$()." + }, + { + "type": "patchouli:crafting", + "recipe": "tfc:crafting/blast_furnace", + "text": "ДÐŧŅ ŅÐūзÐīÐ°Ð―ÐļŅ ŅÐ°ÐžÐūÐđ ÐīÐūОÐĩÐ―Ð―ÐūÐđ ÐŋÐĩŅ‡Ðļ ÐŋÐūŅ‚Ņ€ÐĩÐąŅƒÐĩŅ‚ŅŅ $(thing)ÐĒÐļÐģÐĩÐŧŅŒ$(), а Ņ‚аКÐķÐĩ Ð―ÐĩŅÐšÐūÐŧŅŒÐšÐū $(thing)ÐīÐēÐūÐđÐ―Ņ‹Ņ… ÐŋÐŧаŅŅ‚ÐļÐ― КÐūÐēÐ°Ð―ÐūÐģÐū ÐķÐĩÐŧÐĩза$()." + }, + { + "type": "patchouli:text", + "text": "ЗаŅ‚ÐĩО ÐēаО Ð―ŅƒÐķÐ―Ðū ÐąŅƒÐīÐĩŅ‚ ÐŋÐūŅŅ‚Ņ€ÐūÐļŅ‚ŅŒ ÐīÐūОÐĩÐ―Ð―ŅƒŅŽ ÐŋÐĩŅ‡ŅŒ ÐēОÐĩŅŅ‚Ðĩ Ņ ÐĩÐĩ $(thing)ДŅ‹ÐžÐūŅ…ÐūÐīÐūО$(). ДŅ‹ÐžÐūŅ…ÐūÐī ÐīÐūÐŧÐķÐĩÐ― ÐąŅ‹Ņ‚ŅŒ ŅÐūŅŅ‚аÐēÐŧÐĩÐ― Ðļз $(l:mechanics/fire_clay#fire_bricks)ОÐģÐ―ÐĩŅƒÐŋÐūŅ€Ð―Ņ‹Ņ… КÐļŅ€ÐŋÐļŅ‡ÐĩÐđ$(), Ņ‚аК КаК ÐūÐ―Ðļ ÐīÐūŅŅ‚аŅ‚ÐūŅ‡Ð―Ðū ÐŋŅ€ÐūŅ‡Ð―Ņ‹, Ņ‡Ņ‚ÐūÐąŅ‹ ÐēŅ‹ÐīÐĩŅ€ÐķаŅ‚ŅŒ ÐļÐ―Ņ‚ÐĩÐ―ŅÐļÐēÐ―Ņ‹Ðđ ÐķаŅ€. ЗаŅ‚ÐĩО ÐĩÐģÐū ŅÐŧÐĩÐīŅƒÐĩŅ‚ ÐēŅ‹ÐŧÐūÐķÐļŅ‚ŅŒ $(thing)ÐŋÐŧаŅŅ‚ÐļÐ―Ð°ÐžÐļ Ðļз КÐūÐēÐ°Ð―Ð―ÐūÐģÐū ÐķÐĩÐŧÐĩза$() ÐīÐŧŅ ÐīÐūÐŋÐūÐŧÐ―ÐļŅ‚ÐĩÐŧŅŒÐ―ÐūÐģÐū ŅƒÐšŅ€ÐĩÐŋÐŧÐĩÐ―ÐļŅ. ПÐŧаŅŅ‚ÐļÐ―Ņ‹ ОÐūÐģŅƒŅ‚ ÐąŅ‹Ņ‚ŅŒ ÐŋŅ€ÐļОÐĩÐ―ÐĩÐ―Ņ‹ К Ð―Ð°Ņ€ŅƒÐķÐ―ÐļО ŅŅ‚ÐūŅ€ÐūÐ―Ð°Ðž КÐļŅ€ÐŋÐļŅ‡ÐĩÐđ ÐŋŅ€Ðļ Ð―Ð°ÐķаŅ‚ÐļÐļ $(item)$(k:key.sneak)$() + $(item)$(k:key.use)$() Ņ ÐŋÐŧаŅŅ‚ÐļÐ―ÐūÐđ Ðē Ņ€ŅƒÐšÐĩ, ÐļÐŧÐļ ŅÐšŅ€Ð°Ņ„Ņ‡ÐĩÐ―Ņ‹ Ðē $(l:mechanics/blast_furnace_insulation)ИзÐūÐŧŅŅ†ÐļŅŽ ÐīÐŧŅ ÐīÐūОÐĩÐ―Ð―ÐūÐđ ÐŋÐĩŅ‡Ðļ$()." + }, + { + "type": "patchouli:multiblock", + "multiblock_id": "tfc:blast_furnace", + "name": "ДÐūОÐĩÐ―Ð―Ð°Ņ ÐŋÐĩŅ‡ŅŒ", + "text": "ДÐūОÐĩÐ―Ð―Ð°Ņ ÐŋÐĩŅ‡ŅŒ Ņ ÐīŅ‹ÐžÐūŅ…ÐūÐīÐūО ОÐļÐ―ÐļОаÐŧŅŒÐ―ÐūÐđ ÐēŅ‹ŅÐūŅ‚Ņ‹.", + "enable_visualize": true + }, + { + "type": "patchouli:text", + "text": "ДŅ‹ÐžÐūŅ…ÐūÐī ÐīÐūОÐĩÐ―Ð―ÐūÐđ ÐŋÐĩŅ‡Ðļ ОÐūÐķÐĩŅ‚ ŅÐūŅŅ‚ÐūŅŅ‚ŅŒ Ðļз ÐŋŅŅ‚Ðļ ŅÐŧÐūÐĩÐē - КаÐķÐīŅ‹Ðđ ŅÐŧÐūÐđ Ņ‚Ņ€ÐĩÐąŅƒÐĩŅ‚ Ņ‡ÐĩŅ‚Ņ‹Ņ€Ðĩ $(thing)ОÐģÐ―ÐĩŅƒÐŋÐūŅ€Ð―Ņ‹Ņ… КÐļŅ€ÐŋÐļŅ‡ÐĩÐđ$() Ðļ ÐīÐēÐĩÐ―Ð°ÐīŅ†Ð°Ņ‚Ðļ $(thing)КÐūÐēÐ°Ð―Ņ‹Ņ… ÐķÐĩÐŧÐĩÐ·Ð―Ņ‹Ņ… ÐŧÐļŅŅ‚ÐūÐē$(), ÐīÐŧŅ заÐēÐĩŅ€ŅˆÐĩÐ―ÐļŅ ŅŅ‚Ņ€ÐūÐļŅ‚ÐĩÐŧŅŒŅŅ‚Ðēа. НаÐŧÐļŅ‡ÐļÐĩ ÐąÐūÐŧŅŒŅˆÐĩÐģÐū КÐūÐŧÐļŅ‡ÐĩŅŅ‚Ðēа ŅÐŧÐūÐĩÐē ŅƒÐēÐĩÐŧÐļŅ‡ÐļÐēаÐĩŅ‚ ÐūÐąŅ‰ŅƒŅŽ ÐēОÐĩŅŅ‚ÐļОÐūŅŅ‚ŅŒ ÐīÐūОÐĩÐ―Ð―ÐūÐđ ÐŋÐĩŅ‡Ðļ, ÐŋÐūзÐēÐūÐŧŅŅ ÐŋÐŧаÐēÐļŅ‚ŅŒ ÐąÐūÐŧŅŒŅˆÐĩ ŅŅ‚аÐŧÐļ за ÐūÐīÐļÐ― Ņ€Ð°Ð·. КаÐķÐīŅ‹Ðđ ŅÐŧÐūÐđ ÐīŅ‹ÐžÐūŅ…ÐūÐīа (ОаКŅÐļОŅƒÐž - ÐŋŅŅ‚ŅŒ ŅÐŧÐūŅ‘Ðē), ÐŋÐūзÐēÐūÐŧŅÐĩŅ‚ ÐīÐūОÐĩÐ―Ð―ÐūÐđ ÐŋÐĩŅ‡Ðļ ÐēОÐĩŅ‰Ð°Ņ‚ŅŒ Ð―Ð° Ņ‡ÐĩŅ‚Ņ‹Ņ€Ðĩ ÐīÐūÐŋÐūÐŧÐ―ÐļŅ‚ÐĩÐŧŅŒÐ―Ņ‹Ņ… ÐŋŅ€ÐĩÐīОÐĩŅ‚а Ņ€ŅƒÐīŅ‹ ÐąÐūÐŧŅŒŅˆÐĩ." + }, + { + "type": "patchouli:text", + "text": "ЧŅ‚ÐūÐąŅ‹ ÐļŅÐŋÐūÐŧŅŒÐ·ÐūÐēаŅ‚ŅŒ ÐīÐūОÐĩÐ―Ð―ŅƒŅŽ ÐŋÐĩŅ‡ŅŒ, ÐēŅ‹ ÐīÐūÐŧÐķÐ―Ņ‹ ÐąŅ€ÐūŅÐļŅ‚ŅŒ ÐŋŅ€ÐĩÐīОÐĩŅ‚Ņ‹ Ðē ÐēÐĩŅ€Ņ…Ð―ŅŽŅŽ Ņ‡Ð°ŅŅ‚ŅŒ ÐīŅ‹ÐžÐūŅ…ÐūÐīа - ÐīÐŧŅ ÐŋŅ€ÐūÐļзÐēÐūÐīŅŅ‚Ðēа ŅŅ‚аÐŧÐļ, ÐēŅ‹ ÐīÐūÐŧÐķÐ―Ņ‹ ÐīÐūÐąÐ°ÐēÐļŅ‚ŅŒ Ņ€Ð°ÐēÐ―ÐūÐĩ КÐūÐŧÐļŅ‡ÐĩŅŅ‚ÐēÐū ÐŋŅ€ÐĩÐīОÐĩŅ‚ÐūÐē $(l:getting_started/finding_ores)ЖÐĩÐŧÐĩÐ·Ð―Ņ‹Ņ… Ņ€ŅƒÐī$() Ðļ $(l:mechanics/flux)Ņ„ÐŧŅŽŅÐ°$(). ПÐūÐīÐūÐđÐīŅƒŅ‚ ÐŧŅŽÐąŅ‹Ðĩ ÐķÐĩÐŧÐĩÐ·Ð―Ņ‹Ðĩ Ņ€ŅƒÐīŅ‹ ÐļÐŧÐļ ÐŋŅ€ÐĩÐīОÐĩŅ‚Ņ‹, КÐūŅ‚ÐūŅ€Ņ‹Ðĩ ОÐūÐģŅƒŅ‚ ÐŋÐŧаÐēÐļŅ‚ŅŒŅŅ Ðē $(thing)ЧŅƒÐģŅƒÐ―$(). ВаО Ņ‚аКÐķÐĩ Ð―ŅƒÐķÐ―Ðū ÐąŅƒÐīÐĩŅ‚ ÐīÐūÐąÐ°ÐēÐļŅ‚ŅŒ $(l:tfg_tips/basic_automation)КÐūКŅ$() ÐļÐŧÐļ $(l:beneath/ores_and_minerals#cursecoal)ÐÐ―Ņ‚Ņ€Ð°Ņ†ÐļŅ‚$(), КÐūŅ‚ÐūŅ€Ņ‹Ðđ ÐąŅƒÐīÐĩŅ‚ Ņ€Ð°ŅŅ…ÐūÐīÐūÐēаŅ‚ŅŒŅŅ ÐŋÐū ОÐĩŅ€Ðĩ Ņ€Ð°ÐąÐūŅ‚Ņ‹ ÐīÐūОÐĩÐ―Ð―ÐūÐđ ÐŋÐĩŅ‡Ðļ." + }, + { + "type": "patchouli:text", + "text": "ИŅÐŋÐūÐŧŅŒÐ·ÐūÐēÐ°Ð―ÐļÐĩ ÐīÐūОÐĩÐ―Ð―ÐūÐđ ÐŋÐĩŅ‡Ðļ ÐūŅ‚КŅ€ÐūÐĩŅ‚ ÐļÐ―Ņ‚ÐĩŅ€Ņ„ÐĩÐđŅ ÐŋÐĩŅ‡Ðļ, ÐŋÐūÐšÐ°Ð·Ð°Ð―Ð―Ņ‹Ðđ ŅÐŋŅ€Ð°Ðēа. В ŅŅ‚ÐūО ÐļÐ―Ņ‚ÐĩŅ€Ņ„ÐĩÐđŅÐĩ ÐēŅ‹ ŅƒÐēÐļÐīÐļŅ‚Ðĩ ÐļÐ―ÐīÐļКаŅ‚ÐūŅ€Ņ‹ ŅÐūÐīÐĩŅ€ÐķÐ°Ð―ÐļŅ Ņ€ŅƒÐīŅ‹ Ðļ Ņ‚ÐūÐŋÐŧÐļÐēа ÐīÐūОÐĩÐ―Ð―ÐūÐđ ÐŋÐĩŅ‡Ðļ. В ÐēÐĩŅ€Ņ…Ð―ÐĩО ÐŋŅ€Ð°ÐēÐūО ŅÐŧÐūŅ‚Ðĩ ÐīÐūÐŧÐķÐ―Ð° Ð―Ð°Ņ…ÐūÐīÐļŅ‚ŅŒŅŅ $(thing)ÐĪŅƒŅ€ÐžÐ°$(), ОÐĩŅ‚аÐŧÐŧÐļŅ‡ÐĩŅÐšÐ°Ņ Ņ‚Ņ€ŅƒÐąÐ°, ÐļŅÐŋÐūÐŧŅŒÐ·ŅƒÐĩОаŅ ÐīÐŧŅ Ð―Ð°ÐŋŅ€Ð°ÐēÐŧÐĩÐ―ÐļŅ ÐēÐūзÐīŅƒŅ…а Ðē ÐēŅ‹ŅÐūКŅƒŅŽ ÐŋÐĩŅ‡ŅŒ, Ð―ÐĩÐūÐąŅ…ÐūÐīÐļОаŅ ÐīÐŧŅ ÐīÐūŅŅ‚ÐļÐķÐĩÐ―ÐļŅ ОаКŅÐļОаÐŧŅŒÐ―Ņ‹Ņ… Ņ‚ÐĩОÐŋÐĩŅ€Ð°Ņ‚ŅƒŅ€ ÐīÐŧŅ ÐŋÐŧаÐēКÐļ ŅŅ‚аÐŧÐļ. ÐĪŅƒŅ€ÐžŅƒ ОÐūÐķÐ―Ðū ÐēŅ‹ÐšÐūÐēаŅ‚ŅŒ Ð―Ð° $(l:mechanics/anvils)НаКÐūÐēаÐŧŅŒÐ―Ðĩ$()." + }, + { + "type": "patchouli:image", + "images": [ + "tfc:textures/gui/book/gui/blast_furnace.png" + ], + "text": "Ð˜Ð―Ņ‚ÐĩŅ€Ņ„ÐĩÐđŅ ÐīÐūОÐĩÐ―Ð―ÐūÐđ ÐŋÐĩŅ‡Ðļ", + "border": false + }, + { + "type": "patchouli:text", + "text": "ВаО Ņ‚аКÐķÐĩ ÐŋÐūÐ―Ð°ÐīÐūÐąŅŅ‚ŅŅ $(l:mechanics/bellows)МÐĩŅ…а$(), Ņ‡Ņ‚ÐūÐąŅ‹ ÐīÐūОÐĩÐ―Ð―Ð°Ņ ÐŋÐĩŅ‡ŅŒ ÐīÐūŅŅ‚ÐļÐģÐŧа Ņ‚ÐĩОÐŋÐĩŅ€Ð°Ņ‚ŅƒŅ€Ņ‹, ÐŋŅ€Ðļ КÐūŅ‚ÐūŅ€ÐūÐđ ÐķÐĩÐŧÐĩзÐū Ņ€Ð°ŅÐŋÐŧаÐēÐļŅ‚ŅŅ. ЕÐģÐū ОÐūÐķÐ―Ðū ŅƒŅŅ‚Ð°Ð―ÐūÐēÐļŅ‚ŅŒ Ð―Ð° ÐŧŅŽÐąÐūÐđ Ðļз Ņ‡ÐĩŅ‚Ņ‹Ņ€ÐĩŅ… ŅŅ‚ÐūŅ€ÐūÐ― ÐīÐūОÐĩÐ―Ð―ÐūÐđ ÐŋÐĩŅ‡Ðļ." + }, + { + "type": "patchouli:multiblock", + "multiblock_id": "tfc:full_blast_furnace", + "name": "", + "text": "ДÐūОÐĩÐ―Ð―Ð°Ņ ÐŋÐĩŅ‡ŅŒ ÐŋÐūÐŧÐ―ÐūÐģÐū Ņ€Ð°Ð·ÐžÐĩŅ€Ð° Ņ ÐŋŅ€ÐļКŅ€ÐĩÐŋÐŧÐĩÐ―Ð―Ņ‹ÐžÐļ ОÐĩŅ…аОÐļ Ðļ Ņ‚ÐļÐģÐŧÐĩО.", + "enable_visualize": true + }, + { + "type": "patchouli:text", + "text": "НаКÐūÐ―ÐĩŅ†, Ņ‡Ņ‚ÐūÐąŅ‹ Ð―Ð°Ņ‡Ð°Ņ‚ŅŒ, заÐķÐģÐļŅ‚Ðĩ ÐīÐūОÐĩÐ―Ð―ŅƒŅŽ ÐŋÐĩŅ‡ŅŒ Ņ ÐŋÐūОÐūŅ‰ŅŒŅŽ $(l:getting_started/firepit#firestarter)ПŅ€ÐļОÐļŅ‚ÐļÐēÐ―ÐūÐģÐū ÐūÐģÐ―ÐļÐēа$() ÐļÐŧÐļ $(thing)ÐĄŅ‚аÐŧŅŒÐ―ÐūÐģÐū ÐūÐģÐ―ÐļÐēа$(). ÐžÐ―Ð° Ð―Ð°Ņ‡Ð―ÐĩŅ‚ Ð―Ð°ÐģŅ€ÐĩÐēаŅ‚ŅŒ Ņ€ŅƒÐīŅ‹ ÐēÐ―ŅƒŅ‚Ņ€Ðļ. ÐĢÐąÐĩÐīÐļŅ‚ÐĩŅŅŒ, Ņ‡Ņ‚Ðū Ðē ÐīÐūОÐĩÐ―Ð―ÐūÐđ ÐŋÐĩŅ‡Ðļ ÐūŅŅ‚аŅ‘Ņ‚ŅŅ Ņ‚ÐūÐŋÐŧÐļÐēÐū, Ðļ ÐļŅÐŋÐūÐŧŅŒÐ·ŅƒÐđŅ‚Ðĩ ОÐĩŅ…а, Ņ‡Ņ‚ÐūÐąŅ‹ Ð―Ð°ÐģÐ―ÐĩŅ‚аŅ‚ŅŒ ÐēÐūзÐīŅƒŅ… Ðē ÐŋÐĩŅ‡ŅŒ ÐŋÐūŅÐŧÐĩ Ņ‚ÐūÐģÐū, КаК ÐĩÐĩ ÐēÐ―ŅƒŅ‚Ņ€ÐĩÐ―Ð―ŅŅ Ņ‚ÐĩОÐŋÐĩŅ€Ð°Ņ‚ŅƒŅ€Ð° ÐīÐūŅŅ‚ÐļÐģÐ―ÐĩŅ‚ ОаКŅÐļОŅƒÐžÐ°, КÐūŅ‚ÐūŅ€Ņ‹Ðđ ОÐūÐķÐĩŅ‚ ÐēŅ‹ÐīаŅ‚ŅŒ ŅƒÐģÐūÐŧŅŒ. ПÐūŅÐŧÐĩ Ð―Ð°ÐģŅ€ÐĩÐēа Ņ€ŅƒÐīŅ‹ ÐēÐ―ŅƒŅ‚Ņ€Ðļ, ÐūÐ―Ð° Ņ€Ð°ŅÐŋÐŧаÐēÐļŅ‚ŅŅ Ðļ ÐŋŅ€ÐĩÐēŅ€Ð°Ņ‚ÐļŅ‚ŅŅ Ðē $(l:mechanics/steel)ЧŅƒÐģŅƒÐ―$()." + }, + { + "type": "patchouli:text", + "text": "ЖÐļÐīКÐļÐđ ОÐĩŅ‚аÐŧÐŧ ÐąŅƒÐīÐĩŅ‚ ŅŅ‚ÐĩКаŅ‚ŅŒ Ðē ÐŧŅŽÐąÐūÐđ ОÐĩŅ‚аÐŧÐŧÐļŅ‡ÐĩŅÐšÐļÐđ КÐūÐ―Ņ‚ÐĩÐđÐ―ÐĩŅ€ ÐīÐŧŅ ÐķÐļÐīКÐūŅŅ‚Ðļ, ŅƒŅŅ‚Ð°Ð―ÐūÐēÐŧÐĩÐ―Ð―Ņ‹Ðđ Ð―ÐĩÐŋÐūŅŅ€ÐĩÐīŅŅ‚ÐēÐĩÐ―Ð―Ðū ÐŋÐūÐī ÐīÐūОÐĩÐ―Ð―ÐūÐđ ÐŋÐĩŅ‡ŅŒŅŽ, Ņ‚аКÐūÐđ КаК $(l:mechanics/crucible)ÐĒÐļÐģÐĩÐŧŅŒ$(). ЕÐģÐū ОÐūÐķÐ―Ðū ÐūŅ‚ÐŧÐļŅ‚ŅŒ Ðē Ņ„ÐūŅ€ÐžŅ‹ ÐīÐŧŅ ŅÐŧÐļŅ‚КÐūÐē Ðļз ÐēŅ‹Ņ…ÐūÐīÐ―ÐūÐģÐū ŅÐŧÐūŅ‚а Ņ‚ÐļÐģÐŧŅ Ðļ ÐŋÐĩŅ€ÐĩŅ€Ð°ÐąÐūŅ‚аŅ‚ŅŒ Ðē $(l:mechanics/steel)ÐĄŅ‚аÐŧŅŒ$()." + } + ], + "read_by_default": true +} \ No newline at end of file diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/mechanics/bloomery.json b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/mechanics/bloomery.json index 2965665dd..edf100f4e 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/mechanics/bloomery.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/mechanics/bloomery.json @@ -22,19 +22,19 @@ }, { "type": "patchouli:text", - "text": "ÐĄŅ‹Ņ€ÐūÐīŅƒŅ‚Ð―Ņ‹Ðđ ÐģÐūŅ€Ð― ÐēОÐĩŅ‰Ð°ÐĩŅ‚ ÐīÐū 48 $(thing)ПŅ€ÐĩÐīОÐĩŅ‚ÐūÐē$(), ÐŋÐū 16 за КаÐķÐīŅ‹Ðđ ŅƒŅ€ÐūÐēÐĩÐ―ŅŒ КаОÐļÐ―Ð°. ЧŅ‚ÐūÐąŅ‹ ÐīÐūÐąÐ°ÐēÐļŅ‚ŅŒ ŅƒŅ€ÐūÐēÐ―ÐĩÐđ ÐīŅ‹ÐžÐūŅ…ÐūÐīŅƒ, ÐŋÐūŅŅ‚аÐēŅŒŅ‚Ðĩ ÐĩŅ‰Ņ‘ ÐīÐēа ŅÐŧÐūŅ Ðļз КаОÐĩÐ―Ð―Ņ‹Ðđ ÐąÐŧÐūКÐūÐē.$(br2)ЧŅ‚ÐūÐąŅ‹ ÐīÐūÐąÐ°ÐēÐļŅ‚ŅŒ ÐŋŅ€ÐĩÐīОÐĩŅ‚Ņ‹ Ðē ÐģÐūŅ€Ð―, Ð·Ð°ÐąÐĩŅ€ÐļŅ‚ÐĩŅŅŒ Ð―Ð°ÐēÐĩŅ€Ņ… Ðļ заКÐļÐ―ŅŒŅ‚Ðĩ ÐļŅ… ÐēÐ―ŅƒŅ‚Ņ€ŅŒ, ÐŋÐūŅÐŧÐĩ Ņ‡ÐĩÐģÐū Ð―Ð° ÐļŅ… ОÐĩŅŅ‚Ðĩ ÐūÐąŅ€Ð°Ð·ŅƒÐĩŅ‚ŅŅ ŅÐĩŅ€Ð°Ņ ОаŅŅÐ°." + "text": "ÐĄŅ‹Ņ€ÐūÐīŅƒŅ‚Ð―Ņ‹Ðđ ÐģÐūŅ€Ð― ÐēОÐĩŅ‰Ð°ÐĩŅ‚ ÐīÐū 48 $(thing)ПŅ€ÐĩÐīОÐĩŅ‚ÐūÐē$(), ÐŋÐū 16 за КаÐķÐīŅ‹Ðđ ŅƒŅ€ÐūÐēÐĩÐ―ŅŒ КаОÐļÐ―Ð°. ЧŅ‚ÐūÐąŅ‹ ÐīÐūÐąÐ°ÐēÐļŅ‚ŅŒ ŅƒŅ€ÐūÐēÐ―ÐĩÐđ ÐīŅ‹ÐžÐūŅ…ÐūÐīŅƒ, ÐŋÐūŅŅ‚аÐēŅŒŅ‚Ðĩ ÐĩŅ‰Ņ‘ ÐīÐēа ŅÐŧÐūŅ Ðļз КаОÐĩÐ―Ð―Ņ‹Ðđ ÐąÐŧÐūКÐūÐē.$(br2)ЧŅ‚ÐūÐąŅ‹ ÐīÐūÐąÐ°ÐēÐļŅ‚ŅŒ ÐŋŅ€ÐĩÐīОÐĩŅ‚Ņ‹ Ðē ÐģÐūŅ€Ð―, Ð·Ð°ÐąÐĩŅ€ÐļŅ‚ÐĩŅŅŒ Ð―Ð°ÐēÐĩŅ€Ņ… Ðļ заКÐļÐ―ŅŒŅ‚Ðĩ ÐļŅ… ÐēÐ―ŅƒŅ‚Ņ€ŅŒ, ÐŋÐūŅÐŧÐĩ Ņ‡ÐĩÐģÐū Ð―Ð° ÐļŅ… ОÐĩŅŅ‚Ðĩ ÐūÐąŅ€Ð°Ð·ŅƒÐĩŅ‚ŅŅ ŅÐĩŅ€Ð°Ņ ОаŅŅÐ°.$(br2ÐĒŅ‹ ОÐūÐķÐĩŅˆŅŒ ÐļŅÐŋÐūÐŧŅŒÐ·ÐūÐēŅ‚ŅŒ Ņ‚аК Ðļ $(item)ДŅ€ÐĩÐēÐĩŅÐ―Ņ‹Ðđ ŅƒÐģÐūÐŧŅŒ$(), Ņ‚аК Ðļ $(item)ÐĢÐģÐūÐŧŅŒ$() Ðē КаŅ‡ÐĩŅŅ‚ÐēÐĩ Ņ‚ÐūÐŋÐŧÐļÐēа ÐīÐŧŅ ÐģÐūŅ€Ð―а." }, { "type": "patchouli:image", "images": [ "tfc:textures/gui/book/tutorial/bloomery_hole.png" ], - "text": "ДÐūÐąÐ°ÐēÐŧÐĩÐ―ÐļÐĩ ÐŋŅ€ÐĩÐīОÐĩŅ‚ÐūÐē Ðē ÐīÐūОÐĩÐ―Ð―ŅƒŅŽ ÐŋÐĩŅ‡ŅŒ.", + "text": "ГÐūŅ€Ð―Ņƒ Ņ‚Ņ€ÐĩÐąŅƒÐĩŅ‚ŅŅ $(thing)1 ДŅ€ÐĩÐēÐĩŅÐ―Ņ‹Ðđ ŅƒÐģÐūÐŧŅŒ$(), Ðļ $(thing)144 Л (mB) ЖÐĩÐŧÐĩÐ·Ð―ÐūÐđ Ņ€ŅƒÐīŅ‹$() Ņ‡Ņ‚ÐūÐąŅ‹ ŅÐūзÐīаŅ‚ŅŒ 1 $(thing)КŅ€ÐļŅ†Ņƒ$().", "border": true }, { "type": "patchouli:text", - "text": "ГÐūŅ€Ð―Ņƒ Ņ‚Ņ€ÐĩÐąŅƒÐĩŅ‚ŅŅ $(thing)1 ДŅ€ÐĩÐēÐĩŅÐ―Ņ‹Ðđ ŅƒÐģÐūÐŧŅŒ$(), Ðļ $(thing)144 Л (mB) ЖÐĩÐŧÐĩÐ·Ð―ÐūÐđ Ņ€ŅƒÐīŅ‹$() Ņ‡Ņ‚ÐūÐąŅ‹ ŅÐūзÐīаŅ‚ŅŒ 1 $(thing)КŅ€ÐļŅ†Ņƒ$(). ПÐūŅÐŧÐĩ заÐŋÐūÐŧÐ―ÐĩÐ―ÐļŅ ÐģÐūŅ€Ð―а ŅÐžÐĩŅŅŒŅŽ $(thing)ДŅ€ÐĩÐēÐĩŅÐ―ÐūÐģÐū ŅƒÐģÐŧŅ$() Ðļ $(thing)РŅƒÐīŅ‹$(), заÐķÐģÐļŅ‚Ðĩ ÐīÐēÐĩŅ€Ðļ ÐģÐūŅ€Ð―а Ðļ ÐŋÐūÐīÐūÐķÐīÐļŅ‚Ðĩ 15 ОÐļÐ―ŅƒŅ‚, ÐŋÐūКа Ņ€ŅƒÐīа ÐŋÐŧаÐēÐļŅ‚ŅŅ. КÐūÐģÐīа ÐģÐūŅ€Ð― ÐŋÐūŅ‚ŅƒŅ…аÐĩŅ‚, ÐūÐ― ŅÐūзÐīаŅ‘Ņ‚ ÐąÐŧÐūК $(thing)КŅ€ÐļŅ†Ņ‹$(). ЭŅ‚Ðļ ÐąÐŧÐūКÐļ ŅÐūÐīÐĩŅ€ÐķаŅ‚ $(thing)КŅ€ÐļŅ‡Ð―ÐūÐĩ ÐķÐĩÐŧÐĩзÐū$(), КÐūŅ‚ÐūŅ€ÐūÐĩ ОÐūÐķÐ―Ðū ÐīÐūÐąŅ‹Ņ‚ŅŒ ÐŋÐūÐēŅ‚ÐūŅ€Ð―Ðū ÐŧÐūОаŅ ÐąÐŧÐūК $(thing)КŅ€ÐļŅ†Ņ‹$() КÐļŅ€ÐšÐūÐđ ÐļÐŧÐļ ОÐūÐŧÐūŅ‚ÐūО." + "text": "ЕŅÐŧÐļ Ņ‚ÐĩÐąÐĩ ÐŧÐĩÐ―ŅŒ ŅŅ‡ÐļŅ‚аŅ‚ŅŒ, ОŅ‹ Ņ€ÐĩКÐūОÐĩÐ―ÐīŅƒÐĩО ÐļŅÐŋÐūÐŧŅŒÐ·ÐūÐēаŅ‚ŅŒ $(item)25 ÐŋŅ‹ÐŧÐļ Ņ€ŅƒÐīÐ―ÐūÐģÐū ÐķÐĩÐŧÐĩза$() Ðļ $(item)22 Ņ‚ÐūÐŋÐŧÐļÐēа$(). ПÐūŅÐŧÐĩ заÐŋÐūÐŧÐ―ÐĩÐ―ÐļŅ ÐģÐūŅ€Ð―а ŅÐžÐĩŅŅŒŅŽ $(thing)Ņ‚ÐūÐŋÐŧÐļÐēа$() Ðļ $(thing)РŅƒÐīŅ‹$(), заÐķÐģÐļŅ‚Ðĩ ÐīÐēÐĩŅ€Ðļ ÐģÐūŅ€Ð―а Ðļ ÐŋÐūÐīÐūÐķÐīÐļŅ‚Ðĩ 15 ОÐļÐ―ŅƒŅ‚, ÐŋÐūКа Ņ€ŅƒÐīа ÐŋÐŧаÐēÐļŅ‚ŅŅ. КÐūÐģÐīа ÐģÐūŅ€Ð― ÐŋÐūŅ‚ŅƒŅ…аÐĩŅ‚, ÐūÐ― ŅÐūзÐīаŅ‘Ņ‚ ÐąÐŧÐūК $(thing)КŅ€ÐļŅ†Ņ‹$(). ЭŅ‚Ðļ ÐąÐŧÐūКÐļ ŅÐūÐīÐĩŅ€ÐķаŅ‚ $(thing)КŅ€ÐļŅ‡Ð―ÐūÐĩ ÐķÐĩÐŧÐĩзÐū$(), КÐūŅ‚ÐūŅ€ÐūÐĩ ОÐūÐķÐ―Ðū ÐīÐūÐąŅ‹Ņ‚ŅŒ ÐŋÐūÐēŅ‚ÐūŅ€Ð―Ðū ÐŧÐūОаŅ ÐąÐŧÐūК $(thing)КŅ€ÐļŅ†Ņ‹$() КÐļŅ€ÐšÐūÐđ." }, { "type": "patchouli:multiblock", diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/mechanics/bread.json b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/mechanics/bread.json deleted file mode 100644 index bd3de7807..000000000 --- a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/mechanics/bread.json +++ /dev/null @@ -1,55 +0,0 @@ -{ - "__comment__": "This file was automatically created by mcresources", - "name": "ÐĨÐŧÐĩÐą", - "category": "tfc:mechanics", - "icon": "tfc:textures/item/food/barley_bread.png", - "pages": [ - { - "type": "patchouli:text", - "text": "ÐĨÐŧÐĩÐą - ŅŅ‚Ðū ÐūÐąŅ€Ð°ÐąÐūŅ‚Ð°Ð―Ð―Ð°Ņ Ņ„ÐūŅ€ÐžÐ° Ņ€Ð°Ð·ÐŧÐļŅ‡Ð―Ņ‹Ņ… зÐĩŅ€Ð―ÐūÐēŅ‹Ņ… КŅƒÐŧŅŒŅ‚ŅƒŅ€, Ņ‚аКÐļŅ… КаК $(l:mechanics/crops#barley)ÐŊŅ‡ÐžÐĩÐ―ŅŒ$(). ÐĄÐąÐūŅ€ зÐĩŅ€Ð―ÐūÐēÐūÐđ КŅƒÐŧŅŒŅ‚ŅƒŅ€Ņ‹ ÐīаÐĩŅ‚ ŅŅ‹Ņ€ÐūÐđ, Ð―ÐĩÐūÐąŅ€Ð°ÐąÐūŅ‚Ð°Ð―Ð―Ņ‹Ðđ зÐĩŅ€Ð―ÐūÐēÐūÐđ ÐŋŅ€ÐĩÐīОÐĩŅ‚, КÐūŅ‚ÐūŅ€Ņ‹Ðđ ŅÐ°Ðž ÐŋÐū ŅÐĩÐąÐĩ Ð―Ðĩ ÐŋŅ€ÐļÐģÐūÐīÐĩÐ― ÐīÐŧŅ ÐļŅÐŋÐūÐŧŅŒÐ·ÐūÐēÐ°Ð―ÐļŅ. ЕÐģÐū Ð―ÐĩÐūÐąŅ…ÐūÐīÐļОÐū ÐŋÐĩŅ€ÐĩŅ€Ð°ÐąÐūŅ‚аŅ‚ŅŒ Ðē $(thing)ÐĨÐŧÐĩÐą$(), КÐūŅ‚ÐūŅ€Ņ‹Ðđ заŅ‚ÐĩО ОÐūÐķÐ―Ðū ÐĩŅŅ‚ŅŒ ÐļÐŧÐļ ÐļŅÐŋÐūÐŧŅŒÐ·ÐūÐēаŅ‚ŅŒ Ðē $(l:mechanics/sandwiches)БŅƒŅ‚ÐĩŅ€ÐąŅ€ÐūÐīаŅ…$()." - }, - { - "type": "patchouli:crafting", - "recipe": "tfc:crafting/barley_cutting", - "text": "ÐĄÐ―Ð°Ņ‡Ð°Ðŧа, ŅŅ€ÐĩÐķŅŒŅ‚Ðĩ ŅÐūÐŧÐūОŅƒ Ņ ÐĩÐīŅ‹ Ņ ÐŋÐūОÐūŅ‰ŅŒŅŽ $(thing)НÐūÐķа$()." - }, - { - "type": "patchouli:spotlight", - "item": "tfc:food/rye_grain", - "link_recipes": false, - "text": "ЗÐĩŅ€Ð―а - ŅŅ‚Ðū ŅÐ°ÐžÐ°Ņ ÐīÐūÐŧÐģÐūÐēÐĩŅ‡Ð―аŅ ŅŅ‚аÐīÐļŅ ÐŋŅ€ÐūŅ†ÐĩŅŅÐ°, ÐūÐ―Ðļ ÐŋÐūŅ€Ņ‚ŅŅ‚ŅŅ ÐģÐūŅ€Ð°Ð·ÐīÐū ОÐĩÐīÐŧÐĩÐ―Ð―ÐĩÐĩ, Ņ‡ÐĩО ÐąÐūÐŧŅŒŅˆÐļÐ―ŅŅ‚ÐēÐū ÐŋŅ€ÐūÐīŅƒÐšŅ‚ÐūÐē. ÐĄÐ°ÐžÐū ÐŋÐū ŅÐĩÐąÐĩ ŅÐēÐĩÐķÐĩÐĩ зÐĩŅ€Ð―Ðū Ņ…Ņ€Ð°Ð―ÐļŅ‚ŅŅ 10 ОÐĩŅŅŅ†ÐĩÐē Ðļ 7 ÐīÐ―ÐĩÐđ. В ОаÐŧÐĩÐ―ŅŒÐšÐūО ŅÐūŅŅƒÐīÐĩ ÐūÐ―Ðū Ņ…Ņ€Ð°Ð―ÐļŅ‚ŅŅ 1 ÐģÐūÐī, 9 ОÐĩŅŅŅ†ÐĩÐē Ðļ 7 ÐīÐ―ÐĩÐđ." - }, - { - "type": "tfc:quern_recipe", - "recipe": "tfc:quern/oat_grain", - "text": "ЗаŅ‚ÐĩО зÐĩŅ€Ð―Ðū ÐīÐūÐŧÐķÐ―Ðū ÐąŅ‹Ņ‚ŅŒ ÐŋÐĩŅ€ÐĩОÐūÐŧÐūŅ‚Ðū Ðē $(l:mechanics/quern)ÐķÐĩŅ€Ð―ÐūÐēÐĩ$(), Ņ‡Ņ‚ÐūÐąŅ‹ ÐŋÐūÐŧŅƒŅ‡ÐļŅ‚ŅŒ ОŅƒÐšŅƒ." - }, - { - "type": "patchouli:crafting", - "recipe": "tfc:crafting/dough/barley_dough_1", - "text": "ÐĒÐĩŅŅ‚Ðū ÐģÐūŅ‚ÐūÐēÐļŅ‚ŅŅ ÐŋŅƒŅ‚ÐĩО ÐīÐūÐąÐ°ÐēÐŧÐĩÐ―ÐļŅ ÐēÐĩÐīŅ€Ð° $(thing)ÐĄÐēÐĩÐķÐĩÐđ ÐēÐūÐīŅ‹$() К ОŅƒÐšÐĩ." - }, - { - "type": "tfc:heat_recipe", - "recipe": "tfc:heating/barley_dough", - "text": "ЗаŅ‚ÐĩО Ņ‚ÐĩŅŅ‚Ðū ОÐūÐķÐ―Ðū $(l:mechanics/heating)Ð―Ð°ÐģŅ€ÐĩŅ‚ŅŒ$(), Ņ‡Ņ‚ÐūÐąŅ‹ ŅÐīÐĩÐŧаŅ‚ŅŒ Ņ…ÐŧÐĩÐą. На ŅŅ‚ÐūО ŅŅ‚аÐŋÐĩ ÐĩÐģÐū Ņ‚аКÐķÐĩ ОÐūÐķÐ―Ðū ÐļŅÐŋÐūÐŧŅŒÐ·ÐūÐēаŅ‚ŅŒ Ðē $(l:mechanics/sandwiches)БŅƒŅ‚ÐĩŅ€ÐąŅ€ÐūÐīаŅ…$()." - } - ], - "read_by_default": true, - "extra_recipe_mappings": { - "tag:tfc:sandwich_bread": 0, - "tag:tfc:foods/dough": 0, - "tfc:food/barley_grain": 0, - "tfc:food/maize_grain": 0, - "tfc:food/oat_grain": 0, - "tfc:food/rice_grain": 0, - "tfc:food/rye_grain": 0, - "tfc:food/wheat_grain": 0, - "tfc:food/barley_flour": 0, - "tfc:food/maize_flour": 0, - "tfc:food/oat_flour": 0, - "tfc:food/rice_flour": 0, - "tfc:food/rye_flour": 0, - "tfc:food/wheat_flour": 0 - } -} \ No newline at end of file diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/mechanics/drinks.json b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/mechanics/drinks.json index 2b432fe19..41cf6b2fb 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/mechanics/drinks.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/mechanics/drinks.json @@ -38,7 +38,7 @@ "type": "patchouli:spotlight", "title": "ЧаÐļ", "text": "$(thing)ЧаÐļ$() ОÐūÐķÐ―Ðū заÐēаŅ€ÐļÐēаŅ‚ŅŒ, ÐļŅÐŋÐūÐŧŅŒÐ·ŅƒŅ ÐēŅ‹ŅŅƒŅˆÐĩÐ―Ð―Ņ‹Ðĩ ÐēÐĩŅ€ŅÐļÐļ Ð―ÐĩКÐūŅ‚ÐūŅ€Ņ‹Ņ… Ņ€Ð°ŅŅ‚ÐĩÐ―ÐļÐđ.$(br2)ÐžÐ―Ðļ ÐīаŅŽŅ‚ КŅ€Ð°Ņ‚КÐūÐēŅ€ÐĩОÐĩÐ―Ð―Ņ‹Ðĩ, Ð―Ðū ŅŅ„Ņ„ÐĩКŅ‚ÐļÐēÐ―Ņ‹Ðĩ ŅŅ„Ņ„ÐĩКŅ‚Ņ‹ Ðļ ŅÐūÐģŅ€ÐĩÐēаŅŽŅ‚ Ð―Ð° 4°C. ИÐīÐĩаÐŧŅŒÐ―Ðū ÐŋÐūÐīŅ…ÐūÐīŅŅ‚ ÐīÐŧŅ зÐļОŅ‹!", - "item": "tfc_gurman:tea_mint_bucket,tfc_gurman:tea_chamomile_bucket,tfc_gurman:tea_rosehip_bucket,tfc_gurman:tea_nettle_bucket" + "item": "tfc_gourmet:tea_mint_bucket,tfc_gourmet:tea_chamomile_bucket,tfc_gourmet:tea_rosehip_bucket,tfc_gourmet:tea_nettle_bucket" }, { "type": "patchouli:text", @@ -48,7 +48,7 @@ "type": "patchouli:spotlight", "title": "ÐĄÐŧаÐīÐūŅŅ‚Ðļ", "text": "ЭŅ‚Ðū КаŅ‚ÐĩÐģÐūŅ€ÐļŅ ÐīÐŧŅ ÐīŅ€ŅƒÐģÐļŅ… Ņ€Ð°Ð·Ð―ÐūÐūÐąŅ€Ð°Ð·Ð―Ņ‹Ņ… Ð―Ð°ÐŋÐļŅ‚КÐūÐē Ņ ÐēÐūŅŅ…ÐļŅ‚ÐļŅ‚ÐĩÐŧŅŒÐ―Ņ‹Ðž ÐēКŅƒŅÐūО Ðļ ÐūŅÐūÐąŅ‹ÐžÐļ ŅŅ„Ņ„ÐĩКŅ‚аОÐļ. ПŅ€ÐļŅŅ‚Ð―ÐūÐģÐū аÐŋÐŋÐĩŅ‚ÐļŅ‚а!", - "item": "tfc_gurman:cocoa_bucket,tfc_gurman:coffee_bucket,tfc_gurman:nalivka_bucket,tfc_gurman:kvass_bucket,tfc_gurman:compote_bucket,tfc_gurman:lemonade_bucket" + "item": "tfc_gourmet:cocoa_bucket,tfc_gourmet:coffee_bucket,tfc_gourmet:nalivka_bucket,tfc_gourmet:kvass_bucket,tfc_gourmet:compote_bucket,tfc_gourmet:lemonade_bucket" }, { "type": "patchouli:text", @@ -58,7 +58,7 @@ "type": "patchouli:spotlight", "title": "МÐūÐŧÐūКÐū", "text": "$(thing)МÐūÐŧÐūКÐū$() ОÐūÐķÐ―Ðū ÐŋÐūÐŧŅƒŅ‡ÐļŅ‚ŅŒ ÐūŅ‚ ÐąÐūÐŧŅŒŅˆÐļÐ―ŅŅ‚Ðēа ŅÐ°ÐžÐūК ОÐūÐŧÐūŅ‡Ð―Ņ‹Ņ… ÐķÐļÐēÐūŅ‚Ð―Ņ‹Ņ…, ÐŋŅ€ÐūŅŅ‚Ðū Ņ‰ÐĩÐŧÐšÐ―ŅƒÐē ÐŋÐū Ð―ÐļО ÐŋŅ€Ð°ÐēÐūÐđ ÐšÐ―ÐūÐŋКÐūÐđ ОŅ‹ŅˆÐļ Ņ ÐīÐĩŅ€ÐĩÐēŅÐ―Ð―Ņ‹Ðž ÐļÐŧÐļ ОÐĩŅ‚аÐŧÐŧÐļŅ‡ÐĩŅÐšÐļО ÐēÐĩÐīŅ€ÐūО, КÐūÐģÐīа ŅƒŅ€ÐūÐēÐĩÐ―ŅŒ ÐŋŅ€ÐļŅ€ŅƒŅ‡ÐĩÐ―Ð―ÐūŅŅ‚Ðļ ÐīÐūŅŅ‚ÐļÐģÐ―ÐĩŅ‚ ÐīÐūŅŅ‚аŅ‚ÐūŅ‡Ð―Ðū ÐēŅ‹ŅÐūКÐūÐģÐū ŅƒŅ€ÐūÐēÐ―Ņ. (ЕŅÐŧÐļ ÐīÐūÐĩÐ―ÐļÐĩ Ð―Ðĩ Ņ€Ð°ÐąÐūŅ‚аÐĩŅ‚, ŅƒÐąÐĩÐīÐļŅ‚ÐĩŅŅŒ, Ņ‡Ņ‚Ðū ÐēÐĩÐīŅ€Ð° Ð―Ðĩ ŅÐūŅŅ‚Ð°ÐšÐ°Ð―Ņ‹!)$(br)ÐĨÐūŅ‚Ņ ŅŅ‚ÐūŅ‚ Ð―Ð°ÐŋÐļŅ‚ÐūК Ð―Ðĩ ÐīаÐĩŅ‚ Ð―ÐļКаКÐļŅ… ÐąÐūÐ―ŅƒŅÐūÐē, ÐūÐ― ÐūÐąÐĩŅÐŋÐĩŅ‡ÐļÐēаÐĩŅ‚ ÐūŅ€ÐģÐ°Ð―ÐļзО ОÐūÐŧÐūŅ‡Ð―Ņ‹ÐžÐļ ÐŋŅ€ÐūÐīŅƒÐšŅ‚аОÐļ, ÐĩŅÐŧÐļ ÐĩÐģÐū ÐēŅ‹ÐŋÐļŅ‚ŅŒ ÐŋÐūŅÐŧÐĩ ÐĩÐīŅ‹, Ðļ Ðļз Ð―ÐĩÐģÐū ÐēÐŋÐūŅÐŧÐĩÐīŅŅ‚ÐēÐļÐļ ОÐūÐķÐ―Ðū ÐŋŅ€ÐļÐģÐūŅ‚ÐūÐēÐļŅ‚ŅŒ ŅŅ‹Ņ€.", - "item": "minecraft:milk_bucket,firmalife:bucket/yak_milk,firmalife:bucket/goat_milk,tfc_gurman:ox_milk_bucket,tfc_gurman:sheep_milk_bucket,tfc_gurman:alpaca_milk_bucket" + "item": "minecraft:milk_bucket,firmalife:bucket/yak_milk,firmalife:bucket/goat_milk,tfc_gourmet:ox_milk_bucket,tfc_gourmet:sheep_milk_bucket,tfc_gourmet:alpaca_milk_bucket" }, { "title": "РÐūÐīÐ―ÐļКÐūÐēаŅ ÐēÐūÐīа", diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/earth_ore_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/earth_ore_index.json index 920c13227..b4dd2dfad 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/earth_ore_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/earth_ore_index.json @@ -29,7 +29,7 @@ }, { "Type": "patchouli:text", - "text": "$(li)КŅƒÐŋÐĩŅ€ÐļŅ‚: $(l:tfg_ores/earth_vein_index#deep_sheldonite)38%$(/l)$()$(li)ЛазŅƒŅ€ÐļŅ‚: $(l:tfg_ores/earth_vein_index#normal_lapis)35%$(/l)$()$(li)ЛазŅƒŅ€ÐļŅ‚ÐļŅ‚: $(l:tfg_ores/earth_vein_index#normal_lapis)25%$(/l)$()$(li)ЛÐĩÐŋÐļÐīÐūÐŧÐļŅ‚: $(l:tfg_ores/earth_vein_index#normal_salt)15%$(/l), $(l:tfg_ores/earth_vein_index#normal_spodumene)15%$(/l)$()$(li)ЛÐļŅ‚ÐļÐđ: $(l:tfg_ores/earth_vein_index#deep_scheelite)20%$(/l)$()$(li)МаÐģÐ―ÐĩзÐļŅ‚: $(l:tfg_ores/earth_vein_index#normal_olivine)25%$(/l)$()$(li)МаÐģÐ―ÐĩŅ‚ÐļŅ‚: $(l:tfg_ores/earth_vein_index#normal_magnetite)63%$(/l), $(l:tfg_ores/earth_vein_index#deep_magnetite)8%$(/l)$()$(li)МаÐŧаŅ…ÐļŅ‚: $(l:tfg_ores/earth_vein_index#deep_limonite)20%$(/l), $(l:tfg_ores/earth_vein_index#normal_limonite)15%$(/l)$()$(li)МÐūÐŧÐļÐąÐīÐĩÐ―ÐļŅ‚: $(l:tfg_ores/earth_vein_index#deep_molybdenum)35%$(/l)$()$(li)МÐūÐ―Ð°Ņ†ÐļŅ‚: $(l:tfg_ores/earth_vein_index#normal_monazite)31%$(/l)$()$(li)МŅ‹ÐŧŅŒÐ―Ņ‹Ðđ КаОÐĩÐ―ŅŒ: $(l:tfg_ores/earth_vein_index#normal_lubricant)30%$(/l)$()$(li)НÐĩÐūÐīÐļО: $(l:tfg_ores/earth_vein_index#normal_monazite)6%$(/l)$()$(li)НÐĩŅ„Ņ‚ÐĩÐ―ÐūŅÐ―Ņ‹Ðđ ÐŋÐĩŅÐūК: $(l:tfg_ores/earth_vein_index#normal_oilsands)100%$(/l), $(l:tfg_ores/earth_vein_index#normal_tarkianite)35%$(/l)$()$(li)НÐļКÐĩÐŧŅŒ: $(l:tfg_ores/earth_vein_index#normal_garnierite)10%$(/l)$()", + "text": "$(li)КŅƒÐŋÐĩŅ€ÐļŅ‚: $(l:tfg_ores/earth_vein_index#deep_sheldonite)38%$(/l)$()$(li)ЛазŅƒŅ€ÐļŅ‚: $(l:tfg_ores/earth_vein_index#normal_lapis)35%$(/l)$()$(li)ЛазŅƒŅ€ÐļŅ‚ÐļŅ‚: $(l:tfg_ores/earth_vein_index#normal_lapis)25%$(/l)$()$(li)ЛÐĩÐŋÐļÐīÐūÐŧÐļŅ‚: $(l:tfg_ores/earth_vein_index#normal_salt)15%$(/l), $(l:tfg_ores/earth_vein_index#normal_spodumene)15%$(/l)$()$(li)ЛÐļŅ‚ÐļÐđ: $(l:tfg_ores/earth_vein_index#deep_scheelite)20%$(/l)$()$(li)МаÐģÐ―ÐĩзÐļŅ‚: $(l:tfg_ores/earth_vein_index#normal_olivine)25%$(/l)$()$(li)МаÐģÐ―ÐĩŅ‚ÐļŅ‚: $(l:tfg_ores/earth_vein_index#normal_magnetite)63%$(/l), $(l:tfg_ores/earth_vein_index#deep_magnetite)8%$(/l)$()$(li)МаÐŧаŅ…ÐļŅ‚: $(l:tfg_ores/earth_vein_index#deep_limonite)20%$(/l), $(l:tfg_ores/earth_vein_index#normal_limonite)15%$(/l)$()$(li)МÐūÐŧÐļÐąÐīÐĩÐ―ÐļŅ‚: $(l:tfg_ores/earth_vein_index#deep_molybdenum)35%$(/l)$()$(li)МÐūÐ―Ð°Ņ†ÐļŅ‚: $(l:tfg_ores/earth_vein_index#normal_monazite)31%$(/l)$()$(li)МŅ‹ÐŧŅŒÐ―Ņ‹Ðđ КаОÐĩÐ―ŅŒ: $(l:tfg_ores/earth_vein_index#normal_lubricant)30%$(/l)$()$(li)НÐĩÐūÐīÐļО: $(l:tfg_ores/earth_vein_index#normal_monazite)6%$(/l)$()$(li)НÐĩŅ„Ņ‚ÐĩÐ―ÐūŅÐ―Ņ‹Ðđ ÐŋÐĩŅÐūК: $(l:tfg_ores/earth_vein_index#desert_oilsands)100%$(/l), $(l:tfg_ores/earth_vein_index#normal_oilsands)100%$(/l), $(l:tfg_ores/earth_vein_index#normal_tarkianite)35%$(/l)$()$(li)НÐļКÐĩÐŧŅŒ: $(l:tfg_ores/earth_vein_index#normal_garnierite)10%$(/l)$()", "type": "patchouli:text" }, { diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/earth_vein_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/earth_vein_index.json index ada05a65d..3729f5313 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/earth_vein_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/earth_vein_index.json @@ -24,12 +24,12 @@ }, { "Type": "patchouli:text", - "text": "$(li)$(l:tfg_ores/earth_vein_index#normal_oilsands)НÐĩŅ„Ņ‚ÐĩÐ―ÐūŅÐ―Ņ‹Ðđ ÐŋÐĩŅÐūК$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_garnet_opal)ОÐŋаÐŧ Ðļ ÐģŅ€Ð°Ð―аŅ‚$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_redstone)РÐĩÐīŅŅ‚ÐūŅƒÐ―, КÐļÐ―ÐūÐēаŅ€ŅŒ Ðļ РŅƒÐąÐļÐ―$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_sapphire)ÐĄÐ°ÐŋŅ„ÐļŅ€ Ðļ АÐŧŅŒÐžÐ°Ð―ÐīÐļÐ―$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_saltpeter)ÐĄÐĩÐŧÐļŅ‚Ņ€Ð° Ðļ ЭÐŧÐĩКŅ‚Ņ€ÐūŅ‚ÐļÐ―$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_sulfur)ÐĄÐĩŅ€Ð° Ðļ ПÐļŅ€ÐļŅ‚$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_silver)ÐĄÐĩŅ€ÐĩÐąŅ€Ðū, ГаÐŧÐĩÐ―Ð° Ðļ ÐĄÐēÐļÐ―ÐĩŅ†$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_salt)ÐĄÐūÐŧÐļ Ðļ БŅƒŅ€Ð°$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_spodumene)ÐĄÐŋÐūÐīŅƒÐžÐĩÐ― Ðļ ЛÐĩÐŋÐļÐīÐūÐŧÐļŅ‚$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_sphalerite)ÐĄŅ„аÐŧÐĩŅ€ÐļŅ‚ & ПÐļŅ€ÐļŅ‚$()$()$(li)$(l:tfg_ores/earth_vein_index#surface_sphalerite)ÐĄŅ„аÐŧÐĩŅ€ÐļŅ‚ Ðļ ÐĄÐĩŅ€Ð°$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_tarkianite)ÐĒаŅ€ÐšÐļÐ°Ð―ÐļŅ‚ Ðļ НÐĩŅ„Ņ‚ÐĩÐ―ÐūŅÐ―Ņ‹Ðđ ÐŋÐĩŅÐūК$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_tetrahedrite)ÐĒÐĩŅ‚Ņ€Ð°ŅÐīŅ€ÐļŅ‚ (ÐūÐąŅ‹Ņ‡Ð―Ņ‹Ðđ)$()$()$(li)$(l:tfg_ores/earth_vein_index#surface_tetrahedrite)ÐĒÐĩŅ‚Ņ€Ð°ŅÐīŅ€ÐļŅ‚ (ПÐūÐēÐĩŅ€Ņ…Ð―ÐūŅŅ‚Ð―Ņ‹Ðđ)$()$()", + "text": "$(li)$(l:tfg_ores/earth_vein_index#desert_oilsands)НÐĩŅ„Ņ‚ÐĩÐ―ÐūŅÐ―Ņ‹Ðđ ÐŋÐĩŅÐūК$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_oilsands)НÐĩŅ„Ņ‚ÐĩÐ―ÐūŅÐ―Ņ‹Ðđ ÐŋÐĩŅÐūК$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_garnet_opal)ОÐŋаÐŧ Ðļ ÐģŅ€Ð°Ð―аŅ‚$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_redstone)РÐĩÐīŅŅ‚ÐūŅƒÐ―, КÐļÐ―ÐūÐēаŅ€ŅŒ Ðļ РŅƒÐąÐļÐ―$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_sapphire)ÐĄÐ°ÐŋŅ„ÐļŅ€ Ðļ АÐŧŅŒÐžÐ°Ð―ÐīÐļÐ―$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_saltpeter)ÐĄÐĩÐŧÐļŅ‚Ņ€Ð° Ðļ ЭÐŧÐĩКŅ‚Ņ€ÐūŅ‚ÐļÐ―$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_sulfur)ÐĄÐĩŅ€Ð° Ðļ ПÐļŅ€ÐļŅ‚$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_silver)ÐĄÐĩŅ€ÐĩÐąŅ€Ðū, ГаÐŧÐĩÐ―Ð° Ðļ ÐĄÐēÐļÐ―ÐĩŅ†$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_salt)ÐĄÐūÐŧÐļ Ðļ БŅƒŅ€Ð°$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_spodumene)ÐĄÐŋÐūÐīŅƒÐžÐĩÐ― Ðļ ЛÐĩÐŋÐļÐīÐūÐŧÐļŅ‚$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_sphalerite)ÐĄŅ„аÐŧÐĩŅ€ÐļŅ‚ & ПÐļŅ€ÐļŅ‚$()$()$(li)$(l:tfg_ores/earth_vein_index#surface_sphalerite)ÐĄŅ„аÐŧÐĩŅ€ÐļŅ‚ Ðļ ÐĄÐĩŅ€Ð°$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_tarkianite)ÐĒаŅ€ÐšÐļÐ°Ð―ÐļŅ‚ Ðļ НÐĩŅ„Ņ‚ÐĩÐ―ÐūŅÐ―Ņ‹Ðđ ÐŋÐĩŅÐūК$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_tetrahedrite)ÐĒÐĩŅ‚Ņ€Ð°ŅÐīŅ€ÐļŅ‚ (ÐūÐąŅ‹Ņ‡Ð―Ņ‹Ðđ)$()$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)$(l:tfg_ores/earth_vein_index#deep_topaz)ÐĒÐūÐŋаз Ðļ ÐĨаÐŧŅŒÐšÐūзÐļÐ―$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_coal)ÐĢÐģÐūÐŧŅŒ$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_pitchblende)ÐĢŅ€Ð°Ð―ÐļÐ―ÐļŅ‚ Ðļ ÐĢŅ€Ð°Ð―ÐļŅ‚$()$()$(li)$(l:tfg_ores/earth_vein_index#surface_copper)ÐĨаÐŧŅŒÐšÐūÐŋÐļŅ€ÐļŅ‚ Ðļ РÐĩаÐŧŅŒÐģаŅ€$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_magnetite)ÐĨŅ€ÐūОÐļŅ‚ Ðļ МаÐģÐ―ÐĩŅ‚ÐļŅ‚$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_mica)ÐĶÐļÐūÐ―ÐļŅ‚, ÐĄÐŧŅŽÐīа Ðļ БÐūКŅÐļŅ‚$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_scheelite)ÐĻÐĩÐĩÐŧÐļŅ‚ Ðļ ВÐūÐŧŅŒŅ„Ņ€Ð°ÐžÐ°Ņ‚$()$()", + "text": "$(li)$(l:tfg_ores/earth_vein_index#surface_tetrahedrite)ÐĒÐĩŅ‚Ņ€Ð°ŅÐīŅ€ÐļŅ‚ (ПÐūÐēÐĩŅ€Ņ…Ð―ÐūŅŅ‚Ð―Ņ‹Ðđ)$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_topaz)ÐĒÐūÐŋаз Ðļ ÐĨаÐŧŅŒÐšÐūзÐļÐ―$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_coal)ÐĢÐģÐūÐŧŅŒ$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_pitchblende)ÐĢŅ€Ð°Ð―ÐļÐ―ÐļŅ‚ Ðļ ÐĢŅ€Ð°Ð―ÐļŅ‚$()$()$(li)$(l:tfg_ores/earth_vein_index#surface_copper)ÐĨаÐŧŅŒÐšÐūÐŋÐļŅ€ÐļŅ‚ Ðļ РÐĩаÐŧŅŒÐģаŅ€$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_magnetite)ÐĨŅ€ÐūОÐļŅ‚ Ðļ МаÐģÐ―ÐĩŅ‚ÐļŅ‚$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_mica)ÐĶÐļÐūÐ―ÐļŅ‚, ÐĄÐŧŅŽÐīа Ðļ БÐūКŅÐļŅ‚$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_scheelite)ÐĻÐĩÐĩÐŧÐļŅ‚ Ðļ ВÐūÐŧŅŒŅ„Ņ€Ð°ÐžÐ°Ņ‚$()$()", "type": "patchouli:text" }, { @@ -1190,7 +1190,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)$(t:ВÐĩŅ€ÐūŅŅ‚Ð―ÐūŅŅ‚ŅŒ ÐģÐĩÐ―ÐĩŅ€Ð°Ņ†ÐļÐļ ÐķÐļÐŧŅ‹ Ðē Ņ‡Ð°Ð―КÐĩ. ЧÐĩО ОÐĩÐ―ŅŒŅˆÐĩ Ð·Ð―Ð°ÐžÐĩÐ―Ð°Ņ‚ÐĩÐŧŅŒ(ÐēŅ‚ÐūŅ€ÐūÐĩ Ņ‡ÐļŅÐŧÐū), Ņ‚ÐĩО Ņ‡Ð°Ņ‰Ðĩ ÐēŅŅ‚Ņ€ÐĩŅ‡Ð°ÐĩŅ‚ŅŅ.)РÐĩÐīКÐūŅŅ‚ŅŒ$(/t)$(): 1/80 Ð―Ð° Ņ‡Ð°Ð―К$(br)$(thing)$(t:ÐĄÐūÐīÐĩŅ€ÐķÐ°Ð―ÐļÐĩ ÐąÐŧÐūКÐūÐē Ņ€ŅƒÐīŅ‹ Ðē ÐķÐļÐŧÐĩ заОÐĩÐ―ŅŅŽŅ‰ÐļŅ… КаОÐĩÐ―ŅŒ. БÐūÐŧŅŒŅˆÐĩÐĩ Ð·Ð―Ð°Ņ‡ÐĩÐ―ÐļÐĩ ÐūÐ·Ð―Ð°Ņ‡Ð°ÐĩŅ‚ ÐąÐūÐŧŅŒŅˆÐĩ Ņ€ŅƒÐīŅ‹.)ПÐŧÐūŅ‚Ð―ÐūŅŅ‚ŅŒ$(/t)$(): 40%$(br)$(thing)$(t:ÐĪÐūŅ€ÐžÐ° ÐķÐļÐŧŅ‹.)ВÐļÐī$(/t)$(): $(t:ÐĻÐļŅ€ÐūКаŅ Ðļ ÐŋÐŧÐūŅÐšÐ°Ņ)ДÐļŅÐšÐūÐūÐąŅ€Ð°Ð·Ð―аŅ ÐķÐļÐŧа$(/t)$(br)$(thing)$(t:ÐĢŅ€ÐūÐēÐ―Ðļ Y, ОÐĩÐķÐīŅƒ КÐūŅ‚ÐūŅ€Ņ‹ÐžÐļ ОÐūÐķÐĩŅ‚ ŅÐģÐĩÐ―ÐĩŅ€ÐļŅ€ÐūÐēаŅ‚ŅŒŅŅ ÐķÐļÐŧа.)Y-ŅƒŅ€ÐūÐēÐĩÐ―ŅŒ$(/t)$(): -64 — -16$(br)$(thing)(t:ÐĄŅ€ÐĩÐīÐ―ÐļÐđ ÐīÐļаОÐĩŅ‚Ņ€ ÐķÐļÐŧŅ‹)РазОÐĩŅ€$(/t)$(): 16$(br)$(thing)ВŅ‹ŅÐūŅ‚а$(): 6$(br)$(thing)$(t:ЕŅÐŧÐļ Ņ€Ð°ŅŅŅ‚ÐūŅÐ―ÐļÐĩ ОÐĩÐķÐīŅƒ ÐŋÐūÐēÐĩŅ€Ņ…Ð―ÐūŅŅ‚ŅŒŅŽ Ðļ ÐķÐļÐŧÐūÐđ ÐąÐūÐŧŅŒŅˆÐĩ Ņ‡ÐĩО ŅŅ‚Ðū Ņ‡ÐļŅÐŧÐū, Ņ‚Ðū ÐķÐļÐŧа Ð―Ðĩ ŅÐģÐĩÐ―ÐĩÐ―Ņ€ÐļŅ€ŅƒÐĩŅ‚ ÐļÐ―ÐīÐļКаŅ‚ÐūŅ€Ņ‹ Ð―Ð° ÐŋÐūÐēÐĩŅ€Ņ…Ð―ÐūŅŅ‚Ðļ.)МаКŅÐļОаÐŧŅŒÐ―аŅ ÐēŅ‹ŅÐūŅ‚а ÐļÐ―ÐīÐļКаŅ‚ÐūŅ€Ð°$(/t)$(): 20$(br2)$(thing)ВÐļÐīŅ‹ ÐšÐ°ÐžÐ―ÐĩÐđ$(): ÐÐ―ÐīÐĩзÐļŅ‚, АŅ€ÐģÐļÐŧÐŧÐļŅ‚, АŅÐŋÐļÐīÐ―Ņ‹Ðđ ŅÐŧÐ°Ð―ÐĩŅ†, БазаÐŧŅŒŅ‚, Ð“Ð°ÐąÐąŅ€Ðū, Ð“Ð―ÐĩÐđŅ, ГŅ€Ð°Ð―ÐļŅ‚, ДаŅ†ÐļŅ‚, ДÐļÐūŅ€ÐļŅ‚, ДÐūÐŧÐūОÐļŅ‚, ИзÐēÐĩŅŅ‚Ð―ŅÐš, КÐēаŅ€Ņ†ÐļŅ‚, КÐūÐ―ÐģÐŧÐūОÐĩŅ€Ð°Ņ‚, КŅ€ÐĩÐžÐ―ÐļŅŅ‚Ņ‹Ðđ ŅÐŧÐ°Ð―ÐĩŅ†, МÐĩÐŧ, МŅ€Ð°ÐžÐūŅ€, РÐļÐūÐŧÐļŅ‚, ÐĄÐŧÐ°Ð―ÐĩŅ†, ÐĪÐļÐŧÐŧÐļŅ‚, ÐĻÐļŅ„ÐĩŅ€Ð―Ņ‹Ðđ ŅÐŧÐ°Ð―ÐĩŅ†", + "text": "$(thing)$(t:ВÐĩŅ€ÐūŅŅ‚Ð―ÐūŅŅ‚ŅŒ ÐģÐĩÐ―ÐĩŅ€Ð°Ņ†ÐļÐļ ÐķÐļÐŧŅ‹ Ðē Ņ‡Ð°Ð―КÐĩ. ЧÐĩО ОÐĩÐ―ŅŒŅˆÐĩ Ð·Ð―Ð°ÐžÐĩÐ―Ð°Ņ‚ÐĩÐŧŅŒ(ÐēŅ‚ÐūŅ€ÐūÐĩ Ņ‡ÐļŅÐŧÐū), Ņ‚ÐĩО Ņ‡Ð°Ņ‰Ðĩ ÐēŅŅ‚Ņ€ÐĩŅ‡Ð°ÐĩŅ‚ŅŅ.)РÐĩÐīКÐūŅŅ‚ŅŒ$(/t)$(): 1/80 Ð―Ð° Ņ‡Ð°Ð―К$(br)$(thing)$(t:ÐĄÐūÐīÐĩŅ€ÐķÐ°Ð―ÐļÐĩ ÐąÐŧÐūКÐūÐē Ņ€ŅƒÐīŅ‹ Ðē ÐķÐļÐŧÐĩ заОÐĩÐ―ŅŅŽŅ‰ÐļŅ… КаОÐĩÐ―ŅŒ. БÐūÐŧŅŒŅˆÐĩÐĩ Ð·Ð―Ð°Ņ‡ÐĩÐ―ÐļÐĩ ÐūÐ·Ð―Ð°Ņ‡Ð°ÐĩŅ‚ ÐąÐūÐŧŅŒŅˆÐĩ Ņ€ŅƒÐīŅ‹.)ПÐŧÐūŅ‚Ð―ÐūŅŅ‚ŅŒ$(/t)$(): 40%$(br)$(thing)$(t:ÐĪÐūŅ€ÐžÐ° ÐķÐļÐŧŅ‹.)ВÐļÐī$(/t)$(): $(t:ÐĻÐļŅ€ÐūКаŅ Ðļ ÐŋÐŧÐūŅÐšÐ°Ņ)ДÐļŅÐšÐūÐūÐąŅ€Ð°Ð·Ð―аŅ ÐķÐļÐŧа$(/t)$(br)$(thing)$(t:ÐĢŅ€ÐūÐēÐ―Ðļ Y, ОÐĩÐķÐīŅƒ КÐūŅ‚ÐūŅ€Ņ‹ÐžÐļ ОÐūÐķÐĩŅ‚ ŅÐģÐĩÐ―ÐĩŅ€ÐļŅ€ÐūÐēаŅ‚ŅŒŅŅ ÐķÐļÐŧа.)Y-ŅƒŅ€ÐūÐēÐĩÐ―ŅŒ$(/t)$(): -64 — -16$(br)$(thing)(t:ÐĄŅ€ÐĩÐīÐ―ÐļÐđ ÐīÐļаОÐĩŅ‚Ņ€ ÐķÐļÐŧŅ‹)РазОÐĩŅ€$(/t)$(): 16$(br)$(thing)ВŅ‹ŅÐūŅ‚а$(): 6$(br)$(thing)$(t:ЕŅÐŧÐļ Ņ€Ð°ŅŅŅ‚ÐūŅÐ―ÐļÐĩ ОÐĩÐķÐīŅƒ ÐŋÐūÐēÐĩŅ€Ņ…Ð―ÐūŅŅ‚ŅŒŅŽ Ðļ ÐķÐļÐŧÐūÐđ ÐąÐūÐŧŅŒŅˆÐĩ Ņ‡ÐĩО ŅŅ‚Ðū Ņ‡ÐļŅÐŧÐū, Ņ‚Ðū ÐķÐļÐŧа Ð―Ðĩ ŅÐģÐĩÐ―ÐĩÐ―Ņ€ÐļŅ€ŅƒÐĩŅ‚ ÐļÐ―ÐīÐļКаŅ‚ÐūŅ€Ņ‹ Ð―Ð° ÐŋÐūÐēÐĩŅ€Ņ…Ð―ÐūŅŅ‚Ðļ.)МаКŅÐļОаÐŧŅŒÐ―аŅ ÐēŅ‹ŅÐūŅ‚а ÐļÐ―ÐīÐļКаŅ‚ÐūŅ€Ð°$(/t)$(): 20$(br2)$(thing)ВÐļÐīŅ‹ ÐšÐ°ÐžÐ―ÐĩÐđ$(): ÐÐ―ÐīÐĩзÐļŅ‚, АŅÐŋÐļÐīÐ―Ņ‹Ðđ ŅÐŧÐ°Ð―ÐĩŅ†, БазаÐŧŅŒŅ‚, Ð“Ð°ÐąÐąŅ€Ðū, Ð“Ð―ÐĩÐđŅ, ГŅ€Ð°Ð―ÐļŅ‚, ДаŅ†ÐļŅ‚, ДÐļÐūŅ€ÐļŅ‚, КÐēаŅ€Ņ†ÐļŅ‚, МŅ€Ð°ÐžÐūŅ€, РÐļÐūÐŧÐļŅ‚, ÐĪÐļÐŧÐŧÐļŅ‚, ÐĻÐļŅ„ÐĩŅ€Ð―Ņ‹Ðđ ŅÐŧÐ°Ð―ÐĩŅ†", "title": "ГŅ€Ð°Ņ„ÐļŅ‚ Ðļ АÐŧОаз", "type": "patchouli:text", "anchor": "normal_graphite" @@ -1441,7 +1441,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)$(t:ВÐĩŅ€ÐūŅŅ‚Ð―ÐūŅŅ‚ŅŒ ÐģÐĩÐ―ÐĩŅ€Ð°Ņ†ÐļÐļ ÐķÐļÐŧŅ‹ Ðē Ņ‡Ð°Ð―КÐĩ. ЧÐĩО ОÐĩÐ―ŅŒŅˆÐĩ Ð·Ð―Ð°ÐžÐĩÐ―Ð°Ņ‚ÐĩÐŧŅŒ(ÐēŅ‚ÐūŅ€ÐūÐĩ Ņ‡ÐļŅÐŧÐū), Ņ‚ÐĩО Ņ‡Ð°Ņ‰Ðĩ ÐēŅŅ‚Ņ€ÐĩŅ‡Ð°ÐĩŅ‚ŅŅ.)РÐĩÐīКÐūŅŅ‚ŅŒ$(/t)$(): 1/250 Ð―Ð° Ņ‡Ð°Ð―К$(br)$(thing)$(t:ÐĄÐūÐīÐĩŅ€ÐķÐ°Ð―ÐļÐĩ ÐąÐŧÐūКÐūÐē Ņ€ŅƒÐīŅ‹ Ðē ÐķÐļÐŧÐĩ заОÐĩÐ―ŅŅŽŅ‰ÐļŅ… КаОÐĩÐ―ŅŒ. БÐūÐŧŅŒŅˆÐĩÐĩ Ð·Ð―Ð°Ņ‡ÐĩÐ―ÐļÐĩ ÐūÐ·Ð―Ð°Ņ‡Ð°ÐĩŅ‚ ÐąÐūÐŧŅŒŅˆÐĩ Ņ€ŅƒÐīŅ‹.)ПÐŧÐūŅ‚Ð―ÐūŅŅ‚ŅŒ$(/t)$(): 35%$(br)$(thing)$(t:ÐĪÐūŅ€ÐžÐ° ÐķÐļÐŧŅ‹.)ВÐļÐī$(/t)$(): $(t:ВŅ‹ŅÐūКаŅ Ðļ ŅƒÐ·ÐšÐ°Ņ)ÐĒŅ€ŅƒÐąŅ‡Ð°Ņ‚аŅ ÐķÐļÐŧа$(/t)$(br)$(thing)$(t:ÐĢŅ€ÐūÐēÐ―Ðļ Y, ОÐĩÐķÐīŅƒ КÐūŅ‚ÐūŅ€Ņ‹ÐžÐļ ОÐūÐķÐĩŅ‚ ŅÐģÐĩÐ―ÐĩŅ€ÐļŅ€ÐūÐēаŅ‚ŅŒŅŅ ÐķÐļÐŧа.)Y-ŅƒŅ€ÐūÐēÐĩÐ―ŅŒ$(/t)$(): -32 — 50$(br)$(thing)ВŅ‹ŅÐūŅ‚а$(): 60$(br)$(thing)РаÐīÐļŅƒŅ$(): 10$(br)$(thing)$(t:ЕŅÐŧÐļ Ņ€Ð°ŅŅŅ‚ÐūŅÐ―ÐļÐĩ ОÐĩÐķÐīŅƒ ÐŋÐūÐēÐĩŅ€Ņ…Ð―ÐūŅŅ‚ŅŒŅŽ Ðļ ÐķÐļÐŧÐūÐđ ÐąÐūÐŧŅŒŅˆÐĩ Ņ‡ÐĩО ŅŅ‚Ðū Ņ‡ÐļŅÐŧÐū, Ņ‚Ðū ÐķÐļÐŧа Ð―Ðĩ ŅÐģÐĩÐ―ÐĩÐ―Ņ€ÐļŅ€ŅƒÐĩŅ‚ ÐļÐ―ÐīÐļКаŅ‚ÐūŅ€Ņ‹ Ð―Ð° ÐŋÐūÐēÐĩŅ€Ņ…Ð―ÐūŅŅ‚Ðļ.)МаКŅÐļОаÐŧŅŒÐ―аŅ ÐēŅ‹ŅÐūŅ‚а ÐļÐ―ÐīÐļКаŅ‚ÐūŅ€Ð°$(/t)$(): 20$(br2)$(thing)ВÐļÐīŅ‹ ÐšÐ°ÐžÐ―ÐĩÐđ$(): ÐÐ―ÐīÐĩзÐļŅ‚, БазаÐŧŅŒŅ‚, ДаŅ†ÐļŅ‚, РÐļÐūÐŧÐļŅ‚", + "text": "$(thing)$(t:ВÐĩŅ€ÐūŅŅ‚Ð―ÐūŅŅ‚ŅŒ ÐģÐĩÐ―ÐĩŅ€Ð°Ņ†ÐļÐļ ÐķÐļÐŧŅ‹ Ðē Ņ‡Ð°Ð―КÐĩ. ЧÐĩО ОÐĩÐ―ŅŒŅˆÐĩ Ð·Ð―Ð°ÐžÐĩÐ―Ð°Ņ‚ÐĩÐŧŅŒ(ÐēŅ‚ÐūŅ€ÐūÐĩ Ņ‡ÐļŅÐŧÐū), Ņ‚ÐĩО Ņ‡Ð°Ņ‰Ðĩ ÐēŅŅ‚Ņ€ÐĩŅ‡Ð°ÐĩŅ‚ŅŅ.)РÐĩÐīКÐūŅŅ‚ŅŒ$(/t)$(): 1/250 Ð―Ð° Ņ‡Ð°Ð―К$(br)$(thing)$(t:ÐĄÐūÐīÐĩŅ€ÐķÐ°Ð―ÐļÐĩ ÐąÐŧÐūКÐūÐē Ņ€ŅƒÐīŅ‹ Ðē ÐķÐļÐŧÐĩ заОÐĩÐ―ŅŅŽŅ‰ÐļŅ… КаОÐĩÐ―ŅŒ. БÐūÐŧŅŒŅˆÐĩÐĩ Ð·Ð―Ð°Ņ‡ÐĩÐ―ÐļÐĩ ÐūÐ·Ð―Ð°Ņ‡Ð°ÐĩŅ‚ ÐąÐūÐŧŅŒŅˆÐĩ Ņ€ŅƒÐīŅ‹.)ПÐŧÐūŅ‚Ð―ÐūŅŅ‚ŅŒ$(/t)$(): 35%$(br)$(thing)$(t:ÐĪÐūŅ€ÐžÐ° ÐķÐļÐŧŅ‹.)ВÐļÐī$(/t)$(): $(t:ВŅ‹ŅÐūКаŅ Ðļ ŅƒÐ·ÐšÐ°Ņ)ÐĒŅ€ŅƒÐąŅ‡Ð°Ņ‚аŅ ÐķÐļÐŧа$(/t)$(br)$(thing)$(t:ÐĢŅ€ÐūÐēÐ―Ðļ Y, ОÐĩÐķÐīŅƒ КÐūŅ‚ÐūŅ€Ņ‹ÐžÐļ ОÐūÐķÐĩŅ‚ ŅÐģÐĩÐ―ÐĩŅ€ÐļŅ€ÐūÐēаŅ‚ŅŒŅŅ ÐķÐļÐŧа.)Y-ŅƒŅ€ÐūÐēÐĩÐ―ŅŒ$(/t)$(): -32 — 30$(br)$(thing)ВŅ‹ŅÐūŅ‚а$(): 60$(br)$(thing)РаÐīÐļŅƒŅ$(): 10$(br)$(thing)$(t:ЕŅÐŧÐļ Ņ€Ð°ŅŅŅ‚ÐūŅÐ―ÐļÐĩ ОÐĩÐķÐīŅƒ ÐŋÐūÐēÐĩŅ€Ņ…Ð―ÐūŅŅ‚ŅŒŅŽ Ðļ ÐķÐļÐŧÐūÐđ ÐąÐūÐŧŅŒŅˆÐĩ Ņ‡ÐĩО ŅŅ‚Ðū Ņ‡ÐļŅÐŧÐū, Ņ‚Ðū ÐķÐļÐŧа Ð―Ðĩ ŅÐģÐĩÐ―ÐĩÐ―Ņ€ÐļŅ€ŅƒÐĩŅ‚ ÐļÐ―ÐīÐļКаŅ‚ÐūŅ€Ņ‹ Ð―Ð° ÐŋÐūÐēÐĩŅ€Ņ…Ð―ÐūŅŅ‚Ðļ.)МаКŅÐļОаÐŧŅŒÐ―аŅ ÐēŅ‹ŅÐūŅ‚а ÐļÐ―ÐīÐļКаŅ‚ÐūŅ€Ð°$(/t)$(): 20$(br2)$(thing)ВÐļÐīŅ‹ ÐšÐ°ÐžÐ―ÐĩÐđ$(): ÐÐ―ÐīÐĩзÐļŅ‚, БазаÐŧŅŒŅ‚, ДаŅ†ÐļŅ‚, РÐļÐūÐŧÐļŅ‚", "title": "ИзŅƒÐžŅ€ŅƒÐī Ðļ БÐĩŅ€ÐļÐŧÐŧÐļÐđ", "type": "patchouli:text", "anchor": "normal_beryllium" @@ -2435,7 +2435,34 @@ }, { "Type": "patchouli:text", - "text": "$(thing)$(t:ВÐĩŅ€ÐūŅŅ‚Ð―ÐūŅŅ‚ŅŒ ÐģÐĩÐ―ÐĩŅ€Ð°Ņ†ÐļÐļ ÐķÐļÐŧŅ‹ Ðē Ņ‡Ð°Ð―КÐĩ. ЧÐĩО ОÐĩÐ―ŅŒŅˆÐĩ Ð·Ð―Ð°ÐžÐĩÐ―Ð°Ņ‚ÐĩÐŧŅŒ(ÐēŅ‚ÐūŅ€ÐūÐĩ Ņ‡ÐļŅÐŧÐū), Ņ‚ÐĩО Ņ‡Ð°Ņ‰Ðĩ ÐēŅŅ‚Ņ€ÐĩŅ‡Ð°ÐĩŅ‚ŅŅ.)РÐĩÐīКÐūŅŅ‚ŅŒ$(/t)$(): 1/185 Ð―Ð° Ņ‡Ð°Ð―К$(br)$(thing)$(t:ÐĄÐūÐīÐĩŅ€ÐķÐ°Ð―ÐļÐĩ ÐąÐŧÐūКÐūÐē Ņ€ŅƒÐīŅ‹ Ðē ÐķÐļÐŧÐĩ заОÐĩÐ―ŅŅŽŅ‰ÐļŅ… КаОÐĩÐ―ŅŒ. БÐūÐŧŅŒŅˆÐĩÐĩ Ð·Ð―Ð°Ņ‡ÐĩÐ―ÐļÐĩ ÐūÐ·Ð―Ð°Ņ‡Ð°ÐĩŅ‚ ÐąÐūÐŧŅŒŅˆÐĩ Ņ€ŅƒÐīŅ‹.)ПÐŧÐūŅ‚Ð―ÐūŅŅ‚ŅŒ$(/t)$(): 20%$(br)$(thing)$(t:ÐĪÐūŅ€ÐžÐ° ÐķÐļÐŧŅ‹.)ВÐļÐī$(/t)$(): $(t:ЗаŅ‡Ð°ŅŅ‚ŅƒŅŽ КŅ€ŅƒÐģÐŧÐūÐđ Ņ„ÐūŅ€ÐžŅ‹)КÐŧаŅŅ‚ÐĩŅ€Ð―аŅ ÐķÐļÐŧа$(/t)$(br)$(thing)$(t:ÐĢŅ€ÐūÐēÐ―Ðļ Y, ОÐĩÐķÐīŅƒ КÐūŅ‚ÐūŅ€Ņ‹ÐžÐļ ОÐūÐķÐĩŅ‚ ŅÐģÐĩÐ―ÐĩŅ€ÐļŅ€ÐūÐēаŅ‚ŅŒŅŅ ÐķÐļÐŧа.)Y-ŅƒŅ€ÐūÐēÐĩÐ―ŅŒ$(/t)$(): 0 — 70$(br)$(thing)(t:ÐĄŅ€ÐĩÐīÐ―ÐļÐđ ÐīÐļаОÐĩŅ‚Ņ€ ÐķÐļÐŧŅ‹)РазОÐĩŅ€$(/t)$(): 55$(br)$(thing)$(t:ЕŅÐŧÐļ Ņ€Ð°ŅŅŅ‚ÐūŅÐ―ÐļÐĩ ОÐĩÐķÐīŅƒ ÐŋÐūÐēÐĩŅ€Ņ…Ð―ÐūŅŅ‚ŅŒŅŽ Ðļ ÐķÐļÐŧÐūÐđ ÐąÐūÐŧŅŒŅˆÐĩ Ņ‡ÐĩО ŅŅ‚Ðū Ņ‡ÐļŅÐŧÐū, Ņ‚Ðū ÐķÐļÐŧа Ð―Ðĩ ŅÐģÐĩÐ―ÐĩÐ―Ņ€ÐļŅ€ŅƒÐĩŅ‚ ÐļÐ―ÐīÐļКаŅ‚ÐūŅ€Ņ‹ Ð―Ð° ÐŋÐūÐēÐĩŅ€Ņ…Ð―ÐūŅŅ‚Ðļ.)МаКŅÐļОаÐŧŅŒÐ―аŅ ÐēŅ‹ŅÐūŅ‚а ÐļÐ―ÐīÐļКаŅ‚ÐūŅ€Ð°$(/t)$(): 20$(br2)$(thing)ВÐļÐīŅ‹ ÐšÐ°ÐžÐ―ÐĩÐđ$(): АŅ€ÐģÐļÐŧÐŧÐļŅ‚, ДÐūÐŧÐūОÐļŅ‚, ИзÐēÐĩŅŅ‚Ð―ŅÐš, КÐūÐ―ÐģÐŧÐūОÐĩŅ€Ð°Ņ‚, КŅ€ÐĩÐžÐ―ÐļŅŅ‚Ņ‹Ðđ ŅÐŧÐ°Ð―ÐĩŅ†, МÐĩÐŧ, ÐĄÐŧÐ°Ð―ÐĩŅ†", + "text": "$(thing)$(t:ВÐĩŅ€ÐūŅŅ‚Ð―ÐūŅŅ‚ŅŒ ÐģÐĩÐ―ÐĩŅ€Ð°Ņ†ÐļÐļ ÐķÐļÐŧŅ‹ Ðē Ņ‡Ð°Ð―КÐĩ. ЧÐĩО ОÐĩÐ―ŅŒŅˆÐĩ Ð·Ð―Ð°ÐžÐĩÐ―Ð°Ņ‚ÐĩÐŧŅŒ(ÐēŅ‚ÐūŅ€ÐūÐĩ Ņ‡ÐļŅÐŧÐū), Ņ‚ÐĩО Ņ‡Ð°Ņ‰Ðĩ ÐēŅŅ‚Ņ€ÐĩŅ‡Ð°ÐĩŅ‚ŅŅ.)РÐĩÐīКÐūŅŅ‚ŅŒ$(/t)$(): 1/150 Ð―Ð° Ņ‡Ð°Ð―К$(br)$(thing)$(t:ÐĄÐūÐīÐĩŅ€ÐķÐ°Ð―ÐļÐĩ ÐąÐŧÐūКÐūÐē Ņ€ŅƒÐīŅ‹ Ðē ÐķÐļÐŧÐĩ заОÐĩÐ―ŅŅŽŅ‰ÐļŅ… КаОÐĩÐ―ŅŒ. БÐūÐŧŅŒŅˆÐĩÐĩ Ð·Ð―Ð°Ņ‡ÐĩÐ―ÐļÐĩ ÐūÐ·Ð―Ð°Ņ‡Ð°ÐĩŅ‚ ÐąÐūÐŧŅŒŅˆÐĩ Ņ€ŅƒÐīŅ‹.)ПÐŧÐūŅ‚Ð―ÐūŅŅ‚ŅŒ$(/t)$(): 20%$(br)$(thing)$(t:ÐĪÐūŅ€ÐžÐ° ÐķÐļÐŧŅ‹.)ВÐļÐī$(/t)$(): $(t:ЗаŅ‡Ð°ŅŅ‚ŅƒŅŽ КŅ€ŅƒÐģÐŧÐūÐđ Ņ„ÐūŅ€ÐžŅ‹)КÐŧаŅŅ‚ÐĩŅ€Ð―аŅ ÐķÐļÐŧа$(/t)$(br)$(thing)$(t:ÐĢŅ€ÐūÐēÐ―Ðļ Y, ОÐĩÐķÐīŅƒ КÐūŅ‚ÐūŅ€Ņ‹ÐžÐļ ОÐūÐķÐĩŅ‚ ŅÐģÐĩÐ―ÐĩŅ€ÐļŅ€ÐūÐēаŅ‚ŅŒŅŅ ÐķÐļÐŧа.)Y-ŅƒŅ€ÐūÐēÐĩÐ―ŅŒ$(/t)$(): 30 — 70$(br)$(thing)(t:ÐĄŅ€ÐĩÐīÐ―ÐļÐđ ÐīÐļаОÐĩŅ‚Ņ€ ÐķÐļÐŧŅ‹)РазОÐĩŅ€$(/t)$(): 60$(br)$(thing)$(t:ЕŅÐŧÐļ Ņ€Ð°ŅŅŅ‚ÐūŅÐ―ÐļÐĩ ОÐĩÐķÐīŅƒ ÐŋÐūÐēÐĩŅ€Ņ…Ð―ÐūŅŅ‚ŅŒŅŽ Ðļ ÐķÐļÐŧÐūÐđ ÐąÐūÐŧŅŒŅˆÐĩ Ņ‡ÐĩО ŅŅ‚Ðū Ņ‡ÐļŅÐŧÐū, Ņ‚Ðū ÐķÐļÐŧа Ð―Ðĩ ŅÐģÐĩÐ―ÐĩÐ―Ņ€ÐļŅ€ŅƒÐĩŅ‚ ÐļÐ―ÐīÐļКаŅ‚ÐūŅ€Ņ‹ Ð―Ð° ÐŋÐūÐēÐĩŅ€Ņ…Ð―ÐūŅŅ‚Ðļ.)МаКŅÐļОаÐŧŅŒÐ―аŅ ÐēŅ‹ŅÐūŅ‚а ÐļÐ―ÐīÐļКаŅ‚ÐūŅ€Ð°$(/t)$(): 50$(br2)$(thing)ВÐļÐīŅ‹ ÐšÐ°ÐžÐ―ÐĩÐđ$(): АŅ€ÐģÐļÐŧÐŧÐļŅ‚, ДÐūÐŧÐūОÐļŅ‚, ИзÐēÐĩŅŅ‚Ð―ŅÐš, КÐūÐ―ÐģÐŧÐūОÐĩŅ€Ð°Ņ‚, КŅ€ÐĩÐžÐ―ÐļŅŅ‚Ņ‹Ðđ ŅÐŧÐ°Ð―ÐĩŅ†, МÐĩÐŧ, ÐĄÐŧÐ°Ð―ÐĩŅ†$(br2)ПÐūŅÐēÐŧŅÐĩŅ‚ŅŅ Ņ‚ÐūÐŧŅŒÐšÐū Ðē ÐŋŅƒŅŅ‚Ņ‹Ð―ŅŅ… Ð―Ð° $(thing)заÐŋаÐīÐĩ$(), ÐŋŅ€Ðļ ÐģÐūÐīÐūÐēŅ‹ÐžÐļ ÐūŅÐ°ÐīКаОÐļ 120ОО.", + "title": "НÐĩŅ„Ņ‚ÐĩÐ―ÐūŅÐ―Ņ‹Ðđ ÐŋÐĩŅÐūК", + "type": "patchouli:text", + "anchor": "desert_oilsands" + }, + { + "Type": "patchouli:multiblock", + "name": "НÐĩŅ„Ņ‚ÐĩÐ―ÐūŅÐ―Ņ‹Ðđ ÐŋÐĩŅÐūК", + "multiblock": { + "mapping": { + "0": "#forge:ores/oilsands" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)ПŅ€ÐūŅ†ÐĩÐ―Ņ‚ Ņ€ŅƒÐīŅ‹$(): 100%$(br)$(thing)ИŅÐŋÐūÐŧŅŒÐ·ŅƒÐĩŅ‚ŅŅ ÐīÐŧŅ$(): НÐĩŅ„Ņ‚ÐĩÐŋŅ€ÐūÐīŅƒÐšŅ‚Ņ‹", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:text", + "text": "$(thing)$(t:ВÐĩŅ€ÐūŅŅ‚Ð―ÐūŅŅ‚ŅŒ ÐģÐĩÐ―ÐĩŅ€Ð°Ņ†ÐļÐļ ÐķÐļÐŧŅ‹ Ðē Ņ‡Ð°Ð―КÐĩ. ЧÐĩО ОÐĩÐ―ŅŒŅˆÐĩ Ð·Ð―Ð°ÐžÐĩÐ―Ð°Ņ‚ÐĩÐŧŅŒ(ÐēŅ‚ÐūŅ€ÐūÐĩ Ņ‡ÐļŅÐŧÐū), Ņ‚ÐĩО Ņ‡Ð°Ņ‰Ðĩ ÐēŅŅ‚Ņ€ÐĩŅ‡Ð°ÐĩŅ‚ŅŅ.)РÐĩÐīКÐūŅŅ‚ŅŒ$(/t)$(): 1/220 Ð―Ð° Ņ‡Ð°Ð―К$(br)$(thing)$(t:ÐĄÐūÐīÐĩŅ€ÐķÐ°Ð―ÐļÐĩ ÐąÐŧÐūКÐūÐē Ņ€ŅƒÐīŅ‹ Ðē ÐķÐļÐŧÐĩ заОÐĩÐ―ŅŅŽŅ‰ÐļŅ… КаОÐĩÐ―ŅŒ. БÐūÐŧŅŒŅˆÐĩÐĩ Ð·Ð―Ð°Ņ‡ÐĩÐ―ÐļÐĩ ÐūÐ·Ð―Ð°Ņ‡Ð°ÐĩŅ‚ ÐąÐūÐŧŅŒŅˆÐĩ Ņ€ŅƒÐīŅ‹.)ПÐŧÐūŅ‚Ð―ÐūŅŅ‚ŅŒ$(/t)$(): 20%$(br)$(thing)$(t:ÐĪÐūŅ€ÐžÐ° ÐķÐļÐŧŅ‹.)ВÐļÐī$(/t)$(): $(t:ЗаŅ‡Ð°ŅŅ‚ŅƒŅŽ КŅ€ŅƒÐģÐŧÐūÐđ Ņ„ÐūŅ€ÐžŅ‹)КÐŧаŅŅ‚ÐĩŅ€Ð―аŅ ÐķÐļÐŧа$(/t)$(br)$(thing)$(t:ÐĢŅ€ÐūÐēÐ―Ðļ Y, ОÐĩÐķÐīŅƒ КÐūŅ‚ÐūŅ€Ņ‹ÐžÐļ ОÐūÐķÐĩŅ‚ ŅÐģÐĩÐ―ÐĩŅ€ÐļŅ€ÐūÐēаŅ‚ŅŒŅŅ ÐķÐļÐŧа.)Y-ŅƒŅ€ÐūÐēÐĩÐ―ŅŒ$(/t)$(): 40 — 90$(br)$(thing)(t:ÐĄŅ€ÐĩÐīÐ―ÐļÐđ ÐīÐļаОÐĩŅ‚Ņ€ ÐķÐļÐŧŅ‹)РазОÐĩŅ€$(/t)$(): 30$(br)$(thing)$(t:ЕŅÐŧÐļ Ņ€Ð°ŅŅŅ‚ÐūŅÐ―ÐļÐĩ ОÐĩÐķÐīŅƒ ÐŋÐūÐēÐĩŅ€Ņ…Ð―ÐūŅŅ‚ŅŒŅŽ Ðļ ÐķÐļÐŧÐūÐđ ÐąÐūÐŧŅŒŅˆÐĩ Ņ‡ÐĩО ŅŅ‚Ðū Ņ‡ÐļŅÐŧÐū, Ņ‚Ðū ÐķÐļÐŧа Ð―Ðĩ ŅÐģÐĩÐ―ÐĩÐ―Ņ€ÐļŅ€ŅƒÐĩŅ‚ ÐļÐ―ÐīÐļКаŅ‚ÐūŅ€Ņ‹ Ð―Ð° ÐŋÐūÐēÐĩŅ€Ņ…Ð―ÐūŅŅ‚Ðļ.)МаКŅÐļОаÐŧŅŒÐ―аŅ ÐēŅ‹ŅÐūŅ‚а ÐļÐ―ÐīÐļКаŅ‚ÐūŅ€Ð°$(/t)$(): 20$(br2)$(thing)ВÐļÐīŅ‹ ÐšÐ°ÐžÐ―ÐĩÐđ$(): АŅ€ÐģÐļÐŧÐŧÐļŅ‚, ДÐūÐŧÐūОÐļŅ‚, ИзÐēÐĩŅŅ‚Ð―ŅÐš, КÐūÐ―ÐģÐŧÐūОÐĩŅ€Ð°Ņ‚, КŅ€ÐĩÐžÐ―ÐļŅŅ‚Ņ‹Ðđ ŅÐŧÐ°Ð―ÐĩŅ†, МÐĩÐŧ, ÐĄÐŧÐ°Ð―ÐĩŅ†", "title": "НÐĩŅ„Ņ‚ÐĩÐ―ÐūŅÐ―Ņ‹Ðđ ÐŋÐĩŅÐūК", "type": "patchouli:text", "anchor": "normal_oilsands" @@ -3257,7 +3284,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)$(t:ВÐĩŅ€ÐūŅŅ‚Ð―ÐūŅŅ‚ŅŒ ÐģÐĩÐ―ÐĩŅ€Ð°Ņ†ÐļÐļ ÐķÐļÐŧŅ‹ Ðē Ņ‡Ð°Ð―КÐĩ. ЧÐĩО ОÐĩÐ―ŅŒŅˆÐĩ Ð·Ð―Ð°ÐžÐĩÐ―Ð°Ņ‚ÐĩÐŧŅŒ(ÐēŅ‚ÐūŅ€ÐūÐĩ Ņ‡ÐļŅÐŧÐū), Ņ‚ÐĩО Ņ‡Ð°Ņ‰Ðĩ ÐēŅŅ‚Ņ€ÐĩŅ‡Ð°ÐĩŅ‚ŅŅ.)РÐĩÐīКÐūŅŅ‚ŅŒ$(/t)$(): 1/140 Ð―Ð° Ņ‡Ð°Ð―К$(br)$(thing)$(t:ÐĄÐūÐīÐĩŅ€ÐķÐ°Ð―ÐļÐĩ ÐąÐŧÐūКÐūÐē Ņ€ŅƒÐīŅ‹ Ðē ÐķÐļÐŧÐĩ заОÐĩÐ―ŅŅŽŅ‰ÐļŅ… КаОÐĩÐ―ŅŒ. БÐūÐŧŅŒŅˆÐĩÐĩ Ð·Ð―Ð°Ņ‡ÐĩÐ―ÐļÐĩ ÐūÐ·Ð―Ð°Ņ‡Ð°ÐĩŅ‚ ÐąÐūÐŧŅŒŅˆÐĩ Ņ€ŅƒÐīŅ‹.)ПÐŧÐūŅ‚Ð―ÐūŅŅ‚ŅŒ$(/t)$(): 35%$(br)$(thing)$(t:ÐĪÐūŅ€ÐžÐ° ÐķÐļÐŧŅ‹.)ВÐļÐī$(/t)$(): $(t:ВŅ‹ŅÐūКаŅ Ðļ ŅƒÐ·ÐšÐ°Ņ)ÐĒŅ€ŅƒÐąŅ‡Ð°Ņ‚аŅ ÐķÐļÐŧа$(/t)$(br)$(thing)$(t:ÐĢŅ€ÐūÐēÐ―Ðļ Y, ОÐĩÐķÐīŅƒ КÐūŅ‚ÐūŅ€Ņ‹ÐžÐļ ОÐūÐķÐĩŅ‚ ŅÐģÐĩÐ―ÐĩŅ€ÐļŅ€ÐūÐēаŅ‚ŅŒŅŅ ÐķÐļÐŧа.)Y-ŅƒŅ€ÐūÐēÐĩÐ―ŅŒ$(/t)$(): 20 — 120$(br)$(thing)ВŅ‹ŅÐūŅ‚а$(): 60$(br)$(thing)РаÐīÐļŅƒŅ$(): 10$(br)$(thing)$(t:ЕŅÐŧÐļ Ņ€Ð°ŅŅŅ‚ÐūŅÐ―ÐļÐĩ ОÐĩÐķÐīŅƒ ÐŋÐūÐēÐĩŅ€Ņ…Ð―ÐūŅŅ‚ŅŒŅŽ Ðļ ÐķÐļÐŧÐūÐđ ÐąÐūÐŧŅŒŅˆÐĩ Ņ‡ÐĩО ŅŅ‚Ðū Ņ‡ÐļŅÐŧÐū, Ņ‚Ðū ÐķÐļÐŧа Ð―Ðĩ ŅÐģÐĩÐ―ÐĩÐ―Ņ€ÐļŅ€ŅƒÐĩŅ‚ ÐļÐ―ÐīÐļКаŅ‚ÐūŅ€Ņ‹ Ð―Ð° ÐŋÐūÐēÐĩŅ€Ņ…Ð―ÐūŅŅ‚Ðļ.)МаКŅÐļОаÐŧŅŒÐ―аŅ ÐēŅ‹ŅÐūŅ‚а ÐļÐ―ÐīÐļКаŅ‚ÐūŅ€Ð°$(/t)$(): 20$(br2)$(thing)ВÐļÐīŅ‹ ÐšÐ°ÐžÐ―ÐĩÐđ$(): ÐÐ―ÐīÐĩзÐļŅ‚, АŅ€ÐģÐļÐŧÐŧÐļŅ‚, АŅÐŋÐļÐīÐ―Ņ‹Ðđ ŅÐŧÐ°Ð―ÐĩŅ†, БазаÐŧŅŒŅ‚, Ð“Ð°ÐąÐąŅ€Ðū, Ð“Ð―ÐĩÐđŅ, ГŅ€Ð°Ð―ÐļŅ‚, ДаŅ†ÐļŅ‚, ДÐļÐūŅ€ÐļŅ‚, ДÐūÐŧÐūОÐļŅ‚, ИзÐēÐĩŅŅ‚Ð―ŅÐš, КÐēаŅ€Ņ†ÐļŅ‚, КÐūÐ―ÐģÐŧÐūОÐĩŅ€Ð°Ņ‚, КŅ€ÐĩÐžÐ―ÐļŅŅ‚Ņ‹Ðđ ŅÐŧÐ°Ð―ÐĩŅ†, МÐĩÐŧ, МŅ€Ð°ÐžÐūŅ€, РÐļÐūÐŧÐļŅ‚, ÐĄÐŧÐ°Ð―ÐĩŅ†, ÐĪÐļÐŧÐŧÐļŅ‚, ÐĻÐļŅ„ÐĩŅ€Ð―Ņ‹Ðđ ŅÐŧÐ°Ð―ÐĩŅ†$(br2)ПÐūŅÐēÐŧŅÐĩŅ‚ŅŅ Ņ‚ÐūÐŧŅŒÐšÐū Ðē ÐŋŅƒŅŅ‚Ņ‹Ð―ŅŅ… Ð―Ð° $(thing)ÐŪÐģÐū-заÐŋаÐīÐĩ$(), ÐŋŅ€Ðļ ОÐļÐ―ÐļОаÐŧŅŒÐ―ÐūÐđ Ņ‚ÐĩОÐŋÐĩŅ€Ð°Ņ‚ŅƒŅ€Ðĩ - 7°C Ðļ ÐģÐūÐīÐūÐēŅ‹ÐžÐļ ÐūŅÐ°ÐīКаОÐļ 100ОО.", + "text": "$(thing)$(t:ВÐĩŅ€ÐūŅŅ‚Ð―ÐūŅŅ‚ŅŒ ÐģÐĩÐ―ÐĩŅ€Ð°Ņ†ÐļÐļ ÐķÐļÐŧŅ‹ Ðē Ņ‡Ð°Ð―КÐĩ. ЧÐĩО ОÐĩÐ―ŅŒŅˆÐĩ Ð·Ð―Ð°ÐžÐĩÐ―Ð°Ņ‚ÐĩÐŧŅŒ(ÐēŅ‚ÐūŅ€ÐūÐĩ Ņ‡ÐļŅÐŧÐū), Ņ‚ÐĩО Ņ‡Ð°Ņ‰Ðĩ ÐēŅŅ‚Ņ€ÐĩŅ‡Ð°ÐĩŅ‚ŅŅ.)РÐĩÐīКÐūŅŅ‚ŅŒ$(/t)$(): 1/140 Ð―Ð° Ņ‡Ð°Ð―К$(br)$(thing)$(t:ÐĄÐūÐīÐĩŅ€ÐķÐ°Ð―ÐļÐĩ ÐąÐŧÐūКÐūÐē Ņ€ŅƒÐīŅ‹ Ðē ÐķÐļÐŧÐĩ заОÐĩÐ―ŅŅŽŅ‰ÐļŅ… КаОÐĩÐ―ŅŒ. БÐūÐŧŅŒŅˆÐĩÐĩ Ð·Ð―Ð°Ņ‡ÐĩÐ―ÐļÐĩ ÐūÐ·Ð―Ð°Ņ‡Ð°ÐĩŅ‚ ÐąÐūÐŧŅŒŅˆÐĩ Ņ€ŅƒÐīŅ‹.)ПÐŧÐūŅ‚Ð―ÐūŅŅ‚ŅŒ$(/t)$(): 35%$(br)$(thing)$(t:ÐĪÐūŅ€ÐžÐ° ÐķÐļÐŧŅ‹.)ВÐļÐī$(/t)$(): $(t:ВŅ‹ŅÐūКаŅ Ðļ ŅƒÐ·ÐšÐ°Ņ)ÐĒŅ€ŅƒÐąŅ‡Ð°Ņ‚аŅ ÐķÐļÐŧа$(/t)$(br)$(thing)$(t:ÐĢŅ€ÐūÐēÐ―Ðļ Y, ОÐĩÐķÐīŅƒ КÐūŅ‚ÐūŅ€Ņ‹ÐžÐļ ОÐūÐķÐĩŅ‚ ŅÐģÐĩÐ―ÐĩŅ€ÐļŅ€ÐūÐēаŅ‚ŅŒŅŅ ÐķÐļÐŧа.)Y-ŅƒŅ€ÐūÐēÐĩÐ―ŅŒ$(/t)$(): 20 — 120$(br)$(thing)ВŅ‹ŅÐūŅ‚а$(): 60$(br)$(thing)РаÐīÐļŅƒŅ$(): 10$(br)$(thing)$(t:ЕŅÐŧÐļ Ņ€Ð°ŅŅŅ‚ÐūŅÐ―ÐļÐĩ ОÐĩÐķÐīŅƒ ÐŋÐūÐēÐĩŅ€Ņ…Ð―ÐūŅŅ‚ŅŒŅŽ Ðļ ÐķÐļÐŧÐūÐđ ÐąÐūÐŧŅŒŅˆÐĩ Ņ‡ÐĩО ŅŅ‚Ðū Ņ‡ÐļŅÐŧÐū, Ņ‚Ðū ÐķÐļÐŧа Ð―Ðĩ ŅÐģÐĩÐ―ÐĩÐ―Ņ€ÐļŅ€ŅƒÐĩŅ‚ ÐļÐ―ÐīÐļКаŅ‚ÐūŅ€Ņ‹ Ð―Ð° ÐŋÐūÐēÐĩŅ€Ņ…Ð―ÐūŅŅ‚Ðļ.)МаКŅÐļОаÐŧŅŒÐ―аŅ ÐēŅ‹ŅÐūŅ‚а ÐļÐ―ÐīÐļКаŅ‚ÐūŅ€Ð°$(/t)$(): 20$(br2)$(thing)ВÐļÐīŅ‹ ÐšÐ°ÐžÐ―ÐĩÐđ$(): ÐÐ―ÐīÐĩзÐļŅ‚, АŅ€ÐģÐļÐŧÐŧÐļŅ‚, АŅÐŋÐļÐīÐ―Ņ‹Ðđ ŅÐŧÐ°Ð―ÐĩŅ†, БазаÐŧŅŒŅ‚, Ð“Ð°ÐąÐąŅ€Ðū, Ð“Ð―ÐĩÐđŅ, ГŅ€Ð°Ð―ÐļŅ‚, ДаŅ†ÐļŅ‚, ДÐļÐūŅ€ÐļŅ‚, ДÐūÐŧÐūОÐļŅ‚, ИзÐēÐĩŅŅ‚Ð―ŅÐš, КÐēаŅ€Ņ†ÐļŅ‚, КÐūÐ―ÐģÐŧÐūОÐĩŅ€Ð°Ņ‚, КŅ€ÐĩÐžÐ―ÐļŅŅ‚Ņ‹Ðđ ŅÐŧÐ°Ð―ÐĩŅ†, МÐĩÐŧ, МŅ€Ð°ÐžÐūŅ€, РÐļÐūÐŧÐļŅ‚, ÐĄÐŧÐ°Ð―ÐĩŅ†, ÐĪÐļÐŧÐŧÐļŅ‚, ÐĻÐļŅ„ÐĩŅ€Ð―Ņ‹Ðđ ŅÐŧÐ°Ð―ÐĩŅ†$(br2)ПÐūŅÐēÐŧŅÐĩŅ‚ŅŅ Ņ‚ÐūÐŧŅŒÐšÐū Ðē ÐŋŅƒŅŅ‚Ņ‹Ð―ŅŅ… Ð―Ð° $(thing)заÐŋаÐīÐĩ$(), ÐŋŅ€Ðļ ОÐļÐ―ÐļОаÐŧŅŒÐ―ÐūÐđ Ņ‚ÐĩОÐŋÐĩŅ€Ð°Ņ‚ŅƒŅ€Ðĩ - 7°C Ðļ ÐģÐūÐīÐūÐēŅ‹ÐžÐļ ÐūŅÐ°ÐīКаОÐļ 100ОО.", "title": "ÐĒаŅ€ÐšÐļÐ°Ð―ÐļŅ‚ Ðļ НÐĩŅ„Ņ‚ÐĩÐ―ÐūŅÐ―Ņ‹Ðđ ÐŋÐĩŅÐūК", "type": "patchouli:text", "anchor": "normal_tarkianite" diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/mars_vein_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/mars_vein_index.json index 43526e706..a9996fe73 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/mars_vein_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/mars_vein_index.json @@ -228,7 +228,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)$(t:ВÐĩŅ€ÐūŅŅ‚Ð―ÐūŅŅ‚ŅŒ ÐģÐĩÐ―ÐĩŅ€Ð°Ņ†ÐļÐļ ÐķÐļÐŧŅ‹ Ðē Ņ‡Ð°Ð―КÐĩ. ЧÐĩО ОÐĩÐ―ŅŒŅˆÐĩ Ð·Ð―Ð°ÐžÐĩÐ―Ð°Ņ‚ÐĩÐŧŅŒ(ÐēŅ‚ÐūŅ€ÐūÐĩ Ņ‡ÐļŅÐŧÐū), Ņ‚ÐĩО Ņ‡Ð°Ņ‰Ðĩ ÐēŅŅ‚Ņ€ÐĩŅ‡Ð°ÐĩŅ‚ŅŅ.)РÐĩÐīКÐūŅŅ‚ŅŒ$(/t)$(): 1/215 Ð―Ð° Ņ‡Ð°Ð―К$(br)$(thing)$(t:ÐĄÐūÐīÐĩŅ€ÐķÐ°Ð―ÐļÐĩ ÐąÐŧÐūКÐūÐē Ņ€ŅƒÐīŅ‹ Ðē ÐķÐļÐŧÐĩ заОÐĩÐ―ŅŅŽŅ‰ÐļŅ… КаОÐĩÐ―ŅŒ. БÐūÐŧŅŒŅˆÐĩÐĩ Ð·Ð―Ð°Ņ‡ÐĩÐ―ÐļÐĩ ÐūÐ·Ð―Ð°Ņ‡Ð°ÐĩŅ‚ ÐąÐūÐŧŅŒŅˆÐĩ Ņ€ŅƒÐīŅ‹.)ПÐŧÐūŅ‚Ð―ÐūŅŅ‚ŅŒ$(/t)$(): 40%$(br)$(thing)$(t:ÐĪÐūŅ€ÐžÐ° ÐķÐļÐŧŅ‹.)ВÐļÐī$(/t)$(): $(t:ЗаŅ‡Ð°ŅŅ‚ŅƒŅŽ КŅ€ŅƒÐģÐŧÐūÐđ Ņ„ÐūŅ€ÐžŅ‹)КÐŧаŅŅ‚ÐĩŅ€Ð―аŅ ÐķÐļÐŧа$(/t)$(br)$(thing)$(t:ÐĢŅ€ÐūÐēÐ―Ðļ Y, ОÐĩÐķÐīŅƒ КÐūŅ‚ÐūŅ€Ņ‹ÐžÐļ ОÐūÐķÐĩŅ‚ ŅÐģÐĩÐ―ÐĩŅ€ÐļŅ€ÐūÐēаŅ‚ŅŒŅŅ ÐķÐļÐŧа.)Y-ŅƒŅ€ÐūÐēÐĩÐ―ŅŒ$(/t)$(): 0 — 70$(br)$(thing)(t:ÐĄŅ€ÐĩÐīÐ―ÐļÐđ ÐīÐļаОÐĩŅ‚Ņ€ ÐķÐļÐŧŅ‹)РазОÐĩŅ€$(/t)$(): 45$(br)$(thing)$(t:ЕŅÐŧÐļ Ņ€Ð°ŅŅŅ‚ÐūŅÐ―ÐļÐĩ ОÐĩÐķÐīŅƒ ÐŋÐūÐēÐĩŅ€Ņ…Ð―ÐūŅŅ‚ŅŒŅŽ Ðļ ÐķÐļÐŧÐūÐđ ÐąÐūÐŧŅŒŅˆÐĩ Ņ‡ÐĩО ŅŅ‚Ðū Ņ‡ÐļŅÐŧÐū, Ņ‚Ðū ÐķÐļÐŧа Ð―Ðĩ ŅÐģÐĩÐ―ÐĩÐ―Ņ€ÐļŅ€ŅƒÐĩŅ‚ ÐļÐ―ÐīÐļКаŅ‚ÐūŅ€Ņ‹ Ð―Ð° ÐŋÐūÐēÐĩŅ€Ņ…Ð―ÐūŅŅ‚Ðļ.)МаКŅÐļОаÐŧŅŒÐ―аŅ ÐēŅ‹ŅÐūŅ‚а ÐļÐ―ÐīÐļКаŅ‚ÐūŅ€Ð°$(/t)$(): 15$(br2)$(thing)ВÐļÐīŅ‹ ÐšÐ°ÐžÐ―ÐĩÐđ$(): АŅ€ÐģÐļÐŧÐŧÐļŅ‚, БазаÐŧŅŒŅ‚, Ð“Ð°ÐąÐąŅ€Ðū, ДÐļÐūŅ€ÐļŅ‚, ДÐūÐŧÐūОÐļŅ‚, КŅ€ÐĩÐžÐ―ÐļŅŅ‚Ņ‹Ðđ ŅÐŧÐ°Ð―ÐĩŅ†, МÐĩÐŧ, ÐĒŅ€Ð°Ņ…ÐļŅ‚", + "text": "$(thing)$(t:ВÐĩŅ€ÐūŅŅ‚Ð―ÐūŅŅ‚ŅŒ ÐģÐĩÐ―ÐĩŅ€Ð°Ņ†ÐļÐļ ÐķÐļÐŧŅ‹ Ðē Ņ‡Ð°Ð―КÐĩ. ЧÐĩО ОÐĩÐ―ŅŒŅˆÐĩ Ð·Ð―Ð°ÐžÐĩÐ―Ð°Ņ‚ÐĩÐŧŅŒ(ÐēŅ‚ÐūŅ€ÐūÐĩ Ņ‡ÐļŅÐŧÐū), Ņ‚ÐĩО Ņ‡Ð°Ņ‰Ðĩ ÐēŅŅ‚Ņ€ÐĩŅ‡Ð°ÐĩŅ‚ŅŅ.)РÐĩÐīКÐūŅŅ‚ŅŒ$(/t)$(): 1/215 Ð―Ð° Ņ‡Ð°Ð―К$(br)$(thing)$(t:ÐĄÐūÐīÐĩŅ€ÐķÐ°Ð―ÐļÐĩ ÐąÐŧÐūКÐūÐē Ņ€ŅƒÐīŅ‹ Ðē ÐķÐļÐŧÐĩ заОÐĩÐ―ŅŅŽŅ‰ÐļŅ… КаОÐĩÐ―ŅŒ. БÐūÐŧŅŒŅˆÐĩÐĩ Ð·Ð―Ð°Ņ‡ÐĩÐ―ÐļÐĩ ÐūÐ·Ð―Ð°Ņ‡Ð°ÐĩŅ‚ ÐąÐūÐŧŅŒŅˆÐĩ Ņ€ŅƒÐīŅ‹.)ПÐŧÐūŅ‚Ð―ÐūŅŅ‚ŅŒ$(/t)$(): 40%$(br)$(thing)$(t:ÐĪÐūŅ€ÐžÐ° ÐķÐļÐŧŅ‹.)ВÐļÐī$(/t)$(): $(t:ЗаŅ‡Ð°ŅŅ‚ŅƒŅŽ КŅ€ŅƒÐģÐŧÐūÐđ Ņ„ÐūŅ€ÐžŅ‹)КÐŧаŅŅ‚ÐĩŅ€Ð―аŅ ÐķÐļÐŧа$(/t)$(br)$(thing)$(t:ÐĢŅ€ÐūÐēÐ―Ðļ Y, ОÐĩÐķÐīŅƒ КÐūŅ‚ÐūŅ€Ņ‹ÐžÐļ ОÐūÐķÐĩŅ‚ ŅÐģÐĩÐ―ÐĩŅ€ÐļŅ€ÐūÐēаŅ‚ŅŒŅŅ ÐķÐļÐŧа.)Y-ŅƒŅ€ÐūÐēÐĩÐ―ŅŒ$(/t)$(): 0 — 70$(br)$(thing)(t:ÐĄŅ€ÐĩÐīÐ―ÐļÐđ ÐīÐļаОÐĩŅ‚Ņ€ ÐķÐļÐŧŅ‹)РазОÐĩŅ€$(/t)$(): 45$(br)$(thing)$(t:ЕŅÐŧÐļ Ņ€Ð°ŅŅŅ‚ÐūŅÐ―ÐļÐĩ ОÐĩÐķÐīŅƒ ÐŋÐūÐēÐĩŅ€Ņ…Ð―ÐūŅŅ‚ŅŒŅŽ Ðļ ÐķÐļÐŧÐūÐđ ÐąÐūÐŧŅŒŅˆÐĩ Ņ‡ÐĩО ŅŅ‚Ðū Ņ‡ÐļŅÐŧÐū, Ņ‚Ðū ÐķÐļÐŧа Ð―Ðĩ ŅÐģÐĩÐ―ÐĩÐ―Ņ€ÐļŅ€ŅƒÐĩŅ‚ ÐļÐ―ÐīÐļКаŅ‚ÐūŅ€Ņ‹ Ð―Ð° ÐŋÐūÐēÐĩŅ€Ņ…Ð―ÐūŅŅ‚Ðļ.)МаКŅÐļОаÐŧŅŒÐ―аŅ ÐēŅ‹ŅÐūŅ‚а ÐļÐ―ÐīÐļКаŅ‚ÐūŅ€Ð°$(/t)$(): 15$(br2)$(thing)ВÐļÐīŅ‹ ÐšÐ°ÐžÐ―ÐĩÐđ$(): АŅ€ÐģÐļÐŧÐŧÐļŅ‚, БазаÐŧŅŒŅ‚, Ð“Ð°ÐąÐąŅ€Ðū, ДÐļÐūŅ€ÐļŅ‚, ДÐūÐŧÐūОÐļŅ‚, КÐēаŅ€Ņ†ÐļŅ‚, КŅ€ÐĩÐžÐ―ÐļŅŅ‚Ņ‹Ðđ ŅÐŧÐ°Ð―ÐĩŅ†, МÐĩÐŧ, ÐĒŅ€Ð°Ņ…ÐļŅ‚", "title": "БаŅŅ‚Ð―ÐĩзÐļŅ‚ Ðļ МÐūÐ―Ð°Ņ†ÐļŅ‚", "type": "patchouli:text", "anchor": "mars_neodynium" @@ -320,7 +320,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)$(t:ВÐĩŅ€ÐūŅŅ‚Ð―ÐūŅŅ‚ŅŒ ÐģÐĩÐ―ÐĩŅ€Ð°Ņ†ÐļÐļ ÐķÐļÐŧŅ‹ Ðē Ņ‡Ð°Ð―КÐĩ. ЧÐĩО ОÐĩÐ―ŅŒŅˆÐĩ Ð·Ð―Ð°ÐžÐĩÐ―Ð°Ņ‚ÐĩÐŧŅŒ(ÐēŅ‚ÐūŅ€ÐūÐĩ Ņ‡ÐļŅÐŧÐū), Ņ‚ÐĩО Ņ‡Ð°Ņ‰Ðĩ ÐēŅŅ‚Ņ€ÐĩŅ‡Ð°ÐĩŅ‚ŅŅ.)РÐĩÐīКÐūŅŅ‚ŅŒ$(/t)$(): 1/370 Ð―Ð° Ņ‡Ð°Ð―К$(br)$(thing)$(t:ÐĄÐūÐīÐĩŅ€ÐķÐ°Ð―ÐļÐĩ ÐąÐŧÐūКÐūÐē Ņ€ŅƒÐīŅ‹ Ðē ÐķÐļÐŧÐĩ заОÐĩÐ―ŅŅŽŅ‰ÐļŅ… КаОÐĩÐ―ŅŒ. БÐūÐŧŅŒŅˆÐĩÐĩ Ð·Ð―Ð°Ņ‡ÐĩÐ―ÐļÐĩ ÐūÐ·Ð―Ð°Ņ‡Ð°ÐĩŅ‚ ÐąÐūÐŧŅŒŅˆÐĩ Ņ€ŅƒÐīŅ‹.)ПÐŧÐūŅ‚Ð―ÐūŅŅ‚ŅŒ$(/t)$(): 30%$(br)$(thing)$(t:ÐĪÐūŅ€ÐžÐ° ÐķÐļÐŧŅ‹.)ВÐļÐī$(/t)$(): $(t:ЗаŅ‡Ð°ŅŅ‚ŅƒŅŽ КŅ€ŅƒÐģÐŧÐūÐđ Ņ„ÐūŅ€ÐžŅ‹)КÐŧаŅŅ‚ÐĩŅ€Ð―аŅ ÐķÐļÐŧа$(/t)$(br)$(thing)$(t:ÐĢŅ€ÐūÐēÐ―Ðļ Y, ОÐĩÐķÐīŅƒ КÐūŅ‚ÐūŅ€Ņ‹ÐžÐļ ОÐūÐķÐĩŅ‚ ŅÐģÐĩÐ―ÐĩŅ€ÐļŅ€ÐūÐēаŅ‚ŅŒŅŅ ÐķÐļÐŧа.)Y-ŅƒŅ€ÐūÐēÐĩÐ―ŅŒ$(/t)$(): -20 — 0$(br)$(thing)(t:ÐĄŅ€ÐĩÐīÐ―ÐļÐđ ÐīÐļаОÐĩŅ‚Ņ€ ÐķÐļÐŧŅ‹)РазОÐĩŅ€$(/t)$(): 60$(br)$(thing)$(t:ЕŅÐŧÐļ Ņ€Ð°ŅŅŅ‚ÐūŅÐ―ÐļÐĩ ОÐĩÐķÐīŅƒ ÐŋÐūÐēÐĩŅ€Ņ…Ð―ÐūŅŅ‚ŅŒŅŽ Ðļ ÐķÐļÐŧÐūÐđ ÐąÐūÐŧŅŒŅˆÐĩ Ņ‡ÐĩО ŅŅ‚Ðū Ņ‡ÐļŅÐŧÐū, Ņ‚Ðū ÐķÐļÐŧа Ð―Ðĩ ŅÐģÐĩÐ―ÐĩÐ―Ņ€ÐļŅ€ŅƒÐĩŅ‚ ÐļÐ―ÐīÐļКаŅ‚ÐūŅ€Ņ‹ Ð―Ð° ÐŋÐūÐēÐĩŅ€Ņ…Ð―ÐūŅŅ‚Ðļ.)МаКŅÐļОаÐŧŅŒÐ―аŅ ÐēŅ‹ŅÐūŅ‚а ÐļÐ―ÐīÐļКаŅ‚ÐūŅ€Ð°$(/t)$(): 20$(br2)$(thing)ВÐļÐīŅ‹ ÐšÐ°ÐžÐ―ÐĩÐđ$(): АŅ€ÐģÐļÐŧÐŧÐļŅ‚, БазаÐŧŅŒŅ‚, ДаŅ†ÐļŅ‚, ДÐļÐūŅ€ÐļŅ‚, КÐūÐ―ÐģÐŧÐūОÐĩŅ€Ð°Ņ‚, КŅ€Ð°ŅÐ―Ņ‹Ðđ ÐģŅ€Ð°Ð―ÐļŅ‚, КŅ€ÐĩÐžÐ―ÐļŅŅ‚Ņ‹Ðđ ŅÐŧÐ°Ð―ÐĩŅ†, МÐĩÐŧ, ÐĒŅ€Ð°Ņ…ÐļŅ‚", + "text": "$(thing)$(t:ВÐĩŅ€ÐūŅŅ‚Ð―ÐūŅŅ‚ŅŒ ÐģÐĩÐ―ÐĩŅ€Ð°Ņ†ÐļÐļ ÐķÐļÐŧŅ‹ Ðē Ņ‡Ð°Ð―КÐĩ. ЧÐĩО ОÐĩÐ―ŅŒŅˆÐĩ Ð·Ð―Ð°ÐžÐĩÐ―Ð°Ņ‚ÐĩÐŧŅŒ(ÐēŅ‚ÐūŅ€ÐūÐĩ Ņ‡ÐļŅÐŧÐū), Ņ‚ÐĩО Ņ‡Ð°Ņ‰Ðĩ ÐēŅŅ‚Ņ€ÐĩŅ‡Ð°ÐĩŅ‚ŅŅ.)РÐĩÐīКÐūŅŅ‚ŅŒ$(/t)$(): 1/370 Ð―Ð° Ņ‡Ð°Ð―К$(br)$(thing)$(t:ÐĄÐūÐīÐĩŅ€ÐķÐ°Ð―ÐļÐĩ ÐąÐŧÐūКÐūÐē Ņ€ŅƒÐīŅ‹ Ðē ÐķÐļÐŧÐĩ заОÐĩÐ―ŅŅŽŅ‰ÐļŅ… КаОÐĩÐ―ŅŒ. БÐūÐŧŅŒŅˆÐĩÐĩ Ð·Ð―Ð°Ņ‡ÐĩÐ―ÐļÐĩ ÐūÐ·Ð―Ð°Ņ‡Ð°ÐĩŅ‚ ÐąÐūÐŧŅŒŅˆÐĩ Ņ€ŅƒÐīŅ‹.)ПÐŧÐūŅ‚Ð―ÐūŅŅ‚ŅŒ$(/t)$(): 30%$(br)$(thing)$(t:ÐĪÐūŅ€ÐžÐ° ÐķÐļÐŧŅ‹.)ВÐļÐī$(/t)$(): $(t:ЗаŅ‡Ð°ŅŅ‚ŅƒŅŽ КŅ€ŅƒÐģÐŧÐūÐđ Ņ„ÐūŅ€ÐžŅ‹)КÐŧаŅŅ‚ÐĩŅ€Ð―аŅ ÐķÐļÐŧа$(/t)$(br)$(thing)$(t:ÐĢŅ€ÐūÐēÐ―Ðļ Y, ОÐĩÐķÐīŅƒ КÐūŅ‚ÐūŅ€Ņ‹ÐžÐļ ОÐūÐķÐĩŅ‚ ŅÐģÐĩÐ―ÐĩŅ€ÐļŅ€ÐūÐēаŅ‚ŅŒŅŅ ÐķÐļÐŧа.)Y-ŅƒŅ€ÐūÐēÐĩÐ―ŅŒ$(/t)$(): -30 — 0$(br)$(thing)(t:ÐĄŅ€ÐĩÐīÐ―ÐļÐđ ÐīÐļаОÐĩŅ‚Ņ€ ÐķÐļÐŧŅ‹)РазОÐĩŅ€$(/t)$(): 60$(br)$(thing)$(t:ЕŅÐŧÐļ Ņ€Ð°ŅŅŅ‚ÐūŅÐ―ÐļÐĩ ОÐĩÐķÐīŅƒ ÐŋÐūÐēÐĩŅ€Ņ…Ð―ÐūŅŅ‚ŅŒŅŽ Ðļ ÐķÐļÐŧÐūÐđ ÐąÐūÐŧŅŒŅˆÐĩ Ņ‡ÐĩО ŅŅ‚Ðū Ņ‡ÐļŅÐŧÐū, Ņ‚Ðū ÐķÐļÐŧа Ð―Ðĩ ŅÐģÐĩÐ―ÐĩÐ―Ņ€ÐļŅ€ŅƒÐĩŅ‚ ÐļÐ―ÐīÐļКаŅ‚ÐūŅ€Ņ‹ Ð―Ð° ÐŋÐūÐēÐĩŅ€Ņ…Ð―ÐūŅŅ‚Ðļ.)МаКŅÐļОаÐŧŅŒÐ―аŅ ÐēŅ‹ŅÐūŅ‚а ÐļÐ―ÐīÐļКаŅ‚ÐūŅ€Ð°$(/t)$(): 20$(br2)$(thing)ВÐļÐīŅ‹ ÐšÐ°ÐžÐ―ÐĩÐđ$(): Ð“Ð°ÐąÐąŅ€Ðū, ГŅ€Ð°Ð―ÐļŅ‚, ДÐļÐūŅ€ÐļŅ‚, КŅ€Ð°ŅÐ―Ņ‹Ðđ ÐģŅ€Ð°Ð―ÐļŅ‚", "title": "БÐūŅ€Ð―ÐļŅ‚ & КŅƒÐŋÐĩŅ€ÐļŅ‚", "type": "patchouli:text", "anchor": "deep_mars_sheldonite" @@ -412,7 +412,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)$(t:ВÐĩŅ€ÐūŅŅ‚Ð―ÐūŅŅ‚ŅŒ ÐģÐĩÐ―ÐĩŅ€Ð°Ņ†ÐļÐļ ÐķÐļÐŧŅ‹ Ðē Ņ‡Ð°Ð―КÐĩ. ЧÐĩО ОÐĩÐ―ŅŒŅˆÐĩ Ð·Ð―Ð°ÐžÐĩÐ―Ð°Ņ‚ÐĩÐŧŅŒ(ÐēŅ‚ÐūŅ€ÐūÐĩ Ņ‡ÐļŅÐŧÐū), Ņ‚ÐĩО Ņ‡Ð°Ņ‰Ðĩ ÐēŅŅ‚Ņ€ÐĩŅ‡Ð°ÐĩŅ‚ŅŅ.)РÐĩÐīКÐūŅŅ‚ŅŒ$(/t)$(): 1/140 Ð―Ð° Ņ‡Ð°Ð―К$(br)$(thing)$(t:ÐĄÐūÐīÐĩŅ€ÐķÐ°Ð―ÐļÐĩ ÐąÐŧÐūКÐūÐē Ņ€ŅƒÐīŅ‹ Ðē ÐķÐļÐŧÐĩ заОÐĩÐ―ŅŅŽŅ‰ÐļŅ… КаОÐĩÐ―ŅŒ. БÐūÐŧŅŒŅˆÐĩÐĩ Ð·Ð―Ð°Ņ‡ÐĩÐ―ÐļÐĩ ÐūÐ·Ð―Ð°Ņ‡Ð°ÐĩŅ‚ ÐąÐūÐŧŅŒŅˆÐĩ Ņ€ŅƒÐīŅ‹.)ПÐŧÐūŅ‚Ð―ÐūŅŅ‚ŅŒ$(/t)$(): 25%$(br)$(thing)$(t:ÐĪÐūŅ€ÐžÐ° ÐķÐļÐŧŅ‹.)ВÐļÐī$(/t)$(): $(t:ЗаŅ‡Ð°ŅŅ‚ŅƒŅŽ КŅ€ŅƒÐģÐŧÐūÐđ Ņ„ÐūŅ€ÐžŅ‹)КÐŧаŅŅ‚ÐĩŅ€Ð―аŅ ÐķÐļÐŧа$(/t)$(br)$(thing)$(t:ÐĢŅ€ÐūÐēÐ―Ðļ Y, ОÐĩÐķÐīŅƒ КÐūŅ‚ÐūŅ€Ņ‹ÐžÐļ ОÐūÐķÐĩŅ‚ ŅÐģÐĩÐ―ÐĩŅ€ÐļŅ€ÐūÐēаŅ‚ŅŒŅŅ ÐķÐļÐŧа.)Y-ŅƒŅ€ÐūÐēÐĩÐ―ŅŒ$(/t)$(): 80 — 180$(br)$(thing)(t:ÐĄŅ€ÐĩÐīÐ―ÐļÐđ ÐīÐļаОÐĩŅ‚Ņ€ ÐķÐļÐŧŅ‹)РазОÐĩŅ€$(/t)$(): 45$(br)$(thing)$(t:ЕŅÐŧÐļ Ņ€Ð°ŅŅŅ‚ÐūŅÐ―ÐļÐĩ ОÐĩÐķÐīŅƒ ÐŋÐūÐēÐĩŅ€Ņ…Ð―ÐūŅŅ‚ŅŒŅŽ Ðļ ÐķÐļÐŧÐūÐđ ÐąÐūÐŧŅŒŅˆÐĩ Ņ‡ÐĩО ŅŅ‚Ðū Ņ‡ÐļŅÐŧÐū, Ņ‚Ðū ÐķÐļÐŧа Ð―Ðĩ ŅÐģÐĩÐ―ÐĩÐ―Ņ€ÐļŅ€ŅƒÐĩŅ‚ ÐļÐ―ÐīÐļКаŅ‚ÐūŅ€Ņ‹ Ð―Ð° ÐŋÐūÐēÐĩŅ€Ņ…Ð―ÐūŅŅ‚Ðļ.)МаКŅÐļОаÐŧŅŒÐ―аŅ ÐēŅ‹ŅÐūŅ‚а ÐļÐ―ÐīÐļКаŅ‚ÐūŅ€Ð°$(/t)$(): 40$(br2)$(thing)ВÐļÐīŅ‹ ÐšÐ°ÐžÐ―ÐĩÐđ$(): АŅ€ÐģÐļÐŧÐŧÐļŅ‚, АŅ€ÐģÐļÐŧÐŧÐļŅ‚, БазаÐŧŅŒŅ‚, Ð“Ð°ÐąÐąŅ€Ðū, ГŅ€Ð°Ð―ÐļŅ‚, ДаŅ†ÐļŅ‚, ДÐļÐūŅ€ÐļŅ‚, ДÐūÐŧÐūОÐļŅ‚, ИзÐēÐĩŅŅ‚Ð―ŅÐš, КÐūÐ―ÐģÐŧÐūОÐĩŅ€Ð°Ņ‚, КŅ€Ð°ŅÐ―Ņ‹Ðđ ÐģŅ€Ð°Ð―ÐļŅ‚, КŅ€ÐĩÐžÐ―ÐļŅŅ‚Ņ‹Ðđ ŅÐŧÐ°Ð―ÐĩŅ†, МÐĩÐŧ, ÐĄÐŧÐ°Ð―ÐĩŅ†, ÐĒŅ€Ð°Ņ…ÐļŅ‚", + "text": "$(thing)$(t:ВÐĩŅ€ÐūŅŅ‚Ð―ÐūŅŅ‚ŅŒ ÐģÐĩÐ―ÐĩŅ€Ð°Ņ†ÐļÐļ ÐķÐļÐŧŅ‹ Ðē Ņ‡Ð°Ð―КÐĩ. ЧÐĩО ОÐĩÐ―ŅŒŅˆÐĩ Ð·Ð―Ð°ÐžÐĩÐ―Ð°Ņ‚ÐĩÐŧŅŒ(ÐēŅ‚ÐūŅ€ÐūÐĩ Ņ‡ÐļŅÐŧÐū), Ņ‚ÐĩО Ņ‡Ð°Ņ‰Ðĩ ÐēŅŅ‚Ņ€ÐĩŅ‡Ð°ÐĩŅ‚ŅŅ.)РÐĩÐīКÐūŅŅ‚ŅŒ$(/t)$(): 1/140 Ð―Ð° Ņ‡Ð°Ð―К$(br)$(thing)$(t:ÐĄÐūÐīÐĩŅ€ÐķÐ°Ð―ÐļÐĩ ÐąÐŧÐūКÐūÐē Ņ€ŅƒÐīŅ‹ Ðē ÐķÐļÐŧÐĩ заОÐĩÐ―ŅŅŽŅ‰ÐļŅ… КаОÐĩÐ―ŅŒ. БÐūÐŧŅŒŅˆÐĩÐĩ Ð·Ð―Ð°Ņ‡ÐĩÐ―ÐļÐĩ ÐūÐ·Ð―Ð°Ņ‡Ð°ÐĩŅ‚ ÐąÐūÐŧŅŒŅˆÐĩ Ņ€ŅƒÐīŅ‹.)ПÐŧÐūŅ‚Ð―ÐūŅŅ‚ŅŒ$(/t)$(): 25%$(br)$(thing)$(t:ÐĪÐūŅ€ÐžÐ° ÐķÐļÐŧŅ‹.)ВÐļÐī$(/t)$(): $(t:ЗаŅ‡Ð°ŅŅ‚ŅƒŅŽ КŅ€ŅƒÐģÐŧÐūÐđ Ņ„ÐūŅ€ÐžŅ‹)КÐŧаŅŅ‚ÐĩŅ€Ð―аŅ ÐķÐļÐŧа$(/t)$(br)$(thing)$(t:ÐĢŅ€ÐūÐēÐ―Ðļ Y, ОÐĩÐķÐīŅƒ КÐūŅ‚ÐūŅ€Ņ‹ÐžÐļ ОÐūÐķÐĩŅ‚ ŅÐģÐĩÐ―ÐĩŅ€ÐļŅ€ÐūÐēаŅ‚ŅŒŅŅ ÐķÐļÐŧа.)Y-ŅƒŅ€ÐūÐēÐĩÐ―ŅŒ$(/t)$(): 80 — 180$(br)$(thing)(t:ÐĄŅ€ÐĩÐīÐ―ÐļÐđ ÐīÐļаОÐĩŅ‚Ņ€ ÐķÐļÐŧŅ‹)РазОÐĩŅ€$(/t)$(): 45$(br)$(thing)$(t:ЕŅÐŧÐļ Ņ€Ð°ŅŅŅ‚ÐūŅÐ―ÐļÐĩ ОÐĩÐķÐīŅƒ ÐŋÐūÐēÐĩŅ€Ņ…Ð―ÐūŅŅ‚ŅŒŅŽ Ðļ ÐķÐļÐŧÐūÐđ ÐąÐūÐŧŅŒŅˆÐĩ Ņ‡ÐĩО ŅŅ‚Ðū Ņ‡ÐļŅÐŧÐū, Ņ‚Ðū ÐķÐļÐŧа Ð―Ðĩ ŅÐģÐĩÐ―ÐĩÐ―Ņ€ÐļŅ€ŅƒÐĩŅ‚ ÐļÐ―ÐīÐļКаŅ‚ÐūŅ€Ņ‹ Ð―Ð° ÐŋÐūÐēÐĩŅ€Ņ…Ð―ÐūŅŅ‚Ðļ.)МаКŅÐļОаÐŧŅŒÐ―аŅ ÐēŅ‹ŅÐūŅ‚а ÐļÐ―ÐīÐļКаŅ‚ÐūŅ€Ð°$(/t)$(): 40$(br2)$(thing)ВÐļÐīŅ‹ ÐšÐ°ÐžÐ―ÐĩÐđ$(): АŅ€ÐģÐļÐŧÐŧÐļŅ‚, АŅ€ÐģÐļÐŧÐŧÐļŅ‚, БазаÐŧŅŒŅ‚, Ð“Ð°ÐąÐąŅ€Ðū, ГŅ€Ð°Ð―ÐļŅ‚, ДаŅ†ÐļŅ‚, ДÐļÐūŅ€ÐļŅ‚, ДÐūÐŧÐūОÐļŅ‚, ИзÐēÐĩŅŅ‚Ð―ŅÐš, КÐēаŅ€Ņ†ÐļŅ‚, КÐūÐ―ÐģÐŧÐūОÐĩŅ€Ð°Ņ‚, КŅ€Ð°ŅÐ―Ņ‹Ðđ ÐģŅ€Ð°Ð―ÐļŅ‚, КŅ€ÐĩÐžÐ―ÐļŅŅ‚Ņ‹Ðđ ŅÐŧÐ°Ð―ÐĩŅ†, МÐĩÐŧ, ÐĄÐŧÐ°Ð―ÐĩŅ†, ÐĒŅ€Ð°Ņ…ÐļŅ‚", "title": "ВÐļŅÐžŅƒŅ‚", "type": "patchouli:text", "anchor": "mars_surface_bismuthinite" @@ -504,7 +504,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)$(t:ВÐĩŅ€ÐūŅŅ‚Ð―ÐūŅŅ‚ŅŒ ÐģÐĩÐ―ÐĩŅ€Ð°Ņ†ÐļÐļ ÐķÐļÐŧŅ‹ Ðē Ņ‡Ð°Ð―КÐĩ. ЧÐĩО ОÐĩÐ―ŅŒŅˆÐĩ Ð·Ð―Ð°ÐžÐĩÐ―Ð°Ņ‚ÐĩÐŧŅŒ(ÐēŅ‚ÐūŅ€ÐūÐĩ Ņ‡ÐļŅÐŧÐū), Ņ‚ÐĩО Ņ‡Ð°Ņ‰Ðĩ ÐēŅŅ‚Ņ€ÐĩŅ‡Ð°ÐĩŅ‚ŅŅ.)РÐĩÐīКÐūŅŅ‚ŅŒ$(/t)$(): 1/250 Ð―Ð° Ņ‡Ð°Ð―К$(br)$(thing)$(t:ÐĄÐūÐīÐĩŅ€ÐķÐ°Ð―ÐļÐĩ ÐąÐŧÐūКÐūÐē Ņ€ŅƒÐīŅ‹ Ðē ÐķÐļÐŧÐĩ заОÐĩÐ―ŅŅŽŅ‰ÐļŅ… КаОÐĩÐ―ŅŒ. БÐūÐŧŅŒŅˆÐĩÐĩ Ð·Ð―Ð°Ņ‡ÐĩÐ―ÐļÐĩ ÐūÐ·Ð―Ð°Ņ‡Ð°ÐĩŅ‚ ÐąÐūÐŧŅŒŅˆÐĩ Ņ€ŅƒÐīŅ‹.)ПÐŧÐūŅ‚Ð―ÐūŅŅ‚ŅŒ$(/t)$(): 40%$(br)$(thing)$(t:ÐĪÐūŅ€ÐžÐ° ÐķÐļÐŧŅ‹.)ВÐļÐī$(/t)$(): $(t:ЗаŅ‡Ð°ŅŅ‚ŅƒŅŽ КŅ€ŅƒÐģÐŧÐūÐđ Ņ„ÐūŅ€ÐžŅ‹)КÐŧаŅŅ‚ÐĩŅ€Ð―аŅ ÐķÐļÐŧа$(/t)$(br)$(thing)$(t:ÐĢŅ€ÐūÐēÐ―Ðļ Y, ОÐĩÐķÐīŅƒ КÐūŅ‚ÐūŅ€Ņ‹ÐžÐļ ОÐūÐķÐĩŅ‚ ŅÐģÐĩÐ―ÐĩŅ€ÐļŅ€ÐūÐēаŅ‚ŅŒŅŅ ÐķÐļÐŧа.)Y-ŅƒŅ€ÐūÐēÐĩÐ―ŅŒ$(/t)$(): 0 — 70$(br)$(thing)(t:ÐĄŅ€ÐĩÐīÐ―ÐļÐđ ÐīÐļаОÐĩŅ‚Ņ€ ÐķÐļÐŧŅ‹)РазОÐĩŅ€$(/t)$(): 55$(br)$(thing)$(t:ЕŅÐŧÐļ Ņ€Ð°ŅŅŅ‚ÐūŅÐ―ÐļÐĩ ОÐĩÐķÐīŅƒ ÐŋÐūÐēÐĩŅ€Ņ…Ð―ÐūŅŅ‚ŅŒŅŽ Ðļ ÐķÐļÐŧÐūÐđ ÐąÐūÐŧŅŒŅˆÐĩ Ņ‡ÐĩО ŅŅ‚Ðū Ņ‡ÐļŅÐŧÐū, Ņ‚Ðū ÐķÐļÐŧа Ð―Ðĩ ŅÐģÐĩÐ―ÐĩÐ―Ņ€ÐļŅ€ŅƒÐĩŅ‚ ÐļÐ―ÐīÐļКаŅ‚ÐūŅ€Ņ‹ Ð―Ð° ÐŋÐūÐēÐĩŅ€Ņ…Ð―ÐūŅŅ‚Ðļ.)МаКŅÐļОаÐŧŅŒÐ―аŅ ÐēŅ‹ŅÐūŅ‚а ÐļÐ―ÐīÐļКаŅ‚ÐūŅ€Ð°$(/t)$(): 40$(br2)$(thing)ВÐļÐīŅ‹ ÐšÐ°ÐžÐ―ÐĩÐđ$(): АŅ€ÐģÐļÐŧÐŧÐļŅ‚, АŅ€ÐģÐļÐŧÐŧÐļŅ‚, БазаÐŧŅŒŅ‚, ГŅ€Ð°Ð―ÐļŅ‚, ДаŅ†ÐļŅ‚, ИзÐēÐĩŅŅ‚Ð―ŅÐš, КŅ€Ð°ŅÐ―Ņ‹Ðđ ÐģŅ€Ð°Ð―ÐļŅ‚, МÐĩÐŧ, ÐĄÐŧÐ°Ð―ÐĩŅ†", + "text": "$(thing)$(t:ВÐĩŅ€ÐūŅŅ‚Ð―ÐūŅŅ‚ŅŒ ÐģÐĩÐ―ÐĩŅ€Ð°Ņ†ÐļÐļ ÐķÐļÐŧŅ‹ Ðē Ņ‡Ð°Ð―КÐĩ. ЧÐĩО ОÐĩÐ―ŅŒŅˆÐĩ Ð·Ð―Ð°ÐžÐĩÐ―Ð°Ņ‚ÐĩÐŧŅŒ(ÐēŅ‚ÐūŅ€ÐūÐĩ Ņ‡ÐļŅÐŧÐū), Ņ‚ÐĩО Ņ‡Ð°Ņ‰Ðĩ ÐēŅŅ‚Ņ€ÐĩŅ‡Ð°ÐĩŅ‚ŅŅ.)РÐĩÐīКÐūŅŅ‚ŅŒ$(/t)$(): 1/250 Ð―Ð° Ņ‡Ð°Ð―К$(br)$(thing)$(t:ÐĄÐūÐīÐĩŅ€ÐķÐ°Ð―ÐļÐĩ ÐąÐŧÐūКÐūÐē Ņ€ŅƒÐīŅ‹ Ðē ÐķÐļÐŧÐĩ заОÐĩÐ―ŅŅŽŅ‰ÐļŅ… КаОÐĩÐ―ŅŒ. БÐūÐŧŅŒŅˆÐĩÐĩ Ð·Ð―Ð°Ņ‡ÐĩÐ―ÐļÐĩ ÐūÐ·Ð―Ð°Ņ‡Ð°ÐĩŅ‚ ÐąÐūÐŧŅŒŅˆÐĩ Ņ€ŅƒÐīŅ‹.)ПÐŧÐūŅ‚Ð―ÐūŅŅ‚ŅŒ$(/t)$(): 40%$(br)$(thing)$(t:ÐĪÐūŅ€ÐžÐ° ÐķÐļÐŧŅ‹.)ВÐļÐī$(/t)$(): $(t:ЗаŅ‡Ð°ŅŅ‚ŅƒŅŽ КŅ€ŅƒÐģÐŧÐūÐđ Ņ„ÐūŅ€ÐžŅ‹)КÐŧаŅŅ‚ÐĩŅ€Ð―аŅ ÐķÐļÐŧа$(/t)$(br)$(thing)$(t:ÐĢŅ€ÐūÐēÐ―Ðļ Y, ОÐĩÐķÐīŅƒ КÐūŅ‚ÐūŅ€Ņ‹ÐžÐļ ОÐūÐķÐĩŅ‚ ŅÐģÐĩÐ―ÐĩŅ€ÐļŅ€ÐūÐēаŅ‚ŅŒŅŅ ÐķÐļÐŧа.)Y-ŅƒŅ€ÐūÐēÐĩÐ―ŅŒ$(/t)$(): 0 — 70$(br)$(thing)(t:ÐĄŅ€ÐĩÐīÐ―ÐļÐđ ÐīÐļаОÐĩŅ‚Ņ€ ÐķÐļÐŧŅ‹)РазОÐĩŅ€$(/t)$(): 55$(br)$(thing)$(t:ЕŅÐŧÐļ Ņ€Ð°ŅŅŅ‚ÐūŅÐ―ÐļÐĩ ОÐĩÐķÐīŅƒ ÐŋÐūÐēÐĩŅ€Ņ…Ð―ÐūŅŅ‚ŅŒŅŽ Ðļ ÐķÐļÐŧÐūÐđ ÐąÐūÐŧŅŒŅˆÐĩ Ņ‡ÐĩО ŅŅ‚Ðū Ņ‡ÐļŅÐŧÐū, Ņ‚Ðū ÐķÐļÐŧа Ð―Ðĩ ŅÐģÐĩÐ―ÐĩÐ―Ņ€ÐļŅ€ŅƒÐĩŅ‚ ÐļÐ―ÐīÐļКаŅ‚ÐūŅ€Ņ‹ Ð―Ð° ÐŋÐūÐēÐĩŅ€Ņ…Ð―ÐūŅŅ‚Ðļ.)МаКŅÐļОаÐŧŅŒÐ―аŅ ÐēŅ‹ŅÐūŅ‚а ÐļÐ―ÐīÐļКаŅ‚ÐūŅ€Ð°$(/t)$(): 40$(br2)$(thing)ВÐļÐīŅ‹ ÐšÐ°ÐžÐ―ÐĩÐđ$(): АŅ€ÐģÐļÐŧÐŧÐļŅ‚, АŅ€ÐģÐļÐŧÐŧÐļŅ‚, БазаÐŧŅŒŅ‚, ГŅ€Ð°Ð―ÐļŅ‚, ДаŅ†ÐļŅ‚, ИзÐēÐĩŅŅ‚Ð―ŅÐš, КÐēаŅ€Ņ†ÐļŅ‚, КŅ€Ð°ŅÐ―Ņ‹Ðđ ÐģŅ€Ð°Ð―ÐļŅ‚, МÐĩÐŧ, ÐĄÐŧÐ°Ð―ÐĩŅ†", "title": "ГаŅ€Ð―ÐļÐĩŅ€ÐļŅ‚ Ðļ КÐūÐąÐ°ÐŧŅŒŅ‚ÐļŅ‚", "type": "patchouli:text", "anchor": "mars_nickel" @@ -596,7 +596,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)$(t:ВÐĩŅ€ÐūŅŅ‚Ð―ÐūŅŅ‚ŅŒ ÐģÐĩÐ―ÐĩŅ€Ð°Ņ†ÐļÐļ ÐķÐļÐŧŅ‹ Ðē Ņ‡Ð°Ð―КÐĩ. ЧÐĩО ОÐĩÐ―ŅŒŅˆÐĩ Ð·Ð―Ð°ÐžÐĩÐ―Ð°Ņ‚ÐĩÐŧŅŒ(ÐēŅ‚ÐūŅ€ÐūÐĩ Ņ‡ÐļŅÐŧÐū), Ņ‚ÐĩО Ņ‡Ð°Ņ‰Ðĩ ÐēŅŅ‚Ņ€ÐĩŅ‡Ð°ÐĩŅ‚ŅŅ.)РÐĩÐīКÐūŅŅ‚ŅŒ$(/t)$(): 1/210 Ð―Ð° Ņ‡Ð°Ð―К$(br)$(thing)$(t:ÐĄÐūÐīÐĩŅ€ÐķÐ°Ð―ÐļÐĩ ÐąÐŧÐūКÐūÐē Ņ€ŅƒÐīŅ‹ Ðē ÐķÐļÐŧÐĩ заОÐĩÐ―ŅŅŽŅ‰ÐļŅ… КаОÐĩÐ―ŅŒ. БÐūÐŧŅŒŅˆÐĩÐĩ Ð·Ð―Ð°Ņ‡ÐĩÐ―ÐļÐĩ ÐūÐ·Ð―Ð°Ņ‡Ð°ÐĩŅ‚ ÐąÐūÐŧŅŒŅˆÐĩ Ņ€ŅƒÐīŅ‹.)ПÐŧÐūŅ‚Ð―ÐūŅŅ‚ŅŒ$(/t)$(): 40%$(br)$(thing)$(t:ÐĪÐūŅ€ÐžÐ° ÐķÐļÐŧŅ‹.)ВÐļÐī$(/t)$(): $(t:ЗаŅ‡Ð°ŅŅ‚ŅƒŅŽ КŅ€ŅƒÐģÐŧÐūÐđ Ņ„ÐūŅ€ÐžŅ‹)КÐŧаŅŅ‚ÐĩŅ€Ð―аŅ ÐķÐļÐŧа$(/t)$(br)$(thing)$(t:ÐĢŅ€ÐūÐēÐ―Ðļ Y, ОÐĩÐķÐīŅƒ КÐūŅ‚ÐūŅ€Ņ‹ÐžÐļ ОÐūÐķÐĩŅ‚ ŅÐģÐĩÐ―ÐĩŅ€ÐļŅ€ÐūÐēаŅ‚ŅŒŅŅ ÐķÐļÐŧа.)Y-ŅƒŅ€ÐūÐēÐĩÐ―ŅŒ$(/t)$(): 0 — 70$(br)$(thing)(t:ÐĄŅ€ÐĩÐīÐ―ÐļÐđ ÐīÐļаОÐĩŅ‚Ņ€ ÐķÐļÐŧŅ‹)РазОÐĩŅ€$(/t)$(): 40$(br)$(thing)$(t:ЕŅÐŧÐļ Ņ€Ð°ŅŅŅ‚ÐūŅÐ―ÐļÐĩ ОÐĩÐķÐīŅƒ ÐŋÐūÐēÐĩŅ€Ņ…Ð―ÐūŅŅ‚ŅŒŅŽ Ðļ ÐķÐļÐŧÐūÐđ ÐąÐūÐŧŅŒŅˆÐĩ Ņ‡ÐĩО ŅŅ‚Ðū Ņ‡ÐļŅÐŧÐū, Ņ‚Ðū ÐķÐļÐŧа Ð―Ðĩ ŅÐģÐĩÐ―ÐĩÐ―Ņ€ÐļŅ€ŅƒÐĩŅ‚ ÐļÐ―ÐīÐļКаŅ‚ÐūŅ€Ņ‹ Ð―Ð° ÐŋÐūÐēÐĩŅ€Ņ…Ð―ÐūŅŅ‚Ðļ.)МаКŅÐļОаÐŧŅŒÐ―аŅ ÐēŅ‹ŅÐūŅ‚а ÐļÐ―ÐīÐļКаŅ‚ÐūŅ€Ð°$(/t)$(): 30$(br2)$(thing)ВÐļÐīŅ‹ ÐšÐ°ÐžÐ―ÐĩÐđ$(): АŅ€ÐģÐļÐŧÐŧÐļŅ‚, АŅ€ÐģÐļÐŧÐŧÐļŅ‚, БазаÐŧŅŒŅ‚, ДаŅ†ÐļŅ‚, ДÐūÐŧÐūОÐļŅ‚, ИзÐēÐĩŅŅ‚Ð―ŅÐš, КÐūÐ―ÐģÐŧÐūОÐĩŅ€Ð°Ņ‚, КŅ€Ð°ŅÐ―Ņ‹Ðđ ÐģŅ€Ð°Ð―ÐļŅ‚", + "text": "$(thing)$(t:ВÐĩŅ€ÐūŅŅ‚Ð―ÐūŅŅ‚ŅŒ ÐģÐĩÐ―ÐĩŅ€Ð°Ņ†ÐļÐļ ÐķÐļÐŧŅ‹ Ðē Ņ‡Ð°Ð―КÐĩ. ЧÐĩО ОÐĩÐ―ŅŒŅˆÐĩ Ð·Ð―Ð°ÐžÐĩÐ―Ð°Ņ‚ÐĩÐŧŅŒ(ÐēŅ‚ÐūŅ€ÐūÐĩ Ņ‡ÐļŅÐŧÐū), Ņ‚ÐĩО Ņ‡Ð°Ņ‰Ðĩ ÐēŅŅ‚Ņ€ÐĩŅ‡Ð°ÐĩŅ‚ŅŅ.)РÐĩÐīКÐūŅŅ‚ŅŒ$(/t)$(): 1/210 Ð―Ð° Ņ‡Ð°Ð―К$(br)$(thing)$(t:ÐĄÐūÐīÐĩŅ€ÐķÐ°Ð―ÐļÐĩ ÐąÐŧÐūКÐūÐē Ņ€ŅƒÐīŅ‹ Ðē ÐķÐļÐŧÐĩ заОÐĩÐ―ŅŅŽŅ‰ÐļŅ… КаОÐĩÐ―ŅŒ. БÐūÐŧŅŒŅˆÐĩÐĩ Ð·Ð―Ð°Ņ‡ÐĩÐ―ÐļÐĩ ÐūÐ·Ð―Ð°Ņ‡Ð°ÐĩŅ‚ ÐąÐūÐŧŅŒŅˆÐĩ Ņ€ŅƒÐīŅ‹.)ПÐŧÐūŅ‚Ð―ÐūŅŅ‚ŅŒ$(/t)$(): 40%$(br)$(thing)$(t:ÐĪÐūŅ€ÐžÐ° ÐķÐļÐŧŅ‹.)ВÐļÐī$(/t)$(): $(t:ЗаŅ‡Ð°ŅŅ‚ŅƒŅŽ КŅ€ŅƒÐģÐŧÐūÐđ Ņ„ÐūŅ€ÐžŅ‹)КÐŧаŅŅ‚ÐĩŅ€Ð―аŅ ÐķÐļÐŧа$(/t)$(br)$(thing)$(t:ÐĢŅ€ÐūÐēÐ―Ðļ Y, ОÐĩÐķÐīŅƒ КÐūŅ‚ÐūŅ€Ņ‹ÐžÐļ ОÐūÐķÐĩŅ‚ ŅÐģÐĩÐ―ÐĩŅ€ÐļŅ€ÐūÐēаŅ‚ŅŒŅŅ ÐķÐļÐŧа.)Y-ŅƒŅ€ÐūÐēÐĩÐ―ŅŒ$(/t)$(): 0 — 70$(br)$(thing)(t:ÐĄŅ€ÐĩÐīÐ―ÐļÐđ ÐīÐļаОÐĩŅ‚Ņ€ ÐķÐļÐŧŅ‹)РазОÐĩŅ€$(/t)$(): 40$(br)$(thing)$(t:ЕŅÐŧÐļ Ņ€Ð°ŅŅŅ‚ÐūŅÐ―ÐļÐĩ ОÐĩÐķÐīŅƒ ÐŋÐūÐēÐĩŅ€Ņ…Ð―ÐūŅŅ‚ŅŒŅŽ Ðļ ÐķÐļÐŧÐūÐđ ÐąÐūÐŧŅŒŅˆÐĩ Ņ‡ÐĩО ŅŅ‚Ðū Ņ‡ÐļŅÐŧÐū, Ņ‚Ðū ÐķÐļÐŧа Ð―Ðĩ ŅÐģÐĩÐ―ÐĩÐ―Ņ€ÐļŅ€ŅƒÐĩŅ‚ ÐļÐ―ÐīÐļКаŅ‚ÐūŅ€Ņ‹ Ð―Ð° ÐŋÐūÐēÐĩŅ€Ņ…Ð―ÐūŅŅ‚Ðļ.)МаКŅÐļОаÐŧŅŒÐ―аŅ ÐēŅ‹ŅÐūŅ‚а ÐļÐ―ÐīÐļКаŅ‚ÐūŅ€Ð°$(/t)$(): 30$(br2)$(thing)ВÐļÐīŅ‹ ÐšÐ°ÐžÐ―ÐĩÐđ$(): АŅ€ÐģÐļÐŧÐŧÐļŅ‚, АŅ€ÐģÐļÐŧÐŧÐļŅ‚, БазаÐŧŅŒŅ‚, ДаŅ†ÐļŅ‚, ДÐūÐŧÐūОÐļŅ‚, ИзÐēÐĩŅŅ‚Ð―ŅÐš, КÐēаŅ€Ņ†ÐļŅ‚, КÐūÐ―ÐģÐŧÐūОÐĩŅ€Ð°Ņ‚, КŅ€Ð°ŅÐ―Ņ‹Ðđ ÐģŅ€Ð°Ð―ÐļŅ‚", "title": "ГÐĩОаŅ‚ÐļŅ‚ Ðļ ЛÐļОÐūÐ―ÐļŅ‚", "type": "patchouli:text", "anchor": "mars_hematite" @@ -688,7 +688,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)$(t:ВÐĩŅ€ÐūŅŅ‚Ð―ÐūŅŅ‚ŅŒ ÐģÐĩÐ―ÐĩŅ€Ð°Ņ†ÐļÐļ ÐķÐļÐŧŅ‹ Ðē Ņ‡Ð°Ð―КÐĩ. ЧÐĩО ОÐĩÐ―ŅŒŅˆÐĩ Ð·Ð―Ð°ÐžÐĩÐ―Ð°Ņ‚ÐĩÐŧŅŒ(ÐēŅ‚ÐūŅ€ÐūÐĩ Ņ‡ÐļŅÐŧÐū), Ņ‚ÐĩО Ņ‡Ð°Ņ‰Ðĩ ÐēŅŅ‚Ņ€ÐĩŅ‡Ð°ÐĩŅ‚ŅŅ.)РÐĩÐīКÐūŅŅ‚ŅŒ$(/t)$(): 1/140 Ð―Ð° Ņ‡Ð°Ð―К$(br)$(thing)$(t:ÐĄÐūÐīÐĩŅ€ÐķÐ°Ð―ÐļÐĩ ÐąÐŧÐūКÐūÐē Ņ€ŅƒÐīŅ‹ Ðē ÐķÐļÐŧÐĩ заОÐĩÐ―ŅŅŽŅ‰ÐļŅ… КаОÐĩÐ―ŅŒ. БÐūÐŧŅŒŅˆÐĩÐĩ Ð·Ð―Ð°Ņ‡ÐĩÐ―ÐļÐĩ ÐūÐ·Ð―Ð°Ņ‡Ð°ÐĩŅ‚ ÐąÐūÐŧŅŒŅˆÐĩ Ņ€ŅƒÐīŅ‹.)ПÐŧÐūŅ‚Ð―ÐūŅŅ‚ŅŒ$(/t)$(): 25%$(br)$(thing)$(t:ÐĪÐūŅ€ÐžÐ° ÐķÐļÐŧŅ‹.)ВÐļÐī$(/t)$(): $(t:ЗаŅ‡Ð°ŅŅ‚ŅƒŅŽ КŅ€ŅƒÐģÐŧÐūÐđ Ņ„ÐūŅ€ÐžŅ‹)КÐŧаŅŅ‚ÐĩŅ€Ð―аŅ ÐķÐļÐŧа$(/t)$(br)$(thing)$(t:ÐĢŅ€ÐūÐēÐ―Ðļ Y, ОÐĩÐķÐīŅƒ КÐūŅ‚ÐūŅ€Ņ‹ÐžÐļ ОÐūÐķÐĩŅ‚ ŅÐģÐĩÐ―ÐĩŅ€ÐļŅ€ÐūÐēаŅ‚ŅŒŅŅ ÐķÐļÐŧа.)Y-ŅƒŅ€ÐūÐēÐĩÐ―ŅŒ$(/t)$(): 80 — 180$(br)$(thing)(t:ÐĄŅ€ÐĩÐīÐ―ÐļÐđ ÐīÐļаОÐĩŅ‚Ņ€ ÐķÐļÐŧŅ‹)РазОÐĩŅ€$(/t)$(): 45$(br)$(thing)$(t:ЕŅÐŧÐļ Ņ€Ð°ŅŅŅ‚ÐūŅÐ―ÐļÐĩ ОÐĩÐķÐīŅƒ ÐŋÐūÐēÐĩŅ€Ņ…Ð―ÐūŅŅ‚ŅŒŅŽ Ðļ ÐķÐļÐŧÐūÐđ ÐąÐūÐŧŅŒŅˆÐĩ Ņ‡ÐĩО ŅŅ‚Ðū Ņ‡ÐļŅÐŧÐū, Ņ‚Ðū ÐķÐļÐŧа Ð―Ðĩ ŅÐģÐĩÐ―ÐĩÐ―Ņ€ÐļŅ€ŅƒÐĩŅ‚ ÐļÐ―ÐīÐļКаŅ‚ÐūŅ€Ņ‹ Ð―Ð° ÐŋÐūÐēÐĩŅ€Ņ…Ð―ÐūŅŅ‚Ðļ.)МаКŅÐļОаÐŧŅŒÐ―аŅ ÐēŅ‹ŅÐūŅ‚а ÐļÐ―ÐīÐļКаŅ‚ÐūŅ€Ð°$(/t)$(): 40$(br2)$(thing)ВÐļÐīŅ‹ ÐšÐ°ÐžÐ―ÐĩÐđ$(): АŅ€ÐģÐļÐŧÐŧÐļŅ‚, АŅ€ÐģÐļÐŧÐŧÐļŅ‚, БазаÐŧŅŒŅ‚, Ð“Ð°ÐąÐąŅ€Ðū, ГŅ€Ð°Ð―ÐļŅ‚, ДаŅ†ÐļŅ‚, ДÐļÐūŅ€ÐļŅ‚, ДÐūÐŧÐūОÐļŅ‚, ИзÐēÐĩŅŅ‚Ð―ŅÐš, КÐūÐ―ÐģÐŧÐūОÐĩŅ€Ð°Ņ‚, КŅ€Ð°ŅÐ―Ņ‹Ðđ ÐģŅ€Ð°Ð―ÐļŅ‚, КŅ€ÐĩÐžÐ―ÐļŅŅ‚Ņ‹Ðđ ŅÐŧÐ°Ð―ÐĩŅ†, МÐĩÐŧ, ÐĄÐŧÐ°Ð―ÐĩŅ†, ÐĒŅ€Ð°Ņ…ÐļŅ‚", + "text": "$(thing)$(t:ВÐĩŅ€ÐūŅŅ‚Ð―ÐūŅŅ‚ŅŒ ÐģÐĩÐ―ÐĩŅ€Ð°Ņ†ÐļÐļ ÐķÐļÐŧŅ‹ Ðē Ņ‡Ð°Ð―КÐĩ. ЧÐĩО ОÐĩÐ―ŅŒŅˆÐĩ Ð·Ð―Ð°ÐžÐĩÐ―Ð°Ņ‚ÐĩÐŧŅŒ(ÐēŅ‚ÐūŅ€ÐūÐĩ Ņ‡ÐļŅÐŧÐū), Ņ‚ÐĩО Ņ‡Ð°Ņ‰Ðĩ ÐēŅŅ‚Ņ€ÐĩŅ‡Ð°ÐĩŅ‚ŅŅ.)РÐĩÐīКÐūŅŅ‚ŅŒ$(/t)$(): 1/140 Ð―Ð° Ņ‡Ð°Ð―К$(br)$(thing)$(t:ÐĄÐūÐīÐĩŅ€ÐķÐ°Ð―ÐļÐĩ ÐąÐŧÐūКÐūÐē Ņ€ŅƒÐīŅ‹ Ðē ÐķÐļÐŧÐĩ заОÐĩÐ―ŅŅŽŅ‰ÐļŅ… КаОÐĩÐ―ŅŒ. БÐūÐŧŅŒŅˆÐĩÐĩ Ð·Ð―Ð°Ņ‡ÐĩÐ―ÐļÐĩ ÐūÐ·Ð―Ð°Ņ‡Ð°ÐĩŅ‚ ÐąÐūÐŧŅŒŅˆÐĩ Ņ€ŅƒÐīŅ‹.)ПÐŧÐūŅ‚Ð―ÐūŅŅ‚ŅŒ$(/t)$(): 25%$(br)$(thing)$(t:ÐĪÐūŅ€ÐžÐ° ÐķÐļÐŧŅ‹.)ВÐļÐī$(/t)$(): $(t:ЗаŅ‡Ð°ŅŅ‚ŅƒŅŽ КŅ€ŅƒÐģÐŧÐūÐđ Ņ„ÐūŅ€ÐžŅ‹)КÐŧаŅŅ‚ÐĩŅ€Ð―аŅ ÐķÐļÐŧа$(/t)$(br)$(thing)$(t:ÐĢŅ€ÐūÐēÐ―Ðļ Y, ОÐĩÐķÐīŅƒ КÐūŅ‚ÐūŅ€Ņ‹ÐžÐļ ОÐūÐķÐĩŅ‚ ŅÐģÐĩÐ―ÐĩŅ€ÐļŅ€ÐūÐēаŅ‚ŅŒŅŅ ÐķÐļÐŧа.)Y-ŅƒŅ€ÐūÐēÐĩÐ―ŅŒ$(/t)$(): 80 — 180$(br)$(thing)(t:ÐĄŅ€ÐĩÐīÐ―ÐļÐđ ÐīÐļаОÐĩŅ‚Ņ€ ÐķÐļÐŧŅ‹)РазОÐĩŅ€$(/t)$(): 45$(br)$(thing)$(t:ЕŅÐŧÐļ Ņ€Ð°ŅŅŅ‚ÐūŅÐ―ÐļÐĩ ОÐĩÐķÐīŅƒ ÐŋÐūÐēÐĩŅ€Ņ…Ð―ÐūŅŅ‚ŅŒŅŽ Ðļ ÐķÐļÐŧÐūÐđ ÐąÐūÐŧŅŒŅˆÐĩ Ņ‡ÐĩО ŅŅ‚Ðū Ņ‡ÐļŅÐŧÐū, Ņ‚Ðū ÐķÐļÐŧа Ð―Ðĩ ŅÐģÐĩÐ―ÐĩÐ―Ņ€ÐļŅ€ŅƒÐĩŅ‚ ÐļÐ―ÐīÐļКаŅ‚ÐūŅ€Ņ‹ Ð―Ð° ÐŋÐūÐēÐĩŅ€Ņ…Ð―ÐūŅŅ‚Ðļ.)МаКŅÐļОаÐŧŅŒÐ―аŅ ÐēŅ‹ŅÐūŅ‚а ÐļÐ―ÐīÐļКаŅ‚ÐūŅ€Ð°$(/t)$(): 40$(br2)$(thing)ВÐļÐīŅ‹ ÐšÐ°ÐžÐ―ÐĩÐđ$(): АŅ€ÐģÐļÐŧÐŧÐļŅ‚, АŅ€ÐģÐļÐŧÐŧÐļŅ‚, БазаÐŧŅŒŅ‚, Ð“Ð°ÐąÐąŅ€Ðū, ГŅ€Ð°Ð―ÐļŅ‚, ДаŅ†ÐļŅ‚, ДÐļÐūŅ€ÐļŅ‚, ДÐūÐŧÐūОÐļŅ‚, ИзÐēÐĩŅŅ‚Ð―ŅÐš, КÐēаŅ€Ņ†ÐļŅ‚, КÐūÐ―ÐģÐŧÐūОÐĩŅ€Ð°Ņ‚, КŅ€Ð°ŅÐ―Ņ‹Ðđ ÐģŅ€Ð°Ð―ÐļŅ‚, КŅ€ÐĩÐžÐ―ÐļŅŅ‚Ņ‹Ðđ ŅÐŧÐ°Ð―ÐĩŅ†, МÐĩÐŧ, ÐĄÐŧÐ°Ð―ÐĩŅ†, ÐĒŅ€Ð°Ņ…ÐļŅ‚", "title": "ГÐĩОаŅ‚ÐļŅ‚ Ðļ ЛÐļОÐūÐ―ÐļŅ‚", "type": "patchouli:text", "anchor": "mars_surface_hematite" @@ -1031,7 +1031,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)$(t:ВÐĩŅ€ÐūŅŅ‚Ð―ÐūŅŅ‚ŅŒ ÐģÐĩÐ―ÐĩŅ€Ð°Ņ†ÐļÐļ ÐķÐļÐŧŅ‹ Ðē Ņ‡Ð°Ð―КÐĩ. ЧÐĩО ОÐĩÐ―ŅŒŅˆÐĩ Ð·Ð―Ð°ÐžÐĩÐ―Ð°Ņ‚ÐĩÐŧŅŒ(ÐēŅ‚ÐūŅ€ÐūÐĩ Ņ‡ÐļŅÐŧÐū), Ņ‚ÐĩО Ņ‡Ð°Ņ‰Ðĩ ÐēŅŅ‚Ņ€ÐĩŅ‡Ð°ÐĩŅ‚ŅŅ.)РÐĩÐīКÐūŅŅ‚ŅŒ$(/t)$(): 1/135 Ð―Ð° Ņ‡Ð°Ð―К$(br)$(thing)$(t:ÐĄÐūÐīÐĩŅ€ÐķÐ°Ð―ÐļÐĩ ÐąÐŧÐūКÐūÐē Ņ€ŅƒÐīŅ‹ Ðē ÐķÐļÐŧÐĩ заОÐĩÐ―ŅŅŽŅ‰ÐļŅ… КаОÐĩÐ―ŅŒ. БÐūÐŧŅŒŅˆÐĩÐĩ Ð·Ð―Ð°Ņ‡ÐĩÐ―ÐļÐĩ ÐūÐ·Ð―Ð°Ņ‡Ð°ÐĩŅ‚ ÐąÐūÐŧŅŒŅˆÐĩ Ņ€ŅƒÐīŅ‹.)ПÐŧÐūŅ‚Ð―ÐūŅŅ‚ŅŒ$(/t)$(): 25%$(br)$(thing)$(t:ÐĪÐūŅ€ÐžÐ° ÐķÐļÐŧŅ‹.)ВÐļÐī$(/t)$(): $(t:ЗаŅ‡Ð°ŅŅ‚ŅƒŅŽ КŅ€ŅƒÐģÐŧÐūÐđ Ņ„ÐūŅ€ÐžŅ‹)КÐŧаŅŅ‚ÐĩŅ€Ð―аŅ ÐķÐļÐŧа$(/t)$(br)$(thing)$(t:ÐĢŅ€ÐūÐēÐ―Ðļ Y, ОÐĩÐķÐīŅƒ КÐūŅ‚ÐūŅ€Ņ‹ÐžÐļ ОÐūÐķÐĩŅ‚ ŅÐģÐĩÐ―ÐĩŅ€ÐļŅ€ÐūÐēаŅ‚ŅŒŅŅ ÐķÐļÐŧа.)Y-ŅƒŅ€ÐūÐēÐĩÐ―ŅŒ$(/t)$(): 80 — 180$(br)$(thing)(t:ÐĄŅ€ÐĩÐīÐ―ÐļÐđ ÐīÐļаОÐĩŅ‚Ņ€ ÐķÐļÐŧŅ‹)РазОÐĩŅ€$(/t)$(): 45$(br)$(thing)$(t:ЕŅÐŧÐļ Ņ€Ð°ŅŅŅ‚ÐūŅÐ―ÐļÐĩ ОÐĩÐķÐīŅƒ ÐŋÐūÐēÐĩŅ€Ņ…Ð―ÐūŅŅ‚ŅŒŅŽ Ðļ ÐķÐļÐŧÐūÐđ ÐąÐūÐŧŅŒŅˆÐĩ Ņ‡ÐĩО ŅŅ‚Ðū Ņ‡ÐļŅÐŧÐū, Ņ‚Ðū ÐķÐļÐŧа Ð―Ðĩ ŅÐģÐĩÐ―ÐĩÐ―Ņ€ÐļŅ€ŅƒÐĩŅ‚ ÐļÐ―ÐīÐļКаŅ‚ÐūŅ€Ņ‹ Ð―Ð° ÐŋÐūÐēÐĩŅ€Ņ…Ð―ÐūŅŅ‚Ðļ.)МаКŅÐļОаÐŧŅŒÐ―аŅ ÐēŅ‹ŅÐūŅ‚а ÐļÐ―ÐīÐļКаŅ‚ÐūŅ€Ð°$(/t)$(): 40$(br2)$(thing)ВÐļÐīŅ‹ ÐšÐ°ÐžÐ―ÐĩÐđ$(): АŅ€ÐģÐļÐŧÐŧÐļŅ‚, АŅ€ÐģÐļÐŧÐŧÐļŅ‚, БазаÐŧŅŒŅ‚, Ð“Ð°ÐąÐąŅ€Ðū, ГŅ€Ð°Ð―ÐļŅ‚, ДаŅ†ÐļŅ‚, ДÐļÐūŅ€ÐļŅ‚, ДÐūÐŧÐūОÐļŅ‚, ИзÐēÐĩŅŅ‚Ð―ŅÐš, КÐūÐ―ÐģÐŧÐūОÐĩŅ€Ð°Ņ‚, КŅ€Ð°ŅÐ―Ņ‹Ðđ ÐģŅ€Ð°Ð―ÐļŅ‚, КŅ€ÐĩÐžÐ―ÐļŅŅ‚Ņ‹Ðđ ŅÐŧÐ°Ð―ÐĩŅ†, МÐĩÐŧ, ÐĄÐŧÐ°Ð―ÐĩŅ†, ÐĒŅ€Ð°Ņ…ÐļŅ‚", + "text": "$(thing)$(t:ВÐĩŅ€ÐūŅŅ‚Ð―ÐūŅŅ‚ŅŒ ÐģÐĩÐ―ÐĩŅ€Ð°Ņ†ÐļÐļ ÐķÐļÐŧŅ‹ Ðē Ņ‡Ð°Ð―КÐĩ. ЧÐĩО ОÐĩÐ―ŅŒŅˆÐĩ Ð·Ð―Ð°ÐžÐĩÐ―Ð°Ņ‚ÐĩÐŧŅŒ(ÐēŅ‚ÐūŅ€ÐūÐĩ Ņ‡ÐļŅÐŧÐū), Ņ‚ÐĩО Ņ‡Ð°Ņ‰Ðĩ ÐēŅŅ‚Ņ€ÐĩŅ‡Ð°ÐĩŅ‚ŅŅ.)РÐĩÐīКÐūŅŅ‚ŅŒ$(/t)$(): 1/135 Ð―Ð° Ņ‡Ð°Ð―К$(br)$(thing)$(t:ÐĄÐūÐīÐĩŅ€ÐķÐ°Ð―ÐļÐĩ ÐąÐŧÐūКÐūÐē Ņ€ŅƒÐīŅ‹ Ðē ÐķÐļÐŧÐĩ заОÐĩÐ―ŅŅŽŅ‰ÐļŅ… КаОÐĩÐ―ŅŒ. БÐūÐŧŅŒŅˆÐĩÐĩ Ð·Ð―Ð°Ņ‡ÐĩÐ―ÐļÐĩ ÐūÐ·Ð―Ð°Ņ‡Ð°ÐĩŅ‚ ÐąÐūÐŧŅŒŅˆÐĩ Ņ€ŅƒÐīŅ‹.)ПÐŧÐūŅ‚Ð―ÐūŅŅ‚ŅŒ$(/t)$(): 25%$(br)$(thing)$(t:ÐĪÐūŅ€ÐžÐ° ÐķÐļÐŧŅ‹.)ВÐļÐī$(/t)$(): $(t:ЗаŅ‡Ð°ŅŅ‚ŅƒŅŽ КŅ€ŅƒÐģÐŧÐūÐđ Ņ„ÐūŅ€ÐžŅ‹)КÐŧаŅŅ‚ÐĩŅ€Ð―аŅ ÐķÐļÐŧа$(/t)$(br)$(thing)$(t:ÐĢŅ€ÐūÐēÐ―Ðļ Y, ОÐĩÐķÐīŅƒ КÐūŅ‚ÐūŅ€Ņ‹ÐžÐļ ОÐūÐķÐĩŅ‚ ŅÐģÐĩÐ―ÐĩŅ€ÐļŅ€ÐūÐēаŅ‚ŅŒŅŅ ÐķÐļÐŧа.)Y-ŅƒŅ€ÐūÐēÐĩÐ―ŅŒ$(/t)$(): 80 — 180$(br)$(thing)(t:ÐĄŅ€ÐĩÐīÐ―ÐļÐđ ÐīÐļаОÐĩŅ‚Ņ€ ÐķÐļÐŧŅ‹)РазОÐĩŅ€$(/t)$(): 45$(br)$(thing)$(t:ЕŅÐŧÐļ Ņ€Ð°ŅŅŅ‚ÐūŅÐ―ÐļÐĩ ОÐĩÐķÐīŅƒ ÐŋÐūÐēÐĩŅ€Ņ…Ð―ÐūŅŅ‚ŅŒŅŽ Ðļ ÐķÐļÐŧÐūÐđ ÐąÐūÐŧŅŒŅˆÐĩ Ņ‡ÐĩО ŅŅ‚Ðū Ņ‡ÐļŅÐŧÐū, Ņ‚Ðū ÐķÐļÐŧа Ð―Ðĩ ŅÐģÐĩÐ―ÐĩÐ―Ņ€ÐļŅ€ŅƒÐĩŅ‚ ÐļÐ―ÐīÐļКаŅ‚ÐūŅ€Ņ‹ Ð―Ð° ÐŋÐūÐēÐĩŅ€Ņ…Ð―ÐūŅŅ‚Ðļ.)МаКŅÐļОаÐŧŅŒÐ―аŅ ÐēŅ‹ŅÐūŅ‚а ÐļÐ―ÐīÐļКаŅ‚ÐūŅ€Ð°$(/t)$(): 40$(br2)$(thing)ВÐļÐīŅ‹ ÐšÐ°ÐžÐ―ÐĩÐđ$(): АŅ€ÐģÐļÐŧÐŧÐļŅ‚, АŅ€ÐģÐļÐŧÐŧÐļŅ‚, БазаÐŧŅŒŅ‚, Ð“Ð°ÐąÐąŅ€Ðū, ГŅ€Ð°Ð―ÐļŅ‚, ДаŅ†ÐļŅ‚, ДÐļÐūŅ€ÐļŅ‚, ДÐūÐŧÐūОÐļŅ‚, ИзÐēÐĩŅŅ‚Ð―ŅÐš, КÐēаŅ€Ņ†ÐļŅ‚, КÐūÐ―ÐģÐŧÐūОÐĩŅ€Ð°Ņ‚, КŅ€Ð°ŅÐ―Ņ‹Ðđ ÐģŅ€Ð°Ð―ÐļŅ‚, КŅ€ÐĩÐžÐ―ÐļŅŅ‚Ņ‹Ðđ ŅÐŧÐ°Ð―ÐĩŅ†, МÐĩÐŧ, ÐĄÐŧÐ°Ð―ÐĩŅ†, ÐĒŅ€Ð°Ņ…ÐļŅ‚", "title": "КаŅŅÐļŅ‚ÐĩŅ€ÐļŅ‚", "type": "patchouli:text", "anchor": "mars_surface_cassiterite" @@ -1098,7 +1098,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)$(t:ВÐĩŅ€ÐūŅŅ‚Ð―ÐūŅŅ‚ŅŒ ÐģÐĩÐ―ÐĩŅ€Ð°Ņ†ÐļÐļ ÐķÐļÐŧŅ‹ Ðē Ņ‡Ð°Ð―КÐĩ. ЧÐĩО ОÐĩÐ―ŅŒŅˆÐĩ Ð·Ð―Ð°ÐžÐĩÐ―Ð°Ņ‚ÐĩÐŧŅŒ(ÐēŅ‚ÐūŅ€ÐūÐĩ Ņ‡ÐļŅÐŧÐū), Ņ‚ÐĩО Ņ‡Ð°Ņ‰Ðĩ ÐēŅŅ‚Ņ€ÐĩŅ‡Ð°ÐĩŅ‚ŅŅ.)РÐĩÐīКÐūŅŅ‚ŅŒ$(/t)$(): 1/210 Ð―Ð° Ņ‡Ð°Ð―К$(br)$(thing)$(t:ÐĄÐūÐīÐĩŅ€ÐķÐ°Ð―ÐļÐĩ ÐąÐŧÐūКÐūÐē Ņ€ŅƒÐīŅ‹ Ðē ÐķÐļÐŧÐĩ заОÐĩÐ―ŅŅŽŅ‰ÐļŅ… КаОÐĩÐ―ŅŒ. БÐūÐŧŅŒŅˆÐĩÐĩ Ð·Ð―Ð°Ņ‡ÐĩÐ―ÐļÐĩ ÐūÐ·Ð―Ð°Ņ‡Ð°ÐĩŅ‚ ÐąÐūÐŧŅŒŅˆÐĩ Ņ€ŅƒÐīŅ‹.)ПÐŧÐūŅ‚Ð―ÐūŅŅ‚ŅŒ$(/t)$(): 30%$(br)$(thing)$(t:ÐĪÐūŅ€ÐžÐ° ÐķÐļÐŧŅ‹.)ВÐļÐī$(/t)$(): $(t:ЗаŅ‡Ð°ŅŅ‚ŅƒŅŽ КŅ€ŅƒÐģÐŧÐūÐđ Ņ„ÐūŅ€ÐžŅ‹)КÐŧаŅŅ‚ÐĩŅ€Ð―аŅ ÐķÐļÐŧа$(/t)$(br)$(thing)$(t:ÐĢŅ€ÐūÐēÐ―Ðļ Y, ОÐĩÐķÐīŅƒ КÐūŅ‚ÐūŅ€Ņ‹ÐžÐļ ОÐūÐķÐĩŅ‚ ŅÐģÐĩÐ―ÐĩŅ€ÐļŅ€ÐūÐēаŅ‚ŅŒŅŅ ÐķÐļÐŧа.)Y-ŅƒŅ€ÐūÐēÐĩÐ―ŅŒ$(/t)$(): 0 — 70$(br)$(thing)(t:ÐĄŅ€ÐĩÐīÐ―ÐļÐđ ÐīÐļаОÐĩŅ‚Ņ€ ÐķÐļÐŧŅ‹)РазОÐĩŅ€$(/t)$(): 40$(br)$(thing)$(t:ЕŅÐŧÐļ Ņ€Ð°ŅŅŅ‚ÐūŅÐ―ÐļÐĩ ОÐĩÐķÐīŅƒ ÐŋÐūÐēÐĩŅ€Ņ…Ð―ÐūŅŅ‚ŅŒŅŽ Ðļ ÐķÐļÐŧÐūÐđ ÐąÐūÐŧŅŒŅˆÐĩ Ņ‡ÐĩО ŅŅ‚Ðū Ņ‡ÐļŅÐŧÐū, Ņ‚Ðū ÐķÐļÐŧа Ð―Ðĩ ŅÐģÐĩÐ―ÐĩÐ―Ņ€ÐļŅ€ŅƒÐĩŅ‚ ÐļÐ―ÐīÐļКаŅ‚ÐūŅ€Ņ‹ Ð―Ð° ÐŋÐūÐēÐĩŅ€Ņ…Ð―ÐūŅŅ‚Ðļ.)МаКŅÐļОаÐŧŅŒÐ―аŅ ÐēŅ‹ŅÐūŅ‚а ÐļÐ―ÐīÐļКаŅ‚ÐūŅ€Ð°$(/t)$(): 15$(br2)$(thing)ВÐļÐīŅ‹ ÐšÐ°ÐžÐ―ÐĩÐđ$(): АŅ€ÐģÐļÐŧÐŧÐļŅ‚, АŅ€ÐģÐļÐŧÐŧÐļŅ‚, ГŅ€Ð°Ð―ÐļŅ‚, ИзÐēÐĩŅŅ‚Ð―ŅÐš, КŅ€Ð°ŅÐ―Ņ‹Ðđ ÐģŅ€Ð°Ð―ÐļŅ‚, КŅ€ÐĩÐžÐ―ÐļŅŅ‚Ņ‹Ðđ ŅÐŧÐ°Ð―ÐĩŅ†, МÐĩÐŧ, ÐĄÐŧÐ°Ð―ÐĩŅ†, ÐĒŅ€Ð°Ņ…ÐļŅ‚", + "text": "$(thing)$(t:ВÐĩŅ€ÐūŅŅ‚Ð―ÐūŅŅ‚ŅŒ ÐģÐĩÐ―ÐĩŅ€Ð°Ņ†ÐļÐļ ÐķÐļÐŧŅ‹ Ðē Ņ‡Ð°Ð―КÐĩ. ЧÐĩО ОÐĩÐ―ŅŒŅˆÐĩ Ð·Ð―Ð°ÐžÐĩÐ―Ð°Ņ‚ÐĩÐŧŅŒ(ÐēŅ‚ÐūŅ€ÐūÐĩ Ņ‡ÐļŅÐŧÐū), Ņ‚ÐĩО Ņ‡Ð°Ņ‰Ðĩ ÐēŅŅ‚Ņ€ÐĩŅ‡Ð°ÐĩŅ‚ŅŅ.)РÐĩÐīКÐūŅŅ‚ŅŒ$(/t)$(): 1/210 Ð―Ð° Ņ‡Ð°Ð―К$(br)$(thing)$(t:ÐĄÐūÐīÐĩŅ€ÐķÐ°Ð―ÐļÐĩ ÐąÐŧÐūКÐūÐē Ņ€ŅƒÐīŅ‹ Ðē ÐķÐļÐŧÐĩ заОÐĩÐ―ŅŅŽŅ‰ÐļŅ… КаОÐĩÐ―ŅŒ. БÐūÐŧŅŒŅˆÐĩÐĩ Ð·Ð―Ð°Ņ‡ÐĩÐ―ÐļÐĩ ÐūÐ·Ð―Ð°Ņ‡Ð°ÐĩŅ‚ ÐąÐūÐŧŅŒŅˆÐĩ Ņ€ŅƒÐīŅ‹.)ПÐŧÐūŅ‚Ð―ÐūŅŅ‚ŅŒ$(/t)$(): 30%$(br)$(thing)$(t:ÐĪÐūŅ€ÐžÐ° ÐķÐļÐŧŅ‹.)ВÐļÐī$(/t)$(): $(t:ЗаŅ‡Ð°ŅŅ‚ŅƒŅŽ КŅ€ŅƒÐģÐŧÐūÐđ Ņ„ÐūŅ€ÐžŅ‹)КÐŧаŅŅ‚ÐĩŅ€Ð―аŅ ÐķÐļÐŧа$(/t)$(br)$(thing)$(t:ÐĢŅ€ÐūÐēÐ―Ðļ Y, ОÐĩÐķÐīŅƒ КÐūŅ‚ÐūŅ€Ņ‹ÐžÐļ ОÐūÐķÐĩŅ‚ ŅÐģÐĩÐ―ÐĩŅ€ÐļŅ€ÐūÐēаŅ‚ŅŒŅŅ ÐķÐļÐŧа.)Y-ŅƒŅ€ÐūÐēÐĩÐ―ŅŒ$(/t)$(): 0 — 70$(br)$(thing)(t:ÐĄŅ€ÐĩÐīÐ―ÐļÐđ ÐīÐļаОÐĩŅ‚Ņ€ ÐķÐļÐŧŅ‹)РазОÐĩŅ€$(/t)$(): 40$(br)$(thing)$(t:ЕŅÐŧÐļ Ņ€Ð°ŅŅŅ‚ÐūŅÐ―ÐļÐĩ ОÐĩÐķÐīŅƒ ÐŋÐūÐēÐĩŅ€Ņ…Ð―ÐūŅŅ‚ŅŒŅŽ Ðļ ÐķÐļÐŧÐūÐđ ÐąÐūÐŧŅŒŅˆÐĩ Ņ‡ÐĩО ŅŅ‚Ðū Ņ‡ÐļŅÐŧÐū, Ņ‚Ðū ÐķÐļÐŧа Ð―Ðĩ ŅÐģÐĩÐ―ÐĩÐ―Ņ€ÐļŅ€ŅƒÐĩŅ‚ ÐļÐ―ÐīÐļКаŅ‚ÐūŅ€Ņ‹ Ð―Ð° ÐŋÐūÐēÐĩŅ€Ņ…Ð―ÐūŅŅ‚Ðļ.)МаКŅÐļОаÐŧŅŒÐ―аŅ ÐēŅ‹ŅÐūŅ‚а ÐļÐ―ÐīÐļКаŅ‚ÐūŅ€Ð°$(/t)$(): 15$(br2)$(thing)ВÐļÐīŅ‹ ÐšÐ°ÐžÐ―ÐĩÐđ$(): АŅ€ÐģÐļÐŧÐŧÐļŅ‚, АŅ€ÐģÐļÐŧÐŧÐļŅ‚, ГŅ€Ð°Ð―ÐļŅ‚, ИзÐēÐĩŅŅ‚Ð―ŅÐš, КÐēаŅ€Ņ†ÐļŅ‚, КŅ€Ð°ŅÐ―Ņ‹Ðđ ÐģŅ€Ð°Ð―ÐļŅ‚, КŅ€ÐĩÐžÐ―ÐļŅŅ‚Ņ‹Ðđ ŅÐŧÐ°Ð―ÐĩŅ†, МÐĩÐŧ, ÐĄÐŧÐ°Ð―ÐĩŅ†, ÐĒŅ€Ð°Ņ…ÐļŅ‚", "title": "КÐēаŅ€Ņ†ÐļŅ‚, АŅÐąÐĩŅŅ‚ & БаŅ€ÐļŅ‚", "type": "patchouli:text", "anchor": "mars_quartzite" @@ -1374,7 +1374,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)$(t:ВÐĩŅ€ÐūŅŅ‚Ð―ÐūŅŅ‚ŅŒ ÐģÐĩÐ―ÐĩŅ€Ð°Ņ†ÐļÐļ ÐķÐļÐŧŅ‹ Ðē Ņ‡Ð°Ð―КÐĩ. ЧÐĩО ОÐĩÐ―ŅŒŅˆÐĩ Ð·Ð―Ð°ÐžÐĩÐ―Ð°Ņ‚ÐĩÐŧŅŒ(ÐēŅ‚ÐūŅ€ÐūÐĩ Ņ‡ÐļŅÐŧÐū), Ņ‚ÐĩО Ņ‡Ð°Ņ‰Ðĩ ÐēŅŅ‚Ņ€ÐĩŅ‡Ð°ÐĩŅ‚ŅŅ.)РÐĩÐīКÐūŅŅ‚ŅŒ$(/t)$(): 1/220 Ð―Ð° Ņ‡Ð°Ð―К$(br)$(thing)$(t:ÐĄÐūÐīÐĩŅ€ÐķÐ°Ð―ÐļÐĩ ÐąÐŧÐūКÐūÐē Ņ€ŅƒÐīŅ‹ Ðē ÐķÐļÐŧÐĩ заОÐĩÐ―ŅŅŽŅ‰ÐļŅ… КаОÐĩÐ―ŅŒ. БÐūÐŧŅŒŅˆÐĩÐĩ Ð·Ð―Ð°Ņ‡ÐĩÐ―ÐļÐĩ ÐūÐ·Ð―Ð°Ņ‡Ð°ÐĩŅ‚ ÐąÐūÐŧŅŒŅˆÐĩ Ņ€ŅƒÐīŅ‹.)ПÐŧÐūŅ‚Ð―ÐūŅŅ‚ŅŒ$(/t)$(): 40%$(br)$(thing)$(t:ÐĪÐūŅ€ÐžÐ° ÐķÐļÐŧŅ‹.)ВÐļÐī$(/t)$(): $(t:ЗаŅ‡Ð°ŅŅ‚ŅƒŅŽ КŅ€ŅƒÐģÐŧÐūÐđ Ņ„ÐūŅ€ÐžŅ‹)КÐŧаŅŅ‚ÐĩŅ€Ð―аŅ ÐķÐļÐŧа$(/t)$(br)$(thing)$(t:ÐĢŅ€ÐūÐēÐ―Ðļ Y, ОÐĩÐķÐīŅƒ КÐūŅ‚ÐūŅ€Ņ‹ÐžÐļ ОÐūÐķÐĩŅ‚ ŅÐģÐĩÐ―ÐĩŅ€ÐļŅ€ÐūÐēаŅ‚ŅŒŅŅ ÐķÐļÐŧа.)Y-ŅƒŅ€ÐūÐēÐĩÐ―ŅŒ$(/t)$(): 0 — 70$(br)$(thing)(t:ÐĄŅ€ÐĩÐīÐ―ÐļÐđ ÐīÐļаОÐĩŅ‚Ņ€ ÐķÐļÐŧŅ‹)РазОÐĩŅ€$(/t)$(): 50$(br)$(thing)$(t:ЕŅÐŧÐļ Ņ€Ð°ŅŅŅ‚ÐūŅÐ―ÐļÐĩ ОÐĩÐķÐīŅƒ ÐŋÐūÐēÐĩŅ€Ņ…Ð―ÐūŅŅ‚ŅŒŅŽ Ðļ ÐķÐļÐŧÐūÐđ ÐąÐūÐŧŅŒŅˆÐĩ Ņ‡ÐĩО ŅŅ‚Ðū Ņ‡ÐļŅÐŧÐū, Ņ‚Ðū ÐķÐļÐŧа Ð―Ðĩ ŅÐģÐĩÐ―ÐĩÐ―Ņ€ÐļŅ€ŅƒÐĩŅ‚ ÐļÐ―ÐīÐļКаŅ‚ÐūŅ€Ņ‹ Ð―Ð° ÐŋÐūÐēÐĩŅ€Ņ…Ð―ÐūŅŅ‚Ðļ.)МаКŅÐļОаÐŧŅŒÐ―аŅ ÐēŅ‹ŅÐūŅ‚а ÐļÐ―ÐīÐļКаŅ‚ÐūŅ€Ð°$(/t)$(): 40$(br2)$(thing)ВÐļÐīŅ‹ ÐšÐ°ÐžÐ―ÐĩÐđ$(): АŅ€ÐģÐļÐŧÐŧÐļŅ‚, АŅ€ÐģÐļÐŧÐŧÐļŅ‚, БазаÐŧŅŒŅ‚, ДаŅ†ÐļŅ‚, ДÐūÐŧÐūОÐļŅ‚, ИзÐēÐĩŅŅ‚Ð―ŅÐš, КÐūÐ―ÐģÐŧÐūОÐĩŅ€Ð°Ņ‚, ÐĄÐŧÐ°Ð―ÐĩŅ†, ÐĒŅ€Ð°Ņ…ÐļŅ‚", + "text": "$(thing)$(t:ВÐĩŅ€ÐūŅŅ‚Ð―ÐūŅŅ‚ŅŒ ÐģÐĩÐ―ÐĩŅ€Ð°Ņ†ÐļÐļ ÐķÐļÐŧŅ‹ Ðē Ņ‡Ð°Ð―КÐĩ. ЧÐĩО ОÐĩÐ―ŅŒŅˆÐĩ Ð·Ð―Ð°ÐžÐĩÐ―Ð°Ņ‚ÐĩÐŧŅŒ(ÐēŅ‚ÐūŅ€ÐūÐĩ Ņ‡ÐļŅÐŧÐū), Ņ‚ÐĩО Ņ‡Ð°Ņ‰Ðĩ ÐēŅŅ‚Ņ€ÐĩŅ‡Ð°ÐĩŅ‚ŅŅ.)РÐĩÐīКÐūŅŅ‚ŅŒ$(/t)$(): 1/220 Ð―Ð° Ņ‡Ð°Ð―К$(br)$(thing)$(t:ÐĄÐūÐīÐĩŅ€ÐķÐ°Ð―ÐļÐĩ ÐąÐŧÐūКÐūÐē Ņ€ŅƒÐīŅ‹ Ðē ÐķÐļÐŧÐĩ заОÐĩÐ―ŅŅŽŅ‰ÐļŅ… КаОÐĩÐ―ŅŒ. БÐūÐŧŅŒŅˆÐĩÐĩ Ð·Ð―Ð°Ņ‡ÐĩÐ―ÐļÐĩ ÐūÐ·Ð―Ð°Ņ‡Ð°ÐĩŅ‚ ÐąÐūÐŧŅŒŅˆÐĩ Ņ€ŅƒÐīŅ‹.)ПÐŧÐūŅ‚Ð―ÐūŅŅ‚ŅŒ$(/t)$(): 40%$(br)$(thing)$(t:ÐĪÐūŅ€ÐžÐ° ÐķÐļÐŧŅ‹.)ВÐļÐī$(/t)$(): $(t:ЗаŅ‡Ð°ŅŅ‚ŅƒŅŽ КŅ€ŅƒÐģÐŧÐūÐđ Ņ„ÐūŅ€ÐžŅ‹)КÐŧаŅŅ‚ÐĩŅ€Ð―аŅ ÐķÐļÐŧа$(/t)$(br)$(thing)$(t:ÐĢŅ€ÐūÐēÐ―Ðļ Y, ОÐĩÐķÐīŅƒ КÐūŅ‚ÐūŅ€Ņ‹ÐžÐļ ОÐūÐķÐĩŅ‚ ŅÐģÐĩÐ―ÐĩŅ€ÐļŅ€ÐūÐēаŅ‚ŅŒŅŅ ÐķÐļÐŧа.)Y-ŅƒŅ€ÐūÐēÐĩÐ―ŅŒ$(/t)$(): 0 — 70$(br)$(thing)(t:ÐĄŅ€ÐĩÐīÐ―ÐļÐđ ÐīÐļаОÐĩŅ‚Ņ€ ÐķÐļÐŧŅ‹)РазОÐĩŅ€$(/t)$(): 50$(br)$(thing)$(t:ЕŅÐŧÐļ Ņ€Ð°ŅŅŅ‚ÐūŅÐ―ÐļÐĩ ОÐĩÐķÐīŅƒ ÐŋÐūÐēÐĩŅ€Ņ…Ð―ÐūŅŅ‚ŅŒŅŽ Ðļ ÐķÐļÐŧÐūÐđ ÐąÐūÐŧŅŒŅˆÐĩ Ņ‡ÐĩО ŅŅ‚Ðū Ņ‡ÐļŅÐŧÐū, Ņ‚Ðū ÐķÐļÐŧа Ð―Ðĩ ŅÐģÐĩÐ―ÐĩÐ―Ņ€ÐļŅ€ŅƒÐĩŅ‚ ÐļÐ―ÐīÐļКаŅ‚ÐūŅ€Ņ‹ Ð―Ð° ÐŋÐūÐēÐĩŅ€Ņ…Ð―ÐūŅŅ‚Ðļ.)МаКŅÐļОаÐŧŅŒÐ―аŅ ÐēŅ‹ŅÐūŅ‚а ÐļÐ―ÐīÐļКаŅ‚ÐūŅ€Ð°$(/t)$(): 40$(br2)$(thing)ВÐļÐīŅ‹ ÐšÐ°ÐžÐ―ÐĩÐđ$(): АŅ€ÐģÐļÐŧÐŧÐļŅ‚, АŅ€ÐģÐļÐŧÐŧÐļŅ‚, БазаÐŧŅŒŅ‚, ДаŅ†ÐļŅ‚, ДÐūÐŧÐūОÐļŅ‚, ИзÐēÐĩŅŅ‚Ð―ŅÐš, КÐēаŅ€Ņ†ÐļŅ‚, КÐūÐ―ÐģÐŧÐūОÐĩŅ€Ð°Ņ‚, ÐĄÐŧÐ°Ð―ÐĩŅ†, ÐĒŅ€Ð°Ņ…ÐļŅ‚", "title": "МÐĩÐīŅŒ Ðļ ÐĨаÐŧŅŒÐšÐūÐŋÐļŅ€ÐļŅ‚", "type": "patchouli:text", "anchor": "mars_copper" @@ -1466,7 +1466,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)$(t:ВÐĩŅ€ÐūŅŅ‚Ð―ÐūŅŅ‚ŅŒ ÐģÐĩÐ―ÐĩŅ€Ð°Ņ†ÐļÐļ ÐķÐļÐŧŅ‹ Ðē Ņ‡Ð°Ð―КÐĩ. ЧÐĩО ОÐĩÐ―ŅŒŅˆÐĩ Ð·Ð―Ð°ÐžÐĩÐ―Ð°Ņ‚ÐĩÐŧŅŒ(ÐēŅ‚ÐūŅ€ÐūÐĩ Ņ‡ÐļŅÐŧÐū), Ņ‚ÐĩО Ņ‡Ð°Ņ‰Ðĩ ÐēŅŅ‚Ņ€ÐĩŅ‡Ð°ÐĩŅ‚ŅŅ.)РÐĩÐīКÐūŅŅ‚ŅŒ$(/t)$(): 1/370 Ð―Ð° Ņ‡Ð°Ð―К$(br)$(thing)$(t:ÐĄÐūÐīÐĩŅ€ÐķÐ°Ð―ÐļÐĩ ÐąÐŧÐūКÐūÐē Ņ€ŅƒÐīŅ‹ Ðē ÐķÐļÐŧÐĩ заОÐĩÐ―ŅŅŽŅ‰ÐļŅ… КаОÐĩÐ―ŅŒ. БÐūÐŧŅŒŅˆÐĩÐĩ Ð·Ð―Ð°Ņ‡ÐĩÐ―ÐļÐĩ ÐūÐ·Ð―Ð°Ņ‡Ð°ÐĩŅ‚ ÐąÐūÐŧŅŒŅˆÐĩ Ņ€ŅƒÐīŅ‹.)ПÐŧÐūŅ‚Ð―ÐūŅŅ‚ŅŒ$(/t)$(): 30%$(br)$(thing)$(t:ÐĪÐūŅ€ÐžÐ° ÐķÐļÐŧŅ‹.)ВÐļÐī$(/t)$(): $(t:ЗаŅ‡Ð°ŅŅ‚ŅƒŅŽ КŅ€ŅƒÐģÐŧÐūÐđ Ņ„ÐūŅ€ÐžŅ‹)КÐŧаŅŅ‚ÐĩŅ€Ð―аŅ ÐķÐļÐŧа$(/t)$(br)$(thing)$(t:ÐĢŅ€ÐūÐēÐ―Ðļ Y, ОÐĩÐķÐīŅƒ КÐūŅ‚ÐūŅ€Ņ‹ÐžÐļ ОÐūÐķÐĩŅ‚ ŅÐģÐĩÐ―ÐĩŅ€ÐļŅ€ÐūÐēаŅ‚ŅŒŅŅ ÐķÐļÐŧа.)Y-ŅƒŅ€ÐūÐēÐĩÐ―ŅŒ$(/t)$(): -20 — 0$(br)$(thing)(t:ÐĄŅ€ÐĩÐīÐ―ÐļÐđ ÐīÐļаОÐĩŅ‚Ņ€ ÐķÐļÐŧŅ‹)РазОÐĩŅ€$(/t)$(): 60$(br)$(thing)$(t:ЕŅÐŧÐļ Ņ€Ð°ŅŅŅ‚ÐūŅÐ―ÐļÐĩ ОÐĩÐķÐīŅƒ ÐŋÐūÐēÐĩŅ€Ņ…Ð―ÐūŅŅ‚ŅŒŅŽ Ðļ ÐķÐļÐŧÐūÐđ ÐąÐūÐŧŅŒŅˆÐĩ Ņ‡ÐĩО ŅŅ‚Ðū Ņ‡ÐļŅÐŧÐū, Ņ‚Ðū ÐķÐļÐŧа Ð―Ðĩ ŅÐģÐĩÐ―ÐĩÐ―Ņ€ÐļŅ€ŅƒÐĩŅ‚ ÐļÐ―ÐīÐļКаŅ‚ÐūŅ€Ņ‹ Ð―Ð° ÐŋÐūÐēÐĩŅ€Ņ…Ð―ÐūŅŅ‚Ðļ.)МаКŅÐļОаÐŧŅŒÐ―аŅ ÐēŅ‹ŅÐūŅ‚а ÐļÐ―ÐīÐļКаŅ‚ÐūŅ€Ð°$(/t)$(): 20$(br2)$(thing)ВÐļÐīŅ‹ ÐšÐ°ÐžÐ―ÐĩÐđ$(): АŅ€ÐģÐļÐŧÐŧÐļŅ‚, АŅ€ÐģÐļÐŧÐŧÐļŅ‚, БазаÐŧŅŒŅ‚, ДаŅ†ÐļŅ‚, ИзÐēÐĩŅŅ‚Ð―ŅÐš, КŅ€ÐĩÐžÐ―ÐļŅŅ‚Ņ‹Ðđ ŅÐŧÐ°Ð―ÐĩŅ†, МÐĩÐŧ, ÐĄÐŧÐ°Ð―ÐĩŅ†", + "text": "$(thing)$(t:ВÐĩŅ€ÐūŅŅ‚Ð―ÐūŅŅ‚ŅŒ ÐģÐĩÐ―ÐĩŅ€Ð°Ņ†ÐļÐļ ÐķÐļÐŧŅ‹ Ðē Ņ‡Ð°Ð―КÐĩ. ЧÐĩО ОÐĩÐ―ŅŒŅˆÐĩ Ð·Ð―Ð°ÐžÐĩÐ―Ð°Ņ‚ÐĩÐŧŅŒ(ÐēŅ‚ÐūŅ€ÐūÐĩ Ņ‡ÐļŅÐŧÐū), Ņ‚ÐĩО Ņ‡Ð°Ņ‰Ðĩ ÐēŅŅ‚Ņ€ÐĩŅ‡Ð°ÐĩŅ‚ŅŅ.)РÐĩÐīКÐūŅŅ‚ŅŒ$(/t)$(): 1/370 Ð―Ð° Ņ‡Ð°Ð―К$(br)$(thing)$(t:ÐĄÐūÐīÐĩŅ€ÐķÐ°Ð―ÐļÐĩ ÐąÐŧÐūКÐūÐē Ņ€ŅƒÐīŅ‹ Ðē ÐķÐļÐŧÐĩ заОÐĩÐ―ŅŅŽŅ‰ÐļŅ… КаОÐĩÐ―ŅŒ. БÐūÐŧŅŒŅˆÐĩÐĩ Ð·Ð―Ð°Ņ‡ÐĩÐ―ÐļÐĩ ÐūÐ·Ð―Ð°Ņ‡Ð°ÐĩŅ‚ ÐąÐūÐŧŅŒŅˆÐĩ Ņ€ŅƒÐīŅ‹.)ПÐŧÐūŅ‚Ð―ÐūŅŅ‚ŅŒ$(/t)$(): 30%$(br)$(thing)$(t:ÐĪÐūŅ€ÐžÐ° ÐķÐļÐŧŅ‹.)ВÐļÐī$(/t)$(): $(t:ЗаŅ‡Ð°ŅŅ‚ŅƒŅŽ КŅ€ŅƒÐģÐŧÐūÐđ Ņ„ÐūŅ€ÐžŅ‹)КÐŧаŅŅ‚ÐĩŅ€Ð―аŅ ÐķÐļÐŧа$(/t)$(br)$(thing)$(t:ÐĢŅ€ÐūÐēÐ―Ðļ Y, ОÐĩÐķÐīŅƒ КÐūŅ‚ÐūŅ€Ņ‹ÐžÐļ ОÐūÐķÐĩŅ‚ ŅÐģÐĩÐ―ÐĩŅ€ÐļŅ€ÐūÐēаŅ‚ŅŒŅŅ ÐķÐļÐŧа.)Y-ŅƒŅ€ÐūÐēÐĩÐ―ŅŒ$(/t)$(): -30 — 0$(br)$(thing)(t:ÐĄŅ€ÐĩÐīÐ―ÐļÐđ ÐīÐļаОÐĩŅ‚Ņ€ ÐķÐļÐŧŅ‹)РазОÐĩŅ€$(/t)$(): 60$(br)$(thing)$(t:ЕŅÐŧÐļ Ņ€Ð°ŅŅŅ‚ÐūŅÐ―ÐļÐĩ ОÐĩÐķÐīŅƒ ÐŋÐūÐēÐĩŅ€Ņ…Ð―ÐūŅŅ‚ŅŒŅŽ Ðļ ÐķÐļÐŧÐūÐđ ÐąÐūÐŧŅŒŅˆÐĩ Ņ‡ÐĩО ŅŅ‚Ðū Ņ‡ÐļŅÐŧÐū, Ņ‚Ðū ÐķÐļÐŧа Ð―Ðĩ ŅÐģÐĩÐ―ÐĩÐ―Ņ€ÐļŅ€ŅƒÐĩŅ‚ ÐļÐ―ÐīÐļКаŅ‚ÐūŅ€Ņ‹ Ð―Ð° ÐŋÐūÐēÐĩŅ€Ņ…Ð―ÐūŅŅ‚Ðļ.)МаКŅÐļОаÐŧŅŒÐ―аŅ ÐēŅ‹ŅÐūŅ‚а ÐļÐ―ÐīÐļКаŅ‚ÐūŅ€Ð°$(/t)$(): 20$(br2)$(thing)ВÐļÐīŅ‹ ÐšÐ°ÐžÐ―ÐĩÐđ$(): Ð“Ð°ÐąÐąŅ€Ðū, ГŅ€Ð°Ð―ÐļŅ‚, ДÐļÐūŅ€ÐļŅ‚, КŅ€Ð°ŅÐ―Ņ‹Ðđ ÐģŅ€Ð°Ð―ÐļŅ‚", "title": "РÐĩÐīŅŅ‚ÐūŅƒÐ― & ÐĨŅ€ÐūО", "type": "patchouli:text", "anchor": "deep_mars_chromite" @@ -1625,7 +1625,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)$(t:ВÐĩŅ€ÐūŅŅ‚Ð―ÐūŅŅ‚ŅŒ ÐģÐĩÐ―ÐĩŅ€Ð°Ņ†ÐļÐļ ÐķÐļÐŧŅ‹ Ðē Ņ‡Ð°Ð―КÐĩ. ЧÐĩО ОÐĩÐ―ŅŒŅˆÐĩ Ð·Ð―Ð°ÐžÐĩÐ―Ð°Ņ‚ÐĩÐŧŅŒ(ÐēŅ‚ÐūŅ€ÐūÐĩ Ņ‡ÐļŅÐŧÐū), Ņ‚ÐĩО Ņ‡Ð°Ņ‰Ðĩ ÐēŅŅ‚Ņ€ÐĩŅ‡Ð°ÐĩŅ‚ŅŅ.)РÐĩÐīКÐūŅŅ‚ŅŒ$(/t)$(): 1/210 Ð―Ð° Ņ‡Ð°Ð―К$(br)$(thing)$(t:ÐĄÐūÐīÐĩŅ€ÐķÐ°Ð―ÐļÐĩ ÐąÐŧÐūКÐūÐē Ņ€ŅƒÐīŅ‹ Ðē ÐķÐļÐŧÐĩ заОÐĩÐ―ŅŅŽŅ‰ÐļŅ… КаОÐĩÐ―ŅŒ. БÐūÐŧŅŒŅˆÐĩÐĩ Ð·Ð―Ð°Ņ‡ÐĩÐ―ÐļÐĩ ÐūÐ·Ð―Ð°Ņ‡Ð°ÐĩŅ‚ ÐąÐūÐŧŅŒŅˆÐĩ Ņ€ŅƒÐīŅ‹.)ПÐŧÐūŅ‚Ð―ÐūŅŅ‚ŅŒ$(/t)$(): 40%$(br)$(thing)$(t:ÐĪÐūŅ€ÐžÐ° ÐķÐļÐŧŅ‹.)ВÐļÐī$(/t)$(): $(t:ÐĻÐļŅ€ÐūКаŅ Ðļ ÐŋÐŧÐūŅÐšÐ°Ņ)ДÐļŅÐšÐūÐūÐąŅ€Ð°Ð·Ð―аŅ ÐķÐļÐŧа$(/t)$(br)$(thing)$(t:ÐĢŅ€ÐūÐēÐ―Ðļ Y, ОÐĩÐķÐīŅƒ КÐūŅ‚ÐūŅ€Ņ‹ÐžÐļ ОÐūÐķÐĩŅ‚ ŅÐģÐĩÐ―ÐĩŅ€ÐļŅ€ÐūÐēаŅ‚ŅŒŅŅ ÐķÐļÐŧа.)Y-ŅƒŅ€ÐūÐēÐĩÐ―ŅŒ$(/t)$(): 0 — 70$(br)$(thing)(t:ÐĄŅ€ÐĩÐīÐ―ÐļÐđ ÐīÐļаОÐĩŅ‚Ņ€ ÐķÐļÐŧŅ‹)РазОÐĩŅ€$(/t)$(): 40$(br)$(thing)ВŅ‹ŅÐūŅ‚а$(): 6$(br)$(thing)$(t:ЕŅÐŧÐļ Ņ€Ð°ŅŅŅ‚ÐūŅÐ―ÐļÐĩ ОÐĩÐķÐīŅƒ ÐŋÐūÐēÐĩŅ€Ņ…Ð―ÐūŅŅ‚ŅŒŅŽ Ðļ ÐķÐļÐŧÐūÐđ ÐąÐūÐŧŅŒŅˆÐĩ Ņ‡ÐĩО ŅŅ‚Ðū Ņ‡ÐļŅÐŧÐū, Ņ‚Ðū ÐķÐļÐŧа Ð―Ðĩ ŅÐģÐĩÐ―ÐĩÐ―Ņ€ÐļŅ€ŅƒÐĩŅ‚ ÐļÐ―ÐīÐļКаŅ‚ÐūŅ€Ņ‹ Ð―Ð° ÐŋÐūÐēÐĩŅ€Ņ…Ð―ÐūŅŅ‚Ðļ.)МаКŅÐļОаÐŧŅŒÐ―аŅ ÐēŅ‹ŅÐūŅ‚а ÐļÐ―ÐīÐļКаŅ‚ÐūŅ€Ð°$(/t)$(): 15$(br2)$(thing)ВÐļÐīŅ‹ ÐšÐ°ÐžÐ―ÐĩÐđ$(): АŅ€ÐģÐļÐŧÐŧÐļŅ‚, АŅ€ÐģÐļÐŧÐŧÐļŅ‚, ГŅ€Ð°Ð―ÐļŅ‚, ДÐļÐūŅ€ÐļŅ‚, ИзÐēÐĩŅŅ‚Ð―ŅÐš, КŅ€Ð°ŅÐ―Ņ‹Ðđ ÐģŅ€Ð°Ð―ÐļŅ‚, КŅ€ÐĩÐžÐ―ÐļŅŅ‚Ņ‹Ðđ ŅÐŧÐ°Ð―ÐĩŅ†, МÐĩÐŧ, ÐĒŅ€Ð°Ņ…ÐļŅ‚", + "text": "$(thing)$(t:ВÐĩŅ€ÐūŅŅ‚Ð―ÐūŅŅ‚ŅŒ ÐģÐĩÐ―ÐĩŅ€Ð°Ņ†ÐļÐļ ÐķÐļÐŧŅ‹ Ðē Ņ‡Ð°Ð―КÐĩ. ЧÐĩО ОÐĩÐ―ŅŒŅˆÐĩ Ð·Ð―Ð°ÐžÐĩÐ―Ð°Ņ‚ÐĩÐŧŅŒ(ÐēŅ‚ÐūŅ€ÐūÐĩ Ņ‡ÐļŅÐŧÐū), Ņ‚ÐĩО Ņ‡Ð°Ņ‰Ðĩ ÐēŅŅ‚Ņ€ÐĩŅ‡Ð°ÐĩŅ‚ŅŅ.)РÐĩÐīКÐūŅŅ‚ŅŒ$(/t)$(): 1/210 Ð―Ð° Ņ‡Ð°Ð―К$(br)$(thing)$(t:ÐĄÐūÐīÐĩŅ€ÐķÐ°Ð―ÐļÐĩ ÐąÐŧÐūКÐūÐē Ņ€ŅƒÐīŅ‹ Ðē ÐķÐļÐŧÐĩ заОÐĩÐ―ŅŅŽŅ‰ÐļŅ… КаОÐĩÐ―ŅŒ. БÐūÐŧŅŒŅˆÐĩÐĩ Ð·Ð―Ð°Ņ‡ÐĩÐ―ÐļÐĩ ÐūÐ·Ð―Ð°Ņ‡Ð°ÐĩŅ‚ ÐąÐūÐŧŅŒŅˆÐĩ Ņ€ŅƒÐīŅ‹.)ПÐŧÐūŅ‚Ð―ÐūŅŅ‚ŅŒ$(/t)$(): 40%$(br)$(thing)$(t:ÐĪÐūŅ€ÐžÐ° ÐķÐļÐŧŅ‹.)ВÐļÐī$(/t)$(): $(t:ÐĻÐļŅ€ÐūКаŅ Ðļ ÐŋÐŧÐūŅÐšÐ°Ņ)ДÐļŅÐšÐūÐūÐąŅ€Ð°Ð·Ð―аŅ ÐķÐļÐŧа$(/t)$(br)$(thing)$(t:ÐĢŅ€ÐūÐēÐ―Ðļ Y, ОÐĩÐķÐīŅƒ КÐūŅ‚ÐūŅ€Ņ‹ÐžÐļ ОÐūÐķÐĩŅ‚ ŅÐģÐĩÐ―ÐĩŅ€ÐļŅ€ÐūÐēаŅ‚ŅŒŅŅ ÐķÐļÐŧа.)Y-ŅƒŅ€ÐūÐēÐĩÐ―ŅŒ$(/t)$(): 0 — 70$(br)$(thing)(t:ÐĄŅ€ÐĩÐīÐ―ÐļÐđ ÐīÐļаОÐĩŅ‚Ņ€ ÐķÐļÐŧŅ‹)РазОÐĩŅ€$(/t)$(): 40$(br)$(thing)ВŅ‹ŅÐūŅ‚а$(): 6$(br)$(thing)$(t:ЕŅÐŧÐļ Ņ€Ð°ŅŅŅ‚ÐūŅÐ―ÐļÐĩ ОÐĩÐķÐīŅƒ ÐŋÐūÐēÐĩŅ€Ņ…Ð―ÐūŅŅ‚ŅŒŅŽ Ðļ ÐķÐļÐŧÐūÐđ ÐąÐūÐŧŅŒŅˆÐĩ Ņ‡ÐĩО ŅŅ‚Ðū Ņ‡ÐļŅÐŧÐū, Ņ‚Ðū ÐķÐļÐŧа Ð―Ðĩ ŅÐģÐĩÐ―ÐĩÐ―Ņ€ÐļŅ€ŅƒÐĩŅ‚ ÐļÐ―ÐīÐļКаŅ‚ÐūŅ€Ņ‹ Ð―Ð° ÐŋÐūÐēÐĩŅ€Ņ…Ð―ÐūŅŅ‚Ðļ.)МаКŅÐļОаÐŧŅŒÐ―аŅ ÐēŅ‹ŅÐūŅ‚а ÐļÐ―ÐīÐļКаŅ‚ÐūŅ€Ð°$(/t)$(): 15$(br2)$(thing)ВÐļÐīŅ‹ ÐšÐ°ÐžÐ―ÐĩÐđ$(): АŅ€ÐģÐļÐŧÐŧÐļŅ‚, АŅ€ÐģÐļÐŧÐŧÐļŅ‚, ГŅ€Ð°Ð―ÐļŅ‚, ДÐļÐūŅ€ÐļŅ‚, ИзÐēÐĩŅŅ‚Ð―ŅÐš, КÐēаŅ€Ņ†ÐļŅ‚, КŅ€Ð°ŅÐ―Ņ‹Ðđ ÐģŅ€Ð°Ð―ÐļŅ‚, КŅ€ÐĩÐžÐ―ÐļŅŅ‚Ņ‹Ðđ ŅÐŧÐ°Ð―ÐĩŅ†, МÐĩÐŧ, ÐĒŅ€Ð°Ņ…ÐļŅ‚", "title": "ÐĄÐūÐŧÐļ & ÐĄÐŋÐūÐīŅƒÐžÐĩÐ―", "type": "patchouli:text", "anchor": "mars_salt" @@ -1717,7 +1717,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)$(t:ВÐĩŅ€ÐūŅŅ‚Ð―ÐūŅŅ‚ŅŒ ÐģÐĩÐ―ÐĩŅ€Ð°Ņ†ÐļÐļ ÐķÐļÐŧŅ‹ Ðē Ņ‡Ð°Ð―КÐĩ. ЧÐĩО ОÐĩÐ―ŅŒŅˆÐĩ Ð·Ð―Ð°ÐžÐĩÐ―Ð°Ņ‚ÐĩÐŧŅŒ(ÐēŅ‚ÐūŅ€ÐūÐĩ Ņ‡ÐļŅÐŧÐū), Ņ‚ÐĩО Ņ‡Ð°Ņ‰Ðĩ ÐēŅŅ‚Ņ€ÐĩŅ‡Ð°ÐĩŅ‚ŅŅ.)РÐĩÐīКÐūŅŅ‚ŅŒ$(/t)$(): 1/150 Ð―Ð° Ņ‡Ð°Ð―К$(br)$(thing)$(t:ÐĄÐūÐīÐĩŅ€ÐķÐ°Ð―ÐļÐĩ ÐąÐŧÐūКÐūÐē Ņ€ŅƒÐīŅ‹ Ðē ÐķÐļÐŧÐĩ заОÐĩÐ―ŅŅŽŅ‰ÐļŅ… КаОÐĩÐ―ŅŒ. БÐūÐŧŅŒŅˆÐĩÐĩ Ð·Ð―Ð°Ņ‡ÐĩÐ―ÐļÐĩ ÐūÐ·Ð―Ð°Ņ‡Ð°ÐĩŅ‚ ÐąÐūÐŧŅŒŅˆÐĩ Ņ€ŅƒÐīŅ‹.)ПÐŧÐūŅ‚Ð―ÐūŅŅ‚ŅŒ$(/t)$(): 25%$(br)$(thing)$(t:ÐĪÐūŅ€ÐžÐ° ÐķÐļÐŧŅ‹.)ВÐļÐī$(/t)$(): $(t:ЗаŅ‡Ð°ŅŅ‚ŅƒŅŽ КŅ€ŅƒÐģÐŧÐūÐđ Ņ„ÐūŅ€ÐžŅ‹)КÐŧаŅŅ‚ÐĩŅ€Ð―аŅ ÐķÐļÐŧа$(/t)$(br)$(thing)$(t:ÐĢŅ€ÐūÐēÐ―Ðļ Y, ОÐĩÐķÐīŅƒ КÐūŅ‚ÐūŅ€Ņ‹ÐžÐļ ОÐūÐķÐĩŅ‚ ŅÐģÐĩÐ―ÐĩŅ€ÐļŅ€ÐūÐēаŅ‚ŅŒŅŅ ÐķÐļÐŧа.)Y-ŅƒŅ€ÐūÐēÐĩÐ―ŅŒ$(/t)$(): 80 — 180$(br)$(thing)(t:ÐĄŅ€ÐĩÐīÐ―ÐļÐđ ÐīÐļаОÐĩŅ‚Ņ€ ÐķÐļÐŧŅ‹)РазОÐĩŅ€$(/t)$(): 45$(br)$(thing)$(t:ЕŅÐŧÐļ Ņ€Ð°ŅŅŅ‚ÐūŅÐ―ÐļÐĩ ОÐĩÐķÐīŅƒ ÐŋÐūÐēÐĩŅ€Ņ…Ð―ÐūŅŅ‚ŅŒŅŽ Ðļ ÐķÐļÐŧÐūÐđ ÐąÐūÐŧŅŒŅˆÐĩ Ņ‡ÐĩО ŅŅ‚Ðū Ņ‡ÐļŅÐŧÐū, Ņ‚Ðū ÐķÐļÐŧа Ð―Ðĩ ŅÐģÐĩÐ―ÐĩÐ―Ņ€ÐļŅ€ŅƒÐĩŅ‚ ÐļÐ―ÐīÐļКаŅ‚ÐūŅ€Ņ‹ Ð―Ð° ÐŋÐūÐēÐĩŅ€Ņ…Ð―ÐūŅŅ‚Ðļ.)МаКŅÐļОаÐŧŅŒÐ―аŅ ÐēŅ‹ŅÐūŅ‚а ÐļÐ―ÐīÐļКаŅ‚ÐūŅ€Ð°$(/t)$(): 40$(br2)$(thing)ВÐļÐīŅ‹ ÐšÐ°ÐžÐ―ÐĩÐđ$(): АŅ€ÐģÐļÐŧÐŧÐļŅ‚, АŅ€ÐģÐļÐŧÐŧÐļŅ‚, БазаÐŧŅŒŅ‚, Ð“Ð°ÐąÐąŅ€Ðū, ГŅ€Ð°Ð―ÐļŅ‚, ДаŅ†ÐļŅ‚, ДÐļÐūŅ€ÐļŅ‚, ДÐūÐŧÐūОÐļŅ‚, ИзÐēÐĩŅŅ‚Ð―ŅÐš, КÐūÐ―ÐģÐŧÐūОÐĩŅ€Ð°Ņ‚, КŅ€Ð°ŅÐ―Ņ‹Ðđ ÐģŅ€Ð°Ð―ÐļŅ‚, КŅ€ÐĩÐžÐ―ÐļŅŅ‚Ņ‹Ðđ ŅÐŧÐ°Ð―ÐĩŅ†, МÐĩÐŧ, ÐĄÐŧÐ°Ð―ÐĩŅ†, ÐĒŅ€Ð°Ņ…ÐļŅ‚", + "text": "$(thing)$(t:ВÐĩŅ€ÐūŅŅ‚Ð―ÐūŅŅ‚ŅŒ ÐģÐĩÐ―ÐĩŅ€Ð°Ņ†ÐļÐļ ÐķÐļÐŧŅ‹ Ðē Ņ‡Ð°Ð―КÐĩ. ЧÐĩО ОÐĩÐ―ŅŒŅˆÐĩ Ð·Ð―Ð°ÐžÐĩÐ―Ð°Ņ‚ÐĩÐŧŅŒ(ÐēŅ‚ÐūŅ€ÐūÐĩ Ņ‡ÐļŅÐŧÐū), Ņ‚ÐĩО Ņ‡Ð°Ņ‰Ðĩ ÐēŅŅ‚Ņ€ÐĩŅ‡Ð°ÐĩŅ‚ŅŅ.)РÐĩÐīКÐūŅŅ‚ŅŒ$(/t)$(): 1/150 Ð―Ð° Ņ‡Ð°Ð―К$(br)$(thing)$(t:ÐĄÐūÐīÐĩŅ€ÐķÐ°Ð―ÐļÐĩ ÐąÐŧÐūКÐūÐē Ņ€ŅƒÐīŅ‹ Ðē ÐķÐļÐŧÐĩ заОÐĩÐ―ŅŅŽŅ‰ÐļŅ… КаОÐĩÐ―ŅŒ. БÐūÐŧŅŒŅˆÐĩÐĩ Ð·Ð―Ð°Ņ‡ÐĩÐ―ÐļÐĩ ÐūÐ·Ð―Ð°Ņ‡Ð°ÐĩŅ‚ ÐąÐūÐŧŅŒŅˆÐĩ Ņ€ŅƒÐīŅ‹.)ПÐŧÐūŅ‚Ð―ÐūŅŅ‚ŅŒ$(/t)$(): 25%$(br)$(thing)$(t:ÐĪÐūŅ€ÐžÐ° ÐķÐļÐŧŅ‹.)ВÐļÐī$(/t)$(): $(t:ЗаŅ‡Ð°ŅŅ‚ŅƒŅŽ КŅ€ŅƒÐģÐŧÐūÐđ Ņ„ÐūŅ€ÐžŅ‹)КÐŧаŅŅ‚ÐĩŅ€Ð―аŅ ÐķÐļÐŧа$(/t)$(br)$(thing)$(t:ÐĢŅ€ÐūÐēÐ―Ðļ Y, ОÐĩÐķÐīŅƒ КÐūŅ‚ÐūŅ€Ņ‹ÐžÐļ ОÐūÐķÐĩŅ‚ ŅÐģÐĩÐ―ÐĩŅ€ÐļŅ€ÐūÐēаŅ‚ŅŒŅŅ ÐķÐļÐŧа.)Y-ŅƒŅ€ÐūÐēÐĩÐ―ŅŒ$(/t)$(): 80 — 180$(br)$(thing)(t:ÐĄŅ€ÐĩÐīÐ―ÐļÐđ ÐīÐļаОÐĩŅ‚Ņ€ ÐķÐļÐŧŅ‹)РазОÐĩŅ€$(/t)$(): 45$(br)$(thing)$(t:ЕŅÐŧÐļ Ņ€Ð°ŅŅŅ‚ÐūŅÐ―ÐļÐĩ ОÐĩÐķÐīŅƒ ÐŋÐūÐēÐĩŅ€Ņ…Ð―ÐūŅŅ‚ŅŒŅŽ Ðļ ÐķÐļÐŧÐūÐđ ÐąÐūÐŧŅŒŅˆÐĩ Ņ‡ÐĩО ŅŅ‚Ðū Ņ‡ÐļŅÐŧÐū, Ņ‚Ðū ÐķÐļÐŧа Ð―Ðĩ ŅÐģÐĩÐ―ÐĩÐ―Ņ€ÐļŅ€ŅƒÐĩŅ‚ ÐļÐ―ÐīÐļКаŅ‚ÐūŅ€Ņ‹ Ð―Ð° ÐŋÐūÐēÐĩŅ€Ņ…Ð―ÐūŅŅ‚Ðļ.)МаКŅÐļОаÐŧŅŒÐ―аŅ ÐēŅ‹ŅÐūŅ‚а ÐļÐ―ÐīÐļКаŅ‚ÐūŅ€Ð°$(/t)$(): 40$(br2)$(thing)ВÐļÐīŅ‹ ÐšÐ°ÐžÐ―ÐĩÐđ$(): АŅ€ÐģÐļÐŧÐŧÐļŅ‚, АŅ€ÐģÐļÐŧÐŧÐļŅ‚, БазаÐŧŅŒŅ‚, Ð“Ð°ÐąÐąŅ€Ðū, ГŅ€Ð°Ð―ÐļŅ‚, ДаŅ†ÐļŅ‚, ДÐļÐūŅ€ÐļŅ‚, ДÐūÐŧÐūОÐļŅ‚, ИзÐēÐĩŅŅ‚Ð―ŅÐš, КÐēаŅ€Ņ†ÐļŅ‚, КÐūÐ―ÐģÐŧÐūОÐĩŅ€Ð°Ņ‚, КŅ€Ð°ŅÐ―Ņ‹Ðđ ÐģŅ€Ð°Ð―ÐļŅ‚, КŅ€ÐĩÐžÐ―ÐļŅŅ‚Ņ‹Ðđ ŅÐŧÐ°Ð―ÐĩŅ†, МÐĩÐŧ, ÐĄÐŧÐ°Ð―ÐĩŅ†, ÐĒŅ€Ð°Ņ…ÐļŅ‚", "title": "ÐĄŅ„аÐŧÐĩŅ€ÐļŅ‚ & ГаÐŧÐĩÐ―Ð°", "type": "patchouli:text", "anchor": "mars_surface_nickel_galena" @@ -1916,7 +1916,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)$(t:ВÐĩŅ€ÐūŅŅ‚Ð―ÐūŅŅ‚ŅŒ ÐģÐĩÐ―ÐĩŅ€Ð°Ņ†ÐļÐļ ÐķÐļÐŧŅ‹ Ðē Ņ‡Ð°Ð―КÐĩ. ЧÐĩО ОÐĩÐ―ŅŒŅˆÐĩ Ð·Ð―Ð°ÐžÐĩÐ―Ð°Ņ‚ÐĩÐŧŅŒ(ÐēŅ‚ÐūŅ€ÐūÐĩ Ņ‡ÐļŅÐŧÐū), Ņ‚ÐĩО Ņ‡Ð°Ņ‰Ðĩ ÐēŅŅ‚Ņ€ÐĩŅ‡Ð°ÐĩŅ‚ŅŅ.)РÐĩÐīКÐūŅŅ‚ŅŒ$(/t)$(): 1/210 Ð―Ð° Ņ‡Ð°Ð―К$(br)$(thing)$(t:ÐĄÐūÐīÐĩŅ€ÐķÐ°Ð―ÐļÐĩ ÐąÐŧÐūКÐūÐē Ņ€ŅƒÐīŅ‹ Ðē ÐķÐļÐŧÐĩ заОÐĩÐ―ŅŅŽŅ‰ÐļŅ… КаОÐĩÐ―ŅŒ. БÐūÐŧŅŒŅˆÐĩÐĩ Ð·Ð―Ð°Ņ‡ÐĩÐ―ÐļÐĩ ÐūÐ·Ð―Ð°Ņ‡Ð°ÐĩŅ‚ ÐąÐūÐŧŅŒŅˆÐĩ Ņ€ŅƒÐīŅ‹.)ПÐŧÐūŅ‚Ð―ÐūŅŅ‚ŅŒ$(/t)$(): 40%$(br)$(thing)$(t:ÐĪÐūŅ€ÐžÐ° ÐķÐļÐŧŅ‹.)ВÐļÐī$(/t)$(): $(t:ЗаŅ‡Ð°ŅŅ‚ŅƒŅŽ КŅ€ŅƒÐģÐŧÐūÐđ Ņ„ÐūŅ€ÐžŅ‹)КÐŧаŅŅ‚ÐĩŅ€Ð―аŅ ÐķÐļÐŧа$(/t)$(br)$(thing)$(t:ÐĢŅ€ÐūÐēÐ―Ðļ Y, ОÐĩÐķÐīŅƒ КÐūŅ‚ÐūŅ€Ņ‹ÐžÐļ ОÐūÐķÐĩŅ‚ ŅÐģÐĩÐ―ÐĩŅ€ÐļŅ€ÐūÐēаŅ‚ŅŒŅŅ ÐķÐļÐŧа.)Y-ŅƒŅ€ÐūÐēÐĩÐ―ŅŒ$(/t)$(): 0 — 70$(br)$(thing)(t:ÐĄŅ€ÐĩÐīÐ―ÐļÐđ ÐīÐļаОÐĩŅ‚Ņ€ ÐķÐļÐŧŅ‹)РазОÐĩŅ€$(/t)$(): 40$(br)$(thing)$(t:ЕŅÐŧÐļ Ņ€Ð°ŅŅŅ‚ÐūŅÐ―ÐļÐĩ ОÐĩÐķÐīŅƒ ÐŋÐūÐēÐĩŅ€Ņ…Ð―ÐūŅŅ‚ŅŒŅŽ Ðļ ÐķÐļÐŧÐūÐđ ÐąÐūÐŧŅŒŅˆÐĩ Ņ‡ÐĩО ŅŅ‚Ðū Ņ‡ÐļŅÐŧÐū, Ņ‚Ðū ÐķÐļÐŧа Ð―Ðĩ ŅÐģÐĩÐ―ÐĩÐ―Ņ€ÐļŅ€ŅƒÐĩŅ‚ ÐļÐ―ÐīÐļКаŅ‚ÐūŅ€Ņ‹ Ð―Ð° ÐŋÐūÐēÐĩŅ€Ņ…Ð―ÐūŅŅ‚Ðļ.)МаКŅÐļОаÐŧŅŒÐ―аŅ ÐēŅ‹ŅÐūŅ‚а ÐļÐ―ÐīÐļКаŅ‚ÐūŅ€Ð°$(/t)$(): 40$(br2)$(thing)ВÐļÐīŅ‹ ÐšÐ°ÐžÐ―ÐĩÐđ$(): АŅ€ÐģÐļÐŧÐŧÐļŅ‚, БазаÐŧŅŒŅ‚, Ð“Ð°ÐąÐąŅ€Ðū, ДаŅ†ÐļŅ‚, ДÐļÐūŅ€ÐļŅ‚, ДÐūÐŧÐūОÐļŅ‚, КŅ€Ð°ŅÐ―Ņ‹Ðđ ÐģŅ€Ð°Ð―ÐļŅ‚, КŅ€ÐĩÐžÐ―ÐļŅŅ‚Ņ‹Ðđ ŅÐŧÐ°Ð―ÐĩŅ†, МÐĩÐŧ, ÐĄÐŧÐ°Ð―ÐĩŅ†, ÐĒŅ€Ð°Ņ…ÐļŅ‚", + "text": "$(thing)$(t:ВÐĩŅ€ÐūŅŅ‚Ð―ÐūŅŅ‚ŅŒ ÐģÐĩÐ―ÐĩŅ€Ð°Ņ†ÐļÐļ ÐķÐļÐŧŅ‹ Ðē Ņ‡Ð°Ð―КÐĩ. ЧÐĩО ОÐĩÐ―ŅŒŅˆÐĩ Ð·Ð―Ð°ÐžÐĩÐ―Ð°Ņ‚ÐĩÐŧŅŒ(ÐēŅ‚ÐūŅ€ÐūÐĩ Ņ‡ÐļŅÐŧÐū), Ņ‚ÐĩО Ņ‡Ð°Ņ‰Ðĩ ÐēŅŅ‚Ņ€ÐĩŅ‡Ð°ÐĩŅ‚ŅŅ.)РÐĩÐīКÐūŅŅ‚ŅŒ$(/t)$(): 1/210 Ð―Ð° Ņ‡Ð°Ð―К$(br)$(thing)$(t:ÐĄÐūÐīÐĩŅ€ÐķÐ°Ð―ÐļÐĩ ÐąÐŧÐūКÐūÐē Ņ€ŅƒÐīŅ‹ Ðē ÐķÐļÐŧÐĩ заОÐĩÐ―ŅŅŽŅ‰ÐļŅ… КаОÐĩÐ―ŅŒ. БÐūÐŧŅŒŅˆÐĩÐĩ Ð·Ð―Ð°Ņ‡ÐĩÐ―ÐļÐĩ ÐūÐ·Ð―Ð°Ņ‡Ð°ÐĩŅ‚ ÐąÐūÐŧŅŒŅˆÐĩ Ņ€ŅƒÐīŅ‹.)ПÐŧÐūŅ‚Ð―ÐūŅŅ‚ŅŒ$(/t)$(): 40%$(br)$(thing)$(t:ÐĪÐūŅ€ÐžÐ° ÐķÐļÐŧŅ‹.)ВÐļÐī$(/t)$(): $(t:ЗаŅ‡Ð°ŅŅ‚ŅƒŅŽ КŅ€ŅƒÐģÐŧÐūÐđ Ņ„ÐūŅ€ÐžŅ‹)КÐŧаŅŅ‚ÐĩŅ€Ð―аŅ ÐķÐļÐŧа$(/t)$(br)$(thing)$(t:ÐĢŅ€ÐūÐēÐ―Ðļ Y, ОÐĩÐķÐīŅƒ КÐūŅ‚ÐūŅ€Ņ‹ÐžÐļ ОÐūÐķÐĩŅ‚ ŅÐģÐĩÐ―ÐĩŅ€ÐļŅ€ÐūÐēаŅ‚ŅŒŅŅ ÐķÐļÐŧа.)Y-ŅƒŅ€ÐūÐēÐĩÐ―ŅŒ$(/t)$(): 0 — 70$(br)$(thing)(t:ÐĄŅ€ÐĩÐīÐ―ÐļÐđ ÐīÐļаОÐĩŅ‚Ņ€ ÐķÐļÐŧŅ‹)РазОÐĩŅ€$(/t)$(): 40$(br)$(thing)$(t:ЕŅÐŧÐļ Ņ€Ð°ŅŅŅ‚ÐūŅÐ―ÐļÐĩ ОÐĩÐķÐīŅƒ ÐŋÐūÐēÐĩŅ€Ņ…Ð―ÐūŅŅ‚ŅŒŅŽ Ðļ ÐķÐļÐŧÐūÐđ ÐąÐūÐŧŅŒŅˆÐĩ Ņ‡ÐĩО ŅŅ‚Ðū Ņ‡ÐļŅÐŧÐū, Ņ‚Ðū ÐķÐļÐŧа Ð―Ðĩ ŅÐģÐĩÐ―ÐĩÐ―Ņ€ÐļŅ€ŅƒÐĩŅ‚ ÐļÐ―ÐīÐļКаŅ‚ÐūŅ€Ņ‹ Ð―Ð° ÐŋÐūÐēÐĩŅ€Ņ…Ð―ÐūŅŅ‚Ðļ.)МаКŅÐļОаÐŧŅŒÐ―аŅ ÐēŅ‹ŅÐūŅ‚а ÐļÐ―ÐīÐļКаŅ‚ÐūŅ€Ð°$(/t)$(): 40$(br2)$(thing)ВÐļÐīŅ‹ ÐšÐ°ÐžÐ―ÐĩÐđ$(): АŅ€ÐģÐļÐŧÐŧÐļŅ‚, БазаÐŧŅŒŅ‚, Ð“Ð°ÐąÐąŅ€Ðū, ДаŅ†ÐļŅ‚, ДÐļÐūŅ€ÐļŅ‚, ДÐūÐŧÐūОÐļŅ‚, КÐēаŅ€Ņ†ÐļŅ‚, КŅ€Ð°ŅÐ―Ņ‹Ðđ ÐģŅ€Ð°Ð―ÐļŅ‚, КŅ€ÐĩÐžÐ―ÐļŅŅ‚Ņ‹Ðđ ŅÐŧÐ°Ð―ÐĩŅ†, МÐĩÐŧ, ÐĄÐŧÐ°Ð―ÐĩŅ†, ÐĒŅ€Ð°Ņ…ÐļŅ‚", "title": "ÐĒÐĩŅ‚Ņ€Ð°ŅÐīŅ€ÐļŅ‚ (ÐūÐąŅ‹Ņ‡Ð―Ņ‹Ðđ)", "type": "patchouli:text", "anchor": "mars_stibnite" @@ -2008,7 +2008,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)$(t:ВÐĩŅ€ÐūŅŅ‚Ð―ÐūŅŅ‚ŅŒ ÐģÐĩÐ―ÐĩŅ€Ð°Ņ†ÐļÐļ ÐķÐļÐŧŅ‹ Ðē Ņ‡Ð°Ð―КÐĩ. ЧÐĩО ОÐĩÐ―ŅŒŅˆÐĩ Ð·Ð―Ð°ÐžÐĩÐ―Ð°Ņ‚ÐĩÐŧŅŒ(ÐēŅ‚ÐūŅ€ÐūÐĩ Ņ‡ÐļŅÐŧÐū), Ņ‚ÐĩО Ņ‡Ð°Ņ‰Ðĩ ÐēŅŅ‚Ņ€ÐĩŅ‡Ð°ÐĩŅ‚ŅŅ.)РÐĩÐīКÐūŅŅ‚ŅŒ$(/t)$(): 1/140 Ð―Ð° Ņ‡Ð°Ð―К$(br)$(thing)$(t:ÐĄÐūÐīÐĩŅ€ÐķÐ°Ð―ÐļÐĩ ÐąÐŧÐūКÐūÐē Ņ€ŅƒÐīŅ‹ Ðē ÐķÐļÐŧÐĩ заОÐĩÐ―ŅŅŽŅ‰ÐļŅ… КаОÐĩÐ―ŅŒ. БÐūÐŧŅŒŅˆÐĩÐĩ Ð·Ð―Ð°Ņ‡ÐĩÐ―ÐļÐĩ ÐūÐ·Ð―Ð°Ņ‡Ð°ÐĩŅ‚ ÐąÐūÐŧŅŒŅˆÐĩ Ņ€ŅƒÐīŅ‹.)ПÐŧÐūŅ‚Ð―ÐūŅŅ‚ŅŒ$(/t)$(): 25%$(br)$(thing)$(t:ÐĪÐūŅ€ÐžÐ° ÐķÐļÐŧŅ‹.)ВÐļÐī$(/t)$(): $(t:ЗаŅ‡Ð°ŅŅ‚ŅƒŅŽ КŅ€ŅƒÐģÐŧÐūÐđ Ņ„ÐūŅ€ÐžŅ‹)КÐŧаŅŅ‚ÐĩŅ€Ð―аŅ ÐķÐļÐŧа$(/t)$(br)$(thing)$(t:ÐĢŅ€ÐūÐēÐ―Ðļ Y, ОÐĩÐķÐīŅƒ КÐūŅ‚ÐūŅ€Ņ‹ÐžÐļ ОÐūÐķÐĩŅ‚ ŅÐģÐĩÐ―ÐĩŅ€ÐļŅ€ÐūÐēаŅ‚ŅŒŅŅ ÐķÐļÐŧа.)Y-ŅƒŅ€ÐūÐēÐĩÐ―ŅŒ$(/t)$(): 80 — 180$(br)$(thing)(t:ÐĄŅ€ÐĩÐīÐ―ÐļÐđ ÐīÐļаОÐĩŅ‚Ņ€ ÐķÐļÐŧŅ‹)РазОÐĩŅ€$(/t)$(): 45$(br)$(thing)$(t:ЕŅÐŧÐļ Ņ€Ð°ŅŅŅ‚ÐūŅÐ―ÐļÐĩ ОÐĩÐķÐīŅƒ ÐŋÐūÐēÐĩŅ€Ņ…Ð―ÐūŅŅ‚ŅŒŅŽ Ðļ ÐķÐļÐŧÐūÐđ ÐąÐūÐŧŅŒŅˆÐĩ Ņ‡ÐĩО ŅŅ‚Ðū Ņ‡ÐļŅÐŧÐū, Ņ‚Ðū ÐķÐļÐŧа Ð―Ðĩ ŅÐģÐĩÐ―ÐĩÐ―Ņ€ÐļŅ€ŅƒÐĩŅ‚ ÐļÐ―ÐīÐļКаŅ‚ÐūŅ€Ņ‹ Ð―Ð° ÐŋÐūÐēÐĩŅ€Ņ…Ð―ÐūŅŅ‚Ðļ.)МаКŅÐļОаÐŧŅŒÐ―аŅ ÐēŅ‹ŅÐūŅ‚а ÐļÐ―ÐīÐļКаŅ‚ÐūŅ€Ð°$(/t)$(): 40$(br2)$(thing)ВÐļÐīŅ‹ ÐšÐ°ÐžÐ―ÐĩÐđ$(): АŅ€ÐģÐļÐŧÐŧÐļŅ‚, АŅ€ÐģÐļÐŧÐŧÐļŅ‚, БазаÐŧŅŒŅ‚, Ð“Ð°ÐąÐąŅ€Ðū, ГŅ€Ð°Ð―ÐļŅ‚, ДаŅ†ÐļŅ‚, ДÐļÐūŅ€ÐļŅ‚, ДÐūÐŧÐūОÐļŅ‚, ИзÐēÐĩŅŅ‚Ð―ŅÐš, КÐūÐ―ÐģÐŧÐūОÐĩŅ€Ð°Ņ‚, КŅ€Ð°ŅÐ―Ņ‹Ðđ ÐģŅ€Ð°Ð―ÐļŅ‚, КŅ€ÐĩÐžÐ―ÐļŅŅ‚Ņ‹Ðđ ŅÐŧÐ°Ð―ÐĩŅ†, МÐĩÐŧ, ÐĄÐŧÐ°Ð―ÐĩŅ†, ÐĒŅ€Ð°Ņ…ÐļŅ‚", + "text": "$(thing)$(t:ВÐĩŅ€ÐūŅŅ‚Ð―ÐūŅŅ‚ŅŒ ÐģÐĩÐ―ÐĩŅ€Ð°Ņ†ÐļÐļ ÐķÐļÐŧŅ‹ Ðē Ņ‡Ð°Ð―КÐĩ. ЧÐĩО ОÐĩÐ―ŅŒŅˆÐĩ Ð·Ð―Ð°ÐžÐĩÐ―Ð°Ņ‚ÐĩÐŧŅŒ(ÐēŅ‚ÐūŅ€ÐūÐĩ Ņ‡ÐļŅÐŧÐū), Ņ‚ÐĩО Ņ‡Ð°Ņ‰Ðĩ ÐēŅŅ‚Ņ€ÐĩŅ‡Ð°ÐĩŅ‚ŅŅ.)РÐĩÐīКÐūŅŅ‚ŅŒ$(/t)$(): 1/140 Ð―Ð° Ņ‡Ð°Ð―К$(br)$(thing)$(t:ÐĄÐūÐīÐĩŅ€ÐķÐ°Ð―ÐļÐĩ ÐąÐŧÐūКÐūÐē Ņ€ŅƒÐīŅ‹ Ðē ÐķÐļÐŧÐĩ заОÐĩÐ―ŅŅŽŅ‰ÐļŅ… КаОÐĩÐ―ŅŒ. БÐūÐŧŅŒŅˆÐĩÐĩ Ð·Ð―Ð°Ņ‡ÐĩÐ―ÐļÐĩ ÐūÐ·Ð―Ð°Ņ‡Ð°ÐĩŅ‚ ÐąÐūÐŧŅŒŅˆÐĩ Ņ€ŅƒÐīŅ‹.)ПÐŧÐūŅ‚Ð―ÐūŅŅ‚ŅŒ$(/t)$(): 25%$(br)$(thing)$(t:ÐĪÐūŅ€ÐžÐ° ÐķÐļÐŧŅ‹.)ВÐļÐī$(/t)$(): $(t:ЗаŅ‡Ð°ŅŅ‚ŅƒŅŽ КŅ€ŅƒÐģÐŧÐūÐđ Ņ„ÐūŅ€ÐžŅ‹)КÐŧаŅŅ‚ÐĩŅ€Ð―аŅ ÐķÐļÐŧа$(/t)$(br)$(thing)$(t:ÐĢŅ€ÐūÐēÐ―Ðļ Y, ОÐĩÐķÐīŅƒ КÐūŅ‚ÐūŅ€Ņ‹ÐžÐļ ОÐūÐķÐĩŅ‚ ŅÐģÐĩÐ―ÐĩŅ€ÐļŅ€ÐūÐēаŅ‚ŅŒŅŅ ÐķÐļÐŧа.)Y-ŅƒŅ€ÐūÐēÐĩÐ―ŅŒ$(/t)$(): 80 — 180$(br)$(thing)(t:ÐĄŅ€ÐĩÐīÐ―ÐļÐđ ÐīÐļаОÐĩŅ‚Ņ€ ÐķÐļÐŧŅ‹)РазОÐĩŅ€$(/t)$(): 45$(br)$(thing)$(t:ЕŅÐŧÐļ Ņ€Ð°ŅŅŅ‚ÐūŅÐ―ÐļÐĩ ОÐĩÐķÐīŅƒ ÐŋÐūÐēÐĩŅ€Ņ…Ð―ÐūŅŅ‚ŅŒŅŽ Ðļ ÐķÐļÐŧÐūÐđ ÐąÐūÐŧŅŒŅˆÐĩ Ņ‡ÐĩО ŅŅ‚Ðū Ņ‡ÐļŅÐŧÐū, Ņ‚Ðū ÐķÐļÐŧа Ð―Ðĩ ŅÐģÐĩÐ―ÐĩÐ―Ņ€ÐļŅ€ŅƒÐĩŅ‚ ÐļÐ―ÐīÐļКаŅ‚ÐūŅ€Ņ‹ Ð―Ð° ÐŋÐūÐēÐĩŅ€Ņ…Ð―ÐūŅŅ‚Ðļ.)МаКŅÐļОаÐŧŅŒÐ―аŅ ÐēŅ‹ŅÐūŅ‚а ÐļÐ―ÐīÐļКаŅ‚ÐūŅ€Ð°$(/t)$(): 40$(br2)$(thing)ВÐļÐīŅ‹ ÐšÐ°ÐžÐ―ÐĩÐđ$(): АŅ€ÐģÐļÐŧÐŧÐļŅ‚, АŅ€ÐģÐļÐŧÐŧÐļŅ‚, БазаÐŧŅŒŅ‚, Ð“Ð°ÐąÐąŅ€Ðū, ГŅ€Ð°Ð―ÐļŅ‚, ДаŅ†ÐļŅ‚, ДÐļÐūŅ€ÐļŅ‚, ДÐūÐŧÐūОÐļŅ‚, ИзÐēÐĩŅŅ‚Ð―ŅÐš, КÐēаŅ€Ņ†ÐļŅ‚, КÐūÐ―ÐģÐŧÐūОÐĩŅ€Ð°Ņ‚, КŅ€Ð°ŅÐ―Ņ‹Ðđ ÐģŅ€Ð°Ð―ÐļŅ‚, КŅ€ÐĩÐžÐ―ÐļŅŅ‚Ņ‹Ðđ ŅÐŧÐ°Ð―ÐĩŅ†, МÐĩÐŧ, ÐĄÐŧÐ°Ð―ÐĩŅ†, ÐĒŅ€Ð°Ņ…ÐļŅ‚", "title": "ÐĒÐĩŅ‚Ņ€Ð°ŅÐīŅ€ÐļŅ‚ (ПÐūÐēÐĩŅ€Ņ…Ð―ÐūŅŅ‚Ð―Ņ‹Ðđ)", "type": "patchouli:text", "anchor": "mars_surface_tetrahedrite" @@ -2100,7 +2100,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)$(t:ВÐĩŅ€ÐūŅŅ‚Ð―ÐūŅŅ‚ŅŒ ÐģÐĩÐ―ÐĩŅ€Ð°Ņ†ÐļÐļ ÐķÐļÐŧŅ‹ Ðē Ņ‡Ð°Ð―КÐĩ. ЧÐĩО ОÐĩÐ―ŅŒŅˆÐĩ Ð·Ð―Ð°ÐžÐĩÐ―Ð°Ņ‚ÐĩÐŧŅŒ(ÐēŅ‚ÐūŅ€ÐūÐĩ Ņ‡ÐļŅÐŧÐū), Ņ‚ÐĩО Ņ‡Ð°Ņ‰Ðĩ ÐēŅŅ‚Ņ€ÐĩŅ‡Ð°ÐĩŅ‚ŅŅ.)РÐĩÐīКÐūŅŅ‚ŅŒ$(/t)$(): 1/220 Ð―Ð° Ņ‡Ð°Ð―К$(br)$(thing)$(t:ÐĄÐūÐīÐĩŅ€ÐķÐ°Ð―ÐļÐĩ ÐąÐŧÐūКÐūÐē Ņ€ŅƒÐīŅ‹ Ðē ÐķÐļÐŧÐĩ заОÐĩÐ―ŅŅŽŅ‰ÐļŅ… КаОÐĩÐ―ŅŒ. БÐūÐŧŅŒŅˆÐĩÐĩ Ð·Ð―Ð°Ņ‡ÐĩÐ―ÐļÐĩ ÐūÐ·Ð―Ð°Ņ‡Ð°ÐĩŅ‚ ÐąÐūÐŧŅŒŅˆÐĩ Ņ€ŅƒÐīŅ‹.)ПÐŧÐūŅ‚Ð―ÐūŅŅ‚ŅŒ$(/t)$(): 25%$(br)$(thing)$(t:ÐĪÐūŅ€ÐžÐ° ÐķÐļÐŧŅ‹.)ВÐļÐī$(/t)$(): $(t:ЗаŅ‡Ð°ŅŅ‚ŅƒŅŽ КŅ€ŅƒÐģÐŧÐūÐđ Ņ„ÐūŅ€ÐžŅ‹)КÐŧаŅŅ‚ÐĩŅ€Ð―аŅ ÐķÐļÐŧа$(/t)$(br)$(thing)$(t:ÐĢŅ€ÐūÐēÐ―Ðļ Y, ОÐĩÐķÐīŅƒ КÐūŅ‚ÐūŅ€Ņ‹ÐžÐļ ОÐūÐķÐĩŅ‚ ŅÐģÐĩÐ―ÐĩŅ€ÐļŅ€ÐūÐēаŅ‚ŅŒŅŅ ÐķÐļÐŧа.)Y-ŅƒŅ€ÐūÐēÐĩÐ―ŅŒ$(/t)$(): 0 — 70$(br)$(thing)(t:ÐĄŅ€ÐĩÐīÐ―ÐļÐđ ÐīÐļаОÐĩŅ‚Ņ€ ÐķÐļÐŧŅ‹)РазОÐĩŅ€$(/t)$(): 40$(br)$(thing)$(t:ЕŅÐŧÐļ Ņ€Ð°ŅŅŅ‚ÐūŅÐ―ÐļÐĩ ОÐĩÐķÐīŅƒ ÐŋÐūÐēÐĩŅ€Ņ…Ð―ÐūŅŅ‚ŅŒŅŽ Ðļ ÐķÐļÐŧÐūÐđ ÐąÐūÐŧŅŒŅˆÐĩ Ņ‡ÐĩО ŅŅ‚Ðū Ņ‡ÐļŅÐŧÐū, Ņ‚Ðū ÐķÐļÐŧа Ð―Ðĩ ŅÐģÐĩÐ―ÐĩÐ―Ņ€ÐļŅ€ŅƒÐĩŅ‚ ÐļÐ―ÐīÐļКаŅ‚ÐūŅ€Ņ‹ Ð―Ð° ÐŋÐūÐēÐĩŅ€Ņ…Ð―ÐūŅŅ‚Ðļ.)МаКŅÐļОаÐŧŅŒÐ―аŅ ÐēŅ‹ŅÐūŅ‚а ÐļÐ―ÐīÐļКаŅ‚ÐūŅ€Ð°$(/t)$(): 15$(br2)$(thing)ВÐļÐīŅ‹ ÐšÐ°ÐžÐ―ÐĩÐđ$(): АŅ€ÐģÐļÐŧÐŧÐļŅ‚, АŅ€ÐģÐļÐŧÐŧÐļŅ‚, ГŅ€Ð°Ð―ÐļŅ‚, ДаŅ†ÐļŅ‚, ДÐļÐūŅ€ÐļŅ‚, ДÐūÐŧÐūОÐļŅ‚, ИзÐēÐĩŅŅ‚Ð―ŅÐš, КÐūÐ―ÐģÐŧÐūОÐĩŅ€Ð°Ņ‚, КŅ€Ð°ŅÐ―Ņ‹Ðđ ÐģŅ€Ð°Ð―ÐļŅ‚, ÐĄÐŧÐ°Ð―ÐĩŅ†", + "text": "$(thing)$(t:ВÐĩŅ€ÐūŅŅ‚Ð―ÐūŅŅ‚ŅŒ ÐģÐĩÐ―ÐĩŅ€Ð°Ņ†ÐļÐļ ÐķÐļÐŧŅ‹ Ðē Ņ‡Ð°Ð―КÐĩ. ЧÐĩО ОÐĩÐ―ŅŒŅˆÐĩ Ð·Ð―Ð°ÐžÐĩÐ―Ð°Ņ‚ÐĩÐŧŅŒ(ÐēŅ‚ÐūŅ€ÐūÐĩ Ņ‡ÐļŅÐŧÐū), Ņ‚ÐĩО Ņ‡Ð°Ņ‰Ðĩ ÐēŅŅ‚Ņ€ÐĩŅ‡Ð°ÐĩŅ‚ŅŅ.)РÐĩÐīКÐūŅŅ‚ŅŒ$(/t)$(): 1/220 Ð―Ð° Ņ‡Ð°Ð―К$(br)$(thing)$(t:ÐĄÐūÐīÐĩŅ€ÐķÐ°Ð―ÐļÐĩ ÐąÐŧÐūКÐūÐē Ņ€ŅƒÐīŅ‹ Ðē ÐķÐļÐŧÐĩ заОÐĩÐ―ŅŅŽŅ‰ÐļŅ… КаОÐĩÐ―ŅŒ. БÐūÐŧŅŒŅˆÐĩÐĩ Ð·Ð―Ð°Ņ‡ÐĩÐ―ÐļÐĩ ÐūÐ·Ð―Ð°Ņ‡Ð°ÐĩŅ‚ ÐąÐūÐŧŅŒŅˆÐĩ Ņ€ŅƒÐīŅ‹.)ПÐŧÐūŅ‚Ð―ÐūŅŅ‚ŅŒ$(/t)$(): 25%$(br)$(thing)$(t:ÐĪÐūŅ€ÐžÐ° ÐķÐļÐŧŅ‹.)ВÐļÐī$(/t)$(): $(t:ЗаŅ‡Ð°ŅŅ‚ŅƒŅŽ КŅ€ŅƒÐģÐŧÐūÐđ Ņ„ÐūŅ€ÐžŅ‹)КÐŧаŅŅ‚ÐĩŅ€Ð―аŅ ÐķÐļÐŧа$(/t)$(br)$(thing)$(t:ÐĢŅ€ÐūÐēÐ―Ðļ Y, ОÐĩÐķÐīŅƒ КÐūŅ‚ÐūŅ€Ņ‹ÐžÐļ ОÐūÐķÐĩŅ‚ ŅÐģÐĩÐ―ÐĩŅ€ÐļŅ€ÐūÐēаŅ‚ŅŒŅŅ ÐķÐļÐŧа.)Y-ŅƒŅ€ÐūÐēÐĩÐ―ŅŒ$(/t)$(): 0 — 70$(br)$(thing)(t:ÐĄŅ€ÐĩÐīÐ―ÐļÐđ ÐīÐļаОÐĩŅ‚Ņ€ ÐķÐļÐŧŅ‹)РазОÐĩŅ€$(/t)$(): 40$(br)$(thing)$(t:ЕŅÐŧÐļ Ņ€Ð°ŅŅŅ‚ÐūŅÐ―ÐļÐĩ ОÐĩÐķÐīŅƒ ÐŋÐūÐēÐĩŅ€Ņ…Ð―ÐūŅŅ‚ŅŒŅŽ Ðļ ÐķÐļÐŧÐūÐđ ÐąÐūÐŧŅŒŅˆÐĩ Ņ‡ÐĩО ŅŅ‚Ðū Ņ‡ÐļŅÐŧÐū, Ņ‚Ðū ÐķÐļÐŧа Ð―Ðĩ ŅÐģÐĩÐ―ÐĩÐ―Ņ€ÐļŅ€ŅƒÐĩŅ‚ ÐļÐ―ÐīÐļКаŅ‚ÐūŅ€Ņ‹ Ð―Ð° ÐŋÐūÐēÐĩŅ€Ņ…Ð―ÐūŅŅ‚Ðļ.)МаКŅÐļОаÐŧŅŒÐ―аŅ ÐēŅ‹ŅÐūŅ‚а ÐļÐ―ÐīÐļКаŅ‚ÐūŅ€Ð°$(/t)$(): 15$(br2)$(thing)ВÐļÐīŅ‹ ÐšÐ°ÐžÐ―ÐĩÐđ$(): АŅ€ÐģÐļÐŧÐŧÐļŅ‚, АŅ€ÐģÐļÐŧÐŧÐļŅ‚, ГŅ€Ð°Ð―ÐļŅ‚, ДаŅ†ÐļŅ‚, ДÐļÐūŅ€ÐļŅ‚, ДÐūÐŧÐūОÐļŅ‚, ИзÐēÐĩŅŅ‚Ð―ŅÐš, КÐēаŅ€Ņ†ÐļŅ‚, КÐūÐ―ÐģÐŧÐūОÐĩŅ€Ð°Ņ‚, КŅ€Ð°ŅÐ―Ņ‹Ðđ ÐģŅ€Ð°Ð―ÐļŅ‚, ÐĄÐŧÐ°Ð―ÐĩŅ†", "title": "ÐĒŅ€ÐūÐ―Ð°, ÐĒаÐŧŅŒÐš & ГÐŧаŅƒÐšÐūÐ―ÐļŅ‚Ņ‹", "type": "patchouli:text", "anchor": "mars_lubricant" @@ -2284,7 +2284,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)$(t:ВÐĩŅ€ÐūŅŅ‚Ð―ÐūŅŅ‚ŅŒ ÐģÐĩÐ―ÐĩŅ€Ð°Ņ†ÐļÐļ ÐķÐļÐŧŅ‹ Ðē Ņ‡Ð°Ð―КÐĩ. ЧÐĩО ОÐĩÐ―ŅŒŅˆÐĩ Ð·Ð―Ð°ÐžÐĩÐ―Ð°Ņ‚ÐĩÐŧŅŒ(ÐēŅ‚ÐūŅ€ÐūÐĩ Ņ‡ÐļŅÐŧÐū), Ņ‚ÐĩО Ņ‡Ð°Ņ‰Ðĩ ÐēŅŅ‚Ņ€ÐĩŅ‡Ð°ÐĩŅ‚ŅŅ.)РÐĩÐīКÐūŅŅ‚ŅŒ$(/t)$(): 1/370 Ð―Ð° Ņ‡Ð°Ð―К$(br)$(thing)$(t:ÐĄÐūÐīÐĩŅ€ÐķÐ°Ð―ÐļÐĩ ÐąÐŧÐūКÐūÐē Ņ€ŅƒÐīŅ‹ Ðē ÐķÐļÐŧÐĩ заОÐĩÐ―ŅŅŽŅ‰ÐļŅ… КаОÐĩÐ―ŅŒ. БÐūÐŧŅŒŅˆÐĩÐĩ Ð·Ð―Ð°Ņ‡ÐĩÐ―ÐļÐĩ ÐūÐ·Ð―Ð°Ņ‡Ð°ÐĩŅ‚ ÐąÐūÐŧŅŒŅˆÐĩ Ņ€ŅƒÐīŅ‹.)ПÐŧÐūŅ‚Ð―ÐūŅŅ‚ŅŒ$(/t)$(): 30%$(br)$(thing)$(t:ÐĪÐūŅ€ÐžÐ° ÐķÐļÐŧŅ‹.)ВÐļÐī$(/t)$(): $(t:ЗаŅ‡Ð°ŅŅ‚ŅƒŅŽ КŅ€ŅƒÐģÐŧÐūÐđ Ņ„ÐūŅ€ÐžŅ‹)КÐŧаŅŅ‚ÐĩŅ€Ð―аŅ ÐķÐļÐŧа$(/t)$(br)$(thing)$(t:ÐĢŅ€ÐūÐēÐ―Ðļ Y, ОÐĩÐķÐīŅƒ КÐūŅ‚ÐūŅ€Ņ‹ÐžÐļ ОÐūÐķÐĩŅ‚ ŅÐģÐĩÐ―ÐĩŅ€ÐļŅ€ÐūÐēаŅ‚ŅŒŅŅ ÐķÐļÐŧа.)Y-ŅƒŅ€ÐūÐēÐĩÐ―ŅŒ$(/t)$(): -20 — 0$(br)$(thing)(t:ÐĄŅ€ÐĩÐīÐ―ÐļÐđ ÐīÐļаОÐĩŅ‚Ņ€ ÐķÐļÐŧŅ‹)РазОÐĩŅ€$(/t)$(): 60$(br)$(thing)$(t:ЕŅÐŧÐļ Ņ€Ð°ŅŅŅ‚ÐūŅÐ―ÐļÐĩ ОÐĩÐķÐīŅƒ ÐŋÐūÐēÐĩŅ€Ņ…Ð―ÐūŅŅ‚ŅŒŅŽ Ðļ ÐķÐļÐŧÐūÐđ ÐąÐūÐŧŅŒŅˆÐĩ Ņ‡ÐĩО ŅŅ‚Ðū Ņ‡ÐļŅÐŧÐū, Ņ‚Ðū ÐķÐļÐŧа Ð―Ðĩ ŅÐģÐĩÐ―ÐĩÐ―Ņ€ÐļŅ€ŅƒÐĩŅ‚ ÐļÐ―ÐīÐļКаŅ‚ÐūŅ€Ņ‹ Ð―Ð° ÐŋÐūÐēÐĩŅ€Ņ…Ð―ÐūŅŅ‚Ðļ.)МаКŅÐļОаÐŧŅŒÐ―аŅ ÐēŅ‹ŅÐūŅ‚а ÐļÐ―ÐīÐļКаŅ‚ÐūŅ€Ð°$(/t)$(): 20$(br2)$(thing)ВÐļÐīŅ‹ ÐšÐ°ÐžÐ―ÐĩÐđ$(): АŅ€ÐģÐļÐŧÐŧÐļŅ‚, АŅ€ÐģÐļÐŧÐŧÐļŅ‚, Ð“Ð°ÐąÐąŅ€Ðū, ДаŅ†ÐļŅ‚, ДÐļÐūŅ€ÐļŅ‚, ÐĄÐŧÐ°Ð―ÐĩŅ†, ÐĒŅ€Ð°Ņ…ÐļŅ‚", + "text": "$(thing)$(t:ВÐĩŅ€ÐūŅŅ‚Ð―ÐūŅŅ‚ŅŒ ÐģÐĩÐ―ÐĩŅ€Ð°Ņ†ÐļÐļ ÐķÐļÐŧŅ‹ Ðē Ņ‡Ð°Ð―КÐĩ. ЧÐĩО ОÐĩÐ―ŅŒŅˆÐĩ Ð·Ð―Ð°ÐžÐĩÐ―Ð°Ņ‚ÐĩÐŧŅŒ(ÐēŅ‚ÐūŅ€ÐūÐĩ Ņ‡ÐļŅÐŧÐū), Ņ‚ÐĩО Ņ‡Ð°Ņ‰Ðĩ ÐēŅŅ‚Ņ€ÐĩŅ‡Ð°ÐĩŅ‚ŅŅ.)РÐĩÐīКÐūŅŅ‚ŅŒ$(/t)$(): 1/370 Ð―Ð° Ņ‡Ð°Ð―К$(br)$(thing)$(t:ÐĄÐūÐīÐĩŅ€ÐķÐ°Ð―ÐļÐĩ ÐąÐŧÐūКÐūÐē Ņ€ŅƒÐīŅ‹ Ðē ÐķÐļÐŧÐĩ заОÐĩÐ―ŅŅŽŅ‰ÐļŅ… КаОÐĩÐ―ŅŒ. БÐūÐŧŅŒŅˆÐĩÐĩ Ð·Ð―Ð°Ņ‡ÐĩÐ―ÐļÐĩ ÐūÐ·Ð―Ð°Ņ‡Ð°ÐĩŅ‚ ÐąÐūÐŧŅŒŅˆÐĩ Ņ€ŅƒÐīŅ‹.)ПÐŧÐūŅ‚Ð―ÐūŅŅ‚ŅŒ$(/t)$(): 30%$(br)$(thing)$(t:ÐĪÐūŅ€ÐžÐ° ÐķÐļÐŧŅ‹.)ВÐļÐī$(/t)$(): $(t:ЗаŅ‡Ð°ŅŅ‚ŅƒŅŽ КŅ€ŅƒÐģÐŧÐūÐđ Ņ„ÐūŅ€ÐžŅ‹)КÐŧаŅŅ‚ÐĩŅ€Ð―аŅ ÐķÐļÐŧа$(/t)$(br)$(thing)$(t:ÐĢŅ€ÐūÐēÐ―Ðļ Y, ОÐĩÐķÐīŅƒ КÐūŅ‚ÐūŅ€Ņ‹ÐžÐļ ОÐūÐķÐĩŅ‚ ŅÐģÐĩÐ―ÐĩŅ€ÐļŅ€ÐūÐēаŅ‚ŅŒŅŅ ÐķÐļÐŧа.)Y-ŅƒŅ€ÐūÐēÐĩÐ―ŅŒ$(/t)$(): -30 — 0$(br)$(thing)(t:ÐĄŅ€ÐĩÐīÐ―ÐļÐđ ÐīÐļаОÐĩŅ‚Ņ€ ÐķÐļÐŧŅ‹)РазОÐĩŅ€$(/t)$(): 60$(br)$(thing)$(t:ЕŅÐŧÐļ Ņ€Ð°ŅŅŅ‚ÐūŅÐ―ÐļÐĩ ОÐĩÐķÐīŅƒ ÐŋÐūÐēÐĩŅ€Ņ…Ð―ÐūŅŅ‚ŅŒŅŽ Ðļ ÐķÐļÐŧÐūÐđ ÐąÐūÐŧŅŒŅˆÐĩ Ņ‡ÐĩО ŅŅ‚Ðū Ņ‡ÐļŅÐŧÐū, Ņ‚Ðū ÐķÐļÐŧа Ð―Ðĩ ŅÐģÐĩÐ―ÐĩÐ―Ņ€ÐļŅ€ŅƒÐĩŅ‚ ÐļÐ―ÐīÐļКаŅ‚ÐūŅ€Ņ‹ Ð―Ð° ÐŋÐūÐēÐĩŅ€Ņ…Ð―ÐūŅŅ‚Ðļ.)МаКŅÐļОаÐŧŅŒÐ―аŅ ÐēŅ‹ŅÐūŅ‚а ÐļÐ―ÐīÐļКаŅ‚ÐūŅ€Ð°$(/t)$(): 20$(br2)$(thing)ВÐļÐīŅ‹ ÐšÐ°ÐžÐ―ÐĩÐđ$(): Ð“Ð°ÐąÐąŅ€Ðū, ГŅ€Ð°Ð―ÐļŅ‚, ДÐļÐūŅ€ÐļŅ‚, КŅ€Ð°ŅÐ―Ņ‹Ðđ ÐģŅ€Ð°Ð―ÐļŅ‚", "title": "ÐĢŅ€Ð°Ð―ÐļÐ―ÐļŅ‚, ÐĒÐūŅ€ÐļÐ°Ð―ÐļŅ‚, & ÐĢŅ€Ð°Ð―ÐļŅ‚", "type": "patchouli:text", "anchor": "deep_mars_pitchblende" @@ -2351,7 +2351,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)$(t:ВÐĩŅ€ÐūŅŅ‚Ð―ÐūŅŅ‚ŅŒ ÐģÐĩÐ―ÐĩŅ€Ð°Ņ†ÐļÐļ ÐķÐļÐŧŅ‹ Ðē Ņ‡Ð°Ð―КÐĩ. ЧÐĩО ОÐĩÐ―ŅŒŅˆÐĩ Ð·Ð―Ð°ÐžÐĩÐ―Ð°Ņ‚ÐĩÐŧŅŒ(ÐēŅ‚ÐūŅ€ÐūÐĩ Ņ‡ÐļŅÐŧÐū), Ņ‚ÐĩО Ņ‡Ð°Ņ‰Ðĩ ÐēŅŅ‚Ņ€ÐĩŅ‡Ð°ÐĩŅ‚ŅŅ.)РÐĩÐīКÐūŅŅ‚ŅŒ$(/t)$(): 1/220 Ð―Ð° Ņ‡Ð°Ð―К$(br)$(thing)$(t:ÐĄÐūÐīÐĩŅ€ÐķÐ°Ð―ÐļÐĩ ÐąÐŧÐūКÐūÐē Ņ€ŅƒÐīŅ‹ Ðē ÐķÐļÐŧÐĩ заОÐĩÐ―ŅŅŽŅ‰ÐļŅ… КаОÐĩÐ―ŅŒ. БÐūÐŧŅŒŅˆÐĩÐĩ Ð·Ð―Ð°Ņ‡ÐĩÐ―ÐļÐĩ ÐūÐ·Ð―Ð°Ņ‡Ð°ÐĩŅ‚ ÐąÐūÐŧŅŒŅˆÐĩ Ņ€ŅƒÐīŅ‹.)ПÐŧÐūŅ‚Ð―ÐūŅŅ‚ŅŒ$(/t)$(): 55%$(br)$(thing)$(t:ÐĪÐūŅ€ÐžÐ° ÐķÐļÐŧŅ‹.)ВÐļÐī$(/t)$(): $(t:ЗаŅ‡Ð°ŅŅ‚ŅƒŅŽ КŅ€ŅƒÐģÐŧÐūÐđ Ņ„ÐūŅ€ÐžŅ‹)КÐŧаŅŅ‚ÐĩŅ€Ð―аŅ ÐķÐļÐŧа$(/t)$(br)$(thing)$(t:ÐĢŅ€ÐūÐēÐ―Ðļ Y, ОÐĩÐķÐīŅƒ КÐūŅ‚ÐūŅ€Ņ‹ÐžÐļ ОÐūÐķÐĩŅ‚ ŅÐģÐĩÐ―ÐĩŅ€ÐļŅ€ÐūÐēаŅ‚ŅŒŅŅ ÐķÐļÐŧа.)Y-ŅƒŅ€ÐūÐēÐĩÐ―ŅŒ$(/t)$(): 0 — 70$(br)$(thing)(t:ÐĄŅ€ÐĩÐīÐ―ÐļÐđ ÐīÐļаОÐĩŅ‚Ņ€ ÐķÐļÐŧŅ‹)РазОÐĩŅ€$(/t)$(): 20$(br)$(thing)$(t:ЕŅÐŧÐļ Ņ€Ð°ŅŅŅ‚ÐūŅÐ―ÐļÐĩ ОÐĩÐķÐīŅƒ ÐŋÐūÐēÐĩŅ€Ņ…Ð―ÐūŅŅ‚ŅŒŅŽ Ðļ ÐķÐļÐŧÐūÐđ ÐąÐūÐŧŅŒŅˆÐĩ Ņ‡ÐĩО ŅŅ‚Ðū Ņ‡ÐļŅÐŧÐū, Ņ‚Ðū ÐķÐļÐŧа Ð―Ðĩ ŅÐģÐĩÐ―ÐĩÐ―Ņ€ÐļŅ€ŅƒÐĩŅ‚ ÐļÐ―ÐīÐļКаŅ‚ÐūŅ€Ņ‹ Ð―Ð° ÐŋÐūÐēÐĩŅ€Ņ…Ð―ÐūŅŅ‚Ðļ.)МаКŅÐļОаÐŧŅŒÐ―аŅ ÐēŅ‹ŅÐūŅ‚а ÐļÐ―ÐīÐļКаŅ‚ÐūŅ€Ð°$(/t)$(): 15$(br2)$(thing)ВÐļÐīŅ‹ ÐšÐ°ÐžÐ―ÐĩÐđ$(): АŅ€ÐģÐļÐŧÐŧÐļŅ‚, Ð“Ð°ÐąÐąŅ€Ðū, ДаŅ†ÐļŅ‚, ДÐļÐūŅ€ÐļŅ‚, ДÐūÐŧÐūОÐļŅ‚, КÐūÐ―ÐģÐŧÐūОÐĩŅ€Ð°Ņ‚, КŅ€Ð°ŅÐ―Ņ‹Ðđ ÐģŅ€Ð°Ð―ÐļŅ‚, ÐĄÐŧÐ°Ð―ÐĩŅ†, ÐĒŅ€Ð°Ņ…ÐļŅ‚", + "text": "$(thing)$(t:ВÐĩŅ€ÐūŅŅ‚Ð―ÐūŅŅ‚ŅŒ ÐģÐĩÐ―ÐĩŅ€Ð°Ņ†ÐļÐļ ÐķÐļÐŧŅ‹ Ðē Ņ‡Ð°Ð―КÐĩ. ЧÐĩО ОÐĩÐ―ŅŒŅˆÐĩ Ð·Ð―Ð°ÐžÐĩÐ―Ð°Ņ‚ÐĩÐŧŅŒ(ÐēŅ‚ÐūŅ€ÐūÐĩ Ņ‡ÐļŅÐŧÐū), Ņ‚ÐĩО Ņ‡Ð°Ņ‰Ðĩ ÐēŅŅ‚Ņ€ÐĩŅ‡Ð°ÐĩŅ‚ŅŅ.)РÐĩÐīКÐūŅŅ‚ŅŒ$(/t)$(): 1/220 Ð―Ð° Ņ‡Ð°Ð―К$(br)$(thing)$(t:ÐĄÐūÐīÐĩŅ€ÐķÐ°Ð―ÐļÐĩ ÐąÐŧÐūКÐūÐē Ņ€ŅƒÐīŅ‹ Ðē ÐķÐļÐŧÐĩ заОÐĩÐ―ŅŅŽŅ‰ÐļŅ… КаОÐĩÐ―ŅŒ. БÐūÐŧŅŒŅˆÐĩÐĩ Ð·Ð―Ð°Ņ‡ÐĩÐ―ÐļÐĩ ÐūÐ·Ð―Ð°Ņ‡Ð°ÐĩŅ‚ ÐąÐūÐŧŅŒŅˆÐĩ Ņ€ŅƒÐīŅ‹.)ПÐŧÐūŅ‚Ð―ÐūŅŅ‚ŅŒ$(/t)$(): 55%$(br)$(thing)$(t:ÐĪÐūŅ€ÐžÐ° ÐķÐļÐŧŅ‹.)ВÐļÐī$(/t)$(): $(t:ЗаŅ‡Ð°ŅŅ‚ŅƒŅŽ КŅ€ŅƒÐģÐŧÐūÐđ Ņ„ÐūŅ€ÐžŅ‹)КÐŧаŅŅ‚ÐĩŅ€Ð―аŅ ÐķÐļÐŧа$(/t)$(br)$(thing)$(t:ÐĢŅ€ÐūÐēÐ―Ðļ Y, ОÐĩÐķÐīŅƒ КÐūŅ‚ÐūŅ€Ņ‹ÐžÐļ ОÐūÐķÐĩŅ‚ ŅÐģÐĩÐ―ÐĩŅ€ÐļŅ€ÐūÐēаŅ‚ŅŒŅŅ ÐķÐļÐŧа.)Y-ŅƒŅ€ÐūÐēÐĩÐ―ŅŒ$(/t)$(): 0 — 70$(br)$(thing)(t:ÐĄŅ€ÐĩÐīÐ―ÐļÐđ ÐīÐļаОÐĩŅ‚Ņ€ ÐķÐļÐŧŅ‹)РазОÐĩŅ€$(/t)$(): 20$(br)$(thing)$(t:ЕŅÐŧÐļ Ņ€Ð°ŅŅŅ‚ÐūŅÐ―ÐļÐĩ ОÐĩÐķÐīŅƒ ÐŋÐūÐēÐĩŅ€Ņ…Ð―ÐūŅŅ‚ŅŒŅŽ Ðļ ÐķÐļÐŧÐūÐđ ÐąÐūÐŧŅŒŅˆÐĩ Ņ‡ÐĩО ŅŅ‚Ðū Ņ‡ÐļŅÐŧÐū, Ņ‚Ðū ÐķÐļÐŧа Ð―Ðĩ ŅÐģÐĩÐ―ÐĩÐ―Ņ€ÐļŅ€ŅƒÐĩŅ‚ ÐļÐ―ÐīÐļКаŅ‚ÐūŅ€Ņ‹ Ð―Ð° ÐŋÐūÐēÐĩŅ€Ņ…Ð―ÐūŅŅ‚Ðļ.)МаКŅÐļОаÐŧŅŒÐ―аŅ ÐēŅ‹ŅÐūŅ‚а ÐļÐ―ÐīÐļКаŅ‚ÐūŅ€Ð°$(/t)$(): 15$(br2)$(thing)ВÐļÐīŅ‹ ÐšÐ°ÐžÐ―ÐĩÐđ$(): АŅ€ÐģÐļÐŧÐŧÐļŅ‚, Ð“Ð°ÐąÐąŅ€Ðū, ДаŅ†ÐļŅ‚, ДÐļÐūŅ€ÐļŅ‚, ДÐūÐŧÐūОÐļŅ‚, КÐēаŅ€Ņ†ÐļŅ‚, КÐūÐ―ÐģÐŧÐūОÐĩŅ€Ð°Ņ‚, КŅ€Ð°ŅÐ―Ņ‹Ðđ ÐģŅ€Ð°Ð―ÐļŅ‚, ÐĄÐŧÐ°Ð―ÐĩŅ†, ÐĒŅ€Ð°Ņ…ÐļŅ‚", "title": "ÐĢŅ€Ð°Ð―ÐļŅ‚, ÐĒÐūŅ€ÐļÐđ & ГÐĩОаŅ‚ÐļŅ‚", "type": "patchouli:text", "anchor": "mars_pitchblende" diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/nether_vein_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/nether_vein_index.json index 9f46b9208..647ffad7d 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/nether_vein_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/nether_vein_index.json @@ -1115,7 +1115,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)$(t:ВÐĩŅ€ÐūŅŅ‚Ð―ÐūŅŅ‚ŅŒ ÐģÐĩÐ―ÐĩŅ€Ð°Ņ†ÐļÐļ ÐķÐļÐŧŅ‹ Ðē Ņ‡Ð°Ð―КÐĩ. ЧÐĩО ОÐĩÐ―ŅŒŅˆÐĩ Ð·Ð―Ð°ÐžÐĩÐ―Ð°Ņ‚ÐĩÐŧŅŒ(ÐēŅ‚ÐūŅ€ÐūÐĩ Ņ‡ÐļŅÐŧÐū), Ņ‚ÐĩО Ņ‡Ð°Ņ‰Ðĩ ÐēŅŅ‚Ņ€ÐĩŅ‡Ð°ÐĩŅ‚ŅŅ.)РÐĩÐīКÐūŅŅ‚ŅŒ$(/t)$(): 1/250 Ð―Ð° Ņ‡Ð°Ð―К$(br)$(thing)$(t:ÐĄÐūÐīÐĩŅ€ÐķÐ°Ð―ÐļÐĩ ÐąÐŧÐūКÐūÐē Ņ€ŅƒÐīŅ‹ Ðē ÐķÐļÐŧÐĩ заОÐĩÐ―ŅŅŽŅ‰ÐļŅ… КаОÐĩÐ―ŅŒ. БÐūÐŧŅŒŅˆÐĩÐĩ Ð·Ð―Ð°Ņ‡ÐĩÐ―ÐļÐĩ ÐūÐ·Ð―Ð°Ņ‡Ð°ÐĩŅ‚ ÐąÐūÐŧŅŒŅˆÐĩ Ņ€ŅƒÐīŅ‹.)ПÐŧÐūŅ‚Ð―ÐūŅŅ‚ŅŒ$(/t)$(): 45%$(br)$(thing)$(t:ÐĪÐūŅ€ÐžÐ° ÐķÐļÐŧŅ‹.)ВÐļÐī$(/t)$(): $(t:ВŅ‹ŅÐūКаŅ Ðļ ŅƒÐ·ÐšÐ°Ņ)ÐĒŅ€ŅƒÐąŅ‡Ð°Ņ‚аŅ ÐķÐļÐŧа$(/t)$(br)$(thing)$(t:ÐĢŅ€ÐūÐēÐ―Ðļ Y, ОÐĩÐķÐīŅƒ КÐūŅ‚ÐūŅ€Ņ‹ÐžÐļ ОÐūÐķÐĩŅ‚ ŅÐģÐĩÐ―ÐĩŅ€ÐļŅ€ÐūÐēаŅ‚ŅŒŅŅ ÐķÐļÐŧа.)Y-ŅƒŅ€ÐūÐēÐĩÐ―ŅŒ$(/t)$(): 32 — 128$(br)$(thing)ВŅ‹ŅÐūŅ‚а$(): 60$(br)$(thing)РаÐīÐļŅƒŅ$(): 12$(br2)$(thing)ВÐļÐīŅ‹ ÐšÐ°ÐžÐ―ÐĩÐđ$(): БазаÐŧŅŒŅ‚, МÐļÐģОаŅ‚ÐļŅ‚, ПÐļŅ€ÐūКŅÐĩÐ―ÐļŅ‚, ÐĒŅ€Ð°ÐēÐĩŅ€Ņ‚ÐļÐ―", + "text": "$(thing)$(t:ВÐĩŅ€ÐūŅŅ‚Ð―ÐūŅŅ‚ŅŒ ÐģÐĩÐ―ÐĩŅ€Ð°Ņ†ÐļÐļ ÐķÐļÐŧŅ‹ Ðē Ņ‡Ð°Ð―КÐĩ. ЧÐĩО ОÐĩÐ―ŅŒŅˆÐĩ Ð·Ð―Ð°ÐžÐĩÐ―Ð°Ņ‚ÐĩÐŧŅŒ(ÐēŅ‚ÐūŅ€ÐūÐĩ Ņ‡ÐļŅÐŧÐū), Ņ‚ÐĩО Ņ‡Ð°Ņ‰Ðĩ ÐēŅŅ‚Ņ€ÐĩŅ‡Ð°ÐĩŅ‚ŅŅ.)РÐĩÐīКÐūŅŅ‚ŅŒ$(/t)$(): 1/300 Ð―Ð° Ņ‡Ð°Ð―К$(br)$(thing)$(t:ÐĄÐūÐīÐĩŅ€ÐķÐ°Ð―ÐļÐĩ ÐąÐŧÐūКÐūÐē Ņ€ŅƒÐīŅ‹ Ðē ÐķÐļÐŧÐĩ заОÐĩÐ―ŅŅŽŅ‰ÐļŅ… КаОÐĩÐ―ŅŒ. БÐūÐŧŅŒŅˆÐĩÐĩ Ð·Ð―Ð°Ņ‡ÐĩÐ―ÐļÐĩ ÐūÐ·Ð―Ð°Ņ‡Ð°ÐĩŅ‚ ÐąÐūÐŧŅŒŅˆÐĩ Ņ€ŅƒÐīŅ‹.)ПÐŧÐūŅ‚Ð―ÐūŅŅ‚ŅŒ$(/t)$(): 45%$(br)$(thing)$(t:ÐĪÐūŅ€ÐžÐ° ÐķÐļÐŧŅ‹.)ВÐļÐī$(/t)$(): $(t:ВŅ‹ŅÐūКаŅ Ðļ ŅƒÐ·ÐšÐ°Ņ)ÐĒŅ€ŅƒÐąŅ‡Ð°Ņ‚аŅ ÐķÐļÐŧа$(/t)$(br)$(thing)$(t:ÐĢŅ€ÐūÐēÐ―Ðļ Y, ОÐĩÐķÐīŅƒ КÐūŅ‚ÐūŅ€Ņ‹ÐžÐļ ОÐūÐķÐĩŅ‚ ŅÐģÐĩÐ―ÐĩŅ€ÐļŅ€ÐūÐēаŅ‚ŅŒŅŅ ÐķÐļÐŧа.)Y-ŅƒŅ€ÐūÐēÐĩÐ―ŅŒ$(/t)$(): 32 — 128$(br)$(thing)ВŅ‹ŅÐūŅ‚а$(): 60$(br)$(thing)РаÐīÐļŅƒŅ$(): 12$(br2)$(thing)ВÐļÐīŅ‹ ÐšÐ°ÐžÐ―ÐĩÐđ$(): БазаÐŧŅŒŅ‚, МÐļÐģОаŅ‚ÐļŅ‚, ПÐļŅ€ÐūКŅÐĩÐ―ÐļŅ‚, ÐĒŅ€Ð°ÐēÐĩŅ€Ņ‚ÐļÐ―", "title": "ИзŅƒÐžŅ€ŅƒÐī Ðļ БÐĩŅ€ÐļÐŧÐŧÐļÐđ", "type": "patchouli:text", "anchor": "nether_beryllium" diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/venus_vein_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/venus_vein_index.json index ad813fd4e..a0e933ece 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/venus_vein_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/venus_vein_index.json @@ -19,7 +19,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)$(t:ВÐĩŅ€ÐūŅŅ‚Ð―ÐūŅŅ‚ŅŒ ÐģÐĩÐ―ÐĩŅ€Ð°Ņ†ÐļÐļ ÐķÐļÐŧŅ‹ Ðē Ņ‡Ð°Ð―КÐĩ. ЧÐĩО ОÐĩÐ―ŅŒŅˆÐĩ Ð·Ð―Ð°ÐžÐĩÐ―Ð°Ņ‚ÐĩÐŧŅŒ(ÐēŅ‚ÐūŅ€ÐūÐĩ Ņ‡ÐļŅÐŧÐū), Ņ‚ÐĩО Ņ‡Ð°Ņ‰Ðĩ ÐēŅŅ‚Ņ€ÐĩŅ‡Ð°ÐĩŅ‚ŅŅ.)РÐĩÐīКÐūŅŅ‚ŅŒ$(/t)$(): 1/30 Ð―Ð° Ņ‡Ð°Ð―К$(br)$(thing)$(t:ÐĄÐūÐīÐĩŅ€ÐķÐ°Ð―ÐļÐĩ ÐąÐŧÐūКÐūÐē Ņ€ŅƒÐīŅ‹ Ðē ÐķÐļÐŧÐĩ заОÐĩÐ―ŅŅŽŅ‰ÐļŅ… КаОÐĩÐ―ŅŒ. БÐūÐŧŅŒŅˆÐĩÐĩ Ð·Ð―Ð°Ņ‡ÐĩÐ―ÐļÐĩ ÐūÐ·Ð―Ð°Ņ‡Ð°ÐĩŅ‚ ÐąÐūÐŧŅŒŅˆÐĩ Ņ€ŅƒÐīŅ‹.)ПÐŧÐūŅ‚Ð―ÐūŅŅ‚ŅŒ$(/t)$(): 20%$(br)$(thing)$(t:ÐĪÐūŅ€ÐžÐ° ÐķÐļÐŧŅ‹.)ВÐļÐī$(/t)$(): $(t:ÐĻÐļŅ€ÐūКаŅ Ðļ ÐŋÐŧÐūŅÐšÐ°Ņ)ДÐļŅÐšÐūÐūÐąŅ€Ð°Ð·Ð―аŅ ÐķÐļÐŧа$(/t)$(br)$(thing)$(t:ÐĢŅ€ÐūÐēÐ―Ðļ Y, ОÐĩÐķÐīŅƒ КÐūŅ‚ÐūŅ€Ņ‹ÐžÐļ ОÐūÐķÐĩŅ‚ ŅÐģÐĩÐ―ÐĩŅ€ÐļŅ€ÐūÐēаŅ‚ŅŒŅŅ ÐķÐļÐŧа.)Y-ŅƒŅ€ÐūÐēÐĩÐ―ŅŒ$(/t)$(): 40 — 65$(br)$(thing)(t:ÐĄŅ€ÐĩÐīÐ―ÐļÐđ ÐīÐļаОÐĩŅ‚Ņ€ ÐķÐļÐŧŅ‹)РазОÐĩŅ€$(/t)$(): 20$(br)$(thing)ВŅ‹ŅÐūŅ‚а$(): 6$(br)$(thing)$(t:ЕŅÐŧÐļ Ņ€Ð°ŅŅŅ‚ÐūŅÐ―ÐļÐĩ ОÐĩÐķÐīŅƒ ÐŋÐūÐēÐĩŅ€Ņ…Ð―ÐūŅŅ‚ŅŒŅŽ Ðļ ÐķÐļÐŧÐūÐđ ÐąÐūÐŧŅŒŅˆÐĩ Ņ‡ÐĩО ŅŅ‚Ðū Ņ‡ÐļŅÐŧÐū, Ņ‚Ðū ÐķÐļÐŧа Ð―Ðĩ ŅÐģÐĩÐ―ÐĩÐ―Ņ€ÐļŅ€ŅƒÐĩŅ‚ ÐļÐ―ÐīÐļКаŅ‚ÐūŅ€Ņ‹ Ð―Ð° ÐŋÐūÐēÐĩŅ€Ņ…Ð―ÐūŅŅ‚Ðļ.)МаКŅÐļОаÐŧŅŒÐ―аŅ ÐēŅ‹ŅÐūŅ‚а ÐļÐ―ÐīÐļКаŅ‚ÐūŅ€Ð°$(/t)$(): 30$(br2)$(thing)ВÐļÐīŅ‹ ÐšÐ°ÐžÐ―ÐĩÐđ$(): ÐÐ―ÐīÐĩзÐļŅ‚, БазаÐŧŅŒŅ‚, ДаŅ†ÐļŅ‚, РÐļÐūÐŧÐļŅ‚, ÐĒŅ€Ð°ÐēÐĩŅ€Ņ‚ÐļÐ―, ÐĒŅ€Ð°Ņ…ÐļŅ‚$(br2)Only appears in the $(thing)Salt Flats$() biome.", + "text": "$(thing)$(t:ВÐĩŅ€ÐūŅŅ‚Ð―ÐūŅŅ‚ŅŒ ÐģÐĩÐ―ÐĩŅ€Ð°Ņ†ÐļÐļ ÐķÐļÐŧŅ‹ Ðē Ņ‡Ð°Ð―КÐĩ. ЧÐĩО ОÐĩÐ―ŅŒŅˆÐĩ Ð·Ð―Ð°ÐžÐĩÐ―Ð°Ņ‚ÐĩÐŧŅŒ(ÐēŅ‚ÐūŅ€ÐūÐĩ Ņ‡ÐļŅÐŧÐū), Ņ‚ÐĩО Ņ‡Ð°Ņ‰Ðĩ ÐēŅŅ‚Ņ€ÐĩŅ‡Ð°ÐĩŅ‚ŅŅ.)РÐĩÐīКÐūŅŅ‚ŅŒ$(/t)$(): 1/30 Ð―Ð° Ņ‡Ð°Ð―К$(br)$(thing)$(t:ÐĄÐūÐīÐĩŅ€ÐķÐ°Ð―ÐļÐĩ ÐąÐŧÐūКÐūÐē Ņ€ŅƒÐīŅ‹ Ðē ÐķÐļÐŧÐĩ заОÐĩÐ―ŅŅŽŅ‰ÐļŅ… КаОÐĩÐ―ŅŒ. БÐūÐŧŅŒŅˆÐĩÐĩ Ð·Ð―Ð°Ņ‡ÐĩÐ―ÐļÐĩ ÐūÐ·Ð―Ð°Ņ‡Ð°ÐĩŅ‚ ÐąÐūÐŧŅŒŅˆÐĩ Ņ€ŅƒÐīŅ‹.)ПÐŧÐūŅ‚Ð―ÐūŅŅ‚ŅŒ$(/t)$(): 20%$(br)$(thing)$(t:ÐĪÐūŅ€ÐžÐ° ÐķÐļÐŧŅ‹.)ВÐļÐī$(/t)$(): $(t:ÐĻÐļŅ€ÐūКаŅ Ðļ ÐŋÐŧÐūŅÐšÐ°Ņ)ДÐļŅÐšÐūÐūÐąŅ€Ð°Ð·Ð―аŅ ÐķÐļÐŧа$(/t)$(br)$(thing)$(t:ÐĢŅ€ÐūÐēÐ―Ðļ Y, ОÐĩÐķÐīŅƒ КÐūŅ‚ÐūŅ€Ņ‹ÐžÐļ ОÐūÐķÐĩŅ‚ ŅÐģÐĩÐ―ÐĩŅ€ÐļŅ€ÐūÐēаŅ‚ŅŒŅŅ ÐķÐļÐŧа.)Y-ŅƒŅ€ÐūÐēÐĩÐ―ŅŒ$(/t)$(): 40 — 65$(br)$(thing)(t:ÐĄŅ€ÐĩÐīÐ―ÐļÐđ ÐīÐļаОÐĩŅ‚Ņ€ ÐķÐļÐŧŅ‹)РазОÐĩŅ€$(/t)$(): 20$(br)$(thing)ВŅ‹ŅÐūŅ‚а$(): 6$(br)$(thing)$(t:ЕŅÐŧÐļ Ņ€Ð°ŅŅŅ‚ÐūŅÐ―ÐļÐĩ ОÐĩÐķÐīŅƒ ÐŋÐūÐēÐĩŅ€Ņ…Ð―ÐūŅŅ‚ŅŒŅŽ Ðļ ÐķÐļÐŧÐūÐđ ÐąÐūÐŧŅŒŅˆÐĩ Ņ‡ÐĩО ŅŅ‚Ðū Ņ‡ÐļŅÐŧÐū, Ņ‚Ðū ÐķÐļÐŧа Ð―Ðĩ ŅÐģÐĩÐ―ÐĩÐ―Ņ€ÐļŅ€ŅƒÐĩŅ‚ ÐļÐ―ÐīÐļКаŅ‚ÐūŅ€Ņ‹ Ð―Ð° ÐŋÐūÐēÐĩŅ€Ņ…Ð―ÐūŅŅ‚Ðļ.)МаКŅÐļОаÐŧŅŒÐ―аŅ ÐēŅ‹ŅÐūŅ‚а ÐļÐ―ÐīÐļКаŅ‚ÐūŅ€Ð°$(/t)$(): 30$(br2)$(thing)ВÐļÐīŅ‹ ÐšÐ°ÐžÐ―ÐĩÐđ$(): ÐÐ―ÐīÐĩзÐļŅ‚, БазаÐŧŅŒŅ‚, ДаŅ†ÐļŅ‚, ИÐģÐ―ÐļÐžÐąŅ€ÐļŅ‚, ЛаОÐŋŅ€ÐūÐļŅ‚, РÐļÐūÐŧÐļŅ‚, ÐĒŅ€Ð°ÐēÐĩŅ€Ņ‚ÐļÐ―, ÐĒŅ€Ð°Ņ…ÐļŅ‚$(br2)Only appears in the $(thing)Salt Flats$() biome.", "title": "Salts & Spodumene", "type": "patchouli:text", "anchor": "venus_manual_salt" @@ -111,7 +111,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)$(t:ВÐĩŅ€ÐūŅŅ‚Ð―ÐūŅŅ‚ŅŒ ÐģÐĩÐ―ÐĩŅ€Ð°Ņ†ÐļÐļ ÐķÐļÐŧŅ‹ Ðē Ņ‡Ð°Ð―КÐĩ. ЧÐĩО ОÐĩÐ―ŅŒŅˆÐĩ Ð·Ð―Ð°ÐžÐĩÐ―Ð°Ņ‚ÐĩÐŧŅŒ(ÐēŅ‚ÐūŅ€ÐūÐĩ Ņ‡ÐļŅÐŧÐū), Ņ‚ÐĩО Ņ‡Ð°Ņ‰Ðĩ ÐēŅŅ‚Ņ€ÐĩŅ‡Ð°ÐĩŅ‚ŅŅ.)РÐĩÐīКÐūŅŅ‚ŅŒ$(/t)$(): 1/30 Ð―Ð° Ņ‡Ð°Ð―К$(br)$(thing)$(t:ÐĄÐūÐīÐĩŅ€ÐķÐ°Ð―ÐļÐĩ ÐąÐŧÐūКÐūÐē Ņ€ŅƒÐīŅ‹ Ðē ÐķÐļÐŧÐĩ заОÐĩÐ―ŅŅŽŅ‰ÐļŅ… КаОÐĩÐ―ŅŒ. БÐūÐŧŅŒŅˆÐĩÐĩ Ð·Ð―Ð°Ņ‡ÐĩÐ―ÐļÐĩ ÐūÐ·Ð―Ð°Ņ‡Ð°ÐĩŅ‚ ÐąÐūÐŧŅŒŅˆÐĩ Ņ€ŅƒÐīŅ‹.)ПÐŧÐūŅ‚Ð―ÐūŅŅ‚ŅŒ$(/t)$(): 20%$(br)$(thing)$(t:ÐĪÐūŅ€ÐžÐ° ÐķÐļÐŧŅ‹.)ВÐļÐī$(/t)$(): $(t:ЗаŅ‡Ð°ŅŅ‚ŅƒŅŽ КŅ€ŅƒÐģÐŧÐūÐđ Ņ„ÐūŅ€ÐžŅ‹)КÐŧаŅŅ‚ÐĩŅ€Ð―аŅ ÐķÐļÐŧа$(/t)$(br)$(thing)$(t:ÐĢŅ€ÐūÐēÐ―Ðļ Y, ОÐĩÐķÐīŅƒ КÐūŅ‚ÐūŅ€Ņ‹ÐžÐļ ОÐūÐķÐĩŅ‚ ŅÐģÐĩÐ―ÐĩŅ€ÐļŅ€ÐūÐēаŅ‚ŅŒŅŅ ÐķÐļÐŧа.)Y-ŅƒŅ€ÐūÐēÐĩÐ―ŅŒ$(/t)$(): 40 — 65$(br)$(thing)(t:ÐĄŅ€ÐĩÐīÐ―ÐļÐđ ÐīÐļаОÐĩŅ‚Ņ€ ÐķÐļÐŧŅ‹)РазОÐĩŅ€$(/t)$(): 20$(br)$(thing)$(t:ЕŅÐŧÐļ Ņ€Ð°ŅŅŅ‚ÐūŅÐ―ÐļÐĩ ОÐĩÐķÐīŅƒ ÐŋÐūÐēÐĩŅ€Ņ…Ð―ÐūŅŅ‚ŅŒŅŽ Ðļ ÐķÐļÐŧÐūÐđ ÐąÐūÐŧŅŒŅˆÐĩ Ņ‡ÐĩО ŅŅ‚Ðū Ņ‡ÐļŅÐŧÐū, Ņ‚Ðū ÐķÐļÐŧа Ð―Ðĩ ŅÐģÐĩÐ―ÐĩÐ―Ņ€ÐļŅ€ŅƒÐĩŅ‚ ÐļÐ―ÐīÐļКаŅ‚ÐūŅ€Ņ‹ Ð―Ð° ÐŋÐūÐēÐĩŅ€Ņ…Ð―ÐūŅŅ‚Ðļ.)МаКŅÐļОаÐŧŅŒÐ―аŅ ÐēŅ‹ŅÐūŅ‚а ÐļÐ―ÐīÐļКаŅ‚ÐūŅ€Ð°$(/t)$(): 30$(br2)$(thing)ВÐļÐīŅ‹ ÐšÐ°ÐžÐ―ÐĩÐđ$(): ÐÐ―ÐīÐĩзÐļŅ‚, БазаÐŧŅŒŅ‚, ДаŅ†ÐļŅ‚, РÐļÐūÐŧÐļŅ‚, ÐĒŅ€Ð°ÐēÐĩŅ€Ņ‚ÐļÐ―, ÐĒŅ€Ð°Ņ…ÐļŅ‚", + "text": "$(thing)$(t:ВÐĩŅ€ÐūŅŅ‚Ð―ÐūŅŅ‚ŅŒ ÐģÐĩÐ―ÐĩŅ€Ð°Ņ†ÐļÐļ ÐķÐļÐŧŅ‹ Ðē Ņ‡Ð°Ð―КÐĩ. ЧÐĩО ОÐĩÐ―ŅŒŅˆÐĩ Ð·Ð―Ð°ÐžÐĩÐ―Ð°Ņ‚ÐĩÐŧŅŒ(ÐēŅ‚ÐūŅ€ÐūÐĩ Ņ‡ÐļŅÐŧÐū), Ņ‚ÐĩО Ņ‡Ð°Ņ‰Ðĩ ÐēŅŅ‚Ņ€ÐĩŅ‡Ð°ÐĩŅ‚ŅŅ.)РÐĩÐīКÐūŅŅ‚ŅŒ$(/t)$(): 1/30 Ð―Ð° Ņ‡Ð°Ð―К$(br)$(thing)$(t:ÐĄÐūÐīÐĩŅ€ÐķÐ°Ð―ÐļÐĩ ÐąÐŧÐūКÐūÐē Ņ€ŅƒÐīŅ‹ Ðē ÐķÐļÐŧÐĩ заОÐĩÐ―ŅŅŽŅ‰ÐļŅ… КаОÐĩÐ―ŅŒ. БÐūÐŧŅŒŅˆÐĩÐĩ Ð·Ð―Ð°Ņ‡ÐĩÐ―ÐļÐĩ ÐūÐ·Ð―Ð°Ņ‡Ð°ÐĩŅ‚ ÐąÐūÐŧŅŒŅˆÐĩ Ņ€ŅƒÐīŅ‹.)ПÐŧÐūŅ‚Ð―ÐūŅŅ‚ŅŒ$(/t)$(): 20%$(br)$(thing)$(t:ÐĪÐūŅ€ÐžÐ° ÐķÐļÐŧŅ‹.)ВÐļÐī$(/t)$(): $(t:ЗаŅ‡Ð°ŅŅ‚ŅƒŅŽ КŅ€ŅƒÐģÐŧÐūÐđ Ņ„ÐūŅ€ÐžŅ‹)КÐŧаŅŅ‚ÐĩŅ€Ð―аŅ ÐķÐļÐŧа$(/t)$(br)$(thing)$(t:ÐĢŅ€ÐūÐēÐ―Ðļ Y, ОÐĩÐķÐīŅƒ КÐūŅ‚ÐūŅ€Ņ‹ÐžÐļ ОÐūÐķÐĩŅ‚ ŅÐģÐĩÐ―ÐĩŅ€ÐļŅ€ÐūÐēаŅ‚ŅŒŅŅ ÐķÐļÐŧа.)Y-ŅƒŅ€ÐūÐēÐĩÐ―ŅŒ$(/t)$(): 40 — 65$(br)$(thing)(t:ÐĄŅ€ÐĩÐīÐ―ÐļÐđ ÐīÐļаОÐĩŅ‚Ņ€ ÐķÐļÐŧŅ‹)РазОÐĩŅ€$(/t)$(): 20$(br)$(thing)$(t:ЕŅÐŧÐļ Ņ€Ð°ŅŅŅ‚ÐūŅÐ―ÐļÐĩ ОÐĩÐķÐīŅƒ ÐŋÐūÐēÐĩŅ€Ņ…Ð―ÐūŅŅ‚ŅŒŅŽ Ðļ ÐķÐļÐŧÐūÐđ ÐąÐūÐŧŅŒŅˆÐĩ Ņ‡ÐĩО ŅŅ‚Ðū Ņ‡ÐļŅÐŧÐū, Ņ‚Ðū ÐķÐļÐŧа Ð―Ðĩ ŅÐģÐĩÐ―ÐĩÐ―Ņ€ÐļŅ€ŅƒÐĩŅ‚ ÐļÐ―ÐīÐļКаŅ‚ÐūŅ€Ņ‹ Ð―Ð° ÐŋÐūÐēÐĩŅ€Ņ…Ð―ÐūŅŅ‚Ðļ.)МаКŅÐļОаÐŧŅŒÐ―аŅ ÐēŅ‹ŅÐūŅ‚а ÐļÐ―ÐīÐļКаŅ‚ÐūŅ€Ð°$(/t)$(): 30$(br2)$(thing)ВÐļÐīŅ‹ ÐšÐ°ÐžÐ―ÐĩÐđ$(): ÐÐ―ÐīÐĩзÐļŅ‚, БазаÐŧŅŒŅ‚, ДаŅ†ÐļŅ‚, ИÐģÐ―ÐļÐžÐąŅ€ÐļŅ‚, ЛаОÐŋŅ€ÐūÐļŅ‚, РÐļÐūÐŧÐļŅ‚, ÐĒŅ€Ð°ÐēÐĩŅ€Ņ‚ÐļÐ―, ÐĒŅ€Ð°Ņ…ÐļŅ‚", "title": "ÐĄÐĩŅ€Ð° Ðļ ПÐļŅ€ÐļŅ‚", "type": "patchouli:text", "anchor": "venus_manual_sulfur" diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/earth_ore_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/earth_ore_index.json index 4035a14c0..0bdf84f0d 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/earth_ore_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/earth_ore_index.json @@ -29,7 +29,7 @@ }, { "Type": "patchouli:text", - "text": "$(li)КŅ–Ð―ÐūÐēаŅ€: $(l:tfg_ores/earth_vein_index#normal_redstone)20%$(/l)$()$(li)КÐūÐąÐ°ÐŧŅŒŅ‚: $(l:tfg_ores/earth_vein_index#normal_garnierite)15%$(/l)$()$(li)КÐūÐąÐ°ÐŧŅŒŅ‚ÐļŅ‚: $(l:tfg_ores/earth_vein_index#normal_garnierite)20%$(/l)$()$(li)ЛазŅƒŅ€ÐļŅ‚: $(l:tfg_ores/earth_vein_index#normal_lapis)35%$(/l)$()$(li)ЛаÐŋŅ–Ņ: $(l:tfg_ores/earth_vein_index#normal_lapis)25%$(/l)$()$(li)ЛÐĩÐŋŅ–ÐīÐūÐŧŅ–Ņ‚: $(l:tfg_ores/earth_vein_index#normal_salt)15%$(/l), $(l:tfg_ores/earth_vein_index#normal_spodumene)15%$(/l)$()$(li)ЛŅ–Ņ‚Ņ–Ðđ: $(l:tfg_ores/earth_vein_index#deep_scheelite)20%$(/l)$()$(li)МаÐģÐ―ÐĩзÐļŅ‚: $(l:tfg_ores/earth_vein_index#normal_olivine)25%$(/l)$()$(li)МаÐģÐ―ÐĩŅ‚ÐļŅ‚: $(l:tfg_ores/earth_vein_index#normal_magnetite)63%$(/l), $(l:tfg_ores/earth_vein_index#deep_magnetite)8%$(/l)$()$(li)МаÐŧаŅ…Ņ–Ņ‚: $(l:tfg_ores/earth_vein_index#deep_limonite)20%$(/l), $(l:tfg_ores/earth_vein_index#normal_limonite)15%$(/l)$()$(li)МÐūÐŧŅ–ÐąÐīÐĩÐ―Ņ–Ņ‚: $(l:tfg_ores/earth_vein_index#deep_molybdenum)35%$(/l)$()$(li)МÐūÐ―Ð°Ņ†ÐļŅ‚: $(l:tfg_ores/earth_vein_index#normal_monazite)31%$(/l)$()$(li)НаŅ„Ņ‚ÐūÐēŅ– ÐŋŅ–ŅÐšÐļ: $(l:tfg_ores/earth_vein_index#normal_oilsands)100%$(/l), $(l:tfg_ores/earth_vein_index#normal_tarkianite)35%$(/l)$()$(li)НÐĩÐūÐīÐļО: $(l:tfg_ores/earth_vein_index#normal_monazite)6%$(/l)$()", + "text": "$(li)КŅ–Ð―ÐūÐēаŅ€: $(l:tfg_ores/earth_vein_index#normal_redstone)20%$(/l)$()$(li)КÐūÐąÐ°ÐŧŅŒŅ‚: $(l:tfg_ores/earth_vein_index#normal_garnierite)15%$(/l)$()$(li)КÐūÐąÐ°ÐŧŅŒŅ‚ÐļŅ‚: $(l:tfg_ores/earth_vein_index#normal_garnierite)20%$(/l)$()$(li)ЛазŅƒŅ€ÐļŅ‚: $(l:tfg_ores/earth_vein_index#normal_lapis)35%$(/l)$()$(li)ЛаÐŋŅ–Ņ: $(l:tfg_ores/earth_vein_index#normal_lapis)25%$(/l)$()$(li)ЛÐĩÐŋŅ–ÐīÐūÐŧŅ–Ņ‚: $(l:tfg_ores/earth_vein_index#normal_salt)15%$(/l), $(l:tfg_ores/earth_vein_index#normal_spodumene)15%$(/l)$()$(li)ЛŅ–Ņ‚Ņ–Ðđ: $(l:tfg_ores/earth_vein_index#deep_scheelite)20%$(/l)$()$(li)МаÐģÐ―ÐĩзÐļŅ‚: $(l:tfg_ores/earth_vein_index#normal_olivine)25%$(/l)$()$(li)МаÐģÐ―ÐĩŅ‚ÐļŅ‚: $(l:tfg_ores/earth_vein_index#normal_magnetite)63%$(/l), $(l:tfg_ores/earth_vein_index#deep_magnetite)8%$(/l)$()$(li)МаÐŧаŅ…Ņ–Ņ‚: $(l:tfg_ores/earth_vein_index#deep_limonite)20%$(/l), $(l:tfg_ores/earth_vein_index#normal_limonite)15%$(/l)$()$(li)МÐūÐŧŅ–ÐąÐīÐĩÐ―Ņ–Ņ‚: $(l:tfg_ores/earth_vein_index#deep_molybdenum)35%$(/l)$()$(li)МÐūÐ―Ð°Ņ†ÐļŅ‚: $(l:tfg_ores/earth_vein_index#normal_monazite)31%$(/l)$()$(li)НаŅ„Ņ‚ÐūÐēŅ– ÐŋŅ–ŅÐšÐļ: $(l:tfg_ores/earth_vein_index#desert_oilsands)100%$(/l), $(l:tfg_ores/earth_vein_index#normal_oilsands)100%$(/l), $(l:tfg_ores/earth_vein_index#normal_tarkianite)35%$(/l)$()$(li)НÐĩÐūÐīÐļО: $(l:tfg_ores/earth_vein_index#normal_monazite)6%$(/l)$()", "type": "patchouli:text" }, { diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/earth_vein_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/earth_vein_index.json index 5d52261e0..95d366a41 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/earth_vein_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/earth_vein_index.json @@ -19,17 +19,17 @@ }, { "Type": "patchouli:text", - "text": "$(li)$(l:tfg_ores/earth_vein_index#normal_graphite)ГŅ€Ð°Ņ„Ņ–Ņ‚ Ņ– ДŅ–Ð°ÐžÐ°Ð―Ņ‚$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_gold)ЗÐūÐŧÐūŅ‚Ðū (ГÐŧÐļÐąÐūКÐĩ)$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_gold)ЗÐūÐŧÐūŅ‚Ðū, ЛŅ–ОÐūÐ―Ņ–Ņ‚ Ņ‚а ГÐĩОаŅ‚ÐļŅ‚$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_cassiterite)КаŅÐļŅ‚ÐĩŅ€ÐļŅ‚ (ЗÐēÐļŅ‡Ð°ÐđÐ―ÐļÐđ)$()$()$(li)$(l:tfg_ores/earth_vein_index#surface_cassiterite)КаŅÐļŅ‚ÐĩŅ€ÐļŅ‚ (ПÐūÐēÐĩŅ€Ņ…Ð―ÐļÐēÐļÐđ)$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_quartz)КÐēаŅ€Ņ†$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_mica)КŅ–Ð°Ð―Ņ–Ņ‚, ÐĄÐŧŅŽÐīа Ņ‚а БÐūКŅÐļŅ‚Ðļ$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_lapis)ЛаÐŋŅ–Ņ, ЛазŅƒŅ€ÐļŅ‚ Ņ‚а ÐĄÐūÐīаÐŧŅ–Ņ‚$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_limonite)ЛŅ–ОÐūÐ―Ņ–Ņ‚$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_magnetite)МаÐģÐ―ÐĩŅ‚ÐļŅ‚ Ņ– Ð’Ð°Ð―Ð°ÐīŅ–Ðđ$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_manganese)МаŅ€ÐģÐ°Ð―ÐĩŅ†ŅŒ Ņ– ÐĒÐ°Ð―Ņ‚аÐŧ$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_copper)МŅ–ÐīŅŒ Ņ‚а ÐĨаÐŧŅŒÐšÐūÐŋŅ–Ņ€ÐļŅ‚$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_basaltic_sands)МŅ–Ð―ÐĩŅ€Ð°ÐŧŅŒÐ―Ņ– ÐŋŅ–ŅÐšÐļ$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_oilsands)НаŅ„Ņ‚ÐūÐēŅ– ÐŋŅ–ŅÐšÐļ$()$()", + "text": "$(li)$(l:tfg_ores/earth_vein_index#normal_graphite)ГŅ€Ð°Ņ„Ņ–Ņ‚ Ņ– ДŅ–Ð°ÐžÐ°Ð―Ņ‚$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_gold)ЗÐūÐŧÐūŅ‚Ðū (ГÐŧÐļÐąÐūКÐĩ)$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_gold)ЗÐūÐŧÐūŅ‚Ðū, ЛŅ–ОÐūÐ―Ņ–Ņ‚ Ņ‚а ГÐĩОаŅ‚ÐļŅ‚$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_cassiterite)КаŅÐļŅ‚ÐĩŅ€ÐļŅ‚ (ЗÐēÐļŅ‡Ð°ÐđÐ―ÐļÐđ)$()$()$(li)$(l:tfg_ores/earth_vein_index#surface_cassiterite)КаŅÐļŅ‚ÐĩŅ€ÐļŅ‚ (ПÐūÐēÐĩŅ€Ņ…Ð―ÐļÐēÐļÐđ)$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_quartz)КÐēаŅ€Ņ†$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_mica)КŅ–Ð°Ð―Ņ–Ņ‚, ÐĄÐŧŅŽÐīа Ņ‚а БÐūКŅÐļŅ‚Ðļ$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_lapis)ЛаÐŋŅ–Ņ, ЛазŅƒŅ€ÐļŅ‚ Ņ‚а ÐĄÐūÐīаÐŧŅ–Ņ‚$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_limonite)ЛŅ–ОÐūÐ―Ņ–Ņ‚$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_magnetite)МаÐģÐ―ÐĩŅ‚ÐļŅ‚ Ņ– Ð’Ð°Ð―Ð°ÐīŅ–Ðđ$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_manganese)МаŅ€ÐģÐ°Ð―ÐĩŅ†ŅŒ Ņ– ÐĒÐ°Ð―Ņ‚аÐŧ$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_copper)МŅ–ÐīŅŒ Ņ‚а ÐĨаÐŧŅŒÐšÐūÐŋŅ–Ņ€ÐļŅ‚$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_basaltic_sands)МŅ–Ð―ÐĩŅ€Ð°ÐŧŅŒÐ―Ņ– ÐŋŅ–ŅÐšÐļ$()$()$(li)$(l:tfg_ores/earth_vein_index#desert_oilsands)НаŅ„Ņ‚ÐūÐēŅ– ÐŋŅ–ŅÐšÐļ$()$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)$(l:tfg_ores/earth_vein_index#deep_garnet_opal)ОÐŋаÐŧ Ņ– ГŅ€Ð°Ð―аŅ‚$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_redstone)РÐĩÐīŅŅ‚ÐūŅƒÐ―, КŅ–Ð―ÐūÐēаŅ€ Ņ– РŅƒÐąŅ–Ð―$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_sapphire)ÐĄÐ°ÐŋŅ„Ņ–Ņ€ Ņ– АÐŧŅŒÐžÐ°ÐīŅ–Ð―$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_saltpeter)ÐĄÐĩÐŧŅ–Ņ‚Ņ€Ð° Ņ‚а ЕÐŧÐĩКŅ‚Ņ€ÐūŅ‚ÐļÐ―$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_sulfur)ÐĄŅ–Ņ€ÐšÐ° Ņ‚а ПŅ–Ņ€ÐļŅ‚$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_beryllium)ÐĄÐžÐ°Ņ€Ð°ÐģÐī Ņ– БÐĩŅ€ÐļÐŧŅ–Ðđ$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_salt)ÐĄÐūÐŧŅ– Ņ‚а БŅƒŅ€Ð°$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_spodumene)ÐĄÐŋÐūÐīŅƒÐžÐĩÐ― Ņ‚а ЛÐĩÐŋŅ–ÐīÐūÐŧŅ–Ņ‚$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_silver)ÐĄŅ€Ņ–ÐąÐŧÐū, ГаÐŧÐĩÐ― Ņ– ÐĄÐēÐļÐ―ÐĩŅ†ŅŒ$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_lubricant)ÐĄŅ‚ÐĩаŅ‚ÐļŅ‚, ÐĒаÐŧŅŒÐš Ņ– ÐĒŅ€ÐūÐ―Ð°$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_sphalerite)ÐĄŅ„аÐŧÐĩŅ€ÐļŅ‚ Ņ– ПŅ–Ņ€ÐļŅ‚$()$()$(li)$(l:tfg_ores/earth_vein_index#surface_sphalerite)ÐĄŅ„аÐŧÐĩŅ€ÐļŅ‚ Ņ– ÐĄŅ–Ņ€ÐšÐ°$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_tarkianite)ÐĒаŅ€ÐšŅ–Ð°Ð―Ņ–Ņ‚ Ņ‚а НаŅ„Ņ‚ÐūÐēŅ– ÐŋŅ–ŅÐšÐļ$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_tetrahedrite)ÐĒÐĩŅ‚Ņ€Ð°ÐĩÐīŅ€ÐļŅ‚ (ЗÐēÐļŅ‡Ð°ÐđÐ―ÐļÐđ)$()$()", + "text": "$(li)$(l:tfg_ores/earth_vein_index#normal_oilsands)НаŅ„Ņ‚ÐūÐēŅ– ÐŋŅ–ŅÐšÐļ$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_garnet_opal)ОÐŋаÐŧ Ņ– ГŅ€Ð°Ð―аŅ‚$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_redstone)РÐĩÐīŅŅ‚ÐūŅƒÐ―, КŅ–Ð―ÐūÐēаŅ€ Ņ– РŅƒÐąŅ–Ð―$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_sapphire)ÐĄÐ°ÐŋŅ„Ņ–Ņ€ Ņ– АÐŧŅŒÐžÐ°ÐīŅ–Ð―$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_saltpeter)ÐĄÐĩÐŧŅ–Ņ‚Ņ€Ð° Ņ‚а ЕÐŧÐĩКŅ‚Ņ€ÐūŅ‚ÐļÐ―$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_sulfur)ÐĄŅ–Ņ€ÐšÐ° Ņ‚а ПŅ–Ņ€ÐļŅ‚$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_beryllium)ÐĄÐžÐ°Ņ€Ð°ÐģÐī Ņ– БÐĩŅ€ÐļÐŧŅ–Ðđ$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_salt)ÐĄÐūÐŧŅ– Ņ‚а БŅƒŅ€Ð°$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_spodumene)ÐĄÐŋÐūÐīŅƒÐžÐĩÐ― Ņ‚а ЛÐĩÐŋŅ–ÐīÐūÐŧŅ–Ņ‚$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_silver)ÐĄŅ€Ņ–ÐąÐŧÐū, ГаÐŧÐĩÐ― Ņ– ÐĄÐēÐļÐ―ÐĩŅ†ŅŒ$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_lubricant)ÐĄŅ‚ÐĩаŅ‚ÐļŅ‚, ÐĒаÐŧŅŒÐš Ņ– ÐĒŅ€ÐūÐ―Ð°$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_sphalerite)ÐĄŅ„аÐŧÐĩŅ€ÐļŅ‚ Ņ– ПŅ–Ņ€ÐļŅ‚$()$()$(li)$(l:tfg_ores/earth_vein_index#surface_sphalerite)ÐĄŅ„аÐŧÐĩŅ€ÐļŅ‚ Ņ– ÐĄŅ–Ņ€ÐšÐ°$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_tarkianite)ÐĒаŅ€ÐšŅ–Ð°Ð―Ņ–Ņ‚ Ņ‚а НаŅ„Ņ‚ÐūÐēŅ– ÐŋŅ–ŅÐšÐļ$()$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)$(l:tfg_ores/earth_vein_index#surface_tetrahedrite)ÐĒÐĩŅ‚Ņ€Ð°ÐĩÐīŅ€ÐļŅ‚ (ПÐūÐēÐĩŅ€Ņ…Ð―Ņ)$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_topaz)ÐĒÐūÐŋаз Ņ– ÐĨаÐŧŅŒÐšÐūŅ†ÐļŅ‚$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_pitchblende)ÐĢŅ€Ð°Ð―Ņ–Ņ‚ & ПŅ–Ņ‚Ņ‡ÐąÐŧÐĩÐ―Ðī$()$()$(li)$(l:tfg_ores/earth_vein_index#surface_copper)ÐĨаÐŧŅŒÐšÐūÐŋŅ–Ņ€ÐļŅ‚ Ņ‚а РÐĩаÐŧŅŒÐģаŅ€$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_magnetite)ÐĨŅ€ÐūОŅ–Ņ‚ Ņ– МаÐģÐ―ÐĩŅ‚ÐļŅ‚$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_scheelite)ÐĻÐĩŅ”ÐŧŅ–Ņ‚ Ņ‚а ВÐūÐŧŅŒŅ„Ņ€Ð°Ðž$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_sheldonite)ÐĻÐĩÐŧÐīÐūÐ―Ņ–Ņ‚ Ņ– БÐūŅ€Ð―Ņ–Ņ‚$()$()", + "text": "$(li)$(l:tfg_ores/earth_vein_index#normal_tetrahedrite)ÐĒÐĩŅ‚Ņ€Ð°ÐĩÐīŅ€ÐļŅ‚ (ЗÐēÐļŅ‡Ð°ÐđÐ―ÐļÐđ)$()$()$(li)$(l:tfg_ores/earth_vein_index#surface_tetrahedrite)ÐĒÐĩŅ‚Ņ€Ð°ÐĩÐīŅ€ÐļŅ‚ (ПÐūÐēÐĩŅ€Ņ…Ð―Ņ)$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_topaz)ÐĒÐūÐŋаз Ņ– ÐĨаÐŧŅŒÐšÐūŅ†ÐļŅ‚$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_pitchblende)ÐĢŅ€Ð°Ð―Ņ–Ņ‚ & ПŅ–Ņ‚Ņ‡ÐąÐŧÐĩÐ―Ðī$()$()$(li)$(l:tfg_ores/earth_vein_index#surface_copper)ÐĨаÐŧŅŒÐšÐūÐŋŅ–Ņ€ÐļŅ‚ Ņ‚а РÐĩаÐŧŅŒÐģаŅ€$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_magnetite)ÐĨŅ€ÐūОŅ–Ņ‚ Ņ– МаÐģÐ―ÐĩŅ‚ÐļŅ‚$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_scheelite)ÐĻÐĩŅ”ÐŧŅ–Ņ‚ Ņ‚а ВÐūÐŧŅŒŅ„Ņ€Ð°Ðž$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_sheldonite)ÐĻÐĩÐŧÐīÐūÐ―Ņ–Ņ‚ Ņ– БÐūŅ€Ð―Ņ–Ņ‚$()$()", "type": "patchouli:text" }, { @@ -1217,7 +1217,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)РŅ–ÐīКŅ–ŅŅ‚ŅŒ$(): 1/80 Ņ‡Ð°Ð―КŅ–Ðē$(br)$(thing)ÐĐŅ–ÐŧŅŒÐ―Ņ–ŅŅ‚ŅŒ$(): 40%$(br)$(thing)ÐĒÐļÐŋ$(): ДÐļŅÐšÐūÐēа ÐēÐĩÐ―Ð°$(br)$(thing)Y$(): -64 — -16$(br)$(thing)РÐūзОŅ–Ņ€$(): 16$(br)$(thing)ВÐļŅÐūŅ‚а$(): 6$(br)$(thing)Ð†Ð―ÐīÐļКаŅ‚ÐūŅ€ Max Depth$(): 20$(br2)$(thing)ÐĒÐļÐŋÐļ КаОÐĩÐ―ŅŽ$(): ÐÐ―ÐīÐĩзÐļŅ‚, АŅ€ÐģÐļÐŧŅ–Ņ‚, АŅÐŋŅ–ÐīÐ―ÐļÐđ ŅÐŧÐ°Ð―ÐĩŅ†ŅŒ, БазаÐŧŅŒŅ‚, ВаÐŋÐ―ŅÐš, Ð“Ð°ÐąŅ€Ðū, ГÐŧÐļÐ―ÐļŅŅ‚ÐļÐđ ŅÐŧÐ°Ð―ÐĩŅ†ŅŒ, Ð“Ð―ÐĩÐđŅ, ГŅ€Ð°Ð―Ņ–Ņ‚, ДаŅ†ÐļŅ‚, ДŅ–ÐūŅ€ÐļŅ‚, ДÐūÐŧÐūОŅ–Ņ‚, КÐēаŅ€Ņ†ÐļŅ‚, КÐūÐ―ÐģÐŧÐūОÐĩŅ€Ð°Ņ‚, КŅ€ÐĩÐđÐīа, КŅ€ÐĩОÐĩÐ―ÐļŅŅ‚ÐļÐđ ŅÐŧÐ°Ð―ÐĩŅ†ŅŒ, МаŅ€ÐžŅƒŅ€, РŅ–ÐūÐŧŅ–Ņ‚, ÐĪŅ–ÐŧŅ–Ņ‚, ÐĻÐļŅ„ÐĩŅ€Ð―ÐļÐđ ŅÐŧÐ°Ð―ÐĩŅ†ŅŒ", + "text": "$(thing)РŅ–ÐīКŅ–ŅŅ‚ŅŒ$(): 1/80 Ņ‡Ð°Ð―КŅ–Ðē$(br)$(thing)ÐĐŅ–ÐŧŅŒÐ―Ņ–ŅŅ‚ŅŒ$(): 40%$(br)$(thing)ÐĒÐļÐŋ$(): ДÐļŅÐšÐūÐēа ÐēÐĩÐ―Ð°$(br)$(thing)Y$(): -64 — -16$(br)$(thing)РÐūзОŅ–Ņ€$(): 16$(br)$(thing)ВÐļŅÐūŅ‚а$(): 6$(br)$(thing)Ð†Ð―ÐīÐļКаŅ‚ÐūŅ€ Max Depth$(): 20$(br2)$(thing)ÐĒÐļÐŋÐļ КаОÐĩÐ―ŅŽ$(): ÐÐ―ÐīÐĩзÐļŅ‚, АŅÐŋŅ–ÐīÐ―ÐļÐđ ŅÐŧÐ°Ð―ÐĩŅ†ŅŒ, БазаÐŧŅŒŅ‚, Ð“Ð°ÐąŅ€Ðū, Ð“Ð―ÐĩÐđŅ, ГŅ€Ð°Ð―Ņ–Ņ‚, ДаŅ†ÐļŅ‚, ДŅ–ÐūŅ€ÐļŅ‚, КÐēаŅ€Ņ†ÐļŅ‚, МаŅ€ÐžŅƒŅ€, РŅ–ÐūÐŧŅ–Ņ‚, ÐĪŅ–ÐŧŅ–Ņ‚, ÐĻÐļŅ„ÐĩŅ€Ð―ÐļÐđ ŅÐŧÐ°Ð―ÐĩŅ†ŅŒ", "title": "ГŅ€Ð°Ņ„Ņ–Ņ‚ Ņ– ДŅ–Ð°ÐžÐ°Ð―Ņ‚", "type": "patchouli:text", "anchor": "normal_graphite" @@ -2313,7 +2313,34 @@ }, { "Type": "patchouli:text", - "text": "$(thing)РŅ–ÐīКŅ–ŅŅ‚ŅŒ$(): 1/185 Ņ‡Ð°Ð―КŅ–Ðē$(br)$(thing)ÐĐŅ–ÐŧŅŒÐ―Ņ–ŅŅ‚ŅŒ$(): 20%$(br)$(thing)ÐĒÐļÐŋ$(): КÐŧаŅŅ‚ÐĩŅ€Ð―а ÐēÐĩÐ―Ð°$(br)$(thing)Y$(): 0 — 70$(br)$(thing)РÐūзОŅ–Ņ€$(): 55$(br)$(thing)Ð†Ð―ÐīÐļКаŅ‚ÐūŅ€ Max Depth$(): 20$(br2)$(thing)ÐĒÐļÐŋÐļ КаОÐĩÐ―ŅŽ$(): АŅ€ÐģÐļÐŧŅ–Ņ‚, ВаÐŋÐ―ŅÐš, ГÐŧÐļÐ―ÐļŅŅ‚ÐļÐđ ŅÐŧÐ°Ð―ÐĩŅ†ŅŒ, ДÐūÐŧÐūОŅ–Ņ‚, КÐūÐ―ÐģÐŧÐūОÐĩŅ€Ð°Ņ‚, КŅ€ÐĩÐđÐīа, КŅ€ÐĩОÐĩÐ―ÐļŅŅ‚ÐļÐđ ŅÐŧÐ°Ð―ÐĩŅ†ŅŒ", + "text": "$(thing)РŅ–ÐīКŅ–ŅŅ‚ŅŒ$(): 1/150 Ņ‡Ð°Ð―КŅ–Ðē$(br)$(thing)ÐĐŅ–ÐŧŅŒÐ―Ņ–ŅŅ‚ŅŒ$(): 20%$(br)$(thing)ÐĒÐļÐŋ$(): КÐŧаŅŅ‚ÐĩŅ€Ð―а ÐēÐĩÐ―Ð°$(br)$(thing)Y$(): 30 — 70$(br)$(thing)РÐūзОŅ–Ņ€$(): 60$(br)$(thing)Ð†Ð―ÐīÐļКаŅ‚ÐūŅ€ Max Depth$(): 50$(br2)$(thing)ÐĒÐļÐŋÐļ КаОÐĩÐ―ŅŽ$(): АŅ€ÐģÐļÐŧŅ–Ņ‚, ВаÐŋÐ―ŅÐš, ГÐŧÐļÐ―ÐļŅŅ‚ÐļÐđ ŅÐŧÐ°Ð―ÐĩŅ†ŅŒ, ДÐūÐŧÐūОŅ–Ņ‚, КÐūÐ―ÐģÐŧÐūОÐĩŅ€Ð°Ņ‚, КŅ€ÐĩÐđÐīа, КŅ€ÐĩОÐĩÐ―ÐļŅŅ‚ÐļÐđ ŅÐŧÐ°Ð―ÐĩŅ†ŅŒ", + "title": "НаŅ„Ņ‚ÐūÐēŅ– ÐŋŅ–ŅÐšÐļ", + "type": "patchouli:text", + "anchor": "desert_oilsands" + }, + { + "Type": "patchouli:multiblock", + "name": "НаŅ„Ņ‚ÐūÐēŅ– ÐŋŅ–ŅÐšÐļ", + "multiblock": { + "mapping": { + "0": "#forge:ores/oilsands" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)ВŅ–ÐīŅÐūŅ‚ÐūК$(): 100%$(br)$(thing)ДÐķÐĩŅ€ÐĩÐŧÐū$(): ÐĄÐēÐūÐąÐūÐīÐļ \uD83D\uDEE2\uD83E\uDD85\uD83D\uDDFD", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:text", + "text": "$(thing)РŅ–ÐīКŅ–ŅŅ‚ŅŒ$(): 1/220 Ņ‡Ð°Ð―КŅ–Ðē$(br)$(thing)ÐĐŅ–ÐŧŅŒÐ―Ņ–ŅŅ‚ŅŒ$(): 20%$(br)$(thing)ÐĒÐļÐŋ$(): КÐŧаŅŅ‚ÐĩŅ€Ð―а ÐēÐĩÐ―Ð°$(br)$(thing)Y$(): 40 — 90$(br)$(thing)РÐūзОŅ–Ņ€$(): 30$(br)$(thing)Ð†Ð―ÐīÐļКаŅ‚ÐūŅ€ Max Depth$(): 20$(br2)$(thing)ÐĒÐļÐŋÐļ КаОÐĩÐ―ŅŽ$(): АŅ€ÐģÐļÐŧŅ–Ņ‚, ВаÐŋÐ―ŅÐš, ГÐŧÐļÐ―ÐļŅŅ‚ÐļÐđ ŅÐŧÐ°Ð―ÐĩŅ†ŅŒ, ДÐūÐŧÐūОŅ–Ņ‚, КÐūÐ―ÐģÐŧÐūОÐĩŅ€Ð°Ņ‚, КŅ€ÐĩÐđÐīа, КŅ€ÐĩОÐĩÐ―ÐļŅŅ‚ÐļÐđ ŅÐŧÐ°Ð―ÐĩŅ†ŅŒ", "title": "НаŅ„Ņ‚ÐūÐēŅ– ÐŋŅ–ŅÐšÐļ", "type": "patchouli:text", "anchor": "normal_oilsands" @@ -2750,7 +2777,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)РŅ–ÐīКŅ–ŅŅ‚ŅŒ$(): 1/250 Ņ‡Ð°Ð―КŅ–Ðē$(br)$(thing)ÐĐŅ–ÐŧŅŒÐ―Ņ–ŅŅ‚ŅŒ$(): 35%$(br)$(thing)ÐĒÐļÐŋ$(): ÐĒŅ€ŅƒÐąÐ―а ÐēÐĩÐ―Ð°$(br)$(thing)Y$(): -32 — 50$(br)$(thing)ВÐļŅÐūŅ‚а$(): 60$(br)$(thing)РаÐīŅ–ŅƒŅ$(): 10$(br)$(thing)Ð†Ð―ÐīÐļКаŅ‚ÐūŅ€ Max Depth$(): 20$(br2)$(thing)ÐĒÐļÐŋÐļ КаОÐĩÐ―ŅŽ$(): ÐÐ―ÐīÐĩзÐļŅ‚, БазаÐŧŅŒŅ‚, ДаŅ†ÐļŅ‚, РŅ–ÐūÐŧŅ–Ņ‚", + "text": "$(thing)РŅ–ÐīКŅ–ŅŅ‚ŅŒ$(): 1/250 Ņ‡Ð°Ð―КŅ–Ðē$(br)$(thing)ÐĐŅ–ÐŧŅŒÐ―Ņ–ŅŅ‚ŅŒ$(): 35%$(br)$(thing)ÐĒÐļÐŋ$(): ÐĒŅ€ŅƒÐąÐ―а ÐēÐĩÐ―Ð°$(br)$(thing)Y$(): -32 — 30$(br)$(thing)ВÐļŅÐūŅ‚а$(): 60$(br)$(thing)РаÐīŅ–ŅƒŅ$(): 10$(br)$(thing)Ð†Ð―ÐīÐļКаŅ‚ÐūŅ€ Max Depth$(): 20$(br2)$(thing)ÐĒÐļÐŋÐļ КаОÐĩÐ―ŅŽ$(): ÐÐ―ÐīÐĩзÐļŅ‚, БазаÐŧŅŒŅ‚, ДаŅ†ÐļŅ‚, РŅ–ÐūÐŧŅ–Ņ‚", "title": "ÐĄÐžÐ°Ņ€Ð°ÐģÐī Ņ– БÐĩŅ€ÐļÐŧŅ–Ðđ", "type": "patchouli:text", "anchor": "normal_beryllium" diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/mars_vein_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/mars_vein_index.json index 53f19f482..bbeb5a8ec 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/mars_vein_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/mars_vein_index.json @@ -228,7 +228,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)РŅ–ÐīКŅ–ŅŅ‚ŅŒ$(): 1/215 Ņ‡Ð°Ð―КŅ–Ðē$(br)$(thing)ÐĐŅ–ÐŧŅŒÐ―Ņ–ŅŅ‚ŅŒ$(): 40%$(br)$(thing)ÐĒÐļÐŋ$(): КÐŧаŅŅ‚ÐĩŅ€Ð―а ÐēÐĩÐ―Ð°$(br)$(thing)Y$(): 0 — 70$(br)$(thing)РÐūзОŅ–Ņ€$(): 45$(br)$(thing)Ð†Ð―ÐīÐļКаŅ‚ÐūŅ€ Max Depth$(): 15$(br2)$(thing)ÐĒÐļÐŋÐļ КаОÐĩÐ―ŅŽ$(): АŅ€ÐģŅ–ÐŧŅ–Ņ‚, БазаÐŧŅŒŅ‚, Ð“Ð°ÐąŅ€Ðū, ДŅ–ÐūŅ€ÐļŅ‚, ДÐūÐŧÐūОŅ–Ņ‚, КŅ€ÐĩÐđÐīа, КŅ€ÐĩОÐĩÐ―ÐļŅŅ‚ÐļÐđ ŅÐŧÐ°Ð―ÐĩŅ†ŅŒ, ÐĒŅ€Ð°Ņ…Ņ–Ņ‚", + "text": "$(thing)РŅ–ÐīКŅ–ŅŅ‚ŅŒ$(): 1/215 Ņ‡Ð°Ð―КŅ–Ðē$(br)$(thing)ÐĐŅ–ÐŧŅŒÐ―Ņ–ŅŅ‚ŅŒ$(): 40%$(br)$(thing)ÐĒÐļÐŋ$(): КÐŧаŅŅ‚ÐĩŅ€Ð―а ÐēÐĩÐ―Ð°$(br)$(thing)Y$(): 0 — 70$(br)$(thing)РÐūзОŅ–Ņ€$(): 45$(br)$(thing)Ð†Ð―ÐīÐļКаŅ‚ÐūŅ€ Max Depth$(): 15$(br2)$(thing)ÐĒÐļÐŋÐļ КаОÐĩÐ―ŅŽ$(): АŅ€ÐģŅ–ÐŧŅ–Ņ‚, БазаÐŧŅŒŅ‚, Ð“Ð°ÐąŅ€Ðū, ДŅ–ÐūŅ€ÐļŅ‚, ДÐūÐŧÐūОŅ–Ņ‚, КÐēаŅ€Ņ†ÐļŅ‚, КŅ€ÐĩÐđÐīа, КŅ€ÐĩОÐĩÐ―ÐļŅŅ‚ÐļÐđ ŅÐŧÐ°Ð―ÐĩŅ†ŅŒ, ÐĒŅ€Ð°Ņ…Ņ–Ņ‚", "title": "БаŅŅ‚Ð―ÐĩзÐļŅ‚ Ņ– МÐūÐ―Ð°Ņ†ÐļŅ‚", "type": "patchouli:text", "anchor": "mars_neodynium" @@ -320,7 +320,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)РŅ–ÐīКŅ–ŅŅ‚ŅŒ$(): 1/370 Ņ‡Ð°Ð―КŅ–Ðē$(br)$(thing)ÐĐŅ–ÐŧŅŒÐ―Ņ–ŅŅ‚ŅŒ$(): 30%$(br)$(thing)ÐĒÐļÐŋ$(): КÐŧаŅŅ‚ÐĩŅ€Ð―а ÐēÐĩÐ―Ð°$(br)$(thing)Y$(): -20 — 0$(br)$(thing)РÐūзОŅ–Ņ€$(): 60$(br)$(thing)Ð†Ð―ÐīÐļКаŅ‚ÐūŅ€ Max Depth$(): 20$(br2)$(thing)ÐĒÐļÐŋÐļ КаОÐĩÐ―ŅŽ$(): Red Granite, АŅ€ÐģŅ–ÐŧŅ–Ņ‚, БазаÐŧŅŒŅ‚, ДаŅ†ÐļŅ‚, ДŅ–ÐūŅ€ÐļŅ‚, КÐūÐ―ÐģÐŧÐūОÐĩŅ€Ð°Ņ‚, КŅ€ÐĩÐđÐīа, КŅ€ÐĩОÐĩÐ―ÐļŅŅ‚ÐļÐđ ŅÐŧÐ°Ð―ÐĩŅ†ŅŒ, ÐĒŅ€Ð°Ņ…Ņ–Ņ‚", + "text": "$(thing)РŅ–ÐīКŅ–ŅŅ‚ŅŒ$(): 1/370 Ņ‡Ð°Ð―КŅ–Ðē$(br)$(thing)ÐĐŅ–ÐŧŅŒÐ―Ņ–ŅŅ‚ŅŒ$(): 30%$(br)$(thing)ÐĒÐļÐŋ$(): КÐŧаŅŅ‚ÐĩŅ€Ð―а ÐēÐĩÐ―Ð°$(br)$(thing)Y$(): -30 — 0$(br)$(thing)РÐūзОŅ–Ņ€$(): 60$(br)$(thing)Ð†Ð―ÐīÐļКаŅ‚ÐūŅ€ Max Depth$(): 20$(br2)$(thing)ÐĒÐļÐŋÐļ КаОÐĩÐ―ŅŽ$(): Red Granite, Ð“Ð°ÐąŅ€Ðū, ГŅ€Ð°Ð―Ņ–Ņ‚, ДŅ–ÐūŅ€ÐļŅ‚", "title": "БÐūŅ€Ð―Ņ–Ņ‚ Ņ– КŅƒÐŋÐĩŅ€ÐļŅ‚", "type": "patchouli:text", "anchor": "deep_mars_sheldonite" @@ -412,7 +412,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)РŅ–ÐīКŅ–ŅŅ‚ŅŒ$(): 1/140 Ņ‡Ð°Ð―КŅ–Ðē$(br)$(thing)ÐĐŅ–ÐŧŅŒÐ―Ņ–ŅŅ‚ŅŒ$(): 25%$(br)$(thing)ÐĒÐļÐŋ$(): КÐŧаŅŅ‚ÐĩŅ€Ð―а ÐēÐĩÐ―Ð°$(br)$(thing)Y$(): 80 — 180$(br)$(thing)РÐūзОŅ–Ņ€$(): 45$(br)$(thing)Ð†Ð―ÐīÐļКаŅ‚ÐūŅ€ Max Depth$(): 40$(br2)$(thing)ÐĒÐļÐŋÐļ КаОÐĩÐ―ŅŽ$(): Red Granite, АŅ€ÐģÐļÐŧŅ–Ņ‚, АŅ€ÐģŅ–ÐŧŅ–Ņ‚, БазаÐŧŅŒŅ‚, ВаÐŋÐ―ŅÐš, Ð“Ð°ÐąŅ€Ðū, ГÐŧÐļÐ―ÐļŅŅ‚ÐļÐđ ŅÐŧÐ°Ð―ÐĩŅ†ŅŒ, ГŅ€Ð°Ð―Ņ–Ņ‚, ДаŅ†ÐļŅ‚, ДŅ–ÐūŅ€ÐļŅ‚, ДÐūÐŧÐūОŅ–Ņ‚, КÐūÐ―ÐģÐŧÐūОÐĩŅ€Ð°Ņ‚, КŅ€ÐĩÐđÐīа, КŅ€ÐĩОÐĩÐ―ÐļŅŅ‚ÐļÐđ ŅÐŧÐ°Ð―ÐĩŅ†ŅŒ, ÐĒŅ€Ð°Ņ…Ņ–Ņ‚", + "text": "$(thing)РŅ–ÐīКŅ–ŅŅ‚ŅŒ$(): 1/140 Ņ‡Ð°Ð―КŅ–Ðē$(br)$(thing)ÐĐŅ–ÐŧŅŒÐ―Ņ–ŅŅ‚ŅŒ$(): 25%$(br)$(thing)ÐĒÐļÐŋ$(): КÐŧаŅŅ‚ÐĩŅ€Ð―а ÐēÐĩÐ―Ð°$(br)$(thing)Y$(): 80 — 180$(br)$(thing)РÐūзОŅ–Ņ€$(): 45$(br)$(thing)Ð†Ð―ÐīÐļКаŅ‚ÐūŅ€ Max Depth$(): 40$(br2)$(thing)ÐĒÐļÐŋÐļ КаОÐĩÐ―ŅŽ$(): Red Granite, АŅ€ÐģÐļÐŧŅ–Ņ‚, АŅ€ÐģŅ–ÐŧŅ–Ņ‚, БазаÐŧŅŒŅ‚, ВаÐŋÐ―ŅÐš, Ð“Ð°ÐąŅ€Ðū, ГÐŧÐļÐ―ÐļŅŅ‚ÐļÐđ ŅÐŧÐ°Ð―ÐĩŅ†ŅŒ, ГŅ€Ð°Ð―Ņ–Ņ‚, ДаŅ†ÐļŅ‚, ДŅ–ÐūŅ€ÐļŅ‚, ДÐūÐŧÐūОŅ–Ņ‚, КÐēаŅ€Ņ†ÐļŅ‚, КÐūÐ―ÐģÐŧÐūОÐĩŅ€Ð°Ņ‚, КŅ€ÐĩÐđÐīа, КŅ€ÐĩОÐĩÐ―ÐļŅŅ‚ÐļÐđ ŅÐŧÐ°Ð―ÐĩŅ†ŅŒ, ÐĒŅ€Ð°Ņ…Ņ–Ņ‚", "title": "ВŅ–ŅÐžŅƒŅ‚", "type": "patchouli:text", "anchor": "mars_surface_bismuthinite" @@ -556,7 +556,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)РŅ–ÐīКŅ–ŅŅ‚ŅŒ$(): 1/250 Ņ‡Ð°Ð―КŅ–Ðē$(br)$(thing)ÐĐŅ–ÐŧŅŒÐ―Ņ–ŅŅ‚ŅŒ$(): 40%$(br)$(thing)ÐĒÐļÐŋ$(): КÐŧаŅŅ‚ÐĩŅ€Ð―а ÐēÐĩÐ―Ð°$(br)$(thing)Y$(): 0 — 70$(br)$(thing)РÐūзОŅ–Ņ€$(): 55$(br)$(thing)Ð†Ð―ÐīÐļКаŅ‚ÐūŅ€ Max Depth$(): 40$(br2)$(thing)ÐĒÐļÐŋÐļ КаОÐĩÐ―ŅŽ$(): Red Granite, АŅ€ÐģÐļÐŧŅ–Ņ‚, АŅ€ÐģŅ–ÐŧŅ–Ņ‚, БазаÐŧŅŒŅ‚, ВаÐŋÐ―ŅÐš, ГÐŧÐļÐ―ÐļŅŅ‚ÐļÐđ ŅÐŧÐ°Ð―ÐĩŅ†ŅŒ, ГŅ€Ð°Ð―Ņ–Ņ‚, ДаŅ†ÐļŅ‚, КŅ€ÐĩÐđÐīа", + "text": "$(thing)РŅ–ÐīКŅ–ŅŅ‚ŅŒ$(): 1/250 Ņ‡Ð°Ð―КŅ–Ðē$(br)$(thing)ÐĐŅ–ÐŧŅŒÐ―Ņ–ŅŅ‚ŅŒ$(): 40%$(br)$(thing)ÐĒÐļÐŋ$(): КÐŧаŅŅ‚ÐĩŅ€Ð―а ÐēÐĩÐ―Ð°$(br)$(thing)Y$(): 0 — 70$(br)$(thing)РÐūзОŅ–Ņ€$(): 55$(br)$(thing)Ð†Ð―ÐīÐļКаŅ‚ÐūŅ€ Max Depth$(): 40$(br2)$(thing)ÐĒÐļÐŋÐļ КаОÐĩÐ―ŅŽ$(): Red Granite, АŅ€ÐģÐļÐŧŅ–Ņ‚, АŅ€ÐģŅ–ÐŧŅ–Ņ‚, БазаÐŧŅŒŅ‚, ВаÐŋÐ―ŅÐš, ГÐŧÐļÐ―ÐļŅŅ‚ÐļÐđ ŅÐŧÐ°Ð―ÐĩŅ†ŅŒ, ГŅ€Ð°Ð―Ņ–Ņ‚, ДаŅ†ÐļŅ‚, КÐēаŅ€Ņ†ÐļŅ‚, КŅ€ÐĩÐđÐīа", "title": "ГаŅ€Ð―Ņ–Ņ”Ņ€ÐļŅ‚ Ņ– КÐūÐąÐ°ÐŧŅŒŅ‚ÐļŅ‚", "type": "patchouli:text", "anchor": "mars_nickel" @@ -648,7 +648,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)РŅ–ÐīКŅ–ŅŅ‚ŅŒ$(): 1/210 Ņ‡Ð°Ð―КŅ–Ðē$(br)$(thing)ÐĐŅ–ÐŧŅŒÐ―Ņ–ŅŅ‚ŅŒ$(): 40%$(br)$(thing)ÐĒÐļÐŋ$(): КÐŧаŅŅ‚ÐĩŅ€Ð―а ÐēÐĩÐ―Ð°$(br)$(thing)Y$(): 0 — 70$(br)$(thing)РÐūзОŅ–Ņ€$(): 40$(br)$(thing)Ð†Ð―ÐīÐļКаŅ‚ÐūŅ€ Max Depth$(): 30$(br2)$(thing)ÐĒÐļÐŋÐļ КаОÐĩÐ―ŅŽ$(): Red Granite, АŅ€ÐģÐļÐŧŅ–Ņ‚, АŅ€ÐģŅ–ÐŧŅ–Ņ‚, БазаÐŧŅŒŅ‚, ВаÐŋÐ―ŅÐš, ДаŅ†ÐļŅ‚, ДÐūÐŧÐūОŅ–Ņ‚, КÐūÐ―ÐģÐŧÐūОÐĩŅ€Ð°Ņ‚", + "text": "$(thing)РŅ–ÐīКŅ–ŅŅ‚ŅŒ$(): 1/210 Ņ‡Ð°Ð―КŅ–Ðē$(br)$(thing)ÐĐŅ–ÐŧŅŒÐ―Ņ–ŅŅ‚ŅŒ$(): 40%$(br)$(thing)ÐĒÐļÐŋ$(): КÐŧаŅŅ‚ÐĩŅ€Ð―а ÐēÐĩÐ―Ð°$(br)$(thing)Y$(): 0 — 70$(br)$(thing)РÐūзОŅ–Ņ€$(): 40$(br)$(thing)Ð†Ð―ÐīÐļКаŅ‚ÐūŅ€ Max Depth$(): 30$(br2)$(thing)ÐĒÐļÐŋÐļ КаОÐĩÐ―ŅŽ$(): Red Granite, АŅ€ÐģÐļÐŧŅ–Ņ‚, АŅ€ÐģŅ–ÐŧŅ–Ņ‚, БазаÐŧŅŒŅ‚, ВаÐŋÐ―ŅÐš, ДаŅ†ÐļŅ‚, ДÐūÐŧÐūОŅ–Ņ‚, КÐēаŅ€Ņ†ÐļŅ‚, КÐūÐ―ÐģÐŧÐūОÐĩŅ€Ð°Ņ‚", "title": "ГÐĩОаŅ‚ÐļŅ‚ Ņ‚а ЛŅ–ОÐūÐ―Ņ–Ņ‚", "type": "patchouli:text", "anchor": "mars_hematite" @@ -740,7 +740,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)РŅ–ÐīКŅ–ŅŅ‚ŅŒ$(): 1/140 Ņ‡Ð°Ð―КŅ–Ðē$(br)$(thing)ÐĐŅ–ÐŧŅŒÐ―Ņ–ŅŅ‚ŅŒ$(): 25%$(br)$(thing)ÐĒÐļÐŋ$(): КÐŧаŅŅ‚ÐĩŅ€Ð―а ÐēÐĩÐ―Ð°$(br)$(thing)Y$(): 80 — 180$(br)$(thing)РÐūзОŅ–Ņ€$(): 45$(br)$(thing)Ð†Ð―ÐīÐļКаŅ‚ÐūŅ€ Max Depth$(): 40$(br2)$(thing)ÐĒÐļÐŋÐļ КаОÐĩÐ―ŅŽ$(): Red Granite, АŅ€ÐģÐļÐŧŅ–Ņ‚, АŅ€ÐģŅ–ÐŧŅ–Ņ‚, БазаÐŧŅŒŅ‚, ВаÐŋÐ―ŅÐš, Ð“Ð°ÐąŅ€Ðū, ГÐŧÐļÐ―ÐļŅŅ‚ÐļÐđ ŅÐŧÐ°Ð―ÐĩŅ†ŅŒ, ГŅ€Ð°Ð―Ņ–Ņ‚, ДаŅ†ÐļŅ‚, ДŅ–ÐūŅ€ÐļŅ‚, ДÐūÐŧÐūОŅ–Ņ‚, КÐūÐ―ÐģÐŧÐūОÐĩŅ€Ð°Ņ‚, КŅ€ÐĩÐđÐīа, КŅ€ÐĩОÐĩÐ―ÐļŅŅ‚ÐļÐđ ŅÐŧÐ°Ð―ÐĩŅ†ŅŒ, ÐĒŅ€Ð°Ņ…Ņ–Ņ‚", + "text": "$(thing)РŅ–ÐīКŅ–ŅŅ‚ŅŒ$(): 1/140 Ņ‡Ð°Ð―КŅ–Ðē$(br)$(thing)ÐĐŅ–ÐŧŅŒÐ―Ņ–ŅŅ‚ŅŒ$(): 25%$(br)$(thing)ÐĒÐļÐŋ$(): КÐŧаŅŅ‚ÐĩŅ€Ð―а ÐēÐĩÐ―Ð°$(br)$(thing)Y$(): 80 — 180$(br)$(thing)РÐūзОŅ–Ņ€$(): 45$(br)$(thing)Ð†Ð―ÐīÐļКаŅ‚ÐūŅ€ Max Depth$(): 40$(br2)$(thing)ÐĒÐļÐŋÐļ КаОÐĩÐ―ŅŽ$(): Red Granite, АŅ€ÐģÐļÐŧŅ–Ņ‚, АŅ€ÐģŅ–ÐŧŅ–Ņ‚, БазаÐŧŅŒŅ‚, ВаÐŋÐ―ŅÐš, Ð“Ð°ÐąŅ€Ðū, ГÐŧÐļÐ―ÐļŅŅ‚ÐļÐđ ŅÐŧÐ°Ð―ÐĩŅ†ŅŒ, ГŅ€Ð°Ð―Ņ–Ņ‚, ДаŅ†ÐļŅ‚, ДŅ–ÐūŅ€ÐļŅ‚, ДÐūÐŧÐūОŅ–Ņ‚, КÐēаŅ€Ņ†ÐļŅ‚, КÐūÐ―ÐģÐŧÐūОÐĩŅ€Ð°Ņ‚, КŅ€ÐĩÐđÐīа, КŅ€ÐĩОÐĩÐ―ÐļŅŅ‚ÐļÐđ ŅÐŧÐ°Ð―ÐĩŅ†ŅŒ, ÐĒŅ€Ð°Ņ…Ņ–Ņ‚", "title": "ГÐĩОаŅ‚ÐļŅ‚ Ņ‚а ЛŅ–ОÐūÐ―Ņ–Ņ‚", "type": "patchouli:text", "anchor": "mars_surface_hematite" @@ -1016,7 +1016,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)РŅ–ÐīКŅ–ŅŅ‚ŅŒ$(): 1/135 Ņ‡Ð°Ð―КŅ–Ðē$(br)$(thing)ÐĐŅ–ÐŧŅŒÐ―Ņ–ŅŅ‚ŅŒ$(): 25%$(br)$(thing)ÐĒÐļÐŋ$(): КÐŧаŅŅ‚ÐĩŅ€Ð―а ÐēÐĩÐ―Ð°$(br)$(thing)Y$(): 80 — 180$(br)$(thing)РÐūзОŅ–Ņ€$(): 45$(br)$(thing)Ð†Ð―ÐīÐļКаŅ‚ÐūŅ€ Max Depth$(): 40$(br2)$(thing)ÐĒÐļÐŋÐļ КаОÐĩÐ―ŅŽ$(): Red Granite, АŅ€ÐģÐļÐŧŅ–Ņ‚, АŅ€ÐģŅ–ÐŧŅ–Ņ‚, БазаÐŧŅŒŅ‚, ВаÐŋÐ―ŅÐš, Ð“Ð°ÐąŅ€Ðū, ГÐŧÐļÐ―ÐļŅŅ‚ÐļÐđ ŅÐŧÐ°Ð―ÐĩŅ†ŅŒ, ГŅ€Ð°Ð―Ņ–Ņ‚, ДаŅ†ÐļŅ‚, ДŅ–ÐūŅ€ÐļŅ‚, ДÐūÐŧÐūОŅ–Ņ‚, КÐūÐ―ÐģÐŧÐūОÐĩŅ€Ð°Ņ‚, КŅ€ÐĩÐđÐīа, КŅ€ÐĩОÐĩÐ―ÐļŅŅ‚ÐļÐđ ŅÐŧÐ°Ð―ÐĩŅ†ŅŒ, ÐĒŅ€Ð°Ņ…Ņ–Ņ‚", + "text": "$(thing)РŅ–ÐīКŅ–ŅŅ‚ŅŒ$(): 1/135 Ņ‡Ð°Ð―КŅ–Ðē$(br)$(thing)ÐĐŅ–ÐŧŅŒÐ―Ņ–ŅŅ‚ŅŒ$(): 25%$(br)$(thing)ÐĒÐļÐŋ$(): КÐŧаŅŅ‚ÐĩŅ€Ð―а ÐēÐĩÐ―Ð°$(br)$(thing)Y$(): 80 — 180$(br)$(thing)РÐūзОŅ–Ņ€$(): 45$(br)$(thing)Ð†Ð―ÐīÐļКаŅ‚ÐūŅ€ Max Depth$(): 40$(br2)$(thing)ÐĒÐļÐŋÐļ КаОÐĩÐ―ŅŽ$(): Red Granite, АŅ€ÐģÐļÐŧŅ–Ņ‚, АŅ€ÐģŅ–ÐŧŅ–Ņ‚, БазаÐŧŅŒŅ‚, ВаÐŋÐ―ŅÐš, Ð“Ð°ÐąŅ€Ðū, ГÐŧÐļÐ―ÐļŅŅ‚ÐļÐđ ŅÐŧÐ°Ð―ÐĩŅ†ŅŒ, ГŅ€Ð°Ð―Ņ–Ņ‚, ДаŅ†ÐļŅ‚, ДŅ–ÐūŅ€ÐļŅ‚, ДÐūÐŧÐūОŅ–Ņ‚, КÐēаŅ€Ņ†ÐļŅ‚, КÐūÐ―ÐģÐŧÐūОÐĩŅ€Ð°Ņ‚, КŅ€ÐĩÐđÐīа, КŅ€ÐĩОÐĩÐ―ÐļŅŅ‚ÐļÐđ ŅÐŧÐ°Ð―ÐĩŅ†ŅŒ, ÐĒŅ€Ð°Ņ…Ņ–Ņ‚", "title": "КаŅÐļŅ‚ÐĩŅ€ÐļŅ‚", "type": "patchouli:text", "anchor": "mars_surface_cassiterite" @@ -1083,7 +1083,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)РŅ–ÐīКŅ–ŅŅ‚ŅŒ$(): 1/210 Ņ‡Ð°Ð―КŅ–Ðē$(br)$(thing)ÐĐŅ–ÐŧŅŒÐ―Ņ–ŅŅ‚ŅŒ$(): 30%$(br)$(thing)ÐĒÐļÐŋ$(): КÐŧаŅŅ‚ÐĩŅ€Ð―а ÐēÐĩÐ―Ð°$(br)$(thing)Y$(): 0 — 70$(br)$(thing)РÐūзОŅ–Ņ€$(): 40$(br)$(thing)Ð†Ð―ÐīÐļКаŅ‚ÐūŅ€ Max Depth$(): 15$(br2)$(thing)ÐĒÐļÐŋÐļ КаОÐĩÐ―ŅŽ$(): Red Granite, АŅ€ÐģÐļÐŧŅ–Ņ‚, АŅ€ÐģŅ–ÐŧŅ–Ņ‚, ВаÐŋÐ―ŅÐš, ГÐŧÐļÐ―ÐļŅŅ‚ÐļÐđ ŅÐŧÐ°Ð―ÐĩŅ†ŅŒ, ГŅ€Ð°Ð―Ņ–Ņ‚, КŅ€ÐĩÐđÐīа, КŅ€ÐĩОÐĩÐ―ÐļŅŅ‚ÐļÐđ ŅÐŧÐ°Ð―ÐĩŅ†ŅŒ, ÐĒŅ€Ð°Ņ…Ņ–Ņ‚", + "text": "$(thing)РŅ–ÐīКŅ–ŅŅ‚ŅŒ$(): 1/210 Ņ‡Ð°Ð―КŅ–Ðē$(br)$(thing)ÐĐŅ–ÐŧŅŒÐ―Ņ–ŅŅ‚ŅŒ$(): 30%$(br)$(thing)ÐĒÐļÐŋ$(): КÐŧаŅŅ‚ÐĩŅ€Ð―а ÐēÐĩÐ―Ð°$(br)$(thing)Y$(): 0 — 70$(br)$(thing)РÐūзОŅ–Ņ€$(): 40$(br)$(thing)Ð†Ð―ÐīÐļКаŅ‚ÐūŅ€ Max Depth$(): 15$(br2)$(thing)ÐĒÐļÐŋÐļ КаОÐĩÐ―ŅŽ$(): Red Granite, АŅ€ÐģÐļÐŧŅ–Ņ‚, АŅ€ÐģŅ–ÐŧŅ–Ņ‚, ВаÐŋÐ―ŅÐš, ГÐŧÐļÐ―ÐļŅŅ‚ÐļÐđ ŅÐŧÐ°Ð―ÐĩŅ†ŅŒ, ГŅ€Ð°Ð―Ņ–Ņ‚, КÐēаŅ€Ņ†ÐļŅ‚, КŅ€ÐĩÐđÐīа, КŅ€ÐĩОÐĩÐ―ÐļŅŅ‚ÐļÐđ ŅÐŧÐ°Ð―ÐĩŅ†ŅŒ, ÐĒŅ€Ð°Ņ…Ņ–Ņ‚", "title": "КÐēаŅ€Ņ†ÐļŅ‚, ÐÐ·ÐąÐĩŅŅ‚ Ņ– БаŅ€ÐļŅ‚", "type": "patchouli:text", "anchor": "mars_quartzite" @@ -1359,7 +1359,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)РŅ–ÐīКŅ–ŅŅ‚ŅŒ$(): 1/220 Ņ‡Ð°Ð―КŅ–Ðē$(br)$(thing)ÐĐŅ–ÐŧŅŒÐ―Ņ–ŅŅ‚ŅŒ$(): 40%$(br)$(thing)ÐĒÐļÐŋ$(): КÐŧаŅŅ‚ÐĩŅ€Ð―а ÐēÐĩÐ―Ð°$(br)$(thing)Y$(): 0 — 70$(br)$(thing)РÐūзОŅ–Ņ€$(): 50$(br)$(thing)Ð†Ð―ÐīÐļКаŅ‚ÐūŅ€ Max Depth$(): 40$(br2)$(thing)ÐĒÐļÐŋÐļ КаОÐĩÐ―ŅŽ$(): АŅ€ÐģÐļÐŧŅ–Ņ‚, АŅ€ÐģŅ–ÐŧŅ–Ņ‚, БазаÐŧŅŒŅ‚, ВаÐŋÐ―ŅÐš, ГÐŧÐļÐ―ÐļŅŅ‚ÐļÐđ ŅÐŧÐ°Ð―ÐĩŅ†ŅŒ, ДаŅ†ÐļŅ‚, ДÐūÐŧÐūОŅ–Ņ‚, КÐūÐ―ÐģÐŧÐūОÐĩŅ€Ð°Ņ‚, ÐĒŅ€Ð°Ņ…Ņ–Ņ‚", + "text": "$(thing)РŅ–ÐīКŅ–ŅŅ‚ŅŒ$(): 1/220 Ņ‡Ð°Ð―КŅ–Ðē$(br)$(thing)ÐĐŅ–ÐŧŅŒÐ―Ņ–ŅŅ‚ŅŒ$(): 40%$(br)$(thing)ÐĒÐļÐŋ$(): КÐŧаŅŅ‚ÐĩŅ€Ð―а ÐēÐĩÐ―Ð°$(br)$(thing)Y$(): 0 — 70$(br)$(thing)РÐūзОŅ–Ņ€$(): 50$(br)$(thing)Ð†Ð―ÐīÐļКаŅ‚ÐūŅ€ Max Depth$(): 40$(br2)$(thing)ÐĒÐļÐŋÐļ КаОÐĩÐ―ŅŽ$(): АŅ€ÐģÐļÐŧŅ–Ņ‚, АŅ€ÐģŅ–ÐŧŅ–Ņ‚, БазаÐŧŅŒŅ‚, ВаÐŋÐ―ŅÐš, ГÐŧÐļÐ―ÐļŅŅ‚ÐļÐđ ŅÐŧÐ°Ð―ÐĩŅ†ŅŒ, ДаŅ†ÐļŅ‚, ДÐūÐŧÐūОŅ–Ņ‚, КÐēаŅ€Ņ†ÐļŅ‚, КÐūÐ―ÐģÐŧÐūОÐĩŅ€Ð°Ņ‚, ÐĒŅ€Ð°Ņ…Ņ–Ņ‚", "title": "МŅ–ÐīŅŒ Ņ‚а ÐĨаÐŧŅŒÐšÐūÐŋŅ–Ņ€ÐļŅ‚", "type": "patchouli:text", "anchor": "mars_copper" @@ -1451,7 +1451,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)РŅ–ÐīКŅ–ŅŅ‚ŅŒ$(): 1/220 Ņ‡Ð°Ð―КŅ–Ðē$(br)$(thing)ÐĐŅ–ÐŧŅŒÐ―Ņ–ŅŅ‚ŅŒ$(): 55%$(br)$(thing)ÐĒÐļÐŋ$(): КÐŧаŅŅ‚ÐĩŅ€Ð―а ÐēÐĩÐ―Ð°$(br)$(thing)Y$(): 0 — 70$(br)$(thing)РÐūзОŅ–Ņ€$(): 20$(br)$(thing)Ð†Ð―ÐīÐļКаŅ‚ÐūŅ€ Max Depth$(): 15$(br2)$(thing)ÐĒÐļÐŋÐļ КаОÐĩÐ―ŅŽ$(): Red Granite, АŅ€ÐģŅ–ÐŧŅ–Ņ‚, Ð“Ð°ÐąŅ€Ðū, ГÐŧÐļÐ―ÐļŅŅ‚ÐļÐđ ŅÐŧÐ°Ð―ÐĩŅ†ŅŒ, ДаŅ†ÐļŅ‚, ДŅ–ÐūŅ€ÐļŅ‚, ДÐūÐŧÐūОŅ–Ņ‚, КÐūÐ―ÐģÐŧÐūОÐĩŅ€Ð°Ņ‚, ÐĒŅ€Ð°Ņ…Ņ–Ņ‚", + "text": "$(thing)РŅ–ÐīКŅ–ŅŅ‚ŅŒ$(): 1/220 Ņ‡Ð°Ð―КŅ–Ðē$(br)$(thing)ÐĐŅ–ÐŧŅŒÐ―Ņ–ŅŅ‚ŅŒ$(): 55%$(br)$(thing)ÐĒÐļÐŋ$(): КÐŧаŅŅ‚ÐĩŅ€Ð―а ÐēÐĩÐ―Ð°$(br)$(thing)Y$(): 0 — 70$(br)$(thing)РÐūзОŅ–Ņ€$(): 20$(br)$(thing)Ð†Ð―ÐīÐļКаŅ‚ÐūŅ€ Max Depth$(): 15$(br2)$(thing)ÐĒÐļÐŋÐļ КаОÐĩÐ―ŅŽ$(): Red Granite, АŅ€ÐģŅ–ÐŧŅ–Ņ‚, Ð“Ð°ÐąŅ€Ðū, ГÐŧÐļÐ―ÐļŅŅ‚ÐļÐđ ŅÐŧÐ°Ð―ÐĩŅ†ŅŒ, ДаŅ†ÐļŅ‚, ДŅ–ÐūŅ€ÐļŅ‚, ДÐūÐŧÐūОŅ–Ņ‚, КÐēаŅ€Ņ†ÐļŅ‚, КÐūÐ―ÐģÐŧÐūОÐĩŅ€Ð°Ņ‚, ÐĒŅ€Ð°Ņ…Ņ–Ņ‚", "title": "НаŅŅ‚ŅƒŅ€Ð°Ð―, ÐĒÐūŅ€Ņ–Ð°Ð―Ņ–Ņ‚ Ņ– ГÐĩОаŅ‚ÐļŅ‚", "type": "patchouli:text", "anchor": "mars_pitchblende" @@ -1518,7 +1518,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)РŅ–ÐīКŅ–ŅŅ‚ŅŒ$(): 1/370 Ņ‡Ð°Ð―КŅ–Ðē$(br)$(thing)ÐĐŅ–ÐŧŅŒÐ―Ņ–ŅŅ‚ŅŒ$(): 30%$(br)$(thing)ÐĒÐļÐŋ$(): КÐŧаŅŅ‚ÐĩŅ€Ð―а ÐēÐĩÐ―Ð°$(br)$(thing)Y$(): -20 — 0$(br)$(thing)РÐūзОŅ–Ņ€$(): 60$(br)$(thing)Ð†Ð―ÐīÐļКаŅ‚ÐūŅ€ Max Depth$(): 20$(br2)$(thing)ÐĒÐļÐŋÐļ КаОÐĩÐ―ŅŽ$(): АŅ€ÐģÐļÐŧŅ–Ņ‚, АŅ€ÐģŅ–ÐŧŅ–Ņ‚, Ð“Ð°ÐąŅ€Ðū, ГÐŧÐļÐ―ÐļŅŅ‚ÐļÐđ ŅÐŧÐ°Ð―ÐĩŅ†ŅŒ, ДаŅ†ÐļŅ‚, ДŅ–ÐūŅ€ÐļŅ‚, ÐĒŅ€Ð°Ņ…Ņ–Ņ‚", + "text": "$(thing)РŅ–ÐīКŅ–ŅŅ‚ŅŒ$(): 1/370 Ņ‡Ð°Ð―КŅ–Ðē$(br)$(thing)ÐĐŅ–ÐŧŅŒÐ―Ņ–ŅŅ‚ŅŒ$(): 30%$(br)$(thing)ÐĒÐļÐŋ$(): КÐŧаŅŅ‚ÐĩŅ€Ð―а ÐēÐĩÐ―Ð°$(br)$(thing)Y$(): -30 — 0$(br)$(thing)РÐūзОŅ–Ņ€$(): 60$(br)$(thing)Ð†Ð―ÐīÐļКаŅ‚ÐūŅ€ Max Depth$(): 20$(br2)$(thing)ÐĒÐļÐŋÐļ КаОÐĩÐ―ŅŽ$(): Red Granite, Ð“Ð°ÐąŅ€Ðū, ГŅ€Ð°Ð―Ņ–Ņ‚, ДŅ–ÐūŅ€ÐļŅ‚", "title": "НаŅŅ‚ŅƒŅ€Ð°Ð―, ÐĒÐūŅ€Ņ–Ð°Ð―Ņ–Ņ‚ Ņ– ÐĢŅ€Ð°Ð―Ņ–Ð―Ņ–Ņ‚", "type": "patchouli:text", "anchor": "deep_mars_pitchblende" @@ -1585,7 +1585,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)РŅ–ÐīКŅ–ŅŅ‚ŅŒ$(): 1/370 Ņ‡Ð°Ð―КŅ–Ðē$(br)$(thing)ÐĐŅ–ÐŧŅŒÐ―Ņ–ŅŅ‚ŅŒ$(): 30%$(br)$(thing)ÐĒÐļÐŋ$(): КÐŧаŅŅ‚ÐĩŅ€Ð―а ÐēÐĩÐ―Ð°$(br)$(thing)Y$(): -20 — 0$(br)$(thing)РÐūзОŅ–Ņ€$(): 60$(br)$(thing)Ð†Ð―ÐīÐļКаŅ‚ÐūŅ€ Max Depth$(): 20$(br2)$(thing)ÐĒÐļÐŋÐļ КаОÐĩÐ―ŅŽ$(): АŅ€ÐģÐļÐŧŅ–Ņ‚, АŅ€ÐģŅ–ÐŧŅ–Ņ‚, БазаÐŧŅŒŅ‚, ВаÐŋÐ―ŅÐš, ГÐŧÐļÐ―ÐļŅŅ‚ÐļÐđ ŅÐŧÐ°Ð―ÐĩŅ†ŅŒ, ДаŅ†ÐļŅ‚, КŅ€ÐĩÐđÐīа, КŅ€ÐĩОÐĩÐ―ÐļŅŅ‚ÐļÐđ ŅÐŧÐ°Ð―ÐĩŅ†ŅŒ", + "text": "$(thing)РŅ–ÐīКŅ–ŅŅ‚ŅŒ$(): 1/370 Ņ‡Ð°Ð―КŅ–Ðē$(br)$(thing)ÐĐŅ–ÐŧŅŒÐ―Ņ–ŅŅ‚ŅŒ$(): 30%$(br)$(thing)ÐĒÐļÐŋ$(): КÐŧаŅŅ‚ÐĩŅ€Ð―а ÐēÐĩÐ―Ð°$(br)$(thing)Y$(): -30 — 0$(br)$(thing)РÐūзОŅ–Ņ€$(): 60$(br)$(thing)Ð†Ð―ÐīÐļКаŅ‚ÐūŅ€ Max Depth$(): 20$(br2)$(thing)ÐĒÐļÐŋÐļ КаОÐĩÐ―ŅŽ$(): Red Granite, Ð“Ð°ÐąŅ€Ðū, ГŅ€Ð°Ð―Ņ–Ņ‚, ДŅ–ÐūŅ€ÐļŅ‚", "title": "РÐĩÐīŅŅ‚ÐūŅƒÐ― Ņ– ÐĨŅ€ÐūОŅ–Ņ‚", "type": "patchouli:text", "anchor": "deep_mars_chromite" @@ -1719,7 +1719,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)РŅ–ÐīКŅ–ŅŅ‚ŅŒ$(): 1/210 Ņ‡Ð°Ð―КŅ–Ðē$(br)$(thing)ÐĐŅ–ÐŧŅŒÐ―Ņ–ŅŅ‚ŅŒ$(): 40%$(br)$(thing)ÐĒÐļÐŋ$(): ДÐļŅÐšÐūÐēа ÐēÐĩÐ―Ð°$(br)$(thing)Y$(): 0 — 70$(br)$(thing)РÐūзОŅ–Ņ€$(): 40$(br)$(thing)ВÐļŅÐūŅ‚а$(): 6$(br)$(thing)Ð†Ð―ÐīÐļКаŅ‚ÐūŅ€ Max Depth$(): 15$(br2)$(thing)ÐĒÐļÐŋÐļ КаОÐĩÐ―ŅŽ$(): Red Granite, АŅ€ÐģÐļÐŧŅ–Ņ‚, АŅ€ÐģŅ–ÐŧŅ–Ņ‚, ВаÐŋÐ―ŅÐš, ГŅ€Ð°Ð―Ņ–Ņ‚, ДŅ–ÐūŅ€ÐļŅ‚, КŅ€ÐĩÐđÐīа, КŅ€ÐĩОÐĩÐ―ÐļŅŅ‚ÐļÐđ ŅÐŧÐ°Ð―ÐĩŅ†ŅŒ, ÐĒŅ€Ð°Ņ…Ņ–Ņ‚", + "text": "$(thing)РŅ–ÐīКŅ–ŅŅ‚ŅŒ$(): 1/210 Ņ‡Ð°Ð―КŅ–Ðē$(br)$(thing)ÐĐŅ–ÐŧŅŒÐ―Ņ–ŅŅ‚ŅŒ$(): 40%$(br)$(thing)ÐĒÐļÐŋ$(): ДÐļŅÐšÐūÐēа ÐēÐĩÐ―Ð°$(br)$(thing)Y$(): 0 — 70$(br)$(thing)РÐūзОŅ–Ņ€$(): 40$(br)$(thing)ВÐļŅÐūŅ‚а$(): 6$(br)$(thing)Ð†Ð―ÐīÐļКаŅ‚ÐūŅ€ Max Depth$(): 15$(br2)$(thing)ÐĒÐļÐŋÐļ КаОÐĩÐ―ŅŽ$(): Red Granite, АŅ€ÐģÐļÐŧŅ–Ņ‚, АŅ€ÐģŅ–ÐŧŅ–Ņ‚, ВаÐŋÐ―ŅÐš, ГŅ€Ð°Ð―Ņ–Ņ‚, ДŅ–ÐūŅ€ÐļŅ‚, КÐēаŅ€Ņ†ÐļŅ‚, КŅ€ÐĩÐđÐīа, КŅ€ÐĩОÐĩÐ―ÐļŅŅ‚ÐļÐđ ŅÐŧÐ°Ð―ÐĩŅ†ŅŒ, ÐĒŅ€Ð°Ņ…Ņ–Ņ‚", "title": "ÐĄÐūÐŧŅ– Ņ– ÐĄÐŋÐūÐīŅƒÐžÐĩÐ―", "type": "patchouli:text", "anchor": "mars_salt" @@ -1903,7 +1903,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)РŅ–ÐīКŅ–ŅŅ‚ŅŒ$(): 1/220 Ņ‡Ð°Ð―КŅ–Ðē$(br)$(thing)ÐĐŅ–ÐŧŅŒÐ―Ņ–ŅŅ‚ŅŒ$(): 25%$(br)$(thing)ÐĒÐļÐŋ$(): КÐŧаŅŅ‚ÐĩŅ€Ð―а ÐēÐĩÐ―Ð°$(br)$(thing)Y$(): 0 — 70$(br)$(thing)РÐūзОŅ–Ņ€$(): 40$(br)$(thing)Ð†Ð―ÐīÐļКаŅ‚ÐūŅ€ Max Depth$(): 15$(br2)$(thing)ÐĒÐļÐŋÐļ КаОÐĩÐ―ŅŽ$(): Red Granite, АŅ€ÐģÐļÐŧŅ–Ņ‚, АŅ€ÐģŅ–ÐŧŅ–Ņ‚, ВаÐŋÐ―ŅÐš, ГÐŧÐļÐ―ÐļŅŅ‚ÐļÐđ ŅÐŧÐ°Ð―ÐĩŅ†ŅŒ, ГŅ€Ð°Ð―Ņ–Ņ‚, ДаŅ†ÐļŅ‚, ДŅ–ÐūŅ€ÐļŅ‚, ДÐūÐŧÐūОŅ–Ņ‚, КÐūÐ―ÐģÐŧÐūОÐĩŅ€Ð°Ņ‚", + "text": "$(thing)РŅ–ÐīКŅ–ŅŅ‚ŅŒ$(): 1/220 Ņ‡Ð°Ð―КŅ–Ðē$(br)$(thing)ÐĐŅ–ÐŧŅŒÐ―Ņ–ŅŅ‚ŅŒ$(): 25%$(br)$(thing)ÐĒÐļÐŋ$(): КÐŧаŅŅ‚ÐĩŅ€Ð―а ÐēÐĩÐ―Ð°$(br)$(thing)Y$(): 0 — 70$(br)$(thing)РÐūзОŅ–Ņ€$(): 40$(br)$(thing)Ð†Ð―ÐīÐļКаŅ‚ÐūŅ€ Max Depth$(): 15$(br2)$(thing)ÐĒÐļÐŋÐļ КаОÐĩÐ―ŅŽ$(): Red Granite, АŅ€ÐģÐļÐŧŅ–Ņ‚, АŅ€ÐģŅ–ÐŧŅ–Ņ‚, ВаÐŋÐ―ŅÐš, ГÐŧÐļÐ―ÐļŅŅ‚ÐļÐđ ŅÐŧÐ°Ð―ÐĩŅ†ŅŒ, ГŅ€Ð°Ð―Ņ–Ņ‚, ДаŅ†ÐļŅ‚, ДŅ–ÐūŅ€ÐļŅ‚, ДÐūÐŧÐūОŅ–Ņ‚, КÐēаŅ€Ņ†ÐļŅ‚, КÐūÐ―ÐģÐŧÐūОÐĩŅ€Ð°Ņ‚", "title": "ÐĄŅ‚ÐĩаŅ‚ÐļŅ‚, ÐĒаÐŧŅŒÐš Ņ– ГÐŧаŅƒÐšÐūÐ―Ņ–Ņ‚", "type": "patchouli:text", "anchor": "mars_lubricant" @@ -2035,7 +2035,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)РŅ–ÐīКŅ–ŅŅ‚ŅŒ$(): 1/150 Ņ‡Ð°Ð―КŅ–Ðē$(br)$(thing)ÐĐŅ–ÐŧŅŒÐ―Ņ–ŅŅ‚ŅŒ$(): 25%$(br)$(thing)ÐĒÐļÐŋ$(): КÐŧаŅŅ‚ÐĩŅ€Ð―а ÐēÐĩÐ―Ð°$(br)$(thing)Y$(): 80 — 180$(br)$(thing)РÐūзОŅ–Ņ€$(): 45$(br)$(thing)Ð†Ð―ÐīÐļКаŅ‚ÐūŅ€ Max Depth$(): 40$(br2)$(thing)ÐĒÐļÐŋÐļ КаОÐĩÐ―ŅŽ$(): Red Granite, АŅ€ÐģÐļÐŧŅ–Ņ‚, АŅ€ÐģŅ–ÐŧŅ–Ņ‚, БазаÐŧŅŒŅ‚, ВаÐŋÐ―ŅÐš, Ð“Ð°ÐąŅ€Ðū, ГÐŧÐļÐ―ÐļŅŅ‚ÐļÐđ ŅÐŧÐ°Ð―ÐĩŅ†ŅŒ, ГŅ€Ð°Ð―Ņ–Ņ‚, ДаŅ†ÐļŅ‚, ДŅ–ÐūŅ€ÐļŅ‚, ДÐūÐŧÐūОŅ–Ņ‚, КÐūÐ―ÐģÐŧÐūОÐĩŅ€Ð°Ņ‚, КŅ€ÐĩÐđÐīа, КŅ€ÐĩОÐĩÐ―ÐļŅŅ‚ÐļÐđ ŅÐŧÐ°Ð―ÐĩŅ†ŅŒ, ÐĒŅ€Ð°Ņ…Ņ–Ņ‚", + "text": "$(thing)РŅ–ÐīКŅ–ŅŅ‚ŅŒ$(): 1/150 Ņ‡Ð°Ð―КŅ–Ðē$(br)$(thing)ÐĐŅ–ÐŧŅŒÐ―Ņ–ŅŅ‚ŅŒ$(): 25%$(br)$(thing)ÐĒÐļÐŋ$(): КÐŧаŅŅ‚ÐĩŅ€Ð―а ÐēÐĩÐ―Ð°$(br)$(thing)Y$(): 80 — 180$(br)$(thing)РÐūзОŅ–Ņ€$(): 45$(br)$(thing)Ð†Ð―ÐīÐļКаŅ‚ÐūŅ€ Max Depth$(): 40$(br2)$(thing)ÐĒÐļÐŋÐļ КаОÐĩÐ―ŅŽ$(): Red Granite, АŅ€ÐģÐļÐŧŅ–Ņ‚, АŅ€ÐģŅ–ÐŧŅ–Ņ‚, БазаÐŧŅŒŅ‚, ВаÐŋÐ―ŅÐš, Ð“Ð°ÐąŅ€Ðū, ГÐŧÐļÐ―ÐļŅŅ‚ÐļÐđ ŅÐŧÐ°Ð―ÐĩŅ†ŅŒ, ГŅ€Ð°Ð―Ņ–Ņ‚, ДаŅ†ÐļŅ‚, ДŅ–ÐūŅ€ÐļŅ‚, ДÐūÐŧÐūОŅ–Ņ‚, КÐēаŅ€Ņ†ÐļŅ‚, КÐūÐ―ÐģÐŧÐūОÐĩŅ€Ð°Ņ‚, КŅ€ÐĩÐđÐīа, КŅ€ÐĩОÐĩÐ―ÐļŅŅ‚ÐļÐđ ŅÐŧÐ°Ð―ÐĩŅ†ŅŒ, ÐĒŅ€Ð°Ņ…Ņ–Ņ‚", "title": "ÐĄŅ„аÐŧÐĩŅ€ÐļŅ‚ Ņ– ГаÐŧÐĩÐ―Ņ–Ņ‚", "type": "patchouli:text", "anchor": "mars_surface_nickel_galena" @@ -2234,7 +2234,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)РŅ–ÐīКŅ–ŅŅ‚ŅŒ$(): 1/210 Ņ‡Ð°Ð―КŅ–Ðē$(br)$(thing)ÐĐŅ–ÐŧŅŒÐ―Ņ–ŅŅ‚ŅŒ$(): 40%$(br)$(thing)ÐĒÐļÐŋ$(): КÐŧаŅŅ‚ÐĩŅ€Ð―а ÐēÐĩÐ―Ð°$(br)$(thing)Y$(): 0 — 70$(br)$(thing)РÐūзОŅ–Ņ€$(): 40$(br)$(thing)Ð†Ð―ÐīÐļКаŅ‚ÐūŅ€ Max Depth$(): 40$(br2)$(thing)ÐĒÐļÐŋÐļ КаОÐĩÐ―ŅŽ$(): Red Granite, АŅ€ÐģŅ–ÐŧŅ–Ņ‚, БазаÐŧŅŒŅ‚, Ð“Ð°ÐąŅ€Ðū, ГÐŧÐļÐ―ÐļŅŅ‚ÐļÐđ ŅÐŧÐ°Ð―ÐĩŅ†ŅŒ, ДаŅ†ÐļŅ‚, ДŅ–ÐūŅ€ÐļŅ‚, ДÐūÐŧÐūОŅ–Ņ‚, КŅ€ÐĩÐđÐīа, КŅ€ÐĩОÐĩÐ―ÐļŅŅ‚ÐļÐđ ŅÐŧÐ°Ð―ÐĩŅ†ŅŒ, ÐĒŅ€Ð°Ņ…Ņ–Ņ‚", + "text": "$(thing)РŅ–ÐīКŅ–ŅŅ‚ŅŒ$(): 1/210 Ņ‡Ð°Ð―КŅ–Ðē$(br)$(thing)ÐĐŅ–ÐŧŅŒÐ―Ņ–ŅŅ‚ŅŒ$(): 40%$(br)$(thing)ÐĒÐļÐŋ$(): КÐŧаŅŅ‚ÐĩŅ€Ð―а ÐēÐĩÐ―Ð°$(br)$(thing)Y$(): 0 — 70$(br)$(thing)РÐūзОŅ–Ņ€$(): 40$(br)$(thing)Ð†Ð―ÐīÐļКаŅ‚ÐūŅ€ Max Depth$(): 40$(br2)$(thing)ÐĒÐļÐŋÐļ КаОÐĩÐ―ŅŽ$(): Red Granite, АŅ€ÐģŅ–ÐŧŅ–Ņ‚, БазаÐŧŅŒŅ‚, Ð“Ð°ÐąŅ€Ðū, ГÐŧÐļÐ―ÐļŅŅ‚ÐļÐđ ŅÐŧÐ°Ð―ÐĩŅ†ŅŒ, ДаŅ†ÐļŅ‚, ДŅ–ÐūŅ€ÐļŅ‚, ДÐūÐŧÐūОŅ–Ņ‚, КÐēаŅ€Ņ†ÐļŅ‚, КŅ€ÐĩÐđÐīа, КŅ€ÐĩОÐĩÐ―ÐļŅŅ‚ÐļÐđ ŅÐŧÐ°Ð―ÐĩŅ†ŅŒ, ÐĒŅ€Ð°Ņ…Ņ–Ņ‚", "title": "ÐĒÐĩŅ‚Ņ€Ð°ÐĩÐīŅ€ÐļŅ‚ (ЗÐēÐļŅ‡Ð°ÐđÐ―ÐļÐđ)", "type": "patchouli:text", "anchor": "mars_stibnite" @@ -2326,7 +2326,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)РŅ–ÐīКŅ–ŅŅ‚ŅŒ$(): 1/140 Ņ‡Ð°Ð―КŅ–Ðē$(br)$(thing)ÐĐŅ–ÐŧŅŒÐ―Ņ–ŅŅ‚ŅŒ$(): 25%$(br)$(thing)ÐĒÐļÐŋ$(): КÐŧаŅŅ‚ÐĩŅ€Ð―а ÐēÐĩÐ―Ð°$(br)$(thing)Y$(): 80 — 180$(br)$(thing)РÐūзОŅ–Ņ€$(): 45$(br)$(thing)Ð†Ð―ÐīÐļКаŅ‚ÐūŅ€ Max Depth$(): 40$(br2)$(thing)ÐĒÐļÐŋÐļ КаОÐĩÐ―ŅŽ$(): Red Granite, АŅ€ÐģÐļÐŧŅ–Ņ‚, АŅ€ÐģŅ–ÐŧŅ–Ņ‚, БазаÐŧŅŒŅ‚, ВаÐŋÐ―ŅÐš, Ð“Ð°ÐąŅ€Ðū, ГÐŧÐļÐ―ÐļŅŅ‚ÐļÐđ ŅÐŧÐ°Ð―ÐĩŅ†ŅŒ, ГŅ€Ð°Ð―Ņ–Ņ‚, ДаŅ†ÐļŅ‚, ДŅ–ÐūŅ€ÐļŅ‚, ДÐūÐŧÐūОŅ–Ņ‚, КÐūÐ―ÐģÐŧÐūОÐĩŅ€Ð°Ņ‚, КŅ€ÐĩÐđÐīа, КŅ€ÐĩОÐĩÐ―ÐļŅŅ‚ÐļÐđ ŅÐŧÐ°Ð―ÐĩŅ†ŅŒ, ÐĒŅ€Ð°Ņ…Ņ–Ņ‚", + "text": "$(thing)РŅ–ÐīКŅ–ŅŅ‚ŅŒ$(): 1/140 Ņ‡Ð°Ð―КŅ–Ðē$(br)$(thing)ÐĐŅ–ÐŧŅŒÐ―Ņ–ŅŅ‚ŅŒ$(): 25%$(br)$(thing)ÐĒÐļÐŋ$(): КÐŧаŅŅ‚ÐĩŅ€Ð―а ÐēÐĩÐ―Ð°$(br)$(thing)Y$(): 80 — 180$(br)$(thing)РÐūзОŅ–Ņ€$(): 45$(br)$(thing)Ð†Ð―ÐīÐļКаŅ‚ÐūŅ€ Max Depth$(): 40$(br2)$(thing)ÐĒÐļÐŋÐļ КаОÐĩÐ―ŅŽ$(): Red Granite, АŅ€ÐģÐļÐŧŅ–Ņ‚, АŅ€ÐģŅ–ÐŧŅ–Ņ‚, БазаÐŧŅŒŅ‚, ВаÐŋÐ―ŅÐš, Ð“Ð°ÐąŅ€Ðū, ГÐŧÐļÐ―ÐļŅŅ‚ÐļÐđ ŅÐŧÐ°Ð―ÐĩŅ†ŅŒ, ГŅ€Ð°Ð―Ņ–Ņ‚, ДаŅ†ÐļŅ‚, ДŅ–ÐūŅ€ÐļŅ‚, ДÐūÐŧÐūОŅ–Ņ‚, КÐēаŅ€Ņ†ÐļŅ‚, КÐūÐ―ÐģÐŧÐūОÐĩŅ€Ð°Ņ‚, КŅ€ÐĩÐđÐīа, КŅ€ÐĩОÐĩÐ―ÐļŅŅ‚ÐļÐđ ŅÐŧÐ°Ð―ÐĩŅ†ŅŒ, ÐĒŅ€Ð°Ņ…Ņ–Ņ‚", "title": "ÐĒÐĩŅ‚Ņ€Ð°ÐĩÐīŅ€ÐļŅ‚ (ПÐūÐēÐĩŅ€Ņ…Ð―Ņ)", "type": "patchouli:text", "anchor": "mars_surface_tetrahedrite" diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/nether_vein_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/nether_vein_index.json index 6799e5aca..877b8f677 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/nether_vein_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/nether_vein_index.json @@ -2029,7 +2029,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)РŅ–ÐīКŅ–ŅŅ‚ŅŒ$(): 1/250 Ņ‡Ð°Ð―КŅ–Ðē$(br)$(thing)ÐĐŅ–ÐŧŅŒÐ―Ņ–ŅŅ‚ŅŒ$(): 45%$(br)$(thing)ÐĒÐļÐŋ$(): ÐĒŅ€ŅƒÐąÐ―а ÐēÐĩÐ―Ð°$(br)$(thing)Y$(): 32 — 128$(br)$(thing)ВÐļŅÐūŅ‚а$(): 60$(br)$(thing)РаÐīŅ–ŅƒŅ$(): 12$(br2)$(thing)ÐĒÐļÐŋÐļ КаОÐĩÐ―ŅŽ$(): БазаÐŧŅŒŅ‚, МŅ–ÐģОаŅ‚ÐļŅ‚, ПŅ–Ņ€ÐūКŅÐĩÐ―Ņ–Ņ‚Ðļ, ÐĒŅ€Ð°ÐēÐĩŅ€Ņ‚ÐļÐ―", + "text": "$(thing)РŅ–ÐīКŅ–ŅŅ‚ŅŒ$(): 1/300 Ņ‡Ð°Ð―КŅ–Ðē$(br)$(thing)ÐĐŅ–ÐŧŅŒÐ―Ņ–ŅŅ‚ŅŒ$(): 45%$(br)$(thing)ÐĒÐļÐŋ$(): ÐĒŅ€ŅƒÐąÐ―а ÐēÐĩÐ―Ð°$(br)$(thing)Y$(): 32 — 128$(br)$(thing)ВÐļŅÐūŅ‚а$(): 60$(br)$(thing)РаÐīŅ–ŅƒŅ$(): 12$(br2)$(thing)ÐĒÐļÐŋÐļ КаОÐĩÐ―ŅŽ$(): БазаÐŧŅŒŅ‚, МŅ–ÐģОаŅ‚ÐļŅ‚, ПŅ–Ņ€ÐūКŅÐĩÐ―Ņ–Ņ‚Ðļ, ÐĒŅ€Ð°ÐēÐĩŅ€Ņ‚ÐļÐ―", "title": "ÐĄÐžÐ°Ņ€Ð°ÐģÐī Ņ– БÐĩŅ€ÐļÐŧŅ–Ðđ", "type": "patchouli:text", "anchor": "nether_beryllium" diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/venus_vein_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/venus_vein_index.json index e2cf19252..755e2793c 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/venus_vein_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/venus_vein_index.json @@ -19,7 +19,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)РŅ–ÐīКŅ–ŅŅ‚ŅŒ$(): 1/30 Ņ‡Ð°Ð―КŅ–Ðē$(br)$(thing)ÐĐŅ–ÐŧŅŒÐ―Ņ–ŅŅ‚ŅŒ$(): 20%$(br)$(thing)ÐĒÐļÐŋ$(): КÐŧаŅŅ‚ÐĩŅ€Ð―а ÐēÐĩÐ―Ð°$(br)$(thing)Y$(): 40 — 65$(br)$(thing)РÐūзОŅ–Ņ€$(): 20$(br)$(thing)Ð†Ð―ÐīÐļКаŅ‚ÐūŅ€ Max Depth$(): 30$(br2)$(thing)ÐĒÐļÐŋÐļ КаОÐĩÐ―ŅŽ$(): ÐÐ―ÐīÐĩзÐļŅ‚, БазаÐŧŅŒŅ‚, ДаŅ†ÐļŅ‚, РŅ–ÐūÐŧŅ–Ņ‚, ÐĒŅ€Ð°ÐēÐĩŅ€Ņ‚ÐļÐ―, ÐĒŅ€Ð°Ņ…Ņ–Ņ‚", + "text": "$(thing)РŅ–ÐīКŅ–ŅŅ‚ŅŒ$(): 1/30 Ņ‡Ð°Ð―КŅ–Ðē$(br)$(thing)ÐĐŅ–ÐŧŅŒÐ―Ņ–ŅŅ‚ŅŒ$(): 20%$(br)$(thing)ÐĒÐļÐŋ$(): КÐŧаŅŅ‚ÐĩŅ€Ð―а ÐēÐĩÐ―Ð°$(br)$(thing)Y$(): 40 — 65$(br)$(thing)РÐūзОŅ–Ņ€$(): 20$(br)$(thing)Ð†Ð―ÐīÐļКаŅ‚ÐūŅ€ Max Depth$(): 30$(br2)$(thing)ÐĒÐļÐŋÐļ КаОÐĩÐ―ŅŽ$(): IÐģÐ―Ņ–ÐžÐąŅ€ÐļŅ‚, ÐÐ―ÐīÐĩзÐļŅ‚, БазаÐŧŅŒŅ‚, ДаŅ†ÐļŅ‚, ЛаОÐŋŅ€ÐūŅ—Ņ‚, РŅ–ÐūÐŧŅ–Ņ‚, ÐĒŅ€Ð°ÐēÐĩŅ€Ņ‚ÐļÐ―, ÐĒŅ€Ð°Ņ…Ņ–Ņ‚", "title": "ÐĄŅ–Ņ€ÐšÐ° Ņ‚а ПŅ–Ņ€ÐļŅ‚", "type": "patchouli:text", "anchor": "venus_manual_sulfur" @@ -86,7 +86,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)РŅ–ÐīКŅ–ŅŅ‚ŅŒ$(): 1/30 Ņ‡Ð°Ð―КŅ–Ðē$(br)$(thing)ÐĐŅ–ÐŧŅŒÐ―Ņ–ŅŅ‚ŅŒ$(): 20%$(br)$(thing)ÐĒÐļÐŋ$(): ДÐļŅÐšÐūÐēа ÐēÐĩÐ―Ð°$(br)$(thing)Y$(): 40 — 65$(br)$(thing)РÐūзОŅ–Ņ€$(): 20$(br)$(thing)ВÐļŅÐūŅ‚а$(): 6$(br)$(thing)Ð†Ð―ÐīÐļКаŅ‚ÐūŅ€ Max Depth$(): 30$(br2)$(thing)ÐĒÐļÐŋÐļ КаОÐĩÐ―ŅŽ$(): ÐÐ―ÐīÐĩзÐļŅ‚, БазаÐŧŅŒŅ‚, ДаŅ†ÐļŅ‚, РŅ–ÐūÐŧŅ–Ņ‚, ÐĒŅ€Ð°ÐēÐĩŅ€Ņ‚ÐļÐ―, ÐĒŅ€Ð°Ņ…Ņ–Ņ‚", + "text": "$(thing)РŅ–ÐīКŅ–ŅŅ‚ŅŒ$(): 1/30 Ņ‡Ð°Ð―КŅ–Ðē$(br)$(thing)ÐĐŅ–ÐŧŅŒÐ―Ņ–ŅŅ‚ŅŒ$(): 20%$(br)$(thing)ÐĒÐļÐŋ$(): ДÐļŅÐšÐūÐēа ÐēÐĩÐ―Ð°$(br)$(thing)Y$(): 40 — 65$(br)$(thing)РÐūзОŅ–Ņ€$(): 20$(br)$(thing)ВÐļŅÐūŅ‚а$(): 6$(br)$(thing)Ð†Ð―ÐīÐļКаŅ‚ÐūŅ€ Max Depth$(): 30$(br2)$(thing)ÐĒÐļÐŋÐļ КаОÐĩÐ―ŅŽ$(): IÐģÐ―Ņ–ÐžÐąŅ€ÐļŅ‚, ÐÐ―ÐīÐĩзÐļŅ‚, БазаÐŧŅŒŅ‚, ДаŅ†ÐļŅ‚, ЛаОÐŋŅ€ÐūŅ—Ņ‚, РŅ–ÐūÐŧŅ–Ņ‚, ÐĒŅ€Ð°ÐēÐĩŅ€Ņ‚ÐļÐ―, ÐĒŅ€Ð°Ņ…Ņ–Ņ‚", "title": "ÐĄÐūÐŧŅ– Ņ– ÐĄÐŋÐūÐīŅƒÐžÐĩÐ―", "type": "patchouli:text", "anchor": "venus_manual_salt" diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/beneath/curious_blocks.json b/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/beneath/curious_blocks.json index 73f70cb95..90c7f8230 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/beneath/curious_blocks.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/beneath/curious_blocks.json @@ -13,6 +13,11 @@ "recipe": "tfg:shapeless/hellbricks_from_soot", "text": "地į‹ąį –æ˜Ŋäļ€į§åŧšį­‘æ–đ块äđŸį”Ļ䚎地į‹ąį†”į‚‰åŧšé€ ã€‚" }, + { + "type": "patchouli:spotlight", + "item": "beneath:ancient_altar", + "text": "čū‰įŸģåēĐ埚嚧åŊį”ĻäšŽåą•įĪšä― æƒģį‚Ŧ耀įš„į‰Đ品" + }, { "type": "patchouli:crafting", "recipe": "beneath:crafting/blackstone_brick", diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/beneath/piglins.json b/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/beneath/piglins.json index a29717042..de7c4663d 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/beneath/piglins.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/beneath/piglins.json @@ -27,7 +27,7 @@ { "type": "patchouli:text", "title": "å Ąåž’é—čŋđ", - "text": "掠åĪšäļ€äļŠ $(thing)å Ąåž’é—čŋđ$() åŊčƒ―åąé™ĐïžŒä―†å›žæŠĨäđŸåūˆäļ°åŽšïžä― čƒ―获åū—åĶ‚äļ‹į‰Đ品$(li)金、įŽŦį‘°é‡‘、į”Ÿé“ã€éŧ‘青铜和é“ķ锭$(li)éŧ‘青铜æ­Ķå™Ļ、å·Ĩ具和æŠĪį”ē$(li)éŦ˜åē­åœŸå’ŒįŸģåĒĻ$(li)æ°ļäđ…光暐$(li)åļƒæ–™ã€įšŪéĐ、į§å­å’ŒéĢŸį‰Đ$(li)äŧĨ及å…ķäŧ–åŪč—ïž" + "text": "掠åĪšäļ€äļŠ $(thing)å Ąåž’é—čŋđ$() åŊčƒ―åąé™ĐïžŒä―†å›žæŠĨäđŸåūˆäļ°åŽšïžä― čƒ―获åū—åĶ‚äļ‹į‰Đ品$(li)金、įŽŦį‘°é‡‘、į”Ÿé“ã€éŧ‘青铜和é“ķ锭$(li)éŧ‘青铜æ­Ķå™Ļ、å·Ĩ具和æŠĪį”ē$(li)éŦ˜åē­åœŸå’ŒįŸģåĒĻ$(li)įŊįŽž$(li)、åļƒæ–™ã€įšŪéĐ、į§å­å’ŒéĢŸį‰Đ$(li)äŧĨ及å…ķäŧ–åŪč—ïž" }, { "type": "patchouli:spotlight", diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/mechanics/bloomery.json b/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/mechanics/bloomery.json index 7d6c41d3c..6ccf049c2 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/mechanics/bloomery.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/mechanics/bloomery.json @@ -6,7 +6,7 @@ "pages": [ { "type": "patchouli:text", - "text": "$(thing)é”ŧ铁į‚‰$()æ˜Ŋäļ€į§čƒ―将$(thing)铁įŸŋ$()įƒ§į‚žæˆ$(thing)į”Ÿé“æ–đåŊ$()įš„čĢ…į―Ū。į”Ÿé“æ–đåŊåŊčŋ›äļ€æ­Ĩé”ŧ造成$(thing)é”ŧ铁$()。$(l:the_world/ores_and_minerals#hematite)čĩĪ铁įŸŋ$()、$(l:the_world/ores_and_minerals#limonite)čĪé“įŸŋ$()和$(l:the_world/ores_and_minerals#magnetite)įĢé“įŸŋ$()均åŦ铁。į›īæŽĨį†”化čŋ™äš›įŸŋįŸģ及䞚åū—到无į”Ļįš„$(thing)é“ļ铁$()而非$(thing)é”ŧ铁$()。åĶåĪ–所有åŦ铁į‰Đ品į†”化æ—ķéƒ―åŠäžšå˜æˆé“ļ铁。é”ŧ铁į‚‰æ˜Ŋ把é“ļ铁变äļšé”ŧ铁įš„å”Ŋäļ€æ–đæģ•ã€‚é”ŧ铁į‚‰æŽĨ受äŧŧä―•åŦ铁į‰Đ品包拎铁įŸŋįŸģ或é“ļ铁锭。" + "text": "$(thing)é”ŧ铁į‚‰$()æ˜Ŋäļ€į§į”Ļ䚎将$(thing)铁įŸŋ$()įƒ§į‚žæˆ$(thing)į”Ÿé“æ–đåŊ$()įš„čĢ…į―Ūį”Ÿé“æ–đåŊåŊčĒŦčŋ›äļ€æ­Ĩ加å·Ĩ成$(thing)é”ŧ铁$()。åļļ见įš„铁įŸŋ包拎$(l:tfg_ores/earth_vein_index#normal_hematite)čĩĪ铁įŸŋ$()、$(l:tfg_ores/earth_vein_index#normal_limonite)čĪé“įŸŋ$()和$(l:tfg_ores/earth_vein_index#normal_magnetite)įĢé“įŸŋ$()。čŋ™äš›įŸŋįŸģį›īæŽĨį†”化及䞚åū—到$(thing)é“ļ铁$()ïžŒč€Œéž$(thing)é”ŧ铁$()。åŪžé™…äļŠïžŒæ‰€æœ‰åŦ铁į‰Đ品į†”åŒ–åŽéƒ―及䞚变成é“ļ铁。č‹ĨčĶå°†åŪƒäŧŽč―ŽåŒ–äļšåŊį”Ļįš„é”ŧé“ïžŒå°ąéœ€čĶä―ŋį”Ļé”ŧ铁į‚‰ã€‚äŧŧä―•åŦ铁į‰Đå“éƒ―åŊį”Ļ䚎é”ŧ铁į‚‰ïžŒåŒ…拎铁åˆķå·Ĩ具和é“ļ铁锭" }, { "type": "patchouli:crafting", @@ -22,19 +22,19 @@ }, { "type": "patchouli:text", - "text": "é”ŧ铁į‚‰æœ€åĪšåŊåŪđįšģ 48 äļŠ $(thing)čū“å…ĨéĄđ$()æŊåą‚įƒŸå›ąæœ€åĪšæ”ū16äŧķį‰Đ品。åŊ通čŋ‡å †å éĒåĪ–įš„įŸģåĪīæĨ加éŦ˜č‡ģåĪšäļĪåą‚įƒŸå›ąïžŒæŊåą‚éĒåĪ–įš„įƒŸå›ąåŊäŧĨåĪšåŪđįšģ16äŧķį‰Đ品。$(br2)čĶå‘é”ŧ铁į‚‰äļ­åŠ å…Ĩį‰Đ品及需将į‰Đ品äŧŽįƒŸå›ąéĄķéƒĻ投å…ĨįƒŸå›ąäļ­åģåŊ。åĶ‚æžœįƒŸå›ąäļ­å‡šįŽ°į°č‰ēį‰ĐčīĻå°ąčŊī明成功䚆。" + "text": "é”ŧ铁į‚‰æœ€åĪšåŊåŪđįšģ 48 äļŠ $(thing)čū“å…ĨéĄđ$()æŊåą‚įƒŸå›ąæœ€åĪšæ”ū16äŧķį‰Đ品。åŊ通čŋ‡å †å éĒåĪ–įš„įŸģåĪīæĨ加éŦ˜č‡ģåĪšäļĪåą‚įƒŸå›ąïžŒæŊåą‚éĒåĪ–įš„įƒŸå›ąåŊäŧĨåĪšåŪđįšģ16äŧķį‰Đ品。$(br2)向é”ŧ铁į‚‰æ·ŧ加į‰Đ品æ—ķčŊ·æ”€č‡ģįƒŸå›ąéĄķéƒĻåđķ将į‰Đ品投å…Ĩå…ķäļ­ã€‚č‹Ĩ观åŊŸåˆ°å†…éƒĻå―Ē成į°č‰ēįš„įŸŋįŸģ堆åģčĄĻįĪšæŠ•æ”ū成功。$(br2)ä― åŊäŧĨä―ŋį”Ļ$(item)æœĻį‚­$()或$(item)į…Īį‚­$()ä―œäļšé”ŧ铁į‚‰įš„į‡ƒæ–™ã€‚" }, { "type": "patchouli:image", "images": [ "tfc:textures/gui/book/tutorial/bloomery_hole.png" ], - "text": "将į‰Đ品æ·ŧ加到é”ŧ铁į‚‰äļ­ã€‚", + "text": "æŊį”Ÿäš§äļ€å—$(thing)į”Ÿé“æ–đåŊ$()é”ŧ铁į‚‰éœ€čĶæķˆč€—$(thing)1äŧ―į‡ƒæ–™$()和$(thing)144mBé“ļ铁$()。", "border": true }, { "type": "patchouli:text", - "text": "é”ŧ铁į‚‰äžšå°†æŊ$(thing)1äŧ―æœĻį‚­$()和$(thing)144mBé“ļ铁$()č―ŽåŒ–æˆäļ€å—$(thing)æ–đåŊ$()。åœĻ投å…Ĩ所需įš„$(thing)æœĻį‚­$()和$(thing)įŸŋįŸģ$()后į‚đį‡ƒé”ŧ铁į‚‰æ–đ块åđķį­‰äļŠ 15 小æ—ķ。é”ŧ铁į‚‰į†„į­åŽäžšį•™äļ‹čŪļåĪšæ–đåŊæ–đ块。į”Ļ镐反åĪæŒ–掘$(thing)æ–đåŊ$()äūŋčƒ―åū—到$(thing)į”Ÿé“æ–đåŊ$()。" + "text": "č‹Ĩä― äļæƒģčīđåŋƒčŪĄįŪ—配æŊ”我äŧŽæŽĻ荐ä―ŋį”Ļ$(item)25äŧ―é‡‘åąžįŸŋįē‰$()和$(item)22äŧ―į‡ƒæ–™$()įš„įŧ„合。åœĻ投å…Ĩ所需įš„$(thing)į‡ƒæ–™$()和$(thing)įŸŋįŸģ$()后į‚đį‡ƒé”ŧ铁į‚‰é—Ļåđķį­‰äļŠ 15 小æ—ķ。é”ŧ铁į‚‰į†„į­åŽäžšį•™äļ‹čŪļåĪšæ–đåŊæ–đ块。į”Ļ镐反åĪæŒ–掘$(thing)æ–đåŊ$()äūŋčƒ―åū—到$(thing)į”Ÿé“æ–đåŊ$()。" }, { "type": "patchouli:multiblock", diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/mechanics/crops.json b/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/mechanics/crops.json index 3d67d0e77..c6189f085 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/mechanics/crops.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/mechanics/crops.json @@ -12,174 +12,44 @@ "type": "patchouli:text", "text": "é™Ī乆äŧŽé‡Žį”Ÿä―œį‰ĐčŽ·å–į§å­ïžŒæ ―åŸđä―œį‰ĐäđŸäžšäš§å‡šį§å­ã€‚å―“äļ€æ ŠåŪŒå…Ļ成į†Ÿįš„ä―œį‰ĐäļčŪšæ˜Ŋ因äļšåĪĐ气原因或æ˜Ŋčŋ‡äš†æ”ķ获æ—ķ节而æžŊ萎æ—ķå°ąäžšč―Žå˜äļšį§å­ïžŒäļšäļ‹äļ€å­Ģį§æĪæ›īåĪšä―œį‰Đ提äū›äš†äŋéšœã€‚" }, + { + "type": "patchouli:text", + "title": "į›Ūå―•", + "text": "$(li)$(l:tfc:mechanics/crops#barley)åĪ§éšĶ$()$(li)$(l:tfc:mechanics/crops#beet)į”œčœ$()$(li)$(l:tfc:mechanics/crops#cabbage)卷åŋƒčœ$()$(li)$(l:tfc:mechanics/crops#canola)æēđ菜$()$(li)$(l:tfc:mechanics/crops#carrot)čƒĄčåœ$()$(li)$(l:tfc:mechanics/crops#flax)乚éšŧ$()$(li)$(l:tfc:mechanics/crops#garlic)åĪ§č’œ$()$(li)$(l:tfc:mechanics/crops#green_bean)įŧŋ豆$()$(li)$(l:tfc:mechanics/crops#jute)éŧ„éšŧ$()$(li)$(l:tfc:mechanics/crops#maize)įŽ‰įąģ$()$(li)$(l:tfc:mechanics/crops#melon)čĨŋį“œ$()$(li)$(l:tfc:mechanics/crops#oat)į‡•éšĶ$()$(li)$(l:tfc:mechanics/crops#onion)æī‹č‘ą$()" + }, + { + "type": "patchouli:text", + "text": "$(li)$(l:tfc:mechanics/crops#papyrus)įšļ莎草$()$(li)$(l:tfc:mechanics/crops#potato)éЮ铃č–Ŋ$()$(li)$(l:tfc:mechanics/crops#pumpkin)南į“œ$()$(li)$(l:tfc:mechanics/crops#red_bell_pepper)įšĒį”œæĪ’$()$(li)$(l:tfc:mechanics/crops#rice)åĪ§įąģ$()$(li)$(l:tfc:mechanics/crops#rye)éŧ‘éšĶ$()$(li)$(l:tfc:mechanics/crops#soybean)åĪ§čą†$()$(li)$(l:tfc:mechanics/crops#squash)čĨŋč‘ŦčŠĶ$()$(li)$(l:tfc:mechanics/crops#sugarcane)į”˜č”—$()$(li)$(l:tfc:mechanics/crops#sunflower)向æ—Ĩč‘ĩ$()$(li)$(l:tfc:mechanics/crops#tomatoes)čĨŋįšĒæŸŋ$()$(li)$(l:tfc:mechanics/crops#wheat)小éšĶ$()$(li)$(l:tfc:mechanics/crops#yellow_bell_pepper)éŧ„į”œæĪ’$()" + }, { "type": "tfc:rock_knapping_recipe", - "recipes": [ - "tfg:rock_knapping/stone_hoe_head_1" - ], + "title": "Contents", "text": "čĶåž€å§‹ïžŒéĶ–先通čŋ‡$(thing)打åˆķįŸģå™Ļ$()做äļ€æŠŠ$(thing)įŸģ锄$()" }, { "type": "patchouli:crafting", - "recipe": "tfc:crafting/stone/hoe_sedimentary", "text": "将锄åĪīäļŽæœĻæĢåˆæˆäļ€æŠŠé”„。$(br2)锄įš„åŠŸčƒ―äļŽåŽŸį‰ˆį›ļ同$(item)$(k:key.use)$()į‚đå‡ŧæģĨ土æ–đ块åģåŊ将å…ķč―ŽåŒ–äļš$(thing)č€•åœ°$()。åŪƒčŋ˜åŊäŧĨį”Ļ䚎将$(thing)įž æ đæģĨ土$()č―ŽåŒ–äļš$(thing)土$()。" }, { "type": "patchouli:text", - "text": "æ‰€æœ‰ä―œį‰Đéƒ―éœ€čĶį§æĪåœĻč€•åœ°äļŠæ‰čƒ―į”Ÿé•ŋã€‚æœ‰äš›ä―œį‰Đčŋ˜æœ‰éĒåĪ–įš„čĶæą‚æŊ”åĶ‚åŠčƒ―į§åœĻæ°īé‡Œæˆ–č€…éœ€čĶæ’äļ€æ đæœĻæĢæ‰čƒ―į”Ÿé•ŋ。$(br2)ä―œį‰Đäļéœ€čĶ$(thing)čĨå…ŧį‰ĐčīĻ$()å°ąčƒ―į”Ÿé•ŋïžŒä―†čĨå…ŧį‰ĐčīĻčƒ―åŠ é€Ÿå…ķ成į†Ÿã€‚čĨå…ŧį‰ĐčīĻ分äļšäļ‰į§ïžš$(b)æ°Ū$()、$(6)įĢ·$()和$(d)é’ū$()。æŊį§ä―œį‰Đéƒ―æœ‰äļ€į§åįˆąįš„å…ŧ分。", - "title": "į§æĪä―œį‰Đ" + "recipes": [ + "tfg:rock_knapping/stone_hoe_head_1" + ], + "text": "æ‰€æœ‰ä―œį‰Đéƒ―éœ€čĶį§æĪåœĻč€•åœ°äļŠæ‰čƒ―į”Ÿé•ŋã€‚æœ‰äš›ä―œį‰Đčŋ˜æœ‰éĒåĪ–įš„čĶæą‚æŊ”åĶ‚åŠčƒ―į§åœĻæ°īé‡Œæˆ–č€…éœ€čĶæ’äļ€æ đæœĻæĢæ‰čƒ―į”Ÿé•ŋ。$(br2)ä―œį‰Đäļéœ€čĶ$(thing)čĨå…ŧį‰ĐčīĻ$()å°ąčƒ―į”Ÿé•ŋïžŒä―†čĨå…ŧį‰ĐčīĻčƒ―åŠ é€Ÿå…ķ成į†Ÿã€‚čĨå…ŧį‰ĐčīĻ分äļšäļ‰į§ïžš$(b)æ°Ū$()、$(6)įĢ·$()和$(d)é’ū$()。æŊį§ä―œį‰Đéƒ―æœ‰äļ€į§åįˆąįš„å…ŧ分。" }, { "type": "patchouli:text", + "recipe": "tfc:crafting/stone/hoe_sedimentary", "text": "æķˆč€—偏įˆąįš„čĨå…ŧį‰ĐčīĻåŊäŧĨåŠ é€Ÿä―œį‰Đįš„į”Ÿé•ŋåđķ提éŦ˜æ”ķ获æ—ķįš„äš§é‡ã€‚ä―œį‰Đæķˆč€—č€•åœ°äļ­įš„某į§čĨå…ŧį‰ĐčīĻįš„同æ—ķ䞚小åđ…䚧凚å…ķäŧ–äļĪį§čĨå…ŧį‰ĐčīĻ。$(br2)æŽĨäļ‹æĨįš„几éĄĩ䞚列凚įūĪåģĶäž čŊīäļ­æ‰€æœ‰įš„ä―œį‰Đ。" }, { "type": "patchouli:text", - "anchor": "barley", "text": "$(bold)$(l:the_world/climate#temperature)æļĐåšĶ$()ïžš-8 - 26 °C$(br)$(bold)$(l:mechanics/hydration)æđŋåšĶ$()ïžš18 - 75 %$(br)$(bold)čĨå…ŧį‰ĐčīĻ$()ïžšæ°Ū$(br2)åĪ§éšĶæ˜Ŋäļ€į§äļ€æ žéŦ˜įš„å†œä―œį‰Đ。į§æĪåĪ§éšĶ䞚䚧凚$(thing)åĪ§éšĶ$()和$(thing)åĪ§éšĶį§å­$()。", "title": "åĪ§éšĶ" }, { "type": "tfc:multimultiblock", - "text": "", - "multiblocks": [ - { - "pattern": [ - [ - "X" - ], - [ - "Y" - ], - [ - "0" - ] - ], - "mapping": { - "X": "tfc:crop/barley[age=0]", - "Y": "tfc:farmland/loam" - } - }, - { - "pattern": [ - [ - "X" - ], - [ - "Y" - ], - [ - "0" - ] - ], - "mapping": { - "X": "tfc:crop/barley[age=1]", - "Y": "tfc:farmland/loam" - } - }, - { - "pattern": [ - [ - "X" - ], - [ - "Y" - ], - [ - "0" - ] - ], - "mapping": { - "X": "tfc:crop/barley[age=2]", - "Y": "tfc:farmland/loam" - } - }, - { - "pattern": [ - [ - "X" - ], - [ - "Y" - ], - [ - "0" - ] - ], - "mapping": { - "X": "tfc:crop/barley[age=3]", - "Y": "tfc:farmland/loam" - } - }, - { - "pattern": [ - [ - "X" - ], - [ - "Y" - ], - [ - "0" - ] - ], - "mapping": { - "X": "tfc:crop/barley[age=4]", - "Y": "tfc:farmland/loam" - } - }, - { - "pattern": [ - [ - "X" - ], - [ - "Y" - ], - [ - "0" - ] - ], - "mapping": { - "X": "tfc:crop/barley[age=5]", - "Y": "tfc:farmland/loam" - } - }, - { - "pattern": [ - [ - "X" - ], - [ - "Y" - ], - [ - "0" - ] - ], - "mapping": { - "X": "tfc:crop/barley[age=6]", - "Y": "tfc:farmland/loam" - } - }, - { - "pattern": [ - [ - "X" - ], - [ - "Y" - ], - [ - "0" - ] - ], - "mapping": { - "X": "tfc:crop/barley[age=7]", - "Y": "tfc:farmland/loam" - } - } - ] + "text": "" }, { "type": "patchouli:text", @@ -497,15 +367,11 @@ ], [ "Z" - ], - [ - "0" ] ], "mapping": { "X": "minecraft:air", - "Y": "tfc:crop/maize[age=0,part=bottom]", - "Z": "tfc:farmland/loam" + "Y": "tfc:crop/maize[age=0,part=bottom]" } }, { @@ -518,15 +384,11 @@ ], [ "Z" - ], - [ - "0" ] ], "mapping": { "X": "minecraft:air", - "Y": "tfc:crop/maize[age=1,part=bottom]", - "Z": "tfc:farmland/loam" + "Y": "tfc:crop/maize[age=1,part=bottom]" } }, { @@ -539,15 +401,11 @@ ], [ "Z" - ], - [ - "0" ] ], "mapping": { "X": "minecraft:air", - "Y": "tfc:crop/maize[age=2,part=bottom]", - "Z": "tfc:farmland/loam" + "Y": "tfc:crop/maize[age=2,part=bottom]" } }, { @@ -560,15 +418,11 @@ ], [ "Z" - ], - [ - "0" ] ], "mapping": { "X": "tfc:crop/maize[age=3,part=top]", - "Y": "tfc:crop/maize[age=3,part=bottom]", - "Z": "tfc:farmland/loam" + "Y": "tfc:crop/maize[age=3,part=bottom]" } }, { @@ -581,15 +435,11 @@ ], [ "Z" - ], - [ - "0" ] ], "mapping": { "X": "tfc:crop/maize[age=4,part=top]", - "Y": "tfc:crop/maize[age=4,part=bottom]", - "Z": "tfc:farmland/loam" + "Y": "tfc:crop/maize[age=4,part=bottom]" } }, { @@ -602,15 +452,45 @@ ], [ "Z" + ] + ], + "mapping": { + "X": "tfc:crop/maize[age=5,part=top]", + "Y": "tfc:crop/maize[age=5,part=bottom]" + } + }, + { + "pattern": [ + [ + "X" + ], + [ + "Y" ], [ "0" ] ], "mapping": { - "X": "tfc:crop/maize[age=5,part=top]", - "Y": "tfc:crop/maize[age=5,part=bottom]", - "Z": "tfc:farmland/loam" + "X": "tfc:crop/rye[age=6]", + "Y": "tfc:farmland/loam" + } + }, + { + "pattern": [ + [ + "X" + ], + [ + "Y" + ], + [ + "0" + ] + ], + "mapping": { + "X": "tfc:crop/rye[age=7]", + "Y": "tfc:farmland/loam" } } ] @@ -633,13 +513,17 @@ [ "Y" ], + [ + "0" + ], [ "0" ] ], "mapping": { "X": "tfc:crop/wheat[age=0]", - "Y": "tfc:farmland/loam" + "Y": "tfc:farmland/loam", + "Z": "tfc:farmland/loam" } }, { @@ -650,13 +534,17 @@ [ "Y" ], + [ + "0" + ], [ "0" ] ], "mapping": { "X": "tfc:crop/wheat[age=1]", - "Y": "tfc:farmland/loam" + "Y": "tfc:farmland/loam", + "Z": "tfc:farmland/loam" } }, { @@ -667,13 +555,17 @@ [ "Y" ], + [ + "0" + ], [ "0" ] ], "mapping": { "X": "tfc:crop/wheat[age=2]", - "Y": "tfc:farmland/loam" + "Y": "tfc:farmland/loam", + "Z": "tfc:farmland/loam" } }, { @@ -684,13 +576,17 @@ [ "Y" ], + [ + "0" + ], [ "0" ] ], "mapping": { "X": "tfc:crop/wheat[age=3]", - "Y": "tfc:farmland/loam" + "Y": "tfc:farmland/loam", + "Z": "tfc:farmland/loam" } }, { @@ -701,13 +597,17 @@ [ "Y" ], + [ + "0" + ], [ "0" ] ], "mapping": { "X": "tfc:crop/wheat[age=4]", - "Y": "tfc:farmland/loam" + "Y": "tfc:farmland/loam", + "Z": "tfc:farmland/loam" } }, { @@ -718,47 +618,17 @@ [ "Y" ], + [ + "0" + ], [ "0" ] ], "mapping": { "X": "tfc:crop/wheat[age=5]", - "Y": "tfc:farmland/loam" - } - }, - { - "pattern": [ - [ - "X" - ], - [ - "Y" - ], - [ - "0" - ] - ], - "mapping": { - "X": "tfc:crop/wheat[age=6]", - "Y": "tfc:farmland/loam" - } - }, - { - "pattern": [ - [ - "X" - ], - [ - "Y" - ], - [ - "0" - ] - ], - "mapping": { - "X": "tfc:crop/wheat[age=7]", - "Y": "tfc:farmland/loam" + "Y": "tfc:farmland/loam", + "Z": "tfc:farmland/loam" } } ] @@ -919,7 +789,7 @@ }, { "type": "tfc:multimultiblock", - "text": "", + "text": "æģĻ意į§æĪæ°īįĻŧį§å­įš„æ–đ块åŋ…éĄŧ$(thing)åŦæ°ī$()。", "multiblocks": [ { "pattern": [ @@ -1022,6 +892,40 @@ "X": "tfc:crop/beet[age=5]", "Y": "tfc:farmland/loam" } + }, + { + "pattern": [ + [ + "X" + ], + [ + "Y" + ], + [ + "0" + ] + ], + "mapping": { + "X": "tfc:crop/rice[age=6,fluid=water]", + "Y": "tfc:farmland/loam" + } + }, + { + "pattern": [ + [ + "X" + ], + [ + "Y" + ], + [ + "0" + ] + ], + "mapping": { + "X": "tfc:crop/rice[age=7,fluid=water]", + "Y": "tfc:farmland/loam" + } } ] }, @@ -1233,6 +1137,23 @@ "X": "tfc:crop/carrot[age=4]", "Y": "tfc:farmland/loam" } + }, + { + "pattern": [ + [ + "X" + ], + [ + "Y" + ], + [ + "0" + ] + ], + "mapping": { + "X": "tfc:crop/cabbage[age=5]", + "Y": "tfc:farmland/loam" + } } ] }, @@ -1353,15 +1274,11 @@ ], [ "Z" - ], - [ - "0" ] ], "mapping": { "X": "tfc:crop/green_bean[age=0,part=top,stick=true]", - "Y": "tfc:crop/green_bean[age=0,part=bottom,stick=true]", - "Z": "tfc:farmland/loam" + "Y": "tfc:crop/green_bean[age=0,part=bottom,stick=true]" } }, { @@ -1374,15 +1291,11 @@ ], [ "Z" - ], - [ - "0" ] ], "mapping": { "X": "tfc:crop/green_bean[age=1,part=top,stick=true]", - "Y": "tfc:crop/green_bean[age=1,part=bottom,stick=true]", - "Z": "tfc:farmland/loam" + "Y": "tfc:crop/green_bean[age=1,part=bottom,stick=true]" } }, { @@ -1395,15 +1308,11 @@ ], [ "Z" - ], - [ - "0" ] ], "mapping": { "X": "tfc:crop/green_bean[age=2,part=top,stick=true]", - "Y": "tfc:crop/green_bean[age=2,part=bottom,stick=true]", - "Z": "tfc:farmland/loam" + "Y": "tfc:crop/green_bean[age=2,part=bottom,stick=true]" } }, { @@ -1416,15 +1325,11 @@ ], [ "Z" - ], - [ - "0" ] ], "mapping": { "X": "tfc:crop/green_bean[age=3,part=top,stick=true]", - "Y": "tfc:crop/green_bean[age=3,part=bottom,stick=true]", - "Z": "tfc:farmland/loam" + "Y": "tfc:crop/green_bean[age=3,part=bottom,stick=true]" } }, { @@ -1437,14 +1342,43 @@ ], [ "Z" - ], - [ - "0" ] ], "mapping": { "X": "tfc:crop/green_bean[age=4,part=top,stick=true]", - "Y": "tfc:crop/green_bean[age=4,part=bottom,stick=true]", + "Y": "tfc:crop/green_bean[age=4,part=bottom,stick=true]" + } + } + ] + }, + { + "type": "patchouli:text", + "anchor": "potato", + "text": "$(bold)$(l:the_world/climate#temperature)æļĐåšĶ$()ïžš-1 - 37 °C$(br)$(bold)$(l:mechanics/hydration)æđŋåšĶ$()ïžš50 - 100 %$(br)$(bold)čĨå…ŧį‰ĐčīĻ$()ïžšé’ū$(br2)éЮ铃č–Ŋæ˜Ŋäļ€į§äļ€æ žéŦ˜įš„å†œä―œį‰Đ。į§æĪéЮ铃č–Ŋ䞚䚧凚$(thing)éЮ铃č–Ŋ$()和$(thing)éЮ铃č–Ŋį§å­$()。", + "title": "éЮ铃č–Ŋ" + }, + { + "type": "tfc:multimultiblock", + "text": "", + "multiblocks": [ + { + "pattern": [ + [ + "X" + ], + [ + "Y" + ], + [ + "0" + ], + [ + "0" + ] + ], + "mapping": { + "X": "tfc:crop/potato[age=0]", + "Y": "tfc:farmland/loam", "Z": "tfc:farmland/loam" } }, @@ -1457,15 +1391,15 @@ "Y" ], [ - "Z" + "0" ], [ "0" ] ], "mapping": { - "X": "tfc:crop/green_bean[age=5,part=top,stick=true]", - "Y": "tfc:crop/green_bean[age=5,part=bottom,stick=true]", + "X": "tfc:crop/potato[age=1]", + "Y": "tfc:farmland/loam", "Z": "tfc:farmland/loam" } }, @@ -1478,15 +1412,99 @@ "Y" ], [ - "Z" + "0" ], [ "0" ] ], "mapping": { - "X": "tfc:crop/green_bean[age=6,part=top,stick=true]", - "Y": "tfc:crop/green_bean[age=6,part=bottom,stick=true]", + "X": "tfc:crop/potato[age=2]", + "Y": "tfc:farmland/loam", + "Z": "tfc:farmland/loam" + } + }, + { + "pattern": [ + [ + "X" + ], + [ + "Y" + ], + [ + "0" + ], + [ + "0" + ] + ], + "mapping": { + "X": "tfc:crop/potato[age=3]", + "Y": "tfc:farmland/loam", + "Z": "tfc:farmland/loam" + } + }, + { + "pattern": [ + [ + "X" + ], + [ + "Y" + ], + [ + "0" + ], + [ + "0" + ] + ], + "mapping": { + "X": "tfc:crop/potato[age=4]", + "Y": "tfc:farmland/loam", + "Z": "tfc:farmland/loam" + } + }, + { + "pattern": [ + [ + "X" + ], + [ + "Y" + ], + [ + "0" + ], + [ + "0" + ] + ], + "mapping": { + "X": "tfc:crop/potato[age=5]", + "Y": "tfc:farmland/loam", + "Z": "tfc:farmland/loam" + } + }, + { + "pattern": [ + [ + "X" + ], + [ + "Y" + ], + [ + "0" + ], + [ + "0" + ] + ], + "mapping": { + "X": "tfc:crop/potato[age=6]", + "Y": "tfc:farmland/loam", "Z": "tfc:farmland/loam" } }, @@ -1515,9 +1533,9 @@ }, { "type": "patchouli:text", - "anchor": "potato", - "text": "$(bold)$(l:the_world/climate#temperature)æļĐåšĶ$()ïžš-1 - 37 °C$(br)$(bold)$(l:mechanics/hydration)æđŋåšĶ$()ïžš50 - 100 %$(br)$(bold)čĨå…ŧį‰ĐčīĻ$()ïžšé’ū$(br2)éЮ铃č–Ŋæ˜Ŋäļ€į§äļ€æ žéŦ˜įš„å†œä―œį‰Đ。į§æĪéЮ铃č–Ŋ䞚䚧凚$(thing)éЮ铃č–Ŋ$()和$(thing)éЮ铃č–Ŋį§å­$()。", - "title": "éЮ铃č–Ŋ" + "anchor": "pumpkin", + "text": "$(bold)$(l:the_world/climate#temperature)æļĐåšĶ$()ïžš0 - 30 °C$(br)$(bold)$(l:mechanics/hydration)æđŋåšĶ$()ïžš30 - 80 %$(br)$(bold)čĨå…ŧį‰ĐčīĻ$()ïžšįĢ·$(br2)南į“œæ˜Ŋäļ€į§įˆŽčĄŒä―œį‰Đ。į§æĪåœĻč€•åœ°äļŠæ—ķ南į“œæĒ—äžšåœĻ成į†ŸåŽåœĻį›ļé‚ŧä―į―Ūæ”ūį―Ū最åĪšäļĪéĒ—$(thing)南į“œ$()。南į“œæĒ—åœĻå…Ĩ冎前åŊįŧ“æžœåĪšæŽĄã€‚南į“œåŊäŧĨåˆķä―œæˆ$(l:mechanics/lighting#jack_o_lanterns)南į“œįŊ$()。", + "title": "南į“œ" }, { "type": "tfc:multimultiblock", @@ -1526,10 +1544,10 @@ { "pattern": [ [ - "X" + " " ], [ - "Y" + "GGG" ], [ "0" @@ -1543,10 +1561,10 @@ { "pattern": [ [ - "X" + " " ], [ - "Y" + "GGG" ], [ "0" @@ -1560,10 +1578,10 @@ { "pattern": [ [ - "X" + " " ], [ - "Y" + "GGG" ], [ "0" @@ -1577,10 +1595,10 @@ { "pattern": [ [ - "X" + " " ], [ - "Y" + "GGG" ], [ "0" @@ -1594,10 +1612,10 @@ { "pattern": [ [ - "X" + " " ], [ - "Y" + "GGG" ], [ "0" @@ -1611,10 +1629,10 @@ { "pattern": [ [ - "X" + " " ], [ - "Y" + "GGG" ], [ "0" @@ -1628,10 +1646,10 @@ { "pattern": [ [ - "X" + " " ], [ - "Y" + "GGG" ], [ "0" @@ -1644,178 +1662,6 @@ } ] }, - { - "type": "patchouli:text", - "anchor": "pumpkin", - "text": "$(bold)$(l:the_world/climate#temperature)æļĐåšĶ$()ïžš0 - 30 °C$(br)$(bold)$(l:mechanics/hydration)æđŋåšĶ$()ïžš30 - 80 %$(br)$(bold)čĨå…ŧį‰ĐčīĻ$()ïžšįĢ·$(br2)南į“œæ˜Ŋäļ€į§įˆŽčĄŒä―œį‰Đ。į§æĪåœĻč€•åœ°äļŠæ—ķ南į“œæĒ—äžšåœĻ成į†ŸåŽåœĻį›ļé‚ŧä―į―Ūæ”ūį―Ū最åĪšäļĪéĒ—$(thing)南į“œ$()。南į“œæĒ—åœĻå…Ĩ冎前åŊįŧ“æžœåĪšæŽĄã€‚南į“œåŊäŧĨåˆķä―œæˆ$(l:mechanics/lighting#jack_o_lanterns)南į“œįŊ$()。", - "title": "南į“œ" - }, - { - "type": "tfc:multimultiblock", - "text": "", - "multiblocks": [ - { - "pattern": [ - [ - " ", - " CP", - " " - ], - [ - "GGG", - "G0G", - "GGG" - ] - ], - "mapping": { - "G": "tfc:farmland/loam", - "0": "tfc:farmland/loam", - "C": "tfc:crop/pumpkin[age=0]", - "P": "minecraft:air" - } - }, - { - "pattern": [ - [ - " ", - " CP", - " " - ], - [ - "GGG", - "G0G", - "GGG" - ] - ], - "mapping": { - "G": "tfc:farmland/loam", - "0": "tfc:farmland/loam", - "C": "tfc:crop/pumpkin[age=1]", - "P": "minecraft:air" - } - }, - { - "pattern": [ - [ - " ", - " CP", - " " - ], - [ - "GGG", - "G0G", - "GGG" - ] - ], - "mapping": { - "G": "tfc:farmland/loam", - "0": "tfc:farmland/loam", - "C": "tfc:crop/pumpkin[age=2]", - "P": "minecraft:air" - } - }, - { - "pattern": [ - [ - " ", - " CP", - " " - ], - [ - "GGG", - "G0G", - "GGG" - ] - ], - "mapping": { - "G": "tfc:farmland/loam", - "0": "tfc:farmland/loam", - "C": "tfc:crop/pumpkin[age=3]", - "P": "minecraft:air" - } - }, - { - "pattern": [ - [ - " ", - " CP", - " " - ], - [ - "GGG", - "G0G", - "GGG" - ] - ], - "mapping": { - "G": "tfc:farmland/loam", - "0": "tfc:farmland/loam", - "C": "tfc:crop/pumpkin[age=4]", - "P": "minecraft:air" - } - }, - { - "pattern": [ - [ - " ", - " CP", - " " - ], - [ - "GGG", - "G0G", - "GGG" - ] - ], - "mapping": { - "G": "tfc:farmland/loam", - "0": "tfc:farmland/loam", - "C": "tfc:crop/pumpkin[age=5]", - "P": "minecraft:air" - } - }, - { - "pattern": [ - [ - " ", - " CP", - " " - ], - [ - "GGG", - "G0G", - "GGG" - ] - ], - "mapping": { - "G": "tfc:farmland/loam", - "0": "tfc:farmland/loam", - "C": "tfc:crop/pumpkin[age=6]", - "P": "minecraft:air" - } - }, - { - "pattern": [ - [ - " ", - " CP", - " " - ], - [ - "GGG", - "G0G", - "GGG" - ] - ], - "mapping": { - "G": "tfc:farmland/loam", - "0": "tfc:farmland/loam", - "C": "tfc:crop/pumpkin[age=7]", - "P": "tfc:pumpkin" - } - } - ] - }, { "type": "patchouli:text", "anchor": "melon", @@ -2001,120 +1847,161 @@ { "pattern": [ [ - "X" + "X", + " CP", + " " ], [ - "Y" - ], - [ - "0" + "Y", + "G0G", + "GGG" ] ], "mapping": { - "X": "tfc:crop/red_bell_pepper[age=0]", - "Y": "tfc:farmland/loam" + "G": "tfc:farmland/loam", + "0": "tfc:farmland/loam", + "C": "tfc:crop/melon[age=0]", + "P": "minecraft:air" } }, { "pattern": [ [ - "X" + "X", + " CP", + " " ], [ - "Y" - ], - [ - "0" + "Y", + "G0G", + "GGG" ] ], "mapping": { - "X": "tfc:crop/red_bell_pepper[age=1]", - "Y": "tfc:farmland/loam" + "G": "tfc:farmland/loam", + "0": "tfc:farmland/loam", + "C": "tfc:crop/melon[age=1]", + "P": "minecraft:air" } }, { "pattern": [ [ - "X" + "X", + " CP", + " " ], [ - "Y" - ], - [ - "0" + "Y", + "G0G", + "GGG" ] ], "mapping": { - "X": "tfc:crop/red_bell_pepper[age=2]", - "Y": "tfc:farmland/loam" + "G": "tfc:farmland/loam", + "0": "tfc:farmland/loam", + "C": "tfc:crop/melon[age=2]", + "P": "minecraft:air" } }, { "pattern": [ [ - "X" + "X", + " CP", + " " ], [ - "Y" - ], - [ - "0" + "Y", + "G0G", + "GGG" ] ], "mapping": { - "X": "tfc:crop/red_bell_pepper[age=3]", - "Y": "tfc:farmland/loam" + "G": "tfc:farmland/loam", + "0": "tfc:farmland/loam", + "C": "tfc:crop/melon[age=3]", + "P": "minecraft:air" } }, { "pattern": [ [ - "X" + "X", + " CP", + " " ], [ - "Y" - ], - [ - "0" + "Y", + "G0G", + "GGG" ] ], "mapping": { - "X": "tfc:crop/red_bell_pepper[age=4]", - "Y": "tfc:farmland/loam" + "G": "tfc:farmland/loam", + "0": "tfc:farmland/loam", + "C": "tfc:crop/melon[age=4]", + "P": "minecraft:air" } }, { "pattern": [ [ - "X" + "X", + " CP", + " " ], [ - "Y" - ], - [ - "0" + "Y", + "G0G", + "GGG" ] ], "mapping": { - "X": "tfc:crop/red_bell_pepper[age=5]", - "Y": "tfc:farmland/loam" + "G": "tfc:farmland/loam", + "0": "tfc:farmland/loam", + "C": "tfc:crop/melon[age=5]", + "P": "minecraft:air" } }, { "pattern": [ [ - "X" + "X", + " CP", + " " ], [ - "Y" - ], - [ - "0" + "Y", + "G0G", + "GGG" ] ], "mapping": { - "X": "tfc:crop/red_bell_pepper[age=6]", - "Y": "tfc:farmland/loam" + "G": "tfc:farmland/loam", + "0": "tfc:farmland/loam", + "C": "tfc:crop/melon[age=6]", + "P": "minecraft:air" + } + }, + { + "pattern": [ + [ + " ", + " CP", + " " + ], + [ + "GGG", + "G0G", + "GGG" + ] + ], + "mapping": { + "G": "tfc:farmland/loam", + "0": "tfc:farmland/loam", + "C": "tfc:crop/melon[age=7]", + "P": "tfc:melon" } } ] @@ -2640,23 +2527,6 @@ "X": "tfc:crop/squash[age=6]", "Y": "tfc:farmland/loam" } - }, - { - "pattern": [ - [ - "X" - ], - [ - "Y" - ], - [ - "0" - ] - ], - "mapping": { - "X": "tfc:crop/squash[age=7]", - "Y": "tfc:farmland/loam" - } } ] }, @@ -2680,15 +2550,11 @@ ], [ "Z" - ], - [ - "0" ] ], "mapping": { "X": "minecraft:air", - "Y": "tfc:crop/sugarcane[age=0,part=bottom]", - "Z": "tfc:farmland/loam" + "Y": "tfc:crop/sugarcane[age=0,part=bottom]" } }, { @@ -2701,15 +2567,11 @@ ], [ "Z" - ], - [ - "0" ] ], "mapping": { "X": "minecraft:air", - "Y": "tfc:crop/sugarcane[age=1,part=bottom]", - "Z": "tfc:farmland/loam" + "Y": "tfc:crop/sugarcane[age=1,part=bottom]" } }, { @@ -2722,15 +2584,11 @@ ], [ "Z" - ], - [ - "0" ] ], "mapping": { "X": "minecraft:air", - "Y": "tfc:crop/sugarcane[age=2,part=bottom]", - "Z": "tfc:farmland/loam" + "Y": "tfc:crop/sugarcane[age=2,part=bottom]" } }, { @@ -2743,15 +2601,11 @@ ], [ "Z" - ], - [ - "0" ] ], "mapping": { "X": "minecraft:air", - "Y": "tfc:crop/sugarcane[age=3,part=bottom]", - "Z": "tfc:farmland/loam" + "Y": "tfc:crop/sugarcane[age=3,part=bottom]" } }, { @@ -2764,15 +2618,11 @@ ], [ "Z" - ], - [ - "0" ] ], "mapping": { "X": "tfc:crop/sugarcane[age=4,part=top]", - "Y": "tfc:crop/sugarcane[age=4,part=bottom]", - "Z": "tfc:farmland/loam" + "Y": "tfc:crop/sugarcane[age=4,part=bottom]" } }, { @@ -2785,15 +2635,11 @@ ], [ "Z" - ], - [ - "0" ] ], "mapping": { "X": "tfc:crop/sugarcane[age=5,part=top]", - "Y": "tfc:crop/sugarcane[age=5,part=bottom]", - "Z": "tfc:farmland/loam" + "Y": "tfc:crop/sugarcane[age=5,part=bottom]" } }, { @@ -2806,15 +2652,11 @@ ], [ "Z" - ], - [ - "0" ] ], "mapping": { "X": "tfc:crop/sugarcane[age=6,part=top]", - "Y": "tfc:crop/sugarcane[age=6,part=bottom]", - "Z": "tfc:farmland/loam" + "Y": "tfc:crop/sugarcane[age=6,part=bottom]" } }, { @@ -2827,15 +2669,11 @@ ], [ "Z" - ], - [ - "0" ] ], "mapping": { "X": "tfc:crop/sugarcane[age=7,part=top]", - "Y": "tfc:crop/sugarcane[age=7,part=bottom]", - "Z": "tfc:farmland/loam" + "Y": "tfc:crop/sugarcane[age=7,part=bottom]" } } ] @@ -3155,6 +2993,48 @@ "Y": "tfc:crop/jute[age=5,part=bottom]", "Z": "tfc:farmland/loam" } + }, + { + "pattern": [ + [ + "X" + ], + [ + "Y" + ], + [ + "Z" + ], + [ + "0" + ] + ], + "mapping": { + "X": "tfc:crop/tomato[age=6,part=top,stick=true]", + "Y": "tfc:crop/tomato[age=6,part=bottom,stick=true]", + "Z": "tfc:farmland/loam" + } + }, + { + "pattern": [ + [ + "X" + ], + [ + "Y" + ], + [ + "Z" + ], + [ + "0" + ] + ], + "mapping": { + "X": "tfc:crop/tomato[age=7,part=top,stick=true]", + "Y": "tfc:crop/tomato[age=7,part=bottom,stick=true]", + "Z": "tfc:farmland/loam" + } } ] }, @@ -3298,11 +3178,13 @@ }, { "type": "patchouli:text", + "anchor": "papyrus", "text": "$(bold)$(l:the_world/climate#temperature)æļĐåšĶ$()ïžš5 - 40 °C$(br)$(bold)$(l:mechanics/hydration)æđŋåšĶ$()ïžš20 - 80 %$(br)$(bold)čĨå…ŧį‰ĐčīĻ$()ïžšæ°Ū$(br2)向æ—Ĩč‘ĩæ˜Ŋäļ€į§äļĪæ žéŦ˜įš„ä―œį‰Đ。向æ—Ĩč‘ĩį§å­åŊäŧĨį§æĪåœĻč€•åœ°äļŠïžŒį”Ÿé•ŋ到äļĪæ žéŦ˜ïžŒåđķį”Ÿäš§åŊ加å·Ĩäļš$(thing)į§å­æēđ$()įš„$(item)向æ—Ĩč‘ĩ花į›˜$()。į§å­æēđæ—ĒåŊį”Ļä―œįŊæēđäđŸåŊåœĻ后期į”Ļ䚎åˆķä―œ$(thing)į”Ÿį‰ĐæŸīæēđ$()。$(br)åœĻ$(l:firmalife/beekeeping)å…ŧ蜂$()įģŧįŧŸäļ­ïžŒå‘æ—Ĩč‘ĩ同样čĒŦ视äļšæœ‰æ•ˆčŠąæšã€‚", "title": "向æ—Ĩč‘ĩ" }, { "type": "tfc:multimultiblock", + "text": "$(thing)野į”Ÿå‘æ—Ĩč‘ĩ$()į”Ÿé•ŋ䚎5°Cč‡ģ40°Cįš„æļĐåšĶ匚é—ī及100č‡ģ450æŊŦįąģįš„降é›ĻįŽŊåĒƒã€‚å…ķį§å­äšĶåŊįƒ˜įƒĪéĢŸį”Ļ", "multiblocks": [ { "pattern": [ @@ -3429,35 +3311,14 @@ "Y": "tfg:sunflower[age=5,part=bottom]", "Z": "tfc:farmland/loam" } - }, - { - "pattern": [ - [ - "X" - ], - [ - "Y" - ], - [ - "Z" - ], - [ - "0" - ] - ], - "mapping": { - "X": "tfg:sunflower[age=6,part=top]", - "Y": "tfg:sunflower[age=6,part=bottom]", - "Z": "tfc:farmland/loam" - } } - ], - "text": "$(thing)野į”Ÿå‘æ—Ĩč‘ĩ$()į”Ÿé•ŋ䚎5°Cč‡ģ40°Cįš„æļĐåšĶ匚é—ī及100č‡ģ450æŊŦįąģįš„降é›ĻįŽŊåĒƒã€‚å…ķį§å­äšĶåŊįƒ˜įƒĪéĢŸį”Ļ" + ] }, { "type": "patchouli:text", - "text": "$(bold)$(l:the_world/climate#temperature)æļĐåšĶ$(): -5 - 25 °C$(br)$(bold)$(l:mechanics/hydration)æđŋåšĶ$(): 10 - 60 %$(br)$(bold)čĨå…ŧį‰ĐčīĻ$()ïžšįĢ·$(br2)æēđ菜æ˜Ŋäļ€į§äļĪæ žéŦ˜įš„ä―œį‰Đ。æēđ菜į§å­åŊį§æĪåœĻč€•åœ°äļŠïžŒį”Ÿé•ŋ到äļĪæ žéŦ˜ïžŒåđķį”Ÿäš§åŊ加å·Ĩäļš$(thing)į§å­æēđ$()įš„$(item)æēđ菜įą―荚$()。į§å­æēđæ—ĒåŊį”Ļä―œįŊæēđäđŸåŊåœĻ后期į”Ļ䚎åˆķä―œ$(thing)į”Ÿį‰ĐæŸīæēđ$()。$(br)åœĻ$(l:firmalife/beekeeping)å…ŧ蜂$()įģŧįŧŸäļ­ïžŒæēđčœåŒæ ·čĒŦ视äļšæœ‰æ•ˆčŠąæšã€‚", - "title": "æēđ菜" + "anchor": "sunflower", + "text": "$(bold)$(l:the_world/climate#temperature)æļĐåšĶ$()ïžš5 - 40 °C$(br)$(bold)$(l:mechanics/hydration)æđŋåšĶ$()ïžš20 - 80 %$(br)$(bold)čĨå…ŧį‰ĐčīĻ$()ïžšæ°Ū$(br2)向æ—Ĩč‘ĩæ˜Ŋäļ€į§äļĪæ žéŦ˜įš„ä―œį‰Đ。向æ—Ĩč‘ĩį§å­åŊäŧĨį§æĪåœĻč€•åœ°äļŠïžŒį”Ÿé•ŋ到äļĪæ žéŦ˜ïžŒåđķį”Ÿäš§åŊ加å·Ĩäļš$(thing)į§å­æēđ$()įš„$(item)向æ—Ĩč‘ĩ花į›˜$()。į§å­æēđæ—ĒåŊį”Ļä―œįŊæēđäđŸåŊåœĻ后期į”Ļ䚎åˆķä―œ$(thing)į”Ÿį‰ĐæŸīæēđ$()。$(br)åœĻ$(l:firmalife/beekeeping)å…ŧ蜂$()įģŧįŧŸäļ­ïžŒå‘æ—Ĩč‘ĩ同样čĒŦ视äļšæœ‰æ•ˆčŠąæšã€‚", + "title": "向æ—Ĩč‘ĩ" }, { "type": "tfc:multimultiblock", @@ -3610,11 +3471,171 @@ } } ], - "text": "$(thing)野į”Ÿæēđ菜$()äšĶį§°$(thing)čŠļ苔$()į”Ÿé•ŋ䚎-7°Cč‡ģ25°Cįš„æļĐåšĶ匚é—ī及50č‡ģ350æŊŦįąģįš„降é›ĻįŽŊåĒƒã€‚", + "text": "$(thing)野į”Ÿæēđ菜$()äšĶį§°$(thing)čŠļ苔$()į”Ÿé•ŋ䚎-7°Cč‡ģ25°Cįš„æļĐåšĶ匚é—ī及50č‡ģ350æŊŦįąģįš„降é›ĻįŽŊåĒƒã€‚" + }, + { + "type": "patchouli:text", + "anchor": "canola", + "text": "$(bold)$(l:the_world/climate#temperature)æļĐåšĶ$(): -5 - 25 °C$(br)$(bold)$(l:mechanics/hydration)æđŋåšĶ$(): 10 - 60 %$(br)$(bold)čĨå…ŧį‰ĐčīĻ$()ïžšįĢ·$(br2)æēđ菜æ˜Ŋäļ€į§äļĪæ žéŦ˜įš„ä―œį‰Đ。æēđ菜į§å­åŊį§æĪåœĻč€•åœ°äļŠïžŒį”Ÿé•ŋ到äļĪæ žéŦ˜ïžŒåđķį”Ÿäš§åŊ加å·Ĩäļš$(thing)į§å­æēđ$()įš„$(item)æēđ菜įą―荚$()。į§å­æēđæ—ĒåŊį”Ļä―œįŊæēđäđŸåŊåœĻ后期į”Ļ䚎åˆķä―œ$(thing)į”Ÿį‰ĐæŸīæēđ$()。$(br)åœĻ$(l:firmalife/beekeeping)å…ŧ蜂$()įģŧįŧŸäļ­ïžŒæēđčœåŒæ ·čĒŦ视äļšæœ‰æ•ˆčŠąæšã€‚", + "title": "æēđ菜" + }, + { + "type": "tfc:multimultiblock", + "multiblocks": [ + { + "pattern": [ + [ + "X" + ], + [ + "Y" + ], + [ + "Z" + ], + [ + "0" + ] + ], + "mapping": { + "X": "minecraft:air", + "Y": "tfg:flax[age=0,part=bottom]", + "Z": "tfc:farmland/loam" + } + }, + { + "pattern": [ + [ + "X" + ], + [ + "Y" + ], + [ + "Z" + ], + [ + "0" + ] + ], + "mapping": { + "X": "minecraft:air", + "Y": "tfg:flax[age=1,part=bottom]", + "Z": "tfc:farmland/loam" + } + }, + { + "pattern": [ + [ + "X" + ], + [ + "Y" + ], + [ + "Z" + ], + [ + "0" + ] + ], + "mapping": { + "X": "minecraft:air", + "Y": "tfg:flax[age=2,part=bottom]", + "Z": "tfc:farmland/loam" + } + }, + { + "pattern": [ + [ + "X" + ], + [ + "Y" + ], + [ + "Z" + ], + [ + "0" + ] + ], + "mapping": { + "X": "minecraft:air", + "Y": "tfg:flax[age=3,part=bottom]", + "Z": "tfc:farmland/loam" + } + }, + { + "pattern": [ + [ + "X" + ], + [ + "Y" + ], + [ + "Z" + ], + [ + "0" + ] + ], + "mapping": { + "X": "tfg:flax[age=4,part=top]", + "Y": "tfg:flax[age=4,part=bottom]", + "Z": "tfc:farmland/loam" + } + }, + { + "pattern": [ + [ + "X" + ], + [ + "Y" + ], + [ + "Z" + ], + [ + "0" + ] + ], + "mapping": { + "X": "tfg:flax[age=5,part=top]", + "Y": "tfg:flax[age=5,part=bottom]", + "Z": "tfc:farmland/loam" + } + }, + { + "pattern": [ + [ + "X" + ], + [ + "Y" + ], + [ + "Z" + ], + [ + "0" + ] + ], + "mapping": { + "X": "tfg:flax[age=6,part=top]", + "Y": "tfg:flax[age=6,part=bottom]", + "Z": "tfc:farmland/loam" + } + } + ], + "text": "$(thing)野į”Ÿäššéšŧ$()į”Ÿé•ŋ䚎-5°Cč‡ģ23°Cįš„æļĐåšĶ匚é—ī及175č‡ģ475æŊŦįąģįš„降é›ĻįŽŊåĒƒã€‚", "enable_visualize": false }, { "type": "patchouli:text", + "anchor": "flax", "text": "$(bold)$(l:the_world/climate#temperature)æļĐåšĶ$()ïžš5 - 37 °C$(br)$(bold)$(l:mechanics/hydration)æđŋåšĶ$()ïžš25 - 100 %$(br)$(bold)čĨå…ŧį‰ĐčīĻ$()ïžšæ°Ū$(br2)乚éšŧæ˜Ŋäļ€į§äļĪæ žéŦ˜įš„å†œä―œį‰Đ。䚚éšŧį§å­åŊäŧĨį§æĪåœĻč€•åœ°äļŠïžŒį”Ÿé•ŋ到äļĪæ žéŦ˜ïžŒåđķį”Ÿäš§į”Ļ䚎加å·Ĩäļš$(thing)乚éšŧåļƒ$()įš„$(item)乚éšŧčŒŽæ†$()。$(br)åœĻ$(l:firmalife/beekeeping)å…ŧ蜂$()įģŧįŧŸäļ­ïžŒäššéšŧ同样čĒŦ视äļšæœ‰æ•ˆčŠąæšã€‚", "title": "乚éšŧ" }, @@ -3769,7 +3790,7 @@ } } ], - "text": "$(thing)野į”Ÿäššéšŧ$()į”Ÿé•ŋ䚎-5°Cč‡ģ23°Cįš„æļĐåšĶ匚é—ī及175č‡ģ475æŊŦįąģįš„降é›ĻįŽŊåĒƒã€‚" + "text": "$(thing)Wild Flax$() grows between -5 and 23C, and 175 to 475mm of rainfall." } ], "read_by_default": true, diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/mechanics/drinks.json b/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/mechanics/drinks.json index 068ad70b4..bc59a3429 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/mechanics/drinks.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/mechanics/drinks.json @@ -38,7 +38,7 @@ "type": "patchouli:spotlight", "title": "čŒķ", "text": "$(thing)čŒķ$()åŊäŧĨį”Ļ某䚛åđēį‡Ĩįš„æĪį‰Đå†ēæģĄã€‚$(br2)åŪƒäŧŽæäū›įŸ­æš‚ä―†æœ‰į”Ļįš„åĒžį›ŠïžŒåđķä―ŋä― įš„ä―“æļĐ升éŦ˜4°C。非åļļ适合冎åĪĐ", - "item": "tfc_gurman:tea_mint_bucket,tfc_gurman:tea_chamomile_bucket,tfc_gurman:tea_rosehip_bucket,tfc_gurman:tea_nettle_bucket" + "item": "tfc_gourmet:tea_mint_bucket,tfc_gourmet:tea_chamomile_bucket,tfc_gourmet:tea_rosehip_bucket,tfc_gourmet:tea_nettle_bucket" }, { "type": "patchouli:text", @@ -48,7 +48,7 @@ "type": "patchouli:spotlight", "title": "į‰đ调éĨŪ品", "text": "čŋ™æ˜Ŋäļ€äļŠåŒ…åŦæ›īåĪšåĢå‘ģį‹Žį‰đ、效果各垂įš„杂éĄđéĨŪ品įš„įąŧåˆŦã€‚å°―æƒ…äšŦį”Ļ吧", - "item": "tfc_gurman:cocoa_bucket,tfc_gurman:coffee_bucket,tfc_gurman:nalivka_bucket,tfc_gurman:kvass_bucket,tfc_gurman:compote_bucket,tfc_gurman:lemonade_bucket" + "item": "tfc_gourmet:cocoa_bucket,tfc_gourmet:coffee_bucket,tfc_gourmet:nalivka_bucket,tfc_gourmet:kvass_bucket,tfc_gourmet:compote_bucket,tfc_gourmet:lemonade_bucket" }, { "type": "patchouli:text", @@ -58,7 +58,7 @@ "type": "patchouli:spotlight", "title": "åĨķįąŧ", "text": "$(thing)åĨķ$()åŊäŧĨäŧŽåĪ§åĪšæ•°é›Œæ€§åŪķį•œčšŦäļŠčŽ·å–及需åœĻäšēåŊ†åšĶčķģåĪŸéŦ˜æ—ķį”ĻæœĻæĄķæˆ–é‡‘åąžæĄķåģé”Ūį‚đå‡ŧåŪƒäŧŽåģåŊ。åĶ‚果无æģ•æŒĪåĨķčŊ·įĄŪäŋæĄķæēĄæœ‰å †å ïžïž‰$(br)č™―į„ķåŪƒäļæäū›äŧŧä―•åĒžį›ŠïžŒä―†åĶ‚æžœåœĻčŋ›éĢŸåŽéĨŪį”ĻåŊäŧĨ提äū›äđģåˆķ品čĨå…ŧåđķäļ”äđ‹åŽåŊäŧĨåˆķ成åĨķ酊。", - "item": "minecraft:milk_bucket,firmalife:bucket/yak_milk,firmalife:bucket/goat_milk,tfc_gurman:ox_milk_bucket,tfc_gurman:sheep_milk_bucket,tfc_gurman:alpaca_milk_bucket" + "item": "minecraft:milk_bucket,firmalife:bucket/yak_milk,firmalife:bucket/goat_milk,tfc_gourmet:ox_milk_bucket,tfc_gourmet:sheep_milk_bucket,tfc_gourmet:alpaca_milk_bucket" }, { "title": "æļĐæģ‰", diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/tfg_ores/earth_ore_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/tfg_ores/earth_ore_index.json index 2890944c0..e6fceb082 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/tfg_ores/earth_ore_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/tfg_ores/earth_ore_index.json @@ -19,7 +19,7 @@ }, { "Type": "patchouli:text", - "text": "$(li)æœąį ‚: $(l:tfg_ores/earth_vein_index#normal_redstone)20%$(/l)$()$(li)æЄæĶ„įŸģ: $(l:tfg_ores/earth_vein_index#normal_olivine)25%$(/l)$()$(li)氟įĒģ镧铈įŸŋ: $(l:tfg_ores/earth_vein_index#normal_monazite)62%$(/l)$()$(li)æēĨ青铀įŸŋ: $(l:tfg_ores/earth_vein_index#deep_pitchblende)62%$(/l)$()$(li)æēļįŸģ: $(l:tfg_ores/earth_vein_index#surface_copper)16%$(/l)$()$(li)æēđį ‚: $(l:tfg_ores/earth_vein_index#normal_oilsands)100%$(/l), $(l:tfg_ores/earth_vein_index#normal_tarkianite)35%$(/l)$()$(li)æĩ·įŧŋįŸģįŸŋį ‚: $(l:tfg_ores/earth_vein_index#normal_lubricant)25%$(/l), $(l:tfg_ores/earth_vein_index#normal_olivine)15%$(/l)$()$(li)æŧ‘įŸģ: $(l:tfg_ores/earth_vein_index#normal_lubricant)20%$(/l)$()$(li)æž‚į™―土: $(l:tfg_ores/earth_vein_index#normal_basaltic_sands)25%$(/l), $(l:tfg_ores/earth_vein_index#normal_gypsum)15%$(/l)$()$(li)įƒ§įŧŋįŸģ: $(l:tfg_ores/earth_vein_index#normal_apatite)15%$(/l)$()$(li)į…Īį‚­: $(l:tfg_ores/earth_vein_index#normal_coal)100%$(/l), $(l:tfg_ores/earth_vein_index#normal_graphite)30%$(/l)$()$(li)į‹Žåą…įŸģ: $(l:tfg_ores/earth_vein_index#normal_monazite)31%$(/l)$()$(li)įŽ„æ­ĶåēĐįŸŋį ‚: $(l:tfg_ores/earth_vein_index#normal_basaltic_sands)35%$(/l)$()$(li)į™―é’ĻįŸŋ: $(l:tfg_ores/earth_vein_index#deep_scheelite)45%$(/l)$()", + "text": "$(li)æœąį ‚: $(l:tfg_ores/earth_vein_index#normal_redstone)20%$(/l)$()$(li)æЄæĶ„įŸģ: $(l:tfg_ores/earth_vein_index#normal_olivine)25%$(/l)$()$(li)氟įĒģ镧铈įŸŋ: $(l:tfg_ores/earth_vein_index#normal_monazite)62%$(/l)$()$(li)æēĨ青铀įŸŋ: $(l:tfg_ores/earth_vein_index#deep_pitchblende)62%$(/l)$()$(li)æēļįŸģ: $(l:tfg_ores/earth_vein_index#surface_copper)16%$(/l)$()$(li)æēđį ‚: $(l:tfg_ores/earth_vein_index#desert_oilsands)100%$(/l), $(l:tfg_ores/earth_vein_index#normal_oilsands)100%$(/l), $(l:tfg_ores/earth_vein_index#normal_tarkianite)35%$(/l)$()$(li)æĩ·įŧŋįŸģįŸŋį ‚: $(l:tfg_ores/earth_vein_index#normal_lubricant)25%$(/l), $(l:tfg_ores/earth_vein_index#normal_olivine)15%$(/l)$()$(li)æŧ‘įŸģ: $(l:tfg_ores/earth_vein_index#normal_lubricant)20%$(/l)$()$(li)æž‚į™―土: $(l:tfg_ores/earth_vein_index#normal_basaltic_sands)25%$(/l), $(l:tfg_ores/earth_vein_index#normal_gypsum)15%$(/l)$()$(li)įƒ§įŧŋįŸģ: $(l:tfg_ores/earth_vein_index#normal_apatite)15%$(/l)$()$(li)į…Īį‚­: $(l:tfg_ores/earth_vein_index#normal_coal)100%$(/l), $(l:tfg_ores/earth_vein_index#normal_graphite)30%$(/l)$()$(li)į‹Žåą…įŸģ: $(l:tfg_ores/earth_vein_index#normal_monazite)31%$(/l)$()$(li)įŽ„æ­ĶåēĐįŸŋį ‚: $(l:tfg_ores/earth_vein_index#normal_basaltic_sands)35%$(/l)$()$(li)į™―é’ĻįŸŋ: $(l:tfg_ores/earth_vein_index#deep_scheelite)45%$(/l)$()", "type": "patchouli:text" }, { diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/tfg_ores/earth_vein_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/tfg_ores/earth_vein_index.json index 96183bfcd..60a264324 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/tfg_ores/earth_vein_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/tfg_ores/earth_vein_index.json @@ -14,22 +14,22 @@ }, { "Type": "patchouli:text", - "text": "$(li)$(l:tfg_ores/earth_vein_index#normal_tarkianite)åĄ”åŸšåŪ‰įŸŋ, æēđį ‚$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_pitchblende)æ™ķčīĻ铀įŸŋ, æēĨ青铀įŸŋ$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_monazite)氟įĒģ镧铈įŸŋ, į‹Žåą…įŸģ$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_oilsands)æēđį ‚$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_coal)į…Īį‚­$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_scheelite)į™―é’ĻįŸŋ, é’Ļé…ļ锂$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_lubricant)įš‚įŸģ, æŧ‘įŸģ, åĪĐį„ķįĒą$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_salt)į›, įĄžį ‚$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_garnet_tin)įŸģæĶīįŸģ, 锡įŸģįŸŋį ‚$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_gypsum)įŸģ膏, æ–đč§ĢįŸģ$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_quartz)įŸģ英$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_graphite)įŸģåĒĻ, é’ŧįŸģ$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_basaltic_sands)įŸŋį ‚$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_garnierite)įĄ…镁镍įŸŋ, čū‰é’īįŸŋ$()$()", + "text": "$(li)$(l:tfg_ores/earth_vein_index#normal_tarkianite)åĄ”åŸšåŪ‰įŸŋ, æēđį ‚$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_pitchblende)æ™ķčīĻ铀įŸŋ, æēĨ青铀įŸŋ$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_monazite)氟įĒģ镧铈įŸŋ, į‹Žåą…įŸģ$()$()$(li)$(l:tfg_ores/earth_vein_index#desert_oilsands)æēđį ‚$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_oilsands)æēđį ‚$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_coal)į…Īį‚­$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_scheelite)į™―é’ĻįŸŋ, é’Ļé…ļ锂$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_lubricant)įš‚įŸģ, æŧ‘įŸģ, åĪĐį„ķįĒą$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_salt)į›, įĄžį ‚$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_garnet_tin)įŸģæĶīįŸģ, 锡įŸģįŸŋį ‚$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_gypsum)įŸģ膏, æ–đč§ĢįŸģ$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_quartz)įŸģ英$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_graphite)įŸģåĒĻ, é’ŧįŸģ$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_basaltic_sands)įŸŋį ‚$()$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)$(l:tfg_ores/earth_vein_index#normal_saltpeter)įĄįŸģ, 蓝įŸģ$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_sulfur)įĄŦ, éŧ„铁įŸŋ$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_sheldonite)įĄŦ铂įŸŋ, 斑铜įŸŋ$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_magnetite)įĢé“įŸŋ, 钒$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_apatite)įĢ·į°įŸģ, įƒ§įŧŋįŸģ$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_garnet_amethyst)įīŦæ°īæ™ķ, įŸģæĶīįŸģ$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_redstone)įšĒįŸģ, æœąį ‚, įšĒåŪįŸģ$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_beryllium)įŧŋåŪįŸģ, 铍įŸŋ$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_olivine)č†ĻæķĶ土, æЄæĶ„įŸģ$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_sapphire)蓝åŪįŸģ, 铁铝æĶīįŸģ$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_mica)蓝æ™ķįŸģ, 乑æŊ, 铝土įŸŋ$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_garnet_opal)蛋į™―įŸģ, įŸģæĶīįŸģ$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_limonite)čĪé“įŸŋ$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_hematite)čĩĪ铁įŸŋ, čĪé“įŸŋ$()$()", + "text": "$(li)$(l:tfg_ores/earth_vein_index#normal_garnierite)įĄ…镁镍įŸŋ, čū‰é’īįŸŋ$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_saltpeter)įĄįŸģ, 蓝įŸģ$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_sulfur)įĄŦ, éŧ„铁įŸŋ$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_sheldonite)įĄŦ铂įŸŋ, 斑铜įŸŋ$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_magnetite)įĢé“įŸŋ, 钒$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_apatite)įĢ·į°įŸģ, įƒ§įŧŋįŸģ$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_garnet_amethyst)įīŦæ°īæ™ķ, įŸģæĶīįŸģ$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_redstone)įšĒįŸģ, æœąį ‚, įšĒåŪįŸģ$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_beryllium)įŧŋåŪįŸģ, 铍įŸŋ$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_olivine)č†ĻæķĶ土, æЄæĶ„įŸģ$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_sapphire)蓝åŪįŸģ, 铁铝æĶīįŸģ$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_mica)蓝æ™ķįŸģ, 乑æŊ, 铝土įŸŋ$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_garnet_opal)蛋į™―įŸģ, įŸģæĶīįŸģ$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_limonite)čĪé“įŸŋ$()$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)$(l:tfg_ores/earth_vein_index#deep_hematite)čĩĪ铁įŸŋ, 针铁įŸŋ, įšĒåŪįŸģ$()$()$(li)$(l:tfg_ores/earth_vein_index#surface_bismuthinite)čū‰é“‹įŸŋ (地čĄĻ)$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_bismuthinite)čū‰é“‹įŸŋ (æ™Ū通)$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_gold)金įŸŋ (æ·ąåą‚)$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_gold)金įŸŋ, čĪé“įŸŋ, čĩĪ铁įŸŋ$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_limonite)针铁įŸŋ, 孔雀įŸģ$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_molybdenum)钾铅įŸŋ, čū‰é’žįŸŋ$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_copper)铜įŸŋ, éŧ„é“œįŸŋ$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_magnetite)铮铁įŸŋ, įĢé“įŸŋ$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_silver)é“ķįŸŋ, æ–đ铅įŸŋ, 铅įŸŋ$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_spodumene)锂čū‰įŸģ, 锂乑æŊ$()$()$(li)$(l:tfg_ores/earth_vein_index#surface_cassiterite)锡įŸģįŸŋ (地čĄĻ)$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_cassiterite)锡įŸģįŸŋ (æ™Ū通)$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_manganese)锰įŸŋ, é’―įŸŋ$()$()", + "text": "$(li)$(l:tfg_ores/earth_vein_index#normal_hematite)čĩĪ铁įŸŋ, čĪé“įŸŋ$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_hematite)čĩĪ铁įŸŋ, 针铁įŸŋ, įšĒåŪįŸģ$()$()$(li)$(l:tfg_ores/earth_vein_index#surface_bismuthinite)čū‰é“‹įŸŋ (地čĄĻ)$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_bismuthinite)čū‰é“‹įŸŋ (æ™Ū通)$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_gold)金įŸŋ (æ·ąåą‚)$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_gold)金įŸŋ, čĪé“įŸŋ, čĩĪ铁įŸŋ$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_limonite)针铁įŸŋ, 孔雀įŸģ$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_molybdenum)钾铅įŸŋ, čū‰é’žįŸŋ$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_copper)铜įŸŋ, éŧ„é“œįŸŋ$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_magnetite)铮铁įŸŋ, įĢé“įŸŋ$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_silver)é“ķįŸŋ, æ–đ铅įŸŋ, 铅įŸŋ$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_spodumene)锂čū‰įŸģ, 锂乑æŊ$()$()$(li)$(l:tfg_ores/earth_vein_index#surface_cassiterite)锡įŸģįŸŋ (地čĄĻ)$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_cassiterite)锡įŸģįŸŋ (æ™Ū通)$()$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)$(l:tfg_ores/earth_vein_index#surface_sphalerite)闩锌įŸŋ, įĄŦ$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_sphalerite)闩锌įŸŋ, éŧ„铁įŸŋ$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_lapis)青金įŸģ, 蓝金įŸģ, æ–đ钠įŸģ$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_topaz)éŧ„įŽ‰, čū‰é“œįŸŋ$()$()$(li)$(l:tfg_ores/earth_vein_index#surface_copper)éŧ„é“œįŸŋ, 雄éŧ„$()$()$(li)$(l:tfg_ores/earth_vein_index#surface_tetrahedrite)éŧé“œįŸŋ (地čĄĻ)$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_tetrahedrite)éŧé“œįŸŋ (æ™Ū通)$()$()", + "text": "$(li)$(l:tfg_ores/earth_vein_index#normal_manganese)锰įŸŋ, é’―įŸŋ$()$()$(li)$(l:tfg_ores/earth_vein_index#surface_sphalerite)闩锌įŸŋ, įĄŦ$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_sphalerite)闩锌įŸŋ, éŧ„铁įŸŋ$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_lapis)青金įŸģ, 蓝金įŸģ, æ–đ钠įŸģ$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_topaz)éŧ„įŽ‰, čū‰é“œįŸŋ$()$()$(li)$(l:tfg_ores/earth_vein_index#surface_copper)éŧ„é“œįŸŋ, 雄éŧ„$()$()$(li)$(l:tfg_ores/earth_vein_index#surface_tetrahedrite)éŧé“œįŸŋ (地čĄĻ)$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_tetrahedrite)éŧé“œįŸŋ (æ™Ū通)$()$()", "type": "patchouli:text" }, { @@ -265,7 +265,34 @@ }, { "Type": "patchouli:text", - "text": "$(thing)įĻ€æœ‰åšĶ$(): 1/185 匚块$(br)$(thing)åŊ†åšĶ$(): 20%$(br)$(thing)įąŧ型$(): å›Ēį°‡įŠķįŸŋ脉$(br)$(thing)Y 坐标$(): 0 — 70$(br)$(thing)å°šåŊļ$(): 55$(br)$(thing)指įĪšå™Ļ最åĪ§æ·ąåšĶ$(): 20$(br2)$(thing)åēĐįŸģįąŧ型$(): į‡§įŸģ, į™―乑åēĐ, į™―åžĐåēĐ, įŸģį°åēĐ, į ūåēĐ, įē˜åœŸåēĐ, éĄĩåēĐ", + "text": "$(thing)įĻ€æœ‰åšĶ$(): 1/150 匚块$(br)$(thing)åŊ†åšĶ$(): 20%$(br)$(thing)įąŧ型$(): å›Ēį°‡įŠķįŸŋ脉$(br)$(thing)Y 坐标$(): 30 — 70$(br)$(thing)å°šåŊļ$(): 60$(br)$(thing)指įĪšå™Ļ最åĪ§æ·ąåšĶ$(): 50$(br2)$(thing)åēĐįŸģįąŧ型$(): į‡§įŸģ, į™―乑åēĐ, į™―åžĐåēĐ, įŸģį°åēĐ, į ūåēĐ, įē˜åœŸåēĐ, éĄĩåēĐ", + "title": "æēđį ‚", + "type": "patchouli:text", + "anchor": "desert_oilsands" + }, + { + "Type": "patchouli:multiblock", + "name": "æēđį ‚", + "multiblock": { + "mapping": { + "0": "#forge:ores/oilsands" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)į™ū分æŊ”$(): 100%$(br)$(thing)æĨ暐$(): 臩į”ą \uD83D\uDEE2\uD83E\uDD85\uD83D\uDDFD", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:text", + "text": "$(thing)įĻ€æœ‰åšĶ$(): 1/220 匚块$(br)$(thing)åŊ†åšĶ$(): 20%$(br)$(thing)įąŧ型$(): å›Ēį°‡įŠķįŸŋ脉$(br)$(thing)Y 坐标$(): 40 — 90$(br)$(thing)å°šåŊļ$(): 30$(br)$(thing)指įĪšå™Ļ最åĪ§æ·ąåšĶ$(): 20$(br2)$(thing)åēĐįŸģįąŧ型$(): į‡§įŸģ, į™―乑åēĐ, į™―åžĐåēĐ, įŸģį°åēĐ, į ūåēĐ, įē˜åœŸåēĐ, éĄĩåēĐ", "title": "æēđį ‚", "type": "patchouli:text", "anchor": "normal_oilsands" @@ -836,7 +863,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)įĻ€æœ‰åšĶ$(): 1/80 匚块$(br)$(thing)åŊ†åšĶ$(): 40%$(br)$(thing)įąŧ型$(): į›˜įŠķįŸŋ脉$(br)$(thing)Y 坐标$(): -64 — -16$(br)$(thing)å°šåŊļ$(): 16$(br)$(thing)éŦ˜åšĶ$(): 6$(br)$(thing)指įĪšå™Ļ最åĪ§æ·ąåšĶ$(): 20$(br2)$(thing)åēĐįŸģįąŧ型$(): 千枚åēĐ, åĪ§į†åēĐ, åŪ‰åąąåēĐ, æŋåēĐ, æĩįšđåēĐ, į‡§įŸģ, į‰‡åēĐ, į‰‡éšŧåēĐ, įŽ„æ­ĶåēĐ, į™―乑åēĐ, į™―åžĐåēĐ, įŸģį°åēĐ, įŸģ英åēĐ, į ūåēĐ, įē˜åœŸåēĐ, 花åē—åēĐ, 英åŪ‰åēĐ, čū‰é•ŋåēĐ, 闩é•ŋåēĐ, éĄĩåēĐ", + "text": "$(thing)įĻ€æœ‰åšĶ$(): 1/80 匚块$(br)$(thing)åŊ†åšĶ$(): 40%$(br)$(thing)įąŧ型$(): į›˜įŠķįŸŋ脉$(br)$(thing)Y 坐标$(): -64 — -16$(br)$(thing)å°šåŊļ$(): 16$(br)$(thing)éŦ˜åšĶ$(): 6$(br)$(thing)指įĪšå™Ļ最åĪ§æ·ąåšĶ$(): 20$(br2)$(thing)åēĐįŸģįąŧ型$(): 千枚åēĐ, åĪ§į†åēĐ, åŪ‰åąąåēĐ, æŋåēĐ, æĩįšđåēĐ, į‰‡åēĐ, į‰‡éšŧåēĐ, įŽ„æ­ĶåēĐ, įŸģ英åēĐ, 花åē—åēĐ, 英åŪ‰åēĐ, čū‰é•ŋåēĐ, 闩é•ŋåēĐ", "title": "įŸģåĒĻ, é’ŧįŸģ", "type": "patchouli:text", "anchor": "normal_graphite" @@ -1646,7 +1673,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)įĻ€æœ‰åšĶ$(): 1/250 匚块$(br)$(thing)åŊ†åšĶ$(): 35%$(br)$(thing)įąŧ型$(): įŪĄįŠķįŸŋ脉$(br)$(thing)Y 坐标$(): -32 — 50$(br)$(thing)éŦ˜åšĶ$(): 60$(br)$(thing)半åū„$(): 10$(br)$(thing)指įĪšå™Ļ最åĪ§æ·ąåšĶ$(): 20$(br2)$(thing)åēĐįŸģįąŧ型$(): åŪ‰åąąåēĐ, æĩįšđåēĐ, įŽ„æ­ĶåēĐ, 英åŪ‰åēĐ", + "text": "$(thing)įĻ€æœ‰åšĶ$(): 1/250 匚块$(br)$(thing)åŊ†åšĶ$(): 35%$(br)$(thing)įąŧ型$(): įŪĄįŠķįŸŋ脉$(br)$(thing)Y 坐标$(): -32 — 30$(br)$(thing)éŦ˜åšĶ$(): 60$(br)$(thing)半åū„$(): 10$(br)$(thing)指įĪšå™Ļ最åĪ§æ·ąåšĶ$(): 20$(br2)$(thing)åēĐįŸģįąŧ型$(): åŪ‰åąąåēĐ, æĩįšđåēĐ, įŽ„æ­ĶåēĐ, 英åŪ‰åēĐ", "title": "įŧŋåŪįŸģ, 铍įŸŋ", "type": "patchouli:text", "anchor": "normal_beryllium" diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/tfg_ores/mars_vein_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/tfg_ores/mars_vein_index.json index 38c97ca35..ce31b402a 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/tfg_ores/mars_vein_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/tfg_ores/mars_vein_index.json @@ -29,7 +29,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)įĻ€æœ‰åšĶ$(): 1/370 匚块$(br)$(thing)åŊ†åšĶ$(): 30%$(br)$(thing)įąŧ型$(): å›Ēį°‡įŠķįŸŋ脉$(br)$(thing)Y 坐标$(): -20 — 0$(br)$(thing)å°šåŊļ$(): 60$(br)$(thing)指įĪšå™Ļ最åĪ§æ·ąåšĶ$(): 20$(br2)$(thing)åēĐįŸģįąŧ型$(): æģĨæŋåēĐ, į‡§įŸģ, įŽ„æ­ĶåēĐ, į™―åžĐåēĐ, į ūåēĐ, įē—éĒåēĐ, įšĒ花åē—åēĐ, 英åŪ‰åēĐ, 闩é•ŋåēĐ", + "text": "$(thing)įĻ€æœ‰åšĶ$(): 1/370 匚块$(br)$(thing)åŊ†åšĶ$(): 30%$(br)$(thing)įąŧ型$(): å›Ēį°‡įŠķįŸŋ脉$(br)$(thing)Y 坐标$(): -30 — 0$(br)$(thing)å°šåŊļ$(): 60$(br)$(thing)指įĪšå™Ļ最åĪ§æ·ąåšĶ$(): 20$(br2)$(thing)åēĐįŸģįąŧ型$(): įšĒ花åē—åēĐ, 花åē—åēĐ, čū‰é•ŋåēĐ, 闩é•ŋåēĐ", "title": "斑铜įŸŋ, įĄŦ铂įŸŋ", "type": "patchouli:text", "anchor": "deep_mars_sheldonite" @@ -121,7 +121,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)įĻ€æœ‰åšĶ$(): 1/215 匚块$(br)$(thing)åŊ†åšĶ$(): 40%$(br)$(thing)įąŧ型$(): å›Ēį°‡įŠķįŸŋ脉$(br)$(thing)Y 坐标$(): 0 — 70$(br)$(thing)å°šåŊļ$(): 45$(br)$(thing)指įĪšå™Ļ最åĪ§æ·ąåšĶ$(): 15$(br2)$(thing)åēĐįŸģįąŧ型$(): æģĨæŋåēĐ, į‡§įŸģ, įŽ„æ­ĶåēĐ, į™―乑åēĐ, į™―åžĐåēĐ, įē—éĒåēĐ, čū‰é•ŋåēĐ, 闩é•ŋåēĐ", + "text": "$(thing)įĻ€æœ‰åšĶ$(): 1/215 匚块$(br)$(thing)åŊ†åšĶ$(): 40%$(br)$(thing)įąŧ型$(): å›Ēį°‡įŠķįŸŋ脉$(br)$(thing)Y 坐标$(): 0 — 70$(br)$(thing)å°šåŊļ$(): 45$(br)$(thing)指įĪšå™Ļ最åĪ§æ·ąåšĶ$(): 15$(br2)$(thing)åēĐįŸģįąŧ型$(): æģĨæŋåēĐ, į‡§įŸģ, įŽ„æ­ĶåēĐ, į™―乑åēĐ, į™―åžĐåēĐ, įŸģ英åēĐ, įē—éĒåēĐ, čū‰é•ŋåēĐ, 闩é•ŋåēĐ", "title": "氟įĒģ镧铈įŸŋ, į‹Žåą…įŸģ", "type": "patchouli:text", "anchor": "mars_neodynium" @@ -213,7 +213,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)įĻ€æœ‰åšĶ$(): 1/370 匚块$(br)$(thing)åŊ†åšĶ$(): 30%$(br)$(thing)įąŧ型$(): å›Ēį°‡įŠķįŸŋ脉$(br)$(thing)Y 坐标$(): -20 — 0$(br)$(thing)å°šåŊļ$(): 60$(br)$(thing)指įĪšå™Ļ最åĪ§æ·ąåšĶ$(): 20$(br2)$(thing)åēĐįŸģįąŧ型$(): æģĨæŋåēĐ, įē—éĒåēĐ, įē˜åœŸåēĐ, 英åŪ‰åēĐ, čū‰é•ŋåēĐ, 闩é•ŋåēĐ, éĄĩåēĐ", + "text": "$(thing)įĻ€æœ‰åšĶ$(): 1/370 匚块$(br)$(thing)åŊ†åšĶ$(): 30%$(br)$(thing)įąŧ型$(): å›Ēį°‡įŠķįŸŋ脉$(br)$(thing)Y 坐标$(): -30 — 0$(br)$(thing)å°šåŊļ$(): 60$(br)$(thing)指įĪšå™Ļ最åĪ§æ·ąåšĶ$(): 20$(br2)$(thing)åēĐįŸģįąŧ型$(): įšĒ花åē—åēĐ, 花åē—åēĐ, čū‰é•ŋåēĐ, 闩é•ŋåēĐ", "title": "æēĨ青铀įŸŋ, æ–đ钍įŸģ, æ™ķčīĻ铀įŸŋ", "type": "patchouli:text", "anchor": "deep_mars_pitchblende" @@ -280,7 +280,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)įĻ€æœ‰åšĶ$(): 1/220 匚块$(br)$(thing)åŊ†åšĶ$(): 55%$(br)$(thing)įąŧ型$(): å›Ēį°‡įŠķįŸŋ脉$(br)$(thing)Y 坐标$(): 0 — 70$(br)$(thing)å°šåŊļ$(): 20$(br)$(thing)指įĪšå™Ļ最åĪ§æ·ąåšĶ$(): 15$(br2)$(thing)åēĐįŸģįąŧ型$(): æģĨæŋåēĐ, į™―乑åēĐ, į ūåēĐ, įē—éĒåēĐ, įšĒ花åē—åēĐ, 英åŪ‰åēĐ, čū‰é•ŋåēĐ, 闩é•ŋåēĐ, éĄĩåēĐ", + "text": "$(thing)įĻ€æœ‰åšĶ$(): 1/220 匚块$(br)$(thing)åŊ†åšĶ$(): 55%$(br)$(thing)įąŧ型$(): å›Ēį°‡įŠķįŸŋ脉$(br)$(thing)Y 坐标$(): 0 — 70$(br)$(thing)å°šåŊļ$(): 20$(br)$(thing)指įĪšå™Ļ最åĪ§æ·ąåšĶ$(): 15$(br2)$(thing)åēĐįŸģįąŧ型$(): æģĨæŋåēĐ, į™―乑åēĐ, įŸģ英åēĐ, į ūåēĐ, įē—éĒåēĐ, įšĒ花åē—åēĐ, 英åŪ‰åēĐ, čū‰é•ŋåēĐ, 闩é•ŋåēĐ, éĄĩåēĐ", "title": "æēĨ青铀įŸŋ, æ–đ钍įŸģ, čĩĪ铁įŸŋ", "type": "patchouli:text", "anchor": "mars_pitchblende" @@ -491,7 +491,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)įĻ€æœ‰åšĶ$(): 1/220 匚块$(br)$(thing)åŊ†åšĶ$(): 25%$(br)$(thing)įąŧ型$(): å›Ēį°‡įŠķįŸŋ脉$(br)$(thing)Y 坐标$(): 0 — 70$(br)$(thing)å°šåŊļ$(): 40$(br)$(thing)指įĪšå™Ļ最åĪ§æ·ąåšĶ$(): 15$(br2)$(thing)åēĐįŸģįąŧ型$(): æģĨæŋåēĐ, į™―乑åēĐ, įŸģį°åēĐ, į ūåēĐ, įē˜åœŸåēĐ, įšĒ花åē—åēĐ, 花åē—åēĐ, 英åŪ‰åēĐ, 闩é•ŋåēĐ, éĄĩåēĐ", + "text": "$(thing)įĻ€æœ‰åšĶ$(): 1/220 匚块$(br)$(thing)åŊ†åšĶ$(): 25%$(br)$(thing)įąŧ型$(): å›Ēį°‡įŠķįŸŋ脉$(br)$(thing)Y 坐标$(): 0 — 70$(br)$(thing)å°šåŊļ$(): 40$(br)$(thing)指įĪšå™Ļ最åĪ§æ·ąåšĶ$(): 15$(br2)$(thing)åēĐįŸģįąŧ型$(): æģĨæŋåēĐ, į™―乑åēĐ, įŸģį°åēĐ, įŸģ英åēĐ, į ūåēĐ, įē˜åœŸåēĐ, įšĒ花åē—åēĐ, 花åē—åēĐ, 英åŪ‰åēĐ, 闩é•ŋåēĐ, éĄĩåēĐ", "title": "įš‚įŸģ, æŧ‘įŸģ, æĩ·įŧŋįŸģįŸŋį ‚", "type": "patchouli:text", "anchor": "mars_lubricant" @@ -623,7 +623,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)įĻ€æœ‰åšĶ$(): 1/210 匚块$(br)$(thing)åŊ†åšĶ$(): 40%$(br)$(thing)įąŧ型$(): į›˜įŠķįŸŋ脉$(br)$(thing)Y 坐标$(): 0 — 70$(br)$(thing)å°šåŊļ$(): 40$(br)$(thing)éŦ˜åšĶ$(): 6$(br)$(thing)指įĪšå™Ļ最åĪ§æ·ąåšĶ$(): 15$(br2)$(thing)åēĐįŸģįąŧ型$(): æģĨæŋåēĐ, į‡§įŸģ, į™―åžĐåēĐ, įŸģį°åēĐ, įē—éĒåēĐ, įē˜åœŸåēĐ, įšĒ花åē—åēĐ, 花åē—åēĐ, 闩é•ŋåēĐ", + "text": "$(thing)įĻ€æœ‰åšĶ$(): 1/210 匚块$(br)$(thing)åŊ†åšĶ$(): 40%$(br)$(thing)įąŧ型$(): į›˜įŠķįŸŋ脉$(br)$(thing)Y 坐标$(): 0 — 70$(br)$(thing)å°šåŊļ$(): 40$(br)$(thing)éŦ˜åšĶ$(): 6$(br)$(thing)指įĪšå™Ļ最åĪ§æ·ąåšĶ$(): 15$(br2)$(thing)åēĐįŸģįąŧ型$(): æģĨæŋåēĐ, į‡§įŸģ, į™―åžĐåēĐ, įŸģį°åēĐ, įŸģ英åēĐ, įē—éĒåēĐ, įē˜åœŸåēĐ, įšĒ花åē—åēĐ, 花åē—åēĐ, 闩é•ŋåēĐ", "title": "į›, 锂čū‰įŸģ", "type": "patchouli:text", "anchor": "mars_salt" @@ -715,7 +715,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)įĻ€æœ‰åšĶ$(): 1/210 匚块$(br)$(thing)åŊ†åšĶ$(): 30%$(br)$(thing)įąŧ型$(): å›Ēį°‡įŠķįŸŋ脉$(br)$(thing)Y 坐标$(): 0 — 70$(br)$(thing)å°šåŊļ$(): 40$(br)$(thing)指įĪšå™Ļ最åĪ§æ·ąåšĶ$(): 15$(br2)$(thing)åēĐįŸģįąŧ型$(): æģĨæŋåēĐ, į‡§įŸģ, į™―åžĐåēĐ, įŸģį°åēĐ, įē—éĒåēĐ, įē˜åœŸåēĐ, įšĒ花åē—åēĐ, 花åē—åēĐ, éĄĩåēĐ", + "text": "$(thing)įĻ€æœ‰åšĶ$(): 1/210 匚块$(br)$(thing)åŊ†åšĶ$(): 30%$(br)$(thing)įąŧ型$(): å›Ēį°‡įŠķįŸŋ脉$(br)$(thing)Y 坐标$(): 0 — 70$(br)$(thing)å°šåŊļ$(): 40$(br)$(thing)指įĪšå™Ļ最åĪ§æ·ąåšĶ$(): 15$(br2)$(thing)åēĐįŸģįąŧ型$(): æģĨæŋåēĐ, į‡§įŸģ, į™―åžĐåēĐ, įŸģį°åēĐ, įŸģ英åēĐ, įē—éĒåēĐ, įē˜åœŸåēĐ, įšĒ花åē—åēĐ, 花åē—åēĐ, éĄĩåēĐ", "title": "įŸģ英åēĐ, įŸģæĢ‰, 重æ™ķįŸģ", "type": "patchouli:text", "anchor": "mars_quartzite" @@ -899,7 +899,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)įĻ€æœ‰åšĶ$(): 1/250 匚块$(br)$(thing)åŊ†åšĶ$(): 40%$(br)$(thing)įąŧ型$(): å›Ēį°‡įŠķįŸŋ脉$(br)$(thing)Y 坐标$(): 0 — 70$(br)$(thing)å°šåŊļ$(): 55$(br)$(thing)指įĪšå™Ļ最åĪ§æ·ąåšĶ$(): 40$(br2)$(thing)åēĐįŸģįąŧ型$(): æģĨæŋåēĐ, įŽ„æ­ĶåēĐ, į™―åžĐåēĐ, įŸģį°åēĐ, įē˜åœŸåēĐ, įšĒ花åē—åēĐ, 花åē—åēĐ, 英åŪ‰åēĐ, éĄĩåēĐ", + "text": "$(thing)įĻ€æœ‰åšĶ$(): 1/250 匚块$(br)$(thing)åŊ†åšĶ$(): 40%$(br)$(thing)įąŧ型$(): å›Ēį°‡įŠķįŸŋ脉$(br)$(thing)Y 坐标$(): 0 — 70$(br)$(thing)å°šåŊļ$(): 55$(br)$(thing)指įĪšå™Ļ最åĪ§æ·ąåšĶ$(): 40$(br2)$(thing)åēĐįŸģįąŧ型$(): æģĨæŋåēĐ, įŽ„æ­ĶåēĐ, į™―åžĐåēĐ, įŸģį°åēĐ, įŸģ英åēĐ, įē˜åœŸåēĐ, įšĒ花åē—åēĐ, 花åē—åēĐ, 英åŪ‰åēĐ, éĄĩåēĐ", "title": "įĄ…镁镍įŸŋ, čū‰é’īįŸŋ", "type": "patchouli:text", "anchor": "mars_nickel" @@ -1083,7 +1083,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)įĻ€æœ‰åšĶ$(): 1/370 匚块$(br)$(thing)åŊ†åšĶ$(): 30%$(br)$(thing)įąŧ型$(): å›Ēį°‡įŠķįŸŋ脉$(br)$(thing)Y 坐标$(): -20 — 0$(br)$(thing)å°šåŊļ$(): 60$(br)$(thing)指įĪšå™Ļ最åĪ§æ·ąåšĶ$(): 20$(br2)$(thing)åēĐįŸģįąŧ型$(): æģĨæŋåēĐ, į‡§įŸģ, įŽ„æ­ĶåēĐ, į™―åžĐåēĐ, įŸģį°åēĐ, įē˜åœŸåēĐ, 英åŪ‰åēĐ, éĄĩåēĐ", + "text": "$(thing)įĻ€æœ‰åšĶ$(): 1/370 匚块$(br)$(thing)åŊ†åšĶ$(): 30%$(br)$(thing)įąŧ型$(): å›Ēį°‡įŠķįŸŋ脉$(br)$(thing)Y 坐标$(): -30 — 0$(br)$(thing)å°šåŊļ$(): 60$(br)$(thing)指įĪšå™Ļ最åĪ§æ·ąåšĶ$(): 20$(br2)$(thing)åēĐįŸģįąŧ型$(): įšĒ花åē—åēĐ, 花åē—åēĐ, čū‰é•ŋåēĐ, 闩é•ŋåēĐ", "title": "įšĒįŸģ, 铮铁įŸŋ", "type": "patchouli:text", "anchor": "deep_mars_chromite" @@ -1217,7 +1217,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)įĻ€æœ‰åšĶ$(): 1/210 匚块$(br)$(thing)åŊ†åšĶ$(): 40%$(br)$(thing)įąŧ型$(): å›Ēį°‡įŠķįŸŋ脉$(br)$(thing)Y 坐标$(): 0 — 70$(br)$(thing)å°šåŊļ$(): 40$(br)$(thing)指įĪšå™Ļ最åĪ§æ·ąåšĶ$(): 30$(br2)$(thing)åēĐįŸģįąŧ型$(): æģĨæŋåēĐ, įŽ„æ­ĶåēĐ, į™―乑åēĐ, įŸģį°åēĐ, į ūåēĐ, įē˜åœŸåēĐ, įšĒ花åē—åēĐ, 英åŪ‰åēĐ", + "text": "$(thing)įĻ€æœ‰åšĶ$(): 1/210 匚块$(br)$(thing)åŊ†åšĶ$(): 40%$(br)$(thing)įąŧ型$(): å›Ēį°‡įŠķįŸŋ脉$(br)$(thing)Y 坐标$(): 0 — 70$(br)$(thing)å°šåŊļ$(): 40$(br)$(thing)指įĪšå™Ļ最åĪ§æ·ąåšĶ$(): 30$(br2)$(thing)åēĐįŸģįąŧ型$(): æģĨæŋåēĐ, įŽ„æ­ĶåēĐ, į™―乑åēĐ, įŸģį°åēĐ, įŸģ英åēĐ, į ūåēĐ, įē˜åœŸåēĐ, įšĒ花åē—åēĐ, 英åŪ‰åēĐ", "title": "čĩĪ铁įŸŋ, čĪé“įŸŋ", "type": "patchouli:text", "anchor": "mars_hematite" @@ -1309,7 +1309,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)įĻ€æœ‰åšĶ$(): 1/140 匚块$(br)$(thing)åŊ†åšĶ$(): 25%$(br)$(thing)įąŧ型$(): å›Ēį°‡įŠķįŸŋ脉$(br)$(thing)Y 坐标$(): 80 — 180$(br)$(thing)å°šåŊļ$(): 45$(br)$(thing)指įĪšå™Ļ最åĪ§æ·ąåšĶ$(): 40$(br2)$(thing)åēĐįŸģįąŧ型$(): æģĨæŋåēĐ, į‡§įŸģ, įŽ„æ­ĶåēĐ, į™―乑åēĐ, į™―åžĐåēĐ, įŸģį°åēĐ, į ūåēĐ, įē—éĒåēĐ, įē˜åœŸåēĐ, įšĒ花åē—åēĐ, 花åē—åēĐ, 英åŪ‰åēĐ, čū‰é•ŋåēĐ, 闩é•ŋåēĐ, éĄĩåēĐ", + "text": "$(thing)įĻ€æœ‰åšĶ$(): 1/140 匚块$(br)$(thing)åŊ†åšĶ$(): 25%$(br)$(thing)įąŧ型$(): å›Ēį°‡įŠķįŸŋ脉$(br)$(thing)Y 坐标$(): 80 — 180$(br)$(thing)å°šåŊļ$(): 45$(br)$(thing)指įĪšå™Ļ最åĪ§æ·ąåšĶ$(): 40$(br2)$(thing)åēĐįŸģįąŧ型$(): æģĨæŋåēĐ, į‡§įŸģ, įŽ„æ­ĶåēĐ, į™―乑åēĐ, į™―åžĐåēĐ, įŸģį°åēĐ, įŸģ英åēĐ, į ūåēĐ, įē—éĒåēĐ, įē˜åœŸåēĐ, įšĒ花åē—åēĐ, 花åē—åēĐ, 英åŪ‰åēĐ, čū‰é•ŋåēĐ, 闩é•ŋåēĐ, éĄĩåēĐ", "title": "čĩĪ铁įŸŋ, čĪé“įŸŋ", "type": "patchouli:text", "anchor": "mars_surface_hematite" @@ -1401,7 +1401,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)įĻ€æœ‰åšĶ$(): 1/140 匚块$(br)$(thing)åŊ†åšĶ$(): 25%$(br)$(thing)įąŧ型$(): å›Ēį°‡įŠķįŸŋ脉$(br)$(thing)Y 坐标$(): 80 — 180$(br)$(thing)å°šåŊļ$(): 45$(br)$(thing)指įĪšå™Ļ最åĪ§æ·ąåšĶ$(): 40$(br2)$(thing)åēĐįŸģįąŧ型$(): æģĨæŋåēĐ, į‡§įŸģ, įŽ„æ­ĶåēĐ, į™―乑åēĐ, į™―åžĐåēĐ, įŸģį°åēĐ, į ūåēĐ, įē—éĒåēĐ, įē˜åœŸåēĐ, įšĒ花åē—åēĐ, 花åē—åēĐ, 英åŪ‰åēĐ, čū‰é•ŋåēĐ, 闩é•ŋåēĐ, éĄĩåēĐ", + "text": "$(thing)įĻ€æœ‰åšĶ$(): 1/140 匚块$(br)$(thing)åŊ†åšĶ$(): 25%$(br)$(thing)įąŧ型$(): å›Ēį°‡įŠķįŸŋ脉$(br)$(thing)Y 坐标$(): 80 — 180$(br)$(thing)å°šåŊļ$(): 45$(br)$(thing)指įĪšå™Ļ最åĪ§æ·ąåšĶ$(): 40$(br2)$(thing)åēĐįŸģįąŧ型$(): æģĨæŋåēĐ, į‡§įŸģ, įŽ„æ­ĶåēĐ, į™―乑åēĐ, į™―åžĐåēĐ, įŸģį°åēĐ, įŸģ英åēĐ, į ūåēĐ, įē—éĒåēĐ, įē˜åœŸåēĐ, įšĒ花åē—åēĐ, 花åē—åēĐ, 英åŪ‰åēĐ, čū‰é•ŋåēĐ, 闩é•ŋåēĐ, éĄĩåēĐ", "title": "čū‰é“‹įŸŋ", "type": "patchouli:text", "anchor": "mars_surface_bismuthinite" @@ -1692,7 +1692,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)įĻ€æœ‰åšĶ$(): 1/220 匚块$(br)$(thing)åŊ†åšĶ$(): 40%$(br)$(thing)įąŧ型$(): å›Ēį°‡įŠķįŸŋ脉$(br)$(thing)Y 坐标$(): 0 — 70$(br)$(thing)å°šåŊļ$(): 50$(br)$(thing)指įĪšå™Ļ最åĪ§æ·ąåšĶ$(): 40$(br2)$(thing)åēĐįŸģįąŧ型$(): æģĨæŋåēĐ, įŽ„æ­ĶåēĐ, į™―乑åēĐ, įŸģį°åēĐ, į ūåēĐ, įē—éĒåēĐ, įē˜åœŸåēĐ, 英åŪ‰åēĐ, éĄĩåēĐ", + "text": "$(thing)įĻ€æœ‰åšĶ$(): 1/220 匚块$(br)$(thing)åŊ†åšĶ$(): 40%$(br)$(thing)įąŧ型$(): å›Ēį°‡įŠķįŸŋ脉$(br)$(thing)Y 坐标$(): 0 — 70$(br)$(thing)å°šåŊļ$(): 50$(br)$(thing)指įĪšå™Ļ最åĪ§æ·ąåšĶ$(): 40$(br2)$(thing)åēĐįŸģįąŧ型$(): æģĨæŋåēĐ, įŽ„æ­ĶåēĐ, į™―乑åēĐ, įŸģį°åēĐ, įŸģ英åēĐ, į ūåēĐ, įē—éĒåēĐ, įē˜åœŸåēĐ, 英åŪ‰åēĐ, éĄĩåēĐ", "title": "铜įŸŋ, éŧ„é“œįŸŋ", "type": "patchouli:text", "anchor": "mars_copper" @@ -1876,7 +1876,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)įĻ€æœ‰åšĶ$(): 1/135 匚块$(br)$(thing)åŊ†åšĶ$(): 25%$(br)$(thing)įąŧ型$(): å›Ēį°‡įŠķįŸŋ脉$(br)$(thing)Y 坐标$(): 80 — 180$(br)$(thing)å°šåŊļ$(): 45$(br)$(thing)指įĪšå™Ļ最åĪ§æ·ąåšĶ$(): 40$(br2)$(thing)åēĐįŸģįąŧ型$(): æģĨæŋåēĐ, į‡§įŸģ, įŽ„æ­ĶåēĐ, į™―乑åēĐ, į™―åžĐåēĐ, įŸģį°åēĐ, į ūåēĐ, įē—éĒåēĐ, įē˜åœŸåēĐ, įšĒ花åē—åēĐ, 花åē—åēĐ, 英åŪ‰åēĐ, čū‰é•ŋåēĐ, 闩é•ŋåēĐ, éĄĩåēĐ", + "text": "$(thing)įĻ€æœ‰åšĶ$(): 1/135 匚块$(br)$(thing)åŊ†åšĶ$(): 25%$(br)$(thing)įąŧ型$(): å›Ēį°‡įŠķįŸŋ脉$(br)$(thing)Y 坐标$(): 80 — 180$(br)$(thing)å°šåŊļ$(): 45$(br)$(thing)指įĪšå™Ļ最åĪ§æ·ąåšĶ$(): 40$(br2)$(thing)åēĐįŸģįąŧ型$(): æģĨæŋåēĐ, į‡§įŸģ, įŽ„æ­ĶåēĐ, į™―乑åēĐ, į™―åžĐåēĐ, įŸģį°åēĐ, įŸģ英åēĐ, į ūåēĐ, įē—éĒåēĐ, įē˜åœŸåēĐ, įšĒ花åē—åēĐ, 花åē—åēĐ, 英åŪ‰åēĐ, čū‰é•ŋåēĐ, 闩é•ŋåēĐ, éĄĩåēĐ", "title": "锡įŸģįŸŋ", "type": "patchouli:text", "anchor": "mars_surface_cassiterite" @@ -2035,7 +2035,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)įĻ€æœ‰åšĶ$(): 1/150 匚块$(br)$(thing)åŊ†åšĶ$(): 25%$(br)$(thing)įąŧ型$(): å›Ēį°‡įŠķįŸŋ脉$(br)$(thing)Y 坐标$(): 80 — 180$(br)$(thing)å°šåŊļ$(): 45$(br)$(thing)指įĪšå™Ļ最åĪ§æ·ąåšĶ$(): 40$(br2)$(thing)åēĐįŸģįąŧ型$(): æģĨæŋåēĐ, į‡§įŸģ, įŽ„æ­ĶåēĐ, į™―乑åēĐ, į™―åžĐåēĐ, įŸģį°åēĐ, į ūåēĐ, įē—éĒåēĐ, įē˜åœŸåēĐ, įšĒ花åē—åēĐ, 花åē—åēĐ, 英åŪ‰åēĐ, čū‰é•ŋåēĐ, 闩é•ŋåēĐ, éĄĩåēĐ", + "text": "$(thing)įĻ€æœ‰åšĶ$(): 1/150 匚块$(br)$(thing)åŊ†åšĶ$(): 25%$(br)$(thing)įąŧ型$(): å›Ēį°‡įŠķįŸŋ脉$(br)$(thing)Y 坐标$(): 80 — 180$(br)$(thing)å°šåŊļ$(): 45$(br)$(thing)指įĪšå™Ļ最åĪ§æ·ąåšĶ$(): 40$(br2)$(thing)åēĐįŸģįąŧ型$(): æģĨæŋåēĐ, į‡§įŸģ, įŽ„æ­ĶåēĐ, į™―乑åēĐ, į™―åžĐåēĐ, įŸģį°åēĐ, įŸģ英åēĐ, į ūåēĐ, įē—éĒåēĐ, įē˜åœŸåēĐ, įšĒ花åē—åēĐ, 花åē—åēĐ, 英åŪ‰åēĐ, čū‰é•ŋåēĐ, 闩é•ŋåēĐ, éĄĩåēĐ", "title": "闩锌įŸŋ, æ–đ铅įŸŋ", "type": "patchouli:text", "anchor": "mars_surface_nickel_galena" @@ -2326,7 +2326,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)įĻ€æœ‰åšĶ$(): 1/140 匚块$(br)$(thing)åŊ†åšĶ$(): 25%$(br)$(thing)įąŧ型$(): å›Ēį°‡įŠķįŸŋ脉$(br)$(thing)Y 坐标$(): 80 — 180$(br)$(thing)å°šåŊļ$(): 45$(br)$(thing)指įĪšå™Ļ最åĪ§æ·ąåšĶ$(): 40$(br2)$(thing)åēĐįŸģįąŧ型$(): æģĨæŋåēĐ, į‡§įŸģ, įŽ„æ­ĶåēĐ, į™―乑åēĐ, į™―åžĐåēĐ, įŸģį°åēĐ, į ūåēĐ, įē—éĒåēĐ, įē˜åœŸåēĐ, įšĒ花åē—åēĐ, 花åē—åēĐ, 英åŪ‰åēĐ, čū‰é•ŋåēĐ, 闩é•ŋåēĐ, éĄĩåēĐ", + "text": "$(thing)įĻ€æœ‰åšĶ$(): 1/140 匚块$(br)$(thing)åŊ†åšĶ$(): 25%$(br)$(thing)įąŧ型$(): å›Ēį°‡įŠķįŸŋ脉$(br)$(thing)Y 坐标$(): 80 — 180$(br)$(thing)å°šåŊļ$(): 45$(br)$(thing)指įĪšå™Ļ最åĪ§æ·ąåšĶ$(): 40$(br2)$(thing)åēĐįŸģįąŧ型$(): æģĨæŋåēĐ, į‡§įŸģ, įŽ„æ­ĶåēĐ, į™―乑åēĐ, į™―åžĐåēĐ, įŸģį°åēĐ, įŸģ英åēĐ, į ūåēĐ, įē—éĒåēĐ, įē˜åœŸåēĐ, įšĒ花åē—åēĐ, 花åē—åēĐ, 英åŪ‰åēĐ, čū‰é•ŋåēĐ, 闩é•ŋåēĐ, éĄĩåēĐ", "title": "éŧé“œįŸŋ (地čĄĻ)", "type": "patchouli:text", "anchor": "mars_surface_tetrahedrite" @@ -2418,7 +2418,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)įĻ€æœ‰åšĶ$(): 1/210 匚块$(br)$(thing)åŊ†åšĶ$(): 40%$(br)$(thing)įąŧ型$(): å›Ēį°‡įŠķįŸŋ脉$(br)$(thing)Y 坐标$(): 0 — 70$(br)$(thing)å°šåŊļ$(): 40$(br)$(thing)指įĪšå™Ļ最åĪ§æ·ąåšĶ$(): 40$(br2)$(thing)åēĐįŸģįąŧ型$(): æģĨæŋåēĐ, į‡§įŸģ, įŽ„æ­ĶåēĐ, į™―乑åēĐ, į™―åžĐåēĐ, įē—éĒåēĐ, įšĒ花åē—åēĐ, 英åŪ‰åēĐ, čū‰é•ŋåēĐ, 闩é•ŋåēĐ, éĄĩåēĐ", + "text": "$(thing)įĻ€æœ‰åšĶ$(): 1/210 匚块$(br)$(thing)åŊ†åšĶ$(): 40%$(br)$(thing)įąŧ型$(): å›Ēį°‡įŠķįŸŋ脉$(br)$(thing)Y 坐标$(): 0 — 70$(br)$(thing)å°šåŊļ$(): 40$(br)$(thing)指įĪšå™Ļ最åĪ§æ·ąåšĶ$(): 40$(br2)$(thing)åēĐįŸģįąŧ型$(): æģĨæŋåēĐ, į‡§įŸģ, įŽ„æ­ĶåēĐ, į™―乑åēĐ, į™―åžĐåēĐ, įŸģ英åēĐ, įē—éĒåēĐ, įšĒ花åē—åēĐ, 英åŪ‰åēĐ, čū‰é•ŋåēĐ, 闩é•ŋåēĐ, éĄĩåēĐ", "title": "éŧé“œįŸŋ (æ™Ū通)", "type": "patchouli:text", "anchor": "mars_stibnite" diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/tfg_ores/nether_vein_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/tfg_ores/nether_vein_index.json index 77704041c..9b70891e2 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/tfg_ores/nether_vein_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/tfg_ores/nether_vein_index.json @@ -1385,7 +1385,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)įĻ€æœ‰åšĶ$(): 1/250 匚块$(br)$(thing)åŊ†åšĶ$(): 45%$(br)$(thing)įąŧ型$(): įŪĄįŠķįŸŋ脉$(br)$(thing)Y 坐标$(): 32 — 128$(br)$(thing)éŦ˜åšĶ$(): 60$(br)$(thing)半åū„$(): 12$(br2)$(thing)åēĐįŸģįąŧ型$(): 混合åēĐ, įŽ„æ­ĶåēĐ, įŸģį°åŽ, čū‰įŸģåēĐ", + "text": "$(thing)įĻ€æœ‰åšĶ$(): 1/300 匚块$(br)$(thing)åŊ†åšĶ$(): 45%$(br)$(thing)įąŧ型$(): įŪĄįŠķįŸŋ脉$(br)$(thing)Y 坐标$(): 32 — 128$(br)$(thing)éŦ˜åšĶ$(): 60$(br)$(thing)半åū„$(): 12$(br2)$(thing)åēĐįŸģįąŧ型$(): 混合åēĐ, įŽ„æ­ĶåēĐ, įŸģį°åŽ, čū‰įŸģåēĐ", "title": "įŧŋåŪįŸģ, 铍įŸŋ", "type": "patchouli:text", "anchor": "nether_beryllium" diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/tfg_ores/venus_vein_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/tfg_ores/venus_vein_index.json index c7df0df3f..eb801f189 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/tfg_ores/venus_vein_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/tfg_ores/venus_vein_index.json @@ -19,7 +19,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)įĻ€æœ‰åšĶ$(): 1/30 匚块$(br)$(thing)åŊ†åšĶ$(): 20%$(br)$(thing)įąŧ型$(): į›˜įŠķįŸŋ脉$(br)$(thing)Y 坐标$(): 40 — 65$(br)$(thing)å°šåŊļ$(): 20$(br)$(thing)éŦ˜åšĶ$(): 6$(br)$(thing)指įĪšå™Ļ最åĪ§æ·ąåšĶ$(): 30$(br2)$(thing)åēĐįŸģįąŧ型$(): åŪ‰åąąåēĐ, æĩįšđåēĐ, įŽ„æ­ĶåēĐ, įŸģį°åŽ, įē—éĒåēĐ, 英åŪ‰åēĐ", + "text": "$(thing)įĻ€æœ‰åšĶ$(): 1/30 匚块$(br)$(thing)åŊ†åšĶ$(): 20%$(br)$(thing)įąŧ型$(): į›˜įŠķįŸŋ脉$(br)$(thing)Y 坐标$(): 40 — 65$(br)$(thing)å°šåŊļ$(): 20$(br)$(thing)éŦ˜åšĶ$(): 6$(br)$(thing)指įĪšå™Ļ最åĪ§æ·ąåšĶ$(): 30$(br2)$(thing)åēĐįŸģįąŧ型$(): åĪĐį„ķį…Œæ–‘åēĐ, åĪĐį„ķį†”į°åēĐ, åŪ‰åąąåēĐ, æĩįšđåēĐ, įŽ„æ­ĶåēĐ, įŸģį°åŽ, įē—éĒåēĐ, 英åŪ‰åēĐ", "title": "į›, 锂čū‰įŸģ", "type": "patchouli:text", "anchor": "venus_manual_salt" @@ -111,7 +111,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)įĻ€æœ‰åšĶ$(): 1/30 匚块$(br)$(thing)åŊ†åšĶ$(): 20%$(br)$(thing)įąŧ型$(): å›Ēį°‡įŠķįŸŋ脉$(br)$(thing)Y 坐标$(): 40 — 65$(br)$(thing)å°šåŊļ$(): 20$(br)$(thing)指įĪšå™Ļ最åĪ§æ·ąåšĶ$(): 30$(br2)$(thing)åēĐįŸģįąŧ型$(): åŪ‰åąąåēĐ, æĩįšđåēĐ, įŽ„æ­ĶåēĐ, įŸģį°åŽ, įē—éĒåēĐ, 英åŪ‰åēĐ", + "text": "$(thing)įĻ€æœ‰åšĶ$(): 1/30 匚块$(br)$(thing)åŊ†åšĶ$(): 20%$(br)$(thing)įąŧ型$(): å›Ēį°‡įŠķįŸŋ脉$(br)$(thing)Y 坐标$(): 40 — 65$(br)$(thing)å°šåŊļ$(): 20$(br)$(thing)指įĪšå™Ļ最åĪ§æ·ąåšĶ$(): 30$(br2)$(thing)åēĐįŸģįąŧ型$(): åĪĐį„ķį…Œæ–‘åēĐ, åĪĐį„ķį†”į°åēĐ, åŪ‰åąąåēĐ, æĩįšđåēĐ, įŽ„æ­ĶåēĐ, įŸģį°åŽ, įē—éĒåēĐ, 英åŪ‰åēĐ", "title": "įĄŦ, éŧ„铁įŸŋ", "type": "patchouli:text", "anchor": "venus_manual_sulfur" diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/the_world/wild_crops.json b/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/the_world/wild_crops.json new file mode 100644 index 000000000..5fcfe90ac --- /dev/null +++ b/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/the_world/wild_crops.json @@ -0,0 +1,661 @@ +{ + "name": "野į”Ÿä―œį‰Đ", + "category": "tfc:the_world", + "icon": "tfc:textures/gui/book/icons/wild_crops.png", + "pages": [ + { + "type": "patchouli:text", + "text": "$(thing)野į”Ÿä―œį‰Đ$()åŊäŧĨåœĻäļ–į•Œå„地é›ķ星æ‰ū到åŪƒäŧŽäŧĨ小į‰‡įš„å―Ē垏į”Ÿé•ŋ。æ”ķ获åŪƒäŧŽåŊäŧĨåū—到éĢŸį‰Đ和į§å­ïžŒčŋ™äš›į§å­éšåŽåŊäŧĨ臩行åŸđč‚ē成非野į”Ÿįš„å―Ē态。$(br2)ä― åŊäŧĨåū’æ‰‹ïžŒæˆ–č€…ä―ŋį”Ļ$(thing)小刀$()和å…ķäŧ–锋åˆĐå·Ĩ具æĨæ”ķ获野į”Ÿä―œį‰Đ。į ī坏æ—ķåŪƒäŧŽäžšæŽ‰č―$(thing)į§å­$()和äļ€äš›$(thing)䚧į‰Đ$()。" + }, + { + "type": "patchouli:multiblock", + "multiblock": { + "pattern": [ + [ + "X" + ], + [ + "0" + ] + ], + "mapping": { + "X": "tfc:wild_crop/wheat[mature=true]" + } + }, + "name": "野į”Ÿå°éšĶ", + "text": "äū‹åĶ‚$(l:mechanics/crops#wheat)小éšĶ$()å°ąæ˜Ŋäļ€į§é‡Žį”Ÿä―œį‰Đ。", + "enable_visualize": false + }, + { + "type": "patchouli:text", + "text": "æŊäļ€į§åŊäŧĨåŸđč‚ēįš„$(l:mechanics/crops)ä―œį‰Đ$()äđŸéƒ―čƒ―åœĻ野åĪ–æ‰ū到。野į”Ÿä―œį‰Đįœ‹čĩ·æĨäļŽäššå·ĨåŸđč‚ēįš„同įąŧį›ļäžžïžŒä―†æ›īéšč”―åœ°į”Ÿé•ŋåœĻ草äļ›äļ­ã€‚野į”Ÿä―œį‰Đäŧ…åœĻ六月到十月é—ī成į†Ÿã€‚åœĻå…ķäŧ–月äŧ―åŪƒäŧŽäžšå‘ˆįŽ°æžŊæ­ŧįŠķ态į›ī到äļ‹äļ€äļŠåĪå­Ģ。" + }, + { + "type": "tfc:multimultiblock", + "text": "所有äļåŒå“į§įš„野į”Ÿä―œį‰Đ", + "multiblocks": [ + { + "pattern": [ + [ + "X" + ], + [ + "0" + ] + ], + "mapping": { + "X": "tfc:wild_crop/barley" + } + }, + { + "pattern": [ + [ + "X" + ], + [ + "0" + ] + ], + "mapping": { + "X": "tfc:wild_crop/oat" + } + }, + { + "pattern": [ + [ + "X" + ], + [ + "0" + ] + ], + "mapping": { + "X": "tfc:wild_crop/rye" + } + }, + { + "pattern": [ + [ + "X" + ], + [ + "Y" + ], + [ + "0" + ] + ], + "mapping": { + "X": "tfc:wild_crop/maize[part=top]", + "Y": "tfc:wild_crop/maize[part=bottom]" + } + }, + { + "pattern": [ + [ + "X" + ], + [ + "0" + ] + ], + "mapping": { + "X": "tfc:wild_crop/barley" + } + }, + { + "pattern": [ + [ + "X" + ], + [ + "0" + ] + ], + "mapping": { + "X": "tfc:wild_crop/rice[fluid=water]" + } + }, + { + "pattern": [ + [ + "X" + ], + [ + "0" + ] + ], + "mapping": { + "X": "tfc:wild_crop/beet" + } + }, + { + "pattern": [ + [ + "X" + ], + [ + "0" + ] + ], + "mapping": { + "X": "tfc:wild_crop/cabbage" + } + }, + { + "pattern": [ + [ + "X" + ], + [ + "0" + ] + ], + "mapping": { + "X": "tfc:wild_crop/carrot" + } + }, + { + "pattern": [ + [ + "X" + ], + [ + "0" + ] + ], + "mapping": { + "X": "tfc:wild_crop/garlic" + } + }, + { + "pattern": [ + [ + "X" + ], + [ + "Y" + ], + [ + "0" + ] + ], + "mapping": { + "X": "tfc:wild_crop/green_bean[part=top]", + "Y": "tfc:wild_crop/green_bean[part=bottom]" + } + }, + { + "pattern": [ + [ + "X" + ], + [ + "0" + ] + ], + "mapping": { + "X": "tfc:wild_crop/potato" + } + }, + { + "pattern": [ + [ + "X" + ], + [ + "0" + ] + ], + "mapping": { + "X": "tfc:wild_crop/onion" + } + }, + { + "pattern": [ + [ + "X" + ], + [ + "0" + ] + ], + "mapping": { + "X": "tfc:wild_crop/soybean" + } + }, + { + "pattern": [ + [ + "X" + ], + [ + "0" + ] + ], + "mapping": { + "X": "tfc:wild_crop/squash" + } + }, + { + "pattern": [ + [ + "X" + ], + [ + "Y" + ], + [ + "0" + ] + ], + "mapping": { + "X": "tfc:wild_crop/sugarcane[part=top]", + "Y": "tfc:wild_crop/sugarcane[part=bottom]" + } + }, + { + "pattern": [ + [ + "X" + ], + [ + "Y" + ], + [ + "0" + ] + ], + "mapping": { + "X": "tfc:wild_crop/tomato[part=top]", + "Y": "tfc:wild_crop/tomato[part=bottom]" + } + }, + { + "pattern": [ + [ + "X" + ], + [ + "Y" + ], + [ + "0" + ] + ], + "mapping": { + "X": "tfc:wild_crop/jute[part=top]", + "Y": "tfc:wild_crop/jute[part=bottom]" + } + }, + { + "pattern": [ + [ + "X" + ], + [ + "0" + ] + ], + "mapping": { + "X": "tfc:wild_crop/pumpkin" + } + }, + { + "pattern": [ + [ + "X" + ], + [ + "0" + ] + ], + "mapping": { + "X": "tfc:wild_crop/melon" + } + } + ] + }, + { + "type": "patchouli:text", + "text": "野į”Ÿä―œį‰Đ侚åœĻæŽĨčŋ‘å…ķåŊåŸđč‚ē气候įš„匚域į”ŸæˆïžŒå› æ­ĪåĶ‚æžœä― åœĻåŊŧæ‰ūį‰đåŪšä―œį‰ĐčŊ·åˆ°čŊĨä―œį‰ĐåŊäŧĨį”Ÿé•ŋįš„气候匚åŊŧæ‰ū。į„ķč€ŒïžŒäļŽįŽĐåŪķį§æĪįš„$(l:mechanics/crops)ä―œį‰Đ$()äļåŒïžŒé‡Žį”Ÿä―œį‰Đäļéœ€čĶ$(l:mechanics/hydration)æ°ī分$()。į›ļ反åŪƒäŧŽįš„分åļƒå–å†ģ䚎čŊĨ地匚įš„åđģ均$()æļĐåšĶ$()和$()降é›Ļ量$()。", + "title": "åŊŧæ‰ū野į”Ÿä―œį‰Đ" + }, + { + "type": "patchouli:text", + "text": "æŽĨäļ‹æĨįš„éĄĩéĒåą•įĪšäš†åŊæ‰ū到野į”Ÿä―œį‰Đįš„į”Ÿé•ŋįŽŊåĒƒåŊđį…§čĄĻ。" + }, + { + "type": "tfc:table", + "strings": [ + { + "text": "ä―œį‰Đ", + "bold": true + }, + { + "text": "æļĐåšĶ°C", + "bold": true + }, + { + "text": "降é›Ļ量æŊŦįąģ", + "bold": true + }, + { + "text": "åĪ§éšĶ" + }, + { + "text": " -8 - 26" + }, + { + "text": " 70 - 310" + }, + { + "text": "į‡•éšĶ" + }, + { + "text": " 3 - 40" + }, + { + "text": "140 - 400" + }, + { + "text": "éŧ‘éšĶ" + }, + { + "text": "-11 - 30" + }, + { + "text": "100 - 350" + }, + { + "text": "įŽ‰įąģ" + }, + { + "text": " 13 - 40" + }, + { + "text": "300 - 500" + }, + { + "text": "小éšĶ" + }, + { + "text": " -4 - 35" + }, + { + "text": "100 - 400" + }, + { + "text": "æ°īįĻŧ" + }, + { + "text": " 15 - 30" + }, + { + "text": "100 - 500" + }, + { + "text": "į”œčœ" + }, + { + "text": " -5 - 20" + }, + { + "text": " 70 - 300" + }, + { + "text": "卷åŋƒčœ" + }, + { + "text": "-10 - 27" + }, + { + "text": " 60 - 280" + }, + { + "text": "čƒĄčåœ" + }, + { + "text": " 3 - 30" + }, + { + "text": "100 - 400" + }, + { + "text": "åĪ§č’œ" + }, + { + "text": "-20 - 18" + }, + { + "text": " 60 - 310" + }, + { + "text": "四å­Ģ豆" + }, + { + "text": " 2 - 35" + }, + { + "text": "150 - 410" + }, + { + "text": "čĨŋį“œ" + }, + { + "text": " 5 - 37" + }, + { + "text": "200 - 500" + } + ], + "text": "", + "title": "野į”Ÿä―œį‰Đéœ€æą‚", + "legend": [], + "columns": 2, + "first_column_width": 80, + "column_width": 70, + "row_height": 10, + "left_buffer": 2, + "top_buffer": 12, + "draw_background": false + }, + { + "type": "patchouli:empty", + "draw_filler": false + }, + { + "type": "tfc:table", + "strings": [ + { + "text": "ä―œį‰Đ", + "bold": true + }, + { + "text": "æļĐåšĶ°C", + "bold": true + }, + { + "text": "降é›Ļ量æŊŦįąģ", + "bold": true + }, + { + "text": "éЮ铃č–Ŋ" + }, + { + "text": " -1 - 37" + }, + { + "text": "200 - 410" + }, + { + "text": "南į“œ" + }, + { + "text": " 0 - 30" + }, + { + "text": "120 - 390" + }, + { + "text": "æī‹č‘ą" + }, + { + "text": " 0 - 30" + }, + { + "text": "100 - 390" + }, + { + "text": "åĪ§čą†" + }, + { + "text": " 8 - 30" + }, + { + "text": "160 - 410" + }, + { + "text": "čĨŋč‘ŦčŠĶ" + }, + { + "text": " 5 - 33" + }, + { + "text": " 90 - 390" + }, + { + "text": "į”˜č”—" + }, + { + "text": " 12 - 38" + }, + { + "text": "160 - 500" + }, + { + "text": "į•ŠčŒ„" + }, + { + "text": " 0 - 36" + }, + { + "text": "120 - 390" + }, + { + "text": "éŧ„éšŧ" + }, + { + "text": " 5 - 37" + }, + { + "text": "100 - 410" + }, + { + "text": "įšļ莎草" + }, + { + "text": " 19 - 37" + }, + { + "text": "310 - 500" + }, + { + "text": "įšĒį”œæĪ’" + }, + { + "text": " 16 - 30" + }, + { + "text": "190 - 400" + }, + { + "text": "éŧ„į”œæĪ’" + }, + { + "text": " 16 - 30" + }, + { + "text": "190 - 400" + }, + { + "text": "向æ—Ĩč‘ĩ" + }, + { + "text": " 5 - 40" + }, + { + "text": "100 - 450" + } + ], + "text": "", + "title": "野į”Ÿä―œį‰Đéœ€æą‚", + "legend": [], + "columns": 2, + "first_column_width": 80, + "column_width": 70, + "row_height": 10, + "left_buffer": 2, + "top_buffer": 12, + "draw_background": false + }, + { + "type": "patchouli:empty", + "draw_filler": false + }, + { + "type": "tfc:table", + "strings": [ + { + "text": "ä―œį‰Đ", + "bold": true + }, + { + "text": "æļĐåšĶ°C", + "bold": true + }, + { + "text": "降é›Ļ量æŊŦįąģ", + "bold": true + }, + { + "text": "æēđ菜" + }, + { + "text": " -5 - 25" + }, + { + "text": " 50 - 350" + }, + { + "text": "乚éšŧ" + }, + { + "text": " -8 - 25" + }, + { + "text": "175 - 475" + } + ], + "text": "", + "title": "野į”Ÿä―œį‰Đéœ€æą‚", + "legend": [], + "columns": 2, + "first_column_width": 80, + "column_width": 70, + "row_height": 10, + "left_buffer": 2, + "top_buffer": 12, + "draw_background": false + }, + { + "type": "patchouli:empty", + "draw_filler": false + } + ], + "read_by_default": true, + "sortnum": 4, + "extra_recipe_mappings": { + "tag:tfc:wild_crops": 0 + } +} \ No newline at end of file diff --git a/kubejs/assets/tfc/textures/block/berry_bush/blackberry_bush.png b/kubejs/assets/tfc/textures/block/berry_bush/blackberry_bush.png new file mode 100644 index 000000000..5b463414e Binary files /dev/null and b/kubejs/assets/tfc/textures/block/berry_bush/blackberry_bush.png differ diff --git a/kubejs/assets/tfc/textures/block/berry_bush/blackberry_cane.png b/kubejs/assets/tfc/textures/block/berry_bush/blackberry_cane.png new file mode 100644 index 000000000..9ae2dc67c Binary files /dev/null and b/kubejs/assets/tfc/textures/block/berry_bush/blackberry_cane.png differ diff --git a/kubejs/assets/tfc/textures/block/berry_bush/blueberry_bush.png b/kubejs/assets/tfc/textures/block/berry_bush/blueberry_bush.png new file mode 100644 index 000000000..93b4c6cf2 Binary files /dev/null and b/kubejs/assets/tfc/textures/block/berry_bush/blueberry_bush.png differ diff --git a/kubejs/assets/tfc/textures/block/berry_bush/blueberry_cane.png b/kubejs/assets/tfc/textures/block/berry_bush/blueberry_cane.png new file mode 100644 index 000000000..439bb0312 Binary files /dev/null and b/kubejs/assets/tfc/textures/block/berry_bush/blueberry_cane.png differ diff --git a/kubejs/assets/tfc/textures/block/berry_bush/bunchberry_bush.png b/kubejs/assets/tfc/textures/block/berry_bush/bunchberry_bush.png new file mode 100644 index 000000000..6c108ae5e Binary files /dev/null and b/kubejs/assets/tfc/textures/block/berry_bush/bunchberry_bush.png differ diff --git a/kubejs/assets/tfc/textures/block/berry_bush/cloudberry_bush.png b/kubejs/assets/tfc/textures/block/berry_bush/cloudberry_bush.png new file mode 100644 index 000000000..4838da0cb Binary files /dev/null and b/kubejs/assets/tfc/textures/block/berry_bush/cloudberry_bush.png differ diff --git a/kubejs/assets/tfc/textures/block/berry_bush/cranberry_bush.png b/kubejs/assets/tfc/textures/block/berry_bush/cranberry_bush.png new file mode 100644 index 000000000..6e4f8ec7a Binary files /dev/null and b/kubejs/assets/tfc/textures/block/berry_bush/cranberry_bush.png differ diff --git a/kubejs/assets/tfc/textures/block/berry_bush/dead_bush.png b/kubejs/assets/tfc/textures/block/berry_bush/dead_bush.png new file mode 100644 index 000000000..fb65029d4 Binary files /dev/null and b/kubejs/assets/tfc/textures/block/berry_bush/dead_bush.png differ diff --git a/kubejs/assets/tfc/textures/block/berry_bush/dead_cane.png b/kubejs/assets/tfc/textures/block/berry_bush/dead_cane.png new file mode 100644 index 000000000..4b6ce7252 Binary files /dev/null and b/kubejs/assets/tfc/textures/block/berry_bush/dead_cane.png differ diff --git a/kubejs/assets/tfc/textures/block/berry_bush/dry_blackberry_bush.png b/kubejs/assets/tfc/textures/block/berry_bush/dry_blackberry_bush.png new file mode 100644 index 000000000..02181a839 Binary files /dev/null and b/kubejs/assets/tfc/textures/block/berry_bush/dry_blackberry_bush.png differ diff --git a/kubejs/assets/tfc/textures/block/berry_bush/dry_blackberry_cane.png b/kubejs/assets/tfc/textures/block/berry_bush/dry_blackberry_cane.png new file mode 100644 index 000000000..770575cac Binary files /dev/null and b/kubejs/assets/tfc/textures/block/berry_bush/dry_blackberry_cane.png differ diff --git a/kubejs/assets/tfc/textures/block/berry_bush/dry_blueberry_bush.png b/kubejs/assets/tfc/textures/block/berry_bush/dry_blueberry_bush.png new file mode 100644 index 000000000..dcf61757f Binary files /dev/null and b/kubejs/assets/tfc/textures/block/berry_bush/dry_blueberry_bush.png differ diff --git a/kubejs/assets/tfc/textures/block/berry_bush/dry_blueberry_cane.png b/kubejs/assets/tfc/textures/block/berry_bush/dry_blueberry_cane.png new file mode 100644 index 000000000..0ba5c70b7 Binary files /dev/null and b/kubejs/assets/tfc/textures/block/berry_bush/dry_blueberry_cane.png differ diff --git a/kubejs/assets/tfc/textures/block/berry_bush/dry_bunchberry_bush.png b/kubejs/assets/tfc/textures/block/berry_bush/dry_bunchberry_bush.png new file mode 100644 index 000000000..73a4e145d Binary files /dev/null and b/kubejs/assets/tfc/textures/block/berry_bush/dry_bunchberry_bush.png differ diff --git a/kubejs/assets/tfc/textures/block/berry_bush/dry_cloudberry_bush.png b/kubejs/assets/tfc/textures/block/berry_bush/dry_cloudberry_bush.png new file mode 100644 index 000000000..7a940035e Binary files /dev/null and b/kubejs/assets/tfc/textures/block/berry_bush/dry_cloudberry_bush.png differ diff --git a/kubejs/assets/tfc/textures/block/berry_bush/dry_cranberry_bush.png b/kubejs/assets/tfc/textures/block/berry_bush/dry_cranberry_bush.png new file mode 100644 index 000000000..09a4d20e5 Binary files /dev/null and b/kubejs/assets/tfc/textures/block/berry_bush/dry_cranberry_bush.png differ diff --git a/kubejs/assets/tfc/textures/block/berry_bush/dry_elderberry_bush.png b/kubejs/assets/tfc/textures/block/berry_bush/dry_elderberry_bush.png new file mode 100644 index 000000000..660dc7eae Binary files /dev/null and b/kubejs/assets/tfc/textures/block/berry_bush/dry_elderberry_bush.png differ diff --git a/kubejs/assets/tfc/textures/block/berry_bush/dry_elderberry_cane.png b/kubejs/assets/tfc/textures/block/berry_bush/dry_elderberry_cane.png new file mode 100644 index 000000000..c12c2189d Binary files /dev/null and b/kubejs/assets/tfc/textures/block/berry_bush/dry_elderberry_cane.png differ diff --git a/kubejs/assets/tfc/textures/block/berry_bush/dry_gooseberry_bush.png b/kubejs/assets/tfc/textures/block/berry_bush/dry_gooseberry_bush.png new file mode 100644 index 000000000..4f22688c2 Binary files /dev/null and b/kubejs/assets/tfc/textures/block/berry_bush/dry_gooseberry_bush.png differ diff --git a/kubejs/assets/tfc/textures/block/berry_bush/dry_raspberry_bush.png b/kubejs/assets/tfc/textures/block/berry_bush/dry_raspberry_bush.png new file mode 100644 index 000000000..bfcdc65cf Binary files /dev/null and b/kubejs/assets/tfc/textures/block/berry_bush/dry_raspberry_bush.png differ diff --git a/kubejs/assets/tfc/textures/block/berry_bush/dry_raspberry_cane.png b/kubejs/assets/tfc/textures/block/berry_bush/dry_raspberry_cane.png new file mode 100644 index 000000000..2aa30cfe6 Binary files /dev/null and b/kubejs/assets/tfc/textures/block/berry_bush/dry_raspberry_cane.png differ diff --git a/kubejs/assets/tfc/textures/block/berry_bush/dry_snowberry_bush.png b/kubejs/assets/tfc/textures/block/berry_bush/dry_snowberry_bush.png new file mode 100644 index 000000000..1f2d2dc7a Binary files /dev/null and b/kubejs/assets/tfc/textures/block/berry_bush/dry_snowberry_bush.png differ diff --git a/kubejs/assets/tfc/textures/block/berry_bush/dry_strawberry_bush.png b/kubejs/assets/tfc/textures/block/berry_bush/dry_strawberry_bush.png new file mode 100644 index 000000000..14a3c67da Binary files /dev/null and b/kubejs/assets/tfc/textures/block/berry_bush/dry_strawberry_bush.png differ diff --git a/kubejs/assets/tfc/textures/block/berry_bush/dry_wintergreen_berry_bush.png b/kubejs/assets/tfc/textures/block/berry_bush/dry_wintergreen_berry_bush.png new file mode 100644 index 000000000..dcb482338 Binary files /dev/null and b/kubejs/assets/tfc/textures/block/berry_bush/dry_wintergreen_berry_bush.png differ diff --git a/kubejs/assets/tfc/textures/block/berry_bush/elderberry_bush.png b/kubejs/assets/tfc/textures/block/berry_bush/elderberry_bush.png new file mode 100644 index 000000000..70dda8072 Binary files /dev/null and b/kubejs/assets/tfc/textures/block/berry_bush/elderberry_bush.png differ diff --git a/kubejs/assets/tfc/textures/block/berry_bush/elderberry_cane.png b/kubejs/assets/tfc/textures/block/berry_bush/elderberry_cane.png new file mode 100644 index 000000000..ed4b55a32 Binary files /dev/null and b/kubejs/assets/tfc/textures/block/berry_bush/elderberry_cane.png differ diff --git a/kubejs/assets/tfc/textures/block/berry_bush/flowering_blackberry_bush.png b/kubejs/assets/tfc/textures/block/berry_bush/flowering_blackberry_bush.png new file mode 100644 index 000000000..766c1bc11 Binary files /dev/null and b/kubejs/assets/tfc/textures/block/berry_bush/flowering_blackberry_bush.png differ diff --git a/kubejs/assets/tfc/textures/block/berry_bush/flowering_blackberry_cane.png b/kubejs/assets/tfc/textures/block/berry_bush/flowering_blackberry_cane.png new file mode 100644 index 000000000..2ce88e414 Binary files /dev/null and b/kubejs/assets/tfc/textures/block/berry_bush/flowering_blackberry_cane.png differ diff --git a/kubejs/assets/tfc/textures/block/berry_bush/flowering_blueberry_bush.png b/kubejs/assets/tfc/textures/block/berry_bush/flowering_blueberry_bush.png new file mode 100644 index 000000000..d2c851bf7 Binary files /dev/null and b/kubejs/assets/tfc/textures/block/berry_bush/flowering_blueberry_bush.png differ diff --git a/kubejs/assets/tfc/textures/block/berry_bush/flowering_blueberry_cane.png b/kubejs/assets/tfc/textures/block/berry_bush/flowering_blueberry_cane.png new file mode 100644 index 000000000..3bf21af2f Binary files /dev/null and b/kubejs/assets/tfc/textures/block/berry_bush/flowering_blueberry_cane.png differ diff --git a/kubejs/assets/tfc/textures/block/berry_bush/flowering_bunchberry_bush.png b/kubejs/assets/tfc/textures/block/berry_bush/flowering_bunchberry_bush.png new file mode 100644 index 000000000..de5fa00b9 Binary files /dev/null and b/kubejs/assets/tfc/textures/block/berry_bush/flowering_bunchberry_bush.png differ diff --git a/kubejs/assets/tfc/textures/block/berry_bush/flowering_cloudberry_bush.png b/kubejs/assets/tfc/textures/block/berry_bush/flowering_cloudberry_bush.png new file mode 100644 index 000000000..bbc5406fb Binary files /dev/null and b/kubejs/assets/tfc/textures/block/berry_bush/flowering_cloudberry_bush.png differ diff --git a/kubejs/assets/tfc/textures/block/berry_bush/flowering_cranberry_bush.png b/kubejs/assets/tfc/textures/block/berry_bush/flowering_cranberry_bush.png new file mode 100644 index 000000000..08dc83666 Binary files /dev/null and b/kubejs/assets/tfc/textures/block/berry_bush/flowering_cranberry_bush.png differ diff --git a/kubejs/assets/tfc/textures/block/berry_bush/flowering_elderberry_bush.png b/kubejs/assets/tfc/textures/block/berry_bush/flowering_elderberry_bush.png new file mode 100644 index 000000000..bbbf91a55 Binary files /dev/null and b/kubejs/assets/tfc/textures/block/berry_bush/flowering_elderberry_bush.png differ diff --git a/kubejs/assets/tfc/textures/block/berry_bush/flowering_elderberry_cane.png b/kubejs/assets/tfc/textures/block/berry_bush/flowering_elderberry_cane.png new file mode 100644 index 000000000..3eea72a37 Binary files /dev/null and b/kubejs/assets/tfc/textures/block/berry_bush/flowering_elderberry_cane.png differ diff --git a/kubejs/assets/tfc/textures/block/berry_bush/flowering_gooseberry_bush.png b/kubejs/assets/tfc/textures/block/berry_bush/flowering_gooseberry_bush.png new file mode 100644 index 000000000..52f9f46ac Binary files /dev/null and b/kubejs/assets/tfc/textures/block/berry_bush/flowering_gooseberry_bush.png differ diff --git a/kubejs/assets/tfc/textures/block/berry_bush/flowering_raspberry_bush.png b/kubejs/assets/tfc/textures/block/berry_bush/flowering_raspberry_bush.png new file mode 100644 index 000000000..01c360273 Binary files /dev/null and b/kubejs/assets/tfc/textures/block/berry_bush/flowering_raspberry_bush.png differ diff --git a/kubejs/assets/tfc/textures/block/berry_bush/flowering_raspberry_cane.png b/kubejs/assets/tfc/textures/block/berry_bush/flowering_raspberry_cane.png new file mode 100644 index 000000000..0ee6342e2 Binary files /dev/null and b/kubejs/assets/tfc/textures/block/berry_bush/flowering_raspberry_cane.png differ diff --git a/kubejs/assets/tfc/textures/block/berry_bush/flowering_snowberry_bush.png b/kubejs/assets/tfc/textures/block/berry_bush/flowering_snowberry_bush.png new file mode 100644 index 000000000..6acb4a34a Binary files /dev/null and b/kubejs/assets/tfc/textures/block/berry_bush/flowering_snowberry_bush.png differ diff --git a/kubejs/assets/tfc/textures/block/berry_bush/flowering_strawberry_bush.png b/kubejs/assets/tfc/textures/block/berry_bush/flowering_strawberry_bush.png new file mode 100644 index 000000000..75eafad0e Binary files /dev/null and b/kubejs/assets/tfc/textures/block/berry_bush/flowering_strawberry_bush.png differ diff --git a/kubejs/assets/tfc/textures/block/berry_bush/flowering_wintergreen_berry_bush.png b/kubejs/assets/tfc/textures/block/berry_bush/flowering_wintergreen_berry_bush.png new file mode 100644 index 000000000..df0c7cb1e Binary files /dev/null and b/kubejs/assets/tfc/textures/block/berry_bush/flowering_wintergreen_berry_bush.png differ diff --git a/kubejs/assets/tfc/textures/block/berry_bush/fruiting_blackberry_bush.png b/kubejs/assets/tfc/textures/block/berry_bush/fruiting_blackberry_bush.png new file mode 100644 index 000000000..470c03f91 Binary files /dev/null and b/kubejs/assets/tfc/textures/block/berry_bush/fruiting_blackberry_bush.png differ diff --git a/kubejs/assets/tfc/textures/block/berry_bush/fruiting_blackberry_cane.png b/kubejs/assets/tfc/textures/block/berry_bush/fruiting_blackberry_cane.png new file mode 100644 index 000000000..66cf6674c Binary files /dev/null and b/kubejs/assets/tfc/textures/block/berry_bush/fruiting_blackberry_cane.png differ diff --git a/kubejs/assets/tfc/textures/block/berry_bush/fruiting_blueberry_bush.png b/kubejs/assets/tfc/textures/block/berry_bush/fruiting_blueberry_bush.png new file mode 100644 index 000000000..bd9913ddb Binary files /dev/null and b/kubejs/assets/tfc/textures/block/berry_bush/fruiting_blueberry_bush.png differ diff --git a/kubejs/assets/tfc/textures/block/berry_bush/fruiting_blueberry_cane.png b/kubejs/assets/tfc/textures/block/berry_bush/fruiting_blueberry_cane.png new file mode 100644 index 000000000..565097b68 Binary files /dev/null and b/kubejs/assets/tfc/textures/block/berry_bush/fruiting_blueberry_cane.png differ diff --git a/kubejs/assets/tfc/textures/block/berry_bush/fruiting_bunchberry_bush.png b/kubejs/assets/tfc/textures/block/berry_bush/fruiting_bunchberry_bush.png new file mode 100644 index 000000000..17b526cbd Binary files /dev/null and b/kubejs/assets/tfc/textures/block/berry_bush/fruiting_bunchberry_bush.png differ diff --git a/kubejs/assets/tfc/textures/block/berry_bush/fruiting_cloudberry_bush.png b/kubejs/assets/tfc/textures/block/berry_bush/fruiting_cloudberry_bush.png new file mode 100644 index 000000000..2ec65e914 Binary files /dev/null and b/kubejs/assets/tfc/textures/block/berry_bush/fruiting_cloudberry_bush.png differ diff --git a/kubejs/assets/tfc/textures/block/berry_bush/fruiting_cranberry_bush.png b/kubejs/assets/tfc/textures/block/berry_bush/fruiting_cranberry_bush.png new file mode 100644 index 000000000..05a9e56b7 Binary files /dev/null and b/kubejs/assets/tfc/textures/block/berry_bush/fruiting_cranberry_bush.png differ diff --git a/kubejs/assets/tfc/textures/block/berry_bush/fruiting_elderberry_bush.png b/kubejs/assets/tfc/textures/block/berry_bush/fruiting_elderberry_bush.png new file mode 100644 index 000000000..870021d23 Binary files /dev/null and b/kubejs/assets/tfc/textures/block/berry_bush/fruiting_elderberry_bush.png differ diff --git a/kubejs/assets/tfc/textures/block/berry_bush/fruiting_elderberry_cane.png b/kubejs/assets/tfc/textures/block/berry_bush/fruiting_elderberry_cane.png new file mode 100644 index 000000000..b01f8559b Binary files /dev/null and b/kubejs/assets/tfc/textures/block/berry_bush/fruiting_elderberry_cane.png differ diff --git a/kubejs/assets/tfc/textures/block/berry_bush/fruiting_gooseberry_bush.png b/kubejs/assets/tfc/textures/block/berry_bush/fruiting_gooseberry_bush.png new file mode 100644 index 000000000..c9258af02 Binary files /dev/null and b/kubejs/assets/tfc/textures/block/berry_bush/fruiting_gooseberry_bush.png differ diff --git a/kubejs/assets/tfc/textures/block/berry_bush/fruiting_raspberry_bush.png b/kubejs/assets/tfc/textures/block/berry_bush/fruiting_raspberry_bush.png new file mode 100644 index 000000000..12f81388a Binary files /dev/null and b/kubejs/assets/tfc/textures/block/berry_bush/fruiting_raspberry_bush.png differ diff --git a/kubejs/assets/tfc/textures/block/berry_bush/fruiting_raspberry_cane.png b/kubejs/assets/tfc/textures/block/berry_bush/fruiting_raspberry_cane.png new file mode 100644 index 000000000..cb466d30f Binary files /dev/null and b/kubejs/assets/tfc/textures/block/berry_bush/fruiting_raspberry_cane.png differ diff --git a/kubejs/assets/tfc/textures/block/berry_bush/fruiting_snowberry_bush.png b/kubejs/assets/tfc/textures/block/berry_bush/fruiting_snowberry_bush.png new file mode 100644 index 000000000..a0fe164de Binary files /dev/null and b/kubejs/assets/tfc/textures/block/berry_bush/fruiting_snowberry_bush.png differ diff --git a/kubejs/assets/tfc/textures/block/berry_bush/fruiting_strawberry_bush.png b/kubejs/assets/tfc/textures/block/berry_bush/fruiting_strawberry_bush.png new file mode 100644 index 000000000..49222cff1 Binary files /dev/null and b/kubejs/assets/tfc/textures/block/berry_bush/fruiting_strawberry_bush.png differ diff --git a/kubejs/assets/tfc/textures/block/berry_bush/fruiting_wintergreen_berry_bush.png b/kubejs/assets/tfc/textures/block/berry_bush/fruiting_wintergreen_berry_bush.png new file mode 100644 index 000000000..0501a7e7a Binary files /dev/null and b/kubejs/assets/tfc/textures/block/berry_bush/fruiting_wintergreen_berry_bush.png differ diff --git a/kubejs/assets/tfc/textures/block/berry_bush/gooseberry_bush.png b/kubejs/assets/tfc/textures/block/berry_bush/gooseberry_bush.png new file mode 100644 index 000000000..17eebb5e5 Binary files /dev/null and b/kubejs/assets/tfc/textures/block/berry_bush/gooseberry_bush.png differ diff --git a/kubejs/assets/tfc/textures/block/berry_bush/raspberry_bush.png b/kubejs/assets/tfc/textures/block/berry_bush/raspberry_bush.png new file mode 100644 index 000000000..cf53806fa Binary files /dev/null and b/kubejs/assets/tfc/textures/block/berry_bush/raspberry_bush.png differ diff --git a/kubejs/assets/tfc/textures/block/berry_bush/raspberry_cane.png b/kubejs/assets/tfc/textures/block/berry_bush/raspberry_cane.png new file mode 100644 index 000000000..c49f9e01f Binary files /dev/null and b/kubejs/assets/tfc/textures/block/berry_bush/raspberry_cane.png differ diff --git a/kubejs/assets/tfc/textures/block/berry_bush/snowberry_bush.png b/kubejs/assets/tfc/textures/block/berry_bush/snowberry_bush.png new file mode 100644 index 000000000..5518d987d Binary files /dev/null and b/kubejs/assets/tfc/textures/block/berry_bush/snowberry_bush.png differ diff --git a/kubejs/assets/tfc/textures/block/berry_bush/strawberry_bush.png b/kubejs/assets/tfc/textures/block/berry_bush/strawberry_bush.png new file mode 100644 index 000000000..a6d7c713a Binary files /dev/null and b/kubejs/assets/tfc/textures/block/berry_bush/strawberry_bush.png differ diff --git a/kubejs/assets/tfc/textures/block/berry_bush/wintergreen_berry_bush.png b/kubejs/assets/tfc/textures/block/berry_bush/wintergreen_berry_bush.png new file mode 100644 index 000000000..0813022a5 Binary files /dev/null and b/kubejs/assets/tfc/textures/block/berry_bush/wintergreen_berry_bush.png differ diff --git a/kubejs/assets/tfc/textures/block/fruit_tree/olive_dry_leaves.png b/kubejs/assets/tfc/textures/block/fruit_tree/olive_dry_leaves.png new file mode 100644 index 000000000..576138159 Binary files /dev/null and b/kubejs/assets/tfc/textures/block/fruit_tree/olive_dry_leaves.png differ diff --git a/kubejs/assets/tfc/textures/block/fruit_tree/olive_flowering_leaves.png b/kubejs/assets/tfc/textures/block/fruit_tree/olive_flowering_leaves.png new file mode 100644 index 000000000..56527bec9 Binary files /dev/null and b/kubejs/assets/tfc/textures/block/fruit_tree/olive_flowering_leaves.png differ diff --git a/kubejs/assets/tfc/textures/block/fruit_tree/olive_fruiting_leaves.png b/kubejs/assets/tfc/textures/block/fruit_tree/olive_fruiting_leaves.png new file mode 100644 index 000000000..383f1071b Binary files /dev/null and b/kubejs/assets/tfc/textures/block/fruit_tree/olive_fruiting_leaves.png differ diff --git a/kubejs/assets/tfc/textures/block/fruit_tree/olive_leaves.png b/kubejs/assets/tfc/textures/block/fruit_tree/olive_leaves.png new file mode 100644 index 000000000..46940bf1d Binary files /dev/null and b/kubejs/assets/tfc/textures/block/fruit_tree/olive_leaves.png differ diff --git a/kubejs/assets/tfc/textures/block/glass/0.png b/kubejs/assets/tfc/textures/block/glass/0.png new file mode 100644 index 000000000..0f3718d84 Binary files /dev/null and b/kubejs/assets/tfc/textures/block/glass/0.png differ diff --git a/kubejs/assets/tfc/textures/block/glass/1.png b/kubejs/assets/tfc/textures/block/glass/1.png new file mode 100644 index 000000000..8358130cb Binary files /dev/null and b/kubejs/assets/tfc/textures/block/glass/1.png differ diff --git a/kubejs/assets/tfc/textures/block/glass/2.png b/kubejs/assets/tfc/textures/block/glass/2.png new file mode 100644 index 000000000..a400a3e43 Binary files /dev/null and b/kubejs/assets/tfc/textures/block/glass/2.png differ diff --git a/kubejs/assets/tfc/textures/block/glass/3.png b/kubejs/assets/tfc/textures/block/glass/3.png new file mode 100644 index 000000000..0c48d92a7 Binary files /dev/null and b/kubejs/assets/tfc/textures/block/glass/3.png differ diff --git a/kubejs/assets/tfc/textures/block/glass/4.png b/kubejs/assets/tfc/textures/block/glass/4.png new file mode 100644 index 000000000..9581000cd Binary files /dev/null and b/kubejs/assets/tfc/textures/block/glass/4.png differ diff --git a/kubejs/assets/tfc/textures/block/glass/5.png b/kubejs/assets/tfc/textures/block/glass/5.png new file mode 100644 index 000000000..8ae40a5d2 Binary files /dev/null and b/kubejs/assets/tfc/textures/block/glass/5.png differ diff --git a/kubejs/assets/tfc/textures/gui/knapping/loose/flavolite.png b/kubejs/assets/tfc/textures/gui/knapping/loose/flavolite.png new file mode 100644 index 000000000..f259025e7 Binary files /dev/null and b/kubejs/assets/tfc/textures/gui/knapping/loose/flavolite.png differ diff --git a/kubejs/assets/tfc/textures/gui/knapping/loose/sandy_jadestone.png b/kubejs/assets/tfc/textures/gui/knapping/loose/sandy_jadestone.png new file mode 100644 index 000000000..256ca2f79 Binary files /dev/null and b/kubejs/assets/tfc/textures/gui/knapping/loose/sandy_jadestone.png differ diff --git a/kubejs/assets/tfc/textures/gui/knapping/loose/scorchia.png b/kubejs/assets/tfc/textures/gui/knapping/loose/scorchia.png new file mode 100644 index 000000000..8d1c9f3b2 Binary files /dev/null and b/kubejs/assets/tfc/textures/gui/knapping/loose/scorchia.png differ diff --git a/kubejs/assets/tfc/textures/gui/knapping/loose/scoria.png b/kubejs/assets/tfc/textures/gui/knapping/loose/scoria.png new file mode 100644 index 000000000..eecc0be2b Binary files /dev/null and b/kubejs/assets/tfc/textures/gui/knapping/loose/scoria.png differ diff --git a/kubejs/assets/tfc/textures/item/blowpipe.png b/kubejs/assets/tfc/textures/item/blowpipe.png new file mode 100644 index 000000000..c62b6f7e3 Binary files /dev/null and b/kubejs/assets/tfc/textures/item/blowpipe.png differ diff --git a/kubejs/assets/tfc/textures/item/blowpipe/0.png b/kubejs/assets/tfc/textures/item/blowpipe/0.png new file mode 100644 index 000000000..52bd4f589 Binary files /dev/null and b/kubejs/assets/tfc/textures/item/blowpipe/0.png differ diff --git a/kubejs/assets/tfc/textures/item/blowpipe/1.png b/kubejs/assets/tfc/textures/item/blowpipe/1.png new file mode 100644 index 000000000..ac5261fc4 Binary files /dev/null and b/kubejs/assets/tfc/textures/item/blowpipe/1.png differ diff --git a/kubejs/assets/tfc/textures/item/blowpipe/2.png b/kubejs/assets/tfc/textures/item/blowpipe/2.png new file mode 100644 index 000000000..99c263fe3 Binary files /dev/null and b/kubejs/assets/tfc/textures/item/blowpipe/2.png differ diff --git a/kubejs/assets/tfc/textures/item/blowpipe/3.png b/kubejs/assets/tfc/textures/item/blowpipe/3.png new file mode 100644 index 000000000..aab255532 Binary files /dev/null and b/kubejs/assets/tfc/textures/item/blowpipe/3.png differ diff --git a/kubejs/assets/tfc/textures/item/blowpipe/4.png b/kubejs/assets/tfc/textures/item/blowpipe/4.png new file mode 100644 index 000000000..464e4cb06 Binary files /dev/null and b/kubejs/assets/tfc/textures/item/blowpipe/4.png differ diff --git a/kubejs/assets/tfc/textures/item/blowpipe/5.png b/kubejs/assets/tfc/textures/item/blowpipe/5.png new file mode 100644 index 000000000..9738f9c9d Binary files /dev/null and b/kubejs/assets/tfc/textures/item/blowpipe/5.png differ diff --git a/kubejs/assets/tfc/textures/item/blowpipe/blowpipe.png b/kubejs/assets/tfc/textures/item/blowpipe/blowpipe.png new file mode 100644 index 000000000..96b44ad03 Binary files /dev/null and b/kubejs/assets/tfc/textures/item/blowpipe/blowpipe.png differ diff --git a/kubejs/assets/tfc/textures/item/blowpipe/ceramic_blowpipe.png b/kubejs/assets/tfc/textures/item/blowpipe/ceramic_blowpipe.png new file mode 100644 index 000000000..892b5d5c4 Binary files /dev/null and b/kubejs/assets/tfc/textures/item/blowpipe/ceramic_blowpipe.png differ diff --git a/kubejs/assets/tfc/textures/item/blowpipe_with_glass.png b/kubejs/assets/tfc/textures/item/blowpipe_with_glass.png new file mode 100644 index 000000000..750a15421 Binary files /dev/null and b/kubejs/assets/tfc/textures/item/blowpipe_with_glass.png differ diff --git a/kubejs/assets/tfc/textures/item/blowpipe_with_glass_hot.png b/kubejs/assets/tfc/textures/item/blowpipe_with_glass_hot.png new file mode 100644 index 000000000..de27c62a7 Binary files /dev/null and b/kubejs/assets/tfc/textures/item/blowpipe_with_glass_hot.png differ diff --git a/kubejs/assets/tfc/textures/item/ceramic_blowpipe.png b/kubejs/assets/tfc/textures/item/ceramic_blowpipe.png new file mode 100644 index 000000000..3404fc194 Binary files /dev/null and b/kubejs/assets/tfc/textures/item/ceramic_blowpipe.png differ diff --git a/kubejs/assets/tfc/textures/item/ceramic_blowpipe_with_glass.png b/kubejs/assets/tfc/textures/item/ceramic_blowpipe_with_glass.png new file mode 100644 index 000000000..cdfbc61f4 Binary files /dev/null and b/kubejs/assets/tfc/textures/item/ceramic_blowpipe_with_glass.png differ diff --git a/kubejs/assets/tfc/textures/item/ceramic_blowpipe_with_glass_hot.png b/kubejs/assets/tfc/textures/item/ceramic_blowpipe_with_glass_hot.png new file mode 100644 index 000000000..23f928f74 Binary files /dev/null and b/kubejs/assets/tfc/textures/item/ceramic_blowpipe_with_glass_hot.png differ diff --git a/kubejs/assets/tfcagedalcohol/lang/ru_ru.json b/kubejs/assets/tfcagedalcohol/lang/ru_ru.json new file mode 100644 index 000000000..92282b34c --- /dev/null +++ b/kubejs/assets/tfcagedalcohol/lang/ru_ru.json @@ -0,0 +1,7 @@ +{ + "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.", + "block.tfcagedalcohol.fluid.aged_mead": "ВŅ‹ÐīÐĩŅ€ÐķÐ°Ð―Ð―Ð°Ņ ОÐĩÐīÐūÐēŅƒŅ…а", + "item.tfcagedalcohol.bucket.aged_mead": "ВÐĩÐīŅ€Ðū Ņ ÐēŅ‹ÐīÐĩŅ€ÐķÐ°Ð―Ð―ÐūÐđ ОÐĩÐīÐūÐēŅƒŅ…ÐūÐđ", + "fluid.tfcagedalcohol.aged_mead": "ВŅ‹ÐīÐĩŅ€ÐķÐ°Ð―Ð―Ð°Ņ ОÐĩÐīÐūÐēŅƒŅ…а", + "tfc.recipe.barrel.tfcagedalcohol.barrel.aged_mead": "ВŅ‹ÐīÐĩŅ€ÐķКа ОÐĩÐīÐūÐēŅƒŅ…Ðļ" +} \ No newline at end of file diff --git a/kubejs/assets/tfchotornot/lang/zh_cn.json b/kubejs/assets/tfchotornot/lang/zh_cn.json index b88627358..2be883ffd 100644 --- a/kubejs/assets/tfchotornot/lang/zh_cn.json +++ b/kubejs/assets/tfchotornot/lang/zh_cn.json @@ -3,8 +3,8 @@ "tfchotornot.creative_tab.tfchotornot": "įūĪåģĶäž čŊī冷įƒ­č‡ŠįŸĨ", "tooltip.tfchotornot.insulating_items": "ä―Đæˆī䚎å‰Ŋ手åŊéŋ免čīŸéĒ效果", "tooltip.tfchotornot.toohot": "åĪŠįƒŦ䚆无æģ•æŽĨč§Ķ!", - "tooltip.tfchotornot.toocold": "åĪŠå†·äš†ïžŒäļčƒ―åĪ„į†!", - "tooltip.tfchotornot.toolight": "åĪŠäšŪ䚆äļčƒ―åĪ„į†!", + "tooltip.tfchotornot.toocold": "åĪŠå†·äš†ïžŒæ— æģ•æŽĨč§Ķ!", + "tooltip.tfchotornot.toolight": "åĪŠč―ŧ䚆无æģ•æŽĨč§Ķ!", "message.tfchotornot.item_getting_hot": "æģĻ意å‰Ŋ手į‰Đ品čŋ‡įƒ­ïž", "item.tfchotornot.mittens": "手åĨ—", "item.tfchotornot.burlap_potholder": "įē—éšŧåļƒéš”įƒ­åžŦ", diff --git a/kubejs/assets/tfg/alloys/weak_blue_steel.json b/kubejs/assets/tfg/alloys/weak_blue_steel.json new file mode 100644 index 000000000..873cd3288 --- /dev/null +++ b/kubejs/assets/tfg/alloys/weak_blue_steel.json @@ -0,0 +1,3 @@ +{ + "derive": true +} \ No newline at end of file diff --git a/kubejs/assets/tfg/alloys/weak_red_steel.json b/kubejs/assets/tfg/alloys/weak_red_steel.json new file mode 100644 index 000000000..873cd3288 --- /dev/null +++ b/kubejs/assets/tfg/alloys/weak_red_steel.json @@ -0,0 +1,3 @@ +{ + "derive": true +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/artisan_table.json b/kubejs/assets/tfg/blockstates/artisan_table.json new file mode 100644 index 000000000..ab7af4fcc --- /dev/null +++ b/kubejs/assets/tfg/blockstates/artisan_table.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "tfg:block/artisan_table", + "y": 90 + }, + "facing=north": { + "model": "tfg:block/artisan_table" + }, + "facing=south": { + "model": "tfg:block/artisan_table", + "y": 180 + }, + "facing=west": { + "model": "tfg:block/artisan_table", + "y": 270 + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/heat_battery_mk1.json b/kubejs/assets/tfg/blockstates/heat_battery_mk1.json new file mode 100644 index 000000000..122553097 --- /dev/null +++ b/kubejs/assets/tfg/blockstates/heat_battery_mk1.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "tfg:block/machines/heat_battery_mk1", + "y": 90 + }, + "facing=north": { + "model": "tfg:block/machines/heat_battery_mk1" + }, + "facing=south": { + "model": "tfg:block/machines/heat_battery_mk1", + "y": 180 + }, + "facing=west": { + "model": "tfg:block/machines/heat_battery_mk1", + "y": 270 + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/uv_smr_fluid_import_hatch.json b/kubejs/assets/tfg/blockstates/uv_smr_fluid_import_hatch.json new file mode 100644 index 000000000..1a0c17c0a --- /dev/null +++ b/kubejs/assets/tfg/blockstates/uv_smr_fluid_import_hatch.json @@ -0,0 +1,28 @@ +{ + "variants": { + "facing=down": { + "model": "tfg:block/machines/ports/uv_smr_fluid_import_hatch", + "x": 90 + }, + "facing=east": { + "model": "tfg:block/machines/ports/uv_smr_fluid_import_hatch", + "y": 90 + }, + "facing=north": { + "model": "tfg:block/machines/ports/uv_smr_fluid_import_hatch" + }, + "facing=south": { + "model": "tfg:block/machines/ports/uv_smr_fluid_import_hatch", + "y": 180 + }, + "facing=up": { + "gtceu:z": 180, + "model": "tfg:block/machines/ports/uv_smr_fluid_import_hatch", + "x": 270 + }, + "facing=west": { + "model": "tfg:block/machines/ports/uv_smr_fluid_import_hatch", + "y": 270 + } + } +} \ 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 3075912c4..bf468e88d 100644 --- a/kubejs/assets/tfg/lang/en_us.json +++ b/kubejs/assets/tfg/lang/en_us.json @@ -803,6 +803,7 @@ "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.uv_smr_fluid_import_hatch": "SMT Input Hatch", "block.tfg.growth_monitor": "Growth Monitor", "block.tfg.sample_rack": "Sample Rack", "block.tfg.casings.machine_casing_sterilizing_pipes": "Sterilizing Pipes", @@ -810,6 +811,13 @@ "block.tfg.impure_moderate_core": "Impure Moderate Core", "block.tfg.moderate_core_frame": "Moderate Core Frame", "block.tfg.impure_moderate_core_frame": "Impure Moderate Core Frame", + "block.tfg.copper_sandy": "Copper-Bound Silica", + "block.tfg.copper_sandy_frame": "Copper-Bound Silica Frame", + "block.tfg.beryllium_sandy": "Beryllium-Bound Silica", + "block.tfg.beryllium_sandy_frame": "Beryllium-Bound Silica Frame", + "block.tfg.heat_battery_mk1": "Heat Battery", + "tfg.block_entity.artisan_table": "Artisan Table", + "block.tfg.artisan_table": "Artisan Table", "fluid.tfg.heavy_ammoniacal_water": "Heavy Ammoniacal Water", "fluid.tfg.semiheavy_ammoniacal_water": "Semiheavy Ammoniacal Water", "fluid.tfg.sulfur_fumes": "Dense Sulfuric Fumes", @@ -1136,11 +1144,24 @@ "item.tfg.clean_dna_syringe": "Clean Syringe", "item.tfg.stainless_steel_needle": "Stainless Steel Needle", "item.tfg.empty_rod": "Empty Fissile Fuel Rod", + "item.tfg.empty_rod_t2": "Empty Beryllium Fissile Fuel Rod", + "item.tfg.empty_rod_t3": "Empty Zirconium Fissile Fuel Rod", "item.tfg.thorium_rod": "Thorium Fuel Rod", + "item.tfg.depleted_thorium_rod": "Depleted Thorium Fuel Rod", "item.tfg.uranium_rod": "Uranium Fuel Rod", + "item.tfg.depleted_uranium_rod": "Depleted Uranium Fuel Rod", "item.tfg.plutonium_rod": "Plutonium Fuel Rod", - "item.tfg.tbu_232_rod": "TBU-232 Fuel Rod", + "item.tfg.depleted_plutonium_rod": "Depleted Plutonium Fuel Rod", + "item.tfg.tbu_232_rod": "Thorium-Uranium Breeder Fuel Rod", + "item.tfg.depleted_tbu_232_rod": "Depleted Thorium-Uranium Breeder Fuel Rod", + "item.tfg.americium_241_rod": "Americium Fuel Rod", + "item.tfg.depleted_americium_241_rod": "Depleted Americium Fuel Rod", + "item.tfg.neptunium_237_rod": "Neptunium Fuel Rod", + "item.tfg.depleted_neptunium_237_rod": "Depleted Neptunium Fuel Rod", + "item.tfg.californium_252_rod": "Californium Fuel Rod", + "item.tfg.depleted_californium_252_rod": "Depleted Californium Fuel Rod", "item.tfg.refrigerant_pellet": "Refrigerant Pellet", + "item.tfg.terrafirmaguard_pa6": "TerraFirmaGuard PA6", "item.tfg.graphite_compound": "Graphite Compound", "item.tfg.raw_graphite_briquette": "Raw Graphite Briquette", "item.tfg.faulty_graphite_briquette": "Faulty Graphite Briquette", @@ -1200,6 +1221,10 @@ "item.tfg.fish_roe": "%s Roe", "item.tfg.rotten_voiding_cover": "Rotten Voiding Cover", "item.tfg.flora_pellets": "Flora Pellets", + "item.tfg.magnesia_refractory_brick_ingot": "Resin-Bonded Magnesia Refractory Brick", + "item.tfg.tier_1_double_rocket": "R-Aluminosteel Two-Person Rocket", + "item.tfg.tier_2_double_rocket": "ASM 4914 Titanium Two-Person Rocket", + "item.tfg.tier_3_double_rocket": "45-Ti Tungstensteel Two-Person Rocket", "material.tfg.latex": "Latex", "material.tfg.vulcanized_latex": "Vulcanized Latex", "material.tfg.fluix": "Fluix", @@ -1274,12 +1299,17 @@ "material.tfg.silica_gel": "Silica Gel", "material.tfg.soaked_silica_gel": "Acetone Soaked Silica Gel", "material.tfg.heavy_water": "Heavy Water", + "material.tfg.warm_water": "Warm 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.raw_rich_brine": "Raw Rich Brine", + "material.tfg.basic_bromine_exhaust": "Basic Bromine Exhaust", + "material.tfg.brominated_iodine_vapor": "Brominated Iodine Vapor", + "material.tfg.hot_iodine_brine": "Hot Iodine Brine", "material.tfg.certus_regolith": "Certus Regolith", "material.tfg.goethe_regolith": "Goethe Regolith", "material.tfg.bright_regolith": "Bright Regolith", @@ -1334,21 +1364,35 @@ "material.tfg.americium_241": "Americium 241", "material.tfg.californium_252": "Californium 252", "material.tfg.neptunium_237": "Neptunium 237", + "material.tfg.tbu_waste": "Thorium-Uranium Breeder Waste", "material.tfg.mixed_radioactive_fluid": "Mixed Radioactive Fluid", "material.tfg.degraded_solvent_stream": "Degraded Solvent Stream", "material.tfg.boron_enriched_coolant": "Boron Enriched Coolant", "material.tfg.hot_boron_enriched_coolant": "Hot Boron Enriched Coolant", "material.tfg.polyalkylene_lubricant": "Polyalkylene Lubricant", "material.tfg.organic_degradation_slurry": "Organic Degradation Slurry", - "material.tfg.gas_fraction": "Gas Fraction", + "material.tfg.gas_fraction": "Solvent Gas Fraction", "material.tfg.isotopic_solvent": "Isotopic Solvent", - "material.tfg.residual_sludge": "Residual Sludge", + "material.tfg.residual_sludge": "Residual Solvent Sludge", "material.tfg.sodium_fluoride": "Sodium Fluoride", "material.tfg.trace_catalyst_salt_e": "Trace Catalyst Salt E", - "material.tfg.copper_trace_catalyst_dust": "Copper Trace Catalyst", + "material.tfg.copper_trace_catalyst": "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.boron_10_hydroxide": "Boron-10 Hydroxide", + "material.tfg.sodium_deuteroxide": "Sodium Deuteroxide", + "material.tfg.boron_thrichloride": "Boron Trichloride", + "material.tfg.enriched_boron_thrichloride": "Enriched Boron Trichloride", + "material.tfg.booster_t3": "NYI", + "material.tfg.radioactive_effluent": "Radioactive Effluent", + "material.tfg.high_grade_isotopic_solvent": "High Grade Isotopic Solvent", + "material.tfg.degraded_high_grade_isotopic_solvent": "Degraded High Grade Isotopic Solvent", + "material.tfg.spent_ticl4_doped_supercritical_co2": "Hot TiCl₄-Doped Supercritical CO₂", + "material.tfg.ticl4_doped_supercritical_co2": "TiCl₄-Doped Supercritical CO₂", + "material.tfg.flibe": "FLiBe", + "material.tfg.dirty_flibe": "Dirty FLiBe", + "material.tfg.hot_flibe": "Hot FLiBe", "material.tfg.glucose": "Glucose", "material.tfg.galactose": "Galactose", "material.tfg.fructose": "Fructose", @@ -1375,6 +1419,14 @@ "material.tfg.chloroplasts": "Chloroplasts", "material.tfg.nitrate_rich_water": "Nitrate Rich Water", "material.tfg.nitrate_rich_semiheavy_ammoniacal_water": "Nitrate Rich Semiheavy Ammoniacal Water", + "material.tfg.weak_red_steel": "Weak Red Steel", + "material.tfg.weak_blue_steel": "Weak Blue Steel", + "material.tfg.refractory_clay": "Refractory Clay", + "material.tfg.bakelite": "Bakelite", + "material.tfg.phenolic_resin": "Phenolic Resin", + "material.tfg.magnesium_hydroxide": "Magnesium Hydroxide", + "material.tfg.magnesia_refractory_brick": "Resin-Bonded Magnesia Refractory Brick", + "material.tfg.nichromium_iodomethylate": "Nichromium Iodomethylate", "ore_vein.tfg.deep_sheldonite": "Cooperite & Bornite", "ore_vein.tfg.deep_garnet_amethyst": "Amethyst & Garnet", "ore_vein.tfg.deep_garnet_opal": "Opal & Garnet", @@ -1387,6 +1439,9 @@ "ore_vein.tfg.deep_sapphire": "Sapphire & Almandine", "ore_vein.tfg.deep_scheelite": "Scheelite & Tungstate", "ore_vein.tfg.deep_topaz": "Topaz & Chalcocite", + "ore_vein.tfg.desert_oilsands": "Desert Oilsands", + "ore_vein.tfg.desert_oilsands.emi.0": "Only in dry climates.", + "ore_vein.tfg.desert_oilsands.emi.1": "Max rainfall: 120mm", "ore_vein.tfg.normal_apatite": "Apatite & Pyrochlore", "ore_vein.tfg.normal_basaltic_sands": "Mineral Sands", "ore_vein.tfg.normal_beryllium": "Emerald & Beryllium", @@ -1556,6 +1611,9 @@ "tfg.tooltip.surfer_variant.brain": "Glacian Hide", "tfg.tooltip.attribution.surfer": "§9§oCredit: Wan's Ancient Beasts", "entity.tfg.rnr_plow": "Paving Cart", + "entity.tfg.tier_1_double_rocket": "R-Aluminosteel Two-Person Rocket", + "entity.tfg.tier_2_double_rocket": "ASM 4914 Titanium Two-Person Rocket", + "entity.tfg.tier_3_double_rocket": "45-Ti Tungstensteel Two-Person Rocket", "effect.tfg.cooling": "§bCooling", "effect.tfg.warming": "§6Warming", "effect.tfg.instant_radiation": "Instant Radiation", @@ -1698,6 +1756,8 @@ "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.polycaprolactam": "Also known as Nylon", + "tfg.tooltip.vessel_warning": "§cHeating an overfilled vessel will void any overflow and may ruin your alloying!§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!", @@ -1735,17 +1795,12 @@ "tfg.tooltip.wireless_card_1": "Enables wireless connections from any range, even from different planets!", "tfg.tooltip.wireless_card_2": "Items can still be transferred through the terminal, but at a very high power cost.", "tfg.tooltip.wireless_card_3": "Use a §dRailgun§r for your interplanetary logistical needs instead.", - "tfg.tooltip.component.blue_ice": "Can be placed inside a Fission Reactor to increase the maximum heat by §90.5§r", - "tfg.tooltip.component.aes_insulation_frame": "Can be placed inside a Fission Reactor to increase the maximum heat by §91§r", - "tfg.tooltip.component.glacian_fur": "Can be placed inside a Fission Reactor to increase the maximum heat by §92§r", - "tfg.tooltip.component.impure_moderate_core_frame": "Can be placed inside a Fission Reactor to increase the maximum heat by §95§r", - "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 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.tooltip.show_recipes": "Show Recipes", + "emi.category.tfg.artisan_table": "Artisan Table", "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", @@ -1777,6 +1832,23 @@ "tfg.gui.cycle_duration": "Cycle duration: ", "tfg.emi.bacon_requirement": "Bacon - The Raw Pork must be smoked first", "tag.item.tfg.dried_fruit": "Dried Fruit", + "tfg.clientmessage.spatialioblocked.claimedchunks": "Spatial IO blocked: Region contains chunks claimed by another team", + "tfg.nuclear.average_heat.text": "Heat: From %s to %s", + "tfg.nuclear.skip": "", + "tfg.machine.aux_exchanger.heat.title": "=== Heat Information ===", + "tfg.machine.aux_exchanger.recipe_temperature": "Recipe Temperature: ", + "tfg.machine.aux_exchanger.recipe_temperature.desc": "Temperature required by this recipe", + "tfg.machine.aux_exchanger.battery_temperature": "Battery Temperature: ", + "tfg.machine.aux_exchanger.battery_temperature.desc": "Current temperature of the heat battery", + "tfg.machine.aux_exchanger.hu_consumed": "HU Consumed: ", + "tfg.machine.aux_exchanger.hu_consumed.desc": "Heat units consumed per recipe cycle", + "tfg.machine.aux_exchanger.total_hu": "Total HU Available: ", + "tfg.machine.aux_exchanger.total_hu.desc": "Total heat units stored in the heat battery", + "tfg.machine.aux_exchanger.speed_modifier": "Speed Modifier: ", + "tfg.machine.aux_exchanger.speed_modifier.desc": "Recipe speed based on battery temperature", + "tfg.machine.aux_exchanger.heat_unavailable": "Heat information unavailable", + "tfg.machine.aux_echanger.output.title": "=== Output ===", + "tfg.multiblock.turbine.obstructed": "Your turbine is obstructed, check under and inside the chimney that there is nothing blocking it", "tfc.jei.flint_knapping": "Flint Knapping", "tfc.jei.straw_knapping": "Straw Knapping", "tfc.recipe.barrel.tfg.barrel.dyeing.decorative_vase.black": "Dyeing", @@ -1904,6 +1976,26 @@ "tfg.grapplemod.downgrades.vertical_throwing_angle": "Decreases the §lVertical Throwing Angle§r of the hook by 5°, down to 0°.", "tfg.grapplemod.upgrades.angle": "Increases the §lHorizontal Angle§r for throwing your §lDouble Hooks§r by 5°, up to 90°.\nOnly accessible with a §lDouble Hook§r installed.", "tfg.grapplemod.downgrades.angle": "Decreases the §lHorizontal Angle§r for throwing your §lDouble Hooks§r by 5°, down to 5°°.\nOnly accessible with a §lDouble Hook§r installed.", + "tfg.tooltip.machine.fission_reactor_mk1_1": "§7The power of the atom§r", + "tfg.tooltip.machine.fission_reactor_mk1_2": "§7Customizable Fission Reactor, add better components, process rods and materials into it and watch out for its temperature.§r", + "tfg.tooltip.machine.smt_1": "§ePower Production:§r From 2048 to 32768 EU/t", + "tfg.tooltip.machine.smt_2": "§7Requires a lubricant to run and can increase power output by using a booster.§r", + "tfg.tooltip.machine.smt_3": "§7Only accept§r SMT Input Hatch §7to input fluids.§r", + "tfg.tooltip.machine.small_fission_reactor_mk1_1": "§7The power of the atom but smaller§r", + "tfg.tooltip.machine.small_fission_reactor_mk1_2": "§7Can only process§r Americium 241 Rod§7 with§r TiCl₄-Doped Supercritical CO₂", + "tfg.tooltip.machine.heat_battery_1": "§7It stores heat§r", + "tfg.tooltip.machine.heat_battery_2": "§7Increase its temperature by inputting hot fluids and use the heat to boil other fluids or run recipes in the OLA.§r", + "tfg.tooltip.machine.heat_battery_3": "§7To transfer Heat to a Ostrum Linear Accelerator, make both§r Heat Port§7 and§r Heat Input Hatch§7 face each other.§r", + "tfg.tooltip.machine.smr_fluid_import_hatch": "§7Can only be used in a Small Modular Turbine§r", + "tfg.tooltip.component.blue_ice": "Can be placed inside a Fission Reactor to increase the maximum heat by §90.5§r", + "tfg.tooltip.component.aes_insulation_frame": "Can be placed inside a Fission Reactor to increase the maximum heat by §91§r", + "tfg.tooltip.component.glacian_fur": "Can be placed inside a Fission Reactor to increase the maximum heat by §92§r", + "tfg.tooltip.component.impure_moderate_core_frame": "Can be placed inside a Fission Reactor to increase the maximum heat by §95§r", + "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.sandy_copper_frame": "Can be placed inside a Heat Battery to increase its storage ability", + "tfg.tooltip.component.sandy_beryllium_frame": "Can be placed inside a Heat Battery to increase its storage ability", "quests.ae2": "Applied Energistics 2", "quests.ae2.subtitle": "The strongest tool to help you with GregTech, unlocked after your first trip to the moon", "quests.ae2.certus_quartz.title": "Certus Quartz", @@ -2142,7 +2234,7 @@ "quests.create_logistics.fabricate_rose_quartz.desc": "Since high-level logistics aren't super necessary for progression, you may also consider leaving the procurement of the Lens up until &bMV&r when you will be able to do it at home. &dRose Quartz&r can be crystallized from its dust form (mixed from 8 parts redstone and 1 part nether quartz) with an &bAdvanced &3Autoclave&r, switching out the usual (distilled) water for &bIce Water&r to simulate natural conditions. Similarly, at &bMV&r tier the &dRose Quartz Lens&r itself can be cut from a &dRose Quartz Plate&r, although it has to be acquired from a full block of Rose Quartz (being a gem plate, it must be processed in a &3Cutter&r).", "quests.create_logistics.rose_quartz_lens.title": "Rose-tinted Glasses", "quests.create_logistics.rose_quartz_lens.subtitle": "YONO (You Only Need One)", - "quests.create_logistics.rose_quartz_lens.desc": "Whichever way you obtained the materials needed, you need a &3Lathe&r to actually create the Lens. A &7Basic &3Lathe&r will be enough to create the lens from an &dExquisite Rose Quartz&r gem, but if you want to make the lens from a mere plate you will need better equipment in the form of an &bAdvanced &3Lathe&r.\n\nOne you've crafted it, the lens can be used in a &7Basic &3Laser Engraver&r &dDouble Red Alloy Plate&r to create the &dTransmitter&r unit we need, and won't be consumed in the process.", + "quests.create_logistics.rose_quartz_lens.desc": "Whichever way you obtained the materials needed, you need a &3Lathe&r to actually create the Lens. A &7Basic &3Lathe&r will be enough to create the lens from an &dExquisite Rose Quartz&r gem, but if you want to make the lens from a mere plate you will need better equipment in the form of an &bAdvanced &3Lathe&r.\n\nOne you've crafted it, the lens can be used in a &7Basic &3Laser Engraver&r with a &dDouble Red Alloy Plate&r to create the &dTransmitter&r unit you need, and won't be consumed in the process.", "quests.create_logistics.stock_link.title": "Stock Link", "quests.create_logistics.stock_link.subtitle": "We got storage buses at home", "quests.create_logistics.stock_link.desc": "The first &2High Logistics&r machine you can make is a &3Stock Link&r, which can be used to create a &dLogistics Network&r. When placed onto any side of a &3Packager&r, the Stock Link will &amake the inventory the Packager is attached to visible to the network&r! On its own, the Stock Link isn't super useful, but it is a core component of all the other machines yet to come...\n\nRemember to right click on an existing Stock Link before placing one down to tune the two to share the same network. To cancel this, you can simply craft the Stock Link by itself to clear its attunement.", @@ -2247,6 +2339,7 @@ "quests.extreme_voltage.t2_rocket.title": "Rocket 2: Titanium Boogaloo", "quests.extreme_voltage.t2_rocket.subtitle": "This one's purple", "quests.extreme_voltage.t2_rocket.desc": "This new rocket shouldn’t be too difficult to assemble, but you’ll notice a clear jump in material costs compared to your previous model.\n\nThe upgraded &6Rocket Alloys&r now require both &bDistilled Water&r and &bCryogenized Fluix&r for cooling.\n\nMake sure you've fully set up your &eTitanium&r production line, as you're going to need a lot of it going forward! A continuous production line will save you a lot of frustration down the road.", + "quests.extreme_voltage.t2_rocket.task": "Either rocket", "quests.extreme_voltage.mars.title": "I'm on &4Mars&r!", "quests.extreme_voltage.mars.subtitle": "The Red Planet", "quests.extreme_voltage.mars.desc.1": "Before landing on &4Mars&r, there are a few important things to keep in mind.\n\nFirst, like the Moon, &4Mars&r will have some hostile surface mobs as well. If you haven't already figured out how to make your Space Suit stay with you after dying or invested in new EV-tier weaponry, you'll have a rough time.\n\nThe planet is mostly a &edesert world&r, dotted with \"&aislands&r\" where you’ll find &bwater&r, lush fauna, and much safer places to build your first base. Meanwhile, the open desert is extremely dangerous if you don't watch your step, but contains some other crucial resources!", @@ -2268,11 +2361,11 @@ "quests.extreme_voltage.reactor_components.desc.2": "As discussed earlier, running three &eThorium Rods&r will push your reactor’s heat to around &c420&r, just above the default limit. However, you can safely reach that threshold by improving your &6reactor insulation&r.&r\n\nAdding &e10 Framed Glacial Wool&r or &e20 Framed AES Insulation&r blocks inside the structure will raise your reactor’s Max Heat to &e420&r, allowing you to operate with three Thorium Rods without triggering cooldown mode.&r\n\nKeep in mind, though, that increasing the number of active rods will also accelerate their &adurability loss&r. This means each rod will produce less steam per tick on average, reducing its &aefficiency&r, but on the other hand, it will &bspeed up fission material production&r significantly.\n\nWhether you prefer &aefficiency&r or &bthroughput&r is entirely up to you - that’s the balancing act at the heart of mastering the &6Fission Reactor&r.", "quests.extreme_voltage.heat_exchanger.title": "Heat Exchanger", "quests.extreme_voltage.heat_exchanger.subtitle": "All that heat's gotta go somewhere!", - "quests.extreme_voltage.heat_exchanger.desc.1": "The &6Heat Exchanger&r is a critical component for the next step of your Fission Line - not only for cooling, but also for producing more &eHigh Pressure Steam&r, the steam that powers your Nuclear Turbine.\n\nIt features &bPerfect Overclocking&r and &bSubtick Processing&r. If these terms sound unfamiliar, we strongly recommend reviewing the &dGregTech Energy Chapter&r to fully understand how they affect performance.", + "quests.extreme_voltage.heat_exchanger.desc.1": "The &6Heat Exchanger&r is a critical component for the next step of your Fission Line - not only for cooling, but also for producing more &eHigh Pressure Steam&r, the steam that powers your Nuclear Turbine. We strongly advise you to use one for each reactor as they can have an hard time processing different recipes.\n\nIt features &bPerfect Overclocking&r and &bSubtick Processing&r. If these terms sound unfamiliar, we strongly recommend reviewing the &dGregTech Energy Chapter&r to fully understand how they affect performance.", "quests.extreme_voltage.heat_exchanger.desc.2": "Don’t hold back! Install a &516A EV Energy Hatch&r right from the start so you’ll never have to worry about speed or throughput limitations.\n\nWe also provide you with a &9Machine Controller&r to attach to your Heat Exchanger’s main controller. We’ve noticed that the machine can sometimes disable itself unexpectedly, so be sure to enable &ePrevent Power Failing&r. This will counter the GregTech mechanic that shuts down machines when they momentarily lose power.", "quests.extreme_voltage.refrigerant_pellet.title": "Refrigerant Pellets", "quests.extreme_voltage.refrigerant_pellet.subtitle": "A temporary solution to extreme temperatures", - "quests.extreme_voltage.refrigerant_pellet.desc": "The &dPlutonium Fuel Rod&r runs at extremely high temperatures - so high, in fact, that you’ll need to use &bRefrigerant Pellets&r inside your reactor to prevent it from going into cooldown mode.\n\nThese pellets are quite expensive to produce, but you should still be able to mass-produce them early on, or at least enough to keep your first few plutonium rods operational. You need approximatively &9256&r to run a full Plutonium Rod.\n\nLater on, if you don’t like constantly crafting these consumables, you’ll gain access to &6advanced reactor components&r. With those installed, your reactor will be able to safely reach up to &e600 Max Heat&r, greatly improving efficiency and stability.\n\nInvest in better internal parts early, to spend less time babysitting your power core.", + "quests.extreme_voltage.refrigerant_pellet.desc": "The &dPlutonium Fuel Rod&r runs at extremely high temperatures - so high, in fact, that you’ll need to use &bTerraFirmaGuard PA6&r inside your reactor to prevent it from going into cooldown mode.\n\nThese pellets are quite expensive to produce, but you should still be able to mass-produce them early on, or at least enough to keep your first few plutonium rods operational. You need approximatively &9256&r to run a full Plutonium Rod.\n\nLater on, if you don’t like constantly crafting these consumables, you’ll gain access to &6advanced reactor components&r. With those installed, your reactor will be able to safely reach up to &e600 Max Heat&r, greatly improving efficiency and stability.\n\nInvest in better internal parts early, to spend less time babysitting your power core.", "quests.extreme_voltage.important_info.title": "Before starting", "quests.extreme_voltage.important_info.subtitle": "Not an easy place to start", "quests.extreme_voltage.important_info.desc.1": "Before you start building your base on &cMars&r, here are a few important tips to help you settle in successfully.&r\n\nBefore crafting up an entire base to carry in your pocket, we always recommend having an exploration mission before you start setting down!", @@ -2287,16 +2380,17 @@ "quests.extreme_voltage.thorium_rod.desc.1": "Each &6Fuel Rod&r comes with its own set of properties including &adurability&r (how long it lasts in the reactor), &cheat generation&r (how much heat it produces), and even different &eproducts&r and &bsteam output levels&r. You can view all of this information directly in the &aEMI&r tabs for each rod.&r\n\nBefore diving into how the Fission Reactor functions, here are some key points to understand:&r", "quests.extreme_voltage.thorium_rod.desc.2": "â€Ē The &eHeat Percentage&r shown on a fuel rod translates to slightly less than double its value inside the reactor. For example, a &eThorium Rod&r with a &cHeat&r of 70%% will generate just under 140 heat when enough &bHeavy Water&r is pumped into your reactor. This heat increase is &aadditive&r, meaning that 2 Thorium Rods will raise your reactor’s total heat to around 280.&r", "quests.extreme_voltage.thorium_rod.desc.3": "â€Ē &aDurability&r decreases at the same base rate for all rods. However, the higher the reactor’s temperature, the faster the rods degrade. Because of this, even if a certain rod type has 4× the durability of another, it doesn’t necessarily mean it will last 4× longer, as &ctemperature directly impacts longevity&r.&r\n\nBalancing the amount of rods within the reactor will be your first challenge with Fission.", + "quests.extreme_voltage.thorium_rod.desc.4": "â€Ē &6Average Heat&r is simply the mean temperature of the reactor while the rod was inside it. Depending on this &laverage heat value&r, the depleted rod will yield &bdifferent output products&r.\n\nYou can browse &bEMI&r to preview the possible results and see exactly what each depleted rod produces at specific temperature ranges.", "quests.extreme_voltage.fission_reactor.title": "Fission Reactor", "quests.extreme_voltage.fission_reactor.subtitle": "Oh no, it's on cooldown again", "quests.extreme_voltage.fission_reactor.desc.1": "To start off, if you’re looking for a deeper dive into &6Fission Reactor&r mechanics including formulas, detailed calculations, and system behavior, check out the quest in the &aGregTech Energy&r chapter. It covers everything you’ll need if you want to get into the math behind the heat and efficiency systems.&r\n\nFor now, let’s focus on your very first &6Thorium Reactor&r. Its base &cMax Heat&r is &e400&r. As explained in the previous quest, running two Thorium Rods will push your internal heat to around &e280&r, which is perfectly safe. However, adding a third rod raises the total to about &c420 Heat&r, exceeding the limit and triggering &ccooldown mode&r.", - "quests.extreme_voltage.fission_reactor.desc.2": "Don’t worry, there’s no explosion, but your reactor will shut down and won’t restart until it fully cools back to 0 Heat. This will completely halt both your &aenergy production&r and your &afission product&r generation - a major setback.\n\nManaging how many rods are active will therefore be your first &6challenge&r and the main minigame of Fission.\n\nThere are multiple ways to approach this, and experimentation is part of the fun.\n\nOne way is by attaching a &6Redstone Port&r to your reactor, and using a &aWrench&r on it switches its monitoring mode between &erod count&r and &cheat level&r.\n\nFinally, note that all rods are stored inside the &6Fuel Holder&r. That means limiting the number of active rods isn’t as simple as having 2 rods in the input bus, &cyou’ll need to control what enters the Input Bus&r to fine-tune your reactor’s operation.", + "quests.extreme_voltage.fission_reactor.desc.2": "Don’t worry, there’s no explosion, but your reactor will shut down and won’t restart until it fully cools back to 0 Heat. This will completely halt both your &aenergy production&r and your &afission product&r generation - a major setback.\n\nAlso be aware that each time your reactor enters cooldown mode, every fuel rod inside will receive &c10 000 Heat&r, which can lead to extremely poor outputs or even disastrous losses. Be very cautious, as this is something you absolutely want to avoid.\n\nManaging how many rods are active will therefore be your first &6challenge&r and the main minigame of Fission.\n\nThere are multiple ways to approach this, and experimentation is part of the fun.\n\nOne way is by attaching a &6Redstone Port&r to your reactor, and using a &aWrench&r on it switches its monitoring mode between &erod count&r and &cheat level&r.\n\nFinally, note that all rods are stored inside the &6Fuel Holder&r. That means limiting the number of active rods isn’t as simple as having 2 rods in the input bus, &cyou’ll need to control what enters the Input Bus&r to fine-tune your reactor’s operation.", "quests.extreme_voltage.high_pressure_steam.title": "High Pressure Steam", "quests.extreme_voltage.high_pressure_steam.subtitle": "Better steam, bigger turbine", "quests.extreme_voltage.high_pressure_steam.desc": "&4Important Info&r: If the reactor doesn't have enough space to output High Pressure Steam, it will simply void.\n\nFor balancing (and pipe throughput) reasons, the &6Fission Reactor&r does not produce regular steam. Instead, it generates &bHigh Pressure Steam&r, which can only be used in a &6Nuclear Steam Turbine&r.\n\nAttempting to run it through a standard Steam Turbine will &cnot work&r.", "quests.extreme_voltage.ev_superconductor.title": "EV Superconductors", "quests.extreme_voltage.ev_superconductor.subtitle": "Bigger Amp ability", - "quests.extreme_voltage.ev_superconductor.desc": "Now that you've processed some &eUranium&r, you should check out the &5EV Superconductors&r.\n\nThese superconductors have higher amp capacity, helping you move energy efficiently across your base and ensuring your &6Nuclear Steam Turbines&r output reaches all your machines without loss.", + "quests.extreme_voltage.ev_superconductor.desc": "Now that you've processed some &eRadon&r, you should check out the &5EV Superconductors&r.\n\nThese superconductors have higher amp capacity, helping you move energy efficiently across your base and ensuring your &6Nuclear Steam Turbines&r output reaches all your machines without loss.", "quests.extreme_voltage.uraninite_dust.subtitle": "That's a lot of rods", "quests.extreme_voltage.uraninite_dust.desc": "To craft your &eUranium Fuel Rods&r, you’ll need a substantial amount of &eUraninite&r - around &c240 Dust&r per rod. Start mining it early to keep up with demand later.\n\nThe largest veins can be found on Mars, where some deposits reach &aimpressive sizes&r. Later in your progression, you’ll be able to produce Pitchblende and Uraninite Dust &ainfinitely&r using the &6Ostrum Linear Accelerator&r, but we’ll cover that in more detail in a future quest.", "quests.extreme_voltage.uranium_line.title": "The Uranium Line", @@ -2379,8 +2473,8 @@ "quests.extreme_voltage.radioactive_concoction.title": "Residual Radioactive Concoction", "quests.extreme_voltage.radioactive_concoction.subtitle": "Don't void this one!", "quests.extreme_voltage.radioactive_concoction.desc": "The &dResidual Radioactive Concoction&r is a very important byproduct of the Fission Line. Its main use is to produce infinite ores with the &bOstrum Linear Accelerator&r, but it is also required to unlock the &bGrowth Chamber&r.\n\nIf you want to build Fission Reactors outside of Mars, you will also need a continuous supply of it.", - "quests.extreme_voltage.ostrum_linear.subtitle": "Infinite but next level", - "quests.extreme_voltage.ostrum_linear.desc": "The &bOstrum Linear Accelerator&r allows you to create various materials using different products from the Fission Line. This multiblock supports a large number of &bInput Buses&r and &bInput Hatches&r, and since all of its recipes are quite fast, a single unit should be enough to cover all your needs.\n\nWe strongly recommend crafting some &eSpray Cans&r with different colors to organize your inputs and outputs. For example, if you color an Input Bus and an Input Hatch in &9blue&r, only those two will interact together, preventing recipe conflicts and ensuring smoother automation.", + "quests.extreme_voltage.ostrum_linear.subtitle": "It does a bit of everything", + "quests.extreme_voltage.ostrum_linear.desc": "The &5Ostrum Linear Accelerator&r allows you to create various materials using different products from the &cFission Line&r; this multiblock supports a large number of &aInput Buses&r and &aInput Hatches&r and can also be expanded vertically to increase its capacity.\n\nTo operate the &5Ostrum Linear Accelerator&r, it must be placed next to a &6Heat Battery&r, ensuring that the &cHeat Port&r from the &6Heat Battery&r is in direct contact with the &cHeat Input Hatch&r of the OLA; like the &6Heat Battery&r, it consumes &cHeat Units&r for every recipe and requires a minimum &eTemperature&r for specific recipes, and it is important to note that the higher the temperature compared to the required minimum, the faster the recipe will run.\n\nWe strongly recommend crafting &bSpray Cans&r in different colors to organize your inputs and outputs; for example, if you color an &aInput Bus&r and an &aInput Hatch&r in &9blue&r, only those two will interact with each other, preventing recipe conflicts and ensuring smoother automation.", "quests.extreme_voltage.pss.subtitle": "A glorified battery", "quests.extreme_voltage.pss.desc": "The &ePower Substation&r was moved from &1IV&r to &5EV&r so you can build it directly on Mars, where energy management can be quite challenging with Fission Power. It’s not mandatory, so feel free to skip it if you prefer.\n\nIf you want to learn more about how this multiblock works, check out its detailed entry in the &aEnergy Chapter&r.", "quests.extreme_voltage.liquid_air.title": "Earth Air", @@ -2472,6 +2566,7 @@ "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.extreme_voltage.large_generators.task": "A Large Gas Turbine or Large Combustion Engine", "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", @@ -2485,6 +2580,20 @@ "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 Catalyzer. 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 &7Coal Tar&r obtained while producing &bReformate Gas&r can be reconverted into &2Hydrogen Sulfide&r and ultimately refined back into &6Sulfur&r.", + "quests.extreme_voltage.nichromium_iode.title": "Nichromium Iodomethylate", + "quests.extreme_voltage.nichromium_iode.subtitle": "Better heating conductivity", + "quests.extreme_voltage.nichromium_iode.desc": "This alloy will be required to craft your new &6RTM Coils&r; while the costs are not excessive, you will need to find the &cCrimsene&r and &9Warpane&r trees on &4Mars&r, and since you may need a large amount of &6RTM Coils&r and &bIodine&r, do not forget to set up a solid passive income using &asap&r.", + "quests.extreme_voltage.heat_battery.subtitle": "A better Heat Exchanger", + "quests.extreme_voltage.heat_battery.desc": "The &6Heat Battery&r is a multiblock capable of storing &cHeat&r from hot coolants coming directly from your &cFission Reactor&r, which can then be used either to heat other fluids or to be consumed in the &5Ostrum Linear Accelerator&r.\n\nThe mechanic is fairly simple: depending on the fluid being input, the &6Heat Battery&r can reach higher temperatures, and you can check how much temperature a fluid can provide by browsing &bEMI&r under the Heat Battery Import recipes tab; conversely, you can spend your &cHeat Units&r by warming fluids, and like the EBF, some recipes require a minimum temperature, for example, producing &bHigh Pressure Steam&r from &9Distilled Water&r requires the Heat Battery to be at least at &c1000°&r.\n\nFinally, just like the &cFission Reactor&r, you can add specific blocks (tag &7#components_hb&r) to increase both the maximum reachable temperature of your &6Heat Battery&r and how many &cHeat Units&r it can store.", + "quests.extreme_voltage.dense_ostrum_vapor.title": "Dense Ostrum Vapor", + "quests.extreme_voltage.dense_ostrum_vapor.subtitle": "Fission on Earth?", + "quests.extreme_voltage.dense_ostrum_vapor.desc": "The &6Dense Ostrum Vapor&r is required to craft a &cThorium-Uranium Breeder Fuel Rod&r, which you will need to start &eFission&r for power generation; more uses will be added with each new update, so stay tuned.\n\nNote that you can also use it to get more Light Ostrum Vapor if you ever feel the need.", + "quests.extreme_voltage.ostrum_vapor.title": "Ostrum Vapor", + "quests.extreme_voltage.ostrum_vapor.subtitle": "We really need to chill", + "quests.extreme_voltage.ostrum_vapor.desc": "The first use of &6Ostrum Vapor&r is allowing you to craft &bTerraFirmaGuard PA6&r, which you will need to run your &cPlutonium Reactor&r without losing all your &3Tritiated Water&r.\n\nLater, when you unlock &eFission Energy&r and the &aSmall Modular Turbine&r, &dPolyalkylene Lubricant&r becomes an extremely strong asset for producing more power in your isolated outposts.", + "quests.extreme_voltage.light_ostrum_vapor.title": "Lightweight Ostrum Vapor", + "quests.extreme_voltage.light_ostrum_vapor.subtitle": "Infinite ores?", + "quests.extreme_voltage.light_ostrum_vapor.desc": "With the help of &6Lightweight Ostrum Vapor&r, you can begin producing infinite ores, especially those required for the &cFission Line&r. There are three tiers of infinite ores:\n\n&eCircuit 1&r is not self-sufficient but can still be helpful if you are truly tired of mining.\n\n&eCircuit 2&r is &dThorium&r positive, meaning that simply by running your &cFission Line&r, you will produce more &dThorium&r than you consume.\n\n&eCircuit 3&r is the final and best tier, where you generate more resources than are required to produce the ores themselves; you become net positive in &dThorium&r and &aUraninite&r, allowing you to fully automate the &cFission Line&r on &4Mars&r for infinite resources, &bNano CPU&r, and everything needed to run &eFission Energy&r on &2Earth&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", @@ -2573,14 +2682,17 @@ "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", - "quests.gregtech_energy.fission_rod.desc.2": "", - "quests.gregtech_energy.fission_rod.task": "", + "quests.gregtech_energy.fission_rod.desc.1": "To begin producing power on &2Earth&r, you will need to invest in an impressive setup on &4Mars&r to produce and process &cThorium-Uranium Breeder Fuel&r; every time you craft a new &cBreeder Rod&r, you must use an &5OLA&r recipe, which is quite expensive, but the advantage is that the rods are fully recyclable after being depleted.\n\nAfter obtaining your first &cBreeder Rod&r, it is very important to decide which isotope you want to target.", + "quests.gregtech_energy.fission_rod.desc.2": "The &aAmericium Rod&r has extremely high durability but very low &cHeat&r, and it is the only rod that can be used in a &eSmall Fission Reactor&r; this incredibly potent rod is very difficult to obtain, as you will need to run your &cFission Reactor&r at an extremely low temperature to maximize americium output—refer to EMI to determine the heat range you should target.\n\nThe &bNeptunium Rod&r is the standard option, offering good power output and good durability; it can produce up to &1360k EU/t&r at &1IV&r but requires a very extensive infrastructure, and with one &cFission Reactor&r, one &6Heat Battery&r, and one &9Cooling Tower&r, you should be able to generate a massive amount of steam in a perfectly looped system.", + "quests.gregtech_energy.fission_rod.desc.3": "Be very cautious, however: if your &cBreeder Rods&r are operated at too high a temperature, you will lose part of the &8TBU Waste&r and will not be able to fully recycle the rod; always be extremely careful when running a &cBreeder Rod&r, as losing them is something you absolutely want to avoid.\n\nWhen targeting specific temperatures to increase isotope yield, remember that you can mix multiple rods together, and as always, refer to EMI to see which rods use which coolants.", "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.smr.desc.1": "If you manage to obtain two &aAmericium-241 Rods&r, you can start looking into the &eSmall Fission Reactor&r and the &aSmall Modular Turbine&r; this generator setup is ideal for long-term, sustainable power generation with no required interaction, making it perfect for isolated outposts or as backup power for your base if everything goes wrong.", + "quests.gregtech_energy.smr.desc.2": "In the &eSmall Fission Reactor&r, you must install two &bFuel Holders&r, as this is the minimum required to produce power, and then craft enough &3TiCl2 Doped Supercritical CO2&r, which is the only coolant this reactor can use; the good news is that the system will be perfectly looped.\n\nTo set up the &aSmall Modular Turbine&r, you must use its dedicated &aSMT Input Hatches&r, as no other input hatches will function; the modular aspect comes from the requirement to use a &eLubricant&r to run the generator, either the &bGregTech&r one or the version produced with the &5OLA&r, which doubles efficiency, and you can further enhance output by adding a &dBooster&r—currently &bOzone&r or &61,1-Cyclohexanediyl Dihydroperoxide&r—to increase the amount of &eEU&r produced.", + "quests.gregtech_energy.smr.desc.3": "While this setup may seem intimidating at first, the benefit of having an extremely long-lasting and reliable power source anywhere in the world is significant, making it well suited for isolated harvesters, miners, or even a fully independent base.", + "quests.gregtech_energy.cooling_tower.subtitle": "Finally Fission Power on Earth", + "quests.gregtech_energy.cooling_tower.desc.1": "The most traditional way to generate power using &eFission Energy&r is through a combination of a &6Heat Battery&r and a &9Cooling Tower&r; the amount of &9Distilled Water&r required is so high that you should not expect to skip the tower. The initial setup usually consists of a &cFission Reactor&r running &bNeptunium Rods&r (you may also add some &aAmericium Rods&r) using &eBoron Coolant&r, which is then cooled through the &6Heat Battery&r.", + "quests.gregtech_energy.cooling_tower.desc.2": "The &cHeat Units&r generated this way should be used to produce &bHigh Pressure Steam&r from &9Distilled Water&r; this steam can then be sent to &eNuclear Turbines&r, which will output &aWarm Water&r that is cooled back into &9Distilled Water&r using the &9Cooling Tower&r. Be prepared to allocate a large amount of space for this setup.\n\nAs a helpful tip, remember that the &9Cooling Tower&r requires a circuit to be selected to operate, and the higher the circuit, the higher the flow rate it can handle.", "quests.gregtech_energy.gasoline.title": "Gasoline", "quests.gregtech_energy.gasoline.subtitle": "The middle child", "quests.gregtech_energy.gasoline.desc": "&aGasoline&r is a really strong combustion fuel that you unlock at &6HV&r, but realistically only begin to make when you build your first &6Distillation Towers&r. &7Toluene&r is easily made from &7Wood Tar&r or &7Heavy Fuel&r, while everything else you need is &dRefinery Gas&r, &eNaphtha&r, and a mix of &3Oxygen&r, &bHydrogen&r, and &1Carbon&r.\n\nIt's strong, quite easy to make, and even better, it can be upgraded into &cHigh Octane Gasoline&r.", @@ -2800,6 +2912,7 @@ "quests.high_voltage.rocket_t1.title": "Your First Rocket!", "quests.high_voltage.rocket_t1.subtitle": "The first of many", "quests.high_voltage.rocket_t1.desc": "Wow, it's time to build your &6Rocket&r!\n\nAssemble all the parts with &d8 Dense Rocket Alloy&r. To finish the insulation, you'll need &b2304mb&r of &bLiquid Silicon&r (&b16 ingots&r) and &f16 pieces of dust&r.\n\nYou have two choices:\n&e-&r &eBorosilicate Glass Dust&r — crafted in a &6Mixer&r with &dBoron&r and &fGlass Dust&r\n\n&e-&r &5Vitrified Asbestos&r — obtained through a &6Pyrolyse Oven&r\n\nGo with whichever's easiest for you!", + "quests.high_voltage.rocket_t1.task": "Either rocket", "quests.high_voltage.vitrified_pearl.title": "Vitrified Ender Pearl", "quests.high_voltage.vitrified_pearl.subtitle": "An Exotic Ceramic", "quests.high_voltage.vitrified_pearl.desc": "Heat the Ender Pearl in a &ePyrolyse Oven&r along with some appropriate insulation to properly vitrify it into something resembling a &3ceramic&r.\n\nYou won’t need many of these for now — at minimum, just one for your &6Rocket&r and another for your &6HV Circuit Assembler&r.\nBut be warned: from &5EV&r and beyond, the demand will rise quickly.", @@ -2880,15 +2993,17 @@ "quests.high_voltage.pisciculture.subtitle": "A multiblock for pollock.", "quests.high_voltage.pisciculture.desc.1": "The &bPisciculture Fishery&r is not only your one stop shop for infinite fish, but also a supporting multiblock in the &3Aquaponics Loop&r. A circular loop of recipes between the Pisciculture fishery and the &2Electric Greenhouse&r which boosts each others yields and if done properly--Will require no external inputs.", "quests.high_voltage.pisciculture.desc.2": "&5Note:&r The structure can be filled with any liquid with the fluid tag &o&7#tfg:pisciculture_fishery_fluids&r&r. But, be aware that some fluids will freeze in space and that some recipes may not run if the multiblock controller is not in an &noxygenated environment&r.", + "quests.high_voltage.multi_structure_terminal.subtitle": "Simply better", + "quests.high_voltage.multi_structure_terminal.desc": "The &4Multi-Structure Manager&r is an advanced terminal and a direct upgrade from the GregTech one. You can use it the same way to &ebuild a multiblock&r by right-clicking a controller, with the &dadded options&r to choose the tier (size of the multiblock or coils used) and whether to place Input/Output ports.\n\nIt can also scan nearby multiblocks to upgrade their hatches or coils, and if linked to your &bME Network&r, it can directly use your ME Storage to upgrade the ports.", "quests.low_voltage": "&7LV&r - Low Voltage", "quests.low_voltage.subtitle": "Tame electricity and begin your GregTech journey", "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.\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_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\nAs a quick reminder, &cmachines explode when exposed to rain or water&r on any of the blocks they're adjacent to, unless the machine specifically says otherwise.", + "quests.low_voltage.lv_machine_casing.title": "Your next machines", "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.", + "quests.low_voltage.lv_machine_casing.desc": "Now that you've got some electricity going, it's time to use it! We recommend starting by making machines that will make it easier and cheaper to make even more machines.\n\nTo 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.", "quests.low_voltage.lv_motor.title": "The First of Many Motors", "quests.low_voltage.lv_motor.subtitle": "Low Voltage beckons...", "quests.low_voltage.lv_motor.desc": "Remember that &2EMI is your friend&r if recipes are getting overwhelming. You can click the button with four stacked squares on the bottom right of any recipe, and EMI will show you a tree of all the crafting ingredients, and you can even have it add a \"shopping list\" to your favourites!\n\nGetting back on topic, set yourself up for &7LV&r by crafting six &aLV Electric Motors&r! This may seem like a lot, but that's the bare minimum required to get to the good stuff in &7LV&r.", @@ -2898,25 +3013,24 @@ "quests.low_voltage.lv_age_progression.task": "I... might have some sense of direction now", "quests.low_voltage.lost.title": "Lost?", "quests.low_voltage.lost.subtitle": "This is all very overwhelming", - "quests.low_voltage.lost.desc.1": "Getting into &7LV&r opens up a LOT of options, so it's easy to get lost. Here's our recommendations:\n\n1) Set up a source of power. Check the quests on the bottom right, there's several options, all are viable. Don't cheap out, build multiple generators!\n\nBe sure to &eread the GregTech Energy quest chapter&r so you get a good understanding of how EU, Volts, Amps, and Cable Loss all work.", - "quests.low_voltage.lost.desc.2": "2) Focus on machines that make building more machines cheaper.\n\nThe Polarizer is a super cheap machine that can magnetize rods for basically free. If you didn't craft the Steam Age equivalents, set up a Bender, Wiremill, Lathe, and Cutter. These quests are all on the top left.\n\nAfter that, focus on making Rubber cheaper with a Chemical Reactor and Fluid Solidifier (left), and making electronic components cheaper with an Assembler (bottom).\n\nOnce everything's at its cheapest, make sure you craft components in batches to save you lots of time.", - "quests.low_voltage.lost.desc.3": "3) Build a canner and make some batteries (top right). Battery buffers will help a lot with the growth of your factory, and the Ore Prospector is an absolute game changer.\n\n4) &7LV&r has two main end goals, the &aCircuit Assembler&r and the &aElectric Blast Furnace&r. You should now be ready to tackle those.", + "quests.low_voltage.lost.desc.1": "Getting into &7LV&r opens up a LOT of options, so it's easy to get lost. Here's our recommendations:\n\n1) Set up a source of power. Check the quests below this, there's several options, all are viable. Don't cheap out, build multiple generators!\n\nBe sure to &eread the GregTech Energy quest chapter&r so you get a good understanding of how EU, Volts, Amps, and Cable Loss all work.", + "quests.low_voltage.lost.desc.2": "2) Focus on machines that make building more machines cheaper.\n\nThe Polarizer is a super cheap machine that can magnetize rods for basically free. If you didn't craft the Steam Age equivalents, set up a Bender, Wiremill, Lathe, and Cutter.\n\nAfter that, focus on making Rubber cheaper with a Chemical Reactor and Fluid Solidifier (left), and making electronic components cheaper with an Assembler (bottom).\n\nOnce everything's at its cheapest, make sure you craft components in batches to save you lots of time.", + "quests.low_voltage.lost.desc.3": "3) Build a canner and make some batteries. Battery buffers will help a lot with the growth of your factory, and the Ore Prospector is an absolute game changer.\n\n4) &7LV&r has two main end goals, the &aCircuit Assembler&r and the &aElectric Blast Furnace&r. You should now be ready to tackle those.", "quests.low_voltage.lost.task": "I know what to do now!", "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!", + "quests.low_voltage.lv_steam_turbine.desc": "The &3Steam Turbine&r is most players' first &7LV&r generator, as you've already got steam production set up from your Steam machines.\n\nWhen provided Steam, the turbine will output EU at a ratio of &d2 mB = 1 EU&r.\n\nOne downside of steam is transporting it, and due to its lack of energy density, you'll need large or huge pipes to carry it around.\n\nYou may also consider upgrading to the Large Bronze Boiler once you start needing more power than what your single-block boilers can produce.", "quests.low_voltage.lbb.title": "Large Bronze Boiler", "quests.low_voltage.lbb.subtitle": "Boom, boom, boom, boom", - "quests.low_voltage.lbb.desc.1": "The &3Large Boiler&r is an &6optional&r big-boy variant of the Small Boilers. It runs off solid or liquid fuel.\n\nIf you want Steam-based power production, this is an alternative to the Create Steam Engine. Later power options are listed in the &bMV&r chapter.\n\nMake sure you set it up so it never runs out of water like your Small Boilers, otherwise it'll &cexplode&r!.", + "quests.low_voltage.lbb.desc.1": "The &3Large Boiler&r is an &6optional&r big-boy variant of the Small Boilers. It runs off solid or liquid fuel.\n\nIf you want Steam-based power production, this is an alternative to the Create Steam Engine.\n\nMake sure you set it up so it never runs out of water like your Small Boilers, otherwise it'll &cexplode&r!", "quests.low_voltage.lbb.desc.2": "Once fully heated up, the &3LBB&r produces 800 Steam per tick, which is &d400EU/t&r after conversion, or 12.5 Basic Steam Turbines. Such (relatively!) immense power comes at the cost of &la lot&r of burnable fuel. &5With this in consideration&r, the GUI lets you &9throttle&r the Boiler down to 25 percent power for 200 Steam per tick. That's &d100EU/t&r, or slightly above 3 Basic Steam Turbines.\n\nWe recommend holding off making this until you're ready to power your EBF, or if you have a lot of steam multiblocks.", - "quests.low_voltage.lbb.desc.3": "In TerraFirmaGreg, you have a few options for fuel. You can use a Hose Pulley to pull Lava out of a deep underground lake, or set up a tree farm into a coke oven for Charcoal and Creosote. Lastly, there are huge surface-level Coal veins that you can extract with some automated mining machines and turn into Coke and significantly more Creosote than charcoal.\n\nIf you go the tree farm route, you'll need three coke ovens to power a full-throttle LBB.", + "quests.low_voltage.lbb.desc.3": "In TerraFirmaGreg, you have a few options for fuel. You can use a Hose Pulley to pull Lava out of a deep underground lake (no, infinite lava is not a thing), or set up a tree farm into a coke oven for Charcoal and Creosote. Lastly, there are huge surface-level Coal veins that you can extract with some automated mining machines and turn into Coke and significantly more Creosote than charcoal.\n\nIf you go the tree farm route, you'll need three coke ovens to power a full-throttle LBB.", "quests.low_voltage.lv_polariser.title": "Basic Polarizer", "quests.low_voltage.lv_polariser.subtitle": "The Polarizer polarizes!", "quests.low_voltage.lv_polariser.desc": "One of the cheapest - if not the cheapest - &7LV&r machine. Use this to make &6Redstone-free Magnetic Rods&r for your Motors. Whenever you start to batch your Motors, this machine will save you stacks and stacks of Redstone.", "quests.low_voltage.link_chapter.title": "Explain energy to me", "quests.low_voltage.link_chapter.subtitle": "There is a whole chapter about energy", - "quests.low_voltage.link_chapter.desc": "View the chapter by clicking here", + "quests.low_voltage.link_chapter.desc": "It might look like a lot of reading, but it's important to understand if you want to avoid accidents and get the most out of your power generation.\n\nGregTech's energy system (EU, Energy Units) works differently to FE (Forge Energy), the system used by almost every other mod.\n\nThere's four ways to generate power in LV, and all are viable options. If you're new to GregTech, Steam is the easiest but falls off fast as you progress to further tiers. Gas fuel is more complicated to produce, but has the cheapest generators. Combustion is somewhere in between.\n\nHere's a link to the energy chapter", "quests.low_voltage.link_chapter.task": "I read it", "quests.low_voltage.lv_combuston_gen.title": "The Combustion Generator", "quests.low_voltage.lv_combuston_gen.subtitle": "It does boom and make energy", @@ -2932,7 +3046,7 @@ "quests.low_voltage.lv_seeds.desc": "If you come across these plants, you should pick them up and start a farm.\n\nThey will be your best source of &aSeed Oil&r, a liquid used for producing &eBio Diesel&r. Canola is a bit more resistant to lower temperatures, while Sunflowers are happier in warmer climates. You also could grow them in your Electric Greenhouse if you don't want to spend as much time farming, at the expense of having to spend a little power to grow them.", "quests.low_voltage.lv_seeds.task": "Canola or Sunflowers", "quests.low_voltage.lv_gas_turbine.title": "The Gas Turbine", - "quests.low_voltage.lv_gas_turbine.subtitle": "It needs more circuits but less materials", + "quests.low_voltage.lv_gas_turbine.subtitle": "For petrochemical enthusiasts", "quests.low_voltage.lv_gas_turbine.desc": "With the help of &7Syngas&r, you now have a viable way to use the &cGas Turbine&r at &7LV&r. They work exactly like the other &6generators&r but should be a tiny bit cheaper than the &6Combustion Generator&r.", "quests.low_voltage.lv_gas_syngas.title": "Syngas", "quests.low_voltage.lv_gas_syngas.subtitle": "Not Wood Gas", @@ -2944,15 +3058,6 @@ "quests.low_voltage.lv_turbo_charge.subtitle": "Useful to charge your electric tools faster", "quests.low_voltage.lv_turbo_charge.desc": "&oThis quest's subject is optional, but may still be of interest to you. We've put it here in the name of completeness.&r\n\nThe &3Turbo Charger&r charges &6RF and EU&r items such as &9Drills&r extremely quickly.\n\nIt accepts up to 4 Amps for every item it charges, making it &6twice as fast&r as the &3Battery Buffer&r. It cannot discharge, though.\n\n&eAny&r Charger will complete this Quest.", "quests.low_voltage.lv_turbo_charge.task": "Any Turbo Charger will do", - "quests.low_voltage.lv_fisher.title": "Fishing Machine", - "quests.low_voltage.lv_fisher.subtitle": "Fully compatible with TFC!", - "quests.low_voltage.lv_fisher.desc": "&oThis quest's subject is optional, but may still be of interest to you. We've put it here in the name of completeness.&r\n\nThe &3Fisher&r catches fish from Water. It requires a 5x5 area of Water directly below to operate. It uses the same loot table as normal Fishing. Each operation consumes 1 String and EU equivalent to its tier (32 for &7LV&r, etc.). That's about it.\n\n&eFish Oil&r can be extracted from Fish, which can be used for &6Bio Diesel&r.", - "quests.low_voltage.lv_fisher.task": "Any Fisher will do", - "quests.low_voltage.lv_rock_crusher.title": "Rock Crusher", - "quests.low_voltage.lv_rock_crusher.subtitle": "Cobble is Love, Cobble is Life", - "quests.low_voltage.lv_rock_crusher.desc.1": "&oThis quest's subject is optional, but may still be of interest to you. We've put it here in the name of completeness.&r\n\nThe &3Rock Breaker&r is effectively a Cobblestone Generator in a box. You can give it any raw rock or cobblestone block, and it will produce copies of it. Very handy if you want a lot of bricks fast!\n\n&eAny&r Rock Breaker will complete this Quest.", - "quests.low_voltage.lv_rock_crusher.desc.2": "&l&3Lore:&r&o Obsidian requiring Redstone to generate is in reference to an ancient Minecraft bug, &7MC-4239&f. Placing Redstone where the Cobblestone would go in a cobble generator would make it generate Obsidian instead. This bug was resolved in snapshot 14w25b for Minecraft 1.8, over 9 years ago at the time of writing!", - "quests.low_voltage.lv_rock_crusher.task": "Any Rock Crusher will do", "quests.low_voltage.lv_aqueous_accumulator.title": "Aqueous Accumulator", "quests.low_voltage.lv_aqueous_accumulator.subtitle": "Thermal Foundation is calling", "quests.low_voltage.lv_aqueous_accumulator.desc": "The &3Aqueous Accumulator&r is basically a Rock Crusher but for fluids. Simply place the machine next to two source blocks of the appropriate fluid, set the circuit, and voila! It'll keep producing more of that fluid. It effectively does the same thing as a mechanical pump, but using electricity instead of mechanical power, so you may find it easier to fit into your factory. As a bonus, the HV one will make infinite lava too!\n\nYou can safely waterlog the source blocks to prevent them freezing in winter, and the machine will continue to work.", @@ -2973,13 +3078,13 @@ "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\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.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\nThe basic Fluid Cells hold &done bucket&r of Fluid, while the Steel Cells hold eight buckets.\n\nNot sold on them yet? Unlike drums and buckets, cells &asafely contain&r their contents, preventing you from getting burnt, frozen, or floating. They're also significantly cheaper!", + "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 can hold even more.\n\nLike Drums, Cells can be placed into a crafting grid to clear their contents.", "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.", - "quests.low_voltage.machine_auto_output_behaviour.desc.2": "Right-clicking a machine with a &5Wrench&r changes the output side, and shift-right-clicking changes the front side. Keep in mind that the front side &ccannot&r also be the output side! \n\nBy default, items and fluids cannot be inserted through the output side, but this can be toggled with a &5Screwdriver&r. Either right-click the output face directly, or shift-right-click on the grid corresponding to the side of the output.\n\nThere are unique machines that do not process recipes, such as the &3Pump&r, &3Miner&r, &3Fisher&r, &3Item Collector&r, etc. These machines will output on their &7Front Face&r (which is still marked as a dot).", + "quests.low_voltage.machine_auto_output_behaviour.desc.2": "Right-clicking a machine with a &5Wrench&r changes the output side, and shift-right-clicking changes the front side. Keep in mind that the front side &ccannot&r also be the output side! \n\nBy default, items and fluids cannot be inserted through the output side, but this can be toggled with a &5Screwdriver&r. Either right-click the output face directly, or shift-right-click on the grid corresponding to the side of the output.", "quests.low_voltage.machine_auto_output_behaviour.task": "Hmm, how interesting!", "quests.low_voltage.programmed_circuits.title": "Programmed Circuits", "quests.low_voltage.programmed_circuits.subtitle": "Don't want to spend your circuits to select recipes?", @@ -3026,18 +3131,20 @@ "quests.low_voltage.lv_amp_explanation.subtitle": "Amps and You: a how-to", "quests.low_voltage.lv_amp_explanation.desc": "This questline serves as a quick guide to &9GregTech Amperage&r. As for &dVoltage&r mechanics, we'll go over those once you reach &bMV&r.\n\n&6&lTL;DR:&r For safety, match the Amperage limit of your Cables with the max amount of Amps provided by your Energy Producers.\n\nStill confused? Check the &cGregTech Energy&r chapter for a full rundown on GregTech's electricity system!", "quests.low_voltage.lv_ore_prospector.title": "This is Hacking", - "quests.low_voltage.lv_ore_prospector.subtitle": "The future of prospector", + "quests.low_voltage.lv_ore_prospector.subtitle": "Prospector NEO", "quests.low_voltage.lv_ore_prospector.desc": "The Prospector is an amazing tool that'll help you find veins in no time.\n\nIts GUI is interactive. Right-clicking will scan for ores, displaying them on a dynamic map.\n\n&l&3Lore:&r&o Back in OUR day, the portable Prospector was locked to &dLuV&f. Kids these days have it easy.", + "quests.low_voltage.night_vision_goggles.subtitle": "See in the dark!", + "quests.low_voltage.night_vision_goggles.desc": "Charge them up and put them on your face to get a permanent Night Vision effect as long as the batteries last! You can toggle this effect with a keybind, set to &aO&r by default.", "quests.low_voltage.lv_sprayer.title": "Spray Can", "quests.low_voltage.lv_sprayer.subtitle": "Time for server tag wars", - "quests.low_voltage.lv_sprayer.desc": "Unfortunately, this is only an &lEmpty&r Spray Can, which you have to fill with Chemical Dye before using.\n\n&aSpray Cans&r do not provide any functionality involving machines, but can be quite &bvisually appealing and useful&r!\n\nAny (or almost any) GregTech tile entity (machine, pipe, cable...) can be &6painted&r to one of the 16 colors of your choosing. This is great for screenshots, or to separate different setups for convenience in a Multiplayer base. They also help with distinguishing between pipelines and cables.\n\nHolding the &aSpray Can&r in the offhand will automatically paint any block you place.", + "quests.low_voltage.lv_sprayer.desc": "Unfortunately, this is only an &lEmpty&r Spray Can, which you have to fill with Dye before using.\n\n&aSpray Cans&r do not provide any functionality involving machines, but can be quite &bvisually appealing and useful&r!\n\nAny (or almost any) GregTech tile entity (machine, pipe, cable...) can be &6painted&r to one of the 16 colors of your choosing. This is great for screenshots, or to separate different setups for convenience in a Multiplayer base. They also help with distinguishing between pipelines and cables.\n\nHolding the &aSpray Can&r in the offhand will automatically paint any block you place.", "quests.low_voltage.other_machines.title": "But wait, there's more!", "quests.low_voltage.other_machines.subtitle": "You can't escape Greg...", "quests.low_voltage.other_machines.desc": "We won't go over the &dfull scale of regular Ore Processing&r. Why regular? Some ores require special treatment, but that's a topic for much later. Oh no, we're already getting carried away!\n\nSome machines like the &bChemical Bath&r or the &bElectrolyser&r could be useful.\n\nIntimidated by ore processing? Check the dedicated &cOre Processing&r chapter for a full walkthrough!", "quests.low_voltage.other_machines.task": "I agree to lose my sanity", "quests.low_voltage.lv_chemical_bath.title": "Basic Chemical Bath", "quests.low_voltage.lv_chemical_bath.subtitle": "The Chemical Bath bathes...", - "quests.low_voltage.lv_chemical_bath.desc.1": "&lOutside of Ore Processing:&r\n\nYou can use the Chemical Bath to replace recipes made with the &6sealed barrel&r, making paper and leather &6painless&r.\n\nThere are some other less important recipes, such as dyeing various items and blocks, or bleaching them.", + "quests.low_voltage.lv_chemical_bath.desc.1": "&lOutside of Ore Processing:&r\n\nYou can use the Chemical Bath to replace recipes made with the &6sealed barrel&r, making leather and treated wood &6painless&r.\n\nThere are some other less important recipes, such as dyeing various items and blocks, or bleaching them.", "quests.low_voltage.lv_chemical_bath.desc.2": "&lFor Ore Processing:&r\n\nSome &aCrushed Ores&r have alternate routes when washed into &aPurified Ore&r, involving bathing in either &aMercury&r or &aSodium Persulfate&r. This step isn't really important, unless you really want that special &6Byproduct&r. This can be a nice alternate source of Silver (hint, hint!).", "quests.low_voltage.lv_electroliser.title": "Basic Electrolyzer", "quests.low_voltage.lv_electroliser.subtitle": "It goes bzzz", @@ -3046,21 +3153,20 @@ "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.\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.lv_mixer.desc": "The electric mixer will &6significantly speed up&r the process of making colored steel, since now it can directly make the &aColored Steel Dust&r. 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. &7(Don't look at the Alloy Blast Smelter in JEI, that's not until &5EV&r&7.)&r", "quests.low_voltage.soldering_alloy.title": "Soldering Alloy", "quests.low_voltage.soldering_alloy.subtitle": "I got soul but I'm not a solder", - "quests.low_voltage.soldering_alloy.desc": "&aSoldering Alloy&r is used solely as a &9Fluid&r, and in most cases is &dinterchangeable&r in circuit recipes as a cheaper alternative to Tin&r.\n\nThe choice is yours. Save more materials? Make Soldering Alloy. Spend less time crafting materials? Tin is the way to go.", + "quests.low_voltage.soldering_alloy.desc": "&aSoldering Alloy&r is used solely as a &9Fluid&r, and in most cases is &dinterchangeable&r in circuit recipes as a cheaper alternative to Tin&r.\n\nThe choice is yours. Save more materials? Make Soldering Alloy. Spend less time crafting materials? Tin is the way to go.\n\nRemember that you'll need to mix the soldering alloy dust first, then use an extractor to turn it into liquid. Ignore the Alloy Blast Smelter recipes in JEI!", "quests.low_voltage.gallium_arsenide.title": "Gallium Arsenide", "quests.low_voltage.gallium_arsenide.subtitle": "I hate byproducts, they're awesome", "quests.low_voltage.gallium_arsenide.desc": "Many materials going forward cannot be smelted directly from any Ores! They are instead obtained as byproducts from processing of other ores. Gallium and Arsenic are &4among&r these materials.\n\nFor &dGallium&r, you may, ranged from worst to best (compromising difficulty and yields):\n\n&9- &3Electrolyze &aSphalerite&r for a low chance of small dust. Note that you lose out on direct smelting value.\n\n&9-&r Put &aCrushed Bauxite&r in the &3Chemical Bath&r. Note that this requires &9Sodium Persulfate&r.\n\n&9-&r Obtain it as a Byproduct of &aSphalerite&r Ore Processing in the &3Thermal Centrifuge&r or &3Centrifuge&r.\n\nFor &dArsenic&r, you will have to mine and &3centrifuge&r &aRealgar&r, or put &aCobaltite&r through an EBF.", "quests.low_voltage.lv_assembler.title": "Basic Assembler", - "quests.low_voltage.lv_assembler.subtitle": "This bad boy is assembling better than you and IKEA", - "quests.low_voltage.lv_assembler.desc.1": "While this is an extremely &9important&r machine for progression, this will &9&lnot help you immediately&r as it is &cexpensive.&r Most of the recipes you will want to pursue require &cfluids&r. Set up a little bit more infrastructure before rushing this.\n\nWith that out of the way, the &3Assembler&r is crucial to gameplay. Consider it as important as a Crafting Table, except... well, it's a machine, duh.", - "quests.low_voltage.lv_assembler.desc.2": "Once you have enough infrastructure you will be able to make use of better recipes for:\n\n&9-&r &6Vacuum Tubes&r, giving over double the previous yield\n\n&9-&r &6Resistors&r, granting 4 resistors per craft!\n\n&9-&r &6Circuit Boards&r, greatly reducing copper used\n\nWahoo!\n\n&l&3Lore:&r&o Back in the days of GregTech 2, the Assembling Machine only had two slots, and was only really used for alternate Circuit and Hull recipes.", + "quests.low_voltage.lv_assembler.subtitle": "No IKEA instruction manual required", + "quests.low_voltage.lv_assembler.desc.1": "While this is an extremely &9important&r machine for progression, we don't recommend trying to craft it as your first LV machine as it is &cexpensive.&r\n\nHowever, if you've followed the quests up to this point, now is a good time to craft it!\n\nThe &3Assembler&r is crucial to gameplay. Consider it as important as a Crafting Table, except... well, it's a machine, duh.", + "quests.low_voltage.lv_assembler.desc.2": "You will be able to make use of better recipes for:\n\n&9-&r &6Vacuum Tubes&r, giving over double the previous yield\n\n&9-&r &6Resistors&r, granting 4 resistors per craft!\n\n&9-&r &6Circuit Boards&r, greatly reducing copper used.\n\nWahoo!\n\n&l&3Lore:&r&o Back in the days of GregTech 2, the Assembling Machine only had two slots, and was only really used for alternate Circuit and Hull recipes.", "quests.low_voltage.lv_assembler.task": "Basic Assembler", - "quests.low_voltage.t2_circuit_board.subtitle": "Yeah yeah it's wood but don't under estimate it", - "quests.low_voltage.t2_circuit_board.desc.1": "This Circuit Board is used to create &dMV Circuits&r!\n\n&9Note:&r You have <wo&r options when making the Phenolic Printed Circuit Board. If you use &aSodium Persulfate&r or &aIron III Chloride&r, making boards takes &6only a quarter of the Silver&r as opposed to the crafting recipe.\n\n&lHowever&r, given how painful it may be for you to obtain these chemicals &oright now&r, you can simply use more Silver by mining most of a Galena Vein...\n\nThe quest for &aSodium Persulfate&r is in the &bMV&r chapter, if you're down for some light reading.", + "quests.low_voltage.t2_circuit_board.subtitle": "They don't make 'em like this any more...", + "quests.low_voltage.t2_circuit_board.desc.1": "This Circuit Board is used to create &dMV Circuits&r!\n\n&9Note:&r You have <wo&r options when making the Phenolic Printed Circuit Board. If you use &aSodium Persulfate&r or &aIron III Chloride&r, making boards takes &6only a quarter of the Silver&r as opposed to the Artisan Table recipe.\n\n&lHowever&r, given how painful it may be for you to obtain these chemicals &oright now&r, you can simply use more Silver by mining most of a Galena Vein...\n\nThe quest for &aSodium Persulfate&r is in the &bMV&r chapter, if you're down for some light reading.", "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!", @@ -3075,22 +3181,30 @@ "quests.low_voltage.lv_greenhouse.title": "Electric Greenhouse", "quests.low_voltage.lv_greenhouse.subtitle": "The power of &mKubejs&r... Java", "quests.low_voltage.lv_greenhouse.desc.1": "The multiblock &3Electric Greenhouse&r can be your source of &aLogs&r and other plants if you prefer making GregTech machines over Create contraptions. It also has the unique property of being able to grow more of TFC's decorative plants!", - "quests.low_voltage.lv_greenhouse.desc.2": "&9Note: &rThis multiblock can have its walls customized to use any valid iron tier greenhouse block. Check the EMI multiblock preview for more usable blocks. The EGH can also be inproved in a few ways, including fertilizer or later in &cHV&r with the &3Hydroponics Loop.&r", + "quests.low_voltage.lv_greenhouse.desc.2": "&9Note: &rThis multiblock can have its walls customized to use any valid iron tier greenhouse block. Check the EMI multiblock preview for more usable blocks. The EGH can also be improved in a few ways, including fertilizer or later in &cHV&r with the &3Hydroponics Loop.&r", "quests.low_voltage.lv_greenhouse.desc.3": "&l&3Lore:&r&o This multiblock was originally created for the GTCEu Community Pack, but is also available on the GTCEu developer documentation. It's significantly slower than default to keep in line with TFC's slower tree growing speeds, but prior to TFG 0.9, it used to take almost an hour for each recipe!\n\nIn TFG 0.11 it was remade from scratch with new recipes, a new structure, a mk2 in the form of the hydroponic facility and custom renders by RubenVerg.\n\nThe original subtitle for this quest was \"The power of Kubejs\" since originally it was an example of a custom machine that could be made in Kubejs--A dev kit. But now the structure is entirely made in Java to support TFC's food properties properly.", "quests.low_voltage.lv_centrifuge.title": "Basic Centrifuge", "quests.low_voltage.lv_centrifuge.subtitle": "It does the opposite of the Mixer", "quests.low_voltage.lv_centrifuge.desc.1": "&lOutside of Ore Processing:&r\n\nOh boy, what can't this machine do? Decomposition recipes to separate dust types, separating air, do your taxes, and many others...\n\nThe list is too long! Let's just say &cyou need the Centrifuge&r.", "quests.low_voltage.lv_centrifuge.desc.2": "&lFor Ore Processing:&r\n\nThis takes &aImpure Dust&r or &aPurified Dust&r and turns them into clean Dust, plus an added tiny Dust &6Byproduct&r. This is outside of the optimal chain for Byproducts, but this is also the cheapest Ore Processing machine of the presented array to run and to setup on a small scale.", "quests.low_voltage.lv_centrifuge.desc.3": "&l&3Lore:&r&o In base GTCE, this was objectively the strongest Ore Processing machine as it was fairly easy to use, and gave three tiny dusts, just like the Ore Washer or the Thermal Centrifuge. We tuned it down in favor of diversity.", - "quests.low_voltage.lv_centrifuge.task": "", "quests.low_voltage.lv_glue.title": "Glued", "quests.low_voltage.lv_glue.subtitle": "What a sticky situation", - "quests.low_voltage.lv_glue.desc": "You can now &3centrifuge&r &aSticky Resin&r, which will give you &aGlue&r in fluid form (and the less useful Plantball, &6for now&r).\n\nGive yourself a headstart and get on producing Glue. You can use it to make &6cheaper Resistors&r, as well as &6cheaper Circuit Boards&r in the &3Assembler&r (and it is especially useful &oin the near future&r).\n\n&eNote:&r You can also centrifuge TFC's &aGlue&r or &aConifer Rosin&r, whichever's easiest!", + "quests.low_voltage.lv_glue.desc": "You can now &3centrifuge&r &aSticky Resin&r, which will give you &aGlue&r in fluid form (and the less useful Plantball, for now).\n\nGive yourself a headstart and get on producing Glue. You can use it to make &6cheaper Resistors&r, as well as &6cheaper Circuit Boards&r in the &3Assembler&r.\n\n&eNote:&r You can also centrifuge TFC's &aGlue&r or &aConifer Rosin&r, whichever's easiest!", "quests.low_voltage.lv_glue.task": "Glue", "quests.low_voltage.lv_cutter.title": "Basic Cutter", "quests.low_voltage.lv_cutter.subtitle": "The Cutter... cuts...", "quests.low_voltage.lv_cutter.desc": "For now, you should use &9Water&r for its recipes instead of trying to acquire Lubricant.\n\nIf you don't have one yet, this machine will also cut &6Rods into four Bolts&r.\n\nThis machine is the only way to obtain &dGem Plates&r, which are needed to craft Filters, and by extension, the &3Gas Collector&r.", "quests.low_voltage.lv_cutter.task": "Any cutter", + "quests.low_voltage.lv_distillery.subtitle": "The distillery distills...", + "quests.low_voltage.lv_distillery.desc": "The Distillery is kind of like a centrifuge, but mostly for organic/petrochemical fluids.\n\nIn &7LV&r, you can only extract one output from one input, but this will change after you get to the Distillation Tower in &6HV&r.\n\nYou won't use this machine for all that much in LV (unless you're using Combustion fuel), but it's essential for obtaining &ePhenol&r.", + "quests.low_voltage.phenolic_resin.subtitle": "Artificial Resin", + "quests.low_voltage.phenolic_resin.desc.1": "Phenolic Resin is made from a chemical reaction of &6Phenol&r and &aFormaldehyde&r.\n\nWhile you only really have two options for obtaining the Phenol in &7LV&r (distilling either Creosote or Heavy Fuel), the Formaldehyde will require &dMethane&r, which has more options.", + "quests.low_voltage.phenolic_resin.desc.2": "The simplest (and slowest) is with hydrogen and carbon in a chemical reactor, which will also require very slow water electrolysis.\n\nThe distillery also has many options, including via Creosote.\n\nIf you're using Syngas as a fuel, you can also oxidize that into Methane.\n\nLastly, if you're feeling silly, you can also centrifuge a ton of mushrooms from the Beneath.", + "quests.low_voltage.magnesia.subtitle": "Also the name of a place in Greece!", + "quests.low_voltage.magnesia.desc": "Also known as Magnesium Oxide, Magnesia can be obtained in two ways:\n\n- Magnesite Ore\n\n- React Magnesium and Lye to create Magnesium Hydroxide, then calcinate it in a Coke Oven. Magnesium can be obtained from a variety of different ores.", + "quests.low_voltage.refractory_brick.subtitle": "The Coolerâ„Ē Fire Bricks", + "quests.low_voltage.refractory_brick.desc": "It's almost time to tear down your old TFC blast furnace setup! If you'd like, you can recycle most of it down into &6Refractory Clay Dust&r (we recommend using the Arc Furnace so you get back both the dust and the iron!), otherwise you can cook up some more Fire Clay. Just make sure you've got a large stockpile of Steel first!\n\nFrom there, mix the refractory clay dust with some Magnesia, Graphite, and Resin to create the improved ceramics required for &dyour first Coils&r.", "quests.low_voltage.lv_gas_collector.title": "Basic Gas Collector", "quests.low_voltage.lv_gas_collector.subtitle": "It'll take your breath away", "quests.low_voltage.lv_gas_collector.desc": "The Gas Collector collects Air that can then be centrifuged into &aOxygen&r and &aNitrogen&r.\n\n&l&3Lore:&r&o GregTech 5 players remember when they had to use a Compressor with IC2 cells to get Compressed Air... here, cell chemistry is no more.", @@ -3098,7 +3212,7 @@ "quests.low_voltage.lv_oxygen.subtitle": "Achtually, it's Dioxygen...", "quests.low_voltage.lv_oxygen.desc.1": "You could waste &o&eprecious years of your life&r in JEI looking for the most optimal Oxygen recipe, given the many ways to obtain it. Various minerals will produce it when electrolyzed.\n\nIf only the quest book had more information!", "quests.low_voltage.lv_oxygen.desc.2": "Surprise! The best source according to us (!) is &acentrifuging Air&r after making a &dGas Collector&r, which you might not be able to make just yet. This recipe also gives &aNitrogen&r, which is handy as it can speed up certain &3Electric Blast Furnace&r recipes&r.\n\nThe second best source according to us (!) is &aelectrolyzing Silicon Dioxide&r. Silicon Dioxide is obtained from various sources, such as Glass Dust and various Stone Dusts. We will come back to &6this method later&r because this one is actually &6god&r.", - "quests.low_voltage.lv_oxygen.desc.3": "The third best source according to us (!) is &aelectrolyzing Water&r. In reality, electrolysis of water is more suitable for &aHydrogen production&r due to the higher energy cost. &4Don't use this method as your main source of Oxygen&r, only for &1Hydrogen&r, once again we will help you later on to make Hydrogen.\n\nThe fourth best source according to us (!) is &ato not void&r it, EVER! Any Oxygen obtained from any source is worth something and should be stored in Tanks.\n\n&eNote:&r Submit a fluid by having it stored in &lany&r tank in your inventory. A bucket will also work.", + "quests.low_voltage.lv_oxygen.desc.3": "The third best source according to us (!) is &aelectrolyzing Water&r. In reality, electrolysis of water is more suitable for &aHydrogen production&r due to the higher energy cost. &4Don't use this method as your main source of Oxygen&r, only for &1Hydrogen&r, once again we will help you later on to make Hydrogen.\n\nThe fourth best source according to us (!) is &ato not void&r it, EVER! Any Oxygen obtained from any source is worth something and should be stored in Tanks.", "quests.low_voltage.lv_oxygen.task": "Oxygen", "quests.low_voltage.lv_nitrogen.title": "Nitrogen Gas", "quests.low_voltage.lv_nitrogen.subtitle": "Your EBF booster", @@ -3116,7 +3230,7 @@ "quests.low_voltage.lv_chemical_reactor.subtitle": "Chemistry for dummies", "quests.low_voltage.lv_chemical_reactor.task": "Liquid Rubber", "quests.low_voltage.lv_chemical_reactor.desc.1": "The &3Chemical Reactor&r will be required for &la lot&r of recipes.\n\nLet's give it a spin - why don't we use your freshly made Chemical Reactor to unlock a new, &6better recipe for Rubber&r? Rubber is &dunusable&r as a Fluid, so you will need to make another machine to process it further.", - "quests.low_voltage.lv_chemical_reactor.desc.2": "You can't make Rubber using the Chemical Reactor alone, so here are some &aother machines&r you might want to aim for: \n\nA &3Solidifier&r is useful to solidify your Rubber directly into &aRubber Sheets&r. You'll want these moving forward.\n\nYou could then make use of an &3Assembler&r to use your molten Rubber for &aCables&r. This isn't important for Tin Cables, but better cables will &eneed&r to be made in the Assembler.\n\n&eNote:&r Submit a fluid by having it stored in &lany&r tank in your inventory. A Drum is the perfect candidate.", + "quests.low_voltage.lv_chemical_reactor.desc.2": "You can't make Rubber using the Chemical Reactor alone, so here are some &aother machines&r you might want to aim for: \n\nA &3Solidifier&r is useful to solidify your Rubber directly into &aRubber Sheets&r. You'll want these moving forward.\n\nYou could then make use of an &3Assembler&r to use your molten Rubber for &aCables&r. This isn't important for Tin Cables, but better cables will &eneed&r to be made in the Assembler.", "quests.low_voltage.lv_fluid_solidifier.title": "Basic Fluid Solidifier", "quests.low_voltage.lv_fluid_solidifier.subtitle": "The Fluid Solidifier solidifies...", "quests.low_voltage.lv_fluid_solidifier.desc": "Build this machine next to your &3Chemical Reactor&r to automatically solidify Rubber into &aRubber Sheets&r.\n\nYou can make your Chemical Reactor auto-output if you &dwrench&r the side of your &3Chemical Reactor&r and enable Fluid &9auto-output&r.\n\nThere will be more Fluids to solidify, so you may re-purpose your &3Fluid Solidifier&r when not crafting Rubber - or make a second one!", @@ -3131,7 +3245,7 @@ "quests.low_voltage.cupronickel_ingot.desc": "A big part of progression in GregTech revolves around gaining access to new materials that you'll use to upgrade your machines or unlock advanced components.\n\nOne such material you'll encounter is &bCupronickel&r — the beginning of a long journey.\nThis material is used to build your first &6Electric Blast Furnace&r, an essential step in your industrial growth.\n\nLuckily, this first step is fairly simple: an Alloy Smelter will get the job done.\nSo even if the recipe asks for &b128 Cupronickel&r, don't worry — it's easier than it looks!&r\n\nLater on, their counterparts will become much more complex, so enjoy the simplicity while it lasts!", "quests.low_voltage.cupronickel_coil.title": "Cupronickel Coils", "quests.low_voltage.cupronickel_coil.subtitle": "Baby's first heating coil", - "quests.low_voltage.cupronickel_coil.desc": "Prepare &a128 Cupronickel&r, &a32 Bronze&r and &a16 Tin Alloy&r to craft the Heating Coils required for your first Electric Blast Furnace.\n\nThis is still less than half (!) of the cost of the whole EBF in raw materials. You will also need about a stack each of Invar and Steel, so get mining.\n\nThe Cupronickel Coils will allow the EBF to perform recipes up to &d1,800K&r (ignoring Voltage bonuses). That's pretty hot if you ask us.\n\n&6Tutorial on Coils in the &lGregTech Energy&r&6 tab - check it out to learn more!&r", + "quests.low_voltage.cupronickel_coil.desc": "Prepare &a128 Cupronickel&r, &a32 Blue Steel&r and &a16 Tin Alloy&r ingots, as well as &a128 Refractory Bricks&r to craft the Heating Coils required for your first Electric Blast Furnace.\n\nThis is still less than half (!) of the cost of the whole EBF in raw materials. You will also need about a stack each of Invar and Steel, so get mining.\n\nThe Cupronickel Coils will allow the EBF to perform recipes up to &d1,800K&r (ignoring Voltage bonuses). That's pretty hot if you ask us.\n\n&6Tutorial on Coils in the &lGregTech Energy&r&6 tab - check it out to learn more!&r", "quests.low_voltage.lv_ebf.title": "The Electric Blast Furnace", "quests.low_voltage.lv_ebf.subtitle": "One of the core machines of GregTech. We like it big.", "quests.low_voltage.lv_ebf.desc.1": "This quest explains the core mechanic of the &3Electric Blast Furnace&r, while the quest just over this one will explain the mechanics of the Multiblock Parts that you'll also need. Be sure to check this quest out.\n\nAnyway, the &3EBF&r is your &efirst electric multiblock&r! Congrats. It's used to process materials at high temperatures.\n\nYou'll become familiar with the EBF to make &aAluminium&r and progress to &d&bMV Age&r. It can also make &7Steel&r faster than the the &6Blast Furnace&r, which means you can finally tear down your old TFC smithy if you'd like.", @@ -3159,13 +3273,26 @@ "quests.low_voltage.mv_hull.desc2": "Before going further into &bMV&r, remember that in &6TFG&r you can use &6Create&r to reinforce your infrastructure if you don't want to use too much of GregTech. Aluminium Shafts and Cogwheels have 4x the stress capacity of steel ones, so you should be able to run all your machines much faster with them!", "quests.low_voltage.aluminium_greate.title": "Aluminium-tier Greate", "quests.low_voltage.aluminium_greate.subtitle": "Also known as Medium Stress", - "quests.low_voltage.aluminium_greate.desc": "It's been a while since your last upgrade, but now you have access to the next tier of Greate cogs and shafts. Like before, the aluminium ones have &bfour times&r the stress capacity of steel.\n\nContinuing with Greate beyond this point is very optional, and we encourage you to move over to GregTech, but the upgrade may help you de-spaghettify some of your old setups if you'd like to continue using them.\n\nYou can scale up your stress more with a &eSteam Engine&r, or convert EU into SU via the &9Create Additions&r &eElectric Motor&r.", + "quests.low_voltage.aluminium_greate.desc": "It's been a while since your last upgrade, but now you have access to the next tier of Greate cogs and shafts. Like before, the aluminium ones have &bfour times&r the stress capacity of steel.\n\nContinuing with Greate beyond this point is very optional, and we encourage you to move over to GregTech, but the upgrade may help you de-spaghettify some of your old setups if you'd like to continue using them.\n\nYou can scale up your stress production with a &eSteam Engine&r, or convert EU into SU via the &9Create Additions&r &eElectric Motor&r.", "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.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 convert it into Diesel to power your Combustion Generators.", "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.low_voltage.next_machines.title": "Even more machines", + "quests.low_voltage.next_machines.subtitle": "Now the fun begins", + "quests.low_voltage.next_machines.desc": "Now that you've got a few machines going, it's time to put them to work.\n\nTo the right of this quest are some purely optional machines (we don't know where else to put them in this chapter!), but otherwise the Assembler will make electronic components cheaper, while the Chemical Reactor, Extractor, and Fluid Solidifier will make Rubber cheaper. After that, the rest of &7LV&r is yours to explore!", + "quests.low_voltage.food_machines.title": "Food Machines", + "quests.low_voltage.food_machines.subtitle": "Fast Food on the Go", + "quests.low_voltage.food_machines.desc": "The Food Processor and Electric Oven are two custom machines designed specifically to work with TerraFirmaCraft's food system.\n\nThe processor can handle mixing bowl recipes, soups, sandwiches, smoking, brining, drying... You name it, this machine can do it. Except for cooking. That's what the oven is for.\n\nThe Rotten Voiding Cover can be placed on any machine or Input Bus to automatically void any food items that become rotten. Useful to stop your food automation from getting backed up!", + "quests.low_voltage.bakelite.subtitle": "Also known as Poly­oxy­benzyl­methylen­glycol­anhydride... try saying that five times fast", + "quests.low_voltage.bakelite.desc.1": "Your first Polymer! Simply mix Phenolic Resin with either Asbestos or Treated Chipboard Composite to finish it.\n\nYou'll be using Bakelite for crafting both Phenolic Circuit Boards and MV Machine Hulls, so making a big batch of it is a good idea, though you'll replace it with Polyethylene in &bMV&r.\n\nYou now also have access to a cheaper recipe for ULV and LV Machine Hulls!", + "quests.low_voltage.bakelite.desc.2": "&l&3Lore:&r&o Bakelite is the first plastic made from synthetic components. The award for first plastic ever goes to Parkesine, but that requires Nitrocellulose which is a long long chain of recipes to craft - too long for LV.\n\nThe second ever plastic is Galalith, created with milk proteins and formaldehyde, but milk is difficult to automate.", + "quests.low_voltage.lv_forming_press.subtitle": "The Forming Press forms...", + "quests.low_voltage.lv_forming_press.desc": "This machine usually isn't used for much, but in TFG it can do TFC Welding recipes if you still need access to them for any reason. It can also easily duplicate any extruder or casting mold.\n\nMore pressingly (pun intended), you'll need it to craft an essential component for your next circuits, the &aPhenolic Circuit Board&r.\n\nYou'll gain access to a cheaper recipe once you're in &bMV&r.", + "quests.low_voltage.lv_laser_engraver.subtitle": "Pew pew!", + "quests.low_voltage.lv_laser_engraver.desc": "The Basic Laser Engraver is required to make Transmitters for Create's logistics system. Other than that, it unfortunately can't do much other than make polished stone.\n\nYou'll deal with lasers more once you get to &bMV&r.", "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!", @@ -3185,7 +3312,7 @@ "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...", - "quests.medium_voltage.electrolyzer.desc.1": "&bThis one should look familiar&r—you’ve seen it before.\n&2We highly recommend crafting it as soon as possible,&r as it will unlock a wide range of new &7Aluminium&r sources.\n\nUntil now, your only method was &9electrolyzing Sapphire&r to obtain &7Aluminium Dust&r.\nBut with the &bMV&r Electrolyzer, a whole new world of resources opens up.", + "quests.medium_voltage.electrolyzer.desc.1": "&bThis one should look familiar&r—you’ve seen it before.\n&2We highly recommend crafting it as soon as possible,&r as it will unlock a wide range of new &7Aluminium&r sources.\n\nUntil now, you were limited to electrolyzing Sapphire or ore processing byproducts to obtain &7Aluminium Dust&r.\nBut with the &bMV&r Electrolyzer, a whole new world of resources opens up.", "quests.medium_voltage.electrolyzer.desc.2": "&6Here are some key materials to look for:&r\n&9Ruby&r – Grants both &7Aluminium&r and &5Chromium&r.\n&9Pyrope&r – Often found alongside Sapphire veins.\n&9Lepidolite&r – Offers a generous selection of valuable byproducts.\n&9Sodalite&r – Comes with &3Chlorine&r and &bSilicon&r.\n&9Topaz&r – Yields both &3Fluorine&r and &7Aluminium&r in solid quantities.\n\n&2And that’s just the beginning!&r Use &aEMI&r to explore even more options—we promise, there’s a lot to discover.\n\n&cOh, and by the way:&r Electrolyzing Clay is now gated behind &6HV&r. \n&7We’re not sorry.&r", "quests.medium_voltage.mv_extruder.title": "Advanced Extruder", "quests.medium_voltage.mv_extruder.subtitle": "The biggest upgrade you'll make", @@ -3419,6 +3546,9 @@ "quests.medium_voltage.stainless_greate.title": "Stainless Steel-tier Greate", "quests.medium_voltage.stainless_greate.subtitle": "High Stress", "quests.medium_voltage.stainless_greate.desc": "This quest is just here to let you know that Greate has another upgrade at this point.\n\nYou may find the next tier of Crushing Wheels useful, as they can give the full amount of byproducts, just like the HV Macerator, but also process multiple items at the same time!", + "quests.medium_voltage.terminal_dismantler.title": "Dismantler Terminal", + "quests.medium_voltage.terminal_dismantler.subtitle": "When your wrench isn't fast enough", + "quests.medium_voltage.terminal_dismantler.desc": "The &8Dismantler&r is an amazing tool, allowing you to dismantle your multiblocks instantly by simply shift-right-clicking the controller, though be wary that the Multiblock must be fully formed to be completely dismantled.", "quests.metal_age": "Metallurgy Age", "quests.metal_age.subtitle": "Your First Technological Advancements.", "quests.metal_age.weld_bronze_ingots.title": "Welding Bronze", @@ -3448,6 +3578,9 @@ "quests.metal_age.wrought_iron_anvil.title": "T3 Anvil: Wrought Iron", "quests.metal_age.wrought_iron_anvil.subtitle": "Waterwheels, Windmills and more Greate", "quests.metal_age.wrought_iron_anvil.desc": "With the Wrought Iron Anvil you'll be able to work Wrought Iron Ingots into different items such as Sheets, Tool heads, etc.\n\nWrought Iron tools and armor isn't much of an improvement over Bronze, but it has far more durability.\n\nCreating the next anvil is going to be a significant step up in difficulty, so this is a good point to settle down and explore some of the other things this modpack has to offer.", + "quests.metal_age.toolbelt.title": "Toolbelt", + "quests.metal_age.toolbelt.subtitle": "Free up your inventory!", + "quests.metal_age.toolbelt.desc": "Put one of these in your &6Belt Slot&r and you'll free up a whole row of your inventory!\n\nYou can swap tools at any time by pressing the &aSwap Tool&r (default: X) keybind to open a radial menu.\n\nToolbelts can be upgraded with eight pouches to hold 9 items total.", "quests.metal_age.coke_oven.title": "Coke Oven", "quests.metal_age.coke_oven.subtitle": "Finally, No More Charcoal Piles", "quests.metal_age.coke_oven.desc.1": "The Coke Oven is your first GregTech multiblock! It allows you to automatically create Charcoal and other powerful combustibles. The Coke Oven will burn one Log into one Charcoal and 250mb of Creosote, which is an important chemical used in wood treating and as an early fuel.\n\nIf you craft the main Coke Oven block and press the JEI 'Uses' key on it (defaults to \"U\"), you'll find the tab called \"Multiblock Info\", which shows you how to build the Coke Oven in the world.\n\nYou can also just place the Controller block in the world, and interact with it while sneaking to create a Hologram of blocks missing.", @@ -3814,12 +3947,20 @@ "quests.space_survival.bulbkin_pie.desc": "Wraptor Eggs can be extracted for a Sugar substitute, while Sniffer eggs are full of Cream.\n\n&eBulbkin Pie&r is probably the pinnacle of Mars' food, boasting high amounts of four different kinds of nutrition, at the expense of being a bit of a pain to craft.\n\n&eBeer-Battered Dinosaur Nuggets&r combine the huge protein of dinosaur meat with a little grain, and can also be put in your meal bags.\n\n&9Tip:&r It's not really a food, but you can also mix together Bulbkin Chunks and Alphacene Mushroom Blocks to get Glowstone Dust.", "quests.space_survival.soarer.title": "Soarer", "quests.space_survival.soarer.subtitle": "Need a lift?", - "quests.space_survival.soarer.desc": "Airplanes don't work on Mars, and your space suit doesn't have a jetpack, so there's no other way to fly, right?\n\nIf you're able to find an elusive &4Soarer&r, you can tame them with raw fish and equip them with a Saddle to glide through the Martian skies with ease.\n\nThey can't fly forever though, indicated by the wing icons on the top left, and will need to land occasionally. Still, they're a great option for long-distance travel, and won't upset the sandworm either!\n\n&9Note&r: Soarers are unable to survive on particularly hot planets such as &6Venus&r.", + "quests.space_survival.soarer.desc": "Airplanes don't work on Mars, and your space suit doesn't have a jetpack, so there's no other way to fly, right?\n\nIf you're able to find an elusive &4Soarer&r, you can tame them with Raw Fish and equip them with a Saddle to glide through the Martian skies with ease.\n\nThey can't fly forever though, indicated by the wing icons on the top left, and will need to land occasionally. (You can feed them more Raw Fish to speed up their recovery.)\n\nStill, they're a great option for long-distance travel, and won't upset the sandworm either!\n\n&9Note&r: Soarers are unable to survive on particularly hot planets such as &6Venus&r.", "quests.space_survival.soarer.task": "Find a Soarer", "quests.space_survival.surfer.title": "Surfer", "quests.space_survival.surfer.subtitle": "Need a swim?", "quests.space_survival.surfer.desc": "&bSurfers&r can be found in the small bodies of water. You can tame them by sneaking up to them while they're lying on the shore, and feeding them raw fish. Once tamed, you can equip them with a saddle to swim quickly underwater too.\n\nThis doesn't sound particularly useful on Mars, but remember that you can transport entities around through AE2's Spatial Storage Disks, and there will be a certain oceanic icy moon in the future...\n\n&9Note&r: Surfers are unable to survive on particularly hot planets such as &6Venus&r.", "quests.space_survival.surfer.task": "Find a Surfer", + "quests.space_survival.charger.title": "Charger", + "quests.space_survival.charger.subtitle": "Chaaaaaaaaarge!", + "quests.space_survival.charger.desc": "&bChargers&r are large green herbivores that can be found roaming around. You can tame them with any Martian crop, but don't feed them &cBeetroot&r...\n\nOnce tamed, you can equip them with a saddle and Armor for some extra defence, hold down Spacebar to charge forward in a straight line (dealing extra damage and knockback), or press the &eSpecial Ability&r keybind (default &9C&r) for a headbutt attack.\n\nFeeding them more Martian crops will restore their health.\n\n&9Note&r: Surfers are unable to survive on particularly hot planets such as &6Venus&r.", + "quests.space_survival.charger.task": "Find a Charger", + "quests.space_survival.snatcher.title": "Snatcher", + "quests.space_survival.snatcher.subtitle": "Yoink!", + "quests.space_survival.snatcher.desc": "&bSnatchers&r are passive animals that like to steal your stuff! Attack them to retrieve your items, or feed them Raw Fish to tame them.\n\nOnce tamed, you can carry them on your back and equip them with a wooden chest for a little extra inventory space. Press the &eSpecial Ability&r keybind (default &9C&r) to throw them, and they will steal the contents of a nearby chest and bring it to you.\n\nFeeding them more Raw Fish will restore their health.\n\n&9Note&r: Surfers are unable to survive on particularly hot planets such as &6Venus&r.", + "quests.space_survival.snatcher.task": "Find a Snatcher", "quests.space_survival.sniffer_or_wraptor.title": "Sniffers and Wraptors", "quests.space_survival.sniffer_or_wraptor.subtitle": "Cow and Chicken", "quests.space_survival.sniffer_or_wraptor.desc": "&2Sniffers&r and &dWraptors&r can be found all over Mars and can be domesticated for meat, eggs, and most importantly, their mineral-rich tufts and feathers.\n\nThey eat any Martian crops, and you can automatically breed and feed them with the Feeding Troughs just like on Earth.", @@ -3831,10 +3972,10 @@ "quests.space_survival.mars_nest.task": "Either Nest", "quests.space_survival.mineral_rich_wool.title": "Mineral-Rich Wool", "quests.space_survival.mineral_rich_wool.subtitle": "Built up from years of dust storms", - "quests.space_survival.mineral_rich_wool.desc": "Once your Sniffers or Wraptors are familiar enough, you can shear them for mineral-rich tufts of fur or feathers.\n\nThese can be melted down in an EBF for an infinite and cheap source of Alkaline Earth Silicate, and are also a required component of &6Bio-AES Reinforced R-Polyurethane Foam.", + "quests.space_survival.mineral_rich_wool.desc": "Once your Sniffers or Wraptors are familiar enough, you can shear them for mineral-rich tufts of fur or feathers. (This can be automated with a Deployer holding Shears.)\n\nThese can be melted down in an EBF for an infinite and cheap source of Alkaline Earth Silicate, and are also a required component of &6Bio-AES Reinforced R-Polyurethane Foam.", "quests.space_survival.aes_insulation.title": "Multi-Layer Insulated Shielding", "quests.space_survival.aes_insulation.subtitle": "Not an ice cream sandwich", - "quests.space_survival.aes_insulation.desc": "This may not be used for much at the moment, but it will be a critical component of your &1IV&r rocket in the future.", + "quests.space_survival.aes_insulation.desc": "This is used for a few components in &1IV&r.", "quests.space_survival.mars_shields.title": "Advanced Shields", "quests.space_survival.mars_shields.subtitle": "Isn't it about time you upgraded your old metal shield?", "quests.space_survival.mars_shields.desc": "The &3Reinforced Shield&r deals damage back to attackers, like the Thorns enchant in normal Minecraft. Its crafting materials can be found from Crunchers and Eaters.\n\nThe &5Corrupted Shield&r randomly teleports attackers, which can be good for keeping them away from you... but it can also teleport them behind you. You can get the teeth from the Cave Endermen under the surface.\n\nThe &4Ricoshield&r absorbs an amount of damage before releasing a shockwave, hurting anything else nearby. You can find the Kinetic Core as a rare drop from the hostile golems in the Martian caves.", @@ -3857,7 +3998,8 @@ "quests.steam_age.create_tools.desc": "A wrench will let you quickly pick up Create blocks by Sneak + Right-Clicking on them, though an axe or pickaxe will still work too. The goggles will let you see much more detailed information about your machines, such as how much stress they're producing or consuming.\n\nBoth of these are optional for now, but will prove to be very useful, and you'll definitely want them later.\n\nCheck the TFG Tips chapter for help on glassblowing. Did you know that breaking cobblestone with a hammer will turn it into gravel, and breaking that again will turn it into sand...?", "quests.steam_age.basic_millstone.title": "Automatic Ore Processing", "quests.steam_age.basic_millstone.subtitle": "No more querning", - "quests.steam_age.basic_millstone.desc": "The &3Millstone&r is an automatic version of the Quern. You can throw whatever you'd like into the top, and then right-click to take your crushed items back out. It's pretty slow if you connect it directly to your Animal Crank, but you can use gear ratios to increase its speed.\n\nYou will only receive the output in the first slot. The other slots are part of a GregTech mechanic that won't be relevant until much later (&6HV&r).", + "quests.steam_age.basic_millstone.desc.1": "The &3Millstone&r is an automatic version of the Quern. You can throw whatever you'd like into the top, and then right-click to take your crushed items back out. It's pretty slow if you connect it directly to your Animal Crank, but you can use gear ratios to increase its speed.\n\nYou will only receive the output in the first slot. The other slots are part of a GregTech mechanic that won't be relevant until much later (&6HV&r).", + "quests.steam_age.basic_millstone.desc.2": "&l&3Lore:&r&o The millstone can't be used to process grains into flour because Create doesn't understand TFC's food expiry system, which previously led to all sorts of bugs involving rotten items becoming fresh and vice versa. Until you're able to get the Food Processor in &7LV&r, you can still crush your grains via a Mortar in a crafting grid.", "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.", @@ -4017,7 +4159,7 @@ "quests.steam_age.resin_boards.desc": "Did you know tree taps can drip directly into GregTech pipes and drums? Now you do!", "quests.steam_age.circuit_boards.title": "Electronics #2: Circuit Boards", "quests.steam_age.circuit_boards.subtitle": "The easier component for circuits", - "quests.steam_age.circuit_boards.desc": "Combine those Resin Circuit Boards with some Copper Wires and you've got the base for your first &aCircuit&r!", + "quests.steam_age.circuit_boards.desc": "Some delicate craftsmanship in an &3Artisan Table&r will allow you to combine those Resin Circuit Boards with some Copper Wires to create your first &aCircuit Boards&r!\n\nThe Artisan Table works on the same principal as Knapping, but this time with additional item and tool inputs.", "quests.steam_age.vacuum_chamber.title": "Vacuum Chamber", "quests.steam_age.vacuum_chamber.subtitle": "Putting the Vacuum in Vacuum Tubes", "quests.steam_age.vacuum_chamber.desc": "This machine is the final step in making your first Vacuum Tubes. Place it above a Basin and give it some power, and make sure the machine is set to Vacuumizing mode.\n\nThis machine can also help liquefy glue and rubber while being heated by either a Charcoal Forge or a Blaze Burner.", @@ -4048,7 +4190,7 @@ "quests.steam_age.rolling_mill.desc.2": "&l&3Lore:&r &oThis machine existed in older versions of TFG, but it made rods instead of plates, and your best plate-making option before the LV bender had a 20 percent chance of failure!&r", "quests.steam_age.steel_mixer.title": "Steel Mechanical Mixer", "quests.steam_age.steel_mixer.subtitle": "An earlier LV Mixer", - "quests.steam_age.steel_mixer.desc": "The &3Steel Mechanical Mixer&r is the other best steam age machine you can make -- it can mix together your colored steel dusts at a much more efficient rate than the Crucible! It can do a large number of other recipes too, including some that involve gases... don't think about it too much.\n\nYou can use either a Charcoal Forge or a Blaze Burner for the recipes that require heating, and a Mechanical Arm can automatically refuel either.", + "quests.steam_age.steel_mixer.desc": "The &3Steel Mechanical Mixer&r is the other best steam age machine you can make -- it can mix together your black steel dusts at a much more efficient rate than the Crucible! Unfortunately, it can't make red or blue steel dusts directly, but it can make their &aweak versions&r.\n\nIt can do a large number of other recipes too, including some that involve gases... don't think about it too much.\n\nYou can use either a Charcoal Forge or a Blaze Burner for the recipes that require heating, and a Mechanical Arm can automatically refuel either.", "quests.steam_age.potin.title": "Potin Seller...", "quests.steam_age.potin.subtitle": "...I'm going into battle, and I need only your finest Potin.", "quests.steam_age.potin.desc.1": "&dPotin Fluid Pipes&r have a &avery high throughput&r for the material tier and cost. You may want to look into making some of these to aid with fluid logistics.\n\nTo get &dPotin&r, you should start by crafting its &eDust&r form.\n\nThis quest calls for either the small or normal pipe. Get either size to complete it.", @@ -4068,7 +4210,7 @@ "quests.steam_age.what_next.desc": "If you rushed straight here, we suggest machines like the LV Bender, Wiremill, or Mixer first.\nOtherwise, if you made the kinetic machines below, we suggest the Assembler, Arc Furnace, Chemical Reactor, or Polarizer.", "quests.steam_age.alternator.title": "Alternators", "quests.steam_age.alternator.subtitle": "Turning stress into power", - "quests.steam_age.alternator.desc.1": "If you've got a big steam age set up, you probably don't want to immediately scrap it all just to go back to some boilers and LV Steam Turbines. Instead, the &3Alternator&r will convert the SU from your steam engines into electricity. Each steam engine + alternator should give you 1A of LV!\n\nUnfortunately, alternators convert stress into a different electricity system (Forge Energy) than the one GregTech uses (Energy Units), so you'll need an Energy Converter to turn it into usable LV energy. Be sure to hit it with a Soft Mallet to convert it to FE to EU mode.", + "quests.steam_age.alternator.desc.1": "If you've got a big steam age set up, you probably don't want to immediately scrap it all just to go back to some boilers and LV Steam Turbines. Instead, the &3Alternator&r will convert the SU from your steam engines into electricity. Each steam engine + alternator should give you 1A of &7LV&r!\n\nUnfortunately, alternators convert stress into a different electricity system (Forge Energy) than the one GregTech uses (Energy Units), so you'll need an Energy Converter to turn it into usable &7LV&r energy. Be sure to hit it with a Soft Mallet to convert it to &aFE to EU&r mode.", "quests.steam_age.alternator.desc.2": "An example of a steam engine producing 8 amps of LV!\n", "quests.steam_age.packager.title": "Create Logistics", "quests.steam_age.packager.subtitle": "\"We have AE2 at home\"", @@ -4109,7 +4251,7 @@ "quests.stone_age.soup_time.desc": "By crafting a pot and some bowls out of clay, you'll be able to create soups!\n\nSoups are one of the first and easiest ways to create more complex meals. Unlike eating plain ingredients, these contain much more saturation and let you consume multiple nutrients at once!", "quests.stone_age.meals.title": "Meals", "quests.stone_age.meals.subtitle": "GET IN MAH BELLEH!", - "quests.stone_age.meals.desc": "These are just some of the basic meals you can create. Soups, salads, and sandwiches are your go-tos for easy high saturation combined meals, while pizzas are the only food that can contain every type of nutrient at once.", + "quests.stone_age.meals.desc": "These are just some of the basic meals you can create. Soups, salads, and sandwiches are your go-tos for easy high saturation combined meals.", "quests.stone_age.meals.tasks.1": "Any regular Sandwich", "quests.stone_age.meals.tasks.2": "Any regular Jam Sandwich", "quests.stone_age.garlic_bread.title": "Garlic Bread...?", @@ -4255,6 +4397,7 @@ "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.desc.3": "Be careful around anything &cCarcinogenic&r or &cRadioactive&r - these conditions are &epermanent&r until you're able to craft Paracetamol in &7LV&r.", "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.", @@ -4839,6 +4982,9 @@ "quests.tfg_tips.greenhouse_automation.title": "Greenhouse Automation", "quests.tfg_tips.greenhouse_automation.subtitle": "By your powers combined...", "quests.tfg_tips.greenhouse_automation.desc": "With the combination of Firmalife's &2Picker&r and &2Sweeper&r, Create's Deployers, and GregTech's Item Collectors, it's possible to completely automate your greenhouse!\n\nPickers will pull mature crops from Hydroponic Planters and Quad Planters when they receive a redstone pulse, while Sweepers will harvest mature crops from the other types in a 3x3 area around it while connected to a redstone signal.\n\nThese machines will produce loose items, but an Item Collector will suck those up in a large area around it.\n\nFrom there, pipe the seeds back into Deployers to plant them in the Planters!", + "quests.tfg_tips.food_automation.title": "Food Automation", + "quests.tfg_tips.food_automation.subtitle": "Automate your kitchen.", + "quests.tfg_tips.food_automation.desc": "You can completely automate food starting from &7LV&r using the &3Food Oven&r and &3Food Processor&r.\n\nTo properly make food out of multiple ingredients in a Food Processor, such as sandwiches, you will have to use the &3Robot Arm&r with the \"Keep Exact\" button enabled (or have your Create logstics deliver exact amounts to your machines).\n\nTo prevent spoiled food from filling up your storage you should use the &3Rotten Voiding Cover&r.\n\nThis will later pair nicely with a refrigerator in &bMV&r.", "quests.tfg_tips.beekeeping.title": "Beekeeping", "quests.tfg_tips.beekeeping.subtitle": "They're so small now...", "quests.tfg_tips.beekeeping.desc": "&bBeekeeping&r has a plethora of uses. Not only do bees fertilize nearby crops (assuming you have the correct trait), you will be able to obtain useful resources such as &aWax&r and &aHoney.&r Breed bees to achieve better stats.\nThe &2Field Guide&r offers an extensive explanation of all &bbeekeeping&r mechanics.", diff --git a/kubejs/assets/tfg/lang/fr_fr.json b/kubejs/assets/tfg/lang/fr_fr.json index 9a9a4317b..49830c29e 100644 --- a/kubejs/assets/tfg/lang/fr_fr.json +++ b/kubejs/assets/tfg/lang/fr_fr.json @@ -1030,6 +1030,9 @@ "ore_vein.tfg.deep_sapphire": "Sapphire & Almandine", "ore_vein.tfg.deep_scheelite": "Scheelite & Tungstate", "ore_vein.tfg.deep_topaz": "Topaz & Chalcocite", + "ore_vein.tfg.desert_oilsands": "Desert Oilsands", + "ore_vein.tfg.desert_oilsands.emi.0": "Only in dry climates.", + "ore_vein.tfg.desert_oilsands.emi.1": "Max rainfall: 120mm", "ore_vein.tfg.normal_apatite": "Apatite & Pyrochlore", "ore_vein.tfg.normal_basaltic_sands": "Mineral Sands", "ore_vein.tfg.normal_beryllium": "Emerald & Beryllium", @@ -3124,7 +3127,7 @@ "quests.stone_age.soup_time.desc": "By crafting a pot and some bowls out of clay, you'll be able to create soups!\n\nSoups are one of the first and easiest ways to create more complex meals. Unlike eating plain ingredients, these contain much more saturation and let you consume multiple nutrients at once!", "quests.stone_age.meals.title": "Meals", "quests.stone_age.meals.subtitle": "GET IN MAH BELLEH!", - "quests.stone_age.meals.desc": "These are just some of the basic meals you can create. Soups, salads, and sandwiches are your go-tos for easy high saturation combined meals, while pizzas are the only food that can contain every type of nutrient at once.", + "quests.stone_age.meals.desc": "These are just some of the basic meals you can create. Soups, salads, and sandwiches are your go-tos for easy high saturation combined meals.", "quests.stone_age.meals.tasks.1": "Any regular Sandwich", "quests.stone_age.meals.tasks.2": "Any regular Jam Sandwich", "quests.stone_age.garlic_bread.title": "Garlic Bread...?", diff --git a/kubejs/assets/tfg/lang/ja_jp.json b/kubejs/assets/tfg/lang/ja_jp.json index 134711f8b..98b582761 100644 --- a/kubejs/assets/tfg/lang/ja_jp.json +++ b/kubejs/assets/tfg/lang/ja_jp.json @@ -1387,6 +1387,9 @@ "ore_vein.tfg.deep_sapphire": "Sapphire & Almandine", "ore_vein.tfg.deep_scheelite": "Scheelite & Tungstate", "ore_vein.tfg.deep_topaz": "Topaz & Chalcocite", + "ore_vein.tfg.desert_oilsands": "Desert Oilsands", + "ore_vein.tfg.desert_oilsands.emi.0": "Only in dry climates.", + "ore_vein.tfg.desert_oilsands.emi.1": "Max rainfall: 120mm", "ore_vein.tfg.normal_apatite": "Apatite & Pyrochlore", "ore_vein.tfg.normal_basaltic_sands": "Mineral Sands", "ore_vein.tfg.normal_beryllium": "Emerald & Beryllium", diff --git a/kubejs/assets/tfg/lang/pt_br.json b/kubejs/assets/tfg/lang/pt_br.json index 74c064112..cde311ad7 100644 --- a/kubejs/assets/tfg/lang/pt_br.json +++ b/kubejs/assets/tfg/lang/pt_br.json @@ -800,6 +800,7 @@ "ore_vein.tfg.deep_sapphire": "Safira e Almandina", "ore_vein.tfg.deep_scheelite": "Sheelita e Tungstato", "ore_vein.tfg.deep_topaz": "TopÃĄzio e Calcocita", + "ore_vein.tfg.desert_oilsands": "Areias Petrolíferas", "ore_vein.tfg.normal_apatite": "Apatita e Pirocloro", "ore_vein.tfg.normal_basaltic_sands": "Areias Minerais", "ore_vein.tfg.normal_beryllium": "Esmeralda e Berílio", @@ -2060,7 +2061,7 @@ "quests.stone_age.soup_time.desc": "Ao criar um pote e algumas tigelas de argila, vocÊ poderÃĄ preparar sopas!\n\nAs sopas sÃĢo uma das primeiras e mais simples formas de criar refeiçÃĩes mais complexas. Diferente de comer os ingredientes crus, elas tÊm muito mais saturaçÃĢo e permitem consumir vÃĄrios nutrientes de uma vez sÃģ!", "quests.stone_age.meals.title": "RefeiçÃĩes", "quests.stone_age.meals.subtitle": "ENTRA NO MEU BUCHO!", - "quests.stone_age.meals.desc": "Estas sÃĢo apenas algumas das refeiçÃĩes bÃĄsicas que vocÊ pode preparar. Sopas, saladas e sanduíches sÃĢo boas opçÃĩes para refeiçÃĩes combinadas com alta saturaçÃĢo, enquanto pizzas sÃĢo o Único alimento que pode conter todos os tipos de nutrientes ao mesmo tempo.", + "quests.stone_age.meals.desc": "Estas sÃĢo apenas algumas das refeiçÃĩes bÃĄsicas que vocÊ pode preparar. Sopas, saladas e sanduíches sÃĢo boas opçÃĩes para refeiçÃĩes combinadas com alta saturaçÃĢo.", "quests.stone_age.meals.tasks.1": "Qualquer Sanduíche comum", "quests.stone_age.meals.tasks.2": "Qualquer Sanduíche com Geleia", "quests.stone_age.garlic_bread.title": "PÃĢo de Alho...?", diff --git a/kubejs/assets/tfg/lang/ru_ru.json b/kubejs/assets/tfg/lang/ru_ru.json index 522ddb6b4..df60e27ef 100644 --- a/kubejs/assets/tfg/lang/ru_ru.json +++ b/kubejs/assets/tfg/lang/ru_ru.json @@ -251,14 +251,14 @@ "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": "ЗаОŅˆÐĩÐŧŅ‹Ðĩ Ð°Ð―ÐūŅ€Ņ‚ÐūзÐļŅ‚ÐūÐēŅ‹Ðĩ КÐļŅ€ÐŋÐļŅ‡Ðļ", "block.tfg.rock.mossy_bricks_moon_stairs": "ÐĄŅ‚ŅƒÐŋÐĩÐ―ŅŒÐšÐļ Ðļз заОŅˆÐĩÐŧŅ‹Ņ… Ð°Ð―ÐūŅ€Ņ‚ÐūзÐļŅ‚ÐūÐēŅ‹Ņ… КÐļŅ€ÐŋÐļŅ‡ÐĩÐđ", - "block.tfg.rock.mossy_bricks_moon_stone_slab": "ПÐŧÐļŅ‚а Ðļз заОŅˆÐĩÐŧŅ‹Ņ… Ð°Ð―ÐūŅ€Ņ‚ÐūзÐļŅ‚ÐūÐēŅ‹Ņ… КÐļŅ€ÐŋÐļŅ‡ÐĩÐđ", + "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": "ÐÐ―ÐūŅ€Ņ‚ÐūзÐļŅ‚ÐūÐēŅ‹Ðđ ÐģŅ€Ð°ÐēÐļÐđ", @@ -437,6 +437,76 @@ "block.tfg.loose.red_granite": "КаОÐĩŅˆÐĩК КŅ€Ð°ŅÐ―ÐūÐģÐū ÐģŅ€Ð°Ð―ÐļŅ‚а", "block.tfg.spike.red_granite_spike": "ÐĄŅ‚аÐŧаÐģОÐļŅ‚ КŅ€Ð°ŅÐ―ÐūÐģÐū ÐģŅ€Ð°Ð―ÐļŅ‚а", "block.tfg.rock.aqueduct_red_granite": "АКÐēÐĩÐīŅƒÐš Ðļз КŅ€Ð°ŅÐ―ÐūÐģÐū ÐģŅ€Ð°Ð―ÐļŅ‚а", + "block.tfg.rock.sandy_jadestone_stairs": "ÐĄŅ‚ŅƒÐŋÐĩÐ―ŅŒÐšÐļ Ðļз ÐŧаОÐŋŅ€ÐūÐļŅ‚а", + "block.tfg.rock.sandy_jadestone_slab": "ПÐŧÐļŅ‚а Ðļз ÐŧаОÐŋŅ€ÐūÐļŅ‚а", + "block.tfg.rock.sandy_jadestone_wall": "ОÐģŅ€Ð°Ðīа Ðļз ÐŧаОÐŋŅ€ÐūÐļŅ‚а", + "block.tfg.rock.hardened_sandy_jadestone": "ÐĢКŅ€ÐĩÐŋÐŧŅ‘Ð―Ð―Ņ‹Ðđ ÐŧаОÐŋŅ€ÐūÐļŅ‚", + "block.tfg.spike.sandy_jadestone_spike": "ÐĄŅ‚аÐŧаÐģОÐļŅ‚ Ðļз ÐŧаОÐŋŅ€ÐūÐļŅ‚а", + "block.tfg.sandy_jadestone_support": "ОÐŋÐūŅ€Ð° Ðļз ÐŧаОÐŋŅ€ÐūÐļŅ‚а", + "block.tfg.rock.cobble_sandy_jadestone": "ЛаОÐŋŅ€ÐūÐļŅ‚ÐūÐēŅ‹Ðđ ÐąŅƒÐŧŅ‹ÐķÐ―ÐļК", + "block.tfg.rock.cobble_sandy_jadestone_stairs": "ÐĄŅ‚ŅƒÐŋÐĩÐ―ŅŒÐšÐļ Ðļз ÐŧаОÐŋŅ€ÐūÐļŅ‚ÐūÐēÐūÐģÐū ÐąŅƒÐŧŅ‹ÐķÐ―ÐļКа", + "block.tfg.rock.cobble_sandy_jadestone_slab": "ПÐŧÐļŅ‚а Ðļз ÐŧаОÐŋŅ€ÐūÐļŅ‚ÐūÐēÐūÐģÐū ÐąŅƒÐŧŅ‹ÐķÐ―ÐļКа", + "block.tfg.rock.cobble_sandy_jadestone_wall": "ОÐģŅ€Ð°Ðīа Ðļз ÐŧаОÐŋŅ€ÐūÐļŅ‚ÐūÐēÐūÐģÐū ÐąŅƒÐŧŅ‹ÐķÐ―ÐļКа", + "block.tfg.rock.gravel_sandy_jadestone": "ЛаОÐŋŅ€ÐūÐļŅ‚ÐūÐēŅ‹Ðđ ÐģŅ€Ð°ÐēÐļÐđ", + "block.tfg.rock.aqueduct_sandy_jadestone": "ЛаОÐŋŅ€ÐūÐļŅ‚ÐūÐēŅ‹Ðđ аКÐēÐĩÐīŅƒÐš", + "block.tfg.rock.bricks_sandy_jadestone_stairs": "ÐĄŅ‚ŅƒÐŋÐĩÐ―ŅŒÐšÐļ Ðļз ÐŧаОÐŋŅ€ÐūÐļŅ‚ÐūÐēŅ‹Ņ… КÐļŅ€ÐŋÐļŅ‡ÐĩÐđ", + "block.tfg.rock.bricks_sandy_jadestone_slab": "ПÐŧÐļŅ‚а Ðļз ÐŧаОÐŋŅ€ÐūÐļŅ‚ÐūÐēŅ‹Ņ… КÐļŅ€ÐŋÐļŅ‡ÐĩÐđ", + "block.tfg.rock.bricks_sandy_jadestone_wall": "ОÐģŅ€Ð°Ðīа Ðļз ÐŧаОÐŋŅ€ÐūÐļŅ‚ÐūÐēŅ‹Ņ… КÐļŅ€ÐŋÐļŅ‡ÐĩÐđ", + "block.tfg.rock.polished_sandy_jadestone_stairs": "ÐĄŅ‚ŅƒÐŋÐĩÐ―ŅŒÐšÐļ Ðļз ÐŋÐūÐŧÐļŅ€ÐūÐēÐ°Ð―Ð―ÐūÐģÐū ÐŧаОÐŋŅ€ÐūÐļŅ‚а", + "block.tfg.rock.polished_sandy_jadestone_slab": "ПÐŧÐļŅ‚а Ðļз ÐŋÐūÐŧÐļŅ€ÐūÐēÐ°Ð―Ð―ÐūÐģÐū ÐŧаОÐŋŅ€ÐūÐļŅ‚а", + "block.tfg.rock.polished_sandy_jadestone_wall": "ОÐģŅ€Ð°Ðīа Ðļз ÐŋÐūÐŧÐļŅ€ÐūÐēÐ°Ð―Ð―ÐūÐģÐū ÐŧаОÐŋŅ€ÐūÐļŅ‚а", + "block.tfg.rock.chiseled_sandy_jadestone_stairs": "ÐĄŅ‚ŅƒÐŋÐĩÐ―ŅŒÐšÐļ Ðļз Ņ€ÐĩÐ·Ð―ÐūÐģÐū ÐŧаОÐŋŅ€ÐūÐļŅ‚а", + "block.tfg.rock.chiseled_sandy_jadestone_slab": "ПÐŧÐļŅ‚а Ðļз Ņ€ÐĩÐ·Ð―ÐūÐģÐū ÐŧаОÐŋŅ€ÐūÐļŅ‚а", + "block.tfg.rock.chiseled_sandy_jadestone_wall": "ОÐģŅ€Ð°Ðīа Ðļз Ņ€ÐĩÐ·Ð―ÐūÐģÐū ÐŧаОÐŋŅ€ÐūÐļŅ‚а", + "block.tfg.loose.sandy_jadestone": "КаОÐĩŅˆÐĩК ÐŧаОÐŋŅ€ÐūÐļŅ‚а", + "block.tfg.rock.flavolite_stairs": "ÐĄŅ‚ŅƒÐŋÐĩÐ―ŅŒÐšÐļ Ðļз ÐļÐģÐ―ÐļÐžÐąŅ€ÐļŅ‚а", + "block.tfg.rock.flavolite_slab": "ПÐŧÐļŅ‚а Ðļз ÐļÐģÐ―ÐļÐžÐąŅ€ÐļŅ‚а", + "block.tfg.rock.flavolite_wall": "ОÐģŅ€Ð°Ðīа Ðļз ÐļÐģÐ―ÐļÐžÐąŅ€ÐļŅ‚а", + "block.tfg.rock.hardened_flavolite": "ÐĢКŅ€ÐĩÐŋÐŧŅ‘Ð―Ð―Ņ‹Ðđ ÐļÐģÐ―ÐļÐžÐąŅ€ÐļŅ‚", + "block.tfg.spike.flavolite_spike": "ÐĄŅ‚аÐŧаÐģОÐļŅ‚ Ðļз ÐļÐģÐ―ÐļÐžÐąŅ€ÐļŅ‚а", + "block.tfg.flavolite_support": "ОÐŋÐūŅ€Ð° Ðļз ÐļÐģÐ―ÐļÐžÐąŅ€ÐļŅ‚а", + "block.tfg.rock.cobble_flavolite": "ИÐģÐ―ÐļÐžÐąŅ€ÐļŅ‚ÐūÐēŅ‹Ðđ ÐąŅƒÐŧŅ‹ÐķÐ―ÐļК", + "block.tfg.rock.cobble_flavolite_stairs": "ÐĄŅ‚ŅƒÐŋÐĩÐ―ŅŒÐšÐļ Ðļз ÐļÐģÐ―ÐļÐžÐąŅ€ÐļŅ‚ÐūÐēÐūÐģÐū ÐąŅƒÐŧŅ‹ÐķÐ―ÐļКа", + "block.tfg.rock.cobble_flavolite_slab": "ПÐŧÐļŅ‚а Ðļз ÐļÐģÐ―ÐļÐžÐąŅ€ÐļŅ‚ÐūÐēÐūÐģÐū ÐąŅƒÐŧŅ‹ÐķÐ―ÐļКа", + "block.tfg.rock.cobble_flavolite_wall": "ОÐģŅ€Ð°Ðīа Ðļз ÐļÐģÐ―ÐļÐžÐąŅ€ÐļŅ‚ÐūÐēÐūÐģÐū ÐąŅƒÐŧŅ‹ÐķÐ―ÐļКа", + "block.tfg.rock.gravel_flavolite": "ИÐģÐ―ÐļÐžÐąŅ€ÐļŅ‚ÐūÐēŅ‹Ðđ ÐģŅ€Ð°ÐēÐļÐđ", + "block.tfg.rock.aqueduct_flavolite": "АКÐēÐĩÐīŅƒÐš Ðļз ÐļÐģÐ―ÐļÐžÐąŅ€ÐļŅ‚а", + "block.tfg.rock.bricks_flavolite_stairs": "ÐĄŅ‚ŅƒÐŋÐĩÐ―ŅŒÐšÐļ Ðļз ÐļÐģÐ―ÐļÐžÐąŅ€ÐļŅ‚а", + "block.tfg.rock.bricks_flavolite_slab": "ПÐŧÐļŅ‚а Ðļз ÐļÐģÐ―ÐļÐžÐąŅ€ÐļŅ‚а", + "block.tfg.rock.bricks_flavolite_wall": "ОÐģŅ€Ð°Ðīа Ðļз ÐļÐģÐ―ÐļÐžÐąŅ€ÐļŅ‚а", + "block.tfg.rock.polished_flavolite_stairs": "ÐĄŅ‚ŅƒÐŋÐĩÐ―ŅŒÐšÐļ Ðļз ÐŋÐūÐŧÐļŅ€ÐūÐēÐ°Ð―Ð―ÐūÐģÐū ÐļÐģÐ―ÐļÐžÐąŅ€ÐļŅ‚а", + "block.tfg.rock.polished_flavolite_slab": "ПÐŧÐļŅ‚а Ðļз ÐŋÐūÐŧÐļŅ€ÐūÐēÐ°Ð―Ð―ÐūÐģÐū ÐļÐģÐ―ÐļÐžÐąŅ€ÐļŅ‚а", + "block.tfg.rock.polished_flavolite_wall": "ОÐģŅ€Ð°Ðīа Ðļз ÐŋÐūÐŧÐļŅ€ÐūÐēÐ°Ð―Ð―ÐūÐģÐū ÐļÐģÐ―ÐļÐžÐąŅ€ÐļŅ‚а", + "block.tfg.rock.chiseled_flavolite_stairs": "ÐĄŅ‚ŅƒÐŋÐĩÐ―ŅŒÐšÐļ Ðļз Ņ€ÐĩÐ·Ð―ÐūÐģÐū ÐļÐģÐ―ÐļÐžÐąŅ€ÐļŅ‚а", + "block.tfg.rock.chiseled_flavolite_slab": "ПÐŧÐļŅ‚а Ðļз Ņ€ÐĩÐ·Ð―ÐūÐģÐū ÐļÐģÐ―ÐļÐžÐąŅ€ÐļŅ‚а", + "block.tfg.rock.chiseled_flavolite_wall": "ОÐģŅ€Ð°Ðīа Ðļз Ņ€ÐĩÐ·Ð―ÐūÐģÐū ÐļÐģÐ―ÐļÐžÐąŅ€ÐļŅ‚а", + "block.tfg.loose.flavolite": "КаОÐĩŅˆÐĩК ÐļÐģÐ―ÐļÐžÐąŅ€ÐļŅ‚а", + "block.tfg.rock.scoria_stairs": "ÐĄŅ‚ŅƒÐŋÐĩÐ―ŅŒÐšÐļ Ðļз ÐŋÐĩÐŋÐŧа", + "block.tfg.rock.scoria_slab": "ПÐŧÐļŅ‚а Ðļз ÐŋÐĩÐŋÐŧа", + "block.tfg.rock.scoria_wall": "ОÐģŅ€Ð°Ðīа Ðļз ÐŋÐĩÐŋÐŧа", + "block.tfg.rock.hardened_scoria": "ÐĢКŅ€ÐĩÐŋÐŧŅ‘Ð―Ð―Ņ‹Ðđ ÐŋÐĩÐŋÐĩÐŧ", + "block.tfg.spike.scoria_spike": "ÐĄŅ‚аÐŧаÐģОÐļŅ‚ Ðļз ÐŋÐĩÐŋÐŧа", + "block.tfg.scoria_support": "ОÐŋÐūŅ€Ð° Ðļз ÐŋÐĩÐŋÐŧа", + "block.tfg.rock.cobble_scoria": "БŅƒÐŧŅ‹ÐķÐ―ÐļК Ðļз ÐŋÐĩÐŋÐŧа", + "block.tfg.rock.cobble_scoria_stairs": "ÐĄŅ‚ŅƒÐŋÐĩÐ―ŅŒÐšÐļ Ðļз ÐąŅƒÐŧŅ‹ÐķÐ―ÐļКа Ðļз ÐŋÐĩÐŋÐŧа", + "block.tfg.rock.cobble_scoria_slab": "ПÐŧÐļŅ‚а Ðļз ÐąŅƒÐŧŅ‹ÐķÐ―ÐļКа Ðļз ÐŋÐĩÐŋÐŧа", + "block.tfg.rock.cobble_scoria_wall": "ОÐģŅ€Ð°Ðīа Ðļз ÐąŅƒÐŧŅ‹ÐķÐ―ÐļКа Ðļз ÐŋÐĩÐŋÐŧа", + "block.tfg.rock.gravel_scoria": "ГŅ€Ð°ÐēÐļÐđ Ðļз ÐŋÐĩÐŋÐŧа", + "block.tfg.rock.aqueduct_scoria": "АКÐēÐĩÐīŅƒÐš Ðļз ÐŋÐĩÐŋÐŧа", + "block.tfg.loose.scoria": "КаОÐĩŅˆÐĩК ÐŋÐĩÐŋÐŧа", + "block.tfg.rock.scorchia_stairs": "ÐĄŅ‚ŅƒÐŋÐĩÐ―ŅŒÐšÐļ Ðļз Ņ‚Ņ‘ÐžÐ―ÐūÐģÐū ÐŋÐĩÐŋÐŧа", + "block.tfg.rock.scorchia_slab": "ПÐŧÐļŅ‚а Ðļз Ņ‚Ņ‘ÐžÐ―ÐūÐģÐū ÐŋÐĩÐŋÐŧа", + "block.tfg.rock.scorchia_wall": "ОÐģŅ€Ð°Ðīа Ðļз Ņ‚Ņ‘ÐžÐ―ÐūÐģÐū ÐŋÐĩÐŋÐŧа", + "block.tfg.rock.hardened_scorchia": "ÐĢКŅ€ÐĩÐŋÐŧŅ‘Ð―Ð―Ņ‹Ðđ Ņ‚Ņ‘ÐžÐ―Ņ‹Ðđ ÐŋÐĩÐŋÐĩÐŧ", + "block.tfg.spike.scorchia_spike": "ÐĄŅ‚аÐŧаÐģОÐļŅ‚ Ðļз Ņ‚Ņ‘ÐžÐ―ÐūÐģÐū ÐŋÐĩÐŋÐŧа", + "block.tfg.scorchia_support": "ОÐŋÐūŅ€Ð° Ðļз Ņ‚Ņ‘ÐžÐ―ÐūÐģÐū ÐŋÐĩÐŋÐŧа", + "block.tfg.rock.cobble_scorchia": "БŅƒÐŧŅ‹ÐķÐ―ÐļК Ðļз О ÐŋÐĩÐŋÐŧа", + "block.tfg.rock.cobble_scorchia_stairs": "ÐĄŅ‚ŅƒÐŋÐĩÐ―ŅŒÐšÐļ Ðļз ÐąŅƒÐŧŅ‹ÐķÐ―ÐļКа Ðļз Ņ‚Ņ‘ÐžÐ―ÐūÐģÐū ÐŋÐĩÐŋÐŧа", + "block.tfg.rock.cobble_scorchia_slab": "ПÐŧÐļŅ‚а Ðļз ÐąŅƒÐŧŅ‹ÐķÐ―ÐļКа Ðļз Ņ‚Ņ‘ÐžÐ―ÐūÐģÐū ÐŋÐĩÐŋÐŧа", + "block.tfg.rock.cobble_scorchia_wall": "ОÐģŅ€Ð°Ðīа Ðļз ÐąŅƒÐŧŅ‹ÐķÐ―ÐļКа Ðļз Ņ‚Ņ‘ÐžÐ―ÐūÐģÐū ÐŋÐĩÐŋÐŧа", + "block.tfg.rock.gravel_scorchia": "ГŅ€Ð°ÐēÐļÐđ Ðļз Ņ‚Ņ‘ÐžÐ―ÐūÐģÐū ÐŋÐĩÐŋÐŧа", + "block.tfg.rock.aqueduct_scorchia": "АКÐēÐĩÐīŅƒÐš Ðļз Ņ‚Ņ‘ÐžÐ―ÐūÐģÐū ÐŋÐĩÐŋÐŧа", + "block.tfg.loose.scorchia": "КаОÐĩŅˆÐĩК Ņ‚Ņ‘ÐžÐ―ÐūÐģÐū ÐŋÐĩÐŋÐŧа", "block.tfg.rock.stone_wall": "ОÐģŅ€Ð°Ðīа Ðļз ÐēÐūŅŅŅ‚Ð°Ð―ÐūÐēÐŧÐĩÐ―Ð―ÐūÐģÐū ÐšÐ°ÐžÐ―Ņ", "block.tfg.rock.smooth_stone_stairs": "ÐĄŅ‚ŅƒÐŋÐĩÐ―ŅŒÐšÐļ Ðļз ÐŋÐūÐŧÐļŅ€ÐūÐēÐ°Ð―Ð―ÐūÐģÐū ÐēÐūŅŅŅ‚Ð°Ð―ÐūÐēÐŧÐĩÐ―Ð―ÐūÐģÐū ÐšÐ°ÐžÐ―Ņ", "block.tfg.rock.smooth_stone_wall": "ОÐģŅ€Ð°Ðīа Ðļз ÐŋÐūÐŧÐļŅ€ÐūÐēÐ°Ð―Ð―ÐūÐģÐū ÐēÐūŅŅŅ‚Ð°Ð―ÐūÐēÐŧÐĩÐ―Ð―ÐūÐģÐū ÐšÐ°ÐžÐ―Ņ", @@ -740,6 +810,8 @@ "block.tfg.impure_moderate_core": "НÐĩŅ‡ÐļŅŅ‚ÐūÐĩ ŅÐīŅ€Ðū ŅŅ‚Ð°ÐąÐļÐŧÐļзаŅ‚ÐūŅ€Ð°", "block.tfg.moderate_core_frame": "КаŅ€ÐšÐ°Ņ Ņ ŅÐīŅ€ÐūО ŅŅ‚Ð°ÐąÐļÐŧÐļзаŅ‚ÐūŅ€Ð°", "block.tfg.impure_moderate_core_frame": "КаŅ€ÐšÐ°Ņ Ņ Ð―ÐĩŅ‡ÐļŅŅ‚Ņ‹Ðž ŅÐīŅ€ÐūО ŅŅ‚Ð°ÐąÐļÐŧÐļзаŅ‚ÐūŅ€Ð°", + "tfg.block_entity.artisan_table": "РÐĩОÐĩŅÐŧÐĩÐ―Ð―Ņ‹Ðđ ŅŅ‚ÐūÐŧ", + "block.tfg.artisan_table": "РÐĩОÐĩŅÐŧÐĩÐ―Ð―Ņ‹Ðđ ŅŅ‚ÐūÐŧ", "fluid.tfg.heavy_ammoniacal_water": "ÐĒŅÐķŅ‘ÐŧаŅ аООÐļаŅ‡Ð―аŅ ÐēÐūÐīа", "fluid.tfg.semiheavy_ammoniacal_water": "ПÐūÐŧŅƒŅ‚ŅÐķŅ‘ÐŧаŅ аООÐļаŅ‡Ð―аŅ ÐēÐūÐīа", "fluid.tfg.sulfur_fumes": "ПаŅ€Ņ‹ ŅÐĩŅ€Ņ‹", @@ -806,22 +878,18 @@ "item.tfg.unfinished_inscriber_accumulation_press": "НÐĩзаКÐūÐ―Ņ‡ÐĩÐ―Ð―Ņ‹Ðđ аККŅƒÐžŅƒÐŧÐļŅ€ŅƒŅŽŅ‰ÐļÐđ ÐŋŅ€ÐĩŅŅ", "item.tfg.brick.deepslate": "МÐļÐģОаŅ‚ÐļŅ‚ÐūÐēŅ‹Ðđ КÐļŅ€ÐŋÐļŅ‡", "item.tfg.brick.dripstone": "ÐĒŅ€Ð°ÐēÐĩŅ€Ņ‚ÐļÐ―ÐūÐēŅ‹Ðđ КÐļŅ€ÐŋÐļŅ‡", - "item.tfg.loose.moon_stone": "КаОÐĩŅˆÐĩК Ð°Ð―ÐūŅ€Ņ‚ÐūзÐļŅ‚а", "item.tfg.brick.moon_stone": "ÐÐ―ÐūŅ€Ņ‚ÐūзÐļŅ‚ÐūÐēŅ‹Ðđ КÐļŅ€ÐŋÐļŅ‡", - "item.tfg.loose.moon_deepslate": "КаОÐĩŅˆÐĩК Ð―ÐūŅ€ÐļŅ‚а", "item.tfg.brick.moon_deepslate": "НÐūŅ€ÐļŅ‚ÐūÐēŅ‹Ðđ КÐļŅ€ÐŋÐļŅ‡", - "item.tfg.loose.mars_stone": "КаОÐĩŅˆÐĩК аŅ€ÐģÐļÐŧÐŧÐļŅ‚а", "item.tfg.brick.mars_stone": "АŅ€ÐģÐļÐŧÐŧÐļŅ‚ÐūÐēŅ‹Ðđ КÐļŅ€ÐŋÐļŅ‡", - "item.tfg.loose.venus_stone": "КаОŅƒŅˆÐĩК Ņ‚Ņ€Ð°Ņ…ÐļŅ‚а", "item.tfg.brick.venus_stone": "ÐĒŅ€Ð°Ņ…ÐļŅ‚ÐūÐēŅ‹Ðđ КÐļŅ€ÐŋÐļŅ‡", - "item.tfg.loose.mercury_stone": "КаОŅƒŅˆÐĩК КÐūОаŅ‚ÐļÐļŅ‚а", "item.tfg.brick.mercury_stone": "КÐūОаŅ‚ÐļÐļŅ‚ÐūÐēŅ‹Ðđ КÐļŅ€ÐŋÐļŅ‡", - "item.tfg.loose.glacio_stone": "КаОŅƒŅˆÐĩК Ņ„ÐūÐ―ÐūÐŧÐļŅ‚а", "item.tfg.brick.glacio_stone": "ÐĪÐūÐ―ÐūÐŧÐļŅ‚ÐūÐēŅ‹Ðđ КÐļŅ€ÐŋÐļŅ‡", - "item.tfg.loose.permafrost": "Permafrost Chunk", "item.tfg.brick.permafrost": "КÐļŅ€ÐŋÐļŅ‡ ÐēÐĩŅ‡Ð―ÐūÐđ ОÐĩŅ€Ð·ÐŧÐūŅ‚Ņ‹", - "item.tfg.loose.red_granite": "КаОŅƒŅˆÐĩК КŅ€Ð°ŅÐ―ÐūÐģÐū ÐģŅ€Ð°Ð―ÐļŅ‚а", "item.tfg.brick.red_granite": "КÐļŅ€ÐŋÐļŅ‡ КŅ€Ð°ŅÐ―ÐūÐģÐū ÐģŅ€Ð°Ð―ÐļŅ‚а", + "item.tfg.brick.sandy_jadestone": "ЛаОÐŋŅ€ÐūÐļŅ‚ÐūÐēŅ‹Ðđ КÐļŅ€ÐŋÐļŅ‡", + "item.tfg.brick.flavolite": "ИÐģÐ―ÐļÐžÐąŅ€ÐļŅ‚ÐūÐēŅ‹Ðđ КÐļŅ€ÐŋÐļŅ‡", + "item.tfg.brick.scoria": "КÐļŅ€ÐŋÐļŅ‡ Ðļз ÐŋÐĩÐŋÐŧа", + "item.tfg.brick.scorchia": "КÐļŅ€ÐŋÐļŅ‡ Ðļз Ņ‚Ņ‘ÐžÐ―ÐūÐģÐū ÐŋÐĩÐŋÐŧа", "item.tfg.terra_firma_greg": "TerraFirmaGreg", "item.tfg.scaffolding_frame": "ÐžÐąŅˆÐļÐēКа ŅŅ‚Ņ€ÐūÐļŅ‚ÐĩÐŧŅŒÐ―Ņ‹Ņ… ÐŧÐĩŅÐūÐē", "item.tfg.airship_hull": "КÐūŅ€ÐŋŅƒŅ ÐīÐļŅ€ÐļÐķÐ°ÐąÐŧŅ", @@ -1134,10 +1202,15 @@ "item.tfg.fish_roe": "ИКŅ€Ð° %s", "item.tfg.rotten_voiding_cover": "ÐĢÐīаÐŧÐĩÐ―ÐļÐĩ ÐģÐ―ÐļÐŧÐļ(ÐĢÐŧŅƒŅ‡ŅˆÐĩÐ―ÐļÐĩ)", "item.tfg.flora_pellets": "РаŅŅ‚ÐļŅ‚ÐĩÐŧŅŒÐ―Ņ‹Ðĩ ÐģŅ€Ð°Ð―ŅƒÐŧŅ‹", + "item.tfg.magnesia_refractory_brick_ingot": "ÐĄÐšÐŧÐĩÐĩÐ―Ð―Ņ‹Ðđ ŅÐžÐūÐŧÐūÐđ ОаÐģÐ―ÐĩзÐļаÐŧŅŒÐ―Ņ‹Ðđ ÐūÐģÐ―ÐĩŅƒÐŋÐūŅ€Ð―Ņ‹Ðđ КÐļŅ€ÐŋÐļŅ‡", + "item.tfg.tier_1_double_rocket": "ЛŅ‘ÐģКаŅ ÐīÐēŅƒŅ…ОÐĩŅŅ‚Ð―аŅ Ņ€Ð°ÐšÐĩŅ‚а R (аÐŧŅŽÐžÐūŅŅ‚аÐŧŅŒ)", + "item.tfg.tier_2_double_rocket": "ПŅ€ÐūŅ‡Ð―аŅ ÐīÐēŅƒŅ…ОÐĩŅŅ‚Ð―аŅ Ņ€Ð°ÐšÐĩŅ‚а ASM 4914 (Ņ‚ÐļŅ‚Ð°Ð―)", + "item.tfg.tier_3_double_rocket": "ÐĒŅÐķŅ‘ÐŧаŅ ÐīÐēŅƒŅ…ОÐĩŅŅ‚Ð―аŅ Ņ€Ð°ÐšÐĩŅ‚а 45-Ti (ÐēÐūÐŧŅŒŅ„Ņ€Ð°ÐžÐūŅŅ‚аÐŧŅŒ)", "material.tfg.latex": "ЛаŅ‚ÐĩКŅ", "material.tfg.vulcanized_latex": "ВŅƒÐŧÐšÐ°Ð―ÐļзÐļŅ€ÐūÐēÐ°Ð―Ð―Ņ‹Ðđ ÐŧаŅ‚ÐĩКŅ", "material.tfg.fluix": "ÐĪÐŧŅŽÐļŅ", "material.tfg.conifer_pitch": "ÐĨÐēÐūÐđÐ―Ð°Ņ ŅÐžÐūÐŧа", + "material.tfg.pyrogallol": "ПÐļŅ€ÐūÐģаÐŧÐŧÐūÐŧ", "material.gtceu.lactose": "ЛаКŅ‚Ðūза", "material.tfg.gabbro": "Ð“Ð°ÐąÐąŅ€Ðū", "material.tfg.shale": "ÐĄÐŧÐ°Ð―ÐĩŅ†", @@ -1308,6 +1381,13 @@ "material.tfg.chloroplasts": "ÐĨÐŧÐūŅ€ÐūÐŋÐŧаŅŅ‚Ņ‹", "material.tfg.nitrate_rich_water": "НÐļŅ‚Ņ€Ð°Ņ‚Ð―Ņ‹Ðđ Ņ€Ð°ŅŅ‚ÐēÐūŅ€", "material.tfg.nitrate_rich_semiheavy_ammoniacal_water": "ПÐūÐŧŅƒŅ‚ŅÐķŅ‘ÐŧŅ‹Ðđ Ð―ÐļŅ‚Ņ€Ð°Ņ‚Ð―Ðū-аООÐļаŅ‡Ð―Ņ‹Ðđ Ņ€Ð°ŅŅ‚ÐēÐūŅ€", + "material.tfg.weak_red_steel": "ÐĄŅ‹Ņ€Ð°Ņ КŅ€Ð°ŅÐ―аŅ ŅŅ‚аÐŧŅŒ", + "material.tfg.weak_blue_steel": "ÐĄŅ‹Ņ€Ð°Ņ ŅÐļÐ―ŅŅ ŅŅ‚аÐŧŅŒ", + "material.tfg.refractory_clay": "ОÐģÐ―ÐĩŅƒÐŋÐūŅ€Ð―аŅ ÐģÐŧÐļÐ―Ð°", + "material.tfg.bakelite": "БаКÐĩÐŧÐļŅ‚", + "material.tfg.phenolic_resin": "ÐĪÐĩÐ―ÐūÐŧŅŒÐ―аŅ ŅÐžÐūÐŧа", + "material.tfg.magnesium_hydroxide": "ГÐļÐīŅ€ÐūКŅÐļÐī ОаÐģÐ―ÐļŅ", + "material.tfg.magnesia_refractory_brick": "ÐĄÐšÐŧÐĩÐĩÐ―Ð―Ņ‹Ðđ ŅÐžÐūÐŧÐūÐđ ОаÐģÐ―ÐĩзÐļаÐŧŅŒÐ―Ņ‹Ðđ ÐūÐģÐ―ÐĩŅƒÐŋÐūŅ€Ð―Ņ‹Ðđ КÐļŅ€ÐŋÐļŅ‡", "ore_vein.tfg.deep_sheldonite": "КŅƒÐŋÐĩŅ€ÐļŅ‚ Ðļ БÐūŅ€Ð―ÐļŅ‚", "ore_vein.tfg.deep_garnet_amethyst": "АОÐĩŅ‚ÐļŅŅ‚ Ðļ ÐģŅ€Ð°Ð―аŅ‚", "ore_vein.tfg.deep_garnet_opal": "ОÐŋаÐŧ Ðļ ÐģŅ€Ð°Ð―аŅ‚", @@ -1320,6 +1400,9 @@ "ore_vein.tfg.deep_sapphire": "ÐĄÐ°ÐŋŅ„ÐļŅ€ Ðļ АÐŧŅŒÐžÐ°Ð―ÐīÐļÐ―", "ore_vein.tfg.deep_scheelite": "ÐĻÐĩÐĩÐŧÐļŅ‚ Ðļ ВÐūÐŧŅŒŅ„Ņ€Ð°ÐžÐ°Ņ‚", "ore_vein.tfg.deep_topaz": "ÐĒÐūÐŋаз Ðļ ÐĨаÐŧŅŒÐšÐūзÐļÐ―", + "ore_vein.tfg.desert_oilsands": "НÐĩŅ„Ņ‚ÐĩÐ―ÐūŅÐ―Ņ‹Ðđ ÐŋÐĩŅÐūК", + "ore_vein.tfg.desert_oilsands.emi.0": "ÐĒÐūÐŧŅŒÐšÐū Ðē ŅŅƒŅ…ÐūО КÐŧÐļОаŅ‚Ðĩ.", + "ore_vein.tfg.desert_oilsands.emi.1": "МаКŅ. ÐģÐūÐīÐūÐēŅ‹Ðĩ ÐūŅÐ°ÐīКÐļ: 120ОО", "ore_vein.tfg.normal_apatite": "АÐŋаŅ‚ÐļŅ‚ Ðļ ПÐļŅ€ÐūŅ…ÐŧÐūŅ€", "ore_vein.tfg.normal_basaltic_sands": "МÐļÐ―ÐĩŅ€Ð°ÐŧŅŒÐ―Ņ‹Ðĩ ÐŋÐĩŅÐšÐļ", "ore_vein.tfg.normal_beryllium": "ИзŅƒÐžŅ€ŅƒÐī Ðļ БÐĩŅ€ÐļÐŧÐŧÐļÐđ", @@ -1484,6 +1567,9 @@ "tfg.tooltip.surfer_variant.brain": "ГÐŧаŅÐļÐ°Ð―ŅÐšÐļÐđ", "tfg.tooltip.attribution.surfer": "§9§oАÐēŅ‚ÐūŅ€: Wan's Ancient Beasts", "entity.tfg.rnr_plow": "ÐĒÐĩÐŧÐĩÐķКа ÐīÐŧŅ ОÐūŅ‰ÐĩÐ―ÐļŅ", + "entity.tfg.tier_1_double_rocket": "ЛŅ‘ÐģКаŅ ÐīÐēŅƒŅ…ОÐĩŅŅ‚Ð―аŅ Ņ€Ð°ÐšÐĩŅ‚а R (аÐŧŅŽÐžÐūŅŅ‚аÐŧŅŒ)", + "entity.tfg.tier_2_double_rocket": "ПŅ€ÐūŅ‡Ð―аŅ ÐīÐēŅƒŅ…ОÐĩŅŅ‚Ð―аŅ Ņ€Ð°ÐšÐĩŅ‚а ASM 4914 (Ņ‚ÐļŅ‚Ð°Ð―)", + "entity.tfg.tier_3_double_rocket": "ÐĒŅÐķŅ‘ÐŧаŅ ÐīÐēŅƒŅ…ОÐĩŅŅ‚Ð―аŅ Ņ€Ð°ÐšÐĩŅ‚а 45-Ti (ÐēÐūÐŧŅŒŅ„Ņ€Ð°ÐžÐūŅŅ‚аÐŧŅŒ)", "effect.tfg.cooling": "§bОŅ…ÐŧаÐķÐīÐĩÐ―ÐļÐĩ", "effect.tfg.warming": "§6ÐĄÐūÐģŅ€ÐĩÐēÐ°Ð―ÐļÐĩ", "effect.tfg.instant_radiation": "МÐģÐ―ÐūÐēÐĩÐ―Ð―ÐūÐĩ Ņ€Ð°ÐīÐļÐūаКŅ‚ÐļÐēÐ―ÐūÐĩ ÐļзÐŧŅƒŅ‡ÐĩÐ―ÐļÐĩ", @@ -1524,7 +1610,6 @@ "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": "ÐĒÐūÐŋаз", @@ -1627,6 +1712,7 @@ "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ÐŧÐĩÐģŅ‡Ðĩ ÐēÐūзÐīŅƒŅ…а§7 ÐģазÐūÐē.§r", + "tfg.tooltip.polycaprolactam": "ÐĒаКÐķÐĩ ÐļзÐēÐĩŅŅ‚Ð―Ņ‹Ðđ КаК НÐĩÐđÐŧÐūÐ―", "tfg.tooltip.machine.one_energy_hatch": "ПŅ€ÐļÐ―ÐļОаÐĩŅ‚ Ņ€ÐūÐēÐ―Ðū §6ÐūÐīÐļÐ―Â§r ŅÐ―ÐĩŅ€ÐģÐĩŅ‚ÐļŅ‡ÐĩŅÐšÐļÐđ Ņ€Ð°Ð·ŅŠŅ‘О.", "tfg.tooltip.machine.two_energy_hatches": "ПŅ€ÐļÐ―ÐļОаÐĩŅ‚ ÐīÐū §6ÐīÐēŅƒŅ…§r ŅÐ―ÐĩŅ€ÐģÐĩŅ‚ÐļŅ‡ÐĩŅÐšÐļŅ… Ņ€Ð°Ð·ŅŠŅ‘Оа.", "tfg.tooltip.machine.subtick": "ЭŅ‚а ОаŅˆÐļÐ―Ð° §2ÐĄÐ°ÐąŅ‚ÐļК§r!", @@ -1675,6 +1761,8 @@ "tfg.tooltip.component.nuclear_turbine_2": "КаÐķÐīŅ‹Ðđ ÐīÐĩŅ€ÐķаŅ‚ÐĩÐŧŅŒ Ņ€ÐūŅ‚ÐūŅ€Ð° ÐēŅ‹ŅˆÐĩ §5EV§r §7ÐīÐūÐąÐ°ÐēÐŧŅÐĩŅ‚§r 10% ŅŅ„Ņ„ÐĩКŅ‚ÐļÐēÐ―ÐūŅŅ‚Ðļ Ðļ ŅƒÐžÐ―ÐūÐķаÐĩŅ‚ EU/t Ð―Ð° 2.", "tfg.tooltip.component.smr_generator_1": "§eПŅ€ÐūÐļÐēÐūÐīÐļŅ‚:§r 4096 EU/t", "tfg.tooltip.component.smr_generator_2": "ПŅ€ÐĩÐīÐ―Ð°Ð·Ð―Ð°Ņ‡ÐĩÐ― ÐīÐŧŅ ÐŋŅ€ÐūÐļзÐēÐūÐīŅŅ‚Ðēа ŅÐ―ÐĩŅ€ÐģÐļÐļ Ðļз sCO2 Ņ ÐļŅÐŋÐūÐŧŅŒÐ·ÐūÐēÐ°Ð―ÐļÐĩО ОаÐŧÐūÐģÐū ОÐūÐīŅƒÐŧŅŒÐ―ÐūÐģÐū Ņ€ÐĩаКŅ‚ÐūŅ€Ð°.\n ИŅÐŋÐūÐŧŅŒÐ·ŅƒÐđŅ‚Ðĩ ŅÐžÐ°Ð·ÐšŅƒ Ðļ ÐĢŅÐšÐūŅ€ÐļŅ‚ÐĩÐŧŅŒ ÐīÐŧŅ ÐŋÐūÐēŅ‹ŅˆÐĩÐ―ÐļŅ ŅŅ„Ņ„ÐĩКŅ‚ÐļÐēÐ―ÐūŅŅ‚Ðļ Ðļ ŅƒÐŋŅ€Ð°ÐēÐŧÐĩÐ―ÐļŅ ÐūŅ…ÐŧаÐķÐīÐĩÐ―ÐļÐĩО ММР.", + "tfg.tooltip.show_recipes": "ПÐūКазаŅ‚ŅŒ Ņ€ÐĩŅ†ÐĩÐŋŅ‚Ņ‹", + "emi.category.tfg.artisan_table": "РÐĩОÐĩŅÐŧÐĩÐ―Ð―Ņ‹Ðđ ŅŅ‚ÐūÐŧ", "tfg.gui.refrigerator.unify_dates.enabled": "ÐžÐąŅŠÐĩÐīÐļÐ―ÐĩÐ―ÐļÐĩ ŅŅ€ÐūКÐūÐē ÐģÐūÐīÐ―ÐūŅŅ‚Ðļ: §aВКÐŧ.", "tfg.gui.refrigerator.unify_dates.disabled": "ÐžÐąŅŠÐĩÐīÐļÐ―ÐĩÐ―ÐļÐĩ ŅŅ€ÐūКÐūÐē ÐģÐūÐīÐ―ÐūŅŅ‚Ðļ: §cВŅ‹ÐšÐŧ.", "tfg.machine.food_refrigerator_power_usage": "§7ПÐūŅ‚Ņ€ÐĩÐąÐŧŅÐĩŅ‚§r %s EU/t §7ÐēÐū ÐēŅ€ÐĩОŅ Ņ€Ð°ÐąÐūŅ‚Ņ‹, Ņ‡Ņ‚ÐūÐąŅ‹ ŅÐūŅ…Ņ€Ð°Ð―ÐļŅ‚ŅŒ ÐēаŅˆŅƒ ÐĩÐīŅƒ.§r", @@ -1756,79 +1844,83 @@ "tfc.recipe.barrel.simplylight.barrel.dyeing.illuminant_orange_block": "ОКŅ€Ð°ŅˆÐļÐēÐ°Ð―ÐļÐĩ", "tfc.recipe.barrel.simplylight.barrel.dyeing.illuminant_red_block": "ОКŅ€Ð°ŅˆÐļÐēÐ°Ð―ÐļÐĩ", "tfc.recipe.barrel.simplylight.barrel.dyeing.illuminant_brown_block": "ОКŅ€Ð°ŅˆÐļÐēÐ°Ð―ÐļÐĩ", - "tfc.recipe.barrel.tfg.barrel.treated_chipboard_composite": "Treating Chipboard Composite", + "tfc.recipe.barrel.tfg.barrel.treated_chipboard_composite": "ПŅ€ÐūÐŋÐļŅ‚Ка Ð”ÐĄÐŸ", "tfc.recipe.barrel.tfg.barrel.soak_hardwood_strip": "ПŅ€ÐūÐŋÐļŅ‚Ка ÐīÐĩŅ€ÐĩÐēŅÐ―Ð―Ņ‹Ņ… ÐŋÐūÐŧÐūŅÐūК", + "tfc.recipe.barrel.tfg.barrel.treated_wood_dust": "ПŅ€ÐūÐŋÐļŅ‚Ка ÐīÐĩŅ€ÐĩÐēŅÐ―Ð―ÐūÐđ ÐŋŅ‹ÐŧÐļ", "tfc.recipe.barrel.tfg.barrel.treated_wood_planks": "ÐžÐąŅ€Ð°ÐąÐūŅ‚Ка ÐīÐĩŅ€ÐĩÐēŅÐ―Ð―Ņ‹Ņ… ÐīÐūŅÐūК", "tfc.recipe.barrel.tfg.barrel.packed_ice": "ЗаОÐūŅ€ÐūзКа ÐŧŅŒÐīа", - "tfc.recipe.barrel.tfg.barrel.cooling_water_1": "Cooling Water", - "tfc.recipe.barrel.tfg.barrel.cooling_water_2": "Cooling Water", - "tfc.recipe.barrel.tfg.barrel.cooling_water_3": "Cooling Water", - "tfc.recipe.barrel.tfg.barrel.cooling_water_4": "Cooling Water", + "tfc.recipe.barrel.tfg.barrel.cooling_water_1": "ОŅ…ÐŧаÐķÐīÐĩÐ―ÐļÐĩ ÐēÐūÐīŅ‹", + "tfc.recipe.barrel.tfg.barrel.cooling_water_2": "ОŅ…ÐŧаÐķÐīÐĩÐ―ÐļÐĩ ÐēÐūÐīŅ‹", + "tfc.recipe.barrel.tfg.barrel.cooling_water_3": "ОŅ…ÐŧаÐķÐīÐĩÐ―ÐļÐĩ ÐēÐūÐīŅ‹", + "tfc.recipe.barrel.tfg.barrel.cooling_water_4": "ОŅ…ÐŧаÐķÐīÐĩÐ―ÐļÐĩ ÐēÐūÐīŅ‹", "tfc.recipe.barrel.tfg.sealed_barrel.prepared_leather_gloves": "ПÐūÐīÐģÐūŅ‚ÐūÐēÐŧÐĩÐ―Ð―Ņ‹Ðĩ КÐūÐķÐ°Ð―Ņ‹Ðĩ ПÐĩŅ€Ņ‡Ð°Ņ‚КÐļ", - "tfc.recipe.barrel.tfg.barrel.rapeseed_to_oil": "Extracting Canola Oil", - "tfc.recipe.barrel.tfg.barrel.sunflower_to_oil": "Extracting Sunflower Oil", - "tfc.recipe.barrel.tfg.barrel.maple_syrup_to_sugar": "Making sugar", - "tfc.recipe.barrel.tfg.barrel.birch_syrup_to_sugar": "Making sugar", - "tfc.recipe.barrel.tfg.barrel.light_concrete": "Solidifying Concrete", - "tfc.recipe.barrel.tfg.barrel.reinforced_light_concrete_support": "Solidifying Concrete", - "tfc.recipe.barrel.tfg.barrel.dark_concrete": "Dyeing", - "tfc.recipe.barrel.tfg.barrel.dark_concrete_support": "Dyeing", - "tfc.recipe.barrel.tfg.barrel.reinforced_dark_concrete_support": "Dyeing", + "tfc.recipe.barrel.tfg.barrel.rapeseed_to_oil": "ИзÐēÐŧÐĩŅ‡ÐĩÐ―ÐļŅ Ņ€Ð°ŅŅ‚ÐļŅ‚ÐĩÐŧŅŒÐ―ÐūÐģÐū ОаŅÐŧа", + "tfc.recipe.barrel.tfg.barrel.sunflower_to_oil": "ИзÐēÐŧÐĩŅ‡ÐĩÐ―ÐļŅ Ņ€Ð°ŅŅ‚ÐļŅ‚ÐĩÐŧŅŒÐ―ÐūÐģÐū ОаŅÐŧа", + "tfc.recipe.barrel.tfg.barrel.maple_syrup_to_sugar": "ПŅ€ÐūÐļзÐēÐūÐīŅŅ‚ÐēÐū ŅÐ°Ņ…аŅ€Ð°", + "tfc.recipe.barrel.tfg.barrel.birch_syrup_to_sugar": "ПŅ€ÐūÐļзÐēÐūÐīŅŅ‚ÐēÐū ŅÐ°Ņ…аŅ€Ð°", + "tfc.recipe.barrel.tfg.barrel.develop_black_and_white_film": "РазŅ€Ð°ÐąÐūŅ‚Ка ÐŋÐŧŅ‘Ð―КÐļ", + "tfc.recipe.barrel.tfg.barrel.develop_color_film": "РазŅ€Ð°ÐąÐūŅ‚Ка ÐŋÐŧŅ‘Ð―КÐļ", + "tfc.recipe.barrel.tfg.barrel.light_concrete": "ЗаŅ‚ÐēÐĩŅ€ÐīÐĩÐēÐ°Ð―ÐļÐĩ ÐąÐĩŅ‚ÐūÐ―Ð°", + "tfc.recipe.barrel.tfg.barrel.reinforced_light_concrete_support": "ЗаŅ‚ÐēÐĩŅ€ÐīÐĩÐēÐ°Ð―ÐļÐĩ ÐąÐĩŅ‚ÐūÐ―Ð°", + "tfc.recipe.barrel.tfg.barrel.dark_concrete": "ОКŅ€Ð°ŅˆÐļÐēÐ°Ð―ÐļÐĩ", + "tfc.recipe.barrel.tfg.barrel.dark_concrete_support": "ОКŅ€Ð°ŅˆÐļÐēÐ°Ð―ÐļÐĩ", + "tfc.recipe.barrel.tfg.barrel.reinforced_dark_concrete_support": "ОКŅ€Ð°ŅˆÐļÐēÐ°Ð―ÐļÐĩ", "gtceu.aqueous_accumulator": "ЖÐļÐīКÐūŅŅ‚Ð―Ņ‹Ðđ КÐūÐŧÐŧÐĩКŅ‚ÐūŅ€", "tfg.food_recipe.brining": "ЗаŅÐ°ÐŧÐļÐēÐ°Ð―ÐļÐĩ", "tfg.food_recipe.smoking": "КÐūÐŋŅ‡ÐĩÐ―ÐļÐĩ", "tfg.food_recipe.drying": "ÐĄŅƒŅˆÐšÐ°", "tfg.food_recipe.freeze_drying": "ЛÐļÐūŅ„ÐļÐŧÐļзаŅ†ÐļŅ", - "tfg.recipe.macerator_warning": "Only outputs first slot until HV", + "tfg.food_recipe.deep_frying": "ЖаŅ€ÐšÐ° ÐēÐū Ņ„Ņ€ÐļŅ‚ŅŽŅ€Ðĩ", + "tfg.recipe.macerator_warning": "ПŅ€ÐūÐļзÐēÐūÐīÐļŅ‚ ÐŧÐļŅˆŅŒ ÐŋÐĩŅ€ÐēŅ‹Ðđ ŅÐŧÐūŅ‚ ÐīÐū HV", "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", - "tfg.grapplemod.upgrades.motor.mv": "Enables the §lMotor§r Upgrade, automatically reeling you in.\n§lMotorMaxSpeed§r set to 1.14\n§lMotorAcceleration§r set to 0.25", - "tfg.grapplemod.upgrades.motor.hv": "Enables the §lMotor§r Upgrade, automatically reeling you in.\n§lMotorMaxSpeed§r set to 1.28\n§lMotorAcceleration§r set to 0.375", - "tfg.grapplemod.upgrades.motor.ev": "Enables the §lMotor§r Upgrade, automatically reeling you in.\n§lMotorMaxSpeed§r set to 1.42\n§lMotorAcceleration§r set to 0.5", - "tfg.grapplemod.upgrades.motor.iv": "Enables the §lMotor§r Upgrade, automatically reeling you in.\n§lMotorMaxSpeed§r set to 1.56\n§lMotorAcceleration§r set to 0.625", - "tfg.grapplemod.upgrades.motor.luv": "Enables the §lMotor§r Upgrade, automatically reeling you in.\n§lMotorMaxSpeed§r set to 1.7\n§lMotorAcceleration§r set to 0.75", - "tfg.grapplemod.upgrades.motor.zpm": "Enables the §lMotor§r Upgrade, automatically reeling you in.\n§lMotorMaxSpeed§r set to 1.84\n§lMotorAcceleration§r set to 0.875", - "tfg.grapplemod.upgrades.motor.uv": "Enables the §lMotor§r Upgrade, automatically reeling you in.\n§lMotorMaxSpeed§r set to 2\n§lMotorAcceleration§r set to 1", - "tfg.grapplemod.downgrades.motor": "Disables the §lMotor§r Upgrade, returning the original motor.\nOnly works if you use the same type of Motor as before.", - "tfg.grapplemod.upgrades.smart_motor": "Enables the §lSmart Motor§r Upgrade, requires a Motor to be installed.", - "tfg.grapplemod.downgrades.smart_motor": "Disables the §lSmart Motor§r Upgrade, can be removed with the Motor already uninstalled. Returns the Basic Electronic Circuit", - "tfg.grapplemod.upgrades.sticky": "Enables the §lSticky§r Upgrade, causing the hook to stick to any block the rope touches.", - "tfg.grapplemod.downgrades.sticky": "Disables the §lSticky§r Upgrade, returning the Sticky Resin", - "tfg.grapplemod.upgrades.forcefield.lv": "Enables the §lForce Field§r Upgrade, repelling you from nearby blocks while Grappling.\n§lRepel Force§r set to 0.625", - "tfg.grapplemod.upgrades.forcefield.mv": "Enables the §lForce Field§r Upgrade, repelling you from nearby blocks while Grappling.\n§lRepel Force§r set to 1.25", - "tfg.grapplemod.upgrades.forcefield.hv": "Enables the §lForce Field§r Upgrade, repelling you from nearby blocks while Grappling.\n§lRepel Force§r set to 1.875", - "tfg.grapplemod.upgrades.forcefield.ev": "Enables the §lForce Field§r Upgrade, repelling you from nearby blocks while Grappling.\n§lRepel Force§r set to 2.5", - "tfg.grapplemod.upgrades.forcefield.iv": "Enables the §lForce Field§r Upgrade, repelling you from nearby blocks while Grappling.\n§lRepel Force§r set to 3.125", - "tfg.grapplemod.upgrades.forcefield.luv": "Enables the §lForce Field§r Upgrade, repelling you from nearby blocks while Grappling.\n§lRepel Force§r set to 3.75", - "tfg.grapplemod.upgrades.forcefield.zpm": "Enables the §lForce Field§r Upgrade, repelling you from nearby blocks while Grappling.\n§lRepel Force§r set to 4.375", - "tfg.grapplemod.upgrades.forcefield.uv": "Enables the §lForce Field§r Upgrade, repelling you from nearby blocks while Grappling.\n§lRepel Force§r set to 5", - "tfg.grapplemod.downgrades.forcefield": "Disables the §lForce Field§r Upgrade, returning the original Field Generator.\nOnly works if you use the same type of Field Generator as before.", - "tfg.grapplemod.upgrades.magnet.magnetic_iron_ingot": "Enables the §lMagnet§r Upgrade, causing the hook itself to attach to nearby blocks.\n§lAttraction Radius§r set to 1.25", - "tfg.grapplemod.upgrades.magnet.magnetic_steel_ingot": "Enables the §lMagnet§r Upgrade, causing the hook itself to attach to nearby blocks.\n§lAttraction Radius§r set to 2.5", - "tfg.grapplemod.upgrades.magnet.magnetic_neodymium_ingot": "Enables the §lMagnet§r Upgrade, causing the hook itself to attach to nearby blocks.\n§lAttraction Radius§r set to 3.75", - "tfg.grapplemod.upgrades.magnet.magnetic_samarium_ingot": "Enables the §lMagnet§r Upgrade, causing the hook itself to attach to nearby blocks.\n§lAttraction Radius§r set to 5", - "tfg.grapplemod.downgrades.magnet": "Disables the §lMagnet§r Upgrade, returning the original Magnetic Ingot.\nOnly works if you use the same type of Magnetic Ingot as before.", - "tfg.grapplemod.upgrades.gravity.0.5": "Lowers the Hook's §lGravity§r to 50% (1 -> 0.5)", - "tfg.grapplemod.downgrades.gravity.0.5": "Returns the Hook's §lGravity§r back to 100% (0.5 -> 1).\nThe empty bucket will be filled with the Helium you used", - "tfg.grapplemod.upgrades.gravity.0": "Lowers the Hook's §lGravity§r to 0% (1 -> 0)", - "tfg.grapplemod.downgrades.gravity.0": "Returns the Hook's §lGravity§r back to 100% (0 -> 1).\nThe Gravitation Engine Unit will be returned.", - "tfg.grapplemod.upgrades.throwspeed.lv": "Increases the §lThrow Speed§r of the Hook, causing it to travel farther.\n§lThrow Speed§r set to 2.25", - "tfg.grapplemod.upgrades.throwspeed.mv": "Increases the §lThrow Speed§r of the Hook, causing it to travel farther.\n§lThrow Speed§r set to 2.5", - "tfg.grapplemod.upgrades.throwspeed.hv": "Increases the §lThrow Speed§r of the Hook, causing it to travel farther.\n§lThrow Speed§r set to 2.75", - "tfg.grapplemod.upgrades.throwspeed.ev": "Increases the §lThrow Speed§r of the Hook, causing it to travel farther.\n§lThrow Speed§r set to 3", - "tfg.grapplemod.upgrades.throwspeed.iv": "Increases the §lThrow Speed§r of the Hook, causing it to travel farther.\n§lThrow Speed§r set to 3.25", - "tfg.grapplemod.upgrades.throwspeed.luv": "Increases the §lThrow Speed§r of the Hook, causing it to travel farther.\n§lThrow Speed§r set to 3.5", - "tfg.grapplemod.upgrades.throwspeed.zpm": "Increases the §lThrow Speed§r of the Hook, causing it to travel farther.\n§lThrow Speed§r set to 3.75", - "tfg.grapplemod.upgrades.throwspeed.uv": "Increases the §lThrow Speed§r of the Hook, causing it to travel farther.\n§lThrow Speed§r set to 4", - "tfg.grapplemod.downgrades.throwspeed": "Resets the §lThrow Speed§r of the hook back to normal, returning the original Piston.\nOnly works if you use the same type of Piston as before.", - "tfg.grapplemod.upgrades.doublehook": "Adds a §lSecondary Hook§r to your Grappling Hook", - "tfg.grapplemod.downgrades.doublehook": "Removes the §lSecondary Hook§r from your Grappling Hook", - "tfg.grapplemod.upgrades.vertical_throwing_angle": "Increases the §lVertical Throwing Angle§r of the hook by 5°, up to 90°.", - "tfg.grapplemod.downgrades.vertical_throwing_angle": "Decreases the §lVertical Throwing Angle§r of the hook by 5°, down to 0°.", - "tfg.grapplemod.upgrades.angle": "Increases the §lHorizontal Angle§r for throwing your §lDouble Hooks§r by 5°, up to 90°.\nOnly accessible with a §lDouble Hook§r installed.", - "tfg.grapplemod.downgrades.angle": "Decreases the §lHorizontal Angle§r for throwing your §lDouble Hooks§r by 5°, down to 5°°.\nOnly accessible with a §lDouble Hook§r installed.", + "tfg.grapplemod.upgrades.maxlen": "ÐĢÐēÐĩÐŧÐļŅ‡ÐļÐēаÐĩŅ‚ §lМаКŅÐļОаÐŧŅŒÐ―ŅƒŅŽ ÐīÐŧÐļÐ―ŅƒÂ§r Ð―Ð° 20, ÐēÐŋÐŧÐūŅ‚ŅŒ ÐīÐū 200.", + "tfg.grapplemod.downgrades.maxlen": "ÐĢОÐĩÐ―ŅŒŅˆÐ°ÐĩŅ‚ §lМаКŅÐļОаÐŧŅŒÐ―ŅƒŅŽ ÐīÐŧÐļÐ―ŅƒÂ§r Ð―Ð° 20, ÐēÐŋÐŧÐūŅ‚ŅŒ ÐīÐū 20. (МÐūŅ‚ÐūК ÐēÐĩŅ€ÐĩÐēКÐļ ÐēÐĩŅ€Ð―Ņ‘Ņ‚ŅŅ).", + "tfg.grapplemod.upgrades.motor.lv": "ВКÐŧŅŽŅ‡Ð°ÐĩŅ‚ ŅƒÐŧŅƒŅ‡ŅˆÐĩÐ―ÐļÐĩ §lМÐūŅ‚ÐūŅ€Â§r, аÐēŅ‚ÐūОаŅ‚ÐļŅ‡ÐĩŅÐšÐļ ÐŋÐūÐīŅ‚ŅÐģÐļÐēаŅ ÐļÐģŅ€ÐūКа. n§lМаКŅÐĄÐšÐūŅ€ÐūŅŅ‚ŅŒÐœÐūŅ‚ÐūŅ€Ð°Â§r ÐąŅƒÐīÐĩŅ‚ Ņ€Ð°ÐēÐ―Ð° 1\n§lÐĢŅÐšÐūŅ€ÐĩÐ―ÐļÐĩМÐūŅ‚ÐūŅ€Ð°Â§r ÐąŅƒÐīÐĩŅ‚ Ņ€Ð°ÐēÐ―Ðū 0.125", + "tfg.grapplemod.upgrades.motor.mv": "ВКÐŧŅŽŅ‡Ð°ÐĩŅ‚ ŅƒÐŧŅƒŅ‡ŅˆÐĩÐ―ÐļÐĩ §lМÐūŅ‚ÐūŅ€Â§r, аÐēŅ‚ÐūОаŅ‚ÐļŅ‡ÐĩŅÐšÐļ ÐŋÐūÐīŅ‚ŅÐģÐļÐēаŅ ÐļÐģŅ€ÐūКа. n§lМаКŅÐĄÐšÐūŅ€ÐūŅŅ‚ŅŒÐœÐūŅ‚ÐūŅ€Ð°Â§r ÐąŅƒÐīÐĩŅ‚ Ņ€Ð°ÐēÐ―Ð° 1.14\n§lÐĢŅÐšÐūŅ€ÐĩÐ―ÐļÐĩМÐūŅ‚ÐūŅ€Ð°Â§r ÐąŅƒÐīÐĩŅ‚ Ņ€Ð°ÐēÐ―Ðū 0.25", + "tfg.grapplemod.upgrades.motor.hv": "ВКÐŧŅŽŅ‡Ð°ÐĩŅ‚ ŅƒÐŧŅƒŅ‡ŅˆÐĩÐ―ÐļÐĩ §lМÐūŅ‚ÐūŅ€Â§r, аÐēŅ‚ÐūОаŅ‚ÐļŅ‡ÐĩŅÐšÐļ ÐŋÐūÐīŅ‚ŅÐģÐļÐēаŅ ÐļÐģŅ€ÐūКа. n§lМаКŅÐĄÐšÐūŅ€ÐūŅŅ‚ŅŒÐœÐūŅ‚ÐūŅ€Ð°Â§r ÐąŅƒÐīÐĩŅ‚ Ņ€Ð°ÐēÐ―Ð° 1.28\n§lÐĢŅÐšÐūŅ€ÐĩÐ―ÐļÐĩМÐūŅ‚ÐūŅ€Ð°Â§r ÐąŅƒÐīÐĩŅ‚ Ņ€Ð°ÐēÐ―Ðū 0.375", + "tfg.grapplemod.upgrades.motor.ev": "ВКÐŧŅŽŅ‡Ð°ÐĩŅ‚ ŅƒÐŧŅƒŅ‡ŅˆÐĩÐ―ÐļÐĩ §lМÐūŅ‚ÐūŅ€Â§r, аÐēŅ‚ÐūОаŅ‚ÐļŅ‡ÐĩŅÐšÐļ ÐŋÐūÐīŅ‚ŅÐģÐļÐēаŅ ÐļÐģŅ€ÐūКа. n§lМаКŅÐĄÐšÐūŅ€ÐūŅŅ‚ŅŒÐœÐūŅ‚ÐūŅ€Ð°Â§r ÐąŅƒÐīÐĩŅ‚ Ņ€Ð°ÐēÐ―Ð° 1.42\n§lÐĢŅÐšÐūŅ€ÐĩÐ―ÐļÐĩМÐūŅ‚ÐūŅ€Ð°Â§r ÐąŅƒÐīÐĩŅ‚ Ņ€Ð°ÐēÐ―Ðū 0.5", + "tfg.grapplemod.upgrades.motor.iv": "ВКÐŧŅŽŅ‡Ð°ÐĩŅ‚ ŅƒÐŧŅƒŅ‡ŅˆÐĩÐ―ÐļÐĩ §lМÐūŅ‚ÐūŅ€Â§r, аÐēŅ‚ÐūОаŅ‚ÐļŅ‡ÐĩŅÐšÐļ ÐŋÐūÐīŅ‚ŅÐģÐļÐēаŅ ÐļÐģŅ€ÐūКа. n§lМаКŅÐĄÐšÐūŅ€ÐūŅŅ‚ŅŒÐœÐūŅ‚ÐūŅ€Ð°Â§r ÐąŅƒÐīÐĩŅ‚ Ņ€Ð°ÐēÐ―Ð° 1.56\n§lÐĢŅÐšÐūŅ€ÐĩÐ―ÐļÐĩМÐūŅ‚ÐūŅ€Ð°Â§r ÐąŅƒÐīÐĩŅ‚ Ņ€Ð°ÐēÐ―Ðū 0.625", + "tfg.grapplemod.upgrades.motor.luv": "ВКÐŧŅŽŅ‡Ð°ÐĩŅ‚ ŅƒÐŧŅƒŅ‡ŅˆÐĩÐ―ÐļÐĩ §lМÐūŅ‚ÐūŅ€Â§r, аÐēŅ‚ÐūОаŅ‚ÐļŅ‡ÐĩŅÐšÐļ ÐŋÐūÐīŅ‚ŅÐģÐļÐēаŅ ÐļÐģŅ€ÐūКа. n§lМаКŅÐĄÐšÐūŅ€ÐūŅŅ‚ŅŒÐœÐūŅ‚ÐūŅ€Ð°Â§r ÐąŅƒÐīÐĩŅ‚ Ņ€Ð°ÐēÐ―Ð° 1.7\n§lÐĢŅÐšÐūŅ€ÐĩÐ―ÐļÐĩМÐūŅ‚ÐūŅ€Ð°Â§r ÐąŅƒÐīÐĩŅ‚ Ņ€Ð°ÐēÐ―Ðū 0.75", + "tfg.grapplemod.upgrades.motor.zpm": "ВКÐŧŅŽŅ‡Ð°ÐĩŅ‚ ŅƒÐŧŅƒŅ‡ŅˆÐĩÐ―ÐļÐĩ §lМÐūŅ‚ÐūŅ€Â§r, аÐēŅ‚ÐūОаŅ‚ÐļŅ‡ÐĩŅÐšÐļ ÐŋÐūÐīŅ‚ŅÐģÐļÐēаŅ ÐļÐģŅ€ÐūКа. n§lМаКŅÐĄÐšÐūŅ€ÐūŅŅ‚ŅŒÐœÐūŅ‚ÐūŅ€Ð°Â§r ÐąŅƒÐīÐĩŅ‚ Ņ€Ð°ÐēÐ―Ð° 1.84\n§lÐĢŅÐšÐūŅ€ÐĩÐ―ÐļÐĩМÐūŅ‚ÐūŅ€Ð°Â§r ÐąŅƒÐīÐĩŅ‚ Ņ€Ð°ÐēÐ―Ðū 0.875", + "tfg.grapplemod.upgrades.motor.uv": "ВКÐŧŅŽŅ‡Ð°ÐĩŅ‚ ŅƒÐŧŅƒŅ‡ŅˆÐĩÐ―ÐļÐĩ §lМÐūŅ‚ÐūŅ€Â§r, аÐēŅ‚ÐūОаŅ‚ÐļŅ‡ÐĩŅÐšÐļ ÐŋÐūÐīŅ‚ŅÐģÐļÐēаŅ ÐļÐģŅ€ÐūКа. n§lМаКŅÐĄÐšÐūŅ€ÐūŅŅ‚ŅŒÐœÐūŅ‚ÐūŅ€Ð°Â§r ÐąŅƒÐīÐĩŅ‚ Ņ€Ð°ÐēÐ―Ð° 2\n§lÐĢŅÐšÐūŅ€ÐĩÐ―ÐļÐĩМÐūŅ‚ÐūŅ€Ð°Â§r ÐąŅƒÐīÐĩŅ‚ Ņ€Ð°ÐēÐ―Ðū 1", + "tfg.grapplemod.downgrades.motor": "ВŅ‹ÐšÐŧŅŽŅ‡Ð°ÐĩŅ‚ ŅƒÐŧŅƒŅ‡ŅˆÐĩÐ―ÐļÐĩ §lМÐūŅ‚ÐūŅ€Â§r, ÐēÐūзŅ€Ð°Ņ‰Ð°Ņ ОÐūŅ‚ÐūŅ€.\nÐ Ð°ÐąÐūŅ‚аÐĩŅ‚ Ņ‚ÐūÐŧŅŒÐšÐū ÐŋŅ€Ðļ ÐļŅÐŋÐūÐŧŅŒÐ·ÐūÐēÐ°Ð―ÐļÐļ Ņ‚ÐūÐģÐū ÐķÐĩ Ņ‚ÐļÐŋа ОÐūŅ‚ÐūŅ€Ð°, Ņ‡Ņ‚Ðū Ðļ Ņ€Ð°Ð―ŅŒŅˆÐĩ.", + "tfg.grapplemod.upgrades.smart_motor": "ВКÐŧŅŽŅ‡Ð°ÐĩŅ‚ ŅƒÐŧŅƒŅ‡ŅˆÐĩÐ―ÐļÐĩ §lÐĢÐžÐ―Ņ‹ÐđМÐūŅ‚ÐūŅ€Â§r, ÐīÐŧŅ Ņ€Ð°ÐąÐūŅ‚Ņ‹ Ð―ÐĩÐūÐąŅ…ÐūÐīÐļО ŅƒŅŅ‚Ð°Ð―ÐūÐēÐŧÐĩÐ―Ð―ÐūÐĩ ŅƒÐŧŅƒŅ‡ŅˆÐĩÐ―ÐļŅ ОÐūŅ‚ÐūŅ€Ð°.", + "tfg.grapplemod.downgrades.smart_motor": "ВŅ‹ÐšÐŧŅŽŅ‡Ð°ÐĩŅ‚ ŅƒÐŧŅƒŅ‡ŅˆÐĩÐ―ÐļÐĩ §lÐĢÐžÐ―Ņ‹ÐđМÐūŅ‚ÐūŅ€Â§r, ÐĩÐģÐū ОÐūÐķÐ―Ðū ŅÐ―ŅŅ‚ŅŒ, ÐīаÐķÐĩ ÐĩŅÐŧÐļ ÐīÐēÐļÐģаŅ‚ÐĩÐŧŅŒ ŅƒÐķÐĩ ŅÐ―ŅŅ‚. ВÐūзŅ€Ð°Ņ‰Ð°ÐĩŅ‚ ÐūÐąŅ‹Ņ‡Ð―ŅƒŅŽ ОÐļКŅ€ÐūŅŅ…ÐĩОŅƒ", + "tfg.grapplemod.upgrades.sticky": "ВКÐŧŅŽŅ‡Ð°ÐĩŅ‚ ŅƒÐŧŅƒŅ‡ŅˆÐĩÐ―ÐļÐĩ §lЛÐļÐŋКаŅ ÐēÐĩŅ€Ņ‘ÐēКа§r, Ðē Ņ€ÐĩзŅƒÐŧŅŒŅ‚аŅ‚Ðĩ Ņ‡ÐĩÐģÐū КŅ€ŅŽÐš ÐŋŅ€ÐļÐŧÐļÐŋаÐĩŅ‚ К ÐŧŅŽÐąÐūОŅƒ ÐąÐŧÐūКŅƒ, КÐūŅ‚ÐūŅ€ÐūÐģÐū КаŅÐ°ÐĩŅ‚ŅŅ ÐēÐĩŅ€ÐĩÐēКа.", + "tfg.grapplemod.downgrades.sticky": "ВŅ‹ÐšÐŧŅŽŅ‡Ð°ÐĩŅ‚ ŅƒÐŧŅƒŅ‡ŅˆÐĩÐ―ÐļÐĩ the §lЛÐļÐŋКаŅ ÐēÐĩŅ€Ņ‘ÐēКа§r, ÐēÐūзÐēŅ€Ð°Ņ‰ÐĩÐ―ÐļÐĩ ÐŧÐļÐŋКÐūÐđ ŅÐžÐūÐŧŅ‹", + "tfg.grapplemod.upgrades.forcefield.lv": "ВКÐŧŅŽŅ‡Ð°ÐĩŅ‚ ŅƒÐŧŅƒŅ‡ŅˆÐĩÐ―ÐļÐĩ §lОŅ‚Ņ‚аÐŧКÐļÐēаŅŽŅ‰ÐĩÐĩПÐūÐŧÐĩ§r, ÐūŅ‚Ņ‚аÐŧКÐļÐēаÐĩŅ‚ ÐēаŅ ÐūŅ‚ ÐąÐŧÐļÐķаÐđŅˆÐļŅ… ÐąÐŧÐūКÐūÐē ÐēÐū ÐēŅ€ÐĩОŅ ÐļŅÐŋÐūÐŧŅŒÐ·ÐūÐēÐ°Ð―ÐļŅ КŅ€ŅŽÐšÐ°.\n§lÐĄÐļÐŧаОŅ‚Ņ‚аÐŧКÐļÐēÐ°Ð―ÐļŅÂ§r ÐąŅƒÐīÐĩŅ‚ Ņ€Ð°ÐēÐ―Ð° 0.625", + "tfg.grapplemod.upgrades.forcefield.mv": "ВКÐŧŅŽŅ‡Ð°ÐĩŅ‚ ŅƒÐŧŅƒŅ‡ŅˆÐĩÐ―ÐļÐĩ §lОŅ‚Ņ‚аÐŧКÐļÐēаŅŽŅ‰ÐĩÐĩПÐūÐŧÐĩ§r, ÐūŅ‚Ņ‚аÐŧКÐļÐēаÐĩŅ‚ ÐēаŅ ÐūŅ‚ ÐąÐŧÐļÐķаÐđŅˆÐļŅ… ÐąÐŧÐūКÐūÐē ÐēÐū ÐēŅ€ÐĩОŅ ÐļŅÐŋÐūÐŧŅŒÐ·ÐūÐēÐ°Ð―ÐļŅ КŅ€ŅŽÐšÐ°.\n§lÐĄÐļÐŧаОŅ‚Ņ‚аÐŧКÐļÐēÐ°Ð―ÐļŅÂ§r ÐąŅƒÐīÐĩŅ‚ Ņ€Ð°ÐēÐ―Ð° 1.25", + "tfg.grapplemod.upgrades.forcefield.hv": "ВКÐŧŅŽŅ‡Ð°ÐĩŅ‚ ŅƒÐŧŅƒŅ‡ŅˆÐĩÐ―ÐļÐĩ §lОŅ‚Ņ‚аÐŧКÐļÐēаŅŽŅ‰ÐĩÐĩПÐūÐŧÐĩ§r, ÐūŅ‚Ņ‚аÐŧКÐļÐēаÐĩŅ‚ ÐēаŅ ÐūŅ‚ ÐąÐŧÐļÐķаÐđŅˆÐļŅ… ÐąÐŧÐūКÐūÐē ÐēÐū ÐēŅ€ÐĩОŅ ÐļŅÐŋÐūÐŧŅŒÐ·ÐūÐēÐ°Ð―ÐļŅ КŅ€ŅŽÐšÐ°.\n§lÐĄÐļÐŧаОŅ‚Ņ‚аÐŧКÐļÐēÐ°Ð―ÐļŅÂ§r ÐąŅƒÐīÐĩŅ‚ Ņ€Ð°ÐēÐ―Ð° 1.875", + "tfg.grapplemod.upgrades.forcefield.ev": "ВКÐŧŅŽŅ‡Ð°ÐĩŅ‚ ŅƒÐŧŅƒŅ‡ŅˆÐĩÐ―ÐļÐĩ §lОŅ‚Ņ‚аÐŧКÐļÐēаŅŽŅ‰ÐĩÐĩПÐūÐŧÐĩ§r, ÐūŅ‚Ņ‚аÐŧКÐļÐēаÐĩŅ‚ ÐēаŅ ÐūŅ‚ ÐąÐŧÐļÐķаÐđŅˆÐļŅ… ÐąÐŧÐūКÐūÐē ÐēÐū ÐēŅ€ÐĩОŅ ÐļŅÐŋÐūÐŧŅŒÐ·ÐūÐēÐ°Ð―ÐļŅ КŅ€ŅŽÐšÐ°.\n§lÐĄÐļÐŧаОŅ‚Ņ‚аÐŧКÐļÐēÐ°Ð―ÐļŅÂ§r ÐąŅƒÐīÐĩŅ‚ Ņ€Ð°ÐēÐ―Ð° 2.5", + "tfg.grapplemod.upgrades.forcefield.iv": "ВКÐŧŅŽŅ‡Ð°ÐĩŅ‚ ŅƒÐŧŅƒŅ‡ŅˆÐĩÐ―ÐļÐĩ §lОŅ‚Ņ‚аÐŧКÐļÐēаŅŽŅ‰ÐĩÐĩПÐūÐŧÐĩ§r, ÐūŅ‚Ņ‚аÐŧКÐļÐēаÐĩŅ‚ ÐēаŅ ÐūŅ‚ ÐąÐŧÐļÐķаÐđŅˆÐļŅ… ÐąÐŧÐūКÐūÐē ÐēÐū ÐēŅ€ÐĩОŅ ÐļŅÐŋÐūÐŧŅŒÐ·ÐūÐēÐ°Ð―ÐļŅ КŅ€ŅŽÐšÐ°.\n§lÐĄÐļÐŧаОŅ‚Ņ‚аÐŧКÐļÐēÐ°Ð―ÐļŅÂ§r ÐąŅƒÐīÐĩŅ‚ Ņ€Ð°ÐēÐ―Ð° 3.125", + "tfg.grapplemod.upgrades.forcefield.luv": "ВКÐŧŅŽŅ‡Ð°ÐĩŅ‚ ŅƒÐŧŅƒŅ‡ŅˆÐĩÐ―ÐļÐĩ §lОŅ‚Ņ‚аÐŧКÐļÐēаŅŽŅ‰ÐĩÐĩПÐūÐŧÐĩ§r, ÐūŅ‚Ņ‚аÐŧКÐļÐēаÐĩŅ‚ ÐēаŅ ÐūŅ‚ ÐąÐŧÐļÐķаÐđŅˆÐļŅ… ÐąÐŧÐūКÐūÐē ÐēÐū ÐēŅ€ÐĩОŅ ÐļŅÐŋÐūÐŧŅŒÐ·ÐūÐēÐ°Ð―ÐļŅ КŅ€ŅŽÐšÐ°.\n§lÐĄÐļÐŧаОŅ‚Ņ‚аÐŧКÐļÐēÐ°Ð―ÐļŅÂ§r ÐąŅƒÐīÐĩŅ‚ Ņ€Ð°ÐēÐ―Ð° 3.75", + "tfg.grapplemod.upgrades.forcefield.zpm": "ВКÐŧŅŽŅ‡Ð°ÐĩŅ‚ ŅƒÐŧŅƒŅ‡ŅˆÐĩÐ―ÐļÐĩ §lОŅ‚Ņ‚аÐŧКÐļÐēаŅŽŅ‰ÐĩÐĩПÐūÐŧÐĩ§r, ÐūŅ‚Ņ‚аÐŧКÐļÐēаÐĩŅ‚ ÐēаŅ ÐūŅ‚ ÐąÐŧÐļÐķаÐđŅˆÐļŅ… ÐąÐŧÐūКÐūÐē ÐēÐū ÐēŅ€ÐĩОŅ ÐļŅÐŋÐūÐŧŅŒÐ·ÐūÐēÐ°Ð―ÐļŅ КŅ€ŅŽÐšÐ°.\n§lÐĄÐļÐŧаОŅ‚Ņ‚аÐŧКÐļÐēÐ°Ð―ÐļŅÂ§r ÐąŅƒÐīÐĩŅ‚ Ņ€Ð°ÐēÐ―Ð° 4.375", + "tfg.grapplemod.upgrades.forcefield.uv": "ВКÐŧŅŽŅ‡Ð°ÐĩŅ‚ ŅƒÐŧŅƒŅ‡ŅˆÐĩÐ―ÐļÐĩ §lОŅ‚Ņ‚аÐŧКÐļÐēаŅŽŅ‰ÐĩÐĩПÐūÐŧÐĩ§r, ÐūŅ‚Ņ‚аÐŧКÐļÐēаÐĩŅ‚ ÐēаŅ ÐūŅ‚ ÐąÐŧÐļÐķаÐđŅˆÐļŅ… ÐąÐŧÐūКÐūÐē ÐēÐū ÐēŅ€ÐĩОŅ ÐļŅÐŋÐūÐŧŅŒÐ·ÐūÐēÐ°Ð―ÐļŅ КŅ€ŅŽÐšÐ°.\n§lÐĄÐļÐŧаОŅ‚Ņ‚аÐŧКÐļÐēÐ°Ð―ÐļŅÂ§r ÐąŅƒÐīÐĩŅ‚ Ņ€Ð°ÐēÐ―Ð° 5", + "tfg.grapplemod.downgrades.forcefield": "ВŅ‹ÐšÐŧŅŽŅ‡Ð°ÐĩŅ‚ ŅƒÐŧŅƒŅ‡ŅˆÐĩÐ―ÐļÐĩ the §lОŅ‚Ņ‚аÐŧКÐļÐēаŅŽŅ‰ÐĩÐĩПÐūÐŧÐĩ§r, ÐēÐūзŅ€Ð°Ņ‰Ð°ÐĩŅ‚ ÐģÐĩÐ―ÐĩŅ€Ð°Ņ‚ÐūŅ€ ÐŋÐūÐŧŅ.\nÐ Ð°ÐąÐūŅ‚аÐĩŅ‚ Ņ‚ÐūÐŧŅŒÐšÐū ÐŋŅ€Ðļ ÐļŅÐŋÐūÐŧŅŒÐ·ÐūÐēÐ°Ð―ÐļÐļ Ņ‚ÐūÐģÐū ÐķÐĩ Ņ‚ÐļÐŋа ÐģÐĩÐ―ÐĩŅ€Ð°Ņ‚ÐūŅ€Ð° ÐŋÐūÐŧÐĩÐđ, Ņ‡Ņ‚Ðū Ðļ Ņ€Ð°Ð―ŅŒŅˆÐĩ", + "tfg.grapplemod.upgrades.magnet.magnetic_iron_ingot": "ВКÐŧŅŽŅ‡Ð°ÐĩŅ‚ ŅƒÐŧŅƒŅ‡ŅˆÐĩÐ―ÐļÐĩ §lМаÐģÐ―ÐļŅ‚§r, Ðē Ņ€ÐĩзŅƒÐŧŅŒŅ‚аŅ‚Ðĩ Ņ‡ÐĩÐģÐū ŅÐ°Ðž КŅ€ŅŽÐš ÐŋŅ€ÐļКŅ€ÐĩÐŋÐŧŅÐĩŅ‚ŅŅ К ÐąÐŧÐļÐķаÐđŅˆÐļО ÐąÐŧÐūКаО..\n§lAttraction Radius§r ÐąŅƒÐīÐĩŅ‚ Ņ€Ð°ÐēÐ―Ðū 1.25", + "tfg.grapplemod.upgrades.magnet.magnetic_steel_ingot": "ВКÐŧŅŽŅ‡Ð°ÐĩŅ‚ ŅƒÐŧŅƒŅ‡ŅˆÐĩÐ―ÐļÐĩ §lМаÐģÐ―ÐļŅ‚§r, Ðē Ņ€ÐĩзŅƒÐŧŅŒŅ‚аŅ‚Ðĩ Ņ‡ÐĩÐģÐū ŅÐ°Ðž КŅ€ŅŽÐš ÐŋŅ€ÐļКŅ€ÐĩÐŋÐŧŅÐĩŅ‚ŅŅ К ÐąÐŧÐļÐķаÐđŅˆÐļО ÐąÐŧÐūКаО..\n§lAttraction Radius§r ÐąŅƒÐīÐĩŅ‚ Ņ€Ð°ÐēÐ―Ðū 2.5", + "tfg.grapplemod.upgrades.magnet.magnetic_neodymium_ingot": "ВКÐŧŅŽŅ‡Ð°ÐĩŅ‚ ŅƒÐŧŅƒŅ‡ŅˆÐĩÐ―ÐļÐĩ §lМаÐģÐ―ÐļŅ‚§r, Ðē Ņ€ÐĩзŅƒÐŧŅŒŅ‚аŅ‚Ðĩ Ņ‡ÐĩÐģÐū ŅÐ°Ðž КŅ€ŅŽÐš ÐŋŅ€ÐļКŅ€ÐĩÐŋÐŧŅÐĩŅ‚ŅŅ К ÐąÐŧÐļÐķаÐđŅˆÐļО ÐąÐŧÐūКаО..\n§lAttraction Radius§r ÐąŅƒÐīÐĩŅ‚ Ņ€Ð°ÐēÐ―Ðū 3.75", + "tfg.grapplemod.upgrades.magnet.magnetic_samarium_ingot": "ВКÐŧŅŽŅ‡Ð°ÐĩŅ‚ ŅƒÐŧŅƒŅ‡ŅˆÐĩÐ―ÐļÐĩ §lМаÐģÐ―ÐļŅ‚§r, Ðē Ņ€ÐĩзŅƒÐŧŅŒŅ‚аŅ‚Ðĩ Ņ‡ÐĩÐģÐū ŅÐ°Ðž КŅ€ŅŽÐš ÐŋŅ€ÐļКŅ€ÐĩÐŋÐŧŅÐĩŅ‚ŅŅ К ÐąÐŧÐļÐķаÐđŅˆÐļО ÐąÐŧÐūКаО..\n§lAttraction Radius§r ÐąŅƒÐīÐĩŅ‚ Ņ€Ð°ÐēÐ―Ðū 5", + "tfg.grapplemod.downgrades.magnet": "ВŅ‹ÐšÐŧŅŽŅ‡Ð°ÐĩŅ‚ ŅƒÐŧŅƒŅ‡ŅˆÐĩÐ―ÐļÐĩ the §lМаÐģÐ―ÐļŅ‚§r, ÐēÐūзŅ€Ð°Ņ‰Ð°ÐĩŅ‚ ОаÐģÐ―ÐļŅ‚Ð―Ņ‹Ðđ ŅÐŧÐļŅ‚ÐūК.\nÐ Ð°ÐąÐūŅ‚аÐĩŅ‚ Ņ‚ÐūÐŧŅŒÐšÐū ÐŋŅ€Ðļ ÐļŅÐŋÐūÐŧŅŒÐ·ÐūÐēÐ°Ð―ÐļÐļ Ņ‚ÐūÐģÐū ÐķÐĩ Ņ‚ÐļÐŋа ОаÐģÐ―ÐļŅ‚Ð―ÐūÐģÐū ŅÐŧÐļŅ‚Ка, Ņ‡Ņ‚Ðū Ðļ Ņ€Ð°Ð―ŅŒŅˆÐĩ", + "tfg.grapplemod.upgrades.gravity.0.5": "ÐĢОÐĩÐ―ŅŒŅˆÐ°ÐĩŅ‚ §lГŅ€Ð°ÐēÐļŅ‚аŅ†ÐļŅŽÂ§r КŅ€ŅŽÐšÐ° ÐīÐū 50% (1 -> 0.5)", + "tfg.grapplemod.downgrades.gravity.0.5": "ВÐūзŅ€Ð°Ņ‰Ð°ÐĩŅ‚ §lГŅ€Ð°ÐēÐļŅ‚аŅ†ÐļŅŽÂ§r КŅ€ŅŽÐšÐ° К 100% (0.5 -> 1).\nПŅƒŅŅ‚ÐūÐĩ ÐēÐĩÐīŅ€Ðū ÐąŅƒÐīÐĩŅ‚ Ð―Ð°ÐŋÐūÐŧÐ―ÐĩÐ―Ðū ÐļŅÐŋÐūÐŧŅŒÐ·ÐūÐēÐ°Ð―Ð―Ņ‹Ðž ÐģÐĩÐŧÐļÐĩО", + "tfg.grapplemod.upgrades.gravity.0": "ÐĢОÐĩÐ―ŅŒŅˆÐ°ÐĩŅ‚ §lГŅ€Ð°ÐēÐļŅ‚аŅ†ÐļŅŽÂ§r КŅ€ŅŽÐšÐ° ÐīÐū 0% (1 -> 0)", + "tfg.grapplemod.downgrades.gravity.0": "ВÐūзŅ€Ð°Ņ‰Ð°ÐĩŅ‚ §lГŅ€Ð°ÐēÐļŅ‚аŅ†ÐļŅŽÂ§r КŅ€ŅŽÐšÐ° К 100% (0 -> 1).\nГŅ€Ð°ÐēÐļŅ‚аŅ†ÐļÐūÐ―Ð―Ņ‹Ðđ ÐīÐēÐļÐģаŅ‚ÐĩÐŧŅŒ ÐąŅƒÐīÐĩŅ‚ ÐēÐūзÐēŅ€Ð°Ņ‰ÐĩÐ―.", + "tfg.grapplemod.upgrades.throwspeed.lv": "ÐĢÐēÐĩÐŧÐļŅ‡ÐļÐēаÐĩŅ‚ §lÐĄÐšÐūŅ€ÐūŅŅ‚ŅŒ ÐąŅ€ÐūŅÐšÐ°Â§r КŅ€ŅŽÐšÐ°, Ðē Ņ€ÐĩзŅƒÐŧŅŒŅ‚аŅ‚Ðĩ Ņ‡ÐĩÐģÐū ÐūÐ― КÐļÐ―ÐĩŅ‚ŅŅ ÐīаÐŧŅŒŅˆÐĩ.\n§lÐĄÐšÐūŅ€ÐūŅŅ‚ŅŒ ÐąŅ€ÐūŅÐšÐ°Â§r ÐąŅƒÐīÐĩŅ‚ Ņ€Ð°ÐēÐ―Ðū 2.25", + "tfg.grapplemod.upgrades.throwspeed.mv": "ÐĢÐēÐĩÐŧÐļŅ‡ÐļÐēаÐĩŅ‚ §lÐĄÐšÐūŅ€ÐūŅŅ‚ŅŒ ÐąŅ€ÐūŅÐšÐ°Â§r КŅ€ŅŽÐšÐ°, Ðē Ņ€ÐĩзŅƒÐŧŅŒŅ‚аŅ‚Ðĩ Ņ‡ÐĩÐģÐū ÐūÐ― КÐļÐ―ÐĩŅ‚ŅŅ ÐīаÐŧŅŒŅˆÐĩ.\n§lÐĄÐšÐūŅ€ÐūŅŅ‚ŅŒ ÐąŅ€ÐūŅÐšÐ°Â§r ÐąŅƒÐīÐĩŅ‚ Ņ€Ð°ÐēÐ―Ðū 2.5", + "tfg.grapplemod.upgrades.throwspeed.hv": "ÐĢÐēÐĩÐŧÐļŅ‡ÐļÐēаÐĩŅ‚ §lÐĄÐšÐūŅ€ÐūŅŅ‚ŅŒ ÐąŅ€ÐūŅÐšÐ°Â§r КŅ€ŅŽÐšÐ°, Ðē Ņ€ÐĩзŅƒÐŧŅŒŅ‚аŅ‚Ðĩ Ņ‡ÐĩÐģÐū ÐūÐ― КÐļÐ―ÐĩŅ‚ŅŅ ÐīаÐŧŅŒŅˆÐĩ.\n§lÐĄÐšÐūŅ€ÐūŅŅ‚ŅŒ ÐąŅ€ÐūŅÐšÐ°Â§r ÐąŅƒÐīÐĩŅ‚ Ņ€Ð°ÐēÐ―Ðū 2.75", + "tfg.grapplemod.upgrades.throwspeed.ev": "ÐĢÐēÐĩÐŧÐļŅ‡ÐļÐēаÐĩŅ‚ §lÐĄÐšÐūŅ€ÐūŅŅ‚ŅŒ ÐąŅ€ÐūŅÐšÐ°Â§r КŅ€ŅŽÐšÐ°, Ðē Ņ€ÐĩзŅƒÐŧŅŒŅ‚аŅ‚Ðĩ Ņ‡ÐĩÐģÐū ÐūÐ― КÐļÐ―ÐĩŅ‚ŅŅ ÐīаÐŧŅŒŅˆÐĩ.\n§lÐĄÐšÐūŅ€ÐūŅŅ‚ŅŒ ÐąŅ€ÐūŅÐšÐ°Â§r ÐąŅƒÐīÐĩŅ‚ Ņ€Ð°ÐēÐ―Ðū 3", + "tfg.grapplemod.upgrades.throwspeed.iv": "ÐĢÐēÐĩÐŧÐļŅ‡ÐļÐēаÐĩŅ‚ §lÐĄÐšÐūŅ€ÐūŅŅ‚ŅŒ ÐąŅ€ÐūŅÐšÐ°Â§r КŅ€ŅŽÐšÐ°, Ðē Ņ€ÐĩзŅƒÐŧŅŒŅ‚аŅ‚Ðĩ Ņ‡ÐĩÐģÐū ÐūÐ― КÐļÐ―ÐĩŅ‚ŅŅ ÐīаÐŧŅŒŅˆÐĩ.\n§lÐĄÐšÐūŅ€ÐūŅŅ‚ŅŒ ÐąŅ€ÐūŅÐšÐ°Â§r ÐąŅƒÐīÐĩŅ‚ Ņ€Ð°ÐēÐ―Ðū 3.25", + "tfg.grapplemod.upgrades.throwspeed.luv": "ÐĢÐēÐĩÐŧÐļŅ‡ÐļÐēаÐĩŅ‚ §lÐĄÐšÐūŅ€ÐūŅŅ‚ŅŒ ÐąŅ€ÐūŅÐšÐ°Â§r КŅ€ŅŽÐšÐ°, Ðē Ņ€ÐĩзŅƒÐŧŅŒŅ‚аŅ‚Ðĩ Ņ‡ÐĩÐģÐū ÐūÐ― КÐļÐ―ÐĩŅ‚ŅŅ ÐīаÐŧŅŒŅˆÐĩ.\n§lÐĄÐšÐūŅ€ÐūŅŅ‚ŅŒ ÐąŅ€ÐūŅÐšÐ°Â§r ÐąŅƒÐīÐĩŅ‚ Ņ€Ð°ÐēÐ―Ðū 3.5", + "tfg.grapplemod.upgrades.throwspeed.zpm": "ÐĢÐēÐĩÐŧÐļŅ‡ÐļÐēаÐĩŅ‚ §lÐĄÐšÐūŅ€ÐūŅŅ‚ŅŒ ÐąŅ€ÐūŅÐšÐ°Â§r КŅ€ŅŽÐšÐ°, Ðē Ņ€ÐĩзŅƒÐŧŅŒŅ‚аŅ‚Ðĩ Ņ‡ÐĩÐģÐū ÐūÐ― КÐļÐ―ÐĩŅ‚ŅŅ ÐīаÐŧŅŒŅˆÐĩ.\n§lÐĄÐšÐūŅ€ÐūŅŅ‚ŅŒ ÐąŅ€ÐūŅÐšÐ°Â§r ÐąŅƒÐīÐĩŅ‚ Ņ€Ð°ÐēÐ―Ðū 3.75", + "tfg.grapplemod.upgrades.throwspeed.uv": "ÐĢÐēÐĩÐŧÐļŅ‡ÐļÐēаÐĩŅ‚ §lÐĄÐšÐūŅ€ÐūŅŅ‚ŅŒ ÐąŅ€ÐūŅÐšÐ°Â§r КŅ€ŅŽÐšÐ°, Ðē Ņ€ÐĩзŅƒÐŧŅŒŅ‚аŅ‚Ðĩ Ņ‡ÐĩÐģÐū ÐūÐ― КÐļÐ―ÐĩŅ‚ŅŅ ÐīаÐŧŅŒŅˆÐĩ.\n§lÐĄÐšÐūŅ€ÐūŅŅ‚ŅŒ ÐąŅ€ÐūŅÐšÐ°Â§r ÐąŅƒÐīÐĩŅ‚ Ņ€Ð°ÐēÐ―Ðū 4", + "tfg.grapplemod.downgrades.throwspeed": "ВÐūзŅ€Ð°Ņ‰Ð°ÐĩŅ‚ §lÐĄÐšÐūŅ€ÐūŅŅ‚ŅŒ ÐąŅ€ÐūŅÐšÐ°Â§r КŅ€ŅŽÐšÐ° К Ð―ÐūŅ€ÐžÐ°ÐŧŅŒÐ―ÐūÐđ, ÐēÐūзŅ€Ð°Ņ‰Ð°ÐĩŅ‚ ÐŋÐūŅ€ŅˆÐĩÐ―ŅŒ.\nÐ Ð°ÐąÐūŅ‚аÐĩŅ‚ Ņ‚ÐūÐŧŅŒÐšÐū ÐŋŅ€Ðļ ÐļŅÐŋÐūÐŧŅŒÐ·ÐūÐēÐ°Ð―ÐļÐļ ÐŋÐūŅ€ŅˆÐ―Ņ Ņ‚ÐūÐģÐū ÐķÐĩ Ņ‚ÐļÐŋа, Ņ‡Ņ‚Ðū Ðļ Ņ€Ð°Ð―ŅŒŅˆÐĩ.", + "tfg.grapplemod.upgrades.doublehook": "ДÐūÐąÐ°ÐēÐŧŅÐĩŅ‚ §lВŅ‚ÐūŅ€ÐūÐđ КŅ€ŅŽÐšÂ§r К КŅ€ŅŽÐšŅƒ", + "tfg.grapplemod.downgrades.doublehook": "ÐĢÐąÐļŅ€Ð°ÐĩŅ‚ §lВŅ‚ÐūŅ€ÐūÐđ КŅ€ŅŽÐšÂ§r Ðļз КŅ€ŅŽÐšÐ°", + "tfg.grapplemod.upgrades.vertical_throwing_angle": "ÐĢÐēÐĩÐŧÐļŅ‡ÐļÐēаÐĩŅ‚ §lВÐĩŅ€Ņ‚ÐļКаÐŧŅŒÐ―Ņ‹Ðđ ŅƒÐģÐūÐŧ ÐąŅ€ÐūŅÐšÐ°Â§r КŅ€ŅŽÐšÐ° Ð―Ð° 5°, ÐēÐŋÐŧÐūŅ‚ŅŒ ÐīÐū 90°.", + "tfg.grapplemod.downgrades.vertical_throwing_angle": "ÐĢОÐĩÐ―ŅŒŅˆÐ°ÐĩŅ‚ §lВÐĩŅ€Ņ‚ÐļКаÐŧŅŒÐ―Ņ‹Ðđ ŅƒÐģÐūÐŧ ÐąŅ€ÐūŅÐšÐ°Â§r КŅ€ŅŽÐšÐ° Ð―Ð° 5°, ÐēÐŋÐŧÐūŅ‚ŅŒ ÐīÐū 0°.", + "tfg.grapplemod.upgrades.angle": "ÐĢÐēÐĩÐŧÐļŅ‡ÐļÐēаÐĩŅ‚ §lГÐūŅ€ÐļзÐūÐ―Ņ‚аÐŧŅŒÐ―Ņ‹Ðđ ŅƒÐģÐūÐŧ ÐąŅ€ÐūŅÐšÐ°Â§r §lВŅ‚ÐūŅ€ÐūÐģÐū КŅ€ŅŽÐšÐ°Â§r Ð―Ð° 5°, ÐēÐŋÐŧÐūŅ‚ŅŒ ÐīÐū 90°.\nДÐūŅŅ‚ŅƒÐŋÐ―Ðū Ņ‚ÐūÐŧŅŒÐšÐū Ņ ŅƒŅŅ‚Ð°Ð―ÐūÐēÐŧÐĩÐ―Ð―Ņ‹Ðž ŅƒÐŧŅƒŅ‡ŅˆÐĩÐ―ÐļÐĩО §lВŅ‚ÐūŅ€ÐūÐđ КŅ€ŅŽÐšÂ§r.", + "tfg.grapplemod.downgrades.angle": "ÐĢОÐĩÐ―ŅŒŅˆÐ°ÐĩŅ‚ §lГÐūŅ€ÐļзÐūÐ―Ņ‚аÐŧŅŒÐ―Ņ‹Ðđ ŅƒÐģÐūÐŧ ÐąŅ€ÐūŅÐšÐ°Â§r §lВŅ‚ÐūŅ€ÐūÐģÐū КŅ€ŅŽÐšÐ°Â§r Ð―Ð° 5°, ÐēÐŋÐŧÐūŅ‚ŅŒ ÐīÐū 5°°.\nДÐūŅŅ‚ŅƒÐŋÐ―Ðū Ņ‚ÐūÐŧŅŒÐšÐū Ņ ŅƒŅŅ‚Ð°Ð―ÐūÐēÐŧÐĩÐ―Ð―Ņ‹Ðž ŅƒÐŧŅƒŅ‡ŅˆÐĩÐ―ÐļÐĩО §lВŅ‚ÐūŅ€ÐūÐđ КŅ€ŅŽÐšÂ§r.", "quests.ae2": "Applied Energistics 2", "quests.ae2.subtitle": "ÐĄÐ°ÐžŅ‹Ðđ ОÐūŅ‰Ð―Ņ‹Ðđ ÐļÐ―ŅŅ‚Ņ€ŅƒÐžÐĩÐ―Ņ‚, КÐūŅ‚ÐūŅ€Ņ‹Ðđ ÐŋÐūОÐūÐķÐĩŅ‚ ÐēаО Ņ GregTech, ÐūŅ‚КŅ€Ņ‹ÐēаÐĩŅ‚ŅŅ ÐŋÐūŅÐŧÐĩ ÐēаŅˆÐĩÐģÐū ÐŋÐĩŅ€ÐēÐūÐģÐū ÐŋÐūÐŧŅ‘Ņ‚а Ð―Ð° ЛŅƒÐ―Ņƒ", "quests.ae2.certus_quartz.title": "ИŅŅ‚ÐļÐ―Ð―Ņ‹Ðđ КÐēаŅ€Ņ†", @@ -1889,6 +1981,7 @@ "quests.ae2.interface_automation.title": "АÐēŅ‚ÐūОаŅ‚ÐļзаŅ†ÐļŅ ÐļÐ―Ņ‚ÐĩŅ€Ņ„ÐĩÐđŅÐ°", "quests.ae2.interface_automation.desc": "ЛŅƒŅ‡ŅˆÐļÐđ ŅÐŋÐūŅÐūÐą ÐŋаŅŅÐļÐēÐ―Ðū ОаŅ€ŅˆŅ€ŅƒŅ‚ÐļзÐļŅ€ÐūÐēаŅ‚ŅŒ ÐŋŅ€ÐĩÐīОÐĩŅ‚Ņ‹ Ðļ ÐķÐļÐīКÐūŅŅ‚Ðļ ÐŋÐū ÐąÐ°Ð·Ðĩ — ÐļŅÐŋÐūÐŧŅŒÐ·ÐūÐēаŅ‚ŅŒ &bМЭ ÐļÐ―Ņ‚ÐĩŅ€Ņ„ÐĩÐđŅ&r. ПÐūŅÐšÐūÐŧŅŒÐšŅƒ ÐļÐ―Ņ‚ÐĩŅ€Ņ„ÐĩÐđŅŅ‹ Ð―Ðĩ ÐēŅ‹Ņ‚аÐŧКÐļÐēаŅŽŅ‚ ŅÐēÐūŅ‘ ŅÐūÐīÐĩŅ€ÐķÐļОÐūÐĩ, Ņ‚ÐĩÐąÐĩ ÐŋÐūŅ‚Ņ€ÐĩÐąŅƒÐĩŅ‚ŅŅ ŅƒŅŅ‚Ð°Ð―ÐūÐēÐļŅ‚ŅŒ ŅƒÐŧŅƒŅ‡ŅˆÐĩÐ―ÐļŅ ОаŅˆÐļÐ― Ð―Ð° ОаŅˆÐļÐ―Ņƒ ÐļÐŧÐļ Ņ‚Ņ€ŅƒÐąŅƒ.\n\nНÐĩ Ð·Ð°ÐąŅƒÐīŅŒ ÐēКÐŧŅŽŅ‡ÐļŅ‚ŅŒ ÐūÐŋŅ†ÐļŅŽ &eРазŅ€ÐĩŅˆÐļŅ‚ŅŒ ÐēÐēÐūÐī ŅÐū ŅŅ‚ÐūŅ€ÐūÐ―Ņ‹ ÐēŅ‹Ņ…ÐūÐīа&r Ð―Ð° ÐēŅ‹Ņ…ÐūÐīÐ―ÐūÐđ ŅŅ‚ÐūŅ€ÐūÐ―Ðĩ Ðē ÐļÐ―Ņ‚ÐĩŅ€Ņ„ÐĩÐđŅÐĩ ОаŅˆÐļÐ―Ņ‹ GregTech, Ņ‡Ņ‚ÐūÐąŅ‹ ОÐūÐķÐ―Ðū ÐąŅ‹ÐŧÐū Ðļ Ð·Ð°ÐąÐļŅ€Ð°Ņ‚ŅŒ, Ðļ ÐēŅŅ‚аÐēÐŧŅŅ‚ŅŒ ÐŋŅ€ÐĩÐīОÐĩŅ‚Ņ‹ Ņ ÐūÐīÐ―ÐūÐđ Ðļ Ņ‚ÐūÐđ ÐķÐĩ ŅŅ‚ÐūŅ€ÐūÐ―Ņ‹.\n\nИŅÐŋÐūÐŧŅŒÐ·ÐūÐēÐ°Ð―ÐļÐĩ Ņ„ÐļÐŧŅŒŅ‚Ņ€ÐūÐē Ð―Ð° КŅ€Ņ‹ŅˆÐšÐ°Ņ… Ņ‚аКÐķÐĩ ОÐūÐķÐĩŅ‚ ÐąŅ‹Ņ‚ŅŒ ŅƒÐīÐūÐąÐ―Ņ‹Ðž ŅÐŋÐūŅÐūÐąÐūО, Ņ‡Ņ‚ÐūÐąŅ‹ Ð―ÐĩŅÐšÐūÐŧŅŒÐšÐū ОаŅˆÐļÐ― Ð·Ð°ÐąÐļŅ€Ð°ÐŧÐļ ÐŋŅ€ÐĩÐīОÐĩŅ‚Ņ‹ Ðļз ÐūÐīÐ―ÐūÐģÐū Ðļ Ņ‚ÐūÐģÐū ÐķÐĩ ÐļÐ―Ņ‚ÐĩŅ€Ņ„ÐĩÐđŅÐ°.\n\nЧŅ‚ÐūÐąŅ‹ ÐļÐ·ÐąÐĩÐķаŅ‚ŅŒ ÐŋÐĩŅ€ÐĩÐŋÐūÐŧÐ―ÐĩÐ―ÐļŅ ÐēŅ…ÐūÐīÐ―Ņ‹Ņ… ŅÐŧÐūŅ‚ÐūÐē ÐŋŅ€ÐĩÐīОÐĩŅ‚ÐūÐē Ðē ОаŅˆÐļÐ―Ðĩ, Ņ‚ÐĩÐąÐĩ Ð―ŅƒÐķÐ―Ðū ÐļŅÐŋÐūÐŧŅŒÐ·ÐūÐēаŅ‚ŅŒ ŅƒÐŧŅƒŅ‡ŅˆÐĩÐ―ÐļÐĩ ОаŅˆÐļÐ―Ņ‹ \"РÐūÐąÐūŅ‚ÐļзÐļŅ€ÐūÐēÐ°Ð―Ð―Ņ‹Ðđ ÐžÐ°Ð―ÐļÐŋŅƒÐŧŅŅ‚ÐūŅ€\" Ðē Ņ€ÐĩÐķÐļОÐĩ &eПÐūÐīÐīÐĩŅ€ÐķÐļÐēаŅ‚ŅŒ Ņ€ÐūÐēÐ―Ðū&r Ņ Ņ„ÐļÐŧŅŒŅ‚Ņ€ÐūО.\n\nÐĄ ÐēÐēÐūÐīÐūО ÐķÐļÐīКÐūŅŅ‚ÐĩÐđ Ņ‚аКÐūÐđ ÐŋŅ€ÐūÐąÐŧÐĩОŅ‹ Ð―ÐĩŅ‚, Ņ‚аК КаК ÐūÐ― аÐēŅ‚ÐūОаŅ‚ÐļŅ‡ÐĩŅÐšÐļ заÐŋÐūÐŧÐ―ŅÐĩŅ‚ Ņ‚ÐūÐŧŅŒÐšÐū ÐūÐīÐļÐ― ŅÐŧÐūŅ‚.", "quests.ae2.crafting_accelerator.desc": "ПŅ€ÐūŅŅ‚Ðū ÐēÐūŅÐŋÐūÐŧŅŒÐ·ŅƒÐđŅŅ ÐēÐ―ŅƒŅ‚Ņ€ÐļÐļÐģŅ€ÐūÐēŅ‹Ðž Ņ€ŅƒÐšÐūÐēÐūÐīŅŅ‚ÐēÐūО — ÐūÐ―Ðū ÐūÐąŅŠŅŅÐ―ÐļŅ‚ ÐēŅŅ‘ ÐģÐūŅ€Ð°Ð·ÐīÐū ÐŧŅƒŅ‡ŅˆÐĩ, Ņ‡ÐĩО ОŅ‹ КÐūÐģÐīа-ÐŧÐļÐąÐū ŅÐžÐūÐģÐŧÐļ ÐąŅ‹ Ðē Ņ€Ð°ÐžÐšÐ°Ņ… заÐīÐ°Ð―ÐļŅ.\n\nНÐĩ ŅÐŋÐĩŅˆÐļ Ðļ ÐēÐ―ÐļОаŅ‚ÐĩÐŧŅŒÐ―Ðū ÐŋŅ€ÐūŅ‡ÐļŅ‚аÐđ ÐĩÐģÐū — ŅŅ‚Ðū ÐūŅ‚ÐŧÐļŅ‡Ð―Ņ‹Ðđ ÐļŅŅ‚ÐūŅ‡Ð―ÐļК ÐļÐ―Ņ„ÐūŅ€ÐžÐ°Ņ†ÐļÐļ!", + "quests.ae2.export_bus.title": "МЭ ŅˆÐļÐ―Ð° ŅÐšŅÐŋÐūŅ€Ņ‚а", "quests.ae2.export_bus.desc": "&dМЭ ŅˆÐļÐ―Ð° ŅÐšŅÐŋÐūŅ€Ņ‚а&r — ŅŅ‚Ðū ОÐūŅ‰Ð―Ņ‹Ðđ ÐļÐ―ŅŅ‚Ņ€ŅƒÐžÐĩÐ―Ņ‚ ÐīÐŧŅ ÐēŅ‹ÐēÐūÐīа ÐŋŅ€ÐĩÐīОÐĩŅ‚ÐūÐē ÐļÐŧÐļ ÐķÐļÐīКÐūŅŅ‚ÐĩÐđ Ðļз Ņ‚ÐēÐūÐĩÐđ &dМЭ ŅÐĩŅ‚Ðļ&r.\nКаК Ņ‚ÐūÐŧŅŒÐšÐū Ņƒ Ņ‚ÐĩÐąŅ ÐŋÐūŅÐēÐļŅ‚ŅŅ ÐēÐūзОÐūÐķÐ―ÐūŅŅ‚ŅŒ ÐļŅ… КŅ€Ð°Ņ„Ņ‚ÐļŅ‚ŅŒ, ÐūŅÐūÐąÐĩÐ―Ð―Ðū ÐūÐąŅ€Ð°Ņ‚Ðļ ÐēÐ―ÐļÐžÐ°Ð―ÐļÐĩ Ð―Ð° ÐēаŅ€ÐļÐ°Ð―Ņ‚Ņ‹ Ðļз &eExtendedAE&r — ÐūÐ―Ðļ ОÐūÐģŅƒŅ‚ ŅÐļÐŧŅŒÐ―Ðū ÐŋÐūОÐūŅ‡ŅŒ Ņ аÐēŅ‚ÐūОаŅ‚ÐļзаŅ†ÐļÐĩÐđ.\n\n&cВаÐķÐ―Ðū&r: ÐūÐ―Ðļ ÐūКазŅ‹ÐēаŅŽŅ‚ Ð·Ð―Ð°Ņ‡ÐļŅ‚ÐĩÐŧŅŒÐ―Ðū ÐąÐūÐŧŅŒŅˆÐĩÐĩ &4ÐēÐŧÐļŅÐ―ÐļÐĩ Ð―Ð° TPS&r, Ņ‡ÐĩО, Ð―Ð°ÐŋŅ€ÐļОÐĩŅ€, MЭ ÐļÐ―Ņ‚ÐĩŅ€Ņ„ÐĩÐđŅŅ‹, ÐŋÐūŅŅ‚ÐūОŅƒ ÐļŅÐŋÐūÐŧŅŒÐ·ÐūÐēаŅ‚ŅŒ ÐļŅ… ŅŅ‚ÐūÐļŅ‚ ŅƒÐžÐĩŅ€ÐĩÐ―Ð―Ðū.", "quests.ae2.export_bus.task": "ЛŅŽÐąÐ°Ņ ŅˆÐļÐ―Ð° ŅÐšŅÐŋÐūŅ€Ņ‚а", "quests.ae2.import_bus.desc": "&dМЭ ŅˆÐļÐ―Ð° ÐļОÐŋÐūŅ€Ņ‚а&r — ŅŅ‚Ðū ÐūÐīÐļÐ― Ðļз ŅÐŋÐūŅÐūÐąÐūÐē ÐēÐēÐūÐīа ÐŋŅ€ÐĩÐīОÐĩŅ‚ÐūÐē Ðļ ÐķÐļÐīКÐūŅŅ‚ÐĩÐđ Ðē Ņ‚ÐēÐūŅŽ &dМЭ ŅÐĩŅ‚ŅŒ&r. ВÐŋŅ€ÐūŅ‡ÐĩО, ÐīÐŧŅ Ņ‚ÐūÐģÐū ÐķÐĩ Ņ€ÐĩзŅƒÐŧŅŒŅ‚аŅ‚а Ņ‚Ņ‹ ОÐūÐķÐĩŅˆŅŒ ÐŋŅ€ÐūŅŅ‚Ðū ÐūŅ‚ÐŋŅ€Ð°ÐēÐŧŅŅ‚ŅŒ ÐŋŅ€ÐĩÐīОÐĩŅ‚Ņ‹ Ðļ ÐķÐļÐīКÐūŅŅ‚Ðļ Ðē ÐļÐ―Ņ‚ÐĩŅ€Ņ„ÐĩÐđŅ ÐļÐŧÐļ ÐŋÐūŅŅ‚аÐēŅ‰ÐļК ŅˆÐ°ÐąÐŧÐūÐ―ÐūÐē, ÐŋÐūŅŅ‚ÐūОŅƒ ŅˆÐļÐ―Ņ‹ ÐļОÐŋÐūŅ€Ņ‚а ÐļŅÐŋÐūÐŧŅŒÐ·ŅƒŅŽŅ‚ŅŅ ÐąÐūÐŧÐĩÐĩ Ð―ÐļŅˆÐĩÐēÐū.\n\n&cВаÐķÐ―Ðū&r: ÐūÐ―Ðļ ÐūКазŅ‹ÐēаŅŽŅ‚ Ð·Ð―Ð°Ņ‡ÐļŅ‚ÐĩÐŧŅŒÐ―Ðū ÐąÐūÐŧŅŒŅˆÐĩÐĩ &4ÐēÐŧÐļŅÐ―ÐļÐĩ Ð―Ð° TPS&r, Ņ‡ÐĩО, Ð―Ð°ÐŋŅ€ÐļОÐĩŅ€, МЭ-ÐļÐ―Ņ‚ÐĩŅ€Ņ„ÐĩÐđŅŅ‹, ÐŋÐūŅŅ‚ÐūОŅƒ ÐļŅÐŋÐūÐŧŅŒÐ·ÐūÐēаŅ‚ŅŒ ÐļŅ… ŅŅ‚ÐūÐļŅ‚ ŅƒÐžÐĩŅ€ÐĩÐ―Ð―Ðū.", @@ -1917,6 +2010,8 @@ "quests.ae2.universal_circuits.title": "ÐĢÐ―ÐļÐēÐĩŅ€ŅÐ°ÐŧŅŒÐ―Ņ‹Ðĩ ŅŅ…ÐĩОŅ‹", "quests.ae2.universal_circuits.subtitle": "ÐĒаК ÐēÐūŅ‚ ÐīÐŧŅ Ņ‡ÐĩÐģÐū ÐūÐ―Ðļ!", "quests.ae2.universal_circuits.desc": "ВŅ‹ КÐūÐģÐīа-Ð―ÐļÐąŅƒÐīŅŒ заÐīŅƒÐžŅ‹ÐēаÐŧÐļŅŅŒ, ÐīÐŧŅ Ņ‡ÐĩÐģÐū Ð―ŅƒÐķÐ―Ņ‹ ÐĢÐ―ÐļÐēÐĩŅ€ŅÐ°ÐŧŅŒÐ―Ņ‹Ðĩ ŅŅ…ÐĩОŅ‹? ПÐūОÐļОÐū КŅ€Ð°ŅÐļÐēŅ‹Ņ… Ð·Ð―Ð°Ņ‡ÐšÐūÐē заÐīÐ°Ð―ÐļÐđ, ÐūÐ―Ðļ Ðē ÐūŅÐ―ÐūÐēÐ―ÐūО ÐļŅÐŋÐūÐŧŅŒÐ·ŅƒŅŽŅ‚ŅŅ Ðē AE2!\n\nAE2 ÐŋÐŧÐūŅ…Ðū ÐūÐąŅ€Ð°ÐąÐ°Ņ‚Ņ‹ÐēаÐĩŅ‚ Ņ‚ÐĩÐģÐļ ÐŋŅ€ÐĩÐīОÐĩŅ‚ÐūÐē Ðē ŅˆÐ°ÐąÐŧÐūÐ―Ð°Ņ…, ÐŋÐūŅŅ‚ÐūОŅƒ ŅƒÐ―ÐļÐēÐĩŅ€ŅÐ°ÐŧŅŒÐ―Ņ‹Ðĩ ŅŅ…ÐĩОŅ‹ Ņ€Ð°Ð·Ņ€Ð°ÐąÐūŅ‚Ð°Ð―Ņ‹ ÐīÐŧŅ ÐļŅÐŋÐūÐŧŅŒÐ·ÐūÐēÐ°Ð―ÐļŅ Ðē ÐŧŅŽÐąŅ‹Ņ… ŅˆÐ°ÐąÐŧÐūÐ―Ð°Ņ…, Ņ‚Ņ€ÐĩÐąŅƒŅŽŅ‰ÐļŅ… ŅŅ…ÐĩО. ÐĒаКÐļО ÐūÐąŅ€Ð°Ð·ÐūО, ÐēŅŅÐšÐļÐđ Ņ€Ð°Ð·, КÐūÐģÐīа ÐēŅ‹ ÐūŅ‚КŅ€Ņ‹ÐēаÐĩŅ‚Ðĩ Ð―ÐūÐēŅ‹Ðđ Ņ‚ÐļÐŋ ŅŅ…ÐĩОŅ‹, ÐēаО Ð―ŅƒÐķÐ―Ðū ÐīÐūÐąÐ°ÐēÐļŅ‚ŅŒ Ņ‚ÐūÐŧŅŒÐšÐū ÐūÐīÐļÐ― ŅˆÐ°ÐąÐŧÐūÐ―, Ņ‡Ņ‚ÐūÐąŅ‹ ÐŋŅ€ÐĩÐūÐąŅ€Ð°Ð·ÐūÐēаŅ‚ŅŒ Ð―ÐūÐēŅƒŅŽ ŅŅ…ÐĩОŅƒ Ðē ŅƒÐ―ÐļÐēÐĩŅ€ŅÐ°ÐŧŅŒÐ―ŅƒŅŽ, ÐēОÐĩŅŅ‚Ðū ÐūÐąÐ―ÐūÐēÐŧÐĩÐ―ÐļŅ &oÐēŅÐĩŅ…l& ÐēаŅˆÐļŅ… ŅŅ‚аŅ€Ņ‹Ņ… ŅˆÐ°ÐąÐŧÐūÐ―ÐūÐē!", + "quests.ae2.stock_bridge.title": "AE МÐūŅŅ‚-Ņ…Ņ€Ð°Ð―ÐļÐŧÐļŅ‰Ðĩ", + "quests.ae2.stock_bridge.desc": "ЕŅÐŧÐļ ÐēŅ‹ ÐēÐŧÐūÐķÐļÐŧÐļ ÐžÐ―ÐūÐģÐū ŅÐļÐŧ Ðē ÐŧÐūÐģÐļŅŅ‚ÐļŅ‡ÐĩŅÐšŅƒŅŽ ŅÐĩŅ‚ŅŒ Create, ОŅ‹ŅÐŧŅŒ Ðū Ð―ÐĩÐūÐąŅ…ÐūÐīÐļОÐūŅŅ‚Ðļ ÐĩŅ‘ ŅÐ―ÐĩŅŅ‚Ðļ Ðļ заОÐĩÐ―ÐļŅ‚ŅŒ Ð―Ð° AE2 ОÐūÐķÐĩŅ‚ ÐŋŅ€ÐļÐēÐĩŅŅ‚Ðļ Ðē ÐūŅ‚Ņ‡Ð°ŅÐ―ÐļÐĩ. &bМÐūŅŅ‚-Ņ…Ņ€Ð°Ð―ÐļÐŧÐļŅ‰Ðĩ&r ŅÐŧŅƒÐķÐļŅ‚ ŅÐēŅÐ·ŅƒŅŽŅ‰ÐļО зÐēÐĩÐ―ÐūО ОÐĩÐķÐīŅƒ ÐēаŅˆÐĩÐđ ME-ŅÐĩŅ‚ŅŒŅŽ Ðļ ŅÐĩŅ‚ŅŒŅŽ Create. ÐžÐ·Ð―Ð°ÐšÐūОŅŒŅ‚ÐĩŅŅŒ Ņ ÐĩÐģÐū Ponder-ŅŅ†ÐĩÐ―Ð°Ņ€ÐļÐĩО, Ņ‡Ņ‚ÐūÐąŅ‹ ŅƒÐ·Ð―аŅ‚ŅŒ, КаК ÐĩÐģÐū Ð―Ð°ŅŅ‚Ņ€ÐūÐļŅ‚ŅŒ.\n\nМŅ‹ ÐēŅŅ‘ ÐķÐĩ Ņ€ÐĩКÐūОÐĩÐ―ÐīŅƒÐĩО ŅÐū ÐēŅ€ÐĩОÐĩÐ―ÐĩО ÐŋÐĩŅ€ÐĩÐ―ÐĩŅŅ‚Ðļ ŅŅ‚аŅ€Ņ‹Ðĩ ŅÐļŅŅ‚ÐĩОŅ‹ Ð―Ð° AE2 — Ðē ÐūŅÐ―ÐūÐēÐ―ÐūО Ðļз-за Ð·Ð―Ð°Ņ‡ÐļŅ‚ÐĩÐŧŅŒÐ―Ðū ОÐĩÐ―ŅŒŅˆÐĩÐđ Ð―Ð°ÐģŅ€ŅƒÐ·ÐšÐļ Ð―Ð° ÐŋŅ€ÐūÐļзÐēÐūÐīÐļŅ‚ÐĩÐŧŅŒÐ―ÐūŅŅ‚ŅŒ ÐļÐģŅ€Ņ‹.", "quests.ae2.iv.title": "AE2 ŅƒŅ€ÐūÐēÐ―Ņ IV", "quests.ae2.iv.desc": "ВŅŅ ŅŅ‚а ÐēÐĩŅ‚Ка ŅŅ‚Ð°Ð―ÐūÐēÐļŅ‚ŅŅ ÐŋÐūÐŧÐ―ÐūŅŅ‚ŅŒŅŽ ÐīÐūŅŅ‚ŅƒÐŋÐ―ÐūÐđ, КаК Ņ‚ÐūÐŧŅŒÐšÐū Ņ‚Ņ‹ ÐīÐūŅŅ‚ÐļÐģÐ―ÐĩŅˆŅŒ &1IV&r.", "quests.ae2.accumulation_press.desc": "ЧŅ‚ÐūÐąŅ‹ ÐŋÐūÐŧŅƒŅ‡ÐļŅ‚ŅŒ ŅŅ‚ÐūŅ‚ &eНÐūÐēŅ‹Ðđ ÐŋŅ€ÐĩŅŅ ÐīÐŧŅ ÐēŅ‹Ņ€ÐĩзаŅ‚ÐĩÐŧŅ&r, Ņ‚ÐĩÐąÐĩ ÐŋŅ€ÐļÐīŅ‘Ņ‚ŅŅ Ð―ÐĩÐžÐ―ÐūÐģÐū ÐļÐ―ÐēÐĩŅŅ‚ÐļŅ€ÐūÐēаŅ‚ŅŒ.\n\nВÐū-ÐŋÐĩŅ€ÐēŅ‹Ņ…, Ð―ŅƒÐķÐ―Ðū ŅƒÐŧŅƒŅ‡ŅˆÐļŅ‚ŅŒ ŅÐēÐūÐđ ÐļОÐŋÐŧÐūзÐļÐūÐ―Ð―Ņ‹Ðđ КÐūОÐŋŅ€ÐĩŅŅÐūŅ€, ŅƒŅŅ‚Ð°Ð―ÐūÐēÐļÐē Ðē Ð―ÐĩÐģÐū &5ÐīÐēа ŅÐ―ÐĩŅ€ÐģÐĩŅ‚ÐļŅ‡ÐĩŅÐšÐļŅ… ÐŧŅŽÐšÐ° EV&r.\n\nЗаŅ‚ÐĩО ÐūÐąÐ·Ð°ÐēÐĩŅŅ‚ÐļŅŅŒ Ð―ÐūÐēŅ‹Ðž IV ÐŧазÐĩŅ€Ð―Ņ‹Ðž ÐģŅ€Ð°ÐēÐļŅ€ÐūÐēŅ‰ÐļКÐūО, ÐĩŅÐŧÐļ Ņƒ Ņ‚ÐĩÐąŅ ÐĩÐģÐū ÐĩŅ‰Ņ‘ Ð―ÐĩŅ‚.\n\nИ Ð―Ð°ÐšÐūÐ―ÐĩŅ†, ÐŋÐūÐīÐģÐūŅ‚ÐūÐēŅŒ ÐžÐ―ÐūÐģÐū ÐŋŅ€ÐūОŅ‹ŅˆÐŧÐĩÐ―Ð―ÐūÐģÐū ÐīÐļÐ―Ð°ÐžÐļŅ‚а — ÐīÐŧŅ ŅŅ‚ÐūÐģÐū ÐŋŅ€ÐūŅ†ÐĩŅŅÐ° ÐŋÐūÐīŅ…ÐūÐīÐļŅ‚ &cŅ‚ÐūÐŧŅŒÐšÐū ÐūÐ―&r.\n\nПÐŧÐ°Ð―ÐļŅ€ŅƒÐđ ÐēŅŅ‘ заŅ€Ð°Ð―ÐĩÐĩ, Ņ‚аК КаК ŅŅ‚ÐūŅ‚ ŅŅ‚аÐŋ ÐīÐūÐēÐūÐŧŅŒÐ―Ðū Ņ‚Ņ€ÐĩÐąÐūÐēаŅ‚ÐĩÐŧŅŒÐ―Ņ‹Ðđ!", @@ -2505,7 +2600,7 @@ "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.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На ÐīÐ°Ð―Ð―Ņ‹Ðđ ОÐūОÐĩÐ―Ņ‚ Ņ€ÐĩаКŅ‚ÐūŅ€ ŅƒÐžÐĩÐĩŅ‚ ÐļŅÐŋÐūÐŧŅŒÐ·ÐūÐēаŅ‚ŅŒ ÐļŅ… Ņ‚Ņ€ÐĩОŅ&7*&r Ņ€Ð°Ð·Ð―Ņ‹ÐžÐļ ŅÐŋÐūŅÐūÐąÐ°ÐžÐļ:\n&e1)&r МаКŅÐļОаÐŧŅŒÐ―аŅ Ņ‚ÐĩОÐŋÐĩŅ€Ð°Ņ‚ŅƒŅ€Ð° &7(ÐļзÐūÐŧŅŅ†ÐļŅ)&r\n&e2)&r ЭŅ„Ņ„ÐĩКŅ‚ÐļÐēÐ―ÐūŅŅ‚ŅŒ &7(Ņ‚ÐūÐŋÐŧÐļÐēÐū ŅÐŧŅƒÐķÐļŅ‚ ÐīÐūÐŧŅŒŅˆÐĩ)&r\n&e3)&r ДŅ€ÐūŅŅÐĩÐŧÐļŅ€ÐūÐēÐ°Ð―ÐļÐĩ &7(заОÐĩÐīÐŧŅÐĩŅ‚ Ņ€ÐĩаКŅ†ÐļÐļ)&r\n\n&7*)&r ВÐūзОÐūÐķÐ―Ðū, Ðē Ņ‚ÐēÐūÐĩÐđ ÐģаÐŧаКŅ‚ÐļКÐĩ Ð―ÐĩŅ‚ Ð―ÐĩÐūÐąŅ…ÐūÐīÐļОŅ‹Ņ… ОаŅ‚ÐĩŅ€ÐļаÐŧÐūÐē ÐīÐŧŅ ÐēŅÐĩŅ… ÐēаŅ€ÐļÐ°Ð―Ņ‚ÐūÐē. МŅ‹ ÐŋŅ€ÐĩÐīÐŋÐūÐŧаÐģаÐĩО, Ņ‡Ņ‚Ðū ОаŅ‚ÐĩŅ€ÐļаÐŧŅ‹ ÐīÐūŅŅ‚ŅƒÐŋÐ―Ņ‹ Ņ‚ÐūÐŧŅŒÐšÐū ÐīÐŧŅ ÐŋÐĩŅ€ÐēÐūÐđ КаŅ‚ÐĩÐģÐūŅ€ÐļÐļ.\n\nНÐū ÐąŅƒÐīŅŒ ÐūŅŅ‚ÐūŅ€ÐūÐķÐĩÐ―. ПÐūÐēŅ‹ŅˆÐĩÐ―ÐļÐĩ &cŅ‚ÐĩОÐŋÐĩŅ€Ð°Ņ‚ŅƒŅ€Ņ‹&r ÐļОÐĩÐĩŅ‚ Ðļ &cÐūÐąŅ€Ð°Ņ‚Ð―ŅƒŅŽ ŅŅ‚ÐūŅ€ÐūÐ―Ņƒ&r.", "quests.gregtech_energy.fission_reactor.desc.5": "ÐĨÐūŅ‚Ņ ÐąÐūÐŧÐĩÐĩ &cÐģÐūŅ€ŅŅ‡ÐļÐđ&r Ņ€ÐĩаКŅ‚ÐūŅ€ ÐīÐĩÐŧаÐĩŅ‚ ÐŋŅ€ÐūÐļзÐēÐūÐīŅŅ‚ÐēÐū ÐūŅ…ÐŧаÐķÐīаŅŽŅ‰ÐļŅ… ÐķÐļÐīКÐūŅŅ‚ÐĩÐđ Ðļ ÐūÐąŅ€Ð°ÐąÐūŅ‚КŅƒ &cÐąŅ‹ŅŅ‚Ņ€ÐĩÐĩ&r, ÐūÐ― Ņ‚аКÐķÐĩ ŅŅ‚Ð°Ð―ÐūÐēÐļŅ‚ŅŅ ÐąÐūÐŧÐĩÐĩ Ņ‚Ņ€ÐĩÐąÐūÐēаŅ‚ÐĩÐŧŅŒÐ―Ņ‹Ðž К Ņ‚ÐūÐŋÐŧÐļÐēÐ―Ņ‹Ðž ŅŅ‚ÐĩŅ€ÐķÐ―ŅÐž. КаÐķÐīŅ‹Ðđ Ņ‚ÐūÐŋÐŧÐļÐēÐ―Ņ‹Ðđ ŅŅ‚ÐĩŅ€ÐķÐĩÐ―ŅŒ ÐļОÐĩÐĩŅ‚ ÐūÐģŅ€Ð°Ð―ÐļŅ‡ÐĩÐ―Ð―ŅƒŅŽ ÐŋŅ€ÐūŅ‡Ð―ÐūŅŅ‚ŅŒ, Ðļ ÐĩŅ‘ Ņ€Ð°ŅŅ…ÐūÐī ÐŧÐļÐ―ÐĩÐđÐ―Ðū заÐēÐļŅÐļŅ‚ ÐūŅ‚ Ņ‚ÐĩОÐŋÐĩŅ€Ð°Ņ‚ŅƒŅ€Ņ‹.\n\nПÐūŅÐšÐūÐŧŅŒÐšŅƒ ÐīÐŧŅ ÐąÐūÐŧÐĩÐĩ ÐēŅ‹ŅÐūКÐūÐđ Ņ‚ÐĩОÐŋÐĩŅ€Ð°Ņ‚ŅƒŅ€Ņ‹ Ņ‚ÐĩÐąÐĩ Ņ‚Ņ€ÐĩÐąŅƒÐĩŅ‚ŅŅ ÐąÐūÐŧŅŒŅˆÐĩ Ņ‚ÐūÐŋÐŧÐļÐēÐ―Ņ‹Ņ… ŅŅ‚ÐĩŅ€ÐķÐ―ÐĩÐđ, Ðē ÐļŅ‚ÐūÐģÐĩ ÐļÐ·Ð―ÐūŅ ОаŅŅˆŅ‚Ð°ÐąÐļŅ€ŅƒÐĩŅ‚ŅŅ &nКÐēаÐīŅ€Ð°Ņ‚ÐļŅ‡Ð―Ðū&r. ЕŅÐŧÐļ Ņ‚Ņ‹ Ņ…ÐūŅ‡ÐĩŅˆŅŒ ОаКŅÐļОаÐŧŅŒÐ―Ðū ŅŅ„Ņ„ÐĩКŅ‚ÐļÐēÐ―Ðū Ð―Ð°ÐģŅ€ÐĩÐēаŅ‚ŅŒ ÐūŅ…ÐŧаÐķÐīаŅŽŅ‰ÐļÐĩ ÐķÐļÐīКÐūŅŅ‚Ðļ, ÐļŅÐŋÐūÐŧŅŒÐ·ŅƒÐđ Ð―ÐļзКŅƒŅŽ Ņ‚ÐĩОÐŋÐĩŅ€Ð°Ņ‚ŅƒŅ€Ņƒ. А ÐĩŅÐŧÐļ Ņ‚ÐĩÐąÐĩ Ð―ŅƒÐķÐ―Ð° ÐąÐūÐŧÐĩÐĩ ÐąŅ‹ŅŅ‚Ņ€Ð°Ņ ÐŋÐĩŅ€ÐĩŅ€Ð°ÐąÐūŅ‚Ка ŅÐīÐĩŅ€Ð―Ņ‹Ņ… ОаŅ‚ÐĩŅ€ÐļаÐŧÐūÐē — ÐŋÐūÐīÐ―ÐļОаÐđ Ņ‚ÐĩОÐŋÐĩŅ€Ð°Ņ‚ŅƒŅ€Ņƒ Ð―Ð°ŅŅ‚ÐūÐŧŅŒÐšÐū ÐēŅ‹ŅÐūКÐū, Ð―Ð°ŅÐšÐūÐŧŅŒÐšÐū ÐŋÐūзÐēÐūÐŧŅÐĩŅ‚ ÐļзÐūÐŧŅŅ†ÐļŅ.", @@ -3258,7 +3353,6 @@ "quests.medium_voltage.stainless_greate.title": "НÐĩŅ€ÐķаÐēÐĩŅŽŅ‰Ð°Ņ ŅŅ‚аÐŧŅŒ Ðē Greate", "quests.medium_voltage.stainless_greate.subtitle": "ЕŅ‰Ðĩ ÐąÐūÐŧŅŒŅˆÐĩ Ð―Ð°ÐģŅ€ŅƒÐ·ÐšÐļ", "quests.medium_voltage.stainless_greate.desc": "ЭŅ‚ÐūŅ‚ КÐēÐĩŅŅ‚ Ð―ŅƒÐķÐĩÐ― ÐŧÐļŅˆŅŒ ÐīÐŧŅ Ņ‚ÐūÐģÐū, Ņ‡Ņ‚ÐūÐąŅ‹ ŅÐūÐūÐąŅ‰ÐļŅ‚ŅŒ Ņ‚ÐĩÐąÐĩ, Ņ‡Ņ‚Ðū Ð―Ð° ŅŅ‚ÐūО ŅŅ‚аÐŋÐĩ Ņƒ Greate ÐĩŅŅ‚ŅŒ ÐĩŅ‰Ņ‘ ÐūÐīÐ―Ðū ŅƒÐŧŅƒŅ‡ŅˆÐĩÐ―ÐļÐĩ.\n\nÐĒÐĩÐąÐĩ ОÐūÐķÐĩŅ‚ ÐŋŅ€ÐļÐģÐūÐīÐļŅ‚ŅŒŅŅ ŅÐŧÐĩÐīŅƒŅŽŅ‰ÐļÐđ Ņ‚ÐļŅ€ ДŅ€ÐūÐąÐļÐŧŅŒÐ―Ņ‹Ņ… КÐūÐŧŅ‘Ņ, Ņ‚аК КаК ÐūÐ―Ðļ ÐēŅ‹ÐīаŅŽŅ‚ ÐŋÐūÐŧÐ―Ņ‹Ðđ Ð―Ð°ÐąÐūŅ€ ÐŋÐūÐąÐūŅ‡Ð―Ņ‹Ņ… ÐŋŅ€ÐūÐīŅƒÐšŅ‚ÐūÐē, КаК Ðļ &6HV ИзОÐĩÐŧŅŒŅ‡ÐļŅ‚ÐĩÐŧŅŒ&r, а Ņ‚аКÐķÐĩ ОÐūÐģŅƒŅ‚ ÐūÐąŅ€Ð°ÐąÐ°Ņ‚Ņ‹ÐēаŅ‚ŅŒ Ð―ÐĩŅÐšÐūÐŧŅŒÐšÐū ÐŋŅ€ÐĩÐīОÐĩŅ‚ÐūÐē ÐūÐīÐ―ÐūÐēŅ€ÐĩОÐĩÐ―Ð―Ðū!", - "parts.lang.quests.7": "metal_age ", "quests.metal_age": "ВÐĩК ОÐĩŅ‚аÐŧÐŧŅƒŅ€ÐģÐļÐļ", "quests.metal_age.subtitle": "ВаŅˆÐļ ÐŋÐĩŅ€ÐēŅ‹Ðĩ Ņ‚ÐĩŅ…Ð―ÐūÐŧÐūÐģÐļŅ‡ÐĩŅÐšÐļÐĩ ÐīÐūŅŅ‚ÐļÐķÐĩÐ―ÐļŅ.", "quests.metal_age.weld_bronze_ingots.title": "ÐĄÐēаŅ€ÐļÐēÐ°Ð―ÐļÐĩ ÐąŅ€ÐūÐ―Ð·Ņ‹", @@ -3697,7 +3791,8 @@ "quests.steam_age.create_tools.desc": "ГаÐĩŅ‡Ð―Ņ‹Ðđ КÐŧŅŽŅ‡ ÐŋÐūзÐēÐūÐŧŅÐĩŅ‚ ÐąŅ‹ŅŅ‚Ņ€Ðū ÐŋÐūÐīÐ―ÐļОаŅ‚ŅŒ ÐąÐŧÐūКÐļ Ðļз Create, ÐĩŅÐŧÐļ Ð―Ð°ÐķаŅ‚ŅŒ Shift + ПКМ ÐŋÐū Ð―ÐļО, Ņ…ÐūŅ‚Ņ Ņ‚ÐūÐŋÐūŅ€ ÐļÐŧÐļ КÐļŅ€ÐšÐ° Ņ‚ÐūÐķÐĩ ÐŋÐūÐīÐūÐđÐīŅƒŅ‚. ОŅ‡ÐšÐļ ÐļÐ―ÐķÐĩÐ―ÐĩŅ€Ð° ÐīаŅŽŅ‚ ÐēÐūзОÐūÐķÐ―ÐūŅŅ‚ŅŒ ÐēÐļÐīÐĩŅ‚ŅŒ ÐąÐūÐŧÐĩÐĩ ÐŋÐūÐīŅ€ÐūÐąÐ―ŅƒŅŽ ÐļÐ―Ņ„ÐūŅ€ÐžÐ°Ņ†ÐļŅŽ Ðū Ņ‚ÐēÐūÐļŅ… ОаŅˆÐļÐ―Ð°Ņ… — Ð―Ð°ÐŋŅ€ÐļОÐĩŅ€, ŅÐšÐūÐŧŅŒÐšÐū Ð―Ð°ÐģŅ€ŅƒÐ·ÐšÐļ ÐūÐ―Ðļ ŅÐūзÐīаŅŽŅ‚ ÐļÐŧÐļ ÐŋÐūŅ‚Ņ€ÐĩÐąÐŧŅŅŽŅ‚.\n\nÐžÐąÐ° ŅŅ‚ÐļŅ… ÐļÐ―ŅŅ‚Ņ€ŅƒÐžÐĩÐ―Ņ‚а ÐŋÐūКа Ð―ÐĩÐūÐąŅÐ·Ð°Ņ‚ÐĩÐŧŅŒÐ―Ņ‹, Ð―Ðū ÐūÐ―Ðļ ÐūКаÐķŅƒŅ‚ŅŅ ÐūŅ‡ÐĩÐ―ŅŒ ÐŋÐūÐŧÐĩÐ·Ð―Ņ‹ÐžÐļ, Ðļ ÐŋÐūзÐķÐĩ ÐąÐĩз Ð―ÐļŅ… ÐąŅƒÐīÐĩŅ‚ Ð―Ðĩ ÐūÐąÐūÐđŅ‚ÐļŅŅŒ.\n\nЗаÐģÐŧŅÐ―Ðļ Ðē ÐģÐŧаÐēŅƒ ÂŦÐĄÐūÐēÐĩŅ‚Ņ‹ TFGÂŧ ÐīÐŧŅ ÐŋÐūОÐūŅ‰Ðļ ŅÐū ŅŅ‚ÐĩКÐŧÐūÐīŅƒÐēÐļÐĩО. А Ņ‚Ņ‹ Ð·Ð―Ð°Ðŧ, Ņ‡Ņ‚Ðū ÐĩŅÐŧÐļ ÐŧÐūОаŅ‚ŅŒ ÐąŅƒÐŧŅ‹ÐķÐ―ÐļК ОÐūÐŧÐūŅ‚КÐūО, ÐūÐ― ÐŋŅ€ÐĩÐēŅ€Ð°Ņ‚ÐļŅ‚ŅŅ Ðē ÐģŅ€Ð°ÐēÐļÐđ, а ÐĩŅÐŧÐļ Ņ€Ð°Ð·ÐąÐļŅ‚ŅŒ ÐģŅ€Ð°ÐēÐļÐđ ÐĩŅ‰Ņ‘ Ņ€Ð°Ð· — ÐŋÐūÐŧŅƒŅ‡ÐļŅ‚ŅŅ ÐŋÐĩŅÐūК...?", "quests.steam_age.basic_millstone.title": "АÐēŅ‚ÐūОаŅ‚ÐļŅ‡ÐĩŅÐšÐ°Ņ ПÐĩŅ€ÐĩŅ€Ð°ÐąÐūŅ‚Ка РŅƒÐīŅ‹", "quests.steam_age.basic_millstone.subtitle": "БÐūÐŧŅŒŅˆÐĩ Ð―ÐļКаКÐūÐģÐū ÐķÐĩŅ€Ð―ÐūÐēа", - "quests.steam_age.basic_millstone.desc": "&3ЖÐĩŅ€Ð―ÐūÐē&r — ŅŅ‚Ðū аÐēŅ‚ÐūОаŅ‚ÐļзÐļŅ€ÐūÐēÐ°Ð―Ð―Ð°Ņ ÐēÐĩŅ€ŅÐļŅ Ņ€ŅƒŅ‡Ð―ÐūÐģÐū ÐķÐĩŅ€Ð―ÐūÐēа. ÐĒŅ‹ ОÐūÐķÐĩŅˆŅŒ ÐŋŅ€ÐūŅŅ‚Ðū ÐąŅ€ÐūŅÐļŅ‚ŅŒ Ð―ŅƒÐķÐ―Ņ‹Ðĩ ОаŅ‚ÐĩŅ€ÐļаÐŧŅ‹ ŅÐēÐĩŅ€Ņ…Ņƒ, а заŅ‚ÐĩО Ņ‰Ņ‘ÐŧÐšÐ―ŅƒŅ‚ŅŒ ПКМ, Ņ‡Ņ‚ÐūÐąŅ‹ Ð·Ð°ÐąŅ€Ð°Ņ‚ŅŒ ÐŋÐĩŅ€ÐĩŅ€Ð°ÐąÐūŅ‚Ð°Ð―Ð―Ņ‹Ðĩ ÐŋŅ€ÐĩÐīОÐĩŅ‚Ņ‹.\n\nЕŅÐŧÐļ ÐŋÐūÐīКÐŧŅŽŅ‡ÐļŅ‚ŅŒ ÐĩÐģÐū Ð―Ð°ÐŋŅ€ŅÐžŅƒŅŽ К &3ÐĄÐšÐūŅ‚Ð―ÐūОŅƒ ПŅ€ÐļÐēÐūÐīŅƒ&r, ÐūÐ― ÐąŅƒÐīÐĩŅ‚ ÐīÐūÐēÐūÐŧŅŒÐ―Ðū ОÐĩÐīÐŧÐĩÐ―Ð―Ņ‹Ðž, Ð―Ðū ОÐūÐķÐ―Ðū ŅƒÐēÐĩÐŧÐļŅ‡ÐļŅ‚ŅŒ ŅÐšÐūŅ€ÐūŅŅ‚ŅŒ Ņ ÐŋÐūОÐūŅ‰ŅŒŅŽ ÐŋÐĩŅ€ÐĩÐīаŅ‚ÐūŅ‡Ð―Ņ‹Ņ… ŅˆÐĩŅŅ‚ÐĩŅ€Ņ‘Ð―.\n\nÐĒŅ‹ ÐąŅƒÐīÐĩŅˆŅŒ ÐŋÐūÐŧŅƒŅ‡Ð°Ņ‚ŅŒ Ņ€ÐĩзŅƒÐŧŅŒŅ‚аŅ‚ Ņ‚ÐūÐŧŅŒÐšÐū Ðļз ÐŋÐĩŅ€ÐēÐūÐģÐū ŅÐŧÐūŅ‚а. ОŅŅ‚аÐŧŅŒÐ―Ņ‹Ðĩ ŅÐŧÐūŅ‚Ņ‹ ÐūŅ‚Ð―ÐūŅŅŅ‚ŅŅ К ОÐĩŅ…Ð°Ð―ÐļКÐĩ GregTech, КÐūŅ‚ÐūŅ€Ð°Ņ ŅŅ‚Ð°Ð―ÐĩŅ‚ аКŅ‚ŅƒÐ°ÐŧŅŒÐ―ÐūÐđ ÐģÐūŅ€Ð°Ð·ÐīÐū ÐŋÐūзÐķÐĩ (&6HV&r).", + "quests.steam_age.basic_millstone.desc.1": "&3ЖÐĩŅ€Ð―ÐūÐē&r — ŅŅ‚Ðū аÐēŅ‚ÐūОаŅ‚ÐļзÐļŅ€ÐūÐēÐ°Ð―Ð―Ð°Ņ ÐēÐĩŅ€ŅÐļŅ Ņ€ŅƒŅ‡Ð―ÐūÐģÐū ÐķÐĩŅ€Ð―ÐūÐēа. ÐĒŅ‹ ОÐūÐķÐĩŅˆŅŒ ÐŋŅ€ÐūŅŅ‚Ðū ÐąŅ€ÐūŅÐļŅ‚ŅŒ Ð―ŅƒÐķÐ―Ņ‹Ðĩ ОаŅ‚ÐĩŅ€ÐļаÐŧŅ‹ ŅÐēÐĩŅ€Ņ…Ņƒ, а заŅ‚ÐĩО Ņ‰Ņ‘ÐŧÐšÐ―ŅƒŅ‚ŅŒ ПКМ, Ņ‡Ņ‚ÐūÐąŅ‹ Ð·Ð°ÐąŅ€Ð°Ņ‚ŅŒ ÐŋÐĩŅ€ÐĩŅ€Ð°ÐąÐūŅ‚Ð°Ð―Ð―Ņ‹Ðĩ ÐŋŅ€ÐĩÐīОÐĩŅ‚Ņ‹.\n\nЕŅÐŧÐļ ÐŋÐūÐīКÐŧŅŽŅ‡ÐļŅ‚ŅŒ ÐĩÐģÐū Ð―Ð°ÐŋŅ€ŅÐžŅƒŅŽ К &3ÐĄÐšÐūŅ‚Ð―ÐūОŅƒ ПŅ€ÐļÐēÐūÐīŅƒ&r, ÐūÐ― ÐąŅƒÐīÐĩŅ‚ ÐīÐūÐēÐūÐŧŅŒÐ―Ðū ОÐĩÐīÐŧÐĩÐ―Ð―Ņ‹Ðž, Ð―Ðū ОÐūÐķÐ―Ðū ŅƒÐēÐĩÐŧÐļŅ‡ÐļŅ‚ŅŒ ŅÐšÐūŅ€ÐūŅŅ‚ŅŒ Ņ ÐŋÐūОÐūŅ‰ŅŒŅŽ ÐŋÐĩŅ€ÐĩÐīаŅ‚ÐūŅ‡Ð―Ņ‹Ņ… ŅˆÐĩŅŅ‚ÐĩŅ€Ņ‘Ð―.\n\nÐĒŅ‹ ÐąŅƒÐīÐĩŅˆŅŒ ÐŋÐūÐŧŅƒŅ‡Ð°Ņ‚ŅŒ Ņ€ÐĩзŅƒÐŧŅŒŅ‚аŅ‚ Ņ‚ÐūÐŧŅŒÐšÐū Ðļз ÐŋÐĩŅ€ÐēÐūÐģÐū ŅÐŧÐūŅ‚а. ОŅŅ‚аÐŧŅŒÐ―Ņ‹Ðĩ ŅÐŧÐūŅ‚Ņ‹ ÐūŅ‚Ð―ÐūŅŅŅ‚ŅŅ К ОÐĩŅ…Ð°Ð―ÐļКÐĩ GregTech, КÐūŅ‚ÐūŅ€Ð°Ņ ŅŅ‚Ð°Ð―ÐĩŅ‚ аКŅ‚ŅƒÐ°ÐŧŅŒÐ―ÐūÐđ ÐģÐūŅ€Ð°Ð·ÐīÐū ÐŋÐūзÐķÐĩ (&6HV&r).", + "quests.steam_age.basic_millstone.desc.2": "&l&3ЛÐūŅ€:&r&o ЖÐĩŅ€Ð―ÐūÐē Ð―ÐĩÐŧŅŒÐ·Ņ ÐļŅÐŋÐūÐŧŅŒÐ·ÐūÐēаŅ‚ŅŒ ÐīÐŧŅ ÐŋÐĩŅ€ÐĩŅ€Ð°ÐąÐūŅ‚КÐļ зÐĩŅ€ÐĩÐ― Ðē ОŅƒÐšŅƒ, ÐŋÐūŅÐšÐūÐŧŅŒÐšŅƒ Create Ð―Ðĩ ÐŋÐūÐ―ÐļОаÐĩŅ‚ ŅÐļŅŅ‚ÐĩОŅƒ ÐļŅŅ‚ÐĩŅ‡ÐĩÐ―ÐļŅ ŅŅ€ÐūКа ÐģÐūÐīÐ―ÐūŅŅ‚Ðļ ÐŋŅ€ÐūÐīŅƒÐšŅ‚ÐūÐē TFC, КÐūŅ‚ÐūŅ€Ð°Ņ Ņ€Ð°Ð―ÐĩÐĩ ÐŋŅ€ÐļÐēÐūÐīÐļÐŧа К Ņ€Ð°Ð·Ð―ÐūÐģÐū Ņ€ÐūÐīа ÐūŅˆÐļÐąÐšÐ°Ðž, ŅÐēŅÐ·Ð°Ð―Ð―Ņ‹Ðž Ņ ÐŋŅ€ÐĩÐēŅ€Ð°Ņ‰ÐĩÐ―ÐļÐĩО ÐģÐ―ÐļÐŧŅ‹Ņ… ÐŋŅ€ÐūÐīŅƒÐšŅ‚ÐūÐē Ðē ŅÐēÐĩÐķÐļÐĩ, Ðļ Ð―Ð°ÐūÐąÐūŅ€ÐūŅ‚. ПÐūКа ÐēŅ‹ Ð―Ðĩ ÐŋÐūÐŧŅƒŅ‡ÐļŅ‚Ðĩ КŅƒŅ…ÐūÐ―Ð―Ņ‹Ðđ КÐūÐžÐąÐ°ÐđÐ― Ðē &7LV&r, ÐēŅ‹ ÐēŅÐĩ Ņ€Ð°ÐēÐ―Ðū ОÐūÐķÐĩŅ‚Ðĩ ÐļзОÐĩÐŧŅŒŅ‡Ð°Ņ‚ŅŒ зÐĩŅ€Ð―а Ņ ÐŋÐūОÐūŅ‰ŅŒŅŽ ŅŅ‚ŅƒÐŋКÐļ Ðē ŅÐĩŅ‚КÐĩ КŅ€Ð°Ņ„Ņ‚а.", "quests.steam_age.horse_crank.title": "ÐĒÐēÐūÐđ ПÐĩŅ€ÐēŅ‹Ðđ ИŅŅ‚ÐūŅ‡Ð―ÐļК Ð­Ð―ÐĩŅ€ÐģÐļÐļ", "quests.steam_age.horse_crank.subtitle": "ПŅƒŅŅ‚ŅŒ ÐīÐūОаŅˆÐ―ÐļÐĩ ÐķÐļÐēÐūŅ‚Ð―Ņ‹Ðĩ ÐŋÐŧаŅ‚ŅŅ‚ за ÐķÐļÐŧŅŒŅ‘", "quests.steam_age.horse_crank.desc.1": "&3ÐĄÐšÐūŅ‚Ð―Ņ‹Ðđ ПŅ€ÐļÐēÐūÐī&r — ŅŅ‚Ðū Ņ‚ÐēÐūÐđ ÐŋÐĩŅ€ÐēŅ‹Ðđ ÐīÐūŅŅ‚ŅƒÐŋÐ―Ņ‹Ðđ ÐļŅŅ‚ÐūŅ‡Ð―ÐļК ОÐĩŅ…Ð°Ð―ÐļŅ‡ÐĩŅÐšÐūÐđ ŅÐ―ÐĩŅ€ÐģÐļÐļ. ЧŅ‚ÐūÐąŅ‹ ÐĩÐģÐū ÐļŅÐŋÐūÐŧŅŒÐ·ÐūÐēаŅ‚ŅŒ, Ņ€Ð°Ð·ÐžÐĩŅŅ‚Ðļ ÐŋŅ€ÐļÐēÐūÐī Ðē Ņ†ÐĩÐ―Ņ‚Ņ€Ðĩ ÐūŅ‡ÐļŅ‰ÐĩÐ―Ð―ÐūÐđ ÐŋÐŧÐūŅ‰Ð°ÐīКÐļ 7x7 Ðļ ÐŋŅ€ÐļÐēŅÐķÐļ К Ð―ÐĩОŅƒ ÐķÐļÐēÐūŅ‚Ð―ÐūÐĩ. Ð Ð°Ð·Ð―Ņ‹Ðĩ ÐķÐļÐēÐūŅ‚Ð―Ņ‹Ðĩ ÐīаŅŽŅ‚ Ņ€Ð°Ð·Ð―ÐūÐĩ КÐūÐŧÐļŅ‡ÐĩŅŅ‚ÐēÐū ŅÐ―ÐĩŅ€ÐģÐļÐļ, а ÐąÐŧÐūКÐļ ÐŋÐūÐī Ð―ÐļОÐļ ОÐūÐģŅƒŅ‚ ŅƒÐēÐĩÐŧÐļŅ‡ÐļŅ‚ŅŒ ŅÐšÐūŅ€ÐūŅŅ‚ŅŒ ÐēŅ€Ð°Ņ‰ÐĩÐ―ÐļŅ. ПÐŧÐūŅ‰Ð°ÐīКÐļ Ð―ÐĩŅÐšÐūÐŧŅŒÐšÐļŅ… ÐŋŅ€ÐļÐēÐūÐīÐūÐē ОÐūÐģŅƒŅ‚ ÐŋÐĩŅ€ÐĩКŅ€Ņ‹ÐēаŅ‚ŅŒŅŅ.\n\nÐ˜Ð―ÐūÐģÐīа ОÐūÐķÐĩŅ‚ ÐŋÐūÐ―Ð°ÐīÐūÐąÐļŅ‚ŅŒŅŅ ŅƒÐīÐĩŅ€ÐķÐļÐēаŅ‚ŅŒ ÐēŅ‚ÐūŅ€ÐūÐđ ÐŋÐūÐēÐūÐīÐūК, Ņ‡Ņ‚ÐūÐąŅ‹ ÐŋŅ€ÐļКŅ€ÐĩÐŋÐļŅ‚ŅŒ ÐķÐļÐēÐūŅ‚Ð―ÐūÐĩ.", @@ -3742,7 +3837,7 @@ "quests.steam_age.item_pipes.title": "ПŅ€ÐĩÐīОÐĩŅ‚Ð―Ņ‹Ðĩ ÐĒŅ€ŅƒÐąŅ‹", "quests.steam_age.item_pipes.subtitle": "НÐĩ Ņ‚аКÐļÐĩ КŅ€ŅƒŅ‚Ņ‹Ðĩ, КаК Item Conduits", "quests.steam_age.item_pipes.desc.1": "&3ПŅ€ÐĩÐīОÐĩŅ‚Ð―Ņ‹Ðĩ ÐĒŅ€ŅƒÐąŅ‹&r — ŅŅ‚Ðū ÐŋŅ€ÐūŅŅ‚ÐūÐđ, Ð―Ðū ŅŅ„Ņ„ÐĩКŅ‚ÐļÐēÐ―Ņ‹Ðđ ŅÐŋÐūŅÐūÐą ОÐģÐ―ÐūÐēÐĩÐ―Ð―Ðū ÐŋÐĩŅ€ÐĩОÐĩŅ‰Ð°Ņ‚ŅŒ ÐŋŅ€ÐĩÐīОÐĩŅ‚Ņ‹, Ņ…ÐūŅ‚Ņ Ðļ Ņ ÐūÐģŅ€Ð°Ð―ÐļŅ‡ÐĩÐ―ÐļÐĩО ÐŋŅ€ÐūÐŋŅƒŅÐšÐ―ÐūÐđ ŅÐŋÐūŅÐūÐąÐ―ÐūŅŅ‚Ðļ.\n\nÐĒŅ€ŅƒÐąŅ‹ ÐąÐūÐŧÐĩÐĩ ÐēŅ‹ŅÐūКÐūÐģÐū ŅƒŅ€ÐūÐēÐ―Ņ ÐūÐąÐĩŅÐŋÐĩŅ‡ÐļÐēаŅŽŅ‚ КÐūÐŧÐūŅŅÐ°ÐŧŅŒÐ―ŅƒŅŽ ÐŋŅ€ÐūÐŋŅƒŅÐšÐ―ŅƒŅŽ ŅÐŋÐūŅÐūÐąÐ―ÐūŅŅ‚ŅŒ — Ņ€ÐĩÐīКÐūŅŅ‚ŅŒ ÐīÐŧŅ ОÐūÐīÐūÐē Minecraft!\n\nПŅ€ÐĩÐīОÐĩŅ‚Ð―Ņ‹Ðĩ Ņ‚Ņ€ŅƒÐąŅ‹ &9Ð―Ðĩ ÐēŅ‚ŅÐģÐļÐēаŅŽŅ‚&r ÐŋŅ€ÐĩÐīОÐĩŅ‚Ņ‹, Ð―Ðū ÐūÐ―Ðļ ÐąŅƒÐīŅƒŅ‚ &9ÐēŅ‹Ņ‚аÐŧКÐļÐēаŅ‚ŅŒ&r ÐŧŅŽÐąŅ‹Ðĩ ÐēŅŅ‚аÐēÐŧÐĩÐ―Ð―Ņ‹Ðĩ Ðē Ð―ÐļŅ… ÐŋŅ€ÐĩÐīОÐĩŅ‚Ņ‹ Ðē ÐŋÐūÐīКÐŧŅŽŅ‡Ņ‘Ð―Ð―Ņ‹Ðĩ КÐūÐ―Ņ‚ÐĩÐđÐ―ÐĩŅ€Ņ‹, Ð―Ð°Ņ‡ÐļÐ―Ð°Ņ Ņ &9ÐąÐŧÐļÐķаÐđŅˆÐĩÐģÐū&r.", - "quests.steam_age.item_pipes.desc.2": "МÐĩŅ…Ð°Ð―ÐļКа ÐŋŅ€ÐļÐūŅ€ÐļŅ‚ÐĩŅ‚а &ÐūÐ―ÐĩÐžÐ―ÐūÐģÐū ŅÐŧÐūÐķÐ―Ð°&r, Ņ‚аК Ņ‡Ņ‚Ðū ОÐūÐķÐĩŅˆŅŒ ÐŋŅ€ÐūÐŋŅƒŅŅ‚ÐļŅ‚ŅŒ, ÐĩŅÐŧÐļ Ð―Ðĩ ÐļÐ―Ņ‚ÐĩŅ€ÐĩŅŅƒÐĩŅ‚:\n\nКаÐķÐīŅ‹Ðđ &eПŅƒÐ―КŅ‚ Ð―Ð°Ð·Ð―Ð°Ņ‡ÐĩÐ―ÐļŅ&r ÐļОÐĩÐĩŅ‚ &dÐ—Ð―Ð°Ņ‡ÐĩÐ―ÐļÐĩ ОаŅ€ŅˆŅ€ŅƒŅ‚а&r — ŅŅ‚Ðū ŅŅƒÐžÐžÐ° ÐēŅÐĩŅ… Ð·Ð―Ð°Ņ‡ÐĩÐ―ÐļÐđ ОаŅ€ŅˆŅ€ŅƒŅ‚а ÐŋÐū ÐŋŅƒŅ‚Ðļ К Ð―ÐĩОŅƒ. ÐĒÐūŅ‚ ÐŋŅƒÐ―КŅ‚, Ņƒ КÐūŅ‚ÐūŅ€ÐūÐģÐū &cÐ―Ð°ÐļОÐĩÐ―ŅŒŅˆÐĩÐĩ &dÐ·Ð―Ð°Ņ‡ÐĩÐ―ÐļÐĩ ОаŅ€ŅˆŅ€ŅƒŅ‚а&r, Ðļ ÐąŅƒÐīÐĩŅ‚ ÐēŅ‹ÐąŅ€Ð°Ð― ÐīÐŧŅ ÐēŅŅ‚аÐēКÐļ ÐŋŅ€ÐĩÐīОÐĩŅ‚ÐūÐē.\n\n&3ОÐģŅ€Ð°Ð―ÐļŅ‡ÐļŅ‚ÐĩÐŧŅŒÐ―Ņ‹Ðĩ Ņ‚Ņ€ŅƒÐąŅ‹&r ÐūÐąŅ‹Ņ‡Ð―Ðū ÐļОÐĩŅŽŅ‚ ŅÐ°ÐžŅ‹Ðđ Ð―ÐļзКÐļÐđ ÐŋŅ€ÐļÐūŅ€ÐļŅ‚ÐĩŅ‚ ÐīÐŧŅ ÐēŅŅ‚аÐēКÐļ Ðļз-за ÐąÐūÐŧÐĩÐĩ ÐēŅ‹ŅÐūКÐūÐģÐū Ð·Ð―Ð°Ņ‡ÐĩÐ―ÐļŅ ОаŅ€ŅˆŅ€ŅƒŅ‚а.", + "quests.steam_age.item_pipes.desc.2": "МÐĩŅ…Ð°Ð―ÐļКа ÐŋŅ€ÐļÐūŅ€ÐļŅ‚ÐĩŅ‚а &oÐ―ÐĩÐžÐ―ÐūÐģÐū ŅÐŧÐūÐķÐ―Ð°&r, Ņ‚аК Ņ‡Ņ‚Ðū ОÐūÐķÐĩŅˆŅŒ ÐŋŅ€ÐūÐŋŅƒŅŅ‚ÐļŅ‚ŅŒ, ÐĩŅÐŧÐļ Ð―Ðĩ ÐļÐ―Ņ‚ÐĩŅ€ÐĩŅŅƒÐĩŅ‚:\n\nКаÐķÐīŅ‹Ðđ &eПŅƒÐ―КŅ‚ Ð―Ð°Ð·Ð―Ð°Ņ‡ÐĩÐ―ÐļŅ&r ÐļОÐĩÐĩŅ‚ &dÐ—Ð―Ð°Ņ‡ÐĩÐ―ÐļÐĩ ОаŅ€ŅˆŅ€ŅƒŅ‚а&r — ŅŅ‚Ðū ŅŅƒÐžÐžÐ° ÐēŅÐĩŅ… Ð·Ð―Ð°Ņ‡ÐĩÐ―ÐļÐđ ОаŅ€ŅˆŅ€ŅƒŅ‚а ÐŋÐū ÐŋŅƒŅ‚Ðļ К Ð―ÐĩОŅƒ. ÐĒÐūŅ‚ ÐŋŅƒÐ―КŅ‚, Ņƒ КÐūŅ‚ÐūŅ€ÐūÐģÐū &cÐ―Ð°ÐļОÐĩÐ―ŅŒŅˆÐĩÐĩ &dÐ·Ð―Ð°Ņ‡ÐĩÐ―ÐļÐĩ ОаŅ€ŅˆŅ€ŅƒŅ‚а&r, Ðļ ÐąŅƒÐīÐĩŅ‚ ÐēŅ‹ÐąŅ€Ð°Ð― ÐīÐŧŅ ÐēŅŅ‚аÐēКÐļ ÐŋŅ€ÐĩÐīОÐĩŅ‚ÐūÐē.\n\n&3ОÐģŅ€Ð°Ð―ÐļŅ‡ÐļŅ‚ÐĩÐŧŅŒÐ―Ņ‹Ðĩ Ņ‚Ņ€ŅƒÐąŅ‹&r ÐūÐąŅ‹Ņ‡Ð―Ðū ÐļОÐĩŅŽŅ‚ ŅÐ°ÐžŅ‹Ðđ Ð―ÐļзКÐļÐđ ÐŋŅ€ÐļÐūŅ€ÐļŅ‚ÐĩŅ‚ ÐīÐŧŅ ÐēŅŅ‚аÐēКÐļ Ðļз-за ÐąÐūÐŧÐĩÐĩ ÐēŅ‹ŅÐūКÐūÐģÐū Ð·Ð―Ð°Ņ‡ÐĩÐ―ÐļŅ ОаŅ€ŅˆŅ€ŅƒŅ‚а.", "quests.steam_age.item_pipes.desc.3": "ÐĄÐĩÐđŅ‡Ð°Ņ Ņ‚Ņ‹ ОÐūÐķÐĩŅˆŅŒ ÐļŅÐŋÐūÐŧŅŒÐ·ÐūÐēаŅ‚ŅŒ ÐļŅ… ÐēОÐĩŅŅ‚Ðĩ Ņ &6ЖÐĩÐŧÐūÐąÐ°ÐžÐļ&r Ðļ &6ВÐūŅ€ÐūÐ―ÐšÐ°ÐžÐļ&r, а Ðē ŅÐŋÐūŅ…Ņƒ LV Ņ‚аКÐķÐĩ ŅÐžÐūÐķÐĩŅˆŅŒ ÐŋÐūÐīКÐŧŅŽŅ‡Ð°Ņ‚ŅŒ ÐļŅ… К МÐūÐīŅƒÐŧŅÐž КÐūÐ―ÐēÐĩÐđÐĩŅ€Ð°, ВŅ‹Ņ…ÐūÐīÐ―Ņ‹Ðž ÐĻÐļÐ―Ð°Ðž Ðļ АÐēŅ‚ÐūОаŅ‚ÐļŅ‡ÐĩŅÐšÐļО ВŅ‹Ņ…ÐūÐīаО ОаŅˆÐļÐ―.\n\n&9ПŅ€ÐļОÐĩŅ‡Ð°Ð―ÐļÐĩ:&r ВКÐŧŅŽŅ‡Ņ‘Ð― ŅŅ‚ÐļÐŧŅŒ Ņ‚Ņ€ŅƒÐą Ðļз GT6. ЭŅ‚Ðū Ð·Ð―Ð°Ņ‡ÐļŅ‚, Ņ‡Ņ‚Ðū ÐŋŅ€Ðļ ŅƒŅŅ‚Ð°Ð―ÐūÐēКÐĩ Ņ‚Ņ€ŅƒÐąÐ° ŅÐūÐĩÐīÐļÐ―ŅÐĩŅ‚ŅŅ Ņ‚ÐūÐŧŅŒÐšÐū Ņ ÐąÐŧÐūКÐūО, К КÐūŅ‚ÐūŅ€ÐūОŅƒ ÐūÐ―Ð° ÐŋŅ€ÐļОŅ‹ÐšÐ°ÐĩŅ‚. ЧŅ‚ÐūÐąŅ‹ ÐūŅ‚КŅ€Ņ‹Ņ‚ŅŒ ÐīÐūÐŋÐūÐŧÐ―ÐļŅ‚ÐĩÐŧŅŒÐ―Ņ‹Ðĩ ŅÐūÐĩÐīÐļÐ―ÐĩÐ―ÐļŅ, ÐļŅÐŋÐūÐŧŅŒÐ·ŅƒÐđ ŅÐēÐūÐđ &5ГаÐĩŅ‡Ð―Ņ‹Ðđ КÐŧŅŽŅ‡&r Ð―Ð° ŅÐĩŅ‚КÐĩ.\n\nПÐūÐŧŅƒŅ‡ÐļŅ‚Ðĩ &eÐŧŅŽÐąŅƒŅŽ&r Ðļз ÐŋŅ€ÐĩÐīÐŧÐūÐķÐĩÐ―Ð―Ņ‹Ņ… ПŅ€ÐĩÐīОÐĩŅ‚Ð―Ņ‹Ņ… ÐĒŅ€ŅƒÐą, Ņ‡Ņ‚ÐūÐąŅ‹ заÐēÐĩŅ€ŅˆÐļŅ‚ŅŒ ŅŅ‚Ðū заÐīÐ°Ð―ÐļÐĩ.", "quests.steam_age.item_pipes.desc.4": "&l&3ЛÐūŅ€:&r&o ОÐūÐūÐūÐū, ДА! ПŅ€ÐĩÐīОÐĩŅ‚Ð―Ņ‹Ðĩ Ņ‚Ņ€ŅƒÐąŅ‹ ÐąŅ‹ÐŧÐļ Ðē GregTech 5, Ð―Ðū ÐŋÐū КаКÐūÐđ-Ņ‚Ðū ÐŋŅ€ÐļŅ‡ÐļÐ―Ðĩ ÐļŅ… Ð―Ðĩ ÐīÐūÐąÐ°ÐēÐļÐŧÐļ Ðē GTCE, Ðļ ÐŋŅ€ÐļŅˆÐŧÐūŅŅŒ ÐļŅÐŋÐūÐŧŅŒÐ·ÐūÐēаŅ‚ŅŒ ÐīŅ€ŅƒÐģÐļÐĩ ОÐūÐīŅ‹ ÐīÐŧŅ Ņ‚Ņ€Ð°Ð―ŅÐŋÐūŅ€Ņ‚ÐļŅ€ÐūÐēКÐļ ÐŋŅ€ÐĩÐīОÐĩŅ‚ÐūÐē. КŅ‚Ðū ÐēÐūÐūÐąŅ‰Ðĩ Ņ‚аК ÐīÐĩÐŧаÐĩŅ‚!? ÐĻŅƒŅ‚КÐļ Ðē ŅŅ‚ÐūŅ€ÐūÐ―Ņƒ — Ð―Ð°ÐīÐĩÐĩОŅŅ, Ņ‚ÐĩÐąÐĩ ÐŋÐūÐ―Ņ€Ð°ÐēÐļŅ‚ŅŅ ÐēÐūзÐēŅ€Ð°Ņ‰ÐĩÐ―ÐļÐĩ Ņ‚Ņ€ŅƒÐą Ðē GregTech!", "quests.steam_age.steel_greate.title": "Greate Ðļз ÐĄŅ‚аÐŧÐļ", @@ -3857,7 +3952,7 @@ "quests.steam_age.resin_boards.desc": "Ð—Ð―Ð°ÐĩŅ‚Ðĩ ÐŧÐļ ÐēŅ‹, Ņ‡Ņ‚Ðū ÐŋÐūÐīŅÐūŅ‡ÐšÐļ ОÐūÐģŅƒŅ‚ КаÐŋаŅ‚ŅŒ ÐŋŅ€ŅÐžÐū Ðē Ņ‚Ņ€ŅƒÐąŅ‹ Ðļ ÐąÐūŅ‡ÐšÐļ GregTech? ÐĒÐĩÐŋÐĩŅ€ŅŒ Ð·Ð―Ð°ÐĩŅ‚Ðĩ!", "quests.steam_age.circuit_boards.title": "ЭÐŧÐĩКŅ‚Ņ€ÐūÐ―ÐļКа #2: ПŅ€ÐūŅ€ÐĩзÐļÐ―ÐĩÐ―Ð―Ð°Ņ ЭÐŧÐĩКŅ‚Ņ€ÐūŅŅ…ÐĩОа", "quests.steam_age.circuit_boards.subtitle": "БÐūÐŧÐĩÐĩ ÐŋŅ€ÐūŅŅ‚ÐūÐđ КÐūОÐŋÐūÐ―ÐĩÐ―Ņ‚ ÐīÐŧŅ ŅŅ…ÐĩО", - "quests.steam_age.circuit_boards.desc": "ÐĄÐšÐūÐžÐąÐļÐ―ÐļŅ€ŅƒÐđŅ‚Ðĩ ПŅ€ÐūŅ€ÐĩзÐļÐ―ÐĩÐ―Ð―Ņ‹Ðĩ ПÐūÐīÐŧÐūÐķКÐļ Ņ ОÐĩÐīÐ―Ņ‹ÐžÐļ ÐŋŅ€ÐūÐēÐūÐīаОÐļ, Ðļ Ņƒ ÐēаŅ ÐŋÐūÐŧŅƒŅ‡ÐļŅ‚ŅŅ ÐūŅÐ―ÐūÐēа ÐīÐŧŅ ÐēаŅˆÐĩÐđ ÐŋÐĩŅ€ÐēÐūÐđ &aÐĄŅ…ÐĩОŅ‹&r!", + "quests.steam_age.circuit_boards.desc": "НÐĩÐžÐ―ÐūÐģÐū Ņ‚ÐūÐ―ÐšÐūÐđ Ņ€Ð°ÐąÐūŅ‚Ņ‹ за &3РÐĩОÐĩŅÐŧÐĩÐ―Ð―Ņ‹Ðž ŅŅ‚ÐūÐŧÐūО&r ÐŋÐūзÐēÐūÐŧÐļŅ‚ Ņ‚ÐĩÐąÐĩ ÐūÐąŅŠÐĩÐīÐļÐ―ÐļŅ‚ŅŒ ÐŋŅ€ÐūŅ€ÐĩзÐļÐ―ÐĩÐ―Ð―Ņ‹Ðĩ ÐŋÐūÐīÐŧÐūÐķКÐļ Ņ ОÐĩÐīÐ―Ņ‹ÐžÐļ ÐŋŅ€ÐūÐēÐūÐīаОÐļ Ðļ ŅÐūзÐīаŅ‚ŅŒ ŅÐēÐūÐļ ÐŋÐĩŅ€ÐēŅ‹Ðĩ &aŅÐŧÐĩКŅ‚Ņ€ÐūŅŅ…ÐĩОŅ‹&r!\n\nРÐĩОÐĩŅÐŧÐĩÐ―Ð―Ņ‹Ðđ ŅŅ‚ÐūÐŧ Ņ€Ð°ÐąÐūŅ‚аÐĩŅ‚ ÐŋÐū Ņ‚ÐūОŅƒ ÐķÐĩ ÐŋŅ€ÐļÐ―Ņ†ÐļÐŋŅƒ, Ņ‡Ņ‚Ðū Ðļ ÐūÐąŅ€Ð°ÐąÐūŅ‚Ка ÐšÐ°ÐžÐ―Ņ, Ð―Ðū Ð―Ð° ŅŅ‚ÐūŅ‚ Ņ€Ð°Ð· Ņ ÐīÐūÐŋÐūÐŧÐ―ÐļŅ‚ÐĩÐŧŅŒÐ―Ņ‹ÐžÐļ ÐŋŅ€ÐĩÐīОÐĩŅ‚аОÐļ Ðļ ÐļÐ―ŅŅ‚Ņ€ŅƒÐžÐĩÐ―Ņ‚аОÐļ.", "quests.steam_age.vacuum_chamber.title": "ВаКŅƒŅƒÐžÐ―аŅ КаОÐĩŅ€Ð°", "quests.steam_age.vacuum_chamber.subtitle": "ДÐūÐąÐ°ÐēÐŧŅÐĩО ÐēаКŅƒŅƒÐž Ðē ÐēаКŅƒŅƒÐžÐ―Ņ‹Ðĩ ÐŧаОÐŋŅ‹", "quests.steam_age.vacuum_chamber.desc": "ЭŅ‚а ОаŅˆÐļÐ―Ð° — Ņ„ÐļÐ―Ð°ÐŧŅŒÐ―Ņ‹Ðđ ŅˆÐ°Ðģ Ðē ŅÐūзÐīÐ°Ð―ÐļÐļ ÐēаŅˆÐļŅ… ÐŋÐĩŅ€ÐēŅ‹Ņ… ÐēаКŅƒŅƒÐžÐ―Ņ‹Ņ… ÐŧаОÐŋ. РазОÐĩŅŅ‚ÐļŅ‚Ðĩ ÐĩŅ‘ Ð―Ð°Ðī Ņ‡Ð°ŅˆÐĩÐđ, ÐŋÐūÐīКÐŧŅŽŅ‡ÐļŅ‚Ðĩ ÐŋÐļŅ‚Ð°Ð―ÐļÐĩ Ðļ ŅƒÐąÐĩÐīÐļŅ‚ÐĩŅŅŒ, Ņ‡Ņ‚Ðū ОаŅˆÐļÐ―Ð° Ð―Ð°Ņ…ÐūÐīÐļŅ‚ŅŅ Ðē Ņ€ÐĩÐķÐļОÐĩ ВааКŅƒÐžÐļŅ€ÐūÐēÐ°Ð―ÐļÐĩ.\n\nÐĒаКÐķÐĩ ŅŅ‚а ОаŅˆÐļÐ―Ð° ÐŋÐūОÐūÐģаÐĩŅ‚ Ņ€Ð°Ð·ÐķÐļÐķаŅ‚ŅŒ КÐŧÐĩÐđ Ðļ Ņ€ÐĩзÐļÐ―Ņƒ, ÐĩŅÐŧÐļ ÐĩŅ‘ Ð―Ð°ÐģŅ€ÐĩÐēаŅ‚ŅŒ Ðē Charcoal Forge ÐļÐŧÐļ Ņ ÐŋÐūОÐūŅ‰ŅŒŅŽ ГÐūŅ€ÐĩÐŧКÐļ ВŅÐŋÐūÐŧÐūŅ…а.", @@ -4095,6 +4190,7 @@ "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.desc.3": "БŅƒÐīŅŒŅ‚Ðĩ ÐūŅŅ‚ÐūŅ€ÐūÐķÐ―Ņ‹ ŅÐū ÐēŅÐĩО &cÐšÐ°Ð―Ņ†ÐĩŅ€ÐūÐģÐĩÐ―Ð―Ņ‹Ðž&r ÐļÐŧÐļ &cРаÐīÐļÐūаКŅ‚ÐļÐēÐ―Ņ‹Ðž&r — ŅŅ‚Ðļ ŅƒŅÐŧÐūÐēÐļŅ &rÐŋÐūŅŅ‚ÐūŅÐ―Ð―Ņ‹&r ÐīÐū Ņ‚ÐĩŅ… ÐŋÐūŅ€, ÐŋÐūКа ÐēŅ‹ Ð―Ðĩ ŅÐžÐūÐķÐĩŅ‚Ðĩ ŅÐūзÐīаŅ‚ŅŒ ÐŋаŅ€Ð°Ņ†ÐĩŅ‚аОÐūÐŧ Ðē &7LV&r.", "quests.stone_age.medical_conditions.task": "ÐĄÐ°Ðž ŅÐĩÐąÐĩ ÐēŅ€Ð°Ņ‡", "quests.stone_age.copper_for_anvil.title": "МÐĩÐīŅŒ ÐīÐŧŅ Ð―Ð°ÐšÐūÐēаÐŧŅŒÐ―Ðļ", "quests.stone_age.copper_for_anvil.subtitle": "ПŅ€ÐļÐēŅ‹ÐšÐ°Ðđ ÐīÐūÐąŅ‹ÐēаŅ‚ŅŒ 14 ŅÐŧÐļŅ‚КÐūÐē Ņ‡ÐĩÐģÐū-ÐŧÐļÐąÐū ", diff --git a/kubejs/assets/tfg/lang/uk_ua.json b/kubejs/assets/tfg/lang/uk_ua.json index b1472e75f..b8e88bb13 100644 --- a/kubejs/assets/tfg/lang/uk_ua.json +++ b/kubejs/assets/tfg/lang/uk_ua.json @@ -1321,6 +1321,7 @@ "ore_vein.tfg.deep_sapphire": "ÐĄÐ°ÐŋŅ„Ņ–Ņ€ Ņ– АÐŧŅŒÐžÐ°ÐīŅ–Ð―", "ore_vein.tfg.deep_scheelite": "ÐĻÐĩŅ”ÐŧŅ–Ņ‚ Ņ‚а ВÐūÐŧŅŒŅ„Ņ€Ð°Ðž", "ore_vein.tfg.deep_topaz": "ÐĒÐūÐŋаз Ņ– ÐĨаÐŧŅŒÐšÐūŅ†ÐļŅ‚", + "ore_vein.tfg.desert_oilsands": "НаŅ„Ņ‚ÐūÐēŅ– ÐŋŅ–ŅÐšÐļ", "ore_vein.tfg.normal_apatite": "АÐŋаŅ‚ÐļŅ‚ Ņ– ПŅ–Ņ€ÐūŅ…ÐŧÐūŅ€", "ore_vein.tfg.normal_basaltic_sands": "МŅ–Ð―ÐĩŅ€Ð°ÐŧŅŒÐ―Ņ– ÐŋŅ–ŅÐšÐļ", "ore_vein.tfg.normal_beryllium": "ÐĄÐžÐ°Ņ€Ð°ÐģÐī Ņ– БÐĩŅ€ÐļÐŧŅ–Ðđ", diff --git a/kubejs/assets/tfg/lang/zh_cn.json b/kubejs/assets/tfg/lang/zh_cn.json index 2464e8c53..98d505a81 100644 --- a/kubejs/assets/tfg/lang/zh_cn.json +++ b/kubejs/assets/tfg/lang/zh_cn.json @@ -581,14 +581,14 @@ "block.tfg.zpm_aqueous_accumulator": "§cįēū英蓄æ°īå™Ļ III§r", "block.tfg.uv_aqueous_accumulator": "§3įŧˆæžč“„æ°īå™Ļ§r", "block.tfg.electric_greenhouse": "į”ĩ力æļĐåŪĪ", - "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_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", @@ -810,6 +810,8 @@ "block.tfg.impure_moderate_core": "äļįšŊæ…Ē化堆čŠŊ", "block.tfg.moderate_core_frame": "æ…Ē化堆čŠŊæĄ†æžķ", "block.tfg.impure_moderate_core_frame": "äļįšŊæ…Ē化堆čŠŊæĄ†æžķ", + "tfg.block_entity.artisan_table": "å·Ĩ匠台", + "block.tfg.artisan_table": "å·Ĩ匠台", "fluid.tfg.heavy_ammoniacal_water": "重æ°Ļæ°ī", "fluid.tfg.semiheavy_ammoniacal_water": "半重æ°Ļæ°ī", "fluid.tfg.sulfur_fumes": "æĩ“įĄŦé…ļįƒŸé›ū", @@ -1294,6 +1296,10 @@ "item.tfg.fish_roe": "%séąžåĩ", "item.tfg.rotten_voiding_cover": "腐įƒ‚į‰Đ销æŊčĶ†į›–æŋ", "item.tfg.flora_pellets": "æĪį‰ĐéĒ—įē’", + "item.tfg.magnesia_refractory_brick_ingot": "æ ‘č„‚įŧ“合镁čīĻ耐įŦį –", + "item.tfg.tier_1_double_rocket": "R型铝é’Ē双䚚įŦįŪ­", + "item.tfg.tier_2_double_rocket": "ASM 4914 钛合金双䚚įŦįŪ­", + "item.tfg.tier_3_double_rocket": "45-Ti é’Ļé’Ē双䚚įŦįŪ­", "material.tfg.latex": "äđģčƒķ", "material.tfg.vulcanized_latex": "įĄŦ化äđģčƒķ", "material.tfg.fluix": "įĶéēäžŠå…‹æ–Ŋ", @@ -1469,6 +1475,13 @@ "material.tfg.chloroplasts": "åķįŧŋä―“", "material.tfg.nitrate_rich_water": "åŊŒįĄé…ļæ°ī", "material.tfg.nitrate_rich_semiheavy_ammoniacal_water": "åŊŒįĄé…ļ半重æ°Ļæ°ī", + "material.tfg.weak_red_steel": "脆įšĒé’Ē", + "material.tfg.weak_blue_steel": "脆蓝é’Ē", + "material.tfg.refractory_clay": "耐įŦéŧåœŸ", + "material.tfg.bakelite": "į”ĩæœĻ", + "material.tfg.phenolic_resin": "é…šé†›æ ‘č„‚", + "material.tfg.magnesium_hydroxide": "æ°Ē氧化镁", + "material.tfg.magnesia_refractory_brick": "æ ‘č„‚įŧ“合镁čīĻ耐įŦį –", "ore_vein.tfg.deep_sheldonite": "įĄŦ铂įŸŋ, 斑铜įŸŋ", "ore_vein.tfg.deep_garnet_amethyst": "įīŦæ°īæ™ķ, įŸģæĶīįŸģ", "ore_vein.tfg.deep_garnet_opal": "蛋į™―įŸģ, įŸģæĶīįŸģ", @@ -1481,6 +1494,7 @@ "ore_vein.tfg.deep_sapphire": "蓝åŪįŸģ, 铁铝æĶīįŸģ", "ore_vein.tfg.deep_scheelite": "į™―é’ĻįŸŋ, é’Ļé…ļ锂", "ore_vein.tfg.deep_topaz": "éŧ„įŽ‰, čū‰é“œįŸŋ", + "ore_vein.tfg.desert_oilsands": "æēđį ‚", "ore_vein.tfg.normal_apatite": "įĢ·į°įŸģ, įƒ§įŧŋįŸģ", "ore_vein.tfg.normal_basaltic_sands": "įŸŋį ‚", "ore_vein.tfg.normal_beryllium": "įŧŋåŪįŸģ, 铍įŸŋ", @@ -1641,6 +1655,9 @@ "tfg.tooltip.surfer_variant.brain": "霜原įē‰æŊ›įšŪ", "tfg.tooltip.attribution.surfer": "§9§oį‰ˆæƒå―’åąžïžšWan's Ancient Beasts", "entity.tfg.rnr_plow": "铹č·Ŋč―Ķ", + "entity.tfg.tier_1_double_rocket": "R型铝é’Ē双䚚įŦįŪ­", + "entity.tfg.tier_2_double_rocket": "ASM 4914 钛合金双䚚įŦįŪ­", + "entity.tfg.tier_3_double_rocket": "45-Ti é’Ļé’Ē双䚚įŦįŪ­", "effect.tfg.cooling": "§b降æļĐ", "effect.tfg.warming": "§6äŋæš–", "effect.tfg.instant_radiation": "įžŽé—īčūå°„", @@ -1782,7 +1799,9 @@ "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.hotornot_floating_equipment": "§7提äū›åŊđ所有§eæŊ”įĐšæ°”č―ŧ§7įš„æ°”ä―“įš„é˜ēæŠĪ。§r", + "tfg.tooltip.polycaprolactam": "äđŸį§°äļšå°žéū™", + "tfg.tooltip.vessel_warning": "§c加įƒ­čŋ‡æŧĄįš„小įžļ将销æŊæ‰€æœ‰æšĒ凚įš„é‡‘åąžïžŒåđķåŊčƒ―æŊæŽ‰ä― æ­ĢåœĻå†ķį‚žįš„合金§r", "tfg.tooltip.machine.one_energy_hatch": "及允čŪļ有äļ”äŧ…有§61äļŠÂ§fčƒ―æšäŧ“。", "tfg.tooltip.machine.two_energy_hatches": "允čŪļ有最åĪšÂ§62äļŠÂ§rčƒ―æšäŧ“。", "tfg.tooltip.machine.subtick": "čŋ™å°æœšå™Ļæ”Ŋ持§2子åˆŧ朚åˆķ§r", @@ -1831,6 +1850,8 @@ "tfg.tooltip.component.nuclear_turbine_2": "æŊäļŠéŦ˜äšŽ §5EV§r é˜ķæŪĩįš„č―Žå­æ”Ŋæžķ §7åŊ提升§r 10% 效įŽ‡ïžŒåđķä―ŋ EU/t 䚧凚įŋŧ倍。", "tfg.tooltip.component.smr_generator_1": "§e埚įĄ€äš§å‡šïžšÂ§r 4096 EU/t", "tfg.tooltip.component.smr_generator_2": "äļ“äļšåˆĐį”Ļčķ…äļīį•ŒäšŒæ°§åŒ–įĒģäļŽå°æĻĄå—化反嚔堆发į”ĩ而čŪūčŪĄã€‚\nä―ŋį”ĻæķĶæŧ‘剂äļŽåŠ é€Ÿå‰‚åŊ提升å…ķ效įŽ‡ïžŒåđķįŪĄį†ååš”å †įš„冷åī回č·Ŋ。", + "tfg.tooltip.show_recipes": "æ˜ūįĪšé…æ–đ", + "emi.category.tfg.artisan_table": "å·Ĩ匠台", "tfg.gui.refrigerator.unify_dates.enabled": "čŋ‡æœŸæ—Ĩ期įŧŸäļ€ïžšÂ§a垀", "tfg.gui.refrigerator.unify_dates.disabled": "čŋ‡æœŸæ—Ĩ期įŧŸäļ€ïžšÂ§aå…ģ", "tfg.machine.food_refrigerator_power_usage": "§7å·Ĩä―œæ—ķæķˆč€—§r %s EU/t §7äŧĨäŋæŒéĢŸį‰Đ新éēœã€‚§r", @@ -2227,10 +2248,10 @@ "quests.create_logistics.fabricate_rose_quartz.desc": "į”ąäšŽéŦ˜įš§į‰ĐæĩåŊđ䚎čŋ›įĻ‹æŽĻčŋ›åđķ非čķ…įš§åŋ…čĶïžŒä― äđŸåŊäŧĨč€ƒč™‘å°†čŽ·å–é€é•œįš„äŧŧåŠĄį•™åˆ°&bäļ­åŽ‹ïžˆMV&ré˜ķæŪĩé‚Ģæ—ķä― å°†čƒ―åĪŸåœĻåŪķåŪŒæˆã€‚&dįŽŦį‘°įŸģ英&råŊäŧĨäŧŽå…ķįē‰å°˜å―Ē垏į”ą8äŧ―įšĒįŸģ和1äŧ―äļ‹į•ŒįŸģč‹ąæ··åˆč€Œæˆïž‰é€ščŋ‡äļ€å°&béŦ˜įš§&3éŦ˜åŽ‹į­čŒå™Ļ&rįŧ“æ™ķ凚æĨį”Ļ&b冰æ°ī&räŧĢæ›ŋ通åļļįš„č’ļéĶïž‰æ°īæĨæĻĄæ‹Ÿč‡Šį„ķæĄäŧķ。įąŧ䞞地åœĻ&bäļ­åŽ‹&rį­‰įš§ïžŒ&dįŽŦį‘°įŸģ英透镜&r朎čšŦåŊäŧĨäŧŽ&dįŽŦį‘°įŸģ英æŋ&r切å‰ē而æĨïžŒå°―įŪĄåŪƒåŋ…éĄŧäŧŽåŪŒæ•īįš„įŽŦį‘°įŸģč‹ąå—äļ­čŽ·å–ïžˆä―œäļšåŪįŸģæŋåŪƒåŋ…éĄŧåœĻ&3切å‰ē朚&räļ­åŠ å·Ĩ。", "quests.create_logistics.rose_quartz_lens.title": "įŽŦį‘°č‰ēįœžé•œ", "quests.create_logistics.rose_quartz_lens.subtitle": "ä― åŠéœ€čĶäļ€äļŠïžˆYONO", - "quests.create_logistics.rose_quartz_lens.desc": "无čŪšä― äŧĨä―•į§æ–đåžčŽ·åū—äš†æ‰€éœ€ææ–™ïžŒä― éƒ―需čĶäļ€å°&3č―Ķ嚊&ræĨåŪžé™…åˆķ造透镜。äļ€å°&7埚įĄ€&3č―Ķ嚊&rčķģäŧĨį”Ļäļ€éĒ—&dįēūįūŽįŽŦį‘°įŸģ英&råŪįŸģåˆķä―œé€é•œïžŒä―†åĶ‚æžœä― æƒģäŧ…į”Ļäļ€å—æŋæĨåˆķä―œé€é•œïžŒä― å°†éœ€čĶæ›īåĨ―įš„čŪūåĪ‡ïžŒåģäļ€å°&béŦ˜įš§&3č―Ķ嚊&r。\n\näļ€æ—Ķåˆķä―œåŪŒæˆïžŒčŊĨ透镜åŊäŧĨį”Ļ䚎åœĻ&7埚įĄ€&3æŋ€å…‰åˆŧå―•æœš&räļ­åˆŧå―•&d双重įšĒ合金æŋ&ræĨåˆķ造我äŧŽéœ€čĶįš„&d发射å™Ļ&r单元åđķäļ”åœĻæ­Īčŋ‡įĻ‹äļ­äļäžščĒŦæķˆč€—。", + "quests.create_logistics.rose_quartz_lens.desc": "无čŪšä― äŧĨä―•į§æ–đåžčŽ·åū—äš†æ‰€éœ€ææ–™ïžŒä― éƒ―需čĶäļ€å°&3č―Ķ嚊&ræĨåŪžé™…åˆķ造透镜。äļ€å°&7埚įĄ€&3č―Ķ嚊&rčķģäŧĨį”Ļäļ€éĒ—&dįēūįūŽįŽŦį‘°įŸģ英&råŪįŸģåˆķä―œé€é•œïžŒä―†åĶ‚æžœä― æƒģäŧ…į”Ļäļ€å—æŋæĨåˆķä―œé€é•œïžŒä― å°†éœ€čĶæ›īåĨ―įš„čŪūåĪ‡ïžŒåģäļ€å°&béŦ˜įš§&3č―Ķ嚊&r。\n\näļ€æ—Ķåˆķä―œåŪŒæˆïžŒčŊĨ透镜åŊäŧĨį”Ļ䚎åœĻ&7埚įĄ€&3æŋ€å…‰åˆŧå―•æœš&räļ­åˆŧå―•&dåŒåą‚įšĒč‰ē合金æŋ&ræĨåˆķé€ ä― æ‰€éœ€čĶįš„&d发射å™Ļ&r单元åđķäļ”åœĻæ­Īčŋ‡įĻ‹äļ­äļäžščĒŦæķˆč€—。", "quests.create_logistics.stock_link.title": "äŧ“å‚Ļé“ūæŽĨįŦ™", "quests.create_logistics.stock_link.subtitle": "åŪķ里有存å‚Ļæ€ŧįšŋ乆", - "quests.create_logistics.stock_link.desc": "ä― åŊäŧĨåˆķ造įš„įŽŽäļ€äļŠ&2éŦ˜įš§į‰Đæĩ&r朚å™Ļæ˜Ŋ&3äŧ“å‚Ļé“ūæŽĨįŦ™&råŪƒåŊį”Ļ䚎创åŧš&dį‰Đæĩį―‘įŧœ&rã€‚å―“æ”ūį―Ū到&3打包朚&rįš„äŧŧ意äļ€éĒæ—ķäŧ“å‚Ļé“ūæŽĨįŦ™å°†&aä―ŋ打包朚所čŋžæŽĨįš„åš“å­˜åŊđį―‘įŧœåŊ见&rïžå°ąå…ķ朎čšŦ而čĻ€ïžŒäŧ“å‚Ļé“ūæŽĨįŦ™åđķäļæ˜Ŋčķ…įš§æœ‰į”ĻïžŒä―†åŪƒæ˜Ŋ所有å…ķäŧ–åģ将到æĨįš„朚å™Ļįš„æ ļåŋƒįŧ„äŧķâ€Ķâ€Ķ\n\nčŪ°åū—先手持äŧ“å‚Ļé“ūæŽĨįŦ™åģé”Ūį‚đå‡ŧå·ēæ”ūį―Ūįš„äŧ“å‚Ļé“ūæŽĨįŦ™ïžŒå°†äļĪ者įŧ‘åŪšäŧĨå…ąäšŦ同äļ€į―‘įŧœã€‚čĶå–æķˆæ­Īæ“ä―œïžŒä― åŊäŧĨįŪ€å•åœ°å•į‹ŽåˆæˆæĨäŧ“å‚Ļé“ūæŽĨįŦ™æļ…é™Īå…ķč°ƒč°ã€‚", + "quests.create_logistics.stock_link.desc": "ä― åŊäŧĨåˆķ造įš„įŽŽäļ€äļŠ&2éŦ˜įš§į‰Đæĩ&r朚å™Ļæ˜Ŋ&3äŧ“å‚Ļé“ūæŽĨįŦ™&råŪƒåŊį”Ļ䚎创åŧš&dį‰Đæĩį―‘įŧœ&rã€‚å―“æ”ūį―Ū到&3打包朚&rįš„äŧŧ意äļ€éĒæ—ķäŧ“å‚Ļé“ūæŽĨįŦ™å°†&aä―ŋ打包朚所čŋžæŽĨįš„åš“å­˜åŊđį―‘įŧœåŊ见&rïžå°ąå…ķ朎čšŦ而čĻ€ïžŒäŧ“å‚Ļé“ūæŽĨįŦ™åđķäļæ˜Ŋčķ…įš§æœ‰į”ĻïžŒä―†åŪƒæ˜Ŋ所有å…ķäŧ–åģ将到æĨįš„朚å™Ļįš„æ ļåŋƒįŧ„äŧķâ€Ķâ€Ķ\n\nčŪ°åū—先手持äŧ“å‚Ļé“ūæŽĨįŦ™åģé”Ūį‚đå‡ŧå·ēæ”ūį―Ūįš„äŧ“å‚Ļé“ūæŽĨįŦ™ïžŒå°†äļĪ者įŧ‘åŪšäŧĨå…ąäšŦ同äļ€į―‘įŧœã€‚čĶå–æķˆæ­Īæ“ä―œïžŒä― åŊäŧĨįŪ€å•åœ°å•į‹Žåˆæˆäŧ“å‚Ļé“ūæŽĨįŦ™æĨæļ…é™Īå…ķč°ƒč°ã€‚", "quests.create_logistics.stock_ticker.title": "äŧ“å‚Ļ发æŠĨ朚", "quests.create_logistics.stock_ticker.subtitle": "æœåŠĄå‘˜ïžæœåŠĄå‘˜ïžå†æĨį‚đįē‰čīĻåĢĪ土įž æ đæģĨ土", "quests.create_logistics.stock_ticker.desc.1": "åĶ‚æžœä― å·ēįŧä―ŋį”Ļ&3äŧ“å‚Ļé“ūæŽĨįŦ™&r向&dį‰Đæĩį―‘įŧœ&r提äū›äš†å„į§į‰Đ品äļ‹äļ€æ­Ĩå°ąæ˜Ŋåˆķä―œäļ€äļŠåŊäŧĨčŋœįĻ‹č°ƒį”Ļ所čŋ°į‰Đ品įš„äļœčĨŋâ€Ķâ€Ķčŋ™å°ąæ˜Ŋ&3äŧ“å‚Ļ发æŠĨ朚&rįš„į”Ļæ­Ķäđ‹åœ°ã€‚äļŽäŧ“å‚Ļ发æŠĨ朚非åļļį›ļäžžïžŒä― éĶ–先需čĶåģå‡ŧäļ€äļŠįŽ°æœ‰įš„é“ūæŽĨ将äŧ“å‚Ļ发æŠĨ朚įŧ‘åŪšåˆ°čŊĨį―‘įŧœã€‚į„ķåŽä― éœ€čĶåœĻäŧ“å‚Ļ发æŠĨ朚旁čūđæ”ūį―Ūäļ€äļŠ&3įƒˆį„°äššį‡ƒįƒ§åŪĪ&r或äŧŧä―•ååœĻ&3坐åžŦ&räļŠįš„į”Ÿį‰ĐčŪĐäŧ–äŧŽå……å―“&3äŧ“åš“įŪĄį†å‘˜&r。", @@ -2970,10 +2991,10 @@ "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ã€‚ä― åŊäŧĨä―ŋį”Ļäŧŧä―•æœ€é€‚åˆä― įš„æ–đåžïžŒä―†äļšäš†įŧ„įŧ‡æœ‰åšïžŒčŋ™äš›äŧŧåŠĄå°†ä―ŋį”Ļ朚å™ĻåĪ–åĢģä―œäļšæ ‡åŋ—。\n\näļįŸĨ道äŧŽä―•åž€å§‹ïžŸæˆ‘äŧŽåŧščŪŪåŊŧæ‰ūé‚Ģäš›čƒ―čŪĐå…ķäŧ–所有äļœčĨŋéƒ―å˜åū—æ›īäūŋåŪœïžˆäš‹åŠåŠŸå€ïž‰įš„朚å™ĻäŧŽä― æœ€čŪĻ厌įš„䚋情垀始。", - "quests.low_voltage.lv_machine_casing.title": "į”Ļ䚎朚æĒ°åŠĻ力įš„LV朚æĒ°æ–đ块", + "quests.low_voltage.lv_machine_hull.desc.2": "åŊđ䚎某䚛įŽĐåŪķæĨčŊīčūū到äļ€äļŠæ–°įš„į­‰įš§æ˜ŊäŧĨåˆķä―œįŽŽäļ€äļŠ&6į”ĩč·Ŋ&räļšæ ‡åŋ—åŊđ䚎å…ķäŧ–䚚则æ˜Ŋ&6朚å™ĻåĪ–åĢģ&r或&6čƒ―æščˆą&rã€‚ä― åŊäŧĨä―ŋį”Ļäŧŧä―•æœ€é€‚åˆä― įš„æ–đåžïžŒä―†äļšäš†įŧ„įŧ‡æœ‰åšïžŒčŋ™äš›äŧŧåŠĄå°†ä―ŋį”Ļ朚å™ĻåĪ–åĢģä―œäļšæ ‡åŋ—。\n\nåŋŦ速提醒é™Ī非朚å™Ļ有į‰đåˆŦčŊī明åĶåˆ™å―“æœšå™Ļ&cäŧŧä―•į›ļé‚ŧįš„æ–đ块æšīéœēåœĻé›Ļ或æ°īäļ­æ—ķ&r朚å™Ļ䞚发į”Ÿįˆ†į‚ļ。", + "quests.low_voltage.lv_machine_casing.title": "ä― įš„äļ‹äļ€äŧĢ朚å™Ļ", "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å·ēäŧ‹įŧčŋ‡čŋ™äš›å†…åŪđ及需čŪ°ä―ïžšå―“å­˜åœĻæ žé›·į§‘技朚å™Ļįš„æ›ŋäŧĢæ–đæĄˆæ—ķïžŒä― éƒ―čƒ―åœĻäŧŧåŠĄäļ­č‡ŠčĄŒé€‰æ‹Đ。", + "quests.low_voltage.lv_machine_casing.desc": "æ—Ēį„ķå·ē通äļŠį”ĩįŽ°åœĻå°ąčŊĨåĨ―åĨ―åˆĐį”ĻåŪƒäš†ïžæˆ‘äŧŽåŧščŪŪä― å…ˆåˆķ造äļ€äš›æœšå™ĻåŪƒäŧŽčƒ―čŪĐ后įŧ­åˆķ造æ›īåĪšæœšå™Ļ变åū—æ›īč―ŧæū、æ›īåŧ‰äŧ·ã€‚\n\näļšé™ä―Žå…Ĩé—ĻLVé˜ķæŪĩįš„éšūåšĶ&5TFG&r允čŪļä― ä―ŋį”Ļ&6朚æĒ°åŠĻ力&rįš„朚å™Ļæ›ŋäŧĢéƒĻ分&6æ žé›·į§‘技&r朚å™Ļ。\n\n我äŧŽåœĻ&6äļŠäļ€įŦ čŠ‚&rå·ēäŧ‹įŧčŋ‡čŋ™äš›å†…åŪđ及需čŪ°ä―ïžšå―“å­˜åœĻæ žé›·į§‘技朚å™Ļįš„æ›ŋäŧĢæ–đæĄˆæ—ķïžŒä― éƒ―čƒ―åœĻäŧŧåŠĄäļ­č‡ŠčĄŒé€‰æ‹Đ。", "quests.low_voltage.lv_motor.title": "侗åĪšéĐŽčūūäļ­įš„įŽŽäļ€äļŠ", "quests.low_voltage.lv_motor.subtitle": "ä―ŽåŽ‹åœĻ収å”Īâ€Ķâ€Ķ", "quests.low_voltage.lv_motor.desc": "čŪ°ä―ïžŒåĶ‚果配æ–đčŪĐä― äļįŸĨ所掊&2EMIæ˜Ŋä― įš„朋友&rã€‚ä― åŊäŧĨį‚đå‡ŧäŧŧä―•é…æ–đåģäļ‹č§’åļĶ有四äļŠå †å æ–đ块įš„按é’ŪEMI侚æ˜ūįĪšæ‰€æœ‰åˆæˆæˆåˆ†įš„æ ‘įŠķå›ūïžŒä― į”šč‡ģåŊäŧĨčŪĐåŪƒå°†â€œčī­į‰Đæļ…单”æ·ŧåŠ åˆ°ä― įš„æ”ķ藏äļ­ïž\n\nčĻ€å―’æ­Ģ䞠通čŋ‡åˆķä―œ6äļŠ&aLVį”ĩåŠĻéĐŽčūū&ræĨäļš&7LV&ré˜ķæŪĩ做åĨ―准åĪ‡ïžčŋ™åŊčƒ―įœ‹čĩ·æĨåūˆåĪšïžŒä―†čŋ™æ˜Ŋčŋ›å…Ĩ&7LV&ré˜ķæŪĩåĨ―äļœčĨŋįš„&6æœ€ä―ŽčĶæą‚&r。", @@ -2983,25 +3004,24 @@ "quests.low_voltage.lv_age_progression.task": "我â€Ķâ€ĶįŽ°åœĻåŊčƒ―æœ‰į‚đæ–đ向感䚆", "quests.low_voltage.lost.title": "čŋ·č·Ŋ䚆", "quests.low_voltage.lost.subtitle": "čŋ™äļ€åˆ‡čŪĐäššåš”æŽĨäļæš‡", - "quests.low_voltage.lost.desc.1": "čŋ›å…Ĩ&7LV&ré˜ķæŪĩ侚č§Ģ锁åĪ§é‡é€‰éĄđåūˆåŪđ易čŪĐäššäļįŸĨ所掊。äŧĨäļ‹æ˜Ŋ我äŧŽæŽĻ荐įš„å‘åą•č·Ŋįšŋïžš\n\n1åŧšįŦ‹äļ€äļŠįĻģåŪšįš„į”ĩ力æĨ暐。æŸĨįœ‹åģäļ‹č§’įš„äŧŧåŠĄïžŒæœ‰åĨ―几į§æ–đæĄˆåŊé€‰ïžŒéƒ―åŊčĄŒã€‚åˆŦ吝啎åĪšåŧšå‡ å°å‘į”ĩ朚\n\nåŠĄåŋ…&eäŧ”įŧ†é˜…čŊŧæ žé›·į§‘æŠ€čƒ―暐äŧŧåŠĄįŦ čŠ‚&räŧĨäūŋ充分į†č§ĢEUïžˆčƒ―é‡å•ä―ïž‰ã€į”ĩ压、į”ĩæĩå’Œįšŋ损æ˜ŊåĶ‚ä―•čŋä―œįš„。", - "quests.low_voltage.lost.desc.2": "2äļ“æģĻ䚎åŧšé€ é‚Ģäš›čƒ―čŪĐ后įŧ­æœšå™Ļ造äŧ·æ›īäūŋåŪœįš„朚å™Ļ。\n\näļĪ极įĢåŒ–朚æ˜Ŋäļ€å°čķ…įš§äūŋåŪœįš„朚å™Ļ几äđŽåŊäŧĨ免čīđįĢåŒ–é‡‘åąžæĢ’。åĶ‚æžœä― čŋ˜æēĄé€ č’ļæą―æ—ķäŧĢåŊđåš”įš„朚å™Ļé‚Ģå°ąæ­åŧščĩ·å·æŋ朚、įšŋæč―§æœšã€č―Ķ嚊和切å‰ē朚。čŋ™äš›äŧŧåŠĄéƒ―åœĻå·ĶäļŠč§’。\n\näđ‹åŽïžŒé‡į‚đåˆĐį”Ļ化å­Ķ反嚔釜和æĩä―“囚化朚å·Ķäū§ïž‰æĨé™ä―ŽæĐĄčƒķ成朎åđķį”Ļįŧ„čĢ…朚äļ‹æ–đæĨé™ä―Žį”ĩ子元äŧķ成朎。\n\nå―“æ‰€æœ‰äļœčĨŋįš„æˆæœŽéƒ―é™åˆ°æœ€ä―ŽåŽïžŒįĄŪäŋæ‰đ量合成įŧ„äŧķäŧĨ节įœåĪ§é‡æ—ķé—ī。", - "quests.low_voltage.lost.desc.3": "3åŧšé€ äļ€å°čĢ…į―æœšåđķåˆķä―œäļ€äš›į”ĩæą ïžˆåģäļŠč§’。į”ĩæą įŪąå°†åŊđä― įš„å·Ĩ厂æ‰Đåž åĪ§æœ‰čĢĻį›ŠïžŒč€ŒæŽĒįŸŋäŧŠįŧåŊđæ˜Ŋæ”đ变æļļæˆä―“éŠŒįš„įĨžå™Ļ。\n\n4&7LV&ré˜ķæŪĩ有äļĪäļŠäļŧčĶįŧˆæžį›Ū标&aį”ĩč·Ŋįŧ„čĢ…朚&r和&aį”ĩ力éŦ˜į‚‰&r。įŽ°åœĻä― åš”čŊĨ准åĪ‡åĨ―挑战åŪƒäŧŽäš†ã€‚", + "quests.low_voltage.lost.desc.1": "čŋ›å…Ĩ&7LV&ré˜ķæŪĩ侚č§Ģ锁åĪ§é‡é€‰éĄđåūˆåŪđ易čŪĐäššäļįŸĨ所掊。äŧĨäļ‹æ˜Ŋ我äŧŽæŽĻ荐įš„å‘åą•č·Ŋįšŋïžš\n\n1åŧšįŦ‹äļ€äļŠįĻģåŪšįš„į”ĩ力æĨ暐。æŸĨįœ‹äļ‹æ–đįš„äŧŧåŠĄïžŒæœ‰åĨ―几į§æ–đæĄˆåŊé€‰ïžŒéƒ―åŊčĄŒã€‚åˆŦ吝啎åĪšåŧšå‡ å°å‘į”ĩ朚\n\nåŠĄåŋ…&eäŧ”įŧ†é˜…čŊŧæ žé›·į§‘æŠ€čƒ―暐äŧŧåŠĄįŦ čŠ‚&räŧĨäūŋ充分į†č§ĢEUïžˆčƒ―é‡å•ä―ïž‰ã€į”ĩ压、į”ĩæĩå’Œįšŋ损æ˜ŊåĶ‚ä―•čŋä―œįš„。", + "quests.low_voltage.lost.desc.2": "2äļ“æģĻ䚎åŧšé€ é‚Ģäš›čƒ―čŪĐ后įŧ­æœšå™Ļ造äŧ·æ›īäūŋåŪœįš„朚å™Ļ。\n\näļĪ极įĢåŒ–朚æ˜Ŋäļ€å°čķ…įš§äūŋåŪœįš„朚å™Ļ几äđŽåŊäŧĨ免čīđįĢåŒ–é‡‘åąžæĢ’。åĶ‚æžœä― čŋ˜æēĄé€ č’ļæą―æ—ķäŧĢåŊđåš”įš„朚å™Ļé‚Ģå°ąæ­åŧščĩ·å·æŋ朚、įšŋæč―§æœšã€č―Ķ嚊和切å‰ē朚。\n\näđ‹åŽïžŒé‡į‚đåˆĐį”Ļ化å­Ķ反嚔釜和æĩä―“囚化朚å·Ķäū§ïž‰æĨé™ä―ŽæĐĄčƒķ成朎åđķį”Ļįŧ„čĢ…朚äļ‹æ–đæĨé™ä―Žį”ĩ子元äŧķ成朎。\n\nå―“æ‰€æœ‰äļœčĨŋįš„æˆæœŽéƒ―é™åˆ°æœ€ä―ŽåŽïžŒįĄŪäŋæ‰đ量合成įŧ„äŧķäŧĨ节įœåĪ§é‡æ—ķé—ī。", + "quests.low_voltage.lost.desc.3": "3åŧšé€ äļ€å°čĢ…į―æœšåđķåˆķä―œäļ€äš›į”ĩæą ã€‚į”ĩæą įŪąå°†åŊđä― įš„å·Ĩ厂æ‰Đåž åĪ§æœ‰čĢĻį›ŠïžŒč€ŒæŽĒįŸŋäŧŠįŧåŊđæ˜Ŋæ”đ变æļļæˆä―“éŠŒįš„įĨžå™Ļ。\n\n4&7LV&ré˜ķæŪĩ有äļĪäļŠäļŧčĶįŧˆæžį›Ū标&aį”ĩč·Ŋįŧ„čĢ…朚&r和&aį”ĩ力éŦ˜į‚‰&r。įŽ°åœĻä― åš”čŊĨ准åĪ‡åĨ―挑战åŪƒäŧŽäš†ã€‚", "quests.low_voltage.lost.task": "åĪŠæĢ’䚆我逐æļį†č§Ģäļ€åˆ‡ïž", "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朚åˆķâ€Ķâ€Ķäļčŋ‡å…·ä―“原į†å°†į•™åū…后įŧ­čŊī明įŽ°åœĻä― åŠéœ€äļ“æģĻäšŦ受æļļ戏。åˆŦ担åŋƒïž", + "quests.low_voltage.lv_steam_turbine.desc": "&3č’ļæą―č―Ū朚&ræ˜ŊåĪ§åĪšæ•°įŽĐåŪķįš„įŽŽäļ€å°&7LV&r发į”ĩ朚因äļšä― å·ēįŧåŧšé€ å‡šč’ļæą―é”…į‚‰åŪžįŽ°äš†č’ļæą―įš„量䚧。\n\nå―“čū“å…Ĩč’ļæą―æ—ķč’ļæą―č―Ū朚将äŧĨ&d2mB=1EU&rįš„æŊ”äū‹čū“凚į”ĩ力。\n\nč’ļæą―įš„äļ€äļŠįžšį‚đåœĻ䚎čŋčū“į”ąäšŽå…ķčƒ―é‡åŊ†åšĶčūƒä―ŽïžŒä― éœ€čĶä―ŋį”ĻåĪ§åž‹æˆ–å·Ļ型įŪĄé“æĨčŋ›čĄŒčū“送。\n\näļ€æ—Ķ单æ–đ块锅į‚‰įš„äš§čƒ―无æģ•æŧĄčķģä― įš„éœ€æą‚ïžŒä― äđŸåŊäŧĨč€ƒč™‘å‡įš§åˆ°åĪ§åž‹é’铜锅į‚‰ã€‚", "quests.low_voltage.lbb.title": "åĪ§åž‹é’铜锅į‚‰", "quests.low_voltage.lbb.subtitle": "č―°ïžč―°ïžč―°ïžč―°ïž", - "quests.low_voltage.lbb.desc.1": "&3åĪ§åž‹é”…į‚‰&ræ˜Ŋ小型锅į‚‰įš„&6åŊ选įš„&råĪ§å·į‰ˆæœŽïžŒåŊä―ŋį”Ļå›šä―“æˆ–æķēä―“į‡ƒæ–™éĐąåŠĻ。\n\nč‹Ĩæƒģ采į”Ļč’ļæą―å‘į”ĩæ–đæĄˆïžŒčŋ™æ˜Ŋæ›ŋäŧĢ朚æĒ°åŠĻ力č’ļæą―åž•æ“Žįš„选éĄđ。后įŧ­čƒ―暐æ–đæĄˆå°†åœĻ&bMV&rįŦ čŠ‚列凚。\n\nčŊ·įĄŪäŋå…ķäū›æ°īæ°ļäļäļ­æ–­â€”â€”å°ąåƒæ“ä―œå°åž‹é”…į‚‰æ—ķé‚Ģ样åĶ则åŪƒäžš&cįˆ†į‚ļ&r", + "quests.low_voltage.lbb.desc.1": "&3åĪ§åž‹é”…į‚‰&ræ˜Ŋ小型锅į‚‰įš„&6åŊ选įš„&råĪ§å·į‰ˆæœŽïžŒåŊä―ŋį”Ļå›šä―“æˆ–æķēä―“į‡ƒæ–™éĐąåŠĻ。\n\nč‹Ĩæƒģ采į”Ļč’ļæą―å‘į”ĩæ–đæĄˆïžŒčŋ™æ˜Ŋæ›ŋäŧĢ朚æĒ°åŠĻ力č’ļæą―åž•æ“Žįš„选éĄđ。\n\nčŊ·įĄŪäŋå…ķäū›æ°īæ°ļäļäļ­æ–­â€”â€”å°ąåƒæ“ä―œå°åž‹é”…į‚‰æ—ķé‚Ģ样åĶ则åŪƒäžš&cįˆ†į‚ļ&r", "quests.low_voltage.lbb.desc.2": "äļ€æ—ĶåŪŒå…ĻéĒ„įƒ­ïžŒ&3åĪ§åž‹é’铜锅į‚‰&råŊ䚧凚800mB/tįš„č’ļæą―ïžŒįŧč―ŽæĒåŊåū—&d400EU/t&rčƒ―é‡ïžŒį›ļå―“äšŽ12.5台埚įĄ€č’ļæą―č―Ū朚įš„äš§čƒ―。åĶ‚æ­Īį›ļåŊđå·ĻåĪ§įš„čƒ―量čū“凚需čĶæķˆč€—&låĪ§é‡&råŊį‡ƒį‡ƒæ–™ã€‚&5č€ƒč™‘åˆ°čŋ™į‚đ&rå…ķGUI允čŪļä― å°†é”…į‚‰&9调节&rč‡ģ25%%功įŽ‡ïžŒåģ200mB/tåŊđåš”&d100EU/t&rįš„į”ĩ力į•ĨéŦ˜äšŽ3台埚įĄ€č’ļæą―č―Ū朚įš„čū“凚。\n\n我äŧŽåŧščŪŪį­‰åˆ°ä― å‡†åĪ‡čŋčĄŒäļšį”ĩ力éŦ˜į‚‰äū›į”ĩæ—ķ再åŧšé€ æ­ĪčŪūåĪ‡ïžŒé™Īéžä― æœ‰åūˆåĪšįš„č’ļæą―åĪšæ–đ块朚å™Ļ。", - "quests.low_voltage.lbb.desc.3": "åœĻTerraFirmaGregæ•ī合包äļ­ïžŒä― æœ‰åĪšį§į‡ƒæ–™é€‰æ‹Đæ–đæĄˆã€‚ä― åŊäŧĨä―ŋį”Ļč―ŊįŪĄæŧ‘č―ŪäŧŽæ·ąåą‚地äļ‹æđ–æŠ―取åēĐæĩ†ïžŒæˆ–åŧšįŦ‹æ ‘圚配合į„Ķį‚‰į”Ÿäš§æœĻį‚­äļŽæ‚é…šæēđ。æ­ĪåĪ–地čĄĻ存åœĻåĪ§åž‹į…Īį‚­įŸŋč„‰ïžŒåŊ通čŋ‡č‡ŠåŠĻ化采įŸŋčŪūåĪ‡åž€é‡‡ïžŒåđķč―ŽåŒ–äļšį„Ķį‚­äŧĨ及čŋœčķ…æœĻį‚­äš§å‡šįš„杂酚æēđ。\n\nč‹Ĩ选æ‹Đ树圚æ–đæĄˆïžŒéœ€é…åĪ‡äļ‰åš§į„Ķį‚‰æ‰čƒ―įŧī持åĪ§åž‹é’铜锅į‚‰å…Ļ功įŽ‡čŋčĄŒã€‚", + "quests.low_voltage.lbb.desc.3": "åœĻTerraFirmaGregæ•ī合包äļ­ïžŒä― æœ‰åĪšį§į‡ƒæ–™é€‰æ‹Đæ–đæĄˆã€‚ä― åŊäŧĨä―ŋį”Ļč―ŊįŪĄæŧ‘č―ŪäŧŽæ·ąåą‚地äļ‹æđ–æŠ―取åēĐæĩ†ïžˆäļïžŒæ— é™åēĐæĩ†æ˜Ŋäļäžšå­˜åœĻįš„或åŧšįŦ‹æ ‘圚配合į„Ķį‚‰į”Ÿäš§æœĻį‚­äļŽæ‚é…šæēđ。æ­ĪåĪ–地čĄĻ存åœĻåĪ§åž‹į…Īį‚­įŸŋč„‰ïžŒåŊ通čŋ‡č‡ŠåŠĻ化采įŸŋčŪūåĪ‡åž€é‡‡ïžŒåđķč―ŽåŒ–äļšį„Ķį‚­äŧĨ及čŋœčķ…æœĻį‚­äš§å‡šįš„杂酚æēđ。\n\nč‹Ĩ选æ‹Đ树圚æ–đæĄˆïžŒéœ€é…åĪ‡äļ‰åš§į„Ķį‚‰æ‰čƒ―įŧī持åĪ§åž‹é’铜锅į‚‰å…Ļ功įŽ‡čŋčĄŒã€‚", "quests.low_voltage.lv_polariser.title": "埚įĄ€äļĪ极įĢåŒ–朚", "quests.low_voltage.lv_polariser.subtitle": "äļĪ极įĢåŒ–朚į”Ļ䚎įĢåŒ–", "quests.low_voltage.lv_polariser.desc": "åœĻ&7LV&ré˜ķæŪĩčŋ™åŊäŧĨčŊīæ˜Ŋ最įŧæĩŽįš„朚å™Ļäđ‹äļ€ïžŒčƒ―į”Ļ䚎åˆķ造&6无需įšĒįŸģįš„įĢåŒ–é‡‘åąžæ†&ræĨį”Ÿäš§į”ĩæœšã€‚å―“ä― åž€å§‹æ‰đ量åˆķ造į”ĩ朚æ—ķčŋ™å°æœšå™Ļčƒ―äļšä― čŠ‚įœåĪ§é‡įšĒįŸģ。", "quests.low_voltage.link_chapter.title": "įŧ™æˆ‘č§Ģ释äļ€äļ‹čƒ―量", "quests.low_voltage.link_chapter.subtitle": "有äļ€æ•īįŦ å…ģäšŽčƒ―é‡įš„内åŪđ", - "quests.low_voltage.link_chapter.desc": "į‚đå‡ŧæ­ĪåĪ„æŸĨįœ‹įŦ čŠ‚", + "quests.low_voltage.link_chapter.desc": "čŋ™įœ‹čĩ·æĨåŊčƒ―éœ€čĶé˜…čŊŧåūˆåĪšå†…åŪđïžŒä―†åĶ‚æžœä― æƒģéŋ免意åĪ–åđķ充分åˆĐį”Ļä― įš„发į”ĩčŪūåĪ‡ïžŒį†č§Ģčŋ™äš›å†…åŪđæ˜Ŋåūˆé‡čĶįš„。\n\næ žé›·į§‘技įš„čƒ―量įģŧįŧŸïžˆEUïžŒčƒ―é‡å•ä―ïž‰äļŽå‡ äđŽæ‰€æœ‰å…ķäŧ–æĻĄįŧ„ä―ŋį”Ļįš„ FEForgečƒ―é‡ïž‰įģŧįŧŸįš„å·Ĩä―œæ–đ垏äļåŒã€‚\n\nåœĻ&7LV&ré˜ķæŪĩ有四į§å‘į”ĩæ–đåžïžŒč€Œäļ”éƒ―æ˜ŊåŊ行įš„选æ‹Đ。åĶ‚æžœä― æ˜Ŋæ žé›·į§‘技įš„新手č’ļæą―å‘į”ĩæ˜Ŋ最įŪ€å•įš„ïžŒä―†éšį€ä― čŋ›å…Ĩæ›īéŦ˜įš„į­‰įš§ïžŒåŪƒįš„效įŽ‡äžščŋ…速äļ‹é™ã€‚æ°”ä―“į‡ƒæ–™įš„į”Ÿäš§æ›īäļšåĪæ‚ïžŒä―†åŊđåš”įš„发į”ĩæœšæˆæœŽæœ€ä―Žã€‚å†…į‡ƒæœšåˆ™äŧ‹äšŽäļĪ者äđ‹é—ī。\n\nčŋ™é‡Œæ˜Ŋæ žé›·į§‘æŠ€čƒ―暐įŦ čŠ‚įš„é“ūæŽĨ", "quests.low_voltage.link_chapter.task": "我čŊŧčŋ‡äš†", "quests.low_voltage.lv_combuston_gen.title": "内į‡ƒå‘į”ĩ朚", "quests.low_voltage.lv_combuston_gen.subtitle": "åŪƒäžšč―°éš†ä―œå“åđķ䚧į”Ÿčƒ―量", @@ -3017,7 +3037,7 @@ "quests.low_voltage.lv_seeds.desc": "č‹Ĩ遇到čŋ™įąŧä―œį‰ĐåŧščŪŪ采集åđķåŧšįŦ‹å†œåœšį§æĪã€‚\n\nåŪƒäŧŽå°†æˆäļš&aį§å­æēđ&rįš„最ä―ģæĨ暐čŊĨæķēä―“åŊį”Ļ䚎į”Ÿäš§&eį”Ÿį‰ĐæŸīæēđ&r。æēđ菜įą―耐åŊ’性čūƒåžšïžŒč€Œå‘æ—Ĩč‘ĩæ›ī适åŪœæļĐ暖įŽŊåĒƒã€‚č‹Ĩäļæ„ŋ花čīđčŋ‡åĪšæ—ķé—īč€•ä―œïžŒäđŸåŊåœĻį”ĩ力æļĐåŪĪäļ­åŸđč‚ēäŧ…需æķˆč€—少量į”ĩ力åģåŊåŪžįŽ°č‡ŠåŠĻ化į§æĪã€‚", "quests.low_voltage.lv_seeds.task": "æēđčœæˆ–å‘æ—Ĩč‘ĩ", "quests.low_voltage.lv_gas_turbine.title": "į‡ƒæ°”č―Ū朚", - "quests.low_voltage.lv_gas_turbine.subtitle": "åŪƒéœ€čĶæ›īåĪšį”ĩč·ŊïžŒä―†æ›ī少材料", + "quests.low_voltage.lv_gas_turbine.subtitle": "éĒ向įŸģ化įˆąåĨ―者", "quests.low_voltage.lv_gas_turbine.desc": "借åŠĐ&7合成气&rïžŒä― įŽ°åœĻæ‹Ĩ有䚆åœĻ&7LV&ré˜ķæŪĩä―ŋį”Ļ&cį‡ƒæ°”č―Ū朚&rįš„åŊ行æ–đæĄˆã€‚åŪƒäŧŽäļŽå…ķäŧ–&6发į”ĩ朚&rå·Ĩä―œåŽŸį†åŪŒå…Ļį›ļåŒïžŒä―†åš”æŊ”&6内į‡ƒæœš&rį•ĨåūŪ节įœææ–™ã€‚", "quests.low_voltage.lv_gas_syngas.title": "合成气", "quests.low_voltage.lv_gas_syngas.subtitle": "åđķ非æœĻį…Ī气", @@ -3029,15 +3049,6 @@ "quests.low_voltage.lv_turbo_charge.subtitle": "åŊæ›īåŋŦäļšį”ĩåŠĻå·Ĩ具充į”ĩ", "quests.low_voltage.lv_turbo_charge.desc": "&o朎äŧŧåŠĄäļŧéĒ˜äļšåŊ选内åŪđïžŒä―†åŊčƒ―äŧäžšåž•å‘ä― įš„å…īčķĢ。我äŧŽå‡šäšŽå†…åŪđåŪŒæ•ī性įš„č€ƒč™‘å°†å…ķæ”ūį―Ū䚎æ­Ī。&r\n\n&3é—Ščšå……į”ĩįŪą&råŊäļš&6RFäļŽEU&rčŪūåĪ‡ïžˆäū‹åĶ‚&9é’ŧåĪī&r提äū›æžé€Ÿå……į”ĩ。\n\nčŊĨčŪūåĪ‡åŊđæŊäŧķ充į”ĩį‰Đ品最éŦ˜æ”Ŋ持4åŪ‰åŸđį”ĩæĩïžŒä―ŋå…ķ充į”ĩ速åšĶčūū到&3į”ĩæą įŪą&rįš„&6äļĪ倍&rïžŒä―†äļå…·åĪ‡æ”ūį”ĩåŠŸčƒ―ã€‚\n\n&eäŧŧä―•&rįąŧ型įš„å……į”ĩįŪąå‡åŊåŪŒæˆæœŽäŧŧåŠĄã€‚", "quests.low_voltage.lv_turbo_charge.task": "äŧŧä―•é—Ščšå……į”ĩįŪąéƒ―行", - "quests.low_voltage.lv_fisher.title": "æ•éąžæœš", - "quests.low_voltage.lv_fisher.subtitle": "åŪŒå…Ļå…žåŪđįūĪåģĶäž čŊī", - "quests.low_voltage.lv_fisher.desc": "&o朎äŧŧåŠĄäļŧéĒ˜äļšåŊ选内åŪđïžŒä―†åŊčƒ―äŧäžšåž•å‘ä― įš„å…īčķĢ。我äŧŽå‡šäšŽå†…åŪđåŪŒæ•ī性įš„č€ƒč™‘å°†å…ķæ”ūį―Ū䚎æ­Ī。&r\n\n&3æ•éąžæœš&råŊäŧŽæ°īäļ­æ•æžéąžįąŧ需åœĻå…ķæ­Ģäļ‹æ–đ配åĪ‡5x5æ°īåŸŸčŒƒå›īæ–đåŊčŋä―œã€‚å…ķä―ŋį”ĻäļŽæ™Ū通钓鱾į›ļ同įš„战åˆĐ品čĄĻæŊæŽĄæ“ä―œæķˆč€—1æ đįšŋäŧĨ及äļŽå…ķį­‰įš§åŊđåš”įš„į”ĩ力&7LV&ré˜ķæŪĩäļš32EUį­‰į­‰ïž‰ã€‚埚朎朚åˆķäūŋæ˜ŊåĶ‚æ­Ī。\n\näŧŽéąžįąŧäļ­åŊ提取&eéąžæēđ&rčŊĨ材料åŊį”Ļ䚎åˆķä―œ&6į”Ÿį‰ĐæŸīæēđ&r。", - "quests.low_voltage.lv_fisher.task": "äŧŧä―•æ•éąžæœšéƒ―čĄŒ", - "quests.low_voltage.lv_rock_crusher.title": "įĒŽåēĐ朚", - "quests.low_voltage.lv_rock_crusher.subtitle": "圆įŸģæ˜ŊįˆąïžŒåœ†įŸģæ˜Ŋį”Ÿå‘―", - "quests.low_voltage.lv_rock_crusher.desc.1": "&o朎äŧŧåŠĄäļŧéĒ˜äļšåŊ选内åŪđïžŒä―†åŊčƒ―äŧäžšåž•å‘ä― įš„å…īčķĢ。我äŧŽå‡šäšŽå†…åŪđåŪŒæ•ī性įš„č€ƒč™‘å°†å…ķæ”ūį―Ū䚎æ­Ī。&r\n\n&3įĒŽåēĐ朚&råŪžčīĻäļŠæ˜ŊäļŠįŪąåžåˆ·įŸģ朚。及需提äū›äŧŧ意åĪĐį„ķåēĐįŸģ或圆įŸģæ–đ块åŪƒå°ąčƒ―持įŧ­åĪåˆķčŊĨæ–đ块。č‹ĨæƒģåŋŦé€ŸčŽ·å–åĪ§é‡į –块材料čŋ™å°†æ˜Ŋ非åļļäūŋ捷įš„选æ‹Đ\n\n&eäŧŧä―•&rį­‰įš§įš„įĒŽåēĐ朚均åŊåŪŒæˆæœŽäŧŧåŠĄã€‚", - "quests.low_voltage.lv_rock_crusher.desc.2": "&l&3背æ™ŊįŸĨčŊ†ïžš&r&oéŧ‘曜įŸģ需čĶįšĒįŸģæ‰čƒ―į”Ÿæˆįš„čŪūåŪšïžŒæšč‡Šäļ€äļŠMinecraftįš„čŋœåĪ枏æīž&7MC-4239&fã€‚å―“åđīåœĻ圆įŸģį”Ÿæˆå™Ļįš„åēĐæĩ†æ°īæĩæŽĨč§ĶåĪ„æ”ūį―ŪįšĒįŸģäūŋ侚į”Ÿæˆéŧ‘曜įŸģ。čŊĨ枏æīžå·ēåœĻMinecraft 1.8įš„14w25båŋŦį…§äļ­äŋŪåĪïžŒæˆŠč‡ģ撰写朎文æ—ķå·ēæ˜Ŋ&oč·äŧŠ9åđī前&rįš„åū€äš‹äš†ïž", - "quests.low_voltage.lv_rock_crusher.task": "äŧŧä―•įĒŽåēĐæœšéƒ―čĄŒ", "quests.low_voltage.lv_aqueous_accumulator.title": "蓄æ°īå™Ļ", "quests.low_voltage.lv_aqueous_accumulator.subtitle": "įƒ­åŠ›åŸšæœŽïžˆThermal FoundationæĻĄįŧ„åœĻ収å”Ī", "quests.low_voltage.lv_aqueous_accumulator.desc": "&3蓄æ°īå™Ļ&r朎čīĻäļŠį›ļå―“äšŽæĩä―“į‰ˆįš„įĒŽåēĐ朚。及需将朚å™Ļæ”ūį―ŪåœĻäļĪäļŠåŊđåš”æĩä―“įš„暐æ–đ块旁配į―ŪåĨ―į”ĩč·ŊåģåŊ持įŧ­į”ŸæˆčŊĨæĩä―“å…ķåŠŸčƒ―åŪžčīĻäļŠäļŽåŠĻ力æģĩį›ļåŒïžŒä―†ä―ŋį”Ļį”ĩ力éĐąåŠĻč€ŒéžæœšæĒ°åŠĻ力因æ­Īčƒ―æ›īäūŋæ·åœ°čžå…Ĩä― įš„å·ĨåŽ‚ä―“įģŧ。éĒåĪ–䞘åŠŋåœĻ䚎HVį­‰įš§įš„čŊĨčŪūåĪ‡čŋ˜čƒ―无限į”ŸæˆåēĐæĩ†ïž\n\nä― åŊäŧĨ将暐æ–đ块į―Ū䚎åŦæ°īįŠķ态äŧĨé˜ēæ­Ē冎å­Ģå†ŧįŧ“朚å™ĻäŧåŊæ­Ģåļļčŋä―œã€‚", @@ -3058,13 +3069,13 @@ "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æĩä―“。\n\nčŋ˜æēĄčĒŦčŊī服吗äļŽæĄķ和åĪ§æœĻæĄķäļåŒïžŒå•å…ƒčƒ―&aåŪ‰å…Ļ地åŪđįšģ&rå…ķäļ­įš„内åŪđé˜ēæ­Ēä― čĒŦįƒŦäžĪ、å†ŧäžĪ或éĢ˜čĩ·æĨ。", + "quests.low_voltage.universal_cell.desc.1": "单元æ˜Ŋæĩä―“å­˜å‚Ļįš„åĶäļ€į§å―Ē垏。所有å‚Ļ存同įąŧį­‰é‡æĩä―“įš„单元均åŊ&6堆叠&råđķåŊ通čŋ‡&3čĢ…į―æœš&råŪžįŽ°č‡ŠåŠĻįŒčĢ…。\n\næŊäļŠåŸšįĄ€įš„æĩä―“单元åŊåŪđįšģ&d1æĄķ&ræĩä―“ïžŒč€Œé’Ē单元åŊäŧĨåŪđįšģ8æĄķ。\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.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äŧŧåŠĄã€‚ã€‚", - "quests.low_voltage.machine_auto_output_behaviour.desc.2": "ä―ŋį”Ļ&5æ‰ģ手&råģé”Ūį‚đå‡ŧ朚å™ĻåŊæ›īæ”đčū“凚éĒïžŒæŒ‰ä―æ―œčĄŒåģé”Ūį‚đå‡ŧåˆ™čƒ―č°ƒæ•īæ­ĢéĒæ–đ向。需æģĻ意朚å™Ļįš„æ­ĢéĒ&cäļåŊ&r同æ—ķčŪūį―Ūäļščū“凚éĒ\n\néŧ˜čŪĪ情å†ĩäļ‹ïžŒį‰Đ品äļŽæĩä―“æ— æģ•é€ščŋ‡čū“凚éĒčū“å…ĨïžŒä―†ä―ŋį”Ļ&5螹äļåˆ€&råŊ切æĒæ­ĪåŠŸčƒ―ã€‚åŊį›īæŽĨåģé”Ūį‚đå‡ŧčū“凚éĒïžŒæˆ–æŒ‰ä―æ―œčĄŒåģé”Ūį‚đå‡ŧį•ŒéĒäļ­åŊđåš”čū“凚éĒįš„į―‘æ žæ ä―čŋ›čĄŒč°ƒæ•ī。\n\n存åœĻéƒĻ分į‰đæŪŠåŠŸčƒ―朚å™ĻåĶ‚&3æģĩ&r、&3采įŸŋ朚&r、&3æ•éąžæœš&r、&3į‰Đ品æ”ķ集å™Ļ&rį­‰ïž‰äļæ‰§čĄŒåˆæˆé…æ–đ。čŋ™įąŧ朚å™Ļ将åœĻå…ķ&7æ­ĢéĒ&rčŋ›čĄŒčū“凚čŊĨéĒäŧäŧĨį‚đįŠķ标čŪ°æ ‡čŊ†ïž‰ã€‚", + "quests.low_voltage.machine_auto_output_behaviour.desc.2": "ä―ŋį”Ļ&5æ‰ģ手&råģé”Ūį‚đå‡ŧ朚å™ĻåŊæ›īæ”đčū“凚éĒïžŒæŒ‰ä―æ―œčĄŒåģé”Ūį‚đå‡ŧåˆ™čƒ―č°ƒæ•īæ­ĢéĒæ–đ向。需æģĻ意朚å™Ļįš„æ­ĢéĒ&cäļåŊ&r同æ—ķčŪūį―Ūäļščū“凚éĒ\n\néŧ˜čŪĪ情å†ĩäļ‹ïžŒį‰Đ品äļŽæĩä―“æ— æģ•é€ščŋ‡čū“凚éĒčū“å…ĨïžŒä―†ä―ŋį”Ļ&5螹äļåˆ€&råŊ切æĒæ­ĪåŠŸčƒ―ã€‚åŊį›īæŽĨåģé”Ūį‚đå‡ŧčū“凚éĒïžŒæˆ–æŒ‰ä―æ―œčĄŒåģé”Ūį‚đå‡ŧį•ŒéĒäļ­åŊđåš”čū“凚éĒįš„į―‘æ žæ ä―čŋ›čĄŒč°ƒæ•ī。", "quests.low_voltage.machine_auto_output_behaviour.task": "å—ŊįœŸæœ‰čķĢ", "quests.low_voltage.programmed_circuits.title": "įž–įĻ‹į”ĩč·Ŋ", "quests.low_voltage.programmed_circuits.subtitle": "äļæƒģ花čīđä― įš„į”ĩč·ŊæĨ选æ‹Đ配æ–đ", @@ -3111,18 +3122,20 @@ "quests.low_voltage.lv_amp_explanation.subtitle": "《į”ĩæĩæœšåˆķå…Ĩé—Ļ指南》", "quests.low_voltage.lv_amp_explanation.desc": "朎äŧŧåŠĄįšŋ将įŪ€čĶčŪēč§Ģ&9æ žé›·į§‘技į”ĩæĩæœšåˆķ&rč‡ģ䚎&dį”ĩ压&r朚åˆķ则åū…ä― æŠĩčūū&bMV&ré˜ķæŪĩ后čŊĶč§Ģ。\n\n&6&læ ļåŋƒčĶį‚đïžš&räļšįĄŪäŋåŪ‰å…ĻčŊ·ä―ŋį”ĩįž†įš„į”ĩæĩæ‰ŋč――äļŠé™äļŽå‘į”ĩčŪūåĪ‡įš„čū“凚į”ĩæĩæ€ŧ量į›ļåŒđ配。\n\näŧæœ‰į–‘惑čŊ·æŸĨ阅&cæ žé›·į§‘æŠ€čƒ―暐&rįŦ čŠ‚čŽ·å–åŪŒæ•īįš„į”ĩ力įģŧįŧŸčŊĶč§Ģ", "quests.low_voltage.lv_ore_prospector.title": "čŋ™æ˜Ŋéŧ‘åŪĒ行äļš", - "quests.low_voltage.lv_ore_prospector.subtitle": "勘æŽĒ者įš„朊æĨ", + "quests.low_voltage.lv_ore_prospector.subtitle": "新äļ€äŧĢæŽĒįŸŋäŧŠ", "quests.low_voltage.lv_ore_prospector.desc": "æŽĒįŸŋäŧŠæ˜Ŋäļ€äļŠčƒ―åŠĐä― åŋŦ速åŪšä―įŸŋ脉įš„įĨžåĨ‡å·Ĩ具。\n\nåŪƒįš„GUIæ”Ŋ持äšĪäš’æ“ä―œïžŒåģé”Ūį‚đå‡ŧåģåŊæ‰Ŧ描įŸŋįŸģåđķåŪžæ—ķæ˜ūįĪšåœĻåŠĻ态地å›ūäļŠã€‚\n\n&l&3背æ™ŊįŸĨčŊ†ïžš&r&oæƒģå―“åđīäūŋ搚垏æŽĒįŸŋäŧŠæ›ū锁åŪšåœĻ&dLuVį­‰įš§&fæ‰čƒ―ä―ŋį”ĻįŽ°åœĻįš„å­Đ子äŧŽåŊåĪŠč―ŧæū䚆。", + "quests.low_voltage.night_vision_goggles.subtitle": "ä―ŋįŽĐåŪķäļå†čŋ·åĪąäšŽéŧ‘æš—äļ­ïž", + "quests.low_voltage.night_vision_goggles.desc": "äļšįœžé•œå……åĨ―į”ĩåđķæˆīåœĻč„ļäļŠïžŒåŠčĶį”ĩæą čŋ˜æœ‰į”ĩïžŒä― å°ąčƒ―čŽ·åū—æ°ļäđ…性įš„åĪœč§†æ•ˆæžœïžä― åŊäŧĨ通čŋ‡åŋŦ捷é”Ū切æĒæ­Ī效果éŧ˜čŪĪčŪūį―Ūäļš&aO&ré”Ū。", "quests.low_voltage.lv_sprayer.title": "喷枆į―", "quests.low_voltage.lv_sprayer.subtitle": "æœåŠĄå™Ļ标į­ū义åĪšæˆ˜åž€å§‹ïž", - "quests.low_voltage.lv_sprayer.desc": "åŊ惜čŋ™åŠæ˜Ŋäļ€äļŠ&lįĐšįš„&r喷枆į―ïžŒä― åŋ…éĄŧåœĻä―ŋį”Ļ前åĄŦ充化å­Ķ染料。\n\n&a喷枆į―&räļæäū›äŧŧä―•æķ‰åŠæœšå™Ļįš„åŠŸčƒ―ïžŒä―†čƒ―åļĶæĨį›ļå―“&b凚č‰ēįš„č§†č§‰æ•ˆæžœäļŽåŪžį”Ļ性&r\n\n几äđŽæ‰€æœ‰æ žé›·į§‘技æ–đ块åŪžä―“朚å™Ļ、įŪĄé“、į”ĩįž†į­‰ïž‰å‡åŊčĒŦ&6喷æķ‚&r成16į§éĒœč‰ēäļ­įš„äŧŧ意äļ€į§ã€‚æ— čŪšæ˜Ŋį”Ļ䚎åˆķä―œįēūįūŽæˆŠå›ūčŋ˜æ˜ŊåœĻåĪšäššåŸšåœ°äļ­åŒšåˆ†äļåŒčŪūåĪ‡åļƒåą€éƒ―极äļšäūŋåˆĐ同æ—ķäđŸæœ‰åŠĐ䚎分čūĻ各įąŧįŪĄé“äļŽįšŋįž†ã€‚\n\n将&a喷į―&r持䚎å‰Ŋ手æ—ķïžŒä― æ”ūį―Ūįš„äŧŧä―•æ–đå—éƒ―äžšč‡ŠåŠĻ喷æķ‚äļŠéĒœč‰ē。", + "quests.low_voltage.lv_sprayer.desc": "åŊ惜čŋ™åŠæ˜Ŋäļ€äļŠ&lįĐšįš„&r喷枆į―ïžŒä― åŋ…éĄŧåœĻä―ŋį”Ļ前åĄŦ充染料。\n\n&a喷枆į―&räļæäū›äŧŧä―•æķ‰åŠæœšå™Ļįš„åŠŸčƒ―ïžŒä―†čƒ―åļĶæĨį›ļå―“&b凚č‰ēįš„č§†č§‰æ•ˆæžœäļŽåŪžį”Ļ性&r\n\n几äđŽæ‰€æœ‰æ žé›·į§‘技æ–đ块åŪžä―“朚å™Ļ、įŪĄé“、į”ĩįž†į­‰ïž‰å‡åŊčĒŦ&6喷æķ‚&r成16į§éĒœč‰ēäļ­įš„äŧŧ意äļ€į§ã€‚æ— čŪšæ˜Ŋį”Ļ䚎åˆķä―œįēūįūŽæˆŠå›ūčŋ˜æ˜ŊåœĻåĪšäššåŸšåœ°äļ­åŒšåˆ†äļåŒčŪūåĪ‡åļƒåą€éƒ―极äļšäūŋåˆĐ同æ—ķäđŸæœ‰åŠĐ䚎分čūĻ各įąŧįŪĄé“äļŽįšŋįž†ã€‚\n\n将&a喷į―&r持䚎å‰Ŋ手æ—ķïžŒä― æ”ūį―Ūįš„äŧŧä―•æ–đå—éƒ―äžšč‡ŠåŠĻ喷æķ‚äļŠéĒœč‰ē。", "quests.low_voltage.other_machines.title": "į­‰į­‰ïžŒčŋ˜æœ‰æ›īåĪšïž", "quests.low_voltage.other_machines.subtitle": "ä― é€ƒäļå‡šæ žé›·įš„掌åŋƒâ€Ķâ€Ķ", "quests.low_voltage.other_machines.desc": "我äŧŽæš‚äļåą•åž€&dåļļ规įŸŋį‰ĐåĪ„į†įš„å…ĻåĨ—æĩįĻ‹&r。äļšäŧ€äđˆåžšč°ƒåļļč§„ïžŸæœ‰äš›įŸŋįŸģ需čĶį‰đæŪŠåĪ„į†ïžŒä―†čŋ™åąžäšŽåŽæœŸå†…åŪđ。įģŸįģ•ïžŒå·Ūį‚đåˆč·‘éĒ˜äš†ïž\n\nčŊļåĶ‚&b化å­Ķæĩļæī—å™Ļ&r或&bį”ĩč§Ģ朚&rį­‰čŪūåĪ‡åŊčƒ―äžšæīūäļŠį”Ļ圚。\n\nč‹ĨåŊđįŸŋį‰ĐåĪ„į†æ„Ÿåˆ°å›°æƒ‘čŊ·æŸĨ阅äļ“åąžįš„&cįŸŋįŸģåĪ„į†&rįŦ čŠ‚čŽ·å–åŪŒæ•ī指南", "quests.low_voltage.other_machines.task": "æˆ‘č‡Šæ„ŋæ”ū垃į†æ™š", "quests.low_voltage.lv_chemical_bath.title": "埚įĄ€åŒ–å­Ķæĩļæī—朚", "quests.low_voltage.lv_chemical_bath.subtitle": "化å­Ķæĩļæī—朚į”Ļ䚎æĩļæī—â€Ķâ€Ķ", - "quests.low_voltage.lv_chemical_bath.desc.1": "&lįŸŋįŸģåĪ„į†äđ‹åĪ–įš„į”Ļ途&r\n\n化å­Ķæĩļæī—朚åŊæ›ŋäŧĢ&6åŊ†å°åĪ§æĄķ&r配æ–đä―ŋįšļ和įšŪéĐįš„åˆķä―œå˜åū—&6č―ŧæūįœåŠ›&r。\n\nčŋ˜åŒ…æ‹Žå…ķäŧ–čū…åŠĐåŠŸčƒ―ïžŒäū‹åĶ‚åŊđ各įąŧį‰Đ品äļŽæ–đ块čŋ›čĄŒæŸ“č‰ē或枂į™―åĪ„į†ã€‚", + "quests.low_voltage.lv_chemical_bath.desc.1": "&lįŸŋįŸģåĪ„į†äđ‹åĪ–įš„į”Ļ途&r\n\n化å­Ķæĩļæī—朚åŊæ›ŋäŧĢ&6åŊ†å°åĪ§æĄķ&r配æ–đä―ŋįšŪéĐ和é˜ē腐æœĻįš„åˆķä―œå˜åū—&6č―ŧæūįœåŠ›&r。\n\nčŋ˜åŒ…æ‹Žå…ķäŧ–čū…åŠĐåŠŸčƒ―ïžŒäū‹åĶ‚åŊđ各įąŧį‰Đ品äļŽæ–đ块čŋ›čĄŒæŸ“č‰ē或枂į™―åĪ„į†ã€‚", "quests.low_voltage.lv_chemical_bath.desc.2": "&låŊđ䚎įŸŋįŸģåĪ„į†ïžš&r\n\néƒĻ分&aįē‰įĒŽįŸŋįŸģ&r通čŋ‡åŒ–å­Ķæĩļæī—č―ŽåŒ–äļš&aįšŊ净įŸŋįŸģ&ræ—ķ存åœĻæ›ŋäŧĢ途åū„ïžšä―ŋį”Ļ&aæąž&r或&ačŋ‡įĄŦé…ļ钠&rčŋ›čĄŒåĪ„į†ã€‚æ­Īæ­ĨéŠĪåđķ非åŋ…éœ€ïžŒä―†č‹ĨæƒģčŽ·å–į‰đæŪŠ&6å‰Ŋ䚧品&r则č‡ģå…ģ重čĶïžˆæįĪšïžščŋ™åŊæ˜Ŋé“ķįš„įŧä―ģæ›ŋäŧĢæĨ暐", "quests.low_voltage.lv_electroliser.title": "埚įĄ€į”ĩč§Ģ朚", "quests.low_voltage.lv_electroliser.subtitle": "å—Ąå—Ąä―œå“", @@ -3131,21 +3144,20 @@ "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。\n\nä― åŊčƒ―å·ēįŧäđ æƒŊ乆åœĻåĐ埚äļ­čŋ›čĄŒåˆé‡‘å†ķį‚žïžŒä―†åŊđ䚎äŧŧä―•æ–°åˆé‡‘ïžˆäŧĨ及所有旧合金栞雷į§‘技įš„合金åˆķä―œæ–đ垏æ˜Ŋ&a将įē‰æœŦ混合&rį„ķ后将å…ķ加įƒ­æˆé”­æˆ–提取äļšæĩä―“。先åˆŦåŽŧJEI里æŸĨįœ‹åˆé‡‘å†ķį‚žį‚‰ïžŒé‚ĢčĶåˆ°&5EV&ré˜ķæŪĩ才有。", - "quests.low_voltage.lv_mixer.task": "æĨč‡ŠæœšæĒ°åŠĻ力或栞雷į§‘技", + "quests.low_voltage.lv_mixer.desc": "į”ĩåŠĻ搅拌朚将&6åĪ§åđ…加åŋŦ&rå―Đč‰ēé’Ēįš„åˆķåĪ‡čŋ‡įĻ‹ïžŒå› å…ķåŊäŧĨį›īæŽĨåˆķä―œ&aå―Đč‰ēé’Ēįē‰&a。åģä―ŋįŽ°åœĻčŪĪäļšäļéœ€čĶïžŒåŽįŧ­é˜ķæŪĩä― äžšå‘įŽ°åŪƒ&6äļåŊ或įžš&r。\n\nä― åŊčƒ―å·ēįŧäđ æƒŊ乆åœĻåĐ埚äļ­čŋ›čĄŒåˆé‡‘å†ķį‚žïžŒä―†åŊđ䚎äŧŧä―•æ–°åˆé‡‘ïžˆäŧĨ及所有旧合金栞雷į§‘技įš„合金åˆķä―œæ–đ垏æ˜Ŋ&a将įē‰æœŦ混合&rį„ķ后将å…ķ加įƒ­æˆé”­æˆ–提取äļšæĩä―“。&7先åˆŦåŽŧJEI里æŸĨįœ‹åˆé‡‘å†ķį‚žį‚‰ïžŒé‚ĢčĶåˆ°&5EV&r&7é˜ķæŪĩ才有。&r", "quests.low_voltage.soldering_alloy.title": "į„Šé”Ą", "quests.low_voltage.soldering_alloy.subtitle": "我æ‹Ĩ有įĩ魂åī非į„Šå°†ïžˆæģĻïžšč‹ąæ–‡č°éŸģæĒ—", - "quests.low_voltage.soldering_alloy.desc": "&aį„Šé”Ą&räŧ…ä―œäļš&9æĩä―“&rä―ŋį”ĻåœĻåĪšæ•°į”ĩč·Ŋ配æ–đäļ­åŊä―œäļš&a锡&rįš„åŧ‰äŧ·æ›ŋäŧĢ品čŋ›čĄŒ&d乒æĒ&r。\n\n选æ‹Đ权åœĻä― æ‰‹äļ­ïžšæƒģ节įœææ–™ïžŸå°ąį”Ļį„Šé”Ąã€‚æƒģ减少材料åˆķåĪ‡æ—ķé—īį›īæŽĨä―ŋį”Ļ锡æ›īäļšäūŋ捷。", + "quests.low_voltage.soldering_alloy.desc": "&aį„Šé”Ą&räŧ…ä―œäļš&9æĩä―“&rä―ŋį”ĻåœĻåĪšæ•°į”ĩč·Ŋ配æ–đäļ­åŊä―œäļš&a锡&rįš„åŧ‰äŧ·æ›ŋäŧĢ品čŋ›čĄŒ&d乒æĒ&r。\n\n选æ‹Đ权åœĻä― æ‰‹äļ­ïžšæƒģ节įœææ–™ïžŸå°ąį”Ļį„Šé”Ąã€‚æƒģ减少材料åˆķåĪ‡æ—ķé—īį›īæŽĨä―ŋį”Ļ锡æ›īäļšäūŋ捷。\n\nčŪ°ä―ïžŒä― éœ€čĶå…ˆį”Ļ搅拌朚åˆķä―œį„Šé”Ąįē‰ïžŒį„ķ后ä―ŋį”Ļ提取朚将å…ķč―ŽåŒ–äļšæĩä―“。åˆŦįŪĄJEIäļ­įš„合金å†ķį‚žį‚‰é…æ–đ", "quests.low_voltage.gallium_arsenide.title": "į ·åŒ–é•“", "quests.low_voltage.gallium_arsenide.subtitle": "我čŪĻ厌å‰Ŋ䚧į‰ĐïžŒä―†åŪƒäŧŽåĪŠæĢ’䚆", "quests.low_voltage.gallium_arsenide.desc": "后įŧ­čŪļåĪšææ–™æ— æģ•é€ščŋ‡į›īæŽĨå†ķį‚žįŸŋįŸģčŽ·å–ïžåŪƒäŧŽåŠčƒ―通čŋ‡åŠ å·Ĩå…ķäŧ–įŸŋįŸģ䚧į”Ÿįš„å‰Ŋ䚧品æĨ获åū—。镓和į ·&4æ­ĢåąžäšŽ&rčŋ™įąŧ材料。\n\n镓įš„čŽ·å–é€”åū„按äŧŽåŠĢ到䞘排嚏įŧžåˆč€ƒč™‘éšūåšĶäļŽäš§å‡šïž‰ïžš\n\n&9-&r&3į”ĩč§Ģ&a闩锌įŸŋ&r获åū—åūŪ量įē‰å°˜æĶ‚įŽ‡čūƒä―Žã€‚æģĻ意æ­Īæ–đæģ•å°†æŸåĪąį›īæŽĨå†ķį‚žæ”ķį›Šã€‚\n\n&9-&r将&aįē‰įĒŽé“åœŸįŸŋ&ræ”ūå…Ĩ&3化å­Ķæĩļæī—朚&råĪ„į†ïžŒéœ€æķˆč€—&9čŋ‡įĄŦé…ļ钠&r。\n\n&9-&r通čŋ‡&3įƒ­åŠ›įĶŧåŋƒæœš&r或&3įĶŧåŋƒæœš&råĪ„į†&a闩锌įŸŋ&ræ—ķä―œäļšå‰Ŋäš§å“čŽ·å–ã€‚\n\nåŊđ䚎&dį ·&rïžŒä― å°†äļåū—äļåž€é‡‡&a雄éŧ„&råđķį”Ļ&3įĶŧåŋƒæœš&råĪ„į†ïžŒæˆ–č€…å°†&ačū‰é’īįŸŋ&ræ”ūå…Ĩ&3į”ĩ力éŦ˜į‚‰&räļ­čŋ›čĄŒåŠ å·Ĩ。", "quests.low_voltage.lv_assembler.title": "埚įĄ€įŧ„čĢ…朚", - "quests.low_voltage.lv_assembler.subtitle": "čŋ™åŪķ侙įŧ„čĢ…čĩ·æĨæŊ”ä― å’ŒåŪœåŪķéƒ―åˆĐįīĒ", - "quests.low_voltage.lv_assembler.desc.1": "č™―į„ķčŋ™æ˜Ŋå‘åą•čŋ›įĻ‹äļ­æžå…ķ&9å…ģé”Ū&rįš„朚å™ĻïžŒä―†åŪƒ&9&l无æģ•įŦ‹åģ发æŒĨä―œį”Ļ&r——因äļšé€ äŧ·&c十分昂čīĩ&r。åĪ§éƒĻ分重čĶé…æ–đéƒ―éœ€čĶ&cæĩä―“&ræ”Ŋ持åŧščŪŪ先åŪŒå–„埚įĄ€é…åĨ—čŪūæ–―å†į€æ‰‹åŧšé€ ã€‚\n\n明įĄŪčŋ™į‚đ后čŊ·å°†&3įŧ„čĢ…朚&rč§†ä―œäļŽå·Ĩä―œå°åŒį­‰é‡čĶįš„æ ļåŋƒčŪūåĪ‡ïžŒåŠäļčŋ‡...å—ŊåŪƒæŊ•įŦŸæ˜Ŋ台朚å™Ļ。", - "quests.low_voltage.lv_assembler.desc.2": "å―“åŸšįĄ€čŪūæ–―åŪŒå–„åŽïžŒä― å°†čƒ―č§Ģ锁äŧĨäļ‹ææ–™įš„䞘化配æ–đïžš\n\n&9-&r &6įœŸįĐšįŪĄ&r䚧量提升č‡ģäļĪ倍äŧĨäļŠ\n\n&9-&r &6į”ĩé˜ŧ&ræŊæŽĄåˆæˆåŊ䚧凚4äļŠïž\n\n&9-&r &6į”ĩč·Ŋæŋ&råĪ§åđ…减少铜材æķˆč€—\n\n哇å“Ķ\n\n&l&3背æ™ŊįŸĨčŊ†ïžš&r&oåœĻæ žé›·į§‘技2æ—ķäŧĢįŧ„čĢ…朚äŧ…有äļĪäļŠæ§―ä―ïžŒäļ”äŧ…į”Ļ䚎į‰đæŪŠį”ĩč·ŊäļŽæœšå™ĻåĪ–åĢģįš„æ›ŋäŧĢ配æ–đåŊ谓äļ€č„‰į›ļæ‰ŋįš„įšŊæ­Ģ血įŧŸã€‚", + "quests.low_voltage.lv_assembler.subtitle": "无需åŪœåŪķčŊī明äđĶ", + "quests.low_voltage.lv_assembler.desc.1": "å°―įŪĄčŋ™æ˜Ŋå‘åą•čŋ›įĻ‹äļ­æžå…ķ&9å…ģé”Ū&rįš„朚å™ĻïžŒä―†æˆ‘äŧŽäļåŧščŪŪä― å°†åŪƒä―œäļšéĶ–äļŠLV朚å™ĻæĨåˆķä―œïžŒå› äļšåŪƒ&c造äŧ·éŦ˜æ˜‚&r。\n\näļčŋ‡ïžŒåĶ‚æžœä― å·ēč·ŸéšäŧŧåŠĄæŒ‡åž•č‡ģæ­Īé‚ĢäđˆįŽ°åœĻæ­Ģæ˜Ŋåˆķä―œåŪƒįš„åĨ―æ—ķ朚\n\n&3įŧ„čĢ…朚&råŊđæļļ戏čŋ›įĻ‹č‡ģå…ģ重čĶã€‚čŊ·å°†å…ķč§†ä―œäļŽå·Ĩä―œå°åŒį­‰é‡čĶįš„æ ļåŋƒčŪūåĪ‡ïžŒåŠäļčŋ‡â€Ķâ€Ķå’ģåŪƒæŊ•įŦŸæ˜Ŋ台朚å™Ļ嘛。", + "quests.low_voltage.lv_assembler.desc.2": "ä― å°†čƒ―č§Ģ锁äŧĨäļ‹ææ–™įš„䞘化配æ–đïžš\n\n&9-&r &6įœŸįĐšįŪĄ&r䚧量提升č‡ģäļĪ倍äŧĨäļŠ\n\n&9-&r &6į”ĩé˜ŧ&ræŊæŽĄåˆæˆåŊ䚧凚4äļŠïž\n\n&9-&r &6į”ĩč·Ŋæŋ&råĪ§åđ…减少铜材æķˆč€—\n\n哇å“Ķ\n\n&l&3背æ™ŊįŸĨčŊ†ïžš&r&oåœĻæ žé›·į§‘技2æ—ķäŧĢįŧ„čĢ…朚äŧ…有äļĪäļŠæ§―ä―ïžŒäļ”äŧ…į”Ļ䚎į‰đæŪŠį”ĩč·ŊäļŽæœšå™ĻåĪ–åĢģįš„æ›ŋäŧĢ配æ–đåŊ谓äļ€č„‰į›ļæ‰ŋįš„įšŊæ­Ģ血įŧŸã€‚", "quests.low_voltage.lv_assembler.task": "埚įĄ€įŧ„čĢ…朚", - "quests.low_voltage.t2_circuit_board.subtitle": "æ˜Ŋ啊æ˜Ŋ啊æ˜ŊæœĻåĪīįš„ïžŒä―†åˆŦä―Žäž°åŪƒ", - "quests.low_voltage.t2_circuit_board.desc.1": "čŊĨį”ĩč·Ŋæŋį”Ļ䚎åˆķ造&dMVį”ĩč·Ŋ&r\n\n&9æģĻ意&råˆķä―œé…šé†›å°åˆ·į”ĩč·Ŋæŋæ—ķä― æœ‰&läļĪį§&r选æ‹Đ。č‹Ĩä―ŋį”Ļ&ačŋ‡įĄŦé…ļ钠&r或&aäļ‰æ°Ŋ化铁&rčŋ›čĄŒåŒ–å­Ķ蚀åˆŧåˆķä―œį”ĩč·Ŋæŋ&6äŧ…需æķˆč€—原配æ–đ四分äđ‹äļ€įš„é“ķ&r。\n\n&lä―†č€ƒč™‘åˆ°&rå―“å‰čŽ·å–čŋ™äš›åŒ–å­ĶčŊ•å‰‚čūƒäļšå›°éšūïžŒä― äđŸåŊäŧĨį›īæŽĨ通čŋ‡åž€é‡‡&oæ–đ铅įŸŋ脉&ræĨčŽ·å–æ›īåĪšį™―é“ķâ€Ķâ€Ķ\n\nč‹Ĩæƒģ乆č§Ģ&ačŋ‡įĄŦé…ļ钠&rįš„åˆķåĪ‡æ–đæģ•ïžŒåŊåœĻ&bMV&rįŦ čŠ‚æ‰ū到į›ļåš”äŧŧåŠĄïžˆå°ąå―“æ˜Ŋäŧ―č―ŧæū阅čŊŧ材料。", + "quests.low_voltage.t2_circuit_board.subtitle": "įŽ°åœĻäŧ–äŧŽå†äđŸé€ äļå‡ščŋ™æ ·įš„äļœčĨŋ乆â€Ķâ€Ķ", + "quests.low_voltage.t2_circuit_board.desc.1": "čŊĨį”ĩč·Ŋæŋį”Ļ䚎åˆķ造&dMVį”ĩč·Ŋ&r\n\n&9æģĻ意&råˆķä―œé…šé†›å°åˆ·į”ĩč·Ŋæŋæ—ķä― æœ‰&läļĪį§&r选æ‹Đ。č‹Ĩä―ŋį”Ļ&ačŋ‡įĄŦé…ļ钠&r或&aäļ‰æ°Ŋ化铁&rčŋ›čĄŒåŒ–å­Ķ蚀åˆŧåˆķä―œį”ĩč·Ŋæŋ&6需æķˆč€—įš„é“ķäŧ…äļšå·Ĩ匠台配æ–đįš„四分äđ‹äļ€&r。\n\n&lä―†č€ƒč™‘åˆ°&rå―“å‰čŽ·å–čŋ™äš›åŒ–å­ĶčŊ•å‰‚čūƒäļšå›°éšūïžŒä― äđŸåŊäŧĨį›īæŽĨ通čŋ‡åž€é‡‡&oæ–đ铅įŸŋ脉&ræĨčŽ·å–æ›īåĪšį™―é“ķâ€Ķâ€Ķ\n\nč‹Ĩæƒģ乆č§Ģ&ačŋ‡įĄŦé…ļ钠&rįš„åˆķåĪ‡æ–đæģ•ïžŒåŊåœĻ&bMV&rįŦ čŠ‚æ‰ū到į›ļåš”äŧŧåŠĄïžˆå°ąå―“æ˜Ŋäŧ―č―ŧæū阅čŊŧ材料。", "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åŠĻ摇", @@ -3167,15 +3179,23 @@ "quests.low_voltage.lv_centrifuge.desc.1": "&lįŸŋįŸģåĪ„į†äđ‹åĪ–įš„į”Ļ途&r\n\nåĨ―åŪķ䞙有äŧ€äđˆæ˜Ŋčŋ™å°æœšå™Ļ办äļåˆ°įš„分č§ĢäļåŒį§įąŧįš„įē‰æœŦ、分įĶŧįĐšæ°”ã€åļŪä― æŠĨįĻŽį­‰į­‰â€Ķâ€Ķ\n\nåŠŸčƒ―åĪšåˆ°åˆ—äļåŪŒïžæˆ‘äŧŽåŠčƒ―čŊī&cä― éœ€čĶįĶŧåŋƒæœš&r。", "quests.low_voltage.lv_centrifuge.desc.2": "&låŊđ䚎įŸŋįŸģåĪ„į†ïžš&r\n\nčŊĨčŪūåĪ‡åŊ将&aåŦ杂įŸŋįē‰&r或&aæīå‡€įŸŋįē‰&rč―ŽåŒ–äļšįšŊ净įš„įŸŋįē‰ïžŒåđķéĒåĪ–䚧凚åūŪ量&6å‰Ŋ䚧品&rįŸŋįē‰ã€‚č™―éžčŽ·å–å‰Ŋ䚧į‰Đįš„最䞘å·Ĩ艹č·ŊįšŋïžŒä―†čŋ™æ˜Ŋå―“å‰æ‰€æœ‰įŸŋįŸģåĪ„į†čŪūåĪ‡äļ­&c造äŧ·æœ€ä―Žåŧ‰ã€æœ€é€‚åˆå°č§„æĻĄé…į―Ū&rįš„č§Ģå†ģæ–đæĄˆã€‚", "quests.low_voltage.lv_centrifuge.desc.3": "&l&3背æ™ŊįŸĨčŊ†ïžš&r&oåœĻ埚įĄ€į‰ˆGTCEäļ­ïžŒįĶŧåŋƒæœšæ›ūæ˜Ŋæ€§čƒ―įĒū压å…ķäŧ–įŸŋįŸģåĪ„į†čŪūåĪ‡įš„å­˜åœĻ——äļäŧ…æ“ä―œįŪ€äūŋčŋ˜čƒ―像æī—įŸŋ朚或įƒ­åŠ›įĶŧåŋƒæœšäļ€æ ·įĻģåŪšäš§å‡šäļ‰äŧ―åūŪ量įē‰å°˜ã€‚å―“å‰į‰ˆæœŽæˆ‘äŧŽäļšå…ķčŋ›čĄŒäš†åđģčĄĄæ€§č°ƒæ•īäŧĨäŋƒčŋ›å·Ĩ艹č·Ŋįšŋįš„åĪšæ ·æ€§å‘åą•ã€‚", - "quests.low_voltage.lv_centrifuge.task": "", "quests.low_voltage.lv_glue.title": "įē˜ä―äš†", "quests.low_voltage.lv_glue.subtitle": "įœŸæ˜ŊæĢ˜æ‰‹įš„情å†ĩ", - "quests.low_voltage.lv_glue.desc": "įŽ°åœĻä― åŊäŧĨ通čŋ‡&3įĶŧåŋƒæœš&råĪ„į†&aįē˜æ€§æ ‘č„‚&ræĨ获åū—æķē态&ačƒķæ°ī&räŧĨ及į›Ū前åŪžį”Ļ性čūƒä―Žįš„æĪį‰Đįƒïž‰ã€‚\n\nįŦ‹åģ垀始åˆķåĪ‡čƒķæ°īčƒ―æŠĒ占先朚。åŪƒåŊį”Ļ䚎åˆķä―œ&6成朎æ›īä―Žįš„į”ĩé˜ŧ&råđķåœĻ&3įŧ„čĢ…朚&räļ­į”Ÿäš§&6æ›īįŧæĩŽįš„į”ĩč·Ŋæŋ&rå°Īå…ķåœĻ&očŋ‘æœŸå‘åą•&ré˜ķæŪĩäŧ·å€žæ˜ūč‘—ïž‰ã€‚\n\n&e提įĪšïžš&rä― äđŸåŊäŧĨįĶŧåŋƒåĪ„į†įūĪåģĶäž čŊīæĻĄįŧ„äļ­įš„&ačƒķæ°ī&r或&aæū脂&r哊į§ææ–™æ›īæ˜“čŽ·å–å°ąé€‰å“Šį§ïž", + "quests.low_voltage.lv_glue.desc": "įŽ°åœĻä― åŊäŧĨ通čŋ‡&3įĶŧåŋƒæœš&råĪ„į†&aįē˜æ€§æ ‘č„‚&ræĨ获åū—æķē态&ačƒķæ°ī&räŧĨ及į›Ū前åŪžį”Ļ性čūƒä―Žįš„æĪį‰Đįƒïž‰ã€‚\n\nįŦ‹åģ垀始åˆķåĪ‡čƒķæ°īčƒ―æŠĒ占先朚。åŪƒåŊį”Ļ䚎åˆķä―œ&6成朎æ›īä―Žįš„į”ĩé˜ŧ&råđķåœĻ&3įŧ„čĢ…朚&räļ­į”Ÿäš§&6æ›īįŧæĩŽįš„į”ĩč·Ŋæŋ&r。\n\n&e提įĪšïžš&rä― äđŸåŊäŧĨįĶŧåŋƒåĪ„į†įūĪåģĶäž čŊīæĻĄįŧ„äļ­įš„&ačƒķæ°ī&r或&aæū脂&r哊į§ææ–™æ›īæ˜“čŽ·å–å°ąé€‰å“Šį§ïž", "quests.low_voltage.lv_glue.task": "čƒķæ°ī", "quests.low_voltage.lv_cutter.title": "埚įĄ€åˆ‡å‰ē朚", "quests.low_voltage.lv_cutter.subtitle": "切å‰ē朚â€Ķâ€Ķį”Ļ䚎切å‰ēâ€Ķâ€Ķ", "quests.low_voltage.lv_cutter.desc": "į›Ūå‰ä― åš”ä―ŋį”Ļ&9æ°ī&ræĨæ‰§čĄŒį›ļå…ģ配æ–đ无需čīđåŠ›čŽ·å–æķĶæŧ‘æķē。\n\nč‹Ĩ尚朊配åĪ‡æ­ĪčŪūåĪ‡ïžŒåŪƒčŋ˜čƒ―将&6é‡‘åąžæ†åˆ‡å‰ē成四äļŠčžšæ “&r。\n\nčŊĨ朚å™Ļæ˜ŊčŽ·å–&dåŪįŸģæŋ&rįš„å”Ŋäļ€é€”åū„čŊĨ材料æ˜Ŋåˆķ造čŋ‡æŧĪåĄåŠåŽįŧ­&3集气åŪĪ&rįš„åŋ…čĶįŧ„äŧķ。", "quests.low_voltage.lv_cutter.task": "äŧŧä―•åˆ‡å‰ē朚", + "quests.low_voltage.lv_distillery.subtitle": "č’ļéĶåŪĪį”Ļ䚎č’ļéĶâ€Ķâ€Ķ", + "quests.low_voltage.lv_distillery.desc": "č’ļéĶåŪĪįš„åŠŸčƒ―įąŧ侾乎įĶŧåŋƒæœšïžŒä―†äļŧčĶį”Ļ䚎åĪ„į†æœ‰æœšæˆ–įŸģ化æĩä―“。\n\nåœĻ&7LV&ré˜ķæŪĩïžŒä― åŠčƒ―äŧŽå•äļ€čū“å…Ĩäļ­æå–äļ€į§äš§į‰ĐïžŒä―†å―“ä― å‡įš§č‡ģ&6HV&rįš„č’ļéĶåĄ”后čŋ™äļ€é™åˆķ将䞚æ”đ变。\n\nčŋ™å°æœšå™ĻåœĻLVé˜ķæŪĩįš„ä―ŋį”ĻéĒ‘įŽ‡åđķäļéŦ˜ïžˆé™Īéžä― į”ĻåŪƒæĨį”Ÿäš§å†…į‡ƒæœšį‡ƒæ–™ïž‰ïžŒä―†åŪƒæ˜ŊčŽ·å–&eč‹Ŋ酚&rįš„å…ģé”ŪčŪūåĪ‡ã€‚", + "quests.low_voltage.phenolic_resin.subtitle": "äššé€ æ ‘č„‚", + "quests.low_voltage.phenolic_resin.desc.1": "é…šé†›æ ‘č„‚į”ą&6č‹Ŋ酚&räļŽ&aį”ē醛&r通čŋ‡åŒ–å­Ķ反嚔åˆķ成。\n\nč™―į„ķåœĻ&7LV&ré˜ķæŪĩïžŒä― čŽ·å–č‹Ŋ酚įš„途åū„å…ķåŪžåŠæœ‰äļĪį§ïžˆč’ļéĶæ‚é…šæēđ或重į‡ƒæēđïž‰ïžŒä―†į”Ÿäš§į”ē醛所需įš„&dį”ēįƒ·&r则有æ›īåĪščŽ·å–æ–đ垏。", + "quests.low_voltage.phenolic_resin.desc.2": "最įŪ€å•ïžˆäđŸæœ€æ…Ēįš„æ–đæģ•æ˜ŊåœĻ化å­Ķ反嚔釜äļ­į”Ļæ°Ē和įĒģåˆæˆïžŒä―†čŋ™åŒæ—ķ需čĶéžåļļįž“æ…Ēįš„æ°īį”ĩč§ĢæĨäū›åš”æ°Ē气。\n\nč’ļéĶåŪĪäđŸæäū›äš†åĪšį§é€‰æ‹Đ包拎通čŋ‡åĪ„į†æ‚é…šæēđæĨčŽ·å–ã€‚\n\nåĶ‚æžœä― åœĻä―ŋį”Ļåˆæˆæ°”ä―œäļšį‡ƒæ–™ïžŒäđŸåŊäŧĨ将å…ķ氧化äļšį”ēįƒ·ã€‚\n\n最后åĶ‚æžœä― æƒģ尝čŊ•äļ€äš›į‰đåˆŦįš„æ–đæģ•ïžŒčŋ˜åŊäŧĨįĶŧåŋƒå·Ļ量åđ―å†Ĩäđ‹åœ°įš„č˜‘č‡æĨčŽ·å–ã€‚", + "quests.low_voltage.magnesia.subtitle": "čŋ™äđŸæ˜ŊåļŒč…Šįš„äļ€äļŠåœ°åïž", + "quests.low_voltage.magnesia.desc": "氧化镁äšĶį§°č‹Ķ土åŊ通čŋ‡äļĪį§æ–đåžčŽ·å–ïžš\n\n- åž€é‡‡čąé•įŸŋįŸģ\n\n- ä―ŋ镁äļŽįĒąæķē反嚔į”Ÿæˆæ°Ē氧化镁随后åœĻį„Ķį‚‰äļ­į……įƒ§ã€‚镁åŊäŧŽåĪšį§äļåŒįš„įŸŋįŸģäļ­æį‚žčŽ·åū—。", + "quests.low_voltage.refractory_brick.subtitle": "酷冷â„Ē耐įŦį –", + "quests.low_voltage.refractory_brick.desc": "æ˜Ŋæ—ķå€™æ‹†æŽ‰ä― é‚ĢåĨ—æ—§įš„įūĪåģĶéŦ˜į‚‰äš†ïžåĶ‚æžœæ„ŋæ„ïžŒä― åŊäŧĨ将åĪ§éƒĻ分材料回æ”ķåˆķ成&6耐įŦéŧåœŸįē‰&ræŽĻ荐ä―ŋį”Ļį”ĩ垧į‚‰ïžŒčŋ™æ ·æ—Ēčƒ―åū—到įē‰æœŦåˆčƒ―å›žæ”ķé“ïžïž‰ïžŒæˆ–č€…ä― äđŸåŊäŧĨįƒ§åˆķæ›īåĪšč€įŦéŧåœŸã€‚ä―†åŠĄåŋ…įĄŪäŋä― å·ēå‚ĻåĪ‡äš†åĪ§é‡é’Ē材\n\nį„ķåŽïžŒå°†č€įŦéŧåœŸįē‰äļŽäļ€äš›æ°§åŒ–镁、įŸģåĒĻåŠæ ‘č„‚æ··åˆïžŒåˆķä―œå‡šæ”đčŋ›åž‹é™ķį“·ææ–™ïžŒčŋ™æ­Ģæ˜Ŋåˆķ造&déĶ–æ‰đįšŋ圈&r所需įš„。", "quests.low_voltage.lv_gas_collector.title": "埚įĄ€é›†æ°”åŪĪ", "quests.low_voltage.lv_gas_collector.subtitle": "åŪƒäžščŪĐä― å–˜äļčŋ‡æ°”æĨ", "quests.low_voltage.lv_gas_collector.desc": "集气åŪĪåŊ采集įĐšæ°”ïžŒåđķ通čŋ‡įĶŧåŋƒåˆ†įĶŧ获åū—&a氧气&räļŽ&aæ°Ū气&r。\n\n&l&3背æ™ŊįŸĨčŊ†ïžš&r&oæ žé›·į§‘技5įš„老įŽĐåŪķåŪšäžščŪ°åū—å―“åđī需į”Ļ压įžĐ朚配合IC2气į―čŽ·å–压įžĐįĐšæ°”įš„åēæœˆâ€ĶåĶ‚äŧŠæ°”į―åŒ–å­Ķä―“įģŧå·ēå―ŧåš•éĐ新。", @@ -3183,7 +3203,7 @@ "quests.low_voltage.lv_oxygen.subtitle": "äļĨæ žæĨčŊī嚔čŊĨåŦ双氧分子Dioxygen...", "quests.low_voltage.lv_oxygen.desc.1": "ä― åĪ§åŊåœĻJEI里耗čīđ&o&eåŪčīĩįš„į”Ÿå‘―åđī华&råŊŧæ‰ū最䞘įš„氧气åˆķåĪ‡æ–đæĄˆâ€”â€”æŊ•įŦŸčŽ·å–途åū„åŪžåœĻįđåĪšã€‚į”ĩč§Ģ各įąŧįŸŋį‰Đå‡čƒ―äš§å‡šæ°§æ°”ã€‚\n\nčĶæ˜ŊäŧŧåŠĄæ‰‹å†Œčƒ―æäū›æ›īåĪšäŋĄæŊå°ąåĨ―䚆", "quests.low_voltage.lv_oxygen.desc.2": "惊喜åœĻ我äŧŽįœ‹æĨ最ä―ģčŽ·å–æ–đ垏å…ķåŪžæ˜Ŋåˆķ造&d集气åŪĪ&r后&aįĶŧåŋƒįĐšæ°”&râ€”â€”č™―į„ķä― åŊčƒ―æš‚æ—ķčŋ˜é€ äļå‡šæĨ。æ­Īæ–đæģ•åŒæ—ķčƒ―äš§å‡š&aæ°Ū气&råŊ有效加速某䚛&3į”ĩ力éŦ˜į‚‰&r配æ–đįš„čŋčĄŒæ•ˆįŽ‡ã€‚\n\nåœĻ我äŧŽįœ‹æĨïžˆïžïž‰æŽĄäž˜æ–đæĄˆæ˜Ŋ&aį”ĩč§Ģ䚌氧化įĄ…&r。䚌氧化įĄ…åŊ通čŋ‡įŽŧį’ƒįē‰åŠå„įąŧįŸģįē‰į­‰åĪšį§é€”åū„čŽ·å–ã€‚æˆ‘äŧŽ&6įĻåŽäžšé‡į‚đ回éĄūæ­Īæ–đæĄˆ&r因äļšåŪƒå Šį§°&6įŧˆæžč§Ģæģ•&r。", - "quests.low_voltage.lv_oxygen.desc.3": "åœĻ我äŧŽįœ‹æĨïžˆïžïž‰ä―åˆ—įŽŽäļ‰įš„æ–đæĄˆæ˜Ŋ&aį”ĩč§Ģæ°ī&r。åŪžé™…äļŠïžŒį”ąäšŽčƒ―耗čūƒéŦ˜ïžŒæ°īį”ĩč§Ģæ›ī适į”Ļ䚎&aåˆķæ°Ē&r。&4čŊ·å‹ŋ将æ­Īæ–đæģ•ä―œäļšäļŧčĶæ°§æš&r——åŪƒåš”äļ“į”Ļ䚎&1æ°Ē气&rį”Ÿäš§ïžŒå…ģ䚎åˆķæ°Ē我äŧŽåŽįŧ­å°†æäū›čŊĶįŧ†æŒ‡åŊžã€‚\n\nåœĻ我äŧŽįœ‹æĨïžˆïžïž‰ä―åˆ—įŽŽå››įš„æ–đæĄˆæ˜Ŋïžš&aįŧåŊđäļčĶ&r随意æĩŠčīđ氧气无čŪšé€ščŋ‡ä―•į§é€”åū„获åū—įš„æ°§æ°”éƒ―具有重čĶäŧ·å€žïžŒåš”å―“åĶĨ善存å‚ĻåœĻå‚Ļį―äļ­ã€‚\n\n&eæģĻ意&r将存æ”ūåœĻį‰Đ品栏内&läŧŧ意&rå‚Ļį―äļ­įš„æĩä―“提äšĪåģåŊåŪŒæˆäŧŧåŠĄïžŒä―ŋį”Ļ气态氧æĄķ同样有效。", + "quests.low_voltage.lv_oxygen.desc.3": "åœĻ我äŧŽįœ‹æĨïžˆïžïž‰ä―åˆ—įŽŽäļ‰įš„æ–đæĄˆæ˜Ŋ&aį”ĩč§Ģæ°ī&r。åŪžé™…äļŠïžŒį”ąäšŽčƒ―耗čūƒéŦ˜ïžŒæ°īį”ĩč§Ģæ›ī适į”Ļ䚎&aåˆķæ°Ē&r。&4čŊ·å‹ŋ将æ­Īæ–đæģ•ä―œäļšäļŧčĶæ°§æš&r——åŪƒåš”äļ“į”Ļ䚎&1æ°Ē气&rį”Ÿäš§ïžŒå…ģ䚎åˆķæ°Ē我äŧŽåŽįŧ­å°†æäū›čŊĶįŧ†æŒ‡åŊžã€‚\n\nåœĻ我äŧŽįœ‹æĨïžˆïžïž‰ä―åˆ—įŽŽå››įš„æ–đæĄˆæ˜Ŋïžš&aįŧåŊđäļčĶ&r随意æĩŠčīđ氧气无čŪšé€ščŋ‡ä―•į§é€”åū„获åū—įš„æ°§æ°”éƒ―具有重čĶäŧ·å€žïžŒåš”å―“åĶĨ善存å‚ĻåœĻå‚Ļį―äļ­ã€‚", "quests.low_voltage.lv_oxygen.task": "æ°§", "quests.low_voltage.lv_nitrogen.title": "æ°Ū气", "quests.low_voltage.lv_nitrogen.subtitle": "ä― įš„į”ĩ力éŦ˜į‚‰åĒžåđ…剂", @@ -3201,7 +3221,7 @@ "quests.low_voltage.lv_chemical_reactor.subtitle": "化å­Ķå…Ĩé—Ļ指南", "quests.low_voltage.lv_chemical_reactor.task": "æķē态æĐĄčƒķ", "quests.low_voltage.lv_chemical_reactor.desc.1": "&3化å­Ķ反嚔釜&r将åœĻ&låĪ§é‡&r配æ–đäļ­æˆäļšåŋ…åĪ‡čŪūåĪ‡ã€‚\n\nčŪĐ我äŧŽįŦ‹åģčŊ•į”Ļâ€”â€”ä―•äļåˆĐį”Ļ刚造åĨ―įš„化å­Ķ反嚔釜č§Ģ锁å…Ļ新įš„&6æ”đč‰ŊæĐĄčƒķ配æ–đ&ræĐĄčƒķåœĻ&dæĩä―“įŠķ态无æģ•į›īæŽĨä―ŋį”Ļ&r因æ­Īä― éœ€čĶåĶ造äļ€å°æœšå™Ļčŋ›čĄŒåŽįŧ­åŠ å·Ĩ。", - "quests.low_voltage.lv_chemical_reactor.desc.2": "äŧ…靠化å­Ķ反嚔釜无æģ•åŪŒæˆæĐĄčƒķåˆķä―œïžŒäŧĨäļ‹æ˜Ŋä― åŊčƒ―éœ€čĶæ‰“造įš„&aå…ķäŧ–čŪūåĪ‡&rïžš\n\n&3囚化朚&rčƒ―į›īæŽĨ将æĐĄčƒķ凝囚成&aæĐĄčƒķį‰‡&rčŋ™æ˜Ŋ后įŧ­å‘åą•åŋ…需įš„材料。\n\n随后åŊåˆĐį”Ļ&3įŧ„čĢ…朚&r将æķē态æĐĄčƒķ加å·Ĩ成&aįšŋįž†&rã€‚č™―į„ķåŊđ锡čīĻįšŋįž†å―ąå“äļåĪ§ïžŒä―†æ›īéŦ˜įš§įš„įšŋįž†&eåŋ…éĄŧ&r通čŋ‡įŧ„čĢ…朚åˆķ造。\n\n&eæģĻ意&r将存å‚ĻåœĻį‰Đ品栏&läŧŧ意&rå‚Ļį―äļ­įš„æĩä―“提äšĪåģåŊåŪŒæˆäŧŧåŠĄïžŒæŽĻ荐ä―ŋį”ĻæĄķä―œäļšåŪđå™Ļ。", + "quests.low_voltage.lv_chemical_reactor.desc.2": "äŧ…靠化å­Ķ反嚔釜无æģ•åŪŒæˆæĐĄčƒķåˆķä―œïžŒäŧĨäļ‹æ˜Ŋä― åŊčƒ―éœ€čĶæ‰“造įš„&aå…ķäŧ–čŪūåĪ‡&rïžš\n\n&3囚化朚&rčƒ―į›īæŽĨ将æĐĄčƒķ凝囚成&aæĐĄčƒķį‰‡&rčŋ™æ˜Ŋ后įŧ­å‘åą•åŋ…需įš„材料。\n\n随后åŊåˆĐį”Ļ&3įŧ„čĢ…朚&r将æķē态æĐĄčƒķ加å·Ĩ成&aįšŋįž†&rã€‚č™―į„ķåŊđ锡čīĻįšŋįž†å―ąå“äļåĪ§ïžŒä―†æ›īéŦ˜įš§įš„įšŋįž†&eåŋ…éĄŧ&r通čŋ‡įŧ„čĢ…朚åˆķ造。", "quests.low_voltage.lv_fluid_solidifier.title": "埚įĄ€æĩä―“囚化å™Ļ", "quests.low_voltage.lv_fluid_solidifier.subtitle": "æĩä―“囚化å™Ļį”Ļ䚎囚化â€Ķâ€Ķ", "quests.low_voltage.lv_fluid_solidifier.desc": "将čŋ™å°æœšå™ĻäļŽ&3化å­Ķ反嚔釜&rį›ļé‚ŧæ”ūį―ŪåģåŊ臩åŠĻ将æĐĄčƒķ囚化成&aæĐĄčƒķį‰‡&r。\n\nä―ŋį”Ļ&dæ‰ģ手&r调æ•ī&3化å­Ķ反嚔釜&räū§éĒæ–đ向åđķ垀åŊæĩä―“&9臩åŠĻčū“凚&råģåŊåŪžįŽ°č‡ŠåŠĻ化䞠čū“。\n\n后įŧ­čŋ˜æœ‰å…ķäŧ–æĩä―“需čĶå›šåŒ–åĪ„į†ïžŒä― åŊäŧĨåœĻ非æĐĄčƒķį”Ÿäš§æ—ķæŪĩ&3é‡æ–°č°ƒé…æĩä―“囚化å™Ļ&rįš„åŠŸčƒ―â€”â€”æˆ–č€…į›īæŽĨåŧšé€ įŽŽäšŒå°äļ“į”ĻčŪūåĪ‡ïž", @@ -3216,7 +3236,7 @@ "quests.low_voltage.cupronickel_ingot.desc": "æ žé›·į§‘技čŋ›é˜ķįš„äļ€åĪ§æ ļåŋƒåœĻäšŽčŽ·å–æ–°ææ–™ïžŒčŋ™äš›ææ–™å°†į”Ļ䚎升įš§æœšå™Ļ和č§Ģ锁éŦ˜įš§įŧ„äŧķ。\n\nä― åģ将æŽĨč§Ķįš„å…ķäļ­äļ€į§ææ–™æ˜Ŋ&bį™―铜&r——čŋ™äŧ…æ˜ŊæžŦé•ŋåūįĻ‹įš„čĩ·į‚đ。\nčŊĨ材料į”Ļ䚎åŧšé€ ä― įš„įŽŽäļ€åš§&6į”ĩ力éŦ˜į‚‰&räđƒæ˜Ŋå·Ĩäļšå‘åą•äļåŊ或įžšįš„å…ģé”Ūæ­ĨéŠĪ。\n\nåđļčŋįš„æ˜Ŋčŋ™įŽŽäļ€æ­Ĩį›ļå―“įŪ€å•ïžšäļ€å°&7合金į‚‰&råģåŊ胜äŧŧ。\n因æ­Īåģäūŋ配æ–đæ˜ūįĪšéœ€čĶ&b128äļŠį™―铜&räđŸæ— éœ€æ‹…åŋ§â€”—åŪžé™…æ“ä―œæŊ”įœ‹čĩ·æĨåŪđ易åū—åĪšïž&r\n\n后įŧ­é˜ķæŪĩįš„合金åˆķåĪ‡å°†æ—Ĩčķ‹åĪæ‚čķįŪ€å•įš„æ—ķ候åĨ―åĨ―äšŦ受吧", "quests.low_voltage.cupronickel_coil.title": "į™―铜įšŋ圈", "quests.low_voltage.cupronickel_coil.subtitle": "åŪåŪįš„įŽŽäļ€äļŠåŠ įƒ­įšŋ圈", - "quests.low_voltage.cupronickel_coil.desc": "准åĪ‡&a128äŧ―į™―铜&r、&a32äŧ―青铜&räļŽ&a16äŧ―é”Ąåˆé‡‘&rį”Ļ䚎åˆķ造初äŧĢį”ĩ力éŦ˜į‚‰æ‰€éœ€įš„加įƒ­įšŋ圈。\n\nčŋ™äŧäļåˆ°æ•ī嚧į”ĩ力éŦ˜į‚‰åŽŸææ–™æˆæœŽįš„äļ€åŠïžˆïžïž‰ã€‚ä― čŋ˜éœ€čĶå‡†åĪ‡įšĶ各äļ€įŧ„įš„æŪ·é’ĒäļŽé’Ē材čŊ·å°―åŋŦ投å…Ĩ采įŸŋä―œäļšã€‚\n\nį™―铜įšŋåœˆčƒ―ä―ŋį”ĩ力éŦ˜į‚‰åĪ„į†æœ€éŦ˜&d1800K&rįš„配æ–đ朊čŪĄå…Ĩį”ĩ压åĒžį›Šïž‰ã€‚čŋ™äļŠæļĐåšĶåœĻ我äŧŽįœ‹æĨį›ļå―“į‚™įƒ­ã€‚\n\n&6įšŋ圈čŊĶč§Ģ教įĻ‹ä―äšŽ&læ žé›·į§‘æŠ€čƒ―暐&r&6标į­ūéĄĩ——前åū€æŸĨ阅äŧĨ乆č§Ģæ›īåĪšïž&r", + "quests.low_voltage.cupronickel_coil.desc": "准åĪ‡&a128äŧ―į™―铜&r、&a32äŧ―蓝é’Ē&räļŽ&a16äŧ―é”Ąåˆé‡‘&r锭äŧĨ及&a128äļŠč€įŦį –&r į”Ļ䚎åˆķ造初äŧĢį”ĩ力éŦ˜į‚‰æ‰€éœ€įš„加įƒ­įšŋ圈。\n\nčŋ™äŧäļåˆ°æ•ī嚧į”ĩ力éŦ˜į‚‰åŽŸææ–™æˆæœŽįš„äļ€åŠïžˆïžïž‰ã€‚ä― čŋ˜éœ€čĶå‡†åĪ‡įšĶ各äļ€įŧ„įš„æŪ·é’ĒäļŽé’Ē材čŊ·å°―åŋŦ投å…Ĩ采įŸŋä―œäļšã€‚\n\nį™―铜įšŋåœˆčƒ―ä―ŋį”ĩ力éŦ˜į‚‰åĪ„į†æœ€éŦ˜&d1800K&rįš„配æ–đ朊čŪĄå…Ĩį”ĩ压åĒžį›Šïž‰ã€‚čŋ™äļŠæļĐåšĶåœĻ我äŧŽįœ‹æĨį›ļå―“į‚™įƒ­ã€‚\n\n&6įšŋ圈čŊĶč§Ģ教įĻ‹ä―äšŽ&læ žé›·į§‘æŠ€čƒ―暐&r&6标į­ūéĄĩ——前åū€æŸĨ阅äŧĨ乆č§Ģæ›īåĪšïž&r", "quests.low_voltage.lv_ebf.title": "į”ĩ力éŦ˜į‚‰", "quests.low_voltage.lv_ebf.subtitle": "æ žé›·į§‘技įš„æ ļåŋƒæœšå™Ļäđ‹äļ€ïžŒæˆ‘äŧŽå–œæŽĒčŋ™äļŠåšžį„ķåĪ§į‰Đ。", "quests.low_voltage.lv_ebf.desc.1": "čŋ™äļŠäŧŧåŠĄč§Ģ释乆&3į”ĩåŠĻéŦ˜į‚‰&rįš„æ ļåŋƒæœšåˆķïžŒč€Œæ—čūđįš„äŧŧåŠĄå°†č§Ģ释åĪšæ–đ块éƒĻäŧķįš„朚åˆķ。äļ€åŪščĶæŸĨįœ‹é‚ĢäļŠäŧŧåŠĄã€‚\n\næ€ŧäđ‹ïžŒ&3į”ĩ力éŦ˜į‚‰&ræ˜Ŋä― įš„&eįŽŽäļ€äļŠį”ĩåŠĻåĪšæ–đ块įŧ“æž„&r恭喜。åŪƒį”Ļ䚎åœĻéŦ˜æļĐäļ‹åĪ„į†ææ–™ã€‚\n\nä― å°†į†Ÿæ‚‰į”ĩ力éŦ˜į‚‰æĨåˆķ造&a铝&råđķčŋ›æ­Ĩ到&d&bMVæ—ķäŧĢ&r。åŪƒčŋ˜čƒ―æŊ”&6éŦ˜į‚‰&ræ›īåŋŦ地åˆķ造&7é’Ē&rčŋ™æ„å‘ģį€ä― įŧˆäšŽåŊäŧĨ拆é™Ī旧įš„įūĪåģĶäž čŊī铁匠铚䚆。", @@ -3244,13 +3264,26 @@ "quests.low_voltage.mv_hull.desc2": "åœĻæ·ąå…Ĩ&bMV&ré˜ķæŪĩäđ‹å‰čŊ·čŪ°ä―ïžŒč‹Ĩäļæƒģčŋ‡åšĶäūčĩ–æ žé›·į§‘技åœĻ&6TFG&ræ•ī合包äļ­ä― åŊäŧĨčŋį”Ļ&6朚æĒ°åŠĻ力&ræĨ垚化埚įĄ€čŪūæ–―ã€‚é“åˆķäž åŠĻ杆äļŽé―ŋč―Ūįš„嚔力åŪđ量æ˜Ŋé’Ēåˆķįš„四倍čĢ…配后所有朚å™Ļéƒ―čƒ―æ›īåŋŦ地čŋč―Žïž", "quests.low_voltage.aluminium_greate.title": "铝įš§æ žé›·æœšæĒ°", "quests.low_voltage.aluminium_greate.subtitle": "äđŸčĒŦį§°äļšâ€œäļ­åš”力”é˜ķæŪĩ", - "quests.low_voltage.aluminium_greate.desc": "č·äļŠæŽĄå‡įš§å·ē有äļ€æŪĩæ—ķæ—ĨįŽ°åœĻä― įŧˆäšŽč§Ģ锁乆å…Ļ新į­‰įš§įš„栞雷朚æĒ°é―ŋč―ŪäļŽäž åŠĻč―ī。äļŽäđ‹å‰äļ€æ ·ïžŒé“čīĻéƒĻäŧķįš„嚔力åŪđ量čūū到䚆é’ĒčīĻįš„&b四倍&r。\n\nįŧ§įŧ­æŽĻčŋ›æ žé›·æœšæĒ°įģŧ列内åŪđåŪŒå…ĻåąžäšŽåŊ选æĩįĻ‹â€”—我äŧŽæ›īåŧščŪŪä― č―Žå‘æ žé›·į§‘技äļŧįšŋå‘åą•ã€‚ä―†č‹Ĩä― åļŒæœ›įŧ§įŧ­æēŋį”Ļ原有čŪūåĪ‡ïžŒæœŽæŽĄå‡įš§å°†åļŪåŠĐä― &bį†éĄš&réƒĻ分旧čĢ…į―Ūįš„杂äđąåļƒåą€ã€‚\n\nä― åŊäŧĨ通čŋ‡&eč’ļæą―åž•æ“Ž&rčŋ›äļ€æ­Ĩ提升æ•īä―“åš”åŠ›č§„æĻĄïžŒæˆ–åˆĐį”Ļ&9Create Additions&rįš„&eį”ĩåŠĻéĐŽčūū&r将EUį”ĩčƒ―č―ŽåŒ–äļšSUåš”åŠ›å•ä―ã€‚", + "quests.low_voltage.aluminium_greate.desc": "č·äļŠæŽĄå‡įš§å·ē有äļ€æŪĩæ—ķæ—ĨįŽ°åœĻä― įŧˆäšŽč§Ģ锁乆å…Ļ新į­‰įš§įš„栞雷朚æĒ°é―ŋč―ŪäļŽäž åŠĻč―ī。äļŽäđ‹å‰äļ€æ ·ïžŒé“čīĻéƒĻäŧķįš„嚔力åŪđ量čūū到䚆é’ĒčīĻįš„&b四倍&r。\n\nįŧ§įŧ­æŽĻčŋ›æ žé›·æœšæĒ°įģŧ列内åŪđåŪŒå…ĻåąžäšŽåŊ选æĩįĻ‹â€”—我äŧŽæ›īåŧščŪŪä― č―Žå‘æ žé›·į§‘技äļŧįšŋå‘åą•ã€‚ä―†č‹Ĩä― åļŒæœ›įŧ§įŧ­æēŋį”Ļ原有čŪūåĪ‡ïžŒæœŽæŽĄå‡įš§å°†åļŪåŠĐä― &bį†éĄš&réƒĻ分旧čĢ…į―Ūįš„杂äđąåļƒåą€ã€‚\n\nä― åŊäŧĨ通čŋ‡&eč’ļæą―åž•æ“Ž&rčŋ›äļ€æ­Ĩ提升æ•īä―“åš”åŠ›äš§å‡šïžŒæˆ–åˆĐį”Ļ&9Create Additions&rįš„&eį”ĩåŠĻéĐŽčūū&r将EUį”ĩčƒ―č―ŽåŒ–äļšSUåš”åŠ›å•ä―ã€‚", "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.oil.desc": "č‹Ĩä― åœĻ旅途äļ­å‘įŽ°äŧŧä―•æēđį ‚įŸŋ或æē™æž äļ­įš„įŸģæēđ喷åĢå…ķåŪžåœĻLVé˜ķæŪĩäūŋåŊįĻåŠ åˆĐį”Ļ。\n\nä― åŊ将å…ķč―ŽåŒ–äļšé‡į‡ƒæēđį”Ļ乎锅į‚‰ïžŒæˆ–č€…å°†å…ķč―ŽåŒ–äļšæŸīæēđį”Ļ䚎内į‡ƒå‘į”ĩ朚。", "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.low_voltage.next_machines.title": "į”šč‡ģæ›īåĪšæœšå™Ļ", + "quests.low_voltage.next_machines.subtitle": "åĨ―戏垀圚", + "quests.low_voltage.next_machines.desc": "æ—Ēį„ķä― å·ē有几台朚å™ĻåœĻčŋč―ŽïžŒįŽ°åœĻæ˜Ŋæ—ķ候čŪĐåŪƒäŧŽæŠ•å…Ĩå·Ĩä―œäš†ã€‚\n\nåœĻ朎äŧŧåŠĄåģäū§åˆ—凚䚆äļ€äš›åŪŒå…ĻåŊ选įš„朚å™Ļ朎įŦ čŠ‚äļįŸĨčŋ˜čƒ―将åŪƒäŧŽæ”ūåœĻä―•åĪ„é™Īæ­Īäđ‹åĪ–įŧ„čĢ…æœščƒ―čŪĐį”ĩ子元äŧķæ›īäūŋåŪœïžŒč€ŒåŒ–å­Ķ反嚔釜、提取朚和æĩä―“å›šåŒ–æœšåˆ™čƒ―é™ä―ŽæĐĄčƒķ成朎。åŪŒæˆčŋ™äš›äđ‹åŽïžŒå‰Đäļ‹įš„&7LV&ré˜ķæŪĩå°ąäŧŧä― æŽĒįīĒ䚆", + "quests.low_voltage.food_machines.title": "éĢŸå“åŠ å·Ĩ朚å™Ļ", + "quests.low_voltage.food_machines.subtitle": "åŋŦéĪåģåˆŧäšŦį”Ļ", + "quests.low_voltage.food_machines.desc": "éĢŸå“åŠ å·Ĩ朚äļŽį”ĩįƒĪįŪąæ˜ŊäļĪ台äļ“é—Ļäļšé€‚配įūĪåģĶäž čŊīéĢŸį‰ĐįģŧįŧŸč€ŒčŪūčŪĄįš„åŪšåˆķ朚å™Ļ。\n\néĢŸå“åŠ å·Ĩæœščƒ―åĪŸåĪ„į†æ…æ‹ŒįĒ—配æ–đ、æąĪ、äļ‰æ˜Žæēŧ、į†åˆķã€č…Œåˆķ、éĢŽåđēâ€Ķâ€Ķä― čƒ―æƒģ到įš„åŪƒå‡ äđŽéƒ―čƒ―åšã€‚é™Ī乆įƒđéĨŠâ€”—é‚Ģæ˜Ŋį”ĩįƒĪįŪąįš„čŒčīĢ。\n\n腐įƒ‚į‰Đ销æŊčĶ†į›–æŋåŊäŧĨåŪ‰čĢ…åœĻäŧŧä―•æœšå™Ļ或čū“å…Ĩæ€ŧįšŋäļŠïžŒč‡ŠåŠĻ销æŊäŧŧä―•å˜čīĻįš„éĢŸį‰Đ。åŪƒčƒ―有效é˜ēæ­Ēä― įš„éĢŸį‰Đ臩åŠĻ化æĩæ°īįšŋ发į”Ÿå ĩåĄžïž", + "quests.low_voltage.bakelite.subtitle": "äšĶį§°čšæ°§åŸšč‹„埚į”ē埚äđ™äšŒé†‡é…â€Ķâ€ĶčŊ•čŊ•įœ‹čƒ―åŋŦ速åŋĩ乔遍äļ", + "quests.low_voltage.bakelite.desc.1": "ä― įš„įŽŽäļ€į§čšåˆį‰ĐïžåŠéœ€å°†é…šé†›æ ‘č„‚äļŽįŸģæĢ‰æˆ–é˜ē腐åˆĻ花æŋåĪåˆææ–™æ··åˆåģåŊåˆķ成。\n\nä― å°†ä―ŋį”Ļį”ĩæœĻæĨåˆķä―œé…šé†›į”ĩč·Ŋæŋ和MV朚å™ĻåĪ–åĢģ因æ­Īæ‰đ量į”Ÿäš§æ˜ŊäļŠåĨ―äļŧ意äļčŋ‡åˆ°&bMV&ré˜ķæŪĩä― å°†į”Ļ聚äđ™įƒŊæ›ŋäŧĢåŪƒã€‚\n\nįŽ°åœĻä― čŋ˜čŽ·åū—䚆äļ€į§æ›īäūŋåŪœįš„ULV和LV朚å™ĻåĪ–åĢģ配æ–đ", + "quests.low_voltage.bakelite.desc.2": "&l&3背æ™ŊįŸĨčŊ†ïžš&r&oį”ĩæœĻæ˜ŊįŽŽäļ€į§į”ąåˆæˆįŧ„分åˆķ成įš„åĄ‘æ–™ã€‚åŽ†åēäļŠįŽŽäļ€į§åĄ‘æ–™įš„æŪŠčĢåąžäšŽåļ•å…‹čū›ïžˆįĄåŒ–įšĪįŧīįī åĄ‘æ–™ïž‰ïžŒä―†å…ķ原料įĄåŒ–įšĪįŧīįī įš„合成é“ūčŋ‡é•ŋ——åŊđä―ŽåŽ‹é˜ķæŪĩæĨčŊīčŋ‡äšŽåĪæ‚。\n\nįŽŽäšŒį§åĄ‘æ–™æ˜Ŋ加拉åˆĐæ–Ŋïžˆé…Šč›‹į™―åĄ‘æ–™ïž‰ïžŒį”ąäđģ蛋į™―和į”ē醛åˆķæˆïžŒä―†į‰›åĨķįš„臊åŠĻ化į”Ÿäš§čūƒäļšå›°éšū。", + "quests.low_voltage.lv_forming_press.subtitle": "å†ē压朚嚊į”ĻäšŽåĄ‘å―Ēâ€Ķâ€Ķ", + "quests.low_voltage.lv_forming_press.desc": "čŋ™å°æœšå™Ļ通åļļį”Ļ途äļåĪšïžŒä―†åœĻTFGäļ­ïžŒåĶ‚æžœä― å› äŧŧä―•åŽŸå› äŧéœ€ä―ŋį”ĻTFCįš„į„ŠæŽĨ配æ–đåŪƒéƒ―åŊäŧĨ胜äŧŧ。åŪƒäđŸčƒ―č―ŧæūåĪåˆķäŧŧä―•æĻĄåĪī或æĻĄå…·ã€‚\n\næ›īčŋŦåœĻįœ‰įŦįš„æ˜Ŋ双å…ģčŊ­č§č°…ïž‰ïžŒä― éœ€čĶį”ĻåŪƒæĨåˆķä―œäļ‹äļ€é˜ķæŪĩį”ĩč·Ŋįš„å…ģé”Ūįŧ„äŧķ——&a酚醛į”ĩč·Ŋæŋ&r。\n\nčŋ›å…Ĩ&bMV&ré˜ķæŪĩåŽïžŒä― å°†čŽ·åū—äļ€äļŠæ›īäūŋåŪœįš„配æ–đ。", + "quests.low_voltage.lv_laser_engraver.subtitle": "biu biu", + "quests.low_voltage.lv_laser_engraver.desc": "åˆķä―œæœšæĒ°åŠĻ力į‰ĐæĩįģŧįŧŸæ‰€éœ€įš„发äŋĄįšŋ圈需čĶį”Ļ到埚įĄ€æŋ€å…‰čš€åˆŧ朚。é™Īæ­Īäđ‹åĪ–åŪƒį›Ū前įš„åŠŸčƒ―äļåĪšïžŒåŠčƒ―åˆķä―œįĢĻåˆķįŸģåĪī。\n\nå…ģ䚎æŋ€å…‰įš„æ›īåĪšåš”į”ĻčĶį­‰åˆ°&bMV&ré˜ķæŪĩ再åĪ„į†äš†ã€‚", "quests.medium_voltage": "&bMV&r - äļ­åŽ‹", "quests.medium_voltage.subtitle": "čŋ›å†›įŸģæēđ化å·Ĩįēūį‚žį”ĩ子技æœŊ", "quests.medium_voltage.mv_machine_hull.title": "æŽĒčŋŽæĨ到MV", @@ -3270,7 +3303,7 @@ "quests.medium_voltage.mv_component.desc": "&bMV&ré˜ķæŪĩ所需įŧ„äŧķæļ…单åĶ‚äļ‹ã€‚äļšå‡č―ŧčīŸæ‹…åŧščŪŪåŊđčŋ™äš›é›ķäŧķčŋ›čĄŒč‡ŠåŠĻ化或&dæ‰đ量合成&rå°Īå…ķæ˜Ŋ&aéĐŽčūū&r。\n\nį†Ÿæ‚‰&a发射å™Ļ&r吗朎é˜ķæŪĩįš„发射å™Ļ配æ–đ需čĶ&d无į‘•įš„įŧŋåŪįŸģ&rį›Ūå‰åŠčƒ―é€ščŋ‡&3į­›é€‰æœš&rčŽ·å–ã€‚\n\nč‹Ĩį”Ļä―œčĶ†į›–į‰ˆïžŒäž é€åļĶ、æģĩäļŽæœšæĒ°č‡‚均äļš&7LV&rį‰ˆæœŽįš„åŪžæ‰“åŪžå‡įš§ã€‚", "quests.medium_voltage.electrolyzer.title": "MVį”ĩč§Ģ朚", "quests.medium_voltage.electrolyzer.subtitle": "我äŧŽæˆåŠŸčŋ›å…Ĩ乆MVæ—ķäŧĢäļčŋ‡...", - "quests.medium_voltage.electrolyzer.desc.1": "&bčŋ™äļŠčŪūåĪ‡įœ‹čĩ·æĨåš”čŊĨåūˆį†Ÿæ‚‰&râ€”â€”ä― äđ‹å‰å·ēįŧč§čŋ‡åŪƒäš†ã€‚\n&2我äŧŽåžšįƒˆåŧščŪŪä― å°―åŋŦåˆķä―œåŪƒ&r因äļšåŪƒå°†č§Ģ锁åĪ§é‡æ–°įš„&7铝&ræĨ暐。\n\nåœĻæ­Īäđ‹å‰ïžŒä― å”Ŋäļ€čŽ·å–&7铝įē‰&rįš„æ–đæģ•æ˜Ŋ&9į”ĩč§Ģ蓝åŪįŸģ&r。\nä―†éšį€&bMV&rį”ĩč§Ģ朚įš„凚įŽ°ïžŒčĩ„暐įš„åˆĐį”Ļ将垀åŊå…Ļ新éĒ†åŸŸã€‚", + "quests.medium_voltage.electrolyzer.desc.1": "&bčŋ™äļŠčŪūåĪ‡įœ‹čĩ·æĨåš”čŊĨåūˆį†Ÿæ‚‰&râ€”â€”ä― äđ‹å‰å·ēįŧč§čŋ‡åŪƒäš†ã€‚\n&2我äŧŽåžšįƒˆåŧščŪŪä― å°―åŋŦåˆķä―œåŪƒ&r因äļšåŪƒå°†č§Ģ锁åĪ§é‡æ–°įš„&7铝&ræĨ暐。\n\nåœĻæ­Īäđ‹å‰ïžŒä― čŽ·å–&7铝įē‰&rįš„æ–đæģ•äŧ…限䚎&9į”ĩč§Ģ蓝åŪįŸģ&r和įŸŋįŸģ加å·Ĩįš„å‰Ŋ䚧į‰Đ。。\nä―†éšį€&bMV&rį”ĩč§Ģ朚įš„凚įŽ°ïžŒčĩ„暐įš„åˆĐį”Ļ将垀åŊå…Ļ新éĒ†åŸŸã€‚", "quests.medium_voltage.electrolyzer.desc.2": "&6äŧĨäļ‹æ˜Ŋäļ€äš›éœ€čĶåŊŧæ‰ūįš„å…ģé”Ū材料&r\n&9įšĒåŪįŸģ&r – 同æ—ķ提äū›&7铝&r和&5铮&r。\n&9镁铝æĶīįŸģ&r – 通åļļäļŽč“åŪįŸģįŸŋ脉äļ€čĩ·æ‰ū到。\n&9锂乑æŊ&r – 提äū›åĪ§é‡æœ‰äŧ·å€žįš„å‰Ŋ䚧į‰Đ选æ‹Đ。\n&9æ–đ钠įŸģ&r – 附åļĶ&3æ°Ŋ&r和&bįĄ…&r。\n&9éŧ„įŽ‰&r – äŧĨå›šä―“å―Ē垏䚧凚&3氟&r和&7铝&r。\n\n&2而čŋ™äŧ…äŧ…æ˜ŊäļŠåž€å§‹ïž&rä―ŋį”Ļ&aEMI&ræŽĒįīĒæ›īåĪšé€‰éĄđ——我äŧŽäŋčŊïžŒæœ‰åūˆåĪšäļœčĨŋį­‰į€ä― åŽŧ发įŽ°ã€‚\n\n&cå“ĶïžŒéĄšäūŋčŊīäļ€äļ‹ïžš&rį”ĩč§ĢéŧåœŸįŽ°åœĻčĒŦ锁åŪšåœĻ&6HV&räđ‹åŽã€‚\n&7我äŧŽåđķäļæŠąæ­‰ã€‚&r", "quests.medium_voltage.mv_extruder.title": "éŦ˜įš§åŽ‹æĻĄå™Ļ", "quests.medium_voltage.mv_extruder.subtitle": "ä― å°†čŋ›čĄŒæœ€é‡åĪ§įš„升įš§", @@ -3942,7 +3975,8 @@ "quests.steam_age.create_tools.desc": "ä―ŋį”Ļæ‰ģ手åŊäŧĨ通čŋ‡æ―œčĄŒ+åģé”Ū单å‡ŧæĨåŋŦ速æ‹ūčĩ·æœšæĒ°åŠĻ力æ–đå—ïžŒå―“į„ķį”Ļ斧或镐äđŸåŊäŧĨ。æˆīäļŠæŠĪį›Ūé•œåˆ™čƒ―čŪĐä― æŸĨįœ‹æœšå™Ļįš„æ›īčŊĶįŧ†äŋĄæŊäū‹åĶ‚åŪƒäŧŽäš§į”Ÿæˆ–æķˆč€—įš„嚔力。\n\nį›Ū前čŋ™äļĪæ ·å·Ĩå…·éƒ―åđķ非垚åˆķä―ŋį”ĻïžŒä―†åŪƒäŧŽäžšéžåļļ有į”ĻïžŒä― äđ‹åŽč‚ŊåŪšäžšéœ€čĶåŪƒäŧŽįš„。\n\nå…ģ䚎åđåˆķįŽŧį’ƒįš„åļŪåŠĐčŊ·æŸĨ阅 TFG 提įĪšįŦ čŠ‚ã€‚ä― įŸĨ道į”Ļé”Ī子į ī坏圆įŸģäžšå°†å…ķ变äļšæē™į ūïžŒå†æŽĄį ī坏æē™į ū则䞚变成æē™å­â€Ķâ€Ķ吗", "quests.steam_age.basic_millstone.title": "臩åŠĻ化įŸŋįŸģåĪ„į†", "quests.steam_age.basic_millstone.subtitle": "告åˆŦ手æŽĻįĢĻ", - "quests.steam_age.basic_millstone.desc": "&3įŸģįĢĻ&ræ˜Ŋ手æŽĻįĢĻįš„臊åŠĻ化į‰ˆæœŽã€‚ä― åŊäŧĨ把äŧŧä―•ä― æƒģįē‰įĒŽįš„äļœčĨŋäŧŽéĄķéƒĻ扔čŋ›åŽŧį„ķ后åģé”Ū单å‡ŧ取凚įē‰įĒŽåŽįš„į‰Đ品。åĶ‚æžœä― į›īæŽĨ把åŪƒčŋžæŽĨ到åŠĻį‰Đæ›ē柄äļŠïžŒåŪƒäžšį›ļå―“æ…ĒïžŒä―†ä― åŊäŧĨä―ŋį”Ļé―ŋč―ŪæŊ”æĨ提éŦ˜åŪƒįš„速åšĶ。\n\nčŊ·æģĻ意䚧凚į‰Đäŧ…䞚凚įŽ°åœĻįŽŽäļ€äļŠæ§―ä―ã€‚å…ķä―™æ§―ä―åąžäšŽæ žé›·į§‘技朚åˆķįš„äļ€éƒĻ分åœĻ&6HV&ré˜ķæŪĩå‰éƒ―æ— éœ€å…ģæģĻ。", + "quests.steam_age.basic_millstone.desc.1": "&3įŸģįĢĻ&ræ˜Ŋ手æŽĻįĢĻįš„臊åŠĻ化į‰ˆæœŽã€‚ä― åŊäŧĨ把äŧŧä―•ä― æƒģįē‰įĒŽįš„äļœčĨŋäŧŽéĄķéƒĻ扔čŋ›åŽŧį„ķ后åģé”Ū单å‡ŧ取凚įē‰įĒŽåŽįš„į‰Đ品。åĶ‚æžœä― į›īæŽĨ把åŪƒčŋžæŽĨ到åŠĻį‰Đæ›ē柄äļŠïžŒåŪƒäžšį›ļå―“æ…ĒïžŒä―†ä― åŊäŧĨåˆĐį”Ļé―ŋč―ŪæŊ”æĨ提éŦ˜åŪƒįš„速åšĶ。\n\nčŊ·æģĻ意䚧凚į‰Đäŧ…䞚凚įŽ°åœĻįŽŽäļ€äļŠæ§―ä―ã€‚å…ķä―™æ§―ä―åąžäšŽæ žé›·į§‘技朚åˆķįš„äļ€éƒĻ分åœĻ&6HV&ré˜ķæŪĩå‰éƒ―æ— éœ€å…ģæģĻ。", + "quests.steam_age.basic_millstone.desc.2": "&l&3背æ™ŊįŸĨčŊ†ïžš&r&oįŸģįĢĻäđ‹æ‰€äŧĨäļčƒ―å°†č°·į‰ĐįĢĻ成éĒįē‰ïžŒæ˜Ŋ因äļšæœšæĒ°åŠĻ力æĻĄįŧ„æ— æģ•æ­ĢįĄŪåĪ„į†įūĪåģĶäž čŊīäļ­įš„éĢŸį‰Đ腐čīĨ朚åˆķ——æ­Ī前čŋ™æ›ū垕发各į§é—ŪéĒ˜ïžŒæŊ”åĶ‚腐įƒ‚éĢŸį‰Đ变新éēœæˆ–æ–°éēœéĢŸį‰Đį›īæŽĨ腐įƒ‚。åœĻ&7LVé˜ķæŪĩ&rč§Ģ锁éĢŸå“åŠ å·Ĩ朚äđ‹å‰ïžŒä― äŧéœ€é€ščŋ‡į ”é’ĩåœĻ合成栏里加å·Ĩč°·į‰Đ。", "quests.steam_age.horse_crank.title": "ä― įš„įŽŽäļ€äļŠåŠĻ力暐", "quests.steam_age.horse_crank.subtitle": "čŪĐä― įš„į‰ēį•œäŧ˜į§Ÿé‡‘", "quests.steam_age.horse_crank.desc.1": "&3åŠĻį‰Đæ›ē柄&r æ˜Ŋä― įŽŽäļ€äļŠåŊ获åū—įš„朚æĒ°åŠĻ力暐。čĶä―ŋį”ĻåŪƒïžŒå°†æ›ē柄æ”ūåœĻäļ€äļŠ7x7æļ…įĐšåŒšåŸŸįš„äļ­åŋƒïžŒåđķį”Ļæ‹īįŧģ将åŠĻį‰Đæ‹īåœĻäļŠéĒ。äļåŒįš„åŠĻį‰Đ䞚提äū›äļåŒæ•°é‡įš„åŠĻåŠ›ïžŒč€Œäļ‹éĒįš„æ–đ块䞚åĒžåŠ čū“凚åŠĻ力įš„速åšĶ。åĪšäļŠæ›ē柄įš„匚域åŊäŧĨ重叠。\n\nä― åŊčƒ―éœ€čĶæ‰‹æŒįŽŽäšŒæ đæ‹īįŧģæĨæ‹īä―åŠĻį‰Đ。", @@ -4102,7 +4136,7 @@ "quests.steam_age.resin_boards.desc": "æēĄæƒģ到吧树æķē采集å™ĻåŊį›īæŽĨ将æķēä―“æŧīå…Ĩæ žé›·į§‘技įŪĄé“äļŽæĄķįŽ°åœĻä― æŽŒæĄčŋ™äļŠæŠ€å·§äš†ïž", "quests.steam_age.circuit_boards.title": "į”ĩ子å­Ķ #2ïžšį”ĩč·Ŋ埚æŋ", "quests.steam_age.circuit_boards.subtitle": "æ›īįŪ€æ˜“įš„į”ĩč·Ŋ元äŧķ", - "quests.steam_age.circuit_boards.desc": "将čĶ†č†œį”ĩč·Ŋ埚æŋäļŽé“œåŊžįšŋįŧ„åˆïžŒä― å°ąæœ‰äš†įŽŽäļ€äļŠ&aį”ĩč·Ŋ&rįš„埚įĄ€ïž", + "quests.steam_age.circuit_boards.desc": "通čŋ‡åœĻ&3å·Ĩ匠台&räļŠčŋ›čĄŒäļ€äš›įēūįŧ†æ“ä―œïžŒä― åŊäŧĨ将čŋ™äš›čĶ†č†œį”ĩč·Ŋ埚æŋäļŽé“œåŊžįšŋįŧ„合åˆķé€ å‡šä― įš„įŽŽäļ€å—&aį”ĩč·Ŋæŋ&r\n\nå·Ĩ匠台įš„å·Ĩä―œåŽŸį†äļŽæ•ēåˆķįąŧäžžïžŒä―†æ­ĪæŽĄéœ€čĶéĒåĪ–æ”ūå…Ĩį‰Đ品和å·Ĩ具。", "quests.steam_age.vacuum_chamber.title": "įœŸįй腔åŪĪ", "quests.steam_age.vacuum_chamber.subtitle": "äļšįœŸįĐšįŪĄčĩ‹äšˆįœŸįĐšį‰đ性", "quests.steam_age.vacuum_chamber.desc": "čŋ™å°æœšå™Ļæ˜Ŋåˆķä―œéĶ–æ‰đįœŸįĐšįŪĄįš„最įŧˆæ­ĨéŠĪ。将å…ķį―Ū䚎å·Ĩä―œį›†äļŠæ–đåđķæŽĨ通嚔力同æ—ķįĄŪäŋæœšå™ĻčŪūį―ŪäļšįœŸįĐšæĻĄåžã€‚\n\nčŊĨčŪūåĪ‡åœĻ受æœĻį‚­į‚‰æˆ–įƒˆį„°äššį‡ƒįƒ§åŪĪ加įƒ­æ—ķčŋ˜åŊį”Ļ䚎æķē化čƒķæ°īäļŽæĐĄčƒķ。", @@ -4133,7 +4167,7 @@ "quests.steam_age.rolling_mill.desc.2": "&l&3背æ™ŊįŸĨčŊ†ïžš&r &očŊĨ朚å™ĻåœĻ旧į‰ˆTFGäļ­å°ąå·ē存åœĻïžŒä―†å―“æ—ķį”Ÿäš§įš„æ˜Ŋé‡‘åąžæ†č€ŒéžæŋæïžŒč€ŒåœĻLV卷æŋ朚é—Ūäļ–äđ‹å‰ïžŒåˆķä―œæŋ材įš„最ä―ģæ–đæĄˆįŦŸæœ‰20%%įš„åĪąčīĨæĶ‚įŽ‡ïž&r", "quests.steam_age.steel_mixer.title": "é’ĒåŠĻ力搅拌å™Ļ", "quests.steam_age.steel_mixer.subtitle": "LV搅拌朚įš„æ—Đ期į‰ˆæœŽ", - "quests.steam_age.steel_mixer.desc": "&3é’ĒåŠĻ力搅拌å™Ļ&ræ˜Ŋč’ļæą―æ—ķäŧĢåĶäļ€å°å€žåū—åˆķ造įš„éĄķ尖čŪūåĪ‡â€”—åŪƒčƒ―äŧĨčŋœčƒœåĐ埚įš„效įŽ‡æ··åˆå„įąŧå―Đč‰ēé’Ēįē‰ïžæ­ĪåĪ–čŋ˜čƒ―æ‰§čĄŒåĪ§é‡å…ķäŧ–配æ–đ包拎某䚛æķ‰åŠæ°”ä―“įš„反嚔â€Ķâ€Ķäļåŋ…æ·ąįĐķå…ķ原į†ã€‚\n\n需čĶåŠ įƒ­įš„配æ–đåŊä―ŋį”ĻæœĻį‚­į‚‰æˆ–įƒˆį„°äššį‡ƒįƒ§åŪĪ提äū›įƒ­æšïžŒåđķ通čŋ‡æœšæĒ°č‡‚åŪžįŽ°č‡ŠåŠĻæ·ŧ料。", + "quests.steam_age.steel_mixer.desc": "&3é’ĒåŠĻ力搅拌å™Ļ&ræ˜Ŋč’ļæą―æ—ķäŧĢåĶäļ€å°å€žåū—åˆķ造įš„éĄķ尖čŪūåĪ‡â€”—åŪƒčƒ―äŧĨčŋœčƒœåĐ埚įš„效įŽ‡æ··åˆå„įąŧéŧ‘é’Ēįē‰ïžé—æ†ūįš„æ˜ŊåŪƒæ— æģ•į›īæŽĨåˆķä―œįšĒé’Ēæˆ–č“é’Ēįē‰ïžŒä―†čƒ―åĪŸį”Ÿäš§åŪƒäŧŽįš„&a脆é’Ēį‰ˆæœŽ&r。\n\næ­ĪåĪ–čŋ˜čƒ―æ‰§čĄŒåĪ§é‡å…ķäŧ–配æ–đ包拎某䚛æķ‰åŠæ°”ä―“įš„反嚔â€Ķâ€Ķäļåŋ…æ·ąįĐķå…ķ原į†ã€‚\n\n需čĶåŠ įƒ­įš„配æ–đåŊä―ŋį”ĻæœĻį‚­į‚‰æˆ–įƒˆį„°äššį‡ƒįƒ§åŪĪ提äū›įƒ­æšïžŒåđķ通čŋ‡æœšæĒ°č‡‚åŪžįŽ°č‡ŠåŠĻæ·ŧ料。", "quests.steam_age.potin.title": "įē—青铜įŪĄé“商â€Ķâ€Ķ", "quests.steam_age.potin.subtitle": "â€Ķâ€Ķ我čĶäļŠæˆ˜åœšäš†ïžŒåŠéœ€čĶä― æœ€åĨ―įš„įē—青铜合金。", "quests.steam_age.potin.desc.1": "&dįē—青铜合金æĩä―“įŪĄé“&råœĻå―“å‰ææ–™į­‰įš§äļ­æ‹Ĩ有&a极éŦ˜įš„性äŧ·æŊ”äļŽåžåé‡&r。č‹Ĩæƒģ䞘化æĩä―“čū“送įģŧįŧŸïžŒåŧščŪŪ考虑åˆķä―œæ­ĪįąŧįŪĄé“。\n\nčĶčŽ·å–&dįē—青铜合金&rčŊ·å…ˆåˆæˆå…ķ&eįē‰æœŦ&rå―Ē态。\n\n朎äŧŧåŠĄčĶæą‚åˆķä―œįŧ†åū„或标准尚åŊļįš„įŪĄé“åŪŒæˆäŧŧ意尚åŊļåģåŊ。", @@ -4153,7 +4187,7 @@ "quests.steam_age.what_next.desc": "č‹Ĩä― į›īæŽĨåŋŦ速æŽĻčŋ›č‡ģæ­ĪåŧščŪŪ䞘先åˆķ造LV卷æŋ朚、įšŋæč―§æœšæˆ–æ…æ‹Œå™Ļį­‰čŪūåĪ‡ã€‚\nč‹Ĩå·ēåˆķä―œäš†äļ‹éĒįš„åŠĻčƒ―æœšå™Ļ则åŧščŪŪ选æ‹Đįŧ„čĢ…朚、į”ĩ垧į‚‰ã€åŒ–å­Ķ反嚔釜或įĢåŒ–朚。", "quests.steam_age.alternator.title": "äšĪæĩå‘į”ĩ朚", "quests.steam_age.alternator.subtitle": "å°†åš”åŠ›č―ŽåŒ–äļšį”ĩ力", - "quests.steam_age.alternator.desc.1": "č‹Ĩä― å·ē搭åŧšäš†č§„æĻĄåŊ观įš„č’ļæą―æ—ķäŧĢčŪūåĪ‡ïžŒåĪ§åŊäļåŋ…äļšäš†æ”đį”Ļ锅į‚‰å’ŒLVč’ļæą―æķĄč―Ū而įŦ‹åģ将å…ķå…ĻéƒĻ拆é™Ī。&3äšĪæĩå‘į”ĩ朚&rčƒ―åĪŸå°†č’ļæą―åž•æ“Žäš§į”Ÿįš„åš”åŠ›å•ä―č―ŽåŒ–äļšį”ĩ力。æŊå°č’ļæą―åž•æ“Žé…åˆäšĪæĩå‘į”ĩ朚åŊčū“凚1åŪ‰LVį”ĩæĩïž\n\nä―†éœ€æģĻ意äšĪæĩå‘į”ĩ朚æ˜Ŋå°†åš”åŠ›č―ŽæĒäļšäš†åĶäļ€åĨ—į”ĩ力įģŧįŧŸïžˆFE因æ­Īä― éœ€čĶé€ščŋ‡čƒ―é‡č―ŽæĒå™Ļ将å…ķč―ŽåŒ–äļšæ žé›·į§‘技åŊį”Ļįš„LVį”ĩ力EU。čŪ°åū—į”Ļč―Ŋ槌将å…ķ切æĒč‡ģ\"FEč―ŽEU\"æĻĄåžã€‚", + "quests.steam_age.alternator.desc.1": "č‹Ĩä― å·ē搭åŧšäš†č§„æĻĄåŊ观įš„č’ļæą―æ—ķäŧĢčŪūåĪ‡ïžŒåĪ§åŊäļåŋ…äļšäš†æ”đį”Ļ锅į‚‰å’ŒLVč’ļæą―æķĄč―Ū而įŦ‹åģ将å…ķå…ĻéƒĻ拆é™Ī。&3äšĪæĩå‘į”ĩ朚&rčƒ―åĪŸå°†č’ļæą―åž•æ“Žäš§į”Ÿįš„åš”åŠ›å•ä―č―ŽåŒ–äļšį”ĩ力。æŊå°č’ļæą―åž•æ“Žé…åˆäšĪæĩå‘į”ĩ朚åŊčū“凚1åŪ‰&7LV&rį”ĩæĩïž\n\nä―†éœ€æģĻ意äšĪæĩå‘į”ĩ朚æ˜Ŋå°†åš”åŠ›č―ŽæĒäļšäš†åĶäļ€åĨ—į”ĩ力įģŧįŧŸïžˆFE因æ­Īä― éœ€čĶé€ščŋ‡čƒ―é‡č―ŽæĒå™Ļ将å…ķč―ŽåŒ–äļšæ žé›·į§‘技åŊį”Ļįš„&7LV&rį”ĩ力EU。čŪ°åū—į”Ļč―Ŋ槌将å…ķ切æĒč‡ģ&a\"FEč―ŽEU\"&ræĻĄåžã€‚", "quests.steam_age.alternator.desc.2": "äļ€äļŠč’ļæą―åž•æ“Žčū“凚8åŪ‰LVį”ĩæĩįš„įĪšäū‹ïž\n", "quests.steam_age.packager.title": "朚æĒ°åŠĻ力į‰Đæĩ", "quests.steam_age.packager.subtitle": "“我äŧŽåŪķ有AE2”", @@ -4340,6 +4374,7 @@ "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.desc.3": "čŊ·åŠĄåŋ…čŋœįĶŧäŧŧä―•å…·æœ‰&cč‡īį™Œæ€§&r或&cæ”ū射性&rįš„į‰ĐčīĻ——åœĻä― čƒ―åĪŸäšŽ&7LV&ré˜ķæŪĩåˆķä―œå‡šåŊđäđ™é…°æ°Ļ埚酚äđ‹å‰ïžŒčŋ™äš›čīŸéĒįŠķ态将æ˜Ŋ&eæ°ļäđ…性&rįš„。", "quests.stone_age.medical_conditions.task": "åšč‡Šå·ąįš„åŒŧį”Ÿ", "quests.stone_age.copper_for_anvil.title": "äļšåˆķä―œį §å‡†åĪ‡é“œé”­", "quests.stone_age.copper_for_anvil.subtitle": "ä― æœ€åĨ―äđ æƒŊ垄到14äļŠæŸį§é”­ã€‚", @@ -4924,6 +4959,9 @@ "quests.tfg_tips.greenhouse_automation.title": "æļĐåŪĪ臩åŠĻ化", "quests.tfg_tips.greenhouse_automation.subtitle": "集䞗力䚎äļ€čšŦâ€Ķâ€Ķ", "quests.tfg_tips.greenhouse_automation.desc": "通čŋ‡įŧ“合Firmalifeįš„&2采摘å™Ļ&räļŽ&2æļ…æ‰Ŧå™Ļ&r、朚æĒ°åŠĻ力įš„朚æĒ°č‡‚、äŧĨ及栞雷į§‘技įš„į‰Đ品æ”ķ集å™ĻïžŒä― åŪŒå…ĻåŊäŧĨåŪžįŽ°æļĐåŪĪįš„å…Ļ臩åŠĻ化čŋčĄŒïž\n\n&2采摘å™Ļ&råœĻæ”ķ到įšĒįŸģ脉å†ēæ—ķ䞚äŧŽæ°īåŸđį§æĪį›†å’Œå››æ§―į§æĪį›†äļ­é‡‡æ‘˜æˆį†Ÿä―œį‰Đïž›č€Œ&2æļ…æ‰Ŧå™Ļ&råœĻčŋžæŽĨįšĒįŸģäŋĄå·æ—ķ䞚æ”ķå‰ēå…ķå‘Ļå›ī3x3匚域内å…ķäŧ–įąŧ型į§æĪį›†äļ­įš„成į†Ÿä―œį‰Đ。\n\nčŋ™äš›æœšå™Ļäžšäš§å‡šæŽ‰č―į‰Đå―Ē垏įš„į‰Đå“ïžŒč€Œį‰Đ品æ”ķ集å™Ļčƒ―åļ附å…ķå‘Ļå›īåĪ§čŒƒå›ī内įš„čŋ™äš›į‰Đ品。\n\n最后通čŋ‡įŪĄé“å°†į§å­é€å›žæœšæĒ°č‡‚åģåŊ重新į§æĪåˆ°į§æĪį›†äļ­ïž", + "quests.tfg_tips.food_automation.title": "éĢŸå“č‡ŠåŠĻ化", + "quests.tfg_tips.food_automation.subtitle": "臩åŠĻåŒ–ä― įš„åŽĻæˆŋ。", + "quests.tfg_tips.food_automation.desc": "äŧŽ&7LV&ré˜ķæŪĩåž€å§‹ïžŒä― å°ąåŊäŧĨä―ŋį”Ļ&3į”ĩįƒĪįŪą&r和&3éĢŸå“åŠ å·Ĩ朚&ræĨåŪžįŽ°éĢŸį‰Đįš„åŪŒå…Ļ臩åŠĻ化į”Ÿäš§ã€‚\n\näļšäš†åœĻéĢŸå“åŠ å·Ĩ朚äļ­æ­ĢįĄŪä―ŋį”ĻåĪšį§åŽŸæ–™åˆķä―œéĢŸį‰Đäū‹åĶ‚äļ‰æ˜Žæēŧïž‰ïžŒä― éœ€čĶä―ŋį”Ļ&3朚æĒ°č‡‚&råđķ垀åŊ“äŋæŒčĄĨįŧ™â€æŒ‰é’Ūïžˆæˆ–č€…åˆĐį”Ļ朚æĒ°åŠĻ力į‰Đæĩå°†įēūįĄŪ数量įš„åŽŸæ–™é…é€åˆ°ä― įš„朚å™Ļäļ­ïž‰ã€‚\n\näļšäš†é˜ēæ­Ē腐įƒ‚įš„éĢŸį‰Đ堆æŧĄä― įš„å­˜å‚ĻįĐšé—īïžŒä― åš”čŊĨä―ŋį”Ļ&3腐įƒ‚į‰Đ销æŊčĶ†į›–æŋ&r。\n\nčŋ™åœĻ后期将äļŽ&bMV&ré˜ķæŪĩįš„į”ĩ冰įŪąåŪŒįūŽé…åˆã€‚", "quests.tfg_tips.beekeeping.title": "å…ŧ蜂", "quests.tfg_tips.beekeeping.subtitle": "åŪƒäŧŽįŽ°åœĻčŋ™äđˆå°...", "quests.tfg_tips.beekeeping.desc": "&bå…ŧ蜂&r有į€čŊļåĪšį”Ļé€”ã€‚čœœčœ‚äļäŧ…čƒ―įŧ™é™„čŋ‘įš„ä―œį‰Đ授įē‰ïžˆéœ€å…·åĪ‡į›ļåš”į‰đæ€§ïž‰ïžŒä― čŋ˜čƒ―äŧŽäļ­čŽ·å–&a蜜蜡&r和&a蜂蜜&rį­‰åŪžį”Ļčĩ„暐。通čŋ‡åŸđč‚ēåŊæå‡čœœčœ‚įš„各éĄđåąžæ€§ã€‚\n&2野åĪ–指南&råŊđ&bå…ŧ蜂&rįš„所有朚åˆķ提äū›äš†čŊĶå°―įš„č§ĢčŊī。", diff --git a/kubejs/assets/tfg/models/block/artisan_table.json b/kubejs/assets/tfg/models/block/artisan_table.json new file mode 100644 index 000000000..c1b27c983 --- /dev/null +++ b/kubejs/assets/tfg/models/block/artisan_table.json @@ -0,0 +1,469 @@ +{ + "format_version": "1.9.0", + "credit": "Made with Blockbench", + "texture_size": [32, 32], + "render_type": "minecraft:cutout", + "textures": { + "0": "tfg:block/artisan_table", + "particle": "#0" + }, + "elements": [ + { + "from": [0.98, 0, 1], + "to": [2.98, 17, 3], + "rotation": {"angle": 0, "axis": "y", "origin": [3, 1, 3]}, + "faces": { + "north": {"uv": [15, 0, 16, 8], "texture": "#0"}, + "east": {"uv": [15, 0, 16, 8], "texture": "#0"}, + "south": {"uv": [15, 0, 16, 8], "texture": "#0"}, + "west": {"uv": [15, 0, 16, 8], "texture": "#0"}, + "up": {"uv": [3.5, 2.5, 2.5, 1.5], "texture": "#0"}, + "down": {"uv": [3.5, 2.5, 2.5, 1.5], "texture": "#0"} + } + }, + { + "from": [1, 0, 12], + "to": [3, 13, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [3, 1, 14]}, + "faces": { + "north": {"uv": [15, 1.5, 16, 8], "texture": "#0"}, + "east": {"uv": [15, 1.5, 16, 8], "texture": "#0"}, + "south": {"uv": [15, 1.5, 16, 8], "texture": "#0"}, + "west": {"uv": [15, 1.5, 16, 8], "texture": "#0"}, + "up": {"uv": [3.5, 2.5, 2.5, 1.5], "texture": "#0"}, + "down": {"uv": [3.5, 2.5, 2.5, 1.5], "texture": "#0"} + } + }, + { + "from": [13, 0, 12], + "to": [15, 13, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [15, 1, 14]}, + "faces": { + "north": {"uv": [15, 1.5, 16, 8], "texture": "#0"}, + "east": {"uv": [15, 1.5, 16, 8], "texture": "#0"}, + "south": {"uv": [15, 1.5, 16, 8], "texture": "#0"}, + "west": {"uv": [15, 1.5, 16, 8], "texture": "#0"}, + "up": {"uv": [3.5, 2.5, 2.5, 1.5], "texture": "#0"}, + "down": {"uv": [3.5, 2.5, 2.5, 1.5], "texture": "#0"} + } + }, + { + "from": [13.02, 0, 1], + "to": [15.02, 17, 3], + "rotation": {"angle": 0, "axis": "y", "origin": [15.1, 1, 3]}, + "faces": { + "north": {"uv": [15, 0, 16, 8], "texture": "#0"}, + "east": {"uv": [15, 0, 16, 8], "texture": "#0"}, + "south": {"uv": [15, 0, 16, 8], "texture": "#0"}, + "west": {"uv": [15, 0, 16, 8], "texture": "#0"}, + "up": {"uv": [3.5, 2.5, 2.5, 1.5], "texture": "#0"}, + "down": {"uv": [3.5, 2.5, 2.5, 1.5], "texture": "#0"} + } + }, + { + "from": [0.5, 3, 14], + "to": [3.5, 15, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [2.5, 3, 16]}, + "faces": { + "north": {"uv": [0, 0, 1.5, 6], "texture": "#0"}, + "east": {"uv": [1.5, 0, 2.5, 6], "texture": "#0"}, + "south": {"uv": [0, 0, 1.5, 6], "texture": "#0"}, + "west": {"uv": [2.5, 0, 1.5, 6], "texture": "#0"}, + "up": {"uv": [2.5, 0, 4, 1], "texture": "#0"}, + "down": {"uv": [2.5, 1, 4, 0], "texture": "#0"} + } + }, + { + "from": [0.4, 13.1, 14.5], + "to": [3.6, 15.1, 15.5], + "rotation": {"angle": 0, "axis": "y", "origin": [3.5, 14.1, 15.5]}, + "faces": { + "north": {"uv": [14.5, 15, 16, 16], "texture": "#0"}, + "east": {"uv": [3.5, 1, 4, 1.5], "texture": "#0"}, + "south": {"uv": [14.5, 15, 16, 16], "texture": "#0"}, + "west": {"uv": [2.5, 1, 3.5, 1.5], "texture": "#0"}, + "up": {"uv": [4, 1.5, 2.5, 1], "texture": "#0"}, + "down": {"uv": [16, 16, 14.5, 15.5], "texture": "#0"} + } + }, + { + "from": [1.5, 7.5, 11], + "to": [2.5, 8.5, 17], + "rotation": {"angle": 0, "axis": "y", "origin": [2.5, 7.5, 17]}, + "faces": { + "north": {"uv": [0, 6, 0.5, 6.5], "texture": "#0"}, + "east": {"uv": [3, 6, 0, 6.5], "texture": "#0"}, + "south": {"uv": [2.5, 6, 3, 6.5], "texture": "#0"}, + "west": {"uv": [0, 6, 3, 6.5], "texture": "#0"}, + "up": {"uv": [0, 6.5, 3, 6], "rotation": 90, "texture": "#0"}, + "down": {"uv": [3, 6.5, 0, 6], "rotation": 90, "texture": "#0"} + } + }, + { + "from": [0.6, 5.7, 16.5], + "to": [1.6, 9.7, 16.5], + "rotation": {"angle": -22.5, "axis": "z", "origin": [1.6, 5.7, 16.5]}, + "faces": { + "north": {"uv": [0, 6, 2, 6.5], "rotation": 90, "texture": "#0"}, + "east": {"uv": [15.5, 15.5, 16, 16], "texture": "#0"}, + "south": {"uv": [0, 6, 2, 6.5], "rotation": 90, "texture": "#0"}, + "west": {"uv": [15.5, 15.5, 16, 16], "texture": "#0"}, + "up": {"uv": [16, 16, 15.5, 15.5], "texture": "#0"}, + "down": {"uv": [16, 15.5, 15.5, 16], "texture": "#0"} + } + }, + { + "from": [13.5, 9, 3], + "to": [14.5, 13, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [14.5, 11, 11]}, + "faces": { + "north": {"uv": [9.5, 0, 10, 2], "texture": "#0"}, + "east": {"uv": [5.5, 0, 10, 2], "texture": "#0"}, + "south": {"uv": [5.5, 0, 6, 2], "texture": "#0"}, + "west": {"uv": [5.5, 0, 10, 2], "texture": "#0"}, + "up": {"uv": [10, 0.5, 5.5, 0], "rotation": 90, "texture": "#0"}, + "down": {"uv": [5.5, 2, 10, 1.5], "rotation": 90, "texture": "#0"} + } + }, + { + "from": [1.5, 9, 3], + "to": [2.5, 13, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [2.5, 11, 11]}, + "faces": { + "north": {"uv": [9.5, 0, 10, 2], "texture": "#0"}, + "east": {"uv": [5.5, 0, 10, 2], "texture": "#0"}, + "south": {"uv": [5.5, 0, 6, 2], "texture": "#0"}, + "west": {"uv": [5.5, 0, 10, 2], "texture": "#0"}, + "up": {"uv": [10, 0.5, 5.5, 0], "rotation": 90, "texture": "#0"}, + "down": {"uv": [5.5, 2, 10, 1.5], "rotation": 90, "texture": "#0"} + } + }, + { + "from": [3, 9, 12.5], + "to": [7, 13, 13.5], + "rotation": {"angle": 0, "axis": "y", "origin": [4, 11, 13.5]}, + "faces": { + "north": {"uv": [6, 0, 8, 2], "texture": "#0"}, + "east": {"uv": [7.5, 0, 8, 2], "texture": "#0"}, + "south": {"uv": [6, 0, 8, 2], "texture": "#0"}, + "west": {"uv": [6, 0, 6.5, 2], "texture": "#0"}, + "up": {"uv": [8, 0.5, 6, 0], "rotation": 180, "texture": "#0"}, + "down": {"uv": [6, 2, 8, 1.5], "texture": "#0"} + } + }, + { + "from": [3, 9, 1.5], + "to": [13, 18, 2.5], + "rotation": {"angle": 0, "axis": "y", "origin": [12, 9, 3.5]}, + "faces": { + "north": {"uv": [10, 0, 15, 4.5], "texture": "#0"}, + "east": {"uv": [10, 0, 10.5, 4.5], "texture": "#0"}, + "south": {"uv": [15, 0, 10, 4.5], "texture": "#0"}, + "west": {"uv": [14.5, 0, 15, 4.5], "texture": "#0"}, + "up": {"uv": [15, 0.5, 10, 0], "texture": "#0"}, + "down": {"uv": [15, 4.5, 10, 4], "texture": "#0"} + } + }, + { + "from": [3, 7, 1], + "to": [13, 9, 3], + "rotation": {"angle": 0, "axis": "y", "origin": [12, 7, 3]}, + "faces": { + "north": {"uv": [15, 2.5, 16, 7.5], "rotation": 90, "texture": "#0"}, + "east": {"uv": [2.5, 1.5, 3.5, 2.5], "texture": "#0"}, + "south": {"uv": [15, 2.5, 16, 7.5], "rotation": 90, "texture": "#0"}, + "west": {"uv": [2.5, 1.5, 3.5, 2.5], "texture": "#0"}, + "up": {"uv": [16, 7.5, 15, 2.5], "rotation": 90, "texture": "#0"}, + "down": {"uv": [16, 7.5, 15, 2.5], "rotation": 90, "texture": "#0"} + } + }, + { + "from": [7, 9, 5.5], + "to": [13, 13, 14.5], + "rotation": {"angle": 0, "axis": "y", "origin": [13, 11, 14.5]}, + "faces": { + "north": {"uv": [0, 6.5, 3, 8.5], "texture": "#0"}, + "east": {"uv": [0.5, 12.5, 2.5, 8], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 6.5, 3, 8.5], "texture": "#0"}, + "west": {"uv": [2.5, 8, 0.5, 12.5], "rotation": 90, "texture": "#0"}, + "up": {"uv": [0, 8, 3, 12.5], "texture": "#0"}, + "down": {"uv": [0, 8, 3, 12.5], "texture": "#0"} + } + }, + { + "from": [8.5, 9.5, 14.5], + "to": [11.5, 11.5, 14.5], + "rotation": {"angle": -22.5, "axis": "x", "origin": [11.5, 11.5, 14.5]}, + "faces": { + "north": {"uv": [2.5, 2.5, 4, 3.5], "texture": "#0"}, + "east": {"uv": [15.5, 15.5, 16, 16], "texture": "#0"}, + "south": {"uv": [2.5, 2.5, 4, 3.5], "texture": "#0"}, + "west": {"uv": [15.5, 15.5, 16, 16], "texture": "#0"}, + "up": {"uv": [16, 16, 15.5, 15.5], "texture": "#0"}, + "down": {"uv": [16, 15.5, 15.5, 16], "texture": "#0"} + } + }, + { + "name": "mold", + "from": [6, 14.2, 5.5], + "to": [11, 14.2, 10.5], + "rotation": {"angle": 22.5, "axis": "y", "origin": [11, 14.2, 10.5]}, + "faces": { + "north": {"uv": [0, 1, 2.5, 1], "texture": "#0"}, + "east": {"uv": [0, 1, 2.5, 1], "texture": "#0"}, + "south": {"uv": [0, 1, 2.5, 1], "texture": "#0"}, + "west": {"uv": [0, 1, 2.5, 1], "texture": "#0"}, + "up": {"uv": [7, 15, 4.5, 12.5], "texture": "#0"}, + "down": {"uv": [2.5, 2.5, 0, 0], "texture": "#0"} + } + }, + { + "name": "top", + "from": [1, 13, 2], + "to": [15, 14, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 13, 6]}, + "faces": { + "north": {"uv": [15, 4.5, 8, 5], "texture": "#0"}, + "east": {"uv": [14.5, 4.5, 15, 10.5], "rotation": 90, "texture": "#0"}, + "south": {"uv": [8, 10, 15, 10.5], "texture": "#0"}, + "west": {"uv": [8.5, 10.5, 8, 4.5], "rotation": 90, "texture": "#0"}, + "up": {"uv": [8, 4.5, 15, 10.5], "texture": "#0"}, + "down": {"uv": [8, 10.5, 15, 4.5], "texture": "#0"} + } + }, + { + "name": "paper", + "from": [1.8, 14.1, 5.8], + "to": [10.8, 14.1, 12.8], + "rotation": {"angle": -22.5, "axis": "y", "origin": [8.8, 14.1, 12.8]}, + "faces": { + "north": {"uv": [15.5, 15.5, 16, 16], "texture": "#0"}, + "east": {"uv": [15.5, 16, 16, 15.5], "texture": "#0"}, + "south": {"uv": [15.5, 16, 16, 15.5], "texture": "#0"}, + "west": {"uv": [15.5, 15.5, 16, 16], "texture": "#0"}, + "up": {"uv": [0, 12.5, 4.5, 16], "texture": "#0"}, + "down": {"uv": [4.5, 16, 0, 12.5], "texture": "#0"} + } + }, + { + "from": [11, 14, 2.5], + "to": [12, 17, 3.5], + "rotation": {"angle": 0, "axis": "y", "origin": [12, 14, 3.5]}, + "faces": { + "north": {"uv": [3, 6, 3.5, 7.5], "texture": "#0"}, + "east": {"uv": [3, 6, 3.5, 7.5], "texture": "#0"}, + "south": {"uv": [3, 6, 3.5, 7.5], "texture": "#0"}, + "west": {"uv": [3, 6, 3.5, 7.5], "texture": "#0"}, + "up": {"uv": [3.5, 6.5, 3, 6], "texture": "#0"}, + "down": {"uv": [3.5, 7.5, 3, 7], "texture": "#0"} + } + }, + { + "from": [10.9, 17, 2.6], + "to": [11.9, 21, 2.6], + "rotation": {"angle": 45, "axis": "y", "origin": [11.9, 17, 2.6]}, + "faces": { + "north": {"uv": [3.5, 4, 4, 6], "texture": "#0"}, + "east": {"uv": [0, 1.5, 0, 3], "texture": "#0"}, + "south": {"uv": [3.5, 4, 4, 6], "texture": "#0"}, + "west": {"uv": [1, 1.5, 1, 3], "texture": "#0"}, + "up": {"uv": [0.5, 0, 0, 0], "texture": "#0"}, + "down": {"uv": [0.5, 1, 0, 1], "texture": "#0"} + } + }, + { + "from": [9.5, 14, 2.5], + "to": [10.5, 17, 3.5], + "rotation": {"angle": 0, "axis": "y", "origin": [10.5, 14, 3.5]}, + "faces": { + "north": {"uv": [3, 6, 3.5, 7.5], "texture": "#0"}, + "east": {"uv": [3, 6, 3.5, 7.5], "texture": "#0"}, + "south": {"uv": [3, 6, 3.5, 7.5], "texture": "#0"}, + "west": {"uv": [3, 6, 3.5, 7.5], "texture": "#0"}, + "up": {"uv": [3.5, 6.5, 3, 6], "texture": "#0"}, + "down": {"uv": [3.5, 7.5, 3, 7], "texture": "#0"} + } + }, + { + "from": [9.5, 17, 3], + "to": [10.5, 20, 3], + "rotation": {"angle": 45, "axis": "y", "origin": [10, 17, 3]}, + "faces": { + "north": {"uv": [3.5, 6, 4, 7.5], "texture": "#0"}, + "east": {"uv": [0, 1.5, 0, 3], "texture": "#0"}, + "south": {"uv": [3.5, 6, 4, 7.5], "texture": "#0"}, + "west": {"uv": [1, 1.5, 1, 3], "texture": "#0"}, + "up": {"uv": [0.5, 0, 0, 0], "texture": "#0"}, + "down": {"uv": [0.5, 1, 0, 1], "texture": "#0"} + } + }, + { + "from": [8, 14, 2.5], + "to": [9, 17, 3.5], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 14, 3.5]}, + "faces": { + "north": {"uv": [3, 6, 3.5, 7.5], "texture": "#0"}, + "east": {"uv": [3, 6, 3.5, 7.5], "texture": "#0"}, + "south": {"uv": [3, 6, 3.5, 7.5], "texture": "#0"}, + "west": {"uv": [3, 6, 3.5, 7.5], "texture": "#0"}, + "up": {"uv": [3.5, 6.5, 3, 6], "texture": "#0"}, + "down": {"uv": [3.5, 7.5, 3, 7], "texture": "#0"} + } + }, + { + "from": [8, 17, 3], + "to": [9, 20, 3], + "rotation": {"angle": 45, "axis": "y", "origin": [8.5, 17, 3]}, + "faces": { + "north": {"uv": [3.5, 6, 4, 7.5], "texture": "#0"}, + "east": {"uv": [0, 1.5, 0, 3], "texture": "#0"}, + "south": {"uv": [3.5, 6, 4, 7.5], "texture": "#0"}, + "west": {"uv": [1, 1.5, 1, 3], "texture": "#0"}, + "up": {"uv": [0.5, 0, 0, 0], "texture": "#0"}, + "down": {"uv": [0.5, 1, 0, 1], "texture": "#0"} + } + }, + { + "name": "cutter", + "from": [15, 9, 5.7], + "to": [15, 15, 11.7], + "rotation": {"angle": -45, "axis": "x", "origin": [15, 9, 11.7]}, + "faces": { + "north": {"uv": [15.5, 15.5, 16, 16], "texture": "#0"}, + "east": {"uv": [5, 2, 8, 5], "texture": "#0"}, + "south": {"uv": [15.5, 15.5, 16, 16], "texture": "#0"}, + "west": {"uv": [8, 2, 5, 5], "texture": "#0"}, + "up": {"uv": [0, 2, 0, 0], "texture": "#0"}, + "down": {"uv": [0, 2, 0, 0], "texture": "#0"} + } + }, + { + "from": [2.84814, 14.2, 5.84814], + "to": [7.84814, 15.2, 7.84814], + "rotation": {"angle": 0, "axis": "y", "origin": [2.84814, 14.2, 7.84814]}, + "faces": { + "north": {"uv": [5.5, 5, 6, 7.5], "rotation": 90, "texture": "#0"}, + "east": {"uv": [5, 5, 6, 5.5], "texture": "#0"}, + "south": {"uv": [5.5, 7.5, 5, 5], "rotation": 90, "texture": "#0"}, + "west": {"uv": [6, 7, 5, 7.5], "texture": "#0"}, + "up": {"uv": [6, 7.5, 5, 5], "rotation": 90, "texture": "#0"}, + "down": {"uv": [3.5, 6, 2.5, 3.5], "rotation": 270, "texture": "#0"} + } + }, + { + "from": [4, 15.96444, 5.84814], + "to": [5, 15.96444, 7.84814], + "rotation": {"angle": -22.5, "axis": "z", "origin": [3, 15.96444, 7.84814]}, + "faces": { + "north": {"uv": [15.5, 15.5, 16, 16], "texture": "#0"}, + "east": {"uv": [15.5, 15.5, 16, 16], "texture": "#0"}, + "south": {"uv": [15.5, 15.5, 16, 16], "texture": "#0"}, + "west": {"uv": [15.5, 15.5, 16, 16], "texture": "#0"}, + "up": {"uv": [7, 7.5, 6, 6.5], "rotation": 90, "texture": "#0"}, + "down": {"uv": [7, 7.5, 6, 6.5], "rotation": 270, "texture": "#0"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [75, 153, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "thirdperson_lefthand": { + "rotation": [75, -149, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "firstperson_righthand": { + "rotation": [0, -45, 0], + "scale": [0.4, 0.4, 0.4] + }, + "firstperson_lefthand": { + "rotation": [0, -45, 0], + "scale": [0.4, 0.4, 0.4] + }, + "ground": { + "translation": [0, 3, 0], + "scale": [0.25, 0.25, 0.25] + }, + "gui": { + "rotation": [30, 45, 0], + "scale": [0.625, 0.625, 0.625] + }, + "head": { + "rotation": [0, -180, 0], + "translation": [0, 6.75, 0], + "scale": [1.5, 1.5, 1.5] + }, + "fixed": { + "rotation": [0, 180, 0], + "translation": [0, 0, -2], + "scale": [0.5, 0.5, 0.5] + } + }, + "groups": [ + { + "name": "legs", + "origin": [12, 0, 12], + "color": 0, + "children": [0, 1, 2, 3] + }, + { + "name": "vise", + "origin": [12.5, 1, 1], + "color": 0, + "children": [4, 5, 6, 7] + }, + { + "name": "sides", + "origin": [2.5, 10, 5], + "color": 0, + "children": [8, 9, 10, 11, 12] + }, + { + "name": "drawer", + "origin": [4, 10, 2.5], + "color": 0, + "children": [13, 14] + }, + { + "name": "table_top", + "origin": [5, 13.2, 5.5], + "color": 0, + "children": [15, 16, 17] + }, + { + "name": "tool_rack", + "origin": [4, 13, 11.5], + "color": 0, + "children": [ + { + "name": "tool1", + "origin": [4, 13, 11.5], + "color": 0, + "children": [18, 19] + }, + { + "name": "tool2", + "origin": [4, 13, 11.5], + "color": 0, + "children": [20, 21] + }, + { + "name": "tool3", + "origin": [4, 13, 11.5], + "color": 0, + "children": [22, 23] + }, + 24, + { + "name": "plane", + "origin": [13.15186, 13, 8.15186], + "color": 0, + "children": [25, 26] + } + ] + } + ] +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/beryllium_sandy_frame.json b/kubejs/assets/tfg/models/block/beryllium_sandy_frame.json new file mode 100644 index 000000000..a3d8a6450 --- /dev/null +++ b/kubejs/assets/tfg/models/block/beryllium_sandy_frame.json @@ -0,0 +1,7 @@ +{ + "parent": "tfg:block/fission_component", + "textures": { + "infill": "tfg:block/fission/beryllium_sandy", + "frame": "tfg:block/empty_fission_frame" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/copper_sandy_frame.json b/kubejs/assets/tfg/models/block/copper_sandy_frame.json new file mode 100644 index 000000000..4606ec4e4 --- /dev/null +++ b/kubejs/assets/tfg/models/block/copper_sandy_frame.json @@ -0,0 +1,7 @@ +{ + "parent": "tfg:block/fission_component", + "textures": { + "infill": "tfg:block/fission/copper_sandy", + "frame": "tfg:block/empty_fission_frame" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/fission/beryllium_sandy.json b/kubejs/assets/tfg/models/block/fission/beryllium_sandy.json new file mode 100644 index 000000000..2c30ff07e --- /dev/null +++ b/kubejs/assets/tfg/models/block/fission/beryllium_sandy.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "tfg:block/fission/beryllium_sandy" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/fission/copper_sandy.json b/kubejs/assets/tfg/models/block/fission/copper_sandy.json new file mode 100644 index 000000000..fbbb7ade8 --- /dev/null +++ b/kubejs/assets/tfg/models/block/fission/copper_sandy.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "tfg:block/fission/copper_sandy" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/lunar_roots.json b/kubejs/assets/tfg/models/block/lunar_roots.json index cdb4e9ca0..dd0cf7f10 100644 --- a/kubejs/assets/tfg/models/block/lunar_roots.json +++ b/kubejs/assets/tfg/models/block/lunar_roots.json @@ -4,6 +4,101 @@ "ambientocclusion": "false", "textures": { "cross": "tfg:block/lunar_roots", + "emissive": "tfg:block/lunar_roots_e", "particle": "tfg:block/lunar_roots" - } + }, + "elements": [ + { + "from": [ 0.8, 0, 8 ], + "to": [ 15.2, 16, 8 ], + "rotation": { + "origin": [ 8, 8, 8 ], + "axis": "y", + "angle": 45, + "rescale": true + }, + "shade": false, + "faces": { + "north": { + "uv": [ 0, 0, 16, 16 ], + "texture": "#cross" + }, + "south": { + "uv": [ 0, 0, 16, 16 ], + "texture": "#cross" + } + } + }, + { + "from": [ 8, 0, 0.8 ], + "to": [ 8, 16, 15.2 ], + "rotation": { + "origin": [ 8, 8, 8 ], + "axis": "y", + "angle": 45, + "rescale": true + }, + "shade": false, + "faces": { + "west": { + "uv": [ 0, 0, 16, 16 ], + "texture": "#cross" + }, + "east": { + "uv": [ 0, 0, 16, 16 ], + "texture": "#cross" + } + } + }, + { + "from": [ 0.8, 0, 8 ], + "to": [ 15.2, 16, 8 ], + "rotation": { + "origin": [ 8, 8, 8 ], + "axis": "y", + "angle": 45, + "rescale": true + }, + "shade": false, + "forge_data": { + "block_light": 15, + "sky_light": 15 + }, + "faces": { + "north": { + "uv": [ 0, 0, 16, 16 ], + "texture": "#emissive" + }, + "south": { + "uv": [ 0, 0, 16, 16 ], + "texture": "#emissive" + } + } + }, + { + "from": [ 8, 0, 0.8 ], + "to": [ 8, 16, 15.2 ], + "rotation": { + "origin": [ 8, 8, 8 ], + "axis": "y", + "angle": 45, + "rescale": true + }, + "shade": false, + "forge_data": { + "block_light": 15, + "sky_light": 15 + }, + "faces": { + "west": { + "uv": [ 0, 0, 16, 16 ], + "texture": "#emissive" + }, + "east": { + "uv": [ 0, 0, 16, 16 ], + "texture": "#emissive" + } + } + } + ] } \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/machines/heat_battery_mk1.json b/kubejs/assets/tfg/models/block/machines/heat_battery_mk1.json new file mode 100644 index 000000000..192e82a14 --- /dev/null +++ b/kubejs/assets/tfg/models/block/machines/heat_battery_mk1.json @@ -0,0 +1,90 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "tfg:heat_battery_mk1", + "texture_overrides": { + "all": "tfg:block/casings/machine_casing_mars" + }, + "variants": { + "is_formed=false,recipe_logic_status=idle": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "tfg:block/casings/machine_casing_mars", + "overlay_front": "tfg:block/machines/bioreactor/overlay_front", + "overlay_front_emissive": "tfg:block/machines/bioreactor/overlay_front_emissive" + } + } + }, + "is_formed=false,recipe_logic_status=suspend": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "tfg:block/casings/machine_casing_mars", + "overlay_front": "tfg:block/machines/bioreactor/overlay_front", + "overlay_front_emissive": "tfg:block/machines/bioreactor/overlay_front_emissive" + } + } + }, + "is_formed=false,recipe_logic_status=waiting": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "tfg:block/casings/machine_casing_mars", + "overlay_front": "tfg:block/machines/bioreactor/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/bioreactor/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_mars", + "overlay_front": "tfg:block/machines/bioreactor/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/bioreactor/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_mars", + "overlay_front": "tfg:block/machines/bioreactor/overlay_front", + "overlay_front_emissive": "tfg:block/machines/bioreactor/overlay_front_emissive" + } + } + }, + "is_formed=true,recipe_logic_status=suspend": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "tfg:block/casings/machine_casing_mars", + "overlay_front": "tfg:block/machines/bioreactor/overlay_front", + "overlay_front_emissive": "tfg:block/machines/bioreactor/overlay_front_emissive" + } + } + }, + "is_formed=true,recipe_logic_status=waiting": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "tfg:block/casings/machine_casing_mars", + "overlay_front": "tfg:block/machines/bioreactor/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/bioreactor/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_mars", + "overlay_front": "tfg:block/machines/bioreactor/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/bioreactor/overlay_front_active_emissive" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/machines/ports/uv_smr_fluid_import_hatch.json b/kubejs/assets/tfg/models/block/machines/ports/uv_smr_fluid_import_hatch.json new file mode 100644 index 000000000..e98f3a5bb --- /dev/null +++ b/kubejs/assets/tfg/models/block/machines/ports/uv_smr_fluid_import_hatch.json @@ -0,0 +1,60 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "tfg:uv_smr_fluid_import_hatch", + "replaceable_textures": [ + "bottom", + "top", + "side" + ], +"variants": { + "is_formed=false,is_painted=false": { + "model": { + "parent": "gtceu:block/machine/template/part/hatch_machine_emissive", + "textures": { + "bottom": "tfg:block/casings/machine_casing_desh_ptfe", + "overlay": "gtceu:block/overlay/machine/overlay_fluid_hatch_input", + "overlay_emissive": "gtceu:block/overlay/machine/overlay_pipe_in_emissive", + "side": "tfg:block/casings/machine_casing_desh_ptfe", + "top": "tfg:block/casings/machine_casing_desh_ptfe" + } + } + }, + "is_formed=false,is_painted=true": { + "model": { + "parent": "gtceu:block/machine/template/part/hatch_machine_emissive_color_ring", + "textures": { + "bottom": "tfg:block/casings/machine_casing_desh_ptfe", + "overlay": "gtceu:block/overlay/machine/overlay_fluid_hatch_input", + "overlay_emissive": "gtceu:block/overlay/machine/overlay_pipe_in_emissive", + "side": "tfg:block/casings/machine_casing_desh_ptfe", + "top": "tfg:block/casings/machine_casing_desh_ptfe" + } + } + }, + "is_formed=true,is_painted=false": { + "model": { + "parent": "gtceu:block/machine/template/part/hatch_machine_emissive", + "textures": { + "bottom": "tfg:block/casings/machine_casing_desh_ptfe", + "overlay": "gtceu:block/overlay/machine/overlay_fluid_hatch_input", + "overlay_emissive": "gtceu:block/overlay/machine/overlay_pipe_in_emissive", + "side": "tfg:block/casings/machine_casing_desh_ptfe", + "top": "tfg:block/casings/machine_casing_desh_ptfe" + } + } + }, + "is_formed=true,is_painted=true": { + "model": { + "parent": "gtceu:block/machine/template/part/hatch_machine_emissive_color_ring", + "textures": { + "bottom": "tfg:block/casings/machine_casing_desh_ptfe", + "overlay": "gtceu:block/overlay/machine/overlay_fluid_hatch_input", + "overlay_emissive": "gtceu:block/overlay/machine/overlay_pipe_in_emissive", + "side": "tfg:block/casings/machine_casing_desh_ptfe", + "top": "tfg:block/casings/machine_casing_desh_ptfe" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/machines/smr_generator.json b/kubejs/assets/tfg/models/block/machines/smr_generator.json index bc0f0fd56..c93ec18d9 100644 --- a/kubejs/assets/tfg/models/block/machines/smr_generator.json +++ b/kubejs/assets/tfg/models/block/machines/smr_generator.json @@ -11,8 +11,8 @@ "parent": "gtceu:block/machine/template/cube_all/sided", "textures": { "all": "tfg:block/casings/machine_casing_desh_ptfe", - "overlay_front": "gtceu:block/multiblock/gcym/large_centrifuge/overlay_front", - "overlay_front_emissive": "gtceu:block/multiblock/gcym/large_centrifuge/overlay_front_emissive" + "overlay_front": "tfg:block/machines/smr/overlay_front", + "overlay_front_emissive": "gtceu:block/multiblock/generator/large_gas_turbine/overlay_front_emissive" } } }, @@ -21,8 +21,8 @@ "parent": "gtceu:block/machine/template/cube_all/sided", "textures": { "all": "tfg:block/casings/machine_casing_desh_ptfe", - "overlay_front": "gtceu:block/multiblock/gcym/large_centrifuge/overlay_front_paused", - "overlay_front_emissive": "gtceu:block/multiblock/gcym/large_centrifuge/overlay_front_paused_emissive" + "overlay_front": "tfg:block/machines/smr/overlay_front_paused", + "overlay_front_emissive": "gtceu:block/multiblock/generator/large_gas_turbine/overlay_front_paused_emissive" } } }, @@ -31,8 +31,8 @@ "parent": "gtceu:block/machine/template/cube_all/sided", "textures": { "all": "tfg:block/casings/machine_casing_desh_ptfe", - "overlay_front": "gtceu:block/multiblock/gcym/large_centrifuge/overlay_front_active", - "overlay_front_emissive": "gtceu:block/multiblock/gcym/large_centrifuge/overlay_front_active_emissive" + "overlay_front": "tfg:block/machines/smr/overlay_front_active", + "overlay_front_emissive": "gtceu:block/multiblock/generator/large_gas_turbine/overlay_front_active_emissive" } } }, @@ -41,8 +41,8 @@ "parent": "gtceu:block/machine/template/cube_all/sided", "textures": { "all": "tfg:block/casings/machine_casing_desh_ptfe", - "overlay_front": "gtceu:block/multiblock/gcym/large_centrifuge/overlay_front_active", - "overlay_front_emissive": "gtceu:block/multiblock/gcym/large_centrifuge/overlay_front_active_emissive" + "overlay_front": "tfg:block/machines/smr/overlay_front_active", + "overlay_front_emissive": "gtceu:block/multiblock/generator/large_gas_turbine/overlay_front_active_emissive" } } }, @@ -51,8 +51,8 @@ "parent": "gtceu:block/machine/template/cube_all/sided", "textures": { "all": "tfg:block/casings/machine_casing_desh_ptfe", - "overlay_front": "gtceu:block/multiblock/gcym/large_centrifuge/overlay_front", - "overlay_front_emissive": "gtceu:block/multiblock/gcym/large_centrifuge/overlay_front_emissive" + "overlay_front": "tfg:block/machines/smr/overlay_front", + "overlay_front_emissive": "gtceu:block/multiblock/generator/large_gas_turbine/overlay_front_emissive" } } }, @@ -61,8 +61,8 @@ "parent": "gtceu:block/machine/template/cube_all/sided", "textures": { "all": "tfg:block/casings/machine_casing_desh_ptfe", - "overlay_front": "gtceu:block/multiblock/gcym/large_centrifuge/overlay_front_paused", - "overlay_front_emissive": "gtceu:block/multiblock/gcym/large_centrifuge/overlay_front_paused_emissive" + "overlay_front": "tfg:block/machines/smr/overlay_front_paused", + "overlay_front_emissive": "gtceu:block/multiblock/generator/large_gas_turbine/overlay_front_paused_emissive" } } }, @@ -71,8 +71,8 @@ "parent": "gtceu:block/machine/template/cube_all/sided", "textures": { "all": "tfg:block/casings/machine_casing_desh_ptfe", - "overlay_front": "gtceu:block/multiblock/gcym/large_centrifuge/overlay_front_active", - "overlay_front_emissive": "gtceu:block/multiblock/gcym/large_centrifuge/overlay_front_active_emissive" + "overlay_front": "tfg:block/machines/smr/overlay_front_active", + "overlay_front_emissive": "gtceu:block/multiblock/generator/large_gas_turbine/overlay_front_active_emissive" } } }, @@ -81,8 +81,8 @@ "parent": "gtceu:block/machine/template/cube_all/sided", "textures": { "all": "tfg:block/casings/machine_casing_desh_ptfe", - "overlay_front": "gtceu:block/multiblock/gcym/large_centrifuge/overlay_front_active", - "overlay_front_emissive": "gtceu:block/multiblock/gcym/large_centrifuge/overlay_front_active_emissive" + "overlay_front": "tfg:block/machines/smr/overlay_front_active", + "overlay_front_emissive": "gtceu:block/multiblock/generator/large_gas_turbine/overlay_front_active_emissive" } } } diff --git a/kubejs/assets/tfg/models/item/americium_241_rod.json b/kubejs/assets/tfg/models/item/americium_241_rod.json new file mode 100644 index 000000000..5647785ec --- /dev/null +++ b/kubejs/assets/tfg/models/item/americium_241_rod.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "tfg:item/fission_rod/americium_241_rod" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/artisan_table.json b/kubejs/assets/tfg/models/item/artisan_table.json new file mode 100644 index 000000000..403b73459 --- /dev/null +++ b/kubejs/assets/tfg/models/item/artisan_table.json @@ -0,0 +1,3 @@ +{ + "parent": "tfg:block/artisan_table" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/californium_252_rod.json b/kubejs/assets/tfg/models/item/californium_252_rod.json new file mode 100644 index 000000000..c7dec0bc9 --- /dev/null +++ b/kubejs/assets/tfg/models/item/californium_252_rod.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "tfg:item/fission_rod/californium_252_rod" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/depleted_americium_241_rod.json b/kubejs/assets/tfg/models/item/depleted_americium_241_rod.json new file mode 100644 index 000000000..0c53012b8 --- /dev/null +++ b/kubejs/assets/tfg/models/item/depleted_americium_241_rod.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "tfg:item/fission_rod/americium_241_rod_depleted" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/depleted_californium_252_rod.json b/kubejs/assets/tfg/models/item/depleted_californium_252_rod.json new file mode 100644 index 000000000..8685f9431 --- /dev/null +++ b/kubejs/assets/tfg/models/item/depleted_californium_252_rod.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "tfg:item/fission_rod/californium_252_rod_depleted" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/depleted_neptunium_237_rod.json b/kubejs/assets/tfg/models/item/depleted_neptunium_237_rod.json new file mode 100644 index 000000000..c3858803d --- /dev/null +++ b/kubejs/assets/tfg/models/item/depleted_neptunium_237_rod.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "tfg:item/fission_rod/neptunium_237_rod_depleted" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/depleted_plutonium_rod.json b/kubejs/assets/tfg/models/item/depleted_plutonium_rod.json new file mode 100644 index 000000000..c2e5668d3 --- /dev/null +++ b/kubejs/assets/tfg/models/item/depleted_plutonium_rod.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "tfg:item/fission_rod/plutonium_rod_depleted" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/depleted_tbu_232_rod.json b/kubejs/assets/tfg/models/item/depleted_tbu_232_rod.json new file mode 100644 index 000000000..975acd1c4 --- /dev/null +++ b/kubejs/assets/tfg/models/item/depleted_tbu_232_rod.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "tfg:item/fission_rod/tbu_rod_depleted" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/depleted_thorium_rod.json b/kubejs/assets/tfg/models/item/depleted_thorium_rod.json new file mode 100644 index 000000000..9736a7e92 --- /dev/null +++ b/kubejs/assets/tfg/models/item/depleted_thorium_rod.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "tfg:item/fission_rod/thorium_rod_depleted" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/depleted_uranium_rod.json b/kubejs/assets/tfg/models/item/depleted_uranium_rod.json new file mode 100644 index 000000000..ed7c2f49d --- /dev/null +++ b/kubejs/assets/tfg/models/item/depleted_uranium_rod.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "tfg:item/fission_rod/uranium_rod_depleted" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/empty_rod.json b/kubejs/assets/tfg/models/item/empty_rod.json index 0c82848b7..6f86608cf 100644 --- a/kubejs/assets/tfg/models/item/empty_rod.json +++ b/kubejs/assets/tfg/models/item/empty_rod.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "tfg:item/fuel_rod_empty" + "layer0": "tfg:item/fission_rod/fuel_rod_empty" } } \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/heat_battery_mk1.json b/kubejs/assets/tfg/models/item/heat_battery_mk1.json new file mode 100644 index 000000000..7139bdd09 --- /dev/null +++ b/kubejs/assets/tfg/models/item/heat_battery_mk1.json @@ -0,0 +1,3 @@ +{ + "parent": "tfg:block/machines/heat_battery_mk1" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/neptunium_237_rod.json b/kubejs/assets/tfg/models/item/neptunium_237_rod.json new file mode 100644 index 000000000..7ece2461b --- /dev/null +++ b/kubejs/assets/tfg/models/item/neptunium_237_rod.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "tfg:item/fission_rod/neptunium_237_rod" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/plutonium_rod.json b/kubejs/assets/tfg/models/item/plutonium_rod.json index 76dd6a707..3cfe34120 100644 --- a/kubejs/assets/tfg/models/item/plutonium_rod.json +++ b/kubejs/assets/tfg/models/item/plutonium_rod.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "tfg:item/fuel_rod_p_1" + "layer0": "tfg:item/fission_rod/plutonium_rod" } } \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/tbu_232_rod.json b/kubejs/assets/tfg/models/item/tbu_232_rod.json index 241ac0772..c90b8cc85 100644 --- a/kubejs/assets/tfg/models/item/tbu_232_rod.json +++ b/kubejs/assets/tfg/models/item/tbu_232_rod.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "tfg:item/fuel_rod_t_1" + "layer0": "tfg:item/fission_rod/tbu_rod" } } \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/thorium_rod.json b/kubejs/assets/tfg/models/item/thorium_rod.json index e2c341ca3..5dc1c3346 100644 --- a/kubejs/assets/tfg/models/item/thorium_rod.json +++ b/kubejs/assets/tfg/models/item/thorium_rod.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "tfg:item/fuel_rod_tbu_1" + "layer0": "tfg:item/fission_rod/thorium_rod" } } \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/tier_1_double_rocket.json b/kubejs/assets/tfg/models/item/tier_1_double_rocket.json new file mode 100644 index 000000000..367f272ed --- /dev/null +++ b/kubejs/assets/tfg/models/item/tier_1_double_rocket.json @@ -0,0 +1,44 @@ +{ + "credit": "Adapted from Ad Astra", + "parent": "builtin/entity", + "gui_light": "front", + "display": { + "thirdperson_righthand": { + "rotation": [-90, 0, -90], + "translation": [-25, 4.5, -1], + "scale": [0.8, 0.8, 0.8] + }, + "thirdperson_lefthand": { + "rotation": [-90, 0, -90], + "translation": [-25, 4.5, -13.5], + "scale": [0.8, 0.8, 0.8] + }, + "firstperson_righthand": { + "rotation": [-10, 180, 90], + "translation": [-18, 20, 0], + "scale": [0.45, 0.45, 0.45] + }, + "firstperson_lefthand": { + "rotation": [-10, 180, 90], + "translation": [-18, 12, 0], + "scale": [0.45, 0.45, 0.45] + }, + "ground": { + "translation": [2, 2, 2], + "scale": [0.2, 0.2, 0.2] + }, + "gui": { + "rotation": [-41, -170, 26], + "translation": [-0.5, -4.8, 0], + "scale": [0.2, 0.2, 0.2] + }, + "head": { + "translation": [2.5, 9, 2.25], + "scale": [0.3, 0.3, 0.3] + }, + "fixed": { + "translation": [1, -2.5, 0], + "scale": [0.2, 0.2, 0.2] + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/tier_2_double_rocket.json b/kubejs/assets/tfg/models/item/tier_2_double_rocket.json new file mode 100644 index 000000000..d3f52111d --- /dev/null +++ b/kubejs/assets/tfg/models/item/tier_2_double_rocket.json @@ -0,0 +1,44 @@ +{ + "credit": "Adapted from Ad Astra", + "parent": "builtin/entity", + "gui_light": "front", + "display": { + "thirdperson_righthand": { + "rotation": [-90, 0, -90], + "translation": [-25, 4.5, -1], + "scale": [0.8, 0.8, 0.8] + }, + "thirdperson_lefthand": { + "rotation": [-90, 0, -90], + "translation": [-25, 4.5, -13.5], + "scale": [0.8, 0.8, 0.8] + }, + "firstperson_righthand": { + "rotation": [-10, 180, 90], + "translation": [-20, 20, 0], + "scale": [0.45, 0.45, 0.45] + }, + "firstperson_lefthand": { + "rotation": [-10, 180, 90], + "translation": [-20, 12, 0], + "scale": [0.45, 0.45, 0.45] + }, + "ground": { + "translation": [2, 2, 2], + "scale": [0.2, 0.2, 0.2] + }, + "gui": { + "rotation": [-41, -170, 26], + "translation": [-0.5, -4.8, 0], + "scale": [0.2, 0.2, 0.2] + }, + "head": { + "translation": [2.5, 9, 2.25], + "scale": [0.3, 0.3, 0.3] + }, + "fixed": { + "translation": [1, -2.5, 0], + "scale": [0.2, 0.2, 0.2] + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/tier_3_double_rocket.json b/kubejs/assets/tfg/models/item/tier_3_double_rocket.json new file mode 100644 index 000000000..5c9cc42ed --- /dev/null +++ b/kubejs/assets/tfg/models/item/tier_3_double_rocket.json @@ -0,0 +1,44 @@ +{ + "credit": "Adapted from Ad Astra", + "parent": "builtin/entity", + "gui_light": "front", + "display": { + "thirdperson_righthand": { + "rotation": [-110, 0, -90], + "translation": [-25, 4.5, -4.5], + "scale": [0.8, 0.8, 0.8] + }, + "thirdperson_lefthand": { + "rotation": [-110, 0, -90], + "translation": [-25, 4.5, -15], + "scale": [0.8, 0.8, 0.8] + }, + "firstperson_righthand": { + "rotation": [-10, 180, 90], + "translation": [-25, 20, -5], + "scale": [0.5, 0.5, 0.5] + }, + "firstperson_lefthand": { + "rotation": [-10, 180, 90], + "translation": [-25, 12, -5], + "scale": [0.5, 0.5, 0.5] + }, + "ground": { + "translation": [2, 2, 2], + "scale": [0.2, 0.2, 0.2] + }, + "gui": { + "rotation": [-41, -170, 26], + "translation": [-0.5, -4.8, 0], + "scale": [0.2, 0.2, 0.2] + }, + "head": { + "translation": [2.5, 9, 2.25], + "scale": [0.3, 0.3, 0.3] + }, + "fixed": { + "translation": [1, -2.5, 0], + "scale": [0.2, 0.2, 0.2] + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/tier_4_double_rocket.json b/kubejs/assets/tfg/models/item/tier_4_double_rocket.json new file mode 100644 index 000000000..65f064315 --- /dev/null +++ b/kubejs/assets/tfg/models/item/tier_4_double_rocket.json @@ -0,0 +1,44 @@ +{ + "credit": "Adapted from Ad Astra", + "parent": "builtin/entity", + "gui_light": "front", + "display": { + "thirdperson_righthand": { + "rotation": [180, 0, -90], + "translation": [-35, 4.5, -14], + "scale": [0.8, 0.8, 0.8] + }, + "thirdperson_lefthand": { + "rotation": [180, 0, -90], + "translation": [-35, -7, -14], + "scale": [0.8, 0.8, 0.8] + }, + "firstperson_righthand": { + "rotation": [80, 180, 90], + "translation": [-25, 20, 6], + "scale": [0.5, 0.5, 0.5] + }, + "firstperson_lefthand": { + "rotation": [80, 180, 90], + "translation": [-25, 18, 0], + "scale": [0.5, 0.5, 0.5] + }, + "ground": { + "translation": [2, 2, 2], + "scale": [0.2, 0.2, 0.2] + }, + "gui": { + "rotation": [-41, -170, 26], + "translation": [0, -4.8, 0], + "scale": [0.17, 0.17, 0.17] + }, + "head": { + "translation": [2.5, 9, 2.25], + "scale": [0.3, 0.3, 0.3] + }, + "fixed": { + "translation": [1, -2.5, 0], + "scale": [0.2, 0.2, 0.2] + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/uranium_rod.json b/kubejs/assets/tfg/models/item/uranium_rod.json index 38ff09542..b7c271b05 100644 --- a/kubejs/assets/tfg/models/item/uranium_rod.json +++ b/kubejs/assets/tfg/models/item/uranium_rod.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "tfg:item/fuel_rod_u_1" + "layer0": "tfg:item/fission_rod/uranium_rod" } } \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/uv_smr_fluid_import_hatch.json b/kubejs/assets/tfg/models/item/uv_smr_fluid_import_hatch.json new file mode 100644 index 000000000..195e11671 --- /dev/null +++ b/kubejs/assets/tfg/models/item/uv_smr_fluid_import_hatch.json @@ -0,0 +1,3 @@ +{ + "parent": "tfg:block/machines/ports/uv_smr_fluid_import_hatch" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/sounds.json b/kubejs/assets/tfg/sounds.json index 56ed1adba..7adb8d046 100644 --- a/kubejs/assets/tfg/sounds.json +++ b/kubejs/assets/tfg/sounds.json @@ -311,6 +311,58 @@ "minecraft:ambient/nether/nether_wastes/mood5" ] }, + "music.nether": { + "sounds": [ + { + "name": "minecraft:music/game/nether/nether1", + "stream": true + }, + { + "name": "minecraft:music/game/nether/nether3", + "stream": true + }, + { + "name": "minecraft:music/game/nether/nether_wastes/rubedo", + "stream": true, + "volume": 0.5 + }, + { + "name": "minecraft:music/game/water/axolotl", + "stream": true, + "volume": 0.4 + }, + { + "name": "minecraft:music/game/nether/soulsand_valley/so_below", + "stream": true, + "volume": 0.5 + }, + { + "name": "minecraft:music/game/ancestry", + "stream": true, + "volume": 0.4 + } + ] + }, + "music.orbit": { + "sounds": [ + { + "name": "minecraft:music/game/piano3", + "stream": true + }, + { + "name": "minecraft:music/game/calm1", + "stream": true + }, + { + "name": "minecraft:music/game/calm2", + "stream": true + }, + { + "name": "minecraft:music/game/calm3", + "stream": true + } + ] + }, "ambient.moon.additions": { "sounds": [ { @@ -377,6 +429,31 @@ "minecraft:ambient/nether/warped_forest/mood8" ] }, + "music.moon": { + "sounds": [ + { + "name": "minecraft:music/game/end/end", + "stream": true + }, + { + "name": "minecraft:music/game/floating_dream", + "stream": true, + "volume": 0.4 + }, + { + "name": "minecraft:music/game/nuance1", + "stream": true + }, + { + "name": "minecraft:music/game/nuance2", + "stream": true + }, + { + "name": "minecraft:music/game/creative/creative6", + "stream": true + } + ] + }, "ambient.mars_desert.loop": { "sounds": [ { @@ -583,6 +660,49 @@ "minecraft:ambient/nether/warped_forest/creak5" ] }, + "music.mars": { + "sounds": [ + { + "name": "minecraft:music/game/creative/creative1", + "stream": true + }, + { + "name": "minecraft:music/game/creative/creative2", + "stream": true + }, + { + "name": "minecraft:music/game/creative/creative3", + "stream": true + }, + { + "name": "minecraft:music/game/creative/creative4", + "stream": true + }, + { + "name": "minecraft:music/game/creative/creative5", + "stream": true + }, + { + "name": "minecraft:music/game/creative/creative6", + "stream": true + }, + { + "name": "minecraft:music/game/crescent_dunes", + "stream": true, + "volume": 0.4, + "weight": 2 + }, + { + "name": "minecraft:records/far", + "stream": true + }, + { + "name": "minecraft:records/otherside", + "stream": true, + "volume": 0.3 + } + ] + }, "ambient.venus_surface.loop": { "sounds": [ { @@ -754,5 +874,74 @@ "minecraft:ambient/nether/crimson_forest/shine2", "minecraft:ambient/nether/crimson_forest/shine3" ] + }, + "music.venus": { + "sounds": [ + { + "name": "minecraft:music/game/nether/nether1", + "stream": true, + "weight": 2 + }, + { + "name": "minecraft:music/game/nether/nether3", + "stream": true, + "weight": 2 + }, + { + "name": "minecraft:music/game/nether/nether4", + "stream": true, + "weight": 2 + }, + { + "name": "minecraft:music/game/nether/crimson_forest/chrysopoeia", + "stream": true, + "volume": 0.5, + "weight": 3 + }, + { + "name": "minecraft:music/game/nether/nether_wastes/rubedo", + "stream": true, + "volume": 0.5, + "weight": 3 + }, + { + "name": "minecraft:music/game/nether/soulsand_valley/so_below", + "stream": true, + "volume": 0.5, + "weight": 3 + }, + { + "name": "minecraft:music/game/piano3", + "stream": true + } + ] + }, + "music.mercury": { + "sounds": [ + { + "name": "minecraft:records/13", + "stream": true, + "volume": 0.4 + } + ] + }, + "music.europa": { + "sounds": [ + { + "name": "minecraft:music/game/water/axolotl", + "stream": true, + "volume": 0.4 + }, + { + "name": "minecraft:music/game/water/dragon_fish", + "stream": true, + "volume": 0.4 + }, + { + "name": "minecraft:music/game/water/shuniji", + "stream": true, + "volume": 0.4 + } + ] } } \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/block/artisan_table.png b/kubejs/assets/tfg/textures/block/artisan_table.png new file mode 100644 index 000000000..074b05872 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/artisan_table.png differ diff --git a/kubejs/assets/tfg/textures/block/artisan_table_n.png b/kubejs/assets/tfg/textures/block/artisan_table_n.png new file mode 100644 index 000000000..e17ca0db4 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/artisan_table_n.png differ diff --git a/kubejs/assets/tfg/textures/block/artisan_table_s.png b/kubejs/assets/tfg/textures/block/artisan_table_s.png new file mode 100644 index 000000000..e14c94986 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/artisan_table_s.png differ diff --git a/kubejs/assets/tfg/textures/block/fission/beryllium_sandy.png b/kubejs/assets/tfg/textures/block/fission/beryllium_sandy.png new file mode 100644 index 000000000..9f21e0adf Binary files /dev/null and b/kubejs/assets/tfg/textures/block/fission/beryllium_sandy.png differ diff --git a/kubejs/assets/tfg/textures/block/fission/copper_sandy.png b/kubejs/assets/tfg/textures/block/fission/copper_sandy.png new file mode 100644 index 000000000..4cbd21545 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/fission/copper_sandy.png differ diff --git a/kubejs/assets/tfg/textures/block/fluids/fluid.boron_enriched_coolant.png b/kubejs/assets/tfg/textures/block/fluids/fluid.boron_enriched_coolant.png new file mode 100644 index 000000000..3298cf862 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/fluids/fluid.boron_enriched_coolant.png differ diff --git a/kubejs/assets/tfg/textures/block/fluids/fluid.boron_enriched_coolant.png.mcmeta b/kubejs/assets/tfg/textures/block/fluids/fluid.boron_enriched_coolant.png.mcmeta new file mode 100644 index 000000000..c5d457f93 --- /dev/null +++ b/kubejs/assets/tfg/textures/block/fluids/fluid.boron_enriched_coolant.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 1 + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/block/fluids/fluid.critical_steam.png b/kubejs/assets/tfg/textures/block/fluids/fluid.critical_steam.png new file mode 100644 index 000000000..9cb8b9334 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/fluids/fluid.critical_steam.png differ diff --git a/kubejs/assets/tfg/textures/block/fluids/fluid.critical_steam.png.mcmeta b/kubejs/assets/tfg/textures/block/fluids/fluid.critical_steam.png.mcmeta new file mode 100644 index 000000000..c5d457f93 --- /dev/null +++ b/kubejs/assets/tfg/textures/block/fluids/fluid.critical_steam.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 1 + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/block/fluids/fluid.degraded_high_grade_isotopic_solvent.png b/kubejs/assets/tfg/textures/block/fluids/fluid.degraded_high_grade_isotopic_solvent.png new file mode 100644 index 000000000..09b1be1b5 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/fluids/fluid.degraded_high_grade_isotopic_solvent.png differ diff --git a/kubejs/assets/tfg/textures/block/fluids/fluid.degraded_high_grade_isotopic_solvent.png.mcmeta b/kubejs/assets/tfg/textures/block/fluids/fluid.degraded_high_grade_isotopic_solvent.png.mcmeta new file mode 100644 index 000000000..c5d457f93 --- /dev/null +++ b/kubejs/assets/tfg/textures/block/fluids/fluid.degraded_high_grade_isotopic_solvent.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 1 + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/block/fluids/fluid.degraded_solvent_stream.png b/kubejs/assets/tfg/textures/block/fluids/fluid.degraded_solvent_stream.png new file mode 100644 index 000000000..2557a2a77 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/fluids/fluid.degraded_solvent_stream.png differ diff --git a/kubejs/assets/tfg/textures/block/fluids/fluid.degraded_solvent_stream.png.mcmeta b/kubejs/assets/tfg/textures/block/fluids/fluid.degraded_solvent_stream.png.mcmeta new file mode 100644 index 000000000..24f9c2fae --- /dev/null +++ b/kubejs/assets/tfg/textures/block/fluids/fluid.degraded_solvent_stream.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 1 + } +} diff --git a/kubejs/assets/tfg/textures/block/fluids/fluid.flibe.png b/kubejs/assets/tfg/textures/block/fluids/fluid.flibe.png new file mode 100644 index 000000000..6c6b8a81c Binary files /dev/null and b/kubejs/assets/tfg/textures/block/fluids/fluid.flibe.png differ diff --git a/kubejs/assets/tfg/textures/block/fluids/fluid.flibe.png.mcmeta b/kubejs/assets/tfg/textures/block/fluids/fluid.flibe.png.mcmeta new file mode 100644 index 000000000..c5d457f93 --- /dev/null +++ b/kubejs/assets/tfg/textures/block/fluids/fluid.flibe.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 1 + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/block/fluids/fluid.heavy_water.png b/kubejs/assets/tfg/textures/block/fluids/fluid.heavy_water.png new file mode 100644 index 000000000..bed9acfb9 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/fluids/fluid.heavy_water.png differ diff --git a/kubejs/assets/tfg/textures/block/fluids/fluid.heavy_water.png.mcmeta b/kubejs/assets/tfg/textures/block/fluids/fluid.heavy_water.png.mcmeta new file mode 100644 index 000000000..7e77c6485 --- /dev/null +++ b/kubejs/assets/tfg/textures/block/fluids/fluid.heavy_water.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 2 + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/block/fluids/fluid.high_grade_isotopic_solvent.png b/kubejs/assets/tfg/textures/block/fluids/fluid.high_grade_isotopic_solvent.png new file mode 100644 index 000000000..75e4810f9 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/fluids/fluid.high_grade_isotopic_solvent.png differ diff --git a/kubejs/assets/tfg/textures/block/fluids/fluid.high_grade_isotopic_solvent.png.mcmeta b/kubejs/assets/tfg/textures/block/fluids/fluid.high_grade_isotopic_solvent.png.mcmeta new file mode 100644 index 000000000..c5d457f93 --- /dev/null +++ b/kubejs/assets/tfg/textures/block/fluids/fluid.high_grade_isotopic_solvent.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 1 + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/block/fluids/fluid.hot_boron_enriched_coolant.png b/kubejs/assets/tfg/textures/block/fluids/fluid.hot_boron_enriched_coolant.png new file mode 100644 index 000000000..cb395e53b Binary files /dev/null and b/kubejs/assets/tfg/textures/block/fluids/fluid.hot_boron_enriched_coolant.png differ diff --git a/kubejs/assets/tfg/textures/block/fluids/fluid.hot_boron_enriched_coolant.png.mcmeta b/kubejs/assets/tfg/textures/block/fluids/fluid.hot_boron_enriched_coolant.png.mcmeta new file mode 100644 index 000000000..c5d457f93 --- /dev/null +++ b/kubejs/assets/tfg/textures/block/fluids/fluid.hot_boron_enriched_coolant.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 1 + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/block/fluids/fluid.hot_flibe.png b/kubejs/assets/tfg/textures/block/fluids/fluid.hot_flibe.png new file mode 100644 index 000000000..caa9486f4 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/fluids/fluid.hot_flibe.png differ diff --git a/kubejs/assets/tfg/textures/block/fluids/fluid.hot_flibe.png.mcmeta b/kubejs/assets/tfg/textures/block/fluids/fluid.hot_flibe.png.mcmeta new file mode 100644 index 000000000..c5d457f93 --- /dev/null +++ b/kubejs/assets/tfg/textures/block/fluids/fluid.hot_flibe.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 1 + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/block/fluids/fluid.isotopic_solvent.png b/kubejs/assets/tfg/textures/block/fluids/fluid.isotopic_solvent.png new file mode 100644 index 000000000..953666c32 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/fluids/fluid.isotopic_solvent.png differ diff --git a/kubejs/assets/tfg/textures/block/fluids/fluid.isotopic_solvent.png.mcmeta b/kubejs/assets/tfg/textures/block/fluids/fluid.isotopic_solvent.png.mcmeta new file mode 100644 index 000000000..c5d457f93 --- /dev/null +++ b/kubejs/assets/tfg/textures/block/fluids/fluid.isotopic_solvent.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 1 + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/block/fluids/fluid.spent_ticl4_doped_supercritical_co2.png b/kubejs/assets/tfg/textures/block/fluids/fluid.spent_ticl4_doped_supercritical_co2.png new file mode 100644 index 000000000..90182bea6 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/fluids/fluid.spent_ticl4_doped_supercritical_co2.png differ diff --git a/kubejs/assets/tfg/textures/block/fluids/fluid.spent_ticl4_doped_supercritical_co2.png.mcmeta b/kubejs/assets/tfg/textures/block/fluids/fluid.spent_ticl4_doped_supercritical_co2.png.mcmeta new file mode 100644 index 000000000..c5d457f93 --- /dev/null +++ b/kubejs/assets/tfg/textures/block/fluids/fluid.spent_ticl4_doped_supercritical_co2.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 1 + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/block/fluids/fluid.tbu_waste.png b/kubejs/assets/tfg/textures/block/fluids/fluid.tbu_waste.png new file mode 100644 index 000000000..c642b4d56 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/fluids/fluid.tbu_waste.png differ diff --git a/kubejs/assets/tfg/textures/block/fluids/fluid.tbu_waste.png.mcmeta b/kubejs/assets/tfg/textures/block/fluids/fluid.tbu_waste.png.mcmeta new file mode 100644 index 000000000..7e77c6485 --- /dev/null +++ b/kubejs/assets/tfg/textures/block/fluids/fluid.tbu_waste.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 2 + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/block/fluids/fluid.ticl4_doped_supercritical_co2.png b/kubejs/assets/tfg/textures/block/fluids/fluid.ticl4_doped_supercritical_co2.png new file mode 100644 index 000000000..fe0d8baa2 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/fluids/fluid.ticl4_doped_supercritical_co2.png differ diff --git a/kubejs/assets/tfg/textures/block/fluids/fluid.ticl4_doped_supercritical_co2.png.mcmeta b/kubejs/assets/tfg/textures/block/fluids/fluid.ticl4_doped_supercritical_co2.png.mcmeta new file mode 100644 index 000000000..c5d457f93 --- /dev/null +++ b/kubejs/assets/tfg/textures/block/fluids/fluid.ticl4_doped_supercritical_co2.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 1 + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/block/machines/smr/overlay_front.png b/kubejs/assets/tfg/textures/block/machines/smr/overlay_front.png new file mode 100644 index 000000000..c8c8cb394 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/machines/smr/overlay_front.png differ diff --git a/kubejs/assets/tfg/textures/block/machines/smr/overlay_front_active.png b/kubejs/assets/tfg/textures/block/machines/smr/overlay_front_active.png new file mode 100644 index 000000000..f57aa76ce Binary files /dev/null and b/kubejs/assets/tfg/textures/block/machines/smr/overlay_front_active.png differ diff --git a/kubejs/assets/tfg/textures/block/machines/smr/overlay_front_active.png.mcmeta b/kubejs/assets/tfg/textures/block/machines/smr/overlay_front_active.png.mcmeta new file mode 100644 index 000000000..7e77c6485 --- /dev/null +++ b/kubejs/assets/tfg/textures/block/machines/smr/overlay_front_active.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 2 + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/block/machines/smr/overlay_front_paused.png b/kubejs/assets/tfg/textures/block/machines/smr/overlay_front_paused.png new file mode 100644 index 000000000..690c4d1ff Binary files /dev/null and b/kubejs/assets/tfg/textures/block/machines/smr/overlay_front_paused.png differ diff --git a/kubejs/assets/tfg/textures/gui/artisan_table/artisan_table.png b/kubejs/assets/tfg/textures/gui/artisan_table/artisan_table.png new file mode 100644 index 000000000..fa531e7a8 Binary files /dev/null and b/kubejs/assets/tfg/textures/gui/artisan_table/artisan_table.png differ diff --git a/kubejs/assets/tfg/textures/gui/artisan_table/blank_phenolic_board.png b/kubejs/assets/tfg/textures/gui/artisan_table/blank_phenolic_board.png new file mode 100644 index 000000000..2fc5b91ff Binary files /dev/null and b/kubejs/assets/tfg/textures/gui/artisan_table/blank_phenolic_board.png differ diff --git a/kubejs/assets/tfg/textures/gui/artisan_table/blank_resin_board.png b/kubejs/assets/tfg/textures/gui/artisan_table/blank_resin_board.png new file mode 100644 index 000000000..e2fdf4564 Binary files /dev/null and b/kubejs/assets/tfg/textures/gui/artisan_table/blank_resin_board.png differ diff --git a/kubejs/assets/tfg/textures/gui/artisan_table/casting_mold_active.png b/kubejs/assets/tfg/textures/gui/artisan_table/casting_mold_active.png new file mode 100644 index 000000000..a57ab6c55 Binary files /dev/null and b/kubejs/assets/tfg/textures/gui/artisan_table/casting_mold_active.png differ diff --git a/kubejs/assets/tfg/textures/gui/artisan_table/casting_mold_border.png b/kubejs/assets/tfg/textures/gui/artisan_table/casting_mold_border.png new file mode 100644 index 000000000..73f3db15f Binary files /dev/null and b/kubejs/assets/tfg/textures/gui/artisan_table/casting_mold_border.png differ diff --git a/kubejs/assets/tfg/textures/gui/artisan_table/casting_mold_inactive.png b/kubejs/assets/tfg/textures/gui/artisan_table/casting_mold_inactive.png new file mode 100644 index 000000000..831d24a14 Binary files /dev/null and b/kubejs/assets/tfg/textures/gui/artisan_table/casting_mold_inactive.png differ diff --git a/kubejs/assets/tfg/textures/gui/artisan_table/extruder_mold_active.png b/kubejs/assets/tfg/textures/gui/artisan_table/extruder_mold_active.png new file mode 100644 index 000000000..9b05d102d Binary files /dev/null and b/kubejs/assets/tfg/textures/gui/artisan_table/extruder_mold_active.png differ diff --git a/kubejs/assets/tfg/textures/gui/artisan_table/extruder_mold_border.png b/kubejs/assets/tfg/textures/gui/artisan_table/extruder_mold_border.png new file mode 100644 index 000000000..4b6d25301 Binary files /dev/null and b/kubejs/assets/tfg/textures/gui/artisan_table/extruder_mold_border.png differ diff --git a/kubejs/assets/tfg/textures/gui/artisan_table/phenolic_board_border.png b/kubejs/assets/tfg/textures/gui/artisan_table/phenolic_board_border.png new file mode 100644 index 000000000..07fb7e65f Binary files /dev/null and b/kubejs/assets/tfg/textures/gui/artisan_table/phenolic_board_border.png differ diff --git a/kubejs/assets/tfg/textures/gui/artisan_table/phenolic_board_border_4x.png b/kubejs/assets/tfg/textures/gui/artisan_table/phenolic_board_border_4x.png new file mode 100644 index 000000000..f397102b7 Binary files /dev/null and b/kubejs/assets/tfg/textures/gui/artisan_table/phenolic_board_border_4x.png differ diff --git a/kubejs/assets/tfg/textures/gui/artisan_table/printed_phenolic_board.png b/kubejs/assets/tfg/textures/gui/artisan_table/printed_phenolic_board.png new file mode 100644 index 000000000..b2a315c16 Binary files /dev/null and b/kubejs/assets/tfg/textures/gui/artisan_table/printed_phenolic_board.png differ diff --git a/kubejs/assets/tfg/textures/gui/artisan_table/printed_resin_board.png b/kubejs/assets/tfg/textures/gui/artisan_table/printed_resin_board.png new file mode 100644 index 000000000..14221fe24 Binary files /dev/null and b/kubejs/assets/tfg/textures/gui/artisan_table/printed_resin_board.png differ diff --git a/kubejs/assets/tfg/textures/gui/artisan_table/resin_board_border.png b/kubejs/assets/tfg/textures/gui/artisan_table/resin_board_border.png new file mode 100644 index 000000000..b021bf13f Binary files /dev/null and b/kubejs/assets/tfg/textures/gui/artisan_table/resin_board_border.png differ diff --git a/kubejs/assets/tfg/textures/gui/artisan_table/resin_board_border_4x.png b/kubejs/assets/tfg/textures/gui/artisan_table/resin_board_border_4x.png new file mode 100644 index 000000000..1af493a69 Binary files /dev/null and b/kubejs/assets/tfg/textures/gui/artisan_table/resin_board_border_4x.png differ diff --git a/kubejs/assets/tfg/textures/item/fission_rod/americium_241_rod.png b/kubejs/assets/tfg/textures/item/fission_rod/americium_241_rod.png new file mode 100644 index 000000000..4a5e30105 Binary files /dev/null and b/kubejs/assets/tfg/textures/item/fission_rod/americium_241_rod.png differ diff --git a/kubejs/assets/tfg/textures/item/fission_rod/americium_241_rod.png.mcmeta b/kubejs/assets/tfg/textures/item/fission_rod/americium_241_rod.png.mcmeta new file mode 100644 index 000000000..cc8a1f3c9 --- /dev/null +++ b/kubejs/assets/tfg/textures/item/fission_rod/americium_241_rod.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 1}} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/item/fission_rod/americium_241_rod_depleted.png b/kubejs/assets/tfg/textures/item/fission_rod/americium_241_rod_depleted.png new file mode 100644 index 000000000..07b5a7391 Binary files /dev/null and b/kubejs/assets/tfg/textures/item/fission_rod/americium_241_rod_depleted.png differ diff --git a/kubejs/assets/tfg/textures/item/fission_rod/americium_241_rod_depleted.png.mcmeta b/kubejs/assets/tfg/textures/item/fission_rod/americium_241_rod_depleted.png.mcmeta new file mode 100644 index 000000000..cc8a1f3c9 --- /dev/null +++ b/kubejs/assets/tfg/textures/item/fission_rod/americium_241_rod_depleted.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 1}} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/item/fission_rod/californium_252_rod.png b/kubejs/assets/tfg/textures/item/fission_rod/californium_252_rod.png new file mode 100644 index 000000000..2863308b1 Binary files /dev/null and b/kubejs/assets/tfg/textures/item/fission_rod/californium_252_rod.png differ diff --git a/kubejs/assets/tfg/textures/item/fuel_rod_p_1.png.mcmeta b/kubejs/assets/tfg/textures/item/fission_rod/californium_252_rod.png.mcmeta similarity index 100% rename from kubejs/assets/tfg/textures/item/fuel_rod_p_1.png.mcmeta rename to kubejs/assets/tfg/textures/item/fission_rod/californium_252_rod.png.mcmeta diff --git a/kubejs/assets/tfg/textures/item/fission_rod/californium_252_rod_depleted.png b/kubejs/assets/tfg/textures/item/fission_rod/californium_252_rod_depleted.png new file mode 100644 index 000000000..a6bfa1a0c Binary files /dev/null and b/kubejs/assets/tfg/textures/item/fission_rod/californium_252_rod_depleted.png differ diff --git a/kubejs/assets/tfg/textures/item/fission_rod/californium_252_rod_depleted.png.mcmeta b/kubejs/assets/tfg/textures/item/fission_rod/californium_252_rod_depleted.png.mcmeta new file mode 100644 index 000000000..cc8a1f3c9 --- /dev/null +++ b/kubejs/assets/tfg/textures/item/fission_rod/californium_252_rod_depleted.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 1}} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/item/fuel_rod_empty.png b/kubejs/assets/tfg/textures/item/fission_rod/fuel_rod_empty.png similarity index 100% rename from kubejs/assets/tfg/textures/item/fuel_rod_empty.png rename to kubejs/assets/tfg/textures/item/fission_rod/fuel_rod_empty.png diff --git a/kubejs/assets/tfg/textures/item/fission_rod/fuel_rod_empty_t2.png b/kubejs/assets/tfg/textures/item/fission_rod/fuel_rod_empty_t2.png new file mode 100644 index 000000000..3d64d1165 Binary files /dev/null and b/kubejs/assets/tfg/textures/item/fission_rod/fuel_rod_empty_t2.png differ diff --git a/kubejs/assets/tfg/textures/item/fission_rod/fuel_rod_empty_t3.png b/kubejs/assets/tfg/textures/item/fission_rod/fuel_rod_empty_t3.png new file mode 100644 index 000000000..f2738e5c9 Binary files /dev/null and b/kubejs/assets/tfg/textures/item/fission_rod/fuel_rod_empty_t3.png differ diff --git a/kubejs/assets/tfg/textures/item/fission_rod/neptunium_237_rod.png b/kubejs/assets/tfg/textures/item/fission_rod/neptunium_237_rod.png new file mode 100644 index 000000000..f6ac41254 Binary files /dev/null and b/kubejs/assets/tfg/textures/item/fission_rod/neptunium_237_rod.png differ diff --git a/kubejs/assets/tfg/textures/item/fuel_rod_p_2.png.mcmeta b/kubejs/assets/tfg/textures/item/fission_rod/neptunium_237_rod.png.mcmeta similarity index 100% rename from kubejs/assets/tfg/textures/item/fuel_rod_p_2.png.mcmeta rename to kubejs/assets/tfg/textures/item/fission_rod/neptunium_237_rod.png.mcmeta diff --git a/kubejs/assets/tfg/textures/item/fission_rod/neptunium_237_rod_depleted.png b/kubejs/assets/tfg/textures/item/fission_rod/neptunium_237_rod_depleted.png new file mode 100644 index 000000000..8c815ec20 Binary files /dev/null and b/kubejs/assets/tfg/textures/item/fission_rod/neptunium_237_rod_depleted.png differ diff --git a/kubejs/assets/tfg/textures/item/fission_rod/neptunium_237_rod_depleted.png.mcmeta b/kubejs/assets/tfg/textures/item/fission_rod/neptunium_237_rod_depleted.png.mcmeta new file mode 100644 index 000000000..cc8a1f3c9 --- /dev/null +++ b/kubejs/assets/tfg/textures/item/fission_rod/neptunium_237_rod_depleted.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 1}} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/item/fuel_rod_p_1.png b/kubejs/assets/tfg/textures/item/fission_rod/plutonium_rod.png similarity index 100% rename from kubejs/assets/tfg/textures/item/fuel_rod_p_1.png rename to kubejs/assets/tfg/textures/item/fission_rod/plutonium_rod.png diff --git a/kubejs/assets/tfg/textures/item/fuel_rod_p_4.png.mcmeta b/kubejs/assets/tfg/textures/item/fission_rod/plutonium_rod.png.mcmeta similarity index 100% rename from kubejs/assets/tfg/textures/item/fuel_rod_p_4.png.mcmeta rename to kubejs/assets/tfg/textures/item/fission_rod/plutonium_rod.png.mcmeta diff --git a/kubejs/assets/tfg/textures/item/fission_rod/plutonium_rod_depleted.png b/kubejs/assets/tfg/textures/item/fission_rod/plutonium_rod_depleted.png new file mode 100644 index 000000000..271d22fe1 Binary files /dev/null and b/kubejs/assets/tfg/textures/item/fission_rod/plutonium_rod_depleted.png differ diff --git a/kubejs/assets/tfg/textures/item/fission_rod/plutonium_rod_depleted.png.mcmeta b/kubejs/assets/tfg/textures/item/fission_rod/plutonium_rod_depleted.png.mcmeta new file mode 100644 index 000000000..cc8a1f3c9 --- /dev/null +++ b/kubejs/assets/tfg/textures/item/fission_rod/plutonium_rod_depleted.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 1}} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/item/fission_rod/tbu_rod.png b/kubejs/assets/tfg/textures/item/fission_rod/tbu_rod.png new file mode 100644 index 000000000..b1e4cacbb Binary files /dev/null and b/kubejs/assets/tfg/textures/item/fission_rod/tbu_rod.png differ diff --git a/kubejs/assets/tfg/textures/item/fuel_rod_t_1.png.mcmeta b/kubejs/assets/tfg/textures/item/fission_rod/tbu_rod.png.mcmeta similarity index 100% rename from kubejs/assets/tfg/textures/item/fuel_rod_t_1.png.mcmeta rename to kubejs/assets/tfg/textures/item/fission_rod/tbu_rod.png.mcmeta diff --git a/kubejs/assets/tfg/textures/item/fission_rod/tbu_rod_depleted.png b/kubejs/assets/tfg/textures/item/fission_rod/tbu_rod_depleted.png new file mode 100644 index 000000000..2204301ea Binary files /dev/null and b/kubejs/assets/tfg/textures/item/fission_rod/tbu_rod_depleted.png differ diff --git a/kubejs/assets/tfg/textures/item/fission_rod/tbu_rod_depleted.png.mcmeta b/kubejs/assets/tfg/textures/item/fission_rod/tbu_rod_depleted.png.mcmeta new file mode 100644 index 000000000..cc8a1f3c9 --- /dev/null +++ b/kubejs/assets/tfg/textures/item/fission_rod/tbu_rod_depleted.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 1}} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/item/fuel_rod_tbu_1.png b/kubejs/assets/tfg/textures/item/fission_rod/thorium_rod.png similarity index 100% rename from kubejs/assets/tfg/textures/item/fuel_rod_tbu_1.png rename to kubejs/assets/tfg/textures/item/fission_rod/thorium_rod.png diff --git a/kubejs/assets/tfg/textures/item/fuel_rod_t_2.png.mcmeta b/kubejs/assets/tfg/textures/item/fission_rod/thorium_rod.png.mcmeta similarity index 100% rename from kubejs/assets/tfg/textures/item/fuel_rod_t_2.png.mcmeta rename to kubejs/assets/tfg/textures/item/fission_rod/thorium_rod.png.mcmeta diff --git a/kubejs/assets/tfg/textures/item/fission_rod/thorium_rod_depleted.png b/kubejs/assets/tfg/textures/item/fission_rod/thorium_rod_depleted.png new file mode 100644 index 000000000..0822e8bbf Binary files /dev/null and b/kubejs/assets/tfg/textures/item/fission_rod/thorium_rod_depleted.png differ diff --git a/kubejs/assets/tfg/textures/item/fission_rod/thorium_rod_depleted.png.mcmeta b/kubejs/assets/tfg/textures/item/fission_rod/thorium_rod_depleted.png.mcmeta new file mode 100644 index 000000000..cc8a1f3c9 --- /dev/null +++ b/kubejs/assets/tfg/textures/item/fission_rod/thorium_rod_depleted.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 1}} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/item/fuel_rod_p_2.png b/kubejs/assets/tfg/textures/item/fission_rod/unused/fuel_rod_p_2.png similarity index 100% rename from kubejs/assets/tfg/textures/item/fuel_rod_p_2.png rename to kubejs/assets/tfg/textures/item/fission_rod/unused/fuel_rod_p_2.png diff --git a/kubejs/assets/tfg/textures/item/fuel_rod_t_4.png.mcmeta b/kubejs/assets/tfg/textures/item/fission_rod/unused/fuel_rod_p_2.png.mcmeta similarity index 100% rename from kubejs/assets/tfg/textures/item/fuel_rod_t_4.png.mcmeta rename to kubejs/assets/tfg/textures/item/fission_rod/unused/fuel_rod_p_2.png.mcmeta diff --git a/kubejs/assets/tfg/textures/item/fuel_rod_p_4.png b/kubejs/assets/tfg/textures/item/fission_rod/unused/fuel_rod_p_4.png similarity index 100% rename from kubejs/assets/tfg/textures/item/fuel_rod_p_4.png rename to kubejs/assets/tfg/textures/item/fission_rod/unused/fuel_rod_p_4.png diff --git a/kubejs/assets/tfg/textures/item/fuel_rod_tbu_1.png.mcmeta b/kubejs/assets/tfg/textures/item/fission_rod/unused/fuel_rod_p_4.png.mcmeta similarity index 100% rename from kubejs/assets/tfg/textures/item/fuel_rod_tbu_1.png.mcmeta rename to kubejs/assets/tfg/textures/item/fission_rod/unused/fuel_rod_p_4.png.mcmeta diff --git a/kubejs/assets/tfg/textures/item/fuel_rod_t_2.png b/kubejs/assets/tfg/textures/item/fission_rod/unused/fuel_rod_t_2.png similarity index 100% rename from kubejs/assets/tfg/textures/item/fuel_rod_t_2.png rename to kubejs/assets/tfg/textures/item/fission_rod/unused/fuel_rod_t_2.png diff --git a/kubejs/assets/tfg/textures/item/fuel_rod_tbu_2.png.mcmeta b/kubejs/assets/tfg/textures/item/fission_rod/unused/fuel_rod_t_2.png.mcmeta similarity index 100% rename from kubejs/assets/tfg/textures/item/fuel_rod_tbu_2.png.mcmeta rename to kubejs/assets/tfg/textures/item/fission_rod/unused/fuel_rod_t_2.png.mcmeta diff --git a/kubejs/assets/tfg/textures/item/fuel_rod_t_4.png b/kubejs/assets/tfg/textures/item/fission_rod/unused/fuel_rod_t_4.png similarity index 100% rename from kubejs/assets/tfg/textures/item/fuel_rod_t_4.png rename to kubejs/assets/tfg/textures/item/fission_rod/unused/fuel_rod_t_4.png diff --git a/kubejs/assets/tfg/textures/item/fuel_rod_tbu_4.png.mcmeta b/kubejs/assets/tfg/textures/item/fission_rod/unused/fuel_rod_t_4.png.mcmeta similarity index 100% rename from kubejs/assets/tfg/textures/item/fuel_rod_tbu_4.png.mcmeta rename to kubejs/assets/tfg/textures/item/fission_rod/unused/fuel_rod_t_4.png.mcmeta diff --git a/kubejs/assets/tfg/textures/item/fuel_rod_tbu_2.png b/kubejs/assets/tfg/textures/item/fission_rod/unused/fuel_rod_tbu_2.png similarity index 100% rename from kubejs/assets/tfg/textures/item/fuel_rod_tbu_2.png rename to kubejs/assets/tfg/textures/item/fission_rod/unused/fuel_rod_tbu_2.png diff --git a/kubejs/assets/tfg/textures/item/fuel_rod_u_1.png.mcmeta b/kubejs/assets/tfg/textures/item/fission_rod/unused/fuel_rod_tbu_2.png.mcmeta similarity index 100% rename from kubejs/assets/tfg/textures/item/fuel_rod_u_1.png.mcmeta rename to kubejs/assets/tfg/textures/item/fission_rod/unused/fuel_rod_tbu_2.png.mcmeta diff --git a/kubejs/assets/tfg/textures/item/fuel_rod_tbu_4.png b/kubejs/assets/tfg/textures/item/fission_rod/unused/fuel_rod_tbu_4.png similarity index 100% rename from kubejs/assets/tfg/textures/item/fuel_rod_tbu_4.png rename to kubejs/assets/tfg/textures/item/fission_rod/unused/fuel_rod_tbu_4.png diff --git a/kubejs/assets/tfg/textures/item/fuel_rod_u_2.png.mcmeta b/kubejs/assets/tfg/textures/item/fission_rod/unused/fuel_rod_tbu_4.png.mcmeta similarity index 100% rename from kubejs/assets/tfg/textures/item/fuel_rod_u_2.png.mcmeta rename to kubejs/assets/tfg/textures/item/fission_rod/unused/fuel_rod_tbu_4.png.mcmeta diff --git a/kubejs/assets/tfg/textures/item/fuel_rod_u_2.png b/kubejs/assets/tfg/textures/item/fission_rod/unused/fuel_rod_u_2.png similarity index 100% rename from kubejs/assets/tfg/textures/item/fuel_rod_u_2.png rename to kubejs/assets/tfg/textures/item/fission_rod/unused/fuel_rod_u_2.png diff --git a/kubejs/assets/tfg/textures/item/fuel_rod_u_4.png.mcmeta b/kubejs/assets/tfg/textures/item/fission_rod/unused/fuel_rod_u_2.png.mcmeta similarity index 100% rename from kubejs/assets/tfg/textures/item/fuel_rod_u_4.png.mcmeta rename to kubejs/assets/tfg/textures/item/fission_rod/unused/fuel_rod_u_2.png.mcmeta diff --git a/kubejs/assets/tfg/textures/item/fuel_rod_u_4.png b/kubejs/assets/tfg/textures/item/fission_rod/unused/fuel_rod_u_4.png similarity index 100% rename from kubejs/assets/tfg/textures/item/fuel_rod_u_4.png rename to kubejs/assets/tfg/textures/item/fission_rod/unused/fuel_rod_u_4.png diff --git a/kubejs/assets/tfg/textures/item/fission_rod/unused/fuel_rod_u_4.png.mcmeta b/kubejs/assets/tfg/textures/item/fission_rod/unused/fuel_rod_u_4.png.mcmeta new file mode 100644 index 000000000..be167b255 --- /dev/null +++ b/kubejs/assets/tfg/textures/item/fission_rod/unused/fuel_rod_u_4.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 2, "frames": [{"index": 0, "time":30}, 1, 2, 3, 4, 5, 6, 7, 8, 9]}} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/item/fuel_rod_u_1.png b/kubejs/assets/tfg/textures/item/fission_rod/uranium_rod.png similarity index 100% rename from kubejs/assets/tfg/textures/item/fuel_rod_u_1.png rename to kubejs/assets/tfg/textures/item/fission_rod/uranium_rod.png diff --git a/kubejs/assets/tfg/textures/item/fission_rod/uranium_rod.png.mcmeta b/kubejs/assets/tfg/textures/item/fission_rod/uranium_rod.png.mcmeta new file mode 100644 index 000000000..be167b255 --- /dev/null +++ b/kubejs/assets/tfg/textures/item/fission_rod/uranium_rod.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 2, "frames": [{"index": 0, "time":30}, 1, 2, 3, 4, 5, 6, 7, 8, 9]}} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/item/fission_rod/uranium_rod_depleted.png b/kubejs/assets/tfg/textures/item/fission_rod/uranium_rod_depleted.png new file mode 100644 index 000000000..498d4f5eb Binary files /dev/null and b/kubejs/assets/tfg/textures/item/fission_rod/uranium_rod_depleted.png differ diff --git a/kubejs/assets/tfg/textures/item/fission_rod/uranium_rod_depleted.png.mcmeta b/kubejs/assets/tfg/textures/item/fission_rod/uranium_rod_depleted.png.mcmeta new file mode 100644 index 000000000..cc8a1f3c9 --- /dev/null +++ b/kubejs/assets/tfg/textures/item/fission_rod/uranium_rod_depleted.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 1}} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/item/fuel_rod_t_1.png b/kubejs/assets/tfg/textures/item/fuel_rod_t_1.png deleted file mode 100644 index a351e0e9a..000000000 Binary files a/kubejs/assets/tfg/textures/item/fuel_rod_t_1.png and /dev/null differ diff --git a/kubejs/assets/tfg/textures/item/terrafirmaguard_pa6.png b/kubejs/assets/tfg/textures/item/terrafirmaguard_pa6.png new file mode 100644 index 000000000..5badacb27 Binary files /dev/null and b/kubejs/assets/tfg/textures/item/terrafirmaguard_pa6.png differ diff --git a/kubejs/assets/tfg/textures/item/terrafirmaguard_pa6.png.mcmeta b/kubejs/assets/tfg/textures/item/terrafirmaguard_pa6.png.mcmeta new file mode 100644 index 000000000..24f9c2fae --- /dev/null +++ b/kubejs/assets/tfg/textures/item/terrafirmaguard_pa6.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 1 + } +} diff --git a/kubejs/assets/wan_ancient_beasts/lang/en_us.json b/kubejs/assets/wan_ancient_beasts/lang/en_us.json index 494713798..41707b3ba 100644 --- a/kubejs/assets/wan_ancient_beasts/lang/en_us.json +++ b/kubejs/assets/wan_ancient_beasts/lang/en_us.json @@ -5,5 +5,21 @@ "item.wan_ancient_beasts.raw_ancient_meat": "Raw Eater Drumstick", "item.wan_ancient_beasts.cooked_ancient_meat": "Cooked Eater Drumstick", "config.jade.plugin_tfc.surfer": "Surfer", - "config.jade.plugin_tfc.soarer": "Soarer" + "config.jade.plugin_tfc.soarer": "Soarer", + "tfc.recipe.barrel.tfg.barrel.dyeing.charger_armor_black": "Dyeing", + "tfc.recipe.barrel.tfg.barrel.dyeing.charger_armor_gray": "Dyeing", + "tfc.recipe.barrel.tfg.barrel.dyeing.charger_armor_light_gray": "Dyeing", + "tfc.recipe.barrel.tfg.barrel.dyeing.charger_armor_white": "Dyeing", + "tfc.recipe.barrel.tfg.barrel.dyeing.charger_armor_pink": "Dyeing", + "tfc.recipe.barrel.tfg.barrel.dyeing.charger_armor_magenta": "Dyeing", + "tfc.recipe.barrel.tfg.barrel.dyeing.charger_armor_purple": "Dyeing", + "tfc.recipe.barrel.tfg.barrel.dyeing.charger_armor_blue": "Dyeing", + "tfc.recipe.barrel.tfg.barrel.dyeing.charger_armor_light_blue": "Dyeing", + "tfc.recipe.barrel.tfg.barrel.dyeing.charger_armor_cyan": "Dyeing", + "tfc.recipe.barrel.tfg.barrel.dyeing.charger_armor_green": "Dyeing", + "tfc.recipe.barrel.tfg.barrel.dyeing.charger_armor_lime": "Dyeing", + "tfc.recipe.barrel.tfg.barrel.dyeing.charger_armor_yellow": "Dyeing", + "tfc.recipe.barrel.tfg.barrel.dyeing.charger_armor_orange": "Dyeing", + "tfc.recipe.barrel.tfg.barrel.dyeing.charger_armor_red": "Dyeing", + "tfc.recipe.barrel.tfg.barrel.dyeing.charger_armor_brown": "Dyeing" } \ No newline at end of file diff --git a/kubejs/assets/wan_ancient_beasts/lang/ja_jp.json b/kubejs/assets/wan_ancient_beasts/lang/ja_jp.json index 0da551aa7..1fe9f4d80 100644 --- a/kubejs/assets/wan_ancient_beasts/lang/ja_jp.json +++ b/kubejs/assets/wan_ancient_beasts/lang/ja_jp.json @@ -3,5 +3,21 @@ "block.wan_ancient_beasts.quick_red_sand": "čĩĪ鉄čģŠãŪæĩį ‚", "item.wan_ancient_beasts.toxlacanth": "į”ŸãŪトキシマãƒĐã‚Ŧãƒģã‚đ", "item.wan_ancient_beasts.raw_ancient_meat": "į”ŸãŪã‚Īマã‚ŋマãŪéŠĻäŧ˜ãč‚‰", - "item.wan_ancient_beasts.cooked_ancient_meat": "į„žã„たã‚Īマã‚ŋマãŪéŠĻäŧ˜ãč‚‰" + "item.wan_ancient_beasts.cooked_ancient_meat": "į„žã„たã‚Īマã‚ŋマãŪéŠĻäŧ˜ãč‚‰", + "tfc.recipe.barrel.tfg.barrel.dyeing.charger_armor_black": "Dyeing", + "tfc.recipe.barrel.tfg.barrel.dyeing.charger_armor_gray": "Dyeing", + "tfc.recipe.barrel.tfg.barrel.dyeing.charger_armor_light_gray": "Dyeing", + "tfc.recipe.barrel.tfg.barrel.dyeing.charger_armor_white": "Dyeing", + "tfc.recipe.barrel.tfg.barrel.dyeing.charger_armor_pink": "Dyeing", + "tfc.recipe.barrel.tfg.barrel.dyeing.charger_armor_magenta": "Dyeing", + "tfc.recipe.barrel.tfg.barrel.dyeing.charger_armor_purple": "Dyeing", + "tfc.recipe.barrel.tfg.barrel.dyeing.charger_armor_blue": "Dyeing", + "tfc.recipe.barrel.tfg.barrel.dyeing.charger_armor_light_blue": "Dyeing", + "tfc.recipe.barrel.tfg.barrel.dyeing.charger_armor_cyan": "Dyeing", + "tfc.recipe.barrel.tfg.barrel.dyeing.charger_armor_green": "Dyeing", + "tfc.recipe.barrel.tfg.barrel.dyeing.charger_armor_lime": "Dyeing", + "tfc.recipe.barrel.tfg.barrel.dyeing.charger_armor_yellow": "Dyeing", + "tfc.recipe.barrel.tfg.barrel.dyeing.charger_armor_orange": "Dyeing", + "tfc.recipe.barrel.tfg.barrel.dyeing.charger_armor_red": "Dyeing", + "tfc.recipe.barrel.tfg.barrel.dyeing.charger_armor_brown": "Dyeing" } \ No newline at end of file diff --git a/kubejs/assets/wan_ancient_beasts/lang/ru_ru.json b/kubejs/assets/wan_ancient_beasts/lang/ru_ru.json index 6da5a0cc8..297d4d858 100644 --- a/kubejs/assets/wan_ancient_beasts/lang/ru_ru.json +++ b/kubejs/assets/wan_ancient_beasts/lang/ru_ru.json @@ -3,5 +3,21 @@ "block.wan_ancient_beasts.quick_red_sand": "ГÐĩОаŅ‚ÐļŅ‚ÐūÐēŅ‹Ðđ зŅ‹ÐąŅƒŅ‡ÐļÐđ ÐŋÐĩŅÐūК", "item.wan_ancient_beasts.toxlacanth": "ÐĄŅ‹Ņ€ÐūÐđ Ņ‚ÐūКŅÐŧÐ°ÐšÐ°Ð―Ņ‚", "item.wan_ancient_beasts.raw_ancient_meat": "ÐĄŅ‹Ņ€Ð°Ņ Ð―ÐūÐķКа ÐŋÐūÐķÐļŅ€Ð°Ņ‚ÐĩÐŧŅ", - "item.wan_ancient_beasts.cooked_ancient_meat": "ПŅ€ÐļÐģÐūŅ‚ÐūÐēÐŧÐĩÐ―Ð―Ð°Ņ Ð―ÐūÐķКа ÐŋÐūÐķÐļŅ€Ð°Ņ‚ÐĩÐŧŅ" + "item.wan_ancient_beasts.cooked_ancient_meat": "ПŅ€ÐļÐģÐūŅ‚ÐūÐēÐŧÐĩÐ―Ð―Ð°Ņ Ð―ÐūÐķКа ÐŋÐūÐķÐļŅ€Ð°Ņ‚ÐĩÐŧŅ", + "tfc.recipe.barrel.tfg.barrel.dyeing.charger_armor_black": "ОКŅ€Ð°ŅˆÐļÐēÐ°Ð―ÐļÐĩ", + "tfc.recipe.barrel.tfg.barrel.dyeing.charger_armor_gray": "ОКŅ€Ð°ŅˆÐļÐēÐ°Ð―ÐļÐĩ", + "tfc.recipe.barrel.tfg.barrel.dyeing.charger_armor_light_gray": "ОКŅ€Ð°ŅˆÐļÐēÐ°Ð―ÐļÐĩ", + "tfc.recipe.barrel.tfg.barrel.dyeing.charger_armor_white": "ОКŅ€Ð°ŅˆÐļÐēÐ°Ð―ÐļÐĩ", + "tfc.recipe.barrel.tfg.barrel.dyeing.charger_armor_pink": "ОКŅ€Ð°ŅˆÐļÐēÐ°Ð―ÐļÐĩ", + "tfc.recipe.barrel.tfg.barrel.dyeing.charger_armor_magenta": "ОКŅ€Ð°ŅˆÐļÐēÐ°Ð―ÐļÐĩ", + "tfc.recipe.barrel.tfg.barrel.dyeing.charger_armor_purple": "ОКŅ€Ð°ŅˆÐļÐēÐ°Ð―ÐļÐĩ", + "tfc.recipe.barrel.tfg.barrel.dyeing.charger_armor_blue": "ОКŅ€Ð°ŅˆÐļÐēÐ°Ð―ÐļÐĩ", + "tfc.recipe.barrel.tfg.barrel.dyeing.charger_armor_light_blue": "ОКŅ€Ð°ŅˆÐļÐēÐ°Ð―ÐļÐĩ", + "tfc.recipe.barrel.tfg.barrel.dyeing.charger_armor_cyan": "ОКŅ€Ð°ŅˆÐļÐēÐ°Ð―ÐļÐĩ", + "tfc.recipe.barrel.tfg.barrel.dyeing.charger_armor_green": "ОКŅ€Ð°ŅˆÐļÐēÐ°Ð―ÐļÐĩ", + "tfc.recipe.barrel.tfg.barrel.dyeing.charger_armor_lime": "ОКŅ€Ð°ŅˆÐļÐēÐ°Ð―ÐļÐĩ", + "tfc.recipe.barrel.tfg.barrel.dyeing.charger_armor_yellow": "ОКŅ€Ð°ŅˆÐļÐēÐ°Ð―ÐļÐĩ", + "tfc.recipe.barrel.tfg.barrel.dyeing.charger_armor_orange": "ОКŅ€Ð°ŅˆÐļÐēÐ°Ð―ÐļÐĩ", + "tfc.recipe.barrel.tfg.barrel.dyeing.charger_armor_red": "ОКŅ€Ð°ŅˆÐļÐēÐ°Ð―ÐļÐĩ", + "tfc.recipe.barrel.tfg.barrel.dyeing.charger_armor_brown": "ОКŅ€Ð°ŅˆÐļÐēÐ°Ð―ÐļÐĩ" } \ No newline at end of file diff --git a/kubejs/assets/wan_ancient_beasts/lang/uk_ua.json b/kubejs/assets/wan_ancient_beasts/lang/uk_ua.json index 63240b7d4..00ebadd53 100644 --- a/kubejs/assets/wan_ancient_beasts/lang/uk_ua.json +++ b/kubejs/assets/wan_ancient_beasts/lang/uk_ua.json @@ -3,5 +3,21 @@ "block.wan_ancient_beasts.quick_red_sand": "ГÐĩОаŅ‚ÐļŅ‚ÐūÐēÐļÐđ ПÐŧÐļÐēŅƒÐ―", "item.wan_ancient_beasts.toxlacanth": "ÐĄÐļŅ€ÐļÐđ Ņ‚ÐūКŅÐ°ÐšÐ°Ð―Ņ‚", "item.wan_ancient_beasts.raw_ancient_meat": "ÐĄÐļŅ€Ðĩ ŅŅ‚ÐĩÐģÐ―Ðū ÐŋÐūÐķÐļŅ€Ð°Ņ‡Ð°", - "item.wan_ancient_beasts.cooked_ancient_meat": "ÐĄÐžÐ°ÐķÐĩÐ―Ðĩ ŅŅ‚ÐĩÐģÐ―Ðū ÐŋÐūÐķÐļŅ€Ð°Ņ‡Ð°" + "item.wan_ancient_beasts.cooked_ancient_meat": "ÐĄÐžÐ°ÐķÐĩÐ―Ðĩ ŅŅ‚ÐĩÐģÐ―Ðū ÐŋÐūÐķÐļŅ€Ð°Ņ‡Ð°", + "tfc.recipe.barrel.tfg.barrel.dyeing.charger_armor_black": "ОКŅ€Ð°ŅˆÐļÐēÐ°Ð―ÐļÐĩ", + "tfc.recipe.barrel.tfg.barrel.dyeing.charger_armor_gray": "ОКŅ€Ð°ŅˆÐļÐēÐ°Ð―ÐļÐĩ", + "tfc.recipe.barrel.tfg.barrel.dyeing.charger_armor_light_gray": "ОКŅ€Ð°ŅˆÐļÐēÐ°Ð―ÐļÐĩ", + "tfc.recipe.barrel.tfg.barrel.dyeing.charger_armor_white": "ОКŅ€Ð°ŅˆÐļÐēÐ°Ð―ÐļÐĩ", + "tfc.recipe.barrel.tfg.barrel.dyeing.charger_armor_pink": "ОКŅ€Ð°ŅˆÐļÐēÐ°Ð―ÐļÐĩ", + "tfc.recipe.barrel.tfg.barrel.dyeing.charger_armor_magenta": "ОКŅ€Ð°ŅˆÐļÐēÐ°Ð―ÐļÐĩ", + "tfc.recipe.barrel.tfg.barrel.dyeing.charger_armor_purple": "ОКŅ€Ð°ŅˆÐļÐēÐ°Ð―ÐļÐĩ", + "tfc.recipe.barrel.tfg.barrel.dyeing.charger_armor_blue": "ОКŅ€Ð°ŅˆÐļÐēÐ°Ð―ÐļÐĩ", + "tfc.recipe.barrel.tfg.barrel.dyeing.charger_armor_light_blue": "ОКŅ€Ð°ŅˆÐļÐēÐ°Ð―ÐļÐĩ", + "tfc.recipe.barrel.tfg.barrel.dyeing.charger_armor_cyan": "ОКŅ€Ð°ŅˆÐļÐēÐ°Ð―ÐļÐĩ", + "tfc.recipe.barrel.tfg.barrel.dyeing.charger_armor_green": "ОКŅ€Ð°ŅˆÐļÐēÐ°Ð―ÐļÐĩ", + "tfc.recipe.barrel.tfg.barrel.dyeing.charger_armor_lime": "ОКŅ€Ð°ŅˆÐļÐēÐ°Ð―ÐļÐĩ", + "tfc.recipe.barrel.tfg.barrel.dyeing.charger_armor_yellow": "ОКŅ€Ð°ŅˆÐļÐēÐ°Ð―ÐļÐĩ", + "tfc.recipe.barrel.tfg.barrel.dyeing.charger_armor_orange": "ОКŅ€Ð°ŅˆÐļÐēÐ°Ð―ÐļÐĩ", + "tfc.recipe.barrel.tfg.barrel.dyeing.charger_armor_red": "ОКŅ€Ð°ŅˆÐļÐēÐ°Ð―ÐļÐĩ", + "tfc.recipe.barrel.tfg.barrel.dyeing.charger_armor_brown": "ОКŅ€Ð°ŅˆÐļÐēÐ°Ð―ÐļÐĩ" } \ No newline at end of file diff --git a/kubejs/assets/wan_ancient_beasts/lang/zh_cn.json b/kubejs/assets/wan_ancient_beasts/lang/zh_cn.json index ad0befad8..19078bae3 100644 --- a/kubejs/assets/wan_ancient_beasts/lang/zh_cn.json +++ b/kubejs/assets/wan_ancient_beasts/lang/zh_cn.json @@ -5,5 +5,21 @@ "item.wan_ancient_beasts.raw_ancient_meat": "į”Ÿå™ŽéĒšå…―č…ŋ肉", "item.wan_ancient_beasts.cooked_ancient_meat": "į†Ÿå™ŽéĒšå…―č…ŋ肉", "config.jade.plugin_tfc.surfer": "į īæĩŠå…―", - "config.jade.plugin_tfc.soarer": "įŋąįŋ”éļŸ" + "config.jade.plugin_tfc.soarer": "įŋąįŋ”éļŸ", + "tfc.recipe.barrel.tfg.barrel.dyeing.charger_armor_black": "染č‰ē", + "tfc.recipe.barrel.tfg.barrel.dyeing.charger_armor_gray": "染č‰ē", + "tfc.recipe.barrel.tfg.barrel.dyeing.charger_armor_light_gray": "染č‰ē", + "tfc.recipe.barrel.tfg.barrel.dyeing.charger_armor_white": "染č‰ē", + "tfc.recipe.barrel.tfg.barrel.dyeing.charger_armor_pink": "染č‰ē", + "tfc.recipe.barrel.tfg.barrel.dyeing.charger_armor_magenta": "染č‰ē", + "tfc.recipe.barrel.tfg.barrel.dyeing.charger_armor_purple": "染č‰ē", + "tfc.recipe.barrel.tfg.barrel.dyeing.charger_armor_blue": "染č‰ē", + "tfc.recipe.barrel.tfg.barrel.dyeing.charger_armor_light_blue": "染č‰ē", + "tfc.recipe.barrel.tfg.barrel.dyeing.charger_armor_cyan": "染č‰ē", + "tfc.recipe.barrel.tfg.barrel.dyeing.charger_armor_green": "染č‰ē", + "tfc.recipe.barrel.tfg.barrel.dyeing.charger_armor_lime": "染č‰ē", + "tfc.recipe.barrel.tfg.barrel.dyeing.charger_armor_yellow": "染č‰ē", + "tfc.recipe.barrel.tfg.barrel.dyeing.charger_armor_orange": "染č‰ē", + "tfc.recipe.barrel.tfg.barrel.dyeing.charger_armor_red": "染č‰ē", + "tfc.recipe.barrel.tfg.barrel.dyeing.charger_armor_brown": "染č‰ē" } \ No newline at end of file diff --git a/kubejs/client_scripts/tooltips.js b/kubejs/client_scripts/tooltips.js index 9ec39e3f0..d4e336e7a 100644 --- a/kubejs/client_scripts/tooltips.js +++ b/kubejs/client_scripts/tooltips.js @@ -24,6 +24,12 @@ const registerTooltips = (event) => { event.addAdvanced(['tfg:antipoison_tablet'], (item, advanced, text) => { text.add(1, Text.translate('tfg.tooltip.antipoison_tablet')) }) + event.addAdvanced(['tfg:polycaprolactam_fabric'], (item, advanced, text) => { + text.add(1, Text.translate('tfg.tooltip.polycaprolactam')) + }) + + //#region Multiblock Controler Tooltip + 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')); @@ -113,7 +119,7 @@ const registerTooltips = (event) => { text.add(1, Text.translate('gtceu.tooltip.machine.coal_liquefaction_tower_1')); text.add(2, Text.translate('gtceu.tooltip.machine.coal_liquefaction_tower_2')); text.add(3, Text.translate('tfg.tooltip.machine.coil_speed_discount')); - text.add(4, Text.translate('tfg.tooltip.machine.one_energy_hatch')); + text.add(4, Text.translate('tfg.tooltip.machine.two_energy_hatch')); }) event.addAdvanced(['tfg:hydroponics_facility'], (item, advanced, text) => { text.add(1, Text.translate('tfg.tooltip.machine.hydroponics_facility_1')); @@ -127,6 +133,31 @@ const registerTooltips = (event) => { text.add(3, Text.translate('tfg.tooltip.machine.parallel')); text.add(4, Text.translate('tfg.tooltip.machine.two_energy_hatches')); }) + event.addAdvanced(['tfg:smr_generator'], (item, advanced, text) => { + text.add(1, Text.translate('tfg.tooltip.machine.smt_1')); + text.add(2, Text.translate('tfg.tooltip.machine.smt_2')); + text.add(3, Text.translate('tfg.tooltip.machine.smt_3')); + }) + event.addAdvanced(['deafission:fission_reactor_mk1'], (item, advanced, text) => { + text.add(1, Text.translate('tfg.tooltip.machine.fission_reactor_mk1_1')); + text.add(2, Text.translate('tfg.tooltip.machine.fission_reactor_mk1_2')); + }) + event.addAdvanced(['deafission:fission_reactor_smr1'], (item, advanced, text) => { + text.add(1, Text.translate('tfg.tooltip.machine.small_fission_reactor_mk1_1')); + text.add(2, Text.translate('tfg.tooltip.machine.small_fission_reactor_mk1_2')); + }) + 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")); + }) + event.addAdvanced(['tfg:heat_battery_mk1'], (item, advanced, text) => { + text.add(1, Text.translate('tfg.tooltip.machine.heat_battery_1')); + text.add(2, Text.translate('tfg.tooltip.machine.heat_battery_2')); + text.add(3, Text.translate('tfg.tooltip.machine.heat_battery_3')); + }) + + //#endregion + event.addAdvanced(['tfg:grow_light'], (item, advanced, text) => { text.add(1, Text.translate('tfg.tooltip.grow_light_disapointment')); }) @@ -321,6 +352,7 @@ const registerTooltips = (event) => { }) event.addAdvanced(['#tfc:fired_vessels'], (item, advanced, text) => { text.add(1, Text.translate("gtceu.universal.tooltip.fluid_storage_capacity", "3,024")) + text.add(2, Text.translate("tfg.tooltip.vessel_warning")) }) event.addAdvanced(['waterflasks:iron_flask', 'waterflasks:red_steel_flask'], (item, advanced, text) => { text.add(1, Text.translate("gtceu.universal.tooltip.fluid_storage_capacity", "2,000")) @@ -356,7 +388,7 @@ const registerTooltips = (event) => { text.add(1, Text.translate("gtceu.universal.tooltip.item_storage_capacity", "9")) }) - //Nuclear Fission Tooltips + //#region Nuclear Fission Tooltips event.addAdvanced(['minecraft:blue_ice'], (item, advanced, text) => { text.add(1, Text.translate("tfg.tooltip.component.blue_ice")) }) @@ -378,11 +410,20 @@ const registerTooltips = (event) => { event.addAdvanced(['tfg:refrigerant_pellet'], (item, advanced, text) => { text.add(1, Text.translate("tfg.tooltip.component.refrigerant_pellet")) }) - - 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")); + event.addAdvanced(['tfg:terrafirmaguard_pa6'], (item, advanced, text) => { + text.add(1, Text.translate("tfg.tooltip.component.refrigerant_pellet")) }) + event.addAdvanced(['tfg:copper_sandy_frame'], (item, advanced, text) => { + text.add(1, Text.translate("tfg.tooltip.component.sandy_copper_frame")) + }) + event.addAdvanced(['tfg:beryllium_sandy_frame'], (item, advanced, text) => { + text.add(1, Text.translate("tfg.tooltip.component.sandy_beryllium_frame")) + }) + event.addAdvanced(['tfg:uv_smr_fluid_import_hatch'], (item, advanced, text) => { + text.add(1, Text.translate("tfg.tooltip.machine.smr_fluid_import_hatch")) + }) + + //#endregion event.addAdvanced(['tfg:food/slice_of_cheese'], (item, advanced, text) => { if (!event.isShift()) { @@ -393,6 +434,7 @@ const registerTooltips = (event) => { }; }); + //#endregion // AE2 event.addAdvanced(['tfg:wireless_card'], (item, advanced, text) => { @@ -402,47 +444,47 @@ const registerTooltips = (event) => { }) // Deprecated Items - event.addAdvanced(['vintageimprovements:lathe'], (item, advanced, text) => { + event.addAdvanced(['vintageimprovements:lathe', 'ae2:fe_p2p_tunnel'], (item, advanced, text) => { text.add(1, Text.translate('tfg.tooltip.obsolete.depreciated')) }) // Drink effects - event.addAdvanced(['tfc_gurman:compote_bucket'], (item, advanced, text) => { + event.addAdvanced(['tfc_gourmet:compote_bucket'], (item, advanced, text) => { text.add(1, Text.translate("effect.minecraft.jump_boost").append(Text.of(" II (00:30)")).blue()); }) - event.addAdvanced(['tfc_gurman:kvass_bucket'], (item, advanced, text) => { + event.addAdvanced(['tfc_gourmet:kvass_bucket'], (item, advanced, text) => { text.add(1, Text.translate("effect.minecraft.strength").append(Text.of(" (01:20)")).blue()); text.add(2, Text.translate('tfg.tooltip.cooling_foods')); }) - event.addAdvanced(['tfc_gurman:lemonade_bucket'], (item, advanced, text) => { + event.addAdvanced(['tfc_gourmet:lemonade_bucket'], (item, advanced, text) => { text.add(1, Text.translate("effect.minecraft.haste").append(Text.of(" (00:30)")).blue()); text.add(2, Text.translate('tfg.tooltip.cooling_foods')); }) - event.addAdvanced(['tfc_gurman:coffee_bucket'], (item, advanced, text) => { + event.addAdvanced(['tfc_gourmet:coffee_bucket'], (item, advanced, text) => { text.add(1, Text.translate("effect.minecraft.speed").append(Text.of(" (00:30)")).blue()); text.add(2, Text.translate('tfg.tooltip.warming_foods')); }) - event.addAdvanced(['tfc_gurman:cocoa_bucket'], (item, advanced, text) => { + event.addAdvanced(['tfc_gourmet:cocoa_bucket'], (item, advanced, text) => { text.add(1, Text.translate("effect.minecraft.haste").append(Text.of(" (00:30)")).blue()); text.add(2, Text.translate('tfg.tooltip.warming_foods')); }) - event.addAdvanced(['tfc_gurman:tea_mint_bucket'], (item, advanced, text) => { + event.addAdvanced(['tfc_gourmet:tea_mint_bucket'], (item, advanced, text) => { text.add(1, Text.translate("effect.minecraft.regeneration").append(Text.of(" II (00:30)")).blue()); text.add(2, Text.translate('tfg.tooltip.warming_foods')); }) - event.addAdvanced(['tfc_gurman:tea_chamomile_bucket'], (item, advanced, text) => { + event.addAdvanced(['tfc_gourmet:tea_chamomile_bucket'], (item, advanced, text) => { text.add(1, Text.translate("effect.minecraft.resistance").append(Text.of(" II (00:30)")).blue()); text.add(2, Text.translate('tfg.tooltip.warming_foods')); }) - event.addAdvanced(['tfc_gurman:tea_nettle_bucket'], (item, advanced, text) => { + event.addAdvanced(['tfc_gourmet:tea_nettle_bucket'], (item, advanced, text) => { text.add(1, Text.translate("effect.minecraft.slow_falling").append(Text.of(" (00:30)")).blue()); text.add(2, Text.translate('tfg.tooltip.warming_foods')); }) - event.addAdvanced(['tfc_gurman:tea_rosehip_bucket'], (item, advanced, text) => { + event.addAdvanced(['tfc_gourmet:tea_rosehip_bucket'], (item, advanced, text) => { text.add(1, Text.translate("effect.minecraft.absorption").append(Text.of(" (00:30)")).blue()); text.add(2, Text.translate('tfg.tooltip.warming_foods')); }) - event.addAdvanced(['tfc_gurman:nalivka_bucket'], (item, advanced, text) => { + event.addAdvanced(['tfc_gourmet:nalivka_bucket'], (item, advanced, text) => { text.add(1, Text.translate("effect.minecraft.strength").append(Text.of(" (02:40)")).blue()); text.add(2, Text.translate('tfg.tooltip.cooling_foods')); }) diff --git a/kubejs/data/ad_astra/dimension/mars.json b/kubejs/data/ad_astra/dimension/mars.json index 4d9fc2375..f709f0b4f 100644 --- a/kubejs/data/ad_astra/dimension/mars.json +++ b/kubejs/data/ad_astra/dimension/mars.json @@ -56,7 +56,8 @@ "chert": "tfc:chert", "chalk": "tfc:chalk", "basalt": "tfc:basalt", - "dacite": "tfc:dacite" + "dacite": "tfc:dacite", + "quartzite": "tfc:quartzite" }, "layers": [ { @@ -70,7 +71,8 @@ "basalt": "bottom", "dacite": "bottom", "venus": "bottom", - "shale": "bottom" + "shale": "bottom", + "quartzite": "bottom" } }, { @@ -83,7 +85,8 @@ "limestone": "mix", "claystone": "mix", "conglomerate": "mix", - "chert": "mix" + "chert": "mix", + "quartzite": "mix" } } ], diff --git a/kubejs/data/ad_astra/dimension/venus.json b/kubejs/data/ad_astra/dimension/venus.json index 6d7dba3d4..bdbd37c82 100644 --- a/kubejs/data/ad_astra/dimension/venus.json +++ b/kubejs/data/ad_astra/dimension/venus.json @@ -64,6 +64,26 @@ "spike": "tfg:spike/dripstone_spike", "loose": "tfg:loose/dripstone" }, + "flavolite": { + "raw": "betterend:flavolite", + "hardened": "tfg:rock/hardened_flavolite", + "gravel": "tfg:rock/gravel_flavolite", + "cobble": "tfg:rock/cobble_flavolite", + "sand": "tfc:sand/green", + "sandstone": "tfc:raw_sandstone/green", + "spike": "tfg:spike/flavolite_spike", + "loose": "tfg:loose/flavolite" + }, + "sandy_jadestone": { + "raw": "betterend:sandy_jadestone", + "hardened": "tfg:rock/hardened_sandy_jadestone", + "gravel": "tfg:rock/gravel_sandy_jadestone", + "cobble": "tfg:rock/cobble_sandy_jadestone", + "sand": "tfc:sand/green", + "sandstone": "tfc:raw_sandstone/green", + "spike": "tfg:spike/sandy_jadestone_spike", + "loose": "tfg:loose/sandy_jadestone" + }, "granite": "tfc:granite", "diorite": "tfc:diorite", "gabbro": "tfc:gabbro", @@ -95,7 +115,8 @@ "basalt": "bottom", "schist": "bottom", "gneiss": "bottom", - "quartzite": "bottom" + "quartzite": "bottom", + "flavolite": "bottom" } }, { @@ -116,7 +137,9 @@ "rhyolite": "middle", "basalt": "middle", "andesite": "middle", - "dacite": "middle" + "dacite": "middle", + "flavolite": "middle", + "sandy_jadestone": "middle" } } ], @@ -153,7 +176,7 @@ "temperature": 0, "humidity": 0, "continentalness": -1, - "erosion": -0.05, + "erosion": 0.05, "weirdness": -0.2, "depth": 0, "offset": 0 @@ -165,7 +188,7 @@ "temperature": 0, "humidity": 0, "continentalness": -1, - "erosion": -0.05, + "erosion": 0.05, "weirdness": 0, "depth": 0, "offset": 0 @@ -177,7 +200,7 @@ "temperature": 0, "humidity": 0, "continentalness": -1, - "erosion": -0.05, + "erosion": 0.05, "weirdness": 0.2, "depth": 0, "offset": 0 @@ -227,7 +250,7 @@ "temperature": 0, "humidity": 0, "continentalness": -0.47, - "erosion": -0.05, + "erosion": 0.05, "weirdness": -0.2, "depth": 0, "offset": 0 @@ -239,7 +262,7 @@ "temperature": 0, "humidity": 0, "continentalness": -0.47, - "erosion": -0.05, + "erosion": 0.05, "weirdness": 0, "depth": 0, "offset": 0 @@ -251,7 +274,7 @@ "temperature": 0, "humidity": 0, "continentalness": -0.47, - "erosion": -0.05, + "erosion": 0.05, "weirdness": 0.2, "depth": 0, "offset": 0 @@ -301,7 +324,7 @@ "temperature": 0, "humidity": 0, "continentalness": -0.44, - "erosion": -0.05, + "erosion": 0.05, "depth": 0, "weirdness": -0.2, "offset": 0 @@ -313,7 +336,7 @@ "temperature": 0, "humidity": 0, "continentalness": -0.44, - "erosion": -0.05, + "erosion": 0.05, "depth": 0, "weirdness": 0, "offset": 0 @@ -325,7 +348,7 @@ "temperature": 0, "humidity": 0, "continentalness": -0.44, - "erosion": -0.05, + "erosion": 0.05, "depth": 0, "weirdness": 0.2, "offset": 0 @@ -375,8 +398,8 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": -0.39, - "erosion": -0.05, + "continentalness": -0.315, + "erosion": 0.05, "depth": 0, "weirdness": -0.2, "offset": 0 @@ -387,8 +410,8 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": -0.39, - "erosion": -0.05, + "continentalness": -0.315, + "erosion": 0.05, "depth": 0, "weirdness": 0, "offset": 0 @@ -399,8 +422,8 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": -0.39, - "erosion": -0.05, + "continentalness": -0.315, + "erosion": 0.05, "depth": 0, "weirdness": 0.2, "offset": 0 @@ -412,7 +435,7 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": -0.39, + "continentalness": -0.315, "erosion": 0.05, "depth": 0, "weirdness": -0.2, @@ -424,7 +447,7 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": -0.39, + "continentalness": -0.315, "erosion": 0.05, "depth": 0, "weirdness": 0, @@ -436,7 +459,7 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": -0.39, + "continentalness": -0.315, "erosion": 0.05, "depth": 0, "weirdness": 0.2, @@ -451,7 +474,7 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": -0.375, + "continentalness": -0.3, "erosion": 0.05, "depth": 0, "weirdness": -0.2, @@ -463,7 +486,7 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": -0.375, + "continentalness": -0.3, "erosion": 0.05, "depth": 0, "weirdness": 0, @@ -475,7 +498,7 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": -0.375, + "continentalness": -0.3, "erosion": 0.05, "depth": 0, "weirdness": 0.2, @@ -488,7 +511,7 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": -0.1, + "continentalness": 0, "erosion": 0.05, "depth": 0, "weirdness": -0.2, @@ -500,7 +523,7 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": -0.1, + "continentalness": 0, "erosion": 0.05, "depth": 0, "weirdness": 0, @@ -512,7 +535,7 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": -0.1, + "continentalness": 0, "erosion": 0.05, "depth": 0, "weirdness": 0.2, @@ -527,8 +550,8 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": -0.375, - "erosion": -0.05, + "continentalness": -0.3, + "erosion": 0.05, "depth": 0, "weirdness": -0.2, "offset": 0.0 @@ -539,8 +562,8 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": -0.375, - "erosion": -0.05, + "continentalness": -0.3, + "erosion": 0.05, "depth": 0, "weirdness": 0, "offset": 0.0 @@ -551,8 +574,8 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": -0.375, - "erosion": -0.05, + "continentalness": -0.3, + "erosion": 0.05, "depth": 0, "weirdness": 0.2, "offset": 0.0 @@ -564,8 +587,8 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": -0.1, - "erosion": -0.05, + "continentalness": 0, + "erosion": 0.05, "depth": 0, "weirdness": -0.2, "offset": 0.0 @@ -576,8 +599,8 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": -0.1, - "erosion": -0.05, + "continentalness": 0, + "erosion": 0.05, "depth": 0, "weirdness": 0, "offset": 0.0 @@ -588,8 +611,8 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": -0.1, - "erosion": -0.05, + "continentalness": 0, + "erosion": 0.05, "depth": 0, "weirdness": 0.2, "offset": 0.0 @@ -602,7 +625,7 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": -0.05, + "continentalness": 0.05, "erosion": 0.05, "depth": 0, "weirdness": -0.2, @@ -614,7 +637,7 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": -0.05, + "continentalness": 0.05, "erosion": 0.05, "depth": 0, "weirdness": 0, @@ -626,7 +649,7 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": -0.05, + "continentalness": 0.05, "erosion": 0.05, "depth": 0, "weirdness": 0.2, @@ -639,7 +662,7 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": 0.35, + "continentalness": 0.45, "erosion": 0.05, "depth": 0, "weirdness": -0.2, @@ -651,7 +674,7 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": 0.35, + "continentalness": 0.45, "erosion": 0.05, "depth": 0, "weirdness": 0, @@ -663,7 +686,7 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": 0.35, + "continentalness": 0.45, "erosion": 0.05, "depth": 0, "weirdness": 0.2, @@ -678,8 +701,8 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": -0.05, - "erosion": -0.05, + "continentalness": 0.05, + "erosion": 0.05, "depth": 0, "weirdness": -0.2, "offset": 0.0 @@ -690,8 +713,8 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": -0.05, - "erosion": -0.05, + "continentalness": 0.05, + "erosion": 0.05, "depth": 0, "weirdness": 0, "offset": 0.0 @@ -702,8 +725,8 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": -0.05, - "erosion": -0.05, + "continentalness": 0.05, + "erosion": 0.05, "depth": 0, "weirdness": 0.2, "offset": 0.0 @@ -716,8 +739,8 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": 0.35, - "erosion": -0.05, + "continentalness": 0.45, + "erosion": 0.05, "depth": 0, "weirdness": -0.2, "offset": 0.0 @@ -728,8 +751,8 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": 0.35, - "erosion": -0.05, + "continentalness": 0.45, + "erosion": 0.05, "depth": 0, "weirdness": 0, "offset": 0.0 @@ -740,8 +763,8 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": 0.35, - "erosion": -0.05, + "continentalness": 0.45, + "erosion": 0.05, "depth": 0, "weirdness": 0.2, "offset": 0.0 @@ -756,7 +779,7 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": 0.4, + "continentalness": 0.5, "erosion": 0.05, "depth": 0, "weirdness": -0.2, @@ -768,7 +791,7 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": 0.4, + "continentalness": 0.5, "erosion": 0.05, "depth": 0, "weirdness": 0, @@ -780,7 +803,7 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": 0.4, + "continentalness": 0.5, "erosion": 0.05, "depth": 0, "weirdness": 0.2, @@ -794,8 +817,8 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": 0.4, - "erosion": -0.05, + "continentalness": 0.5, + "erosion": 0.05, "depth": 0, "weirdness": -0.2, "offset": 0.0 @@ -806,8 +829,8 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": 0.4, - "erosion": -0.05, + "continentalness": 0.5, + "erosion": 0.05, "depth": 0, "weirdness": 0, "offset": 0.0 @@ -818,8 +841,8 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": 0.4, - "erosion": -0.05, + "continentalness": 0.5, + "erosion": 0.05, "depth": 0, "weirdness": 0.2, "offset": 0.0 diff --git a/kubejs/data/ad_astra/worldgen/biome/orbit.json b/kubejs/data/ad_astra/worldgen/biome/orbit.json new file mode 100644 index 000000000..876da29bb --- /dev/null +++ b/kubejs/data/ad_astra/worldgen/biome/orbit.json @@ -0,0 +1,38 @@ +{ + "carvers": {}, + "downfall": 0.0, + "effects": { + "fog_color": 0, + "mood_sound": { + "block_search_extent": 8, + "offset": 2.0, + "sound": "minecraft:ambient.cave", + "tick_delay": 6000 + }, + "sky_color": 0, + "water_color": 4159204, + "water_fog_color": 329011, + "music": { + "max_delay": 24000, + "min_delay": 12000, + "replace_current_music": false, + "sound": { + "sound_id": "tfg:music.orbit" + } + } + }, + "features": [], + "has_precipitation": false, + "spawn_costs": {}, + "spawners": { + "ambient": [], + "axolotls": [], + "creature": [], + "misc": [], + "monster": [], + "underground_water_creature": [], + "water_ambient": [], + "water_creature": [] + }, + "temperature": 0.5 +} \ No newline at end of file diff --git a/kubejs/data/betterend/loot_tables/blocks/flavolite.json b/kubejs/data/betterend/loot_tables/blocks/flavolite.json new file mode 100644 index 000000000..1215fdeef --- /dev/null +++ b/kubejs/data/betterend/loot_tables/blocks/flavolite.json @@ -0,0 +1,44 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "name": "betterend:flavolite", + "conditions": [ + { + "condition": "tfc:is_isolated" + } + ] + }, + { + "type": "minecraft:item", + "name": "tfg:loose/flavolite", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 1, + "max": 4, + "type": "minecraft:uniform" + } + } + ] + } + ] + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/kubejs/data/betterend/loot_tables/blocks/sandy_jadestone.json b/kubejs/data/betterend/loot_tables/blocks/sandy_jadestone.json new file mode 100644 index 000000000..80bc06412 --- /dev/null +++ b/kubejs/data/betterend/loot_tables/blocks/sandy_jadestone.json @@ -0,0 +1,44 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "name": "betterend:sandy_jadestone", + "conditions": [ + { + "condition": "tfc:is_isolated" + } + ] + }, + { + "type": "minecraft:item", + "name": "tfg:loose/sandy_jadestone", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 1, + "max": 4, + "type": "minecraft:uniform" + } + } + ] + } + ] + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/kubejs/data/create/loot_tables/blocks/scorchia.json b/kubejs/data/create/loot_tables/blocks/scorchia.json new file mode 100644 index 000000000..3fc5016e3 --- /dev/null +++ b/kubejs/data/create/loot_tables/blocks/scorchia.json @@ -0,0 +1,44 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "name": "create:scorchia", + "conditions": [ + { + "condition": "tfc:is_isolated" + } + ] + }, + { + "type": "minecraft:item", + "name": "tfg:loose/scorchia", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 1, + "max": 4, + "type": "minecraft:uniform" + } + } + ] + } + ] + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/kubejs/data/create/loot_tables/blocks/scoria.json b/kubejs/data/create/loot_tables/blocks/scoria.json new file mode 100644 index 000000000..e76d4e30d --- /dev/null +++ b/kubejs/data/create/loot_tables/blocks/scoria.json @@ -0,0 +1,44 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "name": "create:scoria", + "conditions": [ + { + "condition": "tfc:is_isolated" + } + ] + }, + { + "type": "minecraft:item", + "name": "tfg:loose/scoria", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 1, + "max": 4, + "type": "minecraft:uniform" + } + } + ] + } + ] + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/kubejs/data/minecraft/loot_tables/entities/piglin_brute.json b/kubejs/data/minecraft/loot_tables/entities/piglin_brute.json new file mode 100644 index 000000000..24417601e --- /dev/null +++ b/kubejs/data/minecraft/loot_tables/entities/piglin_brute.json @@ -0,0 +1,55 @@ +{ + "type": "minecraft:entity", + "pools": [ + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "tfc:food/pork", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "type": "minecraft:uniform", + "min": 1, + "max": 2 + } + } + ] + } + ] + }, + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:bone", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "type": "minecraft:uniform", + "min": 1, + "max": 3 + } + } + ] + } + ] + }, + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:gold_ingot" + } + ] + } + ] +} \ No newline at end of file diff --git a/kubejs/data/simplystacked/config/glacio_to_orbit.json b/kubejs/data/simplystacked/config/glacio_to_orbit.json new file mode 100644 index 000000000..b8b694ae7 --- /dev/null +++ b/kubejs/data/simplystacked/config/glacio_to_orbit.json @@ -0,0 +1,8 @@ +{ + "from": "ad_astra:glacio", + "to": "ad_astra:glacio_orbit", + "from_y_min": 500, + "from_y_max": 600, + "to_y": -64, + "cloud_platform": false +} \ No newline at end of file diff --git a/kubejs/data/simplystacked/config/mars_to_orbit.json b/kubejs/data/simplystacked/config/mars_to_orbit.json new file mode 100644 index 000000000..e6f441294 --- /dev/null +++ b/kubejs/data/simplystacked/config/mars_to_orbit.json @@ -0,0 +1,8 @@ +{ + "from": "ad_astra:mars", + "to": "ad_astra:mars_orbit", + "from_y_min": 500, + "from_y_max": 600, + "to_y": -64, + "cloud_platform": false +} \ No newline at end of file diff --git a/kubejs/data/simplystacked/config/mercury_to_orbit.json b/kubejs/data/simplystacked/config/mercury_to_orbit.json new file mode 100644 index 000000000..c17b6f585 --- /dev/null +++ b/kubejs/data/simplystacked/config/mercury_to_orbit.json @@ -0,0 +1,8 @@ +{ + "from": "ad_astra:mercury", + "to": "ad_astra:mercury_orbit", + "from_y_min": 500, + "from_y_max": 600, + "to_y": -64, + "cloud_platform": false +} \ No newline at end of file diff --git a/kubejs/data/simplystacked/config/overworld_to_orbit.json b/kubejs/data/simplystacked/config/overworld_to_orbit.json new file mode 100644 index 000000000..2255822cf --- /dev/null +++ b/kubejs/data/simplystacked/config/overworld_to_orbit.json @@ -0,0 +1,8 @@ +{ + "from": "minecraft:overworld", + "to": "ad_astra:earth_orbit", + "from_y_min": 500, + "from_y_max": 600, + "to_y": -64, + "cloud_platform": false +} \ No newline at end of file diff --git a/kubejs/data/simplystacked/config/venus_to_orbit.json b/kubejs/data/simplystacked/config/venus_to_orbit.json new file mode 100644 index 000000000..3860a103c --- /dev/null +++ b/kubejs/data/simplystacked/config/venus_to_orbit.json @@ -0,0 +1,8 @@ +{ + "from": "ad_astra:venus", + "to": "ad_astra:venus_orbit", + "from_y_min": 500, + "from_y_max": 600, + "to_y": -64, + "cloud_platform": false +} \ No newline at end of file diff --git a/kubejs/data/tfc/worldgen/placed_feature/flood_fill_lake.json b/kubejs/data/tfc/worldgen/placed_feature/flood_fill_lake.json new file mode 100644 index 000000000..3c544cd20 --- /dev/null +++ b/kubejs/data/tfc/worldgen/placed_feature/flood_fill_lake.json @@ -0,0 +1,21 @@ +{ + "__comment__": "This file was automatically created by mcresources", + "feature": "tfc:flood_fill_lake", + "placement": [ + { + "type": "minecraft:rarity_filter", + "chance": 5 + }, + { + "type": "tfc:climate", + "min_rainfall": 100 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "WORLD_SURFACE_WG" + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfc_gurman/tfc/drinkables/cocoa.json b/kubejs/data/tfc_gurman/tfc/drinkables/cocoa.json index 0f59bce41..b8b268214 100644 --- a/kubejs/data/tfc_gurman/tfc/drinkables/cocoa.json +++ b/kubejs/data/tfc_gurman/tfc/drinkables/cocoa.json @@ -1,5 +1,5 @@ { - "ingredient": "tfc_gurman:cocoa", + "ingredient": "tfc_gourmet:cocoa", "thirst": 10, "may_drink_when_full": true, "effects": [ diff --git a/kubejs/data/tfc_gurman/tfc/drinkables/coffee.json b/kubejs/data/tfc_gurman/tfc/drinkables/coffee.json index c64e29166..47bf4613f 100644 --- a/kubejs/data/tfc_gurman/tfc/drinkables/coffee.json +++ b/kubejs/data/tfc_gurman/tfc/drinkables/coffee.json @@ -1,5 +1,5 @@ { - "ingredient": "tfc_gurman:coffee", + "ingredient": "tfc_gourmet:coffee", "thirst": 10, "may_drink_when_full": true, "effects": [ diff --git a/kubejs/data/tfc_gurman/tfc/drinkables/compote.json b/kubejs/data/tfc_gurman/tfc/drinkables/compote.json index d86db6987..124807bcc 100644 --- a/kubejs/data/tfc_gurman/tfc/drinkables/compote.json +++ b/kubejs/data/tfc_gurman/tfc/drinkables/compote.json @@ -1,5 +1,5 @@ { - "ingredient": "tfc_gurman:compote", + "ingredient": "tfc_gourmet:compote", "thirst": 10, "may_drink_when_full": true, "effects": [ diff --git a/kubejs/data/tfc_gurman/tfc/drinkables/kvass.json b/kubejs/data/tfc_gurman/tfc/drinkables/kvass.json index 2f70a543d..17b9eabf9 100644 --- a/kubejs/data/tfc_gurman/tfc/drinkables/kvass.json +++ b/kubejs/data/tfc_gurman/tfc/drinkables/kvass.json @@ -1,5 +1,5 @@ { - "ingredient": "tfc_gurman:kvass", + "ingredient": "tfc_gourmet:kvass", "thirst": 10, "may_drink_when_full": true, "effects": [ diff --git a/kubejs/data/tfc_gurman/tfc/drinkables/lemonade.json b/kubejs/data/tfc_gurman/tfc/drinkables/lemonade.json index d5d810fe4..755373fe9 100644 --- a/kubejs/data/tfc_gurman/tfc/drinkables/lemonade.json +++ b/kubejs/data/tfc_gurman/tfc/drinkables/lemonade.json @@ -1,5 +1,5 @@ { - "ingredient": "tfc_gurman:lemonade", + "ingredient": "tfc_gourmet:lemonade", "thirst": 10, "may_drink_when_full": true, "effects": [ diff --git a/kubejs/data/tfc_gurman/tfc/drinkables/nalivka.json b/kubejs/data/tfc_gurman/tfc/drinkables/nalivka.json index 563b57b30..a93b02e15 100644 --- a/kubejs/data/tfc_gurman/tfc/drinkables/nalivka.json +++ b/kubejs/data/tfc_gurman/tfc/drinkables/nalivka.json @@ -1,5 +1,5 @@ { - "ingredient": "tfc_gurman:nalivka", + "ingredient": "tfc_gourmet:nalivka", "thirst": 10, "intoxication": 4000, "may_drink_when_full": true, diff --git a/kubejs/data/tfc_gurman/tfc/drinkables/tea_chamomile.json b/kubejs/data/tfc_gurman/tfc/drinkables/tea_chamomile.json index bb7a5223f..1445cb421 100644 --- a/kubejs/data/tfc_gurman/tfc/drinkables/tea_chamomile.json +++ b/kubejs/data/tfc_gurman/tfc/drinkables/tea_chamomile.json @@ -1,5 +1,5 @@ { - "ingredient": "tfc_gurman:tea_chamomile", + "ingredient": "tfc_gourmet:tea_chamomile", "thirst": 10, "may_drink_when_full": true, "effects": [ diff --git a/kubejs/data/tfc_gurman/tfc/drinkables/tea_mint.json b/kubejs/data/tfc_gurman/tfc/drinkables/tea_mint.json index e43e41414..de5d5a07a 100644 --- a/kubejs/data/tfc_gurman/tfc/drinkables/tea_mint.json +++ b/kubejs/data/tfc_gurman/tfc/drinkables/tea_mint.json @@ -1,5 +1,5 @@ { - "ingredient": "tfc_gurman:tea_mint", + "ingredient": "tfc_gourmet:tea_mint", "thirst": 10, "may_drink_when_full": true, "effects": [ diff --git a/kubejs/data/tfc_gurman/tfc/drinkables/tea_nettle.json b/kubejs/data/tfc_gurman/tfc/drinkables/tea_nettle.json index a9e53654d..317504cc9 100644 --- a/kubejs/data/tfc_gurman/tfc/drinkables/tea_nettle.json +++ b/kubejs/data/tfc_gurman/tfc/drinkables/tea_nettle.json @@ -1,5 +1,5 @@ { - "ingredient": "tfc_gurman:tea_nettle", + "ingredient": "tfc_gourmet:tea_nettle", "thirst": 10, "may_drink_when_full": true, "effects": [ diff --git a/kubejs/data/tfc_gurman/tfc/drinkables/tea_rosehip.json b/kubejs/data/tfc_gurman/tfc/drinkables/tea_rosehip.json index 9f45aa167..58e41fe52 100644 --- a/kubejs/data/tfc_gurman/tfc/drinkables/tea_rosehip.json +++ b/kubejs/data/tfc_gurman/tfc/drinkables/tea_rosehip.json @@ -1,5 +1,5 @@ { - "ingredient": "tfc_gurman:tea_rosehip", + "ingredient": "tfc_gourmet:tea_rosehip", "thirst": 10, "may_drink_when_full": true, "effects": [ diff --git a/kubejs/data/tfg/loot_tables/blocks/rock/hardened_dripstone.json b/kubejs/data/tfg/loot_tables/blocks/artisan_table.json similarity index 52% rename from kubejs/data/tfg/loot_tables/blocks/rock/hardened_dripstone.json rename to kubejs/data/tfg/loot_tables/blocks/artisan_table.json index bcd7443c2..59792a68b 100644 --- a/kubejs/data/tfg/loot_tables/blocks/rock/hardened_dripstone.json +++ b/kubejs/data/tfg/loot_tables/blocks/artisan_table.json @@ -7,17 +7,7 @@ "entries": [ { "type": "minecraft:item", - "name": "tfg:loose/dripstone", - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "min": 1, - "max": 4, - "type": "minecraft:uniform" - } - } - ] + "name": "tfg:artisan_table" } ], "conditions": [ @@ -27,4 +17,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/kubejs/data/tfg/loot_tables/blocks/lunar_chorus_flower.json b/kubejs/data/tfg/loot_tables/blocks/lunar_chorus_flower.json index 8aa73cbbc..8c24b4f7b 100644 --- a/kubejs/data/tfg/loot_tables/blocks/lunar_chorus_flower.json +++ b/kubejs/data/tfg/loot_tables/blocks/lunar_chorus_flower.json @@ -37,13 +37,7 @@ "entries": [ { "type": "minecraft:item", - "name": "tfg:lunar_chorus_flower", - "conditions": [ - { - "condition": "minecraft:random_chance", - "chance": 0.2 - } - ] + "name": "tfg:lunar_chorus_flower" } ], "conditions": [ diff --git a/kubejs/data/tfg/loot_tables/blocks/rock/cobble_blackstone.json b/kubejs/data/tfg/loot_tables/blocks/rock/cobble_blackstone.json deleted file mode 100644 index c3ede98e4..000000000 --- a/kubejs/data/tfg/loot_tables/blocks/rock/cobble_blackstone.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "name": "loot_pool", - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "tfg:rock/cobble_blackstone" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/kubejs/data/tfg/loot_tables/blocks/rock/cobble_crackrack.json b/kubejs/data/tfg/loot_tables/blocks/rock/cobble_crackrack.json deleted file mode 100644 index 2dafa861e..000000000 --- a/kubejs/data/tfg/loot_tables/blocks/rock/cobble_crackrack.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "name": "loot_pool", - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "tfg:rock/cobble_crackrack" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/kubejs/data/tfg/loot_tables/blocks/rock/cobble_dripstone.json b/kubejs/data/tfg/loot_tables/blocks/rock/cobble_dripstone.json deleted file mode 100644 index 20dda7fce..000000000 --- a/kubejs/data/tfg/loot_tables/blocks/rock/cobble_dripstone.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "name": "loot_pool", - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "tfg:rock/cobble_dripstone" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/kubejs/data/tfg/loot_tables/blocks/rock/cobble_moon_deepslate.json b/kubejs/data/tfg/loot_tables/blocks/rock/cobble_moon_deepslate.json deleted file mode 100644 index 6043da7a8..000000000 --- a/kubejs/data/tfg/loot_tables/blocks/rock/cobble_moon_deepslate.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "name": "loot_pool", - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "tfg:rock/cobble_moon_deepslate" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/kubejs/data/tfg/loot_tables/blocks/rock/cobble_permafrost.json b/kubejs/data/tfg/loot_tables/blocks/rock/cobble_permafrost.json deleted file mode 100644 index da12291a9..000000000 --- a/kubejs/data/tfg/loot_tables/blocks/rock/cobble_permafrost.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "name": "loot_pool", - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "tfg:rock/cobble_permafrost" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/kubejs/data/tfg/loot_tables/blocks/rock/gravel_blackstone.json b/kubejs/data/tfg/loot_tables/blocks/rock/gravel_blackstone.json deleted file mode 100644 index 0d20b2d29..000000000 --- a/kubejs/data/tfg/loot_tables/blocks/rock/gravel_blackstone.json +++ /dev/null @@ -1,70 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "name": "loot_pool", - "rolls": 1, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "name": "tfg:rock/gravel_blackstone", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - }, - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "name": "minecraft:flint", - "conditions": [ - { - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune", - "chances": [ - 0.1, - 0.14285715, - 0.25, - 1.0 - ] - } - ] - }, - { - "type": "minecraft:item", - "name": "tfg:rock/gravel_blackstone" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/kubejs/data/tfg/loot_tables/blocks/rock/gravel_crackrack.json b/kubejs/data/tfg/loot_tables/blocks/rock/gravel_crackrack.json deleted file mode 100644 index eddae43a9..000000000 --- a/kubejs/data/tfg/loot_tables/blocks/rock/gravel_crackrack.json +++ /dev/null @@ -1,70 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "name": "loot_pool", - "rolls": 1, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "name": "tfg:rock/gravel_crackrack", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - }, - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "name": "minecraft:flint", - "conditions": [ - { - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune", - "chances": [ - 0.1, - 0.14285715, - 0.25, - 1.0 - ] - } - ] - }, - { - "type": "minecraft:item", - "name": "tfg:rock/gravel_crackrack" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/kubejs/data/tfg/loot_tables/blocks/rock/gravel_deepslate.json b/kubejs/data/tfg/loot_tables/blocks/rock/gravel_deepslate.json deleted file mode 100644 index 9e5ef2260..000000000 --- a/kubejs/data/tfg/loot_tables/blocks/rock/gravel_deepslate.json +++ /dev/null @@ -1,70 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "name": "loot_pool", - "rolls": 1, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "name": "tfg:rock/gravel_deepslate", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - }, - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "name": "minecraft:flint", - "conditions": [ - { - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune", - "chances": [ - 0.1, - 0.14285715, - 0.25, - 1.0 - ] - } - ] - }, - { - "type": "minecraft:item", - "name": "tfg:rock/gravel_deepslate" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/kubejs/data/tfg/loot_tables/blocks/rock/gravel_dripstone.json b/kubejs/data/tfg/loot_tables/blocks/rock/gravel_dripstone.json deleted file mode 100644 index 819a92dfd..000000000 --- a/kubejs/data/tfg/loot_tables/blocks/rock/gravel_dripstone.json +++ /dev/null @@ -1,70 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "name": "loot_pool", - "rolls": 1, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "name": "tfg:rock/gravel_dripstone", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - }, - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "name": "minecraft:flint", - "conditions": [ - { - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune", - "chances": [ - 0.1, - 0.14285715, - 0.25, - 1.0 - ] - } - ] - }, - { - "type": "minecraft:item", - "name": "tfg:rock/gravel_dripstone" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/kubejs/data/tfg/loot_tables/blocks/rock/gravel_glacio.json b/kubejs/data/tfg/loot_tables/blocks/rock/gravel_glacio.json deleted file mode 100644 index 8e7508ef2..000000000 --- a/kubejs/data/tfg/loot_tables/blocks/rock/gravel_glacio.json +++ /dev/null @@ -1,70 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "name": "loot_pool", - "rolls": 1, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "name": "tfg:rock/gravel_glacio", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - }, - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "name": "minecraft:flint", - "conditions": [ - { - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune", - "chances": [ - 0.1, - 0.14285715, - 0.25, - 1.0 - ] - } - ] - }, - { - "type": "minecraft:item", - "name": "tfg:rock/gravel_glacio" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/kubejs/data/tfg/loot_tables/blocks/rock/gravel_mars.json b/kubejs/data/tfg/loot_tables/blocks/rock/gravel_mars.json deleted file mode 100644 index 0c9a1f370..000000000 --- a/kubejs/data/tfg/loot_tables/blocks/rock/gravel_mars.json +++ /dev/null @@ -1,70 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "name": "loot_pool", - "rolls": 1, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "name": "tfg:rock/gravel_mars", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - }, - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "name": "minecraft:flint", - "conditions": [ - { - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune", - "chances": [ - 0.1, - 0.14285715, - 0.25, - 1.0 - ] - } - ] - }, - { - "type": "minecraft:item", - "name": "tfg:rock/gravel_mars" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/kubejs/data/tfg/loot_tables/blocks/rock/gravel_mercury.json b/kubejs/data/tfg/loot_tables/blocks/rock/gravel_mercury.json deleted file mode 100644 index 626a1e252..000000000 --- a/kubejs/data/tfg/loot_tables/blocks/rock/gravel_mercury.json +++ /dev/null @@ -1,70 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "name": "loot_pool", - "rolls": 1, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "name": "tfg:rock/gravel_mercury", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - }, - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "name": "minecraft:flint", - "conditions": [ - { - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune", - "chances": [ - 0.1, - 0.14285715, - 0.25, - 1.0 - ] - } - ] - }, - { - "type": "minecraft:item", - "name": "tfg:rock/gravel_mercury" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/kubejs/data/tfg/loot_tables/blocks/rock/gravel_moon.json b/kubejs/data/tfg/loot_tables/blocks/rock/gravel_moon.json deleted file mode 100644 index 09d2e998b..000000000 --- a/kubejs/data/tfg/loot_tables/blocks/rock/gravel_moon.json +++ /dev/null @@ -1,70 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "name": "loot_pool", - "rolls": 1, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "name": "tfg:rock/gravel_moon", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - }, - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "name": "minecraft:flint", - "conditions": [ - { - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune", - "chances": [ - 0.1, - 0.14285715, - 0.25, - 1.0 - ] - } - ] - }, - { - "type": "minecraft:item", - "name": "tfg:rock/gravel_moon" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/kubejs/data/tfg/loot_tables/blocks/rock/gravel_moon_deepslate.json b/kubejs/data/tfg/loot_tables/blocks/rock/gravel_moon_deepslate.json deleted file mode 100644 index 7e1bf9b63..000000000 --- a/kubejs/data/tfg/loot_tables/blocks/rock/gravel_moon_deepslate.json +++ /dev/null @@ -1,70 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "name": "loot_pool", - "rolls": 1, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "name": "tfg:rock/gravel_moon_deepslate", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - }, - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "name": "minecraft:flint", - "conditions": [ - { - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune", - "chances": [ - 0.1, - 0.14285715, - 0.25, - 1.0 - ] - } - ] - }, - { - "type": "minecraft:item", - "name": "tfg:rock/gravel_moon_deepslate" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/kubejs/data/tfg/loot_tables/blocks/rock/gravel_permafrost.json b/kubejs/data/tfg/loot_tables/blocks/rock/gravel_permafrost.json deleted file mode 100644 index 5267f98d6..000000000 --- a/kubejs/data/tfg/loot_tables/blocks/rock/gravel_permafrost.json +++ /dev/null @@ -1,70 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "name": "loot_pool", - "rolls": 1, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "name": "tfg:rock/gravel_permafrost", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - }, - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "name": "minecraft:flint", - "conditions": [ - { - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune", - "chances": [ - 0.1, - 0.14285715, - 0.25, - 1.0 - ] - } - ] - }, - { - "type": "minecraft:item", - "name": "tfg:rock/gravel_permafrost" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/kubejs/data/tfg/loot_tables/blocks/rock/gravel_red_granite.json b/kubejs/data/tfg/loot_tables/blocks/rock/gravel_red_granite.json deleted file mode 100644 index c4a8d619a..000000000 --- a/kubejs/data/tfg/loot_tables/blocks/rock/gravel_red_granite.json +++ /dev/null @@ -1,70 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "name": "loot_pool", - "rolls": 1, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "name": "tfg:rock/gravel_red_granite", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - }, - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "name": "minecraft:flint", - "conditions": [ - { - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune", - "chances": [ - 0.1, - 0.14285715, - 0.25, - 1.0 - ] - } - ] - }, - { - "type": "minecraft:item", - "name": "tfg:rock/gravel_red_granite" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/kubejs/data/tfg/loot_tables/blocks/rock/gravel_venus.json b/kubejs/data/tfg/loot_tables/blocks/rock/gravel_venus.json deleted file mode 100644 index a4800b69a..000000000 --- a/kubejs/data/tfg/loot_tables/blocks/rock/gravel_venus.json +++ /dev/null @@ -1,70 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "name": "loot_pool", - "rolls": 1, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "name": "tfg:rock/gravel_venus", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - }, - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "name": "minecraft:flint", - "conditions": [ - { - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune", - "chances": [ - 0.1, - 0.14285715, - 0.25, - 1.0 - ] - } - ] - }, - { - "type": "minecraft:item", - "name": "tfg:rock/gravel_venus" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/kubejs/data/tfg/loot_tables/blocks/rock/hardened_blackstone.json b/kubejs/data/tfg/loot_tables/blocks/rock/hardened_blackstone.json deleted file mode 100644 index 748f5016f..000000000 --- a/kubejs/data/tfg/loot_tables/blocks/rock/hardened_blackstone.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "name": "loot_pool", - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "beneath:blackstone_pebble", - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "min": 1, - "max": 4, - "type": "minecraft:uniform" - } - } - ] - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/kubejs/data/tfg/loot_tables/blocks/rock/hardened_deepslate.json b/kubejs/data/tfg/loot_tables/blocks/rock/hardened_deepslate.json deleted file mode 100644 index 6cd548020..000000000 --- a/kubejs/data/tfg/loot_tables/blocks/rock/hardened_deepslate.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "name": "loot_pool", - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "tfg:loose/deepslate", - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "min": 1, - "max": 4, - "type": "minecraft:uniform" - } - } - ] - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/kubejs/data/tfg/loot_tables/blocks/rock/hardened_glacio_stone.json b/kubejs/data/tfg/loot_tables/blocks/rock/hardened_glacio_stone.json deleted file mode 100644 index e8e009c94..000000000 --- a/kubejs/data/tfg/loot_tables/blocks/rock/hardened_glacio_stone.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "name": "loot_pool", - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "tfg:loose/glacio_stone", - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "min": 1, - "max": 4, - "type": "minecraft:uniform" - } - } - ] - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/kubejs/data/tfg/loot_tables/blocks/rock/hardened_mars_stone.json b/kubejs/data/tfg/loot_tables/blocks/rock/hardened_mars_stone.json deleted file mode 100644 index 0e7e9cf38..000000000 --- a/kubejs/data/tfg/loot_tables/blocks/rock/hardened_mars_stone.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "name": "loot_pool", - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "tfg:loose/mars_stone", - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "min": 1, - "max": 4, - "type": "minecraft:uniform" - } - } - ] - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/kubejs/data/tfg/loot_tables/blocks/rock/hardened_mercury_stone.json b/kubejs/data/tfg/loot_tables/blocks/rock/hardened_mercury_stone.json deleted file mode 100644 index 2362d4e63..000000000 --- a/kubejs/data/tfg/loot_tables/blocks/rock/hardened_mercury_stone.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "name": "loot_pool", - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "tfg:loose/mercury_stone", - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "min": 1, - "max": 4, - "type": "minecraft:uniform" - } - } - ] - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/kubejs/data/tfg/loot_tables/blocks/rock/hardened_moon_deepslate.json b/kubejs/data/tfg/loot_tables/blocks/rock/hardened_moon_deepslate.json deleted file mode 100644 index 804cf0072..000000000 --- a/kubejs/data/tfg/loot_tables/blocks/rock/hardened_moon_deepslate.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "name": "loot_pool", - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "tfg:loose/moon_deepslate", - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "min": 1, - "max": 4, - "type": "minecraft:uniform" - } - } - ] - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/kubejs/data/tfg/loot_tables/blocks/rock/hardened_moon_stone.json b/kubejs/data/tfg/loot_tables/blocks/rock/hardened_moon_stone.json deleted file mode 100644 index b687d4df8..000000000 --- a/kubejs/data/tfg/loot_tables/blocks/rock/hardened_moon_stone.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "name": "loot_pool", - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "tfg:loose/moon_stone", - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "min": 1, - "max": 4, - "type": "minecraft:uniform" - } - } - ] - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/kubejs/data/tfg/loot_tables/blocks/rock/hardened_red_granite.json b/kubejs/data/tfg/loot_tables/blocks/rock/hardened_red_granite.json deleted file mode 100644 index c8819199b..000000000 --- a/kubejs/data/tfg/loot_tables/blocks/rock/hardened_red_granite.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "name": "loot_pool", - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "tfg:loose/red_granite", - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "min": 1, - "max": 4, - "type": "minecraft:uniform" - } - } - ] - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/kubejs/data/tfg/loot_tables/blocks/rock/hardened_venus_stone.json b/kubejs/data/tfg/loot_tables/blocks/rock/hardened_venus_stone.json deleted file mode 100644 index 3c950f61a..000000000 --- a/kubejs/data/tfg/loot_tables/blocks/rock/hardened_venus_stone.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "name": "loot_pool", - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "tfg:loose/venus_stone", - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "min": 1, - "max": 4, - "type": "minecraft:uniform" - } - } - ] - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/biome/glacio/placeholder_biome.json b/kubejs/data/tfg/worldgen/biome/glacio/placeholder_biome.json index 3af86fa03..228206b0c 100644 --- a/kubejs/data/tfg/worldgen/biome/glacio/placeholder_biome.json +++ b/kubejs/data/tfg/worldgen/biome/glacio/placeholder_biome.json @@ -13,7 +13,15 @@ }, "sky_color": 12638463, "water_color": 4159204, - "water_fog_color": 329011 + "water_fog_color": 329011, + "music": { + "max_delay": 24000, + "min_delay": 12000, + "replace_current_music": false, + "sound": { + "sound_id": "tfg:music.europa" + } + } }, "features": [ [ diff --git a/kubejs/data/tfg/worldgen/biome/mars/amber_edge.json b/kubejs/data/tfg/worldgen/biome/mars/amber_edge.json index ff69d8291..23fc49950 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/amber_edge.json +++ b/kubejs/data/tfg/worldgen/biome/mars/amber_edge.json @@ -20,7 +20,9 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "minecraft:music.overworld.desert" + "sound": { + "sound_id": "tfg:music.mars" + } }, "sky_color": 15117444, "water_color": 4159204, @@ -130,7 +132,25 @@ "type": "wan_ancient_beasts:eater", "maxCount": 1, "minCount": 1, - "weight": 10 + "weight": 20 + }, + { + "type": "wan_ancient_beasts:charger", + "maxCount": 4, + "minCount": 3, + "weight": 20 + }, + { + "type": "wan_ancient_beasts:raider", + "maxCount": 4, + "minCount": 3, + "weight": 20 + }, + { + "type": "wan_ancient_beasts:snatcher", + "maxCount": 4, + "minCount": 2, + "weight": 50 }, { "type": "species:goober", diff --git a/kubejs/data/tfg/worldgen/biome/mars/amber_hills.json b/kubejs/data/tfg/worldgen/biome/mars/amber_hills.json index 123397ed4..930731ac2 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/amber_hills.json +++ b/kubejs/data/tfg/worldgen/biome/mars/amber_hills.json @@ -23,7 +23,9 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "minecraft:music.overworld.badlands" + "sound": { + "sound_id": "tfg:music.mars" + } }, "sky_color": 15117444, "water_color": 4159204, @@ -114,7 +116,7 @@ "type": "wan_ancient_beasts:walker", "maxCount": 3, "minCount": 2, - "weight": 20 + "weight": 30 }, { "type": "wan_ancient_beasts:crusher", @@ -140,6 +142,24 @@ "minCount": 1, "weight": 40 }, + { + "type": "wan_ancient_beasts:charger", + "maxCount": 4, + "minCount": 3, + "weight": 50 + }, + { + "type": "wan_ancient_beasts:raider", + "maxCount": 4, + "minCount": 3, + "weight": 50 + }, + { + "type": "wan_ancient_beasts:snatcher", + "maxCount": 4, + "minCount": 2, + "weight": 100 + }, { "type": "species:springling", "maxCount": 4, diff --git a/kubejs/data/tfg/worldgen/biome/mars/amber_plains.json b/kubejs/data/tfg/worldgen/biome/mars/amber_plains.json index 449c418df..50eef88ce 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/amber_plains.json +++ b/kubejs/data/tfg/worldgen/biome/mars/amber_plains.json @@ -23,7 +23,9 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "minecraft:music.overworld.badlands" + "sound": { + "sound_id": "tfg:music.mars" + } }, "sky_color": 15117444, "water_color": 4159204, @@ -145,7 +147,25 @@ "type": "wan_ancient_beasts:eater", "maxCount": 2, "minCount": 1, - "weight": 15 + "weight": 20 + }, + { + "type": "wan_ancient_beasts:charger", + "maxCount": 4, + "minCount": 3, + "weight": 40 + }, + { + "type": "wan_ancient_beasts:raider", + "maxCount": 4, + "minCount": 3, + "weight": 40 + }, + { + "type": "wan_ancient_beasts:snatcher", + "maxCount": 4, + "minCount": 2, + "weight": 100 } ], "misc": [], diff --git a/kubejs/data/tfg/worldgen/biome/mars/martian_deep_desert.json b/kubejs/data/tfg/worldgen/biome/mars/martian_deep_desert.json index 55dc40cb3..995e337d6 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/martian_deep_desert.json +++ b/kubejs/data/tfg/worldgen/biome/mars/martian_deep_desert.json @@ -22,7 +22,9 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "minecraft:music.overworld.desert" + "sound": { + "sound_id": "tfg:music.mars" + } }, "sky_color": 15117444, "water_color": 4159204, diff --git a/kubejs/data/tfg/worldgen/biome/mars/martian_dune_edge.json b/kubejs/data/tfg/worldgen/biome/mars/martian_dune_edge.json index bc287325a..27f4ac101 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/martian_dune_edge.json +++ b/kubejs/data/tfg/worldgen/biome/mars/martian_dune_edge.json @@ -22,7 +22,9 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "minecraft:music.overworld.desert" + "sound": { + "sound_id": "tfg:music.mars" + } }, "sky_color": 15117444, "water_color": 4159204, @@ -114,6 +116,18 @@ "maxCount": 2, "minCount": 1, "weight": 20 + }, + { + "type": "wan_ancient_beasts:charger", + "maxCount": 2, + "minCount": 1, + "weight": 20 + }, + { + "type": "wan_ancient_beasts:snatcher", + "maxCount": 2, + "minCount": 1, + "weight": 20 } ], "misc": [], diff --git a/kubejs/data/tfg/worldgen/biome/mars/martian_dunes.json b/kubejs/data/tfg/worldgen/biome/mars/martian_dunes.json index 5a6be0ee6..21b1c4bba 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/martian_dunes.json +++ b/kubejs/data/tfg/worldgen/biome/mars/martian_dunes.json @@ -22,7 +22,9 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "minecraft:music.overworld.desert" + "sound": { + "sound_id": "tfg:music.mars" + } }, "sky_color": 15117444, "water_color": 4159204, diff --git a/kubejs/data/tfg/worldgen/biome/mars/martian_mountains.json b/kubejs/data/tfg/worldgen/biome/mars/martian_mountains.json index 36fc33433..cd441acb3 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/martian_mountains.json +++ b/kubejs/data/tfg/worldgen/biome/mars/martian_mountains.json @@ -23,7 +23,9 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "minecraft:music.overworld.badlands" + "sound": { + "sound_id": "tfg:music.mars" + } }, "sky_color": 15117444, "water_color": 4159204, @@ -146,6 +148,24 @@ "maxCount": 3, "minCount": 2, "weight": 50 + }, + { + "type": "wan_ancient_beasts:charger", + "maxCount": 4, + "minCount": 3, + "weight": 40 + }, + { + "type": "wan_ancient_beasts:raider", + "maxCount": 4, + "minCount": 3, + "weight": 40 + }, + { + "type": "wan_ancient_beasts:snatcher", + "maxCount": 4, + "minCount": 2, + "weight": 20 } ], "misc": [], diff --git a/kubejs/data/tfg/worldgen/biome/mars/martian_river.json b/kubejs/data/tfg/worldgen/biome/mars/martian_river.json index 526e0aac2..338b76712 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/martian_river.json +++ b/kubejs/data/tfg/worldgen/biome/mars/martian_river.json @@ -23,7 +23,9 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "minecraft:music.overworld.badlands" + "sound": { + "sound_id": "tfg:music.mars" + } }, "sky_color": 15117444, "water_color": 4159204, @@ -130,7 +132,7 @@ "type": "wan_ancient_beasts:walker", "maxCount": 3, "minCount": 2, - "weight": 20 + "weight": 30 }, { "type": "tfg:glacian_ram", @@ -143,6 +145,24 @@ "maxCount": 2, "minCount": 1, "weight": 20 + }, + { + "type": "wan_ancient_beasts:charger", + "maxCount": 4, + "minCount": 3, + "weight": 30 + }, + { + "type": "wan_ancient_beasts:raider", + "maxCount": 4, + "minCount": 3, + "weight": 30 + }, + { + "type": "wan_ancient_beasts:snatcher", + "maxCount": 4, + "minCount": 2, + "weight": 100 } ], "misc": [], diff --git a/kubejs/data/tfg/worldgen/biome/mars/rusticus_edge.json b/kubejs/data/tfg/worldgen/biome/mars/rusticus_edge.json index 426622e37..413473836 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/rusticus_edge.json +++ b/kubejs/data/tfg/worldgen/biome/mars/rusticus_edge.json @@ -20,7 +20,9 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "minecraft:music.overworld.desert" + "sound": { + "sound_id": "tfg:music.mars" + } }, "sky_color": 15117444, "water_color": 4159204, @@ -130,13 +132,31 @@ "type": "wan_ancient_beasts:eater", "maxCount": 1, "minCount": 1, - "weight": 10 + "weight": 20 }, { "type": "species:goober", "maxCount": 2, "minCount": 2, "weight": 40 + }, + { + "type": "wan_ancient_beasts:charger", + "maxCount": 4, + "minCount": 3, + "weight": 30 + }, + { + "type": "wan_ancient_beasts:raider", + "maxCount": 4, + "minCount": 3, + "weight": 30 + }, + { + "type": "wan_ancient_beasts:snatcher", + "maxCount": 4, + "minCount": 2, + "weight": 50 } ], "misc": [], diff --git a/kubejs/data/tfg/worldgen/biome/mars/rusticus_hills.json b/kubejs/data/tfg/worldgen/biome/mars/rusticus_hills.json index 51da6391a..50185326f 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/rusticus_hills.json +++ b/kubejs/data/tfg/worldgen/biome/mars/rusticus_hills.json @@ -23,7 +23,9 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "minecraft:music.overworld.badlands" + "sound": { + "sound_id": "tfg:music.mars" + } }, "sky_color": 15117444, "water_color": 4159204, @@ -151,6 +153,24 @@ "maxCount": 4, "minCount": 3, "weight": 100 + }, + { + "type": "wan_ancient_beasts:charger", + "maxCount": 4, + "minCount": 3, + "weight": 50 + }, + { + "type": "wan_ancient_beasts:raider", + "maxCount": 4, + "minCount": 3, + "weight": 50 + }, + { + "type": "wan_ancient_beasts:snatcher", + "maxCount": 4, + "minCount": 2, + "weight": 100 } ], "misc": [], diff --git a/kubejs/data/tfg/worldgen/biome/mars/rusticus_plains.json b/kubejs/data/tfg/worldgen/biome/mars/rusticus_plains.json index fc74372ce..02836a8fd 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/rusticus_plains.json +++ b/kubejs/data/tfg/worldgen/biome/mars/rusticus_plains.json @@ -23,7 +23,9 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "minecraft:music.overworld.badlands" + "sound": { + "sound_id": "tfg:music.mars" + } }, "sky_color": 15117444, "water_color": 4159204, @@ -146,6 +148,24 @@ "maxCount": 2, "minCount": 1, "weight": 15 + }, + { + "type": "wan_ancient_beasts:charger", + "maxCount": 4, + "minCount": 3, + "weight": 50 + }, + { + "type": "wan_ancient_beasts:raider", + "maxCount": 4, + "minCount": 3, + "weight": 50 + }, + { + "type": "wan_ancient_beasts:snatcher", + "maxCount": 4, + "minCount": 2, + "weight": 100 } ], "misc": [], diff --git a/kubejs/data/tfg/worldgen/biome/mars/sangnum_edge.json b/kubejs/data/tfg/worldgen/biome/mars/sangnum_edge.json index 9ec2931ea..f7a48d0b0 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/sangnum_edge.json +++ b/kubejs/data/tfg/worldgen/biome/mars/sangnum_edge.json @@ -20,7 +20,9 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "minecraft:music.overworld.desert" + "sound": { + "sound_id": "tfg:music.mars" + } }, "sky_color": 15117444, "water_color": 4159204, @@ -130,13 +132,31 @@ "type": "wan_ancient_beasts:eater", "maxCount": 1, "minCount": 1, - "weight": 5 + "weight": 20 }, { "type": "species:goober", "maxCount": 2, "minCount": 2, "weight": 30 + }, + { + "type": "wan_ancient_beasts:charger", + "maxCount": 4, + "minCount": 3, + "weight": 20 + }, + { + "type": "wan_ancient_beasts:raider", + "maxCount": 4, + "minCount": 3, + "weight": 20 + }, + { + "type": "wan_ancient_beasts:snatcher", + "maxCount": 4, + "minCount": 2, + "weight": 50 } ], "misc": [], diff --git a/kubejs/data/tfg/worldgen/biome/mars/sangnum_hills.json b/kubejs/data/tfg/worldgen/biome/mars/sangnum_hills.json index ea1dd0460..9cd5ab19c 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/sangnum_hills.json +++ b/kubejs/data/tfg/worldgen/biome/mars/sangnum_hills.json @@ -23,7 +23,9 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "minecraft:music.overworld.badlands" + "sound": { + "sound_id": "tfg:music.mars" + } }, "sky_color": 15117444, "water_color": 4159204, @@ -151,6 +153,24 @@ "maxCount": 4, "minCount": 3, "weight": 100 + }, + { + "type": "wan_ancient_beasts:charger", + "maxCount": 4, + "minCount": 3, + "weight": 50 + }, + { + "type": "wan_ancient_beasts:raider", + "maxCount": 4, + "minCount": 3, + "weight": 50 + }, + { + "type": "wan_ancient_beasts:snatcher", + "maxCount": 4, + "minCount": 2, + "weight": 100 } ], "misc": [], diff --git a/kubejs/data/tfg/worldgen/biome/mars/sangnum_plains.json b/kubejs/data/tfg/worldgen/biome/mars/sangnum_plains.json index c121e5c92..2943880d7 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/sangnum_plains.json +++ b/kubejs/data/tfg/worldgen/biome/mars/sangnum_plains.json @@ -23,7 +23,9 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "minecraft:music.overworld.badlands" + "sound": { + "sound_id": "tfg:music.mars" + } }, "sky_color": 15117444, "water_color": 4159204, @@ -145,7 +147,25 @@ "type": "wan_ancient_beasts:eater", "maxCount": 2, "minCount": 1, - "weight": 15 + "weight": 20 + }, + { + "type": "wan_ancient_beasts:charger", + "maxCount": 4, + "minCount": 3, + "weight": 50 + }, + { + "type": "wan_ancient_beasts:raider", + "maxCount": 4, + "minCount": 3, + "weight": 50 + }, + { + "type": "wan_ancient_beasts:snatcher", + "maxCount": 4, + "minCount": 2, + "weight": 100 } ], "misc": [], diff --git a/kubejs/data/tfg/worldgen/biome/moon/lunar_asurine_dense.json b/kubejs/data/tfg/worldgen/biome/moon/lunar_asurine_dense.json index bdcadd76f..357b5aab2 100644 --- a/kubejs/data/tfg/worldgen/biome/moon/lunar_asurine_dense.json +++ b/kubejs/data/tfg/worldgen/biome/moon/lunar_asurine_dense.json @@ -20,7 +20,15 @@ }, "sky_color": 0, "water_color": 4159204, - "water_fog_color": 329011 + "water_fog_color": 329011, + "music": { + "max_delay": 24000, + "min_delay": 12000, + "replace_current_music": false, + "sound": { + "sound_id": "tfg:music.moon" + } + } }, "features": [ [], diff --git a/kubejs/data/tfg/worldgen/biome/moon/lunar_asurine_sparse.json b/kubejs/data/tfg/worldgen/biome/moon/lunar_asurine_sparse.json index 01404bf9a..21e7a52e9 100644 --- a/kubejs/data/tfg/worldgen/biome/moon/lunar_asurine_sparse.json +++ b/kubejs/data/tfg/worldgen/biome/moon/lunar_asurine_sparse.json @@ -20,7 +20,15 @@ }, "sky_color": 0, "water_color": 4159204, - "water_fog_color": 329011 + "water_fog_color": 329011, + "music": { + "max_delay": 24000, + "min_delay": 12000, + "replace_current_music": false, + "sound": { + "sound_id": "tfg:music.moon" + } + } }, "features": [ [], diff --git a/kubejs/data/tfg/worldgen/biome/moon/lunar_chorus_dense.json b/kubejs/data/tfg/worldgen/biome/moon/lunar_chorus_dense.json index e1b31499f..bba025310 100644 --- a/kubejs/data/tfg/worldgen/biome/moon/lunar_chorus_dense.json +++ b/kubejs/data/tfg/worldgen/biome/moon/lunar_chorus_dense.json @@ -20,7 +20,15 @@ }, "sky_color": 0, "water_color": 4159204, - "water_fog_color": 329011 + "water_fog_color": 329011, + "music": { + "max_delay": 24000, + "min_delay": 12000, + "replace_current_music": false, + "sound": { + "sound_id": "tfg:music.moon" + } + } }, "features": [ [], diff --git a/kubejs/data/tfg/worldgen/biome/moon/lunar_chorus_sparse.json b/kubejs/data/tfg/worldgen/biome/moon/lunar_chorus_sparse.json index 78f29f76c..98b98947b 100644 --- a/kubejs/data/tfg/worldgen/biome/moon/lunar_chorus_sparse.json +++ b/kubejs/data/tfg/worldgen/biome/moon/lunar_chorus_sparse.json @@ -20,7 +20,15 @@ }, "sky_color": 0, "water_color": 4159204, - "water_fog_color": 329011 + "water_fog_color": 329011, + "music": { + "max_delay": 24000, + "min_delay": 12000, + "replace_current_music": false, + "sound": { + "sound_id": "tfg:music.moon" + } + } }, "features": [ [], diff --git a/kubejs/data/tfg/worldgen/biome/moon/lunar_corals_dense.json b/kubejs/data/tfg/worldgen/biome/moon/lunar_corals_dense.json index 71e451418..70d22cd44 100644 --- a/kubejs/data/tfg/worldgen/biome/moon/lunar_corals_dense.json +++ b/kubejs/data/tfg/worldgen/biome/moon/lunar_corals_dense.json @@ -20,7 +20,15 @@ }, "sky_color": 0, "water_color": 4159204, - "water_fog_color": 329011 + "water_fog_color": 329011, + "music": { + "max_delay": 24000, + "min_delay": 12000, + "replace_current_music": false, + "sound": { + "sound_id": "tfg:music.moon" + } + } }, "features": [ [], diff --git a/kubejs/data/tfg/worldgen/biome/moon/lunar_corals_sparse.json b/kubejs/data/tfg/worldgen/biome/moon/lunar_corals_sparse.json index 7fa136647..39daf8d7f 100644 --- a/kubejs/data/tfg/worldgen/biome/moon/lunar_corals_sparse.json +++ b/kubejs/data/tfg/worldgen/biome/moon/lunar_corals_sparse.json @@ -20,7 +20,15 @@ }, "sky_color": 0, "water_color": 4159204, - "water_fog_color": 329011 + "water_fog_color": 329011, + "music": { + "max_delay": 24000, + "min_delay": 12000, + "replace_current_music": false, + "sound": { + "sound_id": "tfg:music.moon" + } + } }, "features": [ [], diff --git a/kubejs/data/tfg/worldgen/biome/moon/lunar_lights_dense.json b/kubejs/data/tfg/worldgen/biome/moon/lunar_lights_dense.json index daaa5ff95..6001fb80e 100644 --- a/kubejs/data/tfg/worldgen/biome/moon/lunar_lights_dense.json +++ b/kubejs/data/tfg/worldgen/biome/moon/lunar_lights_dense.json @@ -20,7 +20,15 @@ }, "sky_color": 0, "water_color": 4159204, - "water_fog_color": 329011 + "water_fog_color": 329011, + "music": { + "max_delay": 24000, + "min_delay": 12000, + "replace_current_music": false, + "sound": { + "sound_id": "tfg:music.moon" + } + } }, "features": [ [], diff --git a/kubejs/data/tfg/worldgen/biome/moon/lunar_lights_sparse.json b/kubejs/data/tfg/worldgen/biome/moon/lunar_lights_sparse.json index 2318e94fa..318c3c8a7 100644 --- a/kubejs/data/tfg/worldgen/biome/moon/lunar_lights_sparse.json +++ b/kubejs/data/tfg/worldgen/biome/moon/lunar_lights_sparse.json @@ -20,7 +20,15 @@ }, "sky_color": 0, "water_color": 4159204, - "water_fog_color": 329011 + "water_fog_color": 329011, + "music": { + "max_delay": 24000, + "min_delay": 12000, + "replace_current_music": false, + "sound": { + "sound_id": "tfg:music.moon" + } + } }, "features": [ [], diff --git a/kubejs/data/tfg/worldgen/biome/moon/lunar_plains.json b/kubejs/data/tfg/worldgen/biome/moon/lunar_plains.json index ce6e50d86..6d378c21f 100644 --- a/kubejs/data/tfg/worldgen/biome/moon/lunar_plains.json +++ b/kubejs/data/tfg/worldgen/biome/moon/lunar_plains.json @@ -20,7 +20,15 @@ }, "sky_color": 0, "water_color": 4159204, - "water_fog_color": 329011 + "water_fog_color": 329011, + "music": { + "max_delay": 24000, + "min_delay": 12000, + "replace_current_music": false, + "sound": { + "sound_id": "tfg:music.moon" + } + } }, "features": [ [], diff --git a/kubejs/data/tfg/worldgen/biome/moon/lunar_sands.json b/kubejs/data/tfg/worldgen/biome/moon/lunar_sands.json index 1413884ea..cf1517a6a 100644 --- a/kubejs/data/tfg/worldgen/biome/moon/lunar_sands.json +++ b/kubejs/data/tfg/worldgen/biome/moon/lunar_sands.json @@ -20,7 +20,15 @@ }, "sky_color": 0, "water_color": 4159204, - "water_fog_color": 329011 + "water_fog_color": 329011, + "music": { + "max_delay": 24000, + "min_delay": 12000, + "replace_current_music": false, + "sound": { + "sound_id": "tfg:music.moon" + } + } }, "features": [ [], diff --git a/kubejs/data/tfg/worldgen/biome/nether/ash_forest.json b/kubejs/data/tfg/worldgen/biome/nether/ash_forest.json index 4e1407e4f..6a3b7836d 100644 --- a/kubejs/data/tfg/worldgen/biome/nether/ash_forest.json +++ b/kubejs/data/tfg/worldgen/biome/nether/ash_forest.json @@ -20,7 +20,9 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "minecraft:music.nether.basalt_deltas" + "sound": { + "sound_id": "tfg:music.nether" + } }, "particle": { "options": { diff --git a/kubejs/data/tfg/worldgen/biome/nether/basalt_deltas.json b/kubejs/data/tfg/worldgen/biome/nether/basalt_deltas.json index 021ca0904..f5ccb984a 100644 --- a/kubejs/data/tfg/worldgen/biome/nether/basalt_deltas.json +++ b/kubejs/data/tfg/worldgen/biome/nether/basalt_deltas.json @@ -20,7 +20,9 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "minecraft:music.nether.basalt_deltas" + "sound": { + "sound_id": "tfg:music.nether" + } }, "particle": { "options": { diff --git a/kubejs/data/tfg/worldgen/biome/nether/decaying_caverns.json b/kubejs/data/tfg/worldgen/biome/nether/decaying_caverns.json index 46ba6d62b..d4a164b95 100644 --- a/kubejs/data/tfg/worldgen/biome/nether/decaying_caverns.json +++ b/kubejs/data/tfg/worldgen/biome/nether/decaying_caverns.json @@ -20,7 +20,9 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "minecraft:music.overworld.swamp" + "sound": { + "sound_id": "tfg:music.nether" + } }, "sky_color": 7369031, "water_color": 6388580, diff --git a/kubejs/data/tfg/worldgen/biome/nether/diorite_caves.json b/kubejs/data/tfg/worldgen/biome/nether/diorite_caves.json index 2eda606b4..1d524fbab 100644 --- a/kubejs/data/tfg/worldgen/biome/nether/diorite_caves.json +++ b/kubejs/data/tfg/worldgen/biome/nether/diorite_caves.json @@ -20,7 +20,9 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "minecraft:music.nether.crimson_forest" + "sound": { + "sound_id": "tfg:music.nether" + } }, "sky_color": 9868701, "water_color": 7255466, diff --git a/kubejs/data/tfg/worldgen/biome/nether/gabbro_caves.json b/kubejs/data/tfg/worldgen/biome/nether/gabbro_caves.json index 924c75418..72f3bfcea 100644 --- a/kubejs/data/tfg/worldgen/biome/nether/gabbro_caves.json +++ b/kubejs/data/tfg/worldgen/biome/nether/gabbro_caves.json @@ -20,7 +20,9 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "minecraft:music.nether.crimson_forest" + "sound": { + "sound_id": "tfg:music.nether" + } }, "sky_color": 5855333, "water_color": 7255466, diff --git a/kubejs/data/tfg/worldgen/biome/nether/gneiss_caves.json b/kubejs/data/tfg/worldgen/biome/nether/gneiss_caves.json index 318f7de01..a0b779890 100644 --- a/kubejs/data/tfg/worldgen/biome/nether/gneiss_caves.json +++ b/kubejs/data/tfg/worldgen/biome/nether/gneiss_caves.json @@ -20,7 +20,9 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "minecraft:music.nether.crimson_forest" + "sound": { + "sound_id": "tfg:music.nether" + } }, "sky_color": 5799235, "water_color": 7255466, diff --git a/kubejs/data/tfg/worldgen/biome/nether/granite_caves.json b/kubejs/data/tfg/worldgen/biome/nether/granite_caves.json index 5ff94fd88..4aba461b6 100644 --- a/kubejs/data/tfg/worldgen/biome/nether/granite_caves.json +++ b/kubejs/data/tfg/worldgen/biome/nether/granite_caves.json @@ -20,7 +20,9 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "minecraft:music.nether.crimson_forest" + "sound": { + "sound_id": "tfg:music.nether" + } }, "sky_color": 9533575, "water_color": 7255466, diff --git a/kubejs/data/tfg/worldgen/biome/nether/lava_floes.json b/kubejs/data/tfg/worldgen/biome/nether/lava_floes.json index 1772b420e..76e2de4ed 100644 --- a/kubejs/data/tfg/worldgen/biome/nether/lava_floes.json +++ b/kubejs/data/tfg/worldgen/biome/nether/lava_floes.json @@ -20,7 +20,9 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "minecraft:music.nether.basalt_deltas" + "sound": { + "sound_id": "tfg:music.nether" + } }, "particle": { "options": { diff --git a/kubejs/data/tfg/worldgen/biome/nether/lush_hollow.json b/kubejs/data/tfg/worldgen/biome/nether/lush_hollow.json index d7992093e..a5a9a0a28 100644 --- a/kubejs/data/tfg/worldgen/biome/nether/lush_hollow.json +++ b/kubejs/data/tfg/worldgen/biome/nether/lush_hollow.json @@ -20,7 +20,9 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "minecraft:music.overworld.lush_caves" + "sound": { + "sound_id": "tfg:music.nether" + } }, "sky_color": 5799235, "water_color": 7255466, diff --git a/kubejs/data/tfg/worldgen/biome/nether/schist_caves.json b/kubejs/data/tfg/worldgen/biome/nether/schist_caves.json index 77e64f7b3..d75fbfb33 100644 --- a/kubejs/data/tfg/worldgen/biome/nether/schist_caves.json +++ b/kubejs/data/tfg/worldgen/biome/nether/schist_caves.json @@ -20,7 +20,9 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "minecraft:music.nether.crimson_forest" + "sound": { + "sound_id": "tfg:music.nether" + } }, "sky_color": 7175789, "water_color": 7255466, diff --git a/kubejs/data/tfg/worldgen/biome/nether/webbed_lair.json b/kubejs/data/tfg/worldgen/biome/nether/webbed_lair.json index 709636995..53a8dba20 100644 --- a/kubejs/data/tfg/worldgen/biome/nether/webbed_lair.json +++ b/kubejs/data/tfg/worldgen/biome/nether/webbed_lair.json @@ -15,7 +15,9 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "minecraft:music.overworld.dripstone_caves" + "sound": { + "sound_id": "tfg:music.nether" + } }, "additions_sound": { "sound": "tfg:ambient.upper_nether_cave.additions", diff --git a/kubejs/data/tfg/worldgen/biome/venus/arachnoids.json b/kubejs/data/tfg/worldgen/biome/venus/arachnoids.json index b5131ddc6..d5b111716 100644 --- a/kubejs/data/tfg/worldgen/biome/venus/arachnoids.json +++ b/kubejs/data/tfg/worldgen/biome/venus/arachnoids.json @@ -24,6 +24,14 @@ "type": "minecraft:ash" }, "probability": 0.05 + }, + "music": { + "max_delay": 24000, + "min_delay": 12000, + "replace_current_music": false, + "sound": { + "sound_id": "tfg:music.venus" + } } }, "features": [ @@ -31,7 +39,9 @@ "tfc:erosion" ], [], - [], + [ + "tfc:random_empty_hot_spring" + ], [], [], [], @@ -47,20 +57,20 @@ "has_precipitation": true, "spawn_costs": { "endermanoverhaul:desert_enderman": { - "energy_budget": 0.05, - "charge": 0.9 + "energy_budget": 0.15, + "charge": 0.7 }, "endermanoverhaul:savanna_enderman": { - "energy_budget": 0.05, - "charge": 0.9 + "energy_budget": 0.15, + "charge": 0.7 }, "endermanoverhaul:nether_wastes_enderman": { - "energy_budget": 0.05, - "charge": 0.9 + "energy_budget": 0.15, + "charge": 0.7 }, "minecraft:enderman": { - "energy_budget": 0.05, - "charge": 0.9 + "energy_budget": 0.15, + "charge": 0.7 }, "species:cliff_hanger": { "energy_budget": 0.15, diff --git a/kubejs/data/tfg/worldgen/biome/venus/fractured_pools.json b/kubejs/data/tfg/worldgen/biome/venus/fractured_pools.json index cb3acbedb..d86ef6e86 100644 --- a/kubejs/data/tfg/worldgen/biome/venus/fractured_pools.json +++ b/kubejs/data/tfg/worldgen/biome/venus/fractured_pools.json @@ -24,6 +24,14 @@ "type": "minecraft:ash" }, "probability": 0.05 + }, + "music": { + "max_delay": 24000, + "min_delay": 12000, + "replace_current_music": false, + "sound": { + "sound_id": "tfg:music.venus" + } } }, "features": [ @@ -31,7 +39,9 @@ "tfc:erosion" ], [], - [], + [ + "tfc:random_empty_hot_spring" + ], [], [], [], @@ -49,20 +59,20 @@ "has_precipitation": true, "spawn_costs": { "endermanoverhaul:desert_enderman": { - "energy_budget": 0.05, - "charge": 0.9 + "energy_budget": 0.15, + "charge": 0.7 }, "endermanoverhaul:savanna_enderman": { - "energy_budget": 0.05, - "charge": 0.9 + "energy_budget": 0.15, + "charge": 0.7 }, "endermanoverhaul:nether_wastes_enderman": { - "energy_budget": 0.05, - "charge": 0.9 + "energy_budget": 0.15, + "charge": 0.7 }, "minecraft:enderman": { - "energy_budget": 0.05, - "charge": 0.9 + "energy_budget": 0.15, + "charge": 0.7 }, "species:cliff_hanger": { "energy_budget": 0.15, diff --git a/kubejs/data/tfg/worldgen/biome/venus/fumaroles.json b/kubejs/data/tfg/worldgen/biome/venus/fumaroles.json index f5cddc92c..dbd00bd06 100644 --- a/kubejs/data/tfg/worldgen/biome/venus/fumaroles.json +++ b/kubejs/data/tfg/worldgen/biome/venus/fumaroles.json @@ -24,6 +24,14 @@ "type": "minecraft:white_ash" }, "probability": 0.03 + }, + "music": { + "max_delay": 24000, + "min_delay": 12000, + "replace_current_music": false, + "sound": { + "sound_id": "tfg:music.venus" + } } }, "features": [ @@ -47,27 +55,28 @@ ], [ "tfg:venus/surface/sulfur_patch", - "tfg:venus/surface/hydralux_rare" + "tfg:venus/surface/hydralux_rare", + "tfg:venus/surface/loose_scoria" ], "#tfg:venus_top_layer_modification" ], "has_precipitation": true, "spawn_costs": { "endermanoverhaul:desert_enderman": { - "energy_budget": 0.05, - "charge": 0.9 + "energy_budget": 0.15, + "charge": 0.7 }, "endermanoverhaul:savanna_enderman": { - "energy_budget": 0.05, - "charge": 0.9 + "energy_budget": 0.15, + "charge": 0.7 }, "endermanoverhaul:nether_wastes_enderman": { - "energy_budget": 0.05, - "charge": 0.9 + "energy_budget": 0.15, + "charge": 0.7 }, "minecraft:enderman": { - "energy_budget": 0.05, - "charge": 0.9 + "energy_budget": 0.15, + "charge": 0.7 }, "species:cliff_hanger": { "energy_budget": 0.15, diff --git a/kubejs/data/tfg/worldgen/biome/venus/geysers.json b/kubejs/data/tfg/worldgen/biome/venus/geysers.json index 63937fc35..b4132b4eb 100644 --- a/kubejs/data/tfg/worldgen/biome/venus/geysers.json +++ b/kubejs/data/tfg/worldgen/biome/venus/geysers.json @@ -24,6 +24,14 @@ "type": "minecraft:ash" }, "probability": 0.07 + }, + "music": { + "max_delay": 24000, + "min_delay": 12000, + "replace_current_music": false, + "sound": { + "sound_id": "tfg:music.venus" + } } }, "features": [ @@ -32,7 +40,8 @@ ], [], [ - "tfg:venus/terrain/hot_spring_delta" + "tfg:venus/terrain/hot_spring_delta", + "tfc:random_empty_hot_spring" ], [], [], @@ -51,20 +60,20 @@ "has_precipitation": true, "spawn_costs": { "endermanoverhaul:desert_enderman": { - "energy_budget": 0.05, - "charge": 0.9 + "energy_budget": 0.15, + "charge": 0.7 }, "endermanoverhaul:savanna_enderman": { - "energy_budget": 0.05, - "charge": 0.9 + "energy_budget": 0.15, + "charge": 0.7 }, "endermanoverhaul:nether_wastes_enderman": { - "energy_budget": 0.05, - "charge": 0.9 + "energy_budget": 0.15, + "charge": 0.7 }, "minecraft:enderman": { - "energy_budget": 0.05, - "charge": 0.9 + "energy_budget": 0.15, + "charge": 0.7 }, "species:cliff_hanger": { "energy_budget": 0.15, diff --git a/kubejs/data/tfg/worldgen/biome/venus/jagged_tablelands.json b/kubejs/data/tfg/worldgen/biome/venus/jagged_tablelands.json index 2a092a303..eac86146f 100644 --- a/kubejs/data/tfg/worldgen/biome/venus/jagged_tablelands.json +++ b/kubejs/data/tfg/worldgen/biome/venus/jagged_tablelands.json @@ -8,8 +8,8 @@ "sound": "tfg:ambient.venus_surface.additions", "tick_chance": 0.0015 }, - "sky_color": 10465603, - "fog_color": 9938052, + "sky_color": 11239553, + "fog_color": 11239553, "water_color": 8241044, "water_fog_color": 10866612, "ambient_sound": "tfg:ambient.venus_surface.loop", @@ -24,6 +24,14 @@ "type": "minecraft:white_ash" }, "probability": 0.02 + }, + "music": { + "max_delay": 24000, + "min_delay": 12000, + "replace_current_music": false, + "sound": { + "sound_id": "tfg:music.venus" + } } }, "features": [ @@ -31,8 +39,13 @@ "tfc:erosion" ], [], - [], - [], + [ + "tfg:venus/terrain/lava_spring_rare", + "tfc:random_empty_hot_spring" + ], + [ + "tfg:venus/terrain/adakite_column" + ], [], [], "#tfg:venus_veins", @@ -41,28 +54,38 @@ "tfc:raw_boulder", "tfc:cobble_boulder", "tfc:raw_boulder_small_patch", - "tfc:cobble_boulder_small_patch" + "tfc:cobble_boulder_small_patch", + "tfg:venus/surface/adakite_spikes", + "tfg:venus/surface/ochrum_spikes", + "tfg:venus/surface/crimsite_spikes" + ], + [ + "tfg:venus/surface/smoker_source_patch", + "tfg:venus/surface/lava_source_patch", + "tfg:venus/surface/twisted_vine", + "tfg:venus/surface/shadow_plant_patch", + "tfg:venus/surface/pile_volcanic_ash", + "tfg:venus/surface/loose_scorchia" ], - [], "#tfg:venus_top_layer_modification" ], "has_precipitation": true, "spawn_costs": { "endermanoverhaul:desert_enderman": { - "energy_budget": 0.05, - "charge": 0.9 + "energy_budget": 0.15, + "charge": 0.7 }, "endermanoverhaul:savanna_enderman": { - "energy_budget": 0.05, - "charge": 0.9 + "energy_budget": 0.15, + "charge": 0.7 }, "endermanoverhaul:nether_wastes_enderman": { - "energy_budget": 0.05, - "charge": 0.9 + "energy_budget": 0.15, + "charge": 0.7 }, "minecraft:enderman": { - "energy_budget": 0.05, - "charge": 0.9 + "energy_budget": 0.15, + "charge": 0.7 }, "species:cliff_hanger": { "energy_budget": 0.15, @@ -81,15 +104,15 @@ "charge": 0.7 }, "minecraft:magma_cube": { - "energy_budget": 0.15, - "charge": 0.7 + "energy_budget": 0.03, + "charge": 0.10 }, "arthropocolypse:millipede_head": { "energy_budget": 0.05, "charge": 0.9 } }, - "creature_spawn_probability": 0.1, + "creature_spawn_probability": 0.15, "spawners": { "ambient": [], "axolotls": [], @@ -145,6 +168,18 @@ "minCount": 1, "weight": 100 }, + { + "type": "endermanoverhaul:nether_wastes_enderman", + "maxCount": 1, + "minCount": 1, + "weight": 100 + }, + { + "type": "endermanoverhaul:desert_enderman", + "maxCount": 1, + "minCount": 1, + "weight": 100 + }, { "type": "minecraft:enderman", "maxCount": 1, @@ -163,6 +198,18 @@ "minCount": 1, "weight": 100 }, + { + "type": "minecraft:magma_cube", + "maxCount": 2, + "minCount": 1, + "weight": 30 + }, + { + "type": "minecraft:blaze", + "maxCount": 2, + "minCount": 1, + "weight": 30 + }, { "type": "arthropocolypse:millipede_head", "maxCount": 2, diff --git a/kubejs/data/tfg/worldgen/biome/venus/salt_flats.json b/kubejs/data/tfg/worldgen/biome/venus/salt_flats.json index 8415a8167..16c2bf780 100644 --- a/kubejs/data/tfg/worldgen/biome/venus/salt_flats.json +++ b/kubejs/data/tfg/worldgen/biome/venus/salt_flats.json @@ -24,6 +24,14 @@ "type": "minecraft:white_ash" }, "probability": 0.02 + }, + "music": { + "max_delay": 24000, + "min_delay": 12000, + "replace_current_music": false, + "sound": { + "sound_id": "tfg:music.venus" + } } }, "features": [ @@ -31,7 +39,9 @@ "tfc:erosion" ], [], - [], + [ + "tfc:random_empty_hot_spring" + ], [], [], [], @@ -48,20 +58,20 @@ "has_precipitation": true, "spawn_costs": { "endermanoverhaul:desert_enderman": { - "energy_budget": 0.05, - "charge": 0.9 + "energy_budget": 0.15, + "charge": 0.7 }, "endermanoverhaul:savanna_enderman": { - "energy_budget": 0.05, - "charge": 0.9 + "energy_budget": 0.15, + "charge": 0.7 }, "endermanoverhaul:nether_wastes_enderman": { - "energy_budget": 0.05, - "charge": 0.9 + "energy_budget": 0.15, + "charge": 0.7 }, "minecraft:enderman": { - "energy_budget": 0.05, - "charge": 0.9 + "energy_budget": 0.15, + "charge": 0.7 }, "species:cliff_hanger": { "energy_budget": 0.15, diff --git a/kubejs/data/tfg/worldgen/biome/venus/scorching_volcanoes.json b/kubejs/data/tfg/worldgen/biome/venus/scorching_volcanoes.json index 7bd62eebb..46cb11773 100644 --- a/kubejs/data/tfg/worldgen/biome/venus/scorching_volcanoes.json +++ b/kubejs/data/tfg/worldgen/biome/venus/scorching_volcanoes.json @@ -8,8 +8,8 @@ "sound": "tfg:ambient.venus_surface.additions", "tick_chance": 0.0015 }, - "sky_color": 5450003, - "fog_color": 5450003, + "sky_color": 7687245, + "fog_color": 7687245, "water_color": 8241044, "water_fog_color": 10866612, "ambient_sound": "tfg:ambient.venus_surface.loop", @@ -24,6 +24,14 @@ "type": "minecraft:ash" }, "probability": 0.1 + }, + "music": { + "max_delay": 24000, + "min_delay": 12000, + "replace_current_music": false, + "sound": { + "sound_id": "tfg:music.venus" + } } }, "features": [ @@ -60,7 +68,9 @@ "tfg:venus/surface/twisted_vine", "tfg:venus/surface/shadow_plant_patch", "tfg:venus/surface/pile_volcanic_ash", - "tfg:venus/surface/pile_black_sand" + "tfg:venus/surface/pile_black_sand", + "tfg:venus/surface/loose_scorchia", + "tfg:venus/surface/loose_crackrack" ], [ "tfg:venus/terrain/lava_fill" @@ -70,20 +80,20 @@ "has_precipitation": true, "spawn_costs": { "endermanoverhaul:desert_enderman": { - "energy_budget": 0.05, - "charge": 0.9 + "energy_budget": 0.15, + "charge": 0.7 }, "endermanoverhaul:savanna_enderman": { - "energy_budget": 0.05, - "charge": 0.9 + "energy_budget": 0.15, + "charge": 0.7 }, "endermanoverhaul:nether_wastes_enderman": { - "energy_budget": 0.05, - "charge": 0.9 + "energy_budget": 0.15, + "charge": 0.7 }, "minecraft:enderman": { - "energy_budget": 0.05, - "charge": 0.9 + "energy_budget": 0.15, + "charge": 0.7 }, "species:cliff_hanger": { "energy_budget": 0.3, @@ -115,6 +125,12 @@ "ambient": [], "axolotls": [], "creature": [ + { + "type": "minecraft:strider", + "maxCount": 5, + "minCount": 3, + "weight": 100 + }, { "type": "arthropocolypse:ice_crawler", "maxCount": 2, diff --git a/kubejs/data/tfg/worldgen/biome/venus/stromatolite_beach.json b/kubejs/data/tfg/worldgen/biome/venus/stromatolite_beach.json index 7ac1a7cf5..13198fce5 100644 --- a/kubejs/data/tfg/worldgen/biome/venus/stromatolite_beach.json +++ b/kubejs/data/tfg/worldgen/biome/venus/stromatolite_beach.json @@ -24,6 +24,14 @@ "type": "minecraft:white_ash" }, "probability": 0.05 + }, + "music": { + "max_delay": 24000, + "min_delay": 12000, + "replace_current_music": false, + "sound": { + "sound_id": "tfg:music.venus" + } } }, "features": [ @@ -32,6 +40,7 @@ ], [], [ + "tfc:random_empty_hot_spring", "tfg:venus/terrain/stromatolite_disk" ], [], @@ -44,27 +53,28 @@ "tfg:venus/terrain/thermal_vent_rare" ], [ - "tfg:venus/surface/sulfur_patch" + "tfg:venus/surface/sulfur_patch", + "tfg:venus/surface/loose_scoria" ], "#tfg:venus_top_layer_modification" ], "has_precipitation": true, "spawn_costs": { "endermanoverhaul:desert_enderman": { - "energy_budget": 0.05, - "charge": 0.9 + "energy_budget": 0.15, + "charge": 0.7 }, "endermanoverhaul:savanna_enderman": { - "energy_budget": 0.05, - "charge": 0.9 + "energy_budget": 0.15, + "charge": 0.7 }, "endermanoverhaul:nether_wastes_enderman": { - "energy_budget": 0.05, - "charge": 0.9 + "energy_budget": 0.15, + "charge": 0.7 }, "minecraft:enderman": { - "energy_budget": 0.05, - "charge": 0.9 + "energy_budget": 0.15, + "charge": 0.7 }, "species:cliff_hanger": { "energy_budget": 0.15, diff --git a/kubejs/data/tfg/worldgen/biome/venus/sulfuric_ravine.json b/kubejs/data/tfg/worldgen/biome/venus/sulfuric_ravine.json index 2088c8478..79b328a81 100644 --- a/kubejs/data/tfg/worldgen/biome/venus/sulfuric_ravine.json +++ b/kubejs/data/tfg/worldgen/biome/venus/sulfuric_ravine.json @@ -24,6 +24,14 @@ "type": "minecraft:ash" }, "probability": 0.05 + }, + "music": { + "max_delay": 24000, + "min_delay": 12000, + "replace_current_music": false, + "sound": { + "sound_id": "tfg:music.venus" + } } }, "features": [ @@ -46,27 +54,28 @@ ], [ "tfg:venus/surface/sulfur_patch", - "tfg:venus/surface/hydralux" + "tfg:venus/surface/hydralux", + "tfg:venus/surface/loose_scoria" ], "#tfg:venus_top_layer_modification" ], "has_precipitation": true, "spawn_costs": { "endermanoverhaul:desert_enderman": { - "energy_budget": 0.05, - "charge": 0.9 + "energy_budget": 0.15, + "charge": 0.7 }, "endermanoverhaul:savanna_enderman": { - "energy_budget": 0.05, - "charge": 0.9 + "energy_budget": 0.15, + "charge": 0.7 }, "endermanoverhaul:nether_wastes_enderman": { - "energy_budget": 0.05, - "charge": 0.9 + "energy_budget": 0.15, + "charge": 0.7 }, "minecraft:enderman": { - "energy_budget": 0.05, - "charge": 0.9 + "energy_budget": 0.15, + "charge": 0.7 }, "species:cliff_hanger": { "energy_budget": 0.15, diff --git a/kubejs/data/tfg/worldgen/configured_feature/earth/spouts/heavy_oil_spout.json b/kubejs/data/tfg/worldgen/configured_feature/earth/spouts/heavy_oil_spout.json new file mode 100644 index 000000000..9ff88f4a9 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/earth/spouts/heavy_oil_spout.json @@ -0,0 +1,21 @@ +{ + "type": "gtceu:fluid_sprout", + "config": { + "fluid": "gtceu:oil_heavy", + "size": { + "type": "minecraft:uniform", + "value": { + "max_inclusive": 13, + "min_inclusive": 9 + } + }, + "sprout_chance": 1.0, + "surface_offset": { + "type": "minecraft:uniform", + "value": { + "max_inclusive": 3, + "min_inclusive": 1 + } + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/earth/spouts/lava_spout.json b/kubejs/data/tfg/worldgen/configured_feature/earth/spouts/lava_spout.json new file mode 100644 index 000000000..b7403f302 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/earth/spouts/lava_spout.json @@ -0,0 +1,21 @@ +{ + "type": "gtceu:fluid_sprout", + "config": { + "fluid": "minecraft:lava", + "size": { + "type": "minecraft:uniform", + "value": { + "max_inclusive": 16, + "min_inclusive": 12 + } + }, + "sprout_chance": 1.0, + "surface_offset": { + "type": "minecraft:uniform", + "value": { + "max_inclusive": 2, + "min_inclusive": 0 + } + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/earth/spouts/light_oil_spout.json b/kubejs/data/tfg/worldgen/configured_feature/earth/spouts/light_oil_spout.json new file mode 100644 index 000000000..aa0d24d9e --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/earth/spouts/light_oil_spout.json @@ -0,0 +1,21 @@ +{ + "type": "gtceu:fluid_sprout", + "config": { + "fluid": "gtceu:oil_light", + "size": { + "type": "minecraft:uniform", + "value": { + "max_inclusive": 13, + "min_inclusive": 9 + } + }, + "sprout_chance": 1.0, + "surface_offset": { + "type": "minecraft:uniform", + "value": { + "max_inclusive": 7, + "min_inclusive": 2 + } + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/earth/spouts/oil_spout.json b/kubejs/data/tfg/worldgen/configured_feature/earth/spouts/oil_spout.json new file mode 100644 index 000000000..c88b6ca8f --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/earth/spouts/oil_spout.json @@ -0,0 +1,21 @@ +{ + "type": "gtceu:fluid_sprout", + "config": { + "fluid": "gtceu:oil", + "size": { + "type": "minecraft:uniform", + "value": { + "max_inclusive": 13, + "min_inclusive": 9 + } + }, + "sprout_chance": 1.0, + "surface_offset": { + "type": "minecraft:uniform", + "value": { + "max_inclusive": 7, + "min_inclusive": 2 + } + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/earth/spouts/raw_oil_spout.json b/kubejs/data/tfg/worldgen/configured_feature/earth/spouts/raw_oil_spout.json new file mode 100644 index 000000000..48f65fa84 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/earth/spouts/raw_oil_spout.json @@ -0,0 +1,21 @@ +{ + "type": "gtceu:fluid_sprout", + "config": { + "fluid": "gtceu:oil_medium", + "size": { + "type": "minecraft:uniform", + "value": { + "max_inclusive": 13, + "min_inclusive": 9 + } + }, + "sprout_chance": 1.0, + "surface_offset": { + "type": "minecraft:uniform", + "value": { + "max_inclusive": 7, + "min_inclusive": 2 + } + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/earth/vein/desert_oilsands.json b/kubejs/data/tfg/worldgen/configured_feature/earth/vein/desert_oilsands.json new file mode 100644 index 000000000..c495617ff --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/earth/vein/desert_oilsands.json @@ -0,0 +1,131 @@ +{ + "__credits__": "This vein was automatically generated by OresToFieldGuide.", + "type": "tfc:cluster_vein", + "config": { + "size": 60, + "rarity": 150, + "density": 0.2, + "min_y": 30, + "max_y": 70, + "random_name": "desert_oilsands", + "blocks": [ + { + "replace": [ + "tfc:rock/raw/shale" + ], + "with": [ + { + "block": "gtceu:shale_oilsands_ore", + "weight": 100 + }, + { + "block": "gtceu:raw_oilsands_block", + "weight": 1 + } + ] + }, + { + "replace": [ + "tfc:rock/raw/claystone" + ], + "with": [ + { + "block": "gtceu:claystone_oilsands_ore", + "weight": 100 + }, + { + "block": "gtceu:raw_oilsands_block", + "weight": 1 + } + ] + }, + { + "replace": [ + "tfc:rock/raw/limestone" + ], + "with": [ + { + "block": "gtceu:limestone_oilsands_ore", + "weight": 100 + }, + { + "block": "gtceu:raw_oilsands_block", + "weight": 1 + } + ] + }, + { + "replace": [ + "tfc:rock/raw/conglomerate" + ], + "with": [ + { + "block": "gtceu:conglomerate_oilsands_ore", + "weight": 100 + }, + { + "block": "gtceu:raw_oilsands_block", + "weight": 1 + } + ] + }, + { + "replace": [ + "tfc:rock/raw/dolomite" + ], + "with": [ + { + "block": "gtceu:dolomite_oilsands_ore", + "weight": 100 + }, + { + "block": "gtceu:raw_oilsands_block", + "weight": 1 + } + ] + }, + { + "replace": [ + "tfc:rock/raw/chert" + ], + "with": [ + { + "block": "gtceu:chert_oilsands_ore", + "weight": 100 + }, + { + "block": "gtceu:raw_oilsands_block", + "weight": 1 + } + ] + }, + { + "replace": [ + "tfc:rock/raw/chalk" + ], + "with": [ + { + "block": "gtceu:chalk_oilsands_ore", + "weight": 100 + }, + { + "block": "gtceu:raw_oilsands_block", + "weight": 1 + } + ] + } + ], + "indicator": { + "rarity": 12, + "depth": 50, + "underground_rarity": 40, + "underground_count": 200, + "blocks": [ + { + "block": "gtceu:oilsands_indicator", + "weight": 100 + } + ] + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_beryllium.json b/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_beryllium.json index 645616ae0..04f2f8dbe 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_beryllium.json +++ b/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_beryllium.json @@ -12,7 +12,7 @@ "rarity": 250, "density": 0.35, "min_y": -32, - "max_y": 50, + "max_y": 30, "random_name": "normal_beryllium", "blocks": [ { diff --git a/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_graphite.json b/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_graphite.json index 1b1f7a1a1..7d6fbd458 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_graphite.json +++ b/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_graphite.json @@ -257,139 +257,6 @@ "weight": 30 } ] - }, - { - "replace": [ - "tfc:rock/raw/shale" - ], - "with": [ - { - "block": "gtceu:shale_graphite_ore", - "weight": 45 - }, - { - "block": "gtceu:shale_diamond_ore", - "weight": 25 - }, - { - "block": "gtceu:shale_coal_ore", - "weight": 30 - } - ] - }, - { - "replace": [ - "tfc:rock/raw/claystone" - ], - "with": [ - { - "block": "gtceu:claystone_graphite_ore", - "weight": 45 - }, - { - "block": "gtceu:claystone_diamond_ore", - "weight": 25 - }, - { - "block": "gtceu:claystone_coal_ore", - "weight": 30 - } - ] - }, - { - "replace": [ - "tfc:rock/raw/limestone" - ], - "with": [ - { - "block": "gtceu:limestone_graphite_ore", - "weight": 45 - }, - { - "block": "gtceu:limestone_diamond_ore", - "weight": 25 - }, - { - "block": "gtceu:limestone_coal_ore", - "weight": 30 - } - ] - }, - { - "replace": [ - "tfc:rock/raw/conglomerate" - ], - "with": [ - { - "block": "gtceu:conglomerate_graphite_ore", - "weight": 45 - }, - { - "block": "gtceu:conglomerate_diamond_ore", - "weight": 25 - }, - { - "block": "gtceu:conglomerate_coal_ore", - "weight": 30 - } - ] - }, - { - "replace": [ - "tfc:rock/raw/dolomite" - ], - "with": [ - { - "block": "gtceu:dolomite_graphite_ore", - "weight": 45 - }, - { - "block": "gtceu:dolomite_diamond_ore", - "weight": 25 - }, - { - "block": "gtceu:dolomite_coal_ore", - "weight": 30 - } - ] - }, - { - "replace": [ - "tfc:rock/raw/chert" - ], - "with": [ - { - "block": "gtceu:chert_graphite_ore", - "weight": 45 - }, - { - "block": "gtceu:chert_diamond_ore", - "weight": 25 - }, - { - "block": "gtceu:chert_coal_ore", - "weight": 30 - } - ] - }, - { - "replace": [ - "tfc:rock/raw/chalk" - ], - "with": [ - { - "block": "gtceu:chalk_graphite_ore", - "weight": 45 - }, - { - "block": "gtceu:chalk_diamond_ore", - "weight": 25 - }, - { - "block": "gtceu:chalk_coal_ore", - "weight": 30 - } - ] } ], "indicator": { diff --git a/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_oilsands.json b/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_oilsands.json index 5ec1ce356..c3078167d 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_oilsands.json +++ b/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_oilsands.json @@ -2,11 +2,11 @@ "__credits__": "This vein was automatically generated by OresToFieldGuide.", "type": "tfc:cluster_vein", "config": { - "size": 55, - "rarity": 185, + "size": 30, + "rarity": 220, "density": 0.2, - "min_y": 0, - "max_y": 70, + "min_y": 40, + "max_y": 90, "random_name": "normal_oilsands", "blocks": [ { diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/surface/large_skull.json b/kubejs/data/tfg/worldgen/configured_feature/mars/surface/large_skull.json index e8cc3b028..c253b278e 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/mars/surface/large_skull.json +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/surface/large_skull.json @@ -13,6 +13,10 @@ { "feature": "tfg:mars/surface/skulls/charger", "placement": [] + }, + { + "feature": "tfg:mars/surface/skulls/raider", + "placement": [] } ] } diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/surface/skulls/raider.json b/kubejs/data/tfg/worldgen/configured_feature/mars/surface/skulls/raider.json new file mode 100644 index 000000000..cd2c87829 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/surface/skulls/raider.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:simple_block", + "config": { + "to_place": { + "type": "minecraft:randomized_int_state_provider", + "property": "rotation", + "values": { + "type": "minecraft:uniform", + "value": { + "min_inclusive": 0, + "max_inclusive": 15 + } + }, + "source": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "wan_ancient_beasts:raider_skull" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/surface/skulls/snatcher.json b/kubejs/data/tfg/worldgen/configured_feature/mars/surface/skulls/snatcher.json new file mode 100644 index 000000000..3258f648c --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/surface/skulls/snatcher.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:simple_block", + "config": { + "to_place": { + "type": "minecraft:randomized_int_state_provider", + "property": "rotation", + "values": { + "type": "minecraft:uniform", + "value": { + "min_inclusive": 0, + "max_inclusive": 15 + } + }, + "source": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "wan_ancient_beasts:snatcher_skull" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/surface/small_skull.json b/kubejs/data/tfg/worldgen/configured_feature/mars/surface/small_skull.json index f413a15cf..ebdcabc62 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/mars/surface/small_skull.json +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/surface/small_skull.json @@ -18,6 +18,10 @@ "feature": "tfg:mars/surface/skulls/surfer", "placement": [] }, + { + "feature": "tfg:mars/surface/skulls/snatcher", + "placement": [] + }, { "feature": "tfg:mars/surface/skulls/tiny", "placement": [] diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/vein/deep_mars_chromite.json b/kubejs/data/tfg/worldgen/configured_feature/mars/vein/deep_mars_chromite.json index 7beb0d99c..e7fbff179 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/mars/vein/deep_mars_chromite.json +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/vein/deep_mars_chromite.json @@ -5,17 +5,17 @@ "size": 60, "rarity": 370, "density": 0.3, - "min_y": -20, + "min_y": -30, "max_y": 0, "random_name": "deep_mars_chromite", "blocks": [ { "replace": [ - "ad_astra:mars_stone" + "gtceu:red_granite" ], "with": [ { - "block": "gtceu:mars_stone_redstone_ore", + "block": "gtceu:red_granite_redstone_ore", "weight": 45 }, { @@ -23,22 +23,22 @@ "weight": 1 }, { - "block": "gtceu:mars_stone_ruby_ore", + "block": "gtceu:red_granite_ruby_ore", "weight": 35 }, { - "block": "gtceu:mars_stone_chromite_ore", + "block": "gtceu:red_granite_chromite_ore", "weight": 20 } ] }, { "replace": [ - "tfc:rock/raw/shale" + "tfc:rock/raw/gabbro" ], "with": [ { - "block": "gtceu:shale_redstone_ore", + "block": "gtceu:gabbro_redstone_ore", "weight": 45 }, { @@ -46,22 +46,22 @@ "weight": 1 }, { - "block": "gtceu:shale_ruby_ore", + "block": "gtceu:gabbro_ruby_ore", "weight": 35 }, { - "block": "gtceu:shale_chromite_ore", + "block": "gtceu:gabbro_chromite_ore", "weight": 20 } ] }, { "replace": [ - "tfc:rock/raw/claystone" + "tfc:rock/raw/diorite" ], "with": [ { - "block": "gtceu:claystone_redstone_ore", + "block": "gtceu:diorite_redstone_ore", "weight": 45 }, { @@ -69,22 +69,22 @@ "weight": 1 }, { - "block": "gtceu:claystone_ruby_ore", + "block": "gtceu:diorite_ruby_ore", "weight": 35 }, { - "block": "gtceu:claystone_chromite_ore", + "block": "gtceu:diorite_chromite_ore", "weight": 20 } ] }, { "replace": [ - "tfc:rock/raw/limestone" + "tfc:rock/raw/granite" ], "with": [ { - "block": "gtceu:limestone_redstone_ore", + "block": "gtceu:granite_redstone_ore", "weight": 45 }, { @@ -92,104 +92,11 @@ "weight": 1 }, { - "block": "gtceu:limestone_ruby_ore", + "block": "gtceu:granite_ruby_ore", "weight": 35 }, { - "block": "gtceu:limestone_chromite_ore", - "weight": 20 - } - ] - }, - { - "replace": [ - "tfc:rock/raw/chert" - ], - "with": [ - { - "block": "gtceu:chert_redstone_ore", - "weight": 45 - }, - { - "block": "gtceu:raw_redstone_block", - "weight": 1 - }, - { - "block": "gtceu:chert_ruby_ore", - "weight": 35 - }, - { - "block": "gtceu:chert_chromite_ore", - "weight": 20 - } - ] - }, - { - "replace": [ - "tfc:rock/raw/chalk" - ], - "with": [ - { - "block": "gtceu:chalk_redstone_ore", - "weight": 45 - }, - { - "block": "gtceu:raw_redstone_block", - "weight": 1 - }, - { - "block": "gtceu:chalk_ruby_ore", - "weight": 35 - }, - { - "block": "gtceu:chalk_chromite_ore", - "weight": 20 - } - ] - }, - { - "replace": [ - "tfc:rock/raw/basalt", - "minecraft:basalt" - ], - "with": [ - { - "block": "gtceu:basalt_redstone_ore", - "weight": 45 - }, - { - "block": "gtceu:raw_redstone_block", - "weight": 1 - }, - { - "block": "gtceu:basalt_ruby_ore", - "weight": 35 - }, - { - "block": "gtceu:basalt_chromite_ore", - "weight": 20 - } - ] - }, - { - "replace": [ - "tfc:rock/raw/dacite" - ], - "with": [ - { - "block": "gtceu:dacite_redstone_ore", - "weight": 45 - }, - { - "block": "gtceu:raw_redstone_block", - "weight": 1 - }, - { - "block": "gtceu:dacite_ruby_ore", - "weight": 35 - }, - { - "block": "gtceu:dacite_chromite_ore", + "block": "gtceu:granite_chromite_ore", "weight": 20 } ] diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/vein/deep_mars_pitchblende.json b/kubejs/data/tfg/worldgen/configured_feature/mars/vein/deep_mars_pitchblende.json index fd2d9a311..8e35b4969 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/mars/vein/deep_mars_pitchblende.json +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/vein/deep_mars_pitchblende.json @@ -5,17 +5,17 @@ "size": 60, "rarity": 370, "density": 0.3, - "min_y": -20, + "min_y": -30, "max_y": 0, "random_name": "deep_mars_pitchblende", "blocks": [ { "replace": [ - "ad_astra:mars_stone" + "gtceu:red_granite" ], "with": [ { - "block": "gtceu:mars_stone_pitchblende_ore", + "block": "gtceu:red_granite_pitchblende_ore", "weight": 50 }, { @@ -23,57 +23,11 @@ "weight": 1 }, { - "block": "gtceu:mars_stone_thorium_ore", + "block": "gtceu:red_granite_thorium_ore", "weight": 25 }, { - "block": "gtceu:mars_stone_uraninite_ore", - "weight": 20 - } - ] - }, - { - "replace": [ - "ad_astra:venus_stone" - ], - "with": [ - { - "block": "gtceu:venus_stone_pitchblende_ore", - "weight": 50 - }, - { - "block": "gtceu:raw_pitchblende_block", - "weight": 1 - }, - { - "block": "gtceu:venus_stone_thorium_ore", - "weight": 25 - }, - { - "block": "gtceu:venus_stone_uraninite_ore", - "weight": 20 - } - ] - }, - { - "replace": [ - "tfc:rock/raw/diorite" - ], - "with": [ - { - "block": "gtceu:diorite_pitchblende_ore", - "weight": 50 - }, - { - "block": "gtceu:raw_pitchblende_block", - "weight": 1 - }, - { - "block": "gtceu:diorite_thorium_ore", - "weight": 25 - }, - { - "block": "gtceu:diorite_uraninite_ore", + "block": "gtceu:red_granite_uraninite_ore", "weight": 20 } ] @@ -103,11 +57,11 @@ }, { "replace": [ - "tfc:rock/raw/shale" + "tfc:rock/raw/diorite" ], "with": [ { - "block": "gtceu:shale_pitchblende_ore", + "block": "gtceu:diorite_pitchblende_ore", "weight": 50 }, { @@ -115,22 +69,22 @@ "weight": 1 }, { - "block": "gtceu:shale_thorium_ore", + "block": "gtceu:diorite_thorium_ore", "weight": 25 }, { - "block": "gtceu:shale_uraninite_ore", + "block": "gtceu:diorite_uraninite_ore", "weight": 20 } ] }, { "replace": [ - "tfc:rock/raw/claystone" + "tfc:rock/raw/granite" ], "with": [ { - "block": "gtceu:claystone_pitchblende_ore", + "block": "gtceu:granite_pitchblende_ore", "weight": 50 }, { @@ -138,34 +92,11 @@ "weight": 1 }, { - "block": "gtceu:claystone_thorium_ore", + "block": "gtceu:granite_thorium_ore", "weight": 25 }, { - "block": "gtceu:claystone_uraninite_ore", - "weight": 20 - } - ] - }, - { - "replace": [ - "tfc:rock/raw/dacite" - ], - "with": [ - { - "block": "gtceu:dacite_pitchblende_ore", - "weight": 50 - }, - { - "block": "gtceu:raw_pitchblende_block", - "weight": 1 - }, - { - "block": "gtceu:dacite_thorium_ore", - "weight": 25 - }, - { - "block": "gtceu:dacite_uraninite_ore", + "block": "gtceu:granite_uraninite_ore", "weight": 20 } ] diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/vein/deep_mars_sheldonite.json b/kubejs/data/tfg/worldgen/configured_feature/mars/vein/deep_mars_sheldonite.json index e7448f9e8..37706d69f 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/mars/vein/deep_mars_sheldonite.json +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/vein/deep_mars_sheldonite.json @@ -5,64 +5,10 @@ "size": 60, "rarity": 370, "density": 0.3, - "min_y": -20, + "min_y": -30, "max_y": 0, "random_name": "deep_mars_sheldonite", "blocks": [ - { - "replace": [ - "ad_astra:mars_stone" - ], - "with": [ - { - "block": "gtceu:mars_stone_bornite_ore", - "weight": 35 - }, - { - "block": "gtceu:raw_bornite_block", - "weight": 1 - }, - { - "block": "gtceu:mars_stone_cooperite_ore", - "weight": 25 - }, - { - "block": "gtceu:mars_stone_nickel_ore", - "weight": 25 - }, - { - "block": "gtceu:mars_stone_platinum_ore", - "weight": 15 - } - ] - }, - { - "replace": [ - "ad_astra:venus_stone" - ], - "with": [ - { - "block": "gtceu:venus_stone_bornite_ore", - "weight": 35 - }, - { - "block": "gtceu:raw_bornite_block", - "weight": 1 - }, - { - "block": "gtceu:venus_stone_cooperite_ore", - "weight": 25 - }, - { - "block": "gtceu:venus_stone_nickel_ore", - "weight": 25 - }, - { - "block": "gtceu:venus_stone_platinum_ore", - "weight": 15 - } - ] - }, { "replace": [ "gtceu:red_granite" @@ -90,6 +36,33 @@ } ] }, + { + "replace": [ + "tfc:rock/raw/gabbro" + ], + "with": [ + { + "block": "gtceu:gabbro_bornite_ore", + "weight": 35 + }, + { + "block": "gtceu:raw_bornite_block", + "weight": 1 + }, + { + "block": "gtceu:gabbro_cooperite_ore", + "weight": 25 + }, + { + "block": "gtceu:gabbro_nickel_ore", + "weight": 25 + }, + { + "block": "gtceu:gabbro_platinum_ore", + "weight": 15 + } + ] + }, { "replace": [ "tfc:rock/raw/diorite" @@ -119,11 +92,11 @@ }, { "replace": [ - "tfc:rock/raw/conglomerate" + "tfc:rock/raw/granite" ], "with": [ { - "block": "gtceu:conglomerate_bornite_ore", + "block": "gtceu:granite_bornite_ore", "weight": 35 }, { @@ -131,124 +104,15 @@ "weight": 1 }, { - "block": "gtceu:conglomerate_cooperite_ore", + "block": "gtceu:granite_cooperite_ore", "weight": 25 }, { - "block": "gtceu:conglomerate_nickel_ore", + "block": "gtceu:granite_nickel_ore", "weight": 25 }, { - "block": "gtceu:conglomerate_platinum_ore", - "weight": 15 - } - ] - }, - { - "replace": [ - "tfc:rock/raw/chert" - ], - "with": [ - { - "block": "gtceu:chert_bornite_ore", - "weight": 35 - }, - { - "block": "gtceu:raw_bornite_block", - "weight": 1 - }, - { - "block": "gtceu:chert_cooperite_ore", - "weight": 25 - }, - { - "block": "gtceu:chert_nickel_ore", - "weight": 25 - }, - { - "block": "gtceu:chert_platinum_ore", - "weight": 15 - } - ] - }, - { - "replace": [ - "tfc:rock/raw/chalk" - ], - "with": [ - { - "block": "gtceu:chalk_bornite_ore", - "weight": 35 - }, - { - "block": "gtceu:raw_bornite_block", - "weight": 1 - }, - { - "block": "gtceu:chalk_cooperite_ore", - "weight": 25 - }, - { - "block": "gtceu:chalk_nickel_ore", - "weight": 25 - }, - { - "block": "gtceu:chalk_platinum_ore", - "weight": 15 - } - ] - }, - { - "replace": [ - "tfc:rock/raw/basalt", - "minecraft:basalt" - ], - "with": [ - { - "block": "gtceu:basalt_bornite_ore", - "weight": 35 - }, - { - "block": "gtceu:raw_bornite_block", - "weight": 1 - }, - { - "block": "gtceu:basalt_cooperite_ore", - "weight": 25 - }, - { - "block": "gtceu:basalt_nickel_ore", - "weight": 25 - }, - { - "block": "gtceu:basalt_platinum_ore", - "weight": 15 - } - ] - }, - { - "replace": [ - "tfc:rock/raw/dacite" - ], - "with": [ - { - "block": "gtceu:dacite_bornite_ore", - "weight": 35 - }, - { - "block": "gtceu:raw_bornite_block", - "weight": 1 - }, - { - "block": "gtceu:dacite_cooperite_ore", - "weight": 25 - }, - { - "block": "gtceu:dacite_nickel_ore", - "weight": 25 - }, - { - "block": "gtceu:dacite_platinum_ore", + "block": "gtceu:granite_platinum_ore", "weight": 15 } ] diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/vein/mars_copper.json b/kubejs/data/tfg/worldgen/configured_feature/mars/vein/mars_copper.json index de69bcc25..14bdc80b8 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/mars/vein/mars_copper.json +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/vein/mars_copper.json @@ -252,6 +252,33 @@ "weight": 5 } ] + }, + { + "replace": [ + "tfc:rock/raw/quartzite" + ], + "with": [ + { + "block": "gtceu:quartzite_chalcopyrite_ore", + "weight": 65 + }, + { + "block": "gtceu:raw_chalcopyrite_block", + "weight": 1 + }, + { + "block": "gtceu:quartzite_copper_ore", + "weight": 20 + }, + { + "block": "gtceu:quartzite_pyrite_ore", + "weight": 10 + }, + { + "block": "gtceu:quartzite_hematite_ore", + "weight": 5 + } + ] } ], "indicator": { diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/vein/mars_hematite.json b/kubejs/data/tfg/worldgen/configured_feature/mars/vein/mars_hematite.json index 9a97b5a72..7453967aa 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/mars/vein/mars_hematite.json +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/vein/mars_hematite.json @@ -225,6 +225,33 @@ "weight": 5 } ] + }, + { + "replace": [ + "tfc:rock/raw/quartzite" + ], + "with": [ + { + "block": "gtceu:quartzite_hematite_ore", + "weight": 50 + }, + { + "block": "gtceu:raw_hematite_block", + "weight": 1 + }, + { + "block": "gtceu:quartzite_yellow_limonite_ore", + "weight": 30 + }, + { + "block": "gtceu:quartzite_goethite_ore", + "weight": 15 + }, + { + "block": "gtceu:quartzite_gold_ore", + "weight": 5 + } + ] } ], "indicator": { diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/vein/mars_lubricant.json b/kubejs/data/tfg/worldgen/configured_feature/mars/vein/mars_lubricant.json index 7bbbcb576..cb97344e6 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/mars/vein/mars_lubricant.json +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/vein/mars_lubricant.json @@ -318,6 +318,37 @@ "weight": 5 } ] + }, + { + "replace": [ + "tfc:rock/raw/quartzite" + ], + "with": [ + { + "block": "gtceu:quartzite_soapstone_ore", + "weight": 15 + }, + { + "block": "gtceu:quartzite_talc_ore", + "weight": 15 + }, + { + "block": "gtceu:quartzite_glauconite_sand_ore", + "weight": 5 + }, + { + "block": "gtceu:quartzite_trona_ore", + "weight": 25 + }, + { + "block": "gtceu:quartzite_pentlandite_ore", + "weight": 5 + }, + { + "block": "gtceu:quartzite_hematite_ore", + "weight": 5 + } + ] } ], "indicator": { diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/vein/mars_neodynium.json b/kubejs/data/tfg/worldgen/configured_feature/mars/vein/mars_neodynium.json index 892218d01..35b7324cf 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/mars/vein/mars_neodynium.json +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/vein/mars_neodynium.json @@ -225,6 +225,33 @@ "weight": 5 } ] + }, + { + "replace": [ + "tfc:rock/raw/quartzite" + ], + "with": [ + { + "block": "gtceu:quartzite_bastnasite_ore", + "weight": 50 + }, + { + "block": "gtceu:raw_bastnasite_block", + "weight": 1 + }, + { + "block": "gtceu:quartzite_monazite_ore", + "weight": 25 + }, + { + "block": "gtceu:quartzite_neodymium_ore", + "weight": 5 + }, + { + "block": "gtceu:quartzite_hematite_ore", + "weight": 5 + } + ] } ], "indicator": { diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/vein/mars_nickel.json b/kubejs/data/tfg/worldgen/configured_feature/mars/vein/mars_nickel.json index 6cbda752e..65b131e1b 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/mars/vein/mars_nickel.json +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/vein/mars_nickel.json @@ -252,6 +252,33 @@ "weight": 5 } ] + }, + { + "replace": [ + "tfc:rock/raw/quartzite" + ], + "with": [ + { + "block": "gtceu:quartzite_garnierite_ore", + "weight": 25 + }, + { + "block": "gtceu:raw_garnierite_block", + "weight": 1 + }, + { + "block": "gtceu:quartzite_nickel_ore", + "weight": 20 + }, + { + "block": "gtceu:quartzite_cobaltite_ore", + "weight": 20 + }, + { + "block": "gtceu:quartzite_hematite_ore", + "weight": 5 + } + ] } ], "indicator": { diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/vein/mars_pitchblende.json b/kubejs/data/tfg/worldgen/configured_feature/mars/vein/mars_pitchblende.json index 274bffe05..d154f83f1 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/mars/vein/mars_pitchblende.json +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/vein/mars_pitchblende.json @@ -215,6 +215,29 @@ "weight": 25 } ] + }, + { + "replace": [ + "tfc:rock/raw/quartzite" + ], + "with": [ + { + "block": "gtceu:quartzite_pitchblende_ore", + "weight": 35 + }, + { + "block": "gtceu:raw_pitchblende_block", + "weight": 1 + }, + { + "block": "gtceu:quartzite_thorium_ore", + "weight": 25 + }, + { + "block": "gtceu:quartzite_hematite_ore", + "weight": 25 + } + ] } ], "indicator": { diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/vein/mars_quartzite.json b/kubejs/data/tfg/worldgen/configured_feature/mars/vein/mars_quartzite.json index d140902b0..2b94fb2b9 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/mars/vein/mars_quartzite.json +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/vein/mars_quartzite.json @@ -251,6 +251,33 @@ "weight": 5 } ] + }, + { + "replace": [ + "tfc:rock/raw/quartzite" + ], + "with": [ + { + "block": "gtceu:quartzite_quartzite_ore", + "weight": 35 + }, + { + "block": "gtceu:raw_quartzite_block", + "weight": 1 + }, + { + "block": "gtceu:quartzite_barite_ore", + "weight": 30 + }, + { + "block": "gtceu:quartzite_asbestos_ore", + "weight": 15 + }, + { + "block": "gtceu:quartzite_hematite_ore", + "weight": 5 + } + ] } ], "indicator": { diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/vein/mars_salt.json b/kubejs/data/tfg/worldgen/configured_feature/mars/vein/mars_salt.json index 7df225aa6..f465521d3 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/mars/vein/mars_salt.json +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/vein/mars_salt.json @@ -252,6 +252,33 @@ "weight": 35 } ] + }, + { + "replace": [ + "tfc:rock/raw/quartzite" + ], + "with": [ + { + "block": "gtceu:quartzite_rock_salt_ore", + "weight": 20 + }, + { + "block": "gtceu:raw_rock_salt_block", + "weight": 1 + }, + { + "block": "gtceu:quartzite_salt_ore", + "weight": 30 + }, + { + "block": "gtceu:quartzite_lepidolite_ore", + "weight": 15 + }, + { + "block": "gtceu:quartzite_spodumene_ore", + "weight": 35 + } + ] } ], "indicator": { diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/vein/mars_stibnite.json b/kubejs/data/tfg/worldgen/configured_feature/mars/vein/mars_stibnite.json index 290fe3904..aaa154bc0 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/mars/vein/mars_stibnite.json +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/vein/mars_stibnite.json @@ -306,6 +306,33 @@ "weight": 5 } ] + }, + { + "replace": [ + "tfc:rock/raw/quartzite" + ], + "with": [ + { + "block": "gtceu:quartzite_tetrahedrite_ore", + "weight": 50 + }, + { + "block": "gtceu:raw_tetrahedrite_block", + "weight": 1 + }, + { + "block": "gtceu:quartzite_copper_ore", + "weight": 30 + }, + { + "block": "gtceu:quartzite_stibnite_ore", + "weight": 20 + }, + { + "block": "gtceu:quartzite_hematite_ore", + "weight": 5 + } + ] } ], "indicator": { diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/vein/mars_surface_bismuthinite.json b/kubejs/data/tfg/worldgen/configured_feature/mars/vein/mars_surface_bismuthinite.json index b7398aa77..c7709965a 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/mars/vein/mars_surface_bismuthinite.json +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/vein/mars_surface_bismuthinite.json @@ -414,6 +414,33 @@ "weight": 10 } ] + }, + { + "replace": [ + "tfc:rock/raw/quartzite" + ], + "with": [ + { + "block": "gtceu:quartzite_bismuth_ore", + "weight": 20 + }, + { + "block": "gtceu:raw_bismuth_block", + "weight": 1 + }, + { + "block": "gtceu:quartzite_hematite_ore", + "weight": 10 + }, + { + "block": "gtceu:quartzite_sulfur_ore", + "weight": 10 + }, + { + "block": "gtceu:quartzite_gypsum_ore", + "weight": 10 + } + ] } ], "indicator": { diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/vein/mars_surface_cassiterite.json b/kubejs/data/tfg/worldgen/configured_feature/mars/vein/mars_surface_cassiterite.json index f84c3b898..3f70207d3 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/mars/vein/mars_surface_cassiterite.json +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/vein/mars_surface_cassiterite.json @@ -354,6 +354,29 @@ "weight": 10 } ] + }, + { + "replace": [ + "tfc:rock/raw/quartzite" + ], + "with": [ + { + "block": "gtceu:quartzite_cassiterite_ore", + "weight": 55 + }, + { + "block": "gtceu:raw_cassiterite_block", + "weight": 1 + }, + { + "block": "gtceu:quartzite_tin_ore", + "weight": 35 + }, + { + "block": "gtceu:quartzite_saltpeter_ore", + "weight": 10 + } + ] } ], "indicator": { diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/vein/mars_surface_hematite.json b/kubejs/data/tfg/worldgen/configured_feature/mars/vein/mars_surface_hematite.json index 0b747a035..379b6c728 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/mars/vein/mars_surface_hematite.json +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/vein/mars_surface_hematite.json @@ -414,6 +414,33 @@ "weight": 5 } ] + }, + { + "replace": [ + "tfc:rock/raw/quartzite" + ], + "with": [ + { + "block": "gtceu:quartzite_hematite_ore", + "weight": 50 + }, + { + "block": "gtceu:raw_hematite_block", + "weight": 1 + }, + { + "block": "gtceu:quartzite_yellow_limonite_ore", + "weight": 30 + }, + { + "block": "gtceu:quartzite_gold_ore", + "weight": 5 + }, + { + "block": "gtceu:quartzite_calcite_ore", + "weight": 5 + } + ] } ], "indicator": { diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/vein/mars_surface_nickel_galena.json b/kubejs/data/tfg/worldgen/configured_feature/mars/vein/mars_surface_nickel_galena.json index 6daa8da11..4c54e0557 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/mars/vein/mars_surface_nickel_galena.json +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/vein/mars_surface_nickel_galena.json @@ -414,6 +414,33 @@ "weight": 10 } ] + }, + { + "replace": [ + "tfc:rock/raw/quartzite" + ], + "with": [ + { + "block": "gtceu:quartzite_sphalerite_ore", + "weight": 15 + }, + { + "block": "gtceu:quartzite_nickel_ore", + "weight": 20 + }, + { + "block": "gtceu:quartzite_galena_ore", + "weight": 30 + }, + { + "block": "gtceu:quartzite_silver_ore", + "weight": 10 + }, + { + "block": "gtceu:quartzite_cobaltite_ore", + "weight": 10 + } + ] } ], "indicator": { diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/vein/mars_surface_tetrahedrite.json b/kubejs/data/tfg/worldgen/configured_feature/mars/vein/mars_surface_tetrahedrite.json index 305b92f59..b9132910b 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/mars/vein/mars_surface_tetrahedrite.json +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/vein/mars_surface_tetrahedrite.json @@ -414,6 +414,33 @@ "weight": 5 } ] + }, + { + "replace": [ + "tfc:rock/raw/quartzite" + ], + "with": [ + { + "block": "gtceu:quartzite_tetrahedrite_ore", + "weight": 60 + }, + { + "block": "gtceu:raw_tetrahedrite_block", + "weight": 1 + }, + { + "block": "gtceu:quartzite_copper_ore", + "weight": 20 + }, + { + "block": "gtceu:quartzite_stibnite_ore", + "weight": 20 + }, + { + "block": "gtceu:quartzite_redstone_ore", + "weight": 5 + } + ] } ], "indicator": { diff --git a/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_beryllium.json b/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_beryllium.json index 80c57d36c..6aa08c262 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_beryllium.json +++ b/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_beryllium.json @@ -9,7 +9,7 @@ "min_slant": 0, "max_slant": 4, "sign": 0, - "rarity": 250, + "rarity": 300, "density": 0.45, "min_y": 32, "max_y": 128, diff --git a/kubejs/data/tfg/worldgen/configured_feature/venus/surface/adakite_spikes.json b/kubejs/data/tfg/worldgen/configured_feature/venus/surface/adakite_spikes.json new file mode 100644 index 000000000..5a617f6b4 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/venus/surface/adakite_spikes.json @@ -0,0 +1,62 @@ +{ + "type": "minecraft:random_patch", + "config": { + "feature": { + "feature": { + "type": "minecraft:block_column", + "config": { + "allowed_placement": { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + }, + "direction": "up", + "layers": [ + { + "height": { + "type": "minecraft:weighted_list", + "distribution": [ + { + "data": { + "type": "minecraft:uniform", + "value": { + "max_inclusive": 8, + "min_inclusive": 4 + } + }, + "weight": 5 + }, + { + "data": { + "type": "minecraft:uniform", + "value": { + "max_inclusive": 16, + "min_inclusive": 8 + } + }, + "weight": 1 + } + ] + }, + "provider": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "betterend:lacugrove_bark" + } + } + } + ], + "prioritize_tip": true + } + }, + "placement": [ + { + "type": "minecraft:heightmap", + "heightmap": "OCEAN_FLOOR" + } + ] + }, + "tries": 12, + "xz_spread": 16, + "y_spread": 1 + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/venus/surface/crimsite_spikes.json b/kubejs/data/tfg/worldgen/configured_feature/venus/surface/crimsite_spikes.json new file mode 100644 index 000000000..dce1d7f60 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/venus/surface/crimsite_spikes.json @@ -0,0 +1,80 @@ +{ + "type": "minecraft:vegetation_patch", + "config": { + "depth": { + "type": "minecraft:uniform", + "value": { + "max_inclusive": 2, + "min_inclusive": 1 + } + }, + "extra_bottom_block_chance": 0, + "extra_edge_column_chance": 0.2, + "ground_state": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "create:crimsite" + } + }, + "replaceable": "#ad_astra:venus_stone_replaceables", + "surface": "floor", + "vegetation_chance": 0.4, + "vegetation_feature": { + "feature": { + "type": "minecraft:block_column", + "config": { + "allowed_placement": { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + }, + "direction": "up", + "layers": [ + { + "height": { + "type": "minecraft:weighted_list", + "distribution": [ + { + "data": { + "type": "minecraft:uniform", + "value": { + "max_inclusive": 3, + "min_inclusive": 0 + } + }, + "weight": 5 + }, + { + "data": { + "type": "minecraft:uniform", + "value": { + "max_inclusive": 7, + "min_inclusive": 1 + } + }, + "weight": 1 + } + ] + }, + "provider": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "create:crimsite" + } + } + } + ], + "prioritize_tip": true + } + }, + "placement": [] + }, + "vertical_range": 5, + "xz_radius": { + "type": "minecraft:uniform", + "value": { + "max_inclusive": 2, + "min_inclusive": 1 + } + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/venus/surface/loose_crackrack.json b/kubejs/data/tfg/worldgen/configured_feature/venus/surface/loose_crackrack.json new file mode 100644 index 000000000..b42fe220e --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/venus/surface/loose_crackrack.json @@ -0,0 +1,55 @@ +{ + "type": "minecraft:random_patch", + "config": { + "feature": { + "feature": { + "type": "minecraft:simple_block", + "config": { + "to_place": { + "type": "minecraft:randomized_int_state_provider", + "property": "count", + "values": { + "type": "minecraft:uniform", + "value": { + "min_inclusive": 1, + "max_inclusive": 3 + } + }, + "source": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "tfg:loose/crackrack" + } + } + } + } + }, + "placement": [ + { + "type": "minecraft:heightmap", + "heightmap": "OCEAN_FLOOR" + }, + { + "type": "minecraft:block_predicate_filter", + "predicate": { + "type": "minecraft:all_of", + "predicates": [ + { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + }, + { + "type": "minecraft:has_sturdy_face", + "offset": [ 0, -1, 0 ], + "direction": "down" + } + ] + } + } + ] + }, + "tries": 8, + "xz_spread": 7, + "y_spread": 1 + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/venus/surface/loose_scorchia.json b/kubejs/data/tfg/worldgen/configured_feature/venus/surface/loose_scorchia.json new file mode 100644 index 000000000..040d64b68 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/venus/surface/loose_scorchia.json @@ -0,0 +1,55 @@ +{ + "type": "minecraft:random_patch", + "config": { + "feature": { + "feature": { + "type": "minecraft:simple_block", + "config": { + "to_place": { + "type": "minecraft:randomized_int_state_provider", + "property": "count", + "values": { + "type": "minecraft:uniform", + "value": { + "min_inclusive": 1, + "max_inclusive": 3 + } + }, + "source": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "tfg:loose/scorchia" + } + } + } + } + }, + "placement": [ + { + "type": "minecraft:heightmap", + "heightmap": "OCEAN_FLOOR" + }, + { + "type": "minecraft:block_predicate_filter", + "predicate": { + "type": "minecraft:all_of", + "predicates": [ + { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + }, + { + "type": "minecraft:has_sturdy_face", + "offset": [ 0, -1, 0 ], + "direction": "down" + } + ] + } + } + ] + }, + "tries": 8, + "xz_spread": 7, + "y_spread": 1 + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/venus/surface/loose_scoria.json b/kubejs/data/tfg/worldgen/configured_feature/venus/surface/loose_scoria.json new file mode 100644 index 000000000..406c92329 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/venus/surface/loose_scoria.json @@ -0,0 +1,55 @@ +{ + "type": "minecraft:random_patch", + "config": { + "feature": { + "feature": { + "type": "minecraft:simple_block", + "config": { + "to_place": { + "type": "minecraft:randomized_int_state_provider", + "property": "count", + "values": { + "type": "minecraft:uniform", + "value": { + "min_inclusive": 1, + "max_inclusive": 3 + } + }, + "source": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "tfg:loose/scoria" + } + } + } + } + }, + "placement": [ + { + "type": "minecraft:heightmap", + "heightmap": "OCEAN_FLOOR" + }, + { + "type": "minecraft:block_predicate_filter", + "predicate": { + "type": "minecraft:all_of", + "predicates": [ + { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + }, + { + "type": "minecraft:has_sturdy_face", + "offset": [ 0, -1, 0 ], + "direction": "down" + } + ] + } + } + ] + }, + "tries": 8, + "xz_spread": 7, + "y_spread": 1 + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/venus/surface/ochrum_spikes.json b/kubejs/data/tfg/worldgen/configured_feature/venus/surface/ochrum_spikes.json new file mode 100644 index 000000000..a1ea43be6 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/venus/surface/ochrum_spikes.json @@ -0,0 +1,80 @@ +{ + "type": "minecraft:vegetation_patch", + "config": { + "depth": { + "type": "minecraft:uniform", + "value": { + "max_inclusive": 2, + "min_inclusive": 1 + } + }, + "extra_bottom_block_chance": 0, + "extra_edge_column_chance": 0.2, + "ground_state": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "create:ochrum" + } + }, + "replaceable": "#ad_astra:venus_stone_replaceables", + "surface": "floor", + "vegetation_chance": 0.4, + "vegetation_feature": { + "feature": { + "type": "minecraft:block_column", + "config": { + "allowed_placement": { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + }, + "direction": "up", + "layers": [ + { + "height": { + "type": "minecraft:weighted_list", + "distribution": [ + { + "data": { + "type": "minecraft:uniform", + "value": { + "max_inclusive": 2, + "min_inclusive": 0 + } + }, + "weight": 5 + }, + { + "data": { + "type": "minecraft:uniform", + "value": { + "max_inclusive": 5, + "min_inclusive": 1 + } + }, + "weight": 1 + } + ] + }, + "provider": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "create:ochrum" + } + } + } + ], + "prioritize_tip": true + } + }, + "placement": [] + }, + "vertical_range": 5, + "xz_radius": { + "type": "minecraft:uniform", + "value": { + "max_inclusive": 2, + "min_inclusive": 1 + } + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/adakite_column.json b/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/adakite_column.json new file mode 100644 index 000000000..08b7f018f --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/adakite_column.json @@ -0,0 +1,30 @@ +{ + "type": "tfc:pipe_vein", + "config": { + "height": 120, + "radius": 4, + "min_skew": 0, + "max_skew": 2, + "min_slant": 0, + "max_slant": 2, + "sign": 0, + "rarity": 80, + "density": 0.99, + "min_y": 60, + "max_y": 180, + "random_name": "adakite_column", + "blocks": [ + { + "replace": [ + "minecraft:air" + ], + "with": [ + { + "block": "betterend:lacugrove_bark", + "weight": 1 + } + ] + } + ] + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/ignimbrite_columns.json b/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/thermal_columns.json similarity index 100% rename from kubejs/data/tfg/worldgen/configured_feature/venus/terrain/ignimbrite_columns.json rename to kubejs/data/tfg/worldgen/configured_feature/venus/terrain/thermal_columns.json diff --git a/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/ignimbrite_disk.json b/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/thermal_disk.json similarity index 100% rename from kubejs/data/tfg/worldgen/configured_feature/venus/terrain/ignimbrite_disk.json rename to kubejs/data/tfg/worldgen/configured_feature/venus/terrain/thermal_disk.json diff --git a/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/ignimbrite_tube_worms.json b/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/thermal_tube_worms.json similarity index 100% rename from kubejs/data/tfg/worldgen/configured_feature/venus/terrain/ignimbrite_tube_worms.json rename to kubejs/data/tfg/worldgen/configured_feature/venus/terrain/thermal_tube_worms.json diff --git a/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/ignimbrite_vents.json b/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/thermal_vents.json similarity index 100% rename from kubejs/data/tfg/worldgen/configured_feature/venus/terrain/ignimbrite_vents.json rename to kubejs/data/tfg/worldgen/configured_feature/venus/terrain/thermal_vents.json diff --git a/kubejs/data/tfg/worldgen/configured_feature/venus/vein/venus_manual_salt.json b/kubejs/data/tfg/worldgen/configured_feature/venus/vein/venus_manual_salt.json new file mode 100644 index 000000000..fb68763cf --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/venus/vein/venus_manual_salt.json @@ -0,0 +1,232 @@ +{ + "__credits__": "This vein was automatically generated by OresToFieldGuide.", + "type": "tfc:disc_vein", + "config": { + "height": 6, + "size": 20, + "rarity": 30, + "density": 0.2, + "min_y": 40, + "max_y": 65, + "random_name": "venus_manual_salt", + "blocks": [ + { + "replace": [ + "minecraft:dripstone_block" + ], + "with": [ + { + "block": "gtceu:dripstone_salt_ore", + "weight": 80 + }, + { + "block": "gtceu:dripstone_rock_salt_ore", + "weight": 10 + }, + { + "block": "gtceu:dripstone_lepidolite_ore", + "weight": 5 + }, + { + "block": "gtceu:dripstone_spodumene_ore", + "weight": 5 + } + ] + }, + { + "replace": [ + "ad_astra:venus_stone" + ], + "with": [ + { + "block": "gtceu:venus_stone_salt_ore", + "weight": 80 + }, + { + "block": "gtceu:venus_stone_rock_salt_ore", + "weight": 10 + }, + { + "block": "gtceu:venus_stone_lepidolite_ore", + "weight": 5 + }, + { + "block": "gtceu:venus_stone_spodumene_ore", + "weight": 5 + } + ] + }, + { + "replace": [ + "tfc:rock/raw/basalt", + "minecraft:basalt" + ], + "with": [ + { + "block": "gtceu:basalt_salt_ore", + "weight": 80 + }, + { + "block": "gtceu:basalt_rock_salt_ore", + "weight": 10 + }, + { + "block": "gtceu:basalt_lepidolite_ore", + "weight": 5 + }, + { + "block": "gtceu:basalt_spodumene_ore", + "weight": 5 + } + ] + }, + { + "replace": [ + "tfc:rock/raw/rhyolite" + ], + "with": [ + { + "block": "gtceu:rhyolite_salt_ore", + "weight": 80 + }, + { + "block": "gtceu:rhyolite_rock_salt_ore", + "weight": 10 + }, + { + "block": "gtceu:rhyolite_lepidolite_ore", + "weight": 5 + }, + { + "block": "gtceu:rhyolite_spodumene_ore", + "weight": 5 + } + ] + }, + { + "replace": [ + "tfc:rock/raw/dacite" + ], + "with": [ + { + "block": "gtceu:dacite_salt_ore", + "weight": 80 + }, + { + "block": "gtceu:dacite_rock_salt_ore", + "weight": 10 + }, + { + "block": "gtceu:dacite_lepidolite_ore", + "weight": 5 + }, + { + "block": "gtceu:dacite_spodumene_ore", + "weight": 5 + } + ] + }, + { + "replace": [ + "tfc:rock/raw/andesite" + ], + "with": [ + { + "block": "gtceu:andesite_salt_ore", + "weight": 80 + }, + { + "block": "gtceu:andesite_rock_salt_ore", + "weight": 10 + }, + { + "block": "gtceu:andesite_lepidolite_ore", + "weight": 5 + }, + { + "block": "gtceu:andesite_spodumene_ore", + "weight": 5 + } + ] + }, + { + "replace": [ + "betterend:flavolite" + ], + "with": [ + { + "block": "gtceu:flavolite_salt_ore", + "weight": 80 + }, + { + "block": "gtceu:flavolite_rock_salt_ore", + "weight": 10 + }, + { + "block": "gtceu:flavolite_lepidolite_ore", + "weight": 5 + }, + { + "block": "gtceu:flavolite_spodumene_ore", + "weight": 5 + } + ] + }, + { + "replace": [ + "betterend:sandy_jadestone" + ], + "with": [ + { + "block": "gtceu:sandy_jadestone_salt_ore", + "weight": 80 + }, + { + "block": "gtceu:sandy_jadestone_rock_salt_ore", + "weight": 10 + }, + { + "block": "gtceu:sandy_jadestone_lepidolite_ore", + "weight": 5 + }, + { + "block": "gtceu:sandy_jadestone_spodumene_ore", + "weight": 5 + } + ] + } + ], + "indicator": { + "rarity": 20, + "depth": 30, + "underground_rarity": 40, + "underground_count": 200, + "blocks": [ + { + "block": "gtceu:rock_salt_indicator", + "weight": 5 + }, + { + "block": "gtceu:rock_salt_bud_indicator", + "weight": 5 + }, + { + "block": "gtceu:salt_indicator", + "weight": 40 + }, + { + "block": "gtceu:salt_bud_indicator", + "weight": 40 + }, + { + "block": "gtceu:lepidolite_indicator", + "weight": 5 + }, + { + "block": "gtceu:spodumene_indicator", + "weight": 5 + } + ] + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/venus/vein/venus_manual_sulfur.json b/kubejs/data/tfg/worldgen/configured_feature/venus/vein/venus_manual_sulfur.json new file mode 100644 index 000000000..6555775b3 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/venus/vein/venus_manual_sulfur.json @@ -0,0 +1,187 @@ +{ + "__credits__": "This vein was automatically generated by OresToFieldGuide.", + "type": "tfc:cluster_vein", + "config": { + "size": 20, + "rarity": 30, + "density": 0.2, + "min_y": 40, + "max_y": 65, + "random_name": "venus_manual_sulfur", + "blocks": [ + { + "replace": [ + "minecraft:dripstone_block" + ], + "with": [ + { + "block": "gtceu:dripstone_sulfur_ore", + "weight": 80 + }, + { + "block": "gtceu:dripstone_pyrite_ore", + "weight": 15 + }, + { + "block": "gtceu:dripstone_sphalerite_ore", + "weight": 5 + } + ] + }, + { + "replace": [ + "ad_astra:venus_stone" + ], + "with": [ + { + "block": "gtceu:venus_stone_sulfur_ore", + "weight": 80 + }, + { + "block": "gtceu:venus_stone_pyrite_ore", + "weight": 15 + }, + { + "block": "gtceu:venus_stone_sphalerite_ore", + "weight": 5 + } + ] + }, + { + "replace": [ + "tfc:rock/raw/basalt", + "minecraft:basalt" + ], + "with": [ + { + "block": "gtceu:basalt_sulfur_ore", + "weight": 80 + }, + { + "block": "gtceu:basalt_pyrite_ore", + "weight": 15 + }, + { + "block": "gtceu:basalt_sphalerite_ore", + "weight": 5 + } + ] + }, + { + "replace": [ + "tfc:rock/raw/rhyolite" + ], + "with": [ + { + "block": "gtceu:rhyolite_sulfur_ore", + "weight": 80 + }, + { + "block": "gtceu:rhyolite_pyrite_ore", + "weight": 15 + }, + { + "block": "gtceu:rhyolite_sphalerite_ore", + "weight": 5 + } + ] + }, + { + "replace": [ + "tfc:rock/raw/dacite" + ], + "with": [ + { + "block": "gtceu:dacite_sulfur_ore", + "weight": 80 + }, + { + "block": "gtceu:dacite_pyrite_ore", + "weight": 15 + }, + { + "block": "gtceu:dacite_sphalerite_ore", + "weight": 5 + } + ] + }, + { + "replace": [ + "tfc:rock/raw/andesite" + ], + "with": [ + { + "block": "gtceu:andesite_sulfur_ore", + "weight": 80 + }, + { + "block": "gtceu:andesite_pyrite_ore", + "weight": 15 + }, + { + "block": "gtceu:andesite_sphalerite_ore", + "weight": 5 + } + ] + }, + { + "replace": [ + "betterend:flavolite" + ], + "with": [ + { + "block": "gtceu:flavolite_sulfur_ore", + "weight": 80 + }, + { + "block": "gtceu:flavolite_pyrite_ore", + "weight": 15 + }, + { + "block": "gtceu:flavolite_sphalerite_ore", + "weight": 5 + } + ] + }, + { + "replace": [ + "betterend:sandy_jadestone" + ], + "with": [ + { + "block": "gtceu:sandy_jadestone_sulfur_ore", + "weight": 80 + }, + { + "block": "gtceu:sandy_jadestone_pyrite_ore", + "weight": 15 + }, + { + "block": "gtceu:sandy_jadestone_sphalerite_ore", + "weight": 5 + } + ] + } + ], + "indicator": { + "rarity": 20, + "depth": 30, + "underground_rarity": 40, + "underground_count": 200, + "blocks": [ + { + "block": "gtceu:sulfur_indicator", + "weight": 80 + }, + { + "block": "gtceu:pyrite_indicator", + "weight": 15 + }, + { + "block": "tfc:ore/small_sphalerite", + "weight": 5 + } + ] + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/venus/vein_manual/salt.json b/kubejs/data/tfg/worldgen/configured_feature/venus/vein_manual/salt.json deleted file mode 100644 index ca56083f5..000000000 --- a/kubejs/data/tfg/worldgen/configured_feature/venus/vein_manual/salt.json +++ /dev/null @@ -1,208 +0,0 @@ -{ - "type": "tfc:disc_vein", - "config": { - "height": 6, - "size": 20, - "rarity": 30, - "density": 0.2, - "min_y": 40, - "max_y": 65, - "random_name": "venus_manual_salt", - "blocks": [ - { - "replace": [ - "ad_astra:venus_stone" - ], - "with": [ - { - "block": "gtceu:venus_stone_rock_salt_ore", - "weight": 10 - }, - { - "block": "gtceu:raw_salt_block", - "weight": 1 - }, - { - "block": "gtceu:venus_stone_salt_ore", - "weight": 80 - }, - { - "block": "gtceu:venus_stone_lepidolite_ore", - "weight": 5 - }, - { - "block": "gtceu:venus_stone_spodumene_ore", - "weight": 5 - } - ] - }, - { - "replace": [ - "minecraft:dripstone_block" - ], - "with": [ - { - "block": "gtceu:dripstone_rock_salt_ore", - "weight": 10 - }, - { - "block": "gtceu:raw_salt_block", - "weight": 1 - }, - { - "block": "gtceu:dripstone_salt_ore", - "weight": 80 - }, - { - "block": "gtceu:dripstone_lepidolite_ore", - "weight": 5 - }, - { - "block": "gtceu:dripstone_spodumene_ore", - "weight": 5 - } - ] - }, - { - "replace": [ - "tfc:rock/raw/rhyolite" - ], - "with": [ - { - "block": "gtceu:rhyolite_rock_salt_ore", - "weight": 10 - }, - { - "block": "gtceu:raw_salt_block", - "weight": 1 - }, - { - "block": "gtceu:rhyolite_salt_ore", - "weight": 80 - }, - { - "block": "gtceu:rhyolite_lepidolite_ore", - "weight": 5 - }, - { - "block": "gtceu:rhyolite_spodumene_ore", - "weight": 5 - } - ] - }, - { - "replace": [ - "tfc:rock/raw/basalt" - ], - "with": [ - { - "block": "gtceu:basalt_rock_salt_ore", - "weight": 10 - }, - { - "block": "gtceu:raw_salt_block", - "weight": 1 - }, - { - "block": "gtceu:basalt_salt_ore", - "weight": 80 - }, - { - "block": "gtceu:basalt_lepidolite_ore", - "weight": 5 - }, - { - "block": "gtceu:basalt_spodumene_ore", - "weight": 5 - } - ] - }, - { - "replace": [ - "tfc:rock/raw/andesite" - ], - "with": [ - { - "block": "gtceu:andesite_rock_salt_ore", - "weight": 10 - }, - { - "block": "gtceu:raw_salt_block", - "weight": 1 - }, - { - "block": "gtceu:andesite_salt_ore", - "weight": 80 - }, - { - "block": "gtceu:andesite_lepidolite_ore", - "weight": 5 - }, - { - "block": "gtceu:andesite_spodumene_ore", - "weight": 5 - } - ] - }, - { - "replace": [ - "tfc:rock/raw/dacite" - ], - "with": [ - { - "block": "gtceu:dacite_rock_salt_ore", - "weight": 10 - }, - { - "block": "gtceu:raw_salt_block", - "weight": 1 - }, - { - "block": "gtceu:dacite_salt_ore", - "weight": 80 - }, - { - "block": "gtceu:dacite_lepidolite_ore", - "weight": 5 - }, - { - "block": "gtceu:dacite_spodumene_ore", - "weight": 5 - } - ] - } - ], - "indicator": { - "rarity": 10, - "depth": 30, - "underground_rarity": 40, - "underground_count": 180, - "blocks": [ - { - "block": "gtceu:rock_salt_indicator", - "weight": 5 - }, - { - "block": "gtceu:rock_salt_bud_indicator", - "weight": 5 - }, - { - "block": "gtceu:salt_indicator", - "weight": 40 - }, - { - "block": "gtceu:salt_bud_indicator", - "weight": 40 - }, - { - "block": "gtceu:lepidolite_indicator", - "weight": 5 - }, - { - "block": "gtceu:spodumene_indicator", - "weight": 5 - } - ] - } - } -} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/venus/vein_manual/sulfur.json b/kubejs/data/tfg/worldgen/configured_feature/venus/vein_manual/sulfur.json deleted file mode 100644 index e9054a1dd..000000000 --- a/kubejs/data/tfg/worldgen/configured_feature/venus/vein_manual/sulfur.json +++ /dev/null @@ -1,172 +0,0 @@ -{ - "type": "tfc:cluster_vein", - "config": { - "size": 20, - "rarity": 30, - "density": 0.2, - "min_y": 40, - "max_y": 65, - "random_name": "venus_manual_sulfur", - "blocks": [ - { - "replace": [ - "tfc:rock/raw/rhyolite" - ], - "with": [ - { - "block": "gtceu:rhyolite_sulfur_ore", - "weight": 80 - }, - { - "block": "gtceu:raw_sulfur_block", - "weight": 2 - }, - { - "block": "gtceu:rhyolite_pyrite_ore", - "weight": 15 - }, - { - "block": "gtceu:rhyolite_sphalerite_ore", - "weight": 5 - } - ] - }, - { - "replace": [ - "tfc:rock/raw/basalt", - "minecraft:basalt" - ], - "with": [ - { - "block": "gtceu:basalt_sulfur_ore", - "weight": 80 - }, - { - "block": "gtceu:raw_sulfur_block", - "weight": 2 - }, - { - "block": "gtceu:basalt_pyrite_ore", - "weight": 15 - }, - { - "block": "gtceu:basalt_sphalerite_ore", - "weight": 5 - } - ] - }, - { - "replace": [ - "minecraft:dripstone_block" - ], - "with": [ - { - "block": "gtceu:dripstone_sulfur_ore", - "weight": 80 - }, - { - "block": "gtceu:raw_sulfur_block", - "weight": 2 - }, - { - "block": "gtceu:dripstone_pyrite_ore", - "weight": 15 - }, - { - "block": "gtceu:dripstone_sphalerite_ore", - "weight": 5 - } - ] - }, - { - "replace": [ - "ad_astra:venus_stone" - ], - "with": [ - { - "block": "gtceu:venus_stone_sulfur_ore", - "weight": 80 - }, - { - "block": "gtceu:raw_sulfur_block", - "weight": 2 - }, - { - "block": "gtceu:venus_stone_pyrite_ore", - "weight": 15 - }, - { - "block": "gtceu:venus_stone_sphalerite_ore", - "weight": 5 - } - ] - }, - { - "replace": [ - "tfc:rock/raw/andesite" - ], - "with": [ - { - "block": "gtceu:andesite_sulfur_ore", - "weight": 80 - }, - { - "block": "gtceu:raw_sulfur_block", - "weight": 2 - }, - { - "block": "gtceu:andesite_pyrite_ore", - "weight": 15 - }, - { - "block": "gtceu:andesite_sphalerite_ore", - "weight": 5 - } - ] - }, - { - "replace": [ - "tfc:rock/raw/dacite" - ], - "with": [ - { - "block": "gtceu:dacite_sulfur_ore", - "weight": 80 - }, - { - "block": "gtceu:raw_sulfur_block", - "weight": 2 - }, - { - "block": "gtceu:dacite_pyrite_ore", - "weight": 15 - }, - { - "block": "gtceu:dacite_sphalerite_ore", - "weight": 5 - } - ] - } - ], - "indicator": { - "rarity": 20, - "depth": 30, - "underground_rarity": 40, - "underground_count": 180, - "blocks": [ - { - "block": "gtceu:sulfur_indicator", - "weight": 80 - }, - { - "block": "gtceu:pyrite_indicator", - "weight": 15 - }, - { - "block": "tfc:ore/small_sphalerite", - "weight": 5 - } - ] - } - } -} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/noise_settings/venus_noise.json b/kubejs/data/tfg/worldgen/noise_settings/venus_noise.json index 50fead7fc..36a967625 100644 --- a/kubejs/data/tfg/worldgen/noise_settings/venus_noise.json +++ b/kubejs/data/tfg/worldgen/noise_settings/venus_noise.json @@ -323,7 +323,7 @@ "then_run": { "type": "minecraft:block", "result_state": { - "Name": "betterend:flavolite" + "Name": "minecraft:tuff" } } } @@ -349,13 +349,16 @@ "raw_rock_weight": 20, "palette": [ { "Name": "create:ochrum" }, - { "Name": "betterend:sandy_jadestone" }, - { "Name": "betterend:sandy_jadestone" }, + { "Name": "create:ochrum" }, + { "Name": "tfg:rock/hardened_scoria" }, + { "Name": "tfg:rock/hardened_scorchia" }, { "Name": "betterend:sandy_jadestone" }, { "Name": "betterend:sandy_jadestone" }, { "Name": "betterend:flavolite" }, { "Name": "betterend:flavolite" }, - { "Name": "betterend:flavolite" } + { "Name": "minecraft:tuff" }, + { "Name": "tfc:rock/raw/basalt" }, + { "Name": "ad_astra:venus_stone" } ], "fallback": { "Name": "ad_astra:venus_stone" @@ -544,7 +547,7 @@ "then_run": { "type": "minecraft:block", "result_state": { - "Name": "create:scorchia" + "Name": "tfg:rock/hardened_scorchia" } } } diff --git a/kubejs/data/tfg/worldgen/placed_feature/earth/oil_spout.json b/kubejs/data/tfg/worldgen/placed_feature/earth/oil_spout.json index 2bdc4c768..504765a89 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/earth/oil_spout.json +++ b/kubejs/data/tfg/worldgen/placed_feature/earth/oil_spout.json @@ -1,5 +1,46 @@ { - "feature": "gtceu:raw_oil_sprout", + "feature": { + "type": "minecraft:random_selector", + "config": { + "default": { + "feature": { + "type": "minecraft:no_op", + "config": {} + }, + "placement": [] + }, + "features": [ + { + "chance": 0.4, + "feature": { + "feature": "tfg:earth/spouts/oil_spout", + "placement": [] + } + }, + { + "chance": 0.3, + "feature": { + "feature": "tfg:earth/spouts/light_oil_spout", + "placement": [] + } + }, + { + "chance": 0.15, + "feature": { + "feature": "tfg:earth/spouts/heavy_oil_spout", + "placement": [] + } + }, + { + "chance": 0.15, + "feature": { + "feature": "tfg:earth/spouts/raw_oil_spout", + "placement": [] + } + } + ] + } + }, "placement": [ { "type": "minecraft:rarity_filter", @@ -9,7 +50,7 @@ "type": "tfc:climate", "min_temperature": 0, "min_rainfall": 0, - "max_rainfall": 100 + "max_rainfall": 120 }, { "type": "minecraft:in_square" diff --git a/kubejs/data/tfg/worldgen/placed_feature/earth/vein/desert_oilsands.json b/kubejs/data/tfg/worldgen/placed_feature/earth/vein/desert_oilsands.json new file mode 100644 index 000000000..0ffca76ee --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/earth/vein/desert_oilsands.json @@ -0,0 +1,10 @@ +{ + "feature": "tfg:earth/vein/desert_oilsands", + "placement": [ + { + "type": "tfc:climate", + "min_rainfall": 0, + "max_rainfall": 120 + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/earth/vein/normal_tarkianite.json b/kubejs/data/tfg/worldgen/placed_feature/earth/vein/normal_tarkianite.json index b65ab875b..08f6e3a64 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/earth/vein/normal_tarkianite.json +++ b/kubejs/data/tfg/worldgen/placed_feature/earth/vein/normal_tarkianite.json @@ -1,14 +1,4 @@ { - - - - - "__credits__": "REVERT THIS FILE AFTER RUNNING ORES TO FIELD GUIDE. Otherwise it wipes the climate stuff.", - - - - - "feature": "tfg:earth/vein/normal_tarkianite", "placement": [ { diff --git a/kubejs/data/tfg/worldgen/placed_feature/earth/volcano_spout.json b/kubejs/data/tfg/worldgen/placed_feature/earth/volcano_spout.json new file mode 100644 index 000000000..02a680eef --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/earth/volcano_spout.json @@ -0,0 +1,25 @@ +{ + "feature": "tfg:earth/spouts/lava_spout", + "placement": [ + { + "type": "tfc:volcano", + "center": true + }, + { + "type": "minecraft:rarity_filter", + "chance": 3 + }, + { + "type": "minecraft:height_range", + "height": { + "type": "minecraft:uniform", + "max_inclusive": { + "absolute": -10 + }, + "min_inclusive": { + "absolute": -45 + } + } + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/venus/surface/adakite_spikes.json b/kubejs/data/tfg/worldgen/placed_feature/venus/surface/adakite_spikes.json new file mode 100644 index 000000000..c8b439c68 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/venus/surface/adakite_spikes.json @@ -0,0 +1,23 @@ +{ + "feature": "tfg:venus/surface/adakite_spikes", + "placement": [ + { + "type": "minecraft:biome" + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:rarity_filter", + "chance": 3 + }, + { + "type": "minecraft:count", + "count": 2 + }, + { + "type": "minecraft:heightmap", + "heightmap": "MOTION_BLOCKING" + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/venus/surface/crimsite_spikes.json b/kubejs/data/tfg/worldgen/placed_feature/venus/surface/crimsite_spikes.json new file mode 100644 index 000000000..8e6070cab --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/venus/surface/crimsite_spikes.json @@ -0,0 +1,23 @@ +{ + "feature": "tfg:venus/surface/crimsite_spikes", + "placement": [ + { + "type": "minecraft:biome" + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:rarity_filter", + "chance": 4 + }, + { + "type": "minecraft:count", + "count": 3 + }, + { + "type": "minecraft:heightmap", + "heightmap": "MOTION_BLOCKING" + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/venus/surface/loose_crackrack.json b/kubejs/data/tfg/worldgen/placed_feature/venus/surface/loose_crackrack.json new file mode 100644 index 000000000..5d1fe5881 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/venus/surface/loose_crackrack.json @@ -0,0 +1,12 @@ +{ + "feature": "tfg:venus/surface/loose_crackrack", + "placement": [ + { + "type": "minecraft:count", + "count": 2 + }, + { + "type": "minecraft:in_square" + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/venus/surface/loose_scorchia.json b/kubejs/data/tfg/worldgen/placed_feature/venus/surface/loose_scorchia.json new file mode 100644 index 000000000..244e2e670 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/venus/surface/loose_scorchia.json @@ -0,0 +1,12 @@ +{ + "feature": "tfg:venus/surface/loose_scorchia", + "placement": [ + { + "type": "minecraft:count", + "count": 2 + }, + { + "type": "minecraft:in_square" + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/venus/surface/loose_scoria.json b/kubejs/data/tfg/worldgen/placed_feature/venus/surface/loose_scoria.json new file mode 100644 index 000000000..ac76c0dba --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/venus/surface/loose_scoria.json @@ -0,0 +1,12 @@ +{ + "feature": "tfg:venus/surface/loose_scoria", + "placement": [ + { + "type": "minecraft:count", + "count": 2 + }, + { + "type": "minecraft:in_square" + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/venus/surface/ochrum_spikes.json b/kubejs/data/tfg/worldgen/placed_feature/venus/surface/ochrum_spikes.json new file mode 100644 index 000000000..121e57bd7 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/venus/surface/ochrum_spikes.json @@ -0,0 +1,23 @@ +{ + "feature": "tfg:venus/surface/ochrum_spikes", + "placement": [ + { + "type": "minecraft:biome" + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:rarity_filter", + "chance": 8 + }, + { + "type": "minecraft:count", + "count": 3 + }, + { + "type": "minecraft:heightmap", + "heightmap": "MOTION_BLOCKING" + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/venus/terrain/adakite_column.json b/kubejs/data/tfg/worldgen/placed_feature/venus/terrain/adakite_column.json new file mode 100644 index 000000000..7a7c2c0f0 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/venus/terrain/adakite_column.json @@ -0,0 +1,4 @@ +{ + "feature": "tfg:venus/terrain/adakite_column", + "placement": [] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/venus/terrain/lava_spring_rare.json b/kubejs/data/tfg/worldgen/placed_feature/venus/terrain/lava_spring_rare.json new file mode 100644 index 000000000..fc484f739 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/venus/terrain/lava_spring_rare.json @@ -0,0 +1,12 @@ +{ + "feature": "tfg:venus/terrain/lava_spring", + "placement": [ + { + "type": "minecraft:rarity_filter", + "chance": 40 + }, + { + "type": "minecraft:biome" + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/venus/terrain/thermal_vent.json b/kubejs/data/tfg/worldgen/placed_feature/venus/terrain/thermal_vent.json index eadd12694..01b0d8c21 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/venus/terrain/thermal_vent.json +++ b/kubejs/data/tfg/worldgen/placed_feature/venus/terrain/thermal_vent.json @@ -4,19 +4,19 @@ "config": { "features": [ { - "feature": "tfg:venus/terrain/ignimbrite_disk", + "feature": "tfg:venus/terrain/thermal_disk", "placement": [] }, { - "feature": "tfg:venus/terrain/ignimbrite_columns", + "feature": "tfg:venus/terrain/thermal_columns", "placement": [] }, { - "feature": "tfg:venus/terrain/ignimbrite_vents", + "feature": "tfg:venus/terrain/thermal_vents", "placement": [] }, { - "feature": "tfg:venus/terrain/ignimbrite_tube_worms", + "feature": "tfg:venus/terrain/thermal_tube_worms", "placement": [] } ] diff --git a/kubejs/data/tfg/worldgen/placed_feature/venus/terrain/thermal_vent_rare.json b/kubejs/data/tfg/worldgen/placed_feature/venus/terrain/thermal_vent_rare.json index fa99f779f..ae2633784 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/venus/terrain/thermal_vent_rare.json +++ b/kubejs/data/tfg/worldgen/placed_feature/venus/terrain/thermal_vent_rare.json @@ -4,19 +4,19 @@ "config": { "features": [ { - "feature": "tfg:venus/terrain/ignimbrite_disk", + "feature": "tfg:venus/terrain/thermal_disk", "placement": [] }, { - "feature": "tfg:venus/terrain/ignimbrite_columns", + "feature": "tfg:venus/terrain/thermal_columns", "placement": [] }, { - "feature": "tfg:venus/terrain/ignimbrite_vents", + "feature": "tfg:venus/terrain/thermal_vents", "placement": [] }, { - "feature": "tfg:venus/terrain/ignimbrite_tube_worms", + "feature": "tfg:venus/terrain/thermal_tube_worms", "placement": [] } ] diff --git a/kubejs/data/tfg/worldgen/placed_feature/venus/vein_manual/salt.json b/kubejs/data/tfg/worldgen/placed_feature/venus/vein_manual/salt.json index 0d2f4aca3..603541018 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/venus/vein_manual/salt.json +++ b/kubejs/data/tfg/worldgen/placed_feature/venus/vein_manual/salt.json @@ -1,4 +1,4 @@ { - "feature": "tfg:venus/vein_manual/salt", + "feature": "tfg:venus/vein/venus_manual_salt", "placement": [] } \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/venus/vein_manual/sulfur.json b/kubejs/data/tfg/worldgen/placed_feature/venus/vein_manual/sulfur.json index 7979b73a1..a72e67a02 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/venus/vein_manual/sulfur.json +++ b/kubejs/data/tfg/worldgen/placed_feature/venus/vein_manual/sulfur.json @@ -1,4 +1,4 @@ { - "feature": "tfg:venus/vein_manual/sulfur", + "feature": "tfg:venus/vein/venus_manual_sulfur", "placement": [] } \ No newline at end of file diff --git a/kubejs/data/wan_ancient_beasts/loot_tables/entities/crusher.json b/kubejs/data/wan_ancient_beasts/loot_tables/entities/crusher.json index 41865f871..945dd7230 100644 --- a/kubejs/data/wan_ancient_beasts/loot_tables/entities/crusher.json +++ b/kubejs/data/wan_ancient_beasts/loot_tables/entities/crusher.json @@ -1,65 +1,79 @@ { - "__comment__": "This file was automatically created by mcresources", - "type": "minecraft:entity", - "pools": [ - { - "name": "loot_pool", - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "tfg:food/raw_crusher_meat", - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "min": 2, - "max": 5 - } - } - ] - } - ] - }, - { - "name": "loot_pool", - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:bone", - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "min": 1, - "max": 3, - "type": "minecraft:uniform" - } - } - ] - } - ] - }, - { - "name": "loot_pool", - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "wan_ancient_beasts:crusher_spike", - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "min": 0, - "max": 2, - "type": "minecraft:uniform" - } - } - ] - } - ] - } - ] + "type": "minecraft:entity", + "pools": [ + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "tfg:food/raw_crusher_meat", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 2, + "max": 5 + } + } + ] + } + ] + }, + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:bone", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 1, + "max": 3, + "type": "minecraft:uniform" + } + } + ] + } + ] + }, + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "wan_ancient_beasts:crusher_spike", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 0, + "max": 2, + "type": "minecraft:uniform" + } + } + ] + } + ] + }, + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "wan_ancient_beasts:crusher_egg", + "conditions": [ + { + "condition": "minecraft:random_chance", + "chance": 0.1 + } + ] + } + ] + } + ] } \ No newline at end of file diff --git a/kubejs/data/wan_ancient_beasts/loot_tables/entities/glider.json b/kubejs/data/wan_ancient_beasts/loot_tables/entities/glider.json index 90570f5b2..408ea0512 100644 --- a/kubejs/data/wan_ancient_beasts/loot_tables/entities/glider.json +++ b/kubejs/data/wan_ancient_beasts/loot_tables/entities/glider.json @@ -1,66 +1,79 @@ { - "__comment__": "This file was automatically created by mcresources", - "type": "minecraft:entity", - "pools": [ - { - "name": "loot_pool", - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "tfg:food/raw_glider_wings", - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "min": 2, - "max": 6 - } - } - ] - } - ] - }, - { - "name": "loot_pool", - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:bone", - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "min": 1, - "max": 2, - "type": "minecraft:uniform" - } - } - ] - } - ] - } - , - { - "name": "loot_pool", - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "wan_ancient_beasts:glider_feather", - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "min": 0, - "max": 2, - "type": "minecraft:uniform" - } - } - ] - } - ] - } - ] + "type": "minecraft:entity", + "pools": [ + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "tfg:food/raw_glider_wings", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 2, + "max": 6 + } + } + ] + } + ] + }, + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:bone", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 1, + "max": 2, + "type": "minecraft:uniform" + } + } + ] + } + ] + }, + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "wan_ancient_beasts:glider_feather", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 0, + "max": 2, + "type": "minecraft:uniform" + } + } + ] + } + ] + }, + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "wan_ancient_beasts:glider_egg", + "conditions": [ + { + "condition": "minecraft:random_chance", + "chance": 0.1 + } + ] + } + ] + } + ] } \ No newline at end of file diff --git a/kubejs/data/wan_ancient_beasts/loot_tables/entities/soarer.json b/kubejs/data/wan_ancient_beasts/loot_tables/entities/soarer.json index 2499bd85b..e4c12b080 100644 --- a/kubejs/data/wan_ancient_beasts/loot_tables/entities/soarer.json +++ b/kubejs/data/wan_ancient_beasts/loot_tables/entities/soarer.json @@ -1,66 +1,64 @@ { - "__comment__": "This file was automatically created by mcresources", - "type": "minecraft:entity", - "pools": [ - { - "name": "loot_pool", - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "tfg:food/raw_whole_soarer", - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "min": 1, - "max": 4 - } - } - ] - } - ] - }, - { - "name": "loot_pool", - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:bone", - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "min": 1, - "max": 4, - "type": "minecraft:uniform" - } - } - ] - } - ] - } - , - { - "name": "loot_pool", - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "wan_ancient_beasts:glider_feather", - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "min": 0, - "max": 4, - "type": "minecraft:uniform" - } - } - ] - } - ] - } - ] + "type": "minecraft:entity", + "pools": [ + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "tfg:food/raw_whole_soarer", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 1, + "max": 4 + } + } + ] + } + ] + }, + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:bone", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 1, + "max": 4, + "type": "minecraft:uniform" + } + } + ] + } + ] + }, + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "wan_ancient_beasts:glider_feather", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 0, + "max": 4, + "type": "minecraft:uniform" + } + } + ] + } + ] + } + ] } \ No newline at end of file diff --git a/kubejs/data/wan_ancient_beasts/loot_tables/entities/walker.json b/kubejs/data/wan_ancient_beasts/loot_tables/entities/walker.json index 9808e1bba..bd339296f 100644 --- a/kubejs/data/wan_ancient_beasts/loot_tables/entities/walker.json +++ b/kubejs/data/wan_ancient_beasts/loot_tables/entities/walker.json @@ -1,45 +1,59 @@ { - "__comment__": "This file was automatically created by mcresources", - "type": "minecraft:entity", - "pools": [ - { - "name": "loot_pool", - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "tfg:food/raw_walker_steak", - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "min": 10, - "max": 25 - } - } - ] - } - ] - }, - { - "name": "loot_pool", - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:bone", - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "min": 4, - "max": 10, - "type": "minecraft:uniform" - } - } - ] - } - ] - } - ] + "type": "minecraft:entity", + "pools": [ + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "tfg:food/raw_walker_steak", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 10, + "max": 25 + } + } + ] + } + ] + }, + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:bone", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 4, + "max": 10, + "type": "minecraft:uniform" + } + } + ] + } + ] + }, + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "wan_ancient_beasts:walker_egg", + "conditions": [ + { + "condition": "minecraft:random_chance", + "chance": 0.1 + } + ] + } + ] + } + ] } \ No newline at end of file diff --git a/kubejs/server_scripts/ad_astra/recipes.js b/kubejs/server_scripts/ad_astra/recipes.js index 79270e13e..e700d283b 100644 --- a/kubejs/server_scripts/ad_astra/recipes.js +++ b/kubejs/server_scripts/ad_astra/recipes.js @@ -461,7 +461,8 @@ const registerAdAstraRecipes = (event) => { .itemOutputs('ad_astra:steel_trapdoor') .duration(100) .EUt(GTValues.VA[GTValues.LV]) - .addMaterialInfo(true, true) + + TFGHelpers.registerMaterialInfo('ad_astra:steel_trapdoor', [GTMaterials.Steel, 1, GTMaterials.Glass, 3/4, GTMaterials.Polyethylene, 1/4]) // Etrium only has factory block, encased block, plateblock, panel, and (storage) block diff --git a/kubejs/server_scripts/ad_astra/tags.js b/kubejs/server_scripts/ad_astra/tags.js index 51505ec41..4deefb95b 100644 --- a/kubejs/server_scripts/ad_astra/tags.js +++ b/kubejs/server_scripts/ad_astra/tags.js @@ -51,6 +51,10 @@ const registerAdAstraItemTags = (event) => { event.add('c:hidden_from_recipe_viewers', 'ad_astra:aeronos_mushroom') event.add('c:hidden_from_recipe_viewers', 'ad_astra:strophar_mushroom') + event.add('c:hidden_from_recipe_viewers', 'tfg:tier_3_double_rocket') + event.add('c:hidden_from_recipe_viewers', 'tfg:tier_4_double_rocket') + + // Deco blocks const DECO_BLOCKS = [ 'iron', 'steel', 'desh', 'calorite', 'ostrum' ]; DECO_BLOCKS.forEach(block => { @@ -68,6 +72,12 @@ const registerAdAstraItemTags = (event) => { event.add('tfg:ad_astra_etrium_blocks', 'ad_astra:etrium_plateblock') event.add('tfg:ad_astra_etrium_blocks', 'ad_astra:etrium_panel') + event.add('ad_astra:held_over_head', 'tfg:tier_1_double_rocket') + event.add('ad_astra:held_over_head', 'tfg:tier_2_double_rocket') + event.add('ad_astra:held_over_head', 'tfg:tier_3_double_rocket') + event.add('ad_astra:held_over_head', 'tfg:tier_4_double_rocket') + + global.AD_ASTRA_WOOD.forEach(wood => { if (wood.log) { diff --git a/kubejs/server_scripts/afc/recipes.js b/kubejs/server_scripts/afc/recipes.js index 1fcc394c8..9f385e5c7 100644 --- a/kubejs/server_scripts/afc/recipes.js +++ b/kubejs/server_scripts/afc/recipes.js @@ -89,7 +89,37 @@ const registerAFCRecipes = (event) => { }).id(`afc:crafting/wood/${wood}_stomping_barrel`) - }) + event.recipes.gtceu.lathe(`tfg:stripping_${wood}_log`) + .itemInputs(`afc:wood/log/${wood}`) + .itemOutputs(`afc:wood/stripped_log/${wood}`) + .duration(50) + .EUt(2) + + event.recipes.gtceu.lathe(`tfg:stripping_${wood}_wood`) + .itemInputs(`afc:wood/wood/${wood}`) + .itemOutputs(`afc:wood/stripped_wood/${wood}`) + .duration(50) + .EUt(2) + + 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.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`) + }); + + global.AFC_SAPLINGS.forEach(wood => { + event.shaped(`4x afc:wood/fallen_leaves/${wood.sapling}`,[ + 'AA', + 'AA' + ], { + A: `afc:wood/leaves/${wood.sapling}` + }).id(`tfg:shaped/afc/${wood.sapling}_leaves_to_fallen_leaves`); + }); // #endregion @@ -237,33 +267,6 @@ const registerAFCRecipes = (event) => { .outputItem('afc:birch_sugar') .id('tfg:barrel/birch_syrup_to_sugar') - - // Stripped logs - - global.AFC_WOOD_TYPES.forEach(wood => { - event.recipes.gtceu.lathe(`tfg:stripping_${wood}_log`) - .itemInputs(`afc:wood/log/${wood}`) - .itemOutputs(`afc:wood/stripped_log/${wood}`) - .duration(50) - .EUt(2) - - event.recipes.gtceu.lathe(`tfg:stripping_${wood}_wood`) - .itemInputs(`afc:wood/wood/${wood}`) - .itemOutputs(`afc:wood/stripped_wood/${wood}`) - .duration(50) - .EUt(2) - - 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.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 = [ { wood: 'black_oak', stripped: 'oak', stripped_mod: 'tfc' }, { wood: 'rainbow_eucalyptus', stripped: 'eucalyptus', stripped_mod: 'afc' }, diff --git a/kubejs/server_scripts/afc/tags.js b/kubejs/server_scripts/afc/tags.js index 771ed2740..016e998b6 100644 --- a/kubejs/server_scripts/afc/tags.js +++ b/kubejs/server_scripts/afc/tags.js @@ -69,21 +69,21 @@ const registerAFCItemTags = (event) => { event.add("tfg:rosin_logs", "#tfc:white_cedar_logs") event.add("tfg:rosin_logs", "#tfc:douglas_fir_logs") - event.add("tfg:rosin_saplings", 'tfc:wood/leaves/aspen') - event.add("tfg:rosin_saplings", 'afc:wood/leaves/coast_spruce') - event.add("tfg:rosin_saplings", 'tfc:wood/leaves/spruce') - event.add("tfg:rosin_saplings", 'afc:wood/leaves/black_spruce') - event.add("tfg:rosin_saplings", 'afc:wood/leaves/sitka_spruce') - event.add("tfg:rosin_saplings", 'tfc:wood/leaves/douglas_fir') - event.add("tfg:rosin_saplings", 'tfc:wood/leaves/white_cedar') + event.add("tfg:rosin_leaves", 'tfc:wood/leaves/aspen') + event.add("tfg:rosin_leaves", 'afc:wood/leaves/coast_spruce') + event.add("tfg:rosin_leaves", 'tfc:wood/leaves/spruce') + event.add("tfg:rosin_leaves", 'afc:wood/leaves/black_spruce') + event.add("tfg:rosin_leaves", 'afc:wood/leaves/sitka_spruce') + event.add("tfg:rosin_leaves", 'tfc:wood/leaves/douglas_fir') + event.add("tfg:rosin_leaves", 'tfc:wood/leaves/white_cedar') - event.add("tfg:rosin_leaves", 'tfc:wood/sapling/aspen') - event.add("tfg:rosin_leaves", 'afc:wood/sapling/coast_spruce') - event.add("tfg:rosin_leaves", 'tfc:wood/sapling/spruce') - event.add("tfg:rosin_leaves", 'afc:wood/sapling/black_spruce') - event.add("tfg:rosin_leaves", 'afc:wood/sapling/sitka_spruce') - event.add("tfg:rosin_leaves", 'tfc:wood/sapling/douglas_fir') - event.add("tfg:rosin_leaves", 'tfc:wood/sapling/white_cedar') + event.add("tfg:rosin_saplings", 'tfc:wood/sapling/aspen') + event.add("tfg:rosin_saplings", 'afc:wood/sapling/coast_spruce') + event.add("tfg:rosin_saplings", 'tfc:wood/sapling/spruce') + event.add("tfg:rosin_saplings", 'afc:wood/sapling/black_spruce') + event.add("tfg:rosin_saplings", 'afc:wood/sapling/sitka_spruce') + event.add("tfg:rosin_saplings", 'tfc:wood/sapling/douglas_fir') + event.add("tfg:rosin_saplings", 'tfc:wood/sapling/white_cedar') // Maple Syrup Tag diff --git a/kubejs/server_scripts/beneath/recipes.js b/kubejs/server_scripts/beneath/recipes.js index b7036a19b..e5182c117 100644 --- a/kubejs/server_scripts/beneath/recipes.js +++ b/kubejs/server_scripts/beneath/recipes.js @@ -85,4 +85,18 @@ const registerBeneathRecipes = (event) => { C: 'beneath:wood/planks/warped', D: 'beneath:wood/log/warped' }).id('tfg:shaped/warped_sewing_table') + + event.shaped(`4x beneath:wood/fallen_leaves/crimson`,[ + 'AA', + 'AA' + ], { + A: `beneath:wood/leaves/crimson` + }).id(`tfg:shaped/beneath/crimson_leaves_to_fallen_leaves`); + + event.shaped(`4x beneath:wood/fallen_leaves/warped`,[ + 'AA', + 'AA' + ], { + A: `beneath:wood/leaves/warped` + }).id(`tfg:shaped/beneath/warped_leaves_to_fallen_leaves`); } \ No newline at end of file diff --git a/kubejs/server_scripts/create/recipes.js b/kubejs/server_scripts/create/recipes.js index 864673961..9dfed7c04 100644 --- a/kubejs/server_scripts/create/recipes.js +++ b/kubejs/server_scripts/create/recipes.js @@ -58,7 +58,10 @@ const registerCreateRecipes = (event) => { // Remove Table Cloth recipes global.MINECRAFT_DYE_NAMES.forEach(dye => { - event.remove([{ id: `create:crafting/logistics/${dye}_table_cloth` }, { id: `create:crafting/logistics/${dye}_table_cloth_from_other_table_cloth` }]) + event.remove([ + { id: `create:crafting/logistics/${dye}_table_cloth` }, + { id: `create:crafting/logistics/${dye}_table_cloth_from_other_table_cloth` } + ]) }) event.remove({ type: 'minecraft:stonecutting', input: 'create:andesite_alloy' }) @@ -1412,17 +1415,21 @@ const registerCreateRecipes = (event) => { event.remove({ id: `create:create.toolbox.color.block.create.${dye}_toolbox` }) event.recipes.tfc.barrel_sealed(1000) - .inputs('create:brown_toolbox', Fluid.of(`tfc:${dye}_dye`, 288)) - .outputItem(`create:${dye}_toolbox`) + .inputs('#create:toolboxes', Fluid.of(`tfc:${dye}_dye`, 288)) + .outputItem(TFC.isp.of(`create:${dye}_toolbox`).simpleModifier('tfg:copy_nbt').asCanonClass()) .id(`barrel/create/${dye}_toolbox`) - event.recipes.gtceu.chemical_bath(`create/${dye}_toolbox`) - .itemInputs('create:brown_toolbox') + event.recipes.gtceu.food_processor(`create/${dye}_toolbox`) + .itemInputs('#create:toolboxes') .inputFluids(Fluid.of(`tfc:${dye}_dye`, 288)) .itemOutputs(`create:${dye}_toolbox`) .duration(200) .EUt(4) - .category(GTRecipeCategories.CHEM_DYES) + + $ISPRecipeLogic.RegisterRecipeData(`food_processor/create/${dye}_toolbox`, + [Ingredient.of('#create:toolboxes')], + TFC.isp.of(`create:${dye}_toolbox`).simpleModifier('tfg:copy_nbt').asCanonClass(), + []) } }) diff --git a/kubejs/server_scripts/create_additions/recipes.js b/kubejs/server_scripts/create_additions/recipes.js index 5ba0b86fc..81c14d48b 100644 --- a/kubejs/server_scripts/create_additions/recipes.js +++ b/kubejs/server_scripts/create_additions/recipes.js @@ -9,11 +9,11 @@ const registerCreateAdditionsRecipes = (event) => { // ПŅ€ÐūКаŅ‚Ð―Ņ‹Ðđ ŅŅ‚Ð°Ð― event.recipes.gtceu.shaped('createaddition:rolling_mill', [ 'ABA', - 'CBC', - 'DED' + 'CEC', + 'DBD' ], { A: 'create:precision_mechanism', - B: 'greate:steel_shaft', + B: '#forge:rods/long/blue_steel', C: '#forge:double_plates/black_steel', D: '#gtceu:circuits/ulv', E: 'gtceu:ulv_machine_hull' diff --git a/kubejs/server_scripts/create_connected/recipes.js b/kubejs/server_scripts/create_connected/recipes.js index 737d75bb7..258e30fe0 100644 --- a/kubejs/server_scripts/create_connected/recipes.js +++ b/kubejs/server_scripts/create_connected/recipes.js @@ -71,4 +71,16 @@ const registerCreateConnectedRecipes = (event) => { }).id('create_connected:crafting/kinetics/sequenced_pulse_generator') event.replaceInput({ id: 'create_connected:crafting/kinetics/redstone_link_wildcard' }, 'create:transmitter', 'minecraft:redstone_torch') + + event.shaped('create_connected:kinetic_bridge', [ + 'BCB', + 'AEA', + 'DCD' + ], { + A: 'create:brass_casing', + B: '#forge:plates/magnetic_iron', + C: '#forge:rods/magnetic_iron', + D: '#forge:small_gears/red_alloy', + E: '#forge:shafts' + }).id('create_connected:crafting/kinetics/kinetic_bridge') } \ No newline at end of file diff --git a/kubejs/server_scripts/create_stock_bridge/recipes.js b/kubejs/server_scripts/create_stock_bridge/recipes.js index 4cfa8fddd..6cce7de17 100644 --- a/kubejs/server_scripts/create_stock_bridge/recipes.js +++ b/kubejs/server_scripts/create_stock_bridge/recipes.js @@ -1,17 +1,17 @@ -"use strict"; +//"use strict"; -function registerCreateStockBridgeRecipes(event) { +//function registerCreateStockBridgeRecipes(event) { - event.remove({ id: 'createstockbridge:ae_bridge' }) +// event.remove({ id: 'createstockbridge:ae_bridge' }) - event.shaped('createstockbridge:ae_bridge', [ - 'ACF', - 'DBD' - ], { - A: 'ae2:fluix_pearl', - B: 'ae2:interface', - C: 'create:stock_link', - D: 'ae2:engineering_processor', - F: '#forge:exquisite_gems/rose_quartz' - }) -} \ No newline at end of file +// event.shaped('createstockbridge:ae_bridge', [ +// 'ACF', +// 'DBD' +// ], { +// A: 'ae2:fluix_pearl', +// B: 'ae2:interface', +// C: 'create:stock_link', +// D: 'ae2:engineering_processor', +// F: '#forge:exquisite_gems/rose_quartz' +// }) +//} \ No newline at end of file diff --git a/kubejs/server_scripts/createdeco/recipes.js b/kubejs/server_scripts/createdeco/recipes.js index ff015f84f..bf47b6af5 100644 --- a/kubejs/server_scripts/createdeco/recipes.js +++ b/kubejs/server_scripts/createdeco/recipes.js @@ -138,7 +138,7 @@ const registerCreatedecoRecipes = (event) => { //#endregion //#region Brick Recipes - const dyeTypes = ['blue', 'green', 'white', 'yellow', 'black', 'red', 'brown'] + const dyeTypes = ['black', 'red', 'gray', 'green', 'blue', 'white', 'brown'] global.CREATE_DECO_BRICK_TYPES.forEach((type, index) => { event.remove({ output: `createdeco:${type}_bricks` }); diff --git a/kubejs/server_scripts/exposure/recipes.js b/kubejs/server_scripts/exposure/recipes.js index 3bb130821..b524e344b 100644 --- a/kubejs/server_scripts/exposure/recipes.js +++ b/kubejs/server_scripts/exposure/recipes.js @@ -67,25 +67,25 @@ const registerExposureRecipes = (event) => { // Creating the developer // Pyrogallol - event.recipes.tfc.pot(['tfc:powder/saltpeter'], Fluid.of('tfc:tannin', 500), 30 * 20, 750) + event.recipes.tfc.pot(['tfc:powder/saltpeter'], Fluid.of('tfc:tannin', 500), 30 * 20, 650) .itemOutput('tfg:pyrogallol_dust') .id('tfg:pot/tannin_to_pyrogallol_saltpeter') - event.recipes.tfc.pot(['tfc:powder/soda_ash'], Fluid.of('tfc:tannin', 500), 30 * 20, 750) + event.recipes.tfc.pot(['tfc:powder/soda_ash'], Fluid.of('tfc:tannin', 500), 30 * 20, 650) .itemOutput('tfg:pyrogallol_dust') .id('tfg:pot/tannin_to_pyrogallol_soda_ash') event.recipes.firmalife.vat() .inputs('tfc:powder/saltpeter', Fluid.of('tfc:tannin', 500)) .length(30 * 20) - .temperature(750) + .temperature(650) .outputItem('tfg:pyrogallol_dust') .id('tfg:vat/tannin_to_pyrogallol_saltpeter') event.recipes.firmalife.vat() .inputs('tfc:powder/soda_ash', Fluid.of('tfc:tannin', 500)) .length(30 * 20) - .temperature(750) + .temperature(650) .outputItem('tfg:pyrogallol_dust') .id('tfg:vat/tannin_to_soda_ash') @@ -104,7 +104,7 @@ const registerExposureRecipes = (event) => { .EUt(7) // Developer - event.recipes.tfc.pot(['#forge:dusts/pyrogallol', 'tfc:powder/soda_ash', 'tfc:powder/sulfur', '#exposure:black_printing_dyes'], Fluid.of('tfc:lye', 1000), 30 * 20, 750) + event.recipes.tfc.pot(['#forge:dusts/pyrogallol', 'tfc:powder/soda_ash', 'tfc:powder/sulfur', '#exposure:black_printing_dyes'], Fluid.of('tfc:lye', 1000), 30 * 20, 550) .fluidOutput(Fluid.of('tfg:bw_photographic_developer', 1000)) .id('tfg:pot/bw_developer') diff --git a/kubejs/server_scripts/firmalife/recipes.js b/kubejs/server_scripts/firmalife/recipes.js index 49e4e1ec5..e1e4ba600 100644 --- a/kubejs/server_scripts/firmalife/recipes.js +++ b/kubejs/server_scripts/firmalife/recipes.js @@ -200,6 +200,8 @@ const registerFirmaLifeRecipes = (event) => { .category(GTRecipeCategories.INGOT_MOLDING) event.replaceInput({ id: 'firmalife:crafting/bottle_label' }, 'firmalife:beeswax', '#forge:wax') + + event.shapeless('firmalife:fruit_leaf', ['#tfc:fruit_tree_leaves']).id('tfg:shapeless/firmalife/fruit_leaf_from_fruit_leaves'); //#endregion diff --git a/kubejs/server_scripts/firmalife/tags.js b/kubejs/server_scripts/firmalife/tags.js index 307bc6230..2264a45d2 100644 --- a/kubejs/server_scripts/firmalife/tags.js +++ b/kubejs/server_scripts/firmalife/tags.js @@ -22,6 +22,11 @@ const registerFirmaLifeItemTags = (event) => { .map(fruit => fruit.id) .filter(fruit => fruit !== 'betterend:shadow_berry_cooked' && fruit !== 'minecraft:popped_chorus_fruit') .forEach(fruit => event.add('tfg:dried_fruit', fruit)) + + event.add('tfc:fruit_tree_leaves', 'firmalife:plant/cocoa_leaves') + event.add('tfc:fruit_tree_leaves', 'firmalife:plant/fig_leaves') + event.add('minecraft:leaves', 'firmalife:plant/cocoa_leaves') + event.add('minecraft:leaves', 'firmalife:plant/fig_leaves') } const registerFirmaLifeBlockTags = (event) => { diff --git a/kubejs/server_scripts/framed_blocks/recipes.js b/kubejs/server_scripts/framed_blocks/recipes.js index 571a8438b..86807a155 100644 --- a/kubejs/server_scripts/framed_blocks/recipes.js +++ b/kubejs/server_scripts/framed_blocks/recipes.js @@ -385,6 +385,13 @@ const registerFramedBlocksRecipes = (event) => { A: '#minecraft:planks', B: '#forge:rods/wooden' }).id('framedblocks:framed_cube') + + event.recipes.gtceu.assembler('tfg:assembler/framedblocks/framed_cube') + .itemInputs('4x #minecraft:planks', '4x #forge:rods/wooden') + .circuit(8) + .itemOutputs('framedblocks:framed_cube') + .duration(40) + .EUt(GTValues.VA[GTValues.ULV]) // Framed Fence event.shaped('3x framedblocks:framed_fence', [ diff --git a/kubejs/server_scripts/greate/recipes.js b/kubejs/server_scripts/greate/recipes.js index aa6173590..bac53d5ba 100644 --- a/kubejs/server_scripts/greate/recipes.js +++ b/kubejs/server_scripts/greate/recipes.js @@ -674,7 +674,7 @@ function registerGreateRecipes(event) { removeMaceratorRecipe(event, 'macerate_stone_belt_connector') event.remove({ id: 'greate:shaped/stone_belt_connector' }) - TFGHelpers.registerMaterialInfo('greate:stone_belt_connector', [GTMaterials.Air, 1]); + TFGHelpers.clearMaterialInfo('greate:stone_belt_connector'); // Rubber event.shaped('greate:rubber_belt_connector', [ @@ -757,7 +757,7 @@ function registerGreateRecipes(event) { 'FEG' ], { A: '#gtceu:circuits/ulv', - B: 'greate:steel_shaft', + B: '#forge:small_gears/blue_steel', C: 'gtceu:ulv_machine_hull', D: '#forge:plates/black_steel', E: 'gtceu:steel_whisk', @@ -766,7 +766,7 @@ function registerGreateRecipes(event) { }).id('greate:shaped/steel_mechanical_mixer') event.recipes.gtceu.assembler('greate:steel_mechanical_mixer') - .itemInputs('greate:steel_shaft', '2x #gtceu:circuits/ulv', 'gtceu:ulv_machine_hull', 'gtceu:steel_whisk', '2x #forge:plates/black_steel') + .itemInputs('#forge:small_gears/blue_steel', '2x #gtceu:circuits/ulv', 'gtceu:ulv_machine_hull', 'gtceu:steel_whisk', '2x #forge:plates/black_steel') .itemOutputs('greate:steel_mechanical_mixer') .duration(200) .EUt(GTValues.VA[GTValues.ULV]) diff --git a/kubejs/server_scripts/greate/recipes.removes.js b/kubejs/server_scripts/greate/recipes.removes.js index 1c267e4cb..fbac8a351 100644 --- a/kubejs/server_scripts/greate/recipes.removes.js +++ b/kubejs/server_scripts/greate/recipes.removes.js @@ -9,6 +9,7 @@ function removeGreateRecipes(event) { global.GREATE_DISABLED_ITEMS.forEach(item => { event.remove({ input: item }) event.remove({ output: item }) + TFGHelpers.clearMaterialInfo(item); }) global.GREATE_DISABLED_FLUIDS.forEach(fluid => { @@ -78,8 +79,55 @@ function removeGreateRecipes(event) { event.remove({ id: 'greate:cutting/integration/create/cutting/runtime_generated/compat/minecraft/bamboo_planks_to_bamboo_button' }) event.remove({ id: 'greate:mixing/integration/gtceu/mixer/fire_charge' }) - event.remove({ id: 'toomanyrecipeviewers:/greate/milling/integration/gtceu/macerator/macerate_cocoa' }) + event.remove({ id: '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' }) + + event.remove({ id: 'greate:mixing/brass_ingot' }) + event.remove({ id: /^greate:.*\/integration\/createaddition/ }) + event.remove({ id: /^greate:.*\/integration\/vintageimprovements/ }) + + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_phosphorus_boule' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_phosphorus_boule_water' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_phosphorus_boule_distilled_water' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_naquadah_boule' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_naquadah_boule_water' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_naquadah_boule_distilled_water' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_neutronium_boule' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_neutronium_boule_water' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_neutronium_boule_distilled_water' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_nano_cpu' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_nano_cpu_water' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_nano_cpu_distilled_water' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_qbit_cpu' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_qbit_cpu_water' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_qbit_cpu_distilled_water' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_soc' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_soc_water' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_soc_distilled_water' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_asoc' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_asoc_water' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_asoc_distilled_water' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_hasoc' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_hasoc_water' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_hasoc_distilled_water' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_nand' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_nand_water' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_nand_distilled_water' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_nor' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_nor_water' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_nor_distilled_water' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_lpic_wafer' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_lpic_wafer_water' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_lpic_wafer_distilled_water' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_pic_wafer' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_pic_wafer_water' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_pic_wafer_distilled_water' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_hpic' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_hpic_water' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_hpic_distilled_water' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_uhpic' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_uhpic_water' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_uhpic_distilled_water' }) } diff --git a/kubejs/server_scripts/gregtech/data.js b/kubejs/server_scripts/gregtech/data.js index 3197bcd1b..1d6e88e13 100644 --- a/kubejs/server_scripts/gregtech/data.js +++ b/kubejs/server_scripts/gregtech/data.js @@ -45,6 +45,7 @@ const registerGTCEUHeats = (event) => { makeItemHeatByTagPrefix(TagPrefix.plateDouble, material, tfcProperty, 5.75) makeItemHeatByTagPrefix(TagPrefix.springSmall, material, tfcProperty, 0.567) makeItemHeatByTagPrefix(TagPrefix.spring, material, tfcProperty, 1.429) + makeItemHeatByTagPrefix(TagPrefix.ring, material, tfcProperty, 0.567) makeItemHeatByTagPrefix(TagPrefix.ingot, material, tfcProperty, 1.429) makeItemHeatByTagPrefix(TFGTagPrefix.ingotDouble, material, tfcProperty, 2.875) @@ -59,7 +60,11 @@ const registerGTCEUHeats = (event) => { makeItemHeatByTagPrefix(TagPrefix.crushed, material, tfcProperty, 1.429) makeItemHeatByTagPrefix(TagPrefix.crushedPurified, material, tfcProperty, 1.429) makeItemHeatByTagPrefix(TagPrefix.crushedRefined, material, tfcProperty, 1.429) - + + makeItemHeatByTagPrefix(TagPrefix.toolHeadWrench, material, tfcProperty, 2.875) + makeItemHeatByTagPrefix(TagPrefix.toolHeadBuzzSaw, material, tfcProperty, 2.875) + makeItemHeatByTagPrefix(TagPrefix.toolHeadScrewdriver, material, tfcProperty, 1.429) + makeItemHeatByTagPrefix(TagPrefix.toolHeadWireCutter, material, tfcProperty, 1.429) makeItemHeatByTagPrefix(TFGTagPrefix.toolHeadSword, material, tfcProperty, 2.875) makeItemHeatByTagPrefix(TFGTagPrefix.toolHeadShovel, material, tfcProperty, 1.429) makeItemHeatByTagPrefix(TFGTagPrefix.toolHeadScythe, material, tfcProperty, 1.429) @@ -70,7 +75,7 @@ const registerGTCEUHeats = (event) => { makeItemHeatByTagPrefix(TFGTagPrefix.toolHeadHammer, material, tfcProperty, 1.429) makeItemHeatByTagPrefix(TFGTagPrefix.toolHeadAxe, material, tfcProperty, 1.429) makeItemHeatByTagPrefix(TFGTagPrefix.toolHeadFile, material, tfcProperty, 1.429) - makeItemHeatByTagPrefix(TFGTagPrefix.toolHeadButcheryKnife, material, tfcProperty, 2.875) + makeItemHeatByTagPrefix(TFGTagPrefix.toolHeadButcheryKnife, material, tfcProperty, 1.429) makeItemHeatByTagPrefix(TFGTagPrefix.toolHeadMiningHammer, material, tfcProperty, 2.875) makeItemHeatByTagPrefix(TFGTagPrefix.toolHeadSpade, material, tfcProperty, 2.875) diff --git a/kubejs/server_scripts/gregtech/recipes.js b/kubejs/server_scripts/gregtech/recipes.js index cc007dfc9..5aa507f5f 100644 --- a/kubejs/server_scripts/gregtech/recipes.js +++ b/kubejs/server_scripts/gregtech/recipes.js @@ -79,7 +79,9 @@ const registerGTCEURecipes = (event) => { //#endregion - // #region Move MV superconductor to mid-late MV instead of post-vac freezer + // #region Superconductor + + // Move MV superconductor to mid-late MV instead of post-vac freezer event.remove({ id: 'gtceu:shaped/mv_chemical_bath' }) event.shaped('gtceu:mv_chemical_bath', [ @@ -111,6 +113,32 @@ const registerGTCEURecipes = (event) => { .duration(400) .EUt(GTValues.VA[GTValues.MV]) + // Move EV to after Uranium Reactor + + event.remove({ id: 'gtceu:mixer/uranium_triplatinum' }) + event.recipes.gtceu.mixer('tfg:uranium_triplatinum') + .itemInputs(Item.of('gtceu:uranium_dust', 1), Item.of('gtceu:platinum_dust', 3)) + .inputFluids(Fluid.of('gtceu:radon', 10)) + .itemOutputs(Item.of('gtceu:uranium_triplatinum_dust', 4)) + .duration(20*10) + .EUt(GTValues.VA[GTValues.EV]) + .circuit(4) + + // Move Superconductor to EV and make them cheap + + event.remove({ id: 'gtceu:assembler/laser_cable' }) + event.recipes.gtceu.assembler('tfg:laser_cable') + .itemInputs(Item.of('gtceu:laminated_glass', 1), Item.of('2x #forge:foils/ostrum_iodide', 2)) + .itemOutputs(Item.of('gtceu:normal_laser_pipe', 16)) + .inputFluids(Fluid.of('gtceu:polytetrafluoroethylene', 144)) + .duration(20*5) + .EUt(GTValues.VA[GTValues.EV]) + .cleanroom(CleanroomType.CLEANROOM) + + TFGHelpers.registerMaterialInfo('gtceu:normal_laser_pipe', [GTMaterials.Air, 1]) + event.remove({ id: 'gtceu:arc_furnace/arc_normal_laser_pipe' }) + removeMaceratorRecipe(event, 'macerate_normal_laser_pipe') + // #endregion //#region Voiding covers @@ -413,4 +441,17 @@ const registerGTCEURecipes = (event) => { .itemOutputs('tfg:paracetamol_pill') .duration(3 * 20) .EUt(GTValues.VA[GTValues.LV]) + + // Glass lens + event.recipes.gtceu.lathe('tfg:gt_glass_lens') + .itemInputs('#forge:plates/glass') + .itemOutputs('#forge:lenses/glass', '#forge:small_dusts/glass') + .duration(60 * 20) + .EUt(GTValues.VA[GTValues.MV]) + + // Magnetic iron + event.shapeless('gtceu:magnetic_iron_ingot', ['#forge:ingots/iron', '8x minecraft:redstone']) + event.shapeless('gtceu:magnetic_iron_plate', ['#forge:plates/iron', '8x minecraft:redstone']) + event.shapeless('gtceu:magnetic_iron_bolt', ['#forge:bolts/iron', '2x minecraft:redstone']) + } diff --git a/kubejs/server_scripts/gregtech/recipes.machines.js b/kubejs/server_scripts/gregtech/recipes.machines.js index 17f880fdb..89709a1e6 100644 --- a/kubejs/server_scripts/gregtech/recipes.machines.js +++ b/kubejs/server_scripts/gregtech/recipes.machines.js @@ -5,7 +5,7 @@ * @param {Internal.RecipesEventJS} event */ function registerGTCEuMachineRecipes(event) { - //#region ВŅ‹Ņ…ÐūÐī: Filter Casing + // Filter Casing event.shaped('gtceu:filter_casing', [ 'AAA', @@ -19,9 +19,7 @@ function registerGTCEuMachineRecipes(event) { E: '#forge:rotors/steel' }).id('gtceu:shaped/filter_casing') - //#endregion - - //#region ВŅ‹Ņ…ÐūÐī: Assembly Line Grating + // Assembly Line Grating event.shaped('2x gtceu:assembly_line_grating', [ 'ABA', @@ -34,9 +32,7 @@ function registerGTCEuMachineRecipes(event) { D: 'gtceu:mv_electric_motor' }).id('gtceu:shaped/casing_grate_casing') - //#endregion - - //#region Gas Collectors + // #region Gas Collectors event.shaped('gtceu:lv_gas_collector', [ 'ABA', @@ -133,10 +129,9 @@ function registerGTCEuMachineRecipes(event) { D: '#gtceu:circuits/uv', E: 'gtceu:uv_machine_hull' }).id('gtceu:shaped/uv_gas_collector') + // #endregion - //#endregion - - //#region Forge Hammers + // #region Forge Hammers event.shaped('gtceu:lv_forge_hammer', [ 'ABA', @@ -233,10 +228,9 @@ function registerGTCEuMachineRecipes(event) { D: 'gtceu:uv_machine_hull', E: '#tfc:red_or_blue_anvil', }).id('gtceu:shaped/uv_forge_hammer') + // #endregion - //#endregion - - //#region CokeOven + // #region Coke Oven event.remove({ id: 'gtceu:shaped/casing_coke_bricks' }) event.remove({ id: 'gtceu:compressor/coke_bricks' }) @@ -257,7 +251,6 @@ function registerGTCEuMachineRecipes(event) { .duration(50) .EUt(2); - // Coke Oven removeMaceratorRecipe(event, 'macerate_coke_oven') event.recipes.gtceu.shaped('gtceu:coke_oven', [ 'ABA', @@ -287,15 +280,12 @@ function registerGTCEuMachineRecipes(event) { A: 'gtceu:coke_oven_bricks', B: '#forge:chests/wooden' }).addMaterialInfo().id('gtceu:shaped/coke_oven_hatch') - //#endregion - //#region ВŅ‹Ņ…ÐūÐī: ÐĄŅ‚аÐŧŅŒÐ―Ņ‹Ðĩ ОаŅˆÐļÐ―Ņ‹ - // HP Steam Boilers removeMaceratorRecipe(event, 'macerate_hp_steam_solid_boiler') event.recipes.gtceu.shaped('gtceu:hp_steam_solid_boiler', [ - 'AEA', + 'FEF', 'ADA', 'BCB' ], { @@ -303,12 +293,13 @@ function registerGTCEuMachineRecipes(event) { B: ChemicalHelper.get(TagPrefix.pipeSmallFluid, GTMaterials.TinAlloy, 1), C: 'gtceu:steel_brick_casing', D: 'tfc:crucible', - E: ChemicalHelper.get(TagPrefix.rod, GTMaterials.BlackSteel, 1) + E: ChemicalHelper.get(TagPrefix.plate, GTMaterials.BlackSteel, 1), + F: ChemicalHelper.get(TagPrefix.rod, GTMaterials.Steel, 1) }).addMaterialInfo().id('gtceu:shaped/steam_boiler_coal_steel') removeMaceratorRecipe(event, 'macerate_hp_steam_liquid_boiler') event.recipes.gtceu.shaped('gtceu:hp_steam_liquid_boiler', [ - 'AEA', + 'FEF', 'ADA', 'BCB' ], { @@ -316,7 +307,8 @@ function registerGTCEuMachineRecipes(event) { B: ChemicalHelper.get(TagPrefix.pipeSmallFluid, GTMaterials.TinAlloy, 1), C: 'gtceu:steel_brick_casing', D: '#forge:glass', - E: ChemicalHelper.get(TagPrefix.rod, GTMaterials.BlackSteel, 1) + E: ChemicalHelper.get(TagPrefix.plate, GTMaterials.BlackSteel, 1), + F: ChemicalHelper.get(TagPrefix.rod, GTMaterials.Steel, 1) }).addMaterialInfo().id('gtceu:shaped/steam_boiler_lava_steel') removeMaceratorRecipe(event, 'macerate_hp_steam_solar_boiler') @@ -327,12 +319,13 @@ function registerGTCEuMachineRecipes(event) { ], { A: '#forge:glass_panes', B: ChemicalHelper.get(TagPrefix.plateDouble, GTMaterials.Silver, 1), - C: ChemicalHelper.get(TagPrefix.rod, GTMaterials.BlackSteel, 1), + C: ChemicalHelper.get(TagPrefix.plate, GTMaterials.BlackSteel, 1), D: 'gtceu:steel_brick_casing', E: ChemicalHelper.get(TagPrefix.pipeSmallFluid, GTMaterials.TinAlloy, 1), }).addMaterialInfo().id('gtceu:shaped/steam_boiler_solar_steel') - // ЭКŅŅ‚Ņ€Ð°ÐšŅ‚ÐūŅ€ + // #region Other steam machines + removeMaceratorRecipe(event, 'macerate_hp_steam_extractor') event.recipes.gtceu.shaped('gtceu:hp_steam_extractor', [ 'BEB', @@ -347,7 +340,6 @@ function registerGTCEuMachineRecipes(event) { F: ChemicalHelper.get(TagPrefix.ring, GTMaterials.BlackSteel, 1) }).addMaterialInfo().id('gtceu:shaped/steam_extractor_steel') - // ДŅ€ÐūÐąÐļŅ‚ÐĩÐŧŅŒ removeMaceratorRecipe(event, 'macerate_hp_steam_macerator') event.recipes.gtceu.shaped('gtceu:hp_steam_macerator', [ 'BFB', @@ -362,7 +354,6 @@ function registerGTCEuMachineRecipes(event) { F: '#forge:raw_materials/diamond' }).addMaterialInfo().id('gtceu:shaped/steam_macerator_steel') - // КÐūОÐŋŅ€ÐĩŅŅÐūŅ€ removeMaceratorRecipe(event, 'macerate_hp_steam_compressor') event.recipes.gtceu.shaped('gtceu:hp_steam_compressor', [ 'BCB', @@ -374,10 +365,9 @@ function registerGTCEuMachineRecipes(event) { C: ChemicalHelper.get(TagPrefix.plate, GTMaterials.Steel, 1), D: ChemicalHelper.get(TagPrefix.plate, GTMaterials.WroughtIron, 1), E: 'minecraft:piston', - F: ChemicalHelper.get(TagPrefix.rod, GTMaterials.BlackSteel, 1) + F: ChemicalHelper.get(TagPrefix.ingot, GTMaterials.BlackSteel, 1) }).addMaterialInfo().id('gtceu:shaped/steam_compressor_steel') - // МÐūÐŧÐūŅ‚ removeMaceratorRecipe(event, 'macerate_hp_steam_forge_hammer') event.recipes.gtceu.shaped('gtceu:hp_steam_forge_hammer', [ 'DFD', @@ -392,7 +382,6 @@ function registerGTCEuMachineRecipes(event) { F: 'minecraft:piston' }).addMaterialInfo().id('gtceu:shaped/steam_hammer_steel') - // ПÐĩŅ‡ŅŒ removeMaceratorRecipe(event, 'macerate_hp_steam_furnace') event.recipes.gtceu.shaped('gtceu:hp_steam_furnace', [ 'BCB', @@ -406,7 +395,6 @@ function registerGTCEuMachineRecipes(event) { F: ChemicalHelper.get(TagPrefix.rod, GTMaterials.BlackSteel, 1) }).addMaterialInfo().id('gtceu:shaped/steam_furnace_steel') - // ÐĄÐŋÐŧаÐēŅ‰ÐļК removeMaceratorRecipe(event, 'macerate_hp_steam_alloy_smelter') event.recipes.gtceu.shaped('gtceu:hp_steam_alloy_smelter', [ 'FCF', @@ -420,7 +408,6 @@ function registerGTCEuMachineRecipes(event) { F: ChemicalHelper.get(TagPrefix.rod, GTMaterials.BlackSteel, 1) }).addMaterialInfo().id('gtceu:shaped/steam_alloy_smelter_steel') - // БÐŧÐūКÐū-ÐŧÐūОаŅ‚ÐĩÐŧŅŒ removeMaceratorRecipe(event, 'macerate_hp_steam_rock_crusher') event.recipes.gtceu.shaped('gtceu:hp_steam_rock_crusher', [ 'ECE', @@ -432,9 +419,9 @@ function registerGTCEuMachineRecipes(event) { C: '#forge:drill_heads', D: ChemicalHelper.get(TagPrefix.rod, GTMaterials.WroughtIron, 1), E: ChemicalHelper.get(TagPrefix.screw, GTMaterials.WroughtIron, 1) - }).addMaterialInfo().id('gtceu:shaped/steam_rock_breaker_steel') + }).id('gtceu:shaped/steam_rock_breaker_steel') + TFGHelpers.registerMaterialInfo('gtceu:hp_steam_rock_crusher', [GTMaterials.WroughtIron, 6.5, GTMaterials.TinAlloy, 2]) - // Miner removeMaceratorRecipe(event, 'macerate_hp_steam_miner') event.recipes.gtceu.shaped('gtceu:hp_steam_miner', [ 'EFE', @@ -447,11 +434,12 @@ function registerGTCEuMachineRecipes(event) { D: ChemicalHelper.get(TagPrefix.rod, GTMaterials.Steel, 1), E: ChemicalHelper.get(TagPrefix.plate, GTMaterials.WroughtIron, 1), F: '#gtceu:circuits/ulv' - }).addMaterialInfo().id('gtceu:shaped/steam_miner_steel') + }).id('gtceu:shaped/steam_miner_steel') + TFGHelpers.registerMaterialInfo('gtceu:hp_steam_miner', [GTMaterials.WroughtIron, 7, GTMaterials.Steel, 1, GTMaterials.TinAlloy, 2]) //#endregion - //#region passthrough hatches + //#region Passthrough hatches event.recipes.gtceu.shaped('gtceu:lv_item_passthrough_hatch', [ ' A ', 'BCB', @@ -623,6 +611,8 @@ function registerGTCEuMachineRecipes(event) { //#region ULV Hatches + event.replaceInput({ id: 'gtceu:shaped/ulv_machine_hull' }, '#forge:plates/wood', '#forge:plates/lead') + event.recipes.gtceu.shaped('gtceu:ulv_input_bus', [ 'CAC', 'CBC', diff --git a/kubejs/server_scripts/gregtech/recipes.removes.js b/kubejs/server_scripts/gregtech/recipes.removes.js index 6c780ab13..c218a3c6e 100644 --- a/kubejs/server_scripts/gregtech/recipes.removes.js +++ b/kubejs/server_scripts/gregtech/recipes.removes.js @@ -12,6 +12,7 @@ function removeGTCEURecipes(event) { global.GTCEU_DISABLED_ITEMS.forEach(item => { event.remove({ input: item }) event.remove({ output: item }) + TFGHelpers.clearMaterialInfo(item); }) //#region ВŅ‹Ņ…ÐūÐī: КŅ€ÐūŅˆÐĩŅ‡Ð―аŅ КŅƒŅ‡ÐšÐ° ÐšÐ°ÐžÐ―Ņ @@ -30,10 +31,8 @@ function removeGTCEURecipes(event) { removeMaceratorRecipe(event, 'macerate_sandstone_slab') removeMaceratorRecipe(event, 'macerate_red_sandstone_stairs') removeMaceratorRecipe(event, 'macerate_red_sandstone_slab') - removeMaceratorRecipe(event, 'macerate_granite') - removeMaceratorRecipe(event, 'macerate_diorite') removeMaceratorRecipe(event, 'macerate_cobblestone_slab') - removeMaceratorRecipe(event, 'macerate_andesite') + event.remove({ id: 'gtceu:shaped/stone_hammer' }) event.remove({ id: 'gtceu:mixer/mossy_cobblestone_from_moss_block' }) event.remove({ id: 'greate:mixing/integration/gtceu/mixer/mossy_cobblestone_from_moss_block' }) @@ -113,8 +112,18 @@ function removeGTCEURecipes(event) { removeCutterRecipe(event, 'cut_deepslate_tile_into_slab_water') removeCutterRecipe(event, 'cut_deepslate_tile_into_slab_distilled_water') - removeMaceratorRecipe(event, 'macerate_deepslate') event.remove({ id: 'gtceu:rock_breaker/deepslate' }) + TFGHelpers.clearMaterialInfo('minecraft:deepslate') + TFGHelpers.clearMaterialInfo('minecraft:deepslate_wall'); + TFGHelpers.clearMaterialInfo('minecraft:polished_deepslate'); + TFGHelpers.clearMaterialInfo('minecraft:cobbled_deepslate'); + TFGHelpers.clearMaterialInfo('minecraft:cobbled_deepslate_wall'); + TFGHelpers.clearMaterialInfo('minecraft:chiseled_deepslate'); + TFGHelpers.clearMaterialInfo('minecraft:polished_deepslate_wall'); + TFGHelpers.clearMaterialInfo('minecraft:deepslate_bricks'); + TFGHelpers.clearMaterialInfo('minecraft:deepslate_brick_wall'); + TFGHelpers.clearMaterialInfo('minecraft:deepslate_tiles'); + TFGHelpers.clearMaterialInfo('minecraft:deepslate_tile_wall'); // #endregion @@ -159,6 +168,14 @@ function removeGTCEURecipes(event) { removeCutterRecipe(event, 'cut_polished_blackstone_brick_into_slab_distilled_water') event.remove({ id: 'gtceu:rock_breaker/blackstone' }) + TFGHelpers.clearMaterialInfo('minecraft:blackstone'); + TFGHelpers.clearMaterialInfo('minecraft:polished_blackstone'); + TFGHelpers.clearMaterialInfo('minecraft:polished_blackstone_bricks'); + TFGHelpers.clearMaterialInfo('minecraft:polished_blackstone_brick_wall'); + TFGHelpers.clearMaterialInfo('minecraft:chiseled_polished_blackstone'); + TFGHelpers.clearMaterialInfo('minecraft:blackstone_wall'); + TFGHelpers.clearMaterialInfo('minecraft:polished_blackstone_wall'); + TFGHelpers.clearMaterialInfo('minecraft:blackstone_brick_wall'); // #endregion @@ -391,6 +408,8 @@ function removeGTCEURecipes(event) { //#region ВŅ‹Ņ…ÐūÐī: БŅƒÐžÐ°ÐķÐ―Ð°Ņ ÐŋŅ‹ÐŧŅŒ event.remove({ id: 'gtceu:shaped/paper_dust' }) + event.remove({ id: 'gtceu:shaped_fluid_container/paper' }) + event.remove({ id: 'gtceu:macerator/macerate_enchanting_table' }) //#endregion @@ -470,7 +489,8 @@ function removeGTCEURecipes(event) { //#region ВŅ‹Ņ…ÐūÐī: ПŅ‹ÐŧŅŒ ÐąÐ°Ð·Ð°ÐŧŅŒŅ‚а - removeMaceratorRecipe(event, 'macerate_basalt') + TFGHelpers.clearMaterialInfo('minecraft:basalt') + TFGHelpers.clearMaterialInfo('minecraft:polished_basalt'); //#endregion @@ -838,14 +858,20 @@ function removeGTCEURecipes(event) { event.remove({ id: 'gtceu:centrifuge/decomposition_centrifuging__granite' }) event.remove({ id: 'gtceu:centrifuge/decomposition_centrifuging__diorite' }) event.remove({ id: 'gtceu:centrifuge/decomposition_centrifuging__andesite' }) + event.remove({ id: 'gtceu:centrifuge/decomposition_centrifuging__marble' }) + event.remove({ id: 'gtceu:centrifuge/decomposition_centrifuging__redrock' }) event.remove({ id: 'gtceu:centrifuge/decomposition_centrifuging__deepslate' }) event.remove({ id: 'gtceu:centrifuge/decomposition_centrifuging__blackstone' }) event.remove({ id: 'gtceu:centrifuge/decomposition_centrifuging__endstone' }) + event.remove({ id: 'gtceu:centrifuge/decomposition_centrifuging__red_granite' }) + event.remove({ id: 'gtceu:centrifuge/decomposition_centrifuging__basalt' }) + event.remove({ id: 'gtceu:electrolyzer/decomposition_electrolyzing_tuff' }) removeMaceratorRecipe(event, 'macerate_end_stone'); removeMaceratorRecipe(event, 'macerate_end_stone_bricks'); removeMaceratorRecipe(event, 'macerate_end_stone_brick_wall'); + // Remove Default Pressure Plate Recipes const MC_PRESSURE_PLATES = [ 'bamboo', @@ -900,6 +926,10 @@ function removeGTCEURecipes(event) { event.remove({ id: 'gtceu:macerator/macerate_smooth_sandstone' }) event.remove({ id: 'gtceu:macerator/macerate_sandstone' }) event.remove({ id: 'gtceu:macerator/macerate_cut_sandstone' }) + + event.remove({ id: 'gtceu:rock_breaker/obsidian' }) + + event.remove({ id: 'gtceu:alloy_smelter/alloy_smelt_magnesia_refractory_brick_to_nugget' }) } function removeMaceratorRecipe(event, id) { diff --git a/kubejs/server_scripts/gregtech/tags.js b/kubejs/server_scripts/gregtech/tags.js index 6953a1202..bca277013 100644 --- a/kubejs/server_scripts/gregtech/tags.js +++ b/kubejs/server_scripts/gregtech/tags.js @@ -109,8 +109,18 @@ function registerGTCEUFluidTags(event) { event.add("c:hidden_from_recipe_viewers", "gtceu:molten_blue_steel"); event.add("c:hidden_from_recipe_viewers", "gtceu:molten_black_bronze"); event.add("c:hidden_from_recipe_viewers", "gtceu:molten_bismuth_bronze"); + event.add("c:hidden_from_recipe_viewers", "gtceu:molten_rose_gold"); + event.add("c:hidden_from_recipe_viewers", "gtceu:molten_sterling_silver"); + event.add("c:hidden_from_recipe_viewers", "gtceu:molten_stainless_steel"); + event.add("c:hidden_from_recipe_viewers", "gtceu:molten_manganese_phosphide"); + event.add("c:hidden_from_recipe_viewers", "gtceu:molten_vanadium_steel"); + event.add("c:hidden_from_recipe_viewers", "gtceu:molten_gallium_arsenide"); + event.add("c:hidden_from_recipe_viewers", "gtceu:molten_hsla_steel"); + event.add("c:hidden_from_recipe_viewers", "gtceu:molten_rocket_alloy_t2"); event.add("c:hidden_from_recipe_viewers", "gtceu:damascus_steel"); event.add("c:hidden_from_recipe_viewers", "gtceu:blaze"); event.add("c:hidden_from_recipe_viewers", "gtceu:thorium"); - + + event.add("c:hidden_from_recipe_viewers", "tfg:molten_weak_red_steel"); + event.add("c:hidden_from_recipe_viewers", "tfg:molten_weak_blue_steel"); } diff --git a/kubejs/server_scripts/gregtech/utility.js b/kubejs/server_scripts/gregtech/utility.js index b81f7b361..9f7c9aa08 100644 --- a/kubejs/server_scripts/gregtech/utility.js +++ b/kubejs/server_scripts/gregtech/utility.js @@ -134,7 +134,7 @@ function addCircuitToRecipe(event, recipeId, circuitNumber) { let hasCircuit = false; for (let i = 0; i < itemArray.size(); i++) { const el = itemArray.get(i); - if (!el.isJsonObject()) {continue;} + if (!el.isJsonObject()) { continue; } const obj = el.getAsJsonObject(); const content = obj.get("content"); if (content && content.isJsonObject()) { @@ -351,21 +351,21 @@ function woodBuilder(event, name, lumber, logs, log, stripped_log, plank, stair, * @throws {TypeError} Throws an error if input, output, or multiplier is invalid. */ function sterilizeItem(event, input, output, multiplier, cleanroom) { - // Collect errors. - const errors = []; + // Collect errors. + const errors = []; if (input === undefined || (Array.isArray(input) && input.length !== 1) || output === undefined || (Array.isArray(output) && output.length !== 1)) { errors.push("input or output is undefined or not equal to one item"); }; - if (multiplier <= 0) { - errors.push(`invalid multiplier (${multiplier})`); - }; + if (multiplier <= 0) { + errors.push(`invalid multiplier (${multiplier})`); + }; - // If there are any errors, log them all and throw once. - if (errors.length > 0) { - const message = `sterilizeItem errors:\n - ${ errors.join("\n - ")}`; - throw new TypeError(message); - }; + // If there are any errors, log them all and throw once. + if (errors.length > 0) { + const message = `sterilizeItem errors:\n - ${errors.join("\n - ")}`; + throw new TypeError(message); + }; // Set default multiplier. let recipe_multiplier = 1; @@ -376,32 +376,32 @@ function sterilizeItem(event, input, output, multiplier, cleanroom) { // Create recipes. const ethanol_recipe = event.recipes.gtceu.chemical_bath(`tfg:ethanol_cleaning/${linuxUnfucker(input)}_to_${linuxUnfucker(output)}`) .itemInputs(input) - .inputFluids(Fluid.of('gtceu:ethanol', 500*recipe_multiplier)) + .inputFluids(Fluid.of('gtceu:ethanol', 500 * recipe_multiplier)) .itemOutputs(output) - .duration(10*20*recipe_multiplier) + .duration(10 * 20 * recipe_multiplier) .EUt(GTValues.VA[GTValues.MV]); const hydrogen_peroxide_recipe = event.recipes.gtceu.chemical_bath(`tfg:hydrogen_peroxide_cleaning/${linuxUnfucker(input)}_to_${linuxUnfucker(output)}`) .itemInputs(input) - .inputFluids(Fluid.of('gtceu:hydrogen_peroxide', 200*recipe_multiplier)) + .inputFluids(Fluid.of('gtceu:hydrogen_peroxide', 200 * recipe_multiplier)) .itemOutputs(output) - .duration(10*20*recipe_multiplier) + .duration(10 * 20 * recipe_multiplier) .EUt(GTValues.VA[GTValues.MV]); const sodium_dodecyl_sulfate_recipe = event.recipes.gtceu.chemical_bath(`tfg:sodium_dodecyl_sulfate_cleaning/${linuxUnfucker(input)}_to_${linuxUnfucker(output)}`) .itemInputs(input) - .inputFluids(Fluid.of('tfg:sodium_dodecyl_sulfate', 50*recipe_multiplier)) + .inputFluids(Fluid.of('tfg:sodium_dodecyl_sulfate', 50 * recipe_multiplier)) .itemOutputs(output) - .duration(10*20*recipe_multiplier) + .duration(10 * 20 * recipe_multiplier) .EUt(GTValues.VA[GTValues.MV]); const autoclave_recipe = event.recipes.gtceu.autoclave(`tfg:autoclave_cleaning/${linuxUnfucker(input)}_to_${linuxUnfucker(output)}`) .itemInputs(input) .perTick(true) - .inputFluids(Fluid.of('gtceu:steam', 100*recipe_multiplier)) + .inputFluids(Fluid.of('gtceu:steam', 100 * recipe_multiplier)) .perTick(false) .itemOutputs(output) - .duration(240*20*recipe_multiplier) + .duration(240 * 20 * recipe_multiplier) .EUt(GTValues.VA[GTValues.MV]); if (cleanroom) { diff --git a/kubejs/server_scripts/gtceu_terminal/recipes.js b/kubejs/server_scripts/gtceu_terminal/recipes.js new file mode 100644 index 000000000..e1f75679d --- /dev/null +++ b/kubejs/server_scripts/gtceu_terminal/recipes.js @@ -0,0 +1,53 @@ +// priority: 0 +"use strict"; + +function registerGTCEUTerminalRecipes(event) { + + + // Gregtech CEu Terminals Integration + + //event.remove({ id : 'gtceuterminal:dismantler' }) + event.shaped('1x gtceuterminal:dismantler', [ + 'ABA', + 'CDC', + 'FEF' + ], { + A: 'gtceu:mv_sensor', + B: 'gtceu:mv_emitter', + C: '#gtceu:circuits/mv', + D: 'gtceu:computer_monitor_cover', + E: 'gtceu:mv_voltage_coil', + F: '#forge:plates/aluminium' + }).id(`tfg:shaped/dismantler`) + + event.remove({ id : 'gtceuterminal:multi_structure_manager' }) + event.shaped('1x gtceuterminal:multi_structure_manager', [ + 'ABA', + 'CDC', + 'FEF' + ], { + A: 'gtceu:hv_sensor', + B: 'gtceu:hv_emitter', + C: '#gtceu:circuits/hv', + D: 'gtceu:terminal', + E: '#gtceu:batteries/hv', + F: '#forge:plates/stainless_steel' + }).id(`tfg:shaped/multi_structure_manager`) + + event.remove({ id : 'gtceuterminal:schematic_interface' }) + /* Broken for now as it can duplicate resources in the I/O Ports + event.shaped('1x gtceuterminal:schematic_interface', [ + 'ABA', + 'CDC', + 'FEF' + ], { + A: 'gtceu:iv_sensor', + B: 'gtceu:iv_emitter', + C: '#gtceu:circuits/iv', + D: 'gtceu:terminal', + E: '#gtceu:batteries/iv', + F: '#forge:plates/tungsten_steel' + }).id(`tfg:shaped/schematic_interface`) + */ + + } \ 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 352f5cca6..a412f913e 100644 --- a/kubejs/server_scripts/macaws_for_tfc/recipes.js +++ b/kubejs/server_scripts/macaws_for_tfc/recipes.js @@ -23,4 +23,19 @@ function registerMacawsForTFCRecipes(event) { C: `tfc:wood/log/${wood}` }).id(`tfg:shaped/${wood}_wired_fence`) }) -} + + event.remove({input: ['mcw_tfc_aio:roofs/gray_roofs/gray_roof_slab','#tfc:saws']}) + + event.shapeless('minecraft:gray_terracotta', [ + 'mcw_tfc_aio:roofs/gray_roofs/gray_roof_slab', + 'mcw_tfc_aio:roofs/gray_roofs/gray_roof_slab' + ]).id('minecraft:gray_terracotta') + + event.shaped(`4x mcw_tfc_aio:fences/other_fences/hedge`, [ + 'BAB', + 'BAB' + ], { + A: '#forge:rods/wooden', + B: '#minecraft:leaves' + }).id(`tfg:shaped/mcw_tfc/hedge_fence_from_leaves`); +}; diff --git a/kubejs/server_scripts/main_server_script.js b/kubejs/server_scripts/main_server_script.js index e0cddeb76..df97fcde1 100644 --- a/kubejs/server_scripts/main_server_script.js +++ b/kubejs/server_scripts/main_server_script.js @@ -53,7 +53,7 @@ ServerEvents.tags('item', event => { registerTFCItemTags(event) registerTFCTextileItemTags(event) registerTFGItemTags(event) - registerTFGItemTagsNuclear(event) + registerTFGNuclearItemTags(event) registerTFCLunchboxItemTags(event) registerVintageImprovementsItemTags(event) registerWABItemTags(event) @@ -87,6 +87,7 @@ ServerEvents.tags('block', event => { registerMoreRedBlockTags(event) registerHotOrNotBlockTags(event) registerRailWaysBlockTags(event) + registerRnrBlockTags(event) registerSophisticatedBackpacksBlockTags(event) registerSpeciesBlockTags(event) registerTACZBlockTags(event) @@ -180,6 +181,7 @@ TFCEvents.data(event => { LootJS.modifiers((event) => { registerAdAstraLoots(event) registerBeneathLoots(event) + registerTFGRockLoots(event) registerTFGOreLoots(event) registerLootrLoots(event) registerPrimitiveCreaturesLoots(event) @@ -237,7 +239,7 @@ ServerEvents.recipes(event => { registerCreateFactoryLogisticsRecipes(event) registerCreateHorsePowerBlockRecipes(event) registerCreateHypertubeRecipes(event) - registerCreateStockBridgeRecipes(event) + //registerCreateStockBridgeRecipes(event) registerDeaFissionRecipes(event) registerDiggerHelmetRecipes(event) registerDomumOrnamentumRecipes(event) @@ -253,6 +255,7 @@ ServerEvents.recipes(event => { registerGrapplingHookRecipes(event); registerGreateRecipes(event) registerGTCEURecipes(event); + registerGTCEUTerminalRecipes(event) registerHandGliderRecipes(event) registerHotOrNotRecipes(event) registerImmersiveAircraftRecipes(event) diff --git a/kubejs/server_scripts/minecraft/recipes.js b/kubejs/server_scripts/minecraft/recipes.js index b45eecc8c..149d38722 100644 --- a/kubejs/server_scripts/minecraft/recipes.js +++ b/kubejs/server_scripts/minecraft/recipes.js @@ -994,21 +994,14 @@ const registerMinecraftRecipes = (event) => { //#endregion //#region Glowing Ink Sacs - - event.recipes.gtceu.chemical_bath('minecraft:glow_inc_sac4') - .itemInputs("gtceu:thorium_dust") - .inputFluids(Fluid.of('gtceu:glowstone', 512)) - .itemOutputs('16x minecraft:glow_ink_sac') - .duration(20) - .EUt(GTValues.VA[GTValues.LV]) - - event.recipes.gtceu.chemical_bath('minecraft:glow_inc_sac1') - .itemInputs("#forge:dyes/black") - .inputFluids(Fluid.of('gtceu:glowstone', 144)) + + event.recipes.gtceu.fluid_solidifier('tfg:glow_ink_sac') + .inputFluids('gtceu:glowstone 36') + .notConsumable('gtceu:ball_casting_mold') .itemOutputs('minecraft:glow_ink_sac') .duration(40) .EUt(GTValues.VA[GTValues.LV]) - + //#endregion //#region Gunpowder diff --git a/kubejs/server_scripts/minecraft/recipes.removes.js b/kubejs/server_scripts/minecraft/recipes.removes.js index 883168c8e..afeaa86e6 100644 --- a/kubejs/server_scripts/minecraft/recipes.removes.js +++ b/kubejs/server_scripts/minecraft/recipes.removes.js @@ -6,6 +6,7 @@ function removeMinecraftRecipes(event) { global.MINECRAFT_DISABLED_ITEMS.forEach(item => { event.remove({ input: item }) event.remove({ output: item }) + TFGHelpers.clearMaterialInfo(item); }) //#region ВŅ‹Ņ…ÐūÐī: КаОÐĩÐ―ŅŒ diff --git a/kubejs/server_scripts/rnr/tags.js b/kubejs/server_scripts/rnr/tags.js index 081432ce3..670010dcd 100644 --- a/kubejs/server_scripts/rnr/tags.js +++ b/kubejs/server_scripts/rnr/tags.js @@ -6,4 +6,31 @@ const registerRnrItemTags = (event) => { event.removeAllTagsFrom(item) event.add('c:hidden_from_recipe_viewers', item) }); -}; \ No newline at end of file +}; + +function registerRnrBlockTags(event) { + + global.TFC_WOOD_TYPES.forEach(wood => { + event.add('minecraft:mineable/axe', `rnr:wood/shingles/${wood}`) + event.add('minecraft:mineable/axe', `rnr:wood/shingles/${wood}_stairs`) + event.add('minecraft:mineable/axe', `rnr:wood/shingles/${wood}_slab`) + }); + + global.AFC_WOOD_TYPES.forEach(wood => { + event.add('minecraft:mineable/axe', `rnr:wood/shingles/${wood}`) + event.add('minecraft:mineable/axe', `rnr:wood/shingles/${wood}_stairs`) + event.add('minecraft:mineable/axe', `rnr:wood/shingles/${wood}_slab`) + }); + + event.add('minecraft:mineable/hoe', `rnr:thatch_roof`) + event.add('minecraft:mineable/hoe', `rnr:thatch_roof_stairs`) + event.add('minecraft:mineable/hoe', `rnr:thatch_roof_slab`) + + event.add('minecraft:mineable/pickaxe', `rnr:terracotta_roof`) + event.add('minecraft:mineable/pickaxe', `rnr:terracotta_roof_stairs`) + event.add('minecraft:mineable/pickaxe', `rnr:terracotta_roof_slab`) + event.add('minecraft:mineable/pickaxe', `rnr:ceramic_roof`) + event.add('minecraft:mineable/pickaxe', `rnr:ceramic_roof_stairs`) + event.add('minecraft:mineable/pickaxe', `rnr:ceramic_roof_slab`) + +} \ No newline at end of file diff --git a/kubejs/server_scripts/sacksnstuff/recipes.js b/kubejs/server_scripts/sacksnstuff/recipes.js index fc0ba14d7..95b7d2e84 100644 --- a/kubejs/server_scripts/sacksnstuff/recipes.js +++ b/kubejs/server_scripts/sacksnstuff/recipes.js @@ -247,10 +247,11 @@ const registerSNSRecipes = (event) => { .circuit(4) .duration(40) .EUt(GTValues.VA[GTValues.LV]) + event.custom({ type: "createaddition:rolling", input: ChemicalHelper.get(TagPrefix.rod, GTMaterials.Steel, 1), - result: 'sns:metal/horseshoe/steel' + result: { item: 'sns:metal/horseshoe/steel' } }).id(`tfg:rolling/steel_horseshoe`) event.recipes.gtceu.bender('sns:horseshoe_black_steel_electric_only') @@ -262,7 +263,7 @@ const registerSNSRecipes = (event) => { event.custom({ type: "createaddition:rolling", input: ChemicalHelper.get(TagPrefix.rod, GTMaterials.BlackSteel, 1), - result: 'sns:metal/horseshoe/black_steel' + result: { item: 'sns:metal/horseshoe/black_steel' } }).id(`tfg:rolling/black_steel_horseshoe`) event.recipes.gtceu.bender('sns:horseshoe_blue_steel_electric_only') @@ -274,7 +275,7 @@ const registerSNSRecipes = (event) => { event.custom({ type: "createaddition:rolling", input: ChemicalHelper.get(TagPrefix.rod, GTMaterials.BlueSteel, 1), - result: 'sns:metal/horseshoe/blue_steel' + result: { item: 'sns:metal/horseshoe/blue_steel' } }).id(`tfg:rolling/blue_steel_horseshoe`) event.recipes.gtceu.bender('sns:horseshoe_red_steel_electric_only') @@ -286,6 +287,6 @@ const registerSNSRecipes = (event) => { event.custom({ type: "createaddition:rolling", input: ChemicalHelper.get(TagPrefix.rod, GTMaterials.RedSteel, 1), - result: 'sns:metal/horseshoe/red_steel' + result: { item: 'sns:metal/horseshoe/red_steel' } }).id(`tfg:rolling/red_steel_horseshoe`) } diff --git a/kubejs/server_scripts/sacksnstuff/tags.js b/kubejs/server_scripts/sacksnstuff/tags.js index bb1c9422b..c7c553151 100644 --- a/kubejs/server_scripts/sacksnstuff/tags.js +++ b/kubejs/server_scripts/sacksnstuff/tags.js @@ -45,4 +45,6 @@ function registerSNSItemTags(event) { // Remove this tag to avoid confusion with the other lunchbox event.removeAll('sns:lunchbox_food') + + event.add('curios:belt', 'sns:quiver'); } \ No newline at end of file diff --git a/kubejs/server_scripts/sophisticated_backpacks/recipes.js b/kubejs/server_scripts/sophisticated_backpacks/recipes.js index 0873a71f5..abf461805 100644 --- a/kubejs/server_scripts/sophisticated_backpacks/recipes.js +++ b/kubejs/server_scripts/sophisticated_backpacks/recipes.js @@ -251,8 +251,8 @@ const registerSophisticatedBackpacksRecipes = (event) => { 'CDE', 'FGF' ], { - A: '#forge:screws/steel', - B: 'gtceu:item_detector_cover', + A: '#forge:screws/wrought_iron', + B: '#forge:small_gears/red_alloy', C: '#forge:tools/screwdrivers', D: 'sophisticatedbackpacks:upgrade_base', E: '#forge:tools/wrenches', @@ -262,7 +262,7 @@ const registerSophisticatedBackpacksRecipes = (event) => { event.shapeless('sophisticatedbackpacks:advanced_void_upgrade', [ 'sophisticatedbackpacks:void_upgrade', - '#gtceu:circuits/mv' + '#gtceu:circuits/ulv' ]).id('tfg:sophisticated_backpacks/shapeless/advanced_void_upgrade') event.shaped('sophisticatedbackpacks:deposit_upgrade', [ diff --git a/kubejs/server_scripts/tacz/recipes.misc.js b/kubejs/server_scripts/tacz/recipes.misc.js index c37803055..f0d7632f7 100644 --- a/kubejs/server_scripts/tacz/recipes.misc.js +++ b/kubejs/server_scripts/tacz/recipes.misc.js @@ -26,38 +26,6 @@ function registerTACZMiscRecipes(event) { ['tacz:target', 'minecraft:minecart'] ).id('tfg_tacz:target_minecart'); - - //Molds - event.shaped('tfg:small_casing_extruder_mold',[ - ' A ', - 'B ', - ' C' - ],{ - A: '#forge:tools/wire_cutters', - B: 'gtceu:empty_mold', - C: '#forge:tools/files' - }).id('tfg:small_casing_extruder_mold'); - - event.shaped('tfg:large_casing_extruder_mold',[ - ' ', - 'AB ', - ' C' - ],{ - A: '#forge:tools/wire_cutters', - B: 'gtceu:empty_mold', - C: '#forge:tools/files' - }).id('tfg:large_casing_extruder_mold'); - - event.shaped('tfg:shell_casing_extruder_mold',[ - ' C', - 'AB ', - ' ' - ],{ - A: '#forge:tools/wire_cutters', - B: 'gtceu:empty_mold', - C: '#forge:tools/files' - }).id('tfg:shell_casing_extruder_mold'); - //Mechanisms event.shaped('tfg:flintlock_mechanism', [ 'ABC', diff --git a/kubejs/server_scripts/tfc/data.js b/kubejs/server_scripts/tfc/data.js index 7fe74b566..f9dfc7602 100644 --- a/kubejs/server_scripts/tfc/data.js +++ b/kubejs/server_scripts/tfc/data.js @@ -109,6 +109,10 @@ const registerTFCFertilizers = (event) => { event.fertilizer('gtceu:tiny_ammonium_chloride_dust', 0.03, null, null) event.fertilizer('gtceu:small_ammonium_chloride_dust', 0.075, null, null) event.fertilizer('gtceu:ammonium_chloride_dust', 0.3, null, null) + + event.fertilizer('tfc:pure_nitrogen', 1, null, null) + event.fertilizer('tfc:pure_phosphorus', null, 1, null) + event.fertilizer('tfc:pure_potassium', null, null, 1) } @@ -117,4 +121,4 @@ const registerTFCFertilizers = (event) => { const registerTFCKnappingTypes = (event) => { event.knappingType('minecraft:flint', 1, 1, 'tfc:item.knapping.stone', true, false, true, 'minecraft:flint', 'tfg:flint') event.knappingType('tfc:straw', 4, 4, 'tfc:item.knapping.leather', false, false, false, 'tfc:straw', 'tfg:straw') -} \ No newline at end of file +} diff --git a/kubejs/server_scripts/tfc/recipes.dyes.js b/kubejs/server_scripts/tfc/recipes.dyes.js index 8499a98f5..45c3e2030 100644 --- a/kubejs/server_scripts/tfc/recipes.dyes.js +++ b/kubejs/server_scripts/tfc/recipes.dyes.js @@ -156,4 +156,62 @@ function registerTFCDyeRecipes(event) { }) //#endregion + + //#region Dye mixing + const dyeMixes = [ + // input 1 + [ + 'black', 'white', 'white', + 'white', 'blue', 'blue', + 'purple', 'white', 'red', + 'orange', 'yellow' + ], + // input 2 + [ + 'white', 'gray', 'green', + 'blue', 'green', 'red', + 'pink', 'red', 'yellow', + 'black', 'blue' + ], + // output + [ + 'gray', 'light_gray', 'light_green', + 'light_blue', 'cyan', 'purple', + 'magenta', 'pink', 'orange', + 'brown', 'green' + ] + ] + + for (let i = 0; i < dyeMixes[2].length; i++) { + if (!Fluid.exists(`tfc:${dyeMixes[0][i]}_dye`) || + !Fluid.exists(`tfc:${dyeMixes[1][i]}_dye`) || + !Fluid.exists(`tfc:${dyeMixes[2][i]}_dye`) + ) continue + + // GT mixer recipe + event.recipes.gtceu.mixer(`mixer_dye_${dyeMixes[2][i]}`) + .inputFluids( + Fluid.of(`tfc:${dyeMixes[0][i]}_dye`, 144), + Fluid.of(`tfc:${dyeMixes[1][i]}_dye`, 144) + ) + .outputFluids( + Fluid.of(`tfc:${dyeMixes[2][i]}_dye`, 288) + ) + .duration(20) + .EUt(8) + + // TFC barrel recipes (2x because 2! = 2) + event.recipes.tfc.barrel_instant_fluid( + Fluid.of(`tfc:${dyeMixes[2][i]}_dye`, 2), + TFC.fluidStackIngredient(Fluid.of(`tfc:${dyeMixes[0][i]}_dye`, 1)), + TFC.fluidStackIngredient(Fluid.of(`tfc:${dyeMixes[1][i]}_dye`, 1)), + ) + event.recipes.tfc.barrel_instant_fluid( + Fluid.of(`tfc:${dyeMixes[2][i]}_dye`, 2), + TFC.fluidStackIngredient(Fluid.of(`tfc:${dyeMixes[1][i]}_dye`, 1)), + TFC.fluidStackIngredient(Fluid.of(`tfc:${dyeMixes[0][i]}_dye`, 1)), + ) + } + + //#endregion } \ No newline at end of file diff --git a/kubejs/server_scripts/tfc/recipes.js b/kubejs/server_scripts/tfc/recipes.js index 4289b3b0e..6eb87bda4 100644 --- a/kubejs/server_scripts/tfc/recipes.js +++ b/kubejs/server_scripts/tfc/recipes.js @@ -21,7 +21,7 @@ const registerTFCRecipes = (event) => { ], { A: '#forge:double_plates/wrought_iron', B: 'tfc:crucible' - }).addMaterialInfo().id('tfc:crafting/blast_furnace') + }).id('tfc:crafting/blast_furnace') // ÐĒŅ‹ÐšÐēа -> КŅƒŅÐūŅ‡ÐšÐļ Ņ‚Ņ‹ÐšÐēŅ‹ event.recipes.tfc.advanced_shapeless_crafting( @@ -240,4 +240,48 @@ const registerTFCRecipes = (event) => { .inputs('#tfc:foods/fruits', TFC.fluidStackIngredient('#tfg:alcohols', 250)) .outputFluid(Fluid.of('tfc:vinegar', 250)) .id('tfc:barrel/vinegar') + + // Borax to flux + event.recipes.tfc.quern('4x tfc:powder/flux', 'gtceu:borax_dust') + .id(`tfg:quern/borax`) + + event.recipes.gtceu.macerator('borax_to_flux') + .itemInputs("#forge:dusts/borax") + .itemOutputs("4x tfc:powder/flux") + .duration(50) + .EUt(2); + + event.shapeless('4x tfc:fire_clay', ['tfc:fire_clay_block']) + + event.shapeless('4x tfc:kaolin_clay', ['tfc:white_kaolin_clay']) + event.shapeless('4x tfc:kaolin_clay', ['tfc:pink_kaolin_clay']) + event.shapeless('4x tfc:kaolin_clay', ['tfc:red_kaolin_clay']) + + global.TFC_WOOD_TYPES.forEach(element => { + event.shaped(`4x tfc:wood/fallen_leaves/${element}`,[ + 'AA', + 'AA' + ], { + A: `tfc:wood/leaves/${element}` + }).id(`tfg:shaped/tfc/${element}_leaves_to_fallen_leaves`); + }); + + /** + * @property {string[]} krummholz_types - List of krummholz wood types. + */ + const krummholz_types = [ + 'aspen', + 'douglas_fir', + 'pine', + 'spruce', + 'white_cedar' + ]; + krummholz_types.forEach(type => { + event.shaped(`1x tfc:plant/${type}_krummholz`,[ + 'A', + 'A' + ], { + A: `tfc:wood/sapling/${type}` + }).id(`tfg:shaped/tfc/${type}_krummholz`); + }); } diff --git a/kubejs/server_scripts/tfc/recipes.removes.js b/kubejs/server_scripts/tfc/recipes.removes.js index a4dd78bbc..90f5266bc 100644 --- a/kubejs/server_scripts/tfc/recipes.removes.js +++ b/kubejs/server_scripts/tfc/recipes.removes.js @@ -130,4 +130,11 @@ function removeTFCRecipes(event) { event.remove({ output: 'tfc:rustic_windmill_blade'}) event.remove({ output: 'tfc:lattice_windmill_blade'}) event.remove({ id: 'tfchotornot:heating/insulating_items'}) + + event.remove({ id: 'tfc:heating/metal/weak_blue_steel_ingot' }) + event.remove({ id: 'tfc:casting/weak_blue_steel_ingot' }) + event.remove({ id: 'tfc:casting/weak_blue_steel_fire_ingot' }) + event.remove({ id: 'tfc:heating/metal/weak_red_steel_ingot' }) + event.remove({ id: 'tfc:casting/weak_red_steel_ingot' }) + event.remove({ id: 'tfc:casting/weak_red_steel_fire_ingot' }) } diff --git a/kubejs/server_scripts/tfc/tags.js b/kubejs/server_scripts/tfc/tags.js index 9748229f5..8f69d82c7 100644 --- a/kubejs/server_scripts/tfc/tags.js +++ b/kubejs/server_scripts/tfc/tags.js @@ -92,9 +92,9 @@ function registerTFCItemTags(event) { event.add("tfc:nonplaceable", "minecraft:milk_bucket") event.add("tfc:nonplaceable", "firmalife:bucket/yak_milk") event.add("tfc:nonplaceable", "firmalife:bucket/goat_milk") - event.add("tfc:nonplaceable", "tfc_gurman:ox_milk_bucket") - event.add("tfc:nonplaceable", "tfc_gurman:sheep_milk_bucket") - event.add("tfc:nonplaceable", "tfc_gurman:alpaca_milk_bucket") + event.add("tfc:nonplaceable", "tfc_gourmet:ox_milk_bucket") + event.add("tfc:nonplaceable", "tfc_gourmet:sheep_milk_bucket") + event.add("tfc:nonplaceable", "tfc_gourmet:alpaca_milk_bucket") event.add("tfc:nonplaceable", "tfc:bucket/beer") event.add("tfc:nonplaceable", "tfc:bucket/cider") event.add("tfc:nonplaceable", "tfc:bucket/rum") @@ -112,16 +112,16 @@ function registerTFCItemTags(event) { event.add("tfc:nonplaceable", "tfcagedalcohol:bucket/aged_corn_whiskey") event.add("tfc:nonplaceable", "tfcagedalcohol:bucket/aged_rye_whiskey") event.add("tfc:nonplaceable", "tfcagedalcohol:bucket/aged_mead") - event.add("tfc:nonplaceable", "tfc_gurman:nalivka_bucket") - event.add("tfc:nonplaceable", "tfc_gurman:coffee_bucket") - event.add("tfc:nonplaceable", "tfc_gurman:tea_mint_bucket") - event.add("tfc:nonplaceable", "tfc_gurman:tea_chamomile_bucket") - event.add("tfc:nonplaceable", "tfc_gurman:tea_rosehip_bucket") - event.add("tfc:nonplaceable", "tfc_gurman:tea_nettle_bucket") - event.add("tfc:nonplaceable", "tfc_gurman:cocoa_bucket") - event.add("tfc:nonplaceable", "tfc_gurman:compote_bucket") - event.add("tfc:nonplaceable", "tfc_gurman:kvass_bucket") - event.add("tfc:nonplaceable", "tfc_gurman:lemonade_bucket") + event.add("tfc:nonplaceable", "tfc_gourmet:nalivka_bucket") + event.add("tfc:nonplaceable", "tfc_gourmet:coffee_bucket") + event.add("tfc:nonplaceable", "tfc_gourmet:tea_mint_bucket") + event.add("tfc:nonplaceable", "tfc_gourmet:tea_chamomile_bucket") + event.add("tfc:nonplaceable", "tfc_gourmet:tea_rosehip_bucket") + event.add("tfc:nonplaceable", "tfc_gourmet:tea_nettle_bucket") + event.add("tfc:nonplaceable", "tfc_gourmet:cocoa_bucket") + event.add("tfc:nonplaceable", "tfc_gourmet:compote_bucket") + event.add("tfc:nonplaceable", "tfc_gourmet:kvass_bucket") + event.add("tfc:nonplaceable", "tfc_gourmet:lemonade_bucket") event.add("tfc:nonplaceable", "firmalife:bucket/mead") event.add("tfc:nonplaceable", "firmalife:bucket/red_wine") event.add("tfc:nonplaceable", "firmalife:bucket/white_wine") @@ -137,6 +137,21 @@ function registerTFCItemTags(event) { //Plants event.add("tfc:plants", "#tfc:wild_fruits"); + /** + * @property {string[]} krummholz_types - List of krummholz wood types. + */ + const krummholz_types = [ + 'aspen', + 'douglas_fir', + 'pine', + 'spruce', + 'white_cedar' + ]; + krummholz_types.forEach(type => { + event.add('tfc:plants', `tfc:plant/${type}_krummholz`); + event.add('tfc:krummholz', `tfc:plant/${type}_krummholz`); + }); + // ДÐŧŅ ŅÐšÐŧаÐīŅ‹ÐēÐ°Ð―ÐļŅ event.add("tfc:pileable_ingots", "#forge:ingots"); event.add("tfc:pileable_sheets", "#forge:plates"); @@ -459,6 +474,17 @@ function registerTFCItemTags(event) { }) event.add('tfc:fluxstone', 'tfg:loose/dripstone') + + event.add('tfc:food/bell_peppers', 'tfc:food/green_bell_pepper'); + event.add('tfc:food/bell_peppers', 'tfc:food/yellow_bell_pepper'); + event.add('tfc:food/bell_peppers', 'tfc:food/red_bell_pepper'); + + // More offhand things for piglin brutes + event.add('tfc:mob_offhand_weapons', 'tfchotornot:tongs/gold'); + event.add('tfc:mob_offhand_weapons', 'tfchotornot:tongs/rose_gold'); + event.add('tfc:mob_offhand_weapons', 'gtceu:black_bronze_knife'); + event.add('tfc:mob_offhand_weapons', 'tfc:metal/javelin/black_bronze'); + event.add('tfc:mob_offhand_weapons', 'tfc:metal/mace/black_bronze'); } /** @param {TagEvent.Block} event */ @@ -806,7 +832,7 @@ function registerTFCFluidTags(event) { 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"); + event.add("tfg:alcohols", "tfc_gourmet:nalivka"); // ДÐūÐąÐ°ÐēÐŧŅÐĩО Ņ‚ÐĩÐģ ÐīÐŧŅ ŅÐšŅ€Ņ‹Ņ‚ÐļŅ Ðē EMI event.add("c:hidden_from_recipe_viewers", "tfc:metal/bismuth"); diff --git a/kubejs/server_scripts/tfc_gurman/recipes.js b/kubejs/server_scripts/tfc_gurman/recipes.js index f19231358..b5b7bd351 100644 --- a/kubejs/server_scripts/tfc_gurman/recipes.js +++ b/kubejs/server_scripts/tfc_gurman/recipes.js @@ -2,84 +2,98 @@ "use strict"; function registerTFCGurmanRecipes(event) { + + let deprecated = Ingredient.of('#tfc_gourmet:deprecated_foods').itemIds.toArray(); + deprecated.forEach(oldID => { + let newID = `${oldID}`.replace(/tfc_gurman:/g, 'tfc_gourmet:'); + event.shapeless(newID, oldID); + }) + //#region Food Oven Recipes - - global.cookingRecipe(event, 'margarita_pizza', 'tfc_gurman:raw_margarita_pizza', 'tfc_gurman:margarita_pizza'); - - global.cookingRecipe(event, 'pepperoni_pizza', 'tfc_gurman:raw_pepperoni_pizza', 'tfc_gurman:pepperoni_pizza'); - - global.cookingRecipe(event, 'hawaiian_pizza', 'tfc_gurman:raw_hawaiian_pizza', 'tfc_gurman:hawaiian_pizza'); - - global.cookingRecipe(event, 'four_cheeses_pizza', 'tfc_gurman:raw_four_cheeses_pizza', 'tfc_gurman:four_cheeses_pizza'); - - global.cookingRecipe(event, 'four_meats_pizza', 'tfc_gurman:raw_four_meats_pizza', 'tfc_gurman:four_meats_pizza'); - - global.cookingRecipe(event, 'neapolitano_pizza', 'tfc_gurman:raw_neapolitano_pizza', 'tfc_gurman:neapolitano_pizza'); - - global.cookingRecipe(event, 'croissants', 'tfc_gurman:raw_croissants', 'tfc_gurman:croissants'); - - global.cookingRecipe(event, 'kiev_cutlets', 'tfc_gurman:raw_kiev_cutlets', 'tfc_gurman:kiev_cutlets'); - - global.cookingRecipe(event, 'quiche', 'tfc_gurman:raw_quiche', 'tfc_gurman:quiche'); - global.cookingRecipe(event, 'tandoori_chicken', 'tfc_gurman:raw_tandoori_chicken', 'tfc_gurman:tandoori_chicken'); - - global.cookingRecipe(event, 'placinda', 'tfc_gurman:raw_placinda', 'tfc_gurman:placinda'); - - global.cookingRecipe(event, 'tonkatsu', 'tfc_gurman:raw_tonkatsu', 'tfc_gurman:tonkatsu'); - - global.cookingRecipe(event, 'takoyaki', 'tfc_gurman:raw_takoyaki', 'tfc_gurman:takoyaki'); - - global.cookingRecipe(event, 'bulgogi', 'tfc_gurman:raw_bulgogi', 'tfc_gurman:bulgogi'); - - global.cookingRecipe(event, 'bratwurst', 'tfc_gurman:raw_bratwurst', 'tfc_gurman:bratwurst'); + global.cookingRecipe(event, 'margarita_pizza', 'tfc_gourmet:raw_margarita_pizza', 'tfc_gourmet:margarita_pizza'); - global.cookingRecipe(event, 'crepes', 'tfc_gurman:raw_crepes', 'tfc_gurman:crepes'); + global.cookingRecipe(event, 'pepperoni_pizza', 'tfc_gourmet:raw_pepperoni_pizza', 'tfc_gourmet:pepperoni_pizza'); - global.cookingRecipe(event, 'chebureki', 'tfc_gurman:raw_chebureki', 'tfc_gurman:chebureki'); + global.cookingRecipe(event, 'hawaiian_pizza', 'tfc_gourmet:raw_hawaiian_pizza', 'tfc_gourmet:hawaiian_pizza'); + + global.cookingRecipe(event, 'four_cheeses_pizza', 'tfc_gourmet:raw_four_cheeses_pizza', 'tfc_gourmet:four_cheeses_pizza'); + + global.cookingRecipe(event, 'four_meats_pizza', 'tfc_gourmet:raw_four_meats_pizza', 'tfc_gourmet:four_meats_pizza'); + + global.cookingRecipe(event, 'neapolitano_pizza', 'tfc_gourmet:raw_neapolitano_pizza', 'tfc_gourmet:neapolitano_pizza'); + + global.cookingRecipe(event, 'croissants', 'tfc_gourmet:raw_croissants', 'tfc_gourmet:croissants'); + + global.cookingRecipe(event, 'kiev_cutlets', 'tfc_gourmet:raw_kiev_cutlets', 'tfc_gourmet:kiev_cutlets'); + + global.cookingRecipe(event, 'quiche', 'tfc_gourmet:raw_quiche', 'tfc_gourmet:quiche'); - global.cookingRecipe(event, 'khachapuri', 'tfc_gurman:raw_khachapuri', 'tfc_gurman:khachapuri'); + global.cookingRecipe(event, 'tandoori_chicken', 'tfc_gourmet:raw_tandoori_chicken', 'tfc_gourmet:tandoori_chicken'); - global.cookingRecipe(event, 'lavash_wrap', 'tfc_gurman:raw_lavash_wrap', 'tfc_gurman:lavash_wrap'); + global.cookingRecipe(event, 'placinda', 'tfc_gourmet:raw_placinda', 'tfc_gourmet:placinda'); - global.cookingRecipe(event, 'syrniki', 'tfc_gurman:raw_syrniki', 'tfc_gurman:syrniki'); + global.cookingRecipe(event, 'tonkatsu', 'tfc_gourmet:raw_tonkatsu', 'tfc_gourmet:tonkatsu'); + + global.cookingRecipe(event, 'takoyaki', 'tfc_gourmet:raw_takoyaki', 'tfc_gourmet:takoyaki'); + + global.cookingRecipe(event, 'bulgogi', 'tfc_gourmet:raw_bulgogi', 'tfc_gourmet:bulgogi'); + + global.cookingRecipe(event, 'bratwurst', 'tfc_gourmet:raw_bratwurst', 'tfc_gourmet:bratwurst'); + + global.cookingRecipe(event, 'crepes', 'tfc_gourmet:raw_crepes', 'tfc_gourmet:crepes'); + + global.cookingRecipe(event, 'chebureki', 'tfc_gourmet:raw_chebureki', 'tfc_gourmet:chebureki'); + + global.cookingRecipe(event, 'khachapuri', 'tfc_gourmet:raw_khachapuri', 'tfc_gourmet:khachapuri'); + + global.cookingRecipe(event, 'lavash_wrap', 'tfc_gourmet:raw_lavash_wrap', 'tfc_gourmet:lavash_wrap'); + + global.cookingRecipe(event, 'syrniki', 'tfc_gourmet:raw_syrniki', 'tfc_gourmet:syrniki'); - global.cookingRecipe(event, 'oladyi', 'tfc_gurman:raw_oladyi', 'tfc_gurman:oladyi'); + global.cookingRecipe(event, 'oladyi', 'tfc_gourmet:raw_oladyi', 'tfc_gourmet:oladyi'); // Falafel - from soybean (no raw version) - global.cookingRecipe(event, 'falafel', 'tfc:food/soybean', 'tfc_gurman:falafel'); + global.cookingRecipe(event, 'falafel', 'tfc_gourmet:raw_falafel', 'tfc_gourmet:falafel'); - global.cookingRecipe(event, 'pelmeni', 'tfc_gurman:raw_pelmeni', 'tfc_gurman:pelmeni', '#tfg:clean_water 500'); + global.cookingRecipe(event, 'pelmeni', 'tfc_gourmet:raw_pelmeni', 'tfc_gourmet:pelmeni', '#tfg:clean_water 500'); - global.cookingRecipe(event, 'vareniki', 'tfc_gurman:raw_vareniki', 'tfc_gurman:vareniki', '#tfg:clean_water 500'); + global.cookingRecipe(event, 'vareniki', 'tfc_gourmet:raw_vareniki', 'tfc_gourmet:vareniki', '#tfg:clean_water 500'); //#endregion //#region Food Processor Recipes // Borscht + global.processorRecipe(event, 'sliced_cabbage', 300, GTValues.VA[GTValues.LV], { + itemInputs: ['tfc:food/cabbage'], + itemOutputs: ['2x tfc_gourmet:sliced_cabbage'], + circuit: 1, + itemOutputProvider: TFC.isp.of('2x tfc_gourmet:sliced_cabbage').copyOldestFood() + }); + global.processorRecipe(event, 'borscht', 300, GTValues.VA[GTValues.LV], { - itemInputs: ['tfc:food/beet', 'tfc:food/cabbage', 'tfc:food/carrot', 'tfc:food/onion', 'tfc:food/tomato', '3x #tfc:bowls'], + itemInputs: ['tfc:food/beet', 'tfc_gourmet:sliced_cabbage', 'tfc:food/carrot', 'tfc:food/onion', '#tfc:foods/cooked_meats', '3x #tfc:bowls'], fluidInputs: ['minecraft:water 1000'], - itemOutputs: ['3x tfc_gurman:borscht'], + itemOutputs: ['3x tfc_gourmet:borscht'], circuit: 20, - itemOutputProvider: TFC.isp.of('3x tfc_gurman:borscht').simpleModifier('tfg:force_add_bowl').copyOldestFood() + itemOutputProvider: TFC.isp.of('3x tfc_gourmet:borscht').simpleModifier('tfg:force_add_bowl').copyOldestFood() }); // Schi global.processorRecipe(event, 'schi', 300, GTValues.VA[GTValues.LV], { itemInputs: ['2x tfc:food/cabbage', 'tfc:food/carrot', 'tfc:food/onion', 'tfc:food/tomato', '3x #tfc:bowls'], fluidInputs: ['minecraft:water 1000'], - itemOutputs: ['3x tfc_gurman:schi'], + itemOutputs: ['3x tfc_gourmet:schi'], circuit: 20, - itemOutputProvider: TFC.isp.of('3x tfc_gurman:schi').simpleModifier('tfg:force_add_bowl').copyOldestFood() + itemOutputProvider: TFC.isp.of('3x tfc_gourmet:schi').simpleModifier('tfg:force_add_bowl').copyOldestFood() }); // Coffee global.processorRecipe(event, 'coffee', 1000, GTValues.VHA[GTValues.LV], { itemInputs: ['2x firmalife:food/roasted_cocoa_beans'], fluidInputs: ['minecraft:water 1000'], - fluidOutputs: ['tfc_gurman:coffee 1000'], + fluidOutputs: ['tfc_gourmet:coffee 1000'], circuit: 2 }); @@ -87,23 +101,23 @@ function registerTFCGurmanRecipes(event) { global.processorRecipe(event, 'cocoa', 1000, GTValues.VHA[GTValues.LV], { itemInputs: ['2x firmalife:food/cocoa_powder'], fluidInputs: ['#tfc:milks 1000'], - fluidOutputs: ['tfc_gurman:cocoa 1000'], + fluidOutputs: ['tfc_gourmet:cocoa 1000'], circuit: 1 }); // Compote global.processorRecipe(event, 'compote', 1000, GTValues.VHA[GTValues.LV], { - itemInputs: ['2x #tfc:foods/fruits'], + itemInputs: ['2x #tfc_gourmet:compote_fruits'], fluidInputs: ['minecraft:water 1000'], - fluidOutputs: ['tfc_gurman:compote 1000'], + fluidOutputs: ['tfc_gourmet:compote 1000'], circuit: 6 }); // Lemonade global.processorRecipe(event, 'lemonade', 1500, GTValues.VHA[GTValues.LV], { - itemInputs: ['2x tfc:food/lemon', '#tfc:sweetener'], + itemInputs: ['2x tfc:food/lemon'], fluidInputs: ['minecraft:water 1000'], - fluidOutputs: ['tfc_gurman:lemonade 1000'], + fluidOutputs: ['tfc_gourmet:lemonade 1000'], circuit: 2 }); @@ -111,39 +125,39 @@ function registerTFCGurmanRecipes(event) { global.processorRecipe(event, 'kvass', 2400, GTValues.VHA[GTValues.LV], { itemInputs: ['2x #tfc:foods/grains'], fluidInputs: ['minecraft:water 1000'], - fluidOutputs: ['tfc_gurman:kvass 1000'], + fluidOutputs: ['tfc_gourmet:kvass 1000'], circuit: 2 }); // Tea Mint global.processorRecipe(event, 'tea_mint', 200, GTValues.VHA[GTValues.LV], { - itemInputs: ['2x tfc_gurman:dried_mint_leaves'], + itemInputs: ['2x tfc_gourmet:dried_mint_leaves'], fluidInputs: ['minecraft:water 1000'], - fluidOutputs: ['tfc_gurman:tea_mint 1000'], + fluidOutputs: ['tfc_gourmet:tea_mint 1000'], circuit: 2 }); // Tea Chamomile global.processorRecipe(event, 'tea_chamomile', 200, GTValues.VHA[GTValues.LV], { - itemInputs: ['2x tfc_gurman:dried_chamomile_leaves'], + itemInputs: ['2x tfc_gourmet:dried_chamomile_leaves'], fluidInputs: ['minecraft:water 1000'], - fluidOutputs: ['tfc_gurman:tea_chamomile 1000'], + fluidOutputs: ['tfc_gourmet:tea_chamomile 1000'], circuit: 2 }); // Tea Rosehip global.processorRecipe(event, 'tea_rosehip', 200, GTValues.VHA[GTValues.LV], { - itemInputs: ['2x tfc_gurman:dried_rosehip_leaves'], + itemInputs: ['2x tfc_gourmet:dried_rosehip_leaves'], fluidInputs: ['minecraft:water 1000'], - fluidOutputs: ['tfc_gurman:tea_rosehip 1000'], + fluidOutputs: ['tfc_gourmet:tea_rosehip 1000'], circuit: 2 }); // Tea Nettle global.processorRecipe(event, 'tea_nettle', 200, GTValues.VHA[GTValues.LV], { - itemInputs: ['2x tfc_gurman:dried_nettle_leaves'], + itemInputs: ['2x tfc_gourmet:dried_nettle_leaves'], fluidInputs: ['minecraft:water 1000'], - fluidOutputs: ['tfc_gurman:tea_nettle 1000'], + fluidOutputs: ['tfc_gourmet:tea_nettle 1000'], circuit: 2 }); @@ -151,198 +165,338 @@ function registerTFCGurmanRecipes(event) { global.processorRecipe(event, 'solyanka', 300, GTValues.VA[GTValues.LV], { itemInputs: ['#tfc:foods/meats', 'tfc:food/cabbage', 'tfc:food/onion', 'tfc:food/tomato', 'tfc:food/olive', '3x #tfc:bowls'], fluidInputs: ['minecraft:water 1000'], - itemOutputs: ['3x tfc_gurman:solyanka'], + itemOutputs: ['3x tfc_gourmet:solyanka'], circuit: 20, - itemOutputProvider: TFC.isp.of('3x tfc_gurman:solyanka').simpleModifier('tfg:force_add_bowl').copyOldestFood() + itemOutputProvider: TFC.isp.of('3x tfc_gourmet:solyanka').simpleModifier('tfg:force_add_bowl').copyOldestFood() }); // Okroshka global.processorRecipe(event, 'okroshka', 300, GTValues.VA[GTValues.LV], { itemInputs: ['tfc:food/cabbage', 'tfc:food/tomato', 'tfc:food/potato', 'tfc:food/onion', '#firmalife:foods/raw_eggs', '3x #tfc:bowls'], - fluidInputs: ['tfc_gurman:kvass 1000'], - itemOutputs: ['3x tfc_gurman:okroshka'], + fluidInputs: ['tfc_gourmet:kvass 1000'], + itemOutputs: ['3x tfc_gourmet:okroshka'], circuit: 20, - itemOutputProvider: TFC.isp.of('3x tfc_gurman:okroshka').simpleModifier('tfg:force_add_bowl').copyOldestFood() + itemOutputProvider: TFC.isp.of('3x tfc_gourmet:okroshka').simpleModifier('tfg:force_add_bowl').copyOldestFood() }); // Zama global.processorRecipe(event, 'zama', 300, GTValues.VA[GTValues.LV], { itemInputs: ['tfc:food/chicken', 'tfc:food/carrot', 'tfc:food/onion', 'tfc:powder/salt', 'tfc:food/garlic', '3x #tfc:bowls'], fluidInputs: ['minecraft:water 1000'], - itemOutputs: ['3x tfc_gurman:zama'], + itemOutputs: ['3x tfc_gourmet:zama'], circuit: 20, - itemOutputProvider: TFC.isp.of('3x tfc_gurman:zama').simpleModifier('tfg:force_add_bowl').copyOldestFood() + itemOutputProvider: TFC.isp.of('3x tfc_gourmet:zama').simpleModifier('tfg:force_add_bowl').copyOldestFood() }); // Curry global.processorRecipe(event, 'curry', 300, GTValues.VA[GTValues.LV], { itemInputs: ['#tfc:foods/cooked_meats', '#tfc:foods/vegetables', 'tfc:powder/salt', 'tfc:food/cooked_rice', '3x #tfc:bowls'], fluidInputs: ['#tfc:milks 1000'], - itemOutputs: ['3x tfc_gurman:curry'], + itemOutputs: ['3x tfc_gourmet:curry'], circuit: 16, - itemOutputProvider: TFC.isp.of('3x tfc_gurman:curry').simpleModifier('tfg:force_add_bowl').copyOldestFood() + itemOutputProvider: TFC.isp.of('3x tfc_gourmet:curry').simpleModifier('tfg:force_add_bowl').copyOldestFood() }); // Goulash global.processorRecipe(event, 'goulash', 300, GTValues.VA[GTValues.LV], { itemInputs: ['#tfc:foods/raw_meats', 'tfc:food/onion', 'tfc:food/potato', 'tfc:powder/salt', '3x #tfc:bowls'], fluidInputs: ['minecraft:water 100'], - itemOutputs: ['3x tfc_gurman:goulash'], + itemOutputs: ['3x tfc_gourmet:goulash'], circuit: 16, - itemOutputProvider: TFC.isp.of('3x tfc_gurman:goulash').simpleModifier('tfg:force_add_bowl').copyOldestFood() + itemOutputProvider: TFC.isp.of('3x tfc_gourmet:goulash').simpleModifier('tfg:force_add_bowl').copyOldestFood() }); // Pho global.processorRecipe(event, 'pho', 300, GTValues.VA[GTValues.LV], { itemInputs: ['firmalife:food/cooked_pasta', '#tfc:foods/cooked_meats', 'tfc:food/garlic', 'tfc:powder/salt', '3x #tfc:bowls'], fluidInputs: ['minecraft:water 100'], - itemOutputs: ['3x tfc_gurman:pho'], + itemOutputs: ['3x tfc_gourmet:pho'], circuit: 16, - itemOutputProvider: TFC.isp.of('3x tfc_gurman:pho').simpleModifier('tfg:force_add_bowl').copyOldestFood() + itemOutputProvider: TFC.isp.of('3x tfc_gourmet:pho').simpleModifier('tfg:force_add_bowl').copyOldestFood() }); // Bouillabaisse global.processorRecipe(event, 'bouillabaisse', 300, GTValues.VA[GTValues.LV], { itemInputs: ['#firmalife:foods/raw_fish', 'tfc:food/tomato', 'tfc:food/onion', 'tfc:food/garlic', 'tfc:powder/salt', '3x #tfc:bowls'], fluidInputs: ['minecraft:water 1000'], - itemOutputs: ['3x tfc_gurman:bouillabaisse'], + itemOutputs: ['3x tfc_gourmet:bouillabaisse'], circuit: 16, - itemOutputProvider: TFC.isp.of('3x tfc_gurman:bouillabaisse').simpleModifier('tfg:force_add_bowl').copyOldestFood() + itemOutputProvider: TFC.isp.of('3x tfc_gourmet:bouillabaisse').simpleModifier('tfg:force_add_bowl').copyOldestFood() }); // Ramen with Beef global.processorRecipe(event, 'ramen_beef', 300, GTValues.VA[GTValues.LV], { itemInputs: ['firmalife:food/raw_egg_noodles', '#firmalife:foods/raw_eggs', 'tfc:food/beef', 'tfc:food/onion', '2x #tfc:bowls'], fluidInputs: ['minecraft:water 1000'], - itemOutputs: ['2x tfc_gurman:ramen_with_beef'], + itemOutputs: ['2x tfc_gourmet:ramen_with_beef'], circuit: 21, - itemOutputProvider: TFC.isp.of('2x tfc_gurman:ramen_with_beef').simpleModifier('tfg:force_add_bowl').copyOldestFood() + itemOutputProvider: TFC.isp.of('2x tfc_gourmet:ramen_with_beef').simpleModifier('tfg:force_add_bowl').copyOldestFood() }); // Ramen with Camelidae global.processorRecipe(event, 'ramen_camelidae', 300, GTValues.VA[GTValues.LV], { itemInputs: ['firmalife:food/raw_egg_noodles', '#firmalife:foods/raw_eggs', 'tfc:food/camelidae', 'tfc:food/onion', '2x #tfc:bowls'], fluidInputs: ['minecraft:water 1000'], - itemOutputs: ['2x tfc_gurman:ramen_with_camelidae'], + itemOutputs: ['2x tfc_gourmet:ramen_with_camelidae'], circuit: 21, - itemOutputProvider: TFC.isp.of('2x tfc_gurman:ramen_with_camelidae').simpleModifier('tfg:force_add_bowl').copyOldestFood() + itemOutputProvider: TFC.isp.of('2x tfc_gourmet:ramen_with_camelidae').simpleModifier('tfg:force_add_bowl').copyOldestFood() }); // Ramen with Chevon global.processorRecipe(event, 'ramen_chevon', 300, GTValues.VA[GTValues.LV], { itemInputs: ['firmalife:food/raw_egg_noodles', '#firmalife:foods/raw_eggs', 'tfc:food/chevon', 'tfc:food/onion', '2x #tfc:bowls'], fluidInputs: ['minecraft:water 1000'], - itemOutputs: ['2x tfc_gurman:ramen_with_chevon'], + itemOutputs: ['2x tfc_gourmet:ramen_with_chevon'], circuit: 21, - itemOutputProvider: TFC.isp.of('2x tfc_gurman:ramen_with_chevon').simpleModifier('tfg:force_add_bowl').copyOldestFood() + itemOutputProvider: TFC.isp.of('2x tfc_gourmet:ramen_with_chevon').simpleModifier('tfg:force_add_bowl').copyOldestFood() }); // Ramen with Bacon global.processorRecipe(event, 'ramen_bacon', 300, GTValues.VA[GTValues.LV], { itemInputs: ['firmalife:food/raw_egg_noodles', '#firmalife:foods/raw_eggs', 'firmalife:food/bacon', 'tfc:food/onion', '2x #tfc:bowls'], fluidInputs: ['minecraft:water 1000'], - itemOutputs: ['2x tfc_gurman:ramen_with_bacon'], + itemOutputs: ['2x tfc_gourmet:ramen_with_bacon'], circuit: 21, - itemOutputProvider: TFC.isp.of('2x tfc_gurman:ramen_with_bacon').simpleModifier('tfg:force_add_bowl').copyOldestFood() + itemOutputProvider: TFC.isp.of('2x tfc_gourmet:ramen_with_bacon').simpleModifier('tfg:force_add_bowl').copyOldestFood() }); // Biryani global.processorRecipe(event, 'biryani', 300, GTValues.VA[GTValues.LV], { itemInputs: ['tfc:food/rice_grain', '#tfc:foods/meats', 'tfc:food/onion', 'tfc:food/carrot', 'tfc:food/tomato', '3x #tfc:bowls'], fluidInputs: ['minecraft:water 1000'], - itemOutputs: ['3x tfc_gurman:biryani'], + itemOutputs: ['3x tfc_gourmet:biryani'], circuit: 20, - itemOutputProvider: TFC.isp.of('3x tfc_gurman:biryani').simpleModifier('tfg:force_add_bowl').copyOldestFood() + itemOutputProvider: TFC.isp.of('3x tfc_gourmet:biryani').simpleModifier('tfg:force_add_bowl').copyOldestFood() }); // Fried Rice global.processorRecipe(event, 'fried_rice', 300, GTValues.VA[GTValues.LV], { itemInputs: ['tfc:food/cooked_rice', '#forge:eggs', '#tfc:foods/vegetables', 'tfc:powder/salt', '3x #tfc:bowls'], fluidInputs: ['minecraft:water 100'], - itemOutputs: ['3x tfc_gurman:fried_rice'], + itemOutputs: ['3x tfc_gourmet:fried_rice'], circuit: 16, - itemOutputProvider: TFC.isp.of('3x tfc_gurman:fried_rice').simpleModifier('tfg:force_add_bowl').copyOldestFood() + itemOutputProvider: TFC.isp.of('3x tfc_gourmet:fried_rice').simpleModifier('tfg:force_add_bowl').copyOldestFood() }); // Kimchi global.processorRecipe(event, 'kimchi', 300, GTValues.VA[GTValues.LV], { itemInputs: ['tfc:food/cabbage', 'tfc:food/carrot', 'tfc:food/onion', 'tfc:food/garlic', 'tfc:powder/salt', '3x #tfc:bowls'], fluidInputs: ['minecraft:water 1000'], - itemOutputs: ['3x tfc_gurman:kimchi'], + itemOutputs: ['3x tfc_gourmet:kimchi'], circuit: 20, - itemOutputProvider: TFC.isp.of('3x tfc_gurman:kimchi').simpleModifier('tfg:force_add_bowl').copyOldestFood() + itemOutputProvider: TFC.isp.of('3x tfc_gourmet:kimchi').simpleModifier('tfg:force_add_bowl').copyOldestFood() }); // Dolma global.processorRecipe(event, 'dolma', 300, GTValues.VA[GTValues.LV], { - itemInputs: ['#tfc:foods/meats', 'tfc:food/rice_grain', 'tfc:powder/salt', '2x #tfc:bowls'], + itemInputs: ['#tfc:foods/meats', 'tfc:food/rice_grain', 'tfc:powder/salt', 'firmalife:fruit_leaf', '2x #tfc:bowls'], fluidInputs: ['minecraft:water 1000'], - itemOutputs: ['2x tfc_gurman:dolma'], + itemOutputs: ['2x tfc_gourmet:dolma'], circuit: 16, - itemOutputProvider: TFC.isp.of('2x tfc_gurman:dolma').simpleModifier('tfg:force_add_bowl').copyOldestFood() + itemOutputProvider: TFC.isp.of('2x tfc_gourmet:dolma').simpleModifier('tfg:force_add_bowl').copyOldestFood() }); // Spaghetti Bolognese global.processorRecipe(event, 'spaghetti_bolognese', 300, GTValues.VA[GTValues.LV], { itemInputs: ['firmalife:food/cooked_pasta', '#tfc:foods/cooked_meats', 'tfc:food/tomato', 'tfc:food/onion', 'tfc:food/garlic', '3x #tfc:bowls'], fluidInputs: ['minecraft:water 500'], - itemOutputs: ['3x tfc_gurman:spaghetti_bolognese'], + itemOutputs: ['3x tfc_gourmet:spaghetti_bolognese'], circuit: 18, - itemOutputProvider: TFC.isp.of('3x tfc_gurman:spaghetti_bolognese').simpleModifier('tfg:force_add_bowl').copyOldestFood() + itemOutputProvider: TFC.isp.of('3x tfc_gourmet:spaghetti_bolognese').simpleModifier('tfg:force_add_bowl').copyOldestFood() }); // Pasta Carbonara global.processorRecipe(event, 'pasta_carbonara', 300, GTValues.VA[GTValues.LV], { itemInputs: ['firmalife:food/cooked_pasta', 'firmalife:food/bacon', '#firmalife:foods/raw_eggs', 'firmalife:food/shredded_cheese', 'tfc:powder/salt', '3x #tfc:bowls'], fluidInputs: ['minecraft:water 500'], - itemOutputs: ['3x tfc_gurman:pasta_carbonara'], + itemOutputs: ['3x tfc_gourmet:pasta_carbonara'], circuit: 18, - itemOutputProvider: TFC.isp.of('3x tfc_gurman:pasta_carbonara').simpleModifier('tfg:force_add_bowl').copyOldestFood() + itemOutputProvider: TFC.isp.of('3x tfc_gourmet:pasta_carbonara').simpleModifier('tfg:force_add_bowl').copyOldestFood() }); // Ratatouille global.processorRecipe(event, 'ratatouille', 300, GTValues.VA[GTValues.LV], { itemInputs: ['tfc:food/tomato', 'tfc:food/pumpkin_chunks', 'tfc:food/carrot', 'tfc:food/onion', 'tfc:food/garlic', '3x #tfc:bowls'], fluidInputs: ['minecraft:water 500'], - itemOutputs: ['3x tfc_gurman:ratatouille'], + itemOutputs: ['3x tfc_gourmet:ratatouille'], circuit: 18, - itemOutputProvider: TFC.isp.of('3x tfc_gurman:ratatouille').simpleModifier('tfg:force_add_bowl').copyOldestFood() + itemOutputProvider: TFC.isp.of('3x tfc_gourmet:ratatouille').simpleModifier('tfg:force_add_bowl').copyOldestFood() }); // Risotto global.processorRecipe(event, 'risotto', 300, GTValues.VA[GTValues.LV], { itemInputs: ['tfc:food/rice_grain', '#firmalife:foods/cheeses', '#tfc:foods/vegetables', '2x #tfc:bowls'], fluidInputs: ['minecraft:water 100'], - itemOutputs: ['3x tfc_gurman:risotto'], + itemOutputs: ['3x tfc_gourmet:risotto'], circuit: 18, - itemOutputProvider: TFC.isp.of('3x tfc_gurman:risotto').simpleModifier('tfg:force_add_bowl').copyOldestFood() + itemOutputProvider: TFC.isp.of('3x tfc_gourmet:risotto').simpleModifier('tfg:force_add_bowl').copyOldestFood() }); // Porridge global.processorRecipe(event, 'porridge', 300, GTValues.VA[GTValues.LV], { itemInputs: ['#tfc:foods/grains', 'tfc:powder/salt', '#tfc:bowls'], fluidInputs: ['minecraft:water 250'], - itemOutputs: ['tfc_gurman:porridge'], + itemOutputs: ['tfc_gourmet:porridge'], circuit: 18, - itemOutputProvider: TFC.isp.of('tfc_gurman:porridge').simpleModifier('tfg:force_add_bowl').copyOldestFood() + itemOutputProvider: TFC.isp.of('tfc_gourmet:porridge').simpleModifier('tfg:force_add_bowl').copyOldestFood() }); // Mamaliga global.processorRecipe(event, 'mamaliga', 300, GTValues.VA[GTValues.LV], { itemInputs: ['tfc:food/maize_grain', 'tfc:powder/salt', '#tfc:bowls'], fluidInputs: ['minecraft:water 1000'], - itemOutputs: ['tfc_gurman:mamaliga'], + itemOutputs: ['tfc_gourmet:mamaliga'], circuit: 16, - itemOutputProvider: TFC.isp.of('tfc_gurman:mamaliga').simpleModifier('tfg:force_add_bowl').copyOldestFood() + itemOutputProvider: TFC.isp.of('tfc_gourmet:mamaliga').simpleModifier('tfg:force_add_bowl').copyOldestFood() }); // Adjika global.processorRecipe(event, 'adjika', 300, GTValues.VA[GTValues.LV], { - itemInputs: ['tfc:food/green_bell_pepper', 'tfc:food/red_bell_pepper', 'tfc:powder/salt', 'tfc:food/garlic', 'firmalife:plant/cilantro', '5x #tfc:bowls'], + itemInputs: ['#tfc:food/bell_peppers', '#tfc:food/bell_peppers', 'tfc:powder/salt', 'tfc:food/garlic', "tfg:spice/cilantro_leaves", '5x #tfc:bowls'], fluidInputs: ['minecraft:water 500'], - itemOutputs: ['5x tfc_gurman:adjika'], + itemOutputs: ['5x tfc_gourmet:adjika'], circuit: 8, - itemOutputProvider: TFC.isp.of('5x tfc_gurman:adjika').simpleModifier('tfg:force_add_bowl').copyOldestFood() + itemOutputProvider: TFC.isp.of('5x tfc_gourmet:adjika').simpleModifier('tfg:force_add_bowl').copyOldestFood() + }); + + // Onion soup with bread + global.processorRecipe(event, 'onion_soup_with_bread', 300, GTValues.VA[GTValues.LV], { + itemInputs: ['2x tfc:food/onion', '#firmalife:foods/flatbreads', '#firmalife:foods/cheeses', 'tfc:powder/salt', '#tfc:bowls'], + fluidInputs: ['minecraft:water 1000'], + itemOutputs: ['3x tfc_gourmet:fresh_onion_soup_bread'], + circuit: 16, + itemOutputProvider: TFC.isp.of('3x tfc_gourmet:fresh_onion_soup_bread').simpleModifier('tfg:force_add_bowl').copyOldestFood() + }); + + // Lentil soup + global.processorRecipe(event, 'lentil_soup', 300, GTValues.VA[GTValues.LV], { + itemInputs: ['2x tfc:food/soybean', 'tfc:food/onion', 'tfc:food/garlic', 'tfc:powder/salt', '#tfc:bowls'], + fluidInputs: ['minecraft:water 1000'], + itemOutputs: ['3x tfc_gourmet:lent_soup'], + circuit: 16, + itemOutputProvider: TFC.isp.of('3x tfc_gourmet:lent_soup').simpleModifier('tfg:force_add_bowl').copyOldestFood() + }); + + // Gazpacho + global.processorRecipe(event, 'gazpacho', 300, GTValues.VA[GTValues.LV], { + itemInputs: ['2x tfc:food/tomato', '#tfc:food/bell_peppers', '#firmalife:foods/flatbreads', 'tfc:food/garlic', '#tfc:bowls'], + fluidInputs: ['minecraft:water 1000'], + itemOutputs: ['3x tfc_gourmet:gazpacho'], + circuit: 16, + itemOutputProvider: TFC.isp.of('3x tfc_gourmet:gazpacho').simpleModifier('tfg:force_add_bowl').copyOldestFood() + }); + + // Kharcho + global.processorRecipe(event, 'kharcho', 300, GTValues.VA[GTValues.LV], { + itemInputs: ['tfc_gourmet:plant_mix', 'tfc:food/garlic', 'tfc:food/onion', 'tfc:food/rice_grain', 'tfc:food/cooked_beef'], + fluidInputs: ['minecraft:water 1000'], + itemOutputs: ['3x tfc_gourmet:kharcho'], + circuit: 16, + itemOutputProvider: TFC.isp.of('3x tfc_gourmet:kharcho').simpleModifier('tfg:force_add_bowl').copyOldestFood() + }); + + // Kholodnik + global.processorRecipe(event, 'kholodnik', 300, GTValues.VA[GTValues.LV], { + itemInputs: ['tfc:food/potato', '2x tfc:food/beet', '#forge:eggs', 'tfc:powder/salt'], + fluidInputs: ['minecraft:water 1000'], + itemOutputs: ['3x tfc_gourmet:kholodnik'], + circuit: 16, + itemOutputProvider: TFC.isp.of('3x tfc_gourmet:kholodnik').simpleModifier('tfg:force_add_bowl').copyOldestFood() + }); + + // Shurpa + global.processorRecipe(event, 'shurpa', 300, GTValues.VA[GTValues.LV], { + itemInputs: ['#tfc:food/bell_peppers', 'tfc:food/onion', 'tfc:food/potato', 'tfc:food/cooked_mutton', 'tfc:powder/salt'], + fluidInputs: ['minecraft:water 1000'], + itemOutputs: ['3x tfc_gourmet:shurpa'], + circuit: 16, + itemOutputProvider: TFC.isp.of('3x tfc_gourmet:shurpa').simpleModifier('tfg:force_add_bowl').copyOldestFood() + }); + global.processorRecipe(event, 'shurpa2', 300, GTValues.VA[GTValues.LV], { + itemInputs: ['#tfc:food/bell_peppers', 'tfc:food/onion', 'tfc:food/potato', 'tfc:food/cooked_beef', 'tfc:powder/salt'], + fluidInputs: ['minecraft:water 1000'], + itemOutputs: ['3x tfc_gourmet:shurpa'], + circuit: 16, + itemOutputProvider: TFC.isp.of('3x tfc_gourmet:shurpa').simpleModifier('tfg:force_add_bowl').copyOldestFood() + }); + + // Fish tomato soup + global.processorRecipe(event, 'fish_tomato_soup', 300, GTValues.VA[GTValues.LV], { + itemInputs: ['#firmalife:foods/raw_fish', 'tfc:food/tomato', 'tfc:food/onion', 'tfc:food/garlic', 'tfc:powder/salt'], + fluidInputs: ['minecraft:water 1000'], + itemOutputs: ['3x tfc_gourmet:fish_soup_tomato'], + circuit: 20, + itemOutputProvider: TFC.isp.of('3x tfc_gourmet:fish_soup_tomato').simpleModifier('tfg:force_add_bowl').copyOldestFood() + }); + + // Pea soup + global.processorRecipe(event, 'pea_soup', 300, GTValues.VA[GTValues.LV], { + itemInputs: ['2x tfc:food/green_bean', 'tfc:food/onion', '#tfc:foods/cooked_meats', 'tfc:powder/salt'], + fluidInputs: ['minecraft:water 1000'], + itemOutputs: ['3x tfc_gourmet:pea_soup'], + circuit: 16, + itemOutputProvider: TFC.isp.of('3x tfc_gourmet:pea_soup').simpleModifier('tfg:force_add_bowl').copyOldestFood() + }); + + // Minestrone + global.processorRecipe(event, 'minestrone', 300, GTValues.VA[GTValues.LV], { + itemInputs: ['tfc:food/rice_grain', 'tfc:food/carrot', 'tfc:food/onion', 'tfc:food/garlic', '#tfc:foods/cooked_meats'], + fluidInputs: ['minecraft:water 1000'], + itemOutputs: ['3x tfc_gourmet:minestrone'], + circuit: 20, + itemOutputProvider: TFC.isp.of('3x tfc_gourmet:minestrone').simpleModifier('tfg:force_add_bowl').copyOldestFood() + }); + global.processorRecipe(event, 'minestrone2', 300, GTValues.VA[GTValues.LV], { + itemInputs: ['firmalife:food/raw_egg_noodles', 'tfc:food/carrot', 'tfc:food/onion', 'tfc:food/garlic', '#tfc:foods/cooked_meats'], + fluidInputs: ['minecraft:water 1000'], + itemOutputs: ['3x tfc_gourmet:minestrone'], + circuit: 20, + itemOutputProvider: TFC.isp.of('3x tfc_gourmet:minestrone').simpleModifier('tfg:force_add_bowl').copyOldestFood() + }); + + // Fish soup + global.processorRecipe(event, 'fish_soup', 300, GTValues.VA[GTValues.LV], { + itemInputs: ['#firmalife:foods/raw_fish', 'tfc:food/onion', 'tfc:food/potato', 'tfc:powder/salt'], + fluidInputs: ['minecraft:water 1000'], + itemOutputs: ['3x tfc_gourmet:fish_soup'], + circuit: 20, + itemOutputProvider: TFC.isp.of('3x tfc_gourmet:fish_soup').simpleModifier('tfg:force_add_bowl').copyOldestFood() + }); + + // French onion soup with toast + global.processorRecipe(event, 'french_onion_soup', 300, GTValues.VA[GTValues.LV], { + itemInputs: ['2x tfc:food/onion', '#firmalife:foods/slices', '#firmalife:foods/cheeses', 'tfc:powder/salt'], + fluidInputs: ['minecraft:water 1000'], + itemOutputs: ['3x tfc_gourmet:fresh_onion_soup'], + circuit: 20, + itemOutputProvider: TFC.isp.of('3x tfc_gourmet:fresh_onion_soup').simpleModifier('tfg:force_add_bowl').copyOldestFood() + }); + + // Raw Croissants + global.processorRecipe(event, 'raw_croissants', 300, GTValues.VA[GTValues.LV], { + itemInputs: ['#tfc:foods/flour', 'firmalife:food/butter', '#forge:eggs'], + fluidInputs: ['minecraft:water 1000'], + itemOutputs: ['2x tfc_gourmet:raw_croissants'], + circuit: 20, + itemOutputProvider: TFC.isp.of('2x tfc_gourmet:raw_croissants').copyOldestFood() + }); + + // Raw crepes + global.processorRecipe(event, 'raw_crepes', 300, GTValues.VA[GTValues.LV], { + itemInputs: ['#tfc:foods/flour', 'firmalife:food/butter', '#forge:eggs'], + fluidInputs: ['#tfc:milks 500'], + itemOutputs: ['2x tfc_gourmet:raw_crepes'], + circuit: 20, + itemOutputProvider: TFC.isp.of('2x tfc_gourmet:raw_crepes').copyOldestFood() + }); + + // Oladyi + global.processorRecipe(event, 'raw_oladyi', 300, GTValues.VA[GTValues.LV], { + itemInputs: ['2x #tfc:foods/dough'], + fluidInputs: ['#tfc:milks 500'], + itemOutputs: ['2x tfc_gourmet:raw_oladyi'], + circuit: 20, + itemOutputProvider: TFC.isp.of('2x tfc_gourmet:raw_oladyi').copyOldestFood() }); //#endregion @@ -351,54 +505,93 @@ function registerTFCGurmanRecipes(event) { global.processorRecipeText(event, 'dried_mint', 200, GTValues.VA[GTValues.LV], "tfg.food_recipe.drying", { itemInputs: ["tfc:plant/foxglove"], fluidInputs: ['gtceu:nitrogen 100'], - itemOutputs: ["tfc_gurman:dried_mint_leaves"], + itemOutputs: ["tfc_gourmet:dried_mint_leaves"], circuit: 6 }); global.processorRecipeText(event, 'dried_chamomile', 200, GTValues.VA[GTValues.LV], "tfg.food_recipe.drying", { itemInputs: ["tfc:plant/lilac"], fluidInputs: ['gtceu:nitrogen 100'], - itemOutputs: ["tfc_gurman:dried_chamomile_leaves"], + itemOutputs: ["tfc_gourmet:dried_chamomile_leaves"], circuit: 6 }); global.processorRecipeText(event, 'dried_rosehip', 200, GTValues.VA[GTValues.LV], "tfg.food_recipe.drying", { itemInputs: ["tfc:plant/rose"], fluidInputs: ['gtceu:nitrogen 100'], - itemOutputs: ["tfc_gurman:dried_rosehip_leaves"], + itemOutputs: ["tfc_gourmet:dried_rosehip_leaves"], circuit: 6 }); global.processorRecipeText(event, 'dried_nettle', 200, GTValues.VA[GTValues.LV], "tfg.food_recipe.drying", { itemInputs: ["tfc:plant/trillium"], fluidInputs: ['gtceu:nitrogen 100'], - itemOutputs: ["tfc_gurman:dried_nettle_leaves"], + itemOutputs: ["tfc_gourmet:dried_nettle_leaves"], circuit: 6 }); // #endregion Drying - // #region Crafting table foods - - // TODO: unfinished - global.processorRecipe(event, 'margarita_pizza', 300, GTValues.VA[GTValues.LV], { - itemInputs: ['firmalife:food/pizza_dough', 'firmalife:food/shredded_cheese', 'tfc:food/tomato', 'tfc:food/red_bell_pepper', 'tfc_gurman:plant_mix', 'firmalife:food/tomato_sauce'], - itemOutputs: ['tfc_gurman:raw_margarita_pizza'], - circuit: 4, - itemOutputProvider: TFC.isp.of('tfc_gurman:raw_margarita_pizza').simpleModifier('tfg:force_add_bowl').copyOldestFood() - }); - - // #endregion - // #region Replacements - event.replaceInput({ id: "tfc_gurman:crafting/tiramisu" }, "minecraft:sugar", "#tfg:sugars"); + event.replaceInput({ id: "tfc_gourmet:crafting/tiramisu" }, "minecraft:sugar", "#tfg:sugars"); - event.recipes.tfc.advanced_shapeless_crafting(TFC.isp.of('4x tfc_gurman:raw_takoyaki').copyOldestFood(), [ + event.shapeless('2x tfc_gourmet:plant_mix', [ + "2x firmalife:spice/basil_leaves", + "tfg:spice/oregano_leaves", + "tfg:spice/cilantro_leaves", + ]).id("tfc_gourmet:crafting/plant_mix") + + event.replaceInput({ id: "tfc_gourmet:pot/adjika_bowl" }, "firmalife:plant/cilantro", "tfg:spice/cilantro_leaves"); + + event.recipes.tfc.advanced_shapeless_crafting(TFC.isp.of('4x tfc_gourmet:raw_takoyaki').copyOldestFood(), [ TFC.ingredient.notRotten('tfg:food/raw_crawlermari'), TFC.ingredient.notRotten('#tfc:foods/flour'), TFC.ingredient.notRotten('#forge:eggs'), 'tfc:powder/salt' ]).id('tfg:shapeless/takoyaki_from_crawlermari'); + event.remove({ id: "tfc_gourmet:crafting/raw_pelmeni" }); + event.recipes.tfc.advanced_shapeless_crafting(TFC.isp.of(`2x tfc_gourmet:raw_pelmeni`).copyFood(), [ + TFC.ingredient.notRotten(`#tfc:foods/dough`), + TFC.ingredient.notRotten(`#tfc:foods/raw_meats`), + TFC.ingredient.notRotten(`#tfc:foods/dough`) + ]).id(`tfg:shapeless/raw_pelmeni`) + + event.remove({ id: "tfc_gourmet:crafting/raw_vareniki" }); + event.recipes.tfc.advanced_shapeless_crafting(TFC.isp.of(`tfc_gourmet:raw_vareniki`).copyFood(), [ + TFC.ingredient.notRotten(`#tfc:foods/dough`), + TFC.ingredient.notRotten(`#tfc:foods/vegetables`) + ]).id(`tfg:shapeless/raw_vareniki`) + + event.remove({ id: "tfc_gourmet:crafting/raw_oladyi" }); + event.recipes.tfc.advanced_shapeless_crafting(TFC.isp.of(`2x tfc_gourmet:raw_oladyi`).copyFood(), [ + TFC.ingredient.notRotten(`#tfc:foods/dough`), + TFC.ingredient.notRotten(`#tfc:foods/dough`), + TFC.ingredient.fluid(TFC.fluidStackIngredient('#tfc:milks', 500)) + ]).id(`tfg:shapeless/raw_oladyi`) + + event.remove({ id: "tfc_gourmet:crafting/raw_syrniki" }); + event.recipes.tfc.advanced_shapeless_crafting(TFC.isp.of(`2x tfc_gourmet:raw_syrniki`).copyFood(), [ + TFC.ingredient.notRotten(`#tfg:foods/cheeses`), + TFC.ingredient.notRotten(`#forge:eggs`), + TFC.ingredient.notRotten(`#tfc:foods/flour`) + ]).id(`tfg:shapeless/raw_syrniki`) + + event.remove({ id: "tfc_gourmet:crafting/raw_croissants" }); + event.recipes.tfc.advanced_shapeless_crafting(TFC.isp.of(`2x tfc_gourmet:raw_croissants`).copyFood(), [ + TFC.ingredient.notRotten(`#tfc:foods/flour`), + TFC.ingredient.notRotten(`firmalife:food/butter`), + TFC.ingredient.notRotten(`#forge:eggs`), + TFC.ingredient.fluid(TFC.fluidStackIngredient('minecraft:water', 1000)) + ]).id(`tfg:shapeless/raw_croissants`) + + event.remove({ id: "tfc_gourmet:crafting/raw_crepes" }); + event.recipes.tfc.advanced_shapeless_crafting(TFC.isp.of(`2x tfc_gourmet:raw_crepes`).copyFood(), [ + TFC.ingredient.notRotten(`#tfc:foods/flour`), + TFC.ingredient.notRotten(`firmalife:food/butter`), + TFC.ingredient.notRotten(`#forge:eggs`), + TFC.ingredient.fluid(TFC.fluidStackIngredient('#tfc:milks', 500)) + ]).id(`tfg:shapeless/raw_crepes`) + // #endregion } diff --git a/kubejs/server_scripts/tfcbetterbf/recipes.js b/kubejs/server_scripts/tfcbetterbf/recipes.js index 86cc9ad9e..941c5f5a5 100644 --- a/kubejs/server_scripts/tfcbetterbf/recipes.js +++ b/kubejs/server_scripts/tfcbetterbf/recipes.js @@ -4,16 +4,24 @@ * * @param {Internal.RecipesEventJS} event */ -const registerTFCBetterBFRecipes = (event) => { - event.remove("tfcbetterbf:heating/metal/insulation") - - event.recipes.tfc.heating('tfcbetterbf:insulation', 1535) - .resultFluid(Fluid.of('gtceu:iron', 432)) - .id(`tfcbetterbf:heating/insulation`) +const registerTFCBetterBFRecipes = (event) => { + event.remove("tfcbetterbf:heating/metal/insulation") - event.recipes.tfc.heating('tfcbetterbf:insulated_fire_bricks', 1535) - .resultFluid(Fluid.of('gtceu:iron', 432)) - .id(`tfcbetterbf:heating/insulated_fire_bricks`) + event.recipes.tfc.heating('tfcbetterbf:insulation', 1535) + .resultFluid(Fluid.of('gtceu:iron', 432)) + .id(`tfcbetterbf:heating/insulation`) - TFGHelpers.registerMaterialInfo('tfcbetterbf:insulated_fire_bricks', [GTMaterials.WroughtIron, 3]) + TFGHelpers.registerMaterialInfo('tfcbetterbf:insulation', [GTMaterials.WroughtIron, 3]) + + event.recipes.tfc.heating('tfcbetterbf:insulated_fire_bricks', 1535) + .resultFluid(Fluid.of('gtceu:iron', 432)) + .id(`tfcbetterbf:heating/insulated_fire_bricks`) + + TFGHelpers.registerMaterialInfo('tfcbetterbf:insulated_fire_bricks', [GTMaterials.get('tfg:refractory_clay'), 5, GTMaterials.WroughtIron, 3]) + + event.recipes.gtceu.packer('tfcbetterbf:insulated_fire_bricks') + .itemInputs('tfcbetterbf:insulated_fire_bricks') + .itemOutputs('tfc:fire_bricks', '3x tfcbetterbf:insulation') + .duration(20) + .EUt(2) } \ No newline at end of file diff --git a/kubejs/server_scripts/tfg/aquaponics/recipes.greenhouse.js b/kubejs/server_scripts/tfg/aquaponics/recipes.greenhouse.js index 84f2ea84e..aeeee27df 100644 --- a/kubejs/server_scripts/tfg/aquaponics/recipes.greenhouse.js +++ b/kubejs/server_scripts/tfg/aquaponics/recipes.greenhouse.js @@ -5,11 +5,11 @@ //#region Balancing Values /** Base duration of recipes in ticks. */ -const greenhouse_base_duration = 16 * 60 * 20; +const greenhouse_base_duration = 10 * 60 * 20; /** Duration multiplier for fertilized recipes. */ -const greenhouse_duration_multiplier_fertilized = 0.5; +const greenhouse_duration_multiplier_fertilized = 0.75; /** Duration multiplier for aquaponic recipes. */ -const greenhouse_duration_multiplier_aquaponics = 0.4; +const greenhouse_duration_multiplier_aquaponics = 0.5; /** Hydroponic facility chance multiplier. */ const hydroponics_facility_chance_multiplier = 1.25; @@ -35,10 +35,10 @@ const greenhouse_chanced_output_aquaponics = 80; /** @param {...DimensionIndex[]} - Dimension settings array */ const greenhouse_dimension_index = [ // Overworld settings are also used as the default when no dimension is specified. - {id: 'minecraft:overworld', fluid: '#tfg:clean_water', fluid_tier2: 'tfg:nitrate_rich_water', fluid_chance: 10, fertilizer: 'gtceu:fertilizer', eut: GTValues.VA[GTValues.LV], oxygenated: true}, - {id: 'minecraft:the_nether', fluid: '#tfg:clean_water', fluid_tier2: 'tfg:nitrate_rich_water', fluid_chance: 10, fertilizer: 'gtceu:fertilizer', eut: GTValues.VA[GTValues.LV], oxygenated: true}, - {id: 'ad_astra:moon', fluid: 'gtceu:helium_3', fluid_tier2: null, fluid_chance: 2, fertilizer: null, eut: GTValues.VA[GTValues.MV], oxygenated: null}, - {id: 'ad_astra:mars', fluid: 'tfg:semiheavy_ammoniacal_water', fluid_tier2: 'tfg:nitrate_rich_semiheavy_ammoniacal_water', fluid_chance: 10, fertilizer: 'gtceu:fertilizer', eut: GTValues.VA[GTValues.HV], oxygenated: null} + {id: 'minecraft:overworld', fluid: '#tfg:clean_water', fluid_tier2: 'tfg:nitrate_rich_water', fluid_chance: 10, fertilizer: 'gtceu:fertilizer', eut: GTValues.VHA[GTValues.LV], oxygenated: true}, + {id: 'minecraft:the_nether', fluid: '#tfg:clean_water', fluid_tier2: 'tfg:nitrate_rich_water', fluid_chance: 10, fertilizer: 'gtceu:fertilizer', eut: GTValues.VHA[GTValues.LV], oxygenated: true}, + {id: 'ad_astra:moon', fluid: 'gtceu:helium_3', fluid_tier2: null, fluid_chance: 2, fertilizer: null, eut: GTValues.VHA[GTValues.MV], oxygenated: null}, + {id: 'ad_astra:mars', fluid: 'tfg:semiheavy_ammoniacal_water', fluid_tier2: 'tfg:nitrate_rich_semiheavy_ammoniacal_water', fluid_chance: 10, fertilizer: 'gtceu:fertilizer', eut: GTValues.VHA[GTValues.HV], oxygenated: null} ]; //#endregion @@ -54,8 +54,9 @@ const greenhouse_dimension_index = [ * @param {Internal.ItemStack} input -Input Item (seeds, saplings, etc.) * @param {Internal.ItemStack|Internal.ItemStack[]} output -Output Items. If array, first item is guaranteed while rest use chanced output. Last item in array is used for the rest of the chance outputs. * @param {number|null} chance_multiplier -Multiplies output chances by this value. Defaults to 1. + * @param {number|null} circuit - Circuit number. 1-32. Or null. */ -function generateGreenHouseRecipe(event, dimension, input, output, chance_multiplier) { +function generateGreenHouseRecipe(event, dimension, input, output, chance_multiplier, circuit) { // Resolve dimension based modifier defaults by comparing to the `greenhouse_dimension_index` array. @@ -75,7 +76,7 @@ function generateGreenHouseRecipe(event, dimension, input, output, chance_multip const canFertilize = resolvedFertilizer !== null; /** @type {GTValues.EUt} - Resolved EUt value. Defaults to LV */ - const resolvedEUt = dimMods ? dimMods.eut : GTValues.VA[GTValues.LV]; + const resolvedEUt = dimMods ? dimMods.eut : GTValues.VHA[GTValues.LV]; /** @type {number} - Resolved fluid chance multiplied by 100. Defaults to 1000. */ const resolvedChance = dimMods ? (dimMods.fluid_chance * 100) : 1000; @@ -83,25 +84,37 @@ function generateGreenHouseRecipe(event, dimension, input, output, chance_multip /** @type {boolean|null} - Whether the recipe requires an oxygenated environment. Defaults to true. */ const requiresOxygen = dimMods ? dimMods.oxygenated : true; + /** @type {string} - Circuit number for the recipe id. Defaults to an empty string if not provided. */ + const idCircuit = (circuit === null || circuit === undefined) ? "" : `/${circuit}`; + ///////////////////////////////////////////////////////////////////////////////////////////////////// /** Collect errors. */ const errors = []; - if (input === undefined || Array.isArray(input)) { - errors.push("input is undefined or is an array"); + if (input === undefined || input === null || Array.isArray(input) || (typeof input === 'string' && input.trim() === '')) { + errors.push(`input is invalid: ${JSON.stringify(input)}`); }; + if (output !== undefined && !Array.isArray(output)) { output = [output]; - } - if (output === undefined || output.length === 0 || output.length > 4) { - errors.push("output is undefined or has invalid length"); + }; + + if (output === undefined || output === null || output.length === 0 || output.length > 4) { + errors.push(`output is invalid: ${JSON.stringify(output)}`); + } else { + output.forEach((o, idx) => { + if (o === undefined || o === null) { + errors.push(`output[${idx}] is null or undefined`); + }; + }); }; // If there are any errors, log them all and throw once. if (errors.length > 0) { - throw new TypeError(`Greenhouse recipe errors for recipe ID ${`tfg:greenhouse/${linuxUnfucker(input)}`}\n - ${errors.join("\n - ")}`); + console.error(`Greenhouse recipe error details:\n input: ${JSON.stringify(input)}\n output: ${JSON.stringify(output)}\n dimension: ${JSON.stringify(dimension)}\n circuit: ${JSON.stringify(circuit)}\n chance_multiplier: ${JSON.stringify(chance_multiplier)}`); + throw new TypeError(`Greenhouse recipe errors for recipe ID ${`tfg:greenhouse/${linuxUnfucker(input)}${idCircuit}`}\n - ${errors.join("\n - ")}`); }; //////////////////////////////////////////////////////////////////////////////////////////////////////// @@ -163,9 +176,8 @@ function generateGreenHouseRecipe(event, dimension, input, output, chance_multip //======================== Greenhouse Recipes ======================== // Base recipe. - let a = event.recipes.gtceu.greenhouse(`tfg:${linuxUnfucker(input)}`) + let a = event.recipes.gtceu.greenhouse(`tfg:${linuxUnfucker(input)}${idCircuit}`) .notConsumable(input) - .circuit(1) .itemOutputs(outputs_array[0]) .perTick(true) .chancedFluidInput(`${resolvedFluid} 1`, resolvedChance, 0) @@ -183,11 +195,13 @@ function generateGreenHouseRecipe(event, dimension, input, output, chance_multip a.chancedOutput(outputs_array[2], base_chance, 0) a.chancedOutput(outputs_array[3], base_chance, 0) }; + if (circuit !== null) { + a.circuit(circuit) + }; // Fertilized Recipe. - let b = event.recipes.gtceu.greenhouse(`tfg:${linuxUnfucker(input)}_fertilized`) + let b = event.recipes.gtceu.greenhouse(`tfg:${linuxUnfucker(input)}_fertilized${idCircuit}`) .notConsumable(input) - .circuit(2) .itemOutputs(outputs_array[0]) .perTick(true) .chancedFluidInput(`${resolvedFluid} 1`, resolvedChance, 0) @@ -206,11 +220,13 @@ function generateGreenHouseRecipe(event, dimension, input, output, chance_multip b.chancedOutput(outputs_array[3], fertilizer_chance, 0) b.itemInputs(Item.of(resolvedFertilizer, 8)) }; + if (circuit !== null) { + b.circuit(circuit + 1) + }; // Aquaponics Recipe. - let c = event.recipes.gtceu.greenhouse(`tfg:${linuxUnfucker(input)}_aquaponic`) + let c = event.recipes.gtceu.greenhouse(`tfg:${linuxUnfucker(input)}_aquaponic${idCircuit}`) .notConsumable(input) - .circuit(3) .itemOutputs(outputs_array[0]) .perTick(true) .chancedFluidInput(`${resolvedFluidTier2} 1`, resolvedChance, 0) @@ -228,14 +244,16 @@ function generateGreenHouseRecipe(event, dimension, input, output, chance_multip c.chancedOutput(outputs_array[2], aquaponic_chance, 0) c.chancedOutput(outputs_array[3], aquaponic_chance, 0) }; + if (circuit !== null) { + c.circuit(circuit + 2) + }; c.itemOutputs('tfg:flora_pellets'); //======================== Hydroponic Facility Recipes ======================== // Base recipe. - let d = event.recipes.gtceu.hydroponics_facility(`tfg:${linuxUnfucker(input)}`) + let d = event.recipes.gtceu.hydroponics_facility(`tfg:${linuxUnfucker(input)}${idCircuit}`) .notConsumable(input) - .circuit(1) .itemOutputs(outputs_array[0]) .perTick(true) .chancedFluidInput(`${resolvedFluid} 1`, resolvedChance, 0) @@ -250,11 +268,13 @@ function generateGreenHouseRecipe(event, dimension, input, output, chance_multip d.chancedOutput(outputs_array[2], hydroponics_base_chance, 0) d.chancedOutput(outputs_array[3], hydroponics_base_chance, 0) }; + if (circuit !== null) { + d.circuit(circuit) + }; // Fertilized Recipe. - let e = event.recipes.gtceu.hydroponics_facility(`tfg:${linuxUnfucker(input)}_fertilized`) + let e = event.recipes.gtceu.hydroponics_facility(`tfg:${linuxUnfucker(input)}_fertilized${idCircuit}`) .notConsumable(input) - .circuit(2) .itemOutputs(outputs_array[0]) .perTick(true) .chancedFluidInput(`${resolvedFluid} 1`, resolvedChance, 0) @@ -270,11 +290,13 @@ function generateGreenHouseRecipe(event, dimension, input, output, chance_multip e.chancedOutput(outputs_array[3], hydroponics_fertilizer_chance, 0) e.itemInputs(Item.of(resolvedFertilizer, 8)) }; + if (circuit !== null) { + e.circuit(circuit + 1) + }; // Aquaponics Recipe. - let f = event.recipes.gtceu.hydroponics_facility(`tfg:${linuxUnfucker(input)}_aquaponic`) + let f = event.recipes.gtceu.hydroponics_facility(`tfg:${linuxUnfucker(input)}_aquaponic${idCircuit}`) .notConsumable(input) - .circuit(3) .itemOutputs(outputs_array[0]) .perTick(true) .chancedFluidInput(`${resolvedFluidTier2} 1`, resolvedChance, 0) @@ -289,6 +311,9 @@ function generateGreenHouseRecipe(event, dimension, input, output, chance_multip f.chancedOutput(outputs_array[2], hydroponics_aquaponic_chance, 0) f.chancedOutput(outputs_array[3], hydroponics_aquaponic_chance, 0) }; + if (circuit !== null) { + f.circuit(circuit + 2) + }; f.itemOutputs('tfg:flora_pellets'); } else { @@ -296,9 +321,8 @@ function generateGreenHouseRecipe(event, dimension, input, output, chance_multip //======================== Greenhouse Recipes ======================== - let a = event.recipes.gtceu.greenhouse(`tfg:${linuxUnfucker(input)}`) + let a = event.recipes.gtceu.greenhouse(`tfg:${linuxUnfucker(input)}${idCircuit}`) .notConsumable(input) - .circuit(1) .itemOutputs(outputs_array[0]) .perTick(true) .chancedFluidInput(`${resolvedFluid} 1`, resolvedChance, 0) @@ -316,12 +340,14 @@ function generateGreenHouseRecipe(event, dimension, input, output, chance_multip a.chancedOutput(outputs_array[2], fertilizer_chance, 0) a.chancedOutput(outputs_array[3], fertilizer_chance, 0) }; + if (circuit !== null) { + a.circuit(circuit) + }; //======================== Hydroponics Facility Recipes ======================== - let b = event.recipes.gtceu.hydroponics_facility(`tfg:${linuxUnfucker(input)}`) + let b = event.recipes.gtceu.hydroponics_facility(`tfg:${linuxUnfucker(input)}${idCircuit}`) .notConsumable(input) - .circuit(1) .itemOutputs(outputs_array[0]) .perTick(true) .chancedFluidInput(`${resolvedFluid} 1`, resolvedChance, 0) @@ -336,6 +362,9 @@ function generateGreenHouseRecipe(event, dimension, input, output, chance_multip b.chancedOutput(outputs_array[2], hydroponics_fertilizer_chance, 0) b.chancedOutput(outputs_array[3], hydroponics_fertilizer_chance, 0) }; + if (circuit !== null) { + b.circuit(circuit) + }; }; }; @@ -351,10 +380,15 @@ function generateGreenHouseRecipe(event, dimension, input, output, chance_multip * @param {Internal.Dimension|null} dimension -Dimension ID * @param {Internal.Ingredient} input -Input Item. (seed, bush, etc.) * @param {Internal.ItemStack} output -Output Item. (vegetable, fruit, etc.) + * @param {Internal.ItemStack|null} leaves - Leaf block. Generates extra recipes with leaf outputs if provided. * @param {number|null} chance_multiplier -Multiplies output chances by this value. Defaults to 1. */ -function generateCropGreenHouseRecipe(event, dimension, input, output, chance_multiplier) { - generateGreenHouseRecipe(event, dimension, `4x ${input}`, [Item.of(output, 20), Item.of(input, 1), Item.of(output, 4)], chance_multiplier); +function generateCropGreenHouseRecipe(event, dimension, input, output, leaves, chance_multiplier) { + generateGreenHouseRecipe(event, dimension, `4x ${input}`, [Item.of(output, 20), Item.of(input, 1), Item.of(output, 4)], chance_multiplier, 1); + generateGreenHouseRecipe(event, dimension, `4x ${input}`, [Item.of(output, 20), Item.of(input, 8), Item.of(input, 4)], chance_multiplier, 5); + if (leaves !== null && leaves !== undefined) { + generateGreenHouseRecipe(event, dimension, `4x ${input}`, [Item.of(output, 20), Item.of(leaves, 16), Item.of(leaves, 8)], chance_multiplier, 10); + }; }; /** @@ -369,10 +403,15 @@ function generateCropGreenHouseRecipe(event, dimension, input, output, chance_mu * @param {Internal.Dimension|null} dimension -Dimension ID * @param {Internal.Ingredient} input -Input Item. (sapling) * @param {Internal.ItemStack} output -Output Item. (wood) + * @param {Internal.ItemStack|null} leaves - Leaf block. Generates extra recipes with leaf outputs if provided. * @param {number|null} chance_multiplier -Multiplies output chances by this value. Defaults to 1. */ -function generateTreeGreenHouseRecipe(event, dimension, input, output, chance_multiplier) { - generateGreenHouseRecipe(event, dimension, `8x ${input}`, [Item.of(output, 64), Item.of(input, 4), Item.of(output, 16)], chance_multiplier); +function generateTreeGreenHouseRecipe(event, dimension, input, output, leaves, chance_multiplier) { + generateGreenHouseRecipe(event, dimension, `8x ${input}`, [Item.of(output, 64), Item.of(input, 4), Item.of(output, 16)], chance_multiplier, 1); + generateGreenHouseRecipe(event, dimension, `8x ${input}`, [Item.of(output, 64), Item.of(input, 16), Item.of(input, 8)], chance_multiplier, 5); + if (leaves !== null && leaves !== undefined) { + generateGreenHouseRecipe(event, dimension, `8x ${input}`, [Item.of(output, 64), Item.of(leaves, 32), Item.of(leaves, 16)], chance_multiplier, 10); + }; }; //#endregion @@ -465,86 +504,91 @@ const registerTFGGreenhouseRecipes = (event) => { //#region Recipes // Mushrooms - Ingredient.of('#beneath:mushrooms').stacks.forEach(element => { - generateGreenHouseRecipe(event, 'minecraft:the_nether', `8x ${element.id}`, [element.withCount(24), element.withCount(8)], 1); + Ingredient.of('#tfg:plants/beneath').stacks.forEach(element => { + generateGreenHouseRecipe(event, 'minecraft:the_nether', `8x ${element.id}`, [element.withCount(24), element.withCount(8)], 1, 1); }); - generateGreenHouseRecipe(event, 'minecraft:the_nether', '8x minecraft:red_mushroom', ['24x minecraft:red_mushroom', '8x minecraft:red_mushroom'], 1); - generateGreenHouseRecipe(event, 'minecraft:the_nether', '8x minecraft:brown_mushroom', ['24x minecraft:brown_mushroom', '8x minecraft:brown_mushroom'], 1); + generateGreenHouseRecipe(event, 'minecraft:the_nether', '8x minecraft:red_mushroom', ['24x minecraft:red_mushroom', '8x minecraft:red_mushroom'], 1, 1); + generateGreenHouseRecipe(event, 'minecraft:the_nether', '8x minecraft:brown_mushroom', ['24x minecraft:brown_mushroom', '8x minecraft:brown_mushroom'], 1, 1); // Crops global.FIRMALIFE_GREENHOUSE_FRUIT_RECIPE_COMPONENTS.forEach(element => { - generateCropGreenHouseRecipe(event, null, element.input, element.output, 1); + generateCropGreenHouseRecipe(event, null, element.input, element.output, element.leaves, 1); }); global.TFC_GREENHOUSE_FRUIT_RECIPE_COMPONENTS.forEach(element => { - generateCropGreenHouseRecipe(event, null, element.input, element.output, 1); + generateCropGreenHouseRecipe(event, null, element.input, element.output, element.leaves, 1); }); global.TFC_GREENHOUSE_VEGETABLE_RECIPE_COMPONENTS.forEach(element => { - generateCropGreenHouseRecipe(event, null, element.input, element.output, 1); + generateCropGreenHouseRecipe(event, null, element.input, element.output, null, 1); }); global.TFC_GREENHOUSE_BERRY_RECIPE_COMPONENTS.forEach(element => { - generateCropGreenHouseRecipe(event, null, element.input, element.output, 1); + generateCropGreenHouseRecipe(event, null, element.input, element.output, null, 1); }); // Wood global.TFC_WOOD_TYPES.forEach(element => { - generateTreeGreenHouseRecipe(event, null, `tfc:wood/sapling/${element}`, `tfc:wood/log/${element}`, 1); + generateTreeGreenHouseRecipe(event, null, `tfc:wood/sapling/${element}`, `tfc:wood/log/${element}`, `tfc:wood/leaves/${element}`, 1); }); global.AFC_SAPLINGS.forEach(element => { - generateTreeGreenHouseRecipe(event, null, `afc:wood/sapling/${element.sapling}`, element.log, 1); + generateTreeGreenHouseRecipe(event, null, `afc:wood/sapling/${element.sapling}`, element.log, `afc:wood/leaves/${element.sapling}`, 1); }); // Plants Ingredient.of('#tfc:plants').subtract('#tfc:wild_fruits').stacks.forEach(element => { - generateGreenHouseRecipe(event, null, `8x ${element.id}`, [element.withCount(24), element.withCount(8)], 1); + generateGreenHouseRecipe(event, null, `8x ${element.id}`, [element.withCount(24), element.withCount(8)], 1, 1); + }); + Ingredient.of('#forge:corals').stacks.forEach(element => { + generateGreenHouseRecipe(event, null, `8x ${element.id}`, [element.withCount(24), element.withCount(8)], 1, 1); + }); + Ingredient.of('#forge:coral_blocks').stacks.forEach(element => { + generateGreenHouseRecipe(event, null, `8x ${element.id}`, [element.withCount(12), element.withCount(4)], 1, 1); }); - generateGreenHouseRecipe(event, null, '8x minecraft:bamboo', ['64x minecraft:bamboo', '8x minecraft:bamboo'], 1); + generateGreenHouseRecipe(event, null, '8x minecraft:bamboo', ['64x minecraft:bamboo', '8x minecraft:bamboo'], 1, 1); + + generateGreenHouseRecipe(event, null, '8x tfc:tree_roots', ['64x tfc:tree_roots', '8x tfc:tree_roots'], 1, 1); + + generateGreenHouseRecipe(event, null, '8x tfc:food/fresh_seaweed', ['24x tfc:food/fresh_seaweed', '8x tfc:food/fresh_seaweed'], 1, 1); + + generateGreenHouseRecipe(event, 'minecraft:the_nether', '4x minecraft:glow_berries', ['20x minecraft:glow_berries', '4x minecraft:glow_berries'], 1, 1); // Mars Wood - generateGreenHouseRecipe(event, 'ad_astra:mars', '8x tfg:saplings/strophar', [ - '64x ad_astra:strophar_stem', '4x tfg:saplings/strophar', '32x ad_astra:strophar_stem', '16x ad_astra:strophar_cap' - ], 1); - generateGreenHouseRecipe(event, 'ad_astra:mars', '8x tfg:saplings/aeronos', [ - '64x ad_astra:aeronos_stem', '4x tfg:saplings/aeronos', '32x ad_astra:aeronos_stem', '16x ad_astra:aeronos_cap' - ], 1); - generateGreenHouseRecipe(event, 'ad_astra:mars', '8x tfg:saplings/glacian', [ - '64x ad_astra:glacian_log', '4x tfg:saplings/glacian', '32x ad_astra:glacian_log', '16x species:alphacene_moss_block' - ], 1); - generateGreenHouseRecipe(event, 'ad_astra:mars', '8x tfg:saplings/alphacene', [ - '64x species:alphacene_mushroom_block', '4x tfg:saplings/alphacene', '16x minecraft:mushroom_stem', '16x minecraft:mushroom_stem' - ], 1); - generateGreenHouseRecipe(event, 'ad_astra:mars', '8x tfg:saplings/warped', [ - '64x beneath:wood/log/warped', '4x tfg:saplings/warped', '32x beneath:wood/log/warped', '16x minecraft:warped_wart_block' - ], 1); - generateGreenHouseRecipe(event, 'ad_astra:mars', '8x tfg:saplings/crimson', [ - '64x beneath:wood/log/crimson', '4x tfg:saplings/crimson', '32x beneath:wood/log/crimson', '16x minecraft:nether_wart_block' - ], 1); + generateTreeGreenHouseRecipe(event, 'ad_astra:mars', `tfg:saplings/strophar`, `ad_astra:strophar_stem`, `ad_astra:strophar_cap`, 1); + + generateTreeGreenHouseRecipe(event, 'ad_astra:mars', `tfg:saplings/aeronos`, `ad_astra:aeronos_stem`, `ad_astra:aeronos_cap`, 1); + + generateTreeGreenHouseRecipe(event, 'ad_astra:mars', `tfg:saplings/glacian`, `ad_astra:glacian_log`, `species:alphacene_moss_block`, 1); + + generateTreeGreenHouseRecipe(event, 'ad_astra:mars', `tfg:saplings/alphacene`, `species:alphacene_mushroom_block`, `minecraft:mushroom_stem`, 1); + + generateTreeGreenHouseRecipe(event, 'ad_astra:mars', `tfg:saplings/warped`, `beneath:wood/log/warped`, `minecraft:warped_wart_block`, 1); + + generateTreeGreenHouseRecipe(event, 'ad_astra:mars', `tfg:saplings/crimson`, `beneath:wood/log/crimson`, `minecraft:nether_wart_block`, 1); // Mars Plants Ingredient.of('#tfg:mars_plants').stacks.forEach(element => { - generateGreenHouseRecipe(event, 'ad_astra:mars', `8x ${element.id}`, [element.withCount(24), element.withCount(8)], 1); + generateGreenHouseRecipe(event, 'ad_astra:mars', `8x ${element.id}`, [element.withCount(24), element.withCount(8)], 1, 1); }); - generateCropGreenHouseRecipe(event, 'ad_astra:mars', 'betterend:amber_root_seeds', 'betterend:amber_root_product', 1); - generateCropGreenHouseRecipe(event, 'ad_astra:mars', 'betterend:blossom_berry_seeds', 'betterend:blossom_berry_product', 1); - generateCropGreenHouseRecipe(event, 'ad_astra:mars', 'betterend:bolux_mushroom_seeds', 'betterend:bolux_mushroom_product', 1); - generateCropGreenHouseRecipe(event, 'ad_astra:mars', 'betterend:cave_pumpkin_plant_seeds', 'betterend:cave_pumpkin', 1); - generateCropGreenHouseRecipe(event, 'ad_astra:mars', 'betterend:chorus_mushroom_seeds', 'betterend:chorus_mushroom_product', 1); - generateCropGreenHouseRecipe(event, 'ad_astra:mars', 'betterend:shadow_berry_seeds', 'betterend:shadow_berry_product', 1); - - // Moon Crops - generateCropGreenHouseRecipe(event, 'ad_astra:moon', 'tfg:lunar_chorus_flower', 'minecraft:chorus_fruit', 2); + generateCropGreenHouseRecipe(event, 'ad_astra:mars', 'betterend:amber_root_seeds', 'betterend:amber_root_product', null, 1); + generateCropGreenHouseRecipe(event, 'ad_astra:mars', 'betterend:blossom_berry_seeds', 'betterend:blossom_berry_product', null, 1); + generateCropGreenHouseRecipe(event, 'ad_astra:mars', 'betterend:bolux_mushroom_seeds', 'betterend:bolux_mushroom_product', null, 1); + generateCropGreenHouseRecipe(event, 'ad_astra:mars', 'betterend:cave_pumpkin_plant_seeds', 'betterend:cave_pumpkin', null, 1); + generateCropGreenHouseRecipe(event, 'ad_astra:mars', 'betterend:chorus_mushroom_seeds', 'betterend:chorus_mushroom_product', null, 1); + generateCropGreenHouseRecipe(event, 'ad_astra:mars', 'betterend:shadow_berry_seeds', 'betterend:shadow_berry_product', null, 1); // Moon Plants + generateGreenHouseRecipe(event, 'ad_astra:moon', '16x tfg:lunar_chorus_flower', [ + '64x minecraft:chorus_fruit', '8x minecraft:chorus_fruit', '4x tfg:lunar_chorus_flower', '4x tfg:lunar_chorus_flower' + ], 1, 1); generateGreenHouseRecipe(event, 'ad_astra:moon', '8x minecraft:twisting_vines', [ '16x minecraft:twisting_vines', '8x minecraft:pearlescent_froglight', '8x minecraft:verdant_froglight', '8x minecraft:ochre_froglight' - ], 1); + ], 1, 1); Ingredient.of('#tfg:moon_plants').stacks.forEach(element => { - generateGreenHouseRecipe(event, 'ad_astra:moon', `8x ${element.id}`, [element.withCount(24), element.withCount(8)], 1); + generateGreenHouseRecipe(event, 'ad_astra:moon', `8x ${element.id}`, [element.withCount(24), element.withCount(8)], 1, 1); }); //#endregion -}; \ No newline at end of file +}; diff --git a/kubejs/server_scripts/tfg/aquaponics/recipes.pisciculture.js b/kubejs/server_scripts/tfg/aquaponics/recipes.pisciculture.js index 71b258c93..e01d95179 100644 --- a/kubejs/server_scripts/tfg/aquaponics/recipes.pisciculture.js +++ b/kubejs/server_scripts/tfg/aquaponics/recipes.pisciculture.js @@ -25,10 +25,10 @@ const pisciculture_base_duration = Math.max(1, greenhouse_base_duration * greenh /** @type {DimensionIndex[]} - Dimension settings array */ const pisciculture_dimension_index = [ // Overworld settings are also used as the default when no dimension is specified. - {id: 'minecraft:overworld', fluid: '#tfg:clean_water', fluid_chance: 10, fluid_out: 'tfg:nitrate_rich_water', eut: GTValues.VA[GTValues.LV], oxygenated: true}, - {id: 'minecraft:the_nether', fluid: '#tfg:clean_water', fluid_chance: 10, fluid_out: 'tfg:nitrate_rich_water', eut: GTValues.VA[GTValues.LV], oxygenated: true}, + {id: 'minecraft:overworld', fluid: '#tfg:clean_water', fluid_chance: 10, fluid_out: 'tfg:nitrate_rich_water', eut: GTValues.VHA[GTValues.LV], oxygenated: true}, + {id: 'minecraft:the_nether', fluid: '#tfg:clean_water', fluid_chance: 10, fluid_out: 'tfg:nitrate_rich_water', eut: GTValues.VHA[GTValues.LV], oxygenated: true}, // The moon has no fish yet :( - {id: 'ad_astra:mars', fluid: 'tfg:semiheavy_ammoniacal_water', fluid_chance: 10, fluid_out: 'tfg:nitrate_rich_semiheavy_ammoniacal_water', eut: GTValues.VA[GTValues.HV], oxygenated: null} + {id: 'ad_astra:mars', fluid: 'tfg:semiheavy_ammoniacal_water', fluid_chance: 10, fluid_out: 'tfg:nitrate_rich_semiheavy_ammoniacal_water', eut: GTValues.VHA[GTValues.HV], oxygenated: null} ]; //#endregion @@ -58,7 +58,7 @@ const pisciculture_dimension_index = [ const resolvedFluidOut = dimMods?.fluid_out ?? 'tfg:nitrate_rich_water'; /** @type {GTValues.EUt} - Resolved EUt value. Defaults to LV EUt. */ - const resolvedEUt = dimMods ? dimMods.eut : GTValues.VA[GTValues.LV]; + const resolvedEUt = dimMods ? dimMods.eut : GTValues.VHA[GTValues.LV]; /** @type {number} - Resolved fluid chance multiplied by 100. Defaults to 1000. */ const resolvedChance = dimMods ? (dimMods.fluid_chance * 100) : 1000; diff --git a/kubejs/server_scripts/tfg/beneath/tags.beneath.js b/kubejs/server_scripts/tfg/beneath/tags.beneath.js index c61249bb5..b5d3b554e 100644 --- a/kubejs/server_scripts/tfg/beneath/tags.beneath.js +++ b/kubejs/server_scripts/tfg/beneath/tags.beneath.js @@ -12,9 +12,25 @@ function registerTFGBeneathItemTags(event) { event.add("minecraft:piglin_loved", "tfc:ore/rich_native_gold"); event.add('minecraft:piglin_loved', 'tfg:piglin_disguise') - event.add('tfc:plants', 'minecraft:spore_blossom') event.remove('createaddition:plants', 'minecraft:moss_carpet') + /** + * @property {string[]} beneath_plants - List of Beneath plants to be added to the `tfg:plants/beneath` tag. + */ + const beneath_plants = [ + 'beneath:gleamflower', + 'beneath:burpflower', + 'minecraft:big_dripleaf', + 'minecraft:small_dripleaf', + 'minecraft:glow_lichen', + 'minecraft:hanging_roots', + 'minecraft:spore_blossom', + '#beneath:mushrooms' + ]; + beneath_plants.forEach(plant => + event.add('tfg:plants/beneath', plant) + ); + event.add('tfc:compost_greens', 'minecraft:red_mushroom_block') event.add('tfc:compost_greens', 'minecraft:brown_mushroom_block') event.add('tfc:compost_greens', 'minecraft:mushroom_stem') @@ -27,6 +43,9 @@ function registerTFGBeneathItemTags(event) { function registerTFGBeneathBlockTags(event) { event.add('tfg:lush_ground_replaceable', 'minecraft:deepslate') event.add('tfg:lush_ground_replaceable', 'minecraft:blackstone') + + event.remove('tfc:plants', 'beneath:gleamflower') + event.remove('tfc:plants', 'beneath:burpflower') event.add('minecraft:lush_ground_replaceable', 'minecraft:blackstone') event.add('beneath:nether_bush_plantable_on', 'minecraft:blackstone') @@ -136,4 +155,4 @@ function registerTFGBeneathPlacedFeatures(event) { event.add('tfg:nether_underground_decoration', 'minecraft:spring_open') event.add('tfg:nether_underground_decoration', 'minecraft:spring_closed') event.add('tfg:nether_underground_decoration', 'tfg:nether/terrain/magma_blob') -} \ No newline at end of file +} diff --git a/kubejs/server_scripts/tfg/equipment/data.equipment.js b/kubejs/server_scripts/tfg/equipment/data.equipment.js index 4263d344b..636982684 100644 --- a/kubejs/server_scripts/tfg/equipment/data.equipment.js +++ b/kubejs/server_scripts/tfg/equipment/data.equipment.js @@ -69,6 +69,12 @@ function registerTFGEquipmentData(event) { 13, 13, 15 + ) + event.itemDamageResistance( + 'minecraft:netherite_boots', + 13, + 13, + 15 ) event.itemDamageResistance( 'create:netherite_diving_boots', diff --git a/kubejs/server_scripts/tfg/equipment/tags.equipment.js b/kubejs/server_scripts/tfg/equipment/tags.equipment.js index b0d28afdc..c6e4d9ac4 100644 --- a/kubejs/server_scripts/tfg/equipment/tags.equipment.js +++ b/kubejs/server_scripts/tfg/equipment/tags.equipment.js @@ -49,4 +49,18 @@ function registerTFGEquipmentItemTags(event) { event.add('ad_astra:heat_resistant_armor', 'gtceu:quarktech_leggings') event.add('ad_astra:heat_resistant_armor', 'gtceu:quarktech_boots') + event.add('tfc:deals_crushing_damage', '#forge:tools/mining_hammers') + event.add('tfc:deals_crushing_damage', '#minecraft:shovels') + event.add('tfc:deals_crushing_damage', '#forge:tools/spades') + event.add('tfc:deals_crushing_damage', '#forge:tools/wrenches') + event.add('tfc:deals_slashing_damage', '#forge:tools/chainsaws') + event.add('tfc:deals_slashing_damage', '#forge:tools/saws') + event.add('tfc:deals_slashing_damage', '#forge:tools/butchery_knives') + event.add('tfc:deals_slashing_damage', '#forge:tools/files') + event.add('tfc:deals_piercing_damage', '#minecraft:pickaxes') + event.add('tfc:deals_piercing_damage', '#forge:tools/drills') + event.add('tfc:deals_piercing_damage', '#forge:tools/screwdrivers') + event.add('tfc:deals_piercing_damage', '#minecraft:hoes') + event.add('tfc:deals_piercing_damage', '#forge:tools/crowbars') + event.add('tfc:deals_piercing_damage', '#forge:tools/wire_cutters') } \ No newline at end of file diff --git a/kubejs/server_scripts/tfg/events.interactions.js b/kubejs/server_scripts/tfg/events.interactions.js index a561f24f2..d6259c238 100644 --- a/kubejs/server_scripts/tfg/events.interactions.js +++ b/kubejs/server_scripts/tfg/events.interactions.js @@ -248,6 +248,12 @@ BlockEvents.rightClicked(event => { transformBlockWithItem(event, 'gtceu:incoloy_ma_956_frame', 'tfg:impure_moderate_core_frame', 'tfg:impure_graphite_moderator', true, 1, 'block.wool.place', 'minecraft:happy_villager', true); transformBlockWithToolReturn(event, 'tfg:impure_moderate_core_frame', 'gtceu:incoloy_ma_956_frame', 'tfg:impure_graphite_moderator', 1, '#forge:tools/wire_cutters', true, 'minecraft:block.beehive.shear', 'minecraft:crit', true); + transformBlockWithItem(event, 'gtceu:incoloy_ma_956_frame', 'tfg:copper_sandy_frame', 'tfg:copper_sandy', true, 1, 'block.wool.place', 'minecraft:happy_villager', true); + transformBlockWithToolReturn(event, 'tfg:copper_sandy_frame', 'gtceu:incoloy_ma_956_frame', 'tfg:copper_sandy', 1, '#forge:tools/wire_cutters', true, 'minecraft:block.beehive.shear', 'minecraft:crit', true); + + transformBlockWithItem(event, 'gtceu:incoloy_ma_956_frame', 'tfg:beryllium_sandy_frame', 'tfg:beryllium_sandy', true, 1, 'block.wool.place', 'minecraft:happy_villager', true); + transformBlockWithToolReturn(event, 'tfg:beryllium_sandy_frame', 'gtceu:incoloy_ma_956_frame', 'tfg:beryllium_sandy', 1, '#forge:tools/wire_cutters', true, 'minecraft:block.beehive.shear', 'minecraft:crit', true); + }); // Makes scythes, hoes, and knives take damage when cutting grass diff --git a/kubejs/server_scripts/tfg/events.js b/kubejs/server_scripts/tfg/events.js index 4c19dd387..e50979af0 100644 --- a/kubejs/server_scripts/tfg/events.js +++ b/kubejs/server_scripts/tfg/events.js @@ -1,14 +1,15 @@ "use strict"; -// TODO TFGServerEvents.dimensionalPowerConsumption(event => { - event["add(java.lang.String,double)"]("minecraft:overworld", 10000); - event["add(java.lang.String,double)"]("minecraft:the_nether", 20000); - event["add(java.lang.String,double)"]("ad_astra:earth_orbit", 20000); - event["add(java.lang.String,double)"]("ad_astra:moon", 50000); - event["add(java.lang.String,double)"]("ad_astra:moon_orbit", 50000); - event["add(java.lang.String,double)"]("ad_astra:mars", 100000); - event["add(java.lang.String,double)"]("ad_astra:mars_orbit", 100000); + event.add("minecraft:overworld", 10000); + event.add("minecraft:the_nether", 20000); + event.add("ad_astra:earth_orbit", 20000); + event.add("ad_astra:moon", 50000); + event.add("ad_astra:moon_orbit", 50000); + event.add("ad_astra:mars", 100000); + event.add("ad_astra:mars_orbit", 100000); + event.add("ad_astra:venus", 200000); + event.add("ad_astra:venus_orbit", 200000); }); // Vase Sounds diff --git a/kubejs/server_scripts/tfg/food/recipes.food.js b/kubejs/server_scripts/tfg/food/recipes.food.js index 74c76a144..66b716e11 100644 --- a/kubejs/server_scripts/tfg/food/recipes.food.js +++ b/kubejs/server_scripts/tfg/food/recipes.food.js @@ -1180,7 +1180,7 @@ function registerTFGFoodRecipes(event) { .duration(60) .EUt(16) - event.shaped('4x tfc:powder/salt', ['A', 'B'], {A: '#forge:dusts/salt', B: '#forge:tools/mortars'}) + event.shapeless('4x tfc:powder/salt', ['#forge:dusts/salt', '#forge:tools/mortars']) .id(`tfg:mortar/salt`) //#endregion diff --git a/kubejs/server_scripts/tfg/food/recipes.meal_bags.js b/kubejs/server_scripts/tfg/food/recipes.meal_bags.js index f1d7cd128..4ac8c515a 100644 --- a/kubejs/server_scripts/tfg/food/recipes.meal_bags.js +++ b/kubejs/server_scripts/tfg/food/recipes.meal_bags.js @@ -85,24 +85,5 @@ function registerTFGMealBagRecipes(event) { ]).id(`tfg:shapeless/emptying/freeze_dried/${fruit.name}`) }) - // Recycling - event.recipes.gtceu.macerator('gtceu:macerator/recycling/clean_foil_pack') - .itemInputs('tfg:clean_foil_pack') - .itemOutputs( - ChemicalHelper.get(TagPrefix.dustSmall, GTMaterials.Aluminium, 1), - ChemicalHelper.get(TagPrefix.dustSmall, GTMaterials.Polyethylene, 1) - ) - .duration(GTMaterials.Aluminium.getMass() * 1) - .category(GTRecipeCategories.MACERATOR_RECYCLING) - .EUt(GTValues.VA[GTValues.ULV]) - - event.recipes.gtceu.arc_furnace('gtceu:arc_furnace/recycling/clean_foil_pack') - .itemInputs('tfg:clean_foil_pack') - .itemOutputs( - ChemicalHelper.get(TagPrefix.nugget, GTMaterials.Aluminium, 2), - ChemicalHelper.get(TagPrefix.dustSmall, GTMaterials.Ash, 1) - ) - .duration(GTMaterials.Aluminium.getMass() * 1) - .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) - .EUt(GTValues.VA[GTValues.LV]) + TFGHelpers.registerMaterialInfo('tfg:clean_foil_pack', [GTMaterials.Aluminium, 0.25, GTMaterials.Polyethylene, 0.25]) } \ No newline at end of file diff --git a/kubejs/server_scripts/tfg/food/tags.food.js b/kubejs/server_scripts/tfg/food/tags.food.js index 97826d234..525a044d1 100644 --- a/kubejs/server_scripts/tfg/food/tags.food.js +++ b/kubejs/server_scripts/tfg/food/tags.food.js @@ -66,6 +66,7 @@ function registerTFGFoodItemTags(event) { event.add('tfg:raw_dinosaur_meat', 'tfg:food/raw_cruncher_ribs') event.add('tfg:raw_dinosaur_meat', 'tfg:food/raw_surfer_steak') event.add('tfg:raw_dinosaur_meat', 'wan_ancient_beasts:raw_ancient_meat') + // TODO add meat for charger, raider, snatcher /** * List of items that can make light stock. @@ -148,9 +149,9 @@ function registerTFGFoodItemTags(event) { 'firmalife:food/yak_curd', 'firmalife:food/goat_curd', 'firmalife:food/milk_curd', - 'tfc_gurman:ox_curd', - 'tfc_gurman:sheep_curd', - 'tfc_gurman:alpaca_curd' + 'tfc_gourmet:ox_curd', + 'tfc_gourmet:sheep_curd', + 'tfc_gourmet:alpaca_curd' ]; cheeseCurds.forEach(item => { event.add('tfg:foods/cheese_curds', item); @@ -176,7 +177,7 @@ function registerTFGFoodItemTags(event) { '#firmalife:foods/cheeses', 'tfg:food/slice_of_cheese', 'firmalife:food/shredded_cheese', - '#tfc_gurman:foods/brinza' + '#tfc_gourmet:foods/brinza' ]; cheeses.forEach(item => { event.add('tfg:foods/cheeses', item); @@ -238,6 +239,7 @@ function registerTFGFoodItemTags(event) { */ const usable_in_meal_bag = [ '#tfc:foods/meats', + '#minecraft:fishes', '#tfc:foods/grains', '#tfc:foods/vegetables', '#tfc:foods/fruits', @@ -267,12 +269,12 @@ function registerTFGFoodItemTags(event) { 'firmalife:food/toast_with_butter', 'firmalife:food/toast_with_jam', 'firmalife:food/butter', - 'tfc_gurman:adjika', - 'tfc_gurman:tzatziki', - 'tfc_gurman:falafel', - 'tfc_gurman:hummus', - 'tfc_gurman:sauerkraut', - 'tfc_gurman:bratwurst' + 'tfc_gourmet:adjika', + 'tfc_gourmet:tzatziki', + 'tfc_gourmet:falafel', + 'tfc_gourmet:hummus', + 'tfc_gourmet:sauerkraut', + 'tfc_gourmet:bratwurst' ]; usable_in_meal_bag.forEach(item => { event.add('tfg:foods/usable_in_meal_bag', item); @@ -357,4 +359,4 @@ function registerTFGFoodBlockTags(event) { event.add('ad_astra:destroyed_in_space', '#tfc:wild_fruits') event.add('ad_astra:destroyed_in_space', '#minecraft:saplings') -} \ No newline at end of file +} diff --git a/kubejs/server_scripts/tfg/machines/recipes.bakelite.js b/kubejs/server_scripts/tfg/machines/recipes.bakelite.js new file mode 100644 index 000000000..99ebb9b4c --- /dev/null +++ b/kubejs/server_scripts/tfg/machines/recipes.bakelite.js @@ -0,0 +1,115 @@ +"use strict"; + +function registerTFGBakeliteRecipes(event) { + + // Make PE exclusively MV+, it's fine if the LCR recipe stays LV since you can't make an LCR in LV anyway + event.recipes.gtceu.chemical_reactor('gtceu:polyethylene_from_oxygen') + .inputFluids('gtceu:oxygen 1000', 'gtceu:ethylene 144') + .circuit(1) + .outputFluids('gtceu:polyethylene 216') + .duration(2 * 20) + .EUt(GTValues.VA[GTValues.MV]) + + event.recipes.gtceu.chemical_reactor('gtceu:polyethylene_from_air') + .inputFluids('gtceu:air 1000', 'gtceu:ethylene 144') + .circuit(1) + .outputFluids('gtceu:polyethylene 144') + .duration(2 * 20) + .EUt(GTValues.VA[GTValues.MV]) + + // Formaldehyde + event.recipes.gtceu.chemical_reactor('tfg:formaldehyde_from_methane') + .inputFluids('gtceu:methane 1000', 'gtceu:oxygen 1000') + .outputFluids('gtceu:formaldehyde 1000', 'gtceu:hydrogen 2000') + .circuit(1) + .duration(200) + .EUt(GTValues.VA[GTValues.LV]) + + // add phenol and methane to distillation + event.recipes.gtceu.distillation_tower('gtceu:distill_creosote') + .inputFluids('gtceu:creosote 1000') + .outputFluids('gtceu:lubricant 500') + .outputFluids('gtceu:phenol 50') + .outputFluids('gtceu:carbon_dioxide 200') + .outputFluids('gtceu:methane 250') + // this adds single-block distillery recipes too + .disableDistilleryRecipes(false) + .duration(8 * 20) + .EUt(96) + + event.recipes.gtceu.chemical_reactor('tfg:syngas_to_methane') + .inputFluids('tfg:syngas 1000') + .notConsumable('#forge:dusts/silver') + .outputFluids('gtceu:methane 100') + .duration(100) + .EUt(GTValues.VA[GTValues.LV]) + + event.recipes.gtceu.chemical_reactor('tfg:phenolic_resin') + .inputFluids('gtceu:phenol 500', 'gtceu:formaldehyde 1000') + .notConsumable('#forge:dusts/sodium_hydroxide') + .outputFluids('tfg:phenolic_resin 1000') + .duration(100) + .EUt(GTValues.VA[GTValues.LV]) + + event.recipes.gtceu.mixer('tfg:bakelite_wood') + .inputFluids('tfg:phenolic_resin 144') + .itemInputs('tfg:treated_chipboard_composite') + .outputFluids('tfg:bakelite 144') + .duration(100) + .EUt(GTValues.VA[GTValues.LV]) + + event.recipes.gtceu.mixer('tfg:bakelite_asbestos') + .inputFluids('tfg:phenolic_resin 144') + .itemInputs('#forge:dusts/asbestos') + .outputFluids('tfg:bakelite 144') + .duration(100) + .EUt(GTValues.VA[GTValues.LV]) + + event.remove({ id: 'gtceu:assembler/phenolic_board' }) + + event.recipes.gtceu.forming_press('tfg:phenolic_board_lv') + .itemInputs('2x #forge:foils/bakelite', '2x minecraft:paper', 'gtceu:resin_circuit_board') + .itemOutputs('gtceu:phenolic_circuit_board') + .duration(7.5 * 20) + .EUt(GTValues.VA[GTValues.LV]) + + event.recipes.gtceu.assembler('tfg:phenolic_board_mv') + .itemInputs('2x #forge:foils/bakelite', 'gtceu:wood_plate') + .inputFluids('gtceu:phenol 50') + .itemOutputs('gtceu:phenolic_circuit_board') + .duration(7.5 * 20) + .EUt(GTValues.VA[GTValues.MV]) + + event.recipes.gtceu.assembler('tfg:phenolic_board_mv_pe') + .itemInputs('2x #forge:foils/polyethylene', 'gtceu:wood_plate') + .inputFluids('gtceu:phenol 50') + .itemOutputs('gtceu:phenolic_circuit_board') + .duration(7.5 * 20) + .EUt(GTValues.VA[GTValues.MV]) + + // machine hull changes/additions + event.replaceInput({ id: 'gtceu:shaped/mv_machine_hull' }, '#forge:plates/wrought_iron', '#forge:plates/bakelite') + + event.recipes.gtceu.assembler('tfg:ulv_hull_bakelite') + .itemInputs('gtceu:ulv_machine_casing', '2x #forge:single_cables/red_alloy') + .inputFluids('tfg:bakelite 432') + .itemOutputs('gtceu:ulv_machine_hull') + .duration(25) + .EUt(16) + + event.recipes.gtceu.assembler('tfg:lv_hull_bakelite') + .itemInputs('gtceu:lv_machine_casing', '2x #forge:single_cables/tin') + .inputFluids('tfg:bakelite 432') + .itemOutputs('gtceu:lv_machine_hull') + .duration(50) + .EUt(16) + + event.shaped('gtceu:lv_hermetic_casing', [ + 'AAA', + 'ABA', + 'AAA' + ], { + A: '#forge:plates/steel', + B: '#forge:storage_blocks/bakelite' + }).id('tfg:shaped/lv_hermetic_casing_bakelite') +} \ No newline at end of file diff --git a/kubejs/server_scripts/tfg/machines/recipes.casings.js b/kubejs/server_scripts/tfg/machines/recipes.casings.js index b240e469f..199fa44a9 100644 --- a/kubejs/server_scripts/tfg/machines/recipes.casings.js +++ b/kubejs/server_scripts/tfg/machines/recipes.casings.js @@ -131,7 +131,7 @@ function registerTFGCasingRecipes(event) { // Ostrum Linear Acclerator event.recipes.gtceu.assembler('tfg:casings/machine_casing_mars') .itemInputs('gtceu:clean_machine_casing', '4x #forge:double_wires/kanthal') - .inputFluids(Fluid.of('gtceu:polybenzimidazole', 288)) + .inputFluids(Fluid.of('gtceu:polytetrafluoroethylene', 288)) .itemOutputs('tfg:casings/machine_casing_mars') .circuit(6) .duration(2.5 * 20) @@ -145,6 +145,34 @@ function registerTFGCasingRecipes(event) { .duration(2.5 * 20) .EUt(GTValues.VA[GTValues.HV]) + // Heat Battery deafission:battery_heat_port_ev + + event.recipes.gtceu.assembler('tfg:battery_heat_port_ev') + .itemInputs(Item.of('gtceu:iv_machine_hull', 1), Item.of('gtceu:rtm_alloy_coil_block'), Item.of('gtceu:silicon_plate', 6)) + .inputFluids(Fluid.of('gtceu:mercury', 4000)) + .itemOutputs('deafission:battery_heat_port_ev') + //.circuit(6) + .duration(2.5 * 20) + .EUt(GTValues.VA[GTValues.EV]) + + // Small Modular Turbine + + event.recipes.gtceu.assembler('tfg:machine_casing_desh_ptfe') + .itemInputs('4x #forge:dense_plates/desh', '2x #forge:dense_plates/lead', Item.of('gtceu:hsla_steel_frame')) + .inputFluids(Fluid.of('gtceu:polytetrafluoroethylene', 288)) + .itemOutputs('tfg:casings/machine_casing_desh_ptfe') + .circuit(6) + .duration(2.5 * 20) + .EUt(GTValues.VA[GTValues.HV]) + + event.recipes.gtceu.assembler('tfg:uv_smr_fluid_import_hatch') + .itemInputs('4x #forge:dense_plates/desh', '2x #forge:dense_plates/lead', Item.of('gtceu:iv_input_hatch', 1)) + .inputFluids(Fluid.of('gtceu:polytetrafluoroethylene', 288)) + .itemOutputs('tfg:uv_smr_fluid_import_hatch') + //.circuit(6) + .duration(2.5 * 20) + .EUt(GTValues.VA[GTValues.EV]) + // Vacuum Intake event.shaped('tfg:casings/machine_casing_vacuum_engine_intake', [ 'USU', diff --git a/kubejs/server_scripts/tfg/machines/recipes.coils.js b/kubejs/server_scripts/tfg/machines/recipes.coils.js new file mode 100644 index 000000000..e6fd13546 --- /dev/null +++ b/kubejs/server_scripts/tfg/machines/recipes.coils.js @@ -0,0 +1,109 @@ +"use strict"; + +function registerTFGCoilRecipes(event) { + + // #region Cupronickel Coil + + event.smelting('tfg:refractory_clay_dust', 'tfc:fire_clay') + + event.recipes.gtceu.chemical_reactor('tfg:magnesium_hydroxide') + .itemInputs('#forge:dusts/magnesium') + .inputFluids('tfc:lye 2000') + .itemOutputs('#forge:dusts/magnesium_hydroxide', '2x #forge:dusts/sodium') + .duration(5 * 20) + .EUt(GTValues.VHA[GTValues.LV]) + + event.recipes.gtceu.coke_oven('tfg:magnesia') + .itemInputs('#forge:dusts/magnesium_hydroxide') + .itemOutputs('#forge:dusts/magnesia') + .duration(20 * 20) + + event.recipes.gtceu.pyrolyse_oven('tfg:magnesia') + .itemInputs('#forge:dusts/magnesium_hydroxide') + .itemOutputs('#forge:dusts/magnesia') + .duration(20 * 20) + .EUt(GTValues.VHA[GTValues.MV]) + + event.recipes.gtceu.mixer('tfg:magnesia_refractory_brick_dust_sticky') + .itemInputs('#forge:dusts/magnesia', '#forge:dusts/refractory_clay', '#forge:dusts/graphite', '5x gtceu:sticky_resin') + .itemOutputs('3x #forge:dusts/magnesia_refractory_brick') + .duration(5 * 20) + .EUt(GTValues.VHA[GTValues.LV]) + + event.recipes.gtceu.mixer('tfg:magnesia_refractory_brick_dust_sticky_powder') + .itemInputs('#forge:dusts/magnesia', '#forge:dusts/refractory_clay', '4x tfc:powder/graphite', '5x gtceu:sticky_resin') + .itemOutputs('3x #forge:dusts/magnesia_refractory_brick') + .duration(5 * 20) + .EUt(GTValues.VHA[GTValues.LV]) + + event.recipes.gtceu.mixer('tfg:magnesia_refractory_brick_dust_phenolic') + .itemInputs('#forge:dusts/magnesia', '#forge:dusts/refractory_clay', '#forge:dusts/graphite') + .inputFluids(Fluid.of('tfg:phenolic_resin', 144)) + .itemOutputs('3x #forge:dusts/magnesia_refractory_brick') + .duration(5 * 20) + .EUt(GTValues.VHA[GTValues.LV]) + + event.recipes.gtceu.mixer('tfg:magnesia_refractory_brick_dust_phenolic_powder') + .itemInputs('#forge:dusts/magnesia', '#forge:dusts/refractory_clay', '4x tfc:powder/graphite') + .inputFluids(Fluid.of('tfg:phenolic_resin', 144)) + .itemOutputs('3x #forge:dusts/magnesia_refractory_brick') + .duration(5 * 20) + .EUt(GTValues.VHA[GTValues.LV]) + + event.recipes.gtceu.alloy_smelter('tfg:magnesia_refractory_brick') + .itemInputs('#forge:dusts/magnesia_refractory_brick') + .notConsumable('gtceu:ingot_casting_mold') + .itemOutputs('#forge:ingots/magnesia_refractory_brick') + .duration(8 * 20) + .EUt(GTValues.VA[GTValues.LV]) + .category(GTRecipeCategories.INGOT_MOLDING) + + event.recipes.gtceu.forming_press('tfg:magnesia_refractory_brick') + .itemInputs('#forge:dusts/magnesia_refractory_brick') + .notConsumable('gtceu:ingot_casting_mold') + .itemOutputs('#forge:ingots/magnesia_refractory_brick') + .duration(4 * 20) + .EUt(GTValues.VHA[GTValues.LV]) + + event.recipes.gtceu.assembler('gtceu:coil_cupronickel') + .itemInputs('8x #forge:double_wires/cupronickel', '8x #forge:foils/blue_steel', '8x #forge:ingots/magnesia_refractory_brick') + .inputFluids('gtceu:tin_alloy 144') + .itemOutputs('gtceu:cupronickel_coil_block') + .duration(10 * 20) + .EUt(GTValues.VA[GTValues.LV]) + .addMaterialInfo(true, true) + + // #endregion + + // #region RTM Coil + + event.remove({ id : 'gtceu:assembler/coil_rtm_alloy' }) + event.recipes.gtceu.assembler('tfg:coil_rtm_alloy') + .itemInputs('8x #forge:double_wires/rtm_alloy', '8x #forge:foils/vanadium_steel', '8x #forge:insulation_t2/sheet') + .inputFluids('tfg:nichromium_iodomethylate 244') + .itemOutputs('gtceu:rtm_alloy_coil_block') + .duration(20 * 25) + .EUt(GTValues.VA[GTValues.EV]) + .addMaterialInfo(true, true) + + event.recipes.gtceu.mixer('tfg:nichromium_iodomethylate') + .inputFluids(Fluid.of('gtceu:nichrome', 144), Fluid.of('tfg:iodomethane', 100)) + .outputFluids('tfg:nichromium_iodomethylate 244') + .duration(20 * 8) + .EUt(GTValues.VA[GTValues.HV]) + + // #endregion + + // #region HSS-G + + event.remove({ id : 'gtceu:assembler/coil_hssg' }) + event.recipes.gtceu.assembler('tfg:coil_hssg') + .itemInputs('8x #forge:double_wires/hssg', '8x #forge:foils/tungsten_carbide', '2x #forge:insulation_t3/sheet') + .inputFluids('gtceu:tungsten 144') + .itemOutputs('gtceu:hssg_coil_block') + .duration(20 * 30) + .EUt(GTValues.VA[GTValues.IV]) + .addMaterialInfo(true, true) + + // #endregion +} \ No newline at end of file diff --git a/kubejs/server_scripts/tfg/machines/recipes.ender_pearls.js b/kubejs/server_scripts/tfg/machines/recipes.ender_pearls.js index 84162e695..803ced4f3 100644 --- a/kubejs/server_scripts/tfg/machines/recipes.ender_pearls.js +++ b/kubejs/server_scripts/tfg/machines/recipes.ender_pearls.js @@ -6,6 +6,7 @@ function registerTFGEnderPearlRecipes(event) { .inputFluids(Fluid.of('gtceu:distilled_water', 6000), Fluid.of('gtceu:chlorine', 8000)) .itemOutputs('17x tfc:powder/kaolinite') .outputFluids(Fluid.of('gtceu:hydrochloric_acid', 8000)) + .circuit(3) .duration(20 * 10) .EUt(GTValues.VA[GTValues.HV]) @@ -14,6 +15,7 @@ function registerTFGEnderPearlRecipes(event) { .inputFluids(Fluid.of('gtceu:distilled_water', 6000), Fluid.of('gtceu:chlorine', 8000)) .itemOutputs('17x tfc:powder/kaolinite', '1x #forge:dusts/chromium') .outputFluids(Fluid.of('gtceu:hydrochloric_acid', 8000)) + .circuit(3) .duration(20 * 10) .EUt(GTValues.VA[GTValues.HV]) diff --git a/kubejs/server_scripts/tfg/machines/recipes.molds.js b/kubejs/server_scripts/tfg/machines/recipes.molds.js index 74bf13c2e..f6271a63a 100644 --- a/kubejs/server_scripts/tfg/machines/recipes.molds.js +++ b/kubejs/server_scripts/tfg/machines/recipes.molds.js @@ -6,278 +6,57 @@ */ function registerTFGMoldRecipes(event) { - event.shaped('tfg:mining_hammer_head_extruder_mold', [ - 'Sfh', - ' ', - ' ' - ], { - S: 'gtceu:empty_mold', - f: '#forge:tools/files', - h: '#forge:tools/hammers' - }) - - event.shaped('tfg:sword_head_extruder_mold', [ - 'Shf', - ' ', - ' ' - ], { - S: 'gtceu:empty_mold', - f: '#forge:tools/files', - h: '#forge:tools/hammers' - }) - - event.shaped('tfg:pickaxe_head_extruder_mold', [ - 'S ', - 'hf ', - ' ' - ], { - S: 'gtceu:empty_mold', - f: '#forge:tools/files', - h: '#forge:tools/hammers' - }) - - event.shaped('tfg:axe_head_extruder_mold', [ - 'S ', - ' fh', - ' ' - ], { - S: 'gtceu:empty_mold', - f: '#forge:tools/files', - h: '#forge:tools/hammers' - }) - - event.shaped('tfg:hoe_head_extruder_mold', [ - 'S ', - ' hf', - ' ' - ], { - S: 'gtceu:empty_mold', - f: '#forge:tools/files', - h: '#forge:tools/hammers' - }) - - event.shaped('tfg:scythe_head_extruder_mold', [ - 'S ', - ' ', - 'fh ' - ], { - S: 'gtceu:empty_mold', - f: '#forge:tools/files', - h: '#forge:tools/hammers' - }) - - event.shaped('tfg:file_head_extruder_mold', [ - 'S ', - ' ', - 'hf ' - ], { - S: 'gtceu:empty_mold', - f: '#forge:tools/files', - h: '#forge:tools/hammers' - }) - - event.shaped('tfg:hammer_head_extruder_mold', [ - 'Sf ', - ' h ', - ' ' - ], { - S: 'gtceu:empty_mold', - f: '#forge:tools/files', - h: '#forge:tools/hammers' - }) - - event.shaped('tfg:saw_head_extruder_mold', [ - 'Sh ', - ' f ', - ' ' - ], { - S: 'gtceu:empty_mold', - f: '#forge:tools/files', - h: '#forge:tools/hammers' - }) - - event.shaped('tfg:knife_head_extruder_mold', [ - 'S f', - ' ', - ' h' - ], { - S: 'gtceu:empty_mold', - f: '#forge:tools/files', - h: '#forge:tools/hammers' - }) - - event.shaped('tfg:butchery_knife_head_extruder_mold', [ - 'S h', - ' ', - ' f' - ], { - S: 'gtceu:empty_mold', - f: '#forge:tools/files', - h: '#forge:tools/hammers' - }) - - event.shaped('tfg:shovel_head_extruder_mold', [ - 'S ', - 'f ', - 'h ' - ], { - S: 'gtceu:empty_mold', - f: '#forge:tools/files', - h: '#forge:tools/hammers' - }) - - event.shaped('tfg:spade_head_extruder_mold', [ - 'S ', - 'f ', - ' h' - ], { - S: 'gtceu:empty_mold', - f: '#forge:tools/files', - h: '#forge:tools/hammers' - }) - - event.shaped('tfg:propick_head_extruder_mold', [ - 'Sxf', - ' ', - ' ' - ], { - S: 'gtceu:empty_mold', - f: '#forge:tools/files', - x: '#forge:tools/wire_cutters' - }) - - event.shaped('tfg:javelin_head_extruder_mold', [ - 'S x', - 'f ', - ' ' - ], { - S: 'gtceu:empty_mold', - f: '#forge:tools/files', - x: '#forge:tools/wire_cutters' - }) - - event.shaped('tfg:chisel_head_extruder_mold', [ - 'S ', - 'xf ', - ' ' - ], { - S: 'gtceu:empty_mold', - f: '#forge:tools/files', - x: '#forge:tools/wire_cutters' - }) - - event.shaped('tfg:mace_head_extruder_mold', [ - 'S ', - ' xf', - ' ' - ], { - S: 'gtceu:empty_mold', - f: '#forge:tools/files', - x: '#forge:tools/wire_cutters' - }) - - event.shaped('tfg:lamp_casting_mold', [ - 'Sh ', - ' ', - ' m' - ], { - S: 'gtceu:empty_mold', - h: '#forge:tools/hammers', - m: '#forge:tools/mallets' - }) - - event.shaped('tfg:trapdoor_casting_mold', [ - 'S h', - ' ', - ' m' - ], { - S: 'gtceu:empty_mold', - h: '#forge:tools/hammers', - m: '#forge:tools/mallets' - }) - - event.shaped('tfg:chain_casting_mold', [ - 'S ', - 'h ', - ' m' - ], { - S: 'gtceu:empty_mold', - h: '#forge:tools/hammers', - m: '#forge:tools/mallets' - }) - - event.shaped('tfg:bell_casting_mold', [ - 'S ', - ' h ', - ' m' - ], { - S: 'gtceu:empty_mold', - h: '#forge:tools/hammers', - m: '#forge:tools/mallets' - }) - - event.shaped('tfg:mattock_head_extruder_mold', [ - ' h', - 'fS ', - ' ' - ], { - S: 'gtceu:empty_mold', - f: '#forge:tools/files', - h: '#forge:tools/hammers' - }) - - event.shaped('tfg:fish_hook_extruder_mold', [ - 'f ', - ' S ', - ' h' - ], { - S: 'gtceu:empty_mold', - f: '#forge:tools/files', - h: '#forge:tools/hammers' - }) - - event.shaped('tfg:whisk_extruder_mold', [ - 'f h', - ' S ', - ' ' - ], { - S: 'gtceu:empty_mold', - f: '#forge:tools/files', - h: '#forge:tools/hammers' - }) + /** @type {['huge'|'large'|'normal'|'small'|'tiny']}*/ + const pipe_sizes = [ + 'huge', + 'large', + 'normal', + 'small', + 'tiny' + ]; - event.shaped('tfg:screwdriver_tip_extruder_mold', [ - 'f ', - ' S ', - ' h ' - ], { - S: 'gtceu:empty_mold', - f: '#forge:tools/files', - h: '#forge:tools/hammers' - }) + let prev_size; + pipe_sizes.forEach((size) => { + if (size !== 'huge'){ + event.shaped(`gtceu:${size}_pipe_casting_mold`, [ + 'ABC' + ], { + A: '#forge:tools/hammers', + B: `gtceu:${prev_size}_pipe_casting_mold`, + C: '#forge:tools/mallets' + }).id(`tfg:shaped/${prev_size}_${size}_casting_mold`) + + event.shaped(`gtceu:${size}_pipe_extruder_mold`, [ + 'ABC' + ], { + A: '#forge:tools/hammers', + B: `gtceu:${prev_size}_pipe_extruder_mold`, + C: '#forge:tools/mallets' + }).id(`tfg:shaped/${prev_size}_${size}_extruder_mold`) + } + prev_size = size; + }); - event.shaped('tfg:wrench_tip_extruder_mold', [ - 'f ', - 'hS ', - ' ' - ], { - S: 'gtceu:empty_mold', - f: '#forge:tools/files', - h: '#forge:tools/hammers' - }) + pipe_sizes.reverse().forEach((size) => { + if (size !== 'tiny'){ + event.shaped(`gtceu:${size}_pipe_casting_mold`, [ + 'ABC' + ], { + A: '#forge:tools/mallets', + B: `gtceu:${prev_size}_pipe_casting_mold`, + C: '#forge:tools/hammers' + }).id(`tfg:shaped/${prev_size}_${size}_casting_mold`) - event.shaped('tfg:wire_cutter_head_extruder_mold', [ - 'hS ', - ' ', - ' f ' - ], { - S: 'gtceu:empty_mold', - f: '#forge:tools/files', - h: '#forge:tools/hammers' - }) - - let steelIngots = ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Steel, 4); - let steelDusts = ChemicalHelper.get(TagPrefix.dust, GTMaterials.Steel, 4); + event.shaped(`gtceu:${size}_pipe_extruder_mold`, [ + 'ABC' + ], { + A: '#forge:tools/mallets', + B: `gtceu:${prev_size}_pipe_extruder_mold`, + C: '#forge:tools/hammers' + }).id(`tfg:shaped/${prev_size}_${size}_extruder_mold`) + } + prev_size = size; + }); global.TFG_EXTRUDER_MOLDS.forEach(mold => { @@ -289,7 +68,7 @@ function registerTFGMoldRecipes(event) { .itemOutputs(mold) .duration(120) .EUt(GTValues.VA[GTValues.LV]) - }) + }); global.TFG_CASTING_MOLDS.forEach(mold => { @@ -301,23 +80,6 @@ function registerTFGMoldRecipes(event) { .itemOutputs(mold) .duration(120) .EUt(GTValues.VA[GTValues.LV]) - }) + }); - //TODO: Fix this code to respect full molds - // //craft mold to scrub nbt - // const molds = Ingredient.of('#tfc:fired_molds').itemIds; - - // molds.forEach(mold => { - // event.shapeless(Item.of(mold), [mold]) - // .id(`tfg:shapeless/mold_cleaning/${mold.replace(":", "/")}`); - // }); - - // //craft vessel to scrub nbt - // const vessels = Ingredient.of('#tfc:fired_vessels').itemIds; - - // vessels.forEach(vessel => { - // event.shapeless(Item.of(vessel), [vessel]) - // .id(`tfg:shapeless/vessel_cleaning/${vessel.replace(":", "/")}`); - // }); - -} +}; diff --git a/kubejs/server_scripts/tfg/machines/recipes.multiblocks.js b/kubejs/server_scripts/tfg/machines/recipes.multiblocks.js index 65f5b2f21..b5a1d9298 100644 --- a/kubejs/server_scripts/tfg/machines/recipes.multiblocks.js +++ b/kubejs/server_scripts/tfg/machines/recipes.multiblocks.js @@ -98,7 +98,7 @@ function registerTFGMultiblockRecipes(event) { 'ACA', 'ABA' ], { - A: '#forge:plates/brass', + A: '#forge:plates/bronze', B: 'gtceu:potin_large_fluid_pipe', C: 'gtceu:hp_steam_compressor' }).addMaterialInfo().id('gtceu:shaped/steam_squasher') @@ -108,7 +108,7 @@ function registerTFGMultiblockRecipes(event) { 'ACA', 'ABA' ], { - A: '#forge:plates/brass', + A: '#forge:plates/bronze', B: 'tfc:metal/anvil/steel', C: 'gtceu:hp_steam_forge_hammer', D: 'gtceu:potin_large_fluid_pipe' @@ -120,13 +120,26 @@ function registerTFGMultiblockRecipes(event) { 'PTP' ], { S: 'tfg:casings/machine_casing_vacuum_engine_intake', - Z: 'gtceu:iv_machine_hull', - W: '#gtceu:circuits/iv', + Z: 'gtceu:ev_machine_hull', + W: '#gtceu:circuits/ev', U: '#forge:double_plates/stellite_100', - T: '#forge:single_cables/platinum', - P: 'gtceu:iv_electric_pump' + T: '#forge:single_cables/aluminium', + P: 'gtceu:ev_electric_pump' }).addMaterialInfo().id('tfg:shaped/ostrum_linear_accelerator') + event.recipes.gtceu.shaped('tfg:heat_battery_mk1', [ + 'USU', + 'WZW', + 'PTP' + ], { + S: 'tfg:casings/heat_pipe_casing', + Z: 'gtceu:ev_machine_hull', + W: '#gtceu:circuits/ev', + U: '#forge:dense_plates/silicon', + T: '#forge:single_cables/aluminium', + P: 'gtceu:hv_field_generator' + }).addMaterialInfo().id('tfg:shaped/heat_battery_mk1') + event.recipes.gtceu.assembler('tfg:ostrum_harvester') .itemInputs( '1x gtceu:ev_machine_hull', @@ -175,6 +188,28 @@ function registerTFGMultiblockRecipes(event) { Z: 'gtceu:ev_machine_hull' }).addMaterialInfo().id('tfg:shaped/fission_reactor_mk1') + event.recipes.gtceu.shaped('deafission:fission_reactor_smr1', [ + 'TUT', + 'WZW', + 'TUT' + ], { + T: 'gtceu:atomic_casing', + W: '#gtceu:circuits/iv', + U: 'gtceu:ev_field_generator', + Z: 'gtceu:iv_machine_hull' + }).addMaterialInfo().id('tfg:shaped/fission_reactor_smr1') + + event.recipes.gtceu.shaped('tfg:smr_generator', [ + 'TUT', + 'WZW', + 'TUT' + ], { + T: 'tfg:casings/machine_casing_desh_ptfe', + W: '#gtceu:circuits/iv', + U: 'gtceu:ev_field_generator', + Z: 'gtceu:iv_machine_hull' + }).addMaterialInfo().id('tfg:shaped/smr_generator') + event.recipes.gtceu.shaped('gtceu:nuclear_fuel_factory', [ 'TUT', 'WZW', @@ -227,8 +262,8 @@ function registerTFGMultiblockRecipes(event) { 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') + .itemInputs('1x gtceu:ev_transformer_1a', '1x #gtceu:circuits/ev', '8x gtceu:uranium_triplatinum_single_wire', + '2x gtceu:mpic_chip') .inputFluids(Fluid.of('gtceu:ostrum_iodide', 288)) .itemOutputs('tfg:active_power_transformer') .duration(300) diff --git a/kubejs/server_scripts/tfg/mars/recipes.ostrum.js b/kubejs/server_scripts/tfg/mars/recipes.ostrum.js index 7aa0cdffd..bf4ff9dbc 100644 --- a/kubejs/server_scripts/tfg/mars/recipes.ostrum.js +++ b/kubejs/server_scripts/tfg/mars/recipes.ostrum.js @@ -2,8 +2,8 @@ function registerTFGMarsOstrumRecipes(event) { - var $HeatRecipeCapability = Java.loadClass("fi.dea.mc.deafission.common.data.recipe.HeatRecipeCapability"); - var $HeatIngredient = Java.loadClass("fi.dea.mc.deafission.common.data.recipe.HeatIngredient"); + const $HeatRecipeCapability = Java.loadClass("fi.dea.mc.deafission.common.data.recipe.HeatRecipeCapability"); + const $HeatIngredient = Java.loadClass("fi.dea.mc.deafission.common.data.recipe.HeatIngredient"); const $ChanceLogic = Java.loadClass('com.gregtechceu.gtceu.api.recipe.chance.logic.ChanceLogic') // Ostrum Harvester @@ -18,7 +18,7 @@ function registerTFGMarsOstrumRecipes(event) { .EUt(GTValues.VA[GTValues.LV]); // Ostrum Linear Accelerator Recipes - +/* event.recipes.gtceu.ostrum_linear_accelerator('tfg:ostrum_transformation') .inputFluids('gtceu:residual_radioactive_concoction 100') .itemInputs('32x #forge:dusts/ostrum') @@ -62,13 +62,13 @@ function registerTFGMarsOstrumRecipes(event) { .dimension('ad_astra:mars') .duration(20 * 5) .EUt(GTValues.VA[GTValues.IV]); - +*/ // Ostrum Linear Accelerator Recipes // .input($HeatRecipeCapability.CAP, new $HeatIngredient(X, Y)) where X is Minimal Temperature to run and where Y is HU consummed per craft - /* + event.recipes.gtceu.ostrum_linear_accelerator('tfg:ostrum_transformation') - .inputFluids('gtceu:residual_radioactive_concoction 100') + .inputFluids(Fluid.of('gtceu:residual_radioactive_concoction', 1000)) .itemInputs('32x #forge:dusts/ostrum') .chancedFluidOutputLogic($ChanceLogic.XOR) .chancedFluidOutput('gtceu:lightweight_ostrum_vapor', 6000, 0) @@ -77,46 +77,49 @@ function registerTFGMarsOstrumRecipes(event) { .dimension('ad_astra:mars') .duration(20 * 5) .EUt(GTValues.VA[GTValues.EV]); + + //#region Light Ostrum Vapor event.recipes.gtceu.ostrum_linear_accelerator('tfg:lightweight_ostrum_vapor_t1') .perTick(true) - .inputFluids('gtceu:residual_radioactive_concoction 1') + .inputFluids(Fluid.of('gtceu:residual_radioactive_concoction', 1)) .perTick(false) .inputFluids(Fluid.of('gtceu:lightweight_ostrum_vapor',1000)) .inputFluids(Fluid.of('gtceu:radon', 10)) - .itemOutputsRanged(Item.of('#forge:dusty_raw_materials/thorium'), 1, 10) - .itemOutputsRanged(Item.of('#forge:dusty_raw_materials/silver'), 1, 10) - .itemOutputsRanged(Item.of('gtceu:dusty_raw_tricalcium_phosphate'), 1, 10) - .itemOutputsRanged(Item.of('#forge:dusty_raw_materials/bauxite'), 1, 10) - .itemOutputsRanged(Item.of('#forge:dusty_raw_materials/lead'), 1, 10) - //.input($HeatRecipeCapability.CAP, new $HeatIngredient(100, 500)) + .itemOutputsRanged(Item.of('#forge:dusty_raw_materials/thorium'), 1, 5) + .itemOutputsRanged(Item.of('#forge:dusty_raw_materials/silver'), 1, 2) + .itemOutputsRanged(Item.of('gtceu:dusty_raw_tricalcium_phosphate'), 1, 2) + .itemOutputsRanged(Item.of('#forge:dusty_raw_materials/bauxite'), 1, 2) + .itemOutputsRanged(Item.of('#forge:dusty_raw_materials/lead'), 1, 5) + .input($HeatRecipeCapability.CAP, new $HeatIngredient(10, 100)) .dimension('ad_astra:mars') - .duration(20 * 20) + .duration(20 * 120) + .EUt(GTValues.VA[GTValues.EV]) .circuit(1); event.recipes.gtceu.ostrum_linear_accelerator('tfg:lightweight_ostrum_vapor_t2') .perTick(true) - .inputFluids('gtceu:residual_radioactive_concoction 1') + .inputFluids(Fluid.of('gtceu:residual_radioactive_concoction', 1)) .inputFluids(Fluid.of('tfg:semiheavy_water', 1)) .perTick(false) .inputFluids(Fluid.of('gtceu:lightweight_ostrum_vapor',1000)) .inputFluids(Fluid.of('gtceu:radon', 10)) .inputFluids(Fluid.of('gtceu:krypton', 10)) - .itemOutputsRanged(Item.of('#forge:dusty_raw_materials/thorium'), 10, 20) - .itemOutputsRanged(Item.of('#forge:dusty_raw_materials/silver'), 1, 10) - .itemOutputsRanged(Item.of('gtceu:dusty_raw_tricalcium_phosphate'), 1, 10) - .itemOutputsRanged(Item.of('#forge:dusty_raw_materials/bauxite'), 1, 10) - .itemOutputsRanged(Item.of('#forge:dusty_raw_materials/lead'), 1, 10) + .itemOutputsRanged(Item.of('#forge:dusty_raw_materials/thorium'), 1, 10) + .itemOutputsRanged(Item.of('#forge:dusty_raw_materials/silver'), 1, 3) + .itemOutputsRanged(Item.of('gtceu:dusty_raw_tricalcium_phosphate'), 1, 3) + .itemOutputsRanged(Item.of('#forge:dusty_raw_materials/bauxite'), 1, 3) + .itemOutputsRanged(Item.of('#forge:dusty_raw_materials/lead'), 1, 3) .itemOutputsRanged(Item.of('gtceu:dusty_raw_pitchblende'), 1, 10) - //.input($HeatRecipeCapability.CAP, new $HeatIngredient(100, 500)) + .input($HeatRecipeCapability.CAP, new $HeatIngredient(10, 100)) .dimension('ad_astra:mars') - .duration(20 * 20) - .EUt(GTValues.VA[GTValues.IV]) + .duration(20 * 120) + .EUt(GTValues.VA[GTValues.EV]) .circuit(2); event.recipes.gtceu.ostrum_linear_accelerator('tfg:lightweight_ostrum_vapor_t3') .perTick(true) - .inputFluids('gtceu:residual_radioactive_concoction 1') + .inputFluids(Fluid.of('gtceu:residual_radioactive_concoction', 1)) .inputFluids(Fluid.of('tfg:semiheavy_water', 1)) .perTick(false) .inputFluids(Fluid.of('gtceu:lightweight_ostrum_vapor',1000)) @@ -124,17 +127,108 @@ function registerTFGMarsOstrumRecipes(event) { .inputFluids(Fluid.of('gtceu:krypton', 10)) .inputFluids(Fluid.of('gtceu:tritiated_water', 10)) .itemOutputsRanged(Item.of('#forge:dusty_raw_materials/thorium'), 10, 20) - .itemOutputsRanged(Item.of('#forge:dusty_raw_materials/silver'), 1, 10) - .itemOutputsRanged(Item.of('gtceu:dusty_raw_tricalcium_phosphate'), 1, 10) - .itemOutputsRanged(Item.of('#forge:dusty_raw_materials/bauxite'), 1, 10) - .itemOutputsRanged(Item.of('#forge:dusty_raw_materials/lead'), 10, 10) + .itemOutputsRanged(Item.of('#forge:dusty_raw_materials/silver'), 1, 5) + .itemOutputsRanged(Item.of('gtceu:dusty_raw_tricalcium_phosphate'), 1, 5) + .itemOutputsRanged(Item.of('#forge:dusty_raw_materials/bauxite'), 1, 5) + .itemOutputsRanged(Item.of('#forge:dusty_raw_materials/lead'), 1, 5) .itemOutputsRanged(Item.of('gtceu:dusty_raw_pitchblende'), 10, 20) - .input($HeatRecipeCapability.CAP, new $HeatIngredient(100, 500)) + .input($HeatRecipeCapability.CAP, new $HeatIngredient(10, 100)) .dimension('ad_astra:mars') - .duration(20 * 20) - .EUt(GTValues.VA[GTValues.IV]) + .duration(20 * 120) + .EUt(GTValues.VA[GTValues.EV]) .circuit(3); - */ + //#endregion + //#region Ostrum Vapor + + event.recipes.gtceu.ostrum_linear_accelerator('tfg:polyalkylene_lubricant') + .perTick(true) + .inputFluids(Fluid.of('gtceu:residual_radioactive_concoction', 1)) + .perTick(false) + .inputFluids(Fluid.of('gtceu:ostrum_vapor', 1000)) + .inputFluids(Fluid.of('gtceu:ethylene', 1000)) + .inputFluids(Fluid.of('gtceu:lubricant', 1000)) + .outputFluids(Fluid.of('tfg:polyalkylene_lubricant', 1000)) + .input($HeatRecipeCapability.CAP, new $HeatIngredient(100, 1500)) + .dimension('ad_astra:mars') + .duration(20 * 150) + .EUt(GTValues.VA[GTValues.IV]) + //.circuit(3); + + event.recipes.gtceu.ostrum_linear_accelerator('tfg:caesium_137') + .perTick(true) + .inputFluids(Fluid.of('gtceu:residual_radioactive_concoction', 1)) + .perTick(false) + .inputFluids(Fluid.of('gtceu:ostrum_vapor', 1000)) + .inputFluids(Fluid.of('gtceu:radon', 1000)) + .itemInputs(Item.of('gtceu:caesium_dust', 64)) + .itemOutputs(Item.of('#forge:dusts/caesium_137')) + .input($HeatRecipeCapability.CAP, new $HeatIngredient(100, 1500)) + .dimension('ad_astra:mars') + .duration(20 * 150) + .EUt(GTValues.VA[GTValues.IV]) + + event.recipes.gtceu.ostrum_linear_accelerator('tfg:terrafirmaguard_pa6') + .perTick(true) + .inputFluids(Fluid.of('gtceu:residual_radioactive_concoction', 1)) + .perTick(false) + .inputFluids(Fluid.of('gtceu:ostrum_vapor', 1000)) + .itemInputs(Item.of('tfg:polycaprolactam_fabric', 64)) + .itemInputs(Item.of('tfg:refrigerant_pellet', 8)) + .itemInputs(Item.of('gtceu:iodine_dust', 1)) + .itemOutputs(Item.of('tfg:terrafirmaguard_pa6', 32)) + .input($HeatRecipeCapability.CAP, new $HeatIngredient(100, 100)) + .dimension('ad_astra:mars') + .duration(20 * 120) + .EUt(GTValues.VA[GTValues.IV]) + + //#endregion + + //#region Dense Ostrum Vapor + + event.recipes.gtceu.ostrum_linear_accelerator('tfg:radioactive_effluent') + .perTick(true) + .inputFluids(Fluid.of('gtceu:residual_radioactive_concoction', 1)) + .perTick(false) + .inputFluids(Fluid.of('gtceu:dense_ostrum_vapor', 1000)) + .itemInputs(Item.of('#forge:dusts/caesium_137', 1)) + .itemInputs(Item.of('gtceu:cobalt_dust', 8)) + .outputFluids(Fluid.of('tfg:radioactive_effluent', 512)) + .input($HeatRecipeCapability.CAP, new $HeatIngredient(500, 1600)) + .dimension('ad_astra:mars') + .duration(20 * 240) + .EUt(GTValues.VA[GTValues.LuV]) + + event.recipes.gtceu.ostrum_linear_accelerator('tfg:tbu_232_rod_ola') + .perTick(true) + .inputFluids(Fluid.of('gtceu:residual_radioactive_concoction', 1)) + .perTick(false) + .inputFluids(Fluid.of('gtceu:dense_ostrum_vapor', 1000)) + .inputFluids(Fluid.of('gtceu:radioactive_waste', 128000)) + .inputFluids(Fluid.of('gtceu:tritiated_water', 41472)) + .itemInputs('16x #forge:rods/long/thorium_230') + .itemInputs('16x #forge:rods/long/thorium_230') + .itemInputs('16x #forge:rods/long/thorium_230') + .itemInputs('16x #forge:rods/long/thorium_230') + .itemInputs('16x #forge:rods/long/thorium_230') + .itemInputs(Item.of('tfg:empty_rod_t2', 1)) + .itemOutputs(Item.of('tfg:tbu_232_rod', 1)) + .input($HeatRecipeCapability.CAP, new $HeatIngredient(100, 500)) + .dimension('ad_astra:mars') + .duration(20 * 640) + .EUt(GTValues.VA[GTValues.IV]) + + event.recipes.gtceu.ostrum_linear_accelerator('tfg:dense_to_light') + .perTick(true) + .inputFluids(Fluid.of('gtceu:residual_radioactive_concoction', 1)) + .perTick(false) + .inputFluids(Fluid.of('gtceu:dense_ostrum_vapor', 1000)) + .outputFluids(Fluid.of('gtceu:lightweight_ostrum_vapor', 1000)) + .input($HeatRecipeCapability.CAP, new $HeatIngredient(100, 100)) + .dimension('ad_astra:mars') + .duration(20 * 240) + .EUt(GTValues.VA[GTValues.IV]) + .circuit(4) + } \ No newline at end of file diff --git a/kubejs/server_scripts/tfg/mars/tags.mars.js b/kubejs/server_scripts/tfg/mars/tags.mars.js index 07c37d491..e7a130957 100644 --- a/kubejs/server_scripts/tfg/mars/tags.mars.js +++ b/kubejs/server_scripts/tfg/mars/tags.mars.js @@ -28,16 +28,14 @@ function registerTFGMarsItemTags(event) { event.add('forge:eggs', '#tfg:martian_eggs') event.add('firmalife:foods/raw_eggs', '#tfg:martian_eggs') - event.add('tfg:martian_animal_foods', 'betterend:amber_root_product') - event.add('tfg:martian_animal_foods', 'betterend:blossom_berry_product') - event.add('tfg:martian_animal_foods', 'betterend:chorus_mushroom_product') - event.add('tfg:martian_animal_foods', 'betterend:shadow_berry_product') - event.add('tfg:martian_animal_foods', 'betterend:bolux_mushroom_product') - event.add('tfg:martian_animal_foods', 'betterend:cave_pumpkin_chunks') - - event.add('tfg:glacian_ram_food', '#tfg:martian_animal_foods') - event.add('tfg:sniffer_food', '#tfg:martian_animal_foods') - event.add('tfg:wraptor_food', '#tfg:martian_animal_foods') + event.add('tfg:martian_herbivore_foods', 'betterend:amber_root_product') + event.add('tfg:martian_herbivore_foods', 'betterend:blossom_berry_product') + event.add('tfg:martian_herbivore_foods', 'betterend:chorus_mushroom_product') + event.add('tfg:martian_herbivore_foods', 'betterend:shadow_berry_product') + event.add('tfg:martian_herbivore_foods', 'betterend:bolux_mushroom_product') + event.add('tfg:martian_herbivore_foods', 'betterend:cave_pumpkin_chunks') + + event.add('tfg:martian_piscivore_foods', '#firmalife:foods/raw_fish') event.remove('minecraft:wool', 'ad_astra:glacian_fur') @@ -162,6 +160,9 @@ function registerTFGMarsBlockTags(event) { event.add('ad_astra:mars_stone_replaceables', 'tfc:rock/raw/shale') event.add('ad_astra:mars_stone_replaceables', 'tfc:rock/hardened/shale') event.add('ad_astra:mars_stone_replaceables', 'tfc:rock/gravel/shale') + event.add('ad_astra:mars_stone_replaceables', 'tfc:rock/raw/quartzite') + event.add('ad_astra:mars_stone_replaceables', 'tfc:rock/hardened/quartzite') + event.add('ad_astra:mars_stone_replaceables', 'tfc:rock/gravel/quartzite') event.add('ad_astra:mars_stone_replaceables', 'ad_astra:mars_stone') event.add('ad_astra:mars_stone_replaceables', 'tfg:rock/hardened_mars_stone') event.add('ad_astra:mars_stone_replaceables', 'tfg:rock/gravel_mars') @@ -393,6 +394,7 @@ function registerTFGMarsEntityTypeTags(event) { 'species:springling', 'species:quake', 'species:stackatick', + 'minecraft:enderman', 'endermanoverhaul:crimson_forest_enderman', 'endermanoverhaul:warped_forest_enderman', 'endermanoverhaul:badlands_enderman', @@ -404,6 +406,9 @@ function registerTFGMarsEntityTypeTags(event) { 'wan_ancient_beasts:glider', 'wan_ancient_beasts:toxlacanth', 'wan_ancient_beasts:surfer', + 'wan_ancient_beasts:charger', + 'wan_ancient_beasts:raider', + 'wan_ancient_beasts:snatcher', 'tfg:surfer' ] @@ -417,10 +422,13 @@ function registerTFGMarsEntityTypeTags(event) { event.add('tfc:deals_piercing_damage', 'wan_ancient_beasts:eater') event.add('tfc:deals_piercing_damage', 'wan_ancient_beasts:soarer') event.add('tfc:deals_piercing_damage', 'wan_ancient_beasts:glider') + event.add('tfc:deals_piercing_damage', 'wan_ancient_beasts:raider') + event.add('tfc:deals_piercing_damage', 'wan_ancient_beasts:snatcher') event.add('tfc:deals_piercing_damage', 'ad_astra:martian_raptor') event.add('tfc:deals_crushing_damage', 'species:quake') event.add('tfc:deals_crushing_damage', 'wan_ancient_beasts:walker') event.add('tfc:deals_crushing_damage', 'wan_ancient_beasts:crusher') + event.add('tfc:deals_crushing_damage', 'wan_ancient_beasts:charger') event.add('tfc:deals_slashing_damage', 'endermanoverhaul:crimson_forest_enderman') event.add('tfc:deals_slashing_damage', 'endermanoverhaul:warped_forest_enderman') event.add('tfc:deals_slashing_damage', 'endermanoverhaul:badlands_enderman') @@ -431,11 +439,14 @@ function registerTFGMarsEntityTypeTags(event) { // this huge guy also looks silly in low grav event.add('tfg:ignores_gravity', 'wan_ancient_beasts:walker') event.add('tfg:ignores_gravity', 'wan_ancient_beasts:eater') + event.add('tfg:ignores_gravity', 'wan_ancient_beasts:raider') + event.add('tfg:ignores_gravity', 'wan_ancient_beasts:charger') // flying mobs event.add('tfg:ignores_gravity', 'wan_ancient_beasts:soarer') event.add('tfg:ignores_gravity', 'wan_ancient_beasts:glider') // swimming mobs event.add('tfg:ignores_gravity', 'tfg:surfer') + event.add('tfg:ignores_gravity', 'wan_ancient_beasts:surfer') event.add('tfg:ignores_gravity', 'wan_ancient_beasts:toxlacanth') event.add('tfg:ignores_gravity', 'endermanoverhaul:coral_enderman') } diff --git a/kubejs/server_scripts/tfg/natural_blocks/loot.stones.js b/kubejs/server_scripts/tfg/natural_blocks/loot.stones.js new file mode 100644 index 000000000..064bb05cc --- /dev/null +++ b/kubejs/server_scripts/tfg/natural_blocks/loot.stones.js @@ -0,0 +1,104 @@ +// priority: 10 +"use strict"; + +function registerTFGRockLoots(event) { + + // Rock to cobble, cobble to gravel + for (let [rockId, rock] of Object.entries(global.BIG_ROCK_TABLE)) { + if (rock.raw != null && rock.cobble != null) { + event.addBlockLootModifier(rock.raw.block) + .matchMainHand('#forge:tools/hammers') + .removeLoot(ItemFilter.ALWAYS_TRUE) + .addLoot(rock.cobble.block) + } + + if (rock.hardened != null && rock.cobble != null) { + event.addBlockLootModifier(rock.hardened) + .removeLoot(ItemFilter.ALWAYS_TRUE) + .addWeightedLoot([1, 4], [ + LootEntry.of(rock.loose) + ]) + + event.addBlockLootModifier(rock.hardened) + .matchMainHand('#forge:tools/hammers') + .removeLoot(ItemFilter.ALWAYS_TRUE) + .addLoot(rock.cobble.block) + } + + if (rock.cobble != null) { + event.addBlockLootModifier(rock.cobble.block) + .addLoot(rock.cobble.block) + } + + if (rock.gravel != null) { + event.addBlockLootModifier(rock.gravel.block) + .addAlternativesLoot([ + LootEntry.of('minecraft:flint').when(c => c.randomChance(0.1)), + LootEntry.of(rock.gravel.block) + ]) + } + + if (rock.cobble != null && rock.gravel != null) { + event.addBlockLootModifier(rock.cobble.block) + .matchMainHand('#forge:tools/hammers') + .removeLoot(ItemFilter.ALWAYS_TRUE) + .addLoot(rock.gravel) + + if (rock.cobble.mossy != null) { + event.addBlockLootModifier(rock.cobble.mossy.block) + .matchMainHand('#forge:tools/hammers') + .removeLoot(ItemFilter.ALWAYS_TRUE) + .addLoot(rock.gravel) + } + } + } + + // Sand + global.SAND_COLORS.forEach(sandColor => { + let tag_array = Ingredient.of(`#tfc:${sandColor}_gravel`).itemIds.toArray().map(String); + tag_array.forEach(item => { + event.addBlockLootModifier(item) + .matchMainHand('#forge:tools/hammers') + .removeLoot(ItemFilter.ALWAYS_TRUE) + .addLoot(`tfc:sand/${sandColor}`) + }) + }) + + global.HAMMERING.forEach(x => { + if (x.raw.startsWith('#')) { + let tag_array = Ingredient.of(x.raw).itemIds.toArray().map(String); + tag_array.forEach(item => { + event.addBlockLootModifier(item) + .matchMainHand('#forge:tools/hammers') + .removeLoot(ItemFilter.ALWAYS_TRUE) + .addLoot(x.hammered) + }) + } + else { + event.addBlockLootModifier(x.raw) + .matchMainHand('#forge:tools/hammers') + .removeLoot(ItemFilter.ALWAYS_TRUE) + .addLoot(x.hammered) + } + }) + + // Other rocks + event.addBlockLootModifier('minecraft:gilded_blackstone') + .matchMainHand('#forge:tools/hammers') + .removeLoot(ItemFilter.ALWAYS_TRUE) + .addSequenceLoot( + LootEntry.of('tfg:rock/cobble_blackstone'), + LootEntry.of('tfc:powder/native_gold') + ) + + event.addBlockLootModifier('beneath:ore/blackstone_sylvite') + .removeLoot(ItemFilter.ALWAYS_TRUE) + .addWeightedLoot([ + Item.of('gtceu:rich_raw_rock_salt').withChance(0.2), + Item.of('gtceu:raw_rock_salt').withChance(0.6), + Item.of('gtceu:poor_raw_rock_salt').withChance(0.2) + ]) + .addLoot(LootEntry.of('tfg:igneous_ultramafic_dust').when(c => c.randomChance(0.2))) + .addLoot(LootEntry.of('gtceu:tiny_rock_salt_dust').when(c => c.randomChance(0.05))); + +} \ No newline at end of file diff --git a/kubejs/server_scripts/tfg/natural_blocks/recipes.concrete.js b/kubejs/server_scripts/tfg/natural_blocks/recipes.concrete.js index fe60118ed..1fe0048ff 100644 --- a/kubejs/server_scripts/tfg/natural_blocks/recipes.concrete.js +++ b/kubejs/server_scripts/tfg/natural_blocks/recipes.concrete.js @@ -87,29 +87,11 @@ function registerTFGConcreteRecipes(event) { .outputItem('gtceu:light_concrete') .id('tfg:barrel/light_concrete') - event.recipes.tfc.barrel_sealed(1000) - .inputFluid(Fluid.of('gtceu:concrete', 96)) - .inputItem('tfg:rebar_support') - .outputItem('tfg:reinforced_light_concrete_support') - .id('tfg:barrel/reinforced_light_concrete_support') - event.recipes.tfc.barrel_sealed(500) .inputItem('gtceu:light_concrete') .inputFluid(Fluid.of('tfc:black_dye', 18)) .outputItem('gtceu:dark_concrete') .id('tfg:barrel/dark_concrete') - - event.recipes.tfc.barrel_sealed(500) - .inputItem('tfg:light_concrete_support') - .inputFluid(Fluid.of('tfc:black_dye', 10)) - .outputItem('tfg:dark_concrete_support') - .id('tfg:barrel/dark_concrete_support') - - event.recipes.tfc.barrel_sealed(500) - .inputItem('tfg:reinforced_light_concrete_support') - .inputFluid(Fluid.of('tfc:black_dye', 10)) - .outputItem('tfg:reinforced_dark_concrete_support') - .id('tfg:barrel/reinforced_dark_concrete_support') // Titanium concrete event.recipes.gtceu.assembler('tfg:titanium_concrete') diff --git a/kubejs/server_scripts/tfg/natural_blocks/recipes.rocks.js b/kubejs/server_scripts/tfg/natural_blocks/recipes.rocks.js index 8918df150..e81bcb904 100644 --- a/kubejs/server_scripts/tfg/natural_blocks/recipes.rocks.js +++ b/kubejs/server_scripts/tfg/natural_blocks/recipes.rocks.js @@ -198,13 +198,22 @@ function registerTFGRockRecipes(event) { // Cobble to mossy cobble if (rock.cobble != null && rock.cobble.mossy != null) { - event.recipes.gtceu.mixer(`tfg:${rockId}_cobble_rocks_to_mossy_cobble`) + event.recipes.gtceu.mixer(`tfg:${rockId}_cobble_to_mossy_cobble`) .itemInputs(rock.cobble.block, '#tfc:compost_greens_low') .circuit(1) .inputFluids("#tfg:clean_water 144") .itemOutputs(rock.cobble.mossy.block) .duration(50) .EUt(2) + + event.recipes.create.deploying(rock.cobble.mossy.block, [ rock.cobble.block, '#tfc:compost_greens_low' ]) + .id(`tfg:deploying/${rockId}_cobble_to_mossy_cobble`) + + event.recipes.create.deploying(rock.cobble.block, [ rock.cobble.mossy.block, 'tfc:groundcover/pumice' ]) + .id(`tfg:deploying/${rockId}_mossy_cobble_to_cobble_pumice`) + + event.recipes.create.deploying(rock.cobble.block, [ rock.cobble.mossy.block, '#forge:tools/knives' ]) + .id(`tfg:deploying/${rockId}_mossy_cobble_to_cobble_knife`) } // Bricks to brick blocks @@ -227,6 +236,20 @@ function registerTFGRockRecipes(event) { .circuit(1) .duration(50) .EUt(2) + + event.recipes.create.sequenced_assembly(`4x ${rock.bricks.block}`, rock.brick, [ + event.recipes.create.deploying(rock.brick, [rock.brick, rock.brick]), + event.recipes.create.deploying(rock.brick, [rock.brick, 'tfc:mortar']) + ]) + .transitionalItem(rock.brick) + .loops(4) + .id(`tfg:deploying/${rockId}_brick_to_bricks`) + } + + // Bricks to smooth + if (rock.bricks != null && rock.polished != null) { + event.recipes.create.sandpaper_polishing(rock.polished.block, rock.bricks.block) + .id(`tfg:polishing/${rockId}_brick_to_polished`) } // Bricks to mossy bricks @@ -238,8 +261,24 @@ function registerTFGRockRecipes(event) { .itemOutputs(rock.bricks.mossy.block) .duration(50) .EUt(2) + + event.recipes.create.deploying(rock.bricks.mossy.block, [ rock.bricks.block, '#tfc:compost_greens_low' ]) + .id(`tfg:deploying/${rockId}_bricks_to_mossy_bricks`) + + event.recipes.create.deploying(rock.bricks.block, [ rock.bricks.mossy.block, 'tfc:groundcover/pumice' ]) + .id(`tfg:deploying/${rockId}_mossy_bricks_to_bricks_pumice`) + + event.recipes.create.deploying(rock.bricks.block, [ rock.bricks.mossy.block, '#forge:tools/knives' ]) + .id(`tfg:deploying/${rockId}_mossy_bricks_to_bricks_knife`) + + // Mossy bricks to smooth + if (rock.bricks.mossy != null && rock.polished != null) { + event.recipes.create.sandpaper_polishing(rock.polished.block, rock.bricks.mossy.block) + .id(`tfg:polishing/${rockId}_mossy_brick_to_polished`) + } } + // Bricks to cracked bricks if (rock.bricks != null && rock.bricks.cracked != null) { if (!rock.isTFC) { @@ -258,8 +297,18 @@ function registerTFGRockRecipes(event) { event.recipes.greate.pressing(rock.bricks.cracked.block, rock.bricks.block) .recipeTier(0) .id(`tfg:pressing/${rockId}_bricks_to_cracked`); + + event.recipes.create.deploying(rock.bricks.block, [ rock.bricks.cracked.block, 'tfc:mortar' ]) + .id(`tfg:deploying/${rockId}_cracked_bricks_to_bricks`) + + // Cracked bricks to smooth + if (rock.bricks.cracked != null && rock.polished != null) { + event.recipes.create.sandpaper_polishing(rock.polished.block, rock.bricks.cracked.block) + .id(`tfg:polishing/${rockId}_cracked_brick_to_polished`) + } } + // Raw to polished if (rock.raw != null && rock.polished != null) { rawToPolished(`${rockId}_raw_to_polished`, !rock.isTFC, rock.raw.block, rock.polished.block); @@ -271,6 +320,9 @@ function registerTFGRockRecipes(event) { .itemOutputs(`8x ${rock.polished.block}`) .duration(250) .EUt(8) + + event.recipes.create.sandpaper_polishing(rock.polished.block, rock.raw.block) + .id(`tfg:polishing/${rockId}_raw_to_polished`) } if (rock.hardened != null && rock.polished != null) { @@ -510,7 +562,7 @@ function registerTFGRockRecipes(event) { let half = Ingredient.of(`#tfg:stone_composition/${compositionId}_half`).itemIds.toArray(); if (half.length > 0) { event.recipes.gtceu.macerator(`tfg:macerate_${compositionId}_half`) - .itemInputs(half) + .itemInputs(`#tfg:stone_composition/${compositionId}_half`) .itemOutputs(ChemicalHelper.getDust(material, GTValues.M / 2)) .duration(150) .EUt(2) @@ -584,4 +636,17 @@ function registerTFGRockRecipes(event) { .itemOutputs('#forge:plates/stone') .duration(20) .EUt(GTValues.VA[GTValues.LV]) + + // Sedimentary carbonate into flux + + event.recipes.gtceu.macerator('tfg:sedimentary_carbonate_to_flux') + .itemInputs('#forge:dusts/sedimentary_carbonate') + .itemOutputs('2x tfc:powder/flux') + .duration(20) + .EUt(2) + + event.recipes.tfc.quern('2x tfc:powder/flux', '#forge:dusts/sedimentary_carbonate') + .id(`tfg:quern/sedimentary_carbonate_to_flux`) + + event.shapeless('2x tfc:powder/flux', ['#forge:dusts/sedimentary_carbonate', '#forge:tools/hammers']) } \ 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 26f82dfdd..0d559e9fa 100644 --- a/kubejs/server_scripts/tfg/natural_blocks/recipes.stone_dusts.js +++ b/kubejs/server_scripts/tfg/natural_blocks/recipes.stone_dusts.js @@ -38,7 +38,7 @@ function registerTFGStoneDustRecipes(event) { .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.CertusQuartz, 1), 5000, 0) .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Olivine, 1), 4500, 0) .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Zinc, 1), 3500, 0) - .outputFluids(Fluid.of('gtceu:helium_3', 200)) + .outputFluids(Fluid.of('gtceu:helium_3', 500)) event.recipes.gtceu.centrifuge('ochrum_dust_separation') .EUt(GTValues.VA[GTValues.MV]) diff --git a/kubejs/server_scripts/tfg/natural_blocks/tags.stones.js b/kubejs/server_scripts/tfg/natural_blocks/tags.stones.js index e94ffb1f9..01a941a77 100644 --- a/kubejs/server_scripts/tfg/natural_blocks/tags.stones.js +++ b/kubejs/server_scripts/tfg/natural_blocks/tags.stones.js @@ -10,7 +10,7 @@ function registerTFGStoneItemTags(event) { function addToMaterialTag(material, block) { if (material != null) { - if (block.endsWith('_slab') || block.endsWith('_wall')) { + if (block.endsWith('_slab') || block.endsWith('_wall') || block.endsWith('_support')) { event.add(`tfg:stone_composition/${material}_half`, block); } else { @@ -278,8 +278,6 @@ function registerTFGStoneBlockTags(event) { if (rock.raw != null) { event.add('forge:stone', rock.raw.block) - event.add('tfc:breaks_when_isolated', rock.raw.block) - event.add('tfc:rock/raw', rock.raw.block) event.add('minecraft:mineable/pickaxe', rock.raw.block) event.add('tfc:can_carve', rock.raw.block) event.add('tfc:powderkeg_breaking_blocks', rock.raw.block) @@ -288,11 +286,13 @@ function registerTFGStoneBlockTags(event) { event.add('tfc:forge_insulation', rock.raw.block) if (rock.collapsible && rock.cobble != null) { + event.add('tfc:rock/raw', rock.raw.block) // Collapse tags also require a collapse recipe to work. // Don't add the recipe if you don't want them to actually collapse! event.add('tfc:can_collapse', rock.raw.block) event.add('tfc:can_trigger_collapse', rock.raw.block) event.add('tfc:can_start_collapse', rock.raw.block) + event.add('tfc:breaks_when_isolated', rock.raw.block) } SHAPES.forEach(shape => { 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 32c1dab7a..826fef649 100644 --- a/kubejs/server_scripts/tfg/ores_and_materials/loot.ores.js +++ b/kubejs/server_scripts/tfg/ores_and_materials/loot.ores.js @@ -2,85 +2,7 @@ "use strict"; const registerTFGOreLoots = (event) => { - // Rock to cobble, cobble to gravel - for (let [rockId, rock] of Object.entries(global.BIG_ROCK_TABLE)) { - if (rock.raw != null && rock.cobble != null) { - event.addBlockLootModifier(rock.raw.block) - .matchMainHand('#forge:tools/hammers') - .removeLoot(ItemFilter.ALWAYS_TRUE) - .addLoot(rock.cobble.block) - } - - if (rock.hardened != null && rock.cobble != null) { - event.addBlockLootModifier(rock.hardened) - .matchMainHand('#forge:tools/hammers') - .removeLoot(ItemFilter.ALWAYS_TRUE) - .addLoot(rock.cobble.block) - } - - if (rock.cobble != null && rock.gravel != null) { - event.addBlockLootModifier(rock.cobble.block) - .matchMainHand('#forge:tools/hammers') - .removeLoot(ItemFilter.ALWAYS_TRUE) - .addLoot(rock.gravel) - - if (rock.cobble.mossy != null) { - event.addBlockLootModifier(rock.cobble.mossy.block) - .matchMainHand('#forge:tools/hammers') - .removeLoot(ItemFilter.ALWAYS_TRUE) - .addLoot(rock.gravel) - } - } - } - - // Sand - global.SAND_COLORS.forEach(sandColor => { - let tag_array = Ingredient.of(`#tfc:${sandColor}_gravel`).itemIds.toArray().map(String); - tag_array.forEach(item => { - event.addBlockLootModifier(item) - .matchMainHand('#forge:tools/hammers') - .removeLoot(ItemFilter.ALWAYS_TRUE) - .addLoot(`tfc:sand/${sandColor}`) - }) - }) - - global.HAMMERING.forEach(x => { - if (x.raw.startsWith('#')) { - let tag_array = Ingredient.of(x.raw).itemIds.toArray().map(String); - tag_array.forEach(item => { - event.addBlockLootModifier(item) - .matchMainHand('#forge:tools/hammers') - .removeLoot(ItemFilter.ALWAYS_TRUE) - .addLoot(x.hammered) - }) - } - else { - event.addBlockLootModifier(x.raw) - .matchMainHand('#forge:tools/hammers') - .removeLoot(ItemFilter.ALWAYS_TRUE) - .addLoot(x.hammered) - } - }) - - // Other rocks - event.addBlockLootModifier('minecraft:gilded_blackstone') - .matchMainHand('#forge:tools/hammers') - .removeLoot(ItemFilter.ALWAYS_TRUE) - .addSequenceLoot( - LootEntry.of('tfg:rock/cobble_blackstone'), - LootEntry.of('tfc:powder/native_gold') - ) - - event.addBlockLootModifier('beneath:ore/blackstone_sylvite') - .removeLoot(ItemFilter.ALWAYS_TRUE) - .addWeightedLoot([ - Item.of('gtceu:rich_raw_rock_salt').withChance(0.2), - Item.of('gtceu:raw_rock_salt').withChance(0.6), - Item.of('gtceu:poor_raw_rock_salt').withChance(0.2) - ]) - .addLoot(LootEntry.of('tfg:igneous_ultramafic_dust').when((c) => c.randomChance(0.2))) - .addLoot(LootEntry.of('gtceu:tiny_rock_salt_dust').when(c => c.randomChance(0.05))); - + // Go through all materials const $GreateMaterials = Java.loadClass("electrolyte.greate.registry.GreateMaterials") @@ -103,7 +25,7 @@ const registerTFGOreLoots = (event) => { let richRawOre = ChemicalHelper.get(TFGTagPrefix.richRawOre, material, 1) let normalRawOre = ChemicalHelper.get(TagPrefix.rawOre, material, 1) let poorRawOre = ChemicalHelper.get(TFGTagPrefix.poorRawOre, material, 1) - let dustOre = ChemicalHelper.get(TagPrefix.dustTiny, material, 1) + let tinyDustOre = ChemicalHelper.get(TagPrefix.dustTiny, material, 1) let rawOreBlock = ChemicalHelper.get(TagPrefix.rawOreBlock, material, 1).getItem().id; event.addBlockLootModifier(rawOreBlock) @@ -113,7 +35,7 @@ const registerTFGOreLoots = (event) => { normalRawOre.withChance(0.6), poorRawOre.withChance(0.2) ]) - .addLoot(LootEntry.of(dustOre).when(c => c.randomChance(0.2))); + .addLoot(LootEntry.of(tinyDustOre).when(c => c.randomChance(0.1))); // Stone ores global.ORE_BEARING_STONES.forEach(stoneType => { @@ -125,18 +47,19 @@ const registerTFGOreLoots = (event) => { // break with pickaxe/mining hammer/drill/mining machine event.addBlockLootModifier(`${namespace}:${stoneType}_${material.getName()}_ore`) - .removeLoot(ItemFilter.ALWAYS_TRUE) + .removeLoot(Ingredient.all) .addWeightedLoot([ richRawOre.withChance(0.2), normalRawOre.withChance(0.6), poorRawOre.withChance(0.2) ]) - .addLoot(LootEntry.of(stoneTypeDust).when((c) => c.randomChance(0.2))) - .addLoot(LootEntry.of(dustOre).when(c => c.randomChance(0.05))); + .addLoot(LootEntry.of(stoneTypeDust).when(c => c.randomChance(0.2))) + .addLoot(LootEntry.of(tinyDustOre).when(c => c.randomChance(0.02))); // break with hammer event.addBlockLootModifier(`${namespace}:${stoneType}_${material.getName()}_ore`) .matchMainHand('#forge:tools/hammers') + .removeLoot(Ingredient.all) .addLoot(LootEntry.of(GTBlocks.COBBLE_BLOCKS.get(TagPrefix.get(stoneType)).get().getBlock().id)); }) } diff --git a/kubejs/server_scripts/tfg/ores_and_materials/recipes.alloys.js b/kubejs/server_scripts/tfg/ores_and_materials/recipes.alloys.js index db441beb3..d132b768a 100644 --- a/kubejs/server_scripts/tfg/ores_and_materials/recipes.alloys.js +++ b/kubejs/server_scripts/tfg/ores_and_materials/recipes.alloys.js @@ -67,6 +67,35 @@ function registerTFGAlloyingRecipes(event) { .circuit(1) .EUt(GTValues.VA[GTValues.MV]) .blastFurnaceTemp(1000) + + event.remove({ id: 'greate:mixing/integration/gtceu/mixer/red_steel' }) + event.remove({ id: 'greate:mixing/integration/gtceu/mixer/blue_steel' }) + + event.recipes.greate.mixing('#forge:dusts/weak_red_steel', + ['4x #forge:dusts/black_steel', '2x #forge:dusts/steel', '#forge:dusts/brass', '#forge:dusts/rose_gold']) + .recipeTier(1) + .circuitNumber(2) + .heated() + .id('tfg:weak_red_steel_greate') + + event.recipes.greate.mixing('#forge:dusts/weak_blue_steel', + ['4x #forge:dusts/black_steel', '2x #forge:dusts/steel', '#forge:dusts/bismuth_bronze', '#forge:dusts/sterling_silver']) + .recipeTier(1) + .circuitNumber(2) + .heated() + .id('tfg:weak_blue_steel_greate') + + event.recipes.greate.mixing('#forge:dusts/red_steel', + ['4x #forge:dusts/black_steel', '2x #forge:dusts/steel', '#forge:dusts/brass', '#forge:dusts/rose_gold']) + .recipeTier(2) + .circuitNumber(1) + .id('tfg:red_steel_greate') + + event.recipes.greate.mixing('#forge:dusts/blue_steel', + ['4x #forge:dusts/black_steel', '2x #forge:dusts/steel', '#forge:dusts/bismuth_bronze', '#forge:dusts/sterling_silver']) + .recipeTier(2) + .circuitNumber(1) + .id('tfg:blue_steel_greate') //#endregion diff --git a/kubejs/server_scripts/tfg/ores_and_materials/recipes.material_ores.js b/kubejs/server_scripts/tfg/ores_and_materials/recipes.material_ores.js index 9624a3cd3..09f9e62f1 100644 --- a/kubejs/server_scripts/tfg/ores_and_materials/recipes.material_ores.js +++ b/kubejs/server_scripts/tfg/ores_and_materials/recipes.material_ores.js @@ -565,9 +565,12 @@ function processGems(event, material) { } const amount = getMaterialAmount(TagPrefix.block, material); - event.recipes.greate.pressing(ChemicalHelper.get(TagPrefix.gem, material, amount), ChemicalHelper.get(TagPrefix.block, material, 1)) - .recipeTier(0) - .id(`greate:pressing/unpacking_${materialName}_block`) + const block = ChemicalHelper.get(TagPrefix.block, material, 1); + if (!block.isEmpty()) { + event.recipes.greate.pressing(ChemicalHelper.get(TagPrefix.gem, material, amount), block) + .recipeTier(0) + .id(`greate:pressing/unpacking_${materialName}_block`) + } event.recipes.tfc.quern(ChemicalHelper.get(TagPrefix.dust, material, 1), gemItem) .id(`tfg:quern/${materialName}_gem_to_dust`) diff --git a/kubejs/server_scripts/tfg/ores_and_materials/recipes.material_tools.js b/kubejs/server_scripts/tfg/ores_and_materials/recipes.material_tools.js index bdc455e77..8eabb675d 100644 --- a/kubejs/server_scripts/tfg/ores_and_materials/recipes.material_tools.js +++ b/kubejs/server_scripts/tfg/ores_and_materials/recipes.material_tools.js @@ -156,7 +156,7 @@ function processToolHead(event, headTagPrefix, tagPrefixName, extruderMold, cera .circuit(circuitMeta) .itemOutputs(toolHeadItem) .duration(material.getMass() * 6) - .EUt(GTValues.VA[GTValues.LV]) + .EUt(GTValues.VA[GTValues.MV]) } addMaterialRecycling(event, toolHeadItem, material, tagPrefixName, headTagPrefix); diff --git a/kubejs/server_scripts/tfg/ores_and_materials/recipes.materials.js b/kubejs/server_scripts/tfg/ores_and_materials/recipes.materials.js index d2374773d..582f842c5 100644 --- a/kubejs/server_scripts/tfg/ores_and_materials/recipes.materials.js +++ b/kubejs/server_scripts/tfg/ores_and_materials/recipes.materials.js @@ -6,9 +6,9 @@ * @param {com.gregtechceu.gtceu.api.data.chemical.material.Material_} material */ function getFluidRecipeEUt(material) { - // Special case for bis/black bronze because removing the blast property doesn't change the tier of + // Special case for bis bronze, black bronze, rose gold and sterling silver because removing the blast property doesn't change the tier of // the extractor recipes retroactively - return material.hasProperty(PropertyKey.BLAST) && material !== GTMaterials.BismuthBronze && material !== GTMaterials.BlackBronze + return material.hasProperty(PropertyKey.BLAST) && material !== GTMaterials.BismuthBronze && material !== GTMaterials.BlackBronze && material !== GTMaterials.RoseGold && material !== GTMaterials.SterlingSilver ? GTValues.VA[GTValues.MV] : GTValues.VA[GTValues.LV]; } @@ -195,7 +195,7 @@ function addMaterialWelding(event, outputItem, inputItem1, inputItem2, material, if (tfcProperty !== null) { - event.recipes.tfc.welding(TFC.isp.of(outputItem).copyForgingBonus().copyHeat(), inputItem1, inputItem2, tfcProperty.getTier() - 1) + event.recipes.tfc.welding(TFC.isp.of(outputItem).copyHeat(), inputItem1, inputItem2, tfcProperty.getTier() - 1) .id(`tfc:welding/${id}`); compactingTier = tfcProperty.getTier() < tierThreshold ? 0 : 1; 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 3214c5bed..eee2285b4 100644 --- a/kubejs/server_scripts/tfg/ores_and_materials/recipes.quartzes.js +++ b/kubejs/server_scripts/tfg/ores_and_materials/recipes.quartzes.js @@ -35,11 +35,12 @@ function registerTFGQuartzRecipes(event) { { input: "tfc:silica_glass_batch", output: "tfc:silica_glass_bottle", name: "silica_glass_bottle" }, { input: "tfc:hematitic_glass_batch", output: "tfc:hematitic_glass_bottle", name: "hematitic_glass_bottle" }, { input: "tfc:olivine_glass_batch", output: "tfc:olivine_glass_bottle", name: "olivine_glass_bottle" }, - { input: "tfc:volcanic_glass_batch", output: "tfc:volcanic_glass_bottle", name: "volcanic_glass_bottle" } + { input: "tfc:volcanic_glass_batch", output: "tfc:volcanic_glass_bottle", name: "volcanic_glass_bottle" }, + { input: '#forge:dusts/glass', output: "tfc:silica_glass_bottle", name: "glass_dust_to_bottle" } ]); TFC_BATCH_TO_BOTTLE_ASSEMBLING_RECIPE_COMPONENTS.forEach(element => { - event.recipes.gtceu.alloy_smelter(`tfg:tfc/${element.name}`) + event.recipes.gtceu.alloy_smelter(`tfg:${element.name}`) .itemInputs(element.input) .notConsumable('gtceu:bottle_casting_mold') .itemOutputs(element.output) @@ -95,12 +96,14 @@ function registerTFGQuartzRecipes(event) { .duration(50) .EUt(2) + // Extracting event.recipes.gtceu.extractor('tfg:glass_batch_extraction') .itemInputs('#tfc:glass_batches') .outputFluids(Fluid.of('gtceu:glass', 144)) .duration(50) .EUt(2) + // TFC lens event.recipes.gtceu.lathe('tfg:tfc_lens') .itemInputs('#forge:glass') .itemOutputs('tfc:lens') @@ -131,26 +134,49 @@ function registerTFGQuartzRecipes(event) { "#forge:glass" ); - - event.recipes.gtceu.alloy_smelter('glass_bottle') - .itemInputs('#forge:dusts/glass') - .itemOutputs('tfc:silica_glass_bottle') - .notConsumable('gtceu:bottle_casting_mold') - .EUt(2) - .duration(20 * 5) - .category(GTRecipeCategories.INGOT_MOLDING) + // Glass blocks + event.recipes.gtceu.alloy_smelter('tfg:clear_glass_block_from_batch') + .itemInputs('tfc:silica_glass_batch') + .notConsumable('gtceu:block_casting_mold') + .itemOutputs('minecraft:glass') + .duration(12 * 20) + .EUt(16) + .category(GTRecipeCategories.INGOT_MOLDING); + event.recipes.gtceu.alloy_smelter('tfg:orange_glass_block_from_batch') + .itemInputs('tfc:hematitic_glass_batch') + .notConsumable('gtceu:block_casting_mold') + .itemOutputs('minecraft:orange_stained_glass') + .duration(12 * 20) + .EUt(16) + .category(GTRecipeCategories.INGOT_MOLDING); + + event.recipes.gtceu.alloy_smelter('tfg:green_glass_block_from_batch') + .itemInputs('tfc:olivine_glass_batch') + .notConsumable('gtceu:block_casting_mold') + .itemOutputs('minecraft:green_stained_glass') + .duration(12 * 20) + .EUt(16) + .category(GTRecipeCategories.INGOT_MOLDING); + + event.recipes.gtceu.alloy_smelter('tfg:blue_glass_block_from_batch') + .itemInputs('tfc:volcanic_glass_batch') + .notConsumable('gtceu:block_casting_mold') + .itemOutputs('minecraft:blue_stained_glass') + .duration(12 * 20) + .EUt(16) + .category(GTRecipeCategories.INGOT_MOLDING); // Glass Tube event.recipes.tfc.glassworking('gtceu:glass_tube', '#tfc:glass_batches_tier_3', ['blow', 'stretch', 'stretch']) .id('tfg:gtceu/glassworking/glass_tube') event.recipes.gtceu.alloy_smelter('tfg:glass_tube_from_batch') - .itemInputs('#tfc:glass_batches') + .itemInputs('#tfc:glass_batches_tier_3') .notConsumable('gtceu:ball_casting_mold') .itemOutputs('gtceu:glass_tube') - .duration(8 * 20) - .EUt(GTValues.VA[GTValues.LV]) + .duration(16 * 20) + .EUt(16) .category(GTRecipeCategories.INGOT_MOLDING); //#endregion } diff --git a/kubejs/server_scripts/tfg/powergen/nuclear/recipes.components.js b/kubejs/server_scripts/tfg/powergen/nuclear/recipes.components.js index 46cf556da..bf81d06e7 100644 --- a/kubejs/server_scripts/tfg/powergen/nuclear/recipes.components.js +++ b/kubejs/server_scripts/tfg/powergen/nuclear/recipes.components.js @@ -33,9 +33,11 @@ function registerTFGNuclearComponentsRecipes(event) { component("HEAT", "tfg:aes_insulation_frame", 1); component("HEAT", "tfg:moderate_core_frame", 10); component("HEAT", "tfg:impure_moderate_core_frame", 5); -/* - componentThermal('THERMAL', 'minecraft:sand', 1000, 25); - componentThermal('THERMAL', 'tfg:impure_moderate_core_frame', 2000, 50); - componentThermal('THERMAL', 'minecraft:bedrock', 9001, 1e5); -*/ + //component("HEAT", "minecraft:bedrock", 1000); + + //componentThermal('THERMAL', '#forge:sand', 1000, 1); + componentThermal('THERMAL', 'tfg:copper_sandy_frame', 1000, 10); + componentThermal('THERMAL', 'tfg:beryllium_sandy_frame', 2000, 10); + //componentThermal('THERMAL', 'minecraft:bedrock', 9001, 10); + } \ 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 fca0005e1..558ffbdbc 100644 --- a/kubejs/server_scripts/tfg/powergen/nuclear/recipes.nuclear.js +++ b/kubejs/server_scripts/tfg/powergen/nuclear/recipes.nuclear.js @@ -30,47 +30,132 @@ function registerTFGNuclearRecipes(event) { //#region Nuclear Pellet - event.recipes.gtceu.nuclear_fuel_factory('tfg:thorium_pellet') - .itemInputs('16x #forge:rods/thorium_230', '32x #forge:rods/thorium_232', - '32x #forge:rods/thorium_232', '32x #forge:rods/thorium_232', '32x #forge:rods/thorium_232', - 'tfg:empty_rod') - .itemOutputs('tfg:thorium_rod') - .duration(20*200) - .EUt(GTValues.VA[GTValues.HV]) - .dimension('ad_astra:mars') + const nuclearFuelRecipes = [ + { + id: 'tfg:thorium_pellet', + itemInputs: [ + '16x #forge:rods/thorium_230', + '32x #forge:rods/thorium_232', + '32x #forge:rods/thorium_232', + '32x #forge:rods/thorium_232', + '32x #forge:rods/thorium_232', + 'tfg:empty_rod' + ], + itemOutputs: 'tfg:thorium_rod', + duration: 20 * 200, + eut: GTValues.VA[GTValues.HV] + }, - event.recipes.gtceu.nuclear_fuel_factory('tfg:uranium_pellet') - .inputFluids(Fluid.of('gtceu:radioactive_waste', 10000)) - .itemInputs('16x #forge:rods/uranium_235', '32x #forge:rods/uranium', '32x #forge:rods/uranium', - '32x #forge:rods/uranium', '32x #forge:rods/uranium', 'tfg:empty_rod') - .itemOutputs('tfg:uranium_rod') - .duration(20*600) - .EUt(GTValues.VA[GTValues.HV]) - .dimension('ad_astra:mars') + { + id: 'tfg:uranium_pellet', + itemInputs: [ + '16x #forge:rods/uranium_235', + '32x #forge:rods/uranium', + '32x #forge:rods/uranium', + '32x #forge:rods/uranium', + '32x #forge:rods/uranium', + 'tfg:empty_rod' + ], + inputFluids: Fluid.of('gtceu:radioactive_waste', 10000), + itemOutputs: 'tfg:uranium_rod', + duration: 20 * 600, + eut: GTValues.VA[GTValues.HV] + }, - event.recipes.gtceu.nuclear_fuel_factory('tfg:plutonium_pellet') - .itemInputs('32x #forge:rods/plutonium', '32x #forge:rods/plutonium', '32x #forge:rods/plutonium', - '32x #forge:rods/plutonium', 'tfg:empty_rod') - .inputFluids(Fluid.of('gtceu:radon', 100)) - .itemOutputs('tfg:plutonium_rod') - .duration(20*600) - .EUt(GTValues.VA[GTValues.EV]) - .dimension('ad_astra:mars') -/* - event.recipes.gtceu.nuclear_fuel_factory('tfg:tbu_232_rod') - .inputFluids(Fluid.of('gtceu:nuclear_waste', 32000)) - .itemInputs('2x #forge:rods/thorium_232', 'tfg:empty_rod') - .itemOutputs('tfg:tbu_232_rod') - .duration(20*300) - .EUt(GTValues.V[GTValues.IV]) + { + id: 'tfg:plutonium_pellet', + itemInputs: [ + '32x #forge:rods/plutonium', + '32x #forge:rods/plutonium', + '32x #forge:rods/plutonium', + '32x #forge:rods/plutonium', + 'tfg:empty_rod' + ], + inputFluids: Fluid.of('gtceu:radon', 100), + itemOutputs: 'tfg:plutonium_rod', + duration: 20 * 600, + eut: GTValues.VA[GTValues.EV] + }, + + { + id: 'tfg:americium_pellet', + itemInputs: [ + '32x #forge:rods/americium_241', + '32x #forge:rods/americium_241', + 'tfg:empty_rod_t2' + ], + inputFluids: Fluid.of('gtceu:radon', 100), + itemOutputs: 'tfg:americium_241_rod', + duration: 20 * 600, + eut: GTValues.VA[GTValues.IV] + }, + + { + id: 'tfg:neptunium_pellet', + itemInputs: [ + '32x #forge:rods/neptunium_237', + '32x #forge:rods/neptunium_237', + 'tfg:empty_rod_t2' + ], + inputFluids: Fluid.of('gtceu:radon', 100), + itemOutputs: 'tfg:neptunium_237_rod', + duration: 20 * 600, + eut: GTValues.VA[GTValues.IV] + }, + + { + id: 'tfg:tbu_232_rod_recycle', + itemInputs: [ + '16x #forge:rods/long/thorium_230', + '16x #forge:rods/long/thorium_230', + '32x #forge:rods/thorium_232', + '32x #forge:rods/thorium_232', + '32x #forge:rods/thorium_232', + 'tfg:empty_rod_t2' + ], + inputFluids: Fluid.of('tfg:tbu_waste', 8000), + itemOutputs: 'tfg:tbu_232_rod', + duration: 20 * 300, + eut: GTValues.VA[GTValues.IV] + } + ] + + nuclearFuelRecipes.forEach(r => { + let recipe = event.recipes.gtceu.nuclear_fuel_factory(r.id) + .itemInputs(r.itemInputs) + .itemOutputs(r.itemOutputs) + .duration(r.duration) + .EUt(r.eut) + .dimension('ad_astra:mars') + TFGRecipeSchemaBindings.isOxygenated(recipe, true) + + if (r.inputFluids) { + recipe.inputFluids(r.inputFluids) + } + }) + + + event.recipes.gtceu.assembler('tfg:empty_rod') + .itemInputs('3x gtceu:cobalt_large_restrictive_item_pipe', '9x #forge:double_plates/cadmium', '4x #forge:dense_plates/maraging_steel_300') + .itemOutputs('tfg:empty_rod') + .duration(20*15) + .EUt(GTValues.VA[GTValues.HV]) + .addMaterialInfo(true) + + event.recipes.gtceu.assembler('tfg:empty_rod_t2') + .itemInputs('3x gtceu:cobalt_large_restrictive_item_pipe', '9x #forge:double_plates/cadmium', '4x #forge:dense_plates/beryllium') + .itemOutputs('tfg:empty_rod_t2') + .duration(20*15) + .EUt(GTValues.VA[GTValues.EV]) + .addMaterialInfo(true) +/* HIDE UNTIL VENUS IV - COMMENT OUT + event.recipes.gtceu.assembler('tfg:empty_rod_t3') + .itemInputs('3x gtceu:cobalt_large_restrictive_item_pipe', '9x #forge:double_plates/cadmium', '4x #forge:dense_plates/zirconium') + .itemOutputs('tfg:empty_rod_t3') + .duration(20*15) + .EUt(GTValues.VA[GTValues.IV]) + .addMaterialInfo(true) */ - event.recipes.gtceu.assembler('tfg:empty_rod') - .itemInputs('3x gtceu:cobalt_large_restrictive_item_pipe', '3x gtceu:lead_huge_fluid_pipe') - .itemOutputs('tfg:empty_rod') - .duration(20*15) - .EUt(GTValues.VA[GTValues.HV]) - .addMaterialInfo(true) - //#endregion //#region Processing Fuels @@ -181,24 +266,24 @@ function registerTFGNuclearRecipes(event) { event.recipes.gtceu.heat_exchanger('plutonium_steam') .perTick(true) .inputFluids(Fluid.of('minecraft:water', 10)) - .inputFluids(Fluid.of('gtceu:irradiated_steam', 1600)) - .outputFluids(Fluid.of('gtceu:dense_steam', 1600)) + .inputFluids(Fluid.of('gtceu:irradiated_steam', 3200)) + .outputFluids(Fluid.of('gtceu:dense_steam', 6400)) .perTick(false) .duration(20*5) .EUt(1) .dimension('ad_astra:mars') // Heat Exchanger for Energy - +/* event.recipes.gtceu.heat_exchanger('flibe_cooling') - .inputFluids(Fluid.of('gtceu:hot_flibe', 10)) + .inputFluids(Fluid.of('tfg:hot_flibe', 10)) .inputFluids(Fluid.of('gtceu:distilled_water', 10)) .chancedFluidInput(Fluid.of('gtceu:hastelloy_c_276', 10), 5000, 0) - .chancedFluidOutput(Fluid.of('gtceu:flibe', 10), 9500, 0) + .chancedFluidOutput(Fluid.of('tfg:flibe', 10), 9500, 0) .outputFluids(Fluid.of('gtceu:dense_steam', 10)) .duration(20*10) .EUt(1) - +*/ //#endregion //#region Fission Reactor @@ -206,15 +291,15 @@ function registerTFGNuclearRecipes(event) { // Thorium Fission event.recipes.deafission.fission_reactor_fuel('tfg:thorium') - .itemInputs(Item.of('tfg:thorium_rod')) - .outputFluids(Fluid.of('gtceu:radioactive_waste', 2500)) - .itemOutputs(Item.of('tfg:empty_rod')) - .dimension('ad_astra:mars') - .hideDuration(true) - .dimension('ad_astra:mars') + .itemInputs(Item.of('tfg:thorium_rod')) + .itemOutputs(Item.of('tfg:depleted_thorium_rod')) + // Mandatory by GT; no real impact. Use this as a convention: + // durability / const / heatValue + .duration(5000 / 0.4 / 0.7) + .dimension('ad_astra:mars'); event.recipes.deafission.fission_reactor_coolant('tfg:thorium_coolant') - .notConsumable(Item.of('tfg:thorium_rod')) + .itemInputs(Item.of('tfg:thorium_rod')) .perTick(true) .inputFluids(Fluid.of('tfg:heavy_water', 2)) .outputFluids(Fluid.of('gtceu:dense_steam', 480)) @@ -226,14 +311,15 @@ function registerTFGNuclearRecipes(event) { // Uranium Fission event.recipes.deafission.fission_reactor_fuel('tfg:uranium') - .itemInputs(Item.of('tfg:uranium_rod')) - .outputFluids(Fluid.of('gtceu:uranium_waste', 50000)) - .itemOutputs(Item.of('tfg:empty_rod')) - .hideDuration(true) - .dimension('ad_astra:mars') + .itemInputs(Item.of('tfg:uranium_rod')) + .itemOutputs(Item.of('tfg:depleted_uranium_rod')) + // Mandatory by GT; no real impact. Use this as a convention: + // durability / const / heatValue + .duration(20000 / 0.4 / 2.2) + .dimension('ad_astra:mars'); event.recipes.deafission.fission_reactor_coolant('tfg:uranium_coolant') - .notConsumable(Item.of('tfg:uranium_rod')) + .itemInputs(Item.of('tfg:uranium_rod')) .perTick(true) .inputFluids(Fluid.of('tfg:heavy_water', 20)) .outputFluids(Fluid.of('gtceu:radioactive_steam', 1600)) @@ -245,42 +331,257 @@ function registerTFGNuclearRecipes(event) { // Plutonium Fission event.recipes.deafission.fission_reactor_fuel('tfg:plutonium') - .itemInputs(Item.of('tfg:plutonium_rod')) - .outputFluids(Fluid.of('gtceu:tritiated_water', 5184)) - .itemOutputs(Item.of('tfg:empty_rod')) - .hideDuration(true) - .dimension('ad_astra:mars') + .itemInputs(Item.of('tfg:plutonium_rod')) + .itemOutputs(Item.of('tfg:depleted_plutonium_rod')) + // Mandatory by GT; no real impact. Use this as a convention: + // durability / const / heatValue + .duration(30000 / 0.4 / 3) + .dimension('ad_astra:mars'); event.recipes.deafission.fission_reactor_coolant('tfg:plutonium_coolant') - .notConsumable(Item.of('tfg:plutonium_rod')) + .itemInputs(Item.of('tfg:plutonium_rod')) .perTick(true) .inputFluids(Fluid.of('tfg:heavy_water', 25)) - .outputFluids(Fluid.of('gtceu:irradiated_steam', 6400)) + .outputFluids(Fluid.of('gtceu:irradiated_steam', 3200)) .perTick(false) .addData("coolant_heat_per_tick", 1) .duration(1) .dimension('ad_astra:mars') // TBU Fission -/* event.recipes.deafission.fission_reactor_fuel('kubejs:fuelcell_custom_x1') .itemInputs('tfg:tbu_232_rod') - .itemOutputs('minecraft:dirt') + .itemOutputs('tfg:depleted_tbu_232_rod') // Mandatory by GT; no real impact. Use this as a convention: // durability / const / heatValue .duration(10000 / 0.4 / 2) .dimension('ad_astra:mars'); - +/* event.recipes.deafission.fission_reactor_coolant('tfg:tbu_coolant') .itemInputs(Ingredient.of([ 'tfg:tbu_232_rod'])) .inputFluids(Fluid.of('tfg:heavy_water', 100)) .outputFluids(Fluid.of('gtceu:dense_steam', 100)) .addData("coolant_heat_per_tick", 12.34) - .duration(1000); -*/ + .duration(1000);*/ + + event.recipes.deafission.fission_reactor_coolant('tfg:tbu_coolant') + .itemInputs(Ingredient.of([ + 'tfg:tbu_232_rod'])) + .perTick(true) + .inputFluids(Fluid.of('tfg:heavy_water', 20)) + .outputFluids(Fluid.of('gtceu:dense_steam', 1200)) + .perTick(false) + .addData("coolant_heat_per_tick", 1) + .duration(1) + .dimension('ad_astra:mars') + + // Neptunium-237 Rod Fission + event.recipes.deafission.fission_reactor_fuel('tfg:neptunium_237') + .itemInputs('tfg:neptunium_237_rod') + .itemOutputs('tfg:depleted_neptunium_237_rod') + // Mandatory by GT; no real impact. Use this as a convention: + // durability / const / heatValue + .duration(100000 / 0.4 / 2); + + event.recipes.deafission.fission_reactor_coolant('tfg:boron_enriched_coolant') + .itemInputs( + Ingredient.of(['tfg:neptunium_237_rod', 'tfg:americium_241_rod', 'tfg:californium_252_rod'])) + .inputFluids(Fluid.of('tfg:boron_enriched_coolant', 10*64)) + .outputFluids(Fluid.of('tfg:hot_boron_enriched_coolant', 10*64)) + .addData("coolant_heat_per_tick", 1) + .duration(1); + + // Americium-241 Rod Fission + event.recipes.deafission.fission_reactor_fuel('tfg:americium_241') + .itemInputs('tfg:americium_241_rod') + .itemOutputs('tfg:depleted_americium_241_rod') + // Mandatory by GT; no real impact. Use this as a convention: + // durability / const / heatValue + .duration(1000000 / 0.4 / 0.5); + + event.recipes.deafission.fission_reactor_coolant_smr('tfg:americium_241_coolant') + .itemInputs(Ingredient.of([ + 'tfg:americium_241_rod'])) + .inputFluids(Fluid.of('tfg:ticl4_doped_supercritical_co2', 80)) + .outputFluids(Fluid.of('tfg:spent_ticl4_doped_supercritical_co2', 80)) + .addData("coolant_heat_per_tick", 1) + .duration(1); + + // Neptunium-237 Rod Fission + event.recipes.deafission.fission_reactor_fuel('tfg:californium_252_rod') + .itemInputs('tfg:californium_252_rod') + .itemOutputs('tfg:depleted_californium_252_rod') + // Mandatory by GT; no real impact. Use this as a convention: + // durability / const / heatValue + .duration(500000 / 0.4 / 4); + + event.recipes.deafission.fission_reactor_coolant('tfg:flibe_coolant') + .itemInputs( + Ingredient.of(['tfg:californium_252_rod'])) + .inputFluids(Fluid.of('tfg:flibe', 10*64)) + .outputFluids(Fluid.of('tfg:hot_flibe', 10*64)) + .addData("coolant_heat_per_tick", 1) + .duration(1); + //#endregion + //#region Fission Rod Processing + + let a; + + a = event.recipes.gtceu.nuclear_fuel_factory('tfg:depleted_thorium_rod') + .inputItemNbtPredicate(Item.of('tfg:depleted_thorium_rod'), NBTPredicates.lt("avgHeat", 800)) + .itemOutputs(Item.of('tfg:empty_rod')) + .outputFluids(Fluid.of('gtceu:radioactive_waste', 2500)) + .EUt(GTValues.VA[GTValues.HV]) + .duration(20*16) + .dimension('ad_astra:mars') + .addDataString("avgHeat1", "0") + .addDataString("avgHeat2", "799") + TFGRecipeSchemaBindings.isOxygenated(a, true) + + a = event.recipes.gtceu.nuclear_fuel_factory('tfg:depleted_thorium_rod_average') + .inputItemNbtPredicate('tfg:depleted_thorium_rod', + NBTPredicates.all([ + NBTPredicates.gte("avgHeat", 800), + NBTPredicates.lt("avgHeat", 3000) + ])) + .itemOutputs(Item.of('tfg:empty_rod')) + .outputFluids(Fluid.of('gtceu:radioactive_waste', 1000)) + .EUt(GTValues.VA[GTValues.HV]) + .duration(20*16) + .dimension('ad_astra:mars') + .addDataString("avgHeat1", "800") + .addDataString("avgHeat2", "2999") + TFGRecipeSchemaBindings.isOxygenated(a, true) + + a = event.recipes.gtceu.nuclear_fuel_factory('tfg:depleted_thorium_rod_bad') + .inputItemNbtPredicate(Item.of('tfg:depleted_thorium_rod'), NBTPredicates.gte("avgHeat", 3000)) + .itemOutputs(Item.of('tfg:empty_rod')) + .outputFluids(Fluid.of('gtceu:radioactive_waste', 100)) + .EUt(GTValues.VA[GTValues.HV]) + .duration(20*16) + .dimension('ad_astra:mars') + .addDataString("avgHeat1", "3000") + .addDataString("avgHeat2", "∞") + TFGRecipeSchemaBindings.isOxygenated(a, true) + + // Uranium + let b; + + b = event.recipes.gtceu.nuclear_fuel_factory('tfg:depleted_uranium_rod') + .inputItemNbtPredicate(Item.of('tfg:depleted_uranium_rod'), NBTPredicates.lt("avgHeat", 2000)) + .itemOutputs(Item.of('tfg:empty_rod')) + .outputFluids(Fluid.of('gtceu:uranium_waste', 50000)) + .EUt(GTValues.VA[GTValues.HV]) + .duration(20*16) + .dimension('ad_astra:mars') + .addDataString("avgHeat1", "0") + .addDataString("avgHeat2", "1999") + TFGRecipeSchemaBindings.isOxygenated(b, true) + + b = event.recipes.gtceu.nuclear_fuel_factory('tfg:depleted_uranium_rod_average') + .inputItemNbtPredicate('tfg:depleted_uranium_rod', + NBTPredicates.all([ + NBTPredicates.gte("avgHeat", 2000), + NBTPredicates.lt("avgHeat", 3000) + ])) + .itemOutputs(Item.of('tfg:empty_rod')) + .outputFluids(Fluid.of('gtceu:uranium_waste', 10000)) + .EUt(GTValues.VA[GTValues.HV]) + .duration(20*16) + .dimension('ad_astra:mars') + .addDataString("avgHeat1", "2000") + .addDataString("avgHeat2", "2999") + TFGRecipeSchemaBindings.isOxygenated(b, true) + + b = event.recipes.gtceu.nuclear_fuel_factory('tfg:depleted_uranium_rod_bad') + .inputItemNbtPredicate(Item.of('tfg:depleted_uranium_rod'), NBTPredicates.gte("avgHeat", 3000)) + .itemOutputs(Item.of('tfg:empty_rod')) + .outputFluids(Fluid.of('gtceu:uranium_waste', 500)) + .EUt(GTValues.VA[GTValues.HV]) + .duration(20*16) + .dimension('ad_astra:mars') + .addDataString("avgHeat1", "3000") + .addDataString("avgHeat2", "∞") + TFGRecipeSchemaBindings.isOxygenated(b, true); + + // Plutonium + let c; + + c = event.recipes.gtceu.nuclear_fuel_factory('tfg:depleted_plutonium_rod') + .inputItemNbtPredicate(Item.of('tfg:depleted_plutonium_rod'), NBTPredicates.lt("avgHeat", 1000)) + .itemOutputs(Item.of('tfg:empty_rod')) + .outputFluids(Fluid.of('gtceu:tritiated_water', 5184)) + .EUt(GTValues.VA[GTValues.HV]) + .duration(20*16) + .dimension('ad_astra:mars') + .addDataString("avgHeat1", "0") + .addDataString("avgHeat2", "999") + TFGRecipeSchemaBindings.isOxygenated(c, true); + + c = event.recipes.gtceu.nuclear_fuel_factory('tfg:depleted_plutonium_rod_average') + .inputItemNbtPredicate('tfg:depleted_plutonium_rod', + NBTPredicates.all([ + NBTPredicates.gte("avgHeat", 1000), + NBTPredicates.lt("avgHeat", 3000) + ])) + .itemOutputs(Item.of('tfg:empty_rod')) + .outputFluids(Fluid.of('gtceu:tritiated_water', 576)) + .EUt(GTValues.VA[GTValues.HV]) + .duration(20*16) + .dimension('ad_astra:mars') + .addDataString("avgHeat1", "1000") + .addDataString("avgHeat2", "2999") + TFGRecipeSchemaBindings.isOxygenated(c, true) + + c = event.recipes.gtceu.nuclear_fuel_factory('tfg:depleted_plutonium_rod_bad') + .inputItemNbtPredicate(Item.of('tfg:depleted_plutonium_rod'), NBTPredicates.gte("avgHeat", 3000)) + .itemOutputs(Item.of('tfg:empty_rod')) + .outputFluids(Fluid.of('gtceu:tritiated_water', 144)) + .EUt(GTValues.VA[GTValues.HV]) + .duration(20*16) + .dimension('ad_astra:mars') + .addDataString("avgHeat1", "3000") + .addDataString("avgHeat2", "∞") + TFGRecipeSchemaBindings.isOxygenated(c, true); + + // Americium - Neptunium - Californium + + let g = event.recipes.gtceu.nuclear_fuel_factory('tfg:depleted_americium_241_rod') + //.inputItemNbtPredicate(Item.of('tfg:depleted_thorium_rod'), NBTPredicates.gte("avgHeat", 5000)) + .itemInputs(Item.of('tfg:americium_241_rod')) + .itemOutputs(Item.of('tfg:empty_rod_t2')) + .EUt(GTValues.VA[GTValues.HV]) + .duration(20*16) + .dimension('ad_astra:mars') + //.addDataString("avgHeat1", "5000") + //.addDataString("avgHeat2", "∞") + TFGRecipeSchemaBindings.isOxygenated(g, true); + + let h = event.recipes.gtceu.nuclear_fuel_factory('tfg:depleted_neptunium_237_rod') + //.inputItemNbtPredicate(Item.of('tfg:depleted_thorium_rod'), NBTPredicates.gte("avgHeat", 5000)) + .itemInputs(Item.of('tfg:neptunium_237_rod')) + .itemOutputs(Item.of('tfg:empty_rod_t2')) + .EUt(GTValues.VA[GTValues.HV]) + .duration(20*16) + .dimension('ad_astra:mars') + //.addDataString("avgHeat1", "5000") + //.addDataString("avgHeat2", "∞") + TFGRecipeSchemaBindings.isOxygenated(h, true); + + let i = event.recipes.gtceu.nuclear_fuel_factory('tfg:depleted_californium_252_rod') + //.inputItemNbtPredicate(Item.of('tfg:depleted_thorium_rod'), NBTPredicates.gte("avgHeat", 5000)) + .itemInputs(Item.of('tfg:californium_252_rod')) + .itemOutputs(Item.of('tfg:empty_rod_t3')) + .EUt(GTValues.VA[GTValues.HV]) + .duration(20*16) + .dimension('ad_astra:mars') + //.addDataString("avgHeat1", "5000") + //.addDataString("avgHeat2", "∞") + TFGRecipeSchemaBindings.isOxygenated(i, true); + //#region Fission Recipes for cooling event.recipes.deafission.fission_reactor_processing('tfg:dry_ice') @@ -291,6 +592,12 @@ function registerTFGNuclearRecipes(event) { event.recipes.deafission.fission_reactor_processing('tfg:refrigerant_pellet') .itemInputs('tfg:refrigerant_pellet') + .blastFurnaceTemp(100) + .addData("heat_per_tick", 5) + .duration(20*10) + + event.recipes.deafission.fission_reactor_processing('tfg:terrafirmaguard_pa6') + .itemInputs('tfg:terrafirmaguard_pa6') .blastFurnaceTemp(100) .addData("heat_per_tick", 40) .duration(20*30) @@ -420,17 +727,50 @@ function registerTFGNuclearRecipes(event) { //#endregion - //#region Power Generation + //#region Heat Battery Component + + event.recipes.gtceu.mixer('tfg:copper_sandy') + .itemInputs('1x #forge:sand') + .inputFluids(Fluid.of('gtceu:copper', 15984)) + //.inputFluids(Fluid.of('gtceu:silicon', 7992)) + .itemOutputs(Item.of('tfg:copper_sandy', 1)) + .EUt(GTValues.VA[GTValues.EV]) + .duration(20*48) + + event.recipes.gtceu.mixer('tfg:beryllium_sandy') + .itemInputs('1x #forge:sand') + .inputFluids(Fluid.of('gtceu:beryllium', 15984)) + .inputFluids(Fluid.of('gtceu:silicon', 7992)) + .itemOutputs(Item.of('tfg:beryllium_sandy', 1)) + .EUt(GTValues.VA[GTValues.IV]) + .duration(20*48) + + //#endregion + + //#region Power Gen event.recipes.gtceu.nuclear_turbine('dense_steam') .inputFluids(Fluid.of('gtceu:dense_steam', 160)) + .outputFluids(Fluid.of('tfg:warm_water', 40)) .EUt(-(32)) .duration(20*1.5) + .dimension('minecraft:overworld') + .dimension('ad_astra:mars') + //.dimension('ad_astra:glacio') + + event.recipes.gtceu.smr_generator('tfg:boron_smr') + .inputFluids(Fluid.of('tfg:spent_ticl4_doped_supercritical_co2', 50)) + .outputFluids(Fluid.of('tfg:ticl4_doped_supercritical_co2', 50)) + .EUt(-(32)) + .duration(20) + .dimension('minecraft:overworld') + .dimension('ad_astra:mars') + //.dimension('ad_astra:glacio') //#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') @@ -438,7 +778,6 @@ 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') @@ -452,11 +791,9 @@ function registerTFGNuclearRecipes(event) { .inputFluids(Fluid.of('tfg:thermally_conductive_fluid', 1000)) .itemOutputs('tfg:casings/heat_pipe_casing') .circuit(6) - .EUt(GTValues.VA[GTValues.IV] * 2) + .EUt(GTValues.VA[GTValues.EV]) .duration(20*4) - */ - /* event.shaped('tfg:cooling_tower', [ 'ABA', 'CDC', @@ -468,61 +805,338 @@ function registerTFGNuclearRecipes(event) { D: 'gtceu:iv_machine_hull', E: 'gtceu:iv_fluid_regulator' }).id('tfg:shaped/cooling_tower') - */ + + event.recipes.gtceu.cooling_tower('tfg:warm_into_distilled_1') + .perTick(true) + .inputFluids(Fluid.of('tfg:warm_water', 1000)) + .outputFluids(Fluid.of('gtceu:distilled_water', 1000)) + .perTick(false) + .EUt(1) + .duration(20*60) + .circuit(1) + .dimension('minecraft:overworld') + .dimension('ad_astra:mars') + //.dimension('ad_astra:glacio') + + event.recipes.gtceu.cooling_tower('tfg:warm_into_distilled_2') + .perTick(true) + .inputFluids(Fluid.of('tfg:warm_water', 5000)) + .outputFluids(Fluid.of('gtceu:distilled_water', 5000)) + .perTick(false) + .EUt(1) + .duration(20*60) + .circuit(2) + .dimension('minecraft:overworld') + .dimension('ad_astra:mars') + //.dimension('ad_astra:glacio') + + event.recipes.gtceu.cooling_tower('tfg:warm_into_distilled_3') + .perTick(true) + .inputFluids(Fluid.of('tfg:warm_water', 10000)) + .outputFluids(Fluid.of('gtceu:distilled_water', 10000)) + .perTick(false) + .EUt(1) + .duration(20*60) + .circuit(3) + .dimension('minecraft:overworld') + .dimension('ad_astra:mars') + //.dimension('ad_astra:glacio') + + event.recipes.gtceu.cooling_tower('tfg:warm_into_distilled_4') + .perTick(true) + .inputFluids(Fluid.of('tfg:warm_water', 50000)) + .outputFluids(Fluid.of('gtceu:distilled_water', 50000)) + .perTick(false) + .EUt(1) + .duration(20*60) + .circuit(4) + .dimension('minecraft:overworld') + .dimension('ad_astra:mars') + //.dimension('ad_astra:glacio') + + event.recipes.gtceu.cooling_tower('tfg:warm_into_distilled_5') + .perTick(true) + .inputFluids(Fluid.of('tfg:warm_water', 100000)) + .outputFluids(Fluid.of('gtceu:distilled_water', 100000)) + .perTick(false) + .EUt(1) + .duration(20*60) + .circuit(5) + .dimension('minecraft:overworld') + .dimension('ad_astra:mars') + //.dimension('ad_astra:glacio') //#endregion - /* + + //#region Heat Battery + + event.recipes.deafission.hb_import('tfg:boron_coolant') + .inputFluids(Fluid.of('tfg:hot_boron_enriched_coolant', 3600)) + .outputFluids(Fluid.of('tfg:boron_enriched_coolant', 3600)) + .blastFurnaceTemp(2000) + .addData("hb_energy", 30) +/* + event.recipes.deafission.hb_export('tfg:boron_coolant_to_dense_steam') + .inputFluids(Fluid.of('gtceu:distilled_water', 7200)) + .outputFluids(Fluid.of('gtceu:dense_steam', 28800)) + .blastFurnaceTemp(1000) + .addData("hb_energy", 10) + .circuit(1) +*/ + event.recipes.deafission.hb_export('tfg:boron_coolant_to_dense_steam') + .inputFluids(Fluid.of('gtceu:distilled_water', 28800)) + .outputFluids(Fluid.of('gtceu:dense_steam', 115200)) + .blastFurnaceTemp(1000) + .addData("hb_energy", 40) + //.circuit(2) + event.recipes.deafission.hb_import('tfg:dense_steam') - .inputFluids(Fluid.of('gtceu:dense_steam', 100)) - .outputFluids(Fluid.of('minecraft:water', 10)) - .blastFurnaceTemp(4000) - .addData("hb_energy", 100) - */ + .inputFluids(Fluid.of('gtceu:dense_steam', 20)) + .outputFluids(Fluid.of('minecraft:water', 20)) + .blastFurnaceTemp(1000) + .addData("hb_energy", 20) + + //#endregion + + //#region Processing Depleted TBU + + let j = event.recipes.gtceu.nuclear_fuel_factory('tfg:americium_300_t1') + .inputFluids(Fluid.of('tfg:isotopic_solvent', 64000)) + .inputItemNbtPredicate('tfg:depleted_tbu_232_rod', + NBTPredicates.all([ + NBTPredicates.gte("avgHeat", 0), + NBTPredicates.lte("avgHeat", 100) + ])) + .chancedItemOutputLogic($ChanceLogic.OR) + .chancedOutput(Item.of('12x gtceu:tiny_americium_241_dust'), 2500, 0) + .chancedOutput(Item.of('16x gtceu:tiny_americium_241_dust'), 7500, 0) + .itemOutputs(Item.of('tfg:empty_rod_t2')) + .outputFluids(Fluid.of('tfg:degraded_solvent_stream', 64000)) + .outputFluids(Fluid.of('tfg:tbu_waste', 8000)) + .duration(20*3) + .EUt(GTValues.VA[GTValues.IV]) + .addDataString("avgHeat1", "0") + .addDataString("avgHeat2", "100") + .dimension('ad_astra:mars') + TFGRecipeSchemaBindings.isOxygenated(j, true); + + let k = event.recipes.gtceu.nuclear_fuel_factory('tfg:americium_300_t2') + .inputFluids(Fluid.of('tfg:isotopic_solvent', 64000)) + .inputItemNbtPredicate('tfg:depleted_tbu_232_rod', + NBTPredicates.all([ + NBTPredicates.gte("avgHeat", 101), + NBTPredicates.lte("avgHeat", 200) + ])) + .chancedItemOutputLogic($ChanceLogic.OR) + .chancedOutput(Item.of('4x gtceu:tiny_americium_241_dust'), 2500, 0) + .chancedOutput(Item.of('8x gtceu:tiny_americium_241_dust'), 7500, 0) + .itemOutputs(Item.of('tfg:empty_rod_t2')) + .outputFluids(Fluid.of('tfg:degraded_solvent_stream', 64000)) + .outputFluids(Fluid.of('tfg:tbu_waste', 8000)) + .duration(20*3) + .EUt(GTValues.VA[GTValues.IV]) + .addDataString("avgHeat1", "101") + .addDataString("avgHeat2", "200") + .dimension('ad_astra:mars') + TFGRecipeSchemaBindings.isOxygenated(k, true); + + let l = event.recipes.gtceu.nuclear_fuel_factory('tfg:americium_30_t3') + .inputFluids(Fluid.of('tfg:isotopic_solvent', 64000)) + .inputItemNbtPredicate('tfg:depleted_tbu_232_rod', + NBTPredicates.all([ + NBTPredicates.gte("avgHeat", 201), + NBTPredicates.lte("avgHeat", 300) + ])) + .chancedItemOutputLogic($ChanceLogic.OR) + .chancedOutput(Item.of('1x gtceu:tiny_americium_241_dust'), 2500, 0) + .chancedOutput(Item.of('2x gtceu:tiny_americium_241_dust'), 7500, 0) + .itemOutputs(Item.of('tfg:empty_rod_t2')) + .outputFluids(Fluid.of('tfg:degraded_solvent_stream', 64000)) + .outputFluids(Fluid.of('tfg:tbu_waste', 8000)) + .duration(20*3) + .EUt(GTValues.VA[GTValues.IV]) + .addDataString("avgHeat1", "201") + .addDataString("avgHeat2", "300") + .dimension('ad_astra:mars') + TFGRecipeSchemaBindings.isOxygenated(l, true); + + let m = event.recipes.gtceu.nuclear_fuel_factory('tfg:neptunium_t1') + .inputFluids(Fluid.of('tfg:isotopic_solvent', 64000)) + .inputItemNbtPredicate('tfg:depleted_tbu_232_rod', + NBTPredicates.all([ + NBTPredicates.gte("avgHeat", 301), + NBTPredicates.lte("avgHeat", 400) + ])) + .chancedItemOutputLogic($ChanceLogic.OR) + .chancedOutput(Item.of('1x gtceu:tiny_neptunium_237_dust'), 2500, 0) + .chancedOutput(Item.of('2x gtceu:tiny_neptunium_237_dust'), 7500, 0) + .itemOutputs(Item.of('tfg:empty_rod_t2')) + .outputFluids(Fluid.of('tfg:degraded_solvent_stream', 64000)) + .outputFluids(Fluid.of('tfg:tbu_waste', 8000)) + .duration(20*3) + .EUt(GTValues.VA[GTValues.IV]) + .addDataString("avgHeat1", "301") + .addDataString("avgHeat2", "400") + .dimension('ad_astra:mars') + TFGRecipeSchemaBindings.isOxygenated(m, true); + + let n = event.recipes.gtceu.nuclear_fuel_factory('tfg:neptunium_t2') + .inputFluids(Fluid.of('tfg:isotopic_solvent', 64000)) + .inputItemNbtPredicate('tfg:depleted_tbu_232_rod', + NBTPredicates.all([ + NBTPredicates.gte("avgHeat", 401), + NBTPredicates.lte("avgHeat", 500) + ])) + .chancedItemOutputLogic($ChanceLogic.OR) + .chancedOutput(Item.of('4x gtceu:tiny_neptunium_237_dust'), 2500, 0) + .chancedOutput(Item.of('8x gtceu:tiny_neptunium_237_dust'), 7500, 0) + .itemOutputs(Item.of('tfg:empty_rod_t2')) + .outputFluids(Fluid.of('tfg:degraded_solvent_stream', 64000)) + .outputFluids(Fluid.of('tfg:tbu_waste', 8000)) + .duration(20*3) + .EUt(GTValues.VA[GTValues.IV]) + .addDataString("avgHeat1", "401") + .addDataString("avgHeat2", "500") + .dimension('ad_astra:mars') + TFGRecipeSchemaBindings.isOxygenated(n, true); + + let o = event.recipes.gtceu.nuclear_fuel_factory('tfg:neptunium_t3') + .inputFluids(Fluid.of('tfg:isotopic_solvent', 64000)) + .inputItemNbtPredicate('tfg:depleted_tbu_232_rod', + NBTPredicates.all([ + NBTPredicates.gte("avgHeat", 501), + NBTPredicates.lte("avgHeat", 599) + ])) + .chancedItemOutputLogic($ChanceLogic.OR) + .chancedOutput(Item.of('12x gtceu:tiny_neptunium_237_dust'), 2500, 0) + .chancedOutput(Item.of('16x gtceu:tiny_neptunium_237_dust'), 7500, 0) + .itemOutputs(Item.of('tfg:empty_rod_t2')) + .outputFluids(Fluid.of('tfg:degraded_solvent_stream', 64000)) + .outputFluids(Fluid.of('tfg:tbu_waste', 8000)) + .duration(20*3) + .EUt(GTValues.VA[GTValues.IV]) + .addDataString("avgHeat1", "501") + .addDataString("avgHeat2", "599") + .dimension('ad_astra:mars') + TFGRecipeSchemaBindings.isOxygenated(o, true); + + let p = event.recipes.gtceu.nuclear_fuel_factory('tfg:californium_t1') + .inputFluids(Fluid.of('tfg:high_grade_isotopic_solvent', 64000)) + .inputItemNbtPredicate('tfg:depleted_tbu_232_rod', + NBTPredicates.all([ + NBTPredicates.gte("avgHeat", 800), + NBTPredicates.lte("avgHeat", 899) + ])) + .chancedItemOutputLogic($ChanceLogic.OR) + .chancedOutput(Item.of('gtceu:tiny_californium_252_dust'), 2500, 0) + .chancedOutput(Item.of('2x gtceu:tiny_californium_252_dust'), 7500, 0) + .itemOutputs(Item.of('tfg:empty_rod_t2')) + .outputFluids(Fluid.of('tfg:degraded_high_grade_isotopic_solvent', 64000)) + .outputFluids(Fluid.of('tfg:tbu_waste', 8000)) + .duration(20*3) + .EUt(GTValues.VA[GTValues.IV]) + .addDataString("avgHeat1", "800") + .addDataString("avgHeat2", "899") + .dimension('ad_astra:mars') + TFGRecipeSchemaBindings.isOxygenated(p, true); + + let q = event.recipes.gtceu.nuclear_fuel_factory('tfg:californium_t2') + .inputFluids(Fluid.of('tfg:high_grade_isotopic_solvent', 64000)) + .inputItemNbtPredicate('tfg:depleted_tbu_232_rod', + NBTPredicates.all([ + NBTPredicates.gte("avgHeat", 900), + NBTPredicates.lte("avgHeat", 999) + ])) + .chancedItemOutputLogic($ChanceLogic.OR) + .chancedOutput(Item.of('4x gtceu:tiny_californium_252_dust'), 2500, 0) + .chancedOutput(Item.of('8x gtceu:tiny_californium_252_dust'), 7500, 0) + .itemOutputs(Item.of('tfg:empty_rod_t2')) + .outputFluids(Fluid.of('tfg:degraded_high_grade_isotopic_solvent', 64000)) + .outputFluids(Fluid.of('tfg:tbu_waste', 8000)) + .duration(20*3) + .EUt(GTValues.VA[GTValues.IV]) + .addDataString("avgHeat1", "900") + .addDataString("avgHeat2", "999") + .dimension('ad_astra:mars') + TFGRecipeSchemaBindings.isOxygenated(q, true); + + let r = event.recipes.gtceu.nuclear_fuel_factory('tfg:californium_t3') + .inputFluids(Fluid.of('tfg:high_grade_isotopic_solvent', 64000)) + .inputItemNbtPredicate('tfg:depleted_tbu_232_rod', + NBTPredicates.all([ + NBTPredicates.gte("avgHeat", 1000), + NBTPredicates.lte("avgHeat", 1100) + ])) + .chancedItemOutputLogic($ChanceLogic.OR) + .chancedOutput(Item.of('12x gtceu:tiny_californium_252_dust'), 2500, 0) + .chancedOutput(Item.of('16x gtceu:tiny_californium_252_dust'), 7500, 0) + .itemOutputs(Item.of('tfg:empty_rod_t2')) + .outputFluids(Fluid.of('tfg:degraded_high_grade_isotopic_solvent', 64000)) + .outputFluids(Fluid.of('tfg:tbu_waste', 8000)) + .duration(20*3) + .EUt(GTValues.VA[GTValues.IV]) + .addDataString("avgHeat1", "1000") + .addDataString("avgHeat2", "1100") + .dimension('ad_astra:mars') + TFGRecipeSchemaBindings.isOxygenated(r, true); + + let s = event.recipes.gtceu.nuclear_fuel_factory('tfg:tbu_overheated') + .inputFluids(Fluid.of('tfg:isotopic_solvent', 64000)) + .inputItemNbtPredicate(Item.of('tfg:depleted_tbu_232_rod'), NBTPredicates.gte("avgHeat", 1101)) + .chancedOutput(Item.of('1x gtceu:tiny_neptunium_237_dust'), 2500, 0) + .itemOutputs(Item.of('tfg:empty_rod_t2')) + .outputFluids(Fluid.of('tfg:degraded_solvent_stream', 64000)) + .outputFluids(Fluid.of('tfg:tbu_waste', 4000)) + .EUt(GTValues.VA[GTValues.IV]) + .duration(20*16) + .dimension('ad_astra:mars') + .addDataString("avgHeat1", "1101") + .addDataString("avgHeat2", "∞") + TFGRecipeSchemaBindings.isOxygenated(s, true); + //#region FLiBe Line - SCRAP FROM MARS TO VENUS - - /* - +/* event.recipes.gtceu.evaporation_tower('raw_rich_brine_earth') .inputFluids(Fluid.of('tfc:spring_water', 20000)) - .outputFluids(Fluid.of('gtceu:raw_rich_brine', 1000)) + .outputFluids(Fluid.of('tfg:raw_rich_brine', 1000)) .duration(20*50) .EUt(GTValues.VA[GTValues.EV]) event.recipes.gtceu.evaporation_tower('raw_rich_brine_mars') .inputFluids(Fluid.of('tfg:heavy_ammoniacal_water', 20000)) - .outputFluids(Fluid.of('gtceu:raw_rich_brine', 1000)) + .outputFluids(Fluid.of('tfg:raw_rich_brine', 1000)) .duration(20*50) .EUt(GTValues.VA[GTValues.EV]) event.recipes.gtceu.chemical_reactor('hydrogen_iodide_to_hot_iodine_brine') .inputFluids(Fluid.of('gtceu:hydrogen_iodide', 1000)) - .inputFluids(Fluid.of('gtceu:raw_rich_brine', 1000)) + .inputFluids(Fluid.of('tfg:raw_rich_brine', 1000)) .outputFluids(Fluid.of('gtceu:sodium_potassium', 1000)) - .outputFluids(Fluid.of('gtceu:hot_iodine_brine', 1000)) + .outputFluids(Fluid.of('tfg:hot_iodine_brine', 1000)) .duration(20*24) .EUt(GTValues.VA[GTValues.HV]) event.recipes.gtceu.large_chemical_reactor('basic_bromine_exhaust_to_hot_iodine_brine') - .inputFluids(Fluid.of('gtceu:basic_bromine_exhaust', 1000)) - .inputFluids(Fluid.of('gtceu:raw_rich_brine', 1000)) + .inputFluids(Fluid.of('tfg:basic_bromine_exhaust', 1000)) + .inputFluids(Fluid.of('tfg:raw_rich_brine', 1000)) .outputFluids(Fluid.of('gtceu:sodium_potassium', 1000)) - .outputFluids(Fluid.of('gtceu:hot_iodine_brine', 1000)) + .outputFluids(Fluid.of('tfg:hot_iodine_brine', 1000)) .outputFluids(Fluid.of('gtceu:steam', 1000)) .duration(20*30) .EUt(GTValues.VA[GTValues.HV]) event.recipes.gtceu.evaporation_tower('brominated_iodine_vapor') - .inputFluids(Fluid.of('gtceu:hot_iodine_brine', 10000)) + .inputFluids(Fluid.of('tfg:hot_iodine_brine', 10000)) .itemOutputs('#forge:dusts/magnesium_chloride') - .outputFluids(Fluid.of('gtceu:brominated_iodine_vapor', 1000)) + .outputFluids(Fluid.of('tfg:brominated_iodine_vapor', 1000)) .duration(20*50) .EUt(GTValues.VA[GTValues.EV]) event.recipes.gtceu.chemical_reactor('lithium_carbonate') - .inputFluids(Fluid.of('gtceu:brominated_iodine_vapor', 1000)) + .inputFluids(Fluid.of('tfg:brominated_iodine_vapor', 1000)) .itemInputs('#forge:dusts/sodium_hydroxide') .itemOutputs('#forge:dusts/lithium_carbonate') - .outputFluids(Fluid.of('gtceu:basic_bromine_exhaust', 1000)) + .outputFluids(Fluid.of('tfg:basic_bromine_exhaust', 1000)) .duration(20*54) .EUt(GTValues.VA[GTValues.HV]) @@ -549,24 +1163,119 @@ function registerTFGNuclearRecipes(event) { .inputFluids(Fluid.of('minecraft:water', 1000)) .itemInputs('#forge:gems/lithium_fluoride') .itemInputs('#forge:gems/tetrafluoroberyllate') - .outputFluids(Fluid.of('gtceu:dirty_flibe', 1000)) + .outputFluids(Fluid.of('tfg:dirty_flibe', 1000)) .blastFurnaceTemp(3600) .duration(20*36) .EUt(GTValues.VA[GTValues.IV]) event.recipes.gtceu.electrolyzer('flibe') - .inputFluids(Fluid.of('gtceu:dirty_flibe', 1000)) - .outputFluids(Fluid.of('gtceu:flibe', 1000)) + .inputFluids(Fluid.of('tfg:dirty_flibe', 1000)) + .outputFluids(Fluid.of('tfg:flibe', 1000)) .itemOutputs('#forge:dusts/chromium') .itemOutputs('gtceu:nickel_dust') .itemOutputs('gtceu:iron_dust') .duration(20*36) .EUt(GTValues.VA[GTValues.IV]) - - */ - +*/ //#endregion + //#region Isotopic Solvent and degradated + + event.recipes.gtceu.chemical_reactor('tfg:copper_trace_catalyst') + .itemInputs('#forge:dusts/copper') + .itemInputs('2x #forge:dusts/salt') + .itemInputs('#forge:dusts/magnesium') + .inputFluids(Fluid.of('gtceu:hydrofluoric_acid', 1000)) + .inputFluids(Fluid.of('gtceu:sulfuric_acid', 1000)) + .inputFluids(Fluid.of('gtceu:oxygen', 3000)) + .itemOutputs('13x tfg:copper_trace_catalyst_dust') + .outputFluids(Fluid.of('minecraft:water', 1000)) + .duration(20 * 5) + .EUt(GTValues.VA[GTValues.IV]) + + event.recipes.gtceu.chemical_reactor('tfg:trace_catalyst_salt_e') + .itemInputs('13x tfg:copper_trace_catalyst_dust') + .inputFluids(Fluid.of('gtceu:ethanol', 1000)) + .inputFluids(Fluid.of('gtceu:distilled_water', 1000)) + .itemOutputs('25x tfg:trace_catalyst_salt_e_dust') + .duration(20 * 5) + .EUt(GTValues.VA[GTValues.IV]) + + event.recipes.gtceu.chemical_reactor('tfg:organic_stabilizer') + .itemInputs('2x #forge:dusts/ammonium_chloride') + .inputFluids(Fluid.of('gtceu:phenol', 1000)) + .inputFluids(Fluid.of('gtceu:ethanol', 2000)) + .inputFluids(Fluid.of('gtceu:toluene', 3000)) + .itemOutputs('8x tfg:organic_stabilizer_dust') + .duration(20 * 5) + .EUt(GTValues.VA[GTValues.IV]) + + event.recipes.gtceu.chemical_reactor('tfg:sodium_fluoride') + .itemInputs('#forge:dusts/sodium') + .inputFluids(Fluid.of('gtceu:fluorine', 1000)) + .itemOutputs('2x tfg:sodium_fluoride_dust') + .duration(20 * 10) + .EUt(GTValues.VA[GTValues.ULV]) + + event.recipes.gtceu.large_chemical_reactor('tfg:isotopic_solvent') + .itemInputs('25x tfg:trace_catalyst_salt_e_dust') + .itemInputs('8x tfg:organic_stabilizer_dust') + .itemInputs('2x tfg:sodium_fluoride_dust') + .inputFluids(Fluid.of('gtceu:argon', 1000)) + .inputFluids(Fluid.of('minecraft:water', 1000)) + .outputFluids(Fluid.of('tfg:isotopic_solvent', 1000)) + .duration(20 * 5) + .EUt(GTValues.VA[GTValues.IV]) + + // Degraded solvent + + event.recipes.gtceu.centrifuge('tfg:centrifuge_degraded_solvent') + .inputFluids(Fluid.of('tfg:degraded_solvent_stream', 1000)) + .itemOutputs('tfg:inert_dust_fraction_dust') + .outputFluids(Fluid.of('tfg:residual_sludge', 1000)) + .outputFluids(Fluid.of('tfg:gas_fraction', 1000)) + .outputFluids(Fluid.of('tfg:organic_degradation_slurry', 1000)) + .duration(20 * 5) + .EUt(GTValues.VA[GTValues.IV]) + + event.recipes.gtceu.centrifuge('tfg:centrifuge_gas_fraction') + .inputFluids(Fluid.of('tfg:gas_fraction', 1000)) + .outputFluids(Fluid.of('gtceu:argon', 500)) + .outputFluids(Fluid.of('gtceu:radon', 500)) + .duration(20 * 5) + .EUt(GTValues.VA[GTValues.IV]) + + event.recipes.gtceu.distillation_tower('tfg:distill_organic_degradation_slurry') + .inputFluids(Fluid.of('tfg:organic_degradation_slurry', 1000)) + .outputFluids(Fluid.of('gtceu:ethanol', 3000)) + .outputFluids(Fluid.of('gtceu:toluene', 3000)) + .outputFluids(Fluid.of('gtceu:dichlorobenzene', 1000)) + .duration(20 * 5) + .EUt(GTValues.VA[GTValues.IV]) + + event.recipes.gtceu.autoclave('tfg:mixed_radioactive_fluid') + .itemInputs('tfg:inert_dust_fraction_dust') + .inputFluids(Fluid.of('tfg:residual_sludge', 1000)) + .itemOutputs('tfg:recovered_ionic_complex_dust') + .outputFluids(Fluid.of('tfg:mixed_radioactive_fluid', 1000)) + .duration(20 * 5) + .EUt(GTValues.VA[GTValues.IV]) + + event.recipes.gtceu.electrolyzer('tfg:electrolyze_recovered_ionic_complex') + .itemInputs('tfg:recovered_ionic_complex_dust') + .itemOutputs('2x #forge:dusts/sodium') + .itemOutputs('#forge:dusts/magnesium') + .duration(20 * 5) + .EUt(GTValues.VA[GTValues.IV]) + + event.recipes.gtceu.centrifuge('tfg:centrifuge_mixed_radioactive_fluid') + .inputFluids(Fluid.of('tfg:mixed_radioactive_fluid', 1000)) + .outputFluids(Fluid.of('gtceu:sulfuric_copper_solution', 1000)) + .outputFluids(Fluid.of('gtceu:fluorine', 2000)) + .outputFluids(Fluid.of('gtceu:hydrogen', 1000)) + .duration(20 * 5) + .EUt(GTValues.VA[GTValues.IV]) + //#region Epoxidized Isosorbide Linolenate event.recipes.gtceu.distillery('tfg:linolenic_from_seed') @@ -647,7 +1356,46 @@ function registerTFGNuclearRecipes(event) { .duration(100) .EUt(GTValues.VA[GTValues.IV]) - //#endregion + //#region Boron Coolant + + event.recipes.gtceu.chemical_reactor('tfg:boron_trichloride') + .inputFluids(Fluid.of('gtceu:chlorine', 2000)) + .itemInputs(Item.of('gtceu:boron_dust', 1)) + .outputFluids(Fluid.of('tfg:boron_thrichloride')) + .circuit(2) + .duration(20*36) + .EUt(GTValues.VA[GTValues.IV]) + + event.recipes.gtceu.centrifuge('tfg:enriched_boron_trichloride') + .inputFluids(Fluid.of('tfg:boron_thrichloride', 1000)) + .outputFluids(Fluid.of('tfg:enriched_boron_thrichloride', 10)) + .duration(20*62) + .EUt(GTValues.VHA[GTValues.HV]) + + event.recipes.gtceu.chemical_reactor('tfg:boron_10_hydroxide') + .inputFluids(Fluid.of('tfg:enriched_boron_thrichloride', 1000), Fluid.of('minecraft:water', 6000) ) + .itemOutputs(Item.of('tfg:boron_10_hydroxide_dust')) + .outputFluids(Fluid.of('gtceu:hydrochloric_acid', 1000)) + .circuit(2) + .duration(20*8) + .EUt(GTValues.VA[GTValues.IV]) + + event.recipes.gtceu.chemical_reactor('tfg:boron_enriched_coolant') + .inputFluids(Fluid.of('gtceu:nitrogen', 2000)) + .itemInputs(Item.of('tfg:boron_10_hydroxide_dust'), Item.of('tfg:sodium_deuteroxide_dust')) + .outputFluids(Fluid.of('tfg:boron_enriched_coolant', 1500)) + .circuit(2) + .duration(20*14) + .EUt(GTValues.VA[GTValues.EV]) + + event.recipes.gtceu.chemical_reactor('tfg:boron_10') + .inputFluids(Fluid.of('tfg:heavy_water', 1000)) + .itemInputs(Item.of('gtceu:sodium_dust')) + .itemOutputs(Item.of('tfg:sodium_deuteroxide_dust', 1)) + .circuit(2) + .duration(20*14) + .EUt(GTValues.VA[GTValues.EV]) + } diff --git a/kubejs/server_scripts/tfg/powergen/nuclear/tags.nuclear.js b/kubejs/server_scripts/tfg/powergen/nuclear/tags.nuclear.js index 97fe73b6c..428ebfa79 100644 --- a/kubejs/server_scripts/tfg/powergen/nuclear/tags.nuclear.js +++ b/kubejs/server_scripts/tfg/powergen/nuclear/tags.nuclear.js @@ -1,6 +1,6 @@ ïŧŋ"use strict"; -const registerTFGItemTagsNuclear = (event) => { +const registerTFGNuclearItemTags = (event) => { //Fission Nucleat Fuel event.add('deafission:fuels', 'tfg:thorium_rod') @@ -8,6 +8,13 @@ const registerTFGItemTagsNuclear = (event) => { event.add('deafission:fuels', 'tfg:plutonium_rod') event.add('tfg:fission_rods', '#deafission:fuels') + let FISSION_ROD_TAG = 'tfg:fission_rods'; + + event.add(FISSION_ROD_TAG, 'tfg:tbu_232_rod'); + event.add(FISSION_ROD_TAG, 'tfg:americium_241_rod'); + event.add(FISSION_ROD_TAG, 'tfg:neptunium_237_rod'); + event.add(FISSION_ROD_TAG, 'tfg:californium_252_rod'); + } const registerTFGBlockTagsNuclear = (event) => { @@ -23,7 +30,7 @@ const registerTFGBlockTagsNuclear = (event) => { event.add(COMPONENTS_FR, 'tfg:impure_moderate_core_frame'); // Max Heat 5 //event.add(COMPONENTS, 'minecraft:blue_ice'); // Max Heat 0.5 - event.add(COMPONENTS_FR, 'minecraft:bedrock'); // Max Heat 10000 CREATIVE BLOCK + //event.add(COMPONENTS_FR, 'minecraft:bedrock'); // Max Heat 10000 CREATIVE BLOCK // Increase Throttle //event.add(COMPONENTS_FR, 'minecraft:iron_block'); @@ -37,16 +44,30 @@ const registerTFGBlockTagsNuclear = (event) => { let COMPONENTS_HB = 'deafission:components_hb'; - event.add(COMPONENTS_HB, 'minecraft:sand'); - event.add(COMPONENTS_HB, 'tfg:impure_moderate_core_frame'); - - event.add(COMPONENTS_HB, 'minecraft:bedrock'); // For Creative usage only + //event.add(COMPONENTS_HB, 'minecraft:sand'); + event.add(COMPONENTS_HB, 'tfg:copper_sandy_frame'); + event.add(COMPONENTS_HB, 'tfg:beryllium_sandy_frame'); + //event.add(COMPONENTS_HB, 'minecraft:bedrock'); // For Creative usage only //#endregion + } //#endregion //#region Fluids const registerTFGFluidTagsNuclear = (event) => { + // Fluid allowed for the SMR Hatch + + let SMR_FLUIDS = 'tfg:smr_fluids'; + + event.add(SMR_FLUIDS, 'gtceu:lubricant'); + event.add(SMR_FLUIDS, 'tfg:polyalkylene_lubricant'); + event.add(SMR_FLUIDS, 'tfg:spent_ticl4_doped_supercritical_co2'); + event.add(SMR_FLUIDS, 'tfg:ozone'); + event.add(SMR_FLUIDS, 'tfg:cyclohex_diperoxide'); + event.add(SMR_FLUIDS, 'tfg:booster_t3'); + + //#endregion + } diff --git a/kubejs/server_scripts/tfg/powergen/recipes.early_gas.js b/kubejs/server_scripts/tfg/powergen/recipes.early_gas.js index a6826317b..e979f098e 100644 --- a/kubejs/server_scripts/tfg/powergen/recipes.early_gas.js +++ b/kubejs/server_scripts/tfg/powergen/recipes.early_gas.js @@ -169,13 +169,13 @@ function registerTFGEarlyGasRecipes(event) { .inputFluids(Fluid.of('tfg:reformed_aromatic_feedstock', 2000), Fluid.of('gtceu:steam', 4000)) .outputFluids(Fluid.of('tfg:reformate_gas', 8000)) .outputFluids(Fluid.of('tfg:cracker_off_gas', 1000)) - .duration(20*30) + .duration(20*16) .EUt(GTValues.VA[GTValues.MV]) event.recipes.gtceu.chemical_reactor('tfg:reformate_gas') .inputFluids(Fluid.of('tfg:reformed_aromatic_feedstock', 2000), Fluid.of('gtceu:steam', 1000)) .outputFluids(Fluid.of('tfg:reformate_gas', 3000)) - .duration(20*30) + .duration(20*16) .EUt(GTValues.VA[GTValues.MV]) // Recycling @@ -190,11 +190,12 @@ function registerTFGEarlyGasRecipes(event) { // Modify Recipe to balance new line event.remove({ id: 'gtceu:extractor/charcoal_extraction' }) + /* event.recipes.gtceu.extractor('tfg:charcoal_extraction') .itemInputs(Item.of('minecraft:charcoal')) .outputFluids(Fluid.of('gtceu:wood_tar', 100)) .duration(20*6.4) - .EUt(GTValues.VA[GTValues.MV]) + .EUt(GTValues.VA[GTValues.MV])*/ //#endregion @@ -235,7 +236,7 @@ function registerTFGEarlyGasRecipes(event) { event.recipes.gtceu.gas_turbine('tfg:btx_fuel') // Gas Turbine .inputFluids(Fluid.of('tfg:btx_fuel', 1)) .EUt(-(32)) - .duration(20*2.6) + .duration(20*2.86) .dimension('minecraft:overworld') .dimension('minecraft:the_nether') @@ -246,7 +247,7 @@ function registerTFGEarlyGasRecipes(event) { 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)) + .outputFluids(Fluid.of('gtceu:methanol', 3000), Fluid.of('minecraft:water', 2000)) .duration(20*12) .EUt(GTValues.VA[GTValues.MV]) @@ -273,7 +274,7 @@ function registerTFGEarlyGasRecipes(event) { .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]) + .EUt(GTValues.VA[GTValues.MV]) event.recipes.gtceu.chemical_reactor('tfg:zsm_5_gel') .itemInputs(Item.of('#forge:dusts/sodium_aluminium')) @@ -303,6 +304,7 @@ function registerTFGEarlyGasRecipes(event) { .itemInputs(Item.of('tfg:catalyser_pt_re_zsm')) .inputFluids(Fluid.of('tfg:reformate_gas', 8000)) .inputFluids(Fluid.of('gtceu:propene', 2000)) + .itemOutputs(Item.of('tfg:used_catalyser', 1)) .outputFluids(Fluid.of('tfg:crude_mixed_gas', 10000)) .duration(20*240) .EUt(GTValues.VA[GTValues.LV]) @@ -312,8 +314,7 @@ function registerTFGEarlyGasRecipes(event) { .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)) + .outputFluids(Fluid.of('tfg:btx_fuel', 54000)) .duration(20*6) .EUt(GTValues.VA[GTValues.IV]) .circuit(24) @@ -328,7 +329,7 @@ function registerTFGEarlyGasRecipes(event) { event.recipes.gtceu.chemical_reactor('tfg:clean_powder') .itemInputs(Item.of('tfg:catalyser_powder_dust', 1)) - .inputFluids(Fluid.of('gtceu:hydrogen_peroxide', 2000)) + .inputFluids(Fluid.of('gtceu:hydrogen_peroxide', 200)) .itemOutputs(Item.of('tfg:clean_powder_dust', 1), Item.of('gtceu:sodium_dust', 1)) .duration(20*14) .EUt(GTValues.VA[GTValues.MV]) diff --git a/kubejs/server_scripts/tfg/powergen/recipes.power_gen_balance.js b/kubejs/server_scripts/tfg/powergen/recipes.power_gen_balance.js new file mode 100644 index 000000000..93505a347 --- /dev/null +++ b/kubejs/server_scripts/tfg/powergen/recipes.power_gen_balance.js @@ -0,0 +1,101 @@ +function registerTFGPowerGenBalance(event) { + + //#region Buff fuels + + event.remove({ id: 'gtceu:combustion_generator/cetane_diesel' }) + event.recipes.gtceu.combustion_generator('tfg:cetane_boosted_diesel') + .inputFluids(Fluid.of('gtceu:cetane_boosted_diesel', 1)) + .duration(20*1.6) + .EUt(-32) + .dimension('minecraft:overworld') + .dimension('minecraft:the_nether') + + //#endregion + + //#region Nerf/Removed +/* COMMENT OUT UNTIL WE WANT TO ENABLE THE NERF + event.remove({ id: 'gtceu:gas_turbine/benzene' }) + event.recipes.gtceu.gas_turbine('tfg:benzene') + .inputFluids(Fluid.of('gtceu:benzene', 1)) + .duration(20*0.2) + .EUt(-32) + .dimension('minecraft:overworld') + .dimension('minecraft:the_nether') + + event.remove({ id: 'gtceu:gas_turbine/nitrobenzene' }) + event.recipes.gtceu.gas_turbine('tfg:nitrobenzene') + .inputFluids(Fluid.of('gtceu:nitrobenzene', 1)) + .duration(20*0.5) + .EUt(-32) + .dimension('minecraft:overworld') + .dimension('minecraft:the_nether') +*/ + // Remove Light fuel ability as a fuel + + event.remove({ id: 'gtceu:combustion_generator/sulfuric_light_fuel' }) + event.remove({ id: 'gtceu:combustion_generator/light_fuel' }) + + + // Make Diesel available at ULV and balance power gen + + event.remove({ id: 'gtceu:combustion_generator/diesel' }) + event.recipes.gtceu.combustion_generator('tfg:diesel') + .inputFluids(Fluid.of('gtceu:diesel', 1)) + .duration(20*0.6) + .EUt(-32) + .dimension('minecraft:overworld') + .dimension('minecraft:the_nether') + + event.remove({ id: 'gtceu:mixer/diesel' }) + event.recipes.gtceu.mixer('tfg:diesel') + .inputFluids(Fluid.of('gtceu:light_fuel', 5000), Fluid.of('gtceu:heavy_fuel', 1000)) + .outputFluids(Fluid.of('gtceu:diesel', 6000)) + .duration(20*1.6) + .EUt(GTValues.VA[GTValues.LV]) + + // Oil to Light Fuel + + event.recipes.vintageimprovements.vacuumizing(Fluid.of('gtceu:light_fuel', 250), [Fluid.of('gtceu:oil', 1000)]) + .secondaryFluidOutput(0) + .processingTime(500) + .heated() + .id('tfg:vi/vacuumizing/light_fuel_from_oil') + + event.recipes.vintageimprovements.vacuumizing(Fluid.of('gtceu:light_fuel', 50), [Fluid.of('gtceu:oil_light', 1000)]) + .secondaryFluidOutput(0) + .processingTime(500) + .heated() + .id('tfg:vi/vacuumizing/light_fuel_from_light_oil') + + // Raw Oil to Naphtha + + event.recipes.vintageimprovements.vacuumizing(Fluid.of('gtceu:naphtha', 500), [Fluid.of('gtceu:oil_medium', 1000)]) + .secondaryFluidOutput(0) + .processingTime(500) + .heated() + .id('tfg:vi/vacuumizing/light_fuel_from_raw_oil') + + // Heavy oil to Heavy Fuel + + event.recipes.vintageimprovements.vacuumizing(Fluid.of('gtceu:heavy_fuel', 750), [Fluid.of('gtceu:oil_heavy', 1000)]) + .secondaryFluidOutput(0) + .processingTime(500) + .heated() + .id('tfg:vi/vacuumizing/heavy_fuel_from_heavy_oil') + + // Switch HOG to require IV Energy Hatch + + event.remove({ id: 'gtceu:large_chemical_reactor/high_octane_gasoline' }) + event.recipes.gtceu.large_chemical_reactor('tfg:high_octane_gasoline') + .inputFluids( + Fluid.of('gtceu:gasoline', 20000), + Fluid.of('gtceu:octane', 2000), + Fluid.of('gtceu:nitrous_oxide', 2000), + Fluid.of('gtceu:toluene', 1000), + Fluid.of('gtceu:ethyl_tertbutyl_ether', 1000)) + .outputFluids(Fluid.of('gtceu:high_octane_gasoline', 32000)) + .duration(20*1.5) + .EUt(GTValues.VA[GTValues.LuV]) + .circuit(24) + +} \ No newline at end of file diff --git a/kubejs/server_scripts/tfg/primitive/recipes.artisan_table.js b/kubejs/server_scripts/tfg/primitive/recipes.artisan_table.js new file mode 100644 index 000000000..340244b36 --- /dev/null +++ b/kubejs/server_scripts/tfg/primitive/recipes.artisan_table.js @@ -0,0 +1,572 @@ +ïŧŋ// priority: 0 +"use strict"; + +function registerTFGArtisanTableRecipes(event) { + + // Removals (`type` didnt want to work here). + event.remove({ id: /gtceu:shaped\/shape_.*/, input: 'gtceu:empty_mold'}); + event.remove({ id: /gtceu:shaped\/shape_.*/, input: /gtceu:.*_extruder_mold/}); + event.remove({ id: 'gtceu:shaped/basic_circuit_board'}); + event.remove({ id: 'gtceu:shaped/good_circuit_board'}); + + //Table Recipe + TFGHelpers.registerMaterialInfo('tfg:artisan_table', [GTMaterials.WroughtIron, 6, GTMaterials.Wood, 3, GTMaterials.Copper, 1/9]) + + event.shaped('tfg:artisan_table', [ + 'CBC', + 'AAA', + 'B B' + ], { + A: ChemicalHelper.get(TagPrefix.plateDouble, GTMaterials.WroughtIron, 1), + B: 'firmalife:treated_wood', + C: '#forge:screws/any_bronze' + }).id('tfg:shaped/artisan_table'); + + //#region Molds + + /** + * Mold pattern definitions. + * @param {string} name - Base id of the mold item. + * @param {boolean} genCast - Whether to generate a casting mold recipe. + * @param {boolean} genExtrude - Whether to generate an extruder mold recipe. + * @param {string[]} pattern - 6x6 pattern for the mold. 'X' for solid, ' ' for empty. + * @type {{name: string, genCast: boolean, genExtrude: boolean, pattern: string[]}[]} moldPatterns + */ + const moldPatterns = [ + { name: 'tfg:lamp', genCast: true, genExtrude: false, pattern: [ + "XX XX", + "X X", + "X XX X", + "X XX X", + "X XX X", + "X X" + ]}, + { name: 'tfg:trapdoor', genCast: true, genExtrude: false, pattern: [ + " ", + " XXXX ", + " ", + " ", + " XXXX ", + " " + ]}, + { name: 'tfg:chain', genCast: true, genExtrude: false, pattern: [ + "X X", + "X XX X", + "X X", + "XX XX", + "X X", + "X XX X" + ]}, + { name: 'tfg:bell', genCast: true, genExtrude: false, pattern: [ + "XX XX", + "X X", + "X X", + "X X", + " ", + " " + ]}, + { name: 'gtceu:plate', genCast: true, genExtrude: true, pattern: [ + "XXXXXX", + "X X", + "X X", + "X X", + "X X", + "XXXXXX" + ]}, + { name: 'gtceu:gear', genCast: true, genExtrude: true, pattern: [ + "XX XX", + "X X", + " XX ", + " XX ", + "X X", + "XX XX" + ]}, + { name: 'gtceu:bottle', genCast: true, genExtrude: true, pattern: [ + "X X", + "XX XX", + "XX XX", + "X X", + "X X", + "X X" + ]}, + { name: 'gtceu:ingot', genCast: true, genExtrude: true, pattern: [ + "XXXXXX", + "XX XX", + "XX XX", + "XX XX", + "XX XX", + "XXXXXX" + ]}, + { name: 'gtceu:ball', genCast: true, genExtrude: false, pattern: [ + "XXXXXX", + "XX XX", + "X X", + "X X", + "XX XX", + "XXXXXX" + ]}, + { name: 'gtceu:cylinder', genCast: true, genExtrude: false, pattern: [ + "XX XX", + "X X", + " ", + " ", + "X X", + "XX XX" + ]}, + { name: 'gtceu:block', genCast: true, genExtrude: true, pattern: [ + " ", + " ", + " ", + " ", + " ", + " " + ]}, + { name: 'gtceu:nugget', genCast: true, genExtrude: false, pattern: [ + "XXXXXX", + "XXXXXX", + "XX XXX", + "XX XXX", + "XXXXXX", + "XXXXXX" + ]}, + { name: 'gtceu:anvil', genCast: true, genExtrude: false, pattern: [ + " ", + " ", + "X X", + "XX XX", + "X X", + "XXXXXX" + ]}, + { name: 'gtceu:name', genCast: true, genExtrude: false, pattern: [ + "XXXXXX", + "X X X ", + " X X X", + "X X X ", + "XXXXXX", + "XXXXXX" + ]}, + { name: 'gtceu:small_gear', genCast: true, genExtrude: true, pattern: [ + "XXX XX", + "XX X", + "X X ", + "XX X", + "XXX XX", + "XXXXXX" + ]}, + { name: 'gtceu:rotor', genCast: true, genExtrude: true, pattern: [ + " XXXX ", + "X XX X", + "XX XX", + "XX XX", + "X XX X", + " XXXX " + ]}, + { name: 'gtceu:pill', genCast: true, genExtrude: false, pattern: [ + "XXXXXX", + "XXXXXX", + "XX XX", + "X XX", + "X XXX", + "XXXXXX" + ]}, + { name: 'gtceu:huge_pipe', genCast: true, genExtrude: true, pattern: [ + " ", + " XXXX ", + " XXXX ", + " XXXX ", + " XXXX ", + " " + ]}, + + { name: 'gtceu:rod', genCast: false, genExtrude: true, pattern: [ + "XXXXXX", + "XXXXXX", + "XX XX", + "XX XX", + "XXXXXX", + "XXXXXX" + ]}, + { name: 'gtceu:bolt', genCast: false, genExtrude: true, pattern: [ + "XXXXXX", + "XXXXXX", + "XX X", + "XXX XX", + "XXX XX", + "XXXXXX" + ]}, + { name: 'gtceu:ring', genCast: false, genExtrude: true, pattern: [ + "XXXXXX", + "XX XX", + "X XX X", + "X XX X", + "XX XX", + "XXXXXX" + ]}, + { name: 'gtceu:cell', genCast: false, genExtrude: true, pattern: [ + "XXXXXX", + "XX X", + "X XX X", + "X XX X", + "X XX", + "XXXXXX" + ]}, + { name: 'gtceu:wire', genCast: false, genExtrude: true, pattern: [ + "XXXXXX", + "XX XXX", + "XXXXXX", + "XXXXXX", + "XXX XX", + "XXXXXX" + ]}, + { name: 'gtceu:foil', genCast: false, genExtrude: true, pattern: [ + "XXXXXX", + "XXXXXX", + "XXXXXX", + " ", + "XXXXXX", + "XXXXXX" + ]}, + { name: 'tfg:small_casing', genCast: false, genExtrude: true, pattern: [ + "XXXXXX", + "XXXXXX", + "X X X ", + "XXXXXX", + "X X X ", + "XXXXXX" + ]}, + { name: 'tfg:shell_casing', genCast: false, genExtrude: true, pattern: [ + " XXXX", + " XXXX", + "XXXXXX", + "XXXXXX", + "XXXX ", + "XXXX " + ]}, + { name: 'tfg:large_casing', genCast: false, genExtrude: true, pattern: [ + "XX XX", + "XX XX", + " XXXX", + " XXXX", + "XXXX ", + "XXXX " + ]}, + + //Tools + { name: 'tfg:mining_hammer_head', genCast: false, genExtrude: true, pattern: [ + " XXXXX", + " X", + " ", + " X", + " XXXXX", + "XXXXXX" + ]}, + { name: 'tfg:sword_head', genCast: false, genExtrude: true, pattern: [ + " XXXX", + " XXX", + "X XX", + "XX X", + "XXX X", + "XXXXX " + ]}, + { name: 'tfg:pickaxe_head', genCast: false, genExtrude: true, pattern: [ + "XXXXXX", + "XXXXXX", + "X X", + " XXXX ", + "XXXXXX", + "XXXXXX" + ]}, + { name: 'tfg:shovel_head', genCast: false, genExtrude: true, pattern: [ + "XXXXXX", + "X X", + "X X", + "X X", + "XX XX", + "XXXXXX" + ]}, + { name: 'tfg:axe_head', genCast: false, genExtrude: true, pattern: [ + "X XXXX", + " X", + " ", + " X", + "X XXXX", + "XXXXXX" + ]}, + { name: 'tfg:hoe_head', genCast: false, genExtrude: true, pattern: [ + "XXXXXX", + "XXXXXX", + " ", + " XXXX", + "XXXXXX", + "XXXXXX" + ]}, + { name: 'tfg:scythe_head', genCast: false, genExtrude: true, pattern: [ + "XXXXXX", + "X ", + " XX", + " XXXX", + "XXXXXX", + "XXXXXX" + ]}, + { name: 'tfg:file_head', genCast: false, genExtrude: true, pattern: [ + "XXXXXX", + "XX XXX", + "XX XXX", + "XX XXX", + "XX XXX", + "XX XXX" + ]}, + { name: 'tfg:hammer_head', genCast: false, genExtrude: true, pattern: [ + "XXXXXX", + " ", + " ", + "XX XX", + "XXXXXX", + "XXXXXX" + ]}, + { name: 'tfg:saw_head', genCast: false, genExtrude: true, pattern: [ + " XXXX", + " XXX", + "X XX", + "X X", + "XX ", + "XXXX " + ]}, + { name: 'tfg:knife_head', genCast: false, genExtrude: true, pattern: [ + "XXX XX", + "XX XX", + "XX XX", + "XX XX", + "XX XX", + "XXXXXX" + ]}, + { name: 'tfg:butchery_knife_head', genCast: false, genExtrude: true, pattern: [ + "X XXXX", + "X XXXX", + "X XX", + "X X", + "X X X", + "X X" + ]}, + { name: 'tfg:spade_head', genCast: false, genExtrude: true, pattern: [ + "X X", + "X X", + "X X", + "X X", + "XX XX", + "XX XX" + ]}, + { name: 'tfg:propick_head', genCast: false, genExtrude: true, pattern: [ + "XXXXXX", + " X", + " XXXX ", + " XXXXX", + "XXXXXX", + "XXXXXX" + ]}, + { name: 'tfg:javelin_head', genCast: false, genExtrude: true, pattern: [ + " XXX", + " XX", + " X", + "X ", + "XX X", + "XXX XX" + ]}, + { name: 'tfg:chisel_head', genCast: false, genExtrude: true, pattern: [ + "XXX XX", + "XXX XX", + "XXX XX", + "XXX XX", + "XXX XX", + "XXXXXX" + ]}, + { name: 'tfg:mace_head', genCast: false, genExtrude: true, pattern: [ + "XX XX", + "X X", + "X X", + "X X", + "X X", + "XX XX" + ]}, + { name: 'tfg:mattock_head', genCast: false, genExtrude: true, pattern: [ + "XXXXXX", + " X", + " XX ", + "XXXXXX", + "XXXXXX", + "XXXXXX" + ]}, + { name: 'tfg:fish_hook', genCast: false, genExtrude: true, pattern: [ + "XXX XX", + "XXXX X", + "X XX X", + "X XX X", + "XX XX", + "XXXXXX" + ]}, + { name: 'tfg:whisk', genCast: false, genExtrude: true, pattern: [ + " X X ", + "XX XX", + " XX ", + " XX ", + "XX XX", + " X X " + ]}, + { name: 'tfg:screwdriver_tip', genCast: false, genExtrude: true, pattern: [ + "XX X", + "XXX XX", + "XX X", + "XXX XX", + "XXX XX", + "XXX XX" + ]}, + { name: 'tfg:wrench_tip', genCast: false, genExtrude: true, pattern: [ + "XXXXXX", + "XX XXX", + "XX XXX", + "XX XXX", + "XX XXX", + "X XX" + ]}, + { name: 'tfg:wire_cutter_head', genCast: false, genExtrude: true, pattern: [ + "XXXXXX", + "XX X", + "X X X", + "X XXX", + "X XXX", + "XXXXXX" + ]} + + /* + , + { name: 'tfg:', genCast: false, genExtrude: true, pattern: [ + "XXXXXX", + "XXXXXX", + "XXXXXX", + "XXXXXX", + "XXXXXX", + "XXXXXX" + ]} + */ + ]; + + /** Checks for duplicate patterns for the same mold type. */ + function patternsEqual(p1, p2) { + for (let i = 0; i < p1.length; i++) { + if (p1[i] !== p2[i]) return false; + }; + return true; + }; + /** Checks for duplicate mirrored patterns for the same mold type. */ + function patternsMirrorEqual(p1, p2) { + for (let i = 0; i < p1.length; i++) { + if (p1[i] !== p2[i].split('').reverse().join('')) return false; + }; + return true; + }; + // Error logging for duplicate patterns. + let patternsChecked = []; + for (let i = 0; i < moldPatterns.length; i++) { + for (let j = i + 1; j < moldPatterns.length; j++) { + + let a = moldPatterns[i]; + let b = moldPatterns[j]; + let shareCast = a.genCast && b.genCast; + let shareExtrude = a.genExtrude && b.genExtrude; + + if (shareCast || shareExtrude) { + if (patternsEqual(a.pattern, b.pattern) || patternsMirrorEqual(a.pattern, b.pattern)) { + patternsChecked.push({a: a.name, b: b.name}); + }; + }; + }; + }; + if (patternsChecked.length !== 0) { + throw new Error( + `Duplicate artisan table mold patterns detected between: ${patternsChecked.map(pair => `\n${pair.a} and ${pair.b}`).join(', ')}` + ); + }; + + // Create Artisan Table recipes for molds. + moldPatterns.forEach((mold) => { + if (mold.genCast){ + event.custom({ + "result": {"item": `${mold.name}_casting_mold`}, + "pattern": mold.pattern, + "artisanType": "tfg:casting_mold", + "type": "tfg:artisan" + }).id(`tfg:artisan_table/${linuxUnfucker(mold.name)}_casting_mold`); + }; + if (mold.genExtrude){ + event.custom({ + "result": {"item": `${mold.name}_extruder_mold`}, + "pattern": mold.pattern, + "artisanType": "tfg:extruder_mold", + "type": "tfg:artisan" + }).id(`tfg:artisan_table/${linuxUnfucker(mold.name)}_extruder_mold`); + }; + }); + + //#endregion + + //#region Circuits + + event.custom({ + "result": {"item": "gtceu:resin_printed_circuit_board"}, + "pattern": [ + "X XXXX", + " XX X", + "X X X", + "X XX X", + " XXX X", + "XXX X" + ], + "artisanType": "tfg:resin_board", + "type": "tfg:artisan" + }).id(`tfg:artisan_table/resin_printed_circuit_board`); + + event.custom({ + "result": {"item": "gtceu:resin_printed_circuit_board", "count": 4}, + "pattern": [ + "X XXXX", + " XX X", + "X X X", + "X XX X", + " XXX X", + "XXX X" + ], + "artisanType": "tfg:resin_board_4x", + "type": "tfg:artisan" + }).id(`tfg:artisan_table/resin_printed_circuit_board_4x`); + + event.custom({ + "result": {"item": "gtceu:phenolic_printed_circuit_board"}, + "pattern": [ + "X XX ", + " XXXX ", + "XX X ", + "XX XXX", + "XX XX ", + " XX " + ], + "artisanType": "tfg:phenolic_board", + "type": "tfg:artisan" + }).id(`tfg:artisan_table/phenolic_printed_circuit_board`); + + event.custom({ + "result": {"item": "gtceu:phenolic_printed_circuit_board", "count": 4}, + "pattern": [ + "X XX ", + " XXXX ", + "XX X ", + "XX XXX", + "XX XX ", + " XX " + ], + "artisanType": "tfg:phenolic_board_4x", + "type": "tfg:artisan" + }).id(`tfg:artisan_table/phenolic_printed_circuit_board_4x`); + //#endregion + + +} diff --git a/kubejs/server_scripts/tfg/primitive/recipes.clay.js b/kubejs/server_scripts/tfg/primitive/recipes.clay.js index 5ea2bf0fd..dec812be3 100644 --- a/kubejs/server_scripts/tfg/primitive/recipes.clay.js +++ b/kubejs/server_scripts/tfg/primitive/recipes.clay.js @@ -43,6 +43,7 @@ function registerTFGClayRecipes(event) { { input: "tfc:ceramic/unfired_spindle_head", output: "tfc:ceramic/spindle_head", name: "spindle_head" }, { input: "tfc:ceramic/unfired_vessel", output: "tfc:ceramic/vessel", name: "vessel" }, { input: "tfc:ceramic/unfired_large_vessel", output: "tfc:ceramic/large_vessel", name: "large_vessel" }, + { input: "tfcscraping:ceramic/unfired_scraping_knife_blade_mold", output: "tfcscraping:ceramic/scraping_knife_blade_mold", name: "scraping_knife" }, { input: "tfcchannelcasting:unfired_channel", output: "tfcchannelcasting:channel", name: "channel" }, { input: "tfcchannelcasting:unfired_mold_table", output: "tfcchannelcasting:mold_table", name: "mold_table" }, { input: "firmalife:oven_top", output: "firmalife:cured_oven_top", name: "oven_top" }, @@ -187,19 +188,16 @@ function registerTFGClayRecipes(event) { .duration(20) .EUt(2) - event.recipes.gtceu.macerator('tfg:casting_channel') - .itemInputs('tfcchannelcasting:channel') - .itemOutputs('1x #forge:dusts/brick') - .category(GTRecipeCategories.MACERATOR_RECYCLING) - .duration(20) - .EUt(2) - - event.recipes.gtceu.macerator('tfg:mold_table') - .itemInputs('tfcchannelcasting:mold_table') - .itemOutputs('5x #forge:dusts/brick') - .category(GTRecipeCategories.MACERATOR_RECYCLING) - .duration(20) - .EUt(2) + var refractoryClay = GTMaterials.get('tfg:refractory_clay'); + TFGHelpers.registerMaterialInfo('tfc:blast_furnace', [GTMaterials.WroughtIron, 16, refractoryClay, 5]) + TFGHelpers.registerMaterialInfo('tfc:fire_bricks', [refractoryClay, 5]) + TFGHelpers.registerMaterialInfo('tfc:crucible', [refractoryClay, 5]) + TFGHelpers.registerMaterialInfo('tfc:ceramic/fire_brick', [refractoryClay, 1]) + TFGHelpers.registerMaterialInfo('tfcchannelcasting:channel', [refractoryClay, 5/4]) + TFGHelpers.registerMaterialInfo('tfcchannelcasting:mold_table', [refractoryClay, 5]) + TFGHelpers.registerMaterialInfo('tfc:ceramic/fire_ingot_mold', [refractoryClay, 5/2]) + TFGHelpers.registerMaterialInfo('tfg:rod_mold', [refractoryClay, 5]) + TFGHelpers.registerMaterialInfo('tfg:small_gear_mold', [refractoryClay, 5]) // Renewable clay event.recipes.gtceu.rock_breaker("clay_duping") diff --git a/kubejs/server_scripts/tfg/primitive/recipes.compost.js b/kubejs/server_scripts/tfg/primitive/recipes.compost.js index 623e231a2..4d56cce0f 100644 --- a/kubejs/server_scripts/tfg/primitive/recipes.compost.js +++ b/kubejs/server_scripts/tfg/primitive/recipes.compost.js @@ -22,21 +22,33 @@ function registerTFGCompostRecipes(event) { .EUt(30) event.recipes.gtceu.centrifuge('tfg:gtceu/centrifuge/pure_fertilizers') - .itemInputs('1x gtceu:fertilizer') + .itemInputs('8x gtceu:fertilizer') .itemOutputs('1x tfc:pure_nitrogen', '1x tfc:pure_potassium', '1x tfc:pure_phosphorus') .duration(340) .EUt(GTValues.VA[GTValues.ULV]) event.recipes.gtceu.mixer('tfg:tfc/mixer/fertilizer') - .itemInputs('1x tfc:pure_nitrogen', '1x tfc:pure_potassium', '1x tfc:pure_phosphorus', ChemicalHelper.get(TagPrefix.dustSmall, GTMaterials.Clay, 1)) + .itemInputs('8x tfc:pure_nitrogen', '8x tfc:pure_potassium', '8x tfc:pure_phosphorus', ChemicalHelper.get(TagPrefix.dustSmall, GTMaterials.Clay, 1)) .itemOutputs('1x gtceu:fertilizer') .duration(160) .EUt(GTValues.VA[GTValues.ULV]) - event.recipes.gtceu.gas_pressurizer('tfg:pure_nitrogen') + event.recipes.gtceu.mixer('tfg:pure_nitrogen') .itemInputs('#forge:wax') - .inputFluids(Fluid.of('gtceu:nitrogen', 1000)) - .itemOutputs('16x tfc:pure_nitrogen') + .inputFluids(Fluid.of('gtceu:nitrogen', 8000)) + .itemOutputs('4x tfc:pure_nitrogen') + .duration(100) + .EUt(GTValues.VA[GTValues.LV]) + + event.recipes.gtceu.mixer('tfg:pure_potassium') + .itemInputs('#forge:wax', '8x gtceu:potassium_dust') + .itemOutputs('4x tfc:pure_potassium') + .duration(100) + .EUt(GTValues.VA[GTValues.LV]) + + event.recipes.gtceu.mixer('tfg:pure_phosphorus') + .itemInputs('#forge:wax', '8x gtceu:phosphorus_dust') + .itemOutputs('4x tfc:pure_phosphorus') .duration(100) .EUt(GTValues.VA[GTValues.LV]) //#endregion @@ -54,6 +66,11 @@ function registerTFGCompostRecipes(event) { .duration(600) .EUt(2) + event.smelting( + '1x tfc:groundcover/dead_grass', + 'tfc:thatch' + ).id('tfg:smelting/thatch_drying_furnace') + event.recipes.gtceu.fermenter('tfg:fertilizer_to_compost') .itemInputs('4x gtceu:fertilizer') .itemOutputs('tfc:compost') @@ -191,4 +208,4 @@ function registerTFGCompostRecipes(event) { .itemOutputs(Item.of('tfg:universal_compost_browns', 4)) .duration(20) .EUt(8) -} \ No newline at end of file +} diff --git a/kubejs/server_scripts/tfg/primitive/recipes.glue_and_chipboard.js b/kubejs/server_scripts/tfg/primitive/recipes.glue_and_chipboard.js index b6d6c956d..d79899f97 100644 --- a/kubejs/server_scripts/tfg/primitive/recipes.glue_and_chipboard.js +++ b/kubejs/server_scripts/tfg/primitive/recipes.glue_and_chipboard.js @@ -128,13 +128,6 @@ function registerTFGChipboardRecipes(event) { .duration(100) .EUt(GTValues.VA[GTValues.ULV]) - event.recipes.gtceu.chemical_bath('gtceu:bath_high_density_treated_fiberboard') - .itemInputs('1x gtceu:wood_plate') - .inputFluids(Fluid.of('gtceu:creosote', 50)) - .itemOutputs('tfg:high_density_treated_fiberboard') - .duration(100) - .EUt(GTValues.VA[GTValues.ULV]) - event.recipes.gtceu.chemical_bath('gtceu:bath_treated_wood_dust') .itemInputs('#tfg:wood_dusts') .inputFluids(Fluid.of('gtceu:creosote', 50)) @@ -142,17 +135,9 @@ function registerTFGChipboardRecipes(event) { .duration(100) .EUt(GTValues.VA[GTValues.ULV]) - event.recipes.gtceu.compressor('tfg:compressed_treated_chipboard_composite') - .itemInputs('tfg:treated_chipboard_composite') - .itemOutputs('tfg:high_density_treated_fiberboard') - .duration(200) - .EUt(GTValues.VA[GTValues.ULV]) - event.recipes.gtceu.assembler('tfg:resin_circuit_assembler') .itemInputs('gtceu:wood_plate', '2x gtceu:sticky_resin') .itemOutputs('gtceu:resin_circuit_board') .duration(20 * 10) .EUt(GTValues.VA[GTValues.ULV]) - - event.replaceInput({ id: 'gtceu:assembler/phenolic_board' }, '#tfg:wood_dusts', 'tfg:high_density_treated_fiberboard') } \ No newline at end of file diff --git a/kubejs/server_scripts/tfg/primitive/recipes.supports.js b/kubejs/server_scripts/tfg/primitive/recipes.supports.js index dc5311736..08d9b09fe 100644 --- a/kubejs/server_scripts/tfg/primitive/recipes.supports.js +++ b/kubejs/server_scripts/tfg/primitive/recipes.supports.js @@ -8,14 +8,14 @@ function registerTFGSupportRecipes(event) { // Concrete Supports event.recipes.gtceu.fluid_solidifier('tfg:gtceu/fluid_solidifier/reinforced_light_concrete_support') - .inputFluids(Fluid.of('gtceu:concrete', 96)) + .inputFluids(Fluid.of('gtceu:concrete', 144 / 2)) .itemOutputs('1x tfg:reinforced_light_concrete_support') .itemInputs('1x tfg:rebar_support') .duration(60) .EUt(GTValues.VA[GTValues.ULV]) event.recipes.gtceu.assembler('tfg:gtceu/assembler/reinforced_light_concrete_support') - .inputFluids(Fluid.of('gtceu:concrete', 96)) + .inputFluids(Fluid.of('gtceu:concrete', 144 / 2)) .itemOutputs('1x tfg:reinforced_light_concrete_support') .itemInputs('1x tfg:rebar_support') .duration(120) @@ -23,7 +23,7 @@ function registerTFGSupportRecipes(event) { event.recipes.gtceu.macerator(`reinforced_light_concrete_support_to_dust`) .itemInputs('tfg:reinforced_light_concrete_support') - .itemOutputs('gtceu:tiny_steel_dust') + .itemOutputs('2x gtceu:small_concrete_dust', 'gtceu:tiny_steel_dust') .duration(150) .EUt(2) .category(GTRecipeCategories.MACERATOR_RECYCLING); @@ -44,13 +44,13 @@ function registerTFGSupportRecipes(event) { event.recipes.gtceu.macerator(`reinforced_dark_concrete_support_to_dust`) .itemInputs('tfg:reinforced_dark_concrete_support') - .itemOutputs('gtceu:tiny_steel_dust') + .itemOutputs('2x gtceu:small_concrete_dust', 'gtceu:tiny_steel_dust') .duration(150) .EUt(2) .category(GTRecipeCategories.MACERATOR_RECYCLING); event.recipes.tfc.damage_inputs_shaped_crafting( - event.shaped('8x tfg:light_concrete_support', [ + event.shaped('6x tfg:light_concrete_support', [ 'AB ', 'AC ', 'AC ' @@ -63,13 +63,13 @@ function registerTFGSupportRecipes(event) { event.recipes.gtceu.assembler('tfg:gtceu/assembler/light_concrete_support') .circuit(11) .inputFluids(Fluid.of('gtceu:concrete', 36)) - .itemOutputs('8x tfg:light_concrete_support') + .itemOutputs('6x tfg:light_concrete_support') .itemInputs('3x gtceu:light_concrete') .duration(40) .EUt(GTValues.VA[GTValues.ULV]) event.recipes.tfc.damage_inputs_shaped_crafting( - event.shaped('8x tfg:dark_concrete_support', [ + event.shaped('6x tfg:dark_concrete_support', [ 'AB ', 'AC ', 'AC ' @@ -82,11 +82,29 @@ function registerTFGSupportRecipes(event) { event.recipes.gtceu.assembler('tfg:gtceu/assembler/dark_concrete_support') .circuit(11) .inputFluids(Fluid.of('gtceu:concrete', 36)) - .itemOutputs('8x tfg:dark_concrete_support') + .itemOutputs('6x tfg:dark_concrete_support') .itemInputs('3x gtceu:dark_concrete') .duration(40) .EUt(GTValues.VA[GTValues.ULV]) + event.recipes.tfc.barrel_sealed(1000) + .inputFluid(Fluid.of('gtceu:concrete', 96)) + .inputItem('tfg:rebar_support') + .outputItem('tfg:reinforced_light_concrete_support') + .id('tfg:barrel/reinforced_light_concrete_support') + + event.recipes.tfc.barrel_sealed(500) + .inputItem('tfg:light_concrete_support') + .inputFluid(Fluid.of('tfc:black_dye', 10)) + .outputItem('tfg:dark_concrete_support') + .id('tfg:barrel/dark_concrete_support') + + event.recipes.tfc.barrel_sealed(500) + .inputItem('tfg:reinforced_light_concrete_support') + .inputFluid(Fluid.of('tfc:black_dye', 10)) + .outputItem('tfg:reinforced_dark_concrete_support') + .id('tfg:barrel/reinforced_dark_concrete_support') + // Stone supports are in recipes.rocks.js // Metal Supports @@ -103,16 +121,10 @@ function registerTFGSupportRecipes(event) { .circuit(11) .itemOutputs('8x tfg:rebar_support') .itemInputs(ChemicalHelper.get(TagPrefix.rod, GTMaterials.Steel, 2), ChemicalHelper.get(TagPrefix.wireFine, GTMaterials.Steel, 1)) + .addMaterialInfo(true) .duration(100) .EUt(GTValues.VA[GTValues.ULV]) - event.recipes.gtceu.macerator(`rebar_support_to_dust`) - .itemInputs(`tfg:rebar_support`) - .itemOutputs(`gtceu:tiny_steel_dust`) - .duration(150) - .EUt(2) - .category(GTRecipeCategories.MACERATOR_RECYCLING); - event.recipes.tfc.anvil( '1x tfg:steel_support', '#forge:double_ingots/steel', @@ -124,16 +136,10 @@ function registerTFGSupportRecipes(event) { event.recipes.gtceu.assembler('tfg:gtceu/assembler/steel_support') .circuit(11) - .itemOutputs('4x tfg:steel_support') - .itemInputs('2x #forge:double_ingots/steel') + .itemOutputs('2x tfg:steel_support') + .itemInputs('1x #forge:double_ingots/steel') .duration(100) .EUt(GTValues.VA[GTValues.ULV]) - .addMaterialInfo(true) - event.recipes.gtceu.macerator("steel_support_to_dust") - .itemInputs('tfg:steel_support') - .itemOutputs('2x gtceu:steel_dust') - .duration(150) - .EUt(2) - .category(GTRecipeCategories.MACERATOR_RECYCLING); + TFGHelpers.registerMaterialInfo('tfg:steel_support', [GTMaterials.Steel, 1]) } diff --git a/kubejs/server_scripts/tfg/primitive/recipes.wood.js b/kubejs/server_scripts/tfg/primitive/recipes.wood.js index 2965d5783..70afd59ac 100644 --- a/kubejs/server_scripts/tfg/primitive/recipes.wood.js +++ b/kubejs/server_scripts/tfg/primitive/recipes.wood.js @@ -131,7 +131,7 @@ function registerTFGWoodRecipes(event) { ' B ' ], { A: '#forge:tools/saws', - B: '#forge:rods/wooden', + B: '#tfc:lumber', C: 'tfc:glue' }).id('gtceu:shaped/small_gear_wood') diff --git a/kubejs/server_scripts/tfg/primitive/tags.primitive.js b/kubejs/server_scripts/tfg/primitive/tags.primitive.js index 092078b9c..54f10a270 100644 --- a/kubejs/server_scripts/tfg/primitive/tags.primitive.js +++ b/kubejs/server_scripts/tfg/primitive/tags.primitive.js @@ -72,6 +72,20 @@ function registerTFGPrimitiveItemTags(event) { event.add('forge:string', 'tfg:phantom_thread') event.add('forge:string', 'tfg:polycaprolactam_string') event.add('forge:string', 'firmalife:pineapple_yarn') + + // Artisan Table + event.add('tfg:artisan_table_inputs', 'gtceu:empty_mold') + event.add('tfg:artisan_table_inputs', 'gtceu:resin_circuit_board') + event.add('tfg:artisan_table_inputs', 'gtceu:copper_single_wire') + event.add('tfg:artisan_table_inputs', 'gtceu:copper_quadruple_wire') + event.add('tfg:artisan_table_inputs', 'gtceu:phenolic_circuit_board') + event.add('tfg:artisan_table_inputs', 'gtceu:silver_single_wire') + event.add('tfg:artisan_table_inputs', 'gtceu:silver_quadruple_wire') + event.add('tfg:artisan_table_tools', '#forge:tools/hammers') + event.add('tfg:artisan_table_tools', '#forge:tools/mallets') + event.add('tfg:artisan_table_tools', '#forge:tools/files') + event.add('tfg:artisan_table_tools', '#forge:tools/wire_cutters') + event.add('tfg:artisan_table_tools', '#forge:tools/screwdrivers') } function registerTFGPrimitiveBlockTags(event) { @@ -90,8 +104,7 @@ function registerTFGPrimitiveBlockTags(event) { function registerTFGPrimitiveFluidTags(event) { forEachMaterial(material => { let tfcProperty = material.getProperty(TFGPropertyKey.TFC_PROPERTY) - if (tfcProperty === null || !material.hasFlag(TFGMaterialFlags.CAN_BE_UNMOLDED)) - return; + if (tfcProperty === null || !material.hasFlag(TFGMaterialFlags.CAN_BE_UNMOLDED)) return; if (!ChemicalHelper.get(TagPrefix.gearSmall, material, 1).isEmpty()) { event.add('tfg:usable_in_small_gear_mold', material.getFluid().getFluidType().toString()) diff --git a/kubejs/server_scripts/tfg/recipes.js b/kubejs/server_scripts/tfg/recipes.js index 925a225b1..25f4720d9 100644 --- a/kubejs/server_scripts/tfg/recipes.js +++ b/kubejs/server_scripts/tfg/recipes.js @@ -49,12 +49,15 @@ const registerTFGRecipes = (event) => { registerTFGClayRecipes(event) registerTFGEquipmentRecipes(event) registerTFGDyeRecipes(event) + registerTFGArtisanTableRecipes(event) registerTFGCasingRecipes(event) registerTFGEnderPearlRecipes(event) registerTFGMultiblockRecipes(event) registerTFGSteamBloomeryRecipes(event) registerTFGElectronicComponentsRecipes(event) + registerTFGBakeliteRecipes(event) + registerTFGCoilRecipes(event) registerTFGEarlyGasRecipes(event) registerTFGBoilerRecipes(event) @@ -64,6 +67,7 @@ const registerTFGRecipes = (event) => { registerTFGNuclearComponentsRecipes(event) registerTFGSolarRecipes(event) registerTFGCoalRecipes(event) + registerTFGPowerGenBalance(event) registerTFGZirconiumRecipes(event) registerTFGBromineRecipes(event) diff --git a/kubejs/server_scripts/tfg/recipes.miscellaneous.js b/kubejs/server_scripts/tfg/recipes.miscellaneous.js index 5392b40ab..ad5bc65a4 100644 --- a/kubejs/server_scripts/tfg/recipes.miscellaneous.js +++ b/kubejs/server_scripts/tfg/recipes.miscellaneous.js @@ -177,4 +177,5 @@ function registerTFGMiscellaneousRecipes(event) { .duration(5*20) .EUt(GTValues.VA[GTValues.LV]) .addMaterialInfo(true); + } diff --git a/kubejs/server_scripts/tfg/recipes.temporary.js b/kubejs/server_scripts/tfg/recipes.temporary.js index 2365c1fca..68d907bd4 100644 --- a/kubejs/server_scripts/tfg/recipes.temporary.js +++ b/kubejs/server_scripts/tfg/recipes.temporary.js @@ -29,6 +29,15 @@ function registerTFGTemporaryRecipes(event) { event.shapeless('greate:rose_quartz_lens', 'gtceu:rose_quartz_lens') event.shapeless('greate:rose_quartz_plate', 'gtceu:rose_quartz_plate') + event.shapeless('tfg:igneous_felsic_dust', 'gtceu:granite_dust') + event.shapeless('tfg:igneous_intermediate_dust', 'gtceu:diorite_dust') + event.shapeless('tfg:igneous_intermediate_dust', 'gtceu:andesite_dust') + event.shapeless('tfg:metamorphic_dust', 'gtceu:marble_dust') + event.shapeless('tfg:metamorphic_dust', 'gtceu:deepslate_dust') + event.shapeless('tfg:igneous_ultramafic_dust', 'gtceu:blackstone_dust') + event.shapeless('tfg:igneous_felsic_dust', 'gtceu:granite_red_dust') + event.shapeless('tfg:igneous_mafic_dust', 'gtceu:basalt_dust') + // TODO: remove nether/ender air in 0.12 diff --git a/kubejs/server_scripts/tfg/space_general/recipes.insulation.js b/kubejs/server_scripts/tfg/space_general/recipes.insulation.js index 25fc6579b..1f87c3304 100644 --- a/kubejs/server_scripts/tfg/space_general/recipes.insulation.js +++ b/kubejs/server_scripts/tfg/space_general/recipes.insulation.js @@ -221,12 +221,14 @@ function registerTFGInsulationRecipes(event) { .inputFluids(Fluid.of('tfg:tmos', 1000), Fluid.of('gtceu:distilled_water', 2000)) .outputFluids(Fluid.of('gtceu:methanol', 4000)) .itemOutputs('3x #forge:dusts/silicon_dioxide') + .circuit(1) .duration(100) .EUt(GTValues.VA[GTValues.MV]) event.recipes.gtceu.large_chemical_reactor('tfg:silica_gel_synthesis') .inputFluids(Fluid.of('tfg:tmos', 1000), Fluid.of('gtceu:ethanol', 2000), Fluid.of('gtceu:distilled_water', 500), Fluid.of('gtceu:hydrochloric_acid', 100)) .outputFluids(Fluid.of('tfg:silica_gel', 1000)) + .circuit(2) .duration(300) .EUt(GTValues.VA[GTValues.IV]) event.recipes.gtceu.chemical_reactor('tfg:silica_gel_soaking') diff --git a/kubejs/server_scripts/tfg/space_general/recipes.rockets.js b/kubejs/server_scripts/tfg/space_general/recipes.rockets.js index 161eb46af..25a92c9c1 100644 --- a/kubejs/server_scripts/tfg/space_general/recipes.rockets.js +++ b/kubejs/server_scripts/tfg/space_general/recipes.rockets.js @@ -88,6 +88,22 @@ function registerTFGRocketRecipes(event) { .circuit(2) .EUt(GTValues.VA[GTValues.HV]) .addMaterialInfo(true, true) + + event.recipes.gtceu.assembler('ad_astra:assembler_tier_1_double_rocket') + .itemInputs( + ChemicalHelper.get(TagPrefix.plateDense, TFGHelpers.getMaterial('rocket_alloy_t1'), 12), + '4x ad_astra:rocket_fin', + '1x ad_astra:steel_engine', + '1x ad_astra:rocket_nose_cone', + '24x #forge:insulation_t1', + '6x #gtceu:circuits/hv' + ) + .inputFluids(Fluid.of('gtceu:silicon', 144 * 24)) + .itemOutputs('tfg:tier_1_double_rocket') + .duration(1800) + .circuit(3) + .EUt(GTValues.VA[GTValues.HV]) + .addMaterialInfo(true, true) //#endregion @@ -185,6 +201,22 @@ function registerTFGRocketRecipes(event) { .circuit(3) .EUt(GTValues.VA[GTValues.EV]) .addMaterialInfo(true, true) + + event.recipes.gtceu.assembler('ad_astra:tier_2_double_rocket') + .itemInputs( + ChemicalHelper.get(TagPrefix.plateDense, TFGHelpers.getMaterial('rocket_alloy_t2'), 18), + '4x tfg:rocket_fin_t2', + '1x ad_astra:desh_engine', + '1x tfg:rocket_cone_t2', + '18x #forge:insulation_t2/roll', + '6x #gtceu:circuits/ev' + ) + .inputFluids(Fluid.of('gtceu:titanium', 144 * 24)) + .itemOutputs('tfg:tier_2_double_rocket') + .duration(2166) + .circuit(4) + .EUt(GTValues.VA[GTValues.EV]) + .addMaterialInfo(true, true) //#endregion @@ -278,6 +310,22 @@ function registerTFGRocketRecipes(event) { .EUt(GTValues.VA[GTValues.IV]) .addMaterialInfo(true, true) + event.recipes.gtceu.assembler('ad_astra:tier_3_double_rocket') + .itemInputs( + '24x #forge:dense_plates/rocket_alloy_t3', + '4x tfg:rocket_fin_t3', + '1x ad_astra:ostrum_engine', + '2x ad_astra:ostrum_tank', + '1x tfg:rocket_cone_t3', + '12x #forge:insulation_t3/sheet' + ) + .inputFluids(Fluid.of('gtceu:bromine', 1000 * 24)) + .itemOutputs('tfg:tier_3_double_rocket') + .duration(2550) + .circuit(5) + .EUt(GTValues.VA[GTValues.IV]) + .addMaterialInfo(true, true) + //#endregion */ } \ No newline at end of file diff --git a/kubejs/server_scripts/tfg/space_general/tags.railgun.js b/kubejs/server_scripts/tfg/space_general/tags.railgun.js index e9d9a973b..89cb59a4b 100644 --- a/kubejs/server_scripts/tfg/space_general/tags.railgun.js +++ b/kubejs/server_scripts/tfg/space_general/tags.railgun.js @@ -105,5 +105,5 @@ function registerTFGRailgunItemTags(event) { event.add('tfg:cannot_launch_in_railgun', 'gtceu:zpm_quantum_tank') event.add('tfg:cannot_launch_in_railgun', 'gtceu:uv_quantum_tank') event.add('tfg:cannot_launch_in_railgun', 'gtceu:uhv_quantum_tank') - + event.add('tfg:cannot_launch_in_railgun', 'toolbelt:belt') } \ No newline at end of file diff --git a/kubejs/server_scripts/tfg/tags.js b/kubejs/server_scripts/tfg/tags.js index 119a5b49b..888189a0b 100644 --- a/kubejs/server_scripts/tfg/tags.js +++ b/kubejs/server_scripts/tfg/tags.js @@ -19,7 +19,7 @@ const registerTFGItemTags = (event) => { registerTFGAquaponicsItemTags(event) // TEMPORARY, REMOVE WHEN GURMAN FIXES THIS - event.remove('tfc:foods', 'tfc_gurman:havai_pizza') + event.remove('tfc:foods', 'tfc_gourmet:havai_pizza') //Circuit Stuff event.add('tfg:components/uv_leds', 'tfg:uv_led') @@ -46,6 +46,7 @@ const registerTFGItemTags = (event) => { event.add('tfg:empty_dna_syringes', 'tfg:clean_dna_syringe') event.add('tfc:sewing_needles', 'tfg:stainless_steel_needle') + //#endregion // Airplane Upgrades diff --git a/kubejs/server_scripts/tfg/venus/tags.venus.js b/kubejs/server_scripts/tfg/venus/tags.venus.js index 7b480c219..15dd2188b 100644 --- a/kubejs/server_scripts/tfg/venus/tags.venus.js +++ b/kubejs/server_scripts/tfg/venus/tags.venus.js @@ -61,6 +61,12 @@ function registerTFGVenusBlockTags(event) { event.add('ad_astra:venus_stone_replaceables', 'tfc:rock/raw/quartzite') event.add('ad_astra:venus_stone_replaceables', 'tfc:rock/hardened/quartzite') event.add('ad_astra:venus_stone_replaceables', 'tfc:rock/gravel/quartzite') + event.add('ad_astra:venus_stone_replaceables', 'betterend:flavolite') + event.add('ad_astra:venus_stone_replaceables', 'tfg:rock/hardened_flavolite') + event.add('ad_astra:venus_stone_replaceables', 'tfg:rock/gravel_flavolite') + event.add('ad_astra:venus_stone_replaceables', 'betterend:sandy_jadestone') + event.add('ad_astra:venus_stone_replaceables', 'tfg:rock/hardened_sandy_jadestone') + event.add('ad_astra:venus_stone_replaceables', 'tfg:rock/gravel_sandy_jadestone') event.add('ad_astra:venus_stone_replaceables', 'tfg:sand/fluorapatite/blue') event.add('ad_astra:venus_stone_replaceables', 'tfg:sandstone/raw/fluorapatite/blue') event.add('ad_astra:venus_stone_replaceables', 'tfg:sand/fluorapatite/green') @@ -79,6 +85,7 @@ function registerTFGVenusBlockTags(event) { event.add('ad_astra:venus_stone_replaceables', 'tfc:raw_sandstone/black') event.add('ad_astra:venus_stone_replaceables', 'create:scoria') event.add('ad_astra:venus_stone_replaceables', 'create:scorchia') + event.add('ad_astra:venus_stone_replaceables', 'ad_astra:conglomerate') event.add('ad_astra:venus_stone_replaceables', 'minecraft:tuff') event.add('ad_astra:venus_stone_replaceables', 'minecraft:basalt') event.add('ad_astra:venus_stone_replaceables', 'minecraft:smooth_basalt') @@ -91,16 +98,22 @@ function registerTFGVenusBlockTags(event) { event.add('ad_astra:venus_stone_replaceables', 'betterend:lucernia_bark') event.add('tfc:can_carve', '#ad_astra:venus_stone_replaceables') + event.add('minecraft:animals_spawnable_on', '#ad_astra:venus_stone_replaceables') - event.add("tfc:monster_spawns_on", "create:scorchia"); - event.add("tfc:monster_spawns_on", "minecraft:basalt"); - event.add("tfc:monster_spawns_on", "minecraft:smooth_basalt"); + event.add("tfc:monster_spawns_on", "create:scorchia"); + event.add("tfc:monster_spawns_on", "create:scoria"); + event.add("tfc:monster_spawns_on", "minecraft:basalt"); + event.add("tfc:monster_spawns_on", "minecraft:smooth_basalt"); event.add("minecraft:strider_warm_blocks", "create:scorchia"); + event.add("minecraft:strider_warm_blocks", "tfg:rock/hardened_scorchia"); event.add("minecraft:strider_warm_blocks", "minecraft:basalt"); event.add("minecraft:strider_warm_blocks", "minecraft:smooth_basalt"); event.add("minecraft:strider_warm_blocks", 'tfc:rock/raw/basalt'); event.add("minecraft:strider_warm_blocks", 'tfc:rock/magma/basalt'); + event.add("minecraft:strider_warm_blocks", 'tfc:rock/hardened/basalt'); + event.add("minecraft:strider_warm_blocks", 'beneath:crackrack'); + event.add("minecraft:strider_warm_blocks", '#minecraft:infiniburn_nether'); event.add('tfc:can_landslide', 'tfg:sand/fluorapatite/blue') event.add('tfc:can_landslide', 'tfg:sand/fluorapatite/green') diff --git a/kubejs/server_scripts/tfg/worldgen/data.fauna.js b/kubejs/server_scripts/tfg/worldgen/data.fauna.js index 6a54f27b4..5621dd1f6 100644 --- a/kubejs/server_scripts/tfg/worldgen/data.fauna.js +++ b/kubejs/server_scripts/tfg/worldgen/data.fauna.js @@ -19,6 +19,7 @@ function registerTFGFauna(event) { climate => { climate.minTemp(-102) climate.maxTemp(-30) + climate.maxForest('normal') climate.fuzzy(true) }, faunaData => { @@ -49,6 +50,7 @@ function registerTFGFauna(event) { event.fauna( climate => { climate.minTemp(-109) + climate.maxForest('normal') climate.fuzzy(true) }, faunaData => { @@ -59,6 +61,7 @@ function registerTFGFauna(event) { event.fauna( climate => { climate.minTemp(-97) + climate.maxForest('edge') climate.fuzzy(true) }, faunaData => { @@ -69,6 +72,7 @@ function registerTFGFauna(event) { event.fauna( climate => { climate.minTemp(-109) + climate.maxForest('normal') climate.fuzzy(true) }, faunaData => { @@ -86,9 +90,32 @@ function registerTFGFauna(event) { }, "wan_ancient_beasts:crusher") + event.fauna( + climate => { + climate.minTemp(-109) + climate.maxForest('normal') + climate.fuzzy(true) + }, + faunaData => { + faunaData.solidGround(true) + }, + "wan_ancient_beasts:raider") + + event.fauna( + climate => { + climate.minTemp(-107) + climate.maxForest('normal') + climate.fuzzy(true) + }, + faunaData => { + faunaData.solidGround(true) + }, + "wan_ancient_beasts:charger") + event.fauna( climate => { climate.minTemp(-105) + climate.minForest('edge') climate.fuzzy(true) }, faunaData => { @@ -99,10 +126,22 @@ function registerTFGFauna(event) { event.fauna( climate => { climate.minTemp(-106) + climate.minForest('edge') climate.fuzzy(true) }, faunaData => { faunaData.solidGround(true) }, "wan_ancient_beasts:glider") + + event.fauna( + climate => { + climate.minTemp(-105) + climate.minForest('edge') + climate.fuzzy(true) + }, + faunaData => { + faunaData.solidGround(true) + }, + "wan_ancient_beasts:snatcher") } diff --git a/kubejs/server_scripts/tfg/worldgen/events.chunks.js b/kubejs/server_scripts/tfg/worldgen/events.chunks.js index 1caa80b20..edf85128b 100644 --- a/kubejs/server_scripts/tfg/worldgen/events.chunks.js +++ b/kubejs/server_scripts/tfg/worldgen/events.chunks.js @@ -58,10 +58,13 @@ let forestWeirdnessNoise = TFC.misc.newOpenSimplex2D(3210378120) .map(i => 1.1 * Math.abs(i)) .clamped(0, 1) +let cellularNoise = TFC.misc.cellular3D(678965856); + //TFC.misc.register2DNoiseForInspection('temp', tempLayer) //TFC.misc.register2DNoiseForInspection('rain', rainLayer) //TFC.misc.register2DNoiseForInspection('forestType', forestDensityNoise) //TFC.misc.register2DNoiseForInspection('forestWeirdness', forestWeirdnessNoise) +TFC.misc.register3DNoiseForInspection('cellular', cellularNoise); // Forest layer let forestLayerNoise = TFC.misc.newOpenSimplex2D(3210378120) @@ -126,41 +129,17 @@ TFCEvents.createChunkDataProvider('mars', event => { }); event.rocks((x, y, z, surfaceY, cache, rockSettings) => { - return rockSettings.sampleAtLayer(rockLayer.getAt(x, z), (surfaceY - y) / ROCK_LAYER_HEIGHT); + let skew = y / 8; + return rockSettings.sampleAtLayer(rockLayer.getAt(x + skew, z + skew), (surfaceY - y) / ROCK_LAYER_HEIGHT); }); }) TFCEvents.createChunkDataProvider('venus', event => { + const emptyLayer = TFC.misc.lerpFloatLayer(0, 0, 0, 0); + event.partial((data, chunk) => { - let x = chunk.pos.minBlockX; - let z = chunk.pos.minBlockZ; - - const avgTemp1 = calcAverage(z, global.VENUS_PLANET_SIZE, 0, 100) - const avgTemp2 = calcAverage(z + 15, global.VENUS_PLANET_SIZE, 0, 100) - const avgRain1 = calcAverage(x, global.VENUS_PLANET_SIZE, 0, 100) - const avgRain2 = calcAverage(x + 15, global.VENUS_PLANET_SIZE, 0, 100) - - let rain = TFC.misc.lerpFloatLayer( - avgRain1 + rainLayer.noise(x, z), - avgRain1 + rainLayer.noise(x, z + 15), - avgRain2 + rainLayer.noise(x + 15, z), - avgRain2 + rainLayer.noise(x + 15, z + 15) - ); - let temp = TFC.misc.lerpFloatLayer( - avgTemp1 + tempLayer.noise(x, z), - avgTemp1 + tempLayer.noise(x, z + 15), - avgTemp2 + tempLayer.noise(x + 15, z), - avgTemp2 + tempLayer.noise(x + 15, z + 15) - ); - - data.generatePartial( - rain, - temp, - floatToForestType(forestLayerNoise.noise(x, z)), - forestWeirdnessNoise.noise(x, z), // forest weirdness - forestDensityNoise.noise(x, z) // forest density - ); - }); + data.generatePartial(emptyLayer, emptyLayer, 0, 0, 0) + }) event.full((data, chunk) => { let heights = []; @@ -173,7 +152,8 @@ TFCEvents.createChunkDataProvider('venus', event => { }); event.rocks((x, y, z, surfaceY, cache, rockSettings) => { - return rockSettings.sampleAtLayer(rockLayer.getAt(x, z), (surfaceY - y) / ROCK_LAYER_HEIGHT); + let skew = y / 6; + return rockSettings.sampleAtLayer(rockLayer.getAt(x + skew, z + skew), (surfaceY - y) / ROCK_LAYER_HEIGHT); }); }) @@ -220,7 +200,8 @@ TFCEvents.createChunkDataProvider('glacio', event => { }); event.rocks((x, y, z, surfaceY, cache, rockSettings) => { - return rockSettings.sampleAtLayer(rockLayer.getAt(x, z), (surfaceY - y) / ROCK_LAYER_HEIGHT); + let skew = y / 8; + return rockSettings.sampleAtLayer(rockLayer.getAt(x + skew, z + skew), (surfaceY - y) / ROCK_LAYER_HEIGHT); }); }) diff --git a/kubejs/server_scripts/tfg/worldgen/events.entities.js b/kubejs/server_scripts/tfg/worldgen/events.entities.js index 8534d677a..7352f1b33 100644 --- a/kubejs/server_scripts/tfg/worldgen/events.entities.js +++ b/kubejs/server_scripts/tfg/worldgen/events.entities.js @@ -10,6 +10,9 @@ const NEW_MOB_MAX_HP = { "endermanoverhaul:end_islands_enderman": 120, "endermanoverhaul:windswept_hills_enderman": 70, "endermanoverhaul:soulsand_valley_enderman": 80, + "minecraft:stray": 40, + "species:limpet": 20, + "species:birt": 20, // mars mobs -- wan's ancient beasts has its own config for this (also includes sniffer) "endermanoverhaul:crimson_enderman": 60, diff --git a/kubejs/server_scripts/tfg/worldgen/tags.overworld.js b/kubejs/server_scripts/tfg/worldgen/tags.overworld.js index 4bebe7ca2..b9e6ca6ce 100644 --- a/kubejs/server_scripts/tfg/worldgen/tags.overworld.js +++ b/kubejs/server_scripts/tfg/worldgen/tags.overworld.js @@ -77,6 +77,7 @@ function registerTFGOverworldPlacedFeatures(event) { // Tarkianite event.add('tfc:in_biome/veins', 'tfg:earth/vein/normal_tarkianite') + event.add('tfc:in_biome/veins', 'tfg:earth/vein/desert_oilsands') // Add back the non-ore ones event.add("tfc:in_biome/veins", "tfc:vein/gravel"); @@ -103,4 +104,5 @@ function registerTFGOverworldPlacedFeatures(event) { event.add("tfc:in_biome/underground_decoration", "tfg:glow_lichen"); event.add("tfc:in_biome/underground_decoration", "tfg:earth/sulfur_patch"); event.add("tfc:in_biome/underground_decoration", "tfg:earth/oil_spout"); + event.add("tfc:in_biome/underground_decoration", "tfg:earth/volcano_spout"); } \ No newline at end of file diff --git a/kubejs/server_scripts/vintage_improvements/recipes.js b/kubejs/server_scripts/vintage_improvements/recipes.js index be452a79f..4e125b161 100644 --- a/kubejs/server_scripts/vintage_improvements/recipes.js +++ b/kubejs/server_scripts/vintage_improvements/recipes.js @@ -16,7 +16,7 @@ function registerVintageImprovementsRecipes(event) { B: 'greate:steel_cogwheel', C: '#forge:rods/steel', D: '#forge:double_ingots/black_steel', - E: '#forge:small_gears/steel', + E: '#forge:small_gears/blue_steel', F: '#gtceu:circuits/ulv' }).addMaterialInfo().id('tfg:vi/shaped/spring_coiling_machine') @@ -27,8 +27,8 @@ function registerVintageImprovementsRecipes(event) { ], { A: 'gtceu:ulv_machine_casing', B: 'greate:steel_mechanical_pump', - C: 'create:mechanical_piston', - D: '#forge:springs/wrought_iron', + C: 'minecraft:piston', + D: '#forge:springs/blue_steel', E: 'create:electron_tube', F: '#forge:plates/black_steel', G: 'create:precision_mechanism' diff --git a/kubejs/server_scripts/wan_ancient_beasts/data.js b/kubejs/server_scripts/wan_ancient_beasts/data.js new file mode 100644 index 000000000..209bea8fb --- /dev/null +++ b/kubejs/server_scripts/wan_ancient_beasts/data.js @@ -0,0 +1,35 @@ +// priority: 0 +"use strict"; + +const registerWABData = (event) => { + + event.foodItem('wan_ancient_beasts:toxlacanth', food => { + food.hunger(2) + food.protein(1.5) + food.decayModifier(3) + }) + + event.foodItem('wan_ancient_beasts:cooked_toxlacanth', food => { + food.hunger(4) + food.saturation(2) + food.protein(2.5) + food.decayModifier(2.25) + }) + + // Eater meat + event.foodItem('wan_ancient_beasts:raw_ancient_meat', food => { + food.hunger(2) + food.protein(2) + food.decayModifier(3) + }) + + event.foodItem('wan_ancient_beasts:cooked_ancient_meat', food => { + food.hunger(4) + food.saturation(3) + food.protein(5) + food.decayModifier(2.25) + }) + + + event.itemSize('wan_ancient_beasts:reinforced_shield', 'very_large', 'very_heavy') +} \ No newline at end of file diff --git a/kubejs/server_scripts/wan_ancient_beasts/recipes.js b/kubejs/server_scripts/wan_ancient_beasts/recipes.js index 9f083ead7..c6b2fbbb6 100644 --- a/kubejs/server_scripts/wan_ancient_beasts/recipes.js +++ b/kubejs/server_scripts/wan_ancient_beasts/recipes.js @@ -1,4 +1,3 @@ - // priority: 0 "use strict"; @@ -48,37 +47,35 @@ const registerWABRecipes = (event) => { C: '#tfc:shields', D: '#forge:plates/titanium' }).id('tfg:shaped/reinforced_shield_from_shield') + + event.shapeless('wan_ancient_beasts:fearsome_horn', [ + 'wan_ancient_beasts:raider_horn', + 'wan_ancient_beasts:eater_tooth', + 'wan_ancient_beasts:crusher_spike', + 'endermanoverhaul:enderman_tooth' + ]).id('tfg:shapeless/fearsome_horn') + + event.shaped('wan_ancient_beasts:white_charger_armor', [ + 'ABA', + 'CCC' + ], { + A: 'firmaciv:rope_coil', + B: 'minecraft:leather_horse_armor', + C: '#forge:double_plates/steel' + }).id('tfg:shaped/white_charger_armor') + + global.MINECRAFT_DYE_NAMES.forEach(dye => { + event.recipes.tfc.barrel_sealed(1000) + .inputs('#wan_ancient_beasts:charger_armors', Fluid.of(`tfc:${dye}_dye`, 288)) + .outputItem(`wan_ancient_beasts:${dye}_charger_armor`) + .id(`tfg:barrel/dyeing/charger_armor_${dye}`) + + event.recipes.gtceu.chemical_bath(`tfg:wan_ancient_beasts/${dye}_charger_armor`) + .itemInputs('#wan_ancient_beasts:charger_armors') + .inputFluids(Fluid.of(`tfc:${dye}_dye`, 288)) + .itemOutputs(`wan_ancient_beasts:${dye}_charger_armor`) + .duration(200) + .EUt(4) + .category(GTRecipeCategories.CHEM_DYES) + }) } - -const registerWABData = (event) => { - - event.foodItem('wan_ancient_beasts:toxlacanth', food => { - food.hunger(2) - food.protein(1.5) - food.decayModifier(3) - }) - - event.foodItem('wan_ancient_beasts:cooked_toxlacanth', food => { - food.hunger(4) - food.saturation(2) - food.protein(2.5) - food.decayModifier(2.25) - }) - - // Eater meat - event.foodItem('wan_ancient_beasts:raw_ancient_meat', food => { - food.hunger(2) - food.protein(2) - food.decayModifier(3) - }) - - event.foodItem('wan_ancient_beasts:cooked_ancient_meat', food => { - food.hunger(4) - food.saturation(3) - food.protein(5) - food.decayModifier(2.25) - }) - - - event.itemSize('wan_ancient_beasts:reinforced_shield', 'very_large', 'very_heavy') -} \ No newline at end of file diff --git a/kubejs/server_scripts/wan_ancient_beasts/tags.js b/kubejs/server_scripts/wan_ancient_beasts/tags.js index 1a7c110d4..bf36190a3 100644 --- a/kubejs/server_scripts/wan_ancient_beasts/tags.js +++ b/kubejs/server_scripts/wan_ancient_beasts/tags.js @@ -22,7 +22,7 @@ const registerWABItemTags = (event) => { event.removeAll('wan_ancient_beasts:paleontologist_common') event.removeAll('wan_ancient_beasts:paleontologist_rare') event.removeAll('wan_ancient_beasts:paleontologist_items') - event.removeAll('wan_ancient_beasts:eater_food') + event.removeAll('wan_ancient_beasts:meat_food') event.add('tfc:foods/raw_meats', 'wan_ancient_beasts:toxlacanth') event.add('firmalife:foods/raw_fish', 'wan_ancient_beasts:toxlacanth') @@ -38,8 +38,7 @@ const registerWABItemTags = (event) => { event.add('tfc:foods/cooked_meats', 'wan_ancient_beasts:cooked_ancient_meat') event.add('tfc:foods/meats', 'wan_ancient_beasts:cooked_ancient_meat') - event.add('wan_ancient_beasts:surfer_food', '#firmalife:foods/raw_fish') - event.add('wan_ancient_beasts:eater_food', '#tfg:martian_animal_foods') + event.add('wan_antcient_beasts:meat_food', '#tfc:foods/raw_meats') // Eggs event.add('tfg:martian_eggs', 'wan_ancient_beasts:eater_egg') @@ -48,6 +47,9 @@ const registerWABItemTags = (event) => { event.add('tfg:martian_eggs', 'wan_ancient_beasts:glider_egg') event.add('tfg:martian_eggs', 'wan_ancient_beasts:soarer_egg') event.add('tfg:martian_eggs', 'wan_ancient_beasts:surfer_egg') + event.add('tfg:martian_eggs', 'wan_ancient_beasts:snatcher_egg') + event.add('tfg:martian_eggs', 'wan_ancient_beasts:raider_egg') + event.add('tfg:martian_eggs', 'wan_ancient_beasts:charger_egg') } const registerWABEntityTypeTags = (event) => { @@ -58,6 +60,11 @@ const registerWABEntityTypeTags = (event) => { event.add('wan_ancient_beasts:eater_ignore', 'species:springling') event.add('wan_ancient_beasts:eater_ignore', 'species:quake') + event.add('wan_ancient_beasts:raider_ignore', 'tfg:sniffer') + event.add('wan_ancient_beasts:raider_ignore', 'tfg:wraptor') + event.add('wan_ancient_beasts:raider_ignore', 'species:springling') + event.add('wan_ancient_beasts:raider_ignore', 'species:quake') + } const registerWansAncientBeastsBiomeTags = (event) => { @@ -66,6 +73,7 @@ const registerWansAncientBeastsBiomeTags = (event) => { event.removeAll('wan_ancient_beasts:has_structure/ancient_nest'); event.removeAll('wan_ancient_beasts:has_structure/dead_coral'); event.removeAll('wan_ancient_beasts:has_structure/desert_ruins'); + event.removeAll('wan_ancient_beasts:has_structure/desert_ruins_small'); event.removeAll('wan_ancient_beasts:has_structure/digsite_badlands'); event.removeAll('wan_ancient_beasts:has_structure/digsite_desert'); event.removeAll('wan_ancient_beasts:has_structure/digsite_icespikes'); @@ -77,4 +85,7 @@ const registerWansAncientBeastsBiomeTags = (event) => { event.removeAll('wan_ancient_beasts:has_structure/digsite_taiga'); event.removeAll('wan_ancient_beasts:has_structure/ice_spike_castle'); event.removeAll('wan_ancient_beasts:has_structure/mesa_temple'); + event.removeAll('wan_ancient_beasts:has_structure/primal_log'); + event.removeAll('wan_ancient_beasts:has_structure/ruined_castle'); + event.removeAll('wan_ancient_beasts:has_structure/training_outpost'); } \ No newline at end of file diff --git a/kubejs/startup_scripts/create_connected/constants.js b/kubejs/startup_scripts/create_connected/constants.js index 8a4b737d7..821512bfc 100644 --- a/kubejs/startup_scripts/create_connected/constants.js +++ b/kubejs/startup_scripts/create_connected/constants.js @@ -17,7 +17,6 @@ global.CREATE_CONNECTED_DISABLED_ITEMS = [ 'create_connected:cross_connector', 'create_connected:andesite_encased_cross_connector', 'create_connected:brass_encased_cross_connector', - 'create_connected:kinetic_bridge', 'create_connected:kinetic_battery', 'create_connected:charged_kinetic_battery' ] \ No newline at end of file diff --git a/kubejs/startup_scripts/firmalife/constants.js b/kubejs/startup_scripts/firmalife/constants.js index f6ae1a013..6708cf1c2 100644 --- a/kubejs/startup_scripts/firmalife/constants.js +++ b/kubejs/startup_scripts/firmalife/constants.js @@ -107,8 +107,8 @@ global.FIRMALIFE_JAMS = [ ] global.FIRMALIFE_GREENHOUSE_FRUIT_RECIPE_COMPONENTS = [ - { input: 'firmalife:plant/cocoa_sapling', output: 'firmalife:food/cocoa_beans'}, - { input: 'firmalife:plant/fig_sapling', output: 'firmalife:food/fig'}, + { input: 'firmalife:plant/cocoa_sapling', output: 'firmalife:food/cocoa_beans', leaves: 'firmalife:plant/cocoa_leaves' }, + { input: 'firmalife:plant/fig_sapling', output: 'firmalife:food/fig', leaves: 'firmalife:plant/fig_leaves' }, { input: 'firmalife:plant/pineapple_bush', output: 'firmalife:food/pineapple'}, { input: 'firmalife:plant/nightshade_bush', output: 'firmalife:food/nightshade_berry'}, { input: 'firmalife:seeds/red_grape', output: 'firmalife:food/red_grapes'}, diff --git a/kubejs/startup_scripts/gtceu/constants.js b/kubejs/startup_scripts/gtceu/constants.js index 2be0de5fd..8084f8658 100644 --- a/kubejs/startup_scripts/gtceu/constants.js +++ b/kubejs/startup_scripts/gtceu/constants.js @@ -170,6 +170,17 @@ global.GTCEU_DISABLED_ITEMS = /** @type {const} */ ([ "gtceu:molten_black_bronze_bucket", "gtceu:molten_bismuth_bronze_bucket", + "gtceu:molten_rose_gold_bucket", + "gtceu:molten_sterling_silver_bucket", + "gtceu:molten_stainless_steel_bucket", + "gtceu:molten_manganese_phosphide_bucket", + "gtceu:molten_vanadium_steel_bucket", + "gtceu:molten_gallium_arsenide_bucket", + "gtceu:molten_hsla_steel_bucket", + "gtceu:molten_rocket_alloy_t2_bucket", + "gtceu:molten_desh_bucket", + "tfg:molten_weak_blue_steel_bucket", + "tfg:molten_weak_red_steel_bucket", //armor "gtceu:bronze_helmet", @@ -415,7 +426,10 @@ global.ORE_BEARING_STONES = /** @type {const} */ ([ "mars_stone", "venus_stone", "mercury_stone", - "glacio_stone" + "glacio_stone", + "red_granite", + "flavolite", + "sandy_jadestone" ]); //#endregion @@ -441,7 +455,10 @@ global.ADD_CIRCUIT = /** @type {const} */ ([ { recipeId: "gtceu:large_chemical_reactor/butraldehyde", circuitNumber: 5 }, { recipeId: "gtceu:chemical_reactor/saltpeter", circuitNumber: 2 }, - { recipeId: "gtceu:large_chemical_reactor/saltpeter", circuitNumber: 2 } + { recipeId: "gtceu:large_chemical_reactor/saltpeter", circuitNumber: 2 }, + + { recipeId: "gtceu:chemical_reactor/biphenyl_from_toluene", circuitNumber: 2 }, + { recipeId: "gtceu:large_chemical_reactor/biphenyl_from_toluene", circuitNumber: 2 }, ]); //#endregion diff --git a/kubejs/startup_scripts/gtceu/machines.js b/kubejs/startup_scripts/gtceu/machines.js index 20241104f..dfd7a176b 100644 --- a/kubejs/startup_scripts/gtceu/machines.js +++ b/kubejs/startup_scripts/gtceu/machines.js @@ -207,6 +207,7 @@ const registerGTCEuMachines = (event) => { .or(Predicates.abilities(PartAbility.EXPORT_ITEMS).setPreviewCount(1)) .or(Predicates.abilities(PartAbility.MAINTENANCE).setExactLimit(1)) .or(Predicates.abilities(PartAbility.IMPORT_FLUIDS).setPreviewCount(1)) + .or(Predicates.abilities(PartAbility.EXPORT_FLUIDS).setPreviewCount(1)) .or(Predicates.abilities(PartAbility.INPUT_ENERGY).setExactLimit(1)) .or(Predicates.abilities(PartAbility.PARALLEL_HATCH).setMaxGlobalLimited(1))) .where('#', Predicates.air()) @@ -380,7 +381,7 @@ const registerGTCEuMachines = (event) => { .or(Predicates.abilities(PartAbility.IMPORT_ITEMS).setPreviewCount(1))) .where('C', Predicates.blocks('gtceu:solid_machine_casing') .or(Predicates.abilities(PartAbility.EXPORT_FLUIDS).setPreviewCount(2)) - .or(Predicates.abilities(PartAbility.INPUT_ENERGY).setExactLimit(1).setPreviewCount(1)) + .or(Predicates.abilities(PartAbility.INPUT_ENERGY).setMinGlobalLimited(1).setMaxGlobalLimited(2).setPreviewCount(2)) .or(Predicates.abilities(PartAbility.MAINTENANCE).setExactLimit(1).setPreviewCount(1))) .where('D', Predicates.blocks('create:metal_girder')) .where('E', Predicates.blocks('gtceu:steam_machine_casing')) diff --git a/kubejs/startup_scripts/gtceu/material_modification.js b/kubejs/startup_scripts/gtceu/material_modification.js index fbcf005a3..c6b02e729 100644 --- a/kubejs/startup_scripts/gtceu/material_modification.js +++ b/kubejs/startup_scripts/gtceu/material_modification.js @@ -106,6 +106,8 @@ const registerGTCEuMaterialModification = (event) => { GTMaterials.BlackSteel.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(891, 1188, 1485, 5)); GTMaterials.BlueSteel.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(924, 1232, 1540, 6)); GTMaterials.RedSteel.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(924, 1232, 1540, 6)); + GTMaterials.get('tfg:weak_blue_steel').setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(924, 1232, 1540, 6)); + GTMaterials.get('tfg:weak_red_steel').setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(924, 1232, 1540, 6)); GTMaterials.Gold.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(636, 848, 1060, 1)); GTMaterials.Bismuth.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(162, 216, 270, 1)); @@ -123,8 +125,9 @@ const registerGTCEuMaterialModification = (event) => { GTMaterials.Magnetite.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(921, 1228, 1535, GTMaterials.Iron, 3, 90)); GTMaterials.Pyrite.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(921, 1228, 1535, GTMaterials.Iron, 3, 90)); GTMaterials.Goethite.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(921, 1228, 1535, GTMaterials.Iron, 3, 90)); - GTMaterials.BasalticMineralSand.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(921, 1228, 1535, GTMaterials.Iron, 3, 90)); - GTMaterials.GraniticMineralSand.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(921, 1228, 1535, GTMaterials.Iron, 3, 90)); + GTMaterials.BasalticMineralSand.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(921, 1228, 1535, GTMaterials.Iron, 3, 80)); + GTMaterials.GraniticMineralSand.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(921, 1228, 1535, GTMaterials.Iron, 3, 80)); + GTMaterials.VanadiumMagnetite.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(921, 1228, 1535, GTMaterials.Iron, 3, 80)); GTMaterials.Malachite.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(138, 184, 1080, GTMaterials.Copper, 1, 90)); GTMaterials.Tetrahedrite.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(138, 184, 1080, GTMaterials.Copper, 1, 90)); @@ -133,7 +136,7 @@ const registerGTCEuMaterialModification = (event) => { GTMaterials.Bornite.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(138, 184, 1080, GTMaterials.Copper, 1, 90)); GTMaterials.Cassiterite.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(648, 864, 230, GTMaterials.Tin, 1, 100)); - GTMaterials.CassiteriteSand.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(138, 184, 230, GTMaterials.Tin, 1, 85)); + GTMaterials.CassiteriteSand.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(138, 184, 230, GTMaterials.Tin, 1, 80)); GTMaterials.Sphalerite.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(138, 184, 420, GTMaterials.Zinc, 1, 90)); GTMaterials.Garnierite.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(138, 184, 1453, GTMaterials.Nickel, 1, 100)); GTMaterials.Pentlandite.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(138, 184, 1453, GTMaterials.Nickel, 1, 85)); @@ -263,6 +266,10 @@ const registerGTCEuMaterialModification = (event) => { // Change Beryllium to add Chemical Bath recipe and Thorium byproduct GTMaterials.Beryllium.getProperty(PropertyKey.ORE).setOreByProducts(GTMaterials.Emerald, GTMaterials.Emerald, GTMaterials.Thorium, GTMaterials.Thorium); GTMaterials.Beryllium.getProperty(PropertyKey.ORE).setWashedIn(GTMaterials.SodiumPersulfate); + + // Remove old stone dusts + GTMaterials.GraniticMineralSand.getProperty(PropertyKey.ORE).setOreByProducts(GTMaterials.get('tfg:igneous_felsic'), GTMaterials.Magnetite, GTMaterials.Magnetite); + GTMaterials.BasalticMineralSand.getProperty(PropertyKey.ORE).setOreByProducts(GTMaterials.get('tfg:igneous_mafic'), GTMaterials.Magnetite, GTMaterials.Magnetite); // Other flags GTMaterials.CertusQuartz.addFlags(GENERATE_ROD); @@ -281,7 +288,7 @@ const registerGTCEuMaterialModification = (event) => { 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.BlueSteel.addFlags(GENERATE_LONG_ROD, GENERATE_BOLT_SCREW, GENERATE_SPRING, GENERATE_SMALL_GEAR, GENERATE_FOIL); GTMaterials.RedSteel.addFlags(GENERATE_LONG_ROD, GENERATE_BOLT_SCREW, GENERATE_FOIL); GTMaterials.WroughtIron.addFlags(GENERATE_ROTOR, GENERATE_SPRING, GENERATE_SMALL_GEAR); @@ -313,10 +320,16 @@ const registerGTCEuMaterialModification = (event) => { GTMaterials.RTMAlloy.addFlags(GENERATE_DENSE, GENERATE_SPRING); GTMaterials.Lead.addFlags(GENERATE_DENSE); + GTMaterials.Beryllium.addFlags(GENERATE_DENSE); + GTMaterials.MaragingSteel300.addFlags(GENERATE_DENSE); + GTMaterials.Quartzite.addFlags(GENERATE_ROD); GTMaterials.TreatedWood.addFlags(GENERATE_LONG_ROD); + GTMaterials.Cadmium.addFlags(GENERATE_PLATE); + GTMaterials.Cadmium.setProperty(PropertyKey.INGOT, new $INGOT_PROPERTY()); + // Hide ore processing tab for plutonium GTMaterials.Plutonium239.addFlags(GENERATE_ROD, GENERATE_LONG_ROD, NO_ORE_PROCESSING_TAB, NO_ORE_SMELTING) GTMaterials.Thorium.addFlags(NO_ORE_SMELTING) @@ -325,7 +338,7 @@ const registerGTCEuMaterialModification = (event) => { GTMaterials.Zirconium.setProperty(PropertyKey.DUST, new $DUST_PROPERTY()); GTMaterials.Zirconium.setProperty(PropertyKey.INGOT, new $INGOT_PROPERTY()); GTMaterials.Zirconium.setProperty(PropertyKey.BLAST, new $BLAST_PROPERTY(4200, 'mid', GTValues.VA[GTValues.EV], 1300, GTValues.VA[GTValues.HV], 14.7*20)); - GTMaterials.Zirconium.addFlags(GENERATE_FINE_WIRE, GENERATE_PLATE, NO_ORE_SMELTING); + GTMaterials.Zirconium.addFlags(GENERATE_FINE_WIRE, GENERATE_PLATE, GENERATE_DENSE, NO_ORE_SMELTING); // Tools GTMaterials.Stone.setProperty(PropertyKey.TOOL, ToolProperty.Builder.of(1.2, 1.0, 8, 1, [ @@ -362,6 +375,9 @@ const registerGTCEuMaterialModification = (event) => { GTMaterials.BlackBronze.getProperties().removeProperty(PropertyKey.BLAST); GTMaterials.BlackBronze.getProperties().removeProperty(PropertyKey.ITEM_PIPE); GTMaterials.BlackBronze.setProperty(PropertyKey.FLUID_PIPE, new $FLUID_PIPE_PROPERTY(1696, 20, true, false, false, false)); + // Rose Gold & Sterling Silver + GTMaterials.RoseGold.getProperties().removeProperty(PropertyKey.BLAST); + GTMaterials.SterlingSilver.getProperties().removeProperty(PropertyKey.BLAST); // Red steel fluid pipe - same flow rate as aluminium, bad heat tolerance (same as PE) but can do cryo GTMaterials.RedSteel.setProperty(PropertyKey.FLUID_PIPE, new $FLUID_PIPE_PROPERTY(370, 75, true, false, true, false)); // Blue steel fluid pipe - same flow rate as aluminium, same temp tolerance as tungsten @@ -394,6 +410,8 @@ const registerGTCEuMaterialModification = (event) => { // Remove properties GTMaterials.Glass.getProperties().removeProperty(PropertyKey.GEM) + GTMaterials.Thorium.getProperties().removeProperty(PropertyKey.INGOT) + GTMaterials.Thorium.getProperties().removeProperty(PropertyKey.FLUID) // Color Adjustments GTMaterials.BismuthBronze.setMaterialARGB(0x5A966E) @@ -422,8 +440,8 @@ const registerGTCEuMaterialModification = (event) => { GTMaterials.Cobalt.setMaterialSecondaryARGB(0x1D2688) GTMaterials.CertusQuartz.setMaterialARGB(0xB8D8FC) GTMaterials.CertusQuartz.setMaterialSecondaryARGB(0xADCCEF) - GTMaterials.Vanadium.setMaterialARGB(0xD8D4E7) - GTMaterials.Vanadium.setMaterialSecondaryARGB(0x7E988F) + GTMaterials.Vanadium.setMaterialARGB(0xA7AAC6) + GTMaterials.Vanadium.setMaterialSecondaryARGB(0xC4EFE6) GTMaterials.Brass.setMaterialSecondaryARGB(0x791905) GTMaterials.Aluminium.setMaterialARGB(0xb6e5ff) GTMaterials.Aluminium.setMaterialSecondaryARGB(0x7ca29b) @@ -446,6 +464,9 @@ const registerGTCEuMaterialModification = (event) => { GTMaterials.Rhenium.setMaterialSecondaryARGB(0x9ccbd6) GTMaterials.Diamond.setMaterialARGB(0x4AEDD9) GTMaterials.Diamond.setMaterialSecondaryARGB(0x1AAAA7) + GTMaterials.Boron.setMaterialARGB(0x75BD8D) + GTMaterials.Boron.setMaterialSecondaryARGB(0x013A15) + GTMaterials.Americium.setMaterialARGB(0x284D7B) // Fluids global.MINECRAFT_DYE_NAMES.forEach(colorName => { @@ -463,4 +484,5 @@ const registerGTCEuMaterialModification = (event) => { GTMaterials.Glowstone.setComponents('1x gold', '1x redstone') GTMaterials.Thorium.setFormula('ThO2') GTMaterials.Americium.setFormula('AmÂēâīÂģ') + GTMaterials.Caesium.setFormula('CsÂđÂģÂģ') } \ No newline at end of file diff --git a/kubejs/startup_scripts/gtceu/recipe_types.js b/kubejs/startup_scripts/gtceu/recipe_types.js index 3cffd2c81..849baf9e7 100644 --- a/kubejs/startup_scripts/gtceu/recipe_types.js +++ b/kubejs/startup_scripts/gtceu/recipe_types.js @@ -20,15 +20,15 @@ const registerGTCEuRecipeTypes = (event) => { .setMaxIOSize(2, 0, 2, 1) .setProgressBar(GuiTextures.PROGRESS_BAR_ARROW, FillDirection.LEFT_TO_RIGHT) .setSound(GTSoundEntries.COOLING) - +/* event.create('nuclear_fuel_factory') .category('nuclear_fuel_factory') .setEUIO('in') - .setMaxIOSize(6, 1, 1, 0) + .setMaxIOSize(6, 1, 1, 1) .setSlotOverlay(false, false, GuiTextures.ATOMIC_OVERLAY_1) .setProgressBar(GuiTextures.PROGRESS_BAR_LATHE, FillDirection.LEFT_TO_RIGHT) .setSound(GTSoundEntries.CUT) - +*/ event.create('heat_exchanger') .category('heat_exchanger') .setEUIO('in') diff --git a/kubejs/startup_scripts/tfc/constants.js b/kubejs/startup_scripts/tfc/constants.js index a6513b569..19a876b1c 100644 --- a/kubejs/startup_scripts/tfc/constants.js +++ b/kubejs/startup_scripts/tfc/constants.js @@ -788,15 +788,15 @@ global.TFC_JAMS = /** @type {const} */ ([ ]); global.TFC_GREENHOUSE_FRUIT_RECIPE_COMPONENTS = /** @type {const} */ ([ - { input: "tfc:plant/cherry_sapling", output: "tfc:food/cherry"}, - { input: "tfc:plant/green_apple_sapling", output: "tfc:food/green_apple"}, - { input: "tfc:plant/lemon_sapling", output: "tfc:food/lemon"}, - { input: "tfc:plant/olive_sapling", output: "tfc:food/olive"}, - { input: "tfc:plant/orange_sapling", output: "tfc:food/orange"}, - { input: "tfc:plant/peach_sapling", output: "tfc:food/peach"}, - { input: "tfc:plant/plum_sapling", output: "tfc:food/plum"}, - { input: "tfc:plant/red_apple_sapling", output: "tfc:food/red_apple"}, - { input: "tfc:plant/banana_sapling", output: "tfc:food/banana"} + { input: "tfc:plant/cherry_sapling", output: "tfc:food/cherry", leaves: "tfc:plant/cherry_leaves" }, + { input: "tfc:plant/green_apple_sapling", output: "tfc:food/green_apple", leaves: "tfc:plant/green_apple_leaves" }, + { input: "tfc:plant/lemon_sapling", output: "tfc:food/lemon", leaves: "tfc:plant/lemon_leaves" }, + { input: "tfc:plant/olive_sapling", output: "tfc:food/olive", leaves: "tfc:plant/olive_leaves" }, + { input: "tfc:plant/orange_sapling", output: "tfc:food/orange", leaves: "tfc:plant/orange_leaves" }, + { input: "tfc:plant/peach_sapling", output: "tfc:food/peach", leaves: "tfc:plant/peach_leaves" }, + { input: "tfc:plant/plum_sapling", output: "tfc:food/plum", leaves: "tfc:plant/plum_leaves" }, + { input: "tfc:plant/red_apple_sapling", output: "tfc:food/red_apple", leaves: "tfc:plant/red_apple_leaves" }, + { input: "tfc:plant/banana_sapling", output: "tfc:food/banana" } ]); global.TFC_GREENHOUSE_VEGETABLE_RECIPE_COMPONENTS = /** @type {const} */ ([ @@ -867,18 +867,18 @@ global.TFC_CURDS_AND_CHEESES = /** @type {const} */ ([ salted_cheese: "firmalife:food/chevre", salted_wheel: "firmalife:chevre_wheel" }, { - id: "ox", milk: "tfc_gurman:ox_milk", curdled_fluid: "tfc_gurman:curdled_ox_milk", curd: "tfc_gurman:ox_curd", - unsalted_cheese: "tfc_gurman:ox_brinza_slice", unsalted_wheel: "tfc_gurman:ox_brinza_wheel", + id: "ox", milk: "tfc_gourmet:ox_milk", curdled_fluid: "tfc_gourmet:curdled_ox_milk", curd: "tfc_gourmet:ox_curd", + unsalted_cheese: "tfc_gourmet:ox_brinza_slice", unsalted_wheel: "tfc_gourmet:ox_brinza_wheel", salted_cheese: null, salted_wheel: null }, { - id: "sheep", milk: "tfc_gurman:sheep_milk", curdled_fluid: "tfc_gurman:curdled_sheep_milk", curd: "tfc_gurman:sheep_curd", - unsalted_cheese: "tfc_gurman:sheep_brinza_slice", unsalted_wheel: "tfc_gurman:sheep_brinza_wheel", + id: "sheep", milk: "tfc_gourmet:sheep_milk", curdled_fluid: "tfc_gourmet:curdled_sheep_milk", curd: "tfc_gourmet:sheep_curd", + unsalted_cheese: "tfc_gourmet:sheep_brinza_slice", unsalted_wheel: "tfc_gourmet:sheep_brinza_wheel", salted_cheese: null, salted_wheel: null }, { - id: "alpaca", milk: "tfc_gurman:alpaca_milk", curdled_fluid: "tfc_gurman:curdled_alpaca_milk", curd: "tfc_gurman:alpaca_curd", - unsalted_cheese: "tfc_gurman:alpaca_brinza_slice", unsalted_wheel: "tfc_gurman:alpaca_brinza_wheel", + id: "alpaca", milk: "tfc_gourmet:alpaca_milk", curdled_fluid: "tfc_gourmet:curdled_alpaca_milk", curd: "tfc_gourmet:alpaca_curd", + unsalted_cheese: "tfc_gourmet:alpaca_brinza_slice", unsalted_wheel: "tfc_gourmet:alpaca_brinza_wheel", salted_cheese: null, salted_wheel: null } ]); diff --git a/kubejs/startup_scripts/tfg/element.js b/kubejs/startup_scripts/tfg/element.js index b71cadcb5..e7fa697bf 100644 --- a/kubejs/startup_scripts/tfg/element.js +++ b/kubejs/startup_scripts/tfg/element.js @@ -4,10 +4,42 @@ const registerTFGElement = (event) => { event.create("thorium_230") .protons(90) - .neutrons(230) + .neutrons(140) .symbol("ThÂēÂģ⁰") + event.create("thorium_232") .protons(90) - .neutrons(232) + .neutrons(142) .symbol("ThÂēÂģÂē") + + event.create("boron_10") + .protons(5) + .neutrons(6) + .symbol("BÂđ⁰") + + event.create("americium_241") + .protons(95) + .neutrons(146) + .symbol("AmÂēâīÂđ") + + event.create("neptunium_237") + .protons(93) + .neutrons(144) + .symbol("NpÂēÂģ⁷") + + event.create("californium_252") + .protons(98) + .neutrons(154) + .symbol("CaÂēâĩÂē") + + event.create("unknown") + .protons(75) + .neutrons(75) + .symbol("?") + + event.create("caesium_137") + .protons(55) + .neutrons(82) + .symbol("CsÂđÂģ⁷") + } \ No newline at end of file diff --git a/kubejs/startup_scripts/tfg/fluids.js b/kubejs/startup_scripts/tfg/fluids.js index 3f9cadb31..87bba4564 100644 --- a/kubejs/startup_scripts/tfg/fluids.js +++ b/kubejs/startup_scripts/tfg/fluids.js @@ -28,5 +28,10 @@ const registerTFGFluids = (event) => { .noBlock() // Venus + event.create('tfg:supercritical_co2') + .thinTexture(0x3deb96) + .bucketColor(0x08733f) + .temperature(236) + .noBlock() } \ 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 fed183e4d..be0ac333c 100644 --- a/kubejs/startup_scripts/tfg/icon_sets.js +++ b/kubejs/startup_scripts/tfg/icon_sets.js @@ -37,6 +37,9 @@ function registerTFGIconSets(event) { event.create('nether_quartz').parent('quartz') + event.create('noodle').parent('metallic') + event.create('cereal_box').parent('bright') + // Credits to Flare from the Cosmic Frontiers team event.create('chonky').parent('shiny') } @@ -152,6 +155,8 @@ function modifyTFGIconSets(event) { GTMaterials.Zirconium.setMaterialIconSet(GTMaterialIconSet.getByName('chonky')) + GTMaterials.Vanadium.setMaterialIconSet(GTMaterialIconSet.getByName('noodle')) + const $GreateMaterials = Java.loadClass("electrolyte.greate.registry.GreateMaterials") $GreateMaterials.RoseQuartz.setMaterialIconSet(GTMaterialIconSet.getByName('nether_quartz')) } \ No newline at end of file diff --git a/kubejs/startup_scripts/tfg/items.js b/kubejs/startup_scripts/tfg/items.js index 92fadd335..d8f3d71a1 100644 --- a/kubejs/startup_scripts/tfg/items.js +++ b/kubejs/startup_scripts/tfg/items.js @@ -49,7 +49,16 @@ const registerTFGItems = (event) => { event.create('tfg:zpm_universal_circuit') event.create('tfg:uv_universal_circuit') event.create('tfg:uhv_universal_circuit') + + // Add item for BTX Fuel + event.create('tfg:catalyser_pt_re_zsm') + .texture('tfg:item/btx/catalyser_zsm') + event.create('tfg:used_catalyser') + .texture('tfg:item/btx/used_catalyser') + + event.create('tfg:loaded_resin') + .texture('tfg:item/btx/loaded_resin') // Temporary event.create('gtceu:rose_quartz_dust').texture('tfg:item/deprecated') @@ -70,17 +79,111 @@ const registerTFGItems = (event) => { 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') + // Thanks gurman + event.create('tfc_gurman:raw_margarita_pizza').texture('tfg:item/deprecated').tag('tfc_gourmet:deprecated_foods'); + event.create('tfc_gurman:margarita_pizza').texture('tfg:item/deprecated').tag('tfc_gourmet:deprecated_foods'); + event.create('tfc_gurman:raw_pepperoni_pizza').texture('tfg:item/deprecated').tag('tfc_gourmet:deprecated_foods'); + event.create('tfc_gurman:pepperoni_pizza').texture('tfg:item/deprecated').tag('tfc_gourmet:deprecated_foods'); + event.create('tfc_gurman:raw_hawaiian_pizza').texture('tfg:item/deprecated').tag('tfc_gourmet:deprecated_foods'); + event.create('tfc_gurman:hawaiian_pizza').texture('tfg:item/deprecated').tag('tfc_gourmet:deprecated_foods'); + event.create('tfc_gurman:raw_four_cheeses_pizza').texture('tfg:item/deprecated').tag('tfc_gourmet:deprecated_foods'); + event.create('tfc_gurman:four_cheeses_pizza').texture('tfg:item/deprecated').tag('tfc_gourmet:deprecated_foods'); + event.create('tfc_gurman:raw_four_meats_pizza').texture('tfg:item/deprecated').tag('tfc_gourmet:deprecated_foods'); + event.create('tfc_gurman:four_meats_pizza').texture('tfg:item/deprecated').tag('tfc_gourmet:deprecated_foods'); + event.create('tfc_gurman:raw_neapolitano_pizza').texture('tfg:item/deprecated').tag('tfc_gourmet:deprecated_foods'); + event.create('tfc_gurman:neapolitano_pizza').texture('tfg:item/deprecated').tag('tfc_gourmet:deprecated_foods'); + event.create('tfc_gurman:raw_placinda').texture('tfg:item/deprecated').tag('tfc_gourmet:deprecated_foods'); + event.create('tfc_gurman:placinda').texture('tfg:item/deprecated').tag('tfc_gourmet:deprecated_foods'); + event.create('tfc_gurman:ramen_with_bacon').texture('tfg:item/deprecated').tag('tfc_gourmet:deprecated_foods'); + event.create('tfc_gurman:ramen_with_beef').texture('tfg:item/deprecated').tag('tfc_gourmet:deprecated_foods'); + event.create('tfc_gurman:ramen_with_camelidae').texture('tfg:item/deprecated').tag('tfc_gourmet:deprecated_foods'); + event.create('tfc_gurman:ramen_with_chevon').texture('tfg:item/deprecated').tag('tfc_gourmet:deprecated_foods'); + event.create('tfc_gurman:plant_mix').texture('tfg:item/deprecated').tag('tfc_gourmet:deprecated_foods'); + event.create('tfc_gurman:adjika').texture('tfg:item/deprecated').tag('tfc_gourmet:deprecated_foods'); + event.create('tfc_gurman:adjika_bread').texture('tfg:item/deprecated').tag('tfc_gourmet:deprecated_foods'); + event.create('tfc_gurman:porridge').texture('tfg:item/deprecated').tag('tfc_gourmet:deprecated_foods'); + event.create('tfc_gurman:porridge_with_honey').texture('tfg:item/deprecated').tag('tfc_gourmet:deprecated_foods'); + event.create('tfc_gurman:porridge_with_fruits').texture('tfg:item/deprecated').tag('tfc_gourmet:deprecated_foods'); + event.create('tfc_gurman:pasta_with_adjika').texture('tfg:item/deprecated').tag('tfc_gourmet:deprecated_foods'); + event.create('tfc_gurman:zama').texture('tfg:item/deprecated').tag('tfc_gourmet:deprecated_foods'); + event.create('tfc_gurman:mamaliga').texture('tfg:item/deprecated').tag('tfc_gourmet:deprecated_foods'); + event.create('tfc_gurman:ox_curd').texture('tfg:item/deprecated').tag('tfc_gourmet:deprecated_foods'); + event.create('tfc_gurman:sheep_curd').texture('tfg:item/deprecated').tag('tfc_gourmet:deprecated_foods'); + event.create('tfc_gurman:alpaca_curd').texture('tfg:item/deprecated').tag('tfc_gourmet:deprecated_foods'); + event.create('tfc_gurman:ox_brinza_slice').texture('tfg:item/deprecated').tag('tfc_gourmet:deprecated_foods'); + event.create('tfc_gurman:sheep_brinza_slice').texture('tfg:item/deprecated').tag('tfc_gourmet:deprecated_foods'); + event.create('tfc_gurman:alpaca_brinza_slice').texture('tfg:item/deprecated').tag('tfc_gourmet:deprecated_foods'); + event.create('tfc_gurman:ox_brinza_wheel').texture('tfg:item/deprecated').tag('tfc_gourmet:deprecated_foods'); + event.create('tfc_gurman:sheep_brinza_wheel').texture('tfg:item/deprecated').tag('tfc_gourmet:deprecated_foods'); + event.create('tfc_gurman:alpaca_brinza_wheel').texture('tfg:item/deprecated').tag('tfc_gourmet:deprecated_foods'); + event.create('tfc_gurman:fried_rice').texture('tfg:item/deprecated').tag('tfc_gourmet:deprecated_foods'); + event.create('tfc_gurman:curry').texture('tfg:item/deprecated').tag('tfc_gourmet:deprecated_foods'); + event.create('tfc_gurman:pho').texture('tfg:item/deprecated').tag('tfc_gourmet:deprecated_foods'); + event.create('tfc_gurman:hummus').texture('tfg:item/deprecated').tag('tfc_gourmet:deprecated_foods'); + event.create('tfc_gurman:greek_salad').texture('tfg:item/deprecated').tag('tfc_gourmet:deprecated_foods'); + event.create('tfc_gurman:tzatziki').texture('tfg:item/deprecated').tag('tfc_gourmet:deprecated_foods'); + event.create('tfc_gurman:falafel').texture('tfg:item/deprecated').tag('tfc_gourmet:deprecated_foods'); + event.create('tfc_gurman:dolma').texture('tfg:item/deprecated').tag('tfc_gourmet:deprecated_foods'); + event.create('tfc_gurman:goulash').texture('tfg:item/deprecated').tag('tfc_gourmet:deprecated_foods'); + event.create('tfc_gurman:risotto').texture('tfg:item/deprecated').tag('tfc_gourmet:deprecated_foods'); + event.create('tfc_gurman:raw_lavash_wrap').texture('tfg:item/deprecated').tag('tfc_gourmet:deprecated_foods'); + event.create('tfc_gurman:lavash_wrap').texture('tfg:item/deprecated').tag('tfc_gourmet:deprecated_foods'); + event.create('tfc_gurman:raw_pelmeni').texture('tfg:item/deprecated').tag('tfc_gourmet:deprecated_foods'); + event.create('tfc_gurman:pelmeni').texture('tfg:item/deprecated').tag('tfc_gourmet:deprecated_foods'); + event.create('tfc_gurman:raw_vareniki').texture('tfg:item/deprecated').tag('tfc_gourmet:deprecated_foods'); + event.create('tfc_gurman:vareniki').texture('tfg:item/deprecated').tag('tfc_gourmet:deprecated_foods'); + event.create('tfc_gurman:raw_oladyi').texture('tfg:item/deprecated').tag('tfc_gourmet:deprecated_foods'); + event.create('tfc_gurman:oladyi').texture('tfg:item/deprecated').tag('tfc_gourmet:deprecated_foods'); + event.create('tfc_gurman:raw_syrniki').texture('tfg:item/deprecated').tag('tfc_gourmet:deprecated_foods'); + event.create('tfc_gurman:syrniki').texture('tfg:item/deprecated').tag('tfc_gourmet:deprecated_foods'); + event.create('tfc_gurman:sliced_cabbage').texture('tfg:item/deprecated').tag('tfc_gourmet:deprecated_foods'); + event.create('tfc_gurman:sauerkraut').texture('tfg:item/deprecated').tag('tfc_gourmet:deprecated_foods'); + event.create('tfc_gurman:raw_khachapuri').texture('tfg:item/deprecated').tag('tfc_gourmet:deprecated_foods'); + event.create('tfc_gurman:khachapuri').texture('tfg:item/deprecated').tag('tfc_gourmet:deprecated_foods'); + event.create('tfc_gurman:raw_chebureki').texture('tfg:item/deprecated').tag('tfc_gourmet:deprecated_foods'); + event.create('tfc_gurman:chebureki').texture('tfg:item/deprecated').tag('tfc_gourmet:deprecated_foods'); + event.create('tfc_gurman:dried_mint_leaves').texture('tfg:item/deprecated').tag('tfc_gourmet:deprecated_foods'); + event.create('tfc_gurman:dried_chamomile_leaves').texture('tfg:item/deprecated').tag('tfc_gourmet:deprecated_foods'); + event.create('tfc_gurman:dried_rosehip_leaves').texture('tfg:item/deprecated').tag('tfc_gourmet:deprecated_foods'); + event.create('tfc_gurman:dried_nettle_leaves').texture('tfg:item/deprecated').tag('tfc_gourmet:deprecated_foods'); + event.create('tfc_gurman:borscht').texture('tfg:item/deprecated').tag('tfc_gourmet:deprecated_foods'); + event.create('tfc_gurman:schi').texture('tfg:item/deprecated').tag('tfc_gourmet:deprecated_foods'); + event.create('tfc_gurman:solyanka').texture('tfg:item/deprecated').tag('tfc_gourmet:deprecated_foods'); + event.create('tfc_gurman:raw_kiev_cutlets').texture('tfg:item/deprecated').tag('tfc_gourmet:deprecated_foods'); + event.create('tfc_gurman:kiev_cutlets').texture('tfg:item/deprecated').tag('tfc_gourmet:deprecated_foods'); + event.create('tfc_gurman:okroshka').texture('tfg:item/deprecated').tag('tfc_gourmet:deprecated_foods'); + event.create('tfc_gurman:spaghetti_bolognese').texture('tfg:item/deprecated').tag('tfc_gourmet:deprecated_foods'); + event.create('tfc_gurman:pasta_carbonara').texture('tfg:item/deprecated').tag('tfc_gourmet:deprecated_foods'); + event.create('tfc_gurman:tiramisu').texture('tfg:item/deprecated').tag('tfc_gourmet:deprecated_foods'); + event.create('tfc_gurman:raw_croissants').texture('tfg:item/deprecated').tag('tfc_gourmet:deprecated_foods'); + event.create('tfc_gurman:croissants').texture('tfg:item/deprecated').tag('tfc_gourmet:deprecated_foods'); + event.create('tfc_gurman:ratatouille').texture('tfg:item/deprecated').tag('tfc_gourmet:deprecated_foods'); + event.create('tfc_gurman:raw_quiche').texture('tfg:item/deprecated').tag('tfc_gourmet:deprecated_foods'); + event.create('tfc_gurman:quiche').texture('tfg:item/deprecated').tag('tfc_gourmet:deprecated_foods'); + event.create('tfc_gurman:bouillabaisse').texture('tfg:item/deprecated').tag('tfc_gourmet:deprecated_foods'); + event.create('tfc_gurman:raw_crepes').texture('tfg:item/deprecated').tag('tfc_gourmet:deprecated_foods'); + event.create('tfc_gurman:crepes').texture('tfg:item/deprecated').tag('tfc_gourmet:deprecated_foods'); + event.create('tfc_gurman:raw_bratwurst').texture('tfg:item/deprecated').tag('tfc_gourmet:deprecated_foods'); + event.create('tfc_gurman:bratwurst').texture('tfg:item/deprecated').tag('tfc_gourmet:deprecated_foods'); + event.create('tfc_gurman:raw_tonkatsu').texture('tfg:item/deprecated').tag('tfc_gourmet:deprecated_foods'); + event.create('tfc_gurman:tonkatsu').texture('tfg:item/deprecated').tag('tfc_gourmet:deprecated_foods'); + event.create('tfc_gurman:raw_takoyaki').texture('tfg:item/deprecated').tag('tfc_gourmet:deprecated_foods'); + event.create('tfc_gurman:takoyaki').texture('tfg:item/deprecated').tag('tfc_gourmet:deprecated_foods'); + event.create('tfc_gurman:kimchi').texture('tfg:item/deprecated').tag('tfc_gourmet:deprecated_foods'); + event.create('tfc_gurman:raw_bulgogi').texture('tfg:item/deprecated').tag('tfc_gourmet:deprecated_foods'); + event.create('tfc_gurman:bulgogi').texture('tfg:item/deprecated').tag('tfc_gourmet:deprecated_foods'); + event.create('tfc_gurman:raw_tandoori_chicken').texture('tfg:item/deprecated').tag('tfc_gourmet:deprecated_foods'); + event.create('tfc_gurman:tandoori_chicken').texture('tfg:item/deprecated').tag('tfc_gourmet:deprecated_foods'); + event.create('tfc_gurman:biryani').texture('tfg:item/deprecated').tag('tfc_gourmet:deprecated_foods'); + event.create('tfc_gurman:fresh_onion_soup_bread').texture('tfg:item/deprecated').tag('tfc_gourmet:deprecated_foods'); + event.create('tfc_gurman:lent_soup').texture('tfg:item/deprecated').tag('tfc_gourmet:deprecated_foods'); + event.create('tfc_gurman:gazpacho').texture('tfg:item/deprecated').tag('tfc_gourmet:deprecated_foods'); + event.create('tfc_gurman:kharcho').texture('tfg:item/deprecated').tag('tfc_gourmet:deprecated_foods'); + event.create('tfc_gurman:kholodnik').texture('tfg:item/deprecated').tag('tfc_gourmet:deprecated_foods'); + event.create('tfc_gurman:shurpa').texture('tfg:item/deprecated').tag('tfc_gourmet:deprecated_foods'); + event.create('tfc_gurman:fish_soup_tomato').texture('tfg:item/deprecated').tag('tfc_gourmet:deprecated_foods'); + event.create('tfc_gurman:pea_soup').texture('tfg:item/deprecated').tag('tfc_gourmet:deprecated_foods'); + event.create('tfc_gurman:minestrone').texture('tfg:item/deprecated').tag('tfc_gourmet:deprecated_foods'); + event.create('tfc_gurman:fish_soup').texture('tfg:item/deprecated').tag('tfc_gourmet:deprecated_foods'); + event.create('tfc_gurman:fresh_onion_soup').texture('tfg:item/deprecated').tag('tfc_gourmet:deprecated_foods'); } diff --git a/kubejs/startup_scripts/tfg/mars/materials.mars.js b/kubejs/startup_scripts/tfg/mars/materials.mars.js index 58eeab18a..fb53dba15 100644 --- a/kubejs/startup_scripts/tfg/mars/materials.mars.js +++ b/kubejs/startup_scripts/tfg/mars/materials.mars.js @@ -22,6 +22,11 @@ function registerTFGMarsMaterials(event) { event.create('residual_radioactive_concoction') .liquid(new GTFluidBuilder().customStill().temperature(450)) + // New OLA Materials + + event.create('tfg:radioactive_effluent') + .liquid(new GTFluidBuilder().customStill().temperature(293)) + // Atmosphere event.create('tfg:mars_air') @@ -81,7 +86,7 @@ function registerTFGMarsMaterials(event) { .components('2x pitchblende', '1x tricalcium_phosphate', '1x bauxite', '1x silver', '1x beryllium') .color(0xbd7980) .secondaryColor(0xA66C8D) - .iconSet(GTMaterialIconSet.getByName('tfc_cassiterite')) + .iconSet(GTMaterialIconSet.getByName('cereal_box')) .ingot() .liquid() .blastTemp(3700, 'mid', GTValues.VA[GTValues.EV]) @@ -99,8 +104,8 @@ function registerTFGMarsMaterials(event) { .liquid() .components('2x ostrum', 'iodine') .blastTemp(3700, 'mid', GTValues.VA[GTValues.IV], (20*120)) - .iconSet(GTMaterialIconSet.BRIGHT) - .flags(GTMaterialFlags.GENERATE_GEAR) + .iconSet(GTMaterialIconSet.getByName('cereal_box')) + .flags(GTMaterialFlags.GENERATE_GEAR, GTMaterialFlags.GENERATE_FOIL) .color(0xc696f2) .secondaryColor(0x9b99ff) } \ No newline at end of file diff --git a/kubejs/startup_scripts/tfg/materials.js b/kubejs/startup_scripts/tfg/materials.js index 7e8068be4..158fb7185 100644 --- a/kubejs/startup_scripts/tfg/materials.js +++ b/kubejs/startup_scripts/tfg/materials.js @@ -16,6 +16,14 @@ const registerTFGMaterials = (event) => { event.create('methoxy') .components('1x oxygen', '1x carbon', '3x hydrogen') .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) + + event.create('methylene') + .components('1x carbon', '2x hydrogen') + .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) + + event.create('hydroxide') + .components('1x oxygen', '1x hydrogen') + .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) //#endregion registerTFGPowerReworkMaterials(event); @@ -65,6 +73,40 @@ const registerTFGMaterials = (event) => { .secondaryColor(0x67FFE6) .formula("(Al2Si2O5(OH)4)(BeK4N5)") + // Bakelite + event.create('tfg:bakelite') + .polymer() + .fluid() + .color(0xF29104) + .secondaryColor(0xD96005) + .components('1x phenol', '1x formaldehyde') + .flags( + GTMaterialFlags.DISABLE_DECOMPOSITION, + GTMaterialFlags.NO_SMELTING, + GTMaterialFlags.GENERATE_PLATE, + GTMaterialFlags.GENERATE_FOIL + ) + + event.create('tfg:phenolic_resin') + .fluid() + .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) + .components('1x phenol', '1x formaldehyde') + .color(0xFCD7A3) + + // Coils + + event.create('tfg:magnesium_hydroxide') + .dust() + .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) + .components('1x magnesium', '2x hydroxide') + .color(0xC6E4FF) + + event.create('tfg:magnesia_refractory_brick') + .dust() + .ingot() + .iconSet(GTMaterialIconSet.ROUGH) + .flags(GTMaterialFlags.NO_SMELTING) + .color(0xA69D96) //#region Tungsten Line @@ -199,4 +241,14 @@ const registerTFGMaterials = (event) => { .flags(GTMaterialFlags.GENERATE_PLATE) // #endregion + + //#region Material for Coils + + event.create('tfg:nichromium_iodomethylate') + .liquid(new GTFluidBuilder().temperature(1818)) + .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) + .components('4x nickel', '1x chromium', '1x carbon', '3x hydrogen', '1x iodine') + .color(0xe7a2fc) + + } diff --git a/kubejs/startup_scripts/tfg/nuclear/blocks.nuclear.js b/kubejs/startup_scripts/tfg/nuclear/blocks.nuclear.js index 5ea789413..a4a37bf36 100644 --- a/kubejs/startup_scripts/tfg/nuclear/blocks.nuclear.js +++ b/kubejs/startup_scripts/tfg/nuclear/blocks.nuclear.js @@ -2,7 +2,7 @@ function registerTFGNuclearBlocks(event) { - // Insulation + // Insulation Fission Reactor event.create('tfg:glacian_wool_frame') .soundType('copper') .hardness(4) @@ -27,7 +27,7 @@ function registerTFGNuclearBlocks(event) { .resistance(6) .tagBlock('gtceu:mineable/pickaxe_or_wrench') - // Unfinished Insulation + // Unfinished Insulation Reactor event.create('tfg:moderate_core') .soundType('ancient_debris') .hardness(7) @@ -42,6 +42,34 @@ function registerTFGNuclearBlocks(event) { .tagBlock('gtceu:mineable/pickaxe_or_wrench') .model('tfg:block/fission/impure_moderate_core') + // Heat Battery Components + + event.create('tfg:copper_sandy') + .soundType('ancient_debris') + .hardness(7) + .resistance(8) + .tagBlock('gtceu:mineable/pickaxe_or_wrench') + .model('tfg:block/fission/copper_sandy') + + event.create('tfg:beryllium_sandy') + .soundType('ancient_debris') + .hardness(7) + .resistance(8) + .tagBlock('gtceu:mineable/pickaxe_or_wrench') + .model('tfg:block/fission/beryllium_sandy') + + event.create('tfg:copper_sandy_frame') + .soundType('copper') + .hardness(4) + .resistance(6) + .tagBlock('gtceu:mineable/pickaxe_or_wrench') + + event.create('tfg:beryllium_sandy_frame') + .soundType('copper') + .hardness(5) + .resistance(6) + .tagBlock('gtceu:mineable/pickaxe_or_wrench') + // Nuclear cooling tower event.create('tfg:titanium_exhaust_vent', 'tfg:active_particle_emitter') .textureAll('tfg:block/titanium_exhaust_vent') diff --git a/kubejs/startup_scripts/tfg/nuclear/items.nuclear.js b/kubejs/startup_scripts/tfg/nuclear/items.nuclear.js index 33d19dcb9..50304d7cb 100644 --- a/kubejs/startup_scripts/tfg/nuclear/items.nuclear.js +++ b/kubejs/startup_scripts/tfg/nuclear/items.nuclear.js @@ -5,8 +5,18 @@ function registerTFGNuclearItems(event) { // Empty Fission Rod event.create('tfg:empty_rod') - .translationKey('item.tfg.empty_road') - .texture('tfg:item/fuel_rod_empty') + .translationKey('item.tfg.empty_rod') + .texture('tfg:item/fission_rod/fuel_rod_empty') + .tag('tfg:fission_rods') + + event.create('tfg:empty_rod_t2') + .translationKey('item.tfg.empty_rod_t2') + .texture('tfg:item/fission_rod/fuel_rod_empty_t2') + .tag('tfg:fission_rods') + + event.create('tfg:empty_rod_t3') + .translationKey('item.tfg.empty_rod_t3') + .texture('tfg:item/fission_rod/fuel_rod_empty_t3') .tag('tfg:fission_rods') event.create('tfg:refrigerant_pellet') @@ -14,6 +24,11 @@ function registerTFGNuclearItems(event) { .texture('tfg:item/refrigerant_pellet') .tag('tfg:fission_coolant') + event.create('tfg:terrafirmaguard_pa6') + .translationKey('item.tfg.terrafirmaguard_pa6') + .texture('tfg:item/terrafirmaguard_pa6') + .tag('tfg:fission_coolant') + // Moderator Line event.create('tfg:graphite_compound') diff --git a/kubejs/startup_scripts/tfg/nuclear/machine.js b/kubejs/startup_scripts/tfg/nuclear/machine.js new file mode 100644 index 000000000..837ae36ab --- /dev/null +++ b/kubejs/startup_scripts/tfg/nuclear/machine.js @@ -0,0 +1,8 @@ +// priority: 0 +"use strict"; + +GTCEuStartupEvents.registry('gtceu:machine', _ => { + const $FrComponents = Java.loadClass("fi.dea.mc.deafission.core.c2.fr.FrComponents"); + const $ReactorBaseStats = Java.loadClass("fi.dea.mc.deafission.core.ReactorBaseStats"); + $ReactorBaseStats.Smr1 = new $FrComponents(200, 0, 0); +}) \ No newline at end of file diff --git a/kubejs/startup_scripts/tfg/nuclear/materials.nuclear.js b/kubejs/startup_scripts/tfg/nuclear/materials.nuclear.js index c78078fb4..0d06ea808 100644 --- a/kubejs/startup_scripts/tfg/nuclear/materials.nuclear.js +++ b/kubejs/startup_scripts/tfg/nuclear/materials.nuclear.js @@ -50,10 +50,16 @@ const registerTFGNuclearMaterials = (event) => { .components('1x water', '1x unknown') .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) - // Coolant + //#region Coolant + + event.create('tfg:warm_water') + .liquid(new GTFluidBuilder().temperature(313)) + .components('2x hydrogen', '1x oxygen') + .color(0x8de3fc) + .secondaryColor(0x81FFF9) event.create('tfg:heavy_water') - .liquid(new GTFluidBuilder().temperature(236)) + .liquid(new GTFluidBuilder().customStill().temperature(236)) .components('2x deuterium', '1x oxygen') .color(0xB5B9FF) .secondaryColor(0x81FFF9) @@ -65,16 +71,24 @@ const registerTFGNuclearMaterials = (event) => { .secondaryColor(0x81FFF9) event.create('tfg:boron_enriched_coolant') - .liquid(new GTFluidBuilder().temperature(213)) + .liquid(new GTFluidBuilder().customStill().temperature(213)) .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) - .color(0x43D6E4) - .secondaryColor(0x2C9AAF) event.create('tfg:hot_boron_enriched_coolant') - .liquid(new GTFluidBuilder().temperature(2000)) + .liquid(new GTFluidBuilder().customStill().temperature(2000)) .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) - .color(0xFF715B) - .secondaryColor(0xFF9D6E) + + event.create('tfg:ticl4_doped_supercritical_co2') + .liquid(new GTFluidBuilder().customStill().temperature(500)) + .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) + .components('1x titanium', '4x chlorine', '1x carbon', '2x oxygen') + + event.create('tfg:spent_ticl4_doped_supercritical_co2') + .liquid(new GTFluidBuilder().customStill().temperature(2000)) + .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) + .components('1x titanium', '4x chlorine', '1x carbon', '2x oxygen') + + //#endregion // Fision Waste @@ -84,7 +98,7 @@ const registerTFGNuclearMaterials = (event) => { .color(0xB5B9FF) .secondaryColor(0x81FFF9) - event.create('nuclear_waste') + event.create('tfg:tbu_waste') .liquid(new GTFluidBuilder().customStill().temperature(3850)) .components('1x thorium', '1x uranium', '1x unknown') .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) @@ -114,7 +128,7 @@ const registerTFGNuclearMaterials = (event) => { .secondaryColor(0xfc5e03) event.create('tritiated_water') - .fluid() + .liquid(new GTFluidBuilder().customStill()) .components('2x tritium', '1x oxygen') .color(0xb2c3e7) @@ -136,39 +150,81 @@ const registerTFGNuclearMaterials = (event) => { // FLiBe Line - event.create('raw_rich_brine') - .liquid(new GTFluidBuilder().customStill().temperature(293)) + event.create('tfg:raw_rich_brine') + .liquid(new GTFluidBuilder().temperature(293)) + .color(0xf2b257) + .secondaryColor(0xcd8dbc) - event.create('hot_iodine_brine') - .liquid(new GTFluidBuilder().customStill().temperature(293)) + event.create('tfg:hot_iodine_brine') + .liquid(new GTFluidBuilder().temperature(293)) .components('1x hydrogen', '1x iodine', '1x magnesium', '1x chlorine', '1x unknown') .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) + .color(0xf26c57) + .secondaryColor(0xcd8dbc) - event.create('brominated_iodine_vapor') - .gas(new GTFluidBuilder().state(GTFluidState.GAS).customStill().temperature(412)) + event.create('tfg:brominated_iodine_vapor') + .gas(new GTFluidBuilder().state(GTFluidState.GAS).temperature(412)) .components('1x hydrogen', '1x iodine', '1x unknown') .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) + .color(0xf5f1b5) + .secondaryColor(0xcd8dbc) - event.create('basic_bromine_exhaust') - .gas(new GTFluidBuilder().state(GTFluidState.GAS).customStill().temperature(406)) + event.create('tfg:basic_bromine_exhaust') + .gas(new GTFluidBuilder().state(GTFluidState.GAS).temperature(406)) .components('1x bromine', '1x unknown') .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) + .color(0xf5bbb5) + .secondaryColor(0xcd8dbc) - event.create('flibe') + event.create('tfg:flibe') .liquid(new GTFluidBuilder().customStill().temperature(293)) .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) .components('1x fluorine', '1x lithium', '1x beryllium') - event.create('dirty_flibe') - .liquid(new GTFluidBuilder().customStill().temperature(293)) + event.create('tfg:dirty_flibe') + .liquid(new GTFluidBuilder().temperature(293)) .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) .components('1x flibe', '1x unknown') + .color(0xdaffd6) + .secondaryColor(0xcd8dbc) - event.create('hot_flibe') + event.create('tfg:hot_flibe') .liquid(new GTFluidBuilder().customStill().temperature(3293)) .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) .components('1x flibe') + // Material Fission Earth + + event.create('boron_10') + .dust() + .element(GTElements.get("boron_10")) + .iconSet(GTMaterialIconSet.DULL) + .flags(GTMaterialFlags.DISABLE_MATERIAL_RECIPES) + .color(0xbffdbf) + .secondaryColor(0x6d7058) + + event.create('caesium_137') + .dust() + .element(GTElements.get("caesium_137")) + .iconSet(GTMaterialIconSet.SHINY) + .flags(GTMaterialFlags.DISABLE_MATERIAL_RECIPES) + .color(0xFCB65C) + .secondaryColor(0x55461B) + + event.create('tfg:boron_thrichloride') + .gas(new GTFluidBuilder().state(GTFluidState.GAS).attribute(GTFluidAttributes.ACID).temperature(380)) + .components('1x boron', '3x chlorine') + .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) + .color(0xb3fcb9) + //.secondaryColor(0x9FAFB2) + + event.create('tfg:enriched_boron_thrichloride') + .gas(new GTFluidBuilder().state(GTFluidState.GAS).attribute(GTFluidAttributes.ACID).temperature(480)) + .components("boron_10", '3x chlorine') + .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) + .color(0x65db6f) + .secondaryColor(0x9FAFB2) + //#endregion //#region Dust @@ -199,6 +255,23 @@ const registerTFGNuclearMaterials = (event) => { .secondaryColor('0xffffff') .iconSet(GTMaterialIconSet.RADIOACTIVE) + event.create('tfg:boron_10_hydroxide') + .dust() + .components('boron_10', '2x oxygen', '1x hydrogen') + .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) + .color(0x8ee8a6) + .secondaryColor('0xffffff') + .iconSet(GTMaterialIconSet.RADIOACTIVE) + + event.create('tfg:sodium_deuteroxide') + .dust() + .components('1x sodium', '2x deuterium', '1x oxygen') + .formula('NaOD') + .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) + .color(0xfef8f6) + .secondaryColor('0xffffff') + .iconSet(GTMaterialIconSet.NETHERSTAR) + // FLiBe Dusts event.create('lithium_carbonate') @@ -233,7 +306,7 @@ const registerTFGNuclearMaterials = (event) => { .ingot() .element(GTElements.get("thorium_230")) .iconSet(GTMaterialIconSet.RADIOACTIVE) - .flags(GTMaterialFlags.GENERATE_ROD) + .flags(GTMaterialFlags.GENERATE_ROD, GTMaterialFlags.GENERATE_LONG_ROD) .color(0xf8a8c0) .secondaryColor(0xcd8dbc) .radioactiveHazard(1000000) @@ -242,35 +315,35 @@ const registerTFGNuclearMaterials = (event) => { .ingot() .element(GTElements.get("thorium_232")) .iconSet(GTMaterialIconSet.RADIOACTIVE) - .flags(GTMaterialFlags.GENERATE_ROD) + .flags(GTMaterialFlags.GENERATE_ROD, GTMaterialFlags.GENERATE_LONG_ROD) .color(0x694c66) .radioactiveHazard(1000) - event.create('tfg:americium_241') + event.create('americium_241') .ingot() .element(GTElements.get("americium_241")) .iconSet(GTMaterialIconSet.RADIOACTIVE) .flags(GTMaterialFlags.GENERATE_ROD) - .color(0x0600ff) - .secondaryColor(0x1b1d36) + .color(0x648ABA) + .secondaryColor(0x999900) .radioactiveHazard(1000000) - event.create('tfg:neptunium_237') + event.create('neptunium_237') .ingot() .element(GTElements.get("neptunium_237")) .iconSet(GTMaterialIconSet.RADIOACTIVE) .flags(GTMaterialFlags.GENERATE_ROD) .color(0x00df98) - .secondaryColor(0xffffff) + .secondaryColor(0x66ff00) .radioactiveHazard(5000000) - event.create('tfg:californium_252') + event.create('californium_252') .ingot() .element(GTElements.get("californium_252")) .iconSet(GTMaterialIconSet.RADIOACTIVE) .flags(GTMaterialFlags.GENERATE_ROD) .color(0xffba00) - .secondaryColor(0xdfffff) + .secondaryColor(0xA85A12) .radioactiveHazard(10000000) //#endregion @@ -324,73 +397,73 @@ const registerTFGNuclearMaterials = (event) => { //#region Isotopic Solvent - // Organic Stabilizer + // Organic Stabilizer event.create('tfg:organic_stabilizer') - .dust() - .components('49x carbon', '64x hydrogen', '6x oxygen', '1x nitrogen', '1x chlorine') - .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) - .color(0xd8c9b5) - .secondaryColor(0xb8a896) + .dust() + .components('31x carbon', '46x hydrogen', '3x oxygen', '1x nitrogen', '1x chlorine') + .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) + .color(0xd8c9b5) + .secondaryColor(0xb8a896) .iconSet(GTMaterialIconSet.BRIGHT) // Trace Catalyst Salt - E event.create('tfg:trace_catalyst_salt_e') - .dust() - .components( - '2x carbon', - '9x hydrogen', - '8x oxygen', - '1x copper', - '1x sodium', - '1x chlorine', - '1x magnesium', - '1x fluorine', - '1x sulfur') - .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) - .color(0xcad4cf) - .secondaryColor(0x9eb1a9) + .dust() + .components( + '2x carbon', + '9x hydrogen', + '8x oxygen', + '1x copper', + '1x sodium', + '1x chlorine', + '1x magnesium', + '1x fluorine', + '1x sulfur') + .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) + .color(0xcad4cf) + .secondaryColor(0x9eb1a9) .iconSet(GTMaterialIconSet.EMERALD) // Sodium Fluoride event.create('tfg:sodium_fluoride') - .dust() - .components('1x sodium', '1x fluorine') - .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) - .color(0xffffff) - .secondaryColor(0xb7b9bd) + .dust() + .components('1x sodium', '1x fluorine') + .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) + .color(0xffffff) + .secondaryColor(0xb7b9bd) .iconSet(GTMaterialIconSet.ROUGH) // Copper Trace Catalyst Dust - event.create('tfg:copper_trace_catalyst_dust') - .dust() - .components('1x copper', '1x sodium', '1x chlorine', '1x magnesium', '1x fluorine', '1x sulfur', '6x oxygen', '1x hydrogen') - .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) - .color(0x4a2e1a) - .secondaryColor(0x7a5c47) + event.create('tfg:copper_trace_catalyst') + .dust() + .components('1x copper', '1x sodium', '1x chlorine', '1x magnesium', '1x fluorine', '1x sulfur', '6x oxygen', '1x hydrogen') + .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) + .color(0x4a2e1a) + .secondaryColor(0x7a5c47) .iconSet(GTMaterialIconSet.FINE) // Isotopic Solvent event.create('tfg:isotopic_solvent') - .liquid(new GTFluidBuilder().temperature(320)) - .components( - '51x carbon', - '75x hydrogen', - '15x oxygen', - '1x nitrogen', - '2x chlorine', - '2x sodium', - '2x fluorine', - '1x copper', - '1x magnesium', - '1x sulfur', - '1x argon') - .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) - .color(0xd4b464) - .secondaryColor(0xa88e55) + .liquid(new GTFluidBuilder().customStill().temperature(320)) + .components( + '33x carbon', + '57x hydrogen', + '12x oxygen', + '1x nitrogen', + '2x chlorine', + '2x sodium', + '2x fluorine', + '1x copper', + '1x magnesium', + '1x sulfur', + '1x argon') + .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) + .color(0xd4b464) + .secondaryColor(0xa88e55) // Degraded Solvent Stream event.create('tfg:degraded_solvent_stream') - .liquid(new GTFluidBuilder().temperature(350)) + .liquid(new GTFluidBuilder().customStill().temperature(350)) .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) .color(0x8b4513) .secondaryColor(0xd2b48c) @@ -440,6 +513,19 @@ const registerTFGNuclearMaterials = (event) => { .color(0xff4500) .secondaryColor(0xff6347) + // High Grade + + event.create('tfg:high_grade_isotopic_solvent') + .liquid(new GTFluidBuilder().customStill().temperature(300)) + .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) + .color(0xfc7303) + .secondaryColor(0xfcf403) + + event.create('tfg:degraded_high_grade_isotopic_solvent') + .liquid(new GTFluidBuilder().customStill().temperature(300)) + .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) + .color(0xfc7303) + .secondaryColor(0xfcf403) }; @@ -485,12 +571,14 @@ StartupEvents.registry("item", (event) => { } }; - fuel("thorium_rod", 5000, 1, 0.7, false); // Max Heat 139 - 1 Fuel - fuel("uranium_rod", 20000, 1, 2.2, false); // Max Heat 435 - 1 Fuel - fuel("plutonium_rod", 30000, 4, 3, false); // Max Heat 595 - 1 Fuel - fuel("tbu_232_rod", 10000, 1, 2); // Max Heat 396 - 1 Fuel + fuel("thorium_rod", 5000, 1, 0.7); // Max Heat 139 - 1 Fuel + fuel("uranium_rod", 20000, 1, 2.2); // Max Heat 435 - 1 Fuel + fuel("plutonium_rod", 30000, 1, 3); // Max Heat 595 - 1 Fuel + + fuel("tbu_232_rod", 5000, 1, 2); // Max Heat 396 - 1 Fuel + + fuel("americium_241_rod", 5000000, 1, 0.5); // Max Heat 99 - 1 Fuel + fuel("neptunium_237_rod", 100000, 1, 2); // Max Heat 396 - 1 Fuel + fuel("californium_252_rod", 500000, 1, 4); // Max Heat 792 - 1 Fuel - fuel("americium_241_rod", 1000000, 1, 0.5); - fuel("neptunium_237_rod", 50000, 1, 2); - fuel("californium_252_rod", 500000, 1, 4); }); diff --git a/kubejs/startup_scripts/tfg/primitive/items.primitive.js b/kubejs/startup_scripts/tfg/primitive/items.primitive.js index 1e5da063f..fcc217dd5 100644 --- a/kubejs/startup_scripts/tfg/primitive/items.primitive.js +++ b/kubejs/startup_scripts/tfg/primitive/items.primitive.js @@ -25,7 +25,6 @@ function registerTFGPrimitiveItems(event) { // Chipboard event.create('tfg:chipboard_composite') event.create('tfg:treated_chipboard_composite') - event.create('tfg:high_density_treated_fiberboard') // Wax event.create('tfg:paraffin_wax') diff --git a/kubejs/startup_scripts/tfg/primitive/materials.primitive.js b/kubejs/startup_scripts/tfg/primitive/materials.primitive.js index 9edbd241e..1d6a7b7fd 100644 --- a/kubejs/startup_scripts/tfg/primitive/materials.primitive.js +++ b/kubejs/startup_scripts/tfg/primitive/materials.primitive.js @@ -94,5 +94,35 @@ function registerTFGPrimitiveMaterials(event) { .dust() .color(0xf0ccb4) .formula("C6H3(OH)3") - .iconSet('rough') + .iconSet(GTMaterialIconSet.ROUGH) + + // Fire clay + event.create('tfg:refractory_clay') + .dust() + .iconSet(GTMaterialIconSet.ROUGH) + .color(0xB49AA2) + .secondaryColor(0x60545F) + + // Weak colored steel + event.create('tfg:weak_blue_steel') + .dust() + .ingot() + .liquid() + .components('1x sterling_silver', '1x bismuth_bronze', '2x steel', '4x black_steel') + .blastTemp(1000, null, GTValues.VA[GTValues.MV], 25 * 20) + .color(0x697FBD) + .secondaryColor(0x384B82) + .flags(GTMaterialFlags.DISABLE_DECOMPOSITION, GTMaterialFlags.NO_SMELTING, GTMaterialFlags.DISABLE_ALLOY_BLAST) + .iconSet(GTMaterialIconSet.METALLIC) + + event.create('tfg:weak_red_steel') + .dust() + .ingot() + .liquid() + .components('1x brass', '1x rose_gold', '2x steel', '4x black_steel') + .blastTemp(1000, null, GTValues.VA[GTValues.MV], 25 * 20) + .color(0xB55C5C) + .secondaryColor(0x7D3232) + .flags(GTMaterialFlags.DISABLE_DECOMPOSITION, GTMaterialFlags.NO_SMELTING, GTMaterialFlags.DISABLE_ALLOY_BLAST) + .iconSet(GTMaterialIconSet.METALLIC) } \ No newline at end of file diff --git a/kubejs/startup_scripts/tfg/sounds.js b/kubejs/startup_scripts/tfg/sounds.js index b169ac3d1..f6325cc71 100644 --- a/kubejs/startup_scripts/tfg/sounds.js +++ b/kubejs/startup_scripts/tfg/sounds.js @@ -7,23 +7,31 @@ function registerTFGSounds(event) { event.create('tfg:ambient.upper_nether_cave.loop') event.create('tfg:ambient.upper_nether.additions') event.create('tfg:ambient.upper_nether.mood') - event.create('tfg:ambient.lower_nether.loop') event.create('tfg:ambient.lower_nether.additions') event.create('tfg:ambient.lower_nether.mood') + event.create('tfg:music.nether') + + event.create('tfg:music.orbit') event.create('tfg:ambient.moon.additions') event.create('tfg:ambient.moon.mood') + event.create('tfg:music.moon') event.create('tfg:ambient.mars_desert.loop') event.create('tfg:ambient.mars_desert.additions') event.create('tfg:ambient.mars_desert.mood') - event.create('tfg:ambient.mars_land.loop') event.create('tfg:ambient.mars_land.additions') event.create('tfg:ambient.mars_land.mood') + event.create('tfg:music.mars') event.create('tfg:ambient.venus_surface.loop') event.create('tfg:ambient.venus_surface.additions') event.create('tfg:ambient.venus_surface.mood') + event.create('tfg:music.venus') + + event.create('tfg:music.mercury') + + event.create('tfg:music.europa') } \ No newline at end of file diff --git a/kubejs/startup_scripts/tfg/stone_types/constants.rocks.js b/kubejs/startup_scripts/tfg/stone_types/constants.rocks.js index 5e13faaa9..0154cb35a 100644 --- a/kubejs/startup_scripts/tfg/stone_types/constants.rocks.js +++ b/kubejs/startup_scripts/tfg/stone_types/constants.rocks.js @@ -1051,7 +1051,7 @@ global.BIG_ROCK_TABLE = /** @type {{String, RockType}} */ ({ "ochrum": { material: 'ochrum', collapsible: false, - dimensions: ['ad_astra:mars'], + dimensions: ['ad_astra:mars', 'ad_astra:venus'], pillar: 'create:ochrum_pillar', pillar2: 'create:layered_ochrum', stonecutterTag: 'create:stone_types/ochrum', @@ -1066,7 +1066,7 @@ global.BIG_ROCK_TABLE = /** @type {{String, RockType}} */ ({ "crimsite": { material: 'crimsite', collapsible: false, - dimensions: ['ad_astra:venus'], + dimensions: ['ad_astra:venus', 'ad_astra:mercury'], pillar: 'create:crimsite_pillar', pillar2: 'create:layered_crimsite', stonecutterTag: 'create:stone_types/crimsite', diff --git a/kubejs/startup_scripts/tfg/stone_types/tag_prefixes.rocks.js b/kubejs/startup_scripts/tfg/stone_types/tag_prefixes.rocks.js index 81354e3ef..594ddc170 100644 --- a/kubejs/startup_scripts/tfg/stone_types/tag_prefixes.rocks.js +++ b/kubejs/startup_scripts/tfg/stone_types/tag_prefixes.rocks.js @@ -2,7 +2,8 @@ "use strict"; const registerTFGRocksTagPrefixes = (event) => { - + + TagPrefix.ORES.remove(TagPrefix.oreDeepslate) TagPrefix.ORES.remove(TagPrefix.oreTuff) TagPrefix.ORES.remove(TagPrefix.oreSand) TagPrefix.ORES.remove(TagPrefix.oreRedSand) @@ -15,6 +16,7 @@ const registerTFGRocksTagPrefixes = (event) => { TagPrefix.ORES.remove(TagPrefix.oreAndesite) TagPrefix.ORES.remove(TagPrefix.oreDiorite) TagPrefix.ORES.remove(TagPrefix.oreGranite) + TagPrefix.ORES.remove(TagPrefix.oreRedGranite) const shouldGenerateOre = (material) => { return material.hasProperty(PropertyKey.ORE); @@ -46,6 +48,15 @@ const registerTFGRocksTagPrefixes = (event) => { TFGHelpers.registerCobbleBlock('pyroxenite', 'tfg:rock/cobble_blackstone'); + event.create('deepslate', 'ore') + .stateSupplier(() => Block.getBlock('minecraft:deepslate').defaultBlockState()) + .baseModelLocation('minecraft:block/deepslate') + .unificationEnabled(true) + .materialIconType(GTMaterialIconType.ore) + .generationCondition(shouldGenerateOre) + + TFGHelpers.registerCobbleBlock('deepslate', 'minecraft:cobbled_deepslate'); + event.create('dripstone', 'ore') .stateSupplier(() => Block.getBlock('minecraft:dripstone_block').defaultBlockState()) .baseModelLocation('minecraft:block/dripstone_block') @@ -108,4 +119,31 @@ const registerTFGRocksTagPrefixes = (event) => { .generationCondition(shouldGenerateOre) TFGHelpers.registerCobbleBlock('glacio_stone', 'ad_astra:glacio_cobblestone'); + + event.create('red_granite', 'ore') + .stateSupplier(() => Block.getBlock('tfg:rock/hardened_red_granite').defaultBlockState()) + .baseModelLocation('gtceu:block/red_granite') + .unificationEnabled(true) + .materialIconType(GTMaterialIconType.ore) + .generationCondition(shouldGenerateOre) + + TFGHelpers.registerCobbleBlock('red_granite', 'gtceu:red_granite_cobblestone'); + + event.create('flavolite', 'ore') + .stateSupplier(() => Block.getBlock('tfg:rock/hardened_flavolite').defaultBlockState()) + .baseModelLocation('betterend:block/flavolite') + .unificationEnabled(true) + .materialIconType(GTMaterialIconType.ore) + .generationCondition(shouldGenerateOre) + + TFGHelpers.registerCobbleBlock('flavolite', 'tfg:rock/cobble_flavolite'); + + event.create('sandy_jadestone', 'ore') + .stateSupplier(() => Block.getBlock('tfg:rock/hardened_sandy_jadestone').defaultBlockState()) + .baseModelLocation('betterend:block/sandy_jadestone') + .unificationEnabled(true) + .materialIconType(GTMaterialIconType.ore) + .generationCondition(shouldGenerateOre) + + TFGHelpers.registerCobbleBlock('sandy_jadestone', 'tfg:rock/cobble_sandy_jadestone'); } \ 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 695ed3041..c3bbdfbfe 100644 --- a/kubejs/startup_scripts/tfg/tag_prefixes.js +++ b/kubejs/startup_scripts/tfg/tag_prefixes.js @@ -20,6 +20,9 @@ function registerTFGTagPrefixes(event) { TagPrefix.ingot.setIgnored(GTMaterials.RawRubber); TagPrefix.plate.setIgnored(GTMaterials.RawRubber); TagPrefix.plateDouble.setIgnored(GTMaterials.RawRubber); + + TagPrefix.nugget.setIgnored(GTMaterials.get('tfg:magnesia_refractory_brick')) + TagPrefix.block.setIgnored(GTMaterials.get('tfg:magnesia_refractory_brick')) } function excludeAllGemsButNormal(material) { diff --git a/kubejs/startup_scripts/tfg/venus/blocks.venus_deco.js b/kubejs/startup_scripts/tfg/venus/blocks.venus_deco.js index 0a7be13f0..c142430a7 100644 --- a/kubejs/startup_scripts/tfg/venus/blocks.venus_deco.js +++ b/kubejs/startup_scripts/tfg/venus/blocks.venus_deco.js @@ -335,7 +335,7 @@ function registerTFGWorldGenVenusDecoBlocks(event) { event.create('betterend:shadow_plant', 'tfg:decorative_plant') .soundType('crop') - .mapColor('color_black') + .mapColor('none') .box(3, 0, 3, 13, 10, 13) .tagItem('tfg:venus_plants') .tagBlock('tfg:do_not_destroy_in_space') @@ -343,7 +343,7 @@ function registerTFGWorldGenVenusDecoBlocks(event) { event.create('betterend:twisted_vine', 'tfg:tall_decorative_plant') .height(3) .soundType('crop') - .mapColor('color_black') + .mapColor('none') .box(3, 0, 3, 13, 16, 13) .tagItem('tfg:venus_plants') .tagBlock('tfg:do_not_destroy_in_space') diff --git a/kubejs/startup_scripts/tfg/worldgen/fauna.js b/kubejs/startup_scripts/tfg/worldgen/fauna.js index 46141c358..98a64bcf4 100644 --- a/kubejs/startup_scripts/tfg/worldgen/fauna.js +++ b/kubejs/startup_scripts/tfg/worldgen/fauna.js @@ -10,6 +10,9 @@ TFCEvents.registerFaunas(event => { event.replace("wan_ancient_beasts:walker", "on_ground", "ocean_floor"); event.replace("wan_ancient_beasts:eater", "on_ground", "ocean_floor"); event.replace("wan_ancient_beasts:crusher", "on_ground", "ocean_floor"); + event.replace("wan_ancient_beasts:snatcher", "on_ground", "ocean_floor"); + event.replace("wan_ancient_beasts:charger", "on_ground", "ocean_floor"); + event.replace("wan_ancient_beasts:raider", "on_ground", "ocean_floor"); event.replace("wan_ancient_beasts:soarer", "no_restrictions", "world_surface"); event.replace("wan_ancient_beasts:glider", "no_restrictions", "world_surface"); diff --git a/kubejs/startup_scripts/wan_ancient_beasts/constants.js b/kubejs/startup_scripts/wan_ancient_beasts/constants.js index 6e5c22a5a..da44bc411 100644 --- a/kubejs/startup_scripts/wan_ancient_beasts/constants.js +++ b/kubejs/startup_scripts/wan_ancient_beasts/constants.js @@ -49,5 +49,46 @@ global.WAB_DISABLED_ITEMS = [ 'wan_ancient_beasts:blue_hang_glider', 'wan_ancient_beasts:purple_hang_glider', 'wan_ancient_beasts:magenta_hang_glider', - 'wan_ancient_beasts:pink_hang_glider' + 'wan_ancient_beasts:pink_hang_glider', + 'wan_ancient_beasts:paleo_table', + 'wan_ancient_beasts:shrieking_horn', + 'wan_ancient_beasts:spectral_horn', + 'wan_ancient_beasts:nasty_stew', + 'wan_ancient_beasts:rafflesia_seeds', + 'wan_ancient_beasts:sundew_seeds', + 'wan_ancient_beasts:bellflower_seeds', + 'wan_ancient_beasts:moonflower', + 'wan_ancient_beasts:equisetum_seeds', + 'wan_ancient_beasts:olden_moss_carpet', + 'wan_ancient_beasts:olden_moss_block', + 'wan_ancient_beasts:amber_ginkgo_seeds', + 'wan_ancient_beasts:verdant_ginkgo_seeds', + 'wan_ancient_beasts:amber_ginkgo_sapling', + 'wan_ancient_beasts:verdant_ginkgo_sapling', + 'wan_ancient_beasts:amber_ginkgo_leaves', + 'wan_ancient_beasts:verdant_ginkgo_leaves', + 'wan_ancient_beasts:ginkgo_log', + 'wan_ancient_beasts:stripped_ginkgo_log', + 'wan_ancient_beasts:ginkgo_wood', + 'wan_ancient_beasts:stripped_ginkgo_wood', + 'wan_ancient_beasts:ginkgo_planks', + 'wan_ancient_beasts:ginkgo_stairs', + 'wan_ancient_beasts:ginkgo_slab', + 'wan_ancient_beasts:ginkgo_fence', + 'wan_ancient_beasts:ginkgo_fence_gate', + 'wan_ancient_beasts:ginkgo_door', + 'wan_ancient_beasts:ginkgo_trapdoor', + 'wan_ancient_beasts:ginkgo_pressure_plate', + 'wan_ancient_beasts:ginkgo_button', + 'wan_ancient_beasts:ginkgo_sign', + 'wan_ancient_beasts:ginkgo_hanging_sign', + 'wan_ancient_beasts:ginkgo_boat', + 'wan_ancient_beasts:ginkgo_chest_boat', + 'wan_ancient_beasts:petrified_log', + 'wan_ancient_beasts:stripped_petrified_log', + 'wan_ancient_beasts:petrified_wood', + 'wan_ancient_beasts:stripped_petrified_wood', + 'wan_ancient_beasts:horns_pottery_sherd', + 'wan_ancient_beasts:loot_pottery_sherd', + 'wan_ancient_beasts:steal_pottery_sherd' ] \ No newline at end of file diff --git a/pakku-lock.json b/pakku-lock.json index 1d4e80d90..c711894cf 100644 --- a/pakku-lock.json +++ b/pakku-lock.json @@ -187,7 +187,8 @@ }, { "pakku_id": "tIIGT85PQd5pJGf0", - "type": "MOD", + "type": "RESOURCE_PACK", + "side": "CLIENT", "slug": { "github": "Frontiers-PackForge/AE2-Midnight-and-Daybreak" }, @@ -990,7 +991,7 @@ "files": [ { "type": "modrinth", - "file_name": "AmbientSounds_FORGE_v6.3.3_mc1.20.1.jar", + "file_name": "AmbientSounds_FORGE_v6.3.4_mc1.20.1.jar", "mc_versions": [ "1.20.1" ], @@ -999,22 +1000,22 @@ "neoforge" ], "release_type": "release", - "url": "https://cdn.modrinth.com/data/fM515JnW/versions/C1kWrOvd/AmbientSounds_FORGE_v6.3.3_mc1.20.1.jar", - "id": "C1kWrOvd", + "url": "https://cdn.modrinth.com/data/fM515JnW/versions/viZ543s0/AmbientSounds_FORGE_v6.3.4_mc1.20.1.jar", + "id": "viZ543s0", "parent_id": "fM515JnW", "hashes": { - "sha512": "ce045384b4e31a4e3a2138225ff94ab549981a1c1eed8d0659efec0a6e78e272f3f72f075d766829ff5ca52cbf2e4c2ff6445b542cbb88925b2cf2f1d0f028c8", - "sha1": "b4a0e4937db9c83ec82a6809f8d53ab2b9e7a62c" + "sha512": "ae49643430fd3d8b2efd295db912c79eb557b470c99cfa0d3cb38fa27cf5fa42b7db20bd85c877469db3bae000c11329e94adf44da60438c36c95a296e1bc49b", + "sha1": "e84e7053c4c3a73c7f608c9da516bb5d393aab60" }, "required_dependencies": [ "OsZiaDHq" ], - "size": 53428829, - "date_published": "2026-01-09T09:26:23.471842Z" + "size": 53428834, + "date_published": "2026-01-30T11:52:35.658838Z" }, { "type": "curseforge", - "file_name": "AmbientSounds_FORGE_v6.3.3_mc1.20.1.jar", + "file_name": "AmbientSounds_FORGE_v6.3.4_mc1.20.1.jar", "mc_versions": [ "1.20.1" ], @@ -1023,18 +1024,18 @@ "neoforge" ], "release_type": "release", - "url": "https://edge.forgecdn.net/files/7436/598/AmbientSounds_FORGE_v6.3.3_mc1.20.1.jar", - "id": "7436598", + "url": "https://edge.forgecdn.net/files/7550/220/AmbientSounds_FORGE_v6.3.4_mc1.20.1.jar", + "id": "7550220", "parent_id": "254284", "hashes": { - "sha1": "b4a0e4937db9c83ec82a6809f8d53ab2b9e7a62c", - "md5": "75a5d7d61175d43ab56605814028134b" + "sha1": "e84e7053c4c3a73c7f608c9da516bb5d393aab60", + "md5": "cde6b48177d3581634514e848cde2622" }, "required_dependencies": [ "257814" ], - "size": 53428829, - "date_published": "2026-01-09T09:25:59.603Z" + "size": 53428834, + "date_published": "2026-01-30T11:52:13.223Z" } ] }, @@ -1464,27 +1465,6 @@ "modrinth": "OfKzpbRU" }, "files": [ - { - "type": "curseforge", - "file_name": "baguettelib-1.20.1-Forge-1.1.5.jar", - "mc_versions": [ - "1.20.1" - ], - "loaders": [ - "forge" - ], - "release_type": "release", - "url": "https://edge.forgecdn.net/files/7287/505/baguettelib-1.20.1-Forge-1.1.5.jar", - "id": "7287505", - "parent_id": "1264423", - "hashes": { - "sha1": "7aaab6216e7fc72e1606b1e35f1f56a18f01153f", - "md5": "21c32e7a3fcd7501915bf2b91d76df9b" - }, - "required_dependencies": [], - "size": 31868, - "date_published": "2025-12-02T22:51:20.803Z" - }, { "type": "modrinth", "file_name": "baguettelib-1.20.1-Forge-1.1.5.jar", @@ -1505,6 +1485,27 @@ "required_dependencies": [], "size": 31868, "date_published": "2025-12-19T20:09:42.978615Z" + }, + { + "type": "curseforge", + "file_name": "baguettelib-1.20.1-Forge-1.1.6.jar", + "mc_versions": [ + "1.20.1" + ], + "loaders": [ + "forge" + ], + "release_type": "release", + "url": "https://edge.forgecdn.net/files/7544/807/baguettelib-1.20.1-Forge-1.1.6.jar", + "id": "7544807", + "parent_id": "1264423", + "hashes": { + "sha1": "8d3c9551bbed4c2f2e8cb2b9a10d31bad4edb52d", + "md5": "f729a7d6d7b28ef14e4e8461a5396566" + }, + "required_dependencies": [], + "size": 31898, + "date_published": "2026-01-29T08:20:07.737Z" } ] }, @@ -3962,76 +3963,6 @@ } ] }, - { - "pakku_id": "Dzg6pHg5yCqd3AP6", - "pakku_links": [ - "Nw8xTCQngHA15ilh" - ], - "type": "MOD", - "side": "BOTH", - "slug": { - "curseforge": "create-stock-bridge", - "modrinth": "create-stock-bridge" - }, - "name": { - "curseforge": "Create Stock Bridge", - "modrinth": "Create Stock Bridge" - }, - "id": { - "curseforge": "1256341", - "modrinth": "V7mbOBO4" - }, - "files": [ - { - "type": "curseforge", - "file_name": "createstockbridge-1.20-0.1.5.jar", - "mc_versions": [ - "1.20.1" - ], - "loaders": [ - "forge" - ], - "release_type": "release", - "url": "https://edge.forgecdn.net/files/6784/442/createstockbridge-1.20-0.1.5.jar", - "id": "6784442", - "parent_id": "1256341", - "hashes": { - "sha1": "0fa15f11788e3bc3a812fc597ade17af33888952", - "md5": "1359e31326732aac28d21ded5371a9ef" - }, - "required_dependencies": [ - "223794", - "328085" - ], - "size": 170122, - "date_published": "2025-07-18T17:47:38.837Z" - }, - { - "type": "modrinth", - "file_name": "createstockbridge-1.20-0.1.5.jar", - "mc_versions": [ - "1.20.1" - ], - "loaders": [ - "forge" - ], - "release_type": "release", - "url": "https://cdn.modrinth.com/data/V7mbOBO4/versions/rzBecedb/createstockbridge-1.20-0.1.5.jar", - "id": "rzBecedb", - "parent_id": "V7mbOBO4", - "hashes": { - "sha512": "ff39b4dd4a024dcb8018bde41d0f77a9321be9b9c6314eb7ea2d5070876d735fc72c0d46b1b27db75fa099062a8f95eb9d860396dd6e9dbc8aae7018a651cd51", - "sha1": "0fa15f11788e3bc3a812fc597ade17af33888952" - }, - "required_dependencies": [ - "XxWD5pD3", - "LNytGWDc" - ], - "size": 170122, - "date_published": "2025-07-18T17:47:40.706650Z" - } - ] - }, { "pakku_id": "Fu7EpxmtyqTkOiMR", "type": "MOD", @@ -4051,7 +3982,7 @@ "files": [ { "type": "modrinth", - "file_name": "create_connected-1.1.10-mc1.20.1-all.jar", + "file_name": "create_connected-1.1.12-mc1.20.1-all.jar", "mc_versions": [ "1.20.1" ], @@ -4060,22 +3991,22 @@ "neoforge" ], "release_type": "release", - "url": "https://cdn.modrinth.com/data/Vg5TIO6d/versions/saiZ8AwJ/create_connected-1.1.10-mc1.20.1-all.jar", - "id": "saiZ8AwJ", + "url": "https://cdn.modrinth.com/data/Vg5TIO6d/versions/aN0bSww5/create_connected-1.1.12-mc1.20.1-all.jar", + "id": "aN0bSww5", "parent_id": "Vg5TIO6d", "hashes": { - "sha512": "0b885e09e0f074051120669337e0f53f42ca43a244cfde02f90b43da5a09853f92715371a9377c542886a673aefeda6f01becd3cb4b1e012d300618f1e33dce8", - "sha1": "329b9417c0fd52f0a5a153de31d7d075c521e900" + "sha512": "197488682615350b777c9f803c58a870fab3f775f044a8c1aae44810b0f9a93a5ff05bc54b1d6a5d962d5b6db78dfb5c33c6cf0e2373f261b89834e0dc2cd67a", + "sha1": "d984c4502c0ed9a997dafc707b3cee2a4a65167e" }, "required_dependencies": [ "LNytGWDc" ], - "size": 6567116, - "date_published": "2025-11-23T02:14:34.172787Z" + "size": 6566880, + "date_published": "2026-02-01T02:48:57.370419Z" }, { "type": "curseforge", - "file_name": "create_connected-1.1.10-mc1.20.1-all.jar", + "file_name": "create_connected-1.1.12-mc1.20.1-all.jar", "mc_versions": [ "1.20.1" ], @@ -4084,18 +4015,18 @@ "neoforge" ], "release_type": "release", - "url": "https://edge.forgecdn.net/files/7251/637/create_connected-1.1.10-mc1.20.1-all.jar", - "id": "7251637", + "url": "https://edge.forgecdn.net/files/7558/612/create_connected-1.1.12-mc1.20.1-all.jar", + "id": "7558612", "parent_id": "947914", "hashes": { - "sha1": "eea1d04aee638689a99acf66457327b13a4b3f96", - "md5": "b119043b5504991e86a5d7d06734f49b" + "sha1": "6a27b27ad502429650fa621009daacc876bd3e28", + "md5": "eccd418f036339b09ec505db7a3f82d4" }, "required_dependencies": [ "328085" ], - "size": 6567117, - "date_published": "2025-11-23T02:14:45.303Z" + "size": 6566879, + "date_published": "2026-02-01T02:49:13.020Z" } ] }, @@ -4944,24 +4875,24 @@ "files": [ { "type": "curseforge", - "file_name": "domum_ornamentum-1.20.1-1.0.295-snapshot-universal.jar", + "file_name": "domum_ornamentum-1.20.1-1.0.295-universal.jar", "mc_versions": [ "1.20.1" ], "loaders": [ "forge" ], - "release_type": "beta", - "url": "https://edge.forgecdn.net/files/7421/161/domum_ornamentum-1.20.1-1.0.295-snapshot-universal.jar", - "id": "7421161", + "release_type": "release", + "url": "https://edge.forgecdn.net/files/7530/695/domum_ornamentum-1.20.1-1.0.295-universal.jar", + "id": "7530695", "parent_id": "527361", "hashes": { - "sha1": "f5fc47a7006445e4f999611d1cc95bda55c70b1f", - "md5": "e85e022d42829065eb6f3d804abeb9d0" + "sha1": "29950245b98ec35184d806e3b9ace700e67ac585", + "md5": "2f8435a8c43ebff6df70299ea212b336" }, "required_dependencies": [], - "size": 1141562, - "date_published": "2026-01-05T14:36:53.033Z" + "size": 1141554, + "date_published": "2026-01-26T15:27:31.327Z" } ] }, @@ -6275,7 +6206,7 @@ "files": [ { "type": "curseforge", - "file_name": "FastSuite-1.20.1-5.1.1.jar", + "file_name": "FastSuite-1.20.1-5.1.2.jar", "mc_versions": [ "1.20.1" ], @@ -6284,18 +6215,18 @@ "neoforge" ], "release_type": "release", - "url": "https://edge.forgecdn.net/files/7428/292/FastSuite-1.20.1-5.1.1.jar", - "id": "7428292", + "url": "https://edge.forgecdn.net/files/7527/943/FastSuite-1.20.1-5.1.2.jar", + "id": "7527943", "parent_id": "475117", "hashes": { - "sha1": "dfceb81524a9e1be19bf89d0281c05b6edf5326c", - "md5": "806f80e876eff6f121c8b508825ce368" + "sha1": "32ea4495b0e646f8f060e4e97d17044dd9fdefbd", + "md5": "efca8ff65bbf93e3a0f776998ee181e9" }, "required_dependencies": [ "283644" ], - "size": 26603, - "date_published": "2026-01-07T04:03:31.723Z" + "size": 26600, + "date_published": "2026-01-26T00:38:18.357Z" } ] }, @@ -6834,7 +6765,7 @@ "files": [ { "type": "modrinth", - "file_name": "fzzy_config-0.7.5+1.20.1+forge.jar", + "file_name": "fzzy_config-0.7.6+1.20.1+forge.jar", "mc_versions": [ "1.20.1" ], @@ -6843,22 +6774,22 @@ "neoforge" ], "release_type": "release", - "url": "https://cdn.modrinth.com/data/hYykXjDp/versions/Dt5erL4a/fzzy_config-0.7.5+1.20.1+forge.jar", - "id": "Dt5erL4a", + "url": "https://cdn.modrinth.com/data/hYykXjDp/versions/7MmXhjWs/fzzy_config-0.7.6+1.20.1+forge.jar", + "id": "7MmXhjWs", "parent_id": "hYykXjDp", "hashes": { - "sha512": "a5e86b8ea8a63bf8b9102b351314393aad5ede26b2480ae8ecaf55eefc482824a27e63ffa088a6d4e30a1ab814502f5e19bc77ac5a09e5120902f191ded59439", - "sha1": "7e890f8b527ccb4523fed54a2864549a53f65fed" + "sha512": "dff242c555006ddab4ffca5ca005b4186cfec3e9f5a9409dc15e91bf1e4eadb33508e458709d0b154b372e214ceb6d8cd343f1e718eb426db4570a292b0e4b0c", + "sha1": "2e9ca1c5f028c251e1bc18b9ebaa06d401c8e624" }, "required_dependencies": [ "ordsPcFz" ], - "size": 2372465, - "date_published": "2026-01-19T17:33:10.246513Z" + "size": 2374667, + "date_published": "2026-02-03T01:48:46.478341Z" }, { "type": "curseforge", - "file_name": "fzzy_config-0.7.5+1.20.1+forge.jar", + "file_name": "fzzy_config-0.7.6+1.20.1+forge.jar", "mc_versions": [ "1.20.1" ], @@ -6867,25 +6798,93 @@ "neoforge" ], "release_type": "release", - "url": "https://edge.forgecdn.net/files/7489/457/fzzy_config-0.7.5+1.20.1+forge.jar", - "id": "7489457", + "url": "https://edge.forgecdn.net/files/7568/893/fzzy_config-0.7.6+1.20.1+forge.jar", + "id": "7568893", "parent_id": "1005914", "hashes": { - "sha1": "7e890f8b527ccb4523fed54a2864549a53f65fed", - "md5": "0519be93c6e6b9183c9416031db4c715" + "sha1": "2e9ca1c5f028c251e1bc18b9ebaa06d401c8e624", + "md5": "f48f8112f6e2d161c655b750f6bfd0c8" }, "required_dependencies": [ "351264" ], - "size": 2372465, - "date_published": "2026-01-19T17:33:01.213Z" + "size": 2374667, + "date_published": "2026-02-03T01:48:37.523Z" + } + ] + }, + { + "pakku_id": "ebnVeibHypJ7c4sE", + "pakku_links": [ + "WN9DdLqsRKVeZIc9" + ], + "type": "MOD", + "side": "BOTH", + "slug": { + "curseforge": "gtceu-terminals", + "modrinth": "gtceu-terminals" + }, + "name": { + "curseforge": "GTCEu Terminals", + "modrinth": "GTCEu Terminals" + }, + "id": { + "curseforge": "1423461", + "modrinth": "jIBIhAO2" + }, + "files": [ + { + "type": "curseforge", + "file_name": "gtceuterminal-2.4.5.jar", + "mc_versions": [ + "1.20.1" + ], + "loaders": [ + "forge" + ], + "release_type": "release", + "url": "https://edge.forgecdn.net/files/7521/437/gtceuterminal-2.4.5.jar", + "id": "7521437", + "parent_id": "1423461", + "hashes": { + "sha1": "d0e5cd6b8d6d5fe89f9e24434c35a61bc0294896", + "md5": "973736c87b451d5eb8d601c27c5c1f65" + }, + "required_dependencies": [ + "890405" + ], + "size": 335658, + "date_published": "2026-01-25T00:45:57.250Z" + }, + { + "type": "modrinth", + "file_name": "gtceuterminal-2.4.5.jar", + "mc_versions": [ + "1.20.1" + ], + "loaders": [ + "forge" + ], + "release_type": "release", + "url": "https://cdn.modrinth.com/data/jIBIhAO2/versions/o6tXhJNB/gtceuterminal-2.4.5.jar", + "id": "o6tXhJNB", + "parent_id": "jIBIhAO2", + "hashes": { + "sha512": "acd26244ab41d7e7ee939b3e88127053e0c31217a31274f165750a77862ccc57116cb2dbc0ff9e76139e77f060d25029e6abd2c08f5dc1e75887e05495acd101", + "sha1": "d0e5cd6b8d6d5fe89f9e24434c35a61bc0294896" + }, + "required_dependencies": [ + "7tG215v7" + ], + "size": 335658, + "date_published": "2026-01-25T00:44:44.421732Z" } ] }, { "pakku_id": "ihA4iuyUc3fA0D4q", "type": "MOD", - "side": "CLIENT", + "side": "BOTH", "slug": { "curseforge": "geckolib", "modrinth": "geckolib" @@ -6899,30 +6898,9 @@ "modrinth": "8BmcQJ2H" }, "files": [ - { - "type": "curseforge", - "file_name": "geckolib-forge-1.20.1-4.8.2.jar", - "mc_versions": [ - "1.20.1" - ], - "loaders": [ - "forge" - ], - "release_type": "release", - "url": "https://edge.forgecdn.net/files/7025/129/geckolib-forge-1.20.1-4.8.2.jar", - "id": "7025129", - "parent_id": "388172", - "hashes": { - "sha1": "395a9f21a36dc8466d67c2af67a904e7013460d1", - "md5": "d1ff73da16b6fc163d6c5ed3d9734dde" - }, - "required_dependencies": [], - "size": 1038979, - "date_published": "2025-09-23T10:08:54.570Z" - }, { "type": "modrinth", - "file_name": "geckolib-forge-1.20.1-4.8.2.jar", + "file_name": "geckolib-forge-1.20.1-4.8.3.jar", "mc_versions": [ "1.20.1" ], @@ -6930,16 +6908,37 @@ "forge" ], "release_type": "release", - "url": "https://cdn.modrinth.com/data/8BmcQJ2H/versions/aVW7Z5da/geckolib-forge-1.20.1-4.8.2.jar", - "id": "aVW7Z5da", + "url": "https://cdn.modrinth.com/data/8BmcQJ2H/versions/HVdLnQMI/geckolib-forge-1.20.1-4.8.3.jar", + "id": "HVdLnQMI", "parent_id": "8BmcQJ2H", "hashes": { - "sha512": "8d8cb1f2d60c885b3b312aca63b94e3942e50ca40e96514f35fb74a39367afa07e4986640a66c66b035da9ea60cb6d8ff602e9c0b6b298e5ce584ad9f46a2f45", - "sha1": "395a9f21a36dc8466d67c2af67a904e7013460d1" + "sha512": "938f1f703fa77a2e05aad4afa1052260521badee006d29529d0ed4e2d3fbaae47c9ffbc95b5c4982c3386e7e7d6592c9c79df31597cc8238db41fc0b1e431db6", + "sha1": "fead1d1645e16cfa02f39113481ead355230f8fd" }, "required_dependencies": [], - "size": 1038979, - "date_published": "2025-09-23T10:09:01.034935Z" + "size": 1039047, + "date_published": "2026-01-31T01:40:17.094003Z" + }, + { + "type": "curseforge", + "file_name": "geckolib-forge-1.20.1-4.8.3.jar", + "mc_versions": [ + "1.20.1" + ], + "loaders": [ + "forge" + ], + "release_type": "release", + "url": "https://edge.forgecdn.net/files/7553/267/geckolib-forge-1.20.1-4.8.3.jar", + "id": "7553267", + "parent_id": "388172", + "hashes": { + "sha1": "5428765c6c2e2135da6ee01f2f0478fa0db6aee7", + "md5": "33b0f8fe0a8d59fcf9d4e222741ecba7" + }, + "required_dependencies": [], + "size": 1039046, + "date_published": "2026-01-31T01:40:51.330Z" } ] }, @@ -7101,7 +7100,7 @@ "files": [ { "type": "modrinth", - "file_name": "greate-0.0.62.jar", + "file_name": "greate-0.0.64.jar", "mc_versions": [ "1.20.1" ], @@ -7110,23 +7109,23 @@ "neoforge" ], "release_type": "alpha", - "url": "https://cdn.modrinth.com/data/8wDcQuht/versions/FDjUACYa/greate-0.0.62.jar", - "id": "FDjUACYa", + "url": "https://cdn.modrinth.com/data/8wDcQuht/versions/9flLlqpd/greate-0.0.64.jar", + "id": "9flLlqpd", "parent_id": "8wDcQuht", "hashes": { - "sha512": "8458d070ec94b6a130944f80a67a72fbf89d099e8378ab0a76eb0130eaa60f5e9af3d61b43f968694c78653a4c6f453b63a9fb8947910c06ad9934bd3c7c120e", - "sha1": "0e4ffe5e88f97df724172b3061a1691028f45582" + "sha512": "9f7d4f37fa720eeca5177263c4cd00f6812cd77063214061f31ef416123d51bc0a553f46393c1e0e3a548ef6d15b2da2bd6f703d80379d3ad084ee749c12b2c0", + "sha1": "7e779ac568c27ebb8cb9b16c6b8797b633ffdcdf" }, "required_dependencies": [ - "LNytGWDc", - "7tG215v7" + "7tG215v7", + "LNytGWDc" ], - "size": 1253198, - "date_published": "2026-01-13T16:37:04.520883Z" + "size": 1257336, + "date_published": "2026-01-24T05:55:41.391475Z" }, { "type": "curseforge", - "file_name": "greate-0.0.62.jar", + "file_name": "greate-0.0.64.jar", "mc_versions": [ "1.20.1" ], @@ -7135,19 +7134,19 @@ "neoforge" ], "release_type": "alpha", - "url": "https://edge.forgecdn.net/files/7455/72/greate-0.0.62.jar", - "id": "7455072", + "url": "https://edge.forgecdn.net/files/7516/28/greate-0.0.64.jar", + "id": "7516028", "parent_id": "901996", "hashes": { - "sha1": "0e4ffe5e88f97df724172b3061a1691028f45582", - "md5": "b4c8e38c9c69a88266d5eb64fcc21f18" + "sha1": "7e779ac568c27ebb8cb9b16c6b8797b633ffdcdf", + "md5": "31e92230efe5fc01d683e25fbe6a561c" }, "required_dependencies": [ - "328085", - "890405" + "890405", + "328085" ], - "size": 1253198, - "date_published": "2026-01-13T16:35:06.893Z" + "size": 1257336, + "date_published": "2026-01-24T05:55:39.687Z" } ] }, @@ -7230,7 +7229,7 @@ "files": [ { "type": "curseforge", - "file_name": "gtmoldraw-3.0.0.jar", + "file_name": "gtmoldraw-3.0.1.jar", "mc_versions": [ "1.20.1" ], @@ -7238,18 +7237,18 @@ "forge" ], "release_type": "release", - "url": "https://edge.forgecdn.net/files/7404/876/gtmoldraw-3.0.0.jar", - "id": "7404876", + "url": "https://edge.forgecdn.net/files/7529/672/gtmoldraw-3.0.1.jar", + "id": "7529672", "parent_id": "1348330", "hashes": { - "sha1": "9377694e2e3d8c62bdacd400e125acc732c54803", - "md5": "e6d36dbc5383b0649bbfa76a829c6170" + "sha1": "caaf28b88afe1b01ec4180a4458c2795184255bc", + "md5": "aae6cd78a4f17cbcbd2b0dc984fe4a8b" }, "required_dependencies": [ "890405" ], - "size": 907581, - "date_published": "2026-01-01T18:19:59.917Z" + "size": 908933, + "date_published": "2026-01-26T10:36:48.937Z" } ] }, @@ -7651,7 +7650,7 @@ "files": [ { "type": "modrinth", - "file_name": "ImmediatelyFast-Forge-1.5.3+1.20.4.jar", + "file_name": "ImmediatelyFast-Forge-1.5.4+1.20.4.jar", "mc_versions": [ "1.20", "1.20.1", @@ -7663,20 +7662,20 @@ "forge" ], "release_type": "release", - "url": "https://cdn.modrinth.com/data/5ZwdcRci/versions/a4stvpj6/ImmediatelyFast-Forge-1.5.3+1.20.4.jar", - "id": "a4stvpj6", + "url": "https://cdn.modrinth.com/data/5ZwdcRci/versions/OomXW3xp/ImmediatelyFast-Forge-1.5.4+1.20.4.jar", + "id": "OomXW3xp", "parent_id": "5ZwdcRci", "hashes": { - "sha512": "ef57ecc7aa7138c1b06fac6d6b49707d6ef324b6220cd604f567cfdbabd5b9ca0e76a2a4ed354d08029976c773f40c65b7692372a3f70637d7ae446be2b3ace0", - "sha1": "d4695d013e9da7089e2906db3f56bc5398e478e2" + "sha512": "b4a30951b41367cbf6567e38d7ddada4a381b430e2bd2d2b01e195d1a8c434e9811af61b28962c1152bf5c669f3ede2551694df4e1b500b35cdf78178aa9e9f0", + "sha1": "e2e60485a0c3efa72f1948c952b095150e3ba4fc" }, "required_dependencies": [], - "size": 426980, - "date_published": "2025-12-09T20:19:33.206344Z" + "size": 538992, + "date_published": "2026-01-27T21:06:43.866649Z" }, { "type": "curseforge", - "file_name": "ImmediatelyFast-Forge-1.5.3+1.20.4.jar", + "file_name": "ImmediatelyFast-Forge-1.5.4+1.20.4.jar", "mc_versions": [ "1.20.2", "1.20.1", @@ -7688,16 +7687,16 @@ "forge" ], "release_type": "release", - "url": "https://edge.forgecdn.net/files/7313/94/ImmediatelyFast-Forge-1.5.3+1.20.4.jar", - "id": "7313094", + "url": "https://edge.forgecdn.net/files/7537/759/ImmediatelyFast-Forge-1.5.4+1.20.4.jar", + "id": "7537759", "parent_id": "686911", "hashes": { - "sha1": "d4695d013e9da7089e2906db3f56bc5398e478e2", - "md5": "1e5278b2585bab1db76d4b1ab61e82c1" + "sha1": "e2e60485a0c3efa72f1948c952b095150e3ba4fc", + "md5": "8fb21bb328cc322c6d9749eff087509f" }, "required_dependencies": [], - "size": 426980, - "date_published": "2025-12-09T20:19:33.393Z" + "size": 538992, + "date_published": "2026-01-27T21:06:43.760Z" } ] }, @@ -8910,31 +8909,9 @@ "modrinth": "fJFETWDN" }, "files": [ - { - "type": "curseforge", - "file_name": "lootjs-forge-1.20.1-2.13.0.jar", - "mc_versions": [ - "1.20.1" - ], - "loaders": [ - "neoforge", - "forge" - ], - "release_type": "release", - "url": "https://edge.forgecdn.net/files/6508/899/lootjs-forge-1.20.1-2.13.0.jar", - "id": "6508899", - "parent_id": "570630", - "hashes": { - "sha1": "fdf90acf177c19bcbfaa08527f6568bd3e6e622e", - "md5": "1ddae5f49ca3200d67bcd32313875e19" - }, - "required_dependencies": [], - "size": 242227, - "date_published": "2025-05-08T14:06:39.737Z" - }, { "type": "modrinth", - "file_name": "lootjs-forge-1.20.1-2.13.0.jar", + "file_name": "lootjs-forge-1.20.1-2.13.1.jar", "mc_versions": [ "1.20.1" ], @@ -8943,16 +8920,38 @@ "neoforge" ], "release_type": "release", - "url": "https://cdn.modrinth.com/data/fJFETWDN/versions/RjTRvo4g/lootjs-forge-1.20.1-2.13.0.jar", - "id": "RjTRvo4g", + "url": "https://cdn.modrinth.com/data/fJFETWDN/versions/wltVDhRB/lootjs-forge-1.20.1-2.13.1.jar", + "id": "wltVDhRB", "parent_id": "fJFETWDN", "hashes": { - "sha512": "c8652b1ccffccd66885dc9dc89490afe46f055c9d9ede2fef24e06978db5957815e6125974670263ab15c1d60d7106954f4d10aff48cd7f1e04277e351d1aa2c", - "sha1": "fdf90acf177c19bcbfaa08527f6568bd3e6e622e" + "sha512": "c03a07caf451a272f8027a47bb951db73f19bb24d603b61f0328a1769568a98f3912ec6b7bf39218062add102cb8fa7b29ae4ca73731cfa2db09eaac8fcf1033", + "sha1": "804deb0bd34d69cad873170642b9d7e47fa0d6ad" }, "required_dependencies": [], - "size": 242227, - "date_published": "2025-05-08T14:06:39.621822Z" + "size": 242267, + "date_published": "2026-01-30T16:31:51.682167Z" + }, + { + "type": "curseforge", + "file_name": "lootjs-forge-1.20.1-2.13.1.jar", + "mc_versions": [ + "1.20.1" + ], + "loaders": [ + "forge", + "neoforge" + ], + "release_type": "release", + "url": "https://edge.forgecdn.net/files/7551/186/lootjs-forge-1.20.1-2.13.1.jar", + "id": "7551186", + "parent_id": "570630", + "hashes": { + "sha1": "804deb0bd34d69cad873170642b9d7e47fa0d6ad", + "md5": "0fbdbf49778f694de153bf5962ec03ee" + }, + "required_dependencies": [], + "size": 242267, + "date_published": "2026-01-30T16:31:51.313Z" } ] }, @@ -9435,7 +9434,7 @@ "files": [ { "type": "modrinth", - "file_name": "modernfix-forge-5.26.1+mc1.20.1.jar", + "file_name": "modernfix-forge-5.26.2+mc1.20.1.jar", "mc_versions": [ "1.20.1" ], @@ -9443,20 +9442,20 @@ "forge" ], "release_type": "release", - "url": "https://cdn.modrinth.com/data/nmDcB62a/versions/zSQuM6f3/modernfix-forge-5.26.1+mc1.20.1.jar", - "id": "zSQuM6f3", + "url": "https://cdn.modrinth.com/data/nmDcB62a/versions/Uvlhuprw/modernfix-forge-5.26.2+mc1.20.1.jar", + "id": "Uvlhuprw", "parent_id": "nmDcB62a", "hashes": { - "sha512": "af689fc986ea90026881cb928cef4d1cdb94030c77e111a4a4b560206c2754ad63b58a7df2990942c6808d692500a7b701a87ebb1665b0d2832d6119ad80c81c", - "sha1": "fa0163b33e911b69af61fee8a3920820e7c617a0" + "sha512": "46e6fb85c3097d3dedca0409fda83d58b3724a0905a5f5417b8bfaa2cb8bce388e6d42c762ee615413a9bc2692fa4b302d7e2405fe6fd7ad82c9def6a5da9028", + "sha1": "0adfc122e9f632d8847688c4c3ed20a1af182afa" }, "required_dependencies": [], "size": 826829, - "date_published": "2026-01-23T00:51:21.409054Z" + "date_published": "2026-01-24T01:51:58.806460Z" }, { "type": "curseforge", - "file_name": "modernfix-forge-5.26.1+mc1.20.1.jar", + "file_name": "modernfix-forge-5.26.2+mc1.20.1.jar", "mc_versions": [ "1.20.1" ], @@ -9464,16 +9463,16 @@ "forge" ], "release_type": "release", - "url": "https://edge.forgecdn.net/files/7509/729/modernfix-forge-5.26.1+mc1.20.1.jar", - "id": "7509729", + "url": "https://edge.forgecdn.net/files/7515/215/modernfix-forge-5.26.2+mc1.20.1.jar", + "id": "7515215", "parent_id": "790626", "hashes": { - "sha1": "fa0163b33e911b69af61fee8a3920820e7c617a0", - "md5": "63bb05ac16ae0ecc3e2b039148edab3e" + "sha1": "0adfc122e9f632d8847688c4c3ed20a1af182afa", + "md5": "61332114c9c317080faaf35f8183d67b" }, "required_dependencies": [], "size": 826829, - "date_published": "2026-01-23T00:51:20.560Z" + "date_published": "2026-01-24T01:51:57.657Z" } ] }, @@ -9557,7 +9556,7 @@ "files": [ { "type": "modrinth", - "file_name": "moonlight-1.20-2.16.23-forge.jar", + "file_name": "moonlight-1.20-2.16.27-forge.jar", "mc_versions": [ "1.20.1" ], @@ -9566,20 +9565,20 @@ "neoforge" ], "release_type": "release", - "url": "https://cdn.modrinth.com/data/twkfQtEc/versions/XCFIOCRA/moonlight-1.20-2.16.23-forge.jar", - "id": "XCFIOCRA", + "url": "https://cdn.modrinth.com/data/twkfQtEc/versions/lrpPgviq/moonlight-1.20-2.16.27-forge.jar", + "id": "lrpPgviq", "parent_id": "twkfQtEc", "hashes": { - "sha512": "2baeeafd86a7df76b81d41cf20f6dde2f1ecfed3bfda19f299d6acd59fd52eedda47829b56ac0f4da4647e9f7be50a8ec6f677c421f91c0bb5c8f5f8d0710b49", - "sha1": "c63750ef54ac17d0dc1e58c246c6dac3d8d9ac87" + "sha512": "30b9a16c4643bbbf643304e14d524f72f7aa2343317ba40e136b88a433d2110dc727b7747003126dc9a220e18b5da69585b24c8b3135844ddeef07e5d6006afa", + "sha1": "0a1b384ec20d63e94c56123b53e264dc2afe5b17" }, "required_dependencies": [], - "size": 1390855, - "date_published": "2026-01-16T18:52:42.739110Z" + "size": 1392973, + "date_published": "2026-01-28T16:55:17.211884Z" }, { "type": "curseforge", - "file_name": "moonlight-1.20-2.16.23-forge.jar", + "file_name": "moonlight-1.20-2.16.27-forge.jar", "mc_versions": [ "1.20.1" ], @@ -9588,16 +9587,16 @@ "neoforge" ], "release_type": "release", - "url": "https://edge.forgecdn.net/files/7469/722/moonlight-1.20-2.16.23-forge.jar", - "id": "7469722", + "url": "https://edge.forgecdn.net/files/7541/536/moonlight-1.20-2.16.27-forge.jar", + "id": "7541536", "parent_id": "499980", "hashes": { - "sha1": "c63750ef54ac17d0dc1e58c246c6dac3d8d9ac87", - "md5": "a6659ba4650f16630293ce633c3ae4e7" + "sha1": "0a1b384ec20d63e94c56123b53e264dc2afe5b17", + "md5": "7e819bab11a4cf9973d0e24fb52c367b" }, "required_dependencies": [], - "size": 1390855, - "date_published": "2026-01-16T18:52:33.317Z" + "size": 1392973, + "date_published": "2026-01-28T16:55:09.907Z" } ] }, @@ -10050,7 +10049,7 @@ "files": [ { "type": "modrinth", - "file_name": "notenoughanimations-forge-1.11.1-mc1.20.1.jar", + "file_name": "notenoughanimations-forge-1.11.2-mc1.20.1.jar", "mc_versions": [ "1.20.1" ], @@ -10058,20 +10057,20 @@ "forge" ], "release_type": "release", - "url": "https://cdn.modrinth.com/data/MPCX6s5C/versions/cfiRPrQF/notenoughanimations-forge-1.11.1-mc1.20.1.jar", - "id": "cfiRPrQF", + "url": "https://cdn.modrinth.com/data/MPCX6s5C/versions/5SeKXwLU/notenoughanimations-forge-1.11.2-mc1.20.1.jar", + "id": "5SeKXwLU", "parent_id": "MPCX6s5C", "hashes": { - "sha512": "9335ace46a9f6477df026f19cab08c656fc7c0a7f1069eedfdadbba01bfd2ad43f9e90a0bb5ef8e867d51608dddcf85fa9653eb178f4a0e6e6bcfb45d0959270", - "sha1": "9aa8917d7c0a5311dc495da3c720434de49e0e24" + "sha512": "594ce4db615446ee20e9938dcb1770c75f2073d82474ff515bebb08fcd1451eac1cd98add2f0a0ddf4b7e35e78525973ae6ed8538a705f5606ce5379173d0718", + "sha1": "fe7898d27c15b76552a69b972abec0728be9ea8a" }, "required_dependencies": [], - "size": 1933839, - "date_published": "2025-12-12T19:11:52.494096Z" + "size": 1935532, + "date_published": "2026-02-01T17:18:01.484134Z" }, { "type": "curseforge", - "file_name": "notenoughanimations-forge-1.11.1-mc1.20.1.jar", + "file_name": "notenoughanimations-forge-1.11.2-mc1.20.1.jar", "mc_versions": [ "1.20.1" ], @@ -10079,16 +10078,16 @@ "forge" ], "release_type": "release", - "url": "https://edge.forgecdn.net/files/7325/366/notenoughanimations-forge-1.11.1-mc1.20.1.jar", - "id": "7325366", + "url": "https://edge.forgecdn.net/files/7561/811/notenoughanimations-forge-1.11.2-mc1.20.1.jar", + "id": "7561811", "parent_id": "433760", "hashes": { - "sha1": "9aa8917d7c0a5311dc495da3c720434de49e0e24", - "md5": "34fd79756da8b5278a5b0905d98ffeca" + "sha1": "fe7898d27c15b76552a69b972abec0728be9ea8a", + "md5": "81f5099779c0b4d223275e7bac616a4e" }, "required_dependencies": [], - "size": 1933839, - "date_published": "2025-12-12T19:11:51.067Z" + "size": 1935532, + "date_published": "2026-02-01T17:17:59.670Z" } ] }, @@ -10551,7 +10550,7 @@ "files": [ { "type": "modrinth", - "file_name": "particle_core-0.3.1+1.20.1+forge.jar", + "file_name": "particle_core-0.3.2+1.20.1+forge.jar", "mc_versions": [ "1.20.1" ], @@ -10560,23 +10559,23 @@ "neoforge" ], "release_type": "release", - "url": "https://cdn.modrinth.com/data/RSeLon5O/versions/dtIZJ1r3/particle_core-0.3.1+1.20.1+forge.jar", - "id": "dtIZJ1r3", + "url": "https://cdn.modrinth.com/data/RSeLon5O/versions/qSjxrRl9/particle_core-0.3.2+1.20.1+forge.jar", + "id": "qSjxrRl9", "parent_id": "RSeLon5O", "hashes": { - "sha512": "63a2c186e74851fef7ce7871c09126deb0a8090de417753873b74cfe3db3e2d61b699e2fd6033526f38356881c1817e759e34e5b536224c17247bd3b3a6d6be8", - "sha1": "935a8c19cc7a72364fdfe494d9ddbd599f01588d" + "sha512": "042a26c72ed13a5b7a961afd575561442fe979295e2adc5901127e2be578391f597ce24d17d92fdf6ad515a19033f1b7cde0a455e7e9e9b0a36a8089caddf459", + "sha1": "57079d1607ce044533fb076d2db0e2a3d277a4fb" }, "required_dependencies": [ - "hYykXjDp", - "ordsPcFz" + "ordsPcFz", + "hYykXjDp" ], - "size": 770117, - "date_published": "2026-01-22T01:13:37.946023Z" + "size": 773147, + "date_published": "2026-01-25T16:04:41.088385Z" }, { "type": "curseforge", - "file_name": "particle_core-0.3.1+1.20.1+forge.jar", + "file_name": "particle_core-0.3.2+1.20.1+forge.jar", "mc_versions": [ "1.20.1" ], @@ -10585,19 +10584,19 @@ "neoforge" ], "release_type": "release", - "url": "https://edge.forgecdn.net/files/7504/78/particle_core-0.3.1+1.20.1+forge.jar", - "id": "7504078", + "url": "https://edge.forgecdn.net/files/7525/37/particle_core-0.3.2+1.20.1+forge.jar", + "id": "7525037", "parent_id": "985426", "hashes": { - "sha1": "935a8c19cc7a72364fdfe494d9ddbd599f01588d", - "md5": "4386c25fd855cc4de76c3458b9a182a5" + "sha1": "57079d1607ce044533fb076d2db0e2a3d277a4fb", + "md5": "5ebd6c2396924c3e33ea96003ec10b0c" }, "required_dependencies": [ - "351264", - "1005914" + "1005914", + "351264" ], - "size": 770117, - "date_published": "2026-01-22T01:13:31.647Z" + "size": 773147, + "date_published": "2026-01-25T16:04:36.363Z" } ] }, @@ -12888,7 +12887,7 @@ ] }, { - "pakku_id": "zjKgkuN1c64ZMrfV", + "pakku_id": "5Hw8y3XluL4fjZ65", "pakku_links": [ "AqNG8HNM9pfy1ges", "64uacGcEw697jVGs" @@ -12896,12 +12895,12 @@ "type": "MOD", "side": "BOTH", "slug": { - "curseforge": "tfcgurman", - "modrinth": "tfc_gurman" + "curseforge": "tfc-gurman", + "modrinth": "tfc_gourmet" }, "name": { "curseforge": "TFC Gurman", - "modrinth": "TFC Gurman" + "modrinth": "TFC Gourmet" }, "id": { "curseforge": "1363944", @@ -12910,31 +12909,7 @@ "files": [ { "type": "modrinth", - "file_name": "tfc_gurman-1.3.0.jar", - "mc_versions": [ - "1.20.1" - ], - "loaders": [ - "forge" - ], - "release_type": "beta", - "url": "https://cdn.modrinth.com/data/ERme2o65/versions/NVqgySaW/tfc_gurman-1.3.0.jar", - "id": "NVqgySaW", - "parent_id": "ERme2o65", - "hashes": { - "sha512": "b82f4b893f85f152a305a9949df8a87337b2e1d75e80a1723c512de5ede3dfa056f17a2186511acf96556e4b5ce1b1c55927d6f97fabf109ac8fdf8ba20f197c", - "sha1": "c55512789128af89d57fe0c9a2f3b4d59a491724" - }, - "required_dependencies": [ - "JaCEZUhg", - "5bKeBHw2" - ], - "size": 542077, - "date_published": "2026-01-02T13:41:35.488377Z" - }, - { - "type": "curseforge", - "file_name": "tfc_gurman-1.3.0.jar", + "file_name": "tfc_gourmet-1.4.3.jar", "mc_versions": [ "1.20.1" ], @@ -12942,19 +12917,40 @@ "forge" ], "release_type": "release", - "url": "https://edge.forgecdn.net/files/7408/157/tfc_gurman-1.3.0.jar", - "id": "7408157", + "url": "https://cdn.modrinth.com/data/ERme2o65/versions/1ns5Lyk4/tfc_gourmet-1.4.3.jar", + "id": "1ns5Lyk4", + "parent_id": "ERme2o65", + "hashes": { + "sha512": "7fef1e460dfb20478d959efad82093de0c538aa16b8b6294dcd057f06da82dc6ad90c6e1c5adfa275f600de8c04868e952f46b856b36d61402383bdfacac61ec", + "sha1": "103326499c4a574c87474a5af52f97d7a730071f" + }, + "required_dependencies": [], + "size": 398088, + "date_published": "2026-02-02T19:04:40.071653Z" + }, + { + "type": "curseforge", + "file_name": "tfc_gourmet-1.4.2.jar", + "mc_versions": [ + "1.20.1" + ], + "loaders": [ + "forge" + ], + "release_type": "release", + "url": "https://edge.forgecdn.net/files/7564/444/tfc_gourmet-1.4.2.jar", + "id": "7564444", "parent_id": "1363944", "hashes": { - "sha1": "c55512789128af89d57fe0c9a2f3b4d59a491724", - "md5": "fd8ba6a9ec34193beda55f5d34e359f1" + "sha1": "d4c2f1eb89330129fdc1e4ee78f61f1130d83fe5", + "md5": "5e39aeac6e9a02f282140ef87c156de4" }, "required_dependencies": [ - "302973", - "453394" + "453394", + "302973" ], - "size": 542077, - "date_published": "2026-01-02T13:43:05.680Z" + "size": 521700, + "date_published": "2026-02-02T03:07:46.393Z" } ] }, @@ -13972,7 +13968,7 @@ "files": [ { "type": "modrinth", - "file_name": "tacz-tweaks-2.12.1-all.jar", + "file_name": "tacz-tweaks-2.12.2-all.jar", "mc_versions": [ "1.20", "1.20.1" @@ -13981,24 +13977,24 @@ "forge" ], "release_type": "release", - "url": "https://cdn.modrinth.com/data/H8peNuJG/versions/RMgTVnMg/tacz-tweaks-2.12.1-all.jar", - "id": "RMgTVnMg", + "url": "https://cdn.modrinth.com/data/H8peNuJG/versions/JnqIQ9EH/tacz-tweaks-2.12.2-all.jar", + "id": "JnqIQ9EH", "parent_id": "H8peNuJG", "hashes": { - "sha512": "1ba717c181bd2211dbb82f23646d5e152bb8308475a74559b65f0ed027c55e89184ef058512cb5bb1a707e13155c609c929085510710e40f6df9baec1fc0bbf4", - "sha1": "92c9981e2e2f2edecab25ee48c5bade7a14298a8" + "sha512": "6ff5680072a972f9a597928745525a89c194d9c7701cda33ba386d1bf8a0ff0fe010d5bf63f467c3ef7d746896ac6a7678e98a7285b0254b926075d4170ac353", + "sha1": "f726c2d0ac2c77e3cc7f93fad7fd4338117c7a80" }, "required_dependencies": [ + "1eAoo2KR", "ordsPcFz", - "SzzJttH8", - "1eAoo2KR" + "SzzJttH8" ], - "size": 1894147, - "date_published": "2026-01-22T14:38:58.126712Z" + "size": 1894239, + "date_published": "2026-01-24T10:14:48.372979Z" }, { "type": "curseforge", - "file_name": "tacz-tweaks-2.12.1-all.jar", + "file_name": "tacz-tweaks-2.12.2-all.jar", "mc_versions": [ "1.20.1", "1.20" @@ -14007,20 +14003,20 @@ "forge" ], "release_type": "release", - "url": "https://edge.forgecdn.net/files/7506/850/tacz-tweaks-2.12.1-all.jar", - "id": "7506850", + "url": "https://edge.forgecdn.net/files/7517/23/tacz-tweaks-2.12.2-all.jar", + "id": "7517023", "parent_id": "1193263", "hashes": { - "sha1": "92c9981e2e2f2edecab25ee48c5bade7a14298a8", - "md5": "d616e17cf5713a027acda0c47f7c98c7" + "sha1": "f726c2d0ac2c77e3cc7f93fad7fd4338117c7a80", + "md5": "2b74092c813b98a27dad4b543808f61f" }, "required_dependencies": [ + "1028108", "667299", - "351264", - "1028108" + "351264" ], - "size": 1894147, - "date_published": "2026-01-22T14:38:49.923Z" + "size": 1894239, + "date_published": "2026-01-24T10:14:48.150Z" } ] }, @@ -14114,7 +14110,7 @@ "files": [ { "type": "modrinth", - "file_name": "TerraFirmaGreg-Core-Modern-0.8.18.jar", + "file_name": "TerraFirmaGreg-Core-Modern-0.8.19.jar", "mc_versions": [ "1.20.1" ], @@ -14123,23 +14119,23 @@ "neoforge" ], "release_type": "release", - "url": "https://cdn.modrinth.com/data/lNttW2Xl/versions/xA84bf76/TerraFirmaGreg-Core-Modern-0.8.18.jar", - "id": "xA84bf76", + "url": "https://cdn.modrinth.com/data/lNttW2Xl/versions/LusgkBmJ/TerraFirmaGreg-Core-Modern-0.8.19.jar", + "id": "LusgkBmJ", "parent_id": "lNttW2Xl", "hashes": { - "sha512": "8a6e5bdd978ff3352df0e6a5723da09a6495f30850b68e5c191a976bf628f2ce537cd1be354ca214859a9e63f6398f2147d186156654946b38159d8a73ea860c", - "sha1": "b4f98b976aa7096b6ec0a6bd291fb16415dfeb3a" + "sha512": "b65de612b24528baead242f0d9564e799db5221b36fd12ccbb191a45f9186082ca4d21599343a909ef65541d230eff2353cfaa0c78f200fd4ff259c33cda11ec", + "sha1": "ff9b919b7afa7a8f921c50d29718d4a3f8115648" }, "required_dependencies": [ "JaCEZUhg", "7tG215v7" ], - "size": 9461778, - "date_published": "2026-01-23T05:43:54.009706Z" + "size": 9564353, + "date_published": "2026-02-03T11:14:10.819830Z" }, { "type": "curseforge", - "file_name": "TerraFirmaGreg-Core-Modern-0.8.18.jar", + "file_name": "TerraFirmaGreg-Core-Modern-0.8.19.jar", "mc_versions": [ "1.20.1" ], @@ -14148,19 +14144,19 @@ "neoforge" ], "release_type": "release", - "url": "https://edge.forgecdn.net/files/7510/518/TerraFirmaGreg-Core-Modern-0.8.18.jar", - "id": "7510518", + "url": "https://edge.forgecdn.net/files/7570/367/TerraFirmaGreg-Core-Modern-0.8.19.jar", + "id": "7570367", "parent_id": "513402", "hashes": { - "sha1": "b4f98b976aa7096b6ec0a6bd291fb16415dfeb3a", - "md5": "98d393ea8d2bedda684ba69b5546c438" + "sha1": "ff9b919b7afa7a8f921c50d29718d4a3f8115648", + "md5": "81f3dfb6d3e503c2e10263ec3563c49a" }, "required_dependencies": [ - "890405", - "302973" + "302973", + "890405" ], - "size": 9461778, - "date_published": "2026-01-23T05:43:16.570Z" + "size": 9564353, + "date_published": "2026-02-03T11:14:05.233Z" } ] }, @@ -14912,7 +14908,7 @@ "files": [ { "type": "modrinth", - "file_name": "wab-1.20.1-1.3.2.jar", + "file_name": "wab-1.20.1-1.4.1.jar", "mc_versions": [ "1.20.1" ], @@ -14921,40 +14917,42 @@ "neoforge" ], "release_type": "release", - "url": "https://cdn.modrinth.com/data/nWC3kyL3/versions/RY6tjr9r/wab-1.20.1-1.3.2.jar", - "id": "RY6tjr9r", + "url": "https://cdn.modrinth.com/data/nWC3kyL3/versions/OhVjiSa4/wab-1.20.1-1.4.1.jar", + "id": "OhVjiSa4", "parent_id": "nWC3kyL3", "hashes": { - "sha512": "5ac692f7eeaf6d0cdb4fd6131b2bbe30bbb873c28a34b999b37a83b7b0e726ad6fb82138a9fb93f34e40384431fcfa549b41d9fbff845f5554182ca427f4f441", - "sha1": "7298a59e383d2327e2acc49d8f1b132cedb8860b" + "sha512": "419bfbad4ca78e35f16b34ced2dafa2f6e7af51850875e21756523b5b2a04afb9cc5308d11e74c9cda5e48411c59d3d5b4d29df07a63fb2abc796552df3d31a9", + "sha1": "6a9465b15671d7f1ea2f7b3ed44c881065b945f6" }, "required_dependencies": [ "8BmcQJ2H" ], - "size": 9115799, - "date_published": "2025-09-22T20:47:32.603138Z" + "size": 10167907, + "date_published": "2026-01-30T21:19:29.785723Z" }, { "type": "curseforge", - "file_name": "wab-1.20.1-1.3.2.jar", + "file_name": "wab-1.20.1-1.4.1.jar", "mc_versions": [ "1.20.1" ], "loaders": [ - "neoforge", - "forge" + "forge", + "neoforge" ], "release_type": "release", - "url": "https://edge.forgecdn.net/files/7023/583/wab-1.20.1-1.3.2.jar", - "id": "7023583", + "url": "https://edge.forgecdn.net/files/7552/366/wab-1.20.1-1.4.1.jar", + "id": "7552366", "parent_id": "1108604", "hashes": { - "sha1": "7298a59e383d2327e2acc49d8f1b132cedb8860b", - "md5": "a3cf1ea1c616b546b586c7415143e5fe" + "sha1": "6a9465b15671d7f1ea2f7b3ed44c881065b945f6", + "md5": "b58604d770735d06b0e105c9105a527a" }, - "required_dependencies": [], - "size": 9115799, - "date_published": "2025-09-22T20:37:11.317Z" + "required_dependencies": [ + "388172" + ], + "size": 10167907, + "date_published": "2026-01-30T21:16:13.643Z" } ] }, @@ -15245,6 +15243,47 @@ } ] }, + { + "pakku_id": "D8FJfLqFF1y0WOqV", + "pakku_links": [ + "7N9O2rPIAVKoRYOH" + ], + "type": "MOD", + "slug": { + "curseforge": "tacz-sbw-playerrevive-gun-mod-compitability" + }, + "name": { + "curseforge": "[TaCZ/SBW] PlayerRevive gun mod compitability" + }, + "id": { + "curseforge": "1440963" + }, + "files": [ + { + "type": "curseforge", + "file_name": "playerrevive_compat-1.0.2-12c699b.jar", + "mc_versions": [ + "1.20.1" + ], + "loaders": [ + "forge" + ], + "release_type": "release", + "url": "https://edge.forgecdn.net/files/7564/958/playerrevive_compat-1.0.2-12c699b.jar", + "id": "7564958", + "parent_id": "1440963", + "hashes": { + "sha1": "a0f05d85155560b743d6ffab61741e3da3803611", + "md5": "c1cb2f857a6fd0e71458637b25a33cbd" + }, + "required_dependencies": [ + "266890" + ], + "size": 198220, + "date_published": "2026-02-02T06:43:37.990Z" + } + ] + }, { "pakku_id": "MpkpUO55EJhBt1az", "pakku_links": [ diff --git a/pakku.json b/pakku.json index faf8a0638..e9af41c30 100644 --- a/pakku.json +++ b/pakku.json @@ -1,7 +1,7 @@ { "name": "TerraFirmaGreg-Modern", "version": "DEV", - "release_type": "release", + "release_type": "alpha", "description": "An innovative modpack that contains GregTech and TerraFirmaCraft on 1.20.x.", "author": "Exception, Xikaro", "overrides": [