diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1e719ced3..1f8183581 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -327,19 +327,23 @@ jobs: sed -i -e "s/DEV/${VERSION}/g" pakku.json + sed -i -e "s/DEV/${VERSION}/g" .github/docker/docker-compose.yml sed -i -e "s/DEV/${VERSION}/g" config/mod-director/modpack.json sed -i -e "s/DEV/${VERSION}/g" config/fancymenu/customization/gui_main_menu.txt - sed -i -e "s/DEV/${VERSION}/g" .pakku/multimc-overrides/instance.cfg - sed -i -e "s/LOADER_VERSION/${LOADER_VERSION}/g" .pakku/multimc-overrides/mmc-pack.json - sed -i -e "s/LOADER_TYPE/${LOADER_TYPE}/g" .pakku/multimc-overrides/mmc-pack.json - sed -i -e "s/MINECRAFT_VERSION/${MINECRAFT_VERSION}/g" .pakku/multimc-overrides/mmc-pack.json + sed -i -e "s/DEV/${VERSION}/g" .pakku/server-overrides/server.properties + + sed -i -e "s/LOADER_VERSION/${LOADER_VERSION}/g" .pakku/multimc-overrides/mmc-pack.json sed -i -e "s/LOADER_VERSION/${LOADER_VERSION}/g" .pakku/server-overrides/forge-auto-install.txt + + sed -i -e "s/LOADER_TYPE/${LOADER_TYPE}/g" .pakku/multimc-overrides/mmc-pack.json sed -i -e "s/LOADER_TYPE/${LOADER_TYPE}/g" .pakku/server-overrides/forge-auto-install.txt + + sed -i -e "s/MINECRAFT_VERSION/${MINECRAFT_VERSION}/g" .pakku/multimc-overrides/mmc-pack.json sed -i -e "s/MINECRAFT_VERSION/${MINECRAFT_VERSION}/g" .pakku/server-overrides/forge-auto-install.txt - - name: 📝 Cache pakku + - name: 📝 Cache Pakku uses: actions/cache@v5.0.1 id: cache with: @@ -347,7 +351,7 @@ jobs: key: pakku-cache-${{ hashFiles('pakku-lock.json') }} restore-keys: pakku-cache- - - name: 📦 Export modpack + - name: 📦 Export Modpack run: | # curl https://github.com/juraj-hrivnak/pakku/releases/latest/download/pakku.jar -o pakku.jar -L -J java -jar pakku.jar fetch @@ -356,7 +360,7 @@ jobs: mkdir -p .pakku/multimc-overrides/flame mkdir -p .pakku/multimc-overrides/mods - - name: 📁 Preparing the artifact curseforge + - name: 📁 Preparing the artifact CurseForge run: | cd ./build/curseforge/ mv *.zip $(basename -s .zip *.zip)-curseforge.zip @@ -368,54 +372,81 @@ jobs: path: ./build/curseforge/${{ needs.info.outputs.project_full_name }}-curseforge.zip if-no-files-found: error - - name: 📁 Preparing the artifact modrinth + - name: 📁 Preparing the artifact Modrinth run: | cd ./build/modrinth/ mv *.mrpack $(basename -s .mrpack *.mrpack)-modrinth.mrpack - - name: 🚀 Upload artifact modrinth + - name: 🚀 Upload artifact Modrinth uses: actions/upload-artifact@v6.0.0 with: name: ${{ needs.info.outputs.project_full_name }}-modrinth path: ./build/modrinth/${{ needs.info.outputs.project_full_name }}-modrinth.mrpack if-no-files-found: warn - - name: 📁 Preparing the artifact multimc + - name: 📁 Preparing the artifact MultiMC run: | mkdir -p .pakku/multimc-overrides/flame mkdir -p .pakku/multimc-overrides/mods mv -vf .pakku/multimc-overrides ./build/multimc + # Delete mods with export: false from ./mods directory + echo "Checking for mods with export: false..." + if [ -f "./pakku.json" ]; then + # Extract mod slugs with export: false and delete corresponding jar files + for mod in $(jq -r 'to_entries[] | select(.value.export == false) | .key' ./pakku.json); do + echo "Looking for mod: $mod" + find ./mods -name "${mod}*.jar" -type f -delete 2>/dev/null && echo "Deleted $mod jar files" || echo "No $mod jar files found" + done + else + echo "pakku.json not found, skipping export:false mod removal" + fi + cp -rf ./build/.cache/curseforge/overrides ./build/multimc/.minecraft cp -vf ./build/.cache/curseforge/manifest.json ./build/multimc/flame/manifest.json cp -vf ./config/fancymenu/assets/icons/icon128x128.png ./build/multimc/.minecraft/icon.png + cp -rf ./mods ./build/multimc/.minecraft/ cd ./build/multimc/ zip -r ${{ needs.info.outputs.project_full_name }}-multimc.zip icon.png mmc-pack.json instance.cfg .minecraft/ flame/ - - name: 🚀 Upload artifact multimc + - name: 🚀 Upload artifact MultiMC uses: actions/upload-artifact@v6.0.0 with: name: ${{ needs.info.outputs.project_full_name }}-multimc path: ./build/multimc/${{ needs.info.outputs.project_full_name }}-multimc.zip if-no-files-found: error - - name: 📁 Preparing the artifact server + - name: 📁 Preparing the artifact Server run: | cd ./build/serverpack/ mv *.zip $(basename -s .zip *.zip)-serverpack.zip - - name: 🚀 Upload artifact server + - name: 🚀 Upload artifact Server uses: actions/upload-artifact@v6.0.0 with: name: ${{ needs.info.outputs.project_full_name }}-serverpack path: ./build/serverpack/${{ needs.info.outputs.project_full_name }}-serverpack.zip if-no-files-found: error + - name: 📁 Preparing the artifact Docker + run: | + mv -vf .pakku/docker-overrides ./build/docker + + cd ./build/docker/ + mv docker-compose.yml "${{ needs.info.outputs.project_full_name }}-docker.yml" + + - name: 🚀 Upload Docker Artifact + uses: actions/upload-artifact@v6.0.0 + with: + name: ${{ needs.info.outputs.project_full_name }}-docker + path: ./build/docker/${{ needs.info.outputs.project_full_name }}-docker.yml + if-no-files-found: error + release-github: name: 🚀 Release to GitHub needs: [info, build-project] @@ -449,6 +480,9 @@ jobs: if [ ! -f ${{ needs.info.outputs.project_full_name }}-multimc.zip ]; then echo '::error::No value found for artifact `multimc.zip`.' && exit 1 fi + if [ ! -f ${{ needs.info.outputs.project_full_name }}-docker.yml ]; then + echo '::error::No value found for artifact `docker.yml`.' && exit 1 + fi echo "✔️ All artifacts found" - name: 📄 Format diff @@ -476,6 +510,7 @@ jobs: ${{ needs.info.outputs.project_full_name }}-modrinth.mrpack ${{ needs.info.outputs.project_full_name }}-serverpack.zip ${{ needs.info.outputs.project_full_name }}-multimc.zip + ${{ needs.info.outputs.project_full_name }}-docker.yml prerelease: ${{ needs.info.outputs.release_type != 'release' }} generate_release_notes: true token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.gitignore b/.gitignore index 36bbc1365..6237e42b1 100644 --- a/.gitignore +++ b/.gitignore @@ -23,6 +23,10 @@ build/ !.pakku/**/* !pakku.jar +# Docker +/.github/docker/data +/.github/docker/backups + # Configs config/jei/world/ config/gregtech/terminal/ @@ -62,9 +66,11 @@ defaultconfigs/ftbranks/players.snbt !bansoukou/**.zip -/.bobby/ -/.mixin.out/ +/.bobby +/.mixin.out /tacz/tacz_default_gun +/tacz_backup +/moonlight-global-datapacks /classOut /backups /profileImage @@ -93,6 +99,9 @@ defaultconfigs/ftbranks/players.snbt /gtceu/prospection_cache /data /ESM +/schematics +/scripts +/gtceu # Client data bansoukou @@ -128,7 +137,3 @@ libEffekseerNativeForJava.so # .pakku/server-overrides/scripts # .pakku/server-overrides/mods # .pakku/server-overrides/user_jvm_args.txt - - - - diff --git a/.pakku/docker-overrides/docker-compose.yml b/.pakku/docker-overrides/docker-compose.yml new file mode 100644 index 000000000..23e50b657 --- /dev/null +++ b/.pakku/docker-overrides/docker-compose.yml @@ -0,0 +1,30 @@ +services: + minecraft: + image: itzg/minecraft-server:latest + container_name: terrafirmagreg-modern + tty: true + stdin_open: true + ports: + - "25565:25565" + environment: + EULA: "true" + ENABLE_RCON: "false" + GUI: "false" + MEMORY: 8G + + TYPE: CUSTOM + CUSTOM_SERVER: ./minecraft_server.jar + SKIP_GENERIC_PACK_UPDATE_CHECK: "true" + OVERRIDE_SERVER_PROPERTIES: "false" + + + GENERIC_PACKS: TerraFirmaGreg-Modern-DEV-serverpack + GENERIC_PACKS_SUFFIX: .zip + GENERIC_PACKS_PREFIX: https://github.com/TerraFirmaGreg-Team/Modpack-Modern/releases/download/DEV/ + + volumes: + - ./data:/data + - ./backups:/backups + +volumes: + minecraft-data: diff --git a/.pakku/server-overrides/server.properties b/.pakku/server-overrides/server.properties index 918e3e5f0..ee7804237 100644 --- a/.pakku/server-overrides/server.properties +++ b/.pakku/server-overrides/server.properties @@ -29,7 +29,7 @@ max-chained-neighbor-updates=1000000 max-players=64 max-tick-time=600000 max-world-size=29999984 -motd=[TerraFirmaGreg-Modern] +motd=[TerraFirmaGreg-Modern] Server DEV network-compression-threshold=256 online-mode=true op-permission-level=4 diff --git a/CHANGELOG.md b/CHANGELOG.md index 6c126c467..d615ecd43 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,55 @@ ### Bug fixes ### Translation updates +## [0.11.16] - 05-01-2026 +### Changes +- Added new steam multiblocks for the alloy smelter, compressor, forge hammer, and thermal centrifuge @Pyritie +- Reduced the Y level that ad astra considers "space" so rocket launches are faster @Pyritie +- Reduced the amount of loot vases in the newer illages, and reduced how much loot you get from them @Pyritie +- Illages and the smaller mud brick ruins are now a little rarer, and the stone brick ruins are a little more common @Pyritie +- Magnesium Diboride now only requires an MV chem bath to cool, but the MV chem bath now also requires a little plastic to craft (#2575) @Pyritie +- Added an implosion compressor recipe for glowstone dust to glowstone blocks (#2581) @Xaligal +- Ad astra and Create Deco lamps are now half as expensive to craft (#2581) @Xaligal +- Added alloy blast smelter recipes for black bronze and bismuth bronze (#2581) @Xaligal +- The alloy blast smelter recipe for glowstone has been adjusted (#2581) @Xaligal +- Renamed Thorium (the non-isotope one) to Thorianite to better indicate that it's only an ore @Pyritie +- Added a way to get wax and latex in the steam age for those of you starting on mars @Pyritie +- Changed the Rover's step height from 1 block to 1.2 blocks (about 4 extra 'pixels') @Pyritie +- Fixed/improved behaviour of GregTech solar things on non-overworld dimensions, so rain in the overworld doesn't stop the solar array from working on the moon, and mars sandstorms affect solar things as well (#2140) @Pyritie +- Added missing recipes for some Steam 'n' Rails items, and changed the smokestacks to use cast iron instead of black steel (#2610) @thederpysockdude123 +- Added missing recipes for new Hypertube redstone things (#2615) @Xtrial-01 +- Recolored diamond GregTech things to match the color of the vanilla diamond item @Pyritie +- Buffed the HP of the Illager Beast @Pyritie +- Added a thermochemically treated hardwood dust -> soaked unrefined paper recipe to the helve hammer (#2621) @Pyritie +- Added Ad Astra's decorative blocks to Domum Ornamentum's whitelist (#2627) @thederpysockdude123 +#### Hazard changes +- Added a new medical condition, Irradiated, caused by the Radioactive hazard which all radioactive things (including naquadria and neutronium) now have instead of Carcinogenic. It has the same symptoms/side effects as carcinogenic. +- Paracetamol now cures carcinogenic, and Rad-Away cures both carcinogenic and irradiated. This is because you encounter carcinogenic hazards much sooner than radioactive ones, so the only cure for radioactive being way in HV didn't make much sense. In order to change the effects of these pills, we had to make new items, so any existing ones won't have these changes, sorry. +- Weakly Poisonous is no longer permanent and heals over time like other conditions. +### Bug fixes +- Fixed missing crafting table recipes for greate gearboxes (#2577) @Pyritie +- Fixed crashing when attaching shafts to a steam engine (#2578, #2579) @Electrolyte220 +- Fixed wrong small cogwheel rotation rendering @Electrolyte220 +- Fixed citric acid food processor recipe producing nothing (#2588) @Pyritie +- Fixed not being able to use pickled eggs in sandwiches (#2551) @Pyritie +- Fixed how much aluminium silicate you get from mica, pollucite, and spodumene to more accurately reflect how much aluminium they have @Pyritie +- Fixed being able to put liquid metals into the new molds that didn't have a recipe @Pyritie +- Added some grain nutrition to oatmeal (#2469) @Pyritie +- Fixed hot-protection chestplates not fully protecting against GT hot ingots (#2598) @Pyritie +- Fixed hermetic sandstone's appearance so it looks similar to TFC's raw sandstone @Pyritie +- Fixed some issues with the food autostacking changes in a previous version (#2580) @Mqrius +- Fixed a crash with meal ingredient stacking on servers @Mqrius +- Fixed some translation inconsistencies in the field guide (#2606, #2607) @jmecn @Petr211071 +- Fixed incorrect fluid tooltips for the silica glass bottle and iron flask (#2608) @JeanRdSz @Pyritie +- Removed some dough mixing bowl recipes that tried to output more than 5 ingredients because that's the mixing bowl's maximum (#2612) @Pyritie +- Fixed missing heat definition for soybeans (#2603) @Pyritie +- Fixed crafting bacon removing all the other food traits @Pyritie +- Fixed lamps costing 4x as much glass when crafted in an assembler as opposed to elsewhere (#2613) @Inceitious +- Fixed some inconsistent ladder recipes (#2616) @Pyritie +### Translation updates +- Chinese (simplified) @jmecn +- Russian @Petr211071 @AlexUnder + ## [0.11.15] - 31-12-2025 ### Bug fixes - Fixed Greate stress levels (#2564) @Pyritie diff --git a/config/ad_astra.jsonc b/config/ad_astra.jsonc index 38ab7b500..f255b90f0 100644 --- a/config/ad_astra.jsonc +++ b/config/ad_astra.jsonc @@ -14,7 +14,7 @@ * The y level where rockets should leave the dimension and enter space. * Type: Integer */ - "atmosphereLeave": 600, + "atmosphereLeave": 400, // A comma-separated list of planet IDs that should be hidden from the planets screen. e.g. minecraft:overworld,ad_astra:moon,ad_astra:mars,ad_astra:venus,ad_astra:mercury,ad_astra:glacio "disabledPlanets": "", // Disables oxygen damage. diff --git a/config/adaptive_performance_tweaks/spawn/CustomSpawn.toml b/config/adaptive_performance_tweaks/spawn/CustomSpawn.toml index 58831562f..6bea8dfdb 100644 --- a/config/adaptive_performance_tweaks/spawn/CustomSpawn.toml +++ b/config/adaptive_performance_tweaks/spawn/CustomSpawn.toml @@ -1,8 +1,8 @@ #Adaptive Performance Tweaks: Spawn ["Custom Spawn Config"] - Enabled = false - Id = "_config" + Enabled = true + Id = "TFG" #Range: 1 ~ 64 MaxPassiveMobsPerPlayer = 4 #Range: 1 ~ 512 @@ -12,19 +12,19 @@ #List of passive Mobs to optimize in the format ["minecraft:bat", "minecraft:cat", ..] PassiveMobsList = [] #Range: 1 ~ 64 - MaxNeutralMobsPerPlayer = 4 + MaxNeutralMobsPerPlayer = 16 #Range: 1 ~ 512 - MaxNeutralMobsPerWorld = 16 + MaxNeutralMobsPerWorld = 32 #Range: 1 ~ 1024 MaxNeutralMobsPerServer = 320 #List of neutral Mobs to optimize in the format ["minecraft:bee", "minecraft:wolf", ..] - NeutralMobsList = [] + NeutralMobsList = ["arthropocolypse:prairie_grasshopper", "arthropocolypse:field_cricket", "arthropocolypse:ice_crawler", "arthropocolypse:worker_ant", "arthropocolypse:soldier_ant", "arthropocolypse:stag_beetle", "arthropocolypse:stag_beetle_larva", "arthropocolypse:wharf_roach", "arthropocolypse:platerodrilus", "arthropocolypse:mealworm_beetle", "arthropocolypse:mealworm"] #Range: 1 ~ 64 - MaxHostileMobsPerPlayer = 4 + MaxHostileMobsPerPlayer = 8 #Range: 1 ~ 512 - MaxHostileMobsPerWorld = 16 + MaxHostileMobsPerWorld = 32 #Range: 1 ~ 1024 MaxHostileMobsPerServer = 320 #List of hostile Mobs to optimize in the format ["minecraft:blaze", "minecraft:cave_spider", ..] - HostileMobsList = [] + HostileMobsList = ["arthropocolypse:millipede_head", "minecraft:blaze", "minecraft:magma_cube", "primitive_creatures:golem_2", "ad_astra:sulfur_creeper", "species:cliff_hanger"] diff --git a/config/ambientsounds-client.json b/config/ambientsounds-client.json index c73d140af..eedba20d7 100644 --- a/config/ambientsounds-client.json +++ b/config/ambientsounds-client.json @@ -224,11 +224,11 @@ "venus": { "overall": 1, "cricket": 1, - "cricket-night": 1, + "cricket-night": 0.7, "cicadas": 1, "cicadas-desert": 1, - "cicadas-night": 1, - "cricket-warm-night": 1 + "cicadas-night": 0.7, + "cricket-warm-night": 0.7 }, "warden": { "overall": 1, diff --git a/config/arthropocolypse.toml b/config/arthropocolypse.toml new file mode 100644 index 000000000..cbca1c9f8 --- /dev/null +++ b/config/arthropocolypse.toml @@ -0,0 +1,78 @@ + +[spawning] + #Spawn Weight, 0 to disable spawn + #Range: 0 ~ 1000 + "Millipede Spawn Weight" = 100 + #Random Chance to spawning + #Range: 0.0 ~ 1.0 + "Millipede Spawn Chance" = 1.0 + #Max World Y Level to spawning + #Range: -64 ~ 128 + "Millipede Spawn Height" = 200 + #Spawn Weight, 0 to disable spawn + #Range: 0 ~ 1000 + "Field Cricket Spawn Weight" = 100 + #Random Chance to spawning + #Range: 0.0 ~ 1.0 + "Field Cricket Spawn Chance" = 1.0 + #Spawn Weight, 0 to disable spawn + #Range: 0 ~ 1000 + "Prairie Grasshopper Spawn Weight" = 100 + #Random Chance to spawning + #Range: 0.0 ~ 1.0 + "Prairie Grasshopper Spawn Chance" = 1.0 + #Spawn Weight, 0 to disable spawn + #Range: 0 ~ 1000 + "Worker Ant Spawn Weight" = 100 + #Random Chance to spawning + #Range: 0.0 ~ 1.0 + "Worker Ant Spawn Chance" = 1.0 + #Spawn Weight, 0 to disable spawn + #Range: 0 ~ 1000 + "Soldier Ant Spawn Weight" = 100 + #Random Chance to spawning + #Range: 0.0 ~ 1.0 + "Soldier Ant Spawn Chance" = 1.0 + #Spawn Weight, 0 to disable spawn + #Range: 0 ~ 1000 + "Ice Crawler Spawn Weight" = 100 + #Random Chance to spawning + #Range: 0.0 ~ 1.0 + "Ice Crawler Spawn Chance" = 1.0 + #Spawn Weight, 0 to disable spawn + #Range: 0 ~ 1000 + "Wharf Roach Spawn Weight" = 100 + #Random Chance to spawning + #Range: 0.0 ~ 1.0 + "Wharf Roach Spawn Chance" = 1.0 + #Spawn Weight, 0 to disable spawn + #Range: 0 ~ 1000 + "Stag Beetle Spawn Weight" = 100 + #Random Chance to spawning + #Range: 0.0 ~ 1.0 + "Stag Beetle Spawn Chance" = 1.0 + #Spawn Weight, 0 to disable spawn + #Range: 0 ~ 1000 + "Stag Beetle Larva Spawn Weight" = 100 + #Random Chance to spawning + #Range: 0.0 ~ 1.0 + "Stag Beetle Larva Spawn Chance" = 1.0 + #Spawn Weight, 0 to disable spawn + #Range: 0 ~ 1000 + "Mealworm Spawn Weight" = 100 + #Random Chance to spawning + #Range: 0.0 ~ 1.0 + "Mealworm Spawn Chance" = 1.0 + #Spawn Weight, 0 to disable spawn + #Range: 0 ~ 1000 + "Mealworm Beetle Spawn Weight" = 100 + #Random Chance to spawning + #Range: 0.0 ~ 1.0 + "Mealworm Beetle Spawn Chance" = 1.0 + #Spawn Weight, 0 to disable spawn + #Range: 0 ~ 1000 + "Platerodrilus Spawn Weight" = 100 + #Random Chance to spawning + #Range: 0.0 ~ 1.0 + "Platerodrilus Spawn Chance" = 1.0 + diff --git a/config/ftbquests/quests/chapters/applied_energistics_2.snbt b/config/ftbquests/quests/chapters/applied_energistics_2.snbt index 8a53c009a..86e58834a 100644 --- a/config/ftbquests/quests/chapters/applied_energistics_2.snbt +++ b/config/ftbquests/quests/chapters/applied_energistics_2.snbt @@ -1263,6 +1263,26 @@ x: 5.0d y: -3.5d } + { + dependencies: ["386C54268DA9F2BF"] + description: ["{quests.ae2.universal_circuits.desc}"] + id: "4F3B767032E0282F" + subtitle: "{quests.ae2.universal_circuits.subtitle}" + tasks: [{ + id: "7427AEBF61BFC772" + item: { + Count: 1 + id: "ftbfiltersystem:smart_filter" + tag: { + "ftbfiltersystem:filter": "or(item(tfg:ulv_universal_circuit)item(tfg:lv_universal_circuit)item(tfg:mv_universal_circuit)item(tfg:hv_universal_circuit)item(tfg:ev_universal_circuit)item(tfg:iv_universal_circuit)item(tfg:luv_universal_circuit)item(tfg:zpm_universal_circuit)item(tfg:uv_universal_circuit)item(tfg:uhv_universal_circuit))" + } + } + type: "item" + }] + title: "{quests.ae2.universal_circuits.title}" + x: -2.0d + y: -9.0d + } ] subtitle: ["{quests.ae2.subtitle}"] title: "{quests.ae2}" diff --git a/config/ftbquests/quests/chapters/ev__extreme_voltage.snbt b/config/ftbquests/quests/chapters/ev__extreme_voltage.snbt index 36e09f67a..587b6037c 100644 --- a/config/ftbquests/quests/chapters/ev__extreme_voltage.snbt +++ b/config/ftbquests/quests/chapters/ev__extreme_voltage.snbt @@ -64,6 +64,7 @@ { id: "2151F8AA263F1D6E" linked_quest: "6ECAD339C91EF194" + shape: "heart" x: 4.0d y: -5.5d } @@ -1778,6 +1779,7 @@ dependencies: ["3A2E442E4D84C891"] description: ["{quests.extreme_voltage.cracker.desc}"] id: "36B9B5024356C53C" + shape: "octagon" size: 1.5d subtitle: "{quests.extreme_voltage.cracker.subtitle}" tasks: [{ @@ -2138,7 +2140,7 @@ id: "4AD96212525517CD" rewards: [{ id: "1F7C92A8EF2F84A0" - item: "gtceu:rad_away_pill" + item: "tfg:rad_away_pill" type: "item" }] shape: "diamond" diff --git a/config/ftbquests/quests/chapters/gregtech_energy.snbt b/config/ftbquests/quests/chapters/gregtech_energy.snbt index 6cecc3a84..a962839dd 100644 --- a/config/ftbquests/quests/chapters/gregtech_energy.snbt +++ b/config/ftbquests/quests/chapters/gregtech_energy.snbt @@ -241,6 +241,7 @@ description: ["{quests.gregtech_energy.transformer.desc}"] icon: "tfg:active_power_transformer" id: "6ECAD339C91EF194" + optional: true subtitle: "{quests.gregtech_energy.transformer.subtitle}" tasks: [ { diff --git a/config/ftbquests/quests/chapters/hv__high_voltage.snbt b/config/ftbquests/quests/chapters/hv__high_voltage.snbt index cb45408b1..0343f6712 100644 --- a/config/ftbquests/quests/chapters/hv__high_voltage.snbt +++ b/config/ftbquests/quests/chapters/hv__high_voltage.snbt @@ -188,8 +188,6 @@ description: ["{quests.high_voltage.assembler.desc}"] icon: "gtceu:hv_assembler" id: "16B735F9C391D260" - shape: "octagon" - size: 2.0d tasks: [{ id: "1B70E35262CA2CB8" item: "gtceu:hv_assembler" @@ -255,8 +253,6 @@ description: ["{quests.high_voltage.hv_energy_hatch.desc}"] icon: "gtceu:hv_energy_input_hatch" id: "5DBBD9B1F5B01F4E" - shape: "octagon" - size: 1.5d subtitle: "{quests.high_voltage.hv_energy_hatch.subtitle}" tasks: [ { @@ -285,8 +281,6 @@ description: ["{quests.high_voltage.chem_reactor.desc}"] icon: "gtceu:hv_chemical_reactor" id: "390E59F05132FCB8" - shape: "octagon" - size: 2.0d tasks: [{ id: "652CFAE1FA60F3E2" item: "gtceu:hv_chemical_reactor" @@ -441,7 +435,7 @@ icon: "gtceu:hv_circuit_assembler" id: "6B1595678ECB7AC8" shape: "octagon" - size: 3.0d + size: 1.5d subtitle: "{quests.high_voltage.circuit_assembler.subtitle}" tasks: [{ id: "337D8EF42A7BD3A2" @@ -917,8 +911,6 @@ description: ["{quests.high_voltage.hv_mixer.desc}"] icon: "gtceu:hv_mixer" id: "05ABC370D7153350" - shape: "octagon" - size: 1.5d subtitle: "{quests.high_voltage.hv_mixer.subtitle}" tasks: [{ id: "6D522B2EF097AA95" @@ -1294,10 +1286,19 @@ { dependencies: ["3FBDC8552F7D8008"] description: ["{quests.high_voltage.gun.desc}"] + icon: { + Count: 1 + id: "tacz:modern_kinetic_gun" + tag: { + GunCurrentAmmoCount: 10 + GunFireMode: "SEMI" + GunId: "create_armorer:sniper_semi_clockwork" + HasBulletInBarrel: 1b + } + } id: "74C6DD5F67B1731F" optional: true shape: "heart" - size: 1.5d subtitle: "{quests.high_voltage.gun.subtitle}" tasks: [ { @@ -1358,7 +1359,7 @@ ] title: "{quests.high_voltage.gun.title}" x: 10.0d - y: -4.5d + y: -4.0d } { dependencies: ["00A2566109144D7F"] @@ -1619,7 +1620,7 @@ ] title: "{quests.medium_voltage.mv_long_pipe.title}" x: 5.0d - y: -8.0d + y: -7.5d } { dependencies: ["7FA0ACB7F161F378"] @@ -1658,6 +1659,7 @@ "{quests.gregtech_energy.reformate_gas.desc.2}" ] id: "3E4E63D5B8CB6860" + optional: true shape: "heart" subtitle: "{quests.gregtech_energy.reformate_gas.subtitle}" tasks: [{ diff --git a/config/ftbquests/quests/chapters/lv__low_voltage.snbt b/config/ftbquests/quests/chapters/lv__low_voltage.snbt index 09d2663e7..520ed4a20 100644 --- a/config/ftbquests/quests/chapters/lv__low_voltage.snbt +++ b/config/ftbquests/quests/chapters/lv__low_voltage.snbt @@ -7,20 +7,24 @@ id: "7D50771C3FE033D7" order_index: 0 quest_links: [ - { - id: "13EDC87034A162DE" - linked_quest: "2CDB9778C7A30044" - shape: "octagon" - size: 2.0d - x: 5.5d - y: 8.5d - } { id: "0EA7766FE6845121" linked_quest: "0FFBB6177DEB0A23" x: -8.0d y: 11.5d } + { + id: "46612C429BCA8A18" + linked_quest: "6BAC3BE1D4FE0F6B" + x: 7.5d + y: 4.0d + } + { + id: "5E5AD44B50E0B15B" + linked_quest: "31A6A236B6710B95" + x: 7.5d + y: 5.0d + } ] quests: [ { @@ -108,7 +112,7 @@ y: -4.5d } { - dependencies: ["2CDB9778C7A30044"] + dependencies: ["7FA1525D681C4B4A"] description: [ "{quests.low_voltage.lv_steam_turbine.desc.1}" "{@pagebreak}" @@ -129,7 +133,7 @@ y: 9.5d } { - dependencies: ["2CDB9778C7A30044"] + dependencies: ["7FA1525D681C4B4A"] description: ["{quests.low_voltage.lv_amp_explanation.desc}"] id: "7B0FF43022F6C2EC" optional: true @@ -191,7 +195,7 @@ ] title: "{quests.low_voltage.lv_battery_preparation.title}" x: 7.5d - y: 0.0d + y: -0.5d } { dependencies: [ @@ -338,11 +342,15 @@ type: "item" }] title: "{quests.low_voltage.lv_polariser.title}" - x: 5.5d - y: 2.5d + x: -1.0d + y: -0.5d } { - dependencies: ["6E186F9C57155BFA"] + dependencies: [ + "6E186F9C57155BFA" + "46FA9DD4755A5548" + ] + dependency_requirement: "one_completed" description: [ "{quests.low_voltage.lbb.desc.1}" "{@pagebreak}" @@ -474,7 +482,7 @@ }] title: "{quests.low_voltage.lv_battery.title}" x: 7.5d - y: 1.5d + y: 1.0d } { dependencies: ["3E6DC423FE4A99F7"] @@ -504,7 +512,7 @@ }] title: "{quests.low_voltage.lv_battery_buffer_4x.title}" x: 7.5d - y: 3.0d + y: 2.5d } { dependencies: ["1646BF9194100E57"] @@ -594,6 +602,7 @@ "02FDECC931B5E8EF" ] description: ["{quests.low_voltage.lv_ore_prospector.desc}"] + icon: "gtceu:prospector.lv" id: "2E36E5755B2F551C" optional: true shape: "heart" @@ -612,7 +621,7 @@ }] title: "{quests.low_voltage.lv_ore_prospector.title}" x: 9.0d - y: 1.5d + y: 1.0d } { dependencies: [ @@ -1217,7 +1226,7 @@ }] title: "{quests.low_voltage.lv_turbo_charge.title}" x: 9.0d - y: 0.0d + y: -0.5d } { dependencies: ["22510C5F2386B453"] @@ -1378,10 +1387,10 @@ type: "item" }] x: 9.0d - y: 3.0d + y: 2.5d } { - dependencies: ["2CDB9778C7A30044"] + dependencies: ["7FA1525D681C4B4A"] description: ["{quests.steam_age.alternator.desc.1}"] id: "2DC24661CAD557B0" optional: true @@ -1496,9 +1505,9 @@ } { dependencies: [ - "2CDB9778C7A30044" "522E08B1592136D5" "36FED1B6CFF7C60A" + "7FA1525D681C4B4A" ] dependency_requirement: "one_completed" description: ["{quests.low_voltage.lv_combuston_gen.desc}"] @@ -1516,10 +1525,10 @@ y: 11.0d } { - dependencies: ["2CDB9778C7A30044"] + dependencies: ["22510C5F2386B453"] description: [ "{quests.low_voltage.link_chapter.desc}:" - "{ \"text\": \"▶▶▶▶▶▶▶\", \"underlined\": \"true\", \"clickEvent\": { \"action\": \"change_page\", \"value\": \"2CDB9778C7A30044\" } }" + "{ \"text\": \"▶▶▶▶▶▶▶\", \"underlined\": \"true\", \"clickEvent\": { \"action\": \"change_page\", \"value\": \"06B2E38F7DCF2678\" } }" ] icon: "createdeco:decal_electrical" id: "7FA1525D681C4B4A" @@ -1533,7 +1542,7 @@ }] title: "{quests.low_voltage.link_chapter.title}" x: 5.5d - y: 6.5d + y: 8.5d } { dependencies: ["5F3063C539C9CBBF"] @@ -1660,8 +1669,8 @@ } { dependencies: [ - "2CDB9778C7A30044" "0404FBCC34011053" + "7FA1525D681C4B4A" ] description: ["{quests.low_voltage.lv_gas_turbine.desc}"] id: "1AD51E2B66EA7F67" @@ -1744,6 +1753,28 @@ x: -8.0d y: 5.5d } + { + dependencies: ["22510C5F2386B453"] + description: [ + "{quests.low_voltage.lost.desc.1}" + "{@pagebreak}" + "{quests.low_voltage.lost.desc.2}" + "{@pagebreak}" + "{quests.low_voltage.lost.desc.3}" + ] + icon: "gtceu:lv_sensor" + id: "7906B0DB8DE8038F" + shape: "circle" + subtitle: "{quests.low_voltage.lost.subtitle}" + tasks: [{ + id: "079BC5815364308D" + title: "{quests.low_voltage.lost.task}" + type: "checkmark" + }] + title: "{quests.low_voltage.lost.title}" + x: 1.5d + y: 5.0d + } ] subtitle: ["{quests.low_voltage.subtitle}"] title: "{quests.low_voltage}" diff --git a/config/ftbquests/quests/chapters/mv__medium_voltage.snbt b/config/ftbquests/quests/chapters/mv__medium_voltage.snbt index af8feae53..19b934cac 100644 --- a/config/ftbquests/quests/chapters/mv__medium_voltage.snbt +++ b/config/ftbquests/quests/chapters/mv__medium_voltage.snbt @@ -318,8 +318,7 @@ description: ["{quests.medium_voltage.mv_component.desc}"] icon: "gtceu:mv_electric_motor" id: "1BE0349B8F3890D3" - shape: "octagon" - size: 1.5d + size: 1.0d subtitle: "{quests.medium_voltage.mv_component_.subtitle}" tasks: [ { @@ -1116,7 +1115,6 @@ icon: "gtceu:natural_gas_bucket" id: "227D89550BB9BD55" optional: true - shape: "square" size: 1.0d subtitle: "{quests.medium_voltage.mv_lpg.subtitle}" tasks: [ @@ -1561,6 +1559,7 @@ description: ["{quests.medium_voltage.lsb.desc}"] icon: "gtceu:steel_large_boiler" id: "730D7C10DEED3117" + optional: true shape: "heart" size: 1.5d subtitle: "{quests.medium_voltage.lsb.subtitle}" @@ -1650,7 +1649,6 @@ description: ["{quests.medium_voltage.reformate_gas.desc}"] id: "10292F9B1DD743EB" optional: true - shape: "heart" subtitle: "{quests.medium_voltage.reformate_gas.subtitle}" tasks: [{ id: "717ABF30F29D12CD" @@ -1670,7 +1668,6 @@ ] id: "54A255C1C6E33165" optional: true - shape: "heart" subtitle: "{quests.medium_voltage.coal_tower.subtitle}" tasks: [{ id: "348CD63DC537BB9A" @@ -1692,7 +1689,6 @@ icon: "gtceu:diesel_bucket" id: "45769156F4253C86" optional: true - shape: "heart" size: 1.0d subtitle: "{quests.medium_voltage.mv_diesel.subtitle}" tasks: [{ diff --git a/config/ftbquests/quests/chapters/ore_processing.snbt b/config/ftbquests/quests/chapters/ore_processing.snbt index d09cdf899..b5b4c3520 100644 --- a/config/ftbquests/quests/chapters/ore_processing.snbt +++ b/config/ftbquests/quests/chapters/ore_processing.snbt @@ -19,7 +19,7 @@ image: "ftblibrary:icons/star" rotation: 0.0d width: 2.0d - x: -0.5d + x: -2.5d y: -6.5d } { @@ -484,10 +484,15 @@ y: -0.5d } { - dependencies: ["0F0525A70047EEB2"] + dependencies: [ + "0F0525A70047EEB2" + "701BCADAE5CF6CA5" + ] + dependency_requirement: "one_completed" description: ["{quests.ore_proc.thermal_centrifuge.desc}"] icon: "gtceu:lv_thermal_centrifuge" id: "6BAC3BE1D4FE0F6B" + optional: true subtitle: "{quests.ore_proc.thermal_centrifuge.subtitle}" tasks: [{ disable_toast: true @@ -496,7 +501,7 @@ Count: 1 id: "ftbfiltersystem:smart_filter" tag: { - "ftbfiltersystem:filter": "or(item(gtceu:lv_thermal_centrifuge)item(gtceu:mv_thermal_centrifuge)item(gtceu:hv_thermal_centrifuge)item(gtceu:ev_thermal_centrifuge)item(gtceu:iv_thermal_centrifuge)item(gtceu:luv_thermal_centrifuge)item(gtceu:zpm_thermal_centrifuge)item(gtceu:uv_thermal_centrifuge))" + "ftbfiltersystem:filter": "or(item(gtceu:lv_thermal_centrifuge)item(gtceu:mv_thermal_centrifuge)item(gtceu:hv_thermal_centrifuge)item(gtceu:ev_thermal_centrifuge)item(gtceu:iv_thermal_centrifuge)item(gtceu:luv_thermal_centrifuge)item(gtceu:zpm_thermal_centrifuge)item(gtceu:uv_thermal_centrifuge)item(tfg:steam_thermal_centrifuge))" } } title: "{quests.ore_proc.thermal_centrifuge.task}" @@ -507,10 +512,15 @@ y: -6.5d } { - dependencies: ["0F0525A70047EEB2"] + dependencies: [ + "0F0525A70047EEB2" + "701BCADAE5CF6CA5" + ] + dependency_requirement: "one_completed" description: ["{quests.ore_proc.sifter.desc}"] icon: "gtceu:lv_sifter" id: "31A6A236B6710B95" + optional: true subtitle: "{quests.ore_proc.sifter.subtitle}" tasks: [{ disable_toast: true @@ -519,7 +529,7 @@ Count: 1 id: "ftbfiltersystem:smart_filter" tag: { - "ftbfiltersystem:filter": "or(item(gtceu:lv_sifter)item(gtceu:mv_sifter)item(gtceu:hv_sifter)item(gtceu:ev_sifter)item(gtceu:iv_sifter)item(gtceu:luv_sifter)item(gtceu:zpm_sifter)item(gtceu:uv_sifter))" + "ftbfiltersystem:filter": "or(item(vintageimprovements:vibrating_table)item(gtceu:lv_sifter)item(gtceu:mv_sifter)item(gtceu:hv_sifter)item(gtceu:ev_sifter)item(gtceu:iv_sifter)item(gtceu:luv_sifter)item(gtceu:zpm_sifter)item(gtceu:uv_sifter))" } } title: "{quests.ore_proc.sifter.task}" diff --git a/config/ftbquests/quests/chapters/questssteam_age.snbt b/config/ftbquests/quests/chapters/questssteam_age.snbt index 327213c5f..c83057919 100644 --- a/config/ftbquests/quests/chapters/questssteam_age.snbt +++ b/config/ftbquests/quests/chapters/questssteam_age.snbt @@ -26,14 +26,14 @@ id: "0CE64B9914191C56" linked_quest: "6FFD4990FF07078A" shape: "diamond" - x: -11.5d - y: 9.5d + x: -9.5d + y: 11.5d } { id: "23A27702FF816291" linked_quest: "6903C72A254A7B08" - x: -14.5d - y: 6.0d + x: -12.5d + y: 8.0d } { id: "1F1E7097C015BE33" @@ -47,8 +47,8 @@ id: "7C03FE015586C652" linked_quest: "55213ACBF5F5D398" shape: "heart" - x: -15.0d - y: 13.0d + x: -12.0d + y: 16.0d } { id: "65E0B13E245D2E5F" @@ -60,15 +60,22 @@ id: "68F5E521F2DB0A86" linked_quest: "0404FBCC34011053" shape: "heart" - x: -14.0d - y: 13.0d + x: -13.0d + y: 16.0d } { id: "38ECA3FEC2B6A6A6" linked_quest: "533F32CCAD9D5B51" shape: "heart" - x: -19.5d - y: 11.5d + x: -18.5d + y: 12.5d + } + { + id: "61DCD50394B7FF0E" + linked_quest: "33263404ED38C6D2" + shape: "heart" + x: -22.5d + y: 4.0d } ] quests: [ @@ -251,7 +258,8 @@ "{quests.steam_age.boilers.desc.2}" ] id: "46FA9DD4755A5548" - size: 1.5d + shape: "octagon" + size: 2.0d subtitle: "{quests.steam_age.boilers.subtitle}" tasks: [{ id: "07FFA9C76EE39D36" @@ -267,7 +275,7 @@ }] title: "{quests.steam_age.boilers.title}" x: -19.5d - y: 7.5d + y: 6.75d } { dependencies: ["32046292AA5B0E30"] @@ -436,8 +444,8 @@ type: "item" }] title: "{quests.steam_age.crushing_wheel.title}" - x: -21.5d - y: 11.5d + x: -20.5d + y: 12.5d } { dependencies: ["7DB7AB5349218605"] @@ -460,10 +468,16 @@ item: "gtceu:treated_wood_plate" type: "item" } + { + id: "1497E51C6C204557" + item: "gtceu:treated_wood_normal_fluid_pipe" + optional_task: true + type: "item" + } ] title: "{quests.steam_age.treated_planks.title}" - x: -20.5d - y: 9.5d + x: -19.5d + y: 10.5d } { dependencies: [ @@ -483,7 +497,7 @@ }] title: "{quests.steam_age.electron_tube.title}" x: -19.5d - y: 14.5d + y: 15.0d } { dependencies: ["2C35D4E01AEC02AA"] @@ -509,14 +523,13 @@ } ] title: "{quests.steam_age.miner.title}" - x: -12.0d - y: 15.0d + x: -10.0d + y: 17.0d } { dependencies: [ "22E604DB7E7E87FB" "09E12A399EE0A628" - "1912758422EEB006" ] dependency_requirement: "one_completed" description: ["{quests.steam_age.glass_tube.desc}"] @@ -528,8 +541,8 @@ type: "item" }] title: "{quests.steam_age.glass_tube.title}" - x: -25.0d - y: 14.5d + x: -23.5d + y: 15.0d } { dependencies: ["033E74BC588E7EAD"] @@ -551,8 +564,8 @@ } ] title: "{quests.steam_age.deployers.title}" - x: -16.5d - y: 12.0d + x: -15.5d + y: 15.0d } { dependencies: ["1912758422EEB006"] @@ -574,8 +587,8 @@ } ] title: "{quests.steam_age.molding.title}" - x: -25.0d - y: 9.5d + x: -23.5d + y: 12.5d } { dependencies: ["033E74BC588E7EAD"] @@ -589,22 +602,22 @@ type: "item" }] title: "{quests.steam_age.mech_crafter.title}" - x: -20.5d - y: 12.0d + x: -19.5d + y: 12.5d } { dependencies: ["46FA9DD4755A5548"] description: ["{quests.steam_age.steam_bloomery.desc}"] - icon: "gtceu:steam_bloomery" + icon: "tfg:steam_bloomery" id: "0805CCABC8E7F6CF" optional: true shape: "heart" - size: 1.5d + size: 1.0d subtitle: "{quests.steam_age.steam_bloomery.subtitle}" tasks: [ { id: "72D748120CACABE2" - item: "gtceu:steam_bloomery" + item: "tfg:steam_bloomery" type: "item" } { @@ -630,8 +643,8 @@ } ] title: "{quests.steam_age.steam_bloomery.title}" - x: -22.5d - y: 4.0d + x: -16.5d + y: 5.5d } { dependencies: ["05CC8C5E63CD1DB8"] @@ -684,8 +697,8 @@ type: "item" }] title: "{quests.steam_age.circuit_boards.title}" - x: -11.5d - y: 8.5d + x: -9.5d + y: 10.5d } { dependencies: ["46FA9DD4755A5548"] @@ -699,8 +712,8 @@ type: "item" }] title: "{quests.steam_age.compressor.title}" - x: -19.5d - y: 9.5d + x: -16.5d + y: 8.5d } { dependencies: ["46FA9DD4755A5548"] @@ -716,7 +729,7 @@ }] title: "{quests.steam_age.alloy_smelter.title}" x: -22.5d - y: 9.5d + y: 8.5d } { dependencies: [ @@ -735,7 +748,7 @@ }] title: "{quests.steam_age.forge_hammer.title}" x: -22.5d - y: 8.0d + y: 6.5d } { dependencies: [ @@ -753,8 +766,8 @@ type: "item" }] title: "{quests.steam_age.vacuum_tubes.title}" - x: -10.0d - y: 12.0d + x: -8.0d + y: 14.0d } { dependencies: ["7DB7AB5349218605"] @@ -768,7 +781,7 @@ }] title: "{quests.steam_age.wood_plank.title}" x: -16.5d - y: 9.5d + y: 11.5d } { dependencies: ["46FA9DD4755A5548"] @@ -785,7 +798,7 @@ }] title: "{quests.steam_age.extractor.title}" x: -16.5d - y: 7.5d + y: 6.5d } { dependencies: [ @@ -804,8 +817,8 @@ type: "item" }] title: "{quests.steam_age.resistors.title}" - x: -7.0d - y: 9.5d + x: -5.0d + y: 11.5d } { dependencies: ["2C35D4E01AEC02AA"] @@ -820,8 +833,8 @@ type: "item" }] title: "{quests.steam_age.coiling_machine.title}" - x: -7.0d - y: 14.0d + x: -5.0d + y: 16.0d } { dependencies: ["2C35D4E01AEC02AA"] @@ -836,8 +849,8 @@ type: "item" }] title: "{quests.steam_age.steel_mixer.title}" - x: -7.0d - y: 12.5d + x: -5.0d + y: 14.5d } { dependencies: ["2C35D4E01AEC02AA"] @@ -851,8 +864,8 @@ type: "item" }] title: "{quests.steam_age.lathe.title}" - x: -8.0d - y: 15.0d + x: -6.0d + y: 17.0d } { dependencies: [ @@ -871,8 +884,8 @@ type: "item" }] title: "{quests.steam_age.centrifuge.title}" - x: -20.5d - y: 11.0d + x: -19.5d + y: 11.5d } { dependencies: [ @@ -889,8 +902,8 @@ type: "item" }] title: "{quests.steam_age.vibrating_table.title}" - x: -10.0d - y: 15.0d + x: -8.0d + y: 17.0d } { dependencies: ["2C35D4E01AEC02AA"] @@ -909,8 +922,8 @@ type: "item" }] title: "{quests.steam_age.rolling_mill.title}" - x: -7.0d - y: 11.0d + x: -5.0d + y: 13.0d } { dependencies: ["2C35D4E01AEC02AA"] @@ -924,8 +937,8 @@ type: "item" }] title: "{quests.steam_age.steel_saw.title}" - x: -9.0d - y: 15.0d + x: -7.0d + y: 17.0d } { dependencies: ["2C35D4E01AEC02AA"] @@ -939,8 +952,8 @@ type: "item" }] title: "{quests.steam_age.curving_press.title}" - x: -11.0d - y: 15.0d + x: -9.0d + y: 17.0d } { dependencies: [ @@ -956,7 +969,7 @@ type: "item" }] title: "{quests.steam_age.steam_furnace.title}" - x: -16.5d + x: -22.5d y: 5.5d } { @@ -1007,14 +1020,15 @@ } ] title: "{quests.steam_age.steam_oven.title}" - x: -16.5d - y: 4.0d + x: -24.5d + y: 5.5d } { dependencies: ["46FA9DD4755A5548"] description: ["{quests.steam_age.rock_crusher.desc}"] id: "2491CB5921B66446" optional: true + shape: "heart" subtitle: "{quests.steam_age.rock_crusher.subtitle}" tasks: [{ id: "5CA302572EF6D4E1" @@ -1022,8 +1036,8 @@ type: "item" }] title: "{quests.steam_age.rock_crusher.title}" - x: -22.5d - y: 7.0d + x: -16.5d + y: 7.5d } { dependencies: [ @@ -1060,7 +1074,7 @@ ] title: "{quests.steam_age.red_alloy.title}" x: -22.5d - y: 13.5d + y: 12.5d } { dependencies: ["51CBF7378FFAD514"] @@ -1149,8 +1163,8 @@ type: "item" }] title: "{quests.steam_age.potin.title}" - x: -5.5d - y: 12.5d + x: -3.5d + y: 14.5d } { dependencies: ["6F1BC99BE641B671"] @@ -1206,8 +1220,8 @@ } ] title: "{quests.steam_age.trains.title}" - x: -16.5d - y: 13.0d + x: -15.5d + y: 16.0d } { dependencies: ["6AA07588374B59AB"] @@ -1220,8 +1234,8 @@ type: "item" }] title: "{quests.steam_age.vacuum_chamber.title}" - x: -14.5d - y: 12.0d + x: -12.5d + y: 15.0d } { description: ["{quests.metal_age.black_steel_goodies.desc}"] @@ -1423,8 +1437,8 @@ type: "item" }] title: "{quests.steam_age.lv_circuit.title}" - x: -10.0d - y: 6.0d + x: -8.0d + y: 8.0d } { description: ["{quests.steam_age.paper.desc}"] @@ -1438,8 +1452,8 @@ type: "item" }] title: "{quests.steam_age.paper.title}" - x: -5.5d - y: 9.5d + x: -3.5d + y: 11.5d } { description: ["{quests.metal_age.bronze_goodies.desc}"] @@ -1520,6 +1534,7 @@ description: ["{quests.steam_age.steam_macerator.desc}"] id: "6CF7DCC996BACBFA" optional: true + shape: "heart" subtitle: "{quests.steam_age.steam_macerator.subtitle}" tasks: [{ id: "19146D7510558652" @@ -1528,7 +1543,7 @@ }] title: "{quests.steam_age.steam_macerator.title}" x: -22.5d - y: 6.0d + y: 7.5d } { dependencies: [ @@ -1537,18 +1552,42 @@ ] dependency_requirement: "one_completed" description: ["{quests.steam_age.steam_grinder.desc}"] + icon: "gtceu:steam_grinder" id: "0CC370A6FC56935B" optional: true shape: "heart" subtitle: "{quests.steam_age.steam_grinder.subtitle}" - tasks: [{ - id: "1CD61C4F273665DE" - item: "gtceu:steam_grinder" - type: "item" - }] + tasks: [ + { + id: "1CD61C4F273665DE" + item: "gtceu:steam_grinder" + type: "item" + } + { + count: 22L + id: "71D6716A2B985592" + item: { Count: 22, id: "gtceu:steam_machine_casing" } + type: "item" + } + { + id: "26D9013B4161E463" + item: "gtceu:steam_input_hatch" + type: "item" + } + { + id: "7D354B529103D126" + item: "gtceu:steam_input_bus" + type: "item" + } + { + id: "63B935735E346133" + item: "gtceu:steam_output_bus" + type: "item" + } + ] title: "{quests.steam_age.steam_grinder.title}" - x: -25.0d - y: 6.0d + x: -24.5d + y: 7.5d } { dependencies: ["32046292AA5B0E30"] @@ -1579,8 +1618,8 @@ type: "item" }] title: "{quests.steam_age.resin_boards.title}" - x: -13.5d - y: 9.5d + x: -11.5d + y: 11.5d } { dependencies: ["6E8CEE02CB5B678B"] @@ -1630,7 +1669,7 @@ }] title: "{quests.steam_age.packager.title}" x: -19.5d - y: 17.0d + y: 17.5d } { dependencies: [ @@ -1722,8 +1761,8 @@ type: "item" }] title: "{quests.steam_age.supers.title}" - x: -12.0d - y: 13.0d + x: -10.5d + y: 13.5d } { dependencies: ["0D0D461AE3A3F7BF"] @@ -1755,6 +1794,156 @@ x: -16.5d y: -2.0d } + { + dependencies: ["59F7F7A8C76DE31C"] + description: ["{quests.steam_age.steam_presser.desc}"] + icon: "tfg:steam_presser" + id: "65B6E2DACCF9159C" + optional: true + shape: "heart" + subtitle: "{quests.steam_age.steam_presser.subtitle}" + tasks: [ + { + id: "0AEC3F770A6166A4" + item: "tfg:steam_presser" + type: "item" + } + { + id: "5CC7BDBF599B405A" + item: "gtceu:steam_input_hatch" + type: "item" + } + { + id: "4998CA4B8DDF6E02" + item: "gtceu:steam_input_bus" + type: "item" + } + { + id: "31A69C679FC6F99A" + item: "gtceu:steam_output_bus" + type: "item" + } + { + count: 12L + id: "709D4C32D2F43ABD" + item: "gtceu:steam_machine_casing" + type: "item" + } + { + count: 4L + id: "559F1DA9AF2EC5C3" + item: { Count: 4, id: "gtceu:steel_machine_casing" } + type: "item" + } + { + count: 8L + id: "769C82179FD4F75B" + item: { Count: 8, id: "create:metal_girder" } + type: "item" + } + ] + title: "{quests.steam_age.steam_presser.title}" + x: -24.5d + y: 6.5d + } + { + dependencies: ["1912758422EEB006"] + description: ["{quests.steam_age.steam_fuser.desc}"] + icon: "tfg:steam_fuser" + id: "49F5B708E8F59ABF" + optional: true + shape: "heart" + subtitle: "{quests.steam_age.steam_fuser.subtitle}" + tasks: [ + { + id: "29EB9A9D81750312" + item: "tfg:steam_fuser" + type: "item" + } + { + id: "5496E814C911D5C1" + item: "gtceu:steam_input_hatch" + type: "item" + } + { + id: "40181C28B6560C94" + item: "gtceu:steam_output_bus" + type: "item" + } + { + id: "249376D261C69933" + item: "gtceu:steam_input_bus" + type: "item" + } + { + count: 8L + id: "790DDB716EAE9769" + item: { Count: 8, id: "gtceu:steam_machine_casing" } + type: "item" + } + { + count: 8L + id: "266BA05C0A212C6C" + item: { Count: 8, id: "gtceu:bronze_firebox_casing" } + type: "item" + } + ] + title: "{quests.steam_age.steam_fuser.title}" + x: -24.5d + y: 8.5d + } + { + dependencies: ["7DB7AB5349218605"] + description: ["{quests.steam_age.steam_squasher.desc}"] + icon: "tfg:steam_squasher" + id: "60399CB594078DE2" + optional: true + shape: "heart" + subtitle: "{quests.steam_age.steam_squasher.subtitle}" + tasks: [ + { + id: "74B02BED5D414B4C" + item: "tfg:steam_squasher" + type: "item" + } + { + id: "3BBEAD3334C1E3D0" + item: "gtceu:steam_input_hatch" + type: "item" + } + { + id: "6D8C5AA895D6DC15" + item: "gtceu:steam_output_bus" + type: "item" + } + { + id: "0D2DC79ED3C74B1F" + item: "gtceu:steam_input_bus" + type: "item" + } + { + count: 7L + id: "4BDAA78AC3C92713" + item: "gtceu:steam_machine_casing" + type: "item" + } + { + count: 3L + id: "4DFE7CD587BFFAB9" + item: { Count: 3, id: "gtceu:bronze_machine_casing" } + type: "item" + } + { + count: 6L + id: "7C5983298F614109" + item: { Count: 6, id: "gtceu:steel_frame" } + type: "item" + } + ] + title: "{quests.steam_age.steam_squasher.title}" + x: -14.5d + y: 8.5d + } ] subtitle: ["{quests.steam_age.subtitle}"] title: "{quests.steam_age}" diff --git a/config/ftbquests/quests/chapters/tips__tools.snbt b/config/ftbquests/quests/chapters/tips__tools.snbt index 61c9792cd..9f57ea394 100644 --- a/config/ftbquests/quests/chapters/tips__tools.snbt +++ b/config/ftbquests/quests/chapters/tips__tools.snbt @@ -2746,6 +2746,7 @@ type: "item" } { + disable_toast: true id: "2BF805FFBA137197" item: { Count: 1 diff --git a/config/moldraw.yaml b/config/moldraw.yaml index 85f917542..79bfa8716 100644 --- a/config/moldraw.yaml +++ b/config/moldraw.yaml @@ -1,14 +1,29 @@ enabled: true -debugMode: false - -coloredAtoms: true - -useMaterialColors: false - onlyShowOnShift: true -defaultColor: e +color: + colors: true -scale: 20 + useMaterialColors: false + + defaultColor: e + + minimumBrightness: 0.1 + +molecule: + showMolecules: true + + moleculeScale: 20 + +alloy: + showAlloys: true + + pieChartRadius: 32 + + recursive: true + + partsByMass: false + +debugMode: false diff --git a/kubejs/assets/ae2/lang/ru_ru.json b/kubejs/assets/ae2/lang/ru_ru.json index 2014cb8d5..887edcac4 100644 --- a/kubejs/assets/ae2/lang/ru_ru.json +++ b/kubejs/assets/ae2/lang/ru_ru.json @@ -8,5 +8,7 @@ "item.ae2.cell_component_256k": "256К МЭ компонент хранения", "item.ae2.item_storage_cell_256k": "256К МЭ предметная ячейка хранения", "item.ae2.fluid_storage_cell_256k": "256К МЭ жидкостная ячейка хранения", - "block.ae2.256k_crafting_storage": "Хранилище для изготовления на 256К" + "block.ae2.256k_crafting_storage": "Хранилище для изготовления на 256К", + "item.ae2.pattern_box": "Коробка для шаблонов", + "block.ae2.controller": "МЭ контроллер" } \ No newline at end of file diff --git a/kubejs/assets/ambientsounds/basic/regions/venus.json b/kubejs/assets/ambientsounds/basic/regions/venus.json index 4cec2093a..6dd4189d8 100644 --- a/kubejs/assets/ambientsounds/basic/regions/venus.json +++ b/kubejs/assets/ambientsounds/basic/regions/venus.json @@ -10,7 +10,8 @@ "geysers", "salt_flats", "sulfuric_ravine", - "fumaroles" + "fumaroles", + "jagged_tablelands" ], "sounds": [ { diff --git a/kubejs/assets/arthropocolypse/lang/en_us.json b/kubejs/assets/arthropocolypse/lang/en_us.json new file mode 100644 index 000000000..87cc912b7 --- /dev/null +++ b/kubejs/assets/arthropocolypse/lang/en_us.json @@ -0,0 +1,45 @@ +{ + "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.", + "entity.arthropocolypse.scarab": "Behemoth Mongolarachne Larva", + "entity.arthropocolypse.prairie_grasshopper": "Giant Cimbrophlebia Hopper", + "entity.arthropocolypse.field_cricket": "Glisachaemus Salthopper", + "entity.arthropocolypse.ice_crawler": "Obsidian Paleophaedon Beetle", + "entity.arthropocolypse.behemoth_desert_spider": "Behemoth Mongolarachne Queen", + "entity.arthropocolypse.behemoth_desert_scorpion": "Royal Guard Liassoscorpionides", + "entity.arthropocolypse.worker_ant": "Worker Formicium Ant", + "entity.arthropocolypse.soldier_ant": "Soldier Formicium Ant", + "entity.arthropocolypse.stag_beetle": "Horned Protognathinus Beetle", + "entity.arthropocolypse.stag_beetle_larva": "Horned Protognathinus Beetle Larva", + "entity.arthropocolypse.wharf_roach": "Arostropsis Weevil", + "entity.arthropocolypse.platerodrilus": "Bulwark Platerodrilus Beetle", + "entity.arthropocolypse.mealworm_beetle": "Manobiomorpha Flea Beetle", + "entity.arthropocolypse.mealworm": "Manobiomorpha Flea Beetle Larva", + "entity.arthropocolypse.millipede_head": "Assassin Chilognatha Millipede", + "item.arthropocolypse.scarab": "Behemoth Mongolarachne Larva", + "item.arthropocolypse.field_cricket_egg": "Glisachaemus Salthopper Egg", + "item.arthropocolypse.stag_beetle_egg": "Horned Protognathinus Beetle Egg", + "item.arthropocolypse.stag_beetle_larva": "Horned Protognathinus Beetle Larva", + "item.arthropocolypse.mealworm_egg": "Manobiomorpha Flea Beetle Egg", + "item.arthropocolypse.mealworm": "Manobiomorpha Flea Beetle Larva", + "item.arthropocolypse.ice_crawler_meat": "Raw Obsidian Paleophaedon Beetle", + "item.arthropocolypse.cooked_ice_crawler_meat": "Cooked Obsidian Paleophaedon Beetle", + "item.arthropocolypse.energy_bar": "Bug Snacks", + "item.arthropocolypse.beetle_fragment": "Chitin Fragment", + "item.arthropocolypse.beetle_fragment_block": "Chitin Block", + "item.arthropocolypse.beetle_fragment_block_bricks": "Chitin Bricks", + "item.arthropocolypse.chiseled_beetle_fragment_block": "Chiseled Chitin Block", + "item.arthropocolypse.polished_beetle_fragment_block": "Polished Chitin Block", + "item.arthropocolypse.tiled_beetle_fragment_block": "Tiled Chitin Block", + "item.arthropocolypse.beetle_fragment_block_stairs": "Chitin Block Stairs", + "item.arthropocolypse.beetle_fragment_block_bricks_stairs": "Chitin Bricks Stairs", + "item.arthropocolypse.polished_beetle_fragment_block_stairs": "Polished Chitin Stairs", + "item.arthropocolypse.tiled_beetle_fragment_block_stairs": "Tiled Chitin Stairs", + "item.arthropocolypse.beetle_fragment_block_slab": "Chitin Block Slab", + "item.arthropocolypse.beetle_fragment_block_bricks_slab": "Chitin Bricks Slab", + "item.arthropocolypse.polished_beetle_fragment_block_slab": "Polished Chitin Slab", + "item.arthropocolypse.tiled_beetle_fragment_block_slab": "Tiled Chitin Slab", + "item.arthropocolypse.beetle_fragment_block_wall": "Chitin Block Wall", + "item.arthropocolypse.beetle_fragment_block_bricks_wall": "Chitin Bricks Wall", + "item.arthropocolypse.polished_beetle_fragment_block_wall": "Polished Chitin Wall", + "item.arthropocolypse.tiled_beetle_fragment_block_wall": "Tiled Chitin Wall" +} \ No newline at end of file diff --git a/kubejs/assets/arthropocolypse/lang/zh_cn.json b/kubejs/assets/arthropocolypse/lang/zh_cn.json new file mode 100644 index 000000000..d5aa88677 --- /dev/null +++ b/kubejs/assets/arthropocolypse/lang/zh_cn.json @@ -0,0 +1,45 @@ +{ + "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.", + "entity.arthropocolypse.scarab": "巨兽蒙古拉蛛幼虫", + "entity.arthropocolypse.prairie_grasshopper": "巨翅辛布跳虫", + "entity.arthropocolypse.field_cricket": "盐地格利沙蟀", + "entity.arthropocolypse.ice_crawler": "黑曜古畏甲虫", + "entity.arthropocolypse.behemoth_desert_spider": "巨兽蒙古拉蛛后", + "entity.arthropocolypse.behemoth_desert_scorpion": "皇家利阿索蝎", + "entity.arthropocolypse.worker_ant": "工蚁", + "entity.arthropocolypse.soldier_ant": "兵蚁", + "entity.arthropocolypse.stag_beetle": "角额原颚甲虫", + "entity.arthropocolypse.stag_beetle_larva": "角额原颚甲虫幼虫", + "entity.arthropocolypse.wharf_roach": "阿罗斯特罗普西斯象甲", + "entity.arthropocolypse.platerodrilus": "板盾甲虫", + "entity.arthropocolypse.mealworm_beetle": "玛诺跳甲虫", + "entity.arthropocolypse.mealworm": "玛诺跳甲虫幼虫", + "entity.arthropocolypse.millipede_head": "刺袭颚唇马陆", + "item.arthropocolypse.scarab": "巨兽蒙古拉蛛幼虫", + "item.arthropocolypse.field_cricket_egg": "盐地格利沙蟀卵", + "item.arthropocolypse.stag_beetle_egg": "角额原颚甲虫卵", + "item.arthropocolypse.stag_beetle_larva": "角额原颚甲虫幼虫", + "item.arthropocolypse.mealworm_egg": "玛诺跳甲虫卵", + "item.arthropocolypse.mealworm": "玛诺跳甲虫幼虫", + "item.arthropocolypse.ice_crawler_meat": "生黑曜古畏甲虫肉", + "item.arthropocolypse.cooked_ice_crawler_meat": "熟黑曜古畏甲虫肉", + "item.arthropocolypse.energy_bar": "昆虫零食", + "item.arthropocolypse.beetle_fragment": "几丁质碎片", + "item.arthropocolypse.beetle_fragment_block": "几丁质方块", + "item.arthropocolypse.beetle_fragment_block_bricks": "几丁质砖", + "item.arthropocolypse.chiseled_beetle_fragment_block": "雕纹几丁质方块", + "item.arthropocolypse.polished_beetle_fragment_block": "磨制几丁质方块", + "item.arthropocolypse.tiled_beetle_fragment_block": "瓦片几丁质方块", + "item.arthropocolypse.beetle_fragment_block_stairs": "几丁质方块楼梯", + "item.arthropocolypse.beetle_fragment_block_bricks_stairs": "几丁质砖楼梯", + "item.arthropocolypse.polished_beetle_fragment_block_stairs": "磨制几丁质楼梯", + "item.arthropocolypse.tiled_beetle_fragment_block_stairs": "瓦片几丁质楼梯", + "item.arthropocolypse.beetle_fragment_block_slab": "几丁质方块台阶", + "item.arthropocolypse.beetle_fragment_block_bricks_slab": "几丁质砖台阶", + "item.arthropocolypse.polished_beetle_fragment_block_slab": "磨制几丁质台阶", + "item.arthropocolypse.tiled_beetle_fragment_block_slab": "瓦片几丁质台阶", + "item.arthropocolypse.beetle_fragment_block_wall": "几丁质方块墙", + "item.arthropocolypse.beetle_fragment_block_bricks_wall": "几丁质砖墙", + "item.arthropocolypse.polished_beetle_fragment_block_wall": "磨制几丁质墙", + "item.arthropocolypse.tiled_beetle_fragment_block_wall": "瓦片几丁质墙" +} \ No newline at end of file diff --git a/kubejs/assets/betterend/blockstates/shadow_plant.json b/kubejs/assets/betterend/blockstates/shadow_plant.json new file mode 100644 index 000000000..08fb1caee --- /dev/null +++ b/kubejs/assets/betterend/blockstates/shadow_plant.json @@ -0,0 +1,12 @@ +{ + "variants": { + "": [ + { "model": "betterend:block/shadow_plant_1" }, + { "model": "betterend:block/shadow_plant_2" }, + { "model": "betterend:block/shadow_plant_3" }, + { "model": "betterend:block/shadow_plant_4" }, + { "model": "betterend:block/shadow_plant_5" }, + { "model": "betterend:block/shadow_plant_6" } + ] + } +} \ No newline at end of file diff --git a/kubejs/assets/betterend/blockstates/twisted_vine.json b/kubejs/assets/betterend/blockstates/twisted_vine.json index 718311e23..b713a16a7 100644 --- a/kubejs/assets/betterend/blockstates/twisted_vine.json +++ b/kubejs/assets/betterend/blockstates/twisted_vine.json @@ -1,13 +1,15 @@ { "variants": { - "shape=top": { "model": "betterend:block/twisted_vine_top" }, - "shape=middle": [ + "height=0": { "model": "betterend:block/twisted_vine_top" }, + "height=1": [ { "model": "betterend:block/twisted_vine_middle_1" }, { "model": "betterend:block/twisted_vine_middle_2" } ], - "shape=bottom": [ + "height=2": [ { "model": "betterend:block/twisted_vine_bottom_1" }, { "model": "betterend:block/twisted_vine_bottom_2" } - ] + ], + "height=3": { "model": "" }, + "height=4": { "model": "" } } } diff --git a/kubejs/assets/betterend/lang/en_us.json b/kubejs/assets/betterend/lang/en_us.json index fcb9d958b..11244c122 100644 --- a/kubejs/assets/betterend/lang/en_us.json +++ b/kubejs/assets/betterend/lang/en_us.json @@ -87,6 +87,7 @@ "block.betterend.shadow_berry": "Nox Berries", "block.betterend.shadow_berry_wild": "Wild Nox Berries", "block.betterend.shadow_berry_dead": "Dead Nox Berries", + "block.betterend.shadow_plant": "Blackened Ashgrass", "block.betterend.small_amaranita_mushroom": "Small Amaranita Mushroom", "block.betterend.sulphur_crystal": "Sulfur Crystal", "block.betterend.sulphuric_rock": "Raw Ignimbrite", @@ -98,7 +99,7 @@ "block.betterend.twisted_moss": "Twisted Moss", "block.betterend.twisted_umbrella_moss": "Twisted Umbrella Moss", "block.betterend.twisted_umbrella_moss_tall": "Twisted Umbrella Moss", - "block.betterend.twisted_vine": "Twisted Vine", + "block.betterend.twisted_vine": "Carbonic Vine", "block.betterend.umbrella_moss": "Umbrella Moss", "block.betterend.umbrella_moss_tall": "Umbrella Moss", "block.betterend.vaiolush_fern": "Vaiolush Fern", diff --git a/kubejs/assets/betterend/lang/zh_cn.json b/kubejs/assets/betterend/lang/zh_cn.json index 156ab295a..40f9cd8f7 100644 --- a/kubejs/assets/betterend/lang/zh_cn.json +++ b/kubejs/assets/betterend/lang/zh_cn.json @@ -87,6 +87,7 @@ "block.betterend.shadow_berry": "夜影浆果", "block.betterend.shadow_berry_wild": "野生夜影浆果", "block.betterend.shadow_berry_dead": "枯萎的夜影浆果", + "block.betterend.shadow_plant": "焦黑的灰草", "block.betterend.small_amaranita_mushroom": " 赤星青茎菇", "block.betterend.sulphur_crystal": "硫磺晶体", "block.betterend.sulphuric_rock": "天然熔灰岩", @@ -98,7 +99,7 @@ "block.betterend.twisted_moss": "缠结苔", "block.betterend.twisted_umbrella_moss": "缠结伞苔", "block.betterend.twisted_umbrella_moss_tall": "高缠结伞苔", - "block.betterend.twisted_vine": "缠结藤", + "block.betterend.twisted_vine": "碳酸藤", "block.betterend.umbrella_moss": "伞苔", "block.betterend.umbrella_moss_tall": "高伞苔", "block.betterend.vaiolush_fern": "幽蓝蕨", diff --git a/kubejs/assets/betterend/models/block/shadow_plant_1.json b/kubejs/assets/betterend/models/block/shadow_plant_1.json new file mode 100644 index 000000000..8966a93e7 --- /dev/null +++ b/kubejs/assets/betterend/models/block/shadow_plant_1.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "betterend:block/shadow_plant" + } +} diff --git a/kubejs/assets/betterend/models/block/shadow_plant_2.json b/kubejs/assets/betterend/models/block/shadow_plant_2.json new file mode 100644 index 000000000..e5b0883c7 --- /dev/null +++ b/kubejs/assets/betterend/models/block/shadow_plant_2.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/cross_inverted", + "textures": { + "cross": "betterend:block/shadow_plant" + } +} diff --git a/kubejs/assets/betterend/models/block/shadow_plant_3.json b/kubejs/assets/betterend/models/block/shadow_plant_3.json new file mode 100644 index 000000000..747d552e8 --- /dev/null +++ b/kubejs/assets/betterend/models/block/shadow_plant_3.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "betterend:block/shadow_plant_potted" + } +} diff --git a/kubejs/assets/betterend/models/block/shadow_plant_4.json b/kubejs/assets/betterend/models/block/shadow_plant_4.json new file mode 100644 index 000000000..33760a4c8 --- /dev/null +++ b/kubejs/assets/betterend/models/block/shadow_plant_4.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/cross_inverted", + "textures": { + "cross": "betterend:block/shadow_plant_potted" + } +} diff --git a/kubejs/assets/betterend/models/block/shadow_plant_5.json b/kubejs/assets/betterend/models/block/shadow_plant_5.json new file mode 100644 index 000000000..27fc96c3f --- /dev/null +++ b/kubejs/assets/betterend/models/block/shadow_plant_5.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/cross_inverted", + "textures": { + "cross": "betterend:block/tail_moss" + } +} diff --git a/kubejs/assets/betterend/models/block/shadow_plant_6.json b/kubejs/assets/betterend/models/block/shadow_plant_6.json new file mode 100644 index 000000000..e2110fee0 --- /dev/null +++ b/kubejs/assets/betterend/models/block/shadow_plant_6.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "betterend:block/tail_moss" + } +} diff --git a/kubejs/assets/betterend/models/block/twisted_vine_bottom_1.json b/kubejs/assets/betterend/models/block/twisted_vine_bottom_1.json new file mode 100644 index 000000000..c64d397a7 --- /dev/null +++ b/kubejs/assets/betterend/models/block/twisted_vine_bottom_1.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/cross_no_distortion", + "textures": { + "texture": "betterend:block/twisted_vine_bottom" + } +} diff --git a/kubejs/assets/betterend/models/block/twisted_vine_bottom_2.json b/kubejs/assets/betterend/models/block/twisted_vine_bottom_2.json new file mode 100644 index 000000000..13696d557 --- /dev/null +++ b/kubejs/assets/betterend/models/block/twisted_vine_bottom_2.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/cross_no_distortion_inverted", + "textures": { + "texture": "betterend:block/twisted_vine_bottom" + } +} diff --git a/kubejs/assets/betterend/models/block/twisted_vine_middle_1.json b/kubejs/assets/betterend/models/block/twisted_vine_middle_1.json new file mode 100644 index 000000000..50cd9cb87 --- /dev/null +++ b/kubejs/assets/betterend/models/block/twisted_vine_middle_1.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/cross_no_distortion", + "textures": { + "texture": "betterend:block/twisted_vine" + } +} diff --git a/kubejs/assets/betterend/models/block/twisted_vine_middle_2.json b/kubejs/assets/betterend/models/block/twisted_vine_middle_2.json new file mode 100644 index 000000000..eb0a34031 --- /dev/null +++ b/kubejs/assets/betterend/models/block/twisted_vine_middle_2.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/cross_no_distortion_inverted", + "textures": { + "texture": "betterend:block/twisted_vine" + } +} diff --git a/kubejs/assets/betterend/models/block/twisted_vine_top.json b/kubejs/assets/betterend/models/block/twisted_vine_top.json new file mode 100644 index 000000000..c6cbd1d12 --- /dev/null +++ b/kubejs/assets/betterend/models/block/twisted_vine_top.json @@ -0,0 +1,76 @@ +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "betterend:block/twisted_vine", + "texture": "betterend:block/twisted_vine", + "roots": "betterend:block/twisted_vine_roots" + }, + "elements": [ + { + "__comment": "PlaneX1", + "from": [ 2.375, 0, 2.25 ], + "to": [ 2.376, 16, 18.25 ], + "rotation": { "origin": [ 2.375, 0, 2.25 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX1", + "from": [ 13.75, 0, 2.25 ], + "to": [ 13.751, 16, 18.25 ], + "rotation": { "origin": [ 13.75, 0, 2.25 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX4", + "from": [ 5, 0, 0.5 ], + "to": [ 5.001, 16, 16.5 ], + "rotation": { "origin": [ 5, 0, 0.5 ], "axis": "y", "angle": 22.5 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 16, 16, 0 ], "texture": "#roots" }, + "east": { "uv": [ 0, 16, 16, 0 ], "texture": "#roots" } + } + }, + { + "__comment": "PlaneZ5", + "from": [ 0.5, 0, 11 ], + "to": [ 16.5, 16, 11.001 ], + "rotation": { "origin": [ 0.5, 0, 11 ], "axis": "y", "angle": 22.5 }, + "shade": false, + "faces": { + "north": { "uv": [ 0, 16, 16, 0 ], "texture": "#roots" }, + "south": { "uv": [ 0, 16, 16, 0 ], "texture": "#roots" } + } + }, + { + "__comment": "PlaneX4", + "from": [ 11, 0, 0.5 ], + "to": [ 11.001, 16, 16.5 ], + "rotation": { "origin": [ 11, 0, 0.5 ], "axis": "y", "angle": -22.5 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 16, 16, 0 ], "texture": "#roots" }, + "east": { "uv": [ 0, 16, 16, 0 ], "texture": "#roots" } + } + }, + { + "__comment": "PlaneZ5", + "from": [ 0.5, 0, 5 ], + "to": [ 16.5, 16, 5.001 ], + "rotation": { "origin": [ 0.5, 0, 5 ], "axis": "y", "angle": -22.5 }, + "shade": false, + "faces": { + "north": { "uv": [ 0, 16, 16, 0 ], "texture": "#roots" }, + "south": { "uv": [ 0, 16, 16, 0 ], "texture": "#roots" } + } + } + ] +} \ No newline at end of file diff --git a/kubejs/assets/betterend/models/item/shadow_plant.json b/kubejs/assets/betterend/models/item/shadow_plant.json new file mode 100644 index 000000000..e7b848fa4 --- /dev/null +++ b/kubejs/assets/betterend/models/item/shadow_plant.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "betterend:block/shadow_plant" + } +} diff --git a/kubejs/assets/betterend/textures/block/twisted_vine.png b/kubejs/assets/betterend/textures/block/twisted_vine.png index 940357484..47a64f263 100644 Binary files a/kubejs/assets/betterend/textures/block/twisted_vine.png and b/kubejs/assets/betterend/textures/block/twisted_vine.png differ diff --git a/kubejs/assets/betterend/textures/block/twisted_vine_bottom.png b/kubejs/assets/betterend/textures/block/twisted_vine_bottom.png index 44dfe5ad5..c1518f352 100644 Binary files a/kubejs/assets/betterend/textures/block/twisted_vine_bottom.png and b/kubejs/assets/betterend/textures/block/twisted_vine_bottom.png differ diff --git a/kubejs/assets/betterend/textures/block/twisted_vine_roots.png b/kubejs/assets/betterend/textures/block/twisted_vine_roots.png index a68c549b7..8dcb9b916 100644 Binary files a/kubejs/assets/betterend/textures/block/twisted_vine_roots.png and b/kubejs/assets/betterend/textures/block/twisted_vine_roots.png differ diff --git a/kubejs/assets/endermanoverhaul/lang/en_us.json b/kubejs/assets/endermanoverhaul/lang/en_us.json index 9f8aee6e7..e9b45fcc9 100644 --- a/kubejs/assets/endermanoverhaul/lang/en_us.json +++ b/kubejs/assets/endermanoverhaul/lang/en_us.json @@ -1,6 +1,6 @@ { "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.", - "entity.endermanoverhaul.nether_wastes_enderman": "Deep Cave Enderman", + "entity.endermanoverhaul.nether_wastes_enderman": "Fiery Enderman", "entity.endermanoverhaul.dark_oak_enderman": "Ashen Enderman", "entity.endermanoverhaul.mushroom_fields_enderman": "Mushroom Enderman", "entity.endermanoverhaul.swamp_enderman": "Mossy Enderman", @@ -10,7 +10,9 @@ "entity.endermanoverhaul.end_enderman": "Baritone Choral Enderman", "entity.endermanoverhaul.end_islands_enderman": "Soprano Choral Enderman", "entity.endermanoverhaul.spirit": "Comet", - "item.endermanoverhaul.nether_wastes_enderman_spawn_egg": "Deep Cave Enderman Spawn Egg", + "entity.endermanoverhaul.desert_enderman": "Lost Enderman", + "entity.endermanoverhaul.savanna_enderman": "Sandy Enderman", + "item.endermanoverhaul.nether_wastes_enderman_spawn_egg": "Fiery Enderman Spawn Egg", "item.endermanoverhaul.dark_oak_enderman_spawn_egg": "Ashen Enderman Spawn Egg", "item.endermanoverhaul.mushroom_fields_enderman_spawn_egg": "Mushroom Enderman Spawn Egg", "item.endermanoverhaul.swamp_enderman_spawn_egg": "Mossy Enderman Spawn Egg", @@ -20,6 +22,8 @@ "item.endermanoverhaul.end_enderman_spawn_egg": "Baritone Choral Enderman Spawn Egg", "item.endermanoverhaul.end_islands_enderman_spawn_egg": "Soprano Choral Enderman Spawn Egg", "item.endermanoverhaul.spirit_spawn_egg": "Comet Spawn Egg", + "item.endermanoverhaul.desert_enderman_spawn_egg": "Lost Enderman Spawn Egg", + "item.endermanoverhaul.savanna_enderman_spawn_egg": "Sandy Enderman Spawn Egg", "subtitles.endermanoverhaul.entity.cave_enderman.ambient": "Deep Cave Enderman vwoops", "subtitles.endermanoverhaul.entity.cave_enderman.hurt": "Deep Cave Enderman hurts", "subtitles.endermanoverhaul.entity.dark_oak_enderman.ambient": "Ashen Enderman vwoops", diff --git a/kubejs/assets/endermanoverhaul/lang/zh_cn.json b/kubejs/assets/endermanoverhaul/lang/zh_cn.json index 3f918e189..4a6887698 100644 --- a/kubejs/assets/endermanoverhaul/lang/zh_cn.json +++ b/kubejs/assets/endermanoverhaul/lang/zh_cn.json @@ -1,6 +1,6 @@ { "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.", - "entity.endermanoverhaul.nether_wastes_enderman": "洞穴末影人", + "entity.endermanoverhaul.nether_wastes_enderman": "狂躁末影人", "entity.endermanoverhaul.dark_oak_enderman": "灰烬末影人", "entity.endermanoverhaul.mushroom_fields_enderman": "蘑菇末影人", "entity.endermanoverhaul.swamp_enderman": "覆苔末影人", @@ -10,7 +10,9 @@ "entity.endermanoverhaul.end_enderman": "男中音合唱末影人", "entity.endermanoverhaul.end_islands_enderman": "女高音合唱末影人", "entity.endermanoverhaul.spirit": "彗星", - "item.endermanoverhaul.nether_wastes_enderman_spawn_egg": "洞穴末影人刷怪蛋", + "entity.endermanoverhaul.desert_enderman": "迷失末影人", + "entity.endermanoverhaul.savanna_enderman": "沙地末影人", + "item.endermanoverhaul.nether_wastes_enderman_spawn_egg": "狂躁末影人刷怪蛋", "item.endermanoverhaul.dark_oak_enderman_spawn_egg": "灰烬末影人刷怪蛋", "item.endermanoverhaul.mushroom_fields_enderman_spawn_egg": "蘑菇末影人刷怪蛋", "item.endermanoverhaul.swamp_enderman_spawn_egg": "覆苔末影人刷怪蛋", @@ -20,6 +22,8 @@ "item.endermanoverhaul.end_enderman_spawn_egg": "男中音合唱末影人刷怪蛋", "item.endermanoverhaul.end_islands_enderman_spawn_egg": "女高音合唱末影人刷怪蛋", "item.endermanoverhaul.spirit_spawn_egg": "彗星刷怪蛋", + "item.endermanoverhaul.desert_enderman_spawn_egg": "迷失末影人刷怪蛋", + "item.endermanoverhaul.savanna_enderman_spawn_egg": "沙地末影人刷怪蛋", "subtitles.endermanoverhaul.entity.cave_enderman.ambient": "洞穴末影人:低鸣", "subtitles.endermanoverhaul.entity.cave_enderman.hurt": "洞穴末影人:受伤", "subtitles.endermanoverhaul.entity.dark_oak_enderman.ambient": "灰烬末影人:低鸣", diff --git a/kubejs/assets/extendedae/lang/ru_ru.json b/kubejs/assets/extendedae/lang/ru_ru.json new file mode 100644 index 000000000..b6bfcb09e --- /dev/null +++ b/kubejs/assets/extendedae/lang/ru_ru.json @@ -0,0 +1,10 @@ +{ + "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.", + "block.extendedae.assembler_matrix_frame": "Рамка матрицы сборщика", + "block.extendedae.assembler_matrix_wall": "Стенка матрицы сборщика", + "block.extendedae.assembler_matrix_glass": "Стекло матрицы сборщика", + "block.extendedae.assembler_matrix_pattern": "Ядро матрицы сборщика", + "block.extendedae.assembler_matrix_crafter": "Крафтовое ядро матрицы сборщика", + "block.extendedae.assembler_matrix_speed": "Ядро ускорения матрицы сборщика", + "item.extendedae.oversize_interface_part": "МЭ Сверхразмерный интерфейс" +} \ No newline at end of file diff --git a/kubejs/assets/framedblocks/lang/zh_cn.json b/kubejs/assets/framedblocks/lang/zh_cn.json index f9270aa91..b1dacf823 100644 --- a/kubejs/assets/framedblocks/lang/zh_cn.json +++ b/kubejs/assets/framedblocks/lang/zh_cn.json @@ -1,110 +1,349 @@ { "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.", + "block.framedblocks.framed_activator_rail_slope": "激活铁轨坡框架", + "block.framedblocks.framed_adj_double_copycat_panel": "可调复合仿制竖板框架", + "block.framedblocks.framed_adj_double_copycat_slab": "可调复合仿制台阶框架", + "block.framedblocks.framed_adj_double_panel": "可调复合竖板框架", + "block.framedblocks.framed_adj_double_slab": "可调复合台阶框架", "block.framedblocks.framed_bars": "铁栅栏框架", + "block.framedblocks.framed_bookshelf": "书架框架", "block.framedblocks.framed_bouncy_cube": "黏液块框架", "block.framedblocks.framed_button": "按钮框架", + "block.framedblocks.framed_centered_panel": "居中竖板框架", + "block.framedblocks.framed_centered_slab": "居中台阶框架", + "block.framedblocks.framed_checkered_cube": "棋盘纹方块框架", + "block.framedblocks.framed_checkered_cube_segment": "棋盘纹方块分段框架", + "block.framedblocks.framed_checkered_panel": "棋盘纹竖板框架", + "block.framedblocks.framed_checkered_panel_segment": "棋盘纹竖板分段框架", + "block.framedblocks.framed_checkered_slab": "棋盘纹台阶框架", + "block.framedblocks.framed_checkered_slab_segment": "棋盘纹台阶分段框架", "block.framedblocks.framed_chest": "箱子框架", + "block.framedblocks.framed_chiseled_bookshelf": "雕纹书架框架", "block.framedblocks.framed_collapsible_block": "自定义方块框架", + "block.framedblocks.framed_collapsible_copycat_block": "自定义仿制方块框架", + "block.framedblocks.framed_compound_slope_panel": "复合坡竖板框架", + "block.framedblocks.framed_compound_slope_slab": "复合坡台阶框架", "block.framedblocks.framed_corner_pillar": "角柱框架", "block.framedblocks.framed_corner_slope": "角坡框架", + "block.framedblocks.framed_corner_strip": "角条框架", "block.framedblocks.framed_cube": "框架块", + "block.framedblocks.framed_detector_rail_slope": "探测铁轨坡框架", + "block.framedblocks.framed_divided_panel_horizontal": "分割竖板框架（水平）", + "block.framedblocks.framed_divided_panel_vertical": "分割竖板框架（垂直）", + "block.framedblocks.framed_divided_slab": "分割台阶框架", + "block.framedblocks.framed_divided_slope": "分割坡框架", + "block.framedblocks.framed_divided_stairs": "分割楼梯框架", "block.framedblocks.framed_door": "门框架", "block.framedblocks.framed_double_corner": "复合角框架", - "block.framedblocks.framed_double_panel": "复合侧板框架", + "block.framedblocks.framed_double_half_slope": "复合半坡框架", + "block.framedblocks.framed_double_half_stairs": "复合半楼梯框架", + "block.framedblocks.framed_double_panel": "复合竖板框架", + "block.framedblocks.framed_double_prism": "复合棱柱框架", "block.framedblocks.framed_double_prism_corner": "复合棱框架", "block.framedblocks.framed_double_slab": "复合台阶框架", "block.framedblocks.framed_double_slope": "复合坡框架", - "block.framedblocks.framed_double_slope_panel": "复合高坡框架", - "block.framedblocks.framed_double_slope_slab": "台阶复合坡框架", + "block.framedblocks.framed_double_slope_panel": "复合坡竖板框架", + "block.framedblocks.framed_double_slope_slab": "复合坡台阶框架", + "block.framedblocks.framed_double_sloped_prism": "复合坡棱柱框架", "block.framedblocks.framed_double_stairs": "复合楼梯框架", "block.framedblocks.framed_double_threeway_corner": "复合三角框架", - "block.framedblocks.framed_elevated_double_slope_slab": "复合高坡台阶框架", - "block.framedblocks.framed_elevated_slope_slab": "高坡框架", - "block.framedblocks.framed_extended_double_slope_panel": "复合竖向高坡框架", - "block.framedblocks.framed_extended_slope_panel": "竖向高坡框架", + "block.framedblocks.framed_double_threeway_corner_pillar": "复合三角柱框架", + "block.framedblocks.framed_elevated_double_slope_edge": "抬升复合坡边缘框架", + "block.framedblocks.framed_elevated_double_slope_slab": "抬升复合坡台阶框架", + "block.framedblocks.framed_elevated_slope_edge": "抬升坡边缘框架", + "block.framedblocks.framed_elevated_slope_slab": "抬升坡台阶框架", + "block.framedblocks.framed_ext_corner_slope_panel": "延伸角坡竖板框架", + "block.framedblocks.framed_ext_corner_slope_panel_w": "延伸角坡竖板框架", + "block.framedblocks.framed_ext_double_corner_slope_panel": "延伸复合角坡竖板框架", + "block.framedblocks.framed_ext_double_corner_slope_panel_w": "延伸复合角坡竖板框架", + "block.framedblocks.framed_ext_inner_corner_slope_panel": "延伸内角坡竖板框架", + "block.framedblocks.framed_ext_inner_corner_slope_panel_w": "延伸内角坡竖板框架", + "block.framedblocks.framed_ext_inner_double_corner_slope_panel": "延伸内复合角坡竖板框架", + "block.framedblocks.framed_ext_inner_double_corner_slope_panel_w": "延伸内复合角坡竖板框架", + "block.framedblocks.framed_extended_double_slope_panel": "延伸复合坡竖板框架", + "block.framedblocks.framed_extended_slope_panel": "延伸坡竖板框架", + "block.framedblocks.framed_fancy_activator_rail": "花式激活铁轨框架", + "block.framedblocks.framed_fancy_activator_rail_slope": "花式激活铁轨坡框架", + "block.framedblocks.framed_fancy_detector_rail": "花式探测铁轨框架", + "block.framedblocks.framed_fancy_detector_rail_slope": "花式探测铁轨坡框架", + "block.framedblocks.framed_fancy_powered_rail": "花式充能铁轨框架", + "block.framedblocks.framed_fancy_powered_rail_slope": "花式充能铁轨坡框架", + "block.framedblocks.framed_fancy_rail": "花式铁轨框架", + "block.framedblocks.framed_fancy_rail_slope": "花式铁轨坡框架", "block.framedblocks.framed_fence": "栅栏框架", + "block.framedblocks.framed_fence_gate": "栅栏门框架", + "block.framedblocks.framed_flat_double_slope_panel_corner": "扁平复合坡竖板角框架", + "block.framedblocks.framed_flat_double_slope_slab_corner": "扁平复合坡台阶角框架", + "block.framedblocks.framed_flat_elev_double_slope_slab_corner": "扁平抬升复合坡台阶角框架", + "block.framedblocks.framed_flat_elev_inner_double_slope_slab_corner": "扁平抬升内复合坡台阶角框架", + "block.framedblocks.framed_flat_elev_inner_slope_slab_corner": "扁平抬升内坡台阶角框架", + "block.framedblocks.framed_flat_elev_slope_slab_corner": "扁平抬升坡台阶角框架", + "block.framedblocks.framed_flat_ext_double_slope_panel_corner": "扁平延伸复合坡竖板角框架", + "block.framedblocks.framed_flat_ext_inner_double_slope_panel_corner": "扁平延伸内复合坡竖板角框架", + "block.framedblocks.framed_flat_ext_inner_slope_panel_corner": "扁平延伸内坡竖板角框架", + "block.framedblocks.framed_flat_ext_slope_panel_corner": "扁平延伸坡竖板角框架", + "block.framedblocks.framed_flat_inner_slope_panel_corner": "扁平内坡竖板角框架", + "block.framedblocks.framed_flat_inner_slope_slab_corner": "扁平内坡台阶角框架", + "block.framedblocks.framed_flat_inv_double_slope_panel_corner": "扁平反向复合坡竖板角框架", + "block.framedblocks.framed_flat_inv_double_slope_slab_corner": "扁平反向复合坡台阶角框架", + "block.framedblocks.framed_flat_slope_panel_corner": "扁平坡竖板角框架", + "block.framedblocks.framed_flat_slope_slab_corner": "扁平坡台阶角框架", + "block.framedblocks.framed_flat_stacked_inner_slope_panel_corner": "扁平堆叠内坡竖板角框架", + "block.framedblocks.framed_flat_stacked_inner_slope_slab_corner": "扁平堆叠内坡台阶角框架", + "block.framedblocks.framed_flat_stacked_slope_panel_corner": "扁平堆叠坡竖板角框架", + "block.framedblocks.framed_flat_stacked_slope_slab_corner": "扁平堆叠坡台阶角框架", "block.framedblocks.framed_floor_board": "地板框架", "block.framedblocks.framed_flower_pot": "花盆框架", - "block.framedblocks.framed_fence_gate": "栅栏门框架", "block.framedblocks.framed_gate": "门框架", - "block.framedblocks.framed_gold_pressure_plate": "轻质测重压力板框架", + "block.framedblocks.framed_glowing_cube": "发光方块框架", + "block.framedblocks.framed_glowing_item_frame": "发光物品展示框框架", + "block.framedblocks.framed_gold_pressure_plate": "轻质压力板框架", "block.framedblocks.framed_half_pillar": "半柱框架", + "block.framedblocks.framed_half_slope": "半坡框架", "block.framedblocks.framed_half_stairs": "半楼梯框架", - "block.framedblocks.framed_horizontal_pane": "水平板框架", + "block.framedblocks.framed_hanging_sign": "悬挂告示牌框架", + "block.framedblocks.framed_horizontal_pane": "水平玻璃板框架", "block.framedblocks.framed_inner_corner_slope": "内角坡框架", + "block.framedblocks.framed_inner_prism": "内棱柱框架", "block.framedblocks.framed_inner_prism_corner": "内棱框架", + "block.framedblocks.framed_inner_sloped_prism": "内坡棱柱框架", "block.framedblocks.framed_inner_threeway_corner": "内三角框架", - "block.framedblocks.framed_inv_double_slope_panel": "竖直反向复合坡框架", - "block.framedblocks.framed_inv_double_slope_slab": "台阶反向复合坡框架", + "block.framedblocks.framed_inv_double_corner_slope_panel": "反向复合角坡竖板框架", + "block.framedblocks.framed_inv_double_corner_slope_panel_w": "反向复合角坡竖板框架", + "block.framedblocks.framed_inv_double_slope_panel": "反向复合坡竖板框架", + "block.framedblocks.framed_inv_double_slope_slab": "反向复合坡台阶框架", "block.framedblocks.framed_iron_door": "铁门框架", + "block.framedblocks.framed_iron_gate": "铁制大门框架", "block.framedblocks.framed_iron_pressure_plate": "重质压力板框架", "block.framedblocks.framed_iron_trapdoor": "铁活板门框架", + "block.framedblocks.framed_item_frame": "物品展示框框架", "block.framedblocks.framed_ladder": "梯子框架", "block.framedblocks.framed_large_button": "大按钮框架", + "block.framedblocks.framed_large_corner_slope_panel": "大角坡竖板框架", + "block.framedblocks.framed_large_corner_slope_panel_w": "大角坡竖板框架", + "block.framedblocks.framed_large_double_corner_slope_panel": "大复合角坡竖板框架", + "block.framedblocks.framed_large_double_corner_slope_panel_w": "大复合角坡竖板框架", + "block.framedblocks.framed_large_inner_corner_slope_panel": "大内角坡竖板框架", + "block.framedblocks.framed_large_inner_corner_slope_panel_w": "大内角坡竖板框架", "block.framedblocks.framed_large_stone_button": "大石头按钮框架", "block.framedblocks.framed_lattice_block": "格架方块", "block.framedblocks.framed_lever": "拉杆框架", + "block.framedblocks.framed_masonry_corner": "石工角框架", + "block.framedblocks.framed_masonry_corner_segment": "石工角分段框架", + "block.framedblocks.framed_mini_cube": "微型方块框架", "block.framedblocks.framed_obsidian_pressure_plate": "黑曜石压力板框架", + "block.framedblocks.framed_one_way_window": "单向玻璃框架", "block.framedblocks.framed_pane": "玻璃板框架", "block.framedblocks.framed_panel": "竖板框架", "block.framedblocks.framed_pillar": "柱框架", "block.framedblocks.framed_post": "杆框架", + "block.framedblocks.framed_powered_rail_slope": "充能铁轨坡框架", "block.framedblocks.framed_pressure_plate": "压力板框架", - "block.framedblocks.framed_prism": "三棱柱框架", + "block.framedblocks.framed_prism": "棱柱框架", "block.framedblocks.framed_prism_corner": "棱框架", "block.framedblocks.framed_pyramid": "角锥框架", "block.framedblocks.framed_pyramid_slab": "角锥台阶框架", - "block.framedblocks.framed_rail_slope": "铁路坡框架", + "block.framedblocks.framed_rail_slope": "铁轨坡框架", "block.framedblocks.framed_redstone_block": "红石块框架", + "block.framedblocks.framed_redstone_torch": "红石火把框架", "block.framedblocks.framed_secret_storage": "木桶框架", "block.framedblocks.framed_sign": "告示牌框架", "block.framedblocks.framed_slab": "台阶框架", "block.framedblocks.framed_slab_corner": "台阶角框架", "block.framedblocks.framed_slab_edge": "台阶边缘框架", + "block.framedblocks.framed_sliced_stairs_panel": "切边楼梯框架（竖板）", + "block.framedblocks.framed_sliced_stairs_slab": "切边楼梯框架（台阶）", "block.framedblocks.framed_slope": "坡框架", - "block.framedblocks.framed_slope_panel": "竖向坡框架", - "block.framedblocks.framed_slope_slab": "台阶坡框架", - "block.framedblocks.framed_sloped_prism": "三棱柱坡框架", + "block.framedblocks.framed_slope_edge": "坡边缘框架", + "block.framedblocks.framed_slope_panel": "坡竖板框架", + "block.framedblocks.framed_slope_slab": "坡台阶框架", + "block.framedblocks.framed_sloped_prism": "坡棱柱框架", + "block.framedblocks.framed_sloped_stairs": "坡楼梯框架", + "block.framedblocks.framed_small_corner_slope_panel": "小角坡竖板框架", + "block.framedblocks.framed_small_corner_slope_panel_w": "小角坡竖板框架", + "block.framedblocks.framed_small_double_corner_slope_panel": "小复合角坡竖板框架", + "block.framedblocks.framed_small_double_corner_slope_panel_w": "小复合角坡竖板框架", + "block.framedblocks.framed_small_inner_corner_slope_panel": "小内角坡竖板框架", + "block.framedblocks.framed_small_inner_corner_slope_panel_w": "小内角坡竖板框架", "block.framedblocks.framed_soul_torch": "灵魂火把框架", + "block.framedblocks.framed_stacked_corner_slope_panel": "堆叠角坡竖板框架", + "block.framedblocks.framed_stacked_corner_slope_panel_w": "堆叠角坡竖板框架", + "block.framedblocks.framed_stacked_inner_corner_slope_panel": "堆叠内角坡竖板框架", + "block.framedblocks.framed_stacked_inner_corner_slope_panel_w": "堆叠内角坡竖板框架", + "block.framedblocks.framed_stacked_slope_edge": "堆叠坡边缘框架", + "block.framedblocks.framed_stacked_slope_panel": "堆叠坡竖板框架", + "block.framedblocks.framed_stacked_slope_slab": "堆叠坡台阶框架", "block.framedblocks.framed_stairs": "楼梯框架", "block.framedblocks.framed_stone_button": "石头按钮框架", "block.framedblocks.framed_stone_pressure_plate": "石头压力板框架", "block.framedblocks.framed_target": "标靶框架", + "block.framedblocks.framed_thick_lattice": "厚格架框架", "block.framedblocks.framed_threeway_corner": "三角框架", + "block.framedblocks.framed_threeway_corner_pillar": "三角柱框架", "block.framedblocks.framed_torch": "火把框架", "block.framedblocks.framed_trapdoor": "活板门框架", - "block.framedblocks.framed_vertical_double_stairs": "竖向复合台阶框架", - "block.framedblocks.framed_vertical_half_stairs": "竖向半楼梯框架", - "block.framedblocks.framed_vertical_stairs": "竖向楼梯框架", + "block.framedblocks.framed_tube": "管状框架", + "block.framedblocks.framed_vertical_divided_stairs": "垂直分割楼梯框架", + "block.framedblocks.framed_vertical_double_half_slope": "垂直复合半坡框架", + "block.framedblocks.framed_vertical_double_half_stairs": "垂直复合半楼梯框架", + "block.framedblocks.framed_vertical_double_stairs": "垂直复合楼梯框架", + "block.framedblocks.framed_vertical_half_slope": "垂直半坡框架", + "block.framedblocks.framed_vertical_half_stairs": "垂直半楼梯框架", + "block.framedblocks.framed_vertical_sliced_stairs": "垂直切边楼梯框架", + "block.framedblocks.framed_vertical_sloped_stairs": "垂直坡楼梯框架", + "block.framedblocks.framed_vertical_stairs": "垂直楼梯框架", "block.framedblocks.framed_wall": "墙框架", "block.framedblocks.framed_wall_board": "墙板框架", + "block.framedblocks.framed_wall_hanging_sign": "悬挂告示牌框架", "block.framedblocks.framed_wall_sign": "告示牌框架", - "button.framedblocks.gui.done": "完成", + "block.framedblocks.framed_waterloggable_gold_pressure_plate": "轻质压力板框架", + "block.framedblocks.framed_waterloggable_iron_pressure_plate": "重质压力板框架", + "block.framedblocks.framed_waterloggable_obsidian_pressure_plate": "黑曜石压力板框架", + "block.framedblocks.framed_waterloggable_pressure_plate": "压力板框架", + "block.framedblocks.framed_waterloggable_stone_pressure_plate": "石头压力板框架", + "block.framedblocks.framing_saw": "框架锯", + "block.framedblocks.powered_framing_saw": "动力框架锯", + "config.framedblocks.client.altGhostRenderer": "使用替代放置预览渲染器", + "config.framedblocks.client.camoMessageVerbosity": "伪装块禁用信息详细程度", + "config.framedblocks.client.camoRotationMode": "伪装块旋转覆盖层：显示模式", + "config.framedblocks.client.conTexMode": "连接纹理模式", + "config.framedblocks.client.detailedCulling": "详细剔除", + "config.framedblocks.client.discreteUVSteps": "使用离散UV步长", + "config.framedblocks.client.fancyHitboxes": "花式碰撞箱", + "config.framedblocks.client.forceAoOnGlowingBlocks": "强制在发光框架块上应用环境光遮蔽", + "config.framedblocks.client.itemFrameBackgroundMode": "物品展示框背景覆盖层：显示模式", + "config.framedblocks.client.oneWayWindowMode": "单向玻璃覆盖层：显示模式", + "config.framedblocks.client.prismOffsetMode": "棱柱偏移覆盖层：显示模式", + "config.framedblocks.client.reinforcedMode": "强化覆盖层：显示模式", + "config.framedblocks.client.showAllRecipePermutationsInEmi": "在EMI中显示所有框架锯配方变体", + "config.framedblocks.client.showButtonPlateTypeOverlay": "显示按钮和压力板类型覆盖层", + "config.framedblocks.client.showGhostBlocks": "显示幽灵方块", + "config.framedblocks.client.showSpecialCubeTypeOverlay": "显示特殊方块类型覆盖层", + "config.framedblocks.client.solidFrameMode": "实心框架模式", + "config.framedblocks.client.splitLineMode": "可折叠方块分割线覆盖层：显示模式", + "config.framedblocks.client.stateLockMode": "状态锁定覆盖层：显示模式", + "config.framedblocks.client.toggleWaterlogMode": "切换可含水覆盖层：显示模式", + "config.framedblocks.client.toggleYSlopeMode": "切换Y轴坡面覆盖层：显示模式", + "config.framedblocks.common.fireproofBlocks": "防火方块", + "config.framedblocks.server.allowBlockEntities": "允许方块实体", + "config.framedblocks.server.consumeCamoItem": "消耗伪装物品", + "config.framedblocks.server.enableIntangibleFeature": "启用无形化功能", + "config.framedblocks.server.glowstoneLightLevel": "荧石光照等级", + "config.framedblocks.server.intangibleMarkerItem": "无形化标记物品", + "config.framedblocks.server.oneWayWindowOwnable": "单向玻璃可拥有性", + "config.jade.plugin_framedblocks.framed_item_frame": "物品展示框框架", "desc.framedblocks.blueprint_block": "内置方块：%s", - "desc.framedblocks.blueprint_camo": "外表方块：%s", - "desc.framedblocks.blueprint_cant_copy": "此方块目前无法被复制", - "desc.framedblocks.blueprint_cant_place_fluid_camo": "目前无法复制填充有流体的方块", - "desc.framedblocks.blueprint_illuminated": "点亮：%s", + "desc.framedblocks.blueprint_camo": "伪装方块：%s", + "desc.framedblocks.blueprint_cant_copy": "此方块目前无法被复制！", + "desc.framedblocks.blueprint_cant_place_fluid_camo": "目前无法复制填充有流体的伪装方块！", "desc.framedblocks.blueprint_false": "否", - "desc.framedblocks.blueprint_true": "是", + "desc.framedblocks.blueprint_illuminated": "点亮：%s", + "desc.framedblocks.blueprint_intangible": "无形化：%s", "desc.framedblocks.blueprint_invalid": "无效的", - "block.framedblocks.framed_iron_gate": "铁制大门框架", + "desc.framedblocks.blueprint_missing_materials": "缺少所需材料：", "desc.framedblocks.blueprint_none": "无", + "desc.framedblocks.blueprint_reinforced": "已强化：%s", + "desc.framedblocks.blueprint_true": "是", + "desc.framedblocks.slope_slab.place_upside_down": "按住潜行键以倒置放置", "framedblocks.key.categories.framedblocks": "框架方块", - "framedblocks.key.update_cull": "更新culling cache", + "framedblocks.key.update_cull": "更新剔除缓存", "item.framedblocks.framed_blueprint": "框架蓝图", "item.framedblocks.framed_hammer": "框架锤", "item.framedblocks.framed_key": "框架钥匙", + "item.framedblocks.framed_reinforcement": "框架强化材料", "item.framedblocks.framed_screwdriver": "框架螺丝刀", "item.framedblocks.framed_wrench": "框架扳手", "itemGroup.framed_blocks": "框架方块", - "msg.framedblocks.camo.blacklisted": "该方块在黑名单中！", - "msg.framedblocks.camo.block_entity": "实体方块不得放入框架中！", + "msg.framedblocks.camo.blacklisted": "该方块不得作为伪装块使用！", + "msg.framedblocks.camo.block_entity": "含有方块实体的方块不得放入框架中！", + "msg.framedblocks.camo.non_solid": "未标记的非实心方块不得放入框架中！", + "msg.framedblocks.frame_crafter.fail.incorrect_additive_0": "第一格中存在错误的添加剂成分", + "msg.framedblocks.frame_crafter.fail.incorrect_additive_1": "第二格中存在错误的添加剂成分", + "msg.framedblocks.frame_crafter.fail.incorrect_additive_2": "第三格中存在错误的添加剂成分", + "msg.framedblocks.frame_crafter.fail.insufficient_additive_0": "第一格中添加剂成分数量不足", + "msg.framedblocks.frame_crafter.fail.insufficient_additive_1": "第二格中添加剂成分数量不足", + "msg.framedblocks.frame_crafter.fail.insufficient_additive_2": "第三格中添加剂成分数量不足", + "msg.framedblocks.frame_crafter.fail.material_lcm": "输入物品过少，无法均匀转换为此输出", + "msg.framedblocks.frame_crafter.fail.material_value": "可用输入材料不足", + "msg.framedblocks.frame_crafter.fail.missing_additive_0": "第一格中缺少添加剂成分", + "msg.framedblocks.frame_crafter.fail.missing_additive_1": "第二格中缺少添加剂成分", + "msg.framedblocks.frame_crafter.fail.missing_additive_2": "第三格中缺少添加剂成分", + "msg.framedblocks.frame_crafter.fail.output_size": "结果数量超过最大堆叠大小", + "msg.framedblocks.frame_crafter.fail.success": "可合成", + "msg.framedblocks.frame_crafter.fail.unexpected_additive_0": "第一格中存在意外的添加剂成分", + "msg.framedblocks.frame_crafter.fail.unexpected_additive_1": "第二格中存在意外的添加剂成分", + "msg.framedblocks.frame_crafter.fail.unexpected_additive_2": "第三格中存在意外的添加剂成分", + "msg.framedblocks.framing_saw.transfer.invalid_recipe": "配方无效", + "msg.framedblocks.framing_saw.transfer.not_implemented": "传输未实现，不会转移任何物品", "msg.framedblocks.lock_state": "现在该方块状态为 %s", "msg.framedblocks.lock_state.locked": "锁定", "msg.framedblocks.lock_state.unlocked": "未锁定", + "msg.framedblocks.powered_saw.status": "状态：", + "msg.framedblocks.powered_saw.status.no_match": "配方不匹配", + "msg.framedblocks.powered_saw.status.no_recipe": "无配方", + "msg.framedblocks.powered_saw.status.ready": "就绪", + "msg.framedblocks.prism_offset.switch": "使用框架锤敲击以切换偏移", + "msg.framedblocks.split_line.switch": "使用框架扳手敲击以切换分割线方向", "title.framedblocks.framed_chest": "箱子框架", "title.framedblocks.framed_secret_storage": "木桶框架", + "title.framedblocks.framing_saw": "框架锯", + "title.framedblocks.powered_framing_saw": "动力框架锯", + "title.framedblocks.powered_saw.target_block": "目标：", "title.framedblocks.sign.edit": "编辑告示牌", - "tooltip.framedblocks.lock_state": "状态 %s" + "tooltip.framedblocks.camo_rotation.false": "目标伪装块不可旋转", + "tooltip.framedblocks.camo_rotation.true": "目标伪装块可旋转", + "tooltip.framedblocks.frame_bg.set_camo": "使用框架锤敲击以将伪装块设为背景", + "tooltip.framedblocks.frame_bg.set_leather": "使用框架锤敲击以将皮革设为背景", + "tooltip.framedblocks.frame_bg.use_camo": "物品展示框框架使用伪装块作为背景", + "tooltip.framedblocks.frame_bg.use_leather": "物品展示框框架使用皮革作为背景", + "tooltip.framedblocks.framing_saw.have_item_none": "无", + "tooltip.framedblocks.framing_saw.have_x_but_need_y_item": "拥有%s，但需要%s", + "tooltip.framedblocks.framing_saw.have_x_but_need_y_item_count": "拥有%s个物品，但至少需要%s个", + "tooltip.framedblocks.framing_saw.have_x_but_need_y_material_count": "拥有%s材料，但至少需要%s材料", + "tooltip.framedblocks.framing_saw.have_x_but_need_y_tag": "拥有%s，但需要任意%s", + "tooltip.framedblocks.framing_saw.loose_additive": "该物品由添加剂成分合成，这些成分将丢失", + "tooltip.framedblocks.framing_saw.material": "材料价值：%s", + "tooltip.framedblocks.framing_saw.output_count": "结果数量：%s，最大数量：%s", + "tooltip.framedblocks.framing_saw.press_to_show": "按下[%s]以显示所有可能的物品", + "tooltip.framedblocks.is_waterloggable.false": "方块不可含水。", + "tooltip.framedblocks.is_waterloggable.true": "方块可含水。", + "tooltip.framedblocks.lock_state": "状态 %s", + "tooltip.framedblocks.make_waterloggable.false": "使用框架锤敲击以使其不可含水", + "tooltip.framedblocks.make_waterloggable.true": "使用框架锤敲击以使其可含水", + "tooltip.framedblocks.one_way_window.clear_face": "潜行时使用框架扳手敲击以清除透视面", + "tooltip.framedblocks.one_way_window.curr_face": "当前透视面：%s", + "tooltip.framedblocks.one_way_window.dir.down": "下", + "tooltip.framedblocks.one_way_window.dir.east": "东", + "tooltip.framedblocks.one_way_window.dir.north": "北", + "tooltip.framedblocks.one_way_window.dir.south": "南", + "tooltip.framedblocks.one_way_window.dir.up": "上", + "tooltip.framedblocks.one_way_window.dir.west": "西", + "tooltip.framedblocks.one_way_window.face.down": "下", + "tooltip.framedblocks.one_way_window.face.east": "东", + "tooltip.framedblocks.one_way_window.face.none": "无", + "tooltip.framedblocks.one_way_window.face.north": "北", + "tooltip.framedblocks.one_way_window.face.south": "南", + "tooltip.framedblocks.one_way_window.face.up": "上", + "tooltip.framedblocks.one_way_window.face.west": "西", + "tooltip.framedblocks.one_way_window.face_abbr.down": "下", + "tooltip.framedblocks.one_way_window.face_abbr.east": "东", + "tooltip.framedblocks.one_way_window.face_abbr.none": "-", + "tooltip.framedblocks.one_way_window.face_abbr.north": "北", + "tooltip.framedblocks.one_way_window.face_abbr.south": "南", + "tooltip.framedblocks.one_way_window.face_abbr.up": "上", + "tooltip.framedblocks.one_way_window.face_abbr.west": "西", + "tooltip.framedblocks.one_way_window.set_face": "使用框架扳手敲击以将透视面设为%s", + "tooltip.framedblocks.powered_saw.energy": "%s / %s FE", + "tooltip.framedblocks.powered_saw.status.no_recipe": "未选择配方，点击目标格并放入任意框架方块以选择配方", + "tooltip.framedblocks.prism_offset.false": "三角纹理未偏移。", + "tooltip.framedblocks.prism_offset.true": "三角纹理偏移了半个方块。", + "tooltip.framedblocks.reinforce_state": "方块%s。", + "tooltip.framedblocks.reinforce_state.false": "未强化", + "tooltip.framedblocks.reinforce_state.true": "已强化", + "tooltip.framedblocks.split_line.false": "变形面的分割线沿陡对角线延伸。", + "tooltip.framedblocks.split_line.true": "变形面的分割线沿缓对角线延伸。", + "tooltip.framedblocks.y_slope": "方块使用%s面作为垂直坡面。", + "tooltip.framedblocks.y_slope.horizontal": "水平", + "tooltip.framedblocks.y_slope.toggle": "使用框架扳手敲击以切换至%s面", + "tooltip.framedblocks.y_slope.vertical": "垂直" } \ No newline at end of file diff --git a/kubejs/assets/gtceu/lang/en_us.json b/kubejs/assets/gtceu/lang/en_us.json index af50b8063..85a0c37d7 100644 --- a/kubejs/assets/gtceu/lang/en_us.json +++ b/kubejs/assets/gtceu/lang/en_us.json @@ -2,7 +2,11 @@ "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.", "block.bud_indicator": "%s Surface Bud", "block.gtceu.greenhouse": "Greenhouse", - "block.gtceu.steam_bloomery": "Steam Bloomery", + "block.tfg.steam_bloomery": "Steam Bloomery", + "block.tfg.steam_thermal_centrifuge": "Steam Thermal Centrifuge", + "block.tfg.steam_fuser": "Steam Fuser", + "block.tfg.steam_squasher": "Steam Squasher", + "block.tfg.steam_presser": "Steam Presser", "block.gtceu.large_solar_panel": "§9Large Solar Array MK I", "block.gtceu.large_solar_panel_tier2": "§bLarge Solar Array MK II", "block.gtceu.large_solar_panel_tier3": "§cLarge Solar Array MK III", @@ -66,7 +70,7 @@ "gtceu.tooltip.machine.steam_bloomery_1": "§7Upgrade your Bloomery with the power of Steam!§r", "gtceu.tooltip.machine.steam_bloomery_2": "§7Processes Iron-bearing Dusts or Ingots into Raw Iron Blooms.§r", "gtceu.tooltip.machine.steam_bloomery_3": "§7Fueling it with Coke or Anthracite will double the output.§r", - "gtceu.tooltip.machine.steam_bloomery_4": "§7Can process up to 8 recipes at once, which changes how much Steam is required.§r", + "gtceu.tooltip.machine.steam_parallel": "§7Can process up to 8 recipes at once, which changes how much Steam is required.§r", "gtceu.tooltip.machine.coal_liquefaction_tower_1": "§7Smoothie Maker§r", "gtceu.tooltip.machine.coal_liquefaction_tower_2": "§7Extracts gas and liquids from carbonic solids§r", "item.gtceu.tiny_wood_dust": "Tiny Pile of Softwood Pulp", @@ -143,6 +147,7 @@ "material.tfg.calorite": "Calorite", "material.tfg.etrium": "Etrium", "material.gtceu.tarkianite": "Tarkianite", + "material.gtceu.thorium": "Thorianite", "material.gtceu.aluminium_silicate": "Aluminium Silicate", "material.gtceu.rocket_alloy_t1": "R-Aluminosteel Rocket Alloy", "material.gtceu.rocket_alloy_t2": "ASM 4914 Titanium Rocket Alloy", @@ -188,6 +193,9 @@ "material.gtceu.uranium_pellet": "Uranium Pellet", "material.gtceu.thorium_pellet": "Thorium Pellet", "material.gtceu.ostrum_iodide": "Ostrum Iodide", + "material.gtceu.americium": "Americium 243", + "material.gtceu.uranium": "Uranium 238", + "material.gtceu.plutonium": "Plutonium 239", "material.gtceu.residual_radioactive_concoction": "Residual Radioactive Concoction", "material.gtceu.regolith_vapor": "Regolith Vapor", "material.gtceu.dense_ostrum_vapor": "Dense Ostrum Vapor", diff --git a/kubejs/assets/gtceu/lang/ja_jp.json b/kubejs/assets/gtceu/lang/ja_jp.json index 92adeb03e..426e38373 100644 --- a/kubejs/assets/gtceu/lang/ja_jp.json +++ b/kubejs/assets/gtceu/lang/ja_jp.json @@ -2,7 +2,7 @@ "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.", "block.bud_indicator": "%s Surface Bud", "block.gtceu.greenhouse": "電気温室", - "block.gtceu.steam_bloomery": "蒸気式塊鉄炉", + "block.tfg.steam_bloomery": "蒸気式塊鉄炉", "block.gtceu.large_solar_panel": "§9大型ソーラーアレイMK I", "block.gtceu.large_solar_panel_tier2": "§b大型ソーラーアレイMK II", "block.gtceu.large_solar_panel_tier3": "§c大型ソーラーアレイMK III", @@ -66,7 +66,7 @@ "gtceu.tooltip.machine.steam_bloomery_1": "§7Upgrade your Bloomery with the power of Steam!§r", "gtceu.tooltip.machine.steam_bloomery_2": "§7Processes Iron-bearing Dusts or Ingots into Raw Iron Blooms.§r", "gtceu.tooltip.machine.steam_bloomery_3": "§7Fueling it with Coke or Anthracite will double the output.§r", - "gtceu.tooltip.machine.steam_bloomery_4": "§7Can process up to 8 recipes at once, which changes how much Steam is required.§r", + "gtceu.tooltip.machine.steam_parallel": "§7Can process up to 8 recipes at once, which changes how much Steam is required.§r", "gtceu.tooltip.machine.coal_liquefaction_tower_1": "§7Smoothie Maker§r", "gtceu.tooltip.machine.coal_liquefaction_tower_2": "§7Extracts gas and liquids from carbonic solids§r", "item.gtceu.tiny_wood_dust": "極小の木のパルプ", @@ -188,6 +188,9 @@ "material.gtceu.uranium_pellet": "ウランペレット", "material.gtceu.thorium_pellet": "トリウムペレット", "material.gtceu.ostrum_iodide": "ヨウ化オストラム", + "material.gtceu.americium": "アメリシウム243", + "material.gtceu.uranium": "ウラン238", + "material.gtceu.plutonium": "プルトニウム239", "material.gtceu.residual_radioactive_concoction": "残留放射性混合物", "material.gtceu.regolith_vapor": "月面堆積粉塵", "material.gtceu.dense_ostrum_vapor": "重質オストラム粉塵", diff --git a/kubejs/assets/gtceu/lang/ru_ru.json b/kubejs/assets/gtceu/lang/ru_ru.json index 254a2e60c..51dfe31bd 100644 --- a/kubejs/assets/gtceu/lang/ru_ru.json +++ b/kubejs/assets/gtceu/lang/ru_ru.json @@ -2,7 +2,7 @@ "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.", "block.bud_indicator": "Поверхностная друза (%s)", "block.gtceu.greenhouse": "Теплица", - "block.gtceu.steam_bloomery": "Паровой сыродутный горн", + "block.tfg.steam_bloomery": "Паровой сыродутный горн", "block.gtceu.large_solar_panel": "§9Large Solar Array MK I", "block.gtceu.large_solar_panel_tier2": "§bLarge Solar Array MK II", "block.gtceu.large_solar_panel_tier3": "§cLarge Solar Array MK III", @@ -166,6 +166,9 @@ "material.gtceu.uranium_pellet": "Uranium Pellet", "material.gtceu.thorium_pellet": "Thorium Pellet", "material.gtceu.ostrum_iodide": "Ostrum Iodide", + "material.gtceu.americium": "Америций 243", + "material.gtceu.uranium": "Уран 238", + "material.gtceu.plutonium": "Плутоний 239", "material.gtceu.residual_radioactive_concoction": "Residual Radioactive Concoction", "material.gtceu.regolith_vapor": "Regolith Vapor", "material.gtceu.dense_ostrum_vapor": "Dense Ostrum Vapor", diff --git a/kubejs/assets/gtceu/lang/uk_ua.json b/kubejs/assets/gtceu/lang/uk_ua.json index ede196300..6f4bb6bd3 100644 --- a/kubejs/assets/gtceu/lang/uk_ua.json +++ b/kubejs/assets/gtceu/lang/uk_ua.json @@ -2,7 +2,7 @@ "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.", "block.bud_indicator": "%s Поверхнева Друза", "block.gtceu.greenhouse": "Теплиця", - "block.gtceu.steam_bloomery": "Парова Сиродутна Піч", + "block.tfg.steam_bloomery": "Парова Сиродутна Піч", "block.gtceu.large_solar_panel": "§9Велика сонячна матриця MK I", "block.gtceu.large_solar_panel_tier2": "§bВелика сонячна матриця MK II", "block.gtceu.large_solar_panel_tier3": "§cВелика сонячна матриця MK III", @@ -66,7 +66,7 @@ "gtceu.tooltip.machine.steam_bloomery_1": "§7Покращуйте свою домницю силою пари!§r", "gtceu.tooltip.machine.steam_bloomery_2": "§7Переробляє пил або злитки, що містять залізо, у необроблені залізні криці.§r", "gtceu.tooltip.machine.steam_bloomery_3": "§7Використання коксу або антрациту як пального подвоїть продуктивність.§r", - "gtceu.tooltip.machine.steam_bloomery_4": "§7Може обробляти до 8 рецептів одночасно, що змінює кількість необхідної пари.§r", + "gtceu.tooltip.machine.steam_parallel": "§7Може обробляти до 8 рецептів одночасно, що змінює кількість необхідної пари.§r", "gtceu.tooltip.machine.coal_liquefaction_tower_1": "§7Фруктовий міксер§r", "gtceu.tooltip.machine.coal_liquefaction_tower_2": "§7Видобуває гази та рідини з вуглецевих твердих речовин§r", "item.gtceu.tiny_wood_dust": "Маленька купа хвойної целюлози", @@ -179,6 +179,9 @@ "material.gtceu.thorium_pellet": "Торієва гранула", "material.gtceu.ostrum_iodide": "Йодит Оструму", "material.gtceu.residual_radioactive_concoction": "Залишкова Радіоактивна Суміш", + "material.gtceu.americium": "Америцій 243", + "material.gtceu.uranium": "Уран 238", + "material.gtceu.plutonium": "Плутоній 239", "material.gtceu.regolith_vapor": "Випаровування Реголіту", "material.gtceu.dense_ostrum_vapor": "Густе Випаровування Острому", "material.gtceu.lightweight_ostrum_vapor": "Легке Випаровування Острому", diff --git a/kubejs/assets/gtceu/lang/zh_cn.json b/kubejs/assets/gtceu/lang/zh_cn.json index 48a78abd1..b56445918 100644 --- a/kubejs/assets/gtceu/lang/zh_cn.json +++ b/kubejs/assets/gtceu/lang/zh_cn.json @@ -2,7 +2,11 @@ "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.", "block.bud_indicator": "%s 表面芽", "block.gtceu.greenhouse": "温室", - "block.gtceu.steam_bloomery": "蒸汽锻铁炉", + "block.tfg.steam_bloomery": "蒸汽锻铁炉", + "block.tfg.steam_thermal_centrifuge": "大型蒸汽热力离心机", + "block.tfg.steam_fuser": "大型蒸汽合金炉", + "block.tfg.steam_squasher": "大型蒸汽压缩机", + "block.tfg.steam_presser": "大型蒸汽锻造锤", "block.gtceu.large_solar_panel": "§9大型太阳能阵列 MK I", "block.gtceu.large_solar_panel_tier2": "§b大型太阳能阵列 MK II", "block.gtceu.large_solar_panel_tier3": "§c大型太阳能阵列 MK III", @@ -66,7 +70,7 @@ "gtceu.tooltip.machine.steam_bloomery_1": "§7用蒸汽动力升级你的锻铁炉！§r", "gtceu.tooltip.machine.steam_bloomery_2": "§7将含铁矿粉或锭加工成生铁方坯。§r", "gtceu.tooltip.machine.steam_bloomery_3": "§7使用焦煤或无烟煤可倍增产量。§r", - "gtceu.tooltip.machine.steam_bloomery_4": "§7支持最多8组配方并行处理，相应调整蒸汽需求。§r", + "gtceu.tooltip.machine.steam_parallel": "§7支持最多8组配方并行处理，相应调整蒸汽需求。§r", "gtceu.tooltip.machine.coal_liquefaction_tower_1": "§7奶昔制造机§r", "gtceu.tooltip.machine.coal_liquefaction_tower_2": "§7从碳质固体中提取燃气和流体§r", "item.gtceu.tiny_wood_dust": "小撮软木浆", @@ -143,6 +147,7 @@ "material.tfg.calorite": "耐热金属", "material.tfg.etrium": "埃忒恩", "material.gtceu.tarkianite": "塔基安矿", + "material.gtceu.thorium": "方钍石", "material.gtceu.aluminium_silicate": "硅酸铝", "material.gtceu.rocket_alloy_t1": "R型铝钢火箭合金", "material.gtceu.rocket_alloy_t2": "ASM 4914 钛合金火箭合金", @@ -188,6 +193,9 @@ "material.gtceu.uranium_pellet": "铀燃料丸", "material.gtceu.thorium_pellet": "钍燃料丸", "material.gtceu.ostrum_iodide": "碘化紫金", + "material.gtceu.americium": "镅-243", + "material.gtceu.uranium": "铀-238", + "material.gtceu.plutonium": "钚-239", "material.gtceu.residual_radioactive_concoction": "放射性残液", "material.gtceu.regolith_vapor": "风化土蒸气", "material.gtceu.dense_ostrum_vapor": "致密紫金蒸气", diff --git a/kubejs/assets/merequester/lang/ru_ru.json b/kubejs/assets/merequester/lang/ru_ru.json new file mode 100644 index 000000000..1cf1392c1 --- /dev/null +++ b/kubejs/assets/merequester/lang/ru_ru.json @@ -0,0 +1,26 @@ +{ + "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.", + "itemGroup.merequester.tab": "ME Requester", + "item.merequester.requester_terminal": "МЭ терминал запроса", + "block.merequester.requester": "МЭ заказчик", + "gui.merequester.requester_terminal": "МЭ терминал запросов", + "gui.merequester.no_requesters": "Не найдено ни одного запросчика МЭ!", + "tooltip.merequester.requester_desc": "Автоматически поддерживает запасы предметов и жидкостей, запрашивая новые партии при необходимости. Должен быть подключен к МЭ сети и может быть доступен с помощью МЭ терминала запроса. При поломке теряет свои настройки. Настройки могут быть скопированы с помощью карты памяти.", + "tooltip.merequester.shift_for_more": "%s подробнее", + "tooltip.merequester.enter_to_submit": "%s представить", + "tooltip.merequester.whole_number": "Должно быть целое число!", + "tooltip.merequester.locked": "Заблокировано! Запрос в процессе выполнения.", + "tooltip.merequester.toggle": "Переключить запрос", + "tooltip.merequester.amount": "Сумма к запасам", + "tooltip.merequester.batch": "Размер пакета", + "tooltip.merequester.submit": "Внести изменения", + "tooltip.merequester.status": "Состояние запроса", + "tooltip.merequester.idle": "Простой", + "tooltip.merequester.idle_desc": "Запросчик простаивает, когда запрашиваемое количество уже достигнуто или для этого предмета или жидкости нет шаблона крафтинга.", + "tooltip.merequester.missing": "Недостающие ингредиенты", + "tooltip.merequester.missing_desc": "Системе не хватает ингредиентов для создания требуемого предмета или жидкости. Процесс будет продолжен, когда ингредиенты будут доступны.", + "tooltip.merequester.link": "Создание", + "tooltip.merequester.link_desc": "В настоящее время система готовит требуемый предмет или жидкость.", + "tooltip.merequester.export": "Экспорт", + "tooltip.merequester.export_desc": "Заказчик пытается экспортировать результаты обработки в систему. Если запросчик находится в этом статусе долгое время, то для экспорта нет свободного места." +} \ No newline at end of file diff --git a/kubejs/assets/minecraft/lang/en_gb.json b/kubejs/assets/minecraft/lang/en_gb.json index ae1f36035..e0456b5e5 100644 --- a/kubejs/assets/minecraft/lang/en_gb.json +++ b/kubejs/assets/minecraft/lang/en_gb.json @@ -1,6 +1,29 @@ { "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.", "block.minecraft.iron_block": "Cast Iron Block", + "block.minecraft.stone": "Reconstituted Stone", + "block.minecraft.stone_stairs": "Reconstituted Stone Stairs", + "block.minecraft.stone_slab": "Reconstituted Stone Slab", + "block.minecraft.cobblestone": "Reconstituted Stone Cobble", + "block.minecraft.cobblestone_stairs": "Reconstituted Stone Cobble Stairs", + "block.minecraft.cobblestone_slab": "Reconstituted Stone Cobble Slab", + "block.minecraft.cobblestone_wall": "Reconstituted Stone Cobble Wall", + "block.minecraft.mossy_cobblestone": "Mossy Reconstituted Stone Cobble", + "block.minecraft.mossy_cobblestone_stairs": "Mossy Reconstituted Stone Cobble Stairs", + "block.minecraft.mossy_cobblestone_slab": "Mossy Reconstituted Stone Cobble Slab", + "block.minecraft.mossy_cobblestone_wall": "Mossy Reconstituted Stone Cobble Wall", + "block.minecraft.smooth_stone": "Polished Reconstituted Stone", + "block.minecraft.smooth_stone_slab": "Polished Reconstituted Stone Slab", + "block.minecraft.stone_bricks": "Reconstituted Stone Bricks", + "block.minecraft.stone_bricks_stairs": "Reconstituted Stone Brick Stairs", + "block.minecraft.stone_bricks_slab": "Reconstituted Stone Brick Slab", + "block.minecraft.stone_bricks_wall": "Reconstituted Stone Brick Wall", + "block.minecraft.cracked_stone_bricks": "Cracked Reconstituted Stone Bricks", + "block.minecraft.mossy_stone_bricks": "Mossy Reconstituted Stone Bricks", + "block.minecraft.mossy_stone_bricks_stairs": "Mossy Reconstituted Stone Bricks Stairs", + "block.minecraft.mossy_stone_bricks_slab": "Mossy Reconstituted Stone Bricks Slab", + "block.minecraft.mossy_stone_bricks_wall": "Mossy Reconstituted Stone Bricks Wall", + "block.minecraft.chiseled_stone_bricks": "Chiseled Reconstituted Stone Bricks", "block.minecraft.chiseled_deepslate": "Chiseled Migmatite", "block.minecraft.cobbled_deepslate": "Migmatite Cobble", "block.minecraft.cobbled_deepslate_slab": "Cobbled Migmatite Slab", @@ -26,8 +49,8 @@ "block.minecraft.blackstone_slab": "Pyroxenite Slab", "block.minecraft.blackstone_stairs": "Pyroxenite Stairs", "block.minecraft.blackstone_wall": "Pyroxenite Wall", - "block.minecraft.chiseled_polished_blackstone": "Chiseled Polished Pyroxenite", - "block.minecraft.cracked_polished_blackstone_bricks": "Cracked Polished Pyroxenite Bricks", + "block.minecraft.chiseled_polished_blackstone": "Chiseled Pyroxenite", + "block.minecraft.cracked_polished_blackstone_bricks": "Cracked Pyroxenite Bricks", "block.minecraft.gilded_blackstone": "Gilded Pyroxenite", "block.minecraft.polished_blackstone": "Polished Pyroxenite", "block.minecraft.polished_blackstone_brick_slab": "Pyroxenite Brick Slab", @@ -56,10 +79,10 @@ "block.minecraft.weeping_vines_plant": "Crimson Vines Plant", "block.minecraft.weeping_vines": "Crimson Vines", "block.minecraft.red_sand": "Hematitic Sand", - "block.minecraft.red_sandstone": "Hematitic Sandstone", - "block.minecraft.red_sandstone_stairs": "Hematitic Sandstone Stairs", - "block.minecraft.red_sandstone_slab": "Hematitic Sandstone Slab", - "block.minecraft.red_sandstone_wall": "Hematitic Sandstone Wall", + "block.minecraft.red_sandstone": "Raw Hematitic Sandstone", + "block.minecraft.red_sandstone_stairs": "Raw Hematitic Sandstone Stairs", + "block.minecraft.red_sandstone_slab": "Raw Hematitic Sandstone Slab", + "block.minecraft.red_sandstone_wall": "Raw Hematitic Sandstone Wall", "block.minecraft.chiseled_red_sandstone": "Chiseled Hematitic Sandstone", "block.minecraft.smooth_red_sandstone": "Smooth Hematitic Sandstone", "block.minecraft.smooth_red_sandstone_stairs": "Smooth Hematitic Sandstone Stairs", @@ -75,5 +98,7 @@ "item.minecraft.glow_ink_sac": "Glowing Dye", "item.minecraft.nether_brick": "Keratophyre Brick", "item.minecraft.furnace_minecart": "Minecart with Boiler", - "material.tfg.dripstone": "Travertine" + "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" } \ No newline at end of file diff --git a/kubejs/assets/minecraft/lang/en_us.json b/kubejs/assets/minecraft/lang/en_us.json index 6f97684eb..f411c7d30 100644 --- a/kubejs/assets/minecraft/lang/en_us.json +++ b/kubejs/assets/minecraft/lang/en_us.json @@ -79,10 +79,10 @@ "block.minecraft.weeping_vines_plant": "Crimson Vines Plant", "block.minecraft.weeping_vines": "Crimson Vines", "block.minecraft.red_sand": "Hematitic Sand", - "block.minecraft.red_sandstone": "Hematitic Sandstone", - "block.minecraft.red_sandstone_stairs": "Hematitic Sandstone Stairs", - "block.minecraft.red_sandstone_slab": "Hematitic Sandstone Slab", - "block.minecraft.red_sandstone_wall": "Hematitic Sandstone Wall", + "block.minecraft.red_sandstone": "Raw Hematitic Sandstone", + "block.minecraft.red_sandstone_stairs": "Raw Hematitic Sandstone Stairs", + "block.minecraft.red_sandstone_slab": "Raw Hematitic Sandstone Slab", + "block.minecraft.red_sandstone_wall": "Raw Hematitic Sandstone Wall", "block.minecraft.chiseled_red_sandstone": "Chiseled Hematitic Sandstone", "block.minecraft.smooth_red_sandstone": "Smooth Hematitic Sandstone", "block.minecraft.smooth_red_sandstone_stairs": "Smooth Hematitic Sandstone Stairs", @@ -99,5 +99,7 @@ "item.minecraft.glow_ink_sac": "Glowing Dye", "item.minecraft.nether_brick": "Keratophyre Brick", "item.minecraft.furnace_minecart": "Minecart with Boiler", - "material.tfg.dripstone": "Travertine" + "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" } \ No newline at end of file diff --git a/kubejs/assets/minecraft/lang/zh_cn.json b/kubejs/assets/minecraft/lang/zh_cn.json index 89cffd042..7657ccf5f 100644 --- a/kubejs/assets/minecraft/lang/zh_cn.json +++ b/kubejs/assets/minecraft/lang/zh_cn.json @@ -79,10 +79,10 @@ "block.minecraft.weeping_vines_plant": "绯红藤蔓植株", "block.minecraft.weeping_vines": "绯红藤蔓", "block.minecraft.red_sand": "赤铁矿砂", - "block.minecraft.red_sandstone": "赤铁矿砂岩", - "block.minecraft.red_sandstone_stairs": "赤铁矿砂岩楼梯", - "block.minecraft.red_sandstone_slab": "赤铁矿砂岩台阶", - "block.minecraft.red_sandstone_wall": "赤铁矿砂岩墙", + "block.minecraft.red_sandstone": "天然赤铁矿砂岩", + "block.minecraft.red_sandstone_stairs": "天然赤铁矿砂岩楼梯", + "block.minecraft.red_sandstone_slab": "天然赤铁矿砂岩台阶", + "block.minecraft.red_sandstone_wall": "天然赤铁矿砂岩墙", "block.minecraft.chiseled_red_sandstone": "雕纹赤铁矿砂岩", "block.minecraft.smooth_red_sandstone": "平滑赤铁矿砂岩", "block.minecraft.smooth_red_sandstone_stairs": "平滑赤铁矿砂岩楼梯", @@ -99,5 +99,7 @@ "item.minecraft.glow_ink_sac": "荧光染料", "item.minecraft.nether_brick": "角斑岩砖", "item.minecraft.furnace_minecart": "动力矿车", - "material.tfg.dripstone": "石灰华" + "material.tfg.dripstone": "石灰华", + "death.attack.magic": "%1$s 被毒死了", + "death.attack.magic.player": "%1$s在试图逃离%2$s时被毒死了" } \ No newline at end of file diff --git a/kubejs/assets/minecraft/models/block/red_sandstone.json b/kubejs/assets/minecraft/models/block/red_sandstone.json new file mode 100644 index 000000000..1411b50bc --- /dev/null +++ b/kubejs/assets/minecraft/models/block/red_sandstone.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "minecraft:block/red_sandstone_bottom" + } +} \ No newline at end of file diff --git a/kubejs/assets/minecraft/models/block/red_sandstone_slab.json b/kubejs/assets/minecraft/models/block/red_sandstone_slab.json new file mode 100644 index 000000000..252d98e0c --- /dev/null +++ b/kubejs/assets/minecraft/models/block/red_sandstone_slab.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "bottom": "minecraft:block/red_sandstone_bottom", + "side": "minecraft:block/red_sandstone_bottom", + "top": "minecraft:block/red_sandstone_bottom" + } +} \ No newline at end of file diff --git a/kubejs/assets/minecraft/models/block/red_sandstone_slab_top.json b/kubejs/assets/minecraft/models/block/red_sandstone_slab_top.json new file mode 100644 index 000000000..dc4b5cb82 --- /dev/null +++ b/kubejs/assets/minecraft/models/block/red_sandstone_slab_top.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab_top", + "textures": { + "bottom": "minecraft:block/red_sandstone_bottom", + "side": "minecraft:block/red_sandstone_bottom", + "top": "minecraft:block/red_sandstone_bottom" + } +} \ No newline at end of file diff --git a/kubejs/assets/minecraft/models/block/red_sandstone_stairs.json b/kubejs/assets/minecraft/models/block/red_sandstone_stairs.json new file mode 100644 index 000000000..b69671478 --- /dev/null +++ b/kubejs/assets/minecraft/models/block/red_sandstone_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "bottom": "minecraft:block/red_sandstone_bottom", + "side": "minecraft:block/red_sandstone_bottom", + "top": "minecraft:block/red_sandstone_bottom" + } +} \ No newline at end of file diff --git a/kubejs/assets/minecraft/models/block/red_sandstone_stairs_inner.json b/kubejs/assets/minecraft/models/block/red_sandstone_stairs_inner.json new file mode 100644 index 000000000..98cd1e27c --- /dev/null +++ b/kubejs/assets/minecraft/models/block/red_sandstone_stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "bottom": "minecraft:block/red_sandstone_bottom", + "side": "minecraft:block/red_sandstone_bottom", + "top": "minecraft:block/red_sandstone_bottom" + } +} \ No newline at end of file diff --git a/kubejs/assets/minecraft/models/block/red_sandstone_stairs_outer.json b/kubejs/assets/minecraft/models/block/red_sandstone_stairs_outer.json new file mode 100644 index 000000000..b4b1302d7 --- /dev/null +++ b/kubejs/assets/minecraft/models/block/red_sandstone_stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "bottom": "minecraft:block/red_sandstone_bottom", + "side": "minecraft:block/red_sandstone_bottom", + "top": "minecraft:block/red_sandstone_bottom" + } +} \ No newline at end of file diff --git a/kubejs/assets/minecraft/models/block/red_sandstone_wall_inventory.json b/kubejs/assets/minecraft/models/block/red_sandstone_wall_inventory.json new file mode 100644 index 000000000..56ced25b2 --- /dev/null +++ b/kubejs/assets/minecraft/models/block/red_sandstone_wall_inventory.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_inventory", + "textures": { + "wall": "minecraft:block/red_sandstone_bottom" + } +} \ No newline at end of file diff --git a/kubejs/assets/minecraft/models/block/red_sandstone_wall_post.json b/kubejs/assets/minecraft/models/block/red_sandstone_wall_post.json new file mode 100644 index 000000000..f18e723df --- /dev/null +++ b/kubejs/assets/minecraft/models/block/red_sandstone_wall_post.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_post", + "textures": { + "wall": "minecraft:block/red_sandstone_bottom" + } +} \ No newline at end of file diff --git a/kubejs/assets/minecraft/models/block/red_sandstone_wall_side.json b/kubejs/assets/minecraft/models/block/red_sandstone_wall_side.json new file mode 100644 index 000000000..811b52dfd --- /dev/null +++ b/kubejs/assets/minecraft/models/block/red_sandstone_wall_side.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side", + "textures": { + "wall": "minecraft:block/red_sandstone_bottom" + } +} \ No newline at end of file diff --git a/kubejs/assets/minecraft/models/block/red_sandstone_wall_side_tall.json b/kubejs/assets/minecraft/models/block/red_sandstone_wall_side_tall.json new file mode 100644 index 000000000..bb475502a --- /dev/null +++ b/kubejs/assets/minecraft/models/block/red_sandstone_wall_side_tall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side_tall", + "textures": { + "wall": "minecraft:block/red_sandstone_bottom" + } +} \ No newline at end of file diff --git a/kubejs/assets/sandworm_mod/lang/en_us.json b/kubejs/assets/sandworm_mod/lang/en_us.json new file mode 100644 index 000000000..9281db3ff --- /dev/null +++ b/kubejs/assets/sandworm_mod/lang/en_us.json @@ -0,0 +1,6 @@ +{ + "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.", + "entity.sandworm_mod.worm_chain": "Sandworm", + "entity.sandworm_mod.worm_head_segment": "Sandworm Head", + "entity.sandworm_mod.worm_segment": "Sandworm Body" +} \ No newline at end of file diff --git a/kubejs/assets/sandworm_mod/lang/zh_cn.json b/kubejs/assets/sandworm_mod/lang/zh_cn.json new file mode 100644 index 000000000..a2b8d28a6 --- /dev/null +++ b/kubejs/assets/sandworm_mod/lang/zh_cn.json @@ -0,0 +1,6 @@ +{ + "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.", + "entity.sandworm_mod.worm_chain": "沙虫", + "entity.sandworm_mod.worm_head_segment": "沙虫头部", + "entity.sandworm_mod.worm_segment": "沙虫躯体" +} \ No newline at end of file diff --git a/kubejs/assets/sns/lang/ru_ru.json b/kubejs/assets/sns/lang/ru_ru.json new file mode 100644 index 000000000..93cc05081 --- /dev/null +++ b/kubejs/assets/sns/lang/ru_ru.json @@ -0,0 +1,71 @@ +{ + "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.", + "item.sns.black_steel_toe_hiking_boots": "Походные ботинки (Чёрная сталь)", + "item.sns.blue_steel_toe_hiking_boots": "Походные ботинки (Синяя сталь)", + "item.sns.bound_leather_strip": "Укреплённая кожаная полоска", + "item.sns.buckle": "Пряжка", + "item.sns.burlap_sack": "Мешок из мешковины", + "item.sns.frame_pack": "Каркасный рюкзак", + "item.sns.hiking_boots": "Походные ботинки", + "item.sns.leather_sack": "Кожаный мешок", + "item.sns.leather_strip": "Кожаная полоска", + "item.sns.lunchbox": "Ланчбокс", + "item.sns.metal.horseshoe.black_steel": "Подкова из чёрной стали", + "item.sns.metal.horseshoe.blue_steel": "Подкова из синей стали", + "item.sns.metal.horseshoe.red_steel": "Подкова из красной стали", + "item.sns.metal.horseshoe.steel": "Стальная подкова", + "item.sns.metal.horseshoes.black_steel": "Подковы из чёрной стали", + "item.sns.metal.horseshoes.blue_steel": "Подковы из синей стали", + "item.sns.metal.horseshoes.red_steel": "Подковы из красной стали", + "item.sns.metal.horseshoes.steel": "Стальные подковы", + "item.sns.mob_net": "Сеть для мобов", + "item.sns.ore_sack": "Мешок для руды", + "item.sns.pack_frame": "Каркас рюкзака", + "item.sns.quiver": "Колчан", + "item.sns.red_steel_toe_hiking_boots": "Походные ботинки (Красная сталь)", + "item.sns.reinforced_fabric": "Укреплённая ткань", + "item.sns.reinforced_fiber": "Укреплённая нить", + "item.sns.seed_pouch": "Мешочек для семян", + "item.sns.steel_toe_hiking_boots": "Походные ботинки (Сталь)", + "item.sns.straw_basket": "Соломенная корзина", + "item.sns.unfinished_leather_sack": "Незавершённый кожаный мешок", + "pack.sns.description": "Sacks 'N Such Resources", + "sns.advancements.frame_pack.description": "Используйте сталь, чтобы создать каркасный рюкзак. Насколько Sophisticated?", + "sns.advancements.frame_pack.title": "Не Sophisticated рюкзак", + "sns.advancements.hiking_boots.description": "Создайте высококачественные ботинки, помогающие исследовать мир пешком", + "sns.advancements.hiking_boots.title": "Эти ботинки созданы для ходьбы", + "sns.advancements.leather_sack.description": "Создайте кожаный мешок из самой лучшей кожи", + "sns.advancements.leather_sack.title": "Кожаный мешок", + "sns.advancements.lunchbox.description": "Скуйте ланчбокс", + "sns.advancements.lunchbox.title": "Еда с собой", + "sns.advancements.steel_horseshoes.description": "Создайте подковы из стали. Как будто они зачарованы", + "sns.advancements.steel_horseshoes.title": "Скоростные подковы", + "sns.advancements.steel_toe_hiking_boots.description": "Защитите свои пальцы ног сталью", + "sns.advancements.steel_toe_hiking_boots.title": "Защита для пальчиков", + "sns.advancements.straw_basket.description": "Создайте примитивную корзину из соломы", + "sns.advancements.straw_basket.title": "Соломенная корзина", + "sns.creative_tab.sacks": "Sacks 'N Such", + "sns.disabled": "Отключено", + "sns.enabled": "Включено", + "sns.extra_fall_distance": "Безопасная высота падения", + "sns.key.openItemContainer": "Открыть контейнер", + "sns.key.pickup": "Переключить автоподбор", + "sns.stack_name.mob_net.with_mob": "%s (%s)", + "sns.status.item_container.no_pickup": "Автоподбор для %s отключён", + "sns.status.mob_net.cannot_capture_generic": "Нельзя поймать %s", + "sns.status.mob_net.cannot_capture_players": "Нельзя ловить игроков", + "sns.status.mob_net.cannot_capture_size": "%s слишком большой для поимки", + "sns.status.mob_net.cannot_place": "Недостаточно места, чтобы выпустить пойманного %s", + "sns.status.sack.auto_pickup": "Автоподбор: %s", + "sns.tooltip.food_trait.lunchbox": "Сохранено в ланчбоксе", + "sns.tooltip.hiking_boots.prevents_slow": "Предотвращает замедление в высокой траве", + "sns.tooltip.horseshoe.modifier": "При езде на лошади:", + "sns.tooltip.item_container.allowed_size": "Максимальный размер: %s", + "sns.tooltip.item_container.slot_capacity": "Вместимость слота: %s", + "sns.tooltip.item_container.slot_count": "Количество слотов: %s", + "sns.tooltip.item_container.tooltip.inventory_interaction": "Взаимодействие с инвентарём: %s", + "sns.tooltip.item_container.tooltip.pickup": "Автоподбор: %s", + "sns.tooltip.item_container.tooltip.shift": "Удерживайте (Shift) для информации о контейнере", + "sns.tooltip.item_container.tooltip.void": "Удаление предметов: %s", + "sns.tooltip.lunchbox.selected_slot": "Выбранный слот: %s" +} \ No newline at end of file diff --git a/kubejs/assets/species/lang/zh_cn.json b/kubejs/assets/species/lang/zh_cn.json index 82565a6a5..127111949 100644 --- a/kubejs/assets/species/lang/zh_cn.json +++ b/kubejs/assets/species/lang/zh_cn.json @@ -354,12 +354,8 @@ "block.species.wicked_candle": "邪火蜡烛", "effect.species.tanked": "厚躯", "effect.species.tanked.description": "邪火效果。随着等级提升，赋予更多生命值、更多伤害，并降低移动速度。使受影响的实体从外观上看起来更宽。", - "effect.species.snatched": "夺躯", - "effect.species.snatched.description": "邪火效果。根据等级提升移动速度。使受影响的实体从外观上看起来更高更瘦。", "effect.species.combustion": "燃躯", "effect.species.combustion.description": "邪火效果。使受影响的实体在死亡时爆炸。爆炸范围和方块破坏强度随等级增加。", - "effect.species.iron_will": "坚毅", - "effect.species.iron_will.description": "邪火效果。免疫一切击退。", "item.species.wicked_wax": "邪火蜡", "item.species.monster_meal": "混沌食品", "item.species.monster_meal.desc.effect": "使食用的实体获得一个随机的邪火效果", @@ -374,8 +370,6 @@ "item.species.wicked_mask.desc.disguise.1": "%1$s + %2$s", "item.species.wicked_mask.desc.disguise.2": "选择生物", "item.species.wicked_treat.desc": "只能喂给宠物", - "item.species.wicked_treat.desc.snatched": "夺躯 II (0:45)", - "item.species.wicked_treat.desc.iron_will": "坚毅 (0:45)", "item.species.wicked_treat.desc.regeneration": "生命恢复 (0:45)", "item.species.wicked_treat.desc.strength": "力量 (0:20)", "subtitles.entity.species.wicked.death": "邪火法师：死亡", @@ -507,11 +501,16 @@ "subtitles.item.species.wicked_swapper.throw": "换位珠：掷空", "subtitles.item.species.wicked_swapper.fail": "换位珠：落地", "subtitles.item.species.wicked_swapper.teleport": "换位珠：换位", - "advancements.species.wicked_mask_wither.description": "使用伪装工具包伪装成凋零", + "item.species.wicked_treat.desc.snatched": "超级迅捷 II (0:45)", + "item.species.wicked_treat.desc.iron_will": "击退抗性 (0:45)", "entity.species.trooper": "硫力怕", "subtitles.entity.species.trooper.death": "硫力怕：死亡", "subtitles.entity.species.trooper.hurt": "硫力怕：受伤", "subtitles.entity.species.trooper.step": "硫力怕：小步疾跑", "subtitles.entity.species.trooper.uproot": "硫力怕：拔根而起", - "subtitles.entity.species.trooper.plant": "硫力怕：扎根" + "subtitles.entity.species.trooper.plant": "硫力怕：扎根", + "effect.species.iron_will": "击退抗性", + "effect.species.iron_will.description": "免疫一切击退。", + "effect.species.snatched": "超级迅捷", + "effect.species.snatched.description": "根据等级提升移动速度。使受影响的实体从外观上看起来更高更瘦。" } \ No newline at end of file diff --git a/kubejs/assets/tfc/lang/en_us.json b/kubejs/assets/tfc/lang/en_us.json index ecb8b205d..7b9b9af21 100644 --- a/kubejs/assets/tfc/lang/en_us.json +++ b/kubejs/assets/tfc/lang/en_us.json @@ -27,6 +27,7 @@ "tfc.recipe.barrel.tfg.barrel.gouda_wheel": "Gouda Wheel", "tfc.recipe.barrel.tfg.barrel.feta_wheel": "Feta Wheel", "tfc.recipe.barrel.tfg.barrel.shosha_wheel": "Shosha Wheel", + "tfc.jei.goat_horn_knapping": "Chitin Knapping Recipe", "tfc.field_guide.book_landing_text": "Welcome traveller! This book will be the source of all you need to know as you explore the world of TerraFirmaCraft (TFC) in $(bold)TerraFirmaGreg$().$(br)This book is accessible at any time via the icon on the right side of your inventory.$(br)You can find an online copy of this guide $(bold)$(l:https://terrafirmagreg-team.github.io/Field-Guide-Modern/en_us/)here$().$(br)Click on the $(italic)Entry Index$() and start typing to $(bold)search$().", "trim_material.tfc.almandine_tfc": "Almandine", "trim_material.tfc.andradite_tfc": "Andradite", diff --git a/kubejs/assets/tfc/lang/zh_cn.json b/kubejs/assets/tfc/lang/zh_cn.json index 1e58a1ac0..52fd0339f 100644 --- a/kubejs/assets/tfc/lang/zh_cn.json +++ b/kubejs/assets/tfc/lang/zh_cn.json @@ -27,6 +27,7 @@ "tfc.recipe.barrel.tfg.barrel.gouda_wheel": "荷兰高德奶酪轮", "tfc.recipe.barrel.tfg.barrel.feta_wheel": "希腊菲达奶酪轮", "tfc.recipe.barrel.tfg.barrel.shosha_wheel": "喜马拉雅奶酪轮", + "tfc.jei.goat_horn_knapping": "几丁质加工配方", "tfc.field_guide.book_landing_text": "旅行者，欢迎你！本书将是你探索$(bold)TFG$()整合包中群峦传说世界时，一切所需知识的源泉。$(br)你随时可以通过物品栏右侧的图标访问本书。$(br)你可以在$(bold)$(l:https://terrafirmagreg-team.github.io/Field-Guide-Modern/zh_cn/)此处$()找到本指南的在线版本。$(br)点击$(italic)条目索引$()并开始输入以$(bold)搜索$()。", "trim_material.tfc.almandine_tfc": "铁铝榴石", "trim_material.tfc.andradite_tfc": "钙铁榴石", diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/firmaciv/beneath.json b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/firmaciv/beneath.json new file mode 100644 index 000000000..38da342d6 --- /dev/null +++ b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/firmaciv/beneath.json @@ -0,0 +1,37 @@ +{ + "name": "Martian Boats", + "category": "tfc:firmaciv", + "icon": "beneath:wood/sapling/crimson", + "flag": "mod:beneath", + "read_by_default": true, + "sortnum": 100, + "pages": [ + { + "type": "patchouli:text", + "text": "Way off on the far reaches of Mars, you can find both Crimson and Warped wood to create some rather flashy $(l:firmaciv/watercraft)Boats$()." + }, + { + "type": "patchouli:empty" + }, + { + "type": "patchouli:spotlight", + "title": "Softwoods", + "text": "Softwoods have sufficiently soft enough pulp and bark that they're perfect for creating $(l:firmaciv/canoe)Dugout Canoes$()", + "item": "beneath:wood/stripped_log/crimson" + }, + { + "type": "patchouli:text", + "text": "$(li)Crimson$()" + }, + { + "type": "patchouli:spotlight", + "title": "Hardwoods", + "text": "Known for their exceptional sturdiness, Hardwood trees are ideal for creating larger and sophisticated Watercrafts such as $(l:firmaciv/rowboat)Rowboats$() and $(l:firmaciv/sloop)Sloops$()", + "item": "beneath:wood/planks/warped" + }, + { + "type": "patchouli:text", + "text": "$(li)Warped$()" + } + ] +} \ No newline at end of file diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/getting_started/primitive_alloys.json b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/getting_started/primitive_alloys.json index a76be7b4e..2ee28c3ce 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/getting_started/primitive_alloys.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/getting_started/primitive_alloys.json @@ -71,6 +71,6 @@ "gtceu:bronze_ingot": 3, "gtceu:bismuth_bronze_ingot": 4, "gtceu:black_bronze_ingot": 5, - "gtceu:brass_ingot": 7 + "create:brass_ingot": 7 } } \ No newline at end of file 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 bf3d42fda..bd7ec360f 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 @@ -44,7 +44,7 @@ }, { "Type": "patchouli:text", - "text": "$(li)Sphalerite: $(l:tfg_ores/earth_vein_index#normal_sphalerite)40%$(/l), $(l:tfg_ores/earth_vein_index#surface_sphalerite)40%$(/l), $(l:tfg_ores/earth_vein_index#normal_sulfur)15%$(/l)$()$(li)Spodumene: $(l:tfg_ores/earth_vein_index#normal_spodumene)35%$(/l)$()$(li)Stibnite: $(l:tfg_ores/earth_vein_index#normal_tetrahedrite)20%$(/l), $(l:tfg_ores/earth_vein_index#surface_tetrahedrite)20%$(/l)$()$(li)Sulfur: $(l:tfg_ores/earth_vein_index#surface_sphalerite)55%$(/l), $(l:tfg_ores/earth_vein_index#normal_sulfur)50%$(/l), $(l:tfg_ores/earth_vein_index#normal_sphalerite)35%$(/l), $(l:tfg_ores/earth_vein_index#normal_bismuthinite)9%$(/l), $(l:tfg_ores/earth_vein_index#surface_bismuthinite)3%$(/l)$()$(li)Talc: $(l:tfg_ores/earth_vein_index#normal_lubricant)20%$(/l)$()$(li)Tantalite: $(l:tfg_ores/earth_vein_index#normal_manganese)12%$(/l)$()$(li)Tarkianite: $(l:tfg_ores/earth_vein_index#normal_tarkianite)35%$(/l)$()$(li)Tetrahedrite: $(l:tfg_ores/earth_vein_index#surface_tetrahedrite)60%$(/l), $(l:tfg_ores/earth_vein_index#normal_tetrahedrite)50%$(/l)$()$(li)Thorium: $(l:tfg_ores/earth_vein_index#normal_beryllium)15%$(/l)$()$(li)Tin: $(l:tfg_ores/earth_vein_index#normal_cassiterite)55%$(/l), $(l:tfg_ores/earth_vein_index#surface_cassiterite)35%$(/l)$()$(li)Topaz: $(l:tfg_ores/earth_vein_index#deep_topaz)25%$(/l)$()$(li)Tricalcium Phosphate: $(l:tfg_ores/earth_vein_index#normal_apatite)35%$(/l)$()$(li)Trona: $(l:tfg_ores/earth_vein_index#normal_lubricant)10%$(/l), $(l:tfg_ores/earth_vein_index#normal_tarkianite)10%$(/l)$()$(li)Tungstate: $(l:tfg_ores/earth_vein_index#deep_scheelite)35%$(/l)$()", + "text": "$(li)Sphalerite: $(l:tfg_ores/earth_vein_index#normal_sphalerite)40%$(/l), $(l:tfg_ores/earth_vein_index#surface_sphalerite)40%$(/l), $(l:tfg_ores/earth_vein_index#normal_sulfur)15%$(/l)$()$(li)Spodumene: $(l:tfg_ores/earth_vein_index#normal_spodumene)35%$(/l)$()$(li)Stibnite: $(l:tfg_ores/earth_vein_index#normal_tetrahedrite)20%$(/l), $(l:tfg_ores/earth_vein_index#surface_tetrahedrite)20%$(/l)$()$(li)Sulfur: $(l:tfg_ores/earth_vein_index#surface_sphalerite)55%$(/l), $(l:tfg_ores/earth_vein_index#normal_sulfur)50%$(/l), $(l:tfg_ores/earth_vein_index#normal_sphalerite)35%$(/l), $(l:tfg_ores/earth_vein_index#normal_bismuthinite)9%$(/l), $(l:tfg_ores/earth_vein_index#surface_bismuthinite)3%$(/l)$()$(li)Talc: $(l:tfg_ores/earth_vein_index#normal_lubricant)20%$(/l)$()$(li)Tantalite: $(l:tfg_ores/earth_vein_index#normal_manganese)12%$(/l)$()$(li)Tarkianite: $(l:tfg_ores/earth_vein_index#normal_tarkianite)35%$(/l)$()$(li)Tetrahedrite: $(l:tfg_ores/earth_vein_index#surface_tetrahedrite)60%$(/l), $(l:tfg_ores/earth_vein_index#normal_tetrahedrite)50%$(/l)$()$(li)Thorianite: $(l:tfg_ores/earth_vein_index#normal_beryllium)15%$(/l)$()$(li)Tin: $(l:tfg_ores/earth_vein_index#normal_cassiterite)55%$(/l), $(l:tfg_ores/earth_vein_index#surface_cassiterite)35%$(/l)$()$(li)Topaz: $(l:tfg_ores/earth_vein_index#deep_topaz)25%$(/l)$()$(li)Tricalcium Phosphate: $(l:tfg_ores/earth_vein_index#normal_apatite)35%$(/l)$()$(li)Trona: $(l:tfg_ores/earth_vein_index#normal_lubricant)10%$(/l), $(l:tfg_ores/earth_vein_index#normal_tarkianite)10%$(/l)$()$(li)Tungstate: $(l:tfg_ores/earth_vein_index#deep_scheelite)35%$(/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 bd497aa70..eaa8bc79a 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 @@ -1107,7 +1107,7 @@ }, { "Type": "patchouli:multiblock", - "name": "Thorium", + "name": "Thorianite", "multiblock": { "mapping": { "0": "#forge:ores/thorium" @@ -1122,7 +1122,7 @@ ] }, "enable_visualize": false, - "text": "$(thing)Percentage$(): 15%$(br)$(thing)Source of$(): Thorium$(br)$(thing)Formula$(): Th", + "text": "$(thing)Percentage$(): 15%$(br)$(thing)Source of$(): Thorium$(br)$(thing)Formula$(): ThO₂", "type": "patchouli:multiblock" }, { @@ -3915,7 +3915,7 @@ ] }, "enable_visualize": false, - "text": "$(thing)Percentage$(): 62%$(br)$(thing)Source of$(): Uranium, Thorium, Lead$(br)$(thing)Formula$(): (UO₂)₃ThPb$(br)$(thing)Hazard$(): $(c)$(t:Requires Full Protection)Carcinogenic (Any Contact)$(/t)$()", + "text": "$(thing)Percentage$(): 62%$(br)$(thing)Source of$(): Uranium, Thorium, Lead$(br)$(thing)Formula$(): (UO₂)₃ThPb$(br)$(thing)Hazard$(): $(c)$(t:Requires Full Protection)Radioactive (Any Contact)$(/t)$()", "type": "patchouli:multiblock" }, { @@ -3935,7 +3935,7 @@ ] }, "enable_visualize": false, - "text": "$(thing)Percentage$(): 25%$(br)$(thing)Source of$(): Uranium$(br)$(thing)Formula$(): UO₂$(br)$(thing)Hazard$(): $(c)$(t:Requires Full Protection)Carcinogenic (Any Contact)$(/t)$()", + "text": "$(thing)Percentage$(): 25%$(br)$(thing)Source of$(): Uranium$(br)$(thing)Formula$(): UO₂$(br)$(thing)Hazard$(): $(c)$(t:Requires Full Protection)Radioactive (Any Contact)$(/t)$()", "type": "patchouli:multiblock" }, { diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/mars_ore_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/mars_ore_index.json index 718015567..b0b52328e 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/mars_ore_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/mars_ore_index.json @@ -14,7 +14,7 @@ }, { "Type": "patchouli:text", - "text": "$(li)Almandine: $(l:tfg_ores/mars_vein_index#mars_almandine)36%$(/l)$()$(li)Apatite: $(l:tfg_ores/mars_vein_index#mars_apatite)47%$(/l)$()$(li)Asbestos: $(l:tfg_ores/mars_vein_index#mars_quartzite)17%$(/l)$()$(li)Barite: $(l:tfg_ores/mars_vein_index#mars_quartzite)35%$(/l)$()$(li)Bastnasite: $(l:tfg_ores/mars_vein_index#mars_neodynium)58%$(/l)$()$(li)Bauxite: $(l:tfg_ores/mars_vein_index#mars_sapphire)20%$(/l)$()$(li)Beryllium: $(l:tfg_ores/mars_vein_index#mars_beryllium)35%$(/l)$()$(li)Bismuth: $(l:tfg_ores/mars_vein_index#mars_surface_bismuthinite)40%$(/l)$()$(li)Bornite: $(l:tfg_ores/mars_vein_index#deep_mars_sheldonite)35%$(/l)$()$(li)Calcite: $(l:tfg_ores/mars_vein_index#mars_surface_hematite)5%$(/l)$()$(li)Cassiterite: $(l:tfg_ores/mars_vein_index#mars_surface_cassiterite)55%$(/l)$()$(li)Chalcopyrite: $(l:tfg_ores/mars_vein_index#mars_copper)65%$(/l)$()$(li)Chromite: $(l:tfg_ores/mars_vein_index#deep_mars_chromite)20%$(/l)$()$(li)Coal: $(l:tfg_ores/mars_vein_index#mars_coal)70%$(/l), $(l:tfg_ores/mars_vein_index#mars_graphite)25%$(/l)$()", + "text": "$(li)Almandine: $(l:tfg_ores/mars_vein_index#mars_almandine)36%$(/l)$()$(li)Apatite: $(l:tfg_ores/mars_vein_index#mars_apatite)47%$(/l)$()$(li)Asbestos: $(l:tfg_ores/mars_vein_index#mars_quartzite)17%$(/l)$()$(li)Barite: $(l:tfg_ores/mars_vein_index#mars_quartzite)35%$(/l)$()$(li)Bastnasite: $(l:tfg_ores/mars_vein_index#mars_neodynium)58%$(/l)$()$(li)Bauxite: $(l:tfg_ores/mars_vein_index#mars_sapphire)20%$(/l)$()$(li)Beryllium: $(l:tfg_ores/mars_vein_index#mars_beryllium)35%$(/l)$()$(li)Bismuth: $(l:tfg_ores/mars_vein_index#mars_surface_bismuthinite)40%$(/l)$()$(li)Bornite: $(l:tfg_ores/mars_vein_index#deep_mars_sheldonite)35%$(/l)$()$(li)Calcite: $(l:tfg_ores/mars_vein_index#mars_lapis)15%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_hematite)5%$(/l)$()$(li)Cassiterite: $(l:tfg_ores/mars_vein_index#mars_surface_cassiterite)55%$(/l)$()$(li)Chalcopyrite: $(l:tfg_ores/mars_vein_index#mars_copper)65%$(/l)$()$(li)Chromite: $(l:tfg_ores/mars_vein_index#deep_mars_chromite)20%$(/l)$()$(li)Coal: $(l:tfg_ores/mars_vein_index#mars_coal)70%$(/l), $(l:tfg_ores/mars_vein_index#mars_graphite)25%$(/l)$()", "type": "patchouli:text" }, { @@ -24,17 +24,22 @@ }, { "Type": "patchouli:text", - "text": "$(li)Lead: $(l:tfg_ores/mars_vein_index#mars_galena)33%$(/l)$()$(li)Lepidolite: $(l:tfg_ores/mars_vein_index#mars_salt)15%$(/l)$()$(li)Lithium: $(l:tfg_ores/mars_vein_index#mars_tungsten)19%$(/l)$()$(li)Monazite: $(l:tfg_ores/mars_vein_index#mars_neodynium)29%$(/l)$()$(li)Native Copper: $(l:tfg_ores/mars_vein_index#mars_stibnite)28%$(/l), $(l:tfg_ores/mars_vein_index#mars_copper)20%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_tetrahedrite)19%$(/l)$()$(li)Native Gold: $(l:tfg_ores/mars_vein_index#mars_sapphire)55%$(/l), $(l:tfg_ores/mars_vein_index#mars_hematite)5%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_hematite)5%$(/l)$()$(li)Native Silver: $(l:tfg_ores/mars_vein_index#mars_galena)20%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_nickel_galena)11%$(/l)$()$(li)Neodymium: $(l:tfg_ores/mars_vein_index#mars_neodynium)5%$(/l)$()$(li)Nickel: $(l:tfg_ores/mars_vein_index#deep_mars_sheldonite)25%$(/l), $(l:tfg_ores/mars_vein_index#mars_nickel)28%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_nickel_galena)23%$(/l)$()$(li)Pentlandite: $(l:tfg_ores/mars_vein_index#mars_lubricant)7%$(/l)$()$(li)Pitchblende: $(l:tfg_ores/mars_vein_index#deep_mars_pitchblende)52%$(/l), $(l:tfg_ores/mars_vein_index#mars_pitchblende)41%$(/l)$()$(li)Platinum: $(l:tfg_ores/mars_vein_index#deep_mars_sheldonite)15%$(/l)$()$(li)Pyrite: $(l:tfg_ores/mars_vein_index#mars_sulfur)42%$(/l), $(l:tfg_ores/mars_vein_index#mars_copper)10%$(/l)$()$(li)Pyrochlore: $(l:tfg_ores/mars_vein_index#mars_apatite)14%$(/l)$()", + "text": "$(li)Lapis: $(l:tfg_ores/mars_vein_index#mars_lapis)25%$(/l)$()$(li)Lazurite: $(l:tfg_ores/mars_vein_index#mars_lapis)35%$(/l)$()$(li)Lead: $(l:tfg_ores/mars_vein_index#mars_galena)33%$(/l)$()$(li)Lepidolite: $(l:tfg_ores/mars_vein_index#mars_salt)15%$(/l)$()$(li)Lithium: $(l:tfg_ores/mars_vein_index#mars_tungsten)19%$(/l)$()$(li)Monazite: $(l:tfg_ores/mars_vein_index#mars_neodynium)29%$(/l)$()$(li)Native Copper: $(l:tfg_ores/mars_vein_index#mars_stibnite)28%$(/l), $(l:tfg_ores/mars_vein_index#mars_copper)20%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_tetrahedrite)19%$(/l)$()$(li)Native Gold: $(l:tfg_ores/mars_vein_index#mars_sapphire)55%$(/l), $(l:tfg_ores/mars_vein_index#mars_hematite)5%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_hematite)5%$(/l)$()$(li)Native Silver: $(l:tfg_ores/mars_vein_index#mars_galena)20%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_nickel_galena)11%$(/l)$()$(li)Neodymium: $(l:tfg_ores/mars_vein_index#mars_neodynium)5%$(/l)$()$(li)Nickel: $(l:tfg_ores/mars_vein_index#deep_mars_sheldonite)25%$(/l), $(l:tfg_ores/mars_vein_index#mars_nickel)28%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_nickel_galena)23%$(/l)$()$(li)Pentlandite: $(l:tfg_ores/mars_vein_index#mars_lubricant)7%$(/l)$()$(li)Pitchblende: $(l:tfg_ores/mars_vein_index#deep_mars_pitchblende)52%$(/l), $(l:tfg_ores/mars_vein_index#mars_pitchblende)41%$(/l)$()$(li)Platinum: $(l:tfg_ores/mars_vein_index#deep_mars_sheldonite)15%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)Pyrolusite: $(l:tfg_ores/mars_vein_index#mars_tantalite)42%$(/l)$()$(li)Pyrope: $(l:tfg_ores/mars_vein_index#mars_almandine)26%$(/l)$()$(li)Quartzite: $(l:tfg_ores/mars_vein_index#mars_quartzite)41%$(/l)$()$(li)Realgar: $(l:tfg_ores/mars_vein_index#mars_beryllium)15%$(/l)$()$(li)Redstone: $(l:tfg_ores/mars_vein_index#deep_mars_chromite)45%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_tetrahedrite)4%$(/l)$()$(li)Rock Salt: $(l:tfg_ores/mars_vein_index#mars_salt)20%$(/l)$()$(li)Ruby: $(l:tfg_ores/mars_vein_index#deep_mars_chromite)35%$(/l)$()$(li)Salt: $(l:tfg_ores/mars_vein_index#mars_salt)30%$(/l)$()$(li)Saltpeter: $(l:tfg_ores/mars_vein_index#mars_surface_cassiterite)10%$(/l)$()$(li)Sapphire: $(l:tfg_ores/mars_vein_index#mars_almandine)15%$(/l)$()$(li)Scheelite: $(l:tfg_ores/mars_vein_index#mars_tungsten)42%$(/l)$()$(li)Soapstone: $(l:tfg_ores/mars_vein_index#mars_lubricant)21%$(/l)$()$(li)Spessartine: $(l:tfg_ores/mars_vein_index#mars_tantalite)10%$(/l)$()$(li)Sphalerite: $(l:tfg_ores/mars_vein_index#mars_sulfur)23%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_nickel_galena)17%$(/l)$()", + "text": "$(li)Pyrite: $(l:tfg_ores/mars_vein_index#mars_sulfur)42%$(/l), $(l:tfg_ores/mars_vein_index#mars_copper)10%$(/l)$()$(li)Pyrochlore: $(l:tfg_ores/mars_vein_index#mars_apatite)14%$(/l)$()$(li)Pyrolusite: $(l:tfg_ores/mars_vein_index#mars_tantalite)42%$(/l)$()$(li)Pyrope: $(l:tfg_ores/mars_vein_index#mars_almandine)26%$(/l)$()$(li)Quartzite: $(l:tfg_ores/mars_vein_index#mars_quartzite)41%$(/l)$()$(li)Realgar: $(l:tfg_ores/mars_vein_index#mars_beryllium)15%$(/l)$()$(li)Redstone: $(l:tfg_ores/mars_vein_index#deep_mars_chromite)45%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_tetrahedrite)4%$(/l)$()$(li)Rock Salt: $(l:tfg_ores/mars_vein_index#mars_salt)20%$(/l)$()$(li)Ruby: $(l:tfg_ores/mars_vein_index#deep_mars_chromite)35%$(/l)$()$(li)Salt: $(l:tfg_ores/mars_vein_index#mars_salt)30%$(/l)$()$(li)Saltpeter: $(l:tfg_ores/mars_vein_index#mars_surface_cassiterite)10%$(/l)$()$(li)Sapphire: $(l:tfg_ores/mars_vein_index#mars_almandine)15%$(/l)$()$(li)Scheelite: $(l:tfg_ores/mars_vein_index#mars_tungsten)42%$(/l)$()$(li)Soapstone: $(l:tfg_ores/mars_vein_index#mars_lubricant)21%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)Spodumene: $(l:tfg_ores/mars_vein_index#mars_salt)35%$(/l)$()$(li)Stibnite: $(l:tfg_ores/mars_vein_index#mars_stibnite)19%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_tetrahedrite)19%$(/l)$()$(li)Sulfur: $(l:tfg_ores/mars_vein_index#mars_sulfur)14%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_bismuthinite)20%$(/l)$()$(li)Talc: $(l:tfg_ores/mars_vein_index#mars_lubricant)21%$(/l)$()$(li)Tantalite: $(l:tfg_ores/mars_vein_index#mars_tantalite)36%$(/l)$()$(li)Tetrahedrite: $(l:tfg_ores/mars_vein_index#mars_surface_tetrahedrite)57%$(/l), $(l:tfg_ores/mars_vein_index#mars_stibnite)47%$(/l)$()$(li)Thorium: $(l:tfg_ores/mars_vein_index#deep_mars_pitchblende)26%$(/l), $(l:tfg_ores/mars_vein_index#mars_pitchblende)29%$(/l)$()$(li)Tin: $(l:tfg_ores/mars_vein_index#mars_surface_cassiterite)35%$(/l)$()$(li)Tricalcium Phosphate: $(l:tfg_ores/mars_vein_index#mars_apatite)33%$(/l)$()$(li)Trona: $(l:tfg_ores/mars_vein_index#mars_lubricant)35%$(/l)$()$(li)Tungstate: $(l:tfg_ores/mars_vein_index#mars_tungsten)33%$(/l)$()$(li)Uraninite: $(l:tfg_ores/mars_vein_index#deep_mars_pitchblende)21%$(/l)$()$(li)Yellow Limonite: $(l:tfg_ores/mars_vein_index#mars_hematite)30%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_hematite)33%$(/l)$()", + "text": "$(li)Sodalite: $(l:tfg_ores/mars_vein_index#mars_lapis)25%$(/l)$()$(li)Spessartine: $(l:tfg_ores/mars_vein_index#mars_tantalite)10%$(/l)$()$(li)Sphalerite: $(l:tfg_ores/mars_vein_index#mars_sulfur)23%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_nickel_galena)17%$(/l)$()$(li)Spodumene: $(l:tfg_ores/mars_vein_index#mars_salt)35%$(/l)$()$(li)Stibnite: $(l:tfg_ores/mars_vein_index#mars_stibnite)19%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_tetrahedrite)19%$(/l)$()$(li)Sulfur: $(l:tfg_ores/mars_vein_index#mars_sulfur)14%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_bismuthinite)20%$(/l)$()$(li)Talc: $(l:tfg_ores/mars_vein_index#mars_lubricant)21%$(/l)$()$(li)Tantalite: $(l:tfg_ores/mars_vein_index#mars_tantalite)36%$(/l)$()$(li)Tetrahedrite: $(l:tfg_ores/mars_vein_index#mars_surface_tetrahedrite)57%$(/l), $(l:tfg_ores/mars_vein_index#mars_stibnite)47%$(/l)$()$(li)Thorianite: $(l:tfg_ores/mars_vein_index#deep_mars_pitchblende)26%$(/l), $(l:tfg_ores/mars_vein_index#mars_pitchblende)29%$(/l)$()$(li)Tin: $(l:tfg_ores/mars_vein_index#mars_surface_cassiterite)35%$(/l)$()$(li)Tricalcium Phosphate: $(l:tfg_ores/mars_vein_index#mars_apatite)33%$(/l)$()$(li)Trona: $(l:tfg_ores/mars_vein_index#mars_lubricant)35%$(/l)$()$(li)Tungstate: $(l:tfg_ores/mars_vein_index#mars_tungsten)33%$(/l)$()", + "type": "patchouli:text" + }, + { + "Type": "patchouli:text", + "text": "$(li)Uraninite: $(l:tfg_ores/mars_vein_index#deep_mars_pitchblende)21%$(/l)$()$(li)Yellow Limonite: $(l:tfg_ores/mars_vein_index#mars_hematite)30%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_hematite)33%$(/l)$()", "type": "patchouli:text" } ], 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 b7c906bc8..3ad04def8 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 @@ -19,7 +19,7 @@ }, { "Type": "patchouli:text", - "text": "$(li)$(l:tfg_ores/mars_vein_index#mars_tantalite)Manganese & Tantalum$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_pitchblende)Pitchblende, Thorium, & Hematite$()$()$(li)$(l:tfg_ores/mars_vein_index#deep_mars_pitchblende)Pitchblende, Thorium, & Uraninite$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_quartzite)Quartzite, Asbestos, & Barite$()$()$(li)$(l:tfg_ores/mars_vein_index#deep_mars_chromite)Redstone & Chromite$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_salt)Salts & Spodumene$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_tungsten)Scheelite & Tungstate$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_galena)Silver, Galena, & Lead$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_surface_nickel_galena)Sphalerite & Galena$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_sulfur)Sphalerite & Pyrite$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_stibnite)Tetrahedrite (Normal)$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_surface_tetrahedrite)Tetrahedrite (Surface)$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_lubricant)Trona, Talc, & Glauconite$()$()", + "text": "$(li)$(l:tfg_ores/mars_vein_index#mars_lapis)Lapis, Lazurite, & Sodalite$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_tantalite)Manganese & Tantalum$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_pitchblende)Pitchblende & Thorianite, & Hematite$()$()$(li)$(l:tfg_ores/mars_vein_index#deep_mars_pitchblende)Pitchblende, Thorianite, & Uraninite$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_quartzite)Quartzite, Asbestos, & Barite$()$()$(li)$(l:tfg_ores/mars_vein_index#deep_mars_chromite)Redstone & Chromite$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_salt)Salts & Spodumene$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_tungsten)Scheelite & Tungstate$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_galena)Silver, Galena, & Lead$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_surface_nickel_galena)Sphalerite & Galena$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_sulfur)Sphalerite & Pyrite$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_stibnite)Tetrahedrite (Normal)$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_surface_tetrahedrite)Tetrahedrite (Surface)$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_lubricant)Trona, Talc, & Glauconite$()$()", "type": "patchouli:text" }, { @@ -1240,6 +1240,98 @@ "draw_filler": true, "type": "patchouli:empty" }, + { + "Type": "patchouli:text", + "text": "$(thing)Rarity$(): 200$(br)$(thing)Density$(): 0.25$(br)$(thing)Type$(): Cluster Vein$(br)$(thing)Y$(): 0 — 70$(br)$(thing)Size$(): 30$(br)$(thing)Indicator Max Depth$(): 20$(br2)$(thing)Stone Types$(): Argillite, Chalk, Chert, Dolomite, Limestone, Shale", + "title": "Lapis, Lazurite, & Sodalite", + "type": "patchouli:text", + "anchor": "mars_lapis" + }, + { + "Type": "patchouli:multiblock", + "name": "Lazurite", + "multiblock": { + "mapping": { + "0": "#forge:ores/lazurite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Percentage$(): 35%$(br)$(thing)Source of$(): Aluminium, Calcium, Sodium$(br)$(thing)Formula$(): Al₆Si₆Ca₈Na₈", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Sodalite", + "multiblock": { + "mapping": { + "0": "#forge:ores/sodalite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Percentage$(): 25%$(br)$(thing)Source of$(): Aluminium, Sodium$(br)$(thing)Formula$(): Al₃Si₃Na₄Cl", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Lapis", + "multiblock": { + "mapping": { + "0": "#forge:ores/lapis" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Percentage$(): 25%$(br)$(thing)Source of$(): Lazurite, Sodalite, Pyrite, Calcite", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Calcite", + "multiblock": { + "mapping": { + "0": "#forge:ores/calcite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Percentage$(): 15%$(br)$(thing)Source of$(): Calcium$(br)$(thing)Formula$(): CaCO₃", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:empty", + "draw_filler": true, + "type": "patchouli:empty" + }, { "Type": "patchouli:text", "text": "$(thing)Rarity$(): 230$(br)$(thing)Density$(): 0.3$(br)$(thing)Type$(): Cluster Vein$(br)$(thing)Y$(): 0 — 70$(br)$(thing)Size$(): 42$(br)$(thing)Indicator Max Depth$(): 15$(br2)$(thing)Stone Types$(): Argillite, Basalt, Chalk, Chert, Claystone, Gabbro, Limestone, Red Granite, Shale, Trachyte", @@ -1335,7 +1427,7 @@ { "Type": "patchouli:text", "text": "$(thing)Rarity$(): 220$(br)$(thing)Density$(): 0.55$(br)$(thing)Type$(): Cluster Vein$(br)$(thing)Y$(): 0 — 70$(br)$(thing)Size$(): 20$(br)$(thing)Indicator Max Depth$(): 15$(br2)$(thing)Stone Types$(): Argillite, Conglomerate, Dacite, Diorite, Dolomite, Gabbro, Red Granite, Shale, Trachyte", - "title": "Pitchblende, Thorium, & Hematite", + "title": "Pitchblende & Thorianite, & Hematite", "type": "patchouli:text", "anchor": "mars_pitchblende" }, @@ -1356,12 +1448,12 @@ ] }, "enable_visualize": false, - "text": "$(thing)Percentage$(): 41%$(br)$(thing)Source of$(): Uranium, Thorium, Lead$(br)$(thing)Formula$(): (UO₂)₃ThPb$(br)$(thing)Hazard$(): $(c)$(t:Requires Full Protection)Carcinogenic (Any Contact)$(/t)$()", + "text": "$(thing)Percentage$(): 41%$(br)$(thing)Source of$(): Uranium, Thorium, Lead$(br)$(thing)Formula$(): (UO₂)₃ThPb$(br)$(thing)Hazard$(): $(c)$(t:Requires Full Protection)Radioactive (Any Contact)$(/t)$()", "type": "patchouli:multiblock" }, { "Type": "patchouli:multiblock", - "name": "Thorium", + "name": "Thorianite", "multiblock": { "mapping": { "0": "#forge:ores/thorium" @@ -1376,7 +1468,7 @@ ] }, "enable_visualize": false, - "text": "$(thing)Percentage$(): 29%$(br)$(thing)Source of$(): Thorium$(br)$(thing)Formula$(): Th", + "text": "$(thing)Percentage$(): 29%$(br)$(thing)Source of$(): Thorium$(br)$(thing)Formula$(): ThO₂", "type": "patchouli:multiblock" }, { @@ -1402,7 +1494,7 @@ { "Type": "patchouli:text", "text": "$(thing)Rarity$(): 370$(br)$(thing)Density$(): 0.3$(br)$(thing)Type$(): Cluster Vein$(br)$(thing)Y$(): -20 — 0$(br)$(thing)Size$(): 60$(br)$(thing)Indicator Max Depth$(): 20$(br2)$(thing)Stone Types$(): Argillite, Claystone, Dacite, Diorite, Gabbro, Shale, Trachyte", - "title": "Pitchblende, Thorium, & Uraninite", + "title": "Pitchblende, Thorianite, & Uraninite", "type": "patchouli:text", "anchor": "deep_mars_pitchblende" }, @@ -1423,12 +1515,12 @@ ] }, "enable_visualize": false, - "text": "$(thing)Percentage$(): 52%$(br)$(thing)Source of$(): Uranium, Thorium, Lead$(br)$(thing)Formula$(): (UO₂)₃ThPb$(br)$(thing)Hazard$(): $(c)$(t:Requires Full Protection)Carcinogenic (Any Contact)$(/t)$()", + "text": "$(thing)Percentage$(): 52%$(br)$(thing)Source of$(): Uranium, Thorium, Lead$(br)$(thing)Formula$(): (UO₂)₃ThPb$(br)$(thing)Hazard$(): $(c)$(t:Requires Full Protection)Radioactive (Any Contact)$(/t)$()", "type": "patchouli:multiblock" }, { "Type": "patchouli:multiblock", - "name": "Thorium", + "name": "Thorianite", "multiblock": { "mapping": { "0": "#forge:ores/thorium" @@ -1443,7 +1535,7 @@ ] }, "enable_visualize": false, - "text": "$(thing)Percentage$(): 26%$(br)$(thing)Source of$(): Thorium$(br)$(thing)Formula$(): Th", + "text": "$(thing)Percentage$(): 26%$(br)$(thing)Source of$(): Thorium$(br)$(thing)Formula$(): ThO₂", "type": "patchouli:multiblock" }, { @@ -1463,7 +1555,7 @@ ] }, "enable_visualize": false, - "text": "$(thing)Percentage$(): 21%$(br)$(thing)Source of$(): Uranium$(br)$(thing)Formula$(): UO₂$(br)$(thing)Hazard$(): $(c)$(t:Requires Full Protection)Carcinogenic (Any Contact)$(/t)$()", + "text": "$(thing)Percentage$(): 21%$(br)$(thing)Source of$(): Uranium$(br)$(thing)Formula$(): UO₂$(br)$(thing)Hazard$(): $(c)$(t:Requires Full Protection)Radioactive (Any Contact)$(/t)$()", "type": "patchouli:multiblock" }, { diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/moon_ore_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/moon_ore_index.json index c2fc92e90..4001c0bec 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/moon_ore_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/moon_ore_index.json @@ -39,7 +39,7 @@ }, { "Type": "patchouli:text", - "text": "$(li)Tantalite: $(l:tfg_ores/moon_vein_index#moon_pyrolusite)14%$(/l), $(l:tfg_ores/moon_vein_index#moon_manganese)12%$(/l)$()$(li)Tetrahedrite: $(l:tfg_ores/moon_vein_index#moon_tetrahedrite)40%$(/l)$()$(li)Thorium: $(l:tfg_ores/moon_vein_index#moon_beryllium)0%$(/l)$()$(li)Tin: $(l:tfg_ores/moon_vein_index#moon_cassiterite)17%$(/l)$()$(li)Topaz: $(l:tfg_ores/moon_vein_index#moon_topaz)25%$(/l)$()$(li)Tricalcium Phosphate: $(l:tfg_ores/moon_vein_index#moon_apatite)33%$(/l)$()$(li)Trona: $(l:tfg_ores/moon_vein_index#moon_lubricant)10%$(/l)$()$(li)Tungstate: $(l:tfg_ores/moon_vein_index#moon_scheelite)50%$(/l)$()$(li)Vanadium Magnetite: $(l:tfg_ores/moon_vein_index#moon_magnetite)15%$(/l)$()$(li)Wulfenite: $(l:tfg_ores/moon_vein_index#moon_molybdenum)44%$(/l)$()$(li)Yellow Garnet: $(l:tfg_ores/moon_vein_index#moon_garnet)14%$(/l)$()$(li)Zeolite: $(l:tfg_ores/moon_vein_index#moon_cassiterite)5%$(/l)$()", + "text": "$(li)Tantalite: $(l:tfg_ores/moon_vein_index#moon_pyrolusite)14%$(/l), $(l:tfg_ores/moon_vein_index#moon_manganese)12%$(/l)$()$(li)Tetrahedrite: $(l:tfg_ores/moon_vein_index#moon_tetrahedrite)40%$(/l)$()$(li)Thorianite: $(l:tfg_ores/moon_vein_index#moon_beryllium)0%$(/l)$()$(li)Tin: $(l:tfg_ores/moon_vein_index#moon_cassiterite)17%$(/l)$()$(li)Topaz: $(l:tfg_ores/moon_vein_index#moon_topaz)25%$(/l)$()$(li)Tricalcium Phosphate: $(l:tfg_ores/moon_vein_index#moon_apatite)33%$(/l)$()$(li)Trona: $(l:tfg_ores/moon_vein_index#moon_lubricant)10%$(/l)$()$(li)Tungstate: $(l:tfg_ores/moon_vein_index#moon_scheelite)50%$(/l)$()$(li)Vanadium Magnetite: $(l:tfg_ores/moon_vein_index#moon_magnetite)15%$(/l)$()$(li)Wulfenite: $(l:tfg_ores/moon_vein_index#moon_molybdenum)44%$(/l)$()$(li)Yellow Garnet: $(l:tfg_ores/moon_vein_index#moon_garnet)14%$(/l)$()$(li)Zeolite: $(l:tfg_ores/moon_vein_index#moon_cassiterite)5%$(/l)$()", "type": "patchouli:text" } ], diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/moon_vein_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/moon_vein_index.json index 16d9728e8..a61f9b89a 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/moon_vein_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/moon_vein_index.json @@ -934,7 +934,7 @@ }, { "Type": "patchouli:multiblock", - "name": "Thorium", + "name": "Thorianite", "multiblock": { "mapping": { "0": "#forge:ores/thorium" @@ -949,7 +949,7 @@ ] }, "enable_visualize": false, - "text": "$(thing)Percentage$(): 0%$(br)$(thing)Source of$(): Thorium$(br)$(thing)Formula$(): Th", + "text": "$(thing)Percentage$(): 0%$(br)$(thing)Source of$(): Thorium$(br)$(thing)Formula$(): ThO₂", "type": "patchouli:multiblock" }, { diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/nether_ore_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/nether_ore_index.json index 643d1ab05..d7124bacc 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/nether_ore_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/nether_ore_index.json @@ -44,7 +44,7 @@ }, { "Type": "patchouli:text", - "text": "$(li)Sylvite: $(l:tfg_ores/nether_vein_index#nether_sylvite)100%$(/l)$()$(li)Talc: $(l:tfg_ores/nether_vein_index#nether_lubricant)20%$(/l)$()$(li)Tantalite: $(l:tfg_ores/nether_vein_index#nether_manganese)12%$(/l)$()$(li)Tetrahedrite: $(l:tfg_ores/nether_vein_index#nether_tetrahedrite)50%$(/l)$()$(li)Thorium: $(l:tfg_ores/nether_vein_index#nether_beryllium)0%$(/l)$()$(li)Tin: $(l:tfg_ores/nether_vein_index#nether_cassiterite)54%$(/l)$()$(li)Topaz: $(l:tfg_ores/nether_vein_index#nether_topaz)25%$(/l)$()$(li)Tricalcium Phosphate: $(l:tfg_ores/nether_vein_index#nether_apatite)35%$(/l)$()$(li)Trona: $(l:tfg_ores/nether_vein_index#nether_lubricant)10%$(/l)$()$(li)Tungstate: $(l:tfg_ores/nether_vein_index#nether_scheelite)35%$(/l)$()$(li)Uraninite: $(l:tfg_ores/nether_vein_index#nether_pitchblende)25%$(/l)$()$(li)Vanadium Magnetite: $(l:tfg_ores/nether_vein_index#nether_magnetite)30%$(/l)$()$(li)Wulfenite: $(l:tfg_ores/nether_vein_index#nether_molybdenum)42%$(/l), $(l:tfg_ores/nether_vein_index#nether_pitchblende)12%$(/l)$()$(li)Yellow Garnet: $(l:tfg_ores/nether_vein_index#nether_garnet)14%$(/l)$()", + "text": "$(li)Sylvite: $(l:tfg_ores/nether_vein_index#nether_sylvite)100%$(/l)$()$(li)Talc: $(l:tfg_ores/nether_vein_index#nether_lubricant)20%$(/l)$()$(li)Tantalite: $(l:tfg_ores/nether_vein_index#nether_manganese)12%$(/l)$()$(li)Tetrahedrite: $(l:tfg_ores/nether_vein_index#nether_tetrahedrite)50%$(/l)$()$(li)Thorianite: $(l:tfg_ores/nether_vein_index#nether_beryllium)0%$(/l)$()$(li)Tin: $(l:tfg_ores/nether_vein_index#nether_cassiterite)54%$(/l)$()$(li)Topaz: $(l:tfg_ores/nether_vein_index#nether_topaz)25%$(/l)$()$(li)Tricalcium Phosphate: $(l:tfg_ores/nether_vein_index#nether_apatite)35%$(/l)$()$(li)Trona: $(l:tfg_ores/nether_vein_index#nether_lubricant)10%$(/l)$()$(li)Tungstate: $(l:tfg_ores/nether_vein_index#nether_scheelite)35%$(/l)$()$(li)Uraninite: $(l:tfg_ores/nether_vein_index#nether_pitchblende)25%$(/l)$()$(li)Vanadium Magnetite: $(l:tfg_ores/nether_vein_index#nether_magnetite)30%$(/l)$()$(li)Wulfenite: $(l:tfg_ores/nether_vein_index#nether_molybdenum)42%$(/l), $(l:tfg_ores/nether_vein_index#nether_pitchblende)12%$(/l)$()$(li)Yellow Garnet: $(l:tfg_ores/nether_vein_index#nether_garnet)14%$(/l)$()", "type": "patchouli:text" }, { 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 90920c3bc..722cc922e 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 @@ -799,7 +799,7 @@ }, { "Type": "patchouli:multiblock", - "name": "Thorium", + "name": "Thorianite", "multiblock": { "mapping": { "0": "#forge:ores/thorium" @@ -814,7 +814,7 @@ ] }, "enable_visualize": false, - "text": "$(thing)Percentage$(): 0%$(br)$(thing)Source of$(): Thorium$(br)$(thing)Formula$(): Th", + "text": "$(thing)Percentage$(): 0%$(br)$(thing)Source of$(): Thorium$(br)$(thing)Formula$(): ThO₂", "type": "patchouli:multiblock" }, { @@ -2744,7 +2744,7 @@ ] }, "enable_visualize": false, - "text": "$(thing)Percentage$(): 62%$(br)$(thing)Source of$(): Uranium, Thorium, Lead$(br)$(thing)Formula$(): (UO₂)₃ThPb$(br)$(thing)Hazard$(): $(c)$(t:Requires Full Protection)Carcinogenic (Any Contact)$(/t)$()", + "text": "$(thing)Percentage$(): 62%$(br)$(thing)Source of$(): Uranium, Thorium, Lead$(br)$(thing)Formula$(): (UO₂)₃ThPb$(br)$(thing)Hazard$(): $(c)$(t:Requires Full Protection)Radioactive (Any Contact)$(/t)$()", "type": "patchouli:multiblock" }, { @@ -2764,7 +2764,7 @@ ] }, "enable_visualize": false, - "text": "$(thing)Percentage$(): 25%$(br)$(thing)Source of$(): Uranium$(br)$(thing)Formula$(): UO₂$(br)$(thing)Hazard$(): $(c)$(t:Requires Full Protection)Carcinogenic (Any Contact)$(/t)$()", + "text": "$(thing)Percentage$(): 25%$(br)$(thing)Source of$(): Uranium$(br)$(thing)Formula$(): UO₂$(br)$(thing)Hazard$(): $(c)$(t:Requires Full Protection)Radioactive (Any Contact)$(/t)$()", "type": "patchouli:multiblock" }, { diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/venus_ore_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/venus_ore_index.json index 94dc40ab4..c5ed949ce 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/venus_ore_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/venus_ore_index.json @@ -1,7 +1,7 @@ { "__credits__": "This page was automatically generated by OresToFieldGuide.", "name": "Venus Ore Index", - "icon": "gtceu:sulfur_dust", + "icon": "vintageimprovements:sulfur", "category": "tfc:tfg_ores", "read_by_default": true, "secret": false, @@ -14,7 +14,7 @@ }, { "Type": "patchouli:text", - "text": "$(li)Lepidolite: $(l:tfg_ores/venus_vein_index#venus_manual_salt)15%$(/l)$()$(li)Pyrite: $(l:tfg_ores/venus_vein_index#venus_manual_sulfur)35%$(/l)$()$(li)Rock Salt: $(l:tfg_ores/venus_vein_index#venus_manual_salt)20%$(/l)$()$(li)Salt: $(l:tfg_ores/venus_vein_index#venus_manual_salt)50%$(/l)$()$(li)Sphalerite: $(l:tfg_ores/venus_vein_index#venus_manual_sulfur)15%$(/l)$()$(li)Spodumene: $(l:tfg_ores/venus_vein_index#venus_manual_salt)15%$(/l)$()$(li)Sulfur: $(l:tfg_ores/venus_vein_index#venus_manual_sulfur)50%$(/l)$()", + "text": "$(li)Lepidolite: $(l:tfg_ores/venus_vein_index#venus_manual_salt)5%$(/l)$()$(li)Pyrite: $(l:tfg_ores/venus_vein_index#venus_manual_sulfur)15%$(/l)$()$(li)Rock Salt: $(l:tfg_ores/venus_vein_index#venus_manual_salt)10%$(/l)$()$(li)Salt: $(l:tfg_ores/venus_vein_index#venus_manual_salt)80%$(/l)$()$(li)Sphalerite: $(l:tfg_ores/venus_vein_index#venus_manual_sulfur)5%$(/l)$()$(li)Spodumene: $(l:tfg_ores/venus_vein_index#venus_manual_salt)5%$(/l)$()$(li)Sulfur: $(l:tfg_ores/venus_vein_index#venus_manual_sulfur)80%$(/l)$()", "type": "patchouli:text" } ], 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 99745b157..9585d526b 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)Rarity$(): 100$(br)$(thing)Density$(): 0.2$(br)$(thing)Type$(): Disc Vein$(br)$(thing)Y$(): 40 — 65$(br)$(thing)Size$(): 20$(br)$(thing)Height$(): 6$(br)$(thing)Indicator Max Depth$(): 30$(br2)$(thing)Stone Types$(): Andesite, Basalt, Dacite, Rhyolite, Trachyte, Travertine$(br2)Only appears in the $(thing)Salt Flats$() biome.", + "text": "$(thing)Rarity$(): 30$(br)$(thing)Density$(): 0.2$(br)$(thing)Type$(): Disc Vein$(br)$(thing)Y$(): 40 — 65$(br)$(thing)Size$(): 20$(br)$(thing)Height$(): 6$(br)$(thing)Indicator Max Depth$(): 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" @@ -41,7 +41,7 @@ ] }, "enable_visualize": false, - "text": "$(thing)Percentage$(): 50%$(br)$(thing)Source of$(): Sodium, Chlorine$(br)$(thing)Formula$(): NaCl", + "text": "$(thing)Percentage$(): 80%$(br)$(thing)Source of$(): Sodium, Chlorine$(br)$(thing)Formula$(): NaCl", "type": "patchouli:multiblock" }, { @@ -61,7 +61,7 @@ ] }, "enable_visualize": false, - "text": "$(thing)Percentage$(): 20%$(br)$(thing)Source of$(): Potassium, Chlorine$(br)$(thing)Formula$(): KCl", + "text": "$(thing)Percentage$(): 10%$(br)$(thing)Source of$(): Potassium, Chlorine$(br)$(thing)Formula$(): KCl", "type": "patchouli:multiblock" }, { @@ -81,7 +81,7 @@ ] }, "enable_visualize": false, - "text": "$(thing)Percentage$(): 15%$(br)$(thing)Source of$(): Potassium, Lithium, Aluminium, Fluorine$(br)$(thing)Formula$(): KLi₃Al₄F₂O₁₀", + "text": "$(thing)Percentage$(): 5%$(br)$(thing)Source of$(): Potassium, Lithium, Aluminium, Fluorine$(br)$(thing)Formula$(): KLi₃Al₄F₂O₁₀", "type": "patchouli:multiblock" }, { @@ -101,7 +101,7 @@ ] }, "enable_visualize": false, - "text": "$(thing)Percentage$(): 15%$(br)$(thing)Source of$(): Lithium, Aluminium$(br)$(thing)Formula$(): LiAlSi₂O₆", + "text": "$(thing)Percentage$(): 5%$(br)$(thing)Source of$(): Lithium, Aluminium$(br)$(thing)Formula$(): LiAlSi₂O₆", "type": "patchouli:multiblock" }, { @@ -111,7 +111,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)Rarity$(): 100$(br)$(thing)Density$(): 0.2$(br)$(thing)Type$(): Cluster Vein$(br)$(thing)Y$(): 40 — 65$(br)$(thing)Size$(): 15$(br)$(thing)Indicator Max Depth$(): 30$(br2)$(thing)Stone Types$(): Andesite, Basalt, Dacite, Rhyolite, Trachyte, Travertine$(br2)Only appears in the $(thing)Sulfuric Ravines$() biome.", + "text": "$(thing)Rarity$(): 30$(br)$(thing)Density$(): 0.2$(br)$(thing)Type$(): Cluster Vein$(br)$(thing)Y$(): 40 — 65$(br)$(thing)Size$(): 20$(br)$(thing)Indicator Max Depth$(): 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" @@ -133,7 +133,7 @@ ] }, "enable_visualize": false, - "text": "$(thing)Percentage$(): 50%$(br)$(thing)Source of$(): Sulfur$(br)$(thing)Formula$(): S", + "text": "$(thing)Percentage$(): 80%$(br)$(thing)Source of$(): Sulfur$(br)$(thing)Formula$(): S", "type": "patchouli:multiblock" }, { @@ -153,7 +153,7 @@ ] }, "enable_visualize": false, - "text": "$(thing)Percentage$(): 35%$(br)$(thing)Melts into$(): Cast Iron$(br)$(thing)Formula$(): FeS₂", + "text": "$(thing)Percentage$(): 15%$(br)$(thing)Melts into$(): Cast Iron$(br)$(thing)Formula$(): FeS₂", "type": "patchouli:multiblock" }, { @@ -173,7 +173,7 @@ ] }, "enable_visualize": false, - "text": "$(thing)Percentage$(): 15%$(br)$(thing)Melts into$(): Zinc$(br)$(thing)Formula$(): ZnS", + "text": "$(thing)Percentage$(): 5%$(br)$(thing)Melts into$(): Zinc$(br)$(thing)Formula$(): ZnS", "type": "patchouli:multiblock" } ], diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_tips/blast_furnace_tips.json b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_tips/blast_furnace_tips.json index bc3a89ef9..52011ad60 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_tips/blast_furnace_tips.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_tips/blast_furnace_tips.json @@ -13,7 +13,7 @@ { "type": "patchouli:spotlight", "item": "gtceu:compressed_fireclay", - "text": "Before you use all your fire clay on 20 fire bricks, note that once you get into the steam age, you can create fire bricks out of only clay, through $(item)Compressed Fireclay$() (you'll need steam machines for the clay dust). This allows you to save $(item)Kaolinite$() and $(item)Graphite$() for $(thing)Casting Tables$()." + "text": "Before you use all your fire clay on 20 fire bricks, note that once you get into the steam age, you can craft it for significantly cheaper. This allows you to save $(item)Kaolinite$() and $(item)Graphite$() for $(thing)Casting Tables$()." }, { "type": "patchouli:spotlight", @@ -33,11 +33,11 @@ }, { "type": "patchouli:text", - "text": "You can pump liquid directly out of the blast furnace using a Create $(item)Mechanical Pump$(). Pump into a $(l:tfc:tfcchannelcasting/channel_casting)Mold Table$() and extract the ingots with a hopper or chute: Easy automation!$(br2)You can automate the bellows with a $(item)Deployer$() too! Just be careful, as using the bellows excessively consumes more fuel and breaks your $(thing)tuyere$() faster.$(br2)You can process the resulting $(item)Pig Iron$() and $(item)High Carbon Steel$() in a $(thing)Forge Hammer$()." + "text": "You can pump liquid directly out of the blast furnace using a Create $(item)Mechanical Pump$(). Pump into a $(l:tfc:tfcchannelcasting/channel_casting)Mold Table$() and extract the ingots with a hopper or chute: Easy automation!$(br2)You can automate the bellows with a $(item)Deployer$() too! Just be careful, as using the bellows excessively consumes more fuel and breaks your $(thing)tuyere$() faster.$(br2)You can process the resulting $(item)Pig Iron$() and $(item)High Carbon Steel$() in a $(thing)Forge Hammer$() or $(thing)Helve Hammer$()." }, { "type": "patchouli:text", - "text": "You can automatically replace broken tuyeres with a hopper facing into the blast furnace." + "text": "You can automatically replace broken tuyeres with a hopper or item pipe facing into the blast furnace." } ] } \ No newline at end of file diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_tips/faqs.json b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_tips/faqs.json index ce8574c54..69a7d3473 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_tips/faqs.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_tips/faqs.json @@ -13,7 +13,7 @@ }, { "type": "patchouli:text", - "text": "$(li)$(l:tfg_tips/faqs#boats)Why did my boat sink?$()$(li)$(l:tfg_tips/faqs#dried_fruit)How do I make yeast starter?$()$(li)$(l:tfg_tips/faqs#dried_fruit)How do I make pineapple fiber?$()$(li)$(l:tfg_tips/faqs#jam)How do I make jam?$()$(li)$(l:tfg_tips/faqs#resin)How do I make Rubber?$()$(li)$(l:tfg_tips/faqs#chunks)How do I force-load a chunk or increase my limit?$()" + "text": "$(li)$(l:tfg_tips/faqs#boats)Why did my boat sink?$()$(li)$(l:tfg_tips/faqs#dried_fruit)How do I make yeast starter?$()$(li)$(l:tfg_tips/faqs#dried_fruit)How do I make pineapple fiber?$()$(li)$(l:tfg_tips/faqs#resin)How do I make Rubber?$()$(li)$(l:tfg_tips/faqs#chunks)How do I force-load a chunk or increase my limit?$()" }, { "type": "patchouli:text", @@ -25,11 +25,6 @@ "anchor": "dried_fruit", "text": "$(italic)How do I make yeast starter or pineapple fiber?$()$(br2)Make sure you dry the fruit first using a $(item)Drying Mat$(). Then follow the rest of the steps for $(l:firmalife/bread)bread$() or $(l:firmalife/berry_bushes)pineapple leather$()." }, - { - "type": "patchouli:text", - "anchor": "jam", - "text": "$(italic)How do I make jam?$()$(br2)It's easiest with a $(l:firmalife/oven_appliances#vat)Vat$(). Follow the steps in that section, but you don't need to make a $(thing)Jarring Station$() or $(thing)Lids$() unless you want to automate it. Just right-click the Vat of $(thing)Fruity Fluid$() with an empty jar, then right-click it again to take it out, and it should be full of jam and sealed.$(br2)Make sure you $(bold)close the lid$() on the Vat with $(item)$(k:sneak)$() + $(item)$(k:use)$()!" - }, { "type": "patchouli:text", "anchor": "chunks", @@ -38,7 +33,7 @@ { "type": "patchouli:text", "anchor": "resin", - "text": "$(italic)How do I make rubber?$()$(br2)Sticky Resin is no longer what you are looking for! First, grow some $(thing)Latex$()-producing trees and make some $(thing)Tree Taps$(). Place a tree tap on the trunk of each tree (more taps on a tree just splits the output). You can collect the Latex that comes out with a $(tfc:mechanics/barrels)Barrel$()." + "text": "$(italic)How do I make rubber?$()$(br2)Sticky Resin is no longer what you are looking for! First, grow some $(thing)Latex$()-producing trees and make some $(thing)Tree Taps$(). Place a tree tap on the trunk of each tree (more taps on a tree just splits the output). You can collect the Latex that comes out with a $(l:mechanics/barrels)Barrel$()." }, { "type": "patchouli:text", diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_tips/space_crops.json b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_tips/space_crops.json index 2f32f2dfd..5215f5ffe 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_tips/space_crops.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_tips/space_crops.json @@ -564,7 +564,7 @@ "betterend:blossom_berry_product": 6, "betterend:bolux_mushroom_seeds": 8, "betterend:bolux_mushroom_product": 8, - "betterend:cave_pumpkin_seeds": 10, + "betterend:cave_pumpkin_plant_seeds": 10, "betterend:cave_pumpkin": 10, "betterend:chorus_mushroom_seeds": 12, "betterend:chorus_mushroom_product": 12, 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 bf3d42fda..bd7ec360f 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 @@ -44,7 +44,7 @@ }, { "Type": "patchouli:text", - "text": "$(li)Sphalerite: $(l:tfg_ores/earth_vein_index#normal_sphalerite)40%$(/l), $(l:tfg_ores/earth_vein_index#surface_sphalerite)40%$(/l), $(l:tfg_ores/earth_vein_index#normal_sulfur)15%$(/l)$()$(li)Spodumene: $(l:tfg_ores/earth_vein_index#normal_spodumene)35%$(/l)$()$(li)Stibnite: $(l:tfg_ores/earth_vein_index#normal_tetrahedrite)20%$(/l), $(l:tfg_ores/earth_vein_index#surface_tetrahedrite)20%$(/l)$()$(li)Sulfur: $(l:tfg_ores/earth_vein_index#surface_sphalerite)55%$(/l), $(l:tfg_ores/earth_vein_index#normal_sulfur)50%$(/l), $(l:tfg_ores/earth_vein_index#normal_sphalerite)35%$(/l), $(l:tfg_ores/earth_vein_index#normal_bismuthinite)9%$(/l), $(l:tfg_ores/earth_vein_index#surface_bismuthinite)3%$(/l)$()$(li)Talc: $(l:tfg_ores/earth_vein_index#normal_lubricant)20%$(/l)$()$(li)Tantalite: $(l:tfg_ores/earth_vein_index#normal_manganese)12%$(/l)$()$(li)Tarkianite: $(l:tfg_ores/earth_vein_index#normal_tarkianite)35%$(/l)$()$(li)Tetrahedrite: $(l:tfg_ores/earth_vein_index#surface_tetrahedrite)60%$(/l), $(l:tfg_ores/earth_vein_index#normal_tetrahedrite)50%$(/l)$()$(li)Thorium: $(l:tfg_ores/earth_vein_index#normal_beryllium)15%$(/l)$()$(li)Tin: $(l:tfg_ores/earth_vein_index#normal_cassiterite)55%$(/l), $(l:tfg_ores/earth_vein_index#surface_cassiterite)35%$(/l)$()$(li)Topaz: $(l:tfg_ores/earth_vein_index#deep_topaz)25%$(/l)$()$(li)Tricalcium Phosphate: $(l:tfg_ores/earth_vein_index#normal_apatite)35%$(/l)$()$(li)Trona: $(l:tfg_ores/earth_vein_index#normal_lubricant)10%$(/l), $(l:tfg_ores/earth_vein_index#normal_tarkianite)10%$(/l)$()$(li)Tungstate: $(l:tfg_ores/earth_vein_index#deep_scheelite)35%$(/l)$()", + "text": "$(li)Sphalerite: $(l:tfg_ores/earth_vein_index#normal_sphalerite)40%$(/l), $(l:tfg_ores/earth_vein_index#surface_sphalerite)40%$(/l), $(l:tfg_ores/earth_vein_index#normal_sulfur)15%$(/l)$()$(li)Spodumene: $(l:tfg_ores/earth_vein_index#normal_spodumene)35%$(/l)$()$(li)Stibnite: $(l:tfg_ores/earth_vein_index#normal_tetrahedrite)20%$(/l), $(l:tfg_ores/earth_vein_index#surface_tetrahedrite)20%$(/l)$()$(li)Sulfur: $(l:tfg_ores/earth_vein_index#surface_sphalerite)55%$(/l), $(l:tfg_ores/earth_vein_index#normal_sulfur)50%$(/l), $(l:tfg_ores/earth_vein_index#normal_sphalerite)35%$(/l), $(l:tfg_ores/earth_vein_index#normal_bismuthinite)9%$(/l), $(l:tfg_ores/earth_vein_index#surface_bismuthinite)3%$(/l)$()$(li)Talc: $(l:tfg_ores/earth_vein_index#normal_lubricant)20%$(/l)$()$(li)Tantalite: $(l:tfg_ores/earth_vein_index#normal_manganese)12%$(/l)$()$(li)Tarkianite: $(l:tfg_ores/earth_vein_index#normal_tarkianite)35%$(/l)$()$(li)Tetrahedrite: $(l:tfg_ores/earth_vein_index#surface_tetrahedrite)60%$(/l), $(l:tfg_ores/earth_vein_index#normal_tetrahedrite)50%$(/l)$()$(li)Thorianite: $(l:tfg_ores/earth_vein_index#normal_beryllium)15%$(/l)$()$(li)Tin: $(l:tfg_ores/earth_vein_index#normal_cassiterite)55%$(/l), $(l:tfg_ores/earth_vein_index#surface_cassiterite)35%$(/l)$()$(li)Topaz: $(l:tfg_ores/earth_vein_index#deep_topaz)25%$(/l)$()$(li)Tricalcium Phosphate: $(l:tfg_ores/earth_vein_index#normal_apatite)35%$(/l)$()$(li)Trona: $(l:tfg_ores/earth_vein_index#normal_lubricant)10%$(/l), $(l:tfg_ores/earth_vein_index#normal_tarkianite)10%$(/l)$()$(li)Tungstate: $(l:tfg_ores/earth_vein_index#deep_scheelite)35%$(/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 bd497aa70..eaa8bc79a 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 @@ -1107,7 +1107,7 @@ }, { "Type": "patchouli:multiblock", - "name": "Thorium", + "name": "Thorianite", "multiblock": { "mapping": { "0": "#forge:ores/thorium" @@ -1122,7 +1122,7 @@ ] }, "enable_visualize": false, - "text": "$(thing)Percentage$(): 15%$(br)$(thing)Source of$(): Thorium$(br)$(thing)Formula$(): Th", + "text": "$(thing)Percentage$(): 15%$(br)$(thing)Source of$(): Thorium$(br)$(thing)Formula$(): ThO₂", "type": "patchouli:multiblock" }, { @@ -3915,7 +3915,7 @@ ] }, "enable_visualize": false, - "text": "$(thing)Percentage$(): 62%$(br)$(thing)Source of$(): Uranium, Thorium, Lead$(br)$(thing)Formula$(): (UO₂)₃ThPb$(br)$(thing)Hazard$(): $(c)$(t:Requires Full Protection)Carcinogenic (Any Contact)$(/t)$()", + "text": "$(thing)Percentage$(): 62%$(br)$(thing)Source of$(): Uranium, Thorium, Lead$(br)$(thing)Formula$(): (UO₂)₃ThPb$(br)$(thing)Hazard$(): $(c)$(t:Requires Full Protection)Radioactive (Any Contact)$(/t)$()", "type": "patchouli:multiblock" }, { @@ -3935,7 +3935,7 @@ ] }, "enable_visualize": false, - "text": "$(thing)Percentage$(): 25%$(br)$(thing)Source of$(): Uranium$(br)$(thing)Formula$(): UO₂$(br)$(thing)Hazard$(): $(c)$(t:Requires Full Protection)Carcinogenic (Any Contact)$(/t)$()", + "text": "$(thing)Percentage$(): 25%$(br)$(thing)Source of$(): Uranium$(br)$(thing)Formula$(): UO₂$(br)$(thing)Hazard$(): $(c)$(t:Requires Full Protection)Radioactive (Any Contact)$(/t)$()", "type": "patchouli:multiblock" }, { diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/fr_fr/entries/tfg_ores/mars_ore_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/fr_fr/entries/tfg_ores/mars_ore_index.json index 718015567..b0b52328e 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/fr_fr/entries/tfg_ores/mars_ore_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/fr_fr/entries/tfg_ores/mars_ore_index.json @@ -14,7 +14,7 @@ }, { "Type": "patchouli:text", - "text": "$(li)Almandine: $(l:tfg_ores/mars_vein_index#mars_almandine)36%$(/l)$()$(li)Apatite: $(l:tfg_ores/mars_vein_index#mars_apatite)47%$(/l)$()$(li)Asbestos: $(l:tfg_ores/mars_vein_index#mars_quartzite)17%$(/l)$()$(li)Barite: $(l:tfg_ores/mars_vein_index#mars_quartzite)35%$(/l)$()$(li)Bastnasite: $(l:tfg_ores/mars_vein_index#mars_neodynium)58%$(/l)$()$(li)Bauxite: $(l:tfg_ores/mars_vein_index#mars_sapphire)20%$(/l)$()$(li)Beryllium: $(l:tfg_ores/mars_vein_index#mars_beryllium)35%$(/l)$()$(li)Bismuth: $(l:tfg_ores/mars_vein_index#mars_surface_bismuthinite)40%$(/l)$()$(li)Bornite: $(l:tfg_ores/mars_vein_index#deep_mars_sheldonite)35%$(/l)$()$(li)Calcite: $(l:tfg_ores/mars_vein_index#mars_surface_hematite)5%$(/l)$()$(li)Cassiterite: $(l:tfg_ores/mars_vein_index#mars_surface_cassiterite)55%$(/l)$()$(li)Chalcopyrite: $(l:tfg_ores/mars_vein_index#mars_copper)65%$(/l)$()$(li)Chromite: $(l:tfg_ores/mars_vein_index#deep_mars_chromite)20%$(/l)$()$(li)Coal: $(l:tfg_ores/mars_vein_index#mars_coal)70%$(/l), $(l:tfg_ores/mars_vein_index#mars_graphite)25%$(/l)$()", + "text": "$(li)Almandine: $(l:tfg_ores/mars_vein_index#mars_almandine)36%$(/l)$()$(li)Apatite: $(l:tfg_ores/mars_vein_index#mars_apatite)47%$(/l)$()$(li)Asbestos: $(l:tfg_ores/mars_vein_index#mars_quartzite)17%$(/l)$()$(li)Barite: $(l:tfg_ores/mars_vein_index#mars_quartzite)35%$(/l)$()$(li)Bastnasite: $(l:tfg_ores/mars_vein_index#mars_neodynium)58%$(/l)$()$(li)Bauxite: $(l:tfg_ores/mars_vein_index#mars_sapphire)20%$(/l)$()$(li)Beryllium: $(l:tfg_ores/mars_vein_index#mars_beryllium)35%$(/l)$()$(li)Bismuth: $(l:tfg_ores/mars_vein_index#mars_surface_bismuthinite)40%$(/l)$()$(li)Bornite: $(l:tfg_ores/mars_vein_index#deep_mars_sheldonite)35%$(/l)$()$(li)Calcite: $(l:tfg_ores/mars_vein_index#mars_lapis)15%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_hematite)5%$(/l)$()$(li)Cassiterite: $(l:tfg_ores/mars_vein_index#mars_surface_cassiterite)55%$(/l)$()$(li)Chalcopyrite: $(l:tfg_ores/mars_vein_index#mars_copper)65%$(/l)$()$(li)Chromite: $(l:tfg_ores/mars_vein_index#deep_mars_chromite)20%$(/l)$()$(li)Coal: $(l:tfg_ores/mars_vein_index#mars_coal)70%$(/l), $(l:tfg_ores/mars_vein_index#mars_graphite)25%$(/l)$()", "type": "patchouli:text" }, { @@ -24,17 +24,22 @@ }, { "Type": "patchouli:text", - "text": "$(li)Lead: $(l:tfg_ores/mars_vein_index#mars_galena)33%$(/l)$()$(li)Lepidolite: $(l:tfg_ores/mars_vein_index#mars_salt)15%$(/l)$()$(li)Lithium: $(l:tfg_ores/mars_vein_index#mars_tungsten)19%$(/l)$()$(li)Monazite: $(l:tfg_ores/mars_vein_index#mars_neodynium)29%$(/l)$()$(li)Native Copper: $(l:tfg_ores/mars_vein_index#mars_stibnite)28%$(/l), $(l:tfg_ores/mars_vein_index#mars_copper)20%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_tetrahedrite)19%$(/l)$()$(li)Native Gold: $(l:tfg_ores/mars_vein_index#mars_sapphire)55%$(/l), $(l:tfg_ores/mars_vein_index#mars_hematite)5%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_hematite)5%$(/l)$()$(li)Native Silver: $(l:tfg_ores/mars_vein_index#mars_galena)20%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_nickel_galena)11%$(/l)$()$(li)Neodymium: $(l:tfg_ores/mars_vein_index#mars_neodynium)5%$(/l)$()$(li)Nickel: $(l:tfg_ores/mars_vein_index#deep_mars_sheldonite)25%$(/l), $(l:tfg_ores/mars_vein_index#mars_nickel)28%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_nickel_galena)23%$(/l)$()$(li)Pentlandite: $(l:tfg_ores/mars_vein_index#mars_lubricant)7%$(/l)$()$(li)Pitchblende: $(l:tfg_ores/mars_vein_index#deep_mars_pitchblende)52%$(/l), $(l:tfg_ores/mars_vein_index#mars_pitchblende)41%$(/l)$()$(li)Platinum: $(l:tfg_ores/mars_vein_index#deep_mars_sheldonite)15%$(/l)$()$(li)Pyrite: $(l:tfg_ores/mars_vein_index#mars_sulfur)42%$(/l), $(l:tfg_ores/mars_vein_index#mars_copper)10%$(/l)$()$(li)Pyrochlore: $(l:tfg_ores/mars_vein_index#mars_apatite)14%$(/l)$()", + "text": "$(li)Lapis: $(l:tfg_ores/mars_vein_index#mars_lapis)25%$(/l)$()$(li)Lazurite: $(l:tfg_ores/mars_vein_index#mars_lapis)35%$(/l)$()$(li)Lead: $(l:tfg_ores/mars_vein_index#mars_galena)33%$(/l)$()$(li)Lepidolite: $(l:tfg_ores/mars_vein_index#mars_salt)15%$(/l)$()$(li)Lithium: $(l:tfg_ores/mars_vein_index#mars_tungsten)19%$(/l)$()$(li)Monazite: $(l:tfg_ores/mars_vein_index#mars_neodynium)29%$(/l)$()$(li)Native Copper: $(l:tfg_ores/mars_vein_index#mars_stibnite)28%$(/l), $(l:tfg_ores/mars_vein_index#mars_copper)20%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_tetrahedrite)19%$(/l)$()$(li)Native Gold: $(l:tfg_ores/mars_vein_index#mars_sapphire)55%$(/l), $(l:tfg_ores/mars_vein_index#mars_hematite)5%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_hematite)5%$(/l)$()$(li)Native Silver: $(l:tfg_ores/mars_vein_index#mars_galena)20%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_nickel_galena)11%$(/l)$()$(li)Neodymium: $(l:tfg_ores/mars_vein_index#mars_neodynium)5%$(/l)$()$(li)Nickel: $(l:tfg_ores/mars_vein_index#deep_mars_sheldonite)25%$(/l), $(l:tfg_ores/mars_vein_index#mars_nickel)28%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_nickel_galena)23%$(/l)$()$(li)Pentlandite: $(l:tfg_ores/mars_vein_index#mars_lubricant)7%$(/l)$()$(li)Pitchblende: $(l:tfg_ores/mars_vein_index#deep_mars_pitchblende)52%$(/l), $(l:tfg_ores/mars_vein_index#mars_pitchblende)41%$(/l)$()$(li)Platinum: $(l:tfg_ores/mars_vein_index#deep_mars_sheldonite)15%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)Pyrolusite: $(l:tfg_ores/mars_vein_index#mars_tantalite)42%$(/l)$()$(li)Pyrope: $(l:tfg_ores/mars_vein_index#mars_almandine)26%$(/l)$()$(li)Quartzite: $(l:tfg_ores/mars_vein_index#mars_quartzite)41%$(/l)$()$(li)Realgar: $(l:tfg_ores/mars_vein_index#mars_beryllium)15%$(/l)$()$(li)Redstone: $(l:tfg_ores/mars_vein_index#deep_mars_chromite)45%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_tetrahedrite)4%$(/l)$()$(li)Rock Salt: $(l:tfg_ores/mars_vein_index#mars_salt)20%$(/l)$()$(li)Ruby: $(l:tfg_ores/mars_vein_index#deep_mars_chromite)35%$(/l)$()$(li)Salt: $(l:tfg_ores/mars_vein_index#mars_salt)30%$(/l)$()$(li)Saltpeter: $(l:tfg_ores/mars_vein_index#mars_surface_cassiterite)10%$(/l)$()$(li)Sapphire: $(l:tfg_ores/mars_vein_index#mars_almandine)15%$(/l)$()$(li)Scheelite: $(l:tfg_ores/mars_vein_index#mars_tungsten)42%$(/l)$()$(li)Soapstone: $(l:tfg_ores/mars_vein_index#mars_lubricant)21%$(/l)$()$(li)Spessartine: $(l:tfg_ores/mars_vein_index#mars_tantalite)10%$(/l)$()$(li)Sphalerite: $(l:tfg_ores/mars_vein_index#mars_sulfur)23%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_nickel_galena)17%$(/l)$()", + "text": "$(li)Pyrite: $(l:tfg_ores/mars_vein_index#mars_sulfur)42%$(/l), $(l:tfg_ores/mars_vein_index#mars_copper)10%$(/l)$()$(li)Pyrochlore: $(l:tfg_ores/mars_vein_index#mars_apatite)14%$(/l)$()$(li)Pyrolusite: $(l:tfg_ores/mars_vein_index#mars_tantalite)42%$(/l)$()$(li)Pyrope: $(l:tfg_ores/mars_vein_index#mars_almandine)26%$(/l)$()$(li)Quartzite: $(l:tfg_ores/mars_vein_index#mars_quartzite)41%$(/l)$()$(li)Realgar: $(l:tfg_ores/mars_vein_index#mars_beryllium)15%$(/l)$()$(li)Redstone: $(l:tfg_ores/mars_vein_index#deep_mars_chromite)45%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_tetrahedrite)4%$(/l)$()$(li)Rock Salt: $(l:tfg_ores/mars_vein_index#mars_salt)20%$(/l)$()$(li)Ruby: $(l:tfg_ores/mars_vein_index#deep_mars_chromite)35%$(/l)$()$(li)Salt: $(l:tfg_ores/mars_vein_index#mars_salt)30%$(/l)$()$(li)Saltpeter: $(l:tfg_ores/mars_vein_index#mars_surface_cassiterite)10%$(/l)$()$(li)Sapphire: $(l:tfg_ores/mars_vein_index#mars_almandine)15%$(/l)$()$(li)Scheelite: $(l:tfg_ores/mars_vein_index#mars_tungsten)42%$(/l)$()$(li)Soapstone: $(l:tfg_ores/mars_vein_index#mars_lubricant)21%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)Spodumene: $(l:tfg_ores/mars_vein_index#mars_salt)35%$(/l)$()$(li)Stibnite: $(l:tfg_ores/mars_vein_index#mars_stibnite)19%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_tetrahedrite)19%$(/l)$()$(li)Sulfur: $(l:tfg_ores/mars_vein_index#mars_sulfur)14%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_bismuthinite)20%$(/l)$()$(li)Talc: $(l:tfg_ores/mars_vein_index#mars_lubricant)21%$(/l)$()$(li)Tantalite: $(l:tfg_ores/mars_vein_index#mars_tantalite)36%$(/l)$()$(li)Tetrahedrite: $(l:tfg_ores/mars_vein_index#mars_surface_tetrahedrite)57%$(/l), $(l:tfg_ores/mars_vein_index#mars_stibnite)47%$(/l)$()$(li)Thorium: $(l:tfg_ores/mars_vein_index#deep_mars_pitchblende)26%$(/l), $(l:tfg_ores/mars_vein_index#mars_pitchblende)29%$(/l)$()$(li)Tin: $(l:tfg_ores/mars_vein_index#mars_surface_cassiterite)35%$(/l)$()$(li)Tricalcium Phosphate: $(l:tfg_ores/mars_vein_index#mars_apatite)33%$(/l)$()$(li)Trona: $(l:tfg_ores/mars_vein_index#mars_lubricant)35%$(/l)$()$(li)Tungstate: $(l:tfg_ores/mars_vein_index#mars_tungsten)33%$(/l)$()$(li)Uraninite: $(l:tfg_ores/mars_vein_index#deep_mars_pitchblende)21%$(/l)$()$(li)Yellow Limonite: $(l:tfg_ores/mars_vein_index#mars_hematite)30%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_hematite)33%$(/l)$()", + "text": "$(li)Sodalite: $(l:tfg_ores/mars_vein_index#mars_lapis)25%$(/l)$()$(li)Spessartine: $(l:tfg_ores/mars_vein_index#mars_tantalite)10%$(/l)$()$(li)Sphalerite: $(l:tfg_ores/mars_vein_index#mars_sulfur)23%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_nickel_galena)17%$(/l)$()$(li)Spodumene: $(l:tfg_ores/mars_vein_index#mars_salt)35%$(/l)$()$(li)Stibnite: $(l:tfg_ores/mars_vein_index#mars_stibnite)19%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_tetrahedrite)19%$(/l)$()$(li)Sulfur: $(l:tfg_ores/mars_vein_index#mars_sulfur)14%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_bismuthinite)20%$(/l)$()$(li)Talc: $(l:tfg_ores/mars_vein_index#mars_lubricant)21%$(/l)$()$(li)Tantalite: $(l:tfg_ores/mars_vein_index#mars_tantalite)36%$(/l)$()$(li)Tetrahedrite: $(l:tfg_ores/mars_vein_index#mars_surface_tetrahedrite)57%$(/l), $(l:tfg_ores/mars_vein_index#mars_stibnite)47%$(/l)$()$(li)Thorianite: $(l:tfg_ores/mars_vein_index#deep_mars_pitchblende)26%$(/l), $(l:tfg_ores/mars_vein_index#mars_pitchblende)29%$(/l)$()$(li)Tin: $(l:tfg_ores/mars_vein_index#mars_surface_cassiterite)35%$(/l)$()$(li)Tricalcium Phosphate: $(l:tfg_ores/mars_vein_index#mars_apatite)33%$(/l)$()$(li)Trona: $(l:tfg_ores/mars_vein_index#mars_lubricant)35%$(/l)$()$(li)Tungstate: $(l:tfg_ores/mars_vein_index#mars_tungsten)33%$(/l)$()", + "type": "patchouli:text" + }, + { + "Type": "patchouli:text", + "text": "$(li)Uraninite: $(l:tfg_ores/mars_vein_index#deep_mars_pitchblende)21%$(/l)$()$(li)Yellow Limonite: $(l:tfg_ores/mars_vein_index#mars_hematite)30%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_hematite)33%$(/l)$()", "type": "patchouli:text" } ], 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 b7c906bc8..3ad04def8 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 @@ -19,7 +19,7 @@ }, { "Type": "patchouli:text", - "text": "$(li)$(l:tfg_ores/mars_vein_index#mars_tantalite)Manganese & Tantalum$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_pitchblende)Pitchblende, Thorium, & Hematite$()$()$(li)$(l:tfg_ores/mars_vein_index#deep_mars_pitchblende)Pitchblende, Thorium, & Uraninite$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_quartzite)Quartzite, Asbestos, & Barite$()$()$(li)$(l:tfg_ores/mars_vein_index#deep_mars_chromite)Redstone & Chromite$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_salt)Salts & Spodumene$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_tungsten)Scheelite & Tungstate$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_galena)Silver, Galena, & Lead$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_surface_nickel_galena)Sphalerite & Galena$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_sulfur)Sphalerite & Pyrite$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_stibnite)Tetrahedrite (Normal)$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_surface_tetrahedrite)Tetrahedrite (Surface)$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_lubricant)Trona, Talc, & Glauconite$()$()", + "text": "$(li)$(l:tfg_ores/mars_vein_index#mars_lapis)Lapis, Lazurite, & Sodalite$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_tantalite)Manganese & Tantalum$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_pitchblende)Pitchblende & Thorianite, & Hematite$()$()$(li)$(l:tfg_ores/mars_vein_index#deep_mars_pitchblende)Pitchblende, Thorianite, & Uraninite$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_quartzite)Quartzite, Asbestos, & Barite$()$()$(li)$(l:tfg_ores/mars_vein_index#deep_mars_chromite)Redstone & Chromite$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_salt)Salts & Spodumene$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_tungsten)Scheelite & Tungstate$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_galena)Silver, Galena, & Lead$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_surface_nickel_galena)Sphalerite & Galena$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_sulfur)Sphalerite & Pyrite$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_stibnite)Tetrahedrite (Normal)$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_surface_tetrahedrite)Tetrahedrite (Surface)$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_lubricant)Trona, Talc, & Glauconite$()$()", "type": "patchouli:text" }, { @@ -1240,6 +1240,98 @@ "draw_filler": true, "type": "patchouli:empty" }, + { + "Type": "patchouli:text", + "text": "$(thing)Rarity$(): 200$(br)$(thing)Density$(): 0.25$(br)$(thing)Type$(): Cluster Vein$(br)$(thing)Y$(): 0 — 70$(br)$(thing)Size$(): 30$(br)$(thing)Indicator Max Depth$(): 20$(br2)$(thing)Stone Types$(): Argillite, Chalk, Chert, Dolomite, Limestone, Shale", + "title": "Lapis, Lazurite, & Sodalite", + "type": "patchouli:text", + "anchor": "mars_lapis" + }, + { + "Type": "patchouli:multiblock", + "name": "Lazurite", + "multiblock": { + "mapping": { + "0": "#forge:ores/lazurite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Percentage$(): 35%$(br)$(thing)Source of$(): Aluminium, Calcium, Sodium$(br)$(thing)Formula$(): Al₆Si₆Ca₈Na₈", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Sodalite", + "multiblock": { + "mapping": { + "0": "#forge:ores/sodalite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Percentage$(): 25%$(br)$(thing)Source of$(): Aluminium, Sodium$(br)$(thing)Formula$(): Al₃Si₃Na₄Cl", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Lapis", + "multiblock": { + "mapping": { + "0": "#forge:ores/lapis" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Percentage$(): 25%$(br)$(thing)Source of$(): Lazurite, Sodalite, Pyrite, Calcite", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Calcite", + "multiblock": { + "mapping": { + "0": "#forge:ores/calcite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Percentage$(): 15%$(br)$(thing)Source of$(): Calcium$(br)$(thing)Formula$(): CaCO₃", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:empty", + "draw_filler": true, + "type": "patchouli:empty" + }, { "Type": "patchouli:text", "text": "$(thing)Rarity$(): 230$(br)$(thing)Density$(): 0.3$(br)$(thing)Type$(): Cluster Vein$(br)$(thing)Y$(): 0 — 70$(br)$(thing)Size$(): 42$(br)$(thing)Indicator Max Depth$(): 15$(br2)$(thing)Stone Types$(): Argillite, Basalt, Chalk, Chert, Claystone, Gabbro, Limestone, Red Granite, Shale, Trachyte", @@ -1335,7 +1427,7 @@ { "Type": "patchouli:text", "text": "$(thing)Rarity$(): 220$(br)$(thing)Density$(): 0.55$(br)$(thing)Type$(): Cluster Vein$(br)$(thing)Y$(): 0 — 70$(br)$(thing)Size$(): 20$(br)$(thing)Indicator Max Depth$(): 15$(br2)$(thing)Stone Types$(): Argillite, Conglomerate, Dacite, Diorite, Dolomite, Gabbro, Red Granite, Shale, Trachyte", - "title": "Pitchblende, Thorium, & Hematite", + "title": "Pitchblende & Thorianite, & Hematite", "type": "patchouli:text", "anchor": "mars_pitchblende" }, @@ -1356,12 +1448,12 @@ ] }, "enable_visualize": false, - "text": "$(thing)Percentage$(): 41%$(br)$(thing)Source of$(): Uranium, Thorium, Lead$(br)$(thing)Formula$(): (UO₂)₃ThPb$(br)$(thing)Hazard$(): $(c)$(t:Requires Full Protection)Carcinogenic (Any Contact)$(/t)$()", + "text": "$(thing)Percentage$(): 41%$(br)$(thing)Source of$(): Uranium, Thorium, Lead$(br)$(thing)Formula$(): (UO₂)₃ThPb$(br)$(thing)Hazard$(): $(c)$(t:Requires Full Protection)Radioactive (Any Contact)$(/t)$()", "type": "patchouli:multiblock" }, { "Type": "patchouli:multiblock", - "name": "Thorium", + "name": "Thorianite", "multiblock": { "mapping": { "0": "#forge:ores/thorium" @@ -1376,7 +1468,7 @@ ] }, "enable_visualize": false, - "text": "$(thing)Percentage$(): 29%$(br)$(thing)Source of$(): Thorium$(br)$(thing)Formula$(): Th", + "text": "$(thing)Percentage$(): 29%$(br)$(thing)Source of$(): Thorium$(br)$(thing)Formula$(): ThO₂", "type": "patchouli:multiblock" }, { @@ -1402,7 +1494,7 @@ { "Type": "patchouli:text", "text": "$(thing)Rarity$(): 370$(br)$(thing)Density$(): 0.3$(br)$(thing)Type$(): Cluster Vein$(br)$(thing)Y$(): -20 — 0$(br)$(thing)Size$(): 60$(br)$(thing)Indicator Max Depth$(): 20$(br2)$(thing)Stone Types$(): Argillite, Claystone, Dacite, Diorite, Gabbro, Shale, Trachyte", - "title": "Pitchblende, Thorium, & Uraninite", + "title": "Pitchblende, Thorianite, & Uraninite", "type": "patchouli:text", "anchor": "deep_mars_pitchblende" }, @@ -1423,12 +1515,12 @@ ] }, "enable_visualize": false, - "text": "$(thing)Percentage$(): 52%$(br)$(thing)Source of$(): Uranium, Thorium, Lead$(br)$(thing)Formula$(): (UO₂)₃ThPb$(br)$(thing)Hazard$(): $(c)$(t:Requires Full Protection)Carcinogenic (Any Contact)$(/t)$()", + "text": "$(thing)Percentage$(): 52%$(br)$(thing)Source of$(): Uranium, Thorium, Lead$(br)$(thing)Formula$(): (UO₂)₃ThPb$(br)$(thing)Hazard$(): $(c)$(t:Requires Full Protection)Radioactive (Any Contact)$(/t)$()", "type": "patchouli:multiblock" }, { "Type": "patchouli:multiblock", - "name": "Thorium", + "name": "Thorianite", "multiblock": { "mapping": { "0": "#forge:ores/thorium" @@ -1443,7 +1535,7 @@ ] }, "enable_visualize": false, - "text": "$(thing)Percentage$(): 26%$(br)$(thing)Source of$(): Thorium$(br)$(thing)Formula$(): Th", + "text": "$(thing)Percentage$(): 26%$(br)$(thing)Source of$(): Thorium$(br)$(thing)Formula$(): ThO₂", "type": "patchouli:multiblock" }, { @@ -1463,7 +1555,7 @@ ] }, "enable_visualize": false, - "text": "$(thing)Percentage$(): 21%$(br)$(thing)Source of$(): Uranium$(br)$(thing)Formula$(): UO₂$(br)$(thing)Hazard$(): $(c)$(t:Requires Full Protection)Carcinogenic (Any Contact)$(/t)$()", + "text": "$(thing)Percentage$(): 21%$(br)$(thing)Source of$(): Uranium$(br)$(thing)Formula$(): UO₂$(br)$(thing)Hazard$(): $(c)$(t:Requires Full Protection)Radioactive (Any Contact)$(/t)$()", "type": "patchouli:multiblock" }, { diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/fr_fr/entries/tfg_ores/moon_ore_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/fr_fr/entries/tfg_ores/moon_ore_index.json index c2fc92e90..4001c0bec 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/fr_fr/entries/tfg_ores/moon_ore_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/fr_fr/entries/tfg_ores/moon_ore_index.json @@ -39,7 +39,7 @@ }, { "Type": "patchouli:text", - "text": "$(li)Tantalite: $(l:tfg_ores/moon_vein_index#moon_pyrolusite)14%$(/l), $(l:tfg_ores/moon_vein_index#moon_manganese)12%$(/l)$()$(li)Tetrahedrite: $(l:tfg_ores/moon_vein_index#moon_tetrahedrite)40%$(/l)$()$(li)Thorium: $(l:tfg_ores/moon_vein_index#moon_beryllium)0%$(/l)$()$(li)Tin: $(l:tfg_ores/moon_vein_index#moon_cassiterite)17%$(/l)$()$(li)Topaz: $(l:tfg_ores/moon_vein_index#moon_topaz)25%$(/l)$()$(li)Tricalcium Phosphate: $(l:tfg_ores/moon_vein_index#moon_apatite)33%$(/l)$()$(li)Trona: $(l:tfg_ores/moon_vein_index#moon_lubricant)10%$(/l)$()$(li)Tungstate: $(l:tfg_ores/moon_vein_index#moon_scheelite)50%$(/l)$()$(li)Vanadium Magnetite: $(l:tfg_ores/moon_vein_index#moon_magnetite)15%$(/l)$()$(li)Wulfenite: $(l:tfg_ores/moon_vein_index#moon_molybdenum)44%$(/l)$()$(li)Yellow Garnet: $(l:tfg_ores/moon_vein_index#moon_garnet)14%$(/l)$()$(li)Zeolite: $(l:tfg_ores/moon_vein_index#moon_cassiterite)5%$(/l)$()", + "text": "$(li)Tantalite: $(l:tfg_ores/moon_vein_index#moon_pyrolusite)14%$(/l), $(l:tfg_ores/moon_vein_index#moon_manganese)12%$(/l)$()$(li)Tetrahedrite: $(l:tfg_ores/moon_vein_index#moon_tetrahedrite)40%$(/l)$()$(li)Thorianite: $(l:tfg_ores/moon_vein_index#moon_beryllium)0%$(/l)$()$(li)Tin: $(l:tfg_ores/moon_vein_index#moon_cassiterite)17%$(/l)$()$(li)Topaz: $(l:tfg_ores/moon_vein_index#moon_topaz)25%$(/l)$()$(li)Tricalcium Phosphate: $(l:tfg_ores/moon_vein_index#moon_apatite)33%$(/l)$()$(li)Trona: $(l:tfg_ores/moon_vein_index#moon_lubricant)10%$(/l)$()$(li)Tungstate: $(l:tfg_ores/moon_vein_index#moon_scheelite)50%$(/l)$()$(li)Vanadium Magnetite: $(l:tfg_ores/moon_vein_index#moon_magnetite)15%$(/l)$()$(li)Wulfenite: $(l:tfg_ores/moon_vein_index#moon_molybdenum)44%$(/l)$()$(li)Yellow Garnet: $(l:tfg_ores/moon_vein_index#moon_garnet)14%$(/l)$()$(li)Zeolite: $(l:tfg_ores/moon_vein_index#moon_cassiterite)5%$(/l)$()", "type": "patchouli:text" } ], diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/fr_fr/entries/tfg_ores/moon_vein_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/fr_fr/entries/tfg_ores/moon_vein_index.json index 16d9728e8..a61f9b89a 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/fr_fr/entries/tfg_ores/moon_vein_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/fr_fr/entries/tfg_ores/moon_vein_index.json @@ -934,7 +934,7 @@ }, { "Type": "patchouli:multiblock", - "name": "Thorium", + "name": "Thorianite", "multiblock": { "mapping": { "0": "#forge:ores/thorium" @@ -949,7 +949,7 @@ ] }, "enable_visualize": false, - "text": "$(thing)Percentage$(): 0%$(br)$(thing)Source of$(): Thorium$(br)$(thing)Formula$(): Th", + "text": "$(thing)Percentage$(): 0%$(br)$(thing)Source of$(): Thorium$(br)$(thing)Formula$(): ThO₂", "type": "patchouli:multiblock" }, { diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/fr_fr/entries/tfg_ores/nether_ore_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/fr_fr/entries/tfg_ores/nether_ore_index.json index 643d1ab05..d7124bacc 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/fr_fr/entries/tfg_ores/nether_ore_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/fr_fr/entries/tfg_ores/nether_ore_index.json @@ -44,7 +44,7 @@ }, { "Type": "patchouli:text", - "text": "$(li)Sylvite: $(l:tfg_ores/nether_vein_index#nether_sylvite)100%$(/l)$()$(li)Talc: $(l:tfg_ores/nether_vein_index#nether_lubricant)20%$(/l)$()$(li)Tantalite: $(l:tfg_ores/nether_vein_index#nether_manganese)12%$(/l)$()$(li)Tetrahedrite: $(l:tfg_ores/nether_vein_index#nether_tetrahedrite)50%$(/l)$()$(li)Thorium: $(l:tfg_ores/nether_vein_index#nether_beryllium)0%$(/l)$()$(li)Tin: $(l:tfg_ores/nether_vein_index#nether_cassiterite)54%$(/l)$()$(li)Topaz: $(l:tfg_ores/nether_vein_index#nether_topaz)25%$(/l)$()$(li)Tricalcium Phosphate: $(l:tfg_ores/nether_vein_index#nether_apatite)35%$(/l)$()$(li)Trona: $(l:tfg_ores/nether_vein_index#nether_lubricant)10%$(/l)$()$(li)Tungstate: $(l:tfg_ores/nether_vein_index#nether_scheelite)35%$(/l)$()$(li)Uraninite: $(l:tfg_ores/nether_vein_index#nether_pitchblende)25%$(/l)$()$(li)Vanadium Magnetite: $(l:tfg_ores/nether_vein_index#nether_magnetite)30%$(/l)$()$(li)Wulfenite: $(l:tfg_ores/nether_vein_index#nether_molybdenum)42%$(/l), $(l:tfg_ores/nether_vein_index#nether_pitchblende)12%$(/l)$()$(li)Yellow Garnet: $(l:tfg_ores/nether_vein_index#nether_garnet)14%$(/l)$()", + "text": "$(li)Sylvite: $(l:tfg_ores/nether_vein_index#nether_sylvite)100%$(/l)$()$(li)Talc: $(l:tfg_ores/nether_vein_index#nether_lubricant)20%$(/l)$()$(li)Tantalite: $(l:tfg_ores/nether_vein_index#nether_manganese)12%$(/l)$()$(li)Tetrahedrite: $(l:tfg_ores/nether_vein_index#nether_tetrahedrite)50%$(/l)$()$(li)Thorianite: $(l:tfg_ores/nether_vein_index#nether_beryllium)0%$(/l)$()$(li)Tin: $(l:tfg_ores/nether_vein_index#nether_cassiterite)54%$(/l)$()$(li)Topaz: $(l:tfg_ores/nether_vein_index#nether_topaz)25%$(/l)$()$(li)Tricalcium Phosphate: $(l:tfg_ores/nether_vein_index#nether_apatite)35%$(/l)$()$(li)Trona: $(l:tfg_ores/nether_vein_index#nether_lubricant)10%$(/l)$()$(li)Tungstate: $(l:tfg_ores/nether_vein_index#nether_scheelite)35%$(/l)$()$(li)Uraninite: $(l:tfg_ores/nether_vein_index#nether_pitchblende)25%$(/l)$()$(li)Vanadium Magnetite: $(l:tfg_ores/nether_vein_index#nether_magnetite)30%$(/l)$()$(li)Wulfenite: $(l:tfg_ores/nether_vein_index#nether_molybdenum)42%$(/l), $(l:tfg_ores/nether_vein_index#nether_pitchblende)12%$(/l)$()$(li)Yellow Garnet: $(l:tfg_ores/nether_vein_index#nether_garnet)14%$(/l)$()", "type": "patchouli:text" }, { 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 90920c3bc..722cc922e 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 @@ -799,7 +799,7 @@ }, { "Type": "patchouli:multiblock", - "name": "Thorium", + "name": "Thorianite", "multiblock": { "mapping": { "0": "#forge:ores/thorium" @@ -814,7 +814,7 @@ ] }, "enable_visualize": false, - "text": "$(thing)Percentage$(): 0%$(br)$(thing)Source of$(): Thorium$(br)$(thing)Formula$(): Th", + "text": "$(thing)Percentage$(): 0%$(br)$(thing)Source of$(): Thorium$(br)$(thing)Formula$(): ThO₂", "type": "patchouli:multiblock" }, { @@ -2744,7 +2744,7 @@ ] }, "enable_visualize": false, - "text": "$(thing)Percentage$(): 62%$(br)$(thing)Source of$(): Uranium, Thorium, Lead$(br)$(thing)Formula$(): (UO₂)₃ThPb$(br)$(thing)Hazard$(): $(c)$(t:Requires Full Protection)Carcinogenic (Any Contact)$(/t)$()", + "text": "$(thing)Percentage$(): 62%$(br)$(thing)Source of$(): Uranium, Thorium, Lead$(br)$(thing)Formula$(): (UO₂)₃ThPb$(br)$(thing)Hazard$(): $(c)$(t:Requires Full Protection)Radioactive (Any Contact)$(/t)$()", "type": "patchouli:multiblock" }, { @@ -2764,7 +2764,7 @@ ] }, "enable_visualize": false, - "text": "$(thing)Percentage$(): 25%$(br)$(thing)Source of$(): Uranium$(br)$(thing)Formula$(): UO₂$(br)$(thing)Hazard$(): $(c)$(t:Requires Full Protection)Carcinogenic (Any Contact)$(/t)$()", + "text": "$(thing)Percentage$(): 25%$(br)$(thing)Source of$(): Uranium$(br)$(thing)Formula$(): UO₂$(br)$(thing)Hazard$(): $(c)$(t:Requires Full Protection)Radioactive (Any Contact)$(/t)$()", "type": "patchouli:multiblock" }, { diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/fr_fr/entries/tfg_ores/venus_ore_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/fr_fr/entries/tfg_ores/venus_ore_index.json index 94dc40ab4..c5ed949ce 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/fr_fr/entries/tfg_ores/venus_ore_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/fr_fr/entries/tfg_ores/venus_ore_index.json @@ -1,7 +1,7 @@ { "__credits__": "This page was automatically generated by OresToFieldGuide.", "name": "Venus Ore Index", - "icon": "gtceu:sulfur_dust", + "icon": "vintageimprovements:sulfur", "category": "tfc:tfg_ores", "read_by_default": true, "secret": false, @@ -14,7 +14,7 @@ }, { "Type": "patchouli:text", - "text": "$(li)Lepidolite: $(l:tfg_ores/venus_vein_index#venus_manual_salt)15%$(/l)$()$(li)Pyrite: $(l:tfg_ores/venus_vein_index#venus_manual_sulfur)35%$(/l)$()$(li)Rock Salt: $(l:tfg_ores/venus_vein_index#venus_manual_salt)20%$(/l)$()$(li)Salt: $(l:tfg_ores/venus_vein_index#venus_manual_salt)50%$(/l)$()$(li)Sphalerite: $(l:tfg_ores/venus_vein_index#venus_manual_sulfur)15%$(/l)$()$(li)Spodumene: $(l:tfg_ores/venus_vein_index#venus_manual_salt)15%$(/l)$()$(li)Sulfur: $(l:tfg_ores/venus_vein_index#venus_manual_sulfur)50%$(/l)$()", + "text": "$(li)Lepidolite: $(l:tfg_ores/venus_vein_index#venus_manual_salt)5%$(/l)$()$(li)Pyrite: $(l:tfg_ores/venus_vein_index#venus_manual_sulfur)15%$(/l)$()$(li)Rock Salt: $(l:tfg_ores/venus_vein_index#venus_manual_salt)10%$(/l)$()$(li)Salt: $(l:tfg_ores/venus_vein_index#venus_manual_salt)80%$(/l)$()$(li)Sphalerite: $(l:tfg_ores/venus_vein_index#venus_manual_sulfur)5%$(/l)$()$(li)Spodumene: $(l:tfg_ores/venus_vein_index#venus_manual_salt)5%$(/l)$()$(li)Sulfur: $(l:tfg_ores/venus_vein_index#venus_manual_sulfur)80%$(/l)$()", "type": "patchouli:text" } ], 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 99745b157..9585d526b 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)Rarity$(): 100$(br)$(thing)Density$(): 0.2$(br)$(thing)Type$(): Disc Vein$(br)$(thing)Y$(): 40 — 65$(br)$(thing)Size$(): 20$(br)$(thing)Height$(): 6$(br)$(thing)Indicator Max Depth$(): 30$(br2)$(thing)Stone Types$(): Andesite, Basalt, Dacite, Rhyolite, Trachyte, Travertine$(br2)Only appears in the $(thing)Salt Flats$() biome.", + "text": "$(thing)Rarity$(): 30$(br)$(thing)Density$(): 0.2$(br)$(thing)Type$(): Disc Vein$(br)$(thing)Y$(): 40 — 65$(br)$(thing)Size$(): 20$(br)$(thing)Height$(): 6$(br)$(thing)Indicator Max Depth$(): 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" @@ -41,7 +41,7 @@ ] }, "enable_visualize": false, - "text": "$(thing)Percentage$(): 50%$(br)$(thing)Source of$(): Sodium, Chlorine$(br)$(thing)Formula$(): NaCl", + "text": "$(thing)Percentage$(): 80%$(br)$(thing)Source of$(): Sodium, Chlorine$(br)$(thing)Formula$(): NaCl", "type": "patchouli:multiblock" }, { @@ -61,7 +61,7 @@ ] }, "enable_visualize": false, - "text": "$(thing)Percentage$(): 20%$(br)$(thing)Source of$(): Potassium, Chlorine$(br)$(thing)Formula$(): KCl", + "text": "$(thing)Percentage$(): 10%$(br)$(thing)Source of$(): Potassium, Chlorine$(br)$(thing)Formula$(): KCl", "type": "patchouli:multiblock" }, { @@ -81,7 +81,7 @@ ] }, "enable_visualize": false, - "text": "$(thing)Percentage$(): 15%$(br)$(thing)Source of$(): Potassium, Lithium, Aluminium, Fluorine$(br)$(thing)Formula$(): KLi₃Al₄F₂O₁₀", + "text": "$(thing)Percentage$(): 5%$(br)$(thing)Source of$(): Potassium, Lithium, Aluminium, Fluorine$(br)$(thing)Formula$(): KLi₃Al₄F₂O₁₀", "type": "patchouli:multiblock" }, { @@ -101,7 +101,7 @@ ] }, "enable_visualize": false, - "text": "$(thing)Percentage$(): 15%$(br)$(thing)Source of$(): Lithium, Aluminium$(br)$(thing)Formula$(): LiAlSi₂O₆", + "text": "$(thing)Percentage$(): 5%$(br)$(thing)Source of$(): Lithium, Aluminium$(br)$(thing)Formula$(): LiAlSi₂O₆", "type": "patchouli:multiblock" }, { @@ -111,7 +111,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)Rarity$(): 100$(br)$(thing)Density$(): 0.2$(br)$(thing)Type$(): Cluster Vein$(br)$(thing)Y$(): 40 — 65$(br)$(thing)Size$(): 15$(br)$(thing)Indicator Max Depth$(): 30$(br2)$(thing)Stone Types$(): Andesite, Basalt, Dacite, Rhyolite, Trachyte, Travertine$(br2)Only appears in the $(thing)Sulfuric Ravines$() biome.", + "text": "$(thing)Rarity$(): 30$(br)$(thing)Density$(): 0.2$(br)$(thing)Type$(): Cluster Vein$(br)$(thing)Y$(): 40 — 65$(br)$(thing)Size$(): 20$(br)$(thing)Indicator Max Depth$(): 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" @@ -133,7 +133,7 @@ ] }, "enable_visualize": false, - "text": "$(thing)Percentage$(): 50%$(br)$(thing)Source of$(): Sulfur$(br)$(thing)Formula$(): S", + "text": "$(thing)Percentage$(): 80%$(br)$(thing)Source of$(): Sulfur$(br)$(thing)Formula$(): S", "type": "patchouli:multiblock" }, { @@ -153,7 +153,7 @@ ] }, "enable_visualize": false, - "text": "$(thing)Percentage$(): 35%$(br)$(thing)Melts into$(): Cast Iron$(br)$(thing)Formula$(): FeS₂", + "text": "$(thing)Percentage$(): 15%$(br)$(thing)Melts into$(): Cast Iron$(br)$(thing)Formula$(): FeS₂", "type": "patchouli:multiblock" }, { @@ -173,7 +173,7 @@ ] }, "enable_visualize": false, - "text": "$(thing)Percentage$(): 15%$(br)$(thing)Melts into$(): Zinc$(br)$(thing)Formula$(): ZnS", + "text": "$(thing)Percentage$(): 5%$(br)$(thing)Melts into$(): Zinc$(br)$(thing)Formula$(): ZnS", "type": "patchouli:multiblock" } ], 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 62f893369..ce258f730 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 @@ -49,7 +49,7 @@ }, { "Type": "patchouli:text", - "text": "$(li)Tório: $(l:tfg_ores/earth_vein_index#normal_beryllium)15%$(/l)$()$(li)Trona: $(l:tfg_ores/earth_vein_index#normal_lubricant)10%$(/l), $(l:tfg_ores/earth_vein_index#normal_tarkianite)10%$(/l)$()$(li)Tungstato: $(l:tfg_ores/earth_vein_index#deep_scheelite)35%$(/l)$()$(li)Uraninita: $(l:tfg_ores/earth_vein_index#deep_pitchblende)25%$(/l)$()$(li)Wulfenita: $(l:tfg_ores/earth_vein_index#deep_molybdenum)47%$(/l), $(l:tfg_ores/earth_vein_index#deep_pitchblende)12%$(/l)$()$(li)Zeólita: $(l:tfg_ores/earth_vein_index#surface_copper)16%$(/l)$()", + "text": "$(li)Torianita: $(l:tfg_ores/earth_vein_index#normal_beryllium)15%$(/l)$()$(li)Trona: $(l:tfg_ores/earth_vein_index#normal_lubricant)10%$(/l), $(l:tfg_ores/earth_vein_index#normal_tarkianite)10%$(/l)$()$(li)Tungstato: $(l:tfg_ores/earth_vein_index#deep_scheelite)35%$(/l)$()$(li)Uraninita: $(l:tfg_ores/earth_vein_index#deep_pitchblende)25%$(/l)$()$(li)Wulfenita: $(l:tfg_ores/earth_vein_index#deep_molybdenum)47%$(/l), $(l:tfg_ores/earth_vein_index#deep_pitchblende)12%$(/l)$()$(li)Zeólita: $(l:tfg_ores/earth_vein_index#surface_copper)16%$(/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 0411088c3..7c9b24ace 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 @@ -1519,7 +1519,7 @@ }, { "Type": "patchouli:multiblock", - "name": "Tório", + "name": "Torianita", "multiblock": { "mapping": { "0": "#forge:ores/thorium" @@ -1534,7 +1534,7 @@ ] }, "enable_visualize": false, - "text": "$(thing)Porcentagem$(): 15%$(br)$(thing)Fonte de$(): Tório$(br)$(thing)Fórmula$(): Th", + "text": "$(thing)Porcentagem$(): 15%$(br)$(thing)Fonte de$(): Tório$(br)$(thing)Fórmula$(): ThO₂", "type": "patchouli:multiblock" }, { diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/pt_br/entries/tfg_ores/mars_ore_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/pt_br/entries/tfg_ores/mars_ore_index.json index b21b41ef8..8f5701118 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/pt_br/entries/tfg_ores/mars_ore_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/pt_br/entries/tfg_ores/mars_ore_index.json @@ -14,7 +14,7 @@ }, { "Type": "patchouli:text", - "text": "$(li)Almandina: $(l:tfg_ores/mars_vein_index#mars_almandine)36%$(/l)$()$(li)Amianto: $(l:tfg_ores/mars_vein_index#mars_quartzite)17%$(/l)$()$(li)Apatita: $(l:tfg_ores/mars_vein_index#mars_apatite)47%$(/l)$()$(li)Areia Glauconita: $(l:tfg_ores/mars_vein_index#mars_lubricant)7%$(/l)$()$(li)Barita: $(l:tfg_ores/mars_vein_index#mars_quartzite)35%$(/l)$()$(li)Bastnasita: $(l:tfg_ores/mars_vein_index#mars_neodynium)58%$(/l)$()$(li)Bauxita: $(l:tfg_ores/mars_vein_index#mars_sapphire)20%$(/l)$()$(li)Berílio: $(l:tfg_ores/mars_vein_index#mars_beryllium)35%$(/l)$()$(li)Bismuto: $(l:tfg_ores/mars_vein_index#mars_surface_bismuthinite)40%$(/l)$()$(li)Bornita: $(l:tfg_ores/mars_vein_index#deep_mars_sheldonite)35%$(/l)$()$(li)Calcita: $(l:tfg_ores/mars_vein_index#mars_surface_hematite)5%$(/l)$()$(li)Calcopirita: $(l:tfg_ores/mars_vein_index#mars_copper)65%$(/l)$()$(li)Carvão: $(l:tfg_ores/mars_vein_index#mars_coal)70%$(/l), $(l:tfg_ores/mars_vein_index#mars_graphite)25%$(/l)$()$(li)Cassiterita: $(l:tfg_ores/mars_vein_index#mars_surface_cassiterite)55%$(/l)$()", + "text": "$(li)Almandina: $(l:tfg_ores/mars_vein_index#mars_almandine)36%$(/l)$()$(li)Amianto: $(l:tfg_ores/mars_vein_index#mars_quartzite)17%$(/l)$()$(li)Apatita: $(l:tfg_ores/mars_vein_index#mars_apatite)47%$(/l)$()$(li)Areia Glauconita: $(l:tfg_ores/mars_vein_index#mars_lubricant)7%$(/l)$()$(li)Barita: $(l:tfg_ores/mars_vein_index#mars_quartzite)35%$(/l)$()$(li)Bastnasita: $(l:tfg_ores/mars_vein_index#mars_neodynium)58%$(/l)$()$(li)Bauxita: $(l:tfg_ores/mars_vein_index#mars_sapphire)20%$(/l)$()$(li)Berílio: $(l:tfg_ores/mars_vein_index#mars_beryllium)35%$(/l)$()$(li)Bismuto: $(l:tfg_ores/mars_vein_index#mars_surface_bismuthinite)40%$(/l)$()$(li)Bornita: $(l:tfg_ores/mars_vein_index#deep_mars_sheldonite)35%$(/l)$()$(li)Calcita: $(l:tfg_ores/mars_vein_index#mars_lapis)15%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_hematite)5%$(/l)$()$(li)Calcopirita: $(l:tfg_ores/mars_vein_index#mars_copper)65%$(/l)$()$(li)Carvão: $(l:tfg_ores/mars_vein_index#mars_coal)70%$(/l), $(l:tfg_ores/mars_vein_index#mars_graphite)25%$(/l)$()$(li)Cassiterita: $(l:tfg_ores/mars_vein_index#mars_surface_cassiterite)55%$(/l)$()", "type": "patchouli:text" }, { @@ -24,17 +24,22 @@ }, { "Type": "patchouli:text", - "text": "$(li)Fosfato Tricálcico: $(l:tfg_ores/mars_vein_index#mars_apatite)33%$(/l)$()$(li)Galena: $(l:tfg_ores/mars_vein_index#mars_galena)40%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_nickel_galena)35%$(/l)$()$(li)Garnierita: $(l:tfg_ores/mars_vein_index#mars_nickel)35%$(/l)$()$(li)Gipsita: $(l:tfg_ores/mars_vein_index#mars_surface_bismuthinite)20%$(/l)$()$(li)Glossulária: $(l:tfg_ores/mars_vein_index#mars_tantalite)10%$(/l)$()$(li)Goethita: $(l:tfg_ores/mars_vein_index#mars_hematite)15%$(/l)$()$(li)Grafite: $(l:tfg_ores/mars_vein_index#mars_graphite)45%$(/l)$()$(li)Hematita: $(l:tfg_ores/mars_vein_index#mars_hematite)50%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_hematite)55%$(/l), $(l:tfg_ores/mars_vein_index#mars_coal)30%$(/l), $(l:tfg_ores/mars_vein_index#mars_pitchblende)29%$(/l), $(l:tfg_ores/mars_vein_index#mars_sulfur)19%$(/l), $(l:tfg_ores/mars_vein_index#mars_graphite)10%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_bismuthinite)20%$(/l), $(l:tfg_ores/mars_vein_index#mars_almandine)5%$(/l), $(l:tfg_ores/mars_vein_index#mars_apatite)4%$(/l), $(l:tfg_ores/mars_vein_index#mars_copper)5%$(/l), $(l:tfg_ores/mars_vein_index#mars_galena)6%$(/l), $(l:tfg_ores/mars_vein_index#mars_lubricant)7%$(/l), $(l:tfg_ores/mars_vein_index#mars_neodynium)5%$(/l), $(l:tfg_ores/mars_vein_index#mars_nickel)7%$(/l), $(l:tfg_ores/mars_vein_index#mars_quartzite)5%$(/l), $(l:tfg_ores/mars_vein_index#mars_stibnite)4%$(/l), $(l:tfg_ores/mars_vein_index#mars_tungsten)4%$(/l)$()$(li)Lepidorita: $(l:tfg_ores/mars_vein_index#mars_salt)15%$(/l)$()$(li)Limonita Amarela: $(l:tfg_ores/mars_vein_index#mars_hematite)30%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_hematite)33%$(/l)$()$(li)Lítio: $(l:tfg_ores/mars_vein_index#mars_tungsten)19%$(/l)$()$(li)Monazita: $(l:tfg_ores/mars_vein_index#mars_neodynium)29%$(/l)$()$(li)Neodímio: $(l:tfg_ores/mars_vein_index#mars_neodynium)5%$(/l)$()$(li)Níquel: $(l:tfg_ores/mars_vein_index#deep_mars_sheldonite)25%$(/l), $(l:tfg_ores/mars_vein_index#mars_nickel)28%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_nickel_galena)23%$(/l)$()", + "text": "$(li)Fosfato Tricálcico: $(l:tfg_ores/mars_vein_index#mars_apatite)33%$(/l)$()$(li)Galena: $(l:tfg_ores/mars_vein_index#mars_galena)40%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_nickel_galena)35%$(/l)$()$(li)Garnierita: $(l:tfg_ores/mars_vein_index#mars_nickel)35%$(/l)$()$(li)Gipsita: $(l:tfg_ores/mars_vein_index#mars_surface_bismuthinite)20%$(/l)$()$(li)Glossulária: $(l:tfg_ores/mars_vein_index#mars_tantalite)10%$(/l)$()$(li)Goethita: $(l:tfg_ores/mars_vein_index#mars_hematite)15%$(/l)$()$(li)Grafite: $(l:tfg_ores/mars_vein_index#mars_graphite)45%$(/l)$()$(li)Hematita: $(l:tfg_ores/mars_vein_index#mars_hematite)50%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_hematite)55%$(/l), $(l:tfg_ores/mars_vein_index#mars_coal)30%$(/l), $(l:tfg_ores/mars_vein_index#mars_pitchblende)29%$(/l), $(l:tfg_ores/mars_vein_index#mars_sulfur)19%$(/l), $(l:tfg_ores/mars_vein_index#mars_graphite)10%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_bismuthinite)20%$(/l), $(l:tfg_ores/mars_vein_index#mars_almandine)5%$(/l), $(l:tfg_ores/mars_vein_index#mars_apatite)4%$(/l), $(l:tfg_ores/mars_vein_index#mars_copper)5%$(/l), $(l:tfg_ores/mars_vein_index#mars_galena)6%$(/l), $(l:tfg_ores/mars_vein_index#mars_lubricant)7%$(/l), $(l:tfg_ores/mars_vein_index#mars_neodynium)5%$(/l), $(l:tfg_ores/mars_vein_index#mars_nickel)7%$(/l), $(l:tfg_ores/mars_vein_index#mars_quartzite)5%$(/l), $(l:tfg_ores/mars_vein_index#mars_stibnite)4%$(/l), $(l:tfg_ores/mars_vein_index#mars_tungsten)4%$(/l)$()$(li)Lápis-lazúri: $(l:tfg_ores/mars_vein_index#mars_lapis)25%$(/l)$()$(li)Lazurita: $(l:tfg_ores/mars_vein_index#mars_lapis)35%$(/l)$()$(li)Lepidorita: $(l:tfg_ores/mars_vein_index#mars_salt)15%$(/l)$()$(li)Limonita Amarela: $(l:tfg_ores/mars_vein_index#mars_hematite)30%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_hematite)33%$(/l)$()$(li)Lítio: $(l:tfg_ores/mars_vein_index#mars_tungsten)19%$(/l)$()$(li)Monazita: $(l:tfg_ores/mars_vein_index#mars_neodynium)29%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)Ouro Nativo: $(l:tfg_ores/mars_vein_index#mars_sapphire)55%$(/l), $(l:tfg_ores/mars_vein_index#mars_hematite)5%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_hematite)5%$(/l)$()$(li)Pechblenda: $(l:tfg_ores/mars_vein_index#deep_mars_pitchblende)52%$(/l), $(l:tfg_ores/mars_vein_index#mars_pitchblende)41%$(/l)$()$(li)Pedra-sabão: $(l:tfg_ores/mars_vein_index#mars_lubricant)21%$(/l)$()$(li)Pentlandita: $(l:tfg_ores/mars_vein_index#mars_lubricant)7%$(/l)$()$(li)Pirita: $(l:tfg_ores/mars_vein_index#mars_sulfur)42%$(/l), $(l:tfg_ores/mars_vein_index#mars_copper)10%$(/l)$()$(li)Pirocloro: $(l:tfg_ores/mars_vein_index#mars_apatite)14%$(/l)$()$(li)Pirolusita: $(l:tfg_ores/mars_vein_index#mars_tantalite)42%$(/l)$()$(li)Piropo: $(l:tfg_ores/mars_vein_index#mars_almandine)26%$(/l)$()$(li)Platina: $(l:tfg_ores/mars_vein_index#deep_mars_sheldonite)15%$(/l)$()$(li)Prata Nativa: $(l:tfg_ores/mars_vein_index#mars_galena)20%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_nickel_galena)11%$(/l)$()$(li)Quartzito: $(l:tfg_ores/mars_vein_index#mars_quartzite)41%$(/l)$()$(li)Realgar: $(l:tfg_ores/mars_vein_index#mars_beryllium)15%$(/l)$()$(li)Redstone: $(l:tfg_ores/mars_vein_index#deep_mars_chromite)45%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_tetrahedrite)4%$(/l)$()$(li)Rubi: $(l:tfg_ores/mars_vein_index#deep_mars_chromite)35%$(/l)$()", + "text": "$(li)Neodímio: $(l:tfg_ores/mars_vein_index#mars_neodynium)5%$(/l)$()$(li)Níquel: $(l:tfg_ores/mars_vein_index#deep_mars_sheldonite)25%$(/l), $(l:tfg_ores/mars_vein_index#mars_nickel)28%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_nickel_galena)23%$(/l)$()$(li)Ouro Nativo: $(l:tfg_ores/mars_vein_index#mars_sapphire)55%$(/l), $(l:tfg_ores/mars_vein_index#mars_hematite)5%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_hematite)5%$(/l)$()$(li)Pechblenda: $(l:tfg_ores/mars_vein_index#deep_mars_pitchblende)52%$(/l), $(l:tfg_ores/mars_vein_index#mars_pitchblende)41%$(/l)$()$(li)Pedra-sabão: $(l:tfg_ores/mars_vein_index#mars_lubricant)21%$(/l)$()$(li)Pentlandita: $(l:tfg_ores/mars_vein_index#mars_lubricant)7%$(/l)$()$(li)Pirita: $(l:tfg_ores/mars_vein_index#mars_sulfur)42%$(/l), $(l:tfg_ores/mars_vein_index#mars_copper)10%$(/l)$()$(li)Pirocloro: $(l:tfg_ores/mars_vein_index#mars_apatite)14%$(/l)$()$(li)Pirolusita: $(l:tfg_ores/mars_vein_index#mars_tantalite)42%$(/l)$()$(li)Piropo: $(l:tfg_ores/mars_vein_index#mars_almandine)26%$(/l)$()$(li)Platina: $(l:tfg_ores/mars_vein_index#deep_mars_sheldonite)15%$(/l)$()$(li)Prata Nativa: $(l:tfg_ores/mars_vein_index#mars_galena)20%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_nickel_galena)11%$(/l)$()$(li)Quartzito: $(l:tfg_ores/mars_vein_index#mars_quartzite)41%$(/l)$()$(li)Realgar: $(l:tfg_ores/mars_vein_index#mars_beryllium)15%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)Safira: $(l:tfg_ores/mars_vein_index#mars_almandine)15%$(/l)$()$(li)Safira Verde: $(l:tfg_ores/mars_vein_index#mars_almandine)15%$(/l), $(l:tfg_ores/mars_vein_index#mars_sapphire)5%$(/l)$()$(li)Sal: $(l:tfg_ores/mars_vein_index#mars_salt)30%$(/l)$()$(li)Sal-gema: $(l:tfg_ores/mars_vein_index#mars_salt)20%$(/l)$()$(li)Salitre: $(l:tfg_ores/mars_vein_index#mars_surface_cassiterite)10%$(/l)$()$(li)Sheelita: $(l:tfg_ores/mars_vein_index#mars_tungsten)42%$(/l)$()$(li)Talco: $(l:tfg_ores/mars_vein_index#mars_lubricant)21%$(/l)$()$(li)Tantalita: $(l:tfg_ores/mars_vein_index#mars_tantalite)36%$(/l)$()$(li)Tetraedrita: $(l:tfg_ores/mars_vein_index#mars_surface_tetrahedrite)57%$(/l), $(l:tfg_ores/mars_vein_index#mars_stibnite)47%$(/l)$()$(li)Tório: $(l:tfg_ores/mars_vein_index#deep_mars_pitchblende)26%$(/l), $(l:tfg_ores/mars_vein_index#mars_pitchblende)29%$(/l)$()$(li)Trona: $(l:tfg_ores/mars_vein_index#mars_lubricant)35%$(/l)$()$(li)Tungstato: $(l:tfg_ores/mars_vein_index#mars_tungsten)33%$(/l)$()$(li)Uraninita: $(l:tfg_ores/mars_vein_index#deep_mars_pitchblende)21%$(/l)$()", + "text": "$(li)Redstone: $(l:tfg_ores/mars_vein_index#deep_mars_chromite)45%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_tetrahedrite)4%$(/l)$()$(li)Rubi: $(l:tfg_ores/mars_vein_index#deep_mars_chromite)35%$(/l)$()$(li)Safira: $(l:tfg_ores/mars_vein_index#mars_almandine)15%$(/l)$()$(li)Safira Verde: $(l:tfg_ores/mars_vein_index#mars_almandine)15%$(/l), $(l:tfg_ores/mars_vein_index#mars_sapphire)5%$(/l)$()$(li)Sal: $(l:tfg_ores/mars_vein_index#mars_salt)30%$(/l)$()$(li)Sal-gema: $(l:tfg_ores/mars_vein_index#mars_salt)20%$(/l)$()$(li)Salitre: $(l:tfg_ores/mars_vein_index#mars_surface_cassiterite)10%$(/l)$()$(li)Sheelita: $(l:tfg_ores/mars_vein_index#mars_tungsten)42%$(/l)$()$(li)Sodalita: $(l:tfg_ores/mars_vein_index#mars_lapis)25%$(/l)$()$(li)Talco: $(l:tfg_ores/mars_vein_index#mars_lubricant)21%$(/l)$()$(li)Tantalita: $(l:tfg_ores/mars_vein_index#mars_tantalite)36%$(/l)$()$(li)Tetraedrita: $(l:tfg_ores/mars_vein_index#mars_surface_tetrahedrite)57%$(/l), $(l:tfg_ores/mars_vein_index#mars_stibnite)47%$(/l)$()$(li)Torianita: $(l:tfg_ores/mars_vein_index#deep_mars_pitchblende)26%$(/l), $(l:tfg_ores/mars_vein_index#mars_pitchblende)29%$(/l)$()$(li)Trona: $(l:tfg_ores/mars_vein_index#mars_lubricant)35%$(/l)$()", + "type": "patchouli:text" + }, + { + "Type": "patchouli:text", + "text": "$(li)Tungstato: $(l:tfg_ores/mars_vein_index#mars_tungsten)33%$(/l)$()$(li)Uraninita: $(l:tfg_ores/mars_vein_index#deep_mars_pitchblende)21%$(/l)$()", "type": "patchouli:text" } ], 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 7833d38d5..3e1622d89 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 @@ -19,7 +19,7 @@ }, { "Type": "patchouli:text", - "text": "$(li)$(l:tfg_ores/mars_vein_index#mars_surface_hematite)Hematita e Limonita$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_tantalite)Manganês e Tântalo$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_pitchblende)Pitchblende, Thorium, & Hematite$()$()$(li)$(l:tfg_ores/mars_vein_index#deep_mars_pitchblende)Pitchblende, Thorium, & Uraninite$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_galena)Prata, Galena e Chumbo$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_quartzite)Quartzite, Asbestos, & Barite$()$()$(li)$(l:tfg_ores/mars_vein_index#deep_mars_chromite)Redstone & Chromite$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_salt)Salts & Spodumene$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_tungsten)Sheelita e Tungstato$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_surface_nickel_galena)Sphalerite & Galena$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_stibnite)Tetraedrita (Normal)$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_surface_tetrahedrite)Tetraedrita (Superfície)$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_lubricant)Trona, Talc, & Glauconite$()$()", + "text": "$(li)$(l:tfg_ores/mars_vein_index#mars_surface_hematite)Hematita e Limonita$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_lapis)Lápis-lazúri, Lazurita e Sodalita$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_tantalite)Manganês e Tântalo$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_pitchblende)Pitchblende & Thorianite, & Hematite$()$()$(li)$(l:tfg_ores/mars_vein_index#deep_mars_pitchblende)Pitchblende, Thorianite, & Uraninite$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_galena)Prata, Galena e Chumbo$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_quartzite)Quartzite, Asbestos, & Barite$()$()$(li)$(l:tfg_ores/mars_vein_index#deep_mars_chromite)Redstone & Chromite$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_salt)Salts & Spodumene$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_tungsten)Sheelita e Tungstato$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_surface_nickel_galena)Sphalerite & Galena$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_stibnite)Tetraedrita (Normal)$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_surface_tetrahedrite)Tetraedrita (Superfície)$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_lubricant)Trona, Talc, & Glauconite$()$()", "type": "patchouli:text" }, { @@ -1332,6 +1332,98 @@ "draw_filler": true, "type": "patchouli:empty" }, + { + "Type": "patchouli:text", + "text": "$(thing)Raridade$(): 200$(br)$(thing)Densidade$(): 0.25$(br)$(thing)Tipo$(): Veio Aglomerado$(br)$(thing)Y$(): 0 — 70$(br)$(thing)Tamanho$(): 30$(br)$(thing)Profundidade Máxima do Indicador$(): 20$(br2)$(thing)Tipos de Pedra$(): Argilita, Calcário, Cherte, Dolomito, Folhelho, Giz", + "title": "Lápis-lazúri, Lazurita e Sodalita", + "type": "patchouli:text", + "anchor": "mars_lapis" + }, + { + "Type": "patchouli:multiblock", + "name": "Lazurita", + "multiblock": { + "mapping": { + "0": "#forge:ores/lazurite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Porcentagem$(): 35%$(br)$(thing)Fonte de$(): Alumínio, Cálcio, Sódio$(br)$(thing)Fórmula$(): Al₆Si₆Ca₈Na₈", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Sodalita", + "multiblock": { + "mapping": { + "0": "#forge:ores/sodalite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Porcentagem$(): 25%$(br)$(thing)Fonte de$(): Alumínio, Sódio$(br)$(thing)Fórmula$(): Al₃Si₃Na₄Cl", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Lápis-lazúri", + "multiblock": { + "mapping": { + "0": "#forge:ores/lapis" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Porcentagem$(): 25%$(br)$(thing)Fonte de$(): Lazurita, Sodalita, Pirita, Calcita", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Calcita", + "multiblock": { + "mapping": { + "0": "#forge:ores/calcite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Porcentagem$(): 15%$(br)$(thing)Fonte de$(): Cálcio$(br)$(thing)Fórmula$(): CaCO₃", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:empty", + "draw_filler": true, + "type": "patchouli:empty" + }, { "Type": "patchouli:text", "text": "$(thing)Raridade$(): 230$(br)$(thing)Densidade$(): 0.3$(br)$(thing)Tipo$(): Veio Aglomerado$(br)$(thing)Y$(): 0 — 70$(br)$(thing)Tamanho$(): 42$(br)$(thing)Profundidade Máxima do Indicador$(): 15$(br2)$(thing)Tipos de Pedra$(): Argilita, Argilito, Basalto, Calcário, Cherte, Folhelho, Gabro, Giz, Red Granite, Traquito", @@ -1427,7 +1519,7 @@ { "Type": "patchouli:text", "text": "$(thing)Raridade$(): 220$(br)$(thing)Densidade$(): 0.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", - "title": "Pitchblende, Thorium, & Hematite", + "title": "Pitchblende & Thorianite, & Hematite", "type": "patchouli:text", "anchor": "mars_pitchblende" }, @@ -1453,7 +1545,7 @@ }, { "Type": "patchouli:multiblock", - "name": "Tório", + "name": "Torianita", "multiblock": { "mapping": { "0": "#forge:ores/thorium" @@ -1468,7 +1560,7 @@ ] }, "enable_visualize": false, - "text": "$(thing)Porcentagem$(): 29%$(br)$(thing)Fonte de$(): Tório$(br)$(thing)Fórmula$(): Th", + "text": "$(thing)Porcentagem$(): 29%$(br)$(thing)Fonte de$(): Tório$(br)$(thing)Fórmula$(): ThO₂", "type": "patchouli:multiblock" }, { @@ -1494,7 +1586,7 @@ { "Type": "patchouli:text", "text": "$(thing)Raridade$(): 370$(br)$(thing)Densidade$(): 0.3$(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", - "title": "Pitchblende, Thorium, & Uraninite", + "title": "Pitchblende, Thorianite, & Uraninite", "type": "patchouli:text", "anchor": "deep_mars_pitchblende" }, @@ -1520,7 +1612,7 @@ }, { "Type": "patchouli:multiblock", - "name": "Tório", + "name": "Torianita", "multiblock": { "mapping": { "0": "#forge:ores/thorium" @@ -1535,7 +1627,7 @@ ] }, "enable_visualize": false, - "text": "$(thing)Porcentagem$(): 26%$(br)$(thing)Fonte de$(): Tório$(br)$(thing)Fórmula$(): Th", + "text": "$(thing)Porcentagem$(): 26%$(br)$(thing)Fonte de$(): Tório$(br)$(thing)Fórmula$(): ThO₂", "type": "patchouli:multiblock" }, { diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/pt_br/entries/tfg_ores/moon_ore_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/pt_br/entries/tfg_ores/moon_ore_index.json index ae5122eea..820ba44e8 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/pt_br/entries/tfg_ores/moon_ore_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/pt_br/entries/tfg_ores/moon_ore_index.json @@ -39,7 +39,7 @@ }, { "Type": "patchouli:text", - "text": "$(li)Salitre: $(l:tfg_ores/moon_vein_index#moon_saltpeter)29%$(/l)$()$(li)Sheelita: $(l:tfg_ores/moon_vein_index#moon_scheelite)40%$(/l)$()$(li)Talco: $(l:tfg_ores/moon_vein_index#moon_lubricant)20%$(/l), $(l:tfg_ores/moon_vein_index#moon_saltpeter)12%$(/l)$()$(li)Tantalita: $(l:tfg_ores/moon_vein_index#moon_pyrolusite)14%$(/l), $(l:tfg_ores/moon_vein_index#moon_manganese)12%$(/l)$()$(li)Tetraedrita: $(l:tfg_ores/moon_vein_index#moon_tetrahedrite)40%$(/l)$()$(li)Topázio: $(l:tfg_ores/moon_vein_index#moon_topaz)25%$(/l)$()$(li)Topázio Azul: $(l:tfg_ores/moon_vein_index#moon_topaz)35%$(/l)$()$(li)Tório: $(l:tfg_ores/moon_vein_index#moon_beryllium)0%$(/l)$()$(li)Trona: $(l:tfg_ores/moon_vein_index#moon_lubricant)10%$(/l)$()$(li)Tungstato: $(l:tfg_ores/moon_vein_index#moon_scheelite)50%$(/l)$()$(li)Wulfenita: $(l:tfg_ores/moon_vein_index#moon_molybdenum)44%$(/l)$()$(li)Zeólita: $(l:tfg_ores/moon_vein_index#moon_cassiterite)5%$(/l)$()", + "text": "$(li)Salitre: $(l:tfg_ores/moon_vein_index#moon_saltpeter)29%$(/l)$()$(li)Sheelita: $(l:tfg_ores/moon_vein_index#moon_scheelite)40%$(/l)$()$(li)Talco: $(l:tfg_ores/moon_vein_index#moon_lubricant)20%$(/l), $(l:tfg_ores/moon_vein_index#moon_saltpeter)12%$(/l)$()$(li)Tantalita: $(l:tfg_ores/moon_vein_index#moon_pyrolusite)14%$(/l), $(l:tfg_ores/moon_vein_index#moon_manganese)12%$(/l)$()$(li)Tetraedrita: $(l:tfg_ores/moon_vein_index#moon_tetrahedrite)40%$(/l)$()$(li)Topázio: $(l:tfg_ores/moon_vein_index#moon_topaz)25%$(/l)$()$(li)Topázio Azul: $(l:tfg_ores/moon_vein_index#moon_topaz)35%$(/l)$()$(li)Torianita: $(l:tfg_ores/moon_vein_index#moon_beryllium)0%$(/l)$()$(li)Trona: $(l:tfg_ores/moon_vein_index#moon_lubricant)10%$(/l)$()$(li)Tungstato: $(l:tfg_ores/moon_vein_index#moon_scheelite)50%$(/l)$()$(li)Wulfenita: $(l:tfg_ores/moon_vein_index#moon_molybdenum)44%$(/l)$()$(li)Zeólita: $(l:tfg_ores/moon_vein_index#moon_cassiterite)5%$(/l)$()", "type": "patchouli:text" } ], diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/pt_br/entries/tfg_ores/moon_vein_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/pt_br/entries/tfg_ores/moon_vein_index.json index b7dc9fe90..2f258676b 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/pt_br/entries/tfg_ores/moon_vein_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/pt_br/entries/tfg_ores/moon_vein_index.json @@ -1016,7 +1016,7 @@ }, { "Type": "patchouli:multiblock", - "name": "Tório", + "name": "Torianita", "multiblock": { "mapping": { "0": "#forge:ores/thorium" @@ -1031,7 +1031,7 @@ ] }, "enable_visualize": false, - "text": "$(thing)Porcentagem$(): 0%$(br)$(thing)Fonte de$(): Tório$(br)$(thing)Fórmula$(): Th", + "text": "$(thing)Porcentagem$(): 0%$(br)$(thing)Fonte de$(): Tório$(br)$(thing)Fórmula$(): ThO₂", "type": "patchouli:multiblock" }, { diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/pt_br/entries/tfg_ores/nether_ore_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/pt_br/entries/tfg_ores/nether_ore_index.json index cf640e558..22f0139b6 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/pt_br/entries/tfg_ores/nether_ore_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/pt_br/entries/tfg_ores/nether_ore_index.json @@ -44,7 +44,7 @@ }, { "Type": "patchouli:text", - "text": "$(li)Salitre: $(l:tfg_ores/nether_vein_index#nether_saltpeter)35%$(/l), $(l:tfg_ores/nether_vein_index#nether_cassiterite)9%$(/l)$()$(li)Sheelita: $(l:tfg_ores/nether_vein_index#nether_scheelite)45%$(/l)$()$(li)Silvita: $(l:tfg_ores/nether_vein_index#nether_sylvite)100%$(/l)$()$(li)Sodalita: $(l:tfg_ores/nether_vein_index#nether_lapis)25%$(/l)$()$(li)Talco: $(l:tfg_ores/nether_vein_index#nether_lubricant)20%$(/l)$()$(li)Tantalita: $(l:tfg_ores/nether_vein_index#nether_manganese)12%$(/l)$()$(li)Terra de Fuller: $(l:tfg_ores/nether_vein_index#nether_basaltic_sands)25%$(/l), $(l:tfg_ores/nether_vein_index#nether_gypsum)15%$(/l)$()$(li)Tetraedrita: $(l:tfg_ores/nether_vein_index#nether_tetrahedrite)50%$(/l)$()$(li)Topázio: $(l:tfg_ores/nether_vein_index#nether_topaz)25%$(/l)$()$(li)Topázio Azul: $(l:tfg_ores/nether_vein_index#nether_topaz)35%$(/l)$()$(li)Tório: $(l:tfg_ores/nether_vein_index#nether_beryllium)0%$(/l)$()$(li)Trona: $(l:tfg_ores/nether_vein_index#nether_lubricant)10%$(/l)$()$(li)Tungstato: $(l:tfg_ores/nether_vein_index#nether_scheelite)35%$(/l)$()$(li)Uraninita: $(l:tfg_ores/nether_vein_index#nether_pitchblende)25%$(/l)$()", + "text": "$(li)Salitre: $(l:tfg_ores/nether_vein_index#nether_saltpeter)35%$(/l), $(l:tfg_ores/nether_vein_index#nether_cassiterite)9%$(/l)$()$(li)Sheelita: $(l:tfg_ores/nether_vein_index#nether_scheelite)45%$(/l)$()$(li)Silvita: $(l:tfg_ores/nether_vein_index#nether_sylvite)100%$(/l)$()$(li)Sodalita: $(l:tfg_ores/nether_vein_index#nether_lapis)25%$(/l)$()$(li)Talco: $(l:tfg_ores/nether_vein_index#nether_lubricant)20%$(/l)$()$(li)Tantalita: $(l:tfg_ores/nether_vein_index#nether_manganese)12%$(/l)$()$(li)Terra de Fuller: $(l:tfg_ores/nether_vein_index#nether_basaltic_sands)25%$(/l), $(l:tfg_ores/nether_vein_index#nether_gypsum)15%$(/l)$()$(li)Tetraedrita: $(l:tfg_ores/nether_vein_index#nether_tetrahedrite)50%$(/l)$()$(li)Topázio: $(l:tfg_ores/nether_vein_index#nether_topaz)25%$(/l)$()$(li)Topázio Azul: $(l:tfg_ores/nether_vein_index#nether_topaz)35%$(/l)$()$(li)Torianita: $(l:tfg_ores/nether_vein_index#nether_beryllium)0%$(/l)$()$(li)Trona: $(l:tfg_ores/nether_vein_index#nether_lubricant)10%$(/l)$()$(li)Tungstato: $(l:tfg_ores/nether_vein_index#nether_scheelite)35%$(/l)$()$(li)Uraninita: $(l:tfg_ores/nether_vein_index#nether_pitchblende)25%$(/l)$()", "type": "patchouli:text" }, { 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 11f83bae3..f3e543676 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 @@ -1092,7 +1092,7 @@ }, { "Type": "patchouli:multiblock", - "name": "Tório", + "name": "Torianita", "multiblock": { "mapping": { "0": "#forge:ores/thorium" @@ -1107,7 +1107,7 @@ ] }, "enable_visualize": false, - "text": "$(thing)Porcentagem$(): 0%$(br)$(thing)Fonte de$(): Tório$(br)$(thing)Fórmula$(): Th", + "text": "$(thing)Porcentagem$(): 0%$(br)$(thing)Fonte de$(): Tório$(br)$(thing)Fórmula$(): ThO₂", "type": "patchouli:multiblock" }, { diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/pt_br/entries/tfg_ores/venus_ore_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/pt_br/entries/tfg_ores/venus_ore_index.json index 38050b2c8..0f3db8b9a 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/pt_br/entries/tfg_ores/venus_ore_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/pt_br/entries/tfg_ores/venus_ore_index.json @@ -1,7 +1,7 @@ { "__credits__": "This page was automatically generated by OresToFieldGuide.", "name": "Venus Ore Index", - "icon": "gtceu:sulfur_dust", + "icon": "vintageimprovements:sulfur", "category": "tfc:tfg_ores", "read_by_default": true, "secret": false, @@ -14,7 +14,7 @@ }, { "Type": "patchouli:text", - "text": "$(li)Enxofre: $(l:tfg_ores/venus_vein_index#venus_manual_sulfur)50%$(/l)$()$(li)Esfalerita: $(l:tfg_ores/venus_vein_index#venus_manual_sulfur)15%$(/l)$()$(li)Espodumena: $(l:tfg_ores/venus_vein_index#venus_manual_salt)15%$(/l)$()$(li)Lepidorita: $(l:tfg_ores/venus_vein_index#venus_manual_salt)15%$(/l)$()$(li)Pirita: $(l:tfg_ores/venus_vein_index#venus_manual_sulfur)35%$(/l)$()$(li)Sal: $(l:tfg_ores/venus_vein_index#venus_manual_salt)50%$(/l)$()$(li)Sal-gema: $(l:tfg_ores/venus_vein_index#venus_manual_salt)20%$(/l)$()", + "text": "$(li)Enxofre: $(l:tfg_ores/venus_vein_index#venus_manual_sulfur)80%$(/l)$()$(li)Esfalerita: $(l:tfg_ores/venus_vein_index#venus_manual_sulfur)5%$(/l)$()$(li)Espodumena: $(l:tfg_ores/venus_vein_index#venus_manual_salt)5%$(/l)$()$(li)Lepidorita: $(l:tfg_ores/venus_vein_index#venus_manual_salt)5%$(/l)$()$(li)Pirita: $(l:tfg_ores/venus_vein_index#venus_manual_sulfur)15%$(/l)$()$(li)Sal: $(l:tfg_ores/venus_vein_index#venus_manual_salt)80%$(/l)$()$(li)Sal-gema: $(l:tfg_ores/venus_vein_index#venus_manual_salt)10%$(/l)$()", "type": "patchouli:text" } ], 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 90cb05028..74a356323 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$(): 100$(br)$(thing)Densidade$(): 0.2$(br)$(thing)Tipo$(): Veio Aglomerado$(br)$(thing)Y$(): 40 — 65$(br)$(thing)Tamanho$(): 15$(br)$(thing)Profundidade Máxima do Indicador$(): 30$(br2)$(thing)Tipos de Pedra$(): Andesito, Basalto, Dacito, Riolito, Traquito, Travertino", + "text": "$(thing)Raridade$(): 30$(br)$(thing)Densidade$(): 0.2$(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", "title": "Enxofre e Pirita", "type": "patchouli:text", "anchor": "venus_manual_sulfur" @@ -41,7 +41,7 @@ ] }, "enable_visualize": false, - "text": "$(thing)Porcentagem$(): 50%$(br)$(thing)Fonte de$(): Enxofre$(br)$(thing)Fórmula$(): S", + "text": "$(thing)Porcentagem$(): 80%$(br)$(thing)Fonte de$(): Enxofre$(br)$(thing)Fórmula$(): S", "type": "patchouli:multiblock" }, { @@ -61,7 +61,7 @@ ] }, "enable_visualize": false, - "text": "$(thing)Porcentagem$(): 35%$(br)$(thing)Derrete em$(): Ferro Fundido$(br)$(thing)Fórmula$(): FeS₂", + "text": "$(thing)Porcentagem$(): 15%$(br)$(thing)Derrete em$(): Ferro Fundido$(br)$(thing)Fórmula$(): FeS₂", "type": "patchouli:multiblock" }, { @@ -81,12 +81,12 @@ ] }, "enable_visualize": false, - "text": "$(thing)Porcentagem$(): 15%$(br)$(thing)Derrete em$(): Zinco$(br)$(thing)Fórmula$(): ZnS", + "text": "$(thing)Porcentagem$(): 5%$(br)$(thing)Derrete em$(): Zinco$(br)$(thing)Fórmula$(): ZnS", "type": "patchouli:multiblock" }, { "Type": "patchouli:text", - "text": "$(thing)Raridade$(): 100$(br)$(thing)Densidade$(): 0.2$(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$(): 30$(br)$(thing)Densidade$(): 0.2$(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.", "title": "Salts & Spodumene", "type": "patchouli:text", "anchor": "venus_manual_salt" @@ -108,7 +108,7 @@ ] }, "enable_visualize": false, - "text": "$(thing)Porcentagem$(): 50%$(br)$(thing)Fonte de$(): Sódio, Cloro$(br)$(thing)Fórmula$(): NaCl", + "text": "$(thing)Porcentagem$(): 80%$(br)$(thing)Fonte de$(): Sódio, Cloro$(br)$(thing)Fórmula$(): NaCl", "type": "patchouli:multiblock" }, { @@ -128,7 +128,7 @@ ] }, "enable_visualize": false, - "text": "$(thing)Porcentagem$(): 20%$(br)$(thing)Fonte de$(): Potássio, Cloro$(br)$(thing)Fórmula$(): KCl", + "text": "$(thing)Porcentagem$(): 10%$(br)$(thing)Fonte de$(): Potássio, Cloro$(br)$(thing)Fórmula$(): KCl", "type": "patchouli:multiblock" }, { @@ -148,7 +148,7 @@ ] }, "enable_visualize": false, - "text": "$(thing)Porcentagem$(): 15%$(br)$(thing)Fonte de$(): Potássio, Lítio, Alumínio, Flúor$(br)$(thing)Fórmula$(): KLi₃Al₄F₂O₁₀", + "text": "$(thing)Porcentagem$(): 5%$(br)$(thing)Fonte de$(): Potássio, Lítio, Alumínio, Flúor$(br)$(thing)Fórmula$(): KLi₃Al₄F₂O₁₀", "type": "patchouli:multiblock" }, { @@ -168,7 +168,7 @@ ] }, "enable_visualize": false, - "text": "$(thing)Porcentagem$(): 15%$(br)$(thing)Fonte de$(): Lítio, Alumínio$(br)$(thing)Fórmula$(): LiAlSi₂O₆", + "text": "$(thing)Porcentagem$(): 5%$(br)$(thing)Fonte de$(): Lítio, Alumínio$(br)$(thing)Fórmula$(): LiAlSi₂O₆", "type": "patchouli:multiblock" }, { diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/categories/sacks_n_such.json b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/categories/sacks_n_such.json new file mode 100644 index 000000000..7d0c9a01c --- /dev/null +++ b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/categories/sacks_n_such.json @@ -0,0 +1,6 @@ +{ + "name": "Sacks 'N Such", + "description": "Всё, что вам нужно знать о Sacks 'N Such", + "icon": "sns:textures/item/icon/leather_sack.png", + "sortnum": 3 +} \ No newline at end of file diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/firmaciv/arborfirmacraft.json b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/firmaciv/arborfirmacraft.json index 2e4f1ebc8..3ec25eb9c 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/firmaciv/arborfirmacraft.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/firmaciv/arborfirmacraft.json @@ -8,30 +8,30 @@ "pages": [ { "type": "patchouli:text", - "text": "If you see Tualang or Fig trees in your travels, you'll be pleased to know that you'll be able to create $(l:firmaciv/watercraft)Boats$() with them just like any other kind of Wood" + "text": "Если во время своих путешествий вы встретите деревья Компассии или Инжира, вам будет приятно узнать, что из них можно создавать $(l:firmaciv/watercraft)Лодки$() так же, как и из любого другого вида древесины." }, { "type": "patchouli:empty" }, { "type": "patchouli:spotlight", - "title": "Softwoods", - "text": "Softwoods have sufficiently soft enough pulp and bark that they're perfect for creating $(l:firmaciv/canoe)Dugout Canoes$()", + "title": "Мягкие породы древесины", + "text": "Мягкие породы имеют достаточно мягкую древесину и кору, благодаря чему они идеально подходят для создания $(l:firmaciv/canoe)Долблёных каноэ$()", "item": "afc:wood/stripped_log/tualang,afc:wood/stripped_log/fig,afc:wood/stripped_log/cypress" }, { "type": "patchouli:text", - "text": "$(li)Tualang$() $(li)Fig$() $(li)Cypress$()" + "text": "$(li)Компассия$() $(li)Инжир$() $(li)Кипарис$()" }, { "type": "patchouli:spotlight", - "title": "Hardwoods", - "text": "Known for their exceptional sturdiness, Hardwood trees are ideal for creating larger and sophisticated Watercrafts such as $(l:firmaciv/rowboat)Rowboats$() and $(l:firmaciv/sloop)Sloops$()", + "title": "Твёрдые породы древесины", + "text": "Известные своей исключительной прочностью, твёрдые породы древесины идеально подходят для создания более крупных и сложных водных судов, таких как $(l:firmaciv/rowboat)Гребные Лодки$() и $(l:firmaciv/sloop)Шлюпы$()", "item": "afc:wood/planks/baobab,afc:wood/planks/eucalyptus,afc:wood/planks/mahogany,afc:wood/planks/hevea,afc:wood/planks/teak,afc:wood/planks/ironwood,afc:wood/planks/ipe" }, { "type": "patchouli:text", - "text": "$(li)Baobab$() $(li)Eucalyptus$() $(li)Mahogany$() $(li)Hevea$() $(li)Teak$() $(li)Ironwood$() $(li)Ipe$()" + "text": "$(li)Баобаб$() $(li)Эвкалипт$() $(li)Махагония$() $(li)Гевея$() $(li)Тиковое Дерево$() $(li)Железное Дерево$() $(li)Ипе$()" } ] -} \ No newline at end of file +} diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/firmaciv/beneath.json b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/firmaciv/beneath.json index c69005a38..72dd719ef 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/firmaciv/beneath.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/firmaciv/beneath.json @@ -1,5 +1,5 @@ { - "name": "Beneath", + "name": "Mарсианские лодки", "category": "tfc:firmaciv", "icon": "beneath:wood/sapling/crimson", "flag": "mod:beneath", @@ -8,30 +8,30 @@ "pages": [ { "type": "patchouli:text", - "text": "Deep within the nether you can utilize both Crimson and Warped wood to create some rather flashy $(l:firmaciv/watercraft)Boats$().$(br2)Format Error: Due to a limitation, Watercrafts created with these materials are NOT impervious to lava, you WILL sink and BURN." + "text": "Далеко-далеко, на самых дальних окраинах Марса вы можете найти и использовать Багряные и Искаженные деревья для создания $(l:firmaciv/watercraft)Лодок$()." }, { "type": "patchouli:empty" }, { "type": "patchouli:spotlight", - "title": "Softwoods", - "text": "Softwoods have sufficiently soft enough pulp and bark that they're perfect for creating $(l:firmaciv/canoe)Dugout Canoes$()", + "title": "Мягкие породы древесины", + "text": "Мягкие породы имеют достаточно мягкую древесину и кору, благодаря чему они идеально подходят для создания $(l:firmaciv/canoe)Долблёных каноэ$()", "item": "beneath:wood/stripped_log/crimson" }, { "type": "patchouli:text", - "text": "$(li)Crimson$()" + "text": "$(li)Багряная Древесина$()" }, { "type": "patchouli:spotlight", - "title": "Hardwoods", - "text": "Known for their exceptional sturdiness, Hardwood trees are ideal for creating larger and sophisticated Watercrafts such as $(l:firmaciv/rowboat)Rowboats$() and $(l:firmaciv/sloop)Sloops$()", + "title": "Твёрдые породы древесины", + "text": "Известные своей исключительной прочностью, твёрдые породы древесины идеально подходят для создания более крупных и сложных водных судов, таких как $(l:firmaciv/rowboat)Гребные Лодки$() и $(l:firmaciv/sloop)Шлюпы$()", "item": "beneath:wood/planks/warped" }, { "type": "patchouli:text", - "text": "$(li)Warped$()" + "text": "$(li)Искаженная Древесина$()" } ] -} \ No newline at end of file +} diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/mechanics/dairy.json b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/mechanics/dairy.json index 39876257f..6838a671c 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/mechanics/dairy.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/mechanics/dairy.json @@ -1,27 +1,12 @@ { - "__comment__": "This file was automatically created by mcresources", "name": "Молочные продукты", "category": "tfc:mechanics", "icon": "tfc:textures/item/food/cheese.png", "pages": [ { "type": "patchouli:text", - "text": "$(thing)Молочные продукты$() - это $(l:getting_started/food_and_water#nutrients)Питательное вещество$(), получаемое из молока, произведенного $(l:mechanics/animal_husbandry#dairy_animals)Молочными животными$(). Его можно пить или перерабатывать в $(thing)Сыр$(). Пить можно из кувшина, и это всегда восстанавливает $(l:getting_started/food_and_water#thirst)Жажду$(). Однако, это добавляет к питанию только после употребления пищи. На практике это означает, что пить молоко дважды подряд неэффективно. Перед этим должен быть прием пищи.", + "text": "$(l:firmalife/cheese)Проверь соответствующую главу в Firmalife для актуальной информации.$()", "title": "Молочные продукты" - }, - { - "type": "patchouli:text", - "text": "Чтобы начать процесс $(thing)Сыроварения$(), добавьте $(thing)Молоко$() и $(thing)Уксус$() в $(l:mechanics/barrels)Бочку$() в соотношении 9: 1. Это проще всего сделать, наполнив бочку 9 ведрами молока и добавив одно ведро уксуса. Это дает $(thing)Молочный уксус$()." - }, - { - "type": "tfc:sealed_barrel_recipe", - "recipe": "tfc:barrel/curdling", - "text": "Как только молоко и уксус смешаны, оно свернется, если его запечатать в бочке на восемь часов. Для этого не требуются дополнительные ингредиенты, кроме времени." - }, - { - "type": "tfc:sealed_barrel_recipe", - "recipe": "tfc:barrel/cheese", - "text": "Затем сыр делается путем повторного запечатывания свернувшегося молока в бочке на восемь часов. Сыр - это долговечный молочный продукт, который может быть использован в некоторых блюдах для добавления молочных продуктов, таких как $(l:mechanics/sandwiches)Бутерброды$()." } ], "read_by_default": true, @@ -29,4 +14,4 @@ "minecraft:milk_bucket": 0, "tfc:food/cheese": 1 } -} \ No newline at end of file +} diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/sns/burlap_sack.json b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/sns/burlap_sack.json new file mode 100644 index 000000000..1c39392a6 --- /dev/null +++ b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/sns/burlap_sack.json @@ -0,0 +1,18 @@ +{ + "name": "Мешок из мешковины", + "category": "tfc:sacks_n_such", + "icon": "sns:burlap_sack", + "pages": [ + { + "type": "patchouli:spotlight", + "item": "sns:burlap_sack", + "text": "$(item)Мешок из мешковины$() — это тип $(l:sns/item_containers)предметного контейнера$() с немного большей вместимостью, чем у $(item)кожаного мешка$()." + }, + { + "type": "patchouli:crafting", + "recipe": "sns:crafting/burlap_sack", + "text": "По умолчанию они могут вмещать предметы максимум $(thing)маленького$() размера." + } + ], + "read_by_default": true +} \ No newline at end of file diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/sns/frame_pack.json b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/sns/frame_pack.json new file mode 100644 index 000000000..9c1d7fa64 --- /dev/null +++ b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/sns/frame_pack.json @@ -0,0 +1,18 @@ +{ + "name": "Каркасный рюкзак", + "category": "tfc:sacks_n_such", + "icon": "sns:frame_pack", + "pages": [ + { + "type": "patchouli:spotlight", + "item": "sns:frame_pack", + "text": "$(item)Каркасный рюкзак$() — это тип $(l:sns/item_containers)предметного контейнера$(), по сути являющийся TFC сундуком на вашей спине. Как и TFC сундук, он учитывает $(l:getting_started/size_and_weight)систему размеров$() TFC." + }, + { + "type": "patchouli:crafting", + "recipe": "sns:crafting/frame_pack", + "text": "По умолчанию они могут вмещать предметы максимум $(thing)большого$() размера." + } + ], + "read_by_default": true +} \ No newline at end of file diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/sns/hiking_boots.json b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/sns/hiking_boots.json new file mode 100644 index 000000000..046c328f9 --- /dev/null +++ b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/sns/hiking_boots.json @@ -0,0 +1,17 @@ +{ + "name": "Походные ботинки", + "category": "tfc:sacks_n_such", + "icon": "sns:hiking_boots", + "pages": [ + { + "type": "patchouli:text", + "text": "Каждому исследователю нужна хорошая пара ботинок. Они позволяют быстро пробираться сквозь траву, дают небольшое ускорение и увеличивают безопасную высоту падения." + }, + { + "type": "patchouli:crafting", + "recipe": "sns:crafting/hiking_boots", + "text": "Эти ботинки созданы для ходьбы." + } + ], + "read_by_default": true +} \ No newline at end of file diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/sns/horseshoes.json b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/sns/horseshoes.json new file mode 100644 index 000000000..3ddd6f339 --- /dev/null +++ b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/sns/horseshoes.json @@ -0,0 +1,30 @@ +{ + "name": "Подковы", + "category": "tfc:sacks_n_such", + "icon": "sns:metal/horseshoe/steel", + "pages": [ + { + "type": "patchouli:text", + "text": "$(item)Подковы$() выковываются по отдельности, а затем объединяются вместе в крафтовом меню. Разве ты не знал, что у лошадей 4 ноги? $(br)$(br)Кстати, с хорошими подковами — очень хорошая идея именно привязывать свою лошадь, тк обычная яма не сработает!" + }, + { + "type": "tfc:sns/better_anvil_recipe", + "recipe": "sns:anvil/metal/horseshoe/steel", + "recipe2": "sns:anvil/metal/horseshoe/black_steel", + "recipe3": "sns:anvil/metal/horseshoe/blue_steel", + "recipe4": "sns:anvil/metal/horseshoe/red_steel", + "text4": "Каждой лошади нужны подковы" + }, + { + "type": "patchouli:crafting", + "recipe": "sns:crafting/metal/horseshoes/steel", + "recipe2": "sns:crafting/metal/horseshoes/black_steel" + }, + { + "type": "patchouli:crafting", + "recipe": "sns:crafting/metal/horseshoes/blue_steel", + "recipe2": "sns:crafting/metal/horseshoes/red_steel" + } + ], + "read_by_default": true +} \ No newline at end of file diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/sns/item_containers.json b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/sns/item_containers.json new file mode 100644 index 000000000..44309ff8d --- /dev/null +++ b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/sns/item_containers.json @@ -0,0 +1,20 @@ +{ + "name": "Предметные контейнеры", + "category": "tfc:sacks_n_such", + "icon": "sns:straw_basket", + "pages": [ + { + "type": "patchouli:text", + "text": "$(thing)Предметные контейнеры$() — это основные предметы, которые добавляет данный мод. У них есть 6 основных характеристик, которые можно увидеть, удерживая $(3)Shift$(clear), наведя курсор на предмет. $(li)$(thing)Количество слотов$(): сколько слотов он имеет. $(li)$(thing)Вместимость слота$(): сколько предметов может хранить один слот. $(li)$(thing)Допустимый размер$(): максимально допустимый $(l:getting_started/size_and_weight)размер TFC$() для слотов." + }, + { + "type": "patchouli:text", + "text": "$(li)$(thing)Автоподбор$() — может ли он подбирать предметы автоматически. Shift + ПКМ или используйте $(k:sns.key.pickup) для переключения. $(li)$(thing)Удаление предметов$() — может ли он удалять лишние предметы. Для переключения используйте Ctrl + ЛКМ. $(li)$(thing)Взаимодействие с инвентарём$() — можно ли вносить и извлекать предметы, кликая по контейнеру, как у сосудов TFC или ванильных мешков. $(br)Все $(thing)предметные контейнеры$() поддерживают ванильную функцию выбора блока через $(k:pickItem)" + }, + { + "type": "patchouli:text", + "text": "Для авторов модпаков или просто тех, кто хочет настраивать различные вещи. Все$(thing) предметные контейнеры$() имеют тег \"черного списка\", который включает $(bold)sns:prevented_in_item_containers$(). Схема именования — $(bold)prevented_in_$(), например соломенная корзина использует $(bold)sns:prevented_in_straw_basket$(). $(thing)Предметные контейнеры$() со специальными тегами \"белого списка\" будут перечислены в соответствующей главе." + } + ], + "read_by_default": true +} \ No newline at end of file diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/sns/leather_sack.json b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/sns/leather_sack.json new file mode 100644 index 000000000..ff12fe3b2 --- /dev/null +++ b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/sns/leather_sack.json @@ -0,0 +1,17 @@ +{ + "name": "Кожаный мешок", + "category": "tfc:sacks_n_such", + "icon": "sns:leather_sack", + "pages": [ + { + "type": "patchouli:spotlight", + "item": "sns:leather_sack", + "text": "$(item)Кожаный мешок$() — это тип $(l:sns/item_containers)предметного контейнера$() и похож на сосуд с немного большей вместимостью. По умолчанию он может вмещать предметы максимум $(thing)обычного$() размера." + }, + { + "type": "patchouli:crafting", + "recipe": "sns:crafting/leather_sack" + } + ], + "read_by_default": true +} \ No newline at end of file diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/sns/ore_sack.json b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/sns/ore_sack.json new file mode 100644 index 000000000..4ed321cb1 --- /dev/null +++ b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/sns/ore_sack.json @@ -0,0 +1,18 @@ +{ + "name": "Мешок для руды", + "category": "tfc:sacks_n_such", + "icon": "sns:ore_sack", + "pages": [ + { + "type": "patchouli:spotlight", + "item": "sns:ore_sack", + "text": "$(item)Мешок для руды$() — это тип $(l:sns/item_containers)предметного контейнера$(), предназначенный для хранения больших количеств одного вида руды или подобных предметов, что делает его чрезвычайно полезным при добыче руды. $(br2)По умолчанию он вмещает ошеломляющие 512 предметов." + }, + { + "type": "patchouli:crafting", + "recipe": "sns:crafting/ore_sack", + "text": "Для авторов модпаков или просто тех, кто хочет добавить дополнительные руды, смотрите тег $(bold)sns:allowed_in_ore_sack$() — большинство аддонов должно поддерживаться автоматически." + } + ], + "read_by_default": true +} \ No newline at end of file diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/sns/quiver.json b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/sns/quiver.json new file mode 100644 index 000000000..490102889 --- /dev/null +++ b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/sns/quiver.json @@ -0,0 +1,18 @@ +{ + "name": "Колчан", + "category": "tfc:sacks_n_such", + "icon": "sns:quiver", + "pages": [ + { + "type": "patchouli:spotlight", + "item": "sns:quiver", + "text": "$(item)Колчан$() — это тип $(l:sns/item_containers)предметного контейнера$() и лучший друг любого любителя дальнего боя, будь то тот, кто любит $(item)копья$(), или предпочитающий лук. $(br)При использовании лука предметы для \"боеприпасов\" берутся сначала из колчана, а также он заменяет метаемые копья." + }, + { + "type": "tfc:knapping_recipe", + "recipe": "sns:leather_knapping/quiver", + "text": "Для авторов модпаков или просто тех, кто хочет добавить поддержку дополнительных \"боеприпасов\", смотрите тег $(bold)sns:allowed_in_quiver$(). Учтите, что пополнение копий работает только с копьями TFC (или из аддонов)." + } + ], + "read_by_default": true +} \ No newline at end of file diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/sns/safety_toe_hiking_boots.json b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/sns/safety_toe_hiking_boots.json new file mode 100644 index 000000000..f9b9fe101 --- /dev/null +++ b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/sns/safety_toe_hiking_boots.json @@ -0,0 +1,22 @@ +{ + "name": "Стальные походные ботинки", + "category": "tfc:sacks_n_such", + "icon": "sns:steel_toe_hiking_boots", + "pages": [ + { + "type": "patchouli:text", + "text": "Как $(l:sns/hiking_boots)походные ботинки$(), но безопаснее благодаря стальным носкам. Жаль только, что никто ещё не изобрёл каску" + }, + { + "type": "patchouli:crafting", + "recipe": "sns:crafting/steel_toe_hiking_boots", + "recipe2": "sns:crafting/black_steel_toe_hiking_boots" + }, + { + "type": "patchouli:crafting", + "recipe": "sns:crafting/blue_steel_toe_hiking_boots", + "recipe2": "sns:crafting/red_steel_toe_hiking_boots" + } + ], + "read_by_default": true +} \ No newline at end of file diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/sns/seed_pouch.json b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/sns/seed_pouch.json new file mode 100644 index 000000000..4dfa29a7b --- /dev/null +++ b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/sns/seed_pouch.json @@ -0,0 +1,18 @@ +{ + "name": "Мешочек для семян", + "category": "tfc:sacks_n_such", + "icon": "sns:seed_pouch", + "pages": [ + { + "type": "patchouli:spotlight", + "item": "sns:seed_pouch", + "text": "$(item)Мешочек для семян$() — это тип $(l:sns/item_containers)предметного контейнера$(), предназначенный для хранения большого разнообразия семян, что делает его очень полезным при фермерстве. $(br2)По умолчанию в нём 27 слотов, каждый из которых может вмещать до 64 семян." + }, + { + "type": "patchouli:crafting", + "recipe": "sns:crafting/seed_pouch", + "text": "Для авторов модпаков или просто тех, кто хочет добавить дополнительные семена, смотрите тег $(bold)sns:allowed_in_seed_pouch$() — большинство аддонов должно поддерживаться автоматически." + } + ], + "read_by_default": true +} \ No newline at end of file diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/sns/straw_basket.json b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/sns/straw_basket.json new file mode 100644 index 000000000..595d55dce --- /dev/null +++ b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/sns/straw_basket.json @@ -0,0 +1,17 @@ +{ + "name": "Соломенная корзина", + "category": "tfc:sacks_n_such", + "icon": "sns:straw_basket", + "pages": [ + { + "type": "patchouli:spotlight", + "item": "sns:straw_basket", + "text": "$(item)Соломенная корзина$() — это тип $(l:sns/item_containers)предметного контейнера$() и по сути является более дешёвым сосудом. По умолчанию она может вмещать предметы максимум $(thing)маленького$() размера." + }, + { + "type": "patchouli:crafting", + "recipe": "sns:crafting/straw_basket" + } + ], + "read_by_default": true +} \ No newline at end of file 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 e09e96b18..f06711814 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 @@ -44,7 +44,7 @@ }, { "Type": "patchouli:text", - "text": "$(li)Сфалерит: $(l:tfg_ores/earth_vein_index#normal_sphalerite)40%$(/l), $(l:tfg_ores/earth_vein_index#surface_sphalerite)40%$(/l), $(l:tfg_ores/earth_vein_index#normal_sulfur)15%$(/l)$()$(li)Тальк: $(l:tfg_ores/earth_vein_index#normal_lubricant)20%$(/l)$()$(li)Танталит: $(l:tfg_ores/earth_vein_index#normal_manganese)12%$(/l)$()$(li)Таркианит: $(l:tfg_ores/earth_vein_index#normal_tarkianite)35%$(/l)$()$(li)Тетраэдрит: $(l:tfg_ores/earth_vein_index#surface_tetrahedrite)60%$(/l), $(l:tfg_ores/earth_vein_index#normal_tetrahedrite)50%$(/l)$()$(li)Топаз: $(l:tfg_ores/earth_vein_index#deep_topaz)25%$(/l)$()$(li)Торий: $(l:tfg_ores/earth_vein_index#normal_beryllium)15%$(/l)$()$(li)Трикальцийфосфат: $(l:tfg_ores/earth_vein_index#normal_apatite)35%$(/l)$()$(li)Трона: $(l:tfg_ores/earth_vein_index#normal_lubricant)10%$(/l), $(l:tfg_ores/earth_vein_index#normal_tarkianite)10%$(/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#deep_pitchblende)25%$(/l)$()$(li)Уранит: $(l:tfg_ores/earth_vein_index#deep_pitchblende)62%$(/l)$()$(li)Халькозин: $(l:tfg_ores/earth_vein_index#deep_topaz)25%$(/l)$()$(li)Халькопирит: $(l:tfg_ores/earth_vein_index#surface_copper)61%$(/l), $(l:tfg_ores/earth_vein_index#normal_copper)20%$(/l)$()", + "text": "$(li)Сфалерит: $(l:tfg_ores/earth_vein_index#normal_sphalerite)40%$(/l), $(l:tfg_ores/earth_vein_index#surface_sphalerite)40%$(/l), $(l:tfg_ores/earth_vein_index#normal_sulfur)15%$(/l)$()$(li)Тальк: $(l:tfg_ores/earth_vein_index#normal_lubricant)20%$(/l)$()$(li)Танталит: $(l:tfg_ores/earth_vein_index#normal_manganese)12%$(/l)$()$(li)Таркианит: $(l:tfg_ores/earth_vein_index#normal_tarkianite)35%$(/l)$()$(li)Тетраэдрит: $(l:tfg_ores/earth_vein_index#surface_tetrahedrite)60%$(/l), $(l:tfg_ores/earth_vein_index#normal_tetrahedrite)50%$(/l)$()$(li)Топаз: $(l:tfg_ores/earth_vein_index#deep_topaz)25%$(/l)$()$(li)Торианит: $(l:tfg_ores/earth_vein_index#normal_beryllium)15%$(/l)$()$(li)Трикальцийфосфат: $(l:tfg_ores/earth_vein_index#normal_apatite)35%$(/l)$()$(li)Трона: $(l:tfg_ores/earth_vein_index#normal_lubricant)10%$(/l), $(l:tfg_ores/earth_vein_index#normal_tarkianite)10%$(/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#deep_pitchblende)25%$(/l)$()$(li)Уранит: $(l:tfg_ores/earth_vein_index#deep_pitchblende)62%$(/l)$()$(li)Халькозин: $(l:tfg_ores/earth_vein_index#deep_topaz)25%$(/l)$()$(li)Халькопирит: $(l:tfg_ores/earth_vein_index#surface_copper)61%$(/l), $(l:tfg_ores/earth_vein_index#normal_copper)20%$(/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 7de77292e..6a322a0db 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 @@ -1488,7 +1488,7 @@ }, { "Type": "patchouli:multiblock", - "name": "Торий", + "name": "Торианит", "multiblock": { "mapping": { "0": "#forge:ores/thorium" @@ -1503,7 +1503,7 @@ ] }, "enable_visualize": false, - "text": "$(thing)Процент руды$(): 15%$(br)$(thing)Хромит$(): Торий$(br)$(thing)Формула$(): Th", + "text": "$(thing)Процент руды$(): 15%$(br)$(thing)Хромит$(): Торий$(br)$(thing)Формула$(): ThO₂", "type": "patchouli:multiblock" }, { diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/mars_ore_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/mars_ore_index.json index c2696cce5..a5f42705b 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/mars_ore_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/mars_ore_index.json @@ -19,22 +19,27 @@ }, { "Type": "patchouli:text", - "text": "$(li)Гётит: $(l:tfg_ores/mars_vein_index#mars_hematite)15%$(/l)$()$(li)Гипс: $(l:tfg_ores/mars_vein_index#mars_surface_bismuthinite)20%$(/l)$()$(li)Глауконитовый песок: $(l:tfg_ores/mars_vein_index#mars_lubricant)7%$(/l)$()$(li)Графит: $(l:tfg_ores/mars_vein_index#mars_graphite)45%$(/l)$()$(li)Гроссуляр: $(l:tfg_ores/mars_vein_index#mars_tantalite)10%$(/l)$()$(li)Жёлтый лимонит: $(l:tfg_ores/mars_vein_index#mars_hematite)30%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_hematite)33%$(/l)$()$(li)Зелёный сапфир: $(l:tfg_ores/mars_vein_index#mars_almandine)15%$(/l), $(l:tfg_ores/mars_vein_index#mars_sapphire)5%$(/l)$()$(li)Изумруд: $(l:tfg_ores/mars_vein_index#mars_beryllium)50%$(/l)$()$(li)Кальцит: $(l:tfg_ores/mars_vein_index#mars_surface_hematite)5%$(/l)$()$(li)Каменная соль: $(l:tfg_ores/mars_vein_index#mars_salt)20%$(/l)$()$(li)Касситерит: $(l:tfg_ores/mars_vein_index#mars_surface_cassiterite)55%$(/l)$()$(li)Кварцит: $(l:tfg_ores/mars_vein_index#mars_quartzite)41%$(/l)$()$(li)Кобальтит: $(l:tfg_ores/mars_vein_index#mars_nickel)28%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_nickel_galena)11%$(/l)$()$(li)Лепидолит: $(l:tfg_ores/mars_vein_index#mars_salt)15%$(/l)$()", + "text": "$(li)Гётит: $(l:tfg_ores/mars_vein_index#mars_hematite)15%$(/l)$()$(li)Гипс: $(l:tfg_ores/mars_vein_index#mars_surface_bismuthinite)20%$(/l)$()$(li)Глауконитовый песок: $(l:tfg_ores/mars_vein_index#mars_lubricant)7%$(/l)$()$(li)Графит: $(l:tfg_ores/mars_vein_index#mars_graphite)45%$(/l)$()$(li)Гроссуляр: $(l:tfg_ores/mars_vein_index#mars_tantalite)10%$(/l)$()$(li)Жёлтый лимонит: $(l:tfg_ores/mars_vein_index#mars_hematite)30%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_hematite)33%$(/l)$()$(li)Зелёный сапфир: $(l:tfg_ores/mars_vein_index#mars_almandine)15%$(/l), $(l:tfg_ores/mars_vein_index#mars_sapphire)5%$(/l)$()$(li)Изумруд: $(l:tfg_ores/mars_vein_index#mars_beryllium)50%$(/l)$()$(li)Кальцит: $(l:tfg_ores/mars_vein_index#mars_lapis)15%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_hematite)5%$(/l)$()$(li)Каменная соль: $(l:tfg_ores/mars_vein_index#mars_salt)20%$(/l)$()$(li)Касситерит: $(l:tfg_ores/mars_vein_index#mars_surface_cassiterite)55%$(/l)$()$(li)Кварцит: $(l:tfg_ores/mars_vein_index#mars_quartzite)41%$(/l)$()$(li)Кобальтит: $(l:tfg_ores/mars_vein_index#mars_nickel)28%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_nickel_galena)11%$(/l)$()$(li)Лазурит: $(l:tfg_ores/mars_vein_index#mars_lapis)35%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)Литий: $(l:tfg_ores/mars_vein_index#mars_tungsten)19%$(/l)$()$(li)Монацит: $(l:tfg_ores/mars_vein_index#mars_neodynium)29%$(/l)$()$(li)Мыльный камень: $(l:tfg_ores/mars_vein_index#mars_lubricant)21%$(/l)$()$(li)Неодим: $(l:tfg_ores/mars_vein_index#mars_neodynium)5%$(/l)$()$(li)Никель: $(l:tfg_ores/mars_vein_index#deep_mars_sheldonite)25%$(/l), $(l:tfg_ores/mars_vein_index#mars_nickel)28%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_nickel_galena)23%$(/l)$()$(li)Олово: $(l:tfg_ores/mars_vein_index#mars_surface_cassiterite)35%$(/l)$()$(li)Пентландит: $(l:tfg_ores/mars_vein_index#mars_lubricant)7%$(/l)$()$(li)Пирит: $(l:tfg_ores/mars_vein_index#mars_sulfur)42%$(/l), $(l:tfg_ores/mars_vein_index#mars_copper)10%$(/l)$()$(li)Пиролюзит: $(l:tfg_ores/mars_vein_index#mars_tantalite)42%$(/l)$()$(li)Пироп: $(l:tfg_ores/mars_vein_index#mars_almandine)26%$(/l)$()$(li)Пирохлор: $(l:tfg_ores/mars_vein_index#mars_apatite)14%$(/l)$()$(li)Платина: $(l:tfg_ores/mars_vein_index#deep_mars_sheldonite)15%$(/l)$()$(li)Реальгар: $(l:tfg_ores/mars_vein_index#mars_beryllium)15%$(/l)$()$(li)Редстоун: $(l:tfg_ores/mars_vein_index#deep_mars_chromite)45%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_tetrahedrite)4%$(/l)$()", + "text": "$(li)Лазурит 2: $(l:tfg_ores/mars_vein_index#mars_lapis)25%$(/l)$()$(li)Лепидолит: $(l:tfg_ores/mars_vein_index#mars_salt)15%$(/l)$()$(li)Литий: $(l:tfg_ores/mars_vein_index#mars_tungsten)19%$(/l)$()$(li)Монацит: $(l:tfg_ores/mars_vein_index#mars_neodynium)29%$(/l)$()$(li)Мыльный камень: $(l:tfg_ores/mars_vein_index#mars_lubricant)21%$(/l)$()$(li)Неодим: $(l:tfg_ores/mars_vein_index#mars_neodynium)5%$(/l)$()$(li)Никель: $(l:tfg_ores/mars_vein_index#deep_mars_sheldonite)25%$(/l), $(l:tfg_ores/mars_vein_index#mars_nickel)28%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_nickel_galena)23%$(/l)$()$(li)Олово: $(l:tfg_ores/mars_vein_index#mars_surface_cassiterite)35%$(/l)$()$(li)Пентландит: $(l:tfg_ores/mars_vein_index#mars_lubricant)7%$(/l)$()$(li)Пирит: $(l:tfg_ores/mars_vein_index#mars_sulfur)42%$(/l), $(l:tfg_ores/mars_vein_index#mars_copper)10%$(/l)$()$(li)Пиролюзит: $(l:tfg_ores/mars_vein_index#mars_tantalite)42%$(/l)$()$(li)Пироп: $(l:tfg_ores/mars_vein_index#mars_almandine)26%$(/l)$()$(li)Пирохлор: $(l:tfg_ores/mars_vein_index#mars_apatite)14%$(/l)$()$(li)Платина: $(l:tfg_ores/mars_vein_index#deep_mars_sheldonite)15%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)Рубин: $(l:tfg_ores/mars_vein_index#deep_mars_chromite)35%$(/l)$()$(li)Самородная Золото: $(l:tfg_ores/mars_vein_index#mars_sapphire)55%$(/l), $(l:tfg_ores/mars_vein_index#mars_hematite)5%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_hematite)5%$(/l)$()$(li)Самородная Медь: $(l:tfg_ores/mars_vein_index#mars_stibnite)28%$(/l), $(l:tfg_ores/mars_vein_index#mars_copper)20%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_tetrahedrite)19%$(/l)$()$(li)Самородная Серебро: $(l:tfg_ores/mars_vein_index#mars_galena)20%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_nickel_galena)11%$(/l)$()$(li)Сапфир: $(l:tfg_ores/mars_vein_index#mars_almandine)15%$(/l)$()$(li)Свинец: $(l:tfg_ores/mars_vein_index#mars_galena)33%$(/l)$()$(li)Селитра: $(l:tfg_ores/mars_vein_index#mars_surface_cassiterite)10%$(/l)$()$(li)Сера: $(l:tfg_ores/mars_vein_index#mars_sulfur)14%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_bismuthinite)20%$(/l)$()$(li)Соль: $(l:tfg_ores/mars_vein_index#mars_salt)30%$(/l)$()$(li)Спасерит: $(l:tfg_ores/mars_vein_index#mars_tantalite)10%$(/l)$()$(li)Сподумен: $(l:tfg_ores/mars_vein_index#mars_salt)35%$(/l)$()$(li)Стибнит: $(l:tfg_ores/mars_vein_index#mars_stibnite)19%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_tetrahedrite)19%$(/l)$()$(li)Сфалерит: $(l:tfg_ores/mars_vein_index#mars_sulfur)23%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_nickel_galena)17%$(/l)$()$(li)Тальк: $(l:tfg_ores/mars_vein_index#mars_lubricant)21%$(/l)$()", + "text": "$(li)Реальгар: $(l:tfg_ores/mars_vein_index#mars_beryllium)15%$(/l)$()$(li)Редстоун: $(l:tfg_ores/mars_vein_index#deep_mars_chromite)45%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_tetrahedrite)4%$(/l)$()$(li)Рубин: $(l:tfg_ores/mars_vein_index#deep_mars_chromite)35%$(/l)$()$(li)Самородная Золото: $(l:tfg_ores/mars_vein_index#mars_sapphire)55%$(/l), $(l:tfg_ores/mars_vein_index#mars_hematite)5%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_hematite)5%$(/l)$()$(li)Самородная Медь: $(l:tfg_ores/mars_vein_index#mars_stibnite)28%$(/l), $(l:tfg_ores/mars_vein_index#mars_copper)20%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_tetrahedrite)19%$(/l)$()$(li)Самородная Серебро: $(l:tfg_ores/mars_vein_index#mars_galena)20%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_nickel_galena)11%$(/l)$()$(li)Сапфир: $(l:tfg_ores/mars_vein_index#mars_almandine)15%$(/l)$()$(li)Свинец: $(l:tfg_ores/mars_vein_index#mars_galena)33%$(/l)$()$(li)Селитра: $(l:tfg_ores/mars_vein_index#mars_surface_cassiterite)10%$(/l)$()$(li)Сера: $(l:tfg_ores/mars_vein_index#mars_sulfur)14%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_bismuthinite)20%$(/l)$()$(li)Содалит: $(l:tfg_ores/mars_vein_index#mars_lapis)25%$(/l)$()$(li)Соль: $(l:tfg_ores/mars_vein_index#mars_salt)30%$(/l)$()$(li)Спасерит: $(l:tfg_ores/mars_vein_index#mars_tantalite)10%$(/l)$()$(li)Сподумен: $(l:tfg_ores/mars_vein_index#mars_salt)35%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)Танталит: $(l:tfg_ores/mars_vein_index#mars_tantalite)36%$(/l)$()$(li)Тетраэдрит: $(l:tfg_ores/mars_vein_index#mars_surface_tetrahedrite)57%$(/l), $(l:tfg_ores/mars_vein_index#mars_stibnite)47%$(/l)$()$(li)Торий: $(l:tfg_ores/mars_vein_index#deep_mars_pitchblende)26%$(/l), $(l:tfg_ores/mars_vein_index#mars_pitchblende)29%$(/l)$()$(li)Трикальцийфосфат: $(l:tfg_ores/mars_vein_index#mars_apatite)33%$(/l)$()$(li)Трона: $(l:tfg_ores/mars_vein_index#mars_lubricant)35%$(/l)$()$(li)Уголь: $(l:tfg_ores/mars_vein_index#mars_coal)70%$(/l), $(l:tfg_ores/mars_vein_index#mars_graphite)25%$(/l)$()$(li)Уранинит: $(l:tfg_ores/mars_vein_index#deep_mars_pitchblende)21%$(/l)$()$(li)Уранит: $(l:tfg_ores/mars_vein_index#deep_mars_pitchblende)52%$(/l), $(l:tfg_ores/mars_vein_index#mars_pitchblende)41%$(/l)$()$(li)Халькопирит: $(l:tfg_ores/mars_vein_index#mars_copper)65%$(/l)$()$(li)Хромит: $(l:tfg_ores/mars_vein_index#deep_mars_chromite)20%$(/l)$()$(li)Шеелит: $(l:tfg_ores/mars_vein_index#mars_tungsten)42%$(/l)$()$(li)Шелдонит: $(l:tfg_ores/mars_vein_index#deep_mars_sheldonite)25%$(/l)$()$(li)Электротин: $(l:tfg_ores/mars_vein_index#mars_sapphire)20%$(/l)$()", + "text": "$(li)Стибнит: $(l:tfg_ores/mars_vein_index#mars_stibnite)19%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_tetrahedrite)19%$(/l)$()$(li)Сфалерит: $(l:tfg_ores/mars_vein_index#mars_sulfur)23%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_nickel_galena)17%$(/l)$()$(li)Тальк: $(l:tfg_ores/mars_vein_index#mars_lubricant)21%$(/l)$()$(li)Танталит: $(l:tfg_ores/mars_vein_index#mars_tantalite)36%$(/l)$()$(li)Тетраэдрит: $(l:tfg_ores/mars_vein_index#mars_surface_tetrahedrite)57%$(/l), $(l:tfg_ores/mars_vein_index#mars_stibnite)47%$(/l)$()$(li)Торианит: $(l:tfg_ores/mars_vein_index#deep_mars_pitchblende)26%$(/l), $(l:tfg_ores/mars_vein_index#mars_pitchblende)29%$(/l)$()$(li)Трикальцийфосфат: $(l:tfg_ores/mars_vein_index#mars_apatite)33%$(/l)$()$(li)Трона: $(l:tfg_ores/mars_vein_index#mars_lubricant)35%$(/l)$()$(li)Уголь: $(l:tfg_ores/mars_vein_index#mars_coal)70%$(/l), $(l:tfg_ores/mars_vein_index#mars_graphite)25%$(/l)$()$(li)Уранинит: $(l:tfg_ores/mars_vein_index#deep_mars_pitchblende)21%$(/l)$()$(li)Уранит: $(l:tfg_ores/mars_vein_index#deep_mars_pitchblende)52%$(/l), $(l:tfg_ores/mars_vein_index#mars_pitchblende)41%$(/l)$()$(li)Халькопирит: $(l:tfg_ores/mars_vein_index#mars_copper)65%$(/l)$()$(li)Хромит: $(l:tfg_ores/mars_vein_index#deep_mars_chromite)20%$(/l)$()$(li)Шеелит: $(l:tfg_ores/mars_vein_index#mars_tungsten)42%$(/l)$()", + "type": "patchouli:text" + }, + { + "Type": "patchouli:text", + "text": "$(li)Шелдонит: $(l:tfg_ores/mars_vein_index#deep_mars_sheldonite)25%$(/l)$()$(li)Электротин: $(l:tfg_ores/mars_vein_index#mars_sapphire)20%$(/l)$()", "type": "patchouli:text" } ], 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 660f54d6d..113854729 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 @@ -14,12 +14,12 @@ }, { "Type": "patchouli:text", - "text": "$(li)$(l:tfg_ores/mars_vein_index#mars_almandine)Almandine & Sapphire$()$()$(li)$(l:tfg_ores/mars_vein_index#deep_mars_sheldonite)Bornite & Cooperite$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_coal)Coal & Hematite$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_sapphire)Gold, Electrotine, & Bauxite$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_pitchblende)Pitchblende, Thorium, & Hematite$()$()$(li)$(l:tfg_ores/mars_vein_index#deep_mars_pitchblende)Pitchblende, Thorium, & Uraninite$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_quartzite)Quartzite, Asbestos, & Barite$()$()$(li)$(l:tfg_ores/mars_vein_index#deep_mars_chromite)Redstone & Chromite$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_salt)Salts & Spodumene$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_surface_nickel_galena)Sphalerite & Galena$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_lubricant)Trona, Talc, & Glauconite$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_apatite)Апатит и Пирохлор$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_neodynium)Бастнезит и Монацит$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_surface_bismuthinite)Висмут$()$()", + "text": "$(li)$(l:tfg_ores/mars_vein_index#mars_almandine)Almandine & Sapphire$()$()$(li)$(l:tfg_ores/mars_vein_index#deep_mars_sheldonite)Bornite & Cooperite$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_coal)Coal & Hematite$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_sapphire)Gold, Electrotine, & Bauxite$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_pitchblende)Pitchblende & Thorianite, & Hematite$()$()$(li)$(l:tfg_ores/mars_vein_index#deep_mars_pitchblende)Pitchblende, Thorianite, & Uraninite$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_quartzite)Quartzite, Asbestos, & Barite$()$()$(li)$(l:tfg_ores/mars_vein_index#deep_mars_chromite)Redstone & Chromite$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_salt)Salts & Spodumene$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_surface_nickel_galena)Sphalerite & Galena$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_lubricant)Trona, Talc, & Glauconite$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_apatite)Апатит и Пирохлор$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_neodynium)Бастнезит и Монацит$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_surface_bismuthinite)Висмут$()$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)$(l:tfg_ores/mars_vein_index#mars_nickel)Гарниерит и Кобальтит$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_hematite)Гематит и Лимонит$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_surface_hematite)Гематит и Лимонит$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_graphite)Графит и Алмаз$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_beryllium)Изумруд и Бериллий$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_surface_cassiterite)Касситерит$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_tantalite)Марганец и Тантал$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_copper)Медь и Халькопирит$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_galena)Серебро, Галена и Свинец$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_sulfur)Сфалерит & Пирит$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_stibnite)Тетраэдрит (обычный)$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_surface_tetrahedrite)Тетраэдрит (Поверхностный)$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_tungsten)Шеелит и Вольфрамат$()$()", + "text": "$(li)$(l:tfg_ores/mars_vein_index#mars_nickel)Гарниерит и Кобальтит$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_hematite)Гематит и Лимонит$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_surface_hematite)Гематит и Лимонит$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_graphite)Графит и Алмаз$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_beryllium)Изумруд и Бериллий$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_surface_cassiterite)Касситерит$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_lapis)Лазурит, Лазурит 2 и Содалит$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_tantalite)Марганец и Тантал$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_copper)Медь и Халькопирит$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_galena)Серебро, Галена и Свинец$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_sulfur)Сфалерит & Пирит$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_stibnite)Тетраэдрит (обычный)$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_surface_tetrahedrite)Тетраэдрит (Поверхностный)$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_tungsten)Шеелит и Вольфрамат$()$()", "type": "patchouli:text" }, { @@ -373,7 +373,7 @@ { "Type": "patchouli:text", "text": "$(thing)Редкость$(): 220$(br)$(thing)Плотность$(): 0.55$(br)$(thing)Вид$(): кластерная жила$(br)$(thing)Y-уровень$(): 0 — 70$(br)$(thing)Размер$(): 20$(br)$(thing)Индикатор Max Depth$(): 15$(br2)$(thing)Виды камней$(): Red Granite, Аргиллит, Габбро, Дацит, Диорит, Доломит, Конгломерат, Сланец, Трахит", - "title": "Pitchblende, Thorium, & Hematite", + "title": "Pitchblende & Thorianite, & Hematite", "type": "patchouli:text", "anchor": "mars_pitchblende" }, @@ -399,7 +399,7 @@ }, { "Type": "patchouli:multiblock", - "name": "Торий", + "name": "Торианит", "multiblock": { "mapping": { "0": "#forge:ores/thorium" @@ -414,7 +414,7 @@ ] }, "enable_visualize": false, - "text": "$(thing)Процент руды$(): 29%$(br)$(thing)Хромит$(): Торий$(br)$(thing)Формула$(): Th", + "text": "$(thing)Процент руды$(): 29%$(br)$(thing)Хромит$(): Торий$(br)$(thing)Формула$(): ThO₂", "type": "patchouli:multiblock" }, { @@ -440,7 +440,7 @@ { "Type": "patchouli:text", "text": "$(thing)Редкость$(): 370$(br)$(thing)Плотность$(): 0.3$(br)$(thing)Вид$(): кластерная жила$(br)$(thing)Y-уровень$(): -20 — 0$(br)$(thing)Размер$(): 60$(br)$(thing)Индикатор Max Depth$(): 20$(br2)$(thing)Виды камней$(): Аргиллит, Аргиллит, Габбро, Дацит, Диорит, Сланец, Трахит", - "title": "Pitchblende, Thorium, & Uraninite", + "title": "Pitchblende, Thorianite, & Uraninite", "type": "patchouli:text", "anchor": "deep_mars_pitchblende" }, @@ -466,7 +466,7 @@ }, { "Type": "patchouli:multiblock", - "name": "Торий", + "name": "Торианит", "multiblock": { "mapping": { "0": "#forge:ores/thorium" @@ -481,7 +481,7 @@ ] }, "enable_visualize": false, - "text": "$(thing)Процент руды$(): 26%$(br)$(thing)Хромит$(): Торий$(br)$(thing)Формула$(): Th", + "text": "$(thing)Процент руды$(): 26%$(br)$(thing)Хромит$(): Торий$(br)$(thing)Формула$(): ThO₂", "type": "patchouli:multiblock" }, { @@ -1772,6 +1772,98 @@ "text": "$(thing)Процент руды$(): 10%$(br)$(thing)Хромит$(): Калий, Азот$(br)$(thing)Формула$(): KNO₃", "type": "patchouli:multiblock" }, + { + "Type": "patchouli:text", + "text": "$(thing)Редкость$(): 200$(br)$(thing)Плотность$(): 0.25$(br)$(thing)Вид$(): кластерная жила$(br)$(thing)Y-уровень$(): 0 — 70$(br)$(thing)Размер$(): 30$(br)$(thing)Индикатор Max Depth$(): 20$(br2)$(thing)Виды камней$(): Аргиллит, Доломит, Известняк, Кремнистый сланец, Мел, Сланец", + "title": "Лазурит, Лазурит 2 и Содалит", + "type": "patchouli:text", + "anchor": "mars_lapis" + }, + { + "Type": "patchouli:multiblock", + "name": "Лазурит", + "multiblock": { + "mapping": { + "0": "#forge:ores/lazurite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Процент руды$(): 35%$(br)$(thing)Хромит$(): Алюминий, Кальций, Натрий$(br)$(thing)Формула$(): Al₆Si₆Ca₈Na₈", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Содалит", + "multiblock": { + "mapping": { + "0": "#forge:ores/sodalite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Процент руды$(): 25%$(br)$(thing)Хромит$(): Алюминий, Натрий$(br)$(thing)Формула$(): Al₃Si₃Na₄Cl", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Лазурит 2", + "multiblock": { + "mapping": { + "0": "#forge:ores/lapis" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Процент руды$(): 25%$(br)$(thing)Хромит$(): Лазурит, Содалит, Пирит, Кальцит", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Кальцит", + "multiblock": { + "mapping": { + "0": "#forge:ores/calcite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Процент руды$(): 15%$(br)$(thing)Хромит$(): Кальций$(br)$(thing)Формула$(): CaCO₃", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:empty", + "draw_filler": true, + "type": "patchouli:empty" + }, { "Type": "patchouli:text", "text": "$(thing)Редкость$(): 230$(br)$(thing)Плотность$(): 0.3$(br)$(thing)Вид$(): кластерная жила$(br)$(thing)Y-уровень$(): 0 — 70$(br)$(thing)Размер$(): 42$(br)$(thing)Индикатор Max Depth$(): 15$(br2)$(thing)Виды камней$(): Red Granite, Аргиллит, Аргиллит, Базальт, Габбро, Известняк, Кремнистый сланец, Мел, Сланец, Трахит", diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/moon_ore_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/moon_ore_index.json index 8b26f0086..02e19a806 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/moon_ore_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/moon_ore_index.json @@ -39,7 +39,7 @@ }, { "Type": "patchouli:text", - "text": "$(li)Топаз: $(l:tfg_ores/moon_vein_index#moon_topaz)25%$(/l)$()$(li)Торий: $(l:tfg_ores/moon_vein_index#moon_beryllium)0%$(/l)$()$(li)Трикальцийфосфат: $(l:tfg_ores/moon_vein_index#moon_apatite)33%$(/l)$()$(li)Трона: $(l:tfg_ores/moon_vein_index#moon_lubricant)10%$(/l)$()$(li)Халькозин: $(l:tfg_ores/moon_vein_index#moon_tetrahedrite)25%$(/l), $(l:tfg_ores/moon_vein_index#moon_topaz)25%$(/l)$()$(li)Халькопирит: $(l:tfg_ores/moon_vein_index#moon_cassiterite)35%$(/l)$()$(li)Хромит: $(l:tfg_ores/moon_vein_index#moon_magnetite)40%$(/l)$()$(li)Цеолит: $(l:tfg_ores/moon_vein_index#moon_cassiterite)5%$(/l)$()$(li)Ционит: $(l:tfg_ores/moon_vein_index#moon_mica)33%$(/l)$()$(li)Шеелит: $(l:tfg_ores/moon_vein_index#moon_scheelite)40%$(/l)$()$(li)Шелдонит: $(l:tfg_ores/moon_vein_index#moon_sheldonite)25%$(/l)$()$(li)Электротин: $(l:tfg_ores/moon_vein_index#moon_saltpeter)37%$(/l)$()", + "text": "$(li)Топаз: $(l:tfg_ores/moon_vein_index#moon_topaz)25%$(/l)$()$(li)Торианит: $(l:tfg_ores/moon_vein_index#moon_beryllium)0%$(/l)$()$(li)Трикальцийфосфат: $(l:tfg_ores/moon_vein_index#moon_apatite)33%$(/l)$()$(li)Трона: $(l:tfg_ores/moon_vein_index#moon_lubricant)10%$(/l)$()$(li)Халькозин: $(l:tfg_ores/moon_vein_index#moon_tetrahedrite)25%$(/l), $(l:tfg_ores/moon_vein_index#moon_topaz)25%$(/l)$()$(li)Халькопирит: $(l:tfg_ores/moon_vein_index#moon_cassiterite)35%$(/l)$()$(li)Хромит: $(l:tfg_ores/moon_vein_index#moon_magnetite)40%$(/l)$()$(li)Цеолит: $(l:tfg_ores/moon_vein_index#moon_cassiterite)5%$(/l)$()$(li)Ционит: $(l:tfg_ores/moon_vein_index#moon_mica)33%$(/l)$()$(li)Шеелит: $(l:tfg_ores/moon_vein_index#moon_scheelite)40%$(/l)$()$(li)Шелдонит: $(l:tfg_ores/moon_vein_index#moon_sheldonite)25%$(/l)$()$(li)Электротин: $(l:tfg_ores/moon_vein_index#moon_saltpeter)37%$(/l)$()", "type": "patchouli:text" } ], diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/moon_vein_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/moon_vein_index.json index 3ec2baac0..96a9e3acb 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/moon_vein_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/moon_vein_index.json @@ -1108,7 +1108,7 @@ }, { "Type": "patchouli:multiblock", - "name": "Торий", + "name": "Торианит", "multiblock": { "mapping": { "0": "#forge:ores/thorium" @@ -1123,7 +1123,7 @@ ] }, "enable_visualize": false, - "text": "$(thing)Процент руды$(): 0%$(br)$(thing)Хромит$(): Торий$(br)$(thing)Формула$(): Th", + "text": "$(thing)Процент руды$(): 0%$(br)$(thing)Хромит$(): Торий$(br)$(thing)Формула$(): ThO₂", "type": "patchouli:multiblock" }, { diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/nether_ore_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/nether_ore_index.json index c863eef1c..15f742923 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/nether_ore_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/nether_ore_index.json @@ -44,7 +44,7 @@ }, { "Type": "patchouli:text", - "text": "$(li)Тетраэдрит: $(l:tfg_ores/nether_vein_index#nether_tetrahedrite)50%$(/l)$()$(li)Топаз: $(l:tfg_ores/nether_vein_index#nether_topaz)25%$(/l)$()$(li)Торий: $(l:tfg_ores/nether_vein_index#nether_beryllium)0%$(/l)$()$(li)Трикальцийфосфат: $(l:tfg_ores/nether_vein_index#nether_apatite)35%$(/l)$()$(li)Трона: $(l:tfg_ores/nether_vein_index#nether_lubricant)10%$(/l)$()$(li)Уголь: $(l:tfg_ores/nether_vein_index#nether_graphite)15%$(/l)$()$(li)Уранинит: $(l:tfg_ores/nether_vein_index#nether_pitchblende)25%$(/l)$()$(li)Уранит: $(l:tfg_ores/nether_vein_index#nether_pitchblende)62%$(/l)$()$(li)Халькозин: $(l:tfg_ores/nether_vein_index#nether_topaz)25%$(/l)$()$(li)Халькопирит: $(l:tfg_ores/nether_vein_index#nether_copper)20%$(/l)$()$(li)Хромит: $(l:tfg_ores/nether_vein_index#nether_magnetite)10%$(/l)$()$(li)Ционит: $(l:tfg_ores/nether_vein_index#nether_mica)46%$(/l)$()$(li)Шеелит: $(l:tfg_ores/nether_vein_index#nether_scheelite)45%$(/l)$()$(li)Шелдонит: $(l:tfg_ores/nether_vein_index#nether_sheldonite)29%$(/l)$()", + "text": "$(li)Тетраэдрит: $(l:tfg_ores/nether_vein_index#nether_tetrahedrite)50%$(/l)$()$(li)Топаз: $(l:tfg_ores/nether_vein_index#nether_topaz)25%$(/l)$()$(li)Торианит: $(l:tfg_ores/nether_vein_index#nether_beryllium)0%$(/l)$()$(li)Трикальцийфосфат: $(l:tfg_ores/nether_vein_index#nether_apatite)35%$(/l)$()$(li)Трона: $(l:tfg_ores/nether_vein_index#nether_lubricant)10%$(/l)$()$(li)Уголь: $(l:tfg_ores/nether_vein_index#nether_graphite)15%$(/l)$()$(li)Уранинит: $(l:tfg_ores/nether_vein_index#nether_pitchblende)25%$(/l)$()$(li)Уранит: $(l:tfg_ores/nether_vein_index#nether_pitchblende)62%$(/l)$()$(li)Халькозин: $(l:tfg_ores/nether_vein_index#nether_topaz)25%$(/l)$()$(li)Халькопирит: $(l:tfg_ores/nether_vein_index#nether_copper)20%$(/l)$()$(li)Хромит: $(l:tfg_ores/nether_vein_index#nether_magnetite)10%$(/l)$()$(li)Ционит: $(l:tfg_ores/nether_vein_index#nether_mica)46%$(/l)$()$(li)Шеелит: $(l:tfg_ores/nether_vein_index#nether_scheelite)45%$(/l)$()$(li)Шелдонит: $(l:tfg_ores/nether_vein_index#nether_sheldonite)29%$(/l)$()", "type": "patchouli:text" }, { 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 75357dc97..010a8d22d 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 @@ -1182,7 +1182,7 @@ }, { "Type": "patchouli:multiblock", - "name": "Торий", + "name": "Торианит", "multiblock": { "mapping": { "0": "#forge:ores/thorium" @@ -1197,7 +1197,7 @@ ] }, "enable_visualize": false, - "text": "$(thing)Процент руды$(): 0%$(br)$(thing)Хромит$(): Торий$(br)$(thing)Формула$(): Th", + "text": "$(thing)Процент руды$(): 0%$(br)$(thing)Хромит$(): Торий$(br)$(thing)Формула$(): ThO₂", "type": "patchouli:multiblock" }, { diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/venus_ore_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/venus_ore_index.json index e6a7bcf43..1414a21b9 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/venus_ore_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/venus_ore_index.json @@ -1,7 +1,7 @@ { "__credits__": "This page was automatically generated by OresToFieldGuide.", "name": "Venus Ore Index", - "icon": "gtceu:sulfur_dust", + "icon": "vintageimprovements:sulfur", "category": "tfc:tfg_ores", "read_by_default": true, "secret": false, @@ -14,7 +14,7 @@ }, { "Type": "patchouli:text", - "text": "$(li)Каменная соль: $(l:tfg_ores/venus_vein_index#venus_manual_salt)20%$(/l)$()$(li)Лепидолит: $(l:tfg_ores/venus_vein_index#venus_manual_salt)15%$(/l)$()$(li)Пирит: $(l:tfg_ores/venus_vein_index#venus_manual_sulfur)35%$(/l)$()$(li)Сера: $(l:tfg_ores/venus_vein_index#venus_manual_sulfur)50%$(/l)$()$(li)Соль: $(l:tfg_ores/venus_vein_index#venus_manual_salt)50%$(/l)$()$(li)Сподумен: $(l:tfg_ores/venus_vein_index#venus_manual_salt)15%$(/l)$()$(li)Сфалерит: $(l:tfg_ores/venus_vein_index#venus_manual_sulfur)15%$(/l)$()", + "text": "$(li)Каменная соль: $(l:tfg_ores/venus_vein_index#venus_manual_salt)10%$(/l)$()$(li)Лепидолит: $(l:tfg_ores/venus_vein_index#venus_manual_salt)5%$(/l)$()$(li)Пирит: $(l:tfg_ores/venus_vein_index#venus_manual_sulfur)15%$(/l)$()$(li)Сера: $(l:tfg_ores/venus_vein_index#venus_manual_sulfur)80%$(/l)$()$(li)Соль: $(l:tfg_ores/venus_vein_index#venus_manual_salt)80%$(/l)$()$(li)Сподумен: $(l:tfg_ores/venus_vein_index#venus_manual_salt)5%$(/l)$()$(li)Сфалерит: $(l:tfg_ores/venus_vein_index#venus_manual_sulfur)5%$(/l)$()", "type": "patchouli:text" } ], 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 61a607b38..23eabe80c 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)Редкость$(): 100$(br)$(thing)Плотность$(): 0.2$(br)$(thing)Вид$(): дискообразная жила$(br)$(thing)Y-уровень$(): 40 — 65$(br)$(thing)Размер$(): 20$(br)$(thing)Высота$(): 6$(br)$(thing)Индикатор Max Depth$(): 30$(br2)$(thing)Виды камней$(): Андезит, Базальт, Дацит, Риолит, Травертин, Трахит$(br2)Only appears in the $(thing)Salt Flats$() biome.", + "text": "$(thing)Редкость$(): 30$(br)$(thing)Плотность$(): 0.2$(br)$(thing)Вид$(): дискообразная жила$(br)$(thing)Y-уровень$(): 40 — 65$(br)$(thing)Размер$(): 20$(br)$(thing)Высота$(): 6$(br)$(thing)Индикатор Max Depth$(): 30$(br2)$(thing)Виды камней$(): Андезит, Базальт, Дацит, Риолит, Травертин, Трахит$(br2)Only appears in the $(thing)Salt Flats$() biome.", "title": "Salts & Spodumene", "type": "patchouli:text", "anchor": "venus_manual_salt" @@ -41,7 +41,7 @@ ] }, "enable_visualize": false, - "text": "$(thing)Процент руды$(): 50%$(br)$(thing)Хромит$(): Натрий, Хлор$(br)$(thing)Формула$(): NaCl", + "text": "$(thing)Процент руды$(): 80%$(br)$(thing)Хромит$(): Натрий, Хлор$(br)$(thing)Формула$(): NaCl", "type": "patchouli:multiblock" }, { @@ -61,7 +61,7 @@ ] }, "enable_visualize": false, - "text": "$(thing)Процент руды$(): 20%$(br)$(thing)Хромит$(): Калий, Хлор$(br)$(thing)Формула$(): KCl", + "text": "$(thing)Процент руды$(): 10%$(br)$(thing)Хромит$(): Калий, Хлор$(br)$(thing)Формула$(): KCl", "type": "patchouli:multiblock" }, { @@ -81,7 +81,7 @@ ] }, "enable_visualize": false, - "text": "$(thing)Процент руды$(): 15%$(br)$(thing)Хромит$(): Калий, Литий, Алюминий, Фтор$(br)$(thing)Формула$(): KLi₃Al₄F₂O₁₀", + "text": "$(thing)Процент руды$(): 5%$(br)$(thing)Хромит$(): Калий, Литий, Алюминий, Фтор$(br)$(thing)Формула$(): KLi₃Al₄F₂O₁₀", "type": "patchouli:multiblock" }, { @@ -101,7 +101,7 @@ ] }, "enable_visualize": false, - "text": "$(thing)Процент руды$(): 15%$(br)$(thing)Хромит$(): Литий, Алюминий$(br)$(thing)Формула$(): LiAlSi₂O₆", + "text": "$(thing)Процент руды$(): 5%$(br)$(thing)Хромит$(): Литий, Алюминий$(br)$(thing)Формула$(): LiAlSi₂O₆", "type": "patchouli:multiblock" }, { @@ -111,7 +111,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)Редкость$(): 100$(br)$(thing)Плотность$(): 0.2$(br)$(thing)Вид$(): кластерная жила$(br)$(thing)Y-уровень$(): 40 — 65$(br)$(thing)Размер$(): 15$(br)$(thing)Индикатор Max Depth$(): 30$(br2)$(thing)Виды камней$(): Андезит, Базальт, Дацит, Риолит, Травертин, Трахит", + "text": "$(thing)Редкость$(): 30$(br)$(thing)Плотность$(): 0.2$(br)$(thing)Вид$(): кластерная жила$(br)$(thing)Y-уровень$(): 40 — 65$(br)$(thing)Размер$(): 20$(br)$(thing)Индикатор Max Depth$(): 30$(br2)$(thing)Виды камней$(): Андезит, Базальт, Дацит, Риолит, Травертин, Трахит", "title": "Сера и Пирит", "type": "patchouli:text", "anchor": "venus_manual_sulfur" @@ -133,7 +133,7 @@ ] }, "enable_visualize": false, - "text": "$(thing)Процент руды$(): 50%$(br)$(thing)Хромит$(): Сера$(br)$(thing)Формула$(): S", + "text": "$(thing)Процент руды$(): 80%$(br)$(thing)Хромит$(): Сера$(br)$(thing)Формула$(): S", "type": "patchouli:multiblock" }, { @@ -153,7 +153,7 @@ ] }, "enable_visualize": false, - "text": "$(thing)Процент руды$(): 35%$(br)$(thing)Плавится в$(): Железо$(br)$(thing)Формула$(): FeS₂", + "text": "$(thing)Процент руды$(): 15%$(br)$(thing)Плавится в$(): Железо$(br)$(thing)Формула$(): FeS₂", "type": "patchouli:multiblock" }, { @@ -173,7 +173,7 @@ ] }, "enable_visualize": false, - "text": "$(thing)Процент руды$(): 15%$(br)$(thing)Плавится в$(): Цинк$(br)$(thing)Формула$(): ZnS", + "text": "$(thing)Процент руды$(): 5%$(br)$(thing)Плавится в$(): Цинк$(br)$(thing)Формула$(): ZnS", "type": "patchouli:multiblock" } ], diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_tips/faqs.json b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_tips/faqs.json new file mode 100644 index 000000000..cfe128d36 --- /dev/null +++ b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_tips/faqs.json @@ -0,0 +1,43 @@ +{ + "name": "Часто задаваемые вопросы", + "icon": "minecraft:spyglass", + "category": "tfc:tfg_tips", + "read_by_default": true, + "priority": true, + "pages": + [ + { + "type": "patchouli:text", + "title": "ЧАВО", + "text": "Застрял на чём-то? Попробуй сначала просмотреть эту книгу и задания, но если ты все еще не можешь найти ответ, ты можешь задать вопрос на нашем сайте. $(l:https://discord.com/invite/AEaCzCTUwQ)Discord$() или $(l:https://www.reddit.com/r/TerraFirmaGreg)Subreddit$()!" + }, + { + "type": "patchouli:text", + "text": "$(li)$(l:tfg_tips/faqs#boats)Почему моя лодка тонет?$()$(li)$(l:tfg_tips/faqs#dried_fruit)Как мне сделать дрожжи?$()$(li)$(l:tfg_tips/faqs#dried_fruit)Как мне сделать ананосовое волокно?$()$(li)$(l:tfg_tips/faqs#resin)Как мне сделать резину?$()$(li)$(l:tfg_tips/faqs#chunks)Как подгрузить чанки или увеличить их лимит?$()" + }, + { + "type": "patchouli:text", + "anchor": "boats", + "text": "$(italic)Почему моя лодка тонет?$()$(br2)Постройте лодку на суше, а затем толкайте её или используйте $(item)поводок$(), чтобы толкать ее. Если она уже затонула, ничего страшного, сделайте новое." + }, + { + "type": "patchouli:text", + "anchor": "dried_fruit", + "text": "$(italic)Как мне сделать дрожжи или ананосовое волокно?$()$(br2)Перед использованием обязательно высушите фрукты используя $(item)Настил для сушки$(). Затем выполните остальные шаги для $(l:firmalife/bread)хлеба$() или $(l:firmalife/berry_bushes)ананасовой кожи$()." + }, + { + "type": "patchouli:text", + "anchor": "chunks", + "text": "$(italic)Как подгрузить чанки или увеличить их лимит?$()$(br2)Открой карту на клавишу $(item)$(k:key.ftbchunks.claim_manager)$(), затем shift ЛКМ по чанку. Shift ПКМ для снятия клейма.$(br2)Для увеличения количества подгружаемых чанков, используй команду $(item)/ftbchunks admin extra_force_load_chunks @p set X$(), где X - новый лимит." + }, + { + "type": "patchouli:text", + "anchor": "resin", + "text": "$(italic)Как мне сделать резину?$()$(br2)Резина(предмет) — это больше не то, что вам нужно! Сначала вырасти деревья, дающие $(thing)Латекс$() и скрафтите несколько $(thing)Краников для подсочки$(). Установите Краник для подсочки на каждом дереве. (Больше краников на одном дереве просто разделит выход).Вы можете собирать латекс с помощью $(l:mechanics/barrels)Бочек$()." + }, + { + "type": "patchouli:text", + "text": "Быстрее всего сварить латекс в $(l:firmalife/oven_appliances#vat)Чане$(). Соедини латекс с $(item)Порошком серы$() в чане (Передроби пыль серы), нагрей и $(bold)закрой крышкку$() чана с помощью клавиш $(item)$(k:sneak)$() + $(item)$(k:use)$(). Ты получишь $(thing)Вулканизированный латекс$(), который ты можешь вакуумировать в $(thing)Вакуумной камере$() для этой долгожданной резины!$(br2)Позже, $(thing)LV Центрифуга$() позволит тебе получить $(thing)Необработанную резину$() напрямую с бревен латексных деревьев." + } + ] +} \ No newline at end of file diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/getting_started/primitive_alloys.json b/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/getting_started/primitive_alloys.json index f0e4b73b1..c9d01025d 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/getting_started/primitive_alloys.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/getting_started/primitive_alloys.json @@ -71,6 +71,6 @@ "gtceu:bronze_ingot": 3, "gtceu:bismuth_bronze_ingot": 4, "gtceu:black_bronze_ingot": 5, - "gtceu:brass_ingot": 7 + "create:brass_ingot": 7 } } \ No newline at end of file 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 46bbdd955..0b0ce6aa8 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 @@ -44,7 +44,7 @@ }, { "Type": "patchouli:text", - "text": "$(li)Сподумен: $(l:tfg_ores/earth_vein_index#normal_spodumene)35%$(/l)$()$(li)Стибніт: $(l:tfg_ores/earth_vein_index#normal_tetrahedrite)20%$(/l), $(l:tfg_ores/earth_vein_index#surface_tetrahedrite)20%$(/l)$()$(li)Сфалерит: $(l:tfg_ores/earth_vein_index#normal_sphalerite)40%$(/l), $(l:tfg_ores/earth_vein_index#surface_sphalerite)40%$(/l), $(l:tfg_ores/earth_vein_index#normal_sulfur)15%$(/l)$()$(li)Тальк: $(l:tfg_ores/earth_vein_index#normal_lubricant)20%$(/l)$()$(li)Танталіт: $(l:tfg_ores/earth_vein_index#normal_manganese)12%$(/l)$()$(li)Таркіаніт: $(l:tfg_ores/earth_vein_index#normal_tarkianite)35%$(/l)$()$(li)Тетраедрит: $(l:tfg_ores/earth_vein_index#surface_tetrahedrite)60%$(/l), $(l:tfg_ores/earth_vein_index#normal_tetrahedrite)50%$(/l)$()$(li)Топаз: $(l:tfg_ores/earth_vein_index#deep_topaz)25%$(/l)$()$(li)Торій: $(l:tfg_ores/earth_vein_index#normal_beryllium)15%$(/l)$()$(li)Трикальційфосфат: $(l:tfg_ores/earth_vein_index#normal_apatite)35%$(/l)$()$(li)Трона: $(l:tfg_ores/earth_vein_index#normal_lubricant)10%$(/l), $(l:tfg_ores/earth_vein_index#normal_tarkianite)10%$(/l)$()$(li)Уранит: $(l:tfg_ores/earth_vein_index#deep_pitchblende)62%$(/l)$()$(li)Ураніт: $(l:tfg_ores/earth_vein_index#deep_pitchblende)25%$(/l)$()$(li)Халькопирит: $(l:tfg_ores/earth_vein_index#surface_copper)61%$(/l), $(l:tfg_ores/earth_vein_index#normal_copper)20%$(/l)$()", + "text": "$(li)Сподумен: $(l:tfg_ores/earth_vein_index#normal_spodumene)35%$(/l)$()$(li)Стибніт: $(l:tfg_ores/earth_vein_index#normal_tetrahedrite)20%$(/l), $(l:tfg_ores/earth_vein_index#surface_tetrahedrite)20%$(/l)$()$(li)Сфалерит: $(l:tfg_ores/earth_vein_index#normal_sphalerite)40%$(/l), $(l:tfg_ores/earth_vein_index#surface_sphalerite)40%$(/l), $(l:tfg_ores/earth_vein_index#normal_sulfur)15%$(/l)$()$(li)Тальк: $(l:tfg_ores/earth_vein_index#normal_lubricant)20%$(/l)$()$(li)Танталіт: $(l:tfg_ores/earth_vein_index#normal_manganese)12%$(/l)$()$(li)Таркіаніт: $(l:tfg_ores/earth_vein_index#normal_tarkianite)35%$(/l)$()$(li)Тетраедрит: $(l:tfg_ores/earth_vein_index#surface_tetrahedrite)60%$(/l), $(l:tfg_ores/earth_vein_index#normal_tetrahedrite)50%$(/l)$()$(li)Топаз: $(l:tfg_ores/earth_vein_index#deep_topaz)25%$(/l)$()$(li)Торіаніт: $(l:tfg_ores/earth_vein_index#normal_beryllium)15%$(/l)$()$(li)Трикальційфосфат: $(l:tfg_ores/earth_vein_index#normal_apatite)35%$(/l)$()$(li)Трона: $(l:tfg_ores/earth_vein_index#normal_lubricant)10%$(/l), $(l:tfg_ores/earth_vein_index#normal_tarkianite)10%$(/l)$()$(li)Уранит: $(l:tfg_ores/earth_vein_index#deep_pitchblende)62%$(/l)$()$(li)Ураніт: $(l:tfg_ores/earth_vein_index#deep_pitchblende)25%$(/l)$()$(li)Халькопирит: $(l:tfg_ores/earth_vein_index#surface_copper)61%$(/l), $(l:tfg_ores/earth_vein_index#normal_copper)20%$(/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 6e89312f7..9d1312b2e 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 @@ -2797,7 +2797,7 @@ }, { "Type": "patchouli:multiblock", - "name": "Торій", + "name": "Торіаніт", "multiblock": { "mapping": { "0": "#forge:ores/thorium" @@ -2812,7 +2812,7 @@ ] }, "enable_visualize": false, - "text": "$(thing)Відсоток$(): 15%$(br)$(thing)Джерело$(): Торію$(br)$(thing)Формула$(): Th", + "text": "$(thing)Відсоток$(): 15%$(br)$(thing)Джерело$(): Торію$(br)$(thing)Формула$(): ThO₂", "type": "patchouli:multiblock" }, { diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/mars_ore_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/mars_ore_index.json index a0613df0b..d949d080b 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/mars_ore_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/mars_ore_index.json @@ -19,22 +19,27 @@ }, { "Type": "patchouli:text", - "text": "$(li)Гетит: $(l:tfg_ores/mars_vein_index#mars_hematite)15%$(/l)$()$(li)Гіпс: $(l:tfg_ores/mars_vein_index#mars_surface_bismuthinite)20%$(/l)$()$(li)Главконітний пісок: $(l:tfg_ores/mars_vein_index#mars_lubricant)7%$(/l)$()$(li)Графіт: $(l:tfg_ores/mars_vein_index#mars_graphite)45%$(/l)$()$(li)Гроссуляр: $(l:tfg_ores/mars_vein_index#mars_tantalite)10%$(/l)$()$(li)Діамант: $(l:tfg_ores/mars_vein_index#mars_graphite)20%$(/l)$()$(li)Електротин: $(l:tfg_ores/mars_vein_index#mars_sapphire)20%$(/l)$()$(li)Жовтий лимоніт: $(l:tfg_ores/mars_vein_index#mars_hematite)30%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_hematite)33%$(/l)$()$(li)Зелений сапфір: $(l:tfg_ores/mars_vein_index#mars_almandine)15%$(/l), $(l:tfg_ores/mars_vein_index#mars_sapphire)5%$(/l)$()$(li)Кальцит: $(l:tfg_ores/mars_vein_index#mars_surface_hematite)5%$(/l)$()$(li)Кам’яна сіль: $(l:tfg_ores/mars_vein_index#mars_salt)20%$(/l)$()$(li)Каситерит: $(l:tfg_ores/mars_vein_index#mars_surface_cassiterite)55%$(/l)$()$(li)Кварцит: $(l:tfg_ores/mars_vein_index#mars_quartzite)41%$(/l)$()$(li)Кобальтит: $(l:tfg_ores/mars_vein_index#mars_nickel)28%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_nickel_galena)11%$(/l)$()", + "text": "$(li)Гетит: $(l:tfg_ores/mars_vein_index#mars_hematite)15%$(/l)$()$(li)Гіпс: $(l:tfg_ores/mars_vein_index#mars_surface_bismuthinite)20%$(/l)$()$(li)Главконітний пісок: $(l:tfg_ores/mars_vein_index#mars_lubricant)7%$(/l)$()$(li)Графіт: $(l:tfg_ores/mars_vein_index#mars_graphite)45%$(/l)$()$(li)Гроссуляр: $(l:tfg_ores/mars_vein_index#mars_tantalite)10%$(/l)$()$(li)Діамант: $(l:tfg_ores/mars_vein_index#mars_graphite)20%$(/l)$()$(li)Електротин: $(l:tfg_ores/mars_vein_index#mars_sapphire)20%$(/l)$()$(li)Жовтий лимоніт: $(l:tfg_ores/mars_vein_index#mars_hematite)30%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_hematite)33%$(/l)$()$(li)Зелений сапфір: $(l:tfg_ores/mars_vein_index#mars_almandine)15%$(/l), $(l:tfg_ores/mars_vein_index#mars_sapphire)5%$(/l)$()$(li)Кальцит: $(l:tfg_ores/mars_vein_index#mars_lapis)15%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_hematite)5%$(/l)$()$(li)Кам’яна сіль: $(l:tfg_ores/mars_vein_index#mars_salt)20%$(/l)$()$(li)Каситерит: $(l:tfg_ores/mars_vein_index#mars_surface_cassiterite)55%$(/l)$()$(li)Кварцит: $(l:tfg_ores/mars_vein_index#mars_quartzite)41%$(/l)$()$(li)Кобальтит: $(l:tfg_ores/mars_vein_index#mars_nickel)28%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_nickel_galena)11%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)Лепідоліт: $(l:tfg_ores/mars_vein_index#mars_salt)15%$(/l)$()$(li)Літій: $(l:tfg_ores/mars_vein_index#mars_tungsten)19%$(/l)$()$(li)Монацит: $(l:tfg_ores/mars_vein_index#mars_neodynium)29%$(/l)$()$(li)Неодим: $(l:tfg_ores/mars_vein_index#mars_neodynium)5%$(/l)$()$(li)Нікель: $(l:tfg_ores/mars_vein_index#deep_mars_sheldonite)25%$(/l), $(l:tfg_ores/mars_vein_index#mars_nickel)28%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_nickel_galena)23%$(/l)$()$(li)Нітрат калію: $(l:tfg_ores/mars_vein_index#mars_surface_cassiterite)10%$(/l)$()$(li)Олово: $(l:tfg_ores/mars_vein_index#mars_surface_cassiterite)35%$(/l)$()$(li)Пентландит: $(l:tfg_ores/mars_vein_index#mars_lubricant)7%$(/l)$()$(li)Пірит: $(l:tfg_ores/mars_vein_index#mars_sulfur)42%$(/l), $(l:tfg_ores/mars_vein_index#mars_copper)10%$(/l)$()$(li)Піролюзит: $(l:tfg_ores/mars_vein_index#mars_tantalite)42%$(/l)$()$(li)Піроп: $(l:tfg_ores/mars_vein_index#mars_almandine)26%$(/l)$()$(li)Пірохлор: $(l:tfg_ores/mars_vein_index#mars_apatite)14%$(/l)$()$(li)Платина: $(l:tfg_ores/mars_vein_index#deep_mars_sheldonite)15%$(/l)$()$(li)Реальгар: $(l:tfg_ores/mars_vein_index#mars_beryllium)15%$(/l)$()", + "text": "$(li)Лазурит: $(l:tfg_ores/mars_vein_index#mars_lapis)35%$(/l)$()$(li)Лапіс: $(l:tfg_ores/mars_vein_index#mars_lapis)25%$(/l)$()$(li)Лепідоліт: $(l:tfg_ores/mars_vein_index#mars_salt)15%$(/l)$()$(li)Літій: $(l:tfg_ores/mars_vein_index#mars_tungsten)19%$(/l)$()$(li)Монацит: $(l:tfg_ores/mars_vein_index#mars_neodynium)29%$(/l)$()$(li)Неодим: $(l:tfg_ores/mars_vein_index#mars_neodynium)5%$(/l)$()$(li)Нікель: $(l:tfg_ores/mars_vein_index#deep_mars_sheldonite)25%$(/l), $(l:tfg_ores/mars_vein_index#mars_nickel)28%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_nickel_galena)23%$(/l)$()$(li)Нітрат калію: $(l:tfg_ores/mars_vein_index#mars_surface_cassiterite)10%$(/l)$()$(li)Олово: $(l:tfg_ores/mars_vein_index#mars_surface_cassiterite)35%$(/l)$()$(li)Пентландит: $(l:tfg_ores/mars_vein_index#mars_lubricant)7%$(/l)$()$(li)Пірит: $(l:tfg_ores/mars_vein_index#mars_sulfur)42%$(/l), $(l:tfg_ores/mars_vein_index#mars_copper)10%$(/l)$()$(li)Піролюзит: $(l:tfg_ores/mars_vein_index#mars_tantalite)42%$(/l)$()$(li)Піроп: $(l:tfg_ores/mars_vein_index#mars_almandine)26%$(/l)$()$(li)Пірохлор: $(l:tfg_ores/mars_vein_index#mars_apatite)14%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)Редстоун: $(l:tfg_ores/mars_vein_index#deep_mars_chromite)45%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_tetrahedrite)4%$(/l)$()$(li)Рубін: $(l:tfg_ores/mars_vein_index#deep_mars_chromite)35%$(/l)$()$(li)Самородна Золото: $(l:tfg_ores/mars_vein_index#mars_sapphire)55%$(/l), $(l:tfg_ores/mars_vein_index#mars_hematite)5%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_hematite)5%$(/l)$()$(li)Самородна Мідь: $(l:tfg_ores/mars_vein_index#mars_stibnite)28%$(/l), $(l:tfg_ores/mars_vein_index#mars_copper)20%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_tetrahedrite)19%$(/l)$()$(li)Самородна Срібла: $(l:tfg_ores/mars_vein_index#mars_galena)20%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_nickel_galena)11%$(/l)$()$(li)Сапфір: $(l:tfg_ores/mars_vein_index#mars_almandine)15%$(/l)$()$(li)Свинець: $(l:tfg_ores/mars_vein_index#mars_galena)33%$(/l)$()$(li)Сіль: $(l:tfg_ores/mars_vein_index#mars_salt)30%$(/l)$()$(li)Сірка: $(l:tfg_ores/mars_vein_index#mars_sulfur)14%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_bismuthinite)20%$(/l)$()$(li)Смарагд: $(l:tfg_ores/mars_vein_index#mars_beryllium)50%$(/l)$()$(li)Соапостон: $(l:tfg_ores/mars_vein_index#mars_lubricant)21%$(/l)$()$(li)Спесартін: $(l:tfg_ores/mars_vein_index#mars_tantalite)10%$(/l)$()$(li)Сподумен: $(l:tfg_ores/mars_vein_index#mars_salt)35%$(/l)$()$(li)Стибніт: $(l:tfg_ores/mars_vein_index#mars_stibnite)19%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_tetrahedrite)19%$(/l)$()", + "text": "$(li)Платина: $(l:tfg_ores/mars_vein_index#deep_mars_sheldonite)15%$(/l)$()$(li)Реальгар: $(l:tfg_ores/mars_vein_index#mars_beryllium)15%$(/l)$()$(li)Редстоун: $(l:tfg_ores/mars_vein_index#deep_mars_chromite)45%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_tetrahedrite)4%$(/l)$()$(li)Рубін: $(l:tfg_ores/mars_vein_index#deep_mars_chromite)35%$(/l)$()$(li)Самородна Золото: $(l:tfg_ores/mars_vein_index#mars_sapphire)55%$(/l), $(l:tfg_ores/mars_vein_index#mars_hematite)5%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_hematite)5%$(/l)$()$(li)Самородна Мідь: $(l:tfg_ores/mars_vein_index#mars_stibnite)28%$(/l), $(l:tfg_ores/mars_vein_index#mars_copper)20%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_tetrahedrite)19%$(/l)$()$(li)Самородна Срібла: $(l:tfg_ores/mars_vein_index#mars_galena)20%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_nickel_galena)11%$(/l)$()$(li)Сапфір: $(l:tfg_ores/mars_vein_index#mars_almandine)15%$(/l)$()$(li)Свинець: $(l:tfg_ores/mars_vein_index#mars_galena)33%$(/l)$()$(li)Сіль: $(l:tfg_ores/mars_vein_index#mars_salt)30%$(/l)$()$(li)Сірка: $(l:tfg_ores/mars_vein_index#mars_sulfur)14%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_bismuthinite)20%$(/l)$()$(li)Смарагд: $(l:tfg_ores/mars_vein_index#mars_beryllium)50%$(/l)$()$(li)Соапостон: $(l:tfg_ores/mars_vein_index#mars_lubricant)21%$(/l)$()$(li)Содаліт: $(l:tfg_ores/mars_vein_index#mars_lapis)25%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)Сфалерит: $(l:tfg_ores/mars_vein_index#mars_sulfur)23%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_nickel_galena)17%$(/l)$()$(li)Тальк: $(l:tfg_ores/mars_vein_index#mars_lubricant)21%$(/l)$()$(li)Танталіт: $(l:tfg_ores/mars_vein_index#mars_tantalite)36%$(/l)$()$(li)Тетраедрит: $(l:tfg_ores/mars_vein_index#mars_surface_tetrahedrite)57%$(/l), $(l:tfg_ores/mars_vein_index#mars_stibnite)47%$(/l)$()$(li)Торій: $(l:tfg_ores/mars_vein_index#deep_mars_pitchblende)26%$(/l), $(l:tfg_ores/mars_vein_index#mars_pitchblende)29%$(/l)$()$(li)Трикальційфосфат: $(l:tfg_ores/mars_vein_index#mars_apatite)33%$(/l)$()$(li)Трона: $(l:tfg_ores/mars_vein_index#mars_lubricant)35%$(/l)$()$(li)Уранит: $(l:tfg_ores/mars_vein_index#deep_mars_pitchblende)52%$(/l), $(l:tfg_ores/mars_vein_index#mars_pitchblende)41%$(/l)$()$(li)Ураніт: $(l:tfg_ores/mars_vein_index#deep_mars_pitchblende)21%$(/l)$()$(li)Халькопирит: $(l:tfg_ores/mars_vein_index#mars_copper)65%$(/l)$()$(li)Хроміт: $(l:tfg_ores/mars_vein_index#deep_mars_chromite)20%$(/l)$()$(li)Шеєліт: $(l:tfg_ores/mars_vein_index#mars_tungsten)42%$(/l)$()$(li)Шелдонітн: $(l:tfg_ores/mars_vein_index#deep_mars_sheldonite)25%$(/l)$()", + "text": "$(li)Спесартін: $(l:tfg_ores/mars_vein_index#mars_tantalite)10%$(/l)$()$(li)Сподумен: $(l:tfg_ores/mars_vein_index#mars_salt)35%$(/l)$()$(li)Стибніт: $(l:tfg_ores/mars_vein_index#mars_stibnite)19%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_tetrahedrite)19%$(/l)$()$(li)Сфалерит: $(l:tfg_ores/mars_vein_index#mars_sulfur)23%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_nickel_galena)17%$(/l)$()$(li)Тальк: $(l:tfg_ores/mars_vein_index#mars_lubricant)21%$(/l)$()$(li)Танталіт: $(l:tfg_ores/mars_vein_index#mars_tantalite)36%$(/l)$()$(li)Тетраедрит: $(l:tfg_ores/mars_vein_index#mars_surface_tetrahedrite)57%$(/l), $(l:tfg_ores/mars_vein_index#mars_stibnite)47%$(/l)$()$(li)Торіаніт: $(l:tfg_ores/mars_vein_index#deep_mars_pitchblende)26%$(/l), $(l:tfg_ores/mars_vein_index#mars_pitchblende)29%$(/l)$()$(li)Трикальційфосфат: $(l:tfg_ores/mars_vein_index#mars_apatite)33%$(/l)$()$(li)Трона: $(l:tfg_ores/mars_vein_index#mars_lubricant)35%$(/l)$()$(li)Уранит: $(l:tfg_ores/mars_vein_index#deep_mars_pitchblende)52%$(/l), $(l:tfg_ores/mars_vein_index#mars_pitchblende)41%$(/l)$()$(li)Ураніт: $(l:tfg_ores/mars_vein_index#deep_mars_pitchblende)21%$(/l)$()$(li)Халькопирит: $(l:tfg_ores/mars_vein_index#mars_copper)65%$(/l)$()$(li)Хроміт: $(l:tfg_ores/mars_vein_index#deep_mars_chromite)20%$(/l)$()", + "type": "patchouli:text" + }, + { + "Type": "patchouli:text", + "text": "$(li)Шеєліт: $(l:tfg_ores/mars_vein_index#mars_tungsten)42%$(/l)$()$(li)Шелдонітн: $(l:tfg_ores/mars_vein_index#deep_mars_sheldonite)25%$(/l)$()", "type": "patchouli:text" } ], 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 51200e18e..49ab96a50 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 @@ -14,12 +14,12 @@ }, { "Type": "patchouli:text", - "text": "$(li)$(l:tfg_ores/mars_vein_index#mars_almandine)Альмандин і Сапфір$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_apatite)Апатит і Пірохлор$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_neodynium)Бастнезит і Монацит$()$()$(li)$(l:tfg_ores/mars_vein_index#deep_mars_sheldonite)Борніт і Куперит$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_surface_bismuthinite)Вісмут$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_coal)Вугілля і Гематит$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_nickel)Гарнієрит і Кобальтит$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_hematite)Гематит та Лімоніт$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_surface_hematite)Гематит та Лімоніт$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_graphite)Графіт і Діамант$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_sapphire)Золото, Електротин і Боксит$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_surface_cassiterite)Каситерит$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_quartzite)Кварцит, Азбест і Барит$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_tantalite)Марганець і Тантал$()$()", + "text": "$(li)$(l:tfg_ores/mars_vein_index#mars_almandine)Альмандин і Сапфір$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_apatite)Апатит і Пірохлор$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_neodynium)Бастнезит і Монацит$()$()$(li)$(l:tfg_ores/mars_vein_index#deep_mars_sheldonite)Борніт і Куперит$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_surface_bismuthinite)Вісмут$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_coal)Вугілля і Гематит$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_nickel)Гарнієрит і Кобальтит$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_hematite)Гематит та Лімоніт$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_surface_hematite)Гематит та Лімоніт$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_graphite)Графіт і Діамант$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_sapphire)Золото, Електротин і Боксит$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_surface_cassiterite)Каситерит$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_quartzite)Кварцит, Азбест і Барит$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_lapis)Лапіс, Лазурит та Содаліт$()$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)$(l:tfg_ores/mars_vein_index#mars_copper)Мідь та Халькопірит$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_pitchblende)Настуран, Торій і Гематит$()$()$(li)$(l:tfg_ores/mars_vein_index#deep_mars_pitchblende)Настуран, Торій і Уранініт$()$()$(li)$(l:tfg_ores/mars_vein_index#deep_mars_chromite)Редстоун і Хроміт$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_beryllium)Смарагд і Берилій$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_salt)Солі і Сподумен$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_galena)Срібло, Гален і Свинець$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_lubricant)Стеатит, Тальк і Глауконіт$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_surface_nickel_galena)Сфалерит і Галеніт$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_sulfur)Сфалерит і Пірит$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_stibnite)Тетраедрит (Звичайний)$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_surface_tetrahedrite)Тетраедрит (Поверхня)$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_tungsten)Шеєліт та Вольфрам$()$()", + "text": "$(li)$(l:tfg_ores/mars_vein_index#mars_tantalite)Марганець і Тантал$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_copper)Мідь та Халькопірит$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_pitchblende)Настуран, Торіаніт і Гематит$()$()$(li)$(l:tfg_ores/mars_vein_index#deep_mars_pitchblende)Настуран, Торіаніт і Уранініт$()$()$(li)$(l:tfg_ores/mars_vein_index#deep_mars_chromite)Редстоун і Хроміт$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_beryllium)Смарагд і Берилій$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_salt)Солі і Сподумен$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_galena)Срібло, Гален і Свинець$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_lubricant)Стеатит, Тальк і Глауконіт$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_surface_nickel_galena)Сфалерит і Галеніт$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_sulfur)Сфалерит і Пірит$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_stibnite)Тетраедрит (Звичайний)$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_surface_tetrahedrite)Тетраедрит (Поверхня)$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_tungsten)Шеєліт та Вольфрам$()$()", "type": "patchouli:text" }, { @@ -1173,6 +1173,98 @@ "draw_filler": true, "type": "patchouli:empty" }, + { + "Type": "patchouli:text", + "text": "$(thing)Рідкість$(): 200$(br)$(thing)Щільність$(): 0.25$(br)$(thing)Тип$(): Кластерна вена$(br)$(thing)Y$(): 0 — 70$(br)$(thing)Розмір$(): 30$(br)$(thing)Індикатор Max Depth$(): 20$(br2)$(thing)Типи каменю$(): Аргіліт, Вапняк, Глинистий сланець, Доломіт, Крейда, Кременистий сланець", + "title": "Лапіс, Лазурит та Содаліт", + "type": "patchouli:text", + "anchor": "mars_lapis" + }, + { + "Type": "patchouli:multiblock", + "name": "Лазурит", + "multiblock": { + "mapping": { + "0": "#forge:ores/lazurite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Відсоток$(): 35%$(br)$(thing)Джерело$(): Алюмінію, Кальцію, Натрію$(br)$(thing)Формула$(): Al₆Si₆Ca₈Na₈", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Содаліт", + "multiblock": { + "mapping": { + "0": "#forge:ores/sodalite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Відсоток$(): 25%$(br)$(thing)Джерело$(): Алюмінію, Натрію$(br)$(thing)Формула$(): Al₃Si₃Na₄Cl", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Лапіс", + "multiblock": { + "mapping": { + "0": "#forge:ores/lapis" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Відсоток$(): 25%$(br)$(thing)Джерело$(): Лазуриту, Содаліту, Пириту, Кальциту", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Кальцит", + "multiblock": { + "mapping": { + "0": "#forge:ores/calcite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Відсоток$(): 15%$(br)$(thing)Джерело$(): Кальцію$(br)$(thing)Формула$(): CaCO₃", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:empty", + "draw_filler": true, + "type": "patchouli:empty" + }, { "Type": "patchouli:text", "text": "$(thing)Рідкість$(): 230$(br)$(thing)Щільність$(): 0.3$(br)$(thing)Тип$(): Кластерна вена$(br)$(thing)Y$(): 0 — 70$(br)$(thing)Розмір$(): 42$(br)$(thing)Індикатор Max Depth$(): 15$(br2)$(thing)Типи каменю$(): Red Granite, Аргиліт, Аргіліт, Базальт, Вапняк, Габро, Глинистий сланець, Крейда, Кременистий сланець, Трахіт", @@ -1360,7 +1452,7 @@ { "Type": "patchouli:text", "text": "$(thing)Рідкість$(): 220$(br)$(thing)Щільність$(): 0.55$(br)$(thing)Тип$(): Кластерна вена$(br)$(thing)Y$(): 0 — 70$(br)$(thing)Розмір$(): 20$(br)$(thing)Індикатор Max Depth$(): 15$(br2)$(thing)Типи каменю$(): Red Granite, Аргіліт, Габро, Глинистий сланець, Дацит, Діорит, Доломіт, Конгломерат, Трахіт", - "title": "Настуран, Торій і Гематит", + "title": "Настуран, Торіаніт і Гематит", "type": "patchouli:text", "anchor": "mars_pitchblende" }, @@ -1386,7 +1478,7 @@ }, { "Type": "patchouli:multiblock", - "name": "Торій", + "name": "Торіаніт", "multiblock": { "mapping": { "0": "#forge:ores/thorium" @@ -1401,7 +1493,7 @@ ] }, "enable_visualize": false, - "text": "$(thing)Відсоток$(): 29%$(br)$(thing)Джерело$(): Торію$(br)$(thing)Формула$(): Th", + "text": "$(thing)Відсоток$(): 29%$(br)$(thing)Джерело$(): Торію$(br)$(thing)Формула$(): ThO₂", "type": "patchouli:multiblock" }, { @@ -1427,7 +1519,7 @@ { "Type": "patchouli:text", "text": "$(thing)Рідкість$(): 370$(br)$(thing)Щільність$(): 0.3$(br)$(thing)Тип$(): Кластерна вена$(br)$(thing)Y$(): -20 — 0$(br)$(thing)Розмір$(): 60$(br)$(thing)Індикатор Max Depth$(): 20$(br2)$(thing)Типи каменю$(): Аргиліт, Аргіліт, Габро, Глинистий сланець, Дацит, Діорит, Трахіт", - "title": "Настуран, Торій і Уранініт", + "title": "Настуран, Торіаніт і Уранініт", "type": "patchouli:text", "anchor": "deep_mars_pitchblende" }, @@ -1453,7 +1545,7 @@ }, { "Type": "patchouli:multiblock", - "name": "Торій", + "name": "Торіаніт", "multiblock": { "mapping": { "0": "#forge:ores/thorium" @@ -1468,7 +1560,7 @@ ] }, "enable_visualize": false, - "text": "$(thing)Відсоток$(): 26%$(br)$(thing)Джерело$(): Торію$(br)$(thing)Формула$(): Th", + "text": "$(thing)Відсоток$(): 26%$(br)$(thing)Джерело$(): Торію$(br)$(thing)Формула$(): ThO₂", "type": "patchouli:multiblock" }, { diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/moon_ore_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/moon_ore_index.json index 1bbcd24bf..da1f5c95b 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/moon_ore_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/moon_ore_index.json @@ -39,7 +39,7 @@ }, { "Type": "patchouli:text", - "text": "$(li)Тетраедрит: $(l:tfg_ores/moon_vein_index#moon_tetrahedrite)40%$(/l)$()$(li)Топаз: $(l:tfg_ores/moon_vein_index#moon_topaz)25%$(/l)$()$(li)Торій: $(l:tfg_ores/moon_vein_index#moon_beryllium)0%$(/l)$()$(li)Трикальційфосфат: $(l:tfg_ores/moon_vein_index#moon_apatite)33%$(/l)$()$(li)Трона: $(l:tfg_ores/moon_vein_index#moon_lubricant)10%$(/l)$()$(li)Халькопирит: $(l:tfg_ores/moon_vein_index#moon_cassiterite)35%$(/l)$()$(li)Халькоцит: $(l:tfg_ores/moon_vein_index#moon_tetrahedrite)25%$(/l), $(l:tfg_ores/moon_vein_index#moon_topaz)25%$(/l)$()$(li)Хроміт: $(l:tfg_ores/moon_vein_index#moon_magnetite)40%$(/l)$()$(li)Цеоліт: $(l:tfg_ores/moon_vein_index#moon_cassiterite)5%$(/l)$()$(li)Червоний гранат: $(l:tfg_ores/moon_vein_index#moon_garnet)9%$(/l)$()$(li)Шеєліт: $(l:tfg_ores/moon_vein_index#moon_scheelite)40%$(/l)$()$(li)Шелдонітн: $(l:tfg_ores/moon_vein_index#moon_sheldonite)25%$(/l)$()", + "text": "$(li)Тетраедрит: $(l:tfg_ores/moon_vein_index#moon_tetrahedrite)40%$(/l)$()$(li)Топаз: $(l:tfg_ores/moon_vein_index#moon_topaz)25%$(/l)$()$(li)Торіаніт: $(l:tfg_ores/moon_vein_index#moon_beryllium)0%$(/l)$()$(li)Трикальційфосфат: $(l:tfg_ores/moon_vein_index#moon_apatite)33%$(/l)$()$(li)Трона: $(l:tfg_ores/moon_vein_index#moon_lubricant)10%$(/l)$()$(li)Халькопирит: $(l:tfg_ores/moon_vein_index#moon_cassiterite)35%$(/l)$()$(li)Халькоцит: $(l:tfg_ores/moon_vein_index#moon_tetrahedrite)25%$(/l), $(l:tfg_ores/moon_vein_index#moon_topaz)25%$(/l)$()$(li)Хроміт: $(l:tfg_ores/moon_vein_index#moon_magnetite)40%$(/l)$()$(li)Цеоліт: $(l:tfg_ores/moon_vein_index#moon_cassiterite)5%$(/l)$()$(li)Червоний гранат: $(l:tfg_ores/moon_vein_index#moon_garnet)9%$(/l)$()$(li)Шеєліт: $(l:tfg_ores/moon_vein_index#moon_scheelite)40%$(/l)$()$(li)Шелдонітн: $(l:tfg_ores/moon_vein_index#moon_sheldonite)25%$(/l)$()", "type": "patchouli:text" } ], diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/moon_vein_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/moon_vein_index.json index bd9a0a222..97767decf 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/moon_vein_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/moon_vein_index.json @@ -1782,7 +1782,7 @@ }, { "Type": "patchouli:multiblock", - "name": "Торій", + "name": "Торіаніт", "multiblock": { "mapping": { "0": "#forge:ores/thorium" @@ -1797,7 +1797,7 @@ ] }, "enable_visualize": false, - "text": "$(thing)Відсоток$(): 0%$(br)$(thing)Джерело$(): Торію$(br)$(thing)Формула$(): Th", + "text": "$(thing)Відсоток$(): 0%$(br)$(thing)Джерело$(): Торію$(br)$(thing)Формула$(): ThO₂", "type": "patchouli:multiblock" }, { diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/nether_ore_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/nether_ore_index.json index 579eb90c8..f7bfffeed 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/nether_ore_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/nether_ore_index.json @@ -44,7 +44,7 @@ }, { "Type": "patchouli:text", - "text": "$(li)Тальк: $(l:tfg_ores/nether_vein_index#nether_lubricant)20%$(/l)$()$(li)Танталіт: $(l:tfg_ores/nether_vein_index#nether_manganese)12%$(/l)$()$(li)Тетраедрит: $(l:tfg_ores/nether_vein_index#nether_tetrahedrite)50%$(/l)$()$(li)Топаз: $(l:tfg_ores/nether_vein_index#nether_topaz)25%$(/l)$()$(li)Торій: $(l:tfg_ores/nether_vein_index#nether_beryllium)0%$(/l)$()$(li)Трикальційфосфат: $(l:tfg_ores/nether_vein_index#nether_apatite)35%$(/l)$()$(li)Трона: $(l:tfg_ores/nether_vein_index#nether_lubricant)10%$(/l)$()$(li)Уранит: $(l:tfg_ores/nether_vein_index#nether_pitchblende)62%$(/l)$()$(li)Ураніт: $(l:tfg_ores/nether_vein_index#nether_pitchblende)25%$(/l)$()$(li)Халькопирит: $(l:tfg_ores/nether_vein_index#nether_copper)20%$(/l)$()$(li)Халькоцит: $(l:tfg_ores/nether_vein_index#nether_topaz)25%$(/l)$()$(li)Хроміт: $(l:tfg_ores/nether_vein_index#nether_magnetite)10%$(/l)$()$(li)Червоний гранат: $(l:tfg_ores/nether_vein_index#nether_garnet)9%$(/l)$()$(li)Шеєліт: $(l:tfg_ores/nether_vein_index#nether_scheelite)45%$(/l)$()", + "text": "$(li)Тальк: $(l:tfg_ores/nether_vein_index#nether_lubricant)20%$(/l)$()$(li)Танталіт: $(l:tfg_ores/nether_vein_index#nether_manganese)12%$(/l)$()$(li)Тетраедрит: $(l:tfg_ores/nether_vein_index#nether_tetrahedrite)50%$(/l)$()$(li)Топаз: $(l:tfg_ores/nether_vein_index#nether_topaz)25%$(/l)$()$(li)Торіаніт: $(l:tfg_ores/nether_vein_index#nether_beryllium)0%$(/l)$()$(li)Трикальційфосфат: $(l:tfg_ores/nether_vein_index#nether_apatite)35%$(/l)$()$(li)Трона: $(l:tfg_ores/nether_vein_index#nether_lubricant)10%$(/l)$()$(li)Уранит: $(l:tfg_ores/nether_vein_index#nether_pitchblende)62%$(/l)$()$(li)Ураніт: $(l:tfg_ores/nether_vein_index#nether_pitchblende)25%$(/l)$()$(li)Халькопирит: $(l:tfg_ores/nether_vein_index#nether_copper)20%$(/l)$()$(li)Халькоцит: $(l:tfg_ores/nether_vein_index#nether_topaz)25%$(/l)$()$(li)Хроміт: $(l:tfg_ores/nether_vein_index#nether_magnetite)10%$(/l)$()$(li)Червоний гранат: $(l:tfg_ores/nether_vein_index#nether_garnet)9%$(/l)$()$(li)Шеєліт: $(l:tfg_ores/nether_vein_index#nether_scheelite)45%$(/l)$()", "type": "patchouli:text" }, { 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 efc819fdb..3ab2c99df 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 @@ -2123,7 +2123,7 @@ }, { "Type": "patchouli:multiblock", - "name": "Торій", + "name": "Торіаніт", "multiblock": { "mapping": { "0": "#forge:ores/thorium" @@ -2138,7 +2138,7 @@ ] }, "enable_visualize": false, - "text": "$(thing)Відсоток$(): 0%$(br)$(thing)Джерело$(): Торію$(br)$(thing)Формула$(): Th", + "text": "$(thing)Відсоток$(): 0%$(br)$(thing)Джерело$(): Торію$(br)$(thing)Формула$(): ThO₂", "type": "patchouli:multiblock" }, { diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/venus_ore_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/venus_ore_index.json index 56888ade7..bd6266b92 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/venus_ore_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/venus_ore_index.json @@ -1,7 +1,7 @@ { "__credits__": "This page was automatically generated by OresToFieldGuide.", "name": "Venus Ore Index", - "icon": "gtceu:sulfur_dust", + "icon": "vintageimprovements:sulfur", "category": "tfc:tfg_ores", "read_by_default": true, "secret": false, @@ -14,7 +14,7 @@ }, { "Type": "patchouli:text", - "text": "$(li)Кам’яна сіль: $(l:tfg_ores/venus_vein_index#venus_manual_salt)20%$(/l)$()$(li)Лепідоліт: $(l:tfg_ores/venus_vein_index#venus_manual_salt)15%$(/l)$()$(li)Пірит: $(l:tfg_ores/venus_vein_index#venus_manual_sulfur)35%$(/l)$()$(li)Сіль: $(l:tfg_ores/venus_vein_index#venus_manual_salt)50%$(/l)$()$(li)Сірка: $(l:tfg_ores/venus_vein_index#venus_manual_sulfur)50%$(/l)$()$(li)Сподумен: $(l:tfg_ores/venus_vein_index#venus_manual_salt)15%$(/l)$()$(li)Сфалерит: $(l:tfg_ores/venus_vein_index#venus_manual_sulfur)15%$(/l)$()", + "text": "$(li)Кам’яна сіль: $(l:tfg_ores/venus_vein_index#venus_manual_salt)10%$(/l)$()$(li)Лепідоліт: $(l:tfg_ores/venus_vein_index#venus_manual_salt)5%$(/l)$()$(li)Пірит: $(l:tfg_ores/venus_vein_index#venus_manual_sulfur)15%$(/l)$()$(li)Сіль: $(l:tfg_ores/venus_vein_index#venus_manual_salt)80%$(/l)$()$(li)Сірка: $(l:tfg_ores/venus_vein_index#venus_manual_sulfur)80%$(/l)$()$(li)Сподумен: $(l:tfg_ores/venus_vein_index#venus_manual_salt)5%$(/l)$()$(li)Сфалерит: $(l:tfg_ores/venus_vein_index#venus_manual_sulfur)5%$(/l)$()", "type": "patchouli:text" } ], 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 f6837e2ac..0802695cd 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)Рідкість$(): 100$(br)$(thing)Щільність$(): 0.2$(br)$(thing)Тип$(): Кластерна вена$(br)$(thing)Y$(): 40 — 65$(br)$(thing)Розмір$(): 15$(br)$(thing)Індикатор Max Depth$(): 30$(br2)$(thing)Типи каменю$(): Андезит, Базальт, Дацит, Ріоліт, Травертин, Трахіт", + "text": "$(thing)Рідкість$(): 30$(br)$(thing)Щільність$(): 0.2$(br)$(thing)Тип$(): Кластерна вена$(br)$(thing)Y$(): 40 — 65$(br)$(thing)Розмір$(): 20$(br)$(thing)Індикатор Max Depth$(): 30$(br2)$(thing)Типи каменю$(): Андезит, Базальт, Дацит, Ріоліт, Травертин, Трахіт", "title": "Сірка та Пірит", "type": "patchouli:text", "anchor": "venus_manual_sulfur" @@ -41,7 +41,7 @@ ] }, "enable_visualize": false, - "text": "$(thing)Відсоток$(): 50%$(br)$(thing)Джерело$(): Сірки$(br)$(thing)Формула$(): S", + "text": "$(thing)Відсоток$(): 80%$(br)$(thing)Джерело$(): Сірки$(br)$(thing)Формула$(): S", "type": "patchouli:multiblock" }, { @@ -61,7 +61,7 @@ ] }, "enable_visualize": false, - "text": "$(thing)Відсоток$(): 35%$(br)$(thing)Розплавляється в$(): Чавун$(br)$(thing)Формула$(): FeS₂", + "text": "$(thing)Відсоток$(): 15%$(br)$(thing)Розплавляється в$(): Чавун$(br)$(thing)Формула$(): FeS₂", "type": "patchouli:multiblock" }, { @@ -81,12 +81,12 @@ ] }, "enable_visualize": false, - "text": "$(thing)Відсоток$(): 15%$(br)$(thing)Розплавляється в$(): Цинк$(br)$(thing)Формула$(): ZnS", + "text": "$(thing)Відсоток$(): 5%$(br)$(thing)Розплавляється в$(): Цинк$(br)$(thing)Формула$(): ZnS", "type": "patchouli:multiblock" }, { "Type": "patchouli:text", - "text": "$(thing)Рідкість$(): 100$(br)$(thing)Щільність$(): 0.2$(br)$(thing)Тип$(): Дискова вена$(br)$(thing)Y$(): 40 — 65$(br)$(thing)Розмір$(): 20$(br)$(thing)Висота$(): 6$(br)$(thing)Індикатор Max Depth$(): 30$(br2)$(thing)Типи каменю$(): Андезит, Базальт, Дацит, Ріоліт, Травертин, Трахіт", + "text": "$(thing)Рідкість$(): 30$(br)$(thing)Щільність$(): 0.2$(br)$(thing)Тип$(): Дискова вена$(br)$(thing)Y$(): 40 — 65$(br)$(thing)Розмір$(): 20$(br)$(thing)Висота$(): 6$(br)$(thing)Індикатор Max Depth$(): 30$(br2)$(thing)Типи каменю$(): Андезит, Базальт, Дацит, Ріоліт, Травертин, Трахіт", "title": "Солі і Сподумен", "type": "patchouli:text", "anchor": "venus_manual_salt" @@ -108,7 +108,7 @@ ] }, "enable_visualize": false, - "text": "$(thing)Відсоток$(): 50%$(br)$(thing)Джерело$(): Натрію, Хлору$(br)$(thing)Формула$(): NaCl", + "text": "$(thing)Відсоток$(): 80%$(br)$(thing)Джерело$(): Натрію, Хлору$(br)$(thing)Формула$(): NaCl", "type": "patchouli:multiblock" }, { @@ -128,7 +128,7 @@ ] }, "enable_visualize": false, - "text": "$(thing)Відсоток$(): 20%$(br)$(thing)Джерело$(): Калію, Хлору$(br)$(thing)Формула$(): KCl", + "text": "$(thing)Відсоток$(): 10%$(br)$(thing)Джерело$(): Калію, Хлору$(br)$(thing)Формула$(): KCl", "type": "patchouli:multiblock" }, { @@ -148,7 +148,7 @@ ] }, "enable_visualize": false, - "text": "$(thing)Відсоток$(): 15%$(br)$(thing)Джерело$(): Калію, Літію, Алюмінію, Фтору$(br)$(thing)Формула$(): KLi₃Al₄F₂O₁₀", + "text": "$(thing)Відсоток$(): 5%$(br)$(thing)Джерело$(): Калію, Літію, Алюмінію, Фтору$(br)$(thing)Формула$(): KLi₃Al₄F₂O₁₀", "type": "patchouli:multiblock" }, { @@ -168,7 +168,7 @@ ] }, "enable_visualize": false, - "text": "$(thing)Відсоток$(): 15%$(br)$(thing)Джерело$(): Літію, Алюмінію$(br)$(thing)Формула$(): LiAlSi₂O₆", + "text": "$(thing)Відсоток$(): 5%$(br)$(thing)Джерело$(): Літію, Алюмінію$(br)$(thing)Формула$(): LiAlSi₂O₆", "type": "patchouli:multiblock" }, { diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_tips/faqs.json b/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_tips/faqs.json index 22216117b..2797b56d2 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_tips/faqs.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_tips/faqs.json @@ -12,7 +12,7 @@ }, { "type": "patchouli:text", - "text": "$(li)$(l:tfg_tips/faqs#boats)Чому мій човен потонув?$()\n$(li)$(l:tfg_tips/faqs#dried_fruit)Як зробити закваску?$()\n$(li)$(l:tfg_tips/faqs#dried_fruit)Як зробити волокно з ананаса?$()\n$(li)$(l:tfg_tips/faqs#jam)Як приготувати джем?$()\n$(li)$(l:tfg_tips/faqs#resin)Як зробити гуму?$()\n$(li)$(l:tfg_tips/faqs#chunks)Як примусово завантажити чанк або збільшити ліміт?$()" + "text": "$(li)$(l:tfg_tips/faqs#boats)Чому мій човен потонув?$()\n$(li)$(l:tfg_tips/faqs#dried_fruit)Як зробити закваску?$()\n$(li)$(l:tfg_tips/faqs#dried_fruit)Як зробити волокно з ананаса?$()$()\n$(li)$(l:tfg_tips/faqs#resin)Як зробити гуму?$()\n$(li)$(l:tfg_tips/faqs#chunks)Як примусово завантажити чанк або збільшити ліміт?$()" }, { "type": "patchouli:text", @@ -24,11 +24,6 @@ "anchor": "dried_fruit", "text": "$(italic)Як приготувати дріжджову закваску або ананасову клітковину?$()$(br2)Обов'язково спочатку висушіть фрукти, використовуючи $(item)Сушильний килимок$(). Потім виконайте решту кроків для $(l:firmalife/bread)хлібу$() або $(l:firmalife/berry_bushes)ананасової шкіри$()." }, - { - "type": "patchouli:text", - "anchor": "jam", - "text": "$(italic)Як зробити джем?$()$(br2)\nНайпростіше — за допомогою $(l:firmalife/oven_appliances#vat)чану$(). Дотримуйтесь кроків із цього розділу, але вам не обов’язково робити $(thing)станцію для консервування$() чи $(thing)кришки$(), якщо не хочете автоматизувати процес. Просто клацніть правою кнопкою миші по чану з $(thing)фруктовою рідиною$(), тримаючи порожню банку, потім клацніть ще раз, щоб дістати її — і вона буде повною джему та запечатаною.$(br2)\nОбов’язково $(bold)закрийте кришку$() на чані, використавши $(item)$(k:sneak)$() + $(item)$(k:use)$()!" - }, { "type": "patchouli:text", "anchor": "chunks", @@ -37,7 +32,7 @@ { "type": "patchouli:text", "anchor": "resin", - "text": "$(italic)Як зробити гуму?$()$(br2)Клейка смола більше не те, що тобі потрібно! Спочатку вирости кілька дерев, що виробляють $(thing)латекс$(), і зроби кілька $(thing)Cокозбірників$(). Встанови сокозбірник на стовбур кожного дерева (більше сокозбірників на одному дереві лише розподіляють вихід). Зібраний латекс можна збирати за допомогою $(tfc:mechanics/barrels)Діжки$()." + "text": "$(italic)Як зробити гуму?$()$(br2)Клейка смола більше не те, що тобі потрібно! Спочатку вирости кілька дерев, що виробляють $(thing)латекс$(), і зроби кілька $(thing)Cокозбірників$(). Встанови сокозбірник на стовбур кожного дерева (більше сокозбірників на одному дереві лише розподіляють вихід). Зібраний латекс можна збирати за допомогою $(l:mechanics/barrels)Діжки$()." }, { "type": "patchouli:text", diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_tips/space_crops.json b/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_tips/space_crops.json index 232167ded..7b4872ac3 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_tips/space_crops.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_tips/space_crops.json @@ -564,7 +564,7 @@ "betterend:blossom_berry_product": 6, "betterend:bolux_mushroom_seeds": 8, "betterend:bolux_mushroom_product": 8, - "betterend:cave_pumpkin_seeds": 10, + "betterend:cave_pumpkin_plant_seeds": 10, "betterend:cave_pumpkin": 10, "betterend:chorus_mushroom_seeds": 12, "betterend:chorus_mushroom_product": 12, diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/firmaciv/beneath.json b/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/firmaciv/beneath.json new file mode 100644 index 000000000..bcaf258e9 --- /dev/null +++ b/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/firmaciv/beneath.json @@ -0,0 +1,37 @@ +{ + "name": "幽冥之地", + "category": "tfc:firmaciv", + "icon": "beneath:wood/sapling/crimson", + "flag": "mod:beneath", + "read_by_default": true, + "sortnum": 100, + "pages": [ + { + "type": "patchouli:text", + "text": "在火星遥远的边疆，你可以找到绯红木和诡异木，用来建造相当不错的$(l:firmaciv/watercraft)船$()。" + }, + { + "type": "patchouli:empty" + }, + { + "type": "patchouli:spotlight", + "title": "软木", + "text": "软木的木质和树皮足够柔软，非常适合制作$(l:firmaciv/canoe)独木舟$()。", + "item": "beneath:wood/stripped_log/crimson" + }, + { + "type": "patchouli:text", + "text": "$(li)绯红木$()" + }, + { + "type": "patchouli:spotlight", + "title": "硬木", + "text": "硬木以其卓越的坚固性著称，是建造更大、更精密船只的理想选择，例如$(l:firmaciv/rowboat)划艇$()和$(l:firmaciv/sloop)单桅纵帆船$()。", + "item": "beneath:wood/planks/warped" + }, + { + "type": "patchouli:text", + "text": "$(li)诡异木$()" + } + ] +} \ No newline at end of file diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/getting_started/primitive_alloys.json b/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/getting_started/primitive_alloys.json index 627d4d5fa..1f30078e7 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/getting_started/primitive_alloys.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/getting_started/primitive_alloys.json @@ -71,6 +71,6 @@ "gtceu:bronze_ingot": 3, "gtceu:bismuth_bronze_ingot": 4, "gtceu:black_bronze_ingot": 5, - "gtceu:brass_ingot": 7 + "create:brass_ingot": 7 } } \ No newline at end of file diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/mechanics/blast_furnace.json b/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/mechanics/blast_furnace.json index 6bcb88bac..b1329f3d2 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/mechanics/blast_furnace.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/mechanics/blast_furnace.json @@ -15,7 +15,7 @@ }, { "type": "patchouli:text", - "text": "接下来就可以开始搭建高炉的$(thing)烟囱$()了。烟囱必须用足以承受炼钢高温的$(l:mechanics/fire_clay#fire_bricks)强化耐火砖$()搭建。强化砖可通过手持铸铁板或锻铁板，对耐火砖块用$(item)$(k:key.sneak)$()+$(item)$(k:key.use)$()点击各个外露面进行包覆，或直接合成$(l:mechanics/blast_furnace_insulation)高炉保温板$()。" + "text": "接下来就可以开始搭建高炉的$(thing)烟囱$()了。烟囱必须用足以承受炼钢高温的$(l:mechanics/fire_clay#fire_bricks)强化耐火砖$()搭建。强化砖可通过手持铸铁板或锻铁板，对耐火砖块用$(item)$(k:key.sneak)$()+$(item)$(k:key.use)$()点击各个外露面进行包覆，或直接合成$(l:mechanics/blast_furnace_insulation)高炉隔热板$()。" }, { "type": "patchouli:multiblock", 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 16c0a4e2a..3bb43fe46 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 @@ -14,27 +14,27 @@ }, { "Type": "patchouli:text", - "text": "$(li)云母: $(l:tfg_ores/earth_vein_index#normal_mica)25%$(/l)$()$(li)原生金: $(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)原生铜: $(l:tfg_ores/earth_vein_index#normal_copper)65%$(/l), $(l:tfg_ores/earth_vein_index#normal_tetrahedrite)30%$(/l), $(l:tfg_ores/earth_vein_index#surface_tetrahedrite)20%$(/l)$()$(li)原生银: $(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)塔基安矿: $(l:tfg_ores/earth_vein_index#normal_tarkianite)35%$(/l)$()$(li)天然碱: $(l:tfg_ores/earth_vein_index#normal_lubricant)10%$(/l), $(l:tfg_ores/earth_vein_index#normal_tarkianite)10%$(/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#normal_salt)40%$(/l), $(l:tfg_ores/earth_vein_index#normal_spodumene)20%$(/l)$()$(li)斑铜矿: $(l:tfg_ores/earth_vein_index#deep_sheldonite)53%$(/l), $(l:tfg_ores/earth_vein_index#deep_topaz)15%$(/l)$()$(li)方解石: $(l:tfg_ores/earth_vein_index#normal_gypsum)30%$(/l), $(l:tfg_ores/earth_vein_index#normal_lapis)15%$(/l)$()$(li)方钠石: $(l:tfg_ores/earth_vein_index#normal_lapis)25%$(/l)$()$(li)方铅矿: $(l:tfg_ores/earth_vein_index#normal_silver)30%$(/l)$()$(li)明矾石: $(l:tfg_ores/earth_vein_index#normal_saltpeter)15%$(/l)$()$(li)晶质铀矿: $(l:tfg_ores/earth_vein_index#deep_pitchblende)25%$(/l)$()", + "text": "$(li)云母: $(l:tfg_ores/earth_vein_index#normal_mica)25%$(/l)$()$(li)原生金: $(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)原生铜: $(l:tfg_ores/earth_vein_index#normal_copper)65%$(/l), $(l:tfg_ores/earth_vein_index#normal_tetrahedrite)30%$(/l), $(l:tfg_ores/earth_vein_index#surface_tetrahedrite)20%$(/l)$()$(li)原生银: $(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)塔基安矿: $(l:tfg_ores/earth_vein_index#normal_tarkianite)35%$(/l)$()$(li)天然碱: $(l:tfg_ores/earth_vein_index#normal_lubricant)10%$(/l), $(l:tfg_ores/earth_vein_index#normal_tarkianite)10%$(/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#normal_salt)40%$(/l), $(l:tfg_ores/earth_vein_index#normal_spodumene)20%$(/l)$()$(li)斑铜矿: $(l:tfg_ores/earth_vein_index#deep_sheldonite)53%$(/l), $(l:tfg_ores/earth_vein_index#deep_topaz)15%$(/l)$()$(li)方解石: $(l:tfg_ores/earth_vein_index#normal_gypsum)30%$(/l), $(l:tfg_ores/earth_vein_index#normal_lapis)15%$(/l)$()$(li)方钍石: $(l:tfg_ores/earth_vein_index#normal_beryllium)15%$(/l)$()$(li)方钠石: $(l:tfg_ores/earth_vein_index#normal_lapis)25%$(/l)$()$(li)方铅矿: $(l:tfg_ores/earth_vein_index#normal_silver)30%$(/l)$()$(li)明矾石: $(l:tfg_ores/earth_vein_index#normal_saltpeter)15%$(/l)$()", "type": "patchouli:text" }, { "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#deep_pitchblende)25%$(/l)$()$(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)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)皂石: $(l:tfg_ores/earth_vein_index#normal_lubricant)30%$(/l)$()$(li)盐: $(l:tfg_ores/earth_vein_index#normal_salt)30%$(/l), $(l:tfg_ores/earth_vein_index#normal_spodumene)30%$(/l)$()$(li)石棉: $(l:tfg_ores/earth_vein_index#normal_garnet_tin)25%$(/l), $(l:tfg_ores/earth_vein_index#normal_quartz)18%$(/l)$()$(li)石榴石矿砂: $(l:tfg_ores/earth_vein_index#normal_garnet_tin)25%$(/l)$()$(li)石膏: $(l:tfg_ores/earth_vein_index#normal_gypsum)35%$(/l), $(l:tfg_ores/earth_vein_index#normal_basaltic_sands)15%$(/l)$()$(li)石英岩: $(l:tfg_ores/earth_vein_index#normal_quartz)43%$(/l)$()$(li)石墨: $(l:tfg_ores/earth_vein_index#normal_graphite)45%$(/l)$()$(li)硅藻土: $(l:tfg_ores/earth_vein_index#normal_saltpeter)25%$(/l), $(l:tfg_ores/earth_vein_index#normal_garnet_tin)15%$(/l)$()$(li)硅镁镍矿: $(l:tfg_ores/earth_vein_index#normal_garnierite)30%$(/l)$()$(li)硝石: $(l:tfg_ores/earth_vein_index#normal_saltpeter)35%$(/l), $(l:tfg_ores/earth_vein_index#normal_cassiterite)10%$(/l), $(l:tfg_ores/earth_vein_index#surface_cassiterite)10%$(/l)$()$(li)硫: $(l:tfg_ores/earth_vein_index#surface_sphalerite)55%$(/l), $(l:tfg_ores/earth_vein_index#normal_sulfur)50%$(/l), $(l:tfg_ores/earth_vein_index#normal_sphalerite)35%$(/l), $(l:tfg_ores/earth_vein_index#normal_bismuthinite)9%$(/l), $(l:tfg_ores/earth_vein_index#surface_bismuthinite)3%$(/l)$()$(li)硫铂矿: $(l:tfg_ores/earth_vein_index#deep_sheldonite)38%$(/l)$()$(li)硼砂: $(l:tfg_ores/earth_vein_index#normal_gypsum)20%$(/l), $(l:tfg_ores/earth_vein_index#normal_tarkianite)20%$(/l), $(l:tfg_ores/earth_vein_index#normal_salt)15%$(/l)$()$(li)磁铁矿: $(l:tfg_ores/earth_vein_index#normal_magnetite)63%$(/l), $(l:tfg_ores/earth_vein_index#deep_magnetite)8%$(/l)$()", + "text": "$(li)白钨矿: $(l:tfg_ores/earth_vein_index#deep_scheelite)45%$(/l)$()$(li)皂石: $(l:tfg_ores/earth_vein_index#normal_lubricant)30%$(/l)$()$(li)盐: $(l:tfg_ores/earth_vein_index#normal_salt)30%$(/l), $(l:tfg_ores/earth_vein_index#normal_spodumene)30%$(/l)$()$(li)石棉: $(l:tfg_ores/earth_vein_index#normal_garnet_tin)25%$(/l), $(l:tfg_ores/earth_vein_index#normal_quartz)18%$(/l)$()$(li)石榴石矿砂: $(l:tfg_ores/earth_vein_index#normal_garnet_tin)25%$(/l)$()$(li)石膏: $(l:tfg_ores/earth_vein_index#normal_gypsum)35%$(/l), $(l:tfg_ores/earth_vein_index#normal_basaltic_sands)15%$(/l)$()$(li)石英岩: $(l:tfg_ores/earth_vein_index#normal_quartz)43%$(/l)$()$(li)石墨: $(l:tfg_ores/earth_vein_index#normal_graphite)45%$(/l)$()$(li)硅藻土: $(l:tfg_ores/earth_vein_index#normal_saltpeter)25%$(/l), $(l:tfg_ores/earth_vein_index#normal_garnet_tin)15%$(/l)$()$(li)硅镁镍矿: $(l:tfg_ores/earth_vein_index#normal_garnierite)30%$(/l)$()$(li)硝石: $(l:tfg_ores/earth_vein_index#normal_saltpeter)35%$(/l), $(l:tfg_ores/earth_vein_index#normal_cassiterite)10%$(/l), $(l:tfg_ores/earth_vein_index#surface_cassiterite)10%$(/l)$()$(li)硫: $(l:tfg_ores/earth_vein_index#surface_sphalerite)55%$(/l), $(l:tfg_ores/earth_vein_index#normal_sulfur)50%$(/l), $(l:tfg_ores/earth_vein_index#normal_sphalerite)35%$(/l), $(l:tfg_ores/earth_vein_index#normal_bismuthinite)9%$(/l), $(l:tfg_ores/earth_vein_index#surface_bismuthinite)3%$(/l)$()$(li)硫铂矿: $(l:tfg_ores/earth_vein_index#deep_sheldonite)38%$(/l)$()$(li)硼砂: $(l:tfg_ores/earth_vein_index#normal_gypsum)20%$(/l), $(l:tfg_ores/earth_vein_index#normal_tarkianite)20%$(/l), $(l:tfg_ores/earth_vein_index#normal_salt)15%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)磷灰石: $(l:tfg_ores/earth_vein_index#normal_apatite)50%$(/l)$()$(li)磷酸三钙: $(l:tfg_ores/earth_vein_index#normal_apatite)35%$(/l)$()$(li)紫水晶: $(l:tfg_ores/earth_vein_index#deep_garnet_amethyst)65%$(/l), $(l:tfg_ores/earth_vein_index#deep_garnet_opal)25%$(/l)$()$(li)红宝石: $(l:tfg_ores/earth_vein_index#normal_redstone)35%$(/l), $(l:tfg_ores/earth_vein_index#deep_hematite)20%$(/l)$()$(li)红石: $(l:tfg_ores/earth_vein_index#normal_redstone)45%$(/l)$()$(li)红色石榴石: $(l:tfg_ores/earth_vein_index#deep_garnet_amethyst)5%$(/l), $(l:tfg_ores/earth_vein_index#deep_garnet_opal)5%$(/l)$()$(li)绿宝石: $(l:tfg_ores/earth_vein_index#normal_beryllium)50%$(/l)$()$(li)绿色蓝宝石: $(l:tfg_ores/earth_vein_index#deep_sapphire)16%$(/l)$()$(li)膨润土: $(l:tfg_ores/earth_vein_index#normal_olivine)35%$(/l)$()$(li)花岗岩矿砂: $(l:tfg_ores/earth_vein_index#normal_basaltic_sands)25%$(/l)$()$(li)菱镁矿: $(l:tfg_ores/earth_vein_index#normal_olivine)25%$(/l)$()$(li)蓝宝石: $(l:tfg_ores/earth_vein_index#deep_sapphire)16%$(/l), $(l:tfg_ores/earth_vein_index#deep_magnetite)8%$(/l)$()$(li)蓝晶石: $(l:tfg_ores/earth_vein_index#normal_mica)35%$(/l)$()$(li)蓝石: $(l:tfg_ores/earth_vein_index#normal_saltpeter)25%$(/l)$()", + "text": "$(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#normal_apatite)50%$(/l)$()$(li)磷酸三钙: $(l:tfg_ores/earth_vein_index#normal_apatite)35%$(/l)$()$(li)紫水晶: $(l:tfg_ores/earth_vein_index#deep_garnet_amethyst)65%$(/l), $(l:tfg_ores/earth_vein_index#deep_garnet_opal)25%$(/l)$()$(li)红宝石: $(l:tfg_ores/earth_vein_index#normal_redstone)35%$(/l), $(l:tfg_ores/earth_vein_index#deep_hematite)20%$(/l)$()$(li)红石: $(l:tfg_ores/earth_vein_index#normal_redstone)45%$(/l)$()$(li)红色石榴石: $(l:tfg_ores/earth_vein_index#deep_garnet_amethyst)5%$(/l), $(l:tfg_ores/earth_vein_index#deep_garnet_opal)5%$(/l)$()$(li)绿宝石: $(l:tfg_ores/earth_vein_index#normal_beryllium)50%$(/l)$()$(li)绿色蓝宝石: $(l:tfg_ores/earth_vein_index#deep_sapphire)16%$(/l)$()$(li)膨润土: $(l:tfg_ores/earth_vein_index#normal_olivine)35%$(/l)$()$(li)花岗岩矿砂: $(l:tfg_ores/earth_vein_index#normal_basaltic_sands)25%$(/l)$()$(li)菱镁矿: $(l:tfg_ores/earth_vein_index#normal_olivine)25%$(/l)$()$(li)蓝宝石: $(l:tfg_ores/earth_vein_index#deep_sapphire)16%$(/l), $(l:tfg_ores/earth_vein_index#deep_magnetite)8%$(/l)$()$(li)蓝晶石: $(l:tfg_ores/earth_vein_index#normal_mica)35%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)蓝金石: $(l:tfg_ores/earth_vein_index#normal_lapis)35%$(/l)$()$(li)蓝黄玉: $(l:tfg_ores/earth_vein_index#deep_topaz)35%$(/l)$()$(li)蛋白石: $(l:tfg_ores/earth_vein_index#deep_garnet_opal)55%$(/l), $(l:tfg_ores/earth_vein_index#deep_garnet_amethyst)15%$(/l)$()$(li)赤铁矿: $(l:tfg_ores/earth_vein_index#normal_hematite)50%$(/l), $(l:tfg_ores/earth_vein_index#deep_hematite)35%$(/l), $(l:tfg_ores/earth_vein_index#normal_gold)20%$(/l), $(l:tfg_ores/earth_vein_index#normal_limonite)20%$(/l), $(l:tfg_ores/earth_vein_index#deep_gold)15%$(/l), $(l:tfg_ores/earth_vein_index#deep_limonite)15%$(/l), $(l:tfg_ores/earth_vein_index#normal_copper)5%$(/l)$()$(li)软锰矿: $(l:tfg_ores/earth_vein_index#normal_manganese)25%$(/l)$()$(li)辉钴矿: $(l:tfg_ores/earth_vein_index#normal_garnierite)20%$(/l)$()$(li)辉钼矿: $(l:tfg_ores/earth_vein_index#deep_molybdenum)35%$(/l)$()$(li)辉铋矿: $(l:tfg_ores/earth_vein_index#surface_bismuthinite)80%$(/l), $(l:tfg_ores/earth_vein_index#normal_bismuthinite)70%$(/l)$()$(li)辉铜矿: $(l:tfg_ores/earth_vein_index#deep_topaz)25%$(/l)$()$(li)辉锑矿: $(l:tfg_ores/earth_vein_index#normal_tetrahedrite)20%$(/l), $(l:tfg_ores/earth_vein_index#surface_tetrahedrite)20%$(/l)$()$(li)重晶石: $(l:tfg_ores/earth_vein_index#normal_quartz)37%$(/l)$()$(li)针铁矿: $(l:tfg_ores/earth_vein_index#deep_limonite)50%$(/l), $(l:tfg_ores/earth_vein_index#deep_hematite)25%$(/l), $(l:tfg_ores/earth_vein_index#normal_hematite)15%$(/l), $(l:tfg_ores/earth_vein_index#normal_limonite)15%$(/l), $(l:tfg_ores/earth_vein_index#deep_gold)5%$(/l), $(l:tfg_ores/earth_vein_index#normal_gold)5%$(/l)$()$(li)钍矿: $(l:tfg_ores/earth_vein_index#normal_beryllium)15%$(/l)$()$(li)钒磁铁矿: $(l:tfg_ores/earth_vein_index#normal_magnetite)22%$(/l), $(l:tfg_ores/earth_vein_index#deep_magnetite)25%$(/l)$()", + "text": "$(li)蓝石: $(l:tfg_ores/earth_vein_index#normal_saltpeter)25%$(/l)$()$(li)蓝金石: $(l:tfg_ores/earth_vein_index#normal_lapis)35%$(/l)$()$(li)蓝黄玉: $(l:tfg_ores/earth_vein_index#deep_topaz)35%$(/l)$()$(li)蛋白石: $(l:tfg_ores/earth_vein_index#deep_garnet_opal)55%$(/l), $(l:tfg_ores/earth_vein_index#deep_garnet_amethyst)15%$(/l)$()$(li)赤铁矿: $(l:tfg_ores/earth_vein_index#normal_hematite)50%$(/l), $(l:tfg_ores/earth_vein_index#deep_hematite)35%$(/l), $(l:tfg_ores/earth_vein_index#normal_gold)20%$(/l), $(l:tfg_ores/earth_vein_index#normal_limonite)20%$(/l), $(l:tfg_ores/earth_vein_index#deep_gold)15%$(/l), $(l:tfg_ores/earth_vein_index#deep_limonite)15%$(/l), $(l:tfg_ores/earth_vein_index#normal_copper)5%$(/l)$()$(li)软锰矿: $(l:tfg_ores/earth_vein_index#normal_manganese)25%$(/l)$()$(li)辉钴矿: $(l:tfg_ores/earth_vein_index#normal_garnierite)20%$(/l)$()$(li)辉钼矿: $(l:tfg_ores/earth_vein_index#deep_molybdenum)35%$(/l)$()$(li)辉铋矿: $(l:tfg_ores/earth_vein_index#surface_bismuthinite)80%$(/l), $(l:tfg_ores/earth_vein_index#normal_bismuthinite)70%$(/l)$()$(li)辉铜矿: $(l:tfg_ores/earth_vein_index#deep_topaz)25%$(/l)$()$(li)辉锑矿: $(l:tfg_ores/earth_vein_index#normal_tetrahedrite)20%$(/l), $(l:tfg_ores/earth_vein_index#surface_tetrahedrite)20%$(/l)$()$(li)重晶石: $(l:tfg_ores/earth_vein_index#normal_quartz)37%$(/l)$()$(li)针铁矿: $(l:tfg_ores/earth_vein_index#deep_limonite)50%$(/l), $(l:tfg_ores/earth_vein_index#deep_hematite)25%$(/l), $(l:tfg_ores/earth_vein_index#normal_hematite)15%$(/l), $(l:tfg_ores/earth_vein_index#normal_limonite)15%$(/l), $(l:tfg_ores/earth_vein_index#deep_gold)5%$(/l), $(l:tfg_ores/earth_vein_index#normal_gold)5%$(/l)$()$(li)钒磁铁矿: $(l:tfg_ores/earth_vein_index#normal_magnetite)22%$(/l), $(l:tfg_ores/earth_vein_index#deep_magnetite)25%$(/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 e735d0826..c5d7b62a3 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 @@ -153,7 +153,7 @@ ] }, "enable_visualize": false, - "text": "$(thing)百分比$(): 62%$(br)$(thing)来源$(): 铀, 钍, 铅$(br)$(thing)化学式$(): (UO₂)₃ThPb$(br)$(thing)危害$(): $(c)$(t:需要全身防护)致癌 (任何接触)$(/t)$()", + "text": "$(thing)百分比$(): 62%$(br)$(thing)来源$(): 铀, 钍, 铅$(br)$(thing)化学式$(): (UO₂)₃ThPb$(br)$(thing)危害$(): $(c)$(t:需要全身防护)放射性 (任何接触)$(/t)$()", "type": "patchouli:multiblock" }, { @@ -173,7 +173,7 @@ ] }, "enable_visualize": false, - "text": "$(thing)百分比$(): 25%$(br)$(thing)来源$(): 铀$(br)$(thing)化学式$(): UO₂$(br)$(thing)危害$(): $(c)$(t:需要全身防护)致癌 (任何接触)$(/t)$()", + "text": "$(thing)百分比$(): 25%$(br)$(thing)来源$(): 铀$(br)$(thing)化学式$(): UO₂$(br)$(thing)危害$(): $(c)$(t:需要全身防护)放射性 (任何接触)$(/t)$()", "type": "patchouli:multiblock" }, { @@ -1693,7 +1693,7 @@ }, { "Type": "patchouli:multiblock", - "name": "钍矿", + "name": "方钍石", "multiblock": { "mapping": { "0": "#forge:ores/thorium" @@ -1708,7 +1708,7 @@ ] }, "enable_visualize": false, - "text": "$(thing)百分比$(): 15%$(br)$(thing)来源$(): 钍$(br)$(thing)化学式$(): Th", + "text": "$(thing)百分比$(): 15%$(br)$(thing)来源$(): 钍$(br)$(thing)化学式$(): ThO₂", "type": "patchouli:multiblock" }, { diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/tfg_ores/mars_ore_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/tfg_ores/mars_ore_index.json index d269c420a..dc1f5f284 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/tfg_ores/mars_ore_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/tfg_ores/mars_ore_index.json @@ -14,27 +14,32 @@ }, { "Type": "patchouli:text", - "text": "$(li)原生金: $(l:tfg_ores/mars_vein_index#mars_sapphire)55%$(/l), $(l:tfg_ores/mars_vein_index#mars_hematite)5%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_hematite)5%$(/l)$()$(li)原生铜: $(l:tfg_ores/mars_vein_index#mars_stibnite)28%$(/l), $(l:tfg_ores/mars_vein_index#mars_copper)20%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_tetrahedrite)19%$(/l)$()$(li)原生银: $(l:tfg_ores/mars_vein_index#mars_galena)20%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_nickel_galena)11%$(/l)$()$(li)天然碱: $(l:tfg_ores/mars_vein_index#mars_lubricant)35%$(/l)$()$(li)岩盐: $(l:tfg_ores/mars_vein_index#mars_salt)20%$(/l)$()$(li)斑铜矿: $(l:tfg_ores/mars_vein_index#deep_mars_sheldonite)35%$(/l)$()$(li)方解石: $(l:tfg_ores/mars_vein_index#mars_surface_hematite)5%$(/l)$()$(li)方铅矿: $(l:tfg_ores/mars_vein_index#mars_galena)40%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_nickel_galena)35%$(/l)$()$(li)晶质铀矿: $(l:tfg_ores/mars_vein_index#deep_mars_pitchblende)21%$(/l)$()$(li)氟碳镧铈矿: $(l:tfg_ores/mars_vein_index#mars_neodynium)58%$(/l)$()$(li)沥青铀矿: $(l:tfg_ores/mars_vein_index#deep_mars_pitchblende)52%$(/l), $(l:tfg_ores/mars_vein_index#mars_pitchblende)41%$(/l)$()$(li)海绿石矿砂: $(l:tfg_ores/mars_vein_index#mars_lubricant)7%$(/l)$()$(li)滑石: $(l:tfg_ores/mars_vein_index#mars_lubricant)21%$(/l)$()$(li)烧绿石: $(l:tfg_ores/mars_vein_index#mars_apatite)14%$(/l)$()", + "text": "$(li)原生金: $(l:tfg_ores/mars_vein_index#mars_sapphire)55%$(/l), $(l:tfg_ores/mars_vein_index#mars_hematite)5%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_hematite)5%$(/l)$()$(li)原生铜: $(l:tfg_ores/mars_vein_index#mars_stibnite)28%$(/l), $(l:tfg_ores/mars_vein_index#mars_copper)20%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_tetrahedrite)19%$(/l)$()$(li)原生银: $(l:tfg_ores/mars_vein_index#mars_galena)20%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_nickel_galena)11%$(/l)$()$(li)天然碱: $(l:tfg_ores/mars_vein_index#mars_lubricant)35%$(/l)$()$(li)岩盐: $(l:tfg_ores/mars_vein_index#mars_salt)20%$(/l)$()$(li)斑铜矿: $(l:tfg_ores/mars_vein_index#deep_mars_sheldonite)35%$(/l)$()$(li)方解石: $(l:tfg_ores/mars_vein_index#mars_lapis)15%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_hematite)5%$(/l)$()$(li)方钍石: $(l:tfg_ores/mars_vein_index#deep_mars_pitchblende)26%$(/l), $(l:tfg_ores/mars_vein_index#mars_pitchblende)29%$(/l)$()$(li)方钠石: $(l:tfg_ores/mars_vein_index#mars_lapis)25%$(/l)$()$(li)方铅矿: $(l:tfg_ores/mars_vein_index#mars_galena)40%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_nickel_galena)35%$(/l)$()$(li)晶质铀矿: $(l:tfg_ores/mars_vein_index#deep_mars_pitchblende)21%$(/l)$()$(li)氟碳镧铈矿: $(l:tfg_ores/mars_vein_index#mars_neodynium)58%$(/l)$()$(li)沥青铀矿: $(l:tfg_ores/mars_vein_index#deep_mars_pitchblende)52%$(/l), $(l:tfg_ores/mars_vein_index#mars_pitchblende)41%$(/l)$()$(li)海绿石矿砂: $(l:tfg_ores/mars_vein_index#mars_lubricant)7%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)煤炭: $(l:tfg_ores/mars_vein_index#mars_coal)70%$(/l), $(l:tfg_ores/mars_vein_index#mars_graphite)25%$(/l)$()$(li)独居石: $(l:tfg_ores/mars_vein_index#mars_neodynium)29%$(/l)$()$(li)白钨矿: $(l:tfg_ores/mars_vein_index#mars_tungsten)42%$(/l)$()$(li)皂石: $(l:tfg_ores/mars_vein_index#mars_lubricant)21%$(/l)$()$(li)盐: $(l:tfg_ores/mars_vein_index#mars_salt)30%$(/l)$()$(li)石棉: $(l:tfg_ores/mars_vein_index#mars_quartzite)17%$(/l)$()$(li)石膏: $(l:tfg_ores/mars_vein_index#mars_surface_bismuthinite)20%$(/l)$()$(li)石英岩: $(l:tfg_ores/mars_vein_index#mars_quartzite)41%$(/l)$()$(li)石墨: $(l:tfg_ores/mars_vein_index#mars_graphite)45%$(/l)$()$(li)硅镁镍矿: $(l:tfg_ores/mars_vein_index#mars_nickel)35%$(/l)$()$(li)硝石: $(l:tfg_ores/mars_vein_index#mars_surface_cassiterite)10%$(/l)$()$(li)硫: $(l:tfg_ores/mars_vein_index#mars_sulfur)14%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_bismuthinite)20%$(/l)$()$(li)硫铂矿: $(l:tfg_ores/mars_vein_index#deep_mars_sheldonite)25%$(/l)$()$(li)磷灰石: $(l:tfg_ores/mars_vein_index#mars_apatite)47%$(/l)$()", + "text": "$(li)滑石: $(l:tfg_ores/mars_vein_index#mars_lubricant)21%$(/l)$()$(li)烧绿石: $(l:tfg_ores/mars_vein_index#mars_apatite)14%$(/l)$()$(li)煤炭: $(l:tfg_ores/mars_vein_index#mars_coal)70%$(/l), $(l:tfg_ores/mars_vein_index#mars_graphite)25%$(/l)$()$(li)独居石: $(l:tfg_ores/mars_vein_index#mars_neodynium)29%$(/l)$()$(li)白钨矿: $(l:tfg_ores/mars_vein_index#mars_tungsten)42%$(/l)$()$(li)皂石: $(l:tfg_ores/mars_vein_index#mars_lubricant)21%$(/l)$()$(li)盐: $(l:tfg_ores/mars_vein_index#mars_salt)30%$(/l)$()$(li)石棉: $(l:tfg_ores/mars_vein_index#mars_quartzite)17%$(/l)$()$(li)石膏: $(l:tfg_ores/mars_vein_index#mars_surface_bismuthinite)20%$(/l)$()$(li)石英岩: $(l:tfg_ores/mars_vein_index#mars_quartzite)41%$(/l)$()$(li)石墨: $(l:tfg_ores/mars_vein_index#mars_graphite)45%$(/l)$()$(li)硅镁镍矿: $(l:tfg_ores/mars_vein_index#mars_nickel)35%$(/l)$()$(li)硝石: $(l:tfg_ores/mars_vein_index#mars_surface_cassiterite)10%$(/l)$()$(li)硫: $(l:tfg_ores/mars_vein_index#mars_sulfur)14%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_bismuthinite)20%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)磷酸三钙: $(l:tfg_ores/mars_vein_index#mars_apatite)33%$(/l)$()$(li)红宝石: $(l:tfg_ores/mars_vein_index#deep_mars_chromite)35%$(/l)$()$(li)红石: $(l:tfg_ores/mars_vein_index#deep_mars_chromite)45%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_tetrahedrite)4%$(/l)$()$(li)绿宝石: $(l:tfg_ores/mars_vein_index#mars_beryllium)50%$(/l)$()$(li)绿色蓝宝石: $(l:tfg_ores/mars_vein_index#mars_almandine)15%$(/l), $(l:tfg_ores/mars_vein_index#mars_sapphire)5%$(/l)$()$(li)蓝宝石: $(l:tfg_ores/mars_vein_index#mars_almandine)15%$(/l)$()$(li)蓝石: $(l:tfg_ores/mars_vein_index#mars_sapphire)20%$(/l)$()$(li)赤铁矿: $(l:tfg_ores/mars_vein_index#mars_hematite)50%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_hematite)55%$(/l), $(l:tfg_ores/mars_vein_index#mars_coal)30%$(/l), $(l:tfg_ores/mars_vein_index#mars_pitchblende)29%$(/l), $(l:tfg_ores/mars_vein_index#mars_sulfur)19%$(/l), $(l:tfg_ores/mars_vein_index#mars_graphite)10%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_bismuthinite)20%$(/l), $(l:tfg_ores/mars_vein_index#mars_almandine)5%$(/l), $(l:tfg_ores/mars_vein_index#mars_apatite)4%$(/l), $(l:tfg_ores/mars_vein_index#mars_copper)5%$(/l), $(l:tfg_ores/mars_vein_index#mars_galena)6%$(/l), $(l:tfg_ores/mars_vein_index#mars_lubricant)7%$(/l), $(l:tfg_ores/mars_vein_index#mars_neodynium)5%$(/l), $(l:tfg_ores/mars_vein_index#mars_nickel)7%$(/l), $(l:tfg_ores/mars_vein_index#mars_quartzite)5%$(/l), $(l:tfg_ores/mars_vein_index#mars_stibnite)4%$(/l), $(l:tfg_ores/mars_vein_index#mars_tungsten)4%$(/l)$()$(li)软锰矿: $(l:tfg_ores/mars_vein_index#mars_tantalite)42%$(/l)$()$(li)辉钴矿: $(l:tfg_ores/mars_vein_index#mars_nickel)28%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_nickel_galena)11%$(/l)$()$(li)辉铋矿: $(l:tfg_ores/mars_vein_index#mars_surface_bismuthinite)40%$(/l)$()$(li)辉锑矿: $(l:tfg_ores/mars_vein_index#mars_stibnite)19%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_tetrahedrite)19%$(/l)$()$(li)重晶石: $(l:tfg_ores/mars_vein_index#mars_quartzite)35%$(/l)$()$(li)针铁矿: $(l:tfg_ores/mars_vein_index#mars_hematite)15%$(/l)$()", + "text": "$(li)硫铂矿: $(l:tfg_ores/mars_vein_index#deep_mars_sheldonite)25%$(/l)$()$(li)磷灰石: $(l:tfg_ores/mars_vein_index#mars_apatite)47%$(/l)$()$(li)磷酸三钙: $(l:tfg_ores/mars_vein_index#mars_apatite)33%$(/l)$()$(li)红宝石: $(l:tfg_ores/mars_vein_index#deep_mars_chromite)35%$(/l)$()$(li)红石: $(l:tfg_ores/mars_vein_index#deep_mars_chromite)45%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_tetrahedrite)4%$(/l)$()$(li)绿宝石: $(l:tfg_ores/mars_vein_index#mars_beryllium)50%$(/l)$()$(li)绿色蓝宝石: $(l:tfg_ores/mars_vein_index#mars_almandine)15%$(/l), $(l:tfg_ores/mars_vein_index#mars_sapphire)5%$(/l)$()$(li)蓝宝石: $(l:tfg_ores/mars_vein_index#mars_almandine)15%$(/l)$()$(li)蓝石: $(l:tfg_ores/mars_vein_index#mars_sapphire)20%$(/l)$()$(li)蓝金石: $(l:tfg_ores/mars_vein_index#mars_lapis)35%$(/l)$()$(li)赤铁矿: $(l:tfg_ores/mars_vein_index#mars_hematite)50%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_hematite)55%$(/l), $(l:tfg_ores/mars_vein_index#mars_coal)30%$(/l), $(l:tfg_ores/mars_vein_index#mars_pitchblende)29%$(/l), $(l:tfg_ores/mars_vein_index#mars_sulfur)19%$(/l), $(l:tfg_ores/mars_vein_index#mars_graphite)10%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_bismuthinite)20%$(/l), $(l:tfg_ores/mars_vein_index#mars_almandine)5%$(/l), $(l:tfg_ores/mars_vein_index#mars_apatite)4%$(/l), $(l:tfg_ores/mars_vein_index#mars_copper)5%$(/l), $(l:tfg_ores/mars_vein_index#mars_galena)6%$(/l), $(l:tfg_ores/mars_vein_index#mars_lubricant)7%$(/l), $(l:tfg_ores/mars_vein_index#mars_neodynium)5%$(/l), $(l:tfg_ores/mars_vein_index#mars_nickel)7%$(/l), $(l:tfg_ores/mars_vein_index#mars_quartzite)5%$(/l), $(l:tfg_ores/mars_vein_index#mars_stibnite)4%$(/l), $(l:tfg_ores/mars_vein_index#mars_tungsten)4%$(/l)$()$(li)软锰矿: $(l:tfg_ores/mars_vein_index#mars_tantalite)42%$(/l)$()$(li)辉钴矿: $(l:tfg_ores/mars_vein_index#mars_nickel)28%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_nickel_galena)11%$(/l)$()$(li)辉铋矿: $(l:tfg_ores/mars_vein_index#mars_surface_bismuthinite)40%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)钍矿: $(l:tfg_ores/mars_vein_index#deep_mars_pitchblende)26%$(/l), $(l:tfg_ores/mars_vein_index#mars_pitchblende)29%$(/l)$()$(li)钕矿: $(l:tfg_ores/mars_vein_index#mars_neodynium)5%$(/l)$()$(li)钙铝榴石: $(l:tfg_ores/mars_vein_index#mars_tantalite)10%$(/l)$()$(li)钨酸锂: $(l:tfg_ores/mars_vein_index#mars_tungsten)33%$(/l)$()$(li)钻石: $(l:tfg_ores/mars_vein_index#mars_graphite)20%$(/l)$()$(li)钽铁矿: $(l:tfg_ores/mars_vein_index#mars_tantalite)36%$(/l)$()$(li)铁铝榴石: $(l:tfg_ores/mars_vein_index#mars_almandine)36%$(/l)$()$(li)铂矿: $(l:tfg_ores/mars_vein_index#deep_mars_sheldonite)15%$(/l)$()$(li)铅矿: $(l:tfg_ores/mars_vein_index#mars_galena)33%$(/l)$()$(li)铍矿: $(l:tfg_ores/mars_vein_index#mars_beryllium)35%$(/l)$()$(li)铝土矿: $(l:tfg_ores/mars_vein_index#mars_sapphire)20%$(/l)$()$(li)铬铁矿: $(l:tfg_ores/mars_vein_index#deep_mars_chromite)20%$(/l)$()$(li)锂云母: $(l:tfg_ores/mars_vein_index#mars_salt)15%$(/l)$()$(li)锂矿: $(l:tfg_ores/mars_vein_index#mars_tungsten)19%$(/l)$()", + "text": "$(li)辉锑矿: $(l:tfg_ores/mars_vein_index#mars_stibnite)19%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_tetrahedrite)19%$(/l)$()$(li)重晶石: $(l:tfg_ores/mars_vein_index#mars_quartzite)35%$(/l)$()$(li)针铁矿: $(l:tfg_ores/mars_vein_index#mars_hematite)15%$(/l)$()$(li)钕矿: $(l:tfg_ores/mars_vein_index#mars_neodynium)5%$(/l)$()$(li)钙铝榴石: $(l:tfg_ores/mars_vein_index#mars_tantalite)10%$(/l)$()$(li)钨酸锂: $(l:tfg_ores/mars_vein_index#mars_tungsten)33%$(/l)$()$(li)钻石: $(l:tfg_ores/mars_vein_index#mars_graphite)20%$(/l)$()$(li)钽铁矿: $(l:tfg_ores/mars_vein_index#mars_tantalite)36%$(/l)$()$(li)铁铝榴石: $(l:tfg_ores/mars_vein_index#mars_almandine)36%$(/l)$()$(li)铂矿: $(l:tfg_ores/mars_vein_index#deep_mars_sheldonite)15%$(/l)$()$(li)铅矿: $(l:tfg_ores/mars_vein_index#mars_galena)33%$(/l)$()$(li)铍矿: $(l:tfg_ores/mars_vein_index#mars_beryllium)35%$(/l)$()$(li)铝土矿: $(l:tfg_ores/mars_vein_index#mars_sapphire)20%$(/l)$()$(li)铬铁矿: $(l:tfg_ores/mars_vein_index#deep_mars_chromite)20%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)锂辉石: $(l:tfg_ores/mars_vein_index#mars_salt)35%$(/l)$()$(li)锡石矿: $(l:tfg_ores/mars_vein_index#mars_surface_cassiterite)55%$(/l)$()$(li)锡矿: $(l:tfg_ores/mars_vein_index#mars_surface_cassiterite)35%$(/l)$()$(li)锰铝榴石: $(l:tfg_ores/mars_vein_index#mars_tantalite)10%$(/l)$()$(li)镁铝榴石: $(l:tfg_ores/mars_vein_index#mars_almandine)26%$(/l)$()$(li)镍矿: $(l:tfg_ores/mars_vein_index#deep_mars_sheldonite)25%$(/l), $(l:tfg_ores/mars_vein_index#mars_nickel)28%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_nickel_galena)23%$(/l)$()$(li)镍黄铁矿: $(l:tfg_ores/mars_vein_index#mars_lubricant)7%$(/l)$()$(li)闪锌矿: $(l:tfg_ores/mars_vein_index#mars_sulfur)23%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_nickel_galena)17%$(/l)$()$(li)雄黄: $(l:tfg_ores/mars_vein_index#mars_beryllium)15%$(/l)$()$(li)黄褐铁矿: $(l:tfg_ores/mars_vein_index#mars_hematite)30%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_hematite)33%$(/l)$()$(li)黄铁矿: $(l:tfg_ores/mars_vein_index#mars_sulfur)42%$(/l), $(l:tfg_ores/mars_vein_index#mars_copper)10%$(/l)$()$(li)黄铜矿: $(l:tfg_ores/mars_vein_index#mars_copper)65%$(/l)$()$(li)黝铜矿: $(l:tfg_ores/mars_vein_index#mars_surface_tetrahedrite)57%$(/l), $(l:tfg_ores/mars_vein_index#mars_stibnite)47%$(/l)$()", + "text": "$(li)锂云母: $(l:tfg_ores/mars_vein_index#mars_salt)15%$(/l)$()$(li)锂矿: $(l:tfg_ores/mars_vein_index#mars_tungsten)19%$(/l)$()$(li)锂辉石: $(l:tfg_ores/mars_vein_index#mars_salt)35%$(/l)$()$(li)锡石矿: $(l:tfg_ores/mars_vein_index#mars_surface_cassiterite)55%$(/l)$()$(li)锡矿: $(l:tfg_ores/mars_vein_index#mars_surface_cassiterite)35%$(/l)$()$(li)锰铝榴石: $(l:tfg_ores/mars_vein_index#mars_tantalite)10%$(/l)$()$(li)镁铝榴石: $(l:tfg_ores/mars_vein_index#mars_almandine)26%$(/l)$()$(li)镍矿: $(l:tfg_ores/mars_vein_index#deep_mars_sheldonite)25%$(/l), $(l:tfg_ores/mars_vein_index#mars_nickel)28%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_nickel_galena)23%$(/l)$()$(li)镍黄铁矿: $(l:tfg_ores/mars_vein_index#mars_lubricant)7%$(/l)$()$(li)闪锌矿: $(l:tfg_ores/mars_vein_index#mars_sulfur)23%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_nickel_galena)17%$(/l)$()$(li)雄黄: $(l:tfg_ores/mars_vein_index#mars_beryllium)15%$(/l)$()$(li)青金石: $(l:tfg_ores/mars_vein_index#mars_lapis)25%$(/l)$()$(li)黄褐铁矿: $(l:tfg_ores/mars_vein_index#mars_hematite)30%$(/l), $(l:tfg_ores/mars_vein_index#mars_surface_hematite)33%$(/l)$()$(li)黄铁矿: $(l:tfg_ores/mars_vein_index#mars_sulfur)42%$(/l), $(l:tfg_ores/mars_vein_index#mars_copper)10%$(/l)$()", + "type": "patchouli:text" + }, + { + "Type": "patchouli:text", + "text": "$(li)黄铜矿: $(l:tfg_ores/mars_vein_index#mars_copper)65%$(/l)$()$(li)黝铜矿: $(l:tfg_ores/mars_vein_index#mars_surface_tetrahedrite)57%$(/l), $(l:tfg_ores/mars_vein_index#mars_stibnite)47%$(/l)$()", "type": "patchouli:text" } ], 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 2491654a3..f475de296 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 @@ -14,12 +14,12 @@ }, { "Type": "patchouli:text", - "text": "$(li)$(l:tfg_ores/mars_vein_index#deep_mars_sheldonite)斑铜矿, 硫铂矿$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_neodynium)氟碳镧铈矿, 独居石$()$()$(li)$(l:tfg_ores/mars_vein_index#deep_mars_pitchblende)沥青铀矿, 钍矿, 晶质铀矿$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_pitchblende)沥青铀矿, 钍矿, 赤铁矿$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_coal)煤炭, 赤铁矿$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_tungsten)白钨矿, 钨酸锂$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_lubricant)皂石, 滑石, 海绿石矿砂$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_salt)盐, 锂辉石$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_quartzite)石英岩, 石棉, 重晶石$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_graphite)石墨, 钻石$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_nickel)硅镁镍矿, 辉钴矿$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_apatite)磷灰石, 烧绿石$()$()$(li)$(l:tfg_ores/mars_vein_index#deep_mars_chromite)红石, 铬铁矿$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_beryllium)绿宝石, 铍矿$()$()", + "text": "$(li)$(l:tfg_ores/mars_vein_index#deep_mars_sheldonite)斑铜矿, 硫铂矿$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_neodynium)氟碳镧铈矿, 独居石$()$()$(li)$(l:tfg_ores/mars_vein_index#deep_mars_pitchblende)沥青铀矿, 方钍石, 晶质铀矿$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_pitchblende)沥青铀矿, 方钍石, 赤铁矿$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_coal)煤炭, 赤铁矿$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_tungsten)白钨矿, 钨酸锂$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_lubricant)皂石, 滑石, 海绿石矿砂$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_salt)盐, 锂辉石$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_quartzite)石英岩, 石棉, 重晶石$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_graphite)石墨, 钻石$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_nickel)硅镁镍矿, 辉钴矿$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_apatite)磷灰石, 烧绿石$()$()$(li)$(l:tfg_ores/mars_vein_index#deep_mars_chromite)红石, 铬铁矿$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_beryllium)绿宝石, 铍矿$()$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)$(l:tfg_ores/mars_vein_index#mars_hematite)赤铁矿, 褐铁矿$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_surface_hematite)赤铁矿, 褐铁矿$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_surface_bismuthinite)辉铋矿$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_sapphire)金矿, 蓝石, 铝土矿$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_almandine)铁铝榴石, 蓝宝石$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_copper)铜矿, 黄铜矿$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_galena)银矿, 方铅矿, 铅矿$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_surface_cassiterite)锡石矿$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_tantalite)锰矿, 钽矿$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_surface_nickel_galena)闪锌矿, 方铅矿$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_sulfur)闪锌矿, 黄铁矿$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_surface_tetrahedrite)黝铜矿 (地表)$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_stibnite)黝铜矿 (普通)$()$()", + "text": "$(li)$(l:tfg_ores/mars_vein_index#mars_hematite)赤铁矿, 褐铁矿$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_surface_hematite)赤铁矿, 褐铁矿$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_surface_bismuthinite)辉铋矿$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_sapphire)金矿, 蓝石, 铝土矿$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_almandine)铁铝榴石, 蓝宝石$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_copper)铜矿, 黄铜矿$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_galena)银矿, 方铅矿, 铅矿$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_surface_cassiterite)锡石矿$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_tantalite)锰矿, 钽矿$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_surface_nickel_galena)闪锌矿, 方铅矿$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_sulfur)闪锌矿, 黄铁矿$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_lapis)青金石, 蓝金石, 方钠石$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_surface_tetrahedrite)黝铜矿 (地表)$()$()$(li)$(l:tfg_ores/mars_vein_index#mars_stibnite)黝铜矿 (普通)$()$()", "type": "patchouli:text" }, { @@ -214,7 +214,7 @@ { "Type": "patchouli:text", "text": "$(thing)稀有度$(): 370$(br)$(thing)密度$(): 0.3$(br)$(thing)类型$(): 团簇状矿脉$(br)$(thing)Y 坐标$(): -20 — 0$(br)$(thing)尺寸$(): 60$(br)$(thing)指示器最大深度$(): 20$(br2)$(thing)岩石类型$(): 泥板岩, 粗面岩, 粘土岩, 英安岩, 辉长岩, 闪长岩, 页岩", - "title": "沥青铀矿, 钍矿, 晶质铀矿", + "title": "沥青铀矿, 方钍石, 晶质铀矿", "type": "patchouli:text", "anchor": "deep_mars_pitchblende" }, @@ -235,12 +235,12 @@ ] }, "enable_visualize": false, - "text": "$(thing)百分比$(): 52%$(br)$(thing)来源$(): 铀, 钍, 铅$(br)$(thing)化学式$(): (UO₂)₃ThPb$(br)$(thing)危害$(): $(c)$(t:需要全身防护)致癌 (任何接触)$(/t)$()", + "text": "$(thing)百分比$(): 52%$(br)$(thing)来源$(): 铀, 钍, 铅$(br)$(thing)化学式$(): (UO₂)₃ThPb$(br)$(thing)危害$(): $(c)$(t:需要全身防护)放射性 (任何接触)$(/t)$()", "type": "patchouli:multiblock" }, { "Type": "patchouli:multiblock", - "name": "钍矿", + "name": "方钍石", "multiblock": { "mapping": { "0": "#forge:ores/thorium" @@ -255,7 +255,7 @@ ] }, "enable_visualize": false, - "text": "$(thing)百分比$(): 26%$(br)$(thing)来源$(): 钍$(br)$(thing)化学式$(): Th", + "text": "$(thing)百分比$(): 26%$(br)$(thing)来源$(): 钍$(br)$(thing)化学式$(): ThO₂", "type": "patchouli:multiblock" }, { @@ -275,13 +275,13 @@ ] }, "enable_visualize": false, - "text": "$(thing)百分比$(): 21%$(br)$(thing)来源$(): 铀$(br)$(thing)化学式$(): UO₂$(br)$(thing)危害$(): $(c)$(t:需要全身防护)致癌 (任何接触)$(/t)$()", + "text": "$(thing)百分比$(): 21%$(br)$(thing)来源$(): 铀$(br)$(thing)化学式$(): UO₂$(br)$(thing)危害$(): $(c)$(t:需要全身防护)放射性 (任何接触)$(/t)$()", "type": "patchouli:multiblock" }, { "Type": "patchouli:text", "text": "$(thing)稀有度$(): 220$(br)$(thing)密度$(): 0.55$(br)$(thing)类型$(): 团簇状矿脉$(br)$(thing)Y 坐标$(): 0 — 70$(br)$(thing)尺寸$(): 20$(br)$(thing)指示器最大深度$(): 15$(br2)$(thing)岩石类型$(): 泥板岩, 白云岩, 砾岩, 粗面岩, 红花岗岩, 英安岩, 辉长岩, 闪长岩, 页岩", - "title": "沥青铀矿, 钍矿, 赤铁矿", + "title": "沥青铀矿, 方钍石, 赤铁矿", "type": "patchouli:text", "anchor": "mars_pitchblende" }, @@ -302,12 +302,12 @@ ] }, "enable_visualize": false, - "text": "$(thing)百分比$(): 41%$(br)$(thing)来源$(): 铀, 钍, 铅$(br)$(thing)化学式$(): (UO₂)₃ThPb$(br)$(thing)危害$(): $(c)$(t:需要全身防护)致癌 (任何接触)$(/t)$()", + "text": "$(thing)百分比$(): 41%$(br)$(thing)来源$(): 铀, 钍, 铅$(br)$(thing)化学式$(): (UO₂)₃ThPb$(br)$(thing)危害$(): $(c)$(t:需要全身防护)放射性 (任何接触)$(/t)$()", "type": "patchouli:multiblock" }, { "Type": "patchouli:multiblock", - "name": "钍矿", + "name": "方钍石", "multiblock": { "mapping": { "0": "#forge:ores/thorium" @@ -322,7 +322,7 @@ ] }, "enable_visualize": false, - "text": "$(thing)百分比$(): 29%$(br)$(thing)来源$(): 钍$(br)$(thing)化学式$(): Th", + "text": "$(thing)百分比$(): 29%$(br)$(thing)来源$(): 钍$(br)$(thing)化学式$(): ThO₂", "type": "patchouli:multiblock" }, { @@ -2232,6 +2232,98 @@ "draw_filler": true, "type": "patchouli:empty" }, + { + "Type": "patchouli:text", + "text": "$(thing)稀有度$(): 200$(br)$(thing)密度$(): 0.25$(br)$(thing)类型$(): 团簇状矿脉$(br)$(thing)Y 坐标$(): 0 — 70$(br)$(thing)尺寸$(): 30$(br)$(thing)指示器最大深度$(): 20$(br2)$(thing)岩石类型$(): 泥板岩, 燧石, 白云岩, 白垩岩, 石灰岩, 页岩", + "title": "青金石, 蓝金石, 方钠石", + "type": "patchouli:text", + "anchor": "mars_lapis" + }, + { + "Type": "patchouli:multiblock", + "name": "蓝金石", + "multiblock": { + "mapping": { + "0": "#forge:ores/lazurite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)百分比$(): 35%$(br)$(thing)来源$(): 铝, 钙, 钠$(br)$(thing)化学式$(): Al₆Si₆Ca₈Na₈", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "方钠石", + "multiblock": { + "mapping": { + "0": "#forge:ores/sodalite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)百分比$(): 25%$(br)$(thing)来源$(): 铝, 钠$(br)$(thing)化学式$(): Al₃Si₃Na₄Cl", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "青金石", + "multiblock": { + "mapping": { + "0": "#forge:ores/lapis" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)百分比$(): 25%$(br)$(thing)来源$(): 蓝金石, 方钠石, 黄铁矿, 方解石", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "方解石", + "multiblock": { + "mapping": { + "0": "#forge:ores/calcite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)百分比$(): 15%$(br)$(thing)来源$(): 钙$(br)$(thing)化学式$(): CaCO₃", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:empty", + "draw_filler": true, + "type": "patchouli:empty" + }, { "Type": "patchouli:text", "text": "$(thing)稀有度$(): 140$(br)$(thing)密度$(): 0.25$(br)$(thing)类型$(): 团簇状矿脉$(br)$(thing)Y 坐标$(): 80 — 180$(br)$(thing)尺寸$(): 45$(br)$(thing)指示器最大深度$(): 40$(br2)$(thing)岩石类型$(): 泥板岩, 燧石, 玄武岩, 白云岩, 白垩岩, 石灰岩, 砾岩, 粗面岩, 粘土岩, 红花岗岩, 花岗岩, 英安岩, 辉长岩, 闪长岩, 页岩", diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/tfg_ores/moon_ore_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/tfg_ores/moon_ore_index.json index 0eead74c1..119901031 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/tfg_ores/moon_ore_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/tfg_ores/moon_ore_index.json @@ -14,22 +14,22 @@ }, { "Type": "patchouli:text", - "text": "$(li)下界石英: $(l:tfg_ores/moon_vein_index#moon_quartz)30%$(/l)$()$(li)云母: $(l:tfg_ores/moon_vein_index#moon_mica)23%$(/l)$()$(li)原生金: $(l:tfg_ores/moon_vein_index#moon_gold)55%$(/l), $(l:tfg_ores/moon_vein_index#moon_magnetite)15%$(/l)$()$(li)原生铜: $(l:tfg_ores/moon_vein_index#moon_tetrahedrite)15%$(/l)$()$(li)原生银: $(l:tfg_ores/moon_vein_index#moon_silver)42%$(/l)$()$(li)天然碱: $(l:tfg_ores/moon_vein_index#moon_lubricant)10%$(/l)$()$(li)岩盐: $(l:tfg_ores/moon_vein_index#moon_beryllium)18%$(/l)$()$(li)戴斯矿: $(l:tfg_ores/moon_vein_index#moon_desh)25%$(/l), $(l:tfg_ores/moon_vein_index#moon_sphalerite)10%$(/l)$()$(li)斑铜矿: $(l:tfg_ores/moon_vein_index#moon_sheldonite)35%$(/l), $(l:tfg_ores/moon_vein_index#moon_topaz)15%$(/l)$()$(li)方解石: $(l:tfg_ores/moon_vein_index#moon_gypsum)25%$(/l)$()$(li)方铅矿: $(l:tfg_ores/moon_vein_index#moon_silver)28%$(/l)$()$(li)明矾石: $(l:tfg_ores/moon_vein_index#moon_gypsum)15%$(/l)$()$(li)朱砂: $(l:tfg_ores/moon_vein_index#moon_redstone)19%$(/l)$()$(li)橄榄石: $(l:tfg_ores/moon_vein_index#moon_graphite)10%$(/l), $(l:tfg_ores/moon_vein_index#moon_apatite)4%$(/l), $(l:tfg_ores/moon_vein_index#moon_beryllium)4%$(/l), $(l:tfg_ores/moon_vein_index#moon_gypsum)5%$(/l), $(l:tfg_ores/moon_vein_index#moon_mica)4%$(/l), $(l:tfg_ores/moon_vein_index#moon_molybdenum)5%$(/l), $(l:tfg_ores/moon_vein_index#moon_redstone)4%$(/l), $(l:tfg_ores/moon_vein_index#moon_silver)4%$(/l), $(l:tfg_ores/moon_vein_index#moon_sapphire)2%$(/l), $(l:tfg_ores/moon_vein_index#moon_monazite)1%$(/l)$()", + "text": "$(li)下界石英: $(l:tfg_ores/moon_vein_index#moon_quartz)30%$(/l)$()$(li)云母: $(l:tfg_ores/moon_vein_index#moon_mica)23%$(/l)$()$(li)原生金: $(l:tfg_ores/moon_vein_index#moon_gold)55%$(/l), $(l:tfg_ores/moon_vein_index#moon_magnetite)15%$(/l)$()$(li)原生铜: $(l:tfg_ores/moon_vein_index#moon_tetrahedrite)15%$(/l)$()$(li)原生银: $(l:tfg_ores/moon_vein_index#moon_silver)42%$(/l)$()$(li)天然碱: $(l:tfg_ores/moon_vein_index#moon_lubricant)10%$(/l)$()$(li)岩盐: $(l:tfg_ores/moon_vein_index#moon_beryllium)18%$(/l)$()$(li)戴斯矿: $(l:tfg_ores/moon_vein_index#moon_desh)25%$(/l), $(l:tfg_ores/moon_vein_index#moon_sphalerite)10%$(/l)$()$(li)斑铜矿: $(l:tfg_ores/moon_vein_index#moon_sheldonite)35%$(/l), $(l:tfg_ores/moon_vein_index#moon_topaz)15%$(/l)$()$(li)方解石: $(l:tfg_ores/moon_vein_index#moon_gypsum)25%$(/l)$()$(li)方钍石: $(l:tfg_ores/moon_vein_index#moon_beryllium)0%$(/l)$()$(li)方铅矿: $(l:tfg_ores/moon_vein_index#moon_silver)28%$(/l)$()$(li)明矾石: $(l:tfg_ores/moon_vein_index#moon_gypsum)15%$(/l)$()$(li)朱砂: $(l:tfg_ores/moon_vein_index#moon_redstone)19%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)氟碳镧铈矿: $(l:tfg_ores/moon_vein_index#moon_monazite)61%$(/l)$()$(li)沸石: $(l:tfg_ores/moon_vein_index#moon_cassiterite)5%$(/l)$()$(li)海绿石矿砂: $(l:tfg_ores/moon_vein_index#moon_lubricant)25%$(/l)$()$(li)滑石: $(l:tfg_ores/moon_vein_index#moon_lubricant)20%$(/l), $(l:tfg_ores/moon_vein_index#moon_saltpeter)12%$(/l)$()$(li)烧绿石: $(l:tfg_ores/moon_vein_index#moon_apatite)38%$(/l)$()$(li)独居石: $(l:tfg_ores/moon_vein_index#moon_monazite)30%$(/l)$()$(li)白钨矿: $(l:tfg_ores/moon_vein_index#moon_scheelite)40%$(/l)$()$(li)皂石: $(l:tfg_ores/moon_vein_index#moon_lubricant)30%$(/l), $(l:tfg_ores/moon_vein_index#moon_saltpeter)20%$(/l)$()$(li)石膏: $(l:tfg_ores/moon_vein_index#moon_gypsum)35%$(/l)$()$(li)石英岩: $(l:tfg_ores/moon_vein_index#moon_quartz)20%$(/l)$()$(li)石墨: $(l:tfg_ores/moon_vein_index#moon_graphite)52%$(/l)$()$(li)硅镁镍矿: $(l:tfg_ores/moon_vein_index#moon_garnierite)23%$(/l)$()$(li)硝石: $(l:tfg_ores/moon_vein_index#moon_saltpeter)29%$(/l)$()$(li)硫铂矿: $(l:tfg_ores/moon_vein_index#moon_sheldonite)25%$(/l)$()", + "text": "$(li)橄榄石: $(l:tfg_ores/moon_vein_index#moon_graphite)10%$(/l), $(l:tfg_ores/moon_vein_index#moon_apatite)4%$(/l), $(l:tfg_ores/moon_vein_index#moon_beryllium)4%$(/l), $(l:tfg_ores/moon_vein_index#moon_gypsum)5%$(/l), $(l:tfg_ores/moon_vein_index#moon_mica)4%$(/l), $(l:tfg_ores/moon_vein_index#moon_molybdenum)5%$(/l), $(l:tfg_ores/moon_vein_index#moon_redstone)4%$(/l), $(l:tfg_ores/moon_vein_index#moon_silver)4%$(/l), $(l:tfg_ores/moon_vein_index#moon_sapphire)2%$(/l), $(l:tfg_ores/moon_vein_index#moon_monazite)1%$(/l)$()$(li)氟碳镧铈矿: $(l:tfg_ores/moon_vein_index#moon_monazite)61%$(/l)$()$(li)沸石: $(l:tfg_ores/moon_vein_index#moon_cassiterite)5%$(/l)$()$(li)海绿石矿砂: $(l:tfg_ores/moon_vein_index#moon_lubricant)25%$(/l)$()$(li)滑石: $(l:tfg_ores/moon_vein_index#moon_lubricant)20%$(/l), $(l:tfg_ores/moon_vein_index#moon_saltpeter)12%$(/l)$()$(li)烧绿石: $(l:tfg_ores/moon_vein_index#moon_apatite)38%$(/l)$()$(li)独居石: $(l:tfg_ores/moon_vein_index#moon_monazite)30%$(/l)$()$(li)白钨矿: $(l:tfg_ores/moon_vein_index#moon_scheelite)40%$(/l)$()$(li)皂石: $(l:tfg_ores/moon_vein_index#moon_lubricant)30%$(/l), $(l:tfg_ores/moon_vein_index#moon_saltpeter)20%$(/l)$()$(li)石膏: $(l:tfg_ores/moon_vein_index#moon_gypsum)35%$(/l)$()$(li)石英岩: $(l:tfg_ores/moon_vein_index#moon_quartz)20%$(/l)$()$(li)石墨: $(l:tfg_ores/moon_vein_index#moon_graphite)52%$(/l)$()$(li)硅镁镍矿: $(l:tfg_ores/moon_vein_index#moon_garnierite)23%$(/l)$()$(li)硝石: $(l:tfg_ores/moon_vein_index#moon_saltpeter)29%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)硼砂: $(l:tfg_ores/moon_vein_index#moon_gypsum)20%$(/l)$()$(li)磁铁矿: $(l:tfg_ores/moon_vein_index#moon_magnetite)25%$(/l), $(l:tfg_ores/moon_vein_index#moon_gold)20%$(/l)$()$(li)磷灰石: $(l:tfg_ores/moon_vein_index#moon_apatite)23%$(/l)$()$(li)磷酸三钙: $(l:tfg_ores/moon_vein_index#moon_apatite)33%$(/l)$()$(li)紫水晶: $(l:tfg_ores/moon_vein_index#moon_garnet)38%$(/l)$()$(li)红宝石: $(l:tfg_ores/moon_vein_index#moon_redstone)33%$(/l)$()$(li)红石: $(l:tfg_ores/moon_vein_index#moon_redstone)42%$(/l)$()$(li)红色石榴石: $(l:tfg_ores/moon_vein_index#moon_garnet)9%$(/l)$()$(li)绿宝石: $(l:tfg_ores/moon_vein_index#moon_beryllium)45%$(/l)$()$(li)绿色蓝宝石: $(l:tfg_ores/moon_vein_index#moon_sapphire)16%$(/l), $(l:tfg_ores/moon_vein_index#moon_gold)5%$(/l)$()$(li)蓝宝石: $(l:tfg_ores/moon_vein_index#moon_sapphire)16%$(/l), $(l:tfg_ores/moon_vein_index#moon_magnetite)5%$(/l)$()$(li)蓝晶石: $(l:tfg_ores/moon_vein_index#moon_mica)33%$(/l)$()$(li)蓝石: $(l:tfg_ores/moon_vein_index#moon_saltpeter)37%$(/l)$()$(li)蓝黄玉: $(l:tfg_ores/moon_vein_index#moon_topaz)35%$(/l)$()", + "text": "$(li)硫铂矿: $(l:tfg_ores/moon_vein_index#moon_sheldonite)25%$(/l)$()$(li)硼砂: $(l:tfg_ores/moon_vein_index#moon_gypsum)20%$(/l)$()$(li)磁铁矿: $(l:tfg_ores/moon_vein_index#moon_magnetite)25%$(/l), $(l:tfg_ores/moon_vein_index#moon_gold)20%$(/l)$()$(li)磷灰石: $(l:tfg_ores/moon_vein_index#moon_apatite)23%$(/l)$()$(li)磷酸三钙: $(l:tfg_ores/moon_vein_index#moon_apatite)33%$(/l)$()$(li)紫水晶: $(l:tfg_ores/moon_vein_index#moon_garnet)38%$(/l)$()$(li)红宝石: $(l:tfg_ores/moon_vein_index#moon_redstone)33%$(/l)$()$(li)红石: $(l:tfg_ores/moon_vein_index#moon_redstone)42%$(/l)$()$(li)红色石榴石: $(l:tfg_ores/moon_vein_index#moon_garnet)9%$(/l)$()$(li)绿宝石: $(l:tfg_ores/moon_vein_index#moon_beryllium)45%$(/l)$()$(li)绿色蓝宝石: $(l:tfg_ores/moon_vein_index#moon_sapphire)16%$(/l), $(l:tfg_ores/moon_vein_index#moon_gold)5%$(/l)$()$(li)蓝宝石: $(l:tfg_ores/moon_vein_index#moon_sapphire)16%$(/l), $(l:tfg_ores/moon_vein_index#moon_magnetite)5%$(/l)$()$(li)蓝晶石: $(l:tfg_ores/moon_vein_index#moon_mica)33%$(/l)$()$(li)蓝石: $(l:tfg_ores/moon_vein_index#moon_saltpeter)37%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)蛋白石: $(l:tfg_ores/moon_vein_index#moon_garnet)38%$(/l)$()$(li)赛特斯石英矿: $(l:tfg_ores/moon_vein_index#moon_quartz)45%$(/l)$()$(li)软锰矿: $(l:tfg_ores/moon_vein_index#moon_pyrolusite)38%$(/l), $(l:tfg_ores/moon_vein_index#moon_manganese)25%$(/l)$()$(li)辉钴矿: $(l:tfg_ores/moon_vein_index#moon_pyrolusite)23%$(/l), $(l:tfg_ores/moon_vein_index#moon_garnierite)19%$(/l)$()$(li)辉钼矿: $(l:tfg_ores/moon_vein_index#moon_molybdenum)33%$(/l)$()$(li)辉铜矿: $(l:tfg_ores/moon_vein_index#moon_tetrahedrite)25%$(/l), $(l:tfg_ores/moon_vein_index#moon_topaz)25%$(/l)$()$(li)辉锑矿: $(l:tfg_ores/moon_vein_index#moon_tetrahedrite)20%$(/l)$()$(li)重晶石: $(l:tfg_ores/moon_vein_index#moon_quartz)5%$(/l)$()$(li)钍矿: $(l:tfg_ores/moon_vein_index#moon_beryllium)0%$(/l)$()$(li)钒磁铁矿: $(l:tfg_ores/moon_vein_index#moon_magnetite)15%$(/l)$()$(li)钕矿: $(l:tfg_ores/moon_vein_index#moon_monazite)6%$(/l)$()$(li)钙铝榴石: $(l:tfg_ores/moon_vein_index#moon_manganese)37%$(/l)$()$(li)钛铁矿: $(l:tfg_ores/moon_vein_index#moon_bauxite)42%$(/l), $(l:tfg_ores/moon_vein_index#moon_desh)30%$(/l)$()$(li)钨酸锂: $(l:tfg_ores/moon_vein_index#moon_scheelite)50%$(/l)$()", + "text": "$(li)蓝黄玉: $(l:tfg_ores/moon_vein_index#moon_topaz)35%$(/l)$()$(li)蛋白石: $(l:tfg_ores/moon_vein_index#moon_garnet)38%$(/l)$()$(li)赛特斯石英矿: $(l:tfg_ores/moon_vein_index#moon_quartz)45%$(/l)$()$(li)软锰矿: $(l:tfg_ores/moon_vein_index#moon_pyrolusite)38%$(/l), $(l:tfg_ores/moon_vein_index#moon_manganese)25%$(/l)$()$(li)辉钴矿: $(l:tfg_ores/moon_vein_index#moon_pyrolusite)23%$(/l), $(l:tfg_ores/moon_vein_index#moon_garnierite)19%$(/l)$()$(li)辉钼矿: $(l:tfg_ores/moon_vein_index#moon_molybdenum)33%$(/l)$()$(li)辉铜矿: $(l:tfg_ores/moon_vein_index#moon_tetrahedrite)25%$(/l), $(l:tfg_ores/moon_vein_index#moon_topaz)25%$(/l)$()$(li)辉锑矿: $(l:tfg_ores/moon_vein_index#moon_tetrahedrite)20%$(/l)$()$(li)重晶石: $(l:tfg_ores/moon_vein_index#moon_quartz)5%$(/l)$()$(li)钒磁铁矿: $(l:tfg_ores/moon_vein_index#moon_magnetite)15%$(/l)$()$(li)钕矿: $(l:tfg_ores/moon_vein_index#moon_monazite)6%$(/l)$()$(li)钙铝榴石: $(l:tfg_ores/moon_vein_index#moon_manganese)37%$(/l)$()$(li)钛铁矿: $(l:tfg_ores/moon_vein_index#moon_bauxite)42%$(/l), $(l:tfg_ores/moon_vein_index#moon_desh)30%$(/l)$()$(li)钨酸锂: $(l:tfg_ores/moon_vein_index#moon_scheelite)50%$(/l)$()", "type": "patchouli:text" }, { diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/tfg_ores/moon_vein_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/tfg_ores/moon_vein_index.json index 057cc3959..0525d88cb 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/tfg_ores/moon_vein_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/tfg_ores/moon_vein_index.json @@ -1215,7 +1215,7 @@ }, { "Type": "patchouli:multiblock", - "name": "钍矿", + "name": "方钍石", "multiblock": { "mapping": { "0": "#forge:ores/thorium" @@ -1230,7 +1230,7 @@ ] }, "enable_visualize": false, - "text": "$(thing)百分比$(): 0%$(br)$(thing)来源$(): 钍$(br)$(thing)化学式$(): Th", + "text": "$(thing)百分比$(): 0%$(br)$(thing)来源$(): 钍$(br)$(thing)化学式$(): ThO₂", "type": "patchouli:multiblock" }, { diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/tfg_ores/nether_ore_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/tfg_ores/nether_ore_index.json index 2d0e70304..c8a4018be 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/tfg_ores/nether_ore_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/tfg_ores/nether_ore_index.json @@ -14,27 +14,27 @@ }, { "Type": "patchouli:text", - "text": "$(li)下界石英: $(l:tfg_ores/nether_vein_index#nether_quartz)54%$(/l)$()$(li)云母: $(l:tfg_ores/nether_vein_index#nether_mica)33%$(/l)$()$(li)原生金: $(l:tfg_ores/nether_vein_index#nether_gold)75%$(/l), $(l:tfg_ores/nether_vein_index#nether_magnetite)30%$(/l), $(l:tfg_ores/nether_vein_index#nether_hematite)5%$(/l)$()$(li)原生铜: $(l:tfg_ores/nether_vein_index#nether_copper)65%$(/l), $(l:tfg_ores/nether_vein_index#nether_tetrahedrite)30%$(/l)$()$(li)原生银: $(l:tfg_ores/nether_vein_index#nether_silver)35%$(/l)$()$(li)天然碱: $(l:tfg_ores/nether_vein_index#nether_lubricant)10%$(/l)$()$(li)孔雀石: $(l:tfg_ores/nether_vein_index#nether_goethite)20%$(/l)$()$(li)岩盐: $(l:tfg_ores/nether_vein_index#nether_beryllium)18%$(/l)$()$(li)斑铜矿: $(l:tfg_ores/nether_vein_index#nether_sheldonite)41%$(/l), $(l:tfg_ores/nether_vein_index#nether_topaz)15%$(/l)$()$(li)方解石: $(l:tfg_ores/nether_vein_index#nether_gypsum)30%$(/l), $(l:tfg_ores/nether_vein_index#nether_lapis)15%$(/l)$()$(li)方钠石: $(l:tfg_ores/nether_vein_index#nether_lapis)25%$(/l)$()$(li)方铅矿: $(l:tfg_ores/nether_vein_index#nether_silver)30%$(/l)$()$(li)无烟煤: $(l:tfg_ores/nether_vein_index#nether_anthracite)100%$(/l)$()$(li)明矾石: $(l:tfg_ores/nether_vein_index#nether_saltpeter)15%$(/l)$()", + "text": "$(li)下界石英: $(l:tfg_ores/nether_vein_index#nether_quartz)54%$(/l)$()$(li)云母: $(l:tfg_ores/nether_vein_index#nether_mica)33%$(/l)$()$(li)原生金: $(l:tfg_ores/nether_vein_index#nether_gold)75%$(/l), $(l:tfg_ores/nether_vein_index#nether_magnetite)30%$(/l), $(l:tfg_ores/nether_vein_index#nether_hematite)5%$(/l)$()$(li)原生铜: $(l:tfg_ores/nether_vein_index#nether_copper)65%$(/l), $(l:tfg_ores/nether_vein_index#nether_tetrahedrite)30%$(/l)$()$(li)原生银: $(l:tfg_ores/nether_vein_index#nether_silver)35%$(/l)$()$(li)天然碱: $(l:tfg_ores/nether_vein_index#nether_lubricant)10%$(/l)$()$(li)孔雀石: $(l:tfg_ores/nether_vein_index#nether_goethite)20%$(/l)$()$(li)岩盐: $(l:tfg_ores/nether_vein_index#nether_beryllium)18%$(/l)$()$(li)斑铜矿: $(l:tfg_ores/nether_vein_index#nether_sheldonite)41%$(/l), $(l:tfg_ores/nether_vein_index#nether_topaz)15%$(/l)$()$(li)方解石: $(l:tfg_ores/nether_vein_index#nether_gypsum)30%$(/l), $(l:tfg_ores/nether_vein_index#nether_lapis)15%$(/l)$()$(li)方钍石: $(l:tfg_ores/nether_vein_index#nether_beryllium)0%$(/l)$()$(li)方钠石: $(l:tfg_ores/nether_vein_index#nether_lapis)25%$(/l)$()$(li)方铅矿: $(l:tfg_ores/nether_vein_index#nether_silver)30%$(/l)$()$(li)无烟煤: $(l:tfg_ores/nether_vein_index#nether_anthracite)100%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)晶质铀矿: $(l:tfg_ores/nether_vein_index#nether_pitchblende)25%$(/l)$()$(li)朱砂: $(l:tfg_ores/nether_vein_index#nether_redstone)20%$(/l)$()$(li)橄榄石: $(l:tfg_ores/nether_vein_index#nether_olivine)25%$(/l)$()$(li)氟碳镧铈矿: $(l:tfg_ores/nether_vein_index#nether_monazite)50%$(/l)$()$(li)沥青铀矿: $(l:tfg_ores/nether_vein_index#nether_pitchblende)62%$(/l)$()$(li)海绿石矿砂: $(l:tfg_ores/nether_vein_index#nether_lubricant)25%$(/l), $(l:tfg_ores/nether_vein_index#nether_olivine)15%$(/l)$()$(li)滑石: $(l:tfg_ores/nether_vein_index#nether_lubricant)20%$(/l)$()$(li)漂白土: $(l:tfg_ores/nether_vein_index#nether_basaltic_sands)25%$(/l), $(l:tfg_ores/nether_vein_index#nether_gypsum)15%$(/l)$()$(li)烧绿石: $(l:tfg_ores/nether_vein_index#nether_apatite)15%$(/l)$()$(li)煤炭: $(l:tfg_ores/nether_vein_index#nether_graphite)15%$(/l)$()$(li)独居石: $(l:tfg_ores/nether_vein_index#nether_monazite)25%$(/l)$()$(li)玄武岩矿砂: $(l:tfg_ores/nether_vein_index#nether_basaltic_sands)35%$(/l)$()$(li)白钨矿: $(l:tfg_ores/nether_vein_index#nether_scheelite)45%$(/l)$()$(li)皂石: $(l:tfg_ores/nether_vein_index#nether_lubricant)30%$(/l)$()", + "text": "$(li)明矾石: $(l:tfg_ores/nether_vein_index#nether_saltpeter)15%$(/l)$()$(li)晶质铀矿: $(l:tfg_ores/nether_vein_index#nether_pitchblende)25%$(/l)$()$(li)朱砂: $(l:tfg_ores/nether_vein_index#nether_redstone)20%$(/l)$()$(li)橄榄石: $(l:tfg_ores/nether_vein_index#nether_olivine)25%$(/l)$()$(li)氟碳镧铈矿: $(l:tfg_ores/nether_vein_index#nether_monazite)50%$(/l)$()$(li)沥青铀矿: $(l:tfg_ores/nether_vein_index#nether_pitchblende)62%$(/l)$()$(li)海绿石矿砂: $(l:tfg_ores/nether_vein_index#nether_lubricant)25%$(/l), $(l:tfg_ores/nether_vein_index#nether_olivine)15%$(/l)$()$(li)滑石: $(l:tfg_ores/nether_vein_index#nether_lubricant)20%$(/l)$()$(li)漂白土: $(l:tfg_ores/nether_vein_index#nether_basaltic_sands)25%$(/l), $(l:tfg_ores/nether_vein_index#nether_gypsum)15%$(/l)$()$(li)烧绿石: $(l:tfg_ores/nether_vein_index#nether_apatite)15%$(/l)$()$(li)煤炭: $(l:tfg_ores/nether_vein_index#nether_graphite)15%$(/l)$()$(li)独居石: $(l:tfg_ores/nether_vein_index#nether_monazite)25%$(/l)$()$(li)玄武岩矿砂: $(l:tfg_ores/nether_vein_index#nether_basaltic_sands)35%$(/l)$()$(li)白钨矿: $(l:tfg_ores/nether_vein_index#nether_scheelite)45%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)石棉: $(l:tfg_ores/nether_vein_index#nether_garnet_tin)25%$(/l)$()$(li)石榴石矿砂: $(l:tfg_ores/nether_vein_index#nether_garnet_tin)25%$(/l)$()$(li)石膏: $(l:tfg_ores/nether_vein_index#nether_gypsum)35%$(/l), $(l:tfg_ores/nether_vein_index#nether_basaltic_sands)15%$(/l)$()$(li)石英岩: $(l:tfg_ores/nether_vein_index#nether_quartz)25%$(/l)$()$(li)石墨: $(l:tfg_ores/nether_vein_index#nether_graphite)45%$(/l)$()$(li)硅岩: $(l:tfg_ores/nether_vein_index#nether_naquadah)100%$(/l)$()$(li)硅藻土: $(l:tfg_ores/nether_vein_index#nether_saltpeter)25%$(/l), $(l:tfg_ores/nether_vein_index#nether_garnet_tin)15%$(/l)$()$(li)硅镁镍矿: $(l:tfg_ores/nether_vein_index#nether_garnierite)23%$(/l)$()$(li)硝石: $(l:tfg_ores/nether_vein_index#nether_saltpeter)35%$(/l), $(l:tfg_ores/nether_vein_index#nether_cassiterite)9%$(/l)$()$(li)硫: $(l:tfg_ores/nether_vein_index#nether_sulfur)50%$(/l), $(l:tfg_ores/nether_vein_index#nether_sphalerite)35%$(/l)$()$(li)硫铂矿: $(l:tfg_ores/nether_vein_index#nether_sheldonite)29%$(/l)$()$(li)硼砂: $(l:tfg_ores/nether_vein_index#nether_gypsum)20%$(/l)$()$(li)磁铁矿: $(l:tfg_ores/nether_vein_index#nether_magnetite)20%$(/l)$()$(li)磷灰石: $(l:tfg_ores/nether_vein_index#nether_apatite)50%$(/l)$()", + "text": "$(li)皂石: $(l:tfg_ores/nether_vein_index#nether_lubricant)30%$(/l)$()$(li)石棉: $(l:tfg_ores/nether_vein_index#nether_garnet_tin)25%$(/l)$()$(li)石榴石矿砂: $(l:tfg_ores/nether_vein_index#nether_garnet_tin)25%$(/l)$()$(li)石膏: $(l:tfg_ores/nether_vein_index#nether_gypsum)35%$(/l), $(l:tfg_ores/nether_vein_index#nether_basaltic_sands)15%$(/l)$()$(li)石英岩: $(l:tfg_ores/nether_vein_index#nether_quartz)25%$(/l)$()$(li)石墨: $(l:tfg_ores/nether_vein_index#nether_graphite)45%$(/l)$()$(li)硅岩: $(l:tfg_ores/nether_vein_index#nether_naquadah)100%$(/l)$()$(li)硅藻土: $(l:tfg_ores/nether_vein_index#nether_saltpeter)25%$(/l), $(l:tfg_ores/nether_vein_index#nether_garnet_tin)15%$(/l)$()$(li)硅镁镍矿: $(l:tfg_ores/nether_vein_index#nether_garnierite)23%$(/l)$()$(li)硝石: $(l:tfg_ores/nether_vein_index#nether_saltpeter)35%$(/l), $(l:tfg_ores/nether_vein_index#nether_cassiterite)9%$(/l)$()$(li)硫: $(l:tfg_ores/nether_vein_index#nether_sulfur)50%$(/l), $(l:tfg_ores/nether_vein_index#nether_sphalerite)35%$(/l)$()$(li)硫铂矿: $(l:tfg_ores/nether_vein_index#nether_sheldonite)29%$(/l)$()$(li)硼砂: $(l:tfg_ores/nether_vein_index#nether_gypsum)20%$(/l)$()$(li)磁铁矿: $(l:tfg_ores/nether_vein_index#nether_magnetite)20%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)磷酸三钙: $(l:tfg_ores/nether_vein_index#nether_apatite)35%$(/l)$()$(li)紫水晶: $(l:tfg_ores/nether_vein_index#nether_garnet)38%$(/l)$()$(li)红宝石: $(l:tfg_ores/nether_vein_index#nether_redstone)35%$(/l), $(l:tfg_ores/nether_vein_index#nether_hematite)20%$(/l)$()$(li)红石: $(l:tfg_ores/nether_vein_index#nether_redstone)45%$(/l)$()$(li)红色石榴石: $(l:tfg_ores/nether_vein_index#nether_garnet)9%$(/l)$()$(li)绿宝石: $(l:tfg_ores/nether_vein_index#nether_beryllium)47%$(/l)$()$(li)绿色蓝宝石: $(l:tfg_ores/nether_vein_index#nether_sapphire)16%$(/l)$()$(li)膨润土: $(l:tfg_ores/nether_vein_index#nether_olivine)35%$(/l)$()$(li)花岗岩矿砂: $(l:tfg_ores/nether_vein_index#nether_basaltic_sands)25%$(/l)$()$(li)菱镁矿: $(l:tfg_ores/nether_vein_index#nether_olivine)25%$(/l)$()$(li)蓝宝石: $(l:tfg_ores/nether_vein_index#nether_sapphire)16%$(/l), $(l:tfg_ores/nether_vein_index#nether_magnetite)10%$(/l)$()$(li)蓝晶石: $(l:tfg_ores/nether_vein_index#nether_mica)46%$(/l)$()$(li)蓝石: $(l:tfg_ores/nether_vein_index#nether_saltpeter)25%$(/l)$()$(li)蓝金石: $(l:tfg_ores/nether_vein_index#nether_lapis)35%$(/l)$()", + "text": "$(li)磷灰石: $(l:tfg_ores/nether_vein_index#nether_apatite)50%$(/l)$()$(li)磷酸三钙: $(l:tfg_ores/nether_vein_index#nether_apatite)35%$(/l)$()$(li)紫水晶: $(l:tfg_ores/nether_vein_index#nether_garnet)38%$(/l)$()$(li)红宝石: $(l:tfg_ores/nether_vein_index#nether_redstone)35%$(/l), $(l:tfg_ores/nether_vein_index#nether_hematite)20%$(/l)$()$(li)红石: $(l:tfg_ores/nether_vein_index#nether_redstone)45%$(/l)$()$(li)红色石榴石: $(l:tfg_ores/nether_vein_index#nether_garnet)9%$(/l)$()$(li)绿宝石: $(l:tfg_ores/nether_vein_index#nether_beryllium)47%$(/l)$()$(li)绿色蓝宝石: $(l:tfg_ores/nether_vein_index#nether_sapphire)16%$(/l)$()$(li)膨润土: $(l:tfg_ores/nether_vein_index#nether_olivine)35%$(/l)$()$(li)花岗岩矿砂: $(l:tfg_ores/nether_vein_index#nether_basaltic_sands)25%$(/l)$()$(li)菱镁矿: $(l:tfg_ores/nether_vein_index#nether_olivine)25%$(/l)$()$(li)蓝宝石: $(l:tfg_ores/nether_vein_index#nether_sapphire)16%$(/l), $(l:tfg_ores/nether_vein_index#nether_magnetite)10%$(/l)$()$(li)蓝晶石: $(l:tfg_ores/nether_vein_index#nether_mica)46%$(/l)$()$(li)蓝石: $(l:tfg_ores/nether_vein_index#nether_saltpeter)25%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)蓝黄玉: $(l:tfg_ores/nether_vein_index#nether_topaz)35%$(/l)$()$(li)蛋白石: $(l:tfg_ores/nether_vein_index#nether_garnet)38%$(/l)$()$(li)赤铁矿: $(l:tfg_ores/nether_vein_index#nether_hematite)35%$(/l), $(l:tfg_ores/nether_vein_index#nether_goethite)15%$(/l), $(l:tfg_ores/nether_vein_index#nether_gold)15%$(/l), $(l:tfg_ores/nether_vein_index#nether_copper)5%$(/l)$()$(li)软锰矿: $(l:tfg_ores/nether_vein_index#nether_manganese)25%$(/l)$()$(li)辉钴矿: $(l:tfg_ores/nether_vein_index#nether_garnierite)19%$(/l)$()$(li)辉钼矿: $(l:tfg_ores/nether_vein_index#nether_molybdenum)31%$(/l)$()$(li)辉铜矿: $(l:tfg_ores/nether_vein_index#nether_topaz)25%$(/l)$()$(li)辉锑矿: $(l:tfg_ores/nether_vein_index#nether_tetrahedrite)20%$(/l)$()$(li)重晶石: $(l:tfg_ores/nether_vein_index#nether_quartz)20%$(/l)$()$(li)针铁矿: $(l:tfg_ores/nether_vein_index#nether_goethite)50%$(/l), $(l:tfg_ores/nether_vein_index#nether_hematite)25%$(/l), $(l:tfg_ores/nether_vein_index#nether_gold)5%$(/l)$()$(li)钍矿: $(l:tfg_ores/nether_vein_index#nether_beryllium)0%$(/l)$()$(li)钒磁铁矿: $(l:tfg_ores/nether_vein_index#nether_magnetite)30%$(/l)$()$(li)钕矿: $(l:tfg_ores/nether_vein_index#nether_monazite)25%$(/l)$()$(li)钙铝榴石: $(l:tfg_ores/nether_vein_index#nether_manganese)37%$(/l)$()", + "text": "$(li)蓝金石: $(l:tfg_ores/nether_vein_index#nether_lapis)35%$(/l)$()$(li)蓝黄玉: $(l:tfg_ores/nether_vein_index#nether_topaz)35%$(/l)$()$(li)蛋白石: $(l:tfg_ores/nether_vein_index#nether_garnet)38%$(/l)$()$(li)赤铁矿: $(l:tfg_ores/nether_vein_index#nether_hematite)35%$(/l), $(l:tfg_ores/nether_vein_index#nether_goethite)15%$(/l), $(l:tfg_ores/nether_vein_index#nether_gold)15%$(/l), $(l:tfg_ores/nether_vein_index#nether_copper)5%$(/l)$()$(li)软锰矿: $(l:tfg_ores/nether_vein_index#nether_manganese)25%$(/l)$()$(li)辉钴矿: $(l:tfg_ores/nether_vein_index#nether_garnierite)19%$(/l)$()$(li)辉钼矿: $(l:tfg_ores/nether_vein_index#nether_molybdenum)31%$(/l)$()$(li)辉铜矿: $(l:tfg_ores/nether_vein_index#nether_topaz)25%$(/l)$()$(li)辉锑矿: $(l:tfg_ores/nether_vein_index#nether_tetrahedrite)20%$(/l)$()$(li)重晶石: $(l:tfg_ores/nether_vein_index#nether_quartz)20%$(/l)$()$(li)针铁矿: $(l:tfg_ores/nether_vein_index#nether_goethite)50%$(/l), $(l:tfg_ores/nether_vein_index#nether_hematite)25%$(/l), $(l:tfg_ores/nether_vein_index#nether_gold)5%$(/l)$()$(li)钒磁铁矿: $(l:tfg_ores/nether_vein_index#nether_magnetite)30%$(/l)$()$(li)钕矿: $(l:tfg_ores/nether_vein_index#nether_monazite)25%$(/l)$()$(li)钙铝榴石: $(l:tfg_ores/nether_vein_index#nether_manganese)37%$(/l)$()", "type": "patchouli:text" }, { 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 d8f594432..4bd56781e 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 @@ -145,7 +145,7 @@ ] }, "enable_visualize": false, - "text": "$(thing)百分比$(): 62%$(br)$(thing)来源$(): 铀, 钍, 铅$(br)$(thing)化学式$(): (UO₂)₃ThPb$(br)$(thing)危害$(): $(c)$(t:需要全身防护)致癌 (任何接触)$(/t)$()", + "text": "$(thing)百分比$(): 62%$(br)$(thing)来源$(): 铀, 钍, 铅$(br)$(thing)化学式$(): (UO₂)₃ThPb$(br)$(thing)危害$(): $(c)$(t:需要全身防护)放射性 (任何接触)$(/t)$()", "type": "patchouli:multiblock" }, { @@ -165,7 +165,7 @@ ] }, "enable_visualize": false, - "text": "$(thing)百分比$(): 25%$(br)$(thing)来源$(): 铀$(br)$(thing)化学式$(): UO₂$(br)$(thing)危害$(): $(c)$(t:需要全身防护)致癌 (任何接触)$(/t)$()", + "text": "$(thing)百分比$(): 25%$(br)$(thing)来源$(): 铀$(br)$(thing)化学式$(): UO₂$(br)$(thing)危害$(): $(c)$(t:需要全身防护)放射性 (任何接触)$(/t)$()", "type": "patchouli:multiblock" }, { @@ -1452,7 +1452,7 @@ }, { "Type": "patchouli:multiblock", - "name": "钍矿", + "name": "方钍石", "multiblock": { "mapping": { "0": "#forge:ores/thorium" @@ -1467,7 +1467,7 @@ ] }, "enable_visualize": false, - "text": "$(thing)百分比$(): 0%$(br)$(thing)来源$(): 钍$(br)$(thing)化学式$(): Th", + "text": "$(thing)百分比$(): 0%$(br)$(thing)来源$(): 钍$(br)$(thing)化学式$(): ThO₂", "type": "patchouli:multiblock" }, { diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/tfg_ores/venus_ore_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/tfg_ores/venus_ore_index.json index f277c2a06..57bbc45ee 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/tfg_ores/venus_ore_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/tfg_ores/venus_ore_index.json @@ -1,7 +1,7 @@ { "__credits__": "This page was automatically generated by OresToFieldGuide.", "name": "金星矿物索引", - "icon": "gtceu:sulfur_dust", + "icon": "vintageimprovements:sulfur", "category": "tfc:tfg_ores", "read_by_default": true, "secret": false, @@ -14,7 +14,7 @@ }, { "Type": "patchouli:text", - "text": "$(li)岩盐: $(l:tfg_ores/venus_vein_index#venus_manual_salt)20%$(/l)$()$(li)盐: $(l:tfg_ores/venus_vein_index#venus_manual_salt)50%$(/l)$()$(li)硫: $(l:tfg_ores/venus_vein_index#venus_manual_sulfur)50%$(/l)$()$(li)锂云母: $(l:tfg_ores/venus_vein_index#venus_manual_salt)15%$(/l)$()$(li)锂辉石: $(l:tfg_ores/venus_vein_index#venus_manual_salt)15%$(/l)$()$(li)闪锌矿: $(l:tfg_ores/venus_vein_index#venus_manual_sulfur)15%$(/l)$()$(li)黄铁矿: $(l:tfg_ores/venus_vein_index#venus_manual_sulfur)35%$(/l)$()", + "text": "$(li)岩盐: $(l:tfg_ores/venus_vein_index#venus_manual_salt)10%$(/l)$()$(li)盐: $(l:tfg_ores/venus_vein_index#venus_manual_salt)80%$(/l)$()$(li)硫: $(l:tfg_ores/venus_vein_index#venus_manual_sulfur)80%$(/l)$()$(li)锂云母: $(l:tfg_ores/venus_vein_index#venus_manual_salt)5%$(/l)$()$(li)锂辉石: $(l:tfg_ores/venus_vein_index#venus_manual_salt)5%$(/l)$()$(li)闪锌矿: $(l:tfg_ores/venus_vein_index#venus_manual_sulfur)5%$(/l)$()$(li)黄铁矿: $(l:tfg_ores/venus_vein_index#venus_manual_sulfur)15%$(/l)$()", "type": "patchouli:text" } ], 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 7879a69a8..1bd0290b4 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)稀有度$(): 100$(br)$(thing)密度$(): 0.2$(br)$(thing)类型$(): 盘状矿脉$(br)$(thing)Y 坐标$(): 40 — 65$(br)$(thing)尺寸$(): 20$(br)$(thing)高度$(): 6$(br)$(thing)指示器最大深度$(): 30$(br2)$(thing)岩石类型$(): 安山岩, 流纹岩, 玄武岩, 石灰华, 粗面岩, 英安岩", + "text": "$(thing)稀有度$(): 30$(br)$(thing)密度$(): 0.2$(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" @@ -41,7 +41,7 @@ ] }, "enable_visualize": false, - "text": "$(thing)百分比$(): 50%$(br)$(thing)来源$(): 钠, 氯$(br)$(thing)化学式$(): NaCl", + "text": "$(thing)百分比$(): 80%$(br)$(thing)来源$(): 钠, 氯$(br)$(thing)化学式$(): NaCl", "type": "patchouli:multiblock" }, { @@ -61,7 +61,7 @@ ] }, "enable_visualize": false, - "text": "$(thing)百分比$(): 20%$(br)$(thing)来源$(): 钾, 氯$(br)$(thing)化学式$(): KCl", + "text": "$(thing)百分比$(): 10%$(br)$(thing)来源$(): 钾, 氯$(br)$(thing)化学式$(): KCl", "type": "patchouli:multiblock" }, { @@ -81,7 +81,7 @@ ] }, "enable_visualize": false, - "text": "$(thing)百分比$(): 15%$(br)$(thing)来源$(): 钾, 锂, 铝, 氟$(br)$(thing)化学式$(): KLi₃Al₄F₂O₁₀", + "text": "$(thing)百分比$(): 5%$(br)$(thing)来源$(): 钾, 锂, 铝, 氟$(br)$(thing)化学式$(): KLi₃Al₄F₂O₁₀", "type": "patchouli:multiblock" }, { @@ -101,7 +101,7 @@ ] }, "enable_visualize": false, - "text": "$(thing)百分比$(): 15%$(br)$(thing)来源$(): 锂, 铝$(br)$(thing)化学式$(): LiAlSi₂O₆", + "text": "$(thing)百分比$(): 5%$(br)$(thing)来源$(): 锂, 铝$(br)$(thing)化学式$(): LiAlSi₂O₆", "type": "patchouli:multiblock" }, { @@ -111,7 +111,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)稀有度$(): 100$(br)$(thing)密度$(): 0.2$(br)$(thing)类型$(): 团簇状矿脉$(br)$(thing)Y 坐标$(): 40 — 65$(br)$(thing)尺寸$(): 15$(br)$(thing)指示器最大深度$(): 30$(br2)$(thing)岩石类型$(): 安山岩, 流纹岩, 玄武岩, 石灰华, 粗面岩, 英安岩", + "text": "$(thing)稀有度$(): 30$(br)$(thing)密度$(): 0.2$(br)$(thing)类型$(): 团簇状矿脉$(br)$(thing)Y 坐标$(): 40 — 65$(br)$(thing)尺寸$(): 20$(br)$(thing)指示器最大深度$(): 30$(br2)$(thing)岩石类型$(): 安山岩, 流纹岩, 玄武岩, 石灰华, 粗面岩, 英安岩", "title": "硫, 黄铁矿", "type": "patchouli:text", "anchor": "venus_manual_sulfur" @@ -133,7 +133,7 @@ ] }, "enable_visualize": false, - "text": "$(thing)百分比$(): 50%$(br)$(thing)来源$(): 硫$(br)$(thing)化学式$(): S", + "text": "$(thing)百分比$(): 80%$(br)$(thing)来源$(): 硫$(br)$(thing)化学式$(): S", "type": "patchouli:multiblock" }, { @@ -153,7 +153,7 @@ ] }, "enable_visualize": false, - "text": "$(thing)百分比$(): 35%$(br)$(thing)熔化$(): 铸铁$(br)$(thing)化学式$(): FeS₂", + "text": "$(thing)百分比$(): 15%$(br)$(thing)熔化$(): 铸铁$(br)$(thing)化学式$(): FeS₂", "type": "patchouli:multiblock" }, { @@ -173,7 +173,7 @@ ] }, "enable_visualize": false, - "text": "$(thing)百分比$(): 15%$(br)$(thing)熔化$(): 锌$(br)$(thing)化学式$(): ZnS", + "text": "$(thing)百分比$(): 5%$(br)$(thing)熔化$(): 锌$(br)$(thing)化学式$(): ZnS", "type": "patchouli:multiblock" } ], diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/tfg_tips/blast_furnace_tips.json b/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/tfg_tips/blast_furnace_tips.json index c4fcfc9da..69ac4a0e3 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/tfg_tips/blast_furnace_tips.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/tfg_tips/blast_furnace_tips.json @@ -12,7 +12,7 @@ { "type": "patchouli:spotlight", "item": "gtceu:compressed_fireclay", - "text": "在将耐火黏土全部用于制作20块耐火砖前，请注意：进入蒸汽时代后，你可通过$(item)压缩耐火黏土$()（需要蒸汽机器制备黏土粉）仅用黏土制作耐火砖。这能让你节省$(item)高岭土$()与$(item)石墨$()用于制作$(thing)铸造台$()。" + "text": "在将耐火黏土全部用于制作20块耐火砖前，请注意：进入蒸汽时代后，你就能以低得多的成本制作它。这能让你节省$(item)高岭土$()与$(item)石墨$()用于制作$(thing)铸造台$()。" }, { "type": "patchouli:spotlight", @@ -32,11 +32,11 @@ }, { "type": "patchouli:text", - "text": "你可以使用机械动力的$(item)动力泵$()直接从高炉泵出液态金属。将其导入$(l:tfc:tfcchannelcasting/channel_casting)铸造台$()后，用漏斗或溜槽提取锭——轻松实现自动化！$(br2)还可使用$(item)机械手$()自动拉动风箱！但需注意：过度使用风箱会加速燃料消耗并加快$(thing)吹风管$()的损坏速度。$(br2)产出的$(item)生铁$()与$(item)高碳钢$()可通过$(thing)锻造锤$()进行加工。" + "text": "你可以使用机械动力的$(item)动力泵$()直接从高炉泵出液态金属。将其导入$(l:tfc:tfcchannelcasting/channel_casting)铸造台$()后，用漏斗或溜槽提取锭——轻松实现自动化！$(br2)还可使用$(item)机械手$()自动拉动风箱！但需注意：过度使用风箱会加速燃料消耗并加快$(thing)吹风管$()的损坏速度。$(br2)产出的$(item)生铁$()与$(item)高碳钢$()可通过$(thing)锻造锤$()或$(thing)杠杆锤$()进行加工。" }, { "type": "patchouli:text", - "text": "你可以用朝向高炉的漏斗自动替换破损的风管。" + "text": "你可以用朝向高炉的漏斗或物品管道自动替换破损的风管。" } ] } \ No newline at end of file diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/tfg_tips/faqs.json b/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/tfg_tips/faqs.json index 5cdd2e8af..656bfcdf0 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/tfg_tips/faqs.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/tfg_tips/faqs.json @@ -12,7 +12,7 @@ }, { "type": "patchouli:text", - "text": "$(li)$(l:tfg_tips/faqs#boats)我的船为什么会沉？$()$(li)$(l:tfg_tips/faqs#dried_fruit)如何制作酵母起子？$()$(li)$(l:tfg_tips/faqs#dried_fruit)如何制作菠萝纤维？$()$(li)$(l:tfg_tips/faqs#jam)如何制作果酱？$()$(li)$(l:tfg_tips/faqs#resin)如何制作橡胶？$()$(li)$(l:tfg_tips/faqs#chunks)如何强制加载区块或提升加载上限？$()" + "text": "$(li)$(l:tfg_tips/faqs#boats)我的船为什么会沉？$()$(li)$(l:tfg_tips/faqs#dried_fruit)如何制作酵种？$()$(li)$(l:tfg_tips/faqs#dried_fruit)如何制作菠萝纤维？$()$(li)$(l:tfg_tips/faqs#resin)如何制作橡胶？$()$(li)$(l:tfg_tips/faqs#chunks)如何强制加载区块或提升加载上限？$()" }, { "type": "patchouli:text", @@ -22,12 +22,7 @@ { "type": "patchouli:text", "anchor": "dried_fruit", - "text": "$(italic)如何制作酵母起子或菠萝纤维？$()$(br2)请先使用$(item)干燥垫$()将水果晒干，随后按照$(l:firmalife/bread)面包$()或$(l:firmalife/berry_bushes)菠萝布$()章节的步骤操作。" - }, - { - "type": "patchouli:text", - "anchor": "jam", - "text": "$(italic)如何制作果酱？$()$(br2)使用$(l:firmalife/oven_appliances#vat)锅$()最为便捷。参照该章节流程操作时请注意：除非需要自动化生产，否则无需制作$(thing)装罐台$()或$(thing)罐盖$()。直接手持空罐右键点击盛有$(thing)果汁液体$()的锅，再次右键即可取得封装完成的果酱。$(br2)务必使用$(item)$(k:sneak)$() + $(item)$(k:use)$()为锅$(bold)盖上盖子$()！" + "text": "$(italic)如何制作酵种或菠萝纤维？$()$(br2)请先使用$(item)干燥垫$()将水果晒干，随后按照$(l:firmalife/bread)面包$()或$(l:firmalife/berry_bushes)菠萝布$()章节的步骤操作。" }, { "type": "patchouli:text", @@ -37,7 +32,7 @@ { "type": "patchouli:text", "anchor": "resin", - "text": "$(italic)如何制作橡胶？$()$(br2)黏性树脂不再是你的目标！请先种植若干产$(thing)乳胶$()的树木并制作$(thing)树汁导管$()。将树汁导管安装在树干上（单棵树安装多个树汁导管只会分流产量）。通过$(tfc:mechanics/barrels)木桶$()收集渗出的乳胶。" + "text": "$(italic)如何制作橡胶？$()$(br2)黏性树脂不再是你的目标！请先种植若干产$(thing)乳胶$()的树木并制作$(thing)树汁导管$()。将树汁导管安装在树干上（单棵树安装多个树汁导管只会分流产量）。通过$(l:mechanics/barrels)木桶$()收集渗出的乳胶。" }, { "type": "patchouli:text", diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/tfg_tips/space_crops.json b/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/tfg_tips/space_crops.json index aa0245291..6f0d63e1b 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/tfg_tips/space_crops.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/tfg_tips/space_crops.json @@ -564,7 +564,7 @@ "betterend:blossom_berry_product": 6, "betterend:bolux_mushroom_seeds": 8, "betterend:bolux_mushroom_product": 8, - "betterend:cave_pumpkin_seeds": 10, + "betterend:cave_pumpkin_plant_seeds": 10, "betterend:cave_pumpkin": 10, "betterend:chorus_mushroom_seeds": 12, "betterend:chorus_mushroom_product": 12, diff --git a/kubejs/assets/tfcchannelcasting/lang/ru_ru.json b/kubejs/assets/tfcchannelcasting/lang/ru_ru.json new file mode 100644 index 000000000..cbdda0cf0 --- /dev/null +++ b/kubejs/assets/tfcchannelcasting/lang/ru_ru.json @@ -0,0 +1,40 @@ +{ + "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.", + "block.tfcchannelcasting.channel": "Литейный канал", + "block.tfcchannelcasting.mold_table": "Стол для форм", + "item.tfcchannelcasting.unfired_channel": "Необожжённый литейный канал", + "item.tfcchannelcasting.unfired_mold_table": "Необожжённый стол для форм", + "item.tfcchannelcasting.heart_mold": "Форма «Сердце»", + "item.tfcchannelcasting.unfired_heart_mold": "Необожжённая форма «Сердце»", + "metal.tfcchannelcasting.dark_chocolate": "Тёмный шоколад", + "block.tfcchannelcasting.fluid.dark_chocolate": "Тёмный шоколад", + "item.tfcchannelcasting.bucket.dark_chocolate": "Ведро тёмного шоколада", + "fluid.tfcchannelcasting.dark_chocolate": "Тёмный шоколад", + "item.tfcchannelcasting.food.dark_chocolate_heart": "Сердце из тёмного шоколада", + "item.tfcchannelcasting.food.dark_chocolate_bell": "Колокольчик из тёмного шоколада", + "item.tfcchannelcasting.food.dark_chocolate_knife": "Вкусный ножик из тёмного шоколада", + "metal.tfcchannelcasting.milk_chocolate": "Молочный шоколад", + "block.tfcchannelcasting.fluid.milk_chocolate": "Молочный шоколад", + "item.tfcchannelcasting.bucket.milk_chocolate": "Ведро молочного шоколада", + "fluid.tfcchannelcasting.milk_chocolate": "Молочный шоколад", + "item.tfcchannelcasting.food.milk_chocolate_heart": "Сердце из молочного шоколада", + "item.tfcchannelcasting.food.milk_chocolate_bell": "Колокольчик из молочного шоколада", + "item.tfcchannelcasting.food.milk_chocolate_knife": "Вкусный ножик из молочного шоколада", + "metal.tfcchannelcasting.white_chocolate": "Белый шоколад", + "block.tfcchannelcasting.fluid.white_chocolate": "Белый шоколад", + "item.tfcchannelcasting.bucket.white_chocolate": "Ведро белого шоколада", + "fluid.tfcchannelcasting.white_chocolate": "Белый шоколад", + "item.tfcchannelcasting.food.white_chocolate_heart": "Сердце из белого шоколада", + "item.tfcchannelcasting.food.white_chocolate_bell": "Колокольчик из белого шоколада", + "item.tfcchannelcasting.food.white_chocolate_knife": "Вкусный ножик из белого шоколада", + "tfc.recipe.barrel.tfcchannelcasting.barrel.fill_with_sweet_liquor": "Наполнение сладким ликёром", + "tfc.recipe.barrel.tfcchannelcasting.barrel.fill_with_strong_liquor": "Наполнение крепким ликёром", + "tfc.recipe.barrel.tfcchannelcasting.barrel.fill_with_whiskey": "Наполнение виски", + "tfcchannelcasting.tooltip.food_trait.festive": "Праздничное", + "tfcchannelcasting.tooltip.food_trait.scary": "Жуткое", + "tfcchannelcasting.tooltip.food_trait.romantic": "Романтичное", + "tfcchannelcasting.tooltip.food_trait.filled_with_jam": "С начинкой из джема", + "tfcchannelcasting.tooltip.food_trait.filled_with_sweet_liquor": "С начинкой из сладкого ликёра", + "tfcchannelcasting.tooltip.food_trait.filled_with_strong_liquor": "С начинкой из крепкого ликёра", + "tfcchannelcasting.tooltip.food_trait.filled_with_whiskey": "С начинкой из виски" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/flax.json b/kubejs/assets/tfg/blockstates/flax.json index 629893c44..0b8a1e705 100644 --- a/kubejs/assets/tfg/blockstates/flax.json +++ b/kubejs/assets/tfg/blockstates/flax.json @@ -21,9 +21,6 @@ "age=6,part=bottom": { "model": "tfg:block/crop/flax_age_6_bottom" }, - "age=7,part=bottom": { - "model": "tfg:block/crop/flax_age_6_bottom" - }, "age=4,part=top": { "model": "tfg:block/crop/flax_age_4_top" }, @@ -32,9 +29,6 @@ }, "age=6,part=top": { "model": "tfg:block/crop/flax_age_6_top" - }, - "age=7,part=top": { - "model": "tfg:block/crop/flax_age_6_top" } } } \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/lava_source.json b/kubejs/assets/tfg/blockstates/lava_source.json new file mode 100644 index 000000000..53b3726e0 --- /dev/null +++ b/kubejs/assets/tfg/blockstates/lava_source.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "tfg:block/lava_source" + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/pile/volcanic_ash.json b/kubejs/assets/tfg/blockstates/pile/volcanic_ash.json new file mode 100644 index 000000000..e692796c4 --- /dev/null +++ b/kubejs/assets/tfg/blockstates/pile/volcanic_ash.json @@ -0,0 +1,28 @@ +{ + "variants": { + "layers=1": { + "model": "tfg:block/pile/volcanic_ash/ash_height2" + }, + "layers=2": { + "model": "tfg:block/pile/volcanic_ash/ash_height4" + }, + "layers=3": { + "model": "tfg:block/pile/volcanic_ash/ash_height6" + }, + "layers=4": { + "model": "tfg:block/pile/volcanic_ash/ash_height8" + }, + "layers=5": { + "model": "tfg:block/pile/volcanic_ash/ash_height10" + }, + "layers=6": { + "model": "tfg:block/pile/volcanic_ash/ash_height12" + }, + "layers=7": { + "model": "tfg:block/pile/volcanic_ash/ash_height14" + }, + "layers=8": { + "model": "tfg:block/pile/volcanic_ash/ash_block" + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/rapeseed.json b/kubejs/assets/tfg/blockstates/rapeseed.json index a7baeaf1f..45d32774b 100644 --- a/kubejs/assets/tfg/blockstates/rapeseed.json +++ b/kubejs/assets/tfg/blockstates/rapeseed.json @@ -21,9 +21,6 @@ "age=6,part=bottom": { "model": "tfg:block/crop/rapeseed_age_5_bottom" }, - "age=7,part=bottom": { - "model": "tfg:block/crop/rapeseed_age_5_bottom" - }, "age=3,part=top": { "model": "tfg:block/crop/rapeseed_age_3_top" }, @@ -35,9 +32,6 @@ }, "age=6,part=top": { "model": "tfg:block/crop/rapeseed_age_5_top" - }, - "age=7,part=top": { - "model": "tfg:block/crop/rapeseed_age_5_top" } } } \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/smoker_source.json b/kubejs/assets/tfg/blockstates/smoker_source.json new file mode 100644 index 000000000..1de3f05c2 --- /dev/null +++ b/kubejs/assets/tfg/blockstates/smoker_source.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "tfg:block/smoker_source" + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/steam_bloomery.json b/kubejs/assets/tfg/blockstates/steam_bloomery.json new file mode 100644 index 000000000..c83f32133 --- /dev/null +++ b/kubejs/assets/tfg/blockstates/steam_bloomery.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "tfg:block/machines/steam_bloomery", + "y": 90 + }, + "facing=north": { + "model": "tfg:block/machines/steam_bloomery" + }, + "facing=south": { + "model": "tfg:block/machines/steam_bloomery", + "y": 180 + }, + "facing=west": { + "model": "tfg:block/machines/steam_bloomery", + "y": 270 + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/steam_fuser.json b/kubejs/assets/tfg/blockstates/steam_fuser.json new file mode 100644 index 000000000..eff6ab041 --- /dev/null +++ b/kubejs/assets/tfg/blockstates/steam_fuser.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "tfg:block/machines/steam_fuser", + "y": 90 + }, + "facing=north": { + "model": "tfg:block/machines/steam_fuser" + }, + "facing=south": { + "model": "tfg:block/machines/steam_fuser", + "y": 180 + }, + "facing=west": { + "model": "tfg:block/machines/steam_fuser", + "y": 270 + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/steam_presser.json b/kubejs/assets/tfg/blockstates/steam_presser.json new file mode 100644 index 000000000..30bb0ccd3 --- /dev/null +++ b/kubejs/assets/tfg/blockstates/steam_presser.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "tfg:block/machines/steam_presser", + "y": 90 + }, + "facing=north": { + "model": "tfg:block/machines/steam_presser" + }, + "facing=south": { + "model": "tfg:block/machines/steam_presser", + "y": 180 + }, + "facing=west": { + "model": "tfg:block/machines/steam_presser", + "y": 270 + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/steam_squasher.json b/kubejs/assets/tfg/blockstates/steam_squasher.json new file mode 100644 index 000000000..f1a4f1e21 --- /dev/null +++ b/kubejs/assets/tfg/blockstates/steam_squasher.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "tfg:block/machines/steam_squasher", + "y": 90 + }, + "facing=north": { + "model": "tfg:block/machines/steam_squasher" + }, + "facing=south": { + "model": "tfg:block/machines/steam_squasher", + "y": 180 + }, + "facing=west": { + "model": "tfg:block/machines/steam_squasher", + "y": 270 + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/steam_thermal_centrifuge.json b/kubejs/assets/tfg/blockstates/steam_thermal_centrifuge.json new file mode 100644 index 000000000..573435d86 --- /dev/null +++ b/kubejs/assets/tfg/blockstates/steam_thermal_centrifuge.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "tfg:block/machines/steam_thermal_centrifuge", + "y": 90 + }, + "facing=north": { + "model": "tfg:block/machines/steam_thermal_centrifuge" + }, + "facing=south": { + "model": "tfg:block/machines/steam_thermal_centrifuge", + "y": 180 + }, + "facing=west": { + "model": "tfg:block/machines/steam_thermal_centrifuge", + "y": 270 + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/sunflower.json b/kubejs/assets/tfg/blockstates/sunflower.json index 0860279df..8708a43c7 100644 --- a/kubejs/assets/tfg/blockstates/sunflower.json +++ b/kubejs/assets/tfg/blockstates/sunflower.json @@ -21,9 +21,6 @@ "age=6,part=bottom": { "model": "tfg:block/crop/sunflower_age_5_bottom" }, - "age=7,part=bottom": { - "model": "tfg:block/crop/sunflower_age_5_bottom" - }, "age=4,part=top": { "model": "tfg:block/crop/sunflower_age_4_top" }, @@ -32,9 +29,6 @@ }, "age=6,part=top": { "model": "tfg:block/crop/sunflower_age_5_top" - }, - "age=7,part=top": { - "model": "tfg:block/crop/sunflower_age_5_top" } } } \ No newline at end of file diff --git a/kubejs/assets/tfg/lang/en_us.json b/kubejs/assets/tfg/lang/en_us.json index 081576af1..81e83566a 100644 --- a/kubejs/assets/tfg/lang/en_us.json +++ b/kubejs/assets/tfg/lang/en_us.json @@ -43,7 +43,7 @@ "biome.tfg.venus/salt_flats": "Salt Flats", "biome.tfg.venus/stromatolite_beach": "Stromatolite Beach", "biome.tfg.venus/sulfuric_ravine": "Sulfuric Ravine", - "biome.tfg.venus/volcanic_mountains": "Scorching Volcanoes", + "biome.tfg.venus/scorching_volcanoes": "Scorching Volcanoes", "block.tfg.piglin_disguise": "Piglin Disguise", "block.tfg.piglin_disguise_block": "Piglin Disguise", "block.tfg.dry_ice": "Dry Ice", @@ -459,11 +459,15 @@ "block.tfg.stromatolite_cluster_medium": "Large Stromatolite Cluster", "block.tfg.rock.raw.geyserite": "Raw Geyserite", "block.tfg.rock.spike.geyserite": "Geyserite Spike", + "block.tfg.geyser_source_small": "Small Steaming Geyser", + "block.tfg.geyser_source": "Steaming Geyser", + "block.tfg.smoker_source": "Volcanic Smoker", + "block.tfg.lava_source": "Lava Vent", "block.tfg.rock.halite": "Halite", "block.tfg.mushroom_roots": "Mushroom Roots", "block.tfg.mushroom_sprouts": "Mushroom Sprouts", "block.tfg.charred_log": "Charred Log", - "block.tfg.ash_pile": "Ash Pile", + "block.tfg.ash_pile": "Wood Ash Pile", "block.tfg.pile.white_sand": "White Sand", "block.tfg.pile.black_sand": "Black Sand", "block.tfg.pile.brown_sand": "Brown Sand", @@ -478,6 +482,7 @@ "block.tfg.pile.venus_sand_covering": "Trachyte Sand", "block.tfg.pile.hematitic_sand": "Hematitic Sand", "block.tfg.pile.hematitic_sand_covering": "Hematitic Sand", + "block.tfg.pile.volcanic_ash": "Volcanic Ash Pile", "block.tfg.lunar_roots": "Lunar Lightblooms", "block.tfg.lunar_sprouts": "Lunar Lightgrass", "block.tfg.lunar_chorus_plant": "Chorus Plant", @@ -737,6 +742,8 @@ "item.tfg.invisibility_salvo": "Invisibility Salvo", "item.tfg.luck_salvo": "Luck Salvo", "item.tfg.resistance_salvo": "Resistance Salvo", + "item.tfg.paracetamol_pill": "Paracetamol Pill", + "item.tfg.rad_away_pill": "RadAway™ Pill", "item.tfg.paraffin_wax": "Paraffin Wax", "item.tfg.flint_arrow_head": "Flint Arrow Head", "item.tfg.fletching": "Fletching", @@ -1218,9 +1225,9 @@ "material.tfg.cracker_off_gas": "Cracked Reformate Off-Gas", "material.tfg.btx_fuel": "BTX Fuel", "material.tfg.critical_steam": "Critical Steam", - "material.tfg.americium_241": "Americium-241", - "material.tfg.californium_252": "Californium-252", - "material.tfg.neptunium_237": "Neptunium-237", + "material.tfg.americium_241": "Americium 241", + "material.tfg.californium_252": "Californium 252", + "material.tfg.neptunium_237": "Neptunium 237", "material.tfg.mixed_radioactive_fluid": "Mixed Radioactive Fluid", "material.tfg.degraded_solvent_stream": "Degraded Solvent Stream", "material.tfg.boron_enriched_coolant": "Boron Enriched Coolant", @@ -1316,7 +1323,7 @@ "ore_vein.tfg.surface_sphalerite": "Sphalerite & Sulfur", "ore_vein.tfg.surface_tetrahedrite": "Tetrahedrite (Surface)", "ore_vein.tfg.deep_mars_chromite": "Redstone & Chromite", - "ore_vein.tfg.deep_mars_pitchblende": "Pitchblende, Thorium, & Uraninite", + "ore_vein.tfg.deep_mars_pitchblende": "Pitchblende, Thorianite, & Uraninite", "ore_vein.tfg.deep_mars_sheldonite": "Bornite & Cooperite", "ore_vein.tfg.mars_almandine": "Almandine & Sapphire", "ore_vein.tfg.mars_apatite": "Apatite & Pyrochlore", @@ -1327,10 +1334,11 @@ "ore_vein.tfg.mars_sapphire": "Gold, Electrotine, & Bauxite", "ore_vein.tfg.mars_graphite": "Graphite & Diamond", "ore_vein.tfg.mars_hematite": "Hematite & Limonite", + "ore_vein.tfg.mars_lapis": "Lapis, Lazurite, & Sodalite", "ore_vein.tfg.mars_lubricant": "Trona, Talc, & Glauconite", "ore_vein.tfg.mars_neodynium": "Bastnasite & Monazite", "ore_vein.tfg.mars_nickel": "Garnierite & Cobaltite", - "ore_vein.tfg.mars_pitchblende": "Pitchblende, Thorium, & Hematite", + "ore_vein.tfg.mars_pitchblende": "Pitchblende & Thorianite, & Hematite", "ore_vein.tfg.mars_quartzite": "Quartzite, Asbestos, & Barite", "ore_vein.tfg.mars_salt": "Salts & Spodumene", "ore_vein.tfg.mars_stibnite": "Tetrahedrite (Normal)", @@ -1444,8 +1452,8 @@ "effect.tfg.warming": "§6Warming", "effect.tfg.instant_radiation": "Instant Radiation", "effect.tfg.chemical_burns_warning": "Suffering Chemical Burns", - "effect.tfg.poison_warning": "Toxic Material", - "effect.tfg.weak_poison_warning": "Weakly Toxic Material", + "effect.tfg.poison_warning": "Poisonous Material", + "effect.tfg.weak_poison_warning": "Weakly Poisonous Material", "effect.tfg.irritant_warning": "Irritant Material", "effect.tfg.nausea_warning": "Nauseous Material", "effect.tfg.carcinogen_warning": "Carcinogenic Material", @@ -1455,6 +1463,9 @@ "effect.tfg.berylliosis_warning": "Berylliosis", "effect.tfg.methanol_poisoning_warning": "Methanol Poisoning", "effect.tfg.carbon_monoxide_poisoning_warning": "Carbon Monoxide Poisoning", + "effect.tfg.radioactive_warning": "Irradiated", + "gtceu.medical_condition.radioactive": "§4Radioactive", + "symptom.tfg.glowing": "Glowing", "tfg.greate.uls_limit": "§432§r (§8ULS§r)", "tfg.greate.ls_limit": "§f128§r (§7LS§r)", "tfg.greate.windmill_hint_1": "Windmills are affected by relative", @@ -1643,6 +1654,8 @@ "tfg.gui.consumes": "Consumes: ", "tfg.gui.per_cycle": "per cycle", "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", "tfc.jei.flint_knapping": "Flint Knapping", "tfc.jei.straw_knapping": "Straw Knapping", "tfc.recipe.barrel.tfg.barrel.dyeing.decorative_vase.black": "Dyeing", @@ -1855,9 +1868,12 @@ "quests.ae2.wireless_access.desc": "Once you've made it to &5EV&r, you'll gain access to the ME Wireless Access Point, which basically acts like a WiFi Router for your ME network. Connect it to a central point in your base, shove as many Wireless Booster cards as you want to increase its range (and power draw), and then link a Wireless Terminal to it.\n\nOnce you have Epoxy and Rhodium, you'll be able to combine all of your Wireless Terminals together via a Universal Terminal!", "quests.ae2.interplanetary_wireless.subtitle": "Forgot something at home?", "quests.ae2.interplanetary_wireless.desc": "You can upgrade your Wireless Terminal with this special Card, allowing access to your network from any distance, even on different worlds! Sounds too good to be true? There's a major catch — transferring items uses a huge amount of energy.\n\nYou can sort of get around this with some Energy Cards and a battery in your inventory set to Discharge Mode, but it should work well enough for those times when you accidentally left something at your base on Earth and don't want to fly all the way back.\n\nFor proper automated transfer, you'll need a Railgun.", + "quests.ae2.universal_circuits.title": "Universal Circuits", + "quests.ae2.universal_circuits.subtitle": "Oh so THAT's what these are for!", + "quests.ae2.universal_circuits.desc": "Ever wondered what the point of the Universal Circuit items was? Besides nice quest icons, they're primarily used for AE2!\n\nAE2 doesn't handle item tags in patterns well, so the universal circuits are designed to be used in any patterns that require circuits. This way, whenever you unlock a new kind of circuit, you only need to add one pattern to convert the new circuit into the universal one, instead of updating &oall&r of your old patterns!", "quests.ae2.iv.title": "IV Tier AE2", "quests.ae2.iv.desc": "This entire branch becomes fully unlockable once you reach &1IV&r.", - "quests.ae2.accumulation_press.desc": "To get this &eNew Inscriber Press&r, you will need to invest a bit.\n\nFirst, you must upgrade your Implosion Compressor with &1two IV Energy Hatches&r.\n\nThen, get yourself a new IV Laser Engraver if you don't already have one.\n\nAnd finally, prepare a lot of Industrial TNT — it’s the &conly one that works&r for this process.\n\nPlan carefully, as this step is quite demanding!", + "quests.ae2.accumulation_press.desc": "To get this &eNew Inscriber Press&r, you will need to invest a bit.\n\nFirst, you must upgrade your Implosion Compressor with &5two EV Energy Hatches&r.\n\nThen, get yourself a new IV Laser Engraver if you don't already have one.\n\nAnd finally, prepare a lot of Industrial TNT — it’s the &conly one that works&r for this process.\n\nPlan carefully, as this step is quite demanding!", "quests.ae2.accumulation_processor.desc": "The &eAccumulation Processor&r will require a large amount of Silicon for each craft.\n\nWe hope you already have a dedicated EBF producing Silicon, or at least a strong infrastructure to manufacture it quickly.\n\nPrepare accordingly, as you’ll need plenty of it!", "quests.ae2.mega_crafting.desc": "These are a neat upgrade for your &bCrafting CPU&r.\n\nThey will help to speed up your auto-crafting and allow you to handle larger jobs with ease.", "quests.ae2.mega_battery.desc": "A &ebigger battery&r for a bigger network. Nothing else to it!", @@ -1872,7 +1888,7 @@ "quests.ae2.extended_import_export.desc": "These are eight times faster than their regular counterparts. Enjoy!", "quests.ae2.extended_import_export.task": "Either the part or the upgrade", "quests.ae2.extended_io_port.desc": "This upgrade will let you &atransfer faster&r while also offering &6more upgrade slots&r if needed.", - "quests.ae2.extended_molecular_assembler.desc": "The upgrade of the &bMolecular Assembler&r.\n\nIt runs &68 crafting jobs&r at the same time and goes &62 times faster&r.\n\nEven though you can only use it with a normal &bPattern Provider&r, it will be a &agreat upgrade&r before you get the &dMatrix Multiblock&r a bit later on.", + "quests.ae2.extended_molecular_assembler.desc": "The upgrade of the &bMolecular Assembler&r.\n\nIt runs &68 crafting jobs&r at the same time and goes &62 times faster&r.\n\nIt will be a &agreat upgrade&r before you get the &dMatrix Multiblock&r a bit later on.", "quests.ae2.wireless.desc": "The &aME Wireless Connector&r is your go-to if you don't want to put down massive lines of &bME Cables&r. They effectively work like short-range Quantum Tunnels, but have a limited range and don't work across dimensions. That would be too easy, wouldn't it?\n\nDon't forget to check the in-game guide with &eG&r to learn about how they work and their limitations.", "quests.ae2.mega_cell_housing.desc": "These &bCell Housings&r work the same way as the basic ones, but you will need these to make the bigger disks from &dMEGA&r.", "quests.ae2.cell_component_64k.desc": "Now that you have &1IV&r Circuits, you can make this enormous &5Storage Component&r. Aren't you glad you made a Moon base?", @@ -2132,8 +2148,8 @@ "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.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\nWhile exploring, you might come across &6Martian Ruins&r containing &eAtomic Casings&r and &eHigh Temperature Smelting Casings&r. These won’t replace the massive number you’ll need later, but they can give you a small head start while scouting for the perfect base location.&r", - "quests.extreme_voltage.important_info.desc.2": "When it comes to your Martian infrastructure, there are two main approaches:&r\n\n• &aPreparation-focused&r: Build everything required for your full &6Fission Line&r before establishing your base. This means an enormous material investment, but allows you to be self-sufficient once operational.\n\n• &aProgressive setup&r: Start smaller with your &6Nuclear Fuel Factory&r, your first &6Fission Reactor&r (running on &eThorium&r), and a &6Nuclear Turbine&r. This route is faster to start, but managing energy will be rough until your fission system stabilizes.\n\nEither way, we always recommend having an exploration mission before you start settling down!", + "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!", + "quests.extreme_voltage.important_info.desc.2": "When it comes to your Martian infrastructure, there are two main approaches:&r\n\n• &aPreparation-focused&r: Build everything required for your full &6Fission Line&r before establishing your base. This means an enormous material investment, but allows you to be self-sufficient once operational.\n\n• &aProgressive setup&r: Start smaller with your &6Nuclear Fuel Factory&r, your first &6Fission Reactor&r (running on &eThorium&r), and a &6Nuclear Turbine&r. This route is faster to start, but managing energy will be rough until your fission system stabilizes.", "quests.extreme_voltage.important_info.desc.3": "Because every kind of combustion-based energy won't work on Mars, you’ll want to bring a good stock of &bLapotron Crystals&r to power your first recipes and oxygen systems.\n\nWe also strongly recommend setting up a &6Distillation Tower&r. &eMartian Air&r can be processed into breathable &bAir&r and several other useful gases. Alternatively, everything for Compressed Nitrox can come from the local Semiheavy Ammoniacal Water.\n\nSurvival on Mars isn’t about luck, it’s about preparation!", "quests.extreme_voltage.important_info.task": "It's Marsing Time", "quests.extreme_voltage.dense_lead.title": "Faster Dense Lead Plates", @@ -2317,7 +2333,7 @@ "quests.extreme_voltage.gasoline.desc": "&aGasoline&r is an extremely powerful Combustion Fuel. It's over &63 times&r as energy dense as &dDiesel&r!\n\n&9Note:&r This Combustion Fuel exists solely as a &echallenge&r for you to overcome if you desire to take on it.\n\nIt's completely &doptional&r, so we'll let you figure out how to obtain it, without any further tips.", "quests.extreme_voltage.radiation.title": "Dealing with Radiation", "quests.extreme_voltage.radiation.subtitle": "Extra Spicy Materials", - "quests.extreme_voltage.radiation.desc.1": "While GregTech doesn't have any sort of \"ambient radiation\" like some other mods do, &aradioactive materials&r are still dangerous to the player when held! This applies to any item that says it's &eCarcinogenic&r and is caused by &eAny Contact&r.\n\nThere's a few ways to mitigate this, and the easiest is to just avoid contact with the items in the first place - move them around with pipes, backpacks, or even Small Vessels. The less time you have them in your inventory, the better!", + "quests.extreme_voltage.radiation.desc.1": "While GregTech doesn't have any sort of \"ambient radiation\" like some other mods do, &aradioactive materials&r are still dangerous to the player when held! This applies to any item that says it's &4Radioactive&r and is caused by &eAny Contact&r.\n\nThere's a few ways to mitigate this, and the easiest is to just avoid contact with the items in the first place - move them around with pipes, backpacks, or even Small Vessels. The less time you have them in your inventory, the better!", "quests.extreme_voltage.radiation.desc.2": "Besides this, you'll want some other ways to protect yourself. Wearing equipment tagged as &e#ppe_armor&r in all four slots will protect you from radiation. However, this will still damage the equipment over time (at a rate equivalent to how much the radiation would affect you), &oexcept&r for the &6Hazardous Material Suit&r, which will never take damage from it.\n\nThe downside is that the hazmat suit isn't a space suit, so on Mars it's up to you whether you want to set up an enclosed Oxygenated base for the hazmat suit, or just take the durability damage on your space suit.", "quests.extreme_voltage.radiation.desc.3": "Lastly, you can check your radiation poisoning at any time with the &a/medical_condition query&r command. If it gets too high, you will start taking occasional damage or just suddenly die, so you want to prevent it.\n\nThe only other way to treat it is to craft and eat &bRad Away&r pills, which will each remove 50%% of the build-up.", "quests.extreme_voltage.radiation.task": "Safety First!", @@ -2399,7 +2415,7 @@ "quests.gregtech_energy.lgt.title": "The Large Gas Turbine", "quests.gregtech_energy.lgt.subtitle": "The fan favorite", "quests.gregtech_energy.lgt.desc.1": "The &6Large Gas Turbine&r — also known as &dLGT&r — is one of your two main sources of energy production for most of the modpack. You’ll be able to build your first one at &5EV&r using Stainless Steel. It can carry you from &5EV&r all the way to &dLuV&r, until you feel ready to upgrade to the Large Plasma Turbine.\n\nThat said, many players can finish TerraFirmaGreg using only these turbines — provided you have a strong infrastructure to handle the gas demands of high-tier LGTs.\n\nTo build the LGT, you’ll need the usual Maintenance Hatch and Input Hatch. This turbine requires a Muffler Hatch, but it does not use an Output Hatch.", - "quests.gregtech_energy.lgt.desc.2": "The default output is &e4096 EU/t&r. That output &cdoubles&r with each upgrade to the Rotor Holder after &5EV&r. For example, an LGT using an IV Rotor Holder (×2) with a HSS-E Turbine Rotor (280%% power) will produce:\n4096 × 2 × 2.8 = &e22,937.6 EU/t&r — that's about &a2.8A of IV&r.\n\nTo fully extract that energy, you’ll need at least a IV 4A Dynamo Hatch, since a normal Dynamo Hatch only handles 2A.\n\nJust so you know: the Efficiency stat of a Turbine Rotor increases the duration of the recipe, which means you get more power from each mB of fuel.\n\nLastly, if the Dynamo Hatch fills up, the LGT will automatically slow down and pause fuel usage, gradually reducing rotor speed until it resumes again. So you won't lose any fuel during a backup.", + "quests.gregtech_energy.lgt.desc.2": "The default output is &e4096 EU/t&r. That output &cdoubles&r with each upgrade to the Rotor Holder after &5EV&r. For example, an LGT using an IV Rotor Holder (×2) with a HSS-E Turbine Rotor (280%% power) will produce:\n4096 × 2 × 2.8 = &e22,937.6 EU/t&r — that's about &a2.8A of IV&r.\n\nTo fully extract that energy, you’ll need at least a IV 4A Dynamo Hatch, since a normal Dynamo Hatch only handles 2A.\n\nJust so you know: the Efficiency stat of a Turbine Rotor increases the duration of the recipe, which means you get more power from each mB of fuel.\n\nLastly, if the Dynamo Hatch fills up, the LGT will start voiding excess, so you'll want to turn your LGTs off when your battery buffer or substation starts getting full, via an Advanced Energy Detector Cover and Machine Controller Cover.", "quests.gregtech_energy.lst.title": "The Large Steam Turbine", "quests.gregtech_energy.lst.subtitle": "It... exists", "quests.gregtech_energy.lst.desc.1": "The &6Large Steam Turbine&r — or &dLST&r — might not be the most common Large Generator in standard GregTech, but thanks to its early unlock at &6HV&r and the fact that Large Boilers are stronger in TerraFirmaGreg, it definitely has its place.\n\nTo make it work, you’ll need an Input Hatch for steam, an Output Hatch for Distilled Water, and of course a Maintenance Hatch. That’s all you need!\n\nLike all Large Turbines, you’ll place a Rotor Holder on one side and a Dynamo Hatch on the other to extract power. For the LST, the Rotor Holder must be at least &6HV-tier&r. Each Rotor Holder upgrade &cdoubles&r the output and increases efficiency slightly.", @@ -2582,7 +2598,7 @@ "quests.high_voltage.mv_superconductors.desc": "&a4A&r of &bMV&r energy transmission may be appealing, but you probably don't need these at this point. The option is always there if you need it.", "quests.high_voltage.circuit_assembler.title": "HV Circuit Assembler", "quests.high_voltage.circuit_assembler.subtitle": "You will need the Cleanroom before you can craft this one", - "quests.high_voltage.circuit_assembler.desc": "The next &3Circuit Assembler&r. This tier of Circuit Assembler is only required for one type of Circuit - your first ever &aMainframe&r. You may have only one use for them, the &5EV Circuit Assembler&r.\n\nYou can put this off until &5EV&r or simply just use it for faster circuits making.", + "quests.high_voltage.circuit_assembler.desc": "The next &3Circuit Assembler&r. This tier of Circuit Assembler is only required for one type of Circuit - your first ever &aMainframe&r, but you won't be able to craft that until Mars in &5EV&r. You may have only one use for them, the &5EV Circuit Assembler&r.\n\nOther than that, the &6HV&r Circuit Assembler is also required to make AE2's &eProcessors&r.\n\nYou can put this off until &5EV&r or simply just use it for faster circuit making.", "quests.high_voltage.microprocessor_mainframe.title": "Mainframes - first IV Circuits!", "quests.high_voltage.microprocessor_mainframe.desc": "The first &1IV&r circuit. Congratulations on making it this far!\n\nThis will be used when you get to &5EV&r, or you can use it right now to craft an Advanced Nanosuit Chestplate, a big upgrade to your jetpack!.\n\n&l&3Lore:&r&o The original texture for the Mainframes was taken from an image of an IBM zEnterprise mainframe.", "quests.high_voltage.cleanroom.title": "The Cleanroom", @@ -2704,7 +2720,7 @@ "quests.high_voltage.gun.subtitle": "And if that don't work, use more gun", "quests.high_voltage.gun.task1": "Any gun", "quests.high_voltage.gun.task2": "Any medicine or aged alcohol", - "quests.high_voltage.gun.desc": "Getting a little too comfortable on Earth? You won't be alone on the moon, so make sure you're well prepared to defend yourself - you'll need more than just a sword or some stone javelins.\n\n&4The Moon is dangerous&r and you wouldn't want to lose your precious Rocket right?\n\nPick out a nice gun (if you're not sure, we recommend the &o\"Clockwork\" Sniper&r), craft some ammo, and maybe try out some attachments if you're feeling fancy.\n\nIt's also a good idea to bring some nutritious food to raise your max HP (try the meal bags!) as well as some alcohol and medicine for buffs and healing.", + "quests.high_voltage.gun.desc": "Getting a little too comfortable on Earth? You won't be alone on the moon, so make sure you're well prepared to defend yourself - you'll need more than just a sword or some stone javelins.\n\n&4The Moon is dangerous&r and you wouldn't want to lose your precious Rocket right?\n\nPick out a nice gun (if you're not sure, we recommend the &o\"Clockwork\" Rifle&r), craft some ammo, and maybe try out some attachments if you're feeling fancy.\n\nIt's also a good idea to bring some nutritious food to raise your max HP (try the meal bags!) as well as some alcohol and medicine for buffs and healing.", "quests.high_voltage.space_survival.title": "Home away from home", "quests.high_voltage.space_survival.subtitle": "More than just a mining dimension", "quests.high_voltage.space_survival.desc": "If you haven't already, be sure to check out the &3Tips - Space Survival&r quest chapter! It contains all the information you'll need to establish a proper moon colony.", @@ -2749,6 +2765,12 @@ "quests.low_voltage.lv_age_progression.subtitle": "Too many options, too little time!", "quests.low_voltage.lv_age_progression.desc": "&7LV&r will require you to craft a lot of different machines! Here's a friendly tip if you're struggling to set goals: pick an item in a later quest and go backwards from there.\n\nWith that in mind... why don't we start with a &5Fusion Controller&r? Never mind, slightly too ambitious - let's check a closer goal instead. Ah, yes, the &3Electric Blast Furnace&r - the main end goal of &7LV&r - should be a good target.\n\nThe EBF is &aexpensive&r, which is why you should initially focus on machines to make components and materials cheaper. Our quests will try to will guide you in the right direction.\n\nOther important goals are crafting the &3LV Assembler&r, making your first &aMV Circuits&r and getting your first &bCircuit Assembler&r.", "quests.low_voltage.lv_age_progression.task": "I... might have some sense of direction now", + "quests.low_voltage.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.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.", @@ -2756,7 +2778,7 @@ "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.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.", + "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.lv_polariser.title": "Basic Polarizer", "quests.low_voltage.lv_polariser.subtitle": "The Polarizer polarizes!", @@ -3236,7 +3258,7 @@ "quests.medium_voltage.mv_jetpack_2.desc": "This jetpack enables flight, and requires energy.\n\nCharge it like you would charge a Battery.\n\nPress &4H&r (default) to enable Hover Mode.\n\n&o&7(Yeah, yeah, a jetpack is supposed to work off propellants. Y'all are always here to nitpick.)&r", "quests.medium_voltage.mv_cutter.title": "Advanced Cutter", "quests.medium_voltage.mv_cutter.subtitle": "Upgrades, people, upgrades!", - "quests.medium_voltage.mv_cutter.desc": "The &3MV Cutter&r is required to cut &7Silicon Boules&r to prepare them for &aLaser Engraving&r.\n\nWe recommend you supply this machine with a steady stream of &dLubricant&r to cut down on the processing time.\n\nLubricant can be &3brewed&r from &eOil&r and &aTalc&r, &2Soapstone&r or &cRedstone&r.\n\n&7Note: You could use the &6Greate&r &7version, it has a tank to fill with fluid&r", + "quests.medium_voltage.mv_cutter.desc": "The &3MV Cutter&r is required to cut &7Silicon Boules&r to prepare them for &aLaser Engraving&r.\n\nWe recommend you supply this machine with a steady stream of &dLubricant&r to cut down on the processing time.\n\nLubricant can be &3brewed&r from &eOil&r and &aTalc&r, &2Soapstone&r or &cRedstone&r.", "quests.medium_voltage.mv_cutter.task": "Any Cutter", "quests.medium_voltage.mv_laser_engraver.title": "Laser Engraving", "quests.medium_voltage.mv_laser_engraver.subtitle": "This is peak technology, this is slow also", @@ -3301,7 +3323,7 @@ "quests.metal_age.coke_oven.desc.2": "Coke Ovens can be fully automated using a Coke Oven Hatch. The Hatch is placed on the sides of the Oven and work as both Inputs and Outputs for both Items and Liquids.\n\nYou can easly create a simple, one way Coke Oven by using a Crate for the input, a Chest for the output, and a Drum, Barrel, or Large Wooden Tank to collect the Creosote. Unlike Chests, Crates are able to store large objects such as Logs. You can also sneak and right-click GregTech pipes with a wrench to make them one-way.", "quests.metal_age.wrought_iron_goodies.title": "Wrought Iron level Mechanical Power", "quests.metal_age.wrought_iron_goodies.subtitle": "What's this \"Andesite Alloy\" you speak of?", - "quests.metal_age.wrought_iron_goodies.desc": "With Wrought Iron you've unlocked access to the Metal Casing, the foundation of many of Create's mechanical blocks such as Gearboxes. Some of the more advanced ones will require Steel, but it's possible to build a fully automatic tree and crop farm at this point.\n\nCreosote is used to create Treated Wood Planks, which can be crafted into Waterwheels and Windmills, a significant improvement over animal power.", + "quests.metal_age.wrought_iron_goodies.desc": "With Wrought Iron you've unlocked access to the Metal Casing, the foundation of many of Create's mechanical blocks such as Gearboxes. Some of the more advanced ones will require Steel, but it's possible to build a partially automatic tree and crop farm at this point.\n\nCreosote is used to create Treated Wood Planks, which can be crafted into Waterwheels and Windmills, a significant improvement over animal power.", "quests.metal_age.fire_clay_ingredients.title": "Fire Clay Ingredients", "quests.metal_age.fire_clay_ingredients.subtitle": "The TerraFirmaCraft Rite of Passage.", "quests.metal_age.fire_clay_ingredients.desc": "Fire Clay is a special clay made out of Kaolinite, Graphite and regular Clay, which is especially resistant to high temperatures. Its two main uses are the Crucible, which works as an improved version of a Vessel for Metal Smelting and Alloying, and the Blast Furance, which is required for the creation of the next anvil and metal tier, Steel.\n\nYou'll likely need to travel far, far away from your base to obtain both Graphite and Kaolin Clay, so preparation is key!", @@ -3493,7 +3515,7 @@ "quests.ore_proc.macerator_separator.task": "Any Macerator", "quests.ore_proc.thermal_centrifuge.title": "The Thermal Centrifuge", "quests.ore_proc.thermal_centrifuge.subtitle": "The go-to for most purified ores", - "quests.ore_proc.thermal_centrifuge.desc": "For all your other Purified Ores that doesn't need special treatment, it's best to run them through the &dThermal Centrifuge&r. This machine can produce byproducts at a reliable rate, while only using electricity. It's quite slow, however, so we suggest making multiple machines.", + "quests.ore_proc.thermal_centrifuge.desc": "For all your other Purified Ores that doesn't need special treatment, it's best to run them through the &dThermal Centrifuge&r. This machine can produce byproducts at a reliable rate, without needing any other ingredients. It's quite slow, however, so we suggest either making multiple machines or the steam parallel multiblock.", "quests.ore_proc.thermal_centrifuge.task": "Any Thermal Centrifuge", "quests.ore_proc.sifter.title": "The Sifter", "quests.ore_proc.sifter.subtitle": "The Skyblock Simulator", @@ -3785,12 +3807,12 @@ "quests.steam_age.boilers.tasks": "Any High Pressure Steam Boiler", "quests.steam_age.steam_bloomery.title": "Steam Bloomery", "quests.steam_age.steam_bloomery.subtitle": "The Bloomery's uncle", - "quests.steam_age.steam_bloomery.desc": "You're always going to need a lot of Wrought Iron, so why not automate your Bloomery? The next closest way to automate wrought iron is way off in LV. The Steam Bloomery is a new multiblock that'll automate your old TFC bloomery, and do it faster too! Like with the Coke Oven, you can press the JEI 'Uses' key (defaults to \"U\") to show the multiblock preview tab. Click on individual blocks to see what's valid in each location.", + "quests.steam_age.steam_bloomery.desc": "You're always going to need a lot of Wrought Iron, so why not automate your Bloomery? The next closest way to automate wrought iron is way off in LV.\n\nThe &3Steam Bloomery&r is a new multiblock that'll automate your old TFC bloomery, and do it faster too!\n\nLike with the Coke Oven, you can press the JEI 'Uses' key (defaults to \"U\") to show the multiblock preview tab. Click on individual blocks to see what's valid in each location.", "quests.steam_age.steam_furnace.title": "Steam Furnace", "quests.steam_age.steam_furnace.subtitle": "The Steam Furnace furnaces...", "quests.steam_age.steam_furnace.desc": "Want to quickly smelt something into an ingot? The &3Steam Furnace&r does just that! It can turn many ores and dusts quickly into their ingot form, at the expense of not getting any byproducts.", "quests.steam_age.steam_oven.title": "Steam Oven", - "quests.steam_age.steam_oven.subtitle": "The Steam Grinder's big brother", + "quests.steam_age.steam_oven.subtitle": "The Steam Furnace's big brother", "quests.steam_age.steam_oven.desc.1": "&o...or little brother. Don't let him know!&r\n\nThe &3Steam Oven&r is a great multiblock option if you need &6effortlessly smelt large quantities of items.&r No more lines of furnaces that you have to manually empty and refuel!\n\nIt effectively behaves as a parallel furnace, smelting up to 8 items at a time for a low cost of Steam.", "quests.steam_age.steam_oven.desc.2": "&l&3Lore:&r&o This Multiblock - despite being very similar to its brother, the Steam Grinder - isn't ported from a GregTech version or addon. Its actual progenitor is the Steam Oven from Railcraft, which dates back to 1.4.7!", "quests.steam_age.steam_macerator.title": "Steam Macerator", @@ -3931,6 +3953,15 @@ "quests.steam_age.supers.subtitle": "Super Storage Drawers", "quests.steam_age.supers.desc": "This is the &cu&6l&et&ai&bm&9a&5t&4e&r portable item and storage solution if you have a lot of single items or fluids. While these &dBasic&r (&8ULV&r) ones start out relatively small, higher tiers of Super chests and tanks can hold an insane amount of stuff - all in one single block without any regards to temperature or acidity!\n\nLike Drums, Super Tanks and Chests &6keep their contents when broken&r, can be cleared in the crafting grid, and can automatically void any overflow. Unlike drums, however, Super Tanks also &asafely contain&r their contents, preventing you from getting burnt, frozen, or floating.\n\nIf you hunger for &9even more&r storage, take a look at higher tier Quantum Chests and Tanks or AE2 Storage Cells.", "quests.steam_age.supers.task": "Any super chest or tank", + "quests.steam_age.steam_presser.title": "Steam Presser", + "quests.steam_age.steam_presser.subtitle": "The Steam Forge Hammer's aunt", + "quests.steam_age.steam_presser.desc": "The &3Steam Presser&r is a multiblock parallel version of the Forge Hammer.\n\nIf you're doing something where the forge hammer is a bottleneck, this upgrade might be useful. Otherwise, skip it.", + "quests.steam_age.steam_fuser.title": "Steam Fuser", + "quests.steam_age.steam_fuser.subtitle": "The Steam Alloy Smelter's cousin (twice removed)", + "quests.steam_age.steam_fuser.desc": "The &3Steam Fuser&r is a bigger and badder version of the Steam Alloy Smelter. Making a lot of alloys and need them fast? You'd like one of these!", + "quests.steam_age.steam_squasher.title": "Steam Squasher", + "quests.steam_age.steam_squasher.subtitle": "The Steam Compressor's childhood friend", + "quests.steam_age.steam_squasher.desc": "Need a lot of things compressed at the same time? The &3Steam Squasher&r is a multiblock parallel Compressor that may prove useful.", "quests.stone_age": "Stone Age", "quests.stone_age.subtitle": "Humble Beginnings", "quests.stone_age.foods.title": "Hungry?", diff --git a/kubejs/assets/tfg/lang/fr_fr.json b/kubejs/assets/tfg/lang/fr_fr.json index b8bbf9430..134f632d3 100644 --- a/kubejs/assets/tfg/lang/fr_fr.json +++ b/kubejs/assets/tfg/lang/fr_fr.json @@ -1075,7 +1075,7 @@ "ore_vein.tfg.surface_sphalerite": "Sphalerite & Sulfur", "ore_vein.tfg.surface_tetrahedrite": "Tetrahedrite (Surface)", "ore_vein.tfg.deep_mars_chromite": "Redstone & Chromite", - "ore_vein.tfg.deep_mars_pitchblende": "Pitchblende, Thorium, & Uraninite", + "ore_vein.tfg.deep_mars_pitchblende": "Pitchblende, Thorianite, & Uraninite", "ore_vein.tfg.deep_mars_sheldonite": "Bornite & Cooperite", "ore_vein.tfg.mars_almandine": "Almandine & Sapphire", "ore_vein.tfg.mars_apatite": "Apatite & Pyrochlore", @@ -1086,10 +1086,11 @@ "ore_vein.tfg.mars_sapphire": "Gold, Electrotine, & Bauxite", "ore_vein.tfg.mars_graphite": "Graphite & Diamond", "ore_vein.tfg.mars_hematite": "Hematite & Limonite", + "ore_vein.tfg.mars_lapis": "Lapis, Lazurite, & Sodalite", "ore_vein.tfg.mars_lubricant": "Trona, Talc, & Glauconite", "ore_vein.tfg.mars_neodynium": "Bastnasite & Monazite", "ore_vein.tfg.mars_nickel": "Garnierite & Cobaltite", - "ore_vein.tfg.mars_pitchblende": "Pitchblende, Thorium, & Hematite", + "ore_vein.tfg.mars_pitchblende": "Pitchblende & Thorianite, & Hematite", "ore_vein.tfg.mars_quartzite": "Quartzite, Asbestos, & Barite", "ore_vein.tfg.mars_salt": "Salts & Spodumene", "ore_vein.tfg.mars_stibnite": "Tetrahedrite (Normal)", @@ -1523,7 +1524,7 @@ "quests.ae2.interplanetary_wireless.desc": "You can upgrade your Wireless Terminal with this special Card, allowing access to your network from any distance, even on different worlds! Sounds too good to be true? There's a major catch — transferring items uses a huge amount of energy.\n\nYou can sort of get around this with some Energy Cards and a battery in your inventory set to Discharge Mode, but it should work well enough for those times when you accidentally left something at your base on Earth and don't want to fly all the way back.\n\nFor proper automated transfer, you'll need a Railgun.", "quests.ae2.iv.title": "IV Tier AE2", "quests.ae2.iv.desc": "This entire branch becomes fully unlockable once you reach &1IV&r.", - "quests.ae2.accumulation_press.desc": "To get this &eNew Inscriber Press&r, you will need to invest a bit.\n\nFirst, you must upgrade your Implosion Compressor with &1two IV Energy Hatches&r.\n\nThen, get yourself a new IV Laser Engraver if you don't already have one.\n\nAnd finally, prepare a lot of Industrial TNT — it’s the &conly one that works&r for this process.\n\nPlan carefully, as this step is quite demanding!", + "quests.ae2.accumulation_press.desc": "To get this &eNew Inscriber Press&r, you will need to invest a bit.\n\nFirst, you must upgrade your Implosion Compressor with &5two EV Energy Hatches&r.\n\nThen, get yourself a new IV Laser Engraver if you don't already have one.\n\nAnd finally, prepare a lot of Industrial TNT — it’s the &conly one that works&r for this process.\n\nPlan carefully, as this step is quite demanding!", "quests.ae2.accumulation_processor.desc": "The &eAccumulation Processor&r will require a large amount of Silicon for each craft.\n\nWe hope you already have a dedicated EBF producing Silicon, or at least a strong infrastructure to manufacture it quickly.\n\nPrepare accordingly, as you’ll need plenty of it!", "quests.ae2.mega_crafting.desc": "These are a neat upgrade for your &bCrafting CPU&r.\n\nThey will help to speed up your auto-crafting and allow you to handle larger jobs with ease.", "quests.ae2.mega_battery.desc": "A &ebigger battery&r for a bigger network. Nothing else to it!", @@ -1538,7 +1539,7 @@ "quests.ae2.extended_import_export.desc": "These are eight times faster than their regular counterparts. Enjoy!", "quests.ae2.extended_import_export.task": "Either the part or the upgrade", "quests.ae2.extended_io_port.desc": "This upgrade will let you &atransfer faster&r while also offering &6more upgrade slots&r if needed.", - "quests.ae2.extended_molecular_assembler.desc": "The upgrade of the &bMolecular Assembler&r.\n\nIt runs &68 crafting jobs&r at the same time and goes &62 times faster&r.\n\nEven though you can only use it with a normal &bPattern Provider&r, it will be a &agreat upgrade&r before you get the &dMatrix Multiblock&r a bit later on.", + "quests.ae2.extended_molecular_assembler.desc": "The upgrade of the &bMolecular Assembler&r.\n\nIt runs &68 crafting jobs&r at the same time and goes &62 times faster&r.\n\nIt will be a &agreat upgrade&r before you get the &dMatrix Multiblock&r a bit later on.", "quests.ae2.wireless.desc": "The &aME Wireless Connector&r is your go-to if you don't want to put down massive lines of &bME Cables&r. They effectively work like short-range Quantum Tunnels, but have a limited range and don't work across dimensions. That would be too easy, wouldn't it?\n\nDon't forget to check the in-game guide with &eG&r to learn about how they work and their limitations.", "quests.ae2.mega_cell_housing.desc": "These &bCell Housings&r work the same way as the basic ones, but you will need these to make the bigger disks from &dMEGA&r.", "quests.ae2.cell_component_64k.desc": "Now that you have &1IV&r Circuits, you can make this enormous &5Storage Component&r. Aren't you glad you made a Moon base?", @@ -1744,7 +1745,7 @@ "quests.gregtech_energy.lgt.title": "The Large Gas Turbine", "quests.gregtech_energy.lgt.subtitle": "The fan favorite", "quests.gregtech_energy.lgt.desc.1": "The &6Large Gas Turbine&r — also known as &dLGT&r — is one of your two main sources of energy production for most of the modpack. You’ll be able to build your first one at &5EV&r using Stainless Steel. It can carry you from &5EV&r all the way to &dLuV&r, until you feel ready to upgrade to the Large Plasma Turbine.\n\nThat said, many players can finish TerraFirmaGreg using only these turbines — provided you have a strong infrastructure to handle the gas demands of high-tier LGTs.\n\nTo build the LGT, you’ll need the usual Maintenance Hatch and Input Hatch. This turbine requires a Muffler Hatch, but it does not use an Output Hatch.", - "quests.gregtech_energy.lgt.desc.2": "The default output is &e4096 EU/t&r. That output &cdoubles&r with each upgrade to the Rotor Holder after &5EV&r. For example, an LGT using an IV Rotor Holder (×2) with a HSS-E Turbine Rotor (280%% power) will produce:\n4096 × 2 × 2.8 = &e22,937.6 EU/t&r — that's about &a2.8A of IV&r.\n\nTo fully extract that energy, you’ll need at least a IV 4A Dynamo Hatch, since a normal Dynamo Hatch only handles 2A.\n\nJust so you know: the Efficiency stat of a Turbine Rotor increases the duration of the recipe, which means you get more power from each mB of fuel.\n\nLastly, if the Dynamo Hatch fills up, the LGT will automatically slow down and pause fuel usage, gradually reducing rotor speed until it resumes again. So you won't lose any fuel during a backup.", + "quests.gregtech_energy.lgt.desc.2": "The default output is &e4096 EU/t&r. That output &cdoubles&r with each upgrade to the Rotor Holder after &5EV&r. For example, an LGT using an IV Rotor Holder (×2) with a HSS-E Turbine Rotor (280%% power) will produce:\n4096 × 2 × 2.8 = &e22,937.6 EU/t&r — that's about &a2.8A of IV&r.\n\nTo fully extract that energy, you’ll need at least a IV 4A Dynamo Hatch, since a normal Dynamo Hatch only handles 2A.\n\nJust so you know: the Efficiency stat of a Turbine Rotor increases the duration of the recipe, which means you get more power from each mB of fuel.\n\nLastly, if the Dynamo Hatch fills up, the LGT will start voiding excess, so you'll want to turn your LGTs off when your battery buffer or substation starts getting full, via an Advanced Energy Detector Cover and Machine Controller Cover.", "quests.gregtech_energy.lst.title": "The Large Steam Turbine", "quests.gregtech_energy.lst.subtitle": "It... exists", "quests.gregtech_energy.lst.desc.1": "The &6Large Steam Turbine&r — or &dLST&r — might not be the most common Large Generator in standard GregTech, but thanks to its early unlock at &6HV&r and the fact that Large Boilers are stronger in TerraFirmaGreg, it definitely has its place.\n\nTo make it work, you’ll need an Input Hatch for steam, an Output Hatch for Distilled Water, and of course a Maintenance Hatch. That’s all you need!\n\nLike all Large Turbines, you’ll place a Rotor Holder on one side and a Dynamo Hatch on the other to extract power. For the LST, the Rotor Holder must be at least &6HV-tier&r. Each Rotor Holder upgrade &cdoubles&r the output and increases efficiency slightly.", @@ -2578,7 +2579,7 @@ "quests.metal_age.coke_oven.desc.2": "Coke Ovens can be fully automated using a Coke Oven Hatch. The Hatch is placed on the sides of the Oven and work as both Inputs and Outputs for both Items and Liquids.\n\nYou can easly create a simple, one way Coke Oven by using a Crate for the input, a Chest for the output, and a Drum, Barrel, or Large Wooden Tank to collect the Creosote. Unlike Chests, Crates are able to store large objects such as Logs. You can also sneak and right-click GregTech pipes with a wrench to make them one-way.", "quests.metal_age.wrought_iron_goodies.title": "Wrought Iron level Mechanical Power", "quests.metal_age.wrought_iron_goodies.subtitle": "What's this \"Andesite Alloy\" you speak of?", - "quests.metal_age.wrought_iron_goodies.desc": "With Wrought Iron you've unlocked access to the Metal Casing, the foundation of many of Create's mechanical blocks such as Gearboxes. Some of the more advanced ones will require Steel, but it's possible to build a fully automatic tree and crop farm at this point.\n\nCreosote is used to create Treated Wood Planks, which can be crafted into Waterwheels and Windmills, a significant improvement over animal power.", + "quests.metal_age.wrought_iron_goodies.desc": "With Wrought Iron you've unlocked access to the Metal Casing, the foundation of many of Create's mechanical blocks such as Gearboxes. Some of the more advanced ones will require Steel, but it's possible to build a partially automatic tree and crop farm at this point.\n\nCreosote is used to create Treated Wood Planks, which can be crafted into Waterwheels and Windmills, a significant improvement over animal power.", "quests.metal_age.fire_clay_ingredients.title": "Fire Clay Ingredients", "quests.metal_age.fire_clay_ingredients.subtitle": "The TerraFirmaCraft Rite of Passage.", "quests.metal_age.fire_clay_ingredients.desc": "Fire Clay is a special clay made out of Kaolinite, Graphite and regular Clay, which is especially resistant to high temperatures. Its two main uses are the Crucible, which works as an improved version of a Vessel for Metal Smelting and Alloying, and the Blast Furance, which is required for the creation of the next anvil and metal tier, Steel.\n\nYou'll likely need to travel far, far away from your base to obtain both Graphite and Kaolin Clay, so preparation is key!", diff --git a/kubejs/assets/tfg/lang/ja_jp.json b/kubejs/assets/tfg/lang/ja_jp.json index efe2c8361..9833c29f1 100644 --- a/kubejs/assets/tfg/lang/ja_jp.json +++ b/kubejs/assets/tfg/lang/ja_jp.json @@ -698,6 +698,8 @@ "item.tfg.invisibility_salvo": "透明化の軟膏", "item.tfg.luck_salvo": "幸運の軟膏", "item.tfg.resistance_salvo": "耐性の軟膏", + "item.tfg.paracetamol": "アセトアミノフェン", + "item.tfg.rad_away_pill": "RadAway™錠", "item.tfg.paraffin_wax": "パラフィンワックス", "item.tfg.flint_arrow_head": "火打石の矢じり", "item.tfg.fletching": "矢羽根", diff --git a/kubejs/assets/tfg/lang/pt_br.json b/kubejs/assets/tfg/lang/pt_br.json index bba736470..bd8332acf 100644 --- a/kubejs/assets/tfg/lang/pt_br.json +++ b/kubejs/assets/tfg/lang/pt_br.json @@ -838,7 +838,7 @@ "ore_vein.tfg.surface_sphalerite": "Esfalerita e Enxofre", "ore_vein.tfg.surface_tetrahedrite": "Tetraedrita (Superfície)", "ore_vein.tfg.deep_mars_chromite": "Redstone & Chromite", - "ore_vein.tfg.deep_mars_pitchblende": "Pitchblende, Thorium, & Uraninite", + "ore_vein.tfg.deep_mars_pitchblende": "Pitchblende, Thorianite, & Uraninite", "ore_vein.tfg.deep_mars_sheldonite": "Bornite & Cooperite", "ore_vein.tfg.mars_almandine": "Almandine & Sapphire", "ore_vein.tfg.mars_apatite": "Apatita e Pirocloro", @@ -849,10 +849,11 @@ "ore_vein.tfg.mars_sapphire": "Gold, Electrotine, & Bauxite", "ore_vein.tfg.mars_graphite": "Grafite e Diamante", "ore_vein.tfg.mars_hematite": "Hematita e Limonita", + "ore_vein.tfg.mars_lapis": "Lápis-lazúri, Lazurita e Sodalita", "ore_vein.tfg.mars_lubricant": "Trona, Talc, & Glauconite", "ore_vein.tfg.mars_neodynium": "Bastnasita e Monazita", "ore_vein.tfg.mars_nickel": "Garnierita e Cobaltita", - "ore_vein.tfg.mars_pitchblende": "Pitchblende, Thorium, & Hematite", + "ore_vein.tfg.mars_pitchblende": "Pitchblende & Thorianite, & Hematite", "ore_vein.tfg.mars_quartzite": "Quartzite, Asbestos, & Barite", "ore_vein.tfg.mars_salt": "Salts & Spodumene", "ore_vein.tfg.mars_stibnite": "Tetraedrita (Normal)", diff --git a/kubejs/assets/tfg/lang/ru_ru.json b/kubejs/assets/tfg/lang/ru_ru.json index d061c354b..b336939e2 100644 --- a/kubejs/assets/tfg/lang/ru_ru.json +++ b/kubejs/assets/tfg/lang/ru_ru.json @@ -688,6 +688,8 @@ "item.tfg.invisibility_salvo": "Мазь невидимости", "item.tfg.luck_salvo": "Мазь везения", "item.tfg.resistance_salvo": "Мазь сопротивления", + "item.tfg.paracetamol_pill": "Таблетка парацетамола", + "item.tfg.rad_away_pill": "Таблетка Антирадина", "item.tfg.paraffin_wax": "Парафин", "item.tfg.flint_arrow_head": "Наконечник стрелы из кремня", "item.tfg.fletching": "Оперение", @@ -1170,9 +1172,9 @@ "material.tfg.cracker_off_gas": "Остатки риформат-газа прошедшего крекинг", "material.tfg.btx_fuel": "БТК", "material.tfg.critical_steam": "Критический пар", - "material.tfg.americium_241": "Америций-241", - "material.tfg.californium_252": "Калифорний-252", - "material.tfg.neptunium_237": "Нептуний-237", + "material.tfg.americium_241": "Америций 241", + "material.tfg.californium_252": "Калифорний 252", + "material.tfg.neptunium_237": "Нептуний 237", "material.tfg.mixed_radioactive_fluid": "Смешанная радиоактивная жидкость", "material.tfg.degraded_solvent_stream": "Деградированный поток растворителя", "material.tfg.boron_enriched_coolant": "Хладагент обогащенный бором", @@ -1261,7 +1263,7 @@ "ore_vein.tfg.surface_sphalerite": "Сфалерит и Сера", "ore_vein.tfg.surface_tetrahedrite": "Тетраэдрит (Поверхностный)", "ore_vein.tfg.deep_mars_chromite": "Redstone & Chromite", - "ore_vein.tfg.deep_mars_pitchblende": "Pitchblende, Thorium, & Uraninite", + "ore_vein.tfg.deep_mars_pitchblende": "Pitchblende, Thorianite, & Uraninite", "ore_vein.tfg.deep_mars_sheldonite": "Bornite & Cooperite", "ore_vein.tfg.mars_almandine": "Almandine & Sapphire", "ore_vein.tfg.mars_apatite": "Апатит и Пирохлор", @@ -1272,10 +1274,11 @@ "ore_vein.tfg.mars_sapphire": "Gold, Electrotine, & Bauxite", "ore_vein.tfg.mars_graphite": "Графит и Алмаз", "ore_vein.tfg.mars_hematite": "Гематит и Лимонит", + "ore_vein.tfg.mars_lapis": "Лазурит, Лазурит 2 и Содалит", "ore_vein.tfg.mars_lubricant": "Trona, Talc, & Glauconite", "ore_vein.tfg.mars_neodynium": "Бастнезит и Монацит", "ore_vein.tfg.mars_nickel": "Гарниерит и Кобальтит", - "ore_vein.tfg.mars_pitchblende": "Pitchblende, Thorium, & Hematite", + "ore_vein.tfg.mars_pitchblende": "Pitchblende & Thorianite, & Hematite", "ore_vein.tfg.mars_quartzite": "Quartzite, Asbestos, & Barite", "ore_vein.tfg.mars_salt": "Salts & Spodumene", "ore_vein.tfg.mars_stibnite": "Тетраэдрит (обычный)", @@ -1654,119 +1657,119 @@ "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.", "quests.ae2": "Applied Energistics 2", "quests.ae2.subtitle": "Самый мощный инструмент, который поможет вам с GregTech, открывается после вашего первого полёта на Луну", - "quests.ae2.certus_quartz.title": "Certus Quartz", - "quests.ae2.certus_quartz.subtitle": "One small step for you, one giant leap for logistics", - "quests.ae2.certus_quartz.desc": "With your first step on the Moon comes access to your first &bCertus Quartz&r vein.\nDon't worry, they're quite common and should be easy to locate, though having a decent Ore Prospector wouldn't hurt.\n\nWhether you decide to set up a miner or manually dig out a full vein, make sure to gather a hefty amount, as you'll need it to progress through AE2.", - "quests.ae2.certus_quartz.task": "Certus Quartz Ore", - "quests.ae2.polarizer.title": "Polarizer", - "quests.ae2.polarizer.subtitle": "Redstone isn't enough", - "quests.ae2.polarizer.desc": "One of your main resources for Applied Energistics 2 will be &bCharged Certus Quartz&r.\n\nTo obtain it, there’s really only one method: the &6HV&r Polarizer.\n\nYou’ll quickly notice how long this recipe takes, so it’s strongly recommended to dedicate a Polarizer exclusively to this task.\n\nIt may seem expensive or daunting at first, but don't worry—it’s absolutely worth it.\n\nAlso, remember not to charge all your Certus Quartz!\nYou’ll need some uncharged ones for items like the Annihilation Core, so always keep a small reserve on hand.", - "quests.ae2.hv_machines.title": "The Three Musketeers", - "quests.ae2.hv_machines.subtitle": "Or is it four?", - "quests.ae2.hv_machines.desc": "The &eSifter&r is used for ore processing to increase your yield of Certus Quartz, Quartzite, Nether Quartz, Ruby, and Armalcolite—all of which are essential for AE2. Alternatively, you can smelt the ores directly in a Furnace if you're in a rush, but you'll lose out on a lot of free resources by doing that.\n\nThe second machine, the &eMixer&r, is your only method to create &dFluix Crystals&r (more about that in the next quest). Don’t forget that you can also use the Greate Mixer as a &6HS&r-tier machine.\n\nThirdly, a &eLaser Engraver&r can combine lesser quality gems together into Exquisite, which will give you better Fluix yields.\n\nLastly, keep in mind that an &eAutoclave&r can help you generate even more gems from dusts. Once you have the resources, crafting one will make your life significantly easier.", - "quests.ae2.hv_machines.task": "Greate or GregTech?", - "quests.ae2.fluix_crystal.subtitle": "Energetic Crystal", - "quests.ae2.fluix_crystal.desc": "As you can see, there are multiple ways to create Fluix Crystals using a Mixer.\n\nThe higher the purity of your input gems, the better the yield — that’s exactly why we recommended crafting a &eSifter&r earlier.\n\nYou’ll need a massive amount of Fluix Crystals, especially since the &5liquid version&r is used in most Applied Energistics 2 recipes.\n\nSo prepare yourself—you’re going to need a lot!", - "quests.ae2.extractor.title": "Fluid Extractor", - "quests.ae2.extractor.subtitle": "The precious fluix", - "quests.ae2.extractor.desc": "Most of your Fluix Crystals will be converted into &5Liquid Fluix&r.\nHowever, make sure to keep a few in their crystal form for the occasional recipe that specifically requires it.\n\nAny &eExtractor&r will do the job here — no need for anything fancy.", - "quests.ae2.extractor.task": "Any Extractor", - "quests.ae2.fluix_liquid.title": "Liquid Fluix", - "quests.ae2.fluix_liquid.subtitle": "The Moon is so cheap", - "quests.ae2.fluix_liquid.desc": "We told you you'd need a vast quantity of Liquid Fluix… but we didn’t mention there’s a way to drastically increase your yield per Fluix Crystal.\n\nIntroducing: &bCryogenized Fluix&r, an ultra-cold fluid only craftable on the Moon using a &bVacuum Freezer&r. Simply combine Liquid Fluix with Helium-3!\n\nThis special fluid can be used as a substitute in nearly all recipes that require Liquid Fluix—but only when you're crafting on the Moon.\n\nMoon-based AE2 recipes come with huge benefits: reduced energy costs, less components needed, or sometimes both! Investing in a proper Moon base for AE2 production will pay off massively, especially in early game.\n\nIt’s not strictly mandatory — yet. But setting up a second base now will ease your future progression, as planet-based infrastructure becomes essential later on. So… why not get ahead of the curve?", - "quests.ae2.ae_processor.title": "Processors", - "quests.ae2.ae_processor.subtitle": "AE2 Components", - "quests.ae2.ae_processor.desc": "All three &eProcessors&r will be used extensively across Applied Energistics 2 recipes.\n\nThis also gives you a great opportunity to see how effective the &3Moon&r recipes can be for crafting them.\n\nBut in the end, the choice is yours — build your infrastructure where it suits you best.", - "quests.ae2.forming_press.title": "Forming Press", - "quests.ae2.forming_press.subtitle": "Small is good too", - "quests.ae2.forming_press.desc": "To get the printed circuits, you'll need to craft the &6HV&r Forming Press.\n\nThe good news? It has multiple input slots, meaning you can insert all your circuit presses at once, so a single Forming Press is enough to handle every printed circuit type.", - "quests.ae2.ae_press.title": "Inscriber Press", - "quests.ae2.ae_press.subtitle": "Treasure hunt", - "quests.ae2.ae_press.desc": "One of the last things you’ll need before diving fully into Applied Energistics 2 is collecting the 4 &ePresses&r.\n\nTo obtain them, you must locate an &eAE2 Meteorite&r on the &3Moon&r — they will look like dark spheres at the bottom of large craters. Luckily, they aren't particularly rare, and a single meteorite will contain all four Presses.\n\n&cBe careful though&r — these meteorites are often guarded, so gear up, bring an ore prospector if you have one, and happy hunting!", - "quests.ae2.ae_guide.title": "Welcome to AE2", - "quests.ae2.ae_guide.subtitle": "Another free book for your collection!", - "quests.ae2.ae_guide.desc": "Here you are, ready to begin your &bAE2&r infrastructure!\n\nThis chapter will mainly guide you through what you can and cannot craft yet.\nWe’ll also highlight the most important items you should focus on.\n\nHowever, to fully understand Applied Energistics 2, we strongly recommend using the &bG&r keybind (similar to Create's Ponder system) or open the &bME Guide&r we provide as a reward from this quest. It’s the best in-game tutorial for AE2.\nAlternatively, watch some online videos about AE2 on &61.20.1&r for more detailed explanations — AE2 is a very popular mod, so there's a ton of tutorials out there!\n\n&dPro tip&r: Many &bAE2&r recipes have alternative Moon recipes that are much cheaper. Once again, investing in your Moon base will greatly reward you throughout the entire game.", - "quests.ae2.hv.title": "HV Tier AE2", - "quests.ae2.hv.desc": "This entire branch is fully unlockable in &6HV&r!", - "quests.ae2.ae_controller.subtitle": "The beating heart of your ME network", - "quests.ae2.ae_controller.desc": "To get started, you’ll need to power your &bME Network&r. These are the two &bAE2&r blocks that can directly accept &bEU&r energy.\n\nWe strongly recommend crafting a &bME Controller&r, as &bchannels&r are enabled in TerraFirmaGreg, and the &bME Controller&r is the best way to manage multiple channels efficiently.\n\nThis is also a great time to use the in-game guide (press &aU&r on a &bME Controller&r) or watch some videos about &bAE2&r on version 1.20.1 to learn more!", - "quests.ae2.drive.subtitle": "The brains of the network", - "quests.ae2.drive.desc": "You will need to store your disks, and thanks to the &bMEGA&r addon, you now have an extra option.\n\nYou should start with a &bME Drive&r. It can store up to &e10&r disks and consumes &e4 EU/t&r. This will be your main storage solution.\n\nThe other option is the &bME Cell Dock&r. It only stores &e1&r disk but consumes just &e1 EU/t&r, and it can be placed directly on a cable like a cover. This makes it quite useful for &aSubnets&r.", - "quests.ae2.cell_housing.desc": "The &bME Cell Housing&r exists in two versions: one for &aItems&r and one for &9Fluids&r.\n\nYou can take their Storage Component out using a &ePacker&r or simply by Sneak + Right-click while holding the storage cell in your hand.", - "quests.ae2.cables.subtitle": "The arteries of the network", - "quests.ae2.cables.desc": "Your basic cables to connect your &bAE2&r infrastructure.\n\nRemember that regular cables carry only &e8 Channels&r, while &6Dense Cables&r can carry up to &a32 Channels&r.\n\nGood news: in &2TFG&r, you can directly craft the &9Smart Cables&r! They are very helpful as they show a &evisual indicator&r for the number of used channels.", - "quests.ae2.terminals.subtitle": "The... fingers? of the network?", - "quests.ae2.terminals.desc": "These terminals are mandatory to access your ME Network and to set up your auto-crafting system.", - "quests.ae2.molecular_assembler.desc": "The &9Molecular Assembler&r is basically your auto-crafting table.\n\nYou can use it for passive crafting, or combine it with a &9Pattern Provider&r.\n\nAs always, check the in-game guide using &eG&r to learn more about it.", - "quests.ae2.crafting_unit.subtitle": "The second? brains of the network", - "quests.ae2.crafting_unit.desc": "The &dCrafting Unit&r works the same way as your &bME Cell Housing&r.\n\nUse a &6Packer&r to make it functional — by itself, it serves no purpose, though you can use it to complete multi-blocks.\n\nIt’s your mandatory structure to run your &bAE2&r auto-crafting.\n\nAs usual, use the in-game guide from &bAE2&r to learn more about the &dCrafting CPU&r.", - "quests.ae2.crafting_storage.desc": "These are mandatory for any sort of auto crafting — the bigger the storage, the bigger the recipe chain that can be done with one request. You can also place multiple of them next to each other to add their storage size.\n\nUse the in-game guide for further details — it will explain everything far better than we ever could in a quest.\n\nTake your time to read it, it’s a great resource!", - "quests.ae2.crafting_storage.task": "Any crafting storage", - "quests.ae2.pattern_provider.subtitle": "These tell your machines how to craft things", - "quests.ae2.pattern_provider.desc": "The &9Pattern Provider&r is a modern &bAE2&r block. If you're only familiar with AE2 in previous versions of Minecraft, this is the block that you put your patterns into now instead of an Interface.\n\nIt can push items into the connected inventory on a crafting request, and pushing items back into it will send them back to your ME storage.\n\nIf you connect these to your GregTech machines, make sure you select the \"Allow Input From Output Face\" option on them so you can both input and output from the same side!\n\nAs always, check the in-game guide using &eG&r to learn more about it.", - "quests.ae2.pattern_provider.task": "Either Pattern Provider", - "quests.ae2.pattern.subtitle": "Crafting instructions", - "quests.ae2.pattern.desc": "Each of these tells your ME system how to craft a specific item. You'll need one for every single recipe, so it's worth aiming for the most efficient way to craft a ton of these.\n\nTo clear a Pattern, simply Sneak + Right-click them.\n\nUse the in-game guide for full details on how to use them, just remember to set the pattern type to \"Processing\" for any recipes that'll go in GregTech machines.", - "quests.ae2.interface.subtitle": "I'm giving up on the body part analogy", - "quests.ae2.interface.desc": "The &dME Interface&r is one of your bread and butter tools to get items or fluids out of, or inside, your network.\n\nIf you've only used AE2 in older Minecraft versions, these now only make network contents passively available for other things to pull out of, and don't actively push anything or hold patterns. You'll want the Pattern Provider for that.\n\nThe ME Interface can do way too many things to list here, so check the in-game guide using &eG&r to learn more about it.", - "quests.ae2.interface_automation.title": "Interface Automation", - "quests.ae2.interface_automation.desc": "The best way to passively route items and fluids around your base is through the &bME Interface&r. Since Interfaces don't push out their contents, you'll need to slap a cover on your machine or pipe.\n\nRemember to enable the &eAllow Input&r option on the Output face in your GregTech machine's GUI, in order to push and pull from the same side.\n\nUsing filters on your covers can also be a handy way for multiple machines to pull out of the same Interface.\n\nTo avoid overfilling a machine's item input slots, you'll need to use a Robot Arm cover on &eKeep Exact&r mode with a filter.\n\nThe fluid input doesn’t have this issue, as it will fill only one slot automatically.", - "quests.ae2.crafting_accelerator.desc": "Simply use the in-game guide — it will explain everything far better than we ever could in a quest.\n\nTake your time to read it, it’s a great resource!", - "quests.ae2.export_bus.desc": "The &dME Export Bus&r is a strong tool to get items or fluids out of your &dME Network&r.\nOnce you're able to craft them, you should especially look at the &eExtendedAE&r ones, as they can be of great help for some automation.\n\n&cImportant note&r: These have much more of a &4TPS impact&r than something like ME Interfaces, so it's best to use them sparingly.", - "quests.ae2.export_bus.task": "Any Export Bus", - "quests.ae2.import_bus.desc": "The &dME Import Bus&r is one way to get items and fluids into your &dME Network&r. You could also just push items and fluids into an Interface or Pattern Provider for the same result, though, so Import Buses are more niche.\n\n&cImportant note&r: These have much more of a &4TPS impact&r than something like ME Interfaces, so it's best to use them sparingly.", - "quests.ae2.storage_bus.desc": "The &bME Storage Bus&r is how you tell your ME network about items and fluids stored somewhere outside of ME Drives. They can be very powerful in combination with Super Tanks and Super Chests — just be sure to give the Storage Bus a higher &ePriority&r than your Drive, and partition it to the item or fluid you want to store, so your network tries to put things there first.\n\nStorage Buses are also essential for setting up Subnets — check out the in-game guide for more details on how those work.\n\nAlso, &aExtended AE&r comes with a lot of Storage Bus variants that may come in handy later. For example, you could tell your network to \"store\" all of your &6hot ingots&r in your Vacuum Freezer.", - "quests.ae2.storage_bus.task": "Any Storage Bus variant", - "quests.ae2.cell_component_1k.desc": "The &bStorage Component&r will be a core part of your progression through &aAE2&r, and they can be quite expensive, even though you will need them to make your &bStorage Cells&r.\n\nThe &e1k ME Storage Component&r is simple enough to not have a specialized moon recipe, but all of the others do, and since the Storage Components get exponentially more expensive... have we convinced you to make a Moon base yet?", - "quests.ae2.cell_component_4k.desc": "Take a look at how the &e4k Storage Component&r has a tremendously cheaper recipe on the &dMoon&r. This will be a consistent trend — the Moon recipes will always use one circuit tier lower than the non-Moon ones.", - "quests.ae2.cell_component_16k.desc": "The &e16k Storage Component&r is starting to get exponentially more expensive, so now you can really start seeing the savings from having a Moon base.\n\nYou do have a Moon base, right?", - "quests.ae2.p2p.title": "P2P Tunneling", - "quests.ae2.p2p.desc": "Channels are enabled here by default, so you may want to learn about &dP2P&r. They're essentially a way to condense multiple channels down into a single channel, letting you carry hundreds of them across your base through a single cable.\n\nAs usual, we advise you to use the in-game guide for more detailed information, and there's also plenty of video tutorials out there that you may find useful.\n\nWe also recommend making the &bAdvanced Memory Card&r from &dBetter P2P&r as soon as possible. It will be a big help when you've got many different P2P tunnels to deal with. You can even place a load of &dME P2P Inputs&r on your ME Controller ahead of time, and connect them to an output whenever you need.", - "quests.ae2.p2p.task": "Any P2P Tunnel", - "quests.ae2.cell_workbench.desc": "The &bCell Workbench&r is used to customize your storage cells.\n\nYou can give them &aWhitelist&r/&cBlacklist&r filters or partitions, or add upgrades like the &4Overflow Destruction Card&r — but be cautious with this one!\n\nThe &bIO Port&r is used to \"defragment\" your drives, if you've got the same items scattered across several of them.", - "quests.ae2.requester.desc.1": "The &aME Requester&r may be one of your &6strongest tools&r if you want to build your automation around &eauto-crafting&r and not passive production.\n\nIt can send Crafting Request batches of an item when your network has fewer than a specified amount.\n\nIf you are using a lot of &dCrafting Upgrades&r, you'd be better off using this machine as it will have much less of an impact on your &cTPS&r.", - "quests.ae2.requester.desc.2": "Also note that you can set your Crafting CPUs to be dedicated to Player-started crafting, automatic crafting requests, or neither, which can be useful to stop your Requesters from hogging all your CPUs.\n\nIf you like, you can also make a specialized &bTerminal&r to have access to all your Requesters from one place.", - "quests.ae2.emitters.desc": "&bEmitters&r and the &bToggle Bus&r are your way to manage &cRedstone&r signals in &bAE2&r.\n\nThe Level Emitter is especially useful for setting up passive production when combined with the GregTech Machine Controller Cover!\n\nCheck the in-game guide for more detailed information.", - "quests.ae2.batteries.desc": "These are the batteries for your ME Network. You may not need them at the beginning, but just keep them in mind — your energy cost could rise quickly, and a blackout in your ME Network can be a really dangerous situation.", - "quests.ae2.cutting_knife.title": "Cutting Knives", - "quests.ae2.cutting_knife.desc": "These are tools for easily renaming all of your ME components. Why would you want to do this? If you rename your Pattern Providers, their names will show up in the Pattern Terminal, which can be very handy for keeping track of which Pattern Provider is connected to which machine.\n\nFor example &oSmall Gear Extruder&r as a name for the Pattern Provider would let you easily know that this Extruder contains a Small Gear mold, so you should only put Small Gear patterns in it.", - "quests.ae2.cutting_knife.task": "Either cutting knife", - "quests.ae2.pattern_box.desc": "The Pattern Box can carry around all your Blank and Encoded Patterns in one inventory slot, and they will be visible in any AE2 device UI as long as the box is somewhere in your inventory.", - "quests.ae2.wireless_access.title": "ME Wireless Network", - "quests.ae2.wireless_access.subtitle": "Get Free WiFi Anywhere You Go", - "quests.ae2.wireless_access.desc": "Once you've made it to &5EV&r, you'll gain access to the ME Wireless Access Point, which basically acts like a WiFi Router for your ME network. Connect it to a central point in your base, shove as many Wireless Booster cards as you want to increase its range (and power draw), and then link a Wireless Terminal to it.\n\nOnce you have Epoxy and Rhodium, you'll be able to combine all of your Wireless Terminals together via a Universal Terminal!", - "quests.ae2.interplanetary_wireless.subtitle": "Forgot something at home?", - "quests.ae2.interplanetary_wireless.desc": "You can upgrade your Wireless Terminal with this special Card, allowing access to your network from any distance, even on different worlds! Sounds too good to be true? There's a major catch — transferring items uses a huge amount of energy.\n\nYou can sort of get around this with some Energy Cards and a battery in your inventory set to Discharge Mode, but it should work well enough for those times when you accidentally left something at your base on Earth and don't want to fly all the way back.\n\nFor proper automated transfer, you'll need a Railgun.", - "quests.ae2.iv.title": "IV Tier AE2", - "quests.ae2.iv.desc": "This entire branch becomes fully unlockable once you reach &1IV&r.", - "quests.ae2.accumulation_press.desc": "To get this &eNew Inscriber Press&r, you will need to invest a bit.\n\nFirst, you must upgrade your Implosion Compressor with &1two IV Energy Hatches&r.\n\nThen, get yourself a new IV Laser Engraver if you don't already have one.\n\nAnd finally, prepare a lot of Industrial TNT — it’s the &conly one that works&r for this process.\n\nPlan carefully, as this step is quite demanding!", - "quests.ae2.accumulation_processor.desc": "The &eAccumulation Processor&r will require a large amount of Silicon for each craft.\n\nWe hope you already have a dedicated EBF producing Silicon, or at least a strong infrastructure to manufacture it quickly.\n\nPrepare accordingly, as you’ll need plenty of it!", - "quests.ae2.mega_crafting.desc": "These are a neat upgrade for your &bCrafting CPU&r.\n\nThey will help to speed up your auto-crafting and allow you to handle larger jobs with ease.", - "quests.ae2.mega_battery.desc": "A &ebigger battery&r for a bigger network. Nothing else to it!", - "quests.ae2.extended_pattern_access.desc": "The &eExtended Pattern Terminal&r is a wonderful upgrade to manage all your patterns in an easier way.\n\nYou get &6more search options&r for your patterns, and with how many you should be getting now, it will be a huge QoL improvement.\n\nMake the \"upgrade\" version to simply sneak-right-click your existing pattern providers to upgrade them without having to take all the patterns out.", - "quests.ae2.extended_pattern_access.task": "Either the part or the upgrade", - "quests.ae2.extended_interface.desc": "Here they are, your bigger &bInterface&r with an upgrade so you don't even need to disconnect them to upgrade.\n\nYou will be quite happy with them!", - "quests.ae2.extended_interface.task": "Either the part or the upgrade", - "quests.ae2.extended_patprov.desc": "Here they are, your bigger &bPattern Providers&r with an upgrade so you don't even need to disconnect them to upgrade.\n\nYou will be quite happy with them!", - "quests.ae2.extended_patprov.task": "Either the part or the upgrade", - "quests.ae2.extended_drive.desc": "The &dME Extended Drive&r will &6double&r the amount of &eStorage Cells&r you can have within it.\n\nYou can also craft the &eupgrade&r to simply &aRight Click&r your existing ME Drives without having to take your discs out, and it won't cost you more.", - "quests.ae2.extended_drive.task": "Either the part or the upgrade", - "quests.ae2.extended_import_export.desc": "These are eight times faster than their regular counterparts. Enjoy!", - "quests.ae2.extended_import_export.task": "Either the part or the upgrade", - "quests.ae2.extended_io_port.desc": "This upgrade will let you &atransfer faster&r while also offering &6more upgrade slots&r if needed.", - "quests.ae2.extended_molecular_assembler.desc": "The upgrade of the &bMolecular Assembler&r.\n\nIt runs &68 crafting jobs&r at the same time and goes &62 times faster&r.\n\nEven though you can only use it with a normal &bPattern Provider&r, it will be a &agreat upgrade&r before you get the &dMatrix Multiblock&r a bit later on.", - "quests.ae2.wireless.desc": "The &aME Wireless Connector&r is your go-to if you don't want to put down massive lines of &bME Cables&r. They effectively work like short-range Quantum Tunnels, but have a limited range and don't work across dimensions. That would be too easy, wouldn't it?\n\nDon't forget to check the in-game guide with &eG&r to learn about how they work and their limitations.", - "quests.ae2.mega_cell_housing.desc": "These &bCell Housings&r work the same way as the basic ones, but you will need these to make the bigger disks from &dMEGA&r.", - "quests.ae2.cell_component_64k.desc": "Now that you have &1IV&r Circuits, you can make this enormous &5Storage Component&r. Aren't you glad you made a Moon base?", - "quests.ae2.cell_component_256k.desc": "The &c256k ME Storage Component&r is the last one you can make with a regular Assembler, and it's so big that you may never need any of the bigger sizes.\n\nUnless you're up for the challenge, of course.", - "quests.ae2.luv.title": "LuV Tier AE2", - "quests.ae2.luv.desc": "This branch becomes unlockable once you reach &dLuV&r.", - "quests.ae2.cell_component_1m.desc": "The &3MEGA Storage Components&r will need an &bAssembly Line&r. Note that the non-Moon recipe must be crafted within a Cleanroom, or you can use a Cleaning Maintenance Hatch if you have access to one.\n\nNo need for that on the Moon though.", - "quests.ae2.cell_component_4m.desc": "Simply bigger and more expensive.", - "quests.ae2.cell_component_16m.desc": "This one can only be made on the &cMoon&r and nowhere else. It will also require a Cleanroom environment, so if you don’t want to bother with a Cleanroom on the &cMoon&r, you should make the &7Cleaning Maintenance Hatch&r.\n\nIt will also need some research. Refer to the &cZPM&r Chapter if you don’t know what that means.", - "quests.ae2.cell_component_64m.desc": "The &c64M MEGA Storage Component&r is the biggest one you can make in &7TerraFirmaGreg&r. Honestly, we believe you'll never need it, but it’s there for completionists.", - "quests.ae2.oversize_interface.desc": "The &dME Oversize Interface&r is a &dME Extended Interface&r but each slot can hold 16x more items or fluids. If you have processes that need huge quantities, this could be your go-to.", - "quests.ae2.assembler_matrix.desc": "The &6Assembler Matrix&r is basically a customizable multiblock Molecular Assembler. The requirements for this quest should let you build one that we deem quite strong enough. You could add more layers of &bPattern Core&r or &aCraft Core&r if you want to.\n\nAs usual, check the in-game guide for detailed informations.", + "quests.ae2.certus_quartz.title": "Истинный кварц", + "quests.ae2.certus_quartz.subtitle": "Один маленький шаг для тебя, один гигантский скачок для логистики", + "quests.ae2.certus_quartz.desc": "С твоим первым шагом на Луну ты получаешь доступ к первой жиле &bистинного кварца&r.\nНе переживай — они довольно распространены и их легко найти, хотя наличие хорошего разведочного сканера точно не помешает.\n\nНезависимо от того, решишь ли ты использовать шахтеры или вручную выкопать всю жилу, обязательно добудь приличное количество, так как оно понадобится для продвижения в AE2.", + "quests.ae2.certus_quartz.task": "Руда истинного кварца", + "quests.ae2.polarizer.title": "Поляризатор", + "quests.ae2.polarizer.subtitle": "Просто редстоуна недостаточно", + "quests.ae2.polarizer.desc": "Одним из основных ресурсов для Applied Energistics 2 будет &bзаряженный кристалл истинного кварц&r.\n\nПолучить его можно только одним способом — с помощью &6HV&r-поляризатора.\n\nТы быстро заметишь, насколько долгий это процесс, поэтому настоятельно рекомендуется выделить отдельный поляризатор.\n\nПоначалу это может показаться дорогим или пугающим, но не переживай — оно того стоит.\n\nТакже помни: не заряжай весь истинный кварц!\nТебе может понадобятся незаряженный кварц, например для Ядер уничтожения, поэтому всегда держи небольшой запас.", + "quests.ae2.hv_machines.title": "Три мушкетёра", + "quests.ae2.hv_machines.subtitle": "Или всё-таки четыре?", + "quests.ae2.hv_machines.desc": "&eПросеиватель&r используется для переработки руд и увеличения выхода истинного кварца, кварцита, незер-кварца, рубина и армалколита — всех необходимых ресурсов для AE2. В качестве альтернативы ты можешь переплавлять руды напрямую в печи, если торопишься, но при этом потеряешь много бесплатных ресурсов.\n\nВторая машина — &eМиксер&r — это единственный способ создать &dфлюисовые кристаллы&r (подробнее об этом в следующем задании). Не забывай, что Greate смешиватель также можно использовать как машину уровня &6HS&r.\n\nТретья — &eЛазерный гравировщик&r — позволяет объединять кристаллы более низкого качества в безупречные, что даёт лучший выход флюиса.\n\nИ наконец, &eАвтоклав&r может помочь получить ещё больше кристаллов из пыли. Как только у тебя появятся ресурсы, его создание значительно упростит тебе жизнь.", + "quests.ae2.hv_machines.task": "Greate или GregTech?", + "quests.ae2.fluix_crystal.subtitle": "Энергетический кристалл", + "quests.ae2.fluix_crystal.desc": "Как ты видишь, существует несколько способов создания флюисовых кристаллов с помощью миксера.\n\nЧем выше чистота исходных кристаллов, тем выше выход — именно поэтому мы ранее рекомендовали создать &eПросеиватель&r.\n\nТебе понадобится огромное количество флюисовых кристаллов, особенно учитывая, что &5жидкий флюс&r используется в большинстве рецептов Applied Energistics 2.\n\nТак что готовься — их потребуется очень много!", + "quests.ae2.extractor.title": "Экстрактор", + "quests.ae2.extractor.subtitle": "Драгоценный флюис", + "quests.ae2.extractor.desc": "Большая часть твоих кристаллов флюиса будет преобразована в &5жидкий флюис&r.\nОднако обязательно оставь несколько в кристальном виде для редких рецептов, которые требуют именно его.\n\nЛюбой &eэкстрактор&r подойдёт для этой задачи — ничего особенного не требуется.", + "quests.ae2.extractor.task": "Любой экстрактор", + "quests.ae2.fluix_liquid.title": "Жидкий флюис", + "quests.ae2.fluix_liquid.subtitle": "Луна — это так дёшево", + "quests.ae2.fluix_liquid.desc": "Мы говорили, что тебе понадобится огромное количество жидкого флюиса… но не упомянули, что существует способ значительно увеличить выход с одного кристалла флюиса.\n\nПредставляем: &bкриогенный флюис&r — сверххолодная жидкость, которую можно создать только на Луне с помощью &bвакуумного холодильника&r. Просто объедини жидкий флюис с гелием-3!\n\nЭту особую жидкость можно использовать в качестве замены почти во всех рецептах, требующих жидкий флюис, — но только при крафте на Луне.\n\nЛунные рецепты AE2 дают огромные преимущества: сниженные энергозатраты, меньшее количество компонентов или иногда и то и другое!\nИнвестиции в полноценную лунную базу для производства AE2 окупятся с лихвой, особенно на ранних этапах игры.\n\nЭто не является строго обязательным — пока что. Но создание второй базы уже сейчас облегчит дальнейшее развитие, так как инфраструктура на планетах станет необходимой позже. Так почему бы не сыграть на опережение?", + "quests.ae2.ae_processor.title": "Процессоры", + "quests.ae2.ae_processor.subtitle": "Компоненты AE2", + "quests.ae2.ae_processor.desc": "Все три типа &eпроцессоров&r будут широко использоваться во множестве рецептов Applied Energistics 2.\n\nЭто также отличная возможность увидеть, насколько эффективными могут быть &3лунные&r рецепты для их создания.\n\nНо в конечном итоге выбор за тобой — строй инфраструктуру там, где тебе удобнее всего.", + "quests.ae2.forming_press.title": "Формовочный пресс", + "quests.ae2.forming_press.subtitle": "Маленькое — тоже хорошо", + "quests.ae2.forming_press.desc": "Чтобы получить печатные схемы, тебе потребуется создать &6HV&r формовочный пресс.\n\nХорошая новость? У него есть несколько входных слотов, а значит ты можешь вставить все печати(прессы) одновременно, и одного формовочного пресса будет достаточно для содния всех типов процессоров.", + "quests.ae2.ae_press.title": "Печати для вырезателя", + "quests.ae2.ae_press.subtitle": "А где вырезатель?", + "quests.ae2.ae_press.desc": "Одним из последних шагов перед полным погружением в Applied Energistics 2 является сбор всех 4 &eпечатей&r.\n\nЧтобы получить их, тебе нужно найти &eметеорит AE2&r на &3Луне&r — они выглядят как тёмные сферы на дне больших кратеров. К счастью, они встречаются не так уж редко, и в одном метеорите находятся все четыре печати.\n\n&cНо будь осторожен&r — такие метеориты часто охраняются, так что экипируйся, возьми разведочный сканер, если он у тебя есть, и удачной охоты!", + "quests.ae2.ae_guide.title": "Добро пожаловать в AE2", + "quests.ae2.ae_guide.subtitle": "Ещё одна бесплатная книга в твою коллекцию!", + "quests.ae2.ae_guide.desc": "Вот ты и готов начать создание своей инфраструктуры &bAE2&r!\n\nЭта глава в основном проведёт тебя через то, что ты уже можешь и не можешь крафтить.\nМы также выделим самые важные предметы, на которых стоит сосредоточиться.\n\nОднако, чтобы полностью понять Applied Energistics 2, мы настоятельно рекомендуем использовать привязку клавиши &bG&r (аналогично системе размышления из Create) или открыть &bРуководство&r, которое ты получишь в награду за это задание. Это лучший внутриигровой учебник по AE2.\nТакже ты можешь посмотреть обучающие видео по AE2 для версии &61.20.1&r — AE2 является очень популярным модом, так что в сети есть множество руководств!\n\n&dСовет профессионала&r: у многих рецептов &bAE2&r есть альтернативные лунные рецепты, которые значительно дешевле. В очередной раз, инвестиции в лунную базу будут щедро вознаграждены на протяжении всей игры.", + "quests.ae2.hv.title": "AE2 HV", + "quests.ae2.hv.desc": "Вся эта ветка полностью открывается на &6HV&r!", + "quests.ae2.ae_controller.subtitle": "Бьющееся сердце твоей ME-сети", + "quests.ae2.ae_controller.desc": "Для начала тебе нужно запитать свою &bМЭ-сеть&r. Это два блока &bAE2&r, которые могут напрямую принимать энергию &bEU&r.\n\nМы настоятельно рекомендуем создать &bМЭ-контроллера&r, так как в TerraFirmaGreg включены &bканалы&r, а &bМЭ-контроллер&r — лучший способ эффективно управлять большим колличеством каналов.\n\nЭто также отличное время, чтобы воспользоваться внутриигровым руководством (нажми &aU&r на &bME-регулятор&r) или посмотреть видео про &bAE2&r для версии 1.20.1, чтобы узнать больше!", + "quests.ae2.drive.subtitle": "Мозг сети", + "quests.ae2.drive.desc": "Тебе понадобится место для хранения дисков, и благодаря аддону &bMEGA&r у тебя теперь есть дополнительный вариант.\n\nНачать стоит с &bМЭ-дисковода&r. Он может хранить до &e10&r дисков и потребляет &e4 EU/t&r. Это будет твоё основное хранилище.\n\nДругой вариант — &bМЭ станция для ячеек&r. Он хранит всего &e1&r диск, но потребляет лишь &e1 EU/t&r и может устанавливаться прямо на кабель. Это делает его очень полезным для &aподсетей&r.", + "quests.ae2.cell_housing.desc": "&bМЭ корпус&r существует в двух версиях: для &aпредметов&r и для &9жидкостей&r.\n\nТы можешь извлечь компонент хранения с помощью &eупаковщика&r или просто зажав Shift и кликнув правой кнопкой мыши, держа ячейку хранения в руке.", + "quests.ae2.cables.subtitle": "Артерии сети", + "quests.ae2.cables.desc": "Базовые кабели для соединения твоей инфраструктуры &bAE2&r.\n\nПомни, что обычные кабели передают только &e8 каналов&r, тогда как &6плотные кабели&r(они названы непрозрачными) могут передавать до &a32 каналов&r.\n\nХорошая новость: в &2TFG&r ты можешь напрямую крафтить &9умные кабели&r! Они очень полезны, так как показывают &eвизуальный индикатор&r количества используемых каналов.", + "quests.ae2.terminals.subtitle": "Эм… пальцы? сети?", + "quests.ae2.terminals.desc": "Эти терминалы необходимы для доступа к твоей МЭ-сети и для настройки системы автокрафта.", + "quests.ae2.molecular_assembler.desc": "&9Молекулярный сборщик&r — это, по сути, твой автоматический верстак.\n\nТы можешь использовать его для пассивного крафта или объединить с &9поставщиком шаблонов&r.\n\nКак всегда, загляни во внутриигровое руководство с помощью &eG&r, чтобы узнать больше.", + "quests.ae2.crafting_unit.subtitle": "Второй? мозг сети", + "quests.ae2.crafting_unit.desc": "&dБлоки создания&r работает так же, как &bМЭ корпус ячейки&r.\n\nИспользуй &6упаковщик&r, чтобы сделать его функциональным — сам по себе он не имеет назначения, хотя может использоваться для сборки мультиблоков.\n\nЭто обязательная структура для работы автокрафта &bAE2&r.\n\nКак обычно, используй внутриигровое руководство &bAE2&r, чтобы узнать больше о &dпроцессоре крафта&r.", + "quests.ae2.crafting_storage.desc": "Эти блоки обязательны для любого автокрафта — чем больше хранилище, тем более длинные цепочки рецептов можно выполнить по одному запросу. Ты также можешь размещать несколько таких блоков рядом, чтобы суммировать их объём.\n\nИспользуй внутриигровое руководство для получения дополнительных деталей — оно объяснит всё гораздо лучше, чем мы когда-либо смогли бы в описании задания.\n\nНе торопись и внимательно прочитай его — это отличный источник информации!", + "quests.ae2.crafting_storage.task": "Любое хранилище для изготовления", + "quests.ae2.pattern_provider.subtitle": "Они указывают вашим машинам, как что-либо крафтить", + "quests.ae2.pattern_provider.desc": "&9МЭ Поставщик шаблонов&r — это современный блок &bAE2&r. Если ты знаком с AE2 только по более старым версиям Minecraft, то теперь именно в этот блок вставляются шаблоны, а не в интерфейс.\n\nОн может отправлять предметы в подключённый инвентарь по запросу на крафт, а возврат предметов обратно в него отправит их обратно в ME-сеть.\n\nЕсли ты подключаешь его к машинам GregTech, обязательно включи опцию \"Разрешить ввод со стороны выхода\", чтобы можно было и вводить, и выводить предметы с одной и той же стороны!\n\nКак всегда, загляни во внутриигровое руководство, нажав &eG&r, чтобы узнать больше.", + "quests.ae2.pattern_provider.task": "Любой поставщик шаблонов", + "quests.ae2.pattern.subtitle": "Инструкции крафта", + "quests.ae2.pattern.desc": "Каждый из них сообщает твоей ME-системе, как скрафтить конкретный предмет. Он понадобится для каждого отдельного рецепта, поэтому стоит сразу стремиться к наиболее эффективному способу массового их производства.\n\nЧтобы очистить шаблон, просто зажми Shift и кликни по нему правой кнопкой мыши.\n\nИспользуй внутриигровое руководство для получения полной информации о том, как ими пользоваться, и не забудь установить тип шаблона \"Обработки\" для рецептов, которые будут выполняться в машинах GregTech.", + "quests.ae2.interface.subtitle": "Я сдаюсь с аналогиями частей тела", + "quests.ae2.interface.desc": "&dМЭ-интерфейс&r — один из твоих основных инструментов для ввода и вывода предметов или жидкостей из сети.\n\nЕсли ты использовал AE2 только в старых версиях Minecraft, то теперь эти блоки лишь пассивно предоставляют содержимое сети для извлечения другими системами и не отправляют предметы активно и не хранят шаблоны. Для этого тебе понадобится поставщик шаблонов.\n\nМЭ-интерфейс умеет слишком многое, чтобы перечислять всё здесь, поэтому обязательно загляни во внутриигровое руководство, нажав &eG&r, чтобы узнать больше.", + "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.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, чем, например, МЭ-интерфейсы, поэтому использовать их стоит умеренно.", + "quests.ae2.storage_bus.desc": "&bМЭ шина хранения&r — это способ сообщить МЭ сети о предметах и жидкостях, хранящихся где-то вне ME дисков. В сочетании с супер резервуарами и супер сундуками они могут быть очень мощными — просто обязательно задай шине хранения более высокий &eприоритет&r, чем у диска, и ограничь её конкретным предметом или жидкостью, чтобы сеть в первую очередь пыталась помещать всё именно туда.\n\nШины хранения также необходимы для настройки подсетей — загляни во внутриигровое руководство, чтобы узнать больше о том, как они работают.\n\nКроме того, &aExtended AE&r добавляет множество вариантов шин хранения, которые могут пригодиться позже. Например, ты можешь сказать сети \"хранить\" все свои &6горячие слитки&r в вакуумном холодильнике.", + "quests.ae2.storage_bus.task": "Любой вариант шины хранения", + "quests.ae2.cell_component_1k.desc": "&bКомпонент хранения&r будет ключевой частью твоего прогресса в &aAE2&r, и он может быть довольно дорогим, несмотря на то, что он нужен для создания &bячеек хранения&r.\n\n&e1k МЭ компонент хранения&r достаточно прост и не имеет специального лунного рецепта, но все остальные — имеют. А поскольку компоненты хранения становятся экспоненциально дороже… мы уже убедили тебя построить базу на Луне?", + "quests.ae2.cell_component_4k.desc": "Обрати внимание, насколько у &e4k компонента хранения&r рецепт на &dЛуне&r дешевле. Это будет постоянной тенденцией — лунные рецепты всегда используют схемы на один уровень ниже, чем не лунные.", + "quests.ae2.cell_component_16k.desc": "&e16k компонент хранения&r начинает экспоненциально дорожать, так что теперь ты действительно можешь почувствовать выгоду от наличия лунной базы.\n\nУ тебя ведь есть база на Луне, правда?", + "quests.ae2.p2p.title": "P2P-туннели", + "quests.ae2.p2p.desc": "Каналы здесь включены по умолчанию, поэтому тебе стоит разобраться с &dP2P&r. По сути, это способ сжать несколько каналов в один, позволяя передавать сотни каналов по всей базе через один-единственный кабель.\n\nКак обычно, мы советуем воспользоваться внутриигровым руководством для получения более подробной информации, а также существует множество видеоуроков, которые могут оказаться полезными.\n\nМы также рекомендуем как можно раньше сделать &bРасширенную карту памяти&r из &dBetter P2P&r. Она сильно поможет, когда тебе придётся иметь дело с большим количеством разных P2P-туннелей. Ты даже можешь заранее разместить несколько &dМЭ P2P водов&r на ME-контроллере и подключать их к выходу тогда, когда это потребуется.", + "quests.ae2.p2p.task": "Любой P2P-туннель", + "quests.ae2.cell_workbench.desc": "&bВерстак для камер&r используется для настройки твоих ячеек хранения.\n\nТы можешь задать им фильтры &aБелого спичка&r/&cЧёрного списка&r или разделы, а также добавить улучшения вроде &4Пустотной карты&r — но с этим улучшением будь осторожен!\n\n&bМЭ порт ввода/вывода&r используется для \"дефрагментации\" твоих дисков, если одни и те же предметы распределены по нескольким из них.", + "quests.ae2.requester.desc.1": "&aМЭ заказчик&r может стать одним из твоих &6самых мощных инструментов&r, если ты хочешь строить автоматизацию вокруг &eавтокрафта&r, а не пассивного производства.\n\nОн может отправлять пакеты запросов на крафт предмета, когда в сети его становится меньше заданного количества.\n\nЕсли ты используешь много &dКарт изготовления&r, лучше воспользуйся этой машиной, так как она оказывает значительно меньшее влияние на ваш &cTPS&r.", + "quests.ae2.requester.desc.2": "Также обратите внимание, что ты можешь настроить ваши хранилища для изготовлений так, чтобы они были выделены под крафт, запускаемый игроком, автоматические запросы крафта или ни то ни другое. Это может быть полезно, чтобы Заказчики не занимали все твои хранилища для изготовлений.\n\nПри желании ты также можешь создать специализированный &bМЭ терминал запросов&r, чтобы иметь доступ ко всем твоим Запросчикам из одного места.", + "quests.ae2.emitters.desc": "&bИзлучатели уровня&r и &bшина переключения&r — это твои инструменты для управления сигналами &cредстоуна&r в &bAE2&r.\n\nИзлучатели уровня особенно полезен для настройки пассивного производства в сочетании с контроллером механизма GregTech!\n\nДля более подробной информации загляни во внутриигровое руководство.", + "quests.ae2.batteries.desc": "Это батареи для твоей МЭ-сети. В начале они могут тебе не понадобиться, но имейте их в виду — энергопотребление может быстро вырасти, а отключение питания в МЭ-сети может оказаться действительно опасной ситуацией.", + "quests.ae2.cutting_knife.title": "Режущие ножи", + "quests.ae2.cutting_knife.desc": "Это инструменты для удобного переименования всех твоих МЭ-компонентов. Зачем это нужно? Если ты переименуешь свои поставщики шаблонов, их имена будут отображаться в терминале доступа к шаблонам, что очень удобно для отслеживания того, какой поставщик шаблонов подключён к какой машине.\n\nНапример, имя &oSmall Gear Extruder&r для поставщика шаблонов позволит тебе сразу понять, что этот экструдер содержит форму для малых шестерён, и что в него следует помещать только шаблоны малых шестерён.", + "quests.ae2.cutting_knife.task": "Любой режущий нож", + "quests.ae2.pattern_box.desc": "Коробка для шаблонов может переносить все твои пустые и закодированные шаблоны в одном слоте инвентаря, и они будут видны в интерфейсе любого устройства AE2, пока коробка находится где-либо в вашем инвентаре.", + "quests.ae2.wireless_access.title": "Беспроводная МЭ-сеть", + "quests.ae2.wireless_access.subtitle": "Бесплатный Wi-Fi где бы вы ни были", + "quests.ae2.wireless_access.desc": "Как только ты достигнешь уровня &5EV&r, ты получишь доступ к МЭ беспроводной точке доступа, который по сути работает как Wi-Fi роутер для твоей МЭ-сети. Подключи его к центральной точке базы, установите столько беспроводных усилитилей, сколько захочешь, чтобы увеличить радиус действия (и энергопотребление), а затем привяжи к нему беспроводной терминал.\n\nКак только у тебя появятся эпоксидная смола и родий, ты сможешь объединить все твои беспроводные терминалы в один универсальный терминал!", + "quests.ae2.interplanetary_wireless.subtitle": "Забыли что-то дома?", + "quests.ae2.interplanetary_wireless.desc": "Ты можешь улучшить свой беспроводной терминал с помощью этой специальной карты, получив доступ к сети с любого расстояния, даже из других миров! Звучит слишком хорошо, чтобы быть правдой? Есть серьёзный подвох — передача предметов потребляет огромное количество энергии.\n\nЧастично это можно обойти с помощью энергетических карт и батареек в твоем инвентаре, установленной в режим разрядки, и этого будет достаточно для случаев, когда ты случайно забыл что-то на базе на Земле и не хочешь лететь обратно.\n\nДля полноценной автоматической передачи тебе понадобится рельсотрон.", + "quests.ae2.iv.title": "AE2 уровня IV", + "quests.ae2.iv.desc": "Вся эта ветка становится полностью доступной, как только ты достигнешь &1IV&r.", + "quests.ae2.accumulation_press.desc": "To get this &eNew Inscriber Press&r, you will need to invest a bit.\n\nFirst, you must upgrade your Implosion Compressor with &5two EV Energy Hatches&r.\n\nThen, get yourself a new IV Laser Engraver if you don't already have one.\n\nAnd finally, prepare a lot of Industrial TNT — it’s the &conly one that works&r for this process.\n\nPlan carefully, as this step is quite demanding!", + "quests.ae2.accumulation_processor.desc": "&eаккумулирующий процессор&r будет требовать большое количество кремния для каждого крафта.\n\nНадеемся, что у тебя уже есть отдельная ЭДП, производящая кремний, или хотя бы мощная инфраструктура для его быстрого производства.\n\nПодготовься соответствующим образом, так как его понадобится очень много!", + "quests.ae2.mega_crafting.desc": "Это отличное улучшение для твоего &bхранилища для изготовления&r.\n\nОно поможет ускорить автокрафт и позволит без проблем справляться с более крупными задачами.", + "quests.ae2.mega_battery.desc": "&eБолее ёмкая батарея&r для более крупной сети. Ничего лишнего!", + "quests.ae2.extended_pattern_access.desc": "&eРасширенный терминал доступа к шаблонам&r — замечательное улучшение, позволяющее тебе гораздо удобнее управлять всеми шаблонами.\n\nТы получаешь &6больше вариантов поиска&r по шаблонам, и с учётом того, сколько их у тебя теперь будет, это станет огромным улучшением удобства.\n\nСкрафти версию \"улучшения\", чтобы просто зажать Shift и кликнуть правой кнопкой мыши по существующим поставщикам шаблонов, улучшив их без необходимости вынимать все шаблоны.", + "quests.ae2.extended_pattern_access.task": "Либо компонент, либо улучшение", + "quests.ae2.extended_interface.desc": "Вот они — твои расширенные &bинтерфейсы&r или улучшение, благодаря которому тебе даже не нужно отключать их для апгрейда.\n\nТы точно останешься ими доволен!", + "quests.ae2.extended_interface.task": "Либо компонент, либо улучшение", + "quests.ae2.extended_patprov.desc": "Вот они — твои расширенные &bпоставщики шаблонов&r с улучшением, позволяющим обновлять их без отключения.\n\nТы точно останешься ими доволен!", + "quests.ae2.extended_patprov.task": "Либо компонент, либо улучшение", + "quests.ae2.extended_drive.desc": "&dРасширенный дисковод&r &6удваивает&r количество &eячеек хранения&r, которые ты можешь в него поставить.\n\nТы также можешь скрафтить &eулучшение&r, чтобы просто &aкликнуть правой кнопкой мыши&r по существующим МЭ-дисководам, не опусташая их, и это не будет стоить дороже.", + "quests.ae2.extended_drive.task": "Либо компонент, либо улучшение", + "quests.ae2.extended_import_export.desc": "Они в восемь раз быстрее своих обычных аналогов. Наслаждайся!", + "quests.ae2.extended_import_export.task": "Либо компонент, либо улучшение", + "quests.ae2.extended_io_port.desc": "Это улучшение позволит тебе &aперемещать быстрее&r, а также при необходимости предоставит &6больше слотов улучшений&r.", + "quests.ae2.extended_molecular_assembler.desc": "Улучшение для &bМолекулярного сборщика&r.\n\nОн выполняет &68 заданий крафта&r одновременно и работает в &62 раза быстрее&r.\n\nХотя его можно использовать только с &bПоставщиком шаблонов&r, это будет &aотличное улучшение&r перед тем, как ты чуть позже получишь &dмультиблочную матрицу сборщика&r.", + "quests.ae2.wireless.desc": "&aМЭ беспроводной соединитель&r — твой лучший выбор, если ты не хочешь прокладывать огромные линии из &bкабелей&r. По сути, они работают как квантовые туннели малого радиуса действия, но имеют ограниченную дальность и не работают между измерениями. Слишком просто было бы, правда?\n\nНе забудь заглянуть во внутриигровое руководство, нажав &eG&r, чтобы узнать, как они работают и каковы их ограничения.", + "quests.ae2.mega_cell_housing.desc": "Эти &bКорпусы для ячеек&r работают так же, как и базовые, но они понадобятся тебе для создания более крупных дисков из &dMEGA&r.", + "quests.ae2.cell_component_64k.desc": "Теперь, когда у тебя есть схемы &1IV&r, ты можешь создать этот огромный &5компонент хранения&r. Рад, что построил лунную базу?", + "quests.ae2.cell_component_256k.desc": "&c256k МЭ компонент хранения&r — последний, который ты можешь создать с помощью обычного ассемблера, и он настолько велик, что тебе, возможно, никогда не понадобятся ещё большие размеры.\n\nНу, разве что ты готов принять вызов.", + "quests.ae2.luv.title": "AE2 уровня LuV", + "quests.ae2.luv.desc": "Эта ветка становится доступной, как только ты достигнешь уровня &dLuV&r.", + "quests.ae2.cell_component_1m.desc": "Для &3МЕГА компонентов хранения&r тебе понадобится &bСборочный конвейер&r. Обрати внимание: рецепт без Луны должен крафтиться в чистой комнате, либо ты можешь использовать &7Люк обслюживания автоматической фильтрации&r, если у тебя есть к нему доступ.\n\nНа Луне это, впрочем, не требуется.", + "quests.ae2.cell_component_4m.desc": "Просто больше и дороже.", + "quests.ae2.cell_component_16m.desc": "Этот компонент можно создать только на &cЛуне&r и нигде больше. Также потребуется среда чистой комнаты, так что если ты не хочешь возиться с чистой комнатой на &cЛуне&r, тебе стоит сделать &7Люк обслюживания автоматической фильтрации&r.\n\nТакже понадобится исследование. Загляни в главу &cZPM&r, если не знаешь, что это означает.", + "quests.ae2.cell_component_64m.desc": "&c64M МЭ МЕГА компонент хранения&r — самый большой компонент, который ты можешь создать в &7TerraFirmaGreg&r. Честно говоря, мы считаем, что он тебе никогда не понадобится, но он есть для коллекционеров и перфекционистов.", + "quests.ae2.oversize_interface.desc": "&dМЭ Сверхразмерный интерфейс&r — это &dМЭ расширенный интерфейс&r, но каждый слот может хранить в 16 раз больше предметов или жидкостей. Если у тебя есть процессы, требующие огромных объёмов, это может стать твоим основным выбором.", + "quests.ae2.assembler_matrix.desc": "&6Матрица сборщика&r — это по сути настраиваемый мультиблок молекулярного сборщика. Требования этого квеста позволят тебе построить вариант, который мы считаем достаточно мощным. При желании ты можешь добавить больше слоёв &bЯдер матрицы&r или &aКрафтовых ядер матрицы&r.\n\nКак обычно, загляни во внутриигровое руководство за подробной информацией.", "quests.tasktype.checkmark": "Нажмите, чтобы закончить квест/задание", "quests.tasktype.item.any": "Любой предмет типа:", "quests.tasktype.lookat": "Посмотреть на:", @@ -2131,7 +2134,7 @@ "quests.extreme_voltage.gasoline.desc": "&aGasoline&r is an extremely powerful Combustion Fuel. It's over &63 times&r as energy dense as &dDiesel&r!\n\n&9Note:&r This Combustion Fuel exists solely as a &echallenge&r for you to overcome if you desire to take on it.\n\nIt's completely &doptional&r, so we'll let you figure out how to obtain it, without any further tips.", "quests.extreme_voltage.radiation.title": "Dealing with Radiation", "quests.extreme_voltage.radiation.subtitle": "Extra Spicy Materials", - "quests.extreme_voltage.radiation.desc.1": "While GregTech doesn't have any sort of \"ambient radiation\" like some other mods do, &aradioactive materials&r are still dangerous to the player when held! This applies to any item that says it's &eCarcinogenic&r and is caused by &eAny Contact&r.\n\nThere's a few ways to mitigate this, and the easiest is to just avoid contact with the items in the first place - move them around with pipes, backpacks, or even Small Vessels. The less time you have them in your inventory, the better!", + "quests.extreme_voltage.radiation.desc.1": "While GregTech doesn't have any sort of \"ambient radiation\" like some other mods do, &aradioactive materials&r are still dangerous to the player when held! This applies to any item that says it's &4Radioactive&r and is caused by &eAny Contact&r.\n\nThere's a few ways to mitigate this, and the easiest is to just avoid contact with the items in the first place - move them around with pipes, backpacks, or even Small Vessels. The less time you have them in your inventory, the better!", "quests.extreme_voltage.radiation.desc.2": "Besides this, you'll want some other ways to protect yourself. Wearing equipment tagged as &e#ppe_armor&r in all four slots will protect you from radiation. However, this will still damage the equipment over time (at a rate equivalent to how much the radiation would affect you), &oexcept&r for the &6Hazardous Material Suit&r, which will never take damage from it.\n\nThe downside is that the hazmat suit isn't a space suit, so on Mars it's up to you whether you want to set up an enclosed Oxygenated base for the hazmat suit, or just take the durability damage on your space suit.", "quests.extreme_voltage.radiation.desc.3": "Lastly, you can check your radiation poisoning at any time with the &a/medical_condition query&r command. If it gets too high, you will start taking occasional damage or just suddenly die, so you want to prevent it.\n\nThe only other way to treat it is to craft and eat &bRad Away&r pills, which will each remove 50%% of the build-up.", "quests.extreme_voltage.radiation.task": "Safety First!", @@ -3320,179 +3323,182 @@ "quests.ore_proc.gem_slurry.subtitle": "Мы... кристаллы...", "quests.ore_proc.gem_slurry.desc": "&6Дроблённые Самоцветы&r — это опциональные, но короткие линии переработки для Рубинов, Сапфиров и Зелёных Сапфиров, чтобы выжать немного больше ресурсов из них. В сравнении с электролизом:\n\n- &cДробленный Рубин&r даёт почти в 3 раза больше Алюминия и Хрома\n\n- &9Дробленный Сапфир&r даёт в 2 раза больше Алюминия\n\n- &aДробленный Зелёный Сапфир&r даёт в 2 раза больше Алюминия и немного Бериллия\n\nИ вдобавок, все они имеют небольшой шанс дать немного Титана, Железа и Ванадия!", "quests.ore_proc.gem_slurry.task": "Любой Дробленный Самоцвет", - "quests.space_survival": "Советы - Космическое выживание", - "quests.space_survival.subtitle": "Единственное место, которое не было испорчено капитализмом... Космос!", - "quests.space_survival.preparations.title": "Pre-Launch Preparations", - "quests.space_survival.preparations.subtitle": "Make sure you're ready!", - "quests.space_survival.preparations.desc": "Eager to launch into the final frontier? We totally get the enthusiasm but you can't just hurl yourself into space and hope to survive! &9Preparation&r is key to survival, or you'll just end up back in the Stone Age banging rocks together for a few seconds before suffocating to death.\n\nMake sure you have at least the following:\n- A Space Suit and a full drum of breathable gas\n- A Rocket with another full drum of spare Fuel\n- A Launch Pad so you can return\n- Plenty of food and water\n- A weapon and shield in case the Moon's haunted...", - "quests.space_survival.food.title": "Space Food", - "quests.space_survival.food.subtitle": "Long lasting food for long journeys", - "quests.space_survival.food.desc": "Consider bringing along some &dSpace Food&r for the journey ahead! It's simple to make and comes with a long shelf life. &9Freeze-Dried Fruit&r are a tasty snack, &bMeal Bags&r can hold any normal kind of food you'd have on Earth, and there's also &aCalorie Paste&r for a nutritionally complete but gross meal. You can reuse the Foil Packs when you're finished, too!", - "quests.space_survival.food.task": "Any space food", - "quests.space_survival.satellite.title": "Space Stations", - "quests.space_survival.satellite.subtitle": "For when you really want to get away from it all", - "quests.space_survival.satellite.desc": "By keeping the above items in your inventory, you'll be able to build a &9Space Station&r in orbit once you launch! There's not really much to do up there, and they're totally optional, but if you want a void dimension with no gravity for whatever reason, or just &oreally&r like sky diving, they're an option.", - "quests.space_survival.flag.title": "Flag Planter", + "quests.moon": "Луна", + "quests.moon.subtitle": "Единственное место, которое не было испорчено капитализмом... Космос!", + "quests.space_survival.preparations.title": "Предполётная подготовка", + "quests.space_survival.preparations.subtitle": "Убедитесь, что вы готовы!", + "quests.space_survival.preparations.desc": "Сгораете от нетерпения отправиться к последнему рубежу? Мы полностью понимаем ваш энтузиазм, но нельзя просто так запулить себя в космос и надеяться на выживание! &9Подготовка&r — это залог успеха, иначе вы просто окажетесь в каменном веке, стуча камнем о камень в течение нескольких секунд, прежде чем задохнуться.\n\nУбедитесь, что у вас есть как минимум следующее:\n- Скафандр и полный баллон дыхательной смеси;\n- Ракета с ещё одним полным баком запасного топлива;\n- Стартовая площадка, чтобы вы могли вернуться;\n- Достаточный запас еды и воды;\n- Оружие и щит на случай, если на Луне водятся призраки...", + "quests.space_survival.food.title": "Космическая еда", + "quests.space_survival.food.subtitle": "Еда с долгим сроком хранения для долгих путешествий", + "quests.space_survival.food.desc": "Подумайте о том, чтобы взять с собой немного &dкосмической еды&r в дорогу! Её просто готовить, и она долго хранится. &9Лиофилизированные фрукты&r — вкусный перекус, &bпакеты с едой&r могут содержать любую обычную пищу, которую вы едите на Земле, а ещё есть &aкалорийная паста&r — питательная, но довольно противная на вкус. Кстати, пустой фольгированный пакет можно использовать повторно!", + "quests.space_survival.food.task": "Любая космическая еда", + "quests.space_survival.satellite.title": "Космические станции", + "quests.space_survival.satellite.subtitle": "Для тех, кто действительно хочет сбежать от всего мира", + "quests.space_survival.satellite.desc": "Имея вышеуказанные предметы в инвентаре, вы сможете построить &9космическую станцию&r на орбите сразу после запуска! Там особо нечем заняться, и они совершенно необязательны, но если вам нужно пустотное измерение без гравитации по какой-либо причине или вы &oочень&r любите скайдайвинг, то это отличный вариант.", + "quests.space_survival.flag.title": "Флагшток", "quests.space_survival.flag.subtitle": "LunaFirmaCraft", - "quests.space_survival.flag.desc": "Introduce yourself to the Moon by planting a flag with whatever image you like on it!", - "quests.space_survival.flag.task": "Any Flag", - "quests.space_survival.chorus.title": "Chorus Fruit", - "quests.space_survival.chorus.subtitle": "Is this the End?", - "quests.space_survival.chorus.desc": "&5Chorus Fruit&r serves a pretty crucial role on the Moon - it will be your main source of Nitrogen. To get started, find some Chorus Plants, parkour up to the top, and break the &5Chorus Flowers&r. Breaking the plant from the bottom will not get you any of the Chorus Flowers! Next up, grow the Chorus Flowers in an Electric Greenhouse to get a renewable source of Chorus Fruit, and from there, you can process them into Biomass and Nitrogen with a Brewery and Fermenter respectively. You can also distill the Biomass into Carbon for more Rocket Fuel!", - "quests.space_survival.rover.title": "Space Rover", - "quests.space_survival.rover.subtitle": "Your getaway vehicle", - "quests.space_survival.rover.desc": "You had to leave your fancy jetpack at home, there's no atmosphere for airplanes, and horses can't survive, so how are you supposed to get around?\n\nThe &bRover&r is a vehicle that can hold up to two passengers, runs on combustible fuels (Diesels, Gasolines, and Rocket Fuel), and even has an inventory and radio that can play real-world radio stations!", - "quests.space_survival.solar_panels.title": "Solar Panels", - "quests.space_survival.solar_panels.subtitle": "Praise the Sun!", - "quests.space_survival.solar_panels.desc": "There are very few energy sources available on the Moon, but these &eSolar Panels&r have a lovely view of the Sun from up here!\n\nOn the moon, each Solar Panel provides the equivalent of &932 EU/t&r during the day with no fuel or upkeep needed, but they only produce an eighth of that down on the Earth's surface. Bring along a whole bunch of them!", - "quests.space_survival.stone_dust_centrifuging.title": "Helium-3", - "quests.space_survival.stone_dust_centrifuging.subtitle": "Clown gas", - "quests.space_survival.stone_dust_centrifuging.desc.1": "The Moon is full of &eHelium-3&r, another important resource, but it's stuck inside the stone! There's two ways to get your hands on some:\n\n1) If you haven't set up any stone dust centrifuging automation before, here's a quick introduction: A Rock Crusher can produce infinite raw stone, which a Macerator crushes into dust for a Centrifuge to process.\n\nHere on the Moon, Anorthosite, Norite, and Phonolite can thus be processed into an infinite source of Helium-3!", - "quests.space_survival.stone_dust_centrifuging.desc.2": "2) Pump it out of the ground with a &9Fluid Rig&r This method is simpler, but doesn't come with any useful byproducts.\n\nHelium-3 is used for several things, of which the most important is making more air to breathe via &6Heliox-3&r! You can also use it as \"fertilizer\" for Chorus Fruit in the Electric Greenhouse, and eventually as another fuel for Fusion Power.", - "quests.space_survival.stone_dust_centrifuging.task": "Any ", - "quests.space_survival.compressed_gases.title": "Compressed Breathable Gases", - "quests.space_survival.compressed_gases.subtitle": "Because pure Oxygen is deadly", - "quests.space_survival.compressed_gases.desc": "Find yourself a little short of breath? You'll need something to breathe up in space, so you'll want to look at producing any of these compressed gases, based off real-world ones used for deep sea diving!\n\nYou can fill your space suit with them the same way you'd fill up a bucket, or if you bring along a &bGas Tank&r you'll be able to \"drink\" from it to replenish your suit without taking it off.\n\n&2Nitrox&r is probably the easiest to produce on Earth, while you can set up &eHeliox-3&r on the Moon.\n\nA full space suit (2500mB) will last about &c45 minutes&r.", - "quests.space_survival.compressed_gases.task": "Any compressed breathable gas", - "quests.space_survival.zip_gun.title": "Zip Gun", - "quests.space_survival.zip_gun.subtitle": "Like a jetpack in the palm of your hand", - "quests.space_survival.zip_gun.desc": "A Zip Gun can be filled up with any of the below Compressed Gases to shoot out air, pushing you around in low gravity environments. They're essential if you want to build anything in orbit!", - "quests.space_survival.air_distributor.title": "Setting up a permanent base", - "quests.space_survival.air_distributor.subtitle": "A holiday home", - "quests.space_survival.air_distributor.desc.1": "So far you may be surviving, but do you want to truly &othrive&r? If you're wanting to set up a more permanent base, look no further than the &6Air Distributor&r! Feed it one of the compressed gases from earlier and it will \"oxygenate\" a large enclosed area, letting you take your helmet off, grow crops, and place a water source without it freezing.\n\nAny solid block will work to build your base out of, but you'll want a proper airlock to ensure the gas doesn't all escape in a &cvortex&r.", - "quests.space_survival.air_distributor.desc.2": "The oxygenated area will be at a constant 15C for any crops you'd like to grow (though the Electric Greenhouse doesn't mind), and the water source staying liquid will also let you easily electrolyze it for a source of &bOxygen&r. You can also use a Diode block to transfer power through the walls while keeping them sealed, just like in a cleanroom.", - "quests.space_survival.oxygen_info.title": "More Moon base machines", - "quests.space_survival.oxygen_info.subtitle": "Home comforts", - "quests.space_survival.oxygen_info.desc": "The Oxygen Detector is a simple machine that emits a redstone signal whenever it's in an oxygenated area.\n\nThe Vent is a solid block that can also let breathable air through without causing a vortex.\n\nThe Gravity Normalizer can change the gravity of an area within an enclosed space similar to how an Air Distributor works, but is a little too expensive at the moment.", - "quests.space_survival.railgun.title": "Interplanetary Logistics", - "quests.space_survival.railgun.subtitle": "Ender chest? Never heard of her!", - "quests.space_survival.railgun.desc.1": "&7In &bTerraFirmaGreg&r, transporting items across dimensions or over long distances requires you to build special &6multiblock structures&r.\n\nThis system is &apowerful and flexible&r, offering multiple settings that let you customize logistics to perfectly suit your needs.\n\nThis is the perfect system to transport all of your &apassively-produced&r resources to exactly where they're needed on other planets! And it comes with a powerful &dconfiguration system&r to let you control everything from a single place.", - "quests.space_survival.railgun.desc.2": "To set it up, you'll need three components:\n\n&6• Interplanetary Railgun&r — this is the &bsender&r that launches items across space.\n\n&6• Interplanetary Receiver&r — this is the &breceiver&r that catches and stores incoming items.\n\n&6• Interplanetary Logistics Monitor&r — this acts as the &9central control&r, where you define the rules and behavior of the entire transport system.\n\nWith these machines, you can automate large-scale transfers efficiently — even between planets!", - "quests.space_survival.railgun.task": "Let's dig into Interplanetary logistics", - "quests.space_survival.interplanetary_railgun.title": "Interplanetary Railgun", - "quests.space_survival.interplanetary_railgun.subtitle": "What we call the sender", - "quests.space_survival.raiinterplanetary_railgunlgun.desc.1": "&6The Interplanetary Railgun&r acts as your &bsender multiblock&r.\n\nIt’s the structure responsible for launching items toward distant &3receivers&r — but it can’t receive anything itself.", - "quests.space_survival.raiinterplanetary_railgunlgun.desc.2": "To function correctly, it requires several components:\n\n&9• Energy Hatch&r — provides the power needed to launch items. Without energy, nothing moves.\n&9• Railgun Ammo Loader&r — must be filled with ammo. One unit is consumed per launch.\n&9• Input Buses&r — you can add as many as you can fit, to insert the items you want to send.\n\n&cImportant:&r This multiblock can only &osend&r items. Make sure your &6Interplanetary Railgun&r is always chunkloaded!", - "quests.space_survival.ammo_railgun.title": "Railgun Ammo", - "quests.space_survival.ammo_railgun.subtitle": "You didn't think it would be free?", - "quests.space_survival.ammo_railgun.desc.1": "&7Each &6Interplanetary Railgun&r requires a special type of &eammo&r — think of it as a package used to transport items.\nEach launch consumes exactly &cone unit&r of ammo and can send &dthree stacks&r of items.\n\nTo load it, you’ll need a &6Railgun Ammo Loader&r as part of your structure.\nYou can insert ammo manually or automate the process.\n\n&9We strongly recommend&r setting up a passive production line to keep your loader filled continuously — this ensures a smooth and reliable logistics chain.", - "quests.space_survival.ammo_railgun.desc.2": "There are multiple recipes available to craft ammo:\n\n• Lower-tier recipes are simpler but produce fewer units.\n• Higher-tier recipes yield &amuch more ammo&r, but require more advanced resources and machines.&r\n• Specialized ammo that you can only craft on certain planets. Check the recipes.\n\nPlan your production based on your &3logistics scale&r — interplanetary trade waits for no one!", - "quests.space_survival.input_bus_railgun.title": "Railgun Input Bus", - "quests.space_survival.input_bus_railgun.subtitle": "Sender only", - "quests.space_survival.input_bus_railgun.desc.1": "&cIf you haven't read the quest about the &6Interplanetary Logistics Monitor&r &con the left of this one, make sure to check it out first — this quest builds on that knowledge.&r\n\nWhen opening the &6Sender&r logistics screen on the &dInterplanetary Logistics Monitor&r, you'll notice the familiar &9Programmed Circuit&r from GregTech.\nThis circuit number is the core identifier for setting up routing rules.\n\nThe number you assign will apply a specific rule to all Input Buses in your Railgun structure that are configured with that same circuit number.\n\nThis allows you to fine-tune what items are sent where and with which rules, based on the circuit used.", - "quests.space_survival.input_bus_railgun.desc.2": "&2How to configure it:&r\n→ Open the GUI of any &9Railgun Input Bus&r\n→ Select the number you want — just like in any other GregTech machine\n\nThis lets you create powerful logic like:\n&7• Circuit 1&r → send to Moon base\n&7• Circuit 2&r → send to Mars\n&7• Circuit 3&r → send to Orbital Station\n\nWith proper circuit setup, you can automate interplanetary trade like a true industrial tycoon!\n\n&9Note&r: You cannot send anything with the &7#tfg:cannot_launch_in_railgun&r tag.", - "quests.space_survival.input_bus_railgun.task": "Any Railgun Input Bus", - "quests.space_survival.monitor_railgun.title": "Interplanetary Logistics Monitor", - "quests.space_survival.monitor_railgun.subtitle": "Super Computer", - "quests.space_survival.monitor_railgun.desc.1": "&6The Interplanetary Logistics Monitor&r is your logistics command center — the true bread and butter of interplanetary transport.\n\nIt’s a &asingle block&r, requires &ono energy&r, and will automatically detect every &6Railgun Sender&r and &3Receiver&r you’ve built.", - "quests.space_survival.monitor_railgun.desc.2": "It may look simple, but it hides powerful tools under the hood.\nLet’s go over the basics:\n\n&9• When you open the Monitor&r, you'll see a list of all your Senders and Receivers.\nYou have to &ename each one&r.\n\n&9• To create a logistic rule:&r\n → Click the right arrow to select a Sender\n → Press &a+&r to add a new rule\n → Choose the destination Receiver from your list\n\nIf your &6Railgun&r has ammo and energy, and the &3Receiver&r has space — the shipment will launch instantly!\n\nNow that you've got the basics, let’s dive into the more advanced features in the next quests...", - "quests.space_survival.redstone_railgun.title": "Redstone Control", - "quests.space_survival.redstone_railgun.subtitle": "Redstone rules in Minecraft", - "quests.space_survival.redstone_railgun.desc": "&6The Redstone Rule&r is simple — but incredibly powerful when used well.\n\nIn the &6Sender&r rules interface, enabling this rule means that a &credstone signal&r must be present on the &9Input Bus&r for it to send items.\n\nIn the &3Receiver&r rules interface, you can configure the rule so that an &9Output Bus&r will only accept items based on the redstone signal on that specific block.\n\nTime to use your redstone logic skills!\nWhether it's with an &dAE2 Level Emitter&r, from &aCreate redstone utilities&r, or good old vanilla mechanisms — this rule lets you synchronize logistics with your factory state like a pro.", - "quests.space_survival.redstone_railgun.task": "Understood", - "quests.space_survival.robot_arm_railgun.title": "Supply Exact", - "quests.space_survival.robot_arm_railgun.subtitle": "It's a Gregtech pack you know", - "quests.space_survival.robot_arm_railgun.desc": "&6The Item Rule&r works similarly to a &9GregTech Robot Arm&r set to &eSupply Exact&r.\nIt can only be configured from the &6Sender&r rules interface.\n\nWith this rule active, the &9Railgun&r will only send the &aexact quantity&r when available in the &9Input Bus&r.\n\n&2How to set it up:&r\n→ Drag items into the filter from your &dEMI&r interface\n→ Use &aleft and right clicks&r to adjust the quantity\n→ You can also bookmark items for quick access and configuration\n\nThis rule is perfect for precise automation — ideal for batch crafting or resource quotas.", - "quests.space_survival.robot_arm_railgun.task": "Understood", - "quests.space_survival.delay_railgun.title": "Delay", - "quests.space_survival.delay_railgun.subtitle": "Sometime you just want to wait", - "quests.space_survival.delay_railgun.desc": "&6The Delay Rule&r is simple, but useful for managing item flow timing.\n\n&2On the Sender side:&r\nItems will only be sent after the &9Input Bus&r hasn't received any new item for a set amount of time (in seconds).\nThis helps avoid sending items too frequently when inputs are constantly changing.\n\n&2On the Receiver side:&r\nThe rule defines a delay before an &9Output Bus&r can receive another batch of items.\nThis can be useful to prevent overflow or to pace item insertion into slower systems.\n\nIdeal for syncing with machines that need breathing room between operations, or to prevent unnecessary waste of ammo.", - "quests.space_survival.delay_railgun.task": "Understood", - "quests.space_survival.receiver_railgun.title": "Interplanetary Receiver", - "quests.space_survival.receiver_railgun.subtitle": "The Receiver", - "quests.space_survival.receiver_railgun.desc.1": "&6The Interplanetary Receiver&r, as its name suggests, is designed to &3receive items&r sent by the Railgun.\n\nIt’s a &asmall and simple multiblock&r that requires no energy or maintenance — just build it and you're ready to go!", - "quests.space_survival.receiver_railgun.desc.2": "Its flexibility lies in the number of &9Output Buses&r you can attach.\nThe more you add, the more items it can handle simultaneously.\n\n&2Setup is easy:&r\n• Build the structure\n• Add as many Output Buses as you need\n• Done — it’s ready to receive!\n\nNo fuel, no maintenance — just pure logistics power.\nMake sure it’s properly chunkloaded, and let the items rain in!", - "quests.space_survival.output_bus_railgun.title": "Railgun Output Bus", - "quests.space_survival.output_bus_railgun.subtitle": "Receiver only", - "quests.space_survival.output_bus_railgun.desc.1": "&cIf you haven't read the quest about the &6Railgun Input Bus&r &cabove this one, make sure to check it out first — this quest builds on that knowledge.&r\n\nJust like how your &6Railgun Input Buses&r can be assigned a &9circuit number&r, you can do the same with the &3Output Buses&r on your &3Receiver&r.", - "quests.space_survival.output_bus_railgun.desc.2": "This feature serves two main purposes:&r\n\n&9• Direct item flow&r —\nYou can control which Output Bus receives items.\nTo do this, simply assign a circuit number to the Output Bus,\nthen select that number in your Sender’s rule via the &6Logistics Monitor&r.\n\n&9• Conditional rules&r —\nYou can also set rules to &cstop sending items&r if the circuit rule isn’t respected.\nThis is done not from the Sender tab, but by opening the &3Receiver&r tab in the Monitor.\nFor each circuit number, you can assign a rule that applies only to Output Buses using that number.", - "quests.space_survival.output_bus_railgun.desc.3": "To learn more about the available rule types, make sure to check the &7three quests above this one&r.\n\nThey go over each rule in detail and explain how to use them effectively.", - "quests.space_survival.output_bus_railgun.task": "Any Railgun Output Bus", - "quests.space_survival.soulbound.title": "Extraterrestrial Death", - "quests.space_survival.soulbound.subtitle": "You're a long way from spawn", - "quests.space_survival.soulbound.desc.1": "In TerraFirmaGreg, you can set your spawn on any dimension (even The Beneath!), but unless you've got a bunch of extra space suits lying around, respawning on the Moon might complicate things.\n\nFirst of all, you'll definitely want your bed to be inside an oxygenated area, so you don't immediately die as soon as you respawn (though in case of a blackout, you should have enough time to break your bed and reset your spawn).", - "quests.space_survival.soulbound.desc.2": "Secondly, you can upgrade each piece of your Space Suit with a &bSoul Pearl&r. This will make them stay equipped when you die!\n\nYou can get these from any of the tougher, hostile Endermen on the Moon.\n\nWe promise it's sci-fi and not magic.", - "quests.space_survival.mars_desert.title": "The Martian Desert", - "quests.space_survival.mars_desert.subtitle": "Sand, sand everywhere", - "quests.space_survival.mars_desert.desc": "The majority of Mars is covered in a vast desert. Not much lives here except the occasional Stackatick, and of course the giant &6Sandworms&r. If this is your first time here, you'll want to find somewhere more hospitable! Otherwise, you'll want to keep searching...", - "quests.space_survival.mars_desert.task": "Visit the Martian Deep Desert biome", - "quests.space_survival.sandworm.title": "The Sandworm", - "quests.space_survival.sandworm.subtitle": "SHAI-HULUD", - "quests.space_survival.sandworm.desc": "If you make too much noise in the desert, you might attract the attention of the mighty &6Sandworm&r! It's more of an environmental hazard than a boss to kill, so your best way of surviving it is to run away!\n\nIf you manage to hit its head enough times with &bexplosion damage&r, it will leave you alone... for a while.\n\nThankfully, the Sandworm can only damage entities, not buildings, and is only attracted to the &6footsteps of players&r, so any way to keep &byour own feet&r off the ground won't anger it. The atmosphere is too thin for airplanes and hang gliders, but there are other tools...", - "quests.space_survival.spice.title": "Ostrum Deposits", - "quests.space_survival.spice.subtitle": "Spice Melange", - "quests.space_survival.spice.desc": "&dOstrum Deposits&r are immovable blocks that you can only find in the Martian Deep Desert, far away from any of the more lush areas. They spawn in small blobs, and can be broken to make space for your Ostrum Harvester if they're on a slope. Try using a &6Spyglass&r to find them from a distance!\n\nYou'll have to figure out some long-distance logistics to ship your Ostrum back to your base. (Try a train!)\n\nOstrum is a crucial resource for both &5EV&r progression and making infinite ores from Mars.", - "quests.space_survival.spice.task": "The spice must flow", - "quests.space_survival.mars_islands.title": "The Martian Jungles", - "quests.space_survival.mars_islands.subtitle": "Is that a dinosaur?!", - "quests.space_survival.mars_islands.desc": "Dotted around the vast Martian deserts are small \"islands\" of life and vegetation, which are probably where you'll want to set up your base. Surviving here will be much easier than in the desert!", - "quests.space_survival.semiheavy_ammoniacal_water.title": "Semiheavy Ammoniacal Water", - "quests.space_survival.semiheavy_ammoniacal_water.subtitle": "Fancy a drink?", - "quests.space_survival.semiheavy_ammoniacal_water.desc": "The water on Mars is &bSemiheavy&r which means it contains one Deuterium atom, and is also full of &aAmmonia&r, a great antifreeze, which is how it can stay liquid despite the very low temperatures.\n\nIt's technically drinkable, but you'll likely want to distill it into normal Water first. You can also move source blocks of Semiheavy Ammoniacal Water around and get more of it via an Aqueous Accumulator, just like regular Water.\n\nYou can also centrifuge the Ammonium Chloride out from it and electrolyze it as a source of &3Nitrogen&r. Easy Nitrox from just one source!", - "quests.space_survival.heavy_ammoniacal_water.title": "Heavy Ammoniacal Water", - "quests.space_survival.heavy_ammoniacal_water.subtitle": "The Cooler Ammoniacal Water", - "quests.space_survival.heavy_ammoniacal_water.desc": "&2Heavy Ammoniacal Water&r is another kind of fluid that can only be found deep underground via a Fluid Drilling Rig. You can only find it in these lush areas of Mars, not the desert!\n\nYou can separate it into Heavy Water, which is important for Fission power.", - "quests.space_survival.mars_poles.title": "The Martian Poles", - "quests.space_survival.mars_poles.subtitle": "Cold enough for CO₂ to freeze!", - "quests.space_survival.mars_poles.desc": "Is Mars not cold enough for you?\n\nHead up (or down) towards one of its poles at Z=+15000/-5000. If anything's able to live there, surely it must have amazing insulative properties...", - "quests.space_survival.glacian_ram.title": "Glacian Sheep", - "quests.space_survival.glacian_ram.subtitle": "Life at -110 C", - "quests.space_survival.glacian_ram.desc": "&dGlacian Rams&r and &dEwes&r can only be found on the Martian poles. You might want to bring a breeding couple back to your base.\n\nGot a long journey? Consider using an AE2 Spatial Storage Cell to carry them around in your pocket.", - "quests.space_survival.glacian_ram.task": "Find a Glacian Ram or Ewe", - "quests.space_survival.glacian_wool.title": "Glacian Wool", - "quests.space_survival.glacian_wool.subtitle": "What an incredible insulator!", - "quests.space_survival.glacian_wool.desc": "Unlike regular Sheep on Earth, killing a Glacian one will only give you normal Wool. You'll need to build up their familiarity and shear them if you want the special &dGlacian Wool&r.\n\nYou'll need 7 of it for a full Tungstensteel Space Suit, but you can also use it as a great component for your Fission Reactor to increase its maximum heat.\n\nYou can also turn it into regular Wool Yarn and Cloth if you want more of that for some reason.", - "quests.space_survival.t2_space_suit.title": "Tungstensteel Space Suit", - "quests.space_survival.t2_space_suit.subtitle": "Extremophilia!", - "quests.space_survival.t2_space_suit.desc": "With this next space suit, you'll be able to survive both the &bcoldest&r and the &chottest&r environments that space can throw at you! It's required to stop you from immediately combusting as soon as you set foot on &6Venus&r and &5Mercury&r.\n\nAs a bonus, it also comes with some extra armor and air capacity!", - "quests.space_survival.mars_tapping.title": "Crimsene and Warpane", - "quests.space_survival.mars_tapping.subtitle": "You LOVE tree tapping!", - "quests.space_survival.mars_tapping.desc": "Crimson and Warped Mushrooms can be tree tapped for &4Crimsene&r and &3Warpane&r respectively.\n\nYou'll need both to get started on producing &9Iodine&r, but they don't often grow in the same place, so you might need to travel a bit. Crimson Mushrooms grow more on the East side of Mars, while Warped grow more on the West. You can also obtain the saplings from the corresponding Endermen.\n\nDon't forget that you can tap directly into open GregTech fluid pipes!\n\n&9Tip:&r Want to show off? You can also build a canoe out of Crimson Stems, and build a Rowboat or Sloop out of Warped ones!", - "quests.space_survival.iodine.title": "The Iodine Line", - "quests.space_survival.iodine.subtitle": "Mushroom chemistry!", - "quests.space_survival.iodine.desc": "Mix together the Crimsene and Warpane, along with some Krypton from Mars Air Distillation (it's looped) and the heat from your Fission Reactor, and you'll get Iodine!\n\nThis process is slow, but you shouldn't need a lot of it for now, and there will be better methods of obtaining Iodine on further planets.", - "quests.space_survival.mars_crops.title": "Martian Crops", - "quests.space_survival.mars_crops.subtitle": "They give HOW much nutrition?!", - "quests.space_survival.mars_crops.desc": "Mars is home to six new crops - three &afruit&r, two &2vegetable&r, and one &6grain&r. They're packed full of nutrients and can be used to prepare similar food to those on Earth, such as sandwiches, soups, and meal bags.\n\nA few of them are toxic if eaten raw, however, so be sure to cook it first!\n\nCheck the Field Guide for full details on how to grow each one. You can grow them in the dirt, in a Firmalife Greenhouse, or in an Electric Greenhouse.", - "quests.space_survival.mars_crops.task": "Any Martian Seed", - "quests.space_survival.bulbkin_pie.title": "Mars Cuisine", - "quests.space_survival.bulbkin_pie.subtitle": "Even more culinary atrocities at your disposal", - "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.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.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.", - "quests.space_survival.sniffer_or_wraptor.task_1": "Find a Sniffer", - "quests.space_survival.sniffer_or_wraptor.task_2": "Find a Wraptor", - "quests.space_survival.mars_nest.title": "Large Thatch Nest", - "quests.space_survival.mars_nest.subtitle": "A big nest for big eggs", - "quests.space_survival.mars_nest.desc": "You remember how to gather thatch, right?\n\nWarped and Crimson Thatch can be gathered from various small plants, as well as any Warped and Crimson Lamella you happen to find.\n\nJust like birds on Earth, Sniffers and Wraptors require nests to lay their eggs. Only, y'know, much bigger.", - "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.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.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.", - "quests.space_survival.mras_shields.task": "Any Advanced Shield", - "quests.space_survival.mercury.title": "I'm on &5Mercury&r...?", - "quests.space_survival.mercury.subtitle": "Wait, what happened here?!", - "quests.space_survival.mercury.desc": "&5Mercury&r will be a secondary planet for the upcoming &1IV&r rework in TFG 0.12. Stay tuned!", - "quests.space_survival.mercury.task": "Land on Mercury", - "quests.space_survival.venus.title": "I'm on &6Venus&r!", - "quests.space_survival.venus.subtitle": "Cloudy with a chance of sulfuric acid rain", - "quests.space_survival.venus.desc": "&6Venus&r will be the primary planet for the upcoming &1IV&r rework in TFG 0.12. Stay tuned!", - "quests.space_survival.venus.task": "Land on Venus", + "quests.space_survival.flag.desc": "Заявите о себе на Луне, установив флаг с любым изображением, которое вам нравится!", + "quests.space_survival.flag.task": "Любой флаг", + "quests.space_survival.chorus.title": "Плод хоруса", + "quests.space_survival.chorus.subtitle": "Это Энд?", + "quests.space_survival.chorus.desc": "&5Плод хоруса&r играет довольно важную роль на Луне — он станет вашим основным источником азота. Для начала найдите растения хоруса, заберитесь наверх и сломайте &5хорусовый цветок&r. Если сломать растение снизу, вы не получите цветков! Затем вырастите их в электротеплице для бесконечного получения плодов, после чего их можно переработать в биомассу и азот с помощью варочной машины и ферменатора соответственно. Биомассу также можно перегнать в углерод для получения ракетного топлива!", + "quests.space_survival.rover.title": "Вездеход", + "quests.space_survival.rover.subtitle": "Ваше средство передвижения", + "quests.space_survival.rover.desc": "Вам пришлось оставить свой модный джетпак дома, для самолётов здесь нет атмосферы, а лошади не выживут. Так как же вам передвигаться?\n\n&bВездеход&r — это транспортное средство, вмещающее до двух пассажиров, работающее на топливе (дизель, бензин или ракетное топливо), имеющее собственный инвентарь и даже радио, которое может ловить реальные радиостанции!", + "quests.space_survival.solar_panels.title": "Солнечные панели", + "quests.space_survival.solar_panels.subtitle": "Вославь Солнце!", + "quests.space_survival.solar_panels.desc": "На Луне очень мало источников энергии, но зато с этих &eсолнечных панелей&r открывается прекрасный вид на Солнце!\n\nЗдесь каждая панель вырабатывает эквивалент &932 EU/t&r днём без затрат топлива и обслуживания, тогда как на поверхности Земли они производят лишь восьмую часть от этого. Берите с собой побольше!", + "quests.space_survival.solar_panels.task": "Любой преобразователь FE в EU", + "quests.space_survival.stone_dust_centrifuging.title": "Гелий-3", + "quests.space_survival.stone_dust_centrifuging.subtitle": "Веселящий газ", + "quests.space_survival.stone_dust_centrifuging.desc.1": "Луна полна &eгелия-3&r, ещё одного важного ресурса, но он заперт внутри камня! Есть два способа его получить:\n\n1) Если вы раньше не настраивали автоматизацию центрифугирования каменной пыли, вот краткое введение: камнелом производит бесконечный булыжник, измельчитель дробит его в пыль, а центрифуга перерабатывает её.\n\nЗдесь, на Луне, анортозит, норит и фонолит можно переработать в бесконечный источник гелия-3!", + "quests.space_survival.stone_dust_centrifuging.desc.2": "2) Выкачивайте его из-под земли с помощью &9жидкостной буровой установки&r. Этот метод проще, но вы не получите полезных побочных продуктов.\n\nГелий-3 используется для нескольких вещей, самой важной из которых является создание дыхательной смеси через &6Гелиокс-3&r! Также его можно использовать как «удобрение» для хоруса в электротеплице, а в будущем — как топливо для термоядерного синтеза.", + "quests.space_survival.stone_dust_centrifuging.task": "Любой способ", + "quests.space_survival.compressed_gases.title": "Сжатые дыхательные газы", + "quests.space_survival.compressed_gases.subtitle": "Потому что чистый кислород смертелен", + "quests.space_survival.compressed_gases.desc": "Чувствуете одышку? В космосе нужно чем-то дышать, так что вам стоит заняться производством этих сжатых газов, основанных на реальных смесях для глубоководных погружений!\n\nВы можете заправить скафандр так же, как наполняете ведро, или, если возьмете с собой &bгазовый баллон&r, сможете «пить» из него, пополняя запас костюма, не снимая его.\n\n&2Нитрокс&r, вероятно, проще всего производить на Земле, в то время как &eГелиокс-3&r можно наладить на Луне.\n\nПолного скафандра (2500 мБ) хватит примерно на &c45 минут&r.", + "quests.space_survival.compressed_gases.task": "Любой сжатый дыхательный газ", + "quests.space_survival.zip_gun.title": "Воздушный пистолет", + "quests.space_survival.zip_gun.subtitle": "Джетпак на ладони", + "quests.space_survival.zip_gun.desc": "Воздушный пистолет можно заправить любым из указанных выше сжатых газов, чтобы выстреливать воздухом, толкая вас в условиях низкой гравитации. Они незаменимы, если вы планируете строить что-то на орбите!", + "quests.space_survival.air_distributor.title": "Обустройство постоянной базы", + "quests.space_survival.air_distributor.subtitle": "Дом для отпуска", + "quests.space_survival.air_distributor.desc.1": "До сих пор вы просто выживали, но не хотите ли вы по-настоящему &oпроцветать&r? Если вы планируете построить постоянную базу, вам не обойтись без &6системы подачи искусственного воздуха&r! Подайте в него один из сжатых газов, и он наполнит кислородом большую закрытую область, позволяя вам снимать шлем, выращивать урожай и ставить воду, не боясь, что она замёрзнет.\n\nДля постройки базы подойдет любой твёрдый блок, но вам понадобится настоящий шлюз, чтобы газ не улетел в космический &cвихрь&r.", + "quests.space_survival.air_distributor.desc.2": "В зоне с кислородом будет поддерживаться постоянная температура 15°C для ваших растений (хотя электротеплице на это плевать), а жидкая вода позволит легко проводить электролиз для получения &bкислорода&r. Также можно использовать диод для передачи энергии через стены, сохраняя их герметичность, как в чистой комнате.", + "quests.space_survival.oxygen_info.title": "Больше механизмов лунной базы", + "quests.space_survival.oxygen_info.subtitle": "Домашний уют", + "quests.space_survival.oxygen_info.desc": "Детектор кислорода — это простой прибор, который подает сигнал редстоуна, когда находится в зоне с воздухом.\n\nВентиляция — это твёрдый блок, который пропускает дыхательную смесь, не вызывая вихря.\n\nГенератор гравитации может изменять гравитацию в закрытом помещении аналогично системе подачи искусственного воздуха, но на данный момент он слишком дорог.", + "quests.space_survival.railgun.title": "Межпланетная логистика", + "quests.space_survival.railgun.subtitle": "Эндер-сундук? Не слышал о таком!", + "quests.space_survival.railgun.desc.1": "&7В &bTerraFirmaGreg&r для транспортировки предметов между измерениями или на большие расстояния требуется строить специальные &6многоблочные структуры&r.\n\nЭта система &aмощная и гибкая&r, предлагающая множество настроек для адаптации логистики под ваши нужды.\n\nЭто идеальный способ доставлять все ваши &aпассивно производимые&r ресурсы именно туда, где они нужны на других планетах! К тому же, здесь есть продвинутая &dсистема конфигурации&r, позволяющая управлять всем из одного места.", + "quests.space_survival.railgun.desc.2": "Для настройки вам понадобятся три компонента:\n\n&6• Межпланетный рельсотрон&r — это &bотправитель&r, который запускает предметы через космос.\n\n&6• Межпланетный приёмник&r — это &bприёмник&r, который ловит и хранит входящие грузы.\n\n&6• Межпланетный логистический монитор&r — это &9центр управления&r, где вы определяете правила и поведение всей транспортной системы.\n\nС этими машинами вы сможете эффективно автоматизировать крупномасштабные перевозки — даже между планетами!", + "quests.space_survival.railgun.task": "Изучим межпланетную логистику", + "quests.space_survival.interplanetary_railgun.title": "Межпланетный рельсотрон", + "quests.space_survival.interplanetary_railgun.subtitle": "То, что мы называем отправителем", + "quests.space_survival.raiinterplanetary_railgunlgun.desc.1": "&6Межпланетный рельсотрон&r служит вашим &bмногоблоком-отправителем&r.\n\nЭто структура, отвечающая за запуск предметов к далёким &3приёмникам&r, но сам он ничего принимать не может.", + "quests.space_survival.raiinterplanetary_railgunlgun.desc.2": "Для работы ему требуются несколько компонентов:\n\n&9• Энергетический входной разъём&r — обеспечивает питание для запуска. Без энергии ничего не сдвинется.\n&9• Загрузчик патронов рельсотрона&r — должен быть заполнен снарядами. Один снаряд тратится на один запуск.\n&9• Предметный входной люк&r — вы можете добавить столько, сколько влезет, чтобы вставлять предметы для отправки.\n\n&cВажно:&r Этот многоблок может только &oотправлять&r. Убедитесь, что чанк с вашим &6рельсотроном&r всегда прогружен!", + "quests.space_survival.ammo_railgun.title": "Снаряды для рельсотрона", + "quests.space_survival.ammo_railgun.subtitle": "Вы же не думали, что это будет бесплатно?", + "quests.space_survival.ammo_railgun.desc.1": "&7Каждому &6межпланетному рельсотрону&r требуются специальные &eснаряды&r — считайте это контейнером для перевозки.\nКаждый запуск потребляет ровно &cодну единицу&r боеприпасов и может отправить &dтри стака&r предметов.\n\nДля заправки вам понадобится &6загрузчик патронов рельсотрона&r в составе структуры.\nСнаряды можно вставлять вручную или автоматизировать процесс.\n\n&9Мы настоятельно рекомендуем&r настроить линию пассивного производства, чтобы ваш загрузчик всегда был полон — это обеспечит бесперебойную работу логистики.", + "quests.space_survival.ammo_railgun.desc.2": "Существует несколько рецептов создания снарядов:\n\n• Низкоуровневые рецепты проще, но дают мало единиц.\n• Высокоуровневые рецепты дают &aгораздо больше снарядов&r, но требуют продвинутых ресурсов и машин.&r\n• Специализированные снаряды можно скрафтить только на определенных планетах. Проверьте рецепты.\n\nПланируйте производство исходя из &3масштабов вашей логистики&r — межпланетная торговля не ждет!", + "quests.space_survival.input_bus_railgun.title": "Входной люк рельсотрона", + "quests.space_survival.input_bus_railgun.subtitle": "Только для отправки", + "quests.space_survival.input_bus_railgun.desc.1": "&cЕсли вы ещё не читали квест про &6межпланетный логистический монитор&r &cслева от этого, обязательно ознакомьтесь с ним сначала — этот квест опирается на те знания.&r\n\nПри открытии экрана логистики &dотправителя&r на &dмониторе&r вы заметите знакомую &9интегральную схему&r из GregTech.\nНомер этой схемы является основным идентификатором для настройки правил маршрутизации.\n\nНазначенный номер применит конкретное правило ко всем входным люкам вашего рельсотрона, которые настроены на тот же номер схемы.\n\nЭто позволяет тонко настраивать, какие предметы куда отправляются и по каким правилам.", + "quests.space_survival.input_bus_railgun.desc.2": "&2Как настроить:&r\n→ Откройте интерфейс любого &9входного люка рельсотрона&r\n→ Выберите нужный номер — точно так же, как в любой другой машине GregTech\n\nЭто позволяет создавать мощную логику, например:\n&7• Схема 1&r → отправка на лунную базу\n&7• Схема 2&r → отправка на Марс\n&7• Схема 3&r → отправка на орбитальную станцию\n\nС правильной настройкой схем вы сможете автоматизировать межпланетную торговлю как настоящий промышленный магнат!\n\n&9Примечание&r: Вы не можете отправить ничего с тегом &7#tfg:cannot_launch_in_railgun&r.", + "quests.space_survival.input_bus_railgun.task": "Любой входной люк межпланетного рельсотрона", + "quests.space_survival.monitor_railgun.title": "Межпланетный логистический монитор", + "quests.space_survival.monitor_railgun.subtitle": "Суперкомпьютер", + "quests.space_survival.monitor_railgun.desc.1": "&6Межпланетный логистический монитор&r — это ваш командный центр, основа основ межпланетных перевозок.\n\nЭто &aодиночный блок&r, который &oне требует энергии&r и автоматически обнаруживает каждый построенный вами &6отправитель&r и &3приёмник&r.", + "quests.space_survival.monitor_railgun.desc.2": "Он может выглядеть просто, но внутри скрыты мощные инструменты.\nДавайте разберем основы:\n\n&9• Открыв монитор&r, вы увидите список всех ваших отправителей и приёмников. Вы должны &eдать имя каждому из них&r.\n\n&9• Чтобы создать правило логистики:&r\n → Нажмите на стрелку вправо, чтобы выбрать отправитель\n → Нажмите &a+&r для добавления нового правила\n → Выберите приёмник назначения из вашего списка\n\nЕсли у вашего &6рельсотрона&r есть снаряды и энергия, а в &3приёмнике&r есть место — груз будет запущен мгновенно!\n\nТеперь, когда вы освоили основы, давайте перейдем к более продвинутым функциям в следующих квестах...", + "quests.space_survival.redstone_railgun.title": "Управление редстоуном", + "quests.space_survival.redstone_railgun.subtitle": "Редстоун правит миром Minecraft", + "quests.space_survival.redstone_railgun.desc": "&6Правило редстоуна&r простое, но невероятно мощное при правильном использовании.\n\nВ интерфейсе правил &6отправителя&r включение этого правила означает, что на &9входном люке&r должен присутствовать &cсигнал редстоуна&r для отправки предметов.\n\nВ интерфейсе правил &3приёмника&r вы можете настроить правило так, что &3выходной люк&r будет принимать предметы только при наличии сигнала редстоуна на этом конкретном блоке.\n\nВремя применить ваши навыки инженера! Будь то &dизлучатель уровней AE2&r, механизмы из &aCreate&r или старая добрая ванильная логика — это правило позволит вам синхронизировать логистику с состоянием вашей фабрики.", + "quests.space_survival.redstone_railgun.task": "Понятно", + "quests.space_survival.robot_arm_railgun.title": "Точная поставка", + "quests.space_survival.robot_arm_railgun.subtitle": "Это же GregTech, вы же знаете", + "quests.space_survival.robot_arm_railgun.desc": "&6Правило предметов&r работает аналогично &9роботизированному манипулятору GregTech&r в режиме &eточной поставки (Supply Exact)&r.\nОно настраивается только в интерфейсе &6отправителя&r.\n\nПри активном правиле &9рельсотрон&r отправит предметы только тогда, когда во &9входном люке&r наберется &aточное количество&r.\n\n&2Как настроить:&r\n→ Перетащите предметы в фильтр из интерфейса &dEMI&r\n→ Используйте &aлевый и правый клик&r для настройки количества\n→ Вы также можете добавлять предметы в закладки для быстрого доступа\n\nЭто правило идеально подходит для точной автоматизации — например, для крафта порциями или соблюдения квот ресурсов.", + "quests.space_survival.robot_arm_railgun.task": "Понятно", + "quests.space_survival.delay_railgun.title": "Задержка", + "quests.space_survival.delay_railgun.subtitle": "Иногда нужно просто подождать", + "quests.space_survival.delay_railgun.desc": "&6Правило задержки&r простое, но полезное для управления временем потока предметов.\n\n&2На стороне отправителя:&r\nПредметы будут отправлены только после того, как &9входной люк&r не получал новых предметов в течение заданного времени (в секундах).\nЭто помогает избежать слишком частых запусков при постоянном изменении входа.\n\n&2На стороне приёмника:&r\nПравило определяет задержку перед тем, как &9выходной люк&r сможет принять следующую партию.\nПолезно для предотвращения переполнения или для замедления подачи предметов в медленные системы.\n\nИдеально для синхронизации с машинами, которым нужна передышка между операциями, или для экономии снарядов.", + "quests.space_survival.delay_railgun.task": "Понятно", + "quests.space_survival.receiver_railgun.title": "Межпланетный приёмник", + "quests.space_survival.receiver_railgun.subtitle": "Тот, кто принимает", + "quests.space_survival.receiver_railgun.desc.1": "&6Межпланетный приёмник&r, как следует из названия, предназначен для &3приёма предметов&r, отправленных рельсотроном.\n\nЭто &aнебольшой и простой многоблок&r, не требующий энергии или обслуживания — просто постройте его, и он готов к работе!", + "quests.space_survival.receiver_railgun.desc.2": "Его гибкость заключается в количестве &9выходных люков&r, которые вы можете подключить.\nЧем их больше, тем больше предметов он сможет обрабатывать одновременно.\n\n&2Настройка проста:&r\n• Постройте структуру;\n• Добавьте столько выходных люков, сколько нужно;\n• Готово — он готов к приёму!\n\nНикакого топлива, никакого обслуживания — только мощь логистики. Убедитесь, что он прогружен, и пусть ресурсы сыплются дождем!", + "quests.space_survival.output_bus_railgun.title": "Выходной люк рельсотрона", + "quests.space_survival.output_bus_railgun.subtitle": "Только для приёма", + "quests.space_survival.output_bus_railgun.desc.1": "&cЕсли вы ещё не читали квест про &6входной люк рельсотрона&r &cвыше, обязательно ознакомьтесь сначала с ним — этот квест дополняет его.&r\n\nТочно так же, как вашим &6входным люкам&r можно назначить &9номер схемы&r, вы можете сделать то же самое с &3выходными люками&r на вашем &3приёмнике&r.", + "quests.space_survival.output_bus_railgun.desc.2": "Эта функция служит двум основным целям:&r\n\n&9• Прямое распределение потока&r — вы можете контролировать, какой именно люк получает предметы. Просто назначьте номер схемы люку и выберите этот номер в правиле отправителя через &6логистический монитор&r.\n\n&9• Условные правила&r — вы также можете установить правила для &cостановки отправки предметов&r, если правило схемы не соблюдается. Это делается не во вкладке отправителя, а во вкладке &3приёмника&r в мониторе. Для каждого номера схемы можно назначить правило, которое будет применяться только к люкам с этим номером.", + "quests.space_survival.output_bus_railgun.desc.3": "Чтобы узнать больше о доступных типах правил, обязательно изучите &7три квеста выше&r. В них подробно разбирается каждое правило и способы их эффективного использования.", + "quests.space_survival.output_bus_railgun.task": "Любой выходной люк межпланетного рельсотрона", + "quests.space_survival.soulbound.title": "Внеземная смерть", + "quests.space_survival.soulbound.subtitle": "Вы далеко от спавна", + "quests.space_survival.soulbound.desc.1": "В TerraFirmaGreg вы можете установить точку возрождения в любом измерении (даже в Бездне!), но если у вас нет кучи запасных скафандров, возрождение на Луне может всё усложнить.\n\nПрежде всего, вам определенно стоит поставить кровать в зоне с кислородом, чтобы не умереть сразу после возрождения (хотя в случае отключения энергии у вас должно быть достаточно времени, чтобы сломать кровать и сбросить спавн).", + "quests.space_survival.soulbound.desc.2": "Во-вторых, вы можете улучшить каждую часть своего скафандра с помощью &bжемчуга душ&r. Это позволит им оставаться на вас после смерти!\n\nИх можно выбить из более сильных и враждебных эндерменов на Луне.\n\nМы обещаем, это научная фантастика, а не магия.", + "quests.mars": "Выживание на Марсе", + "quests.mars.subtitle": "Зыбучие пески ждут", + "quests.space_survival.mars_desert.title": "Марсианская пустыня", + "quests.space_survival.mars_desert.subtitle": "Песок, повсюду песок", + "quests.space_survival.mars_desert.desc": "Большая часть Марса покрыта бескрайней пустыней. Здесь мало кто живет, кроме редких жуков-перевозчиков и, конечно же, гигантских &6песчаных червей&r. Если вы здесь впервые, лучше поискать более гостеприимное место! Иначе вам придется продолжить поиски...", + "quests.space_survival.mars_desert.task": "Посетите биом глубокой марсианской пустыни", + "quests.space_survival.sandworm.title": "Песчаный червь", + "quests.space_survival.sandworm.subtitle": "ШАЙ-ХУЛУД", + "quests.space_survival.sandworm.desc": "Если вы будете слишком сильно шуметь в пустыне, то можете привлечь внимание могучего &6песчаного червя&r! Это скорее стихийное бедствие, чем босс, которого нужно убить, так что лучший способ выжить — просто бежать!\n\nЕсли вам удастся достаточное количество раз попасть ему в голову &bвзрывным уроном&r, он оставит вас в покое... на какое-то время.\n\nК счастью, червь наносит урон только сущностям, а не постройкам, и его привлекают только &6шаги игроков&r. Так что любой способ не касаться &bногами&r земли не разозлит его. Атмосфера слишком разрежена для самолётов и дельтапланов, но есть другие инструменты...", + "quests.space_survival.spice.title": "Залежи острума", + "quests.space_survival.spice.subtitle": "Пряность Меланж", + "quests.space_survival.spice.desc": "&dЗалежи острума&r — это неподвижные блоки, которые можно найти только в глубокой марсианской пустыне, вдали от цветущих зон. Они спавнятся небольшими скоплениями; их можно сломать, если они мешают установке сборщика острума. Попробуйте использовать &6подзорную трубу&r, чтобы найти их издалека!\n\nВам придется продумать логистику, чтобы доставлять острум на базу. (Попробуйте поезд!)\n\nОструм — важнейший ресурс как для развития в &5тире EV&r, так и для создания бесконечных руд из Марса.", + "quests.space_survival.spice.task": "Пряность должна течь", + "quests.space_survival.mars_islands.title": "Марсианские джунгли", + "quests.space_survival.mars_islands.subtitle": "Это что, динозавр?!", + "quests.space_survival.mars_islands.desc": "Среди бескрайних марсианских пустынь разбросаны небольшие «островки» жизни и растительности — именно там вам, скорее всего, захочется обустроить базу. Выжить здесь будет гораздо проще, чем в пустыне!", + "quests.space_survival.semiheavy_ammoniacal_water.title": "Полутяжёлая аммиачная вода", + "quests.space_survival.semiheavy_ammoniacal_water.subtitle": "Хотите глоточек?", + "quests.space_survival.semiheavy_ammoniacal_water.desc": "Вода на Марсе &bполутяжёлая&r, что означает содержание в ней одного атома дейтерия, а также она полна &aаммиака&r — отличного антифриза, благодаря которому она остается жидкой даже при очень низких температурах.\n\nТехнически она пригодна для питья, но вы наверняка захотите сначала перегнать её в обычную воду. Источники полутяжелой воды можно переносить и размножать с помощью жидкосного коллектора, как и обычную воду.\n\nТакже из неё можно центрифугировать хлорид аммония и электролизовать его для получения &3азота&r. Простой способ получить нитрокс из одного источника!", + "quests.space_survival.heavy_ammoniacal_water.title": "Тяжёлая аммиачная вода", + "quests.space_survival.heavy_ammoniacal_water.subtitle": "Более крутая аммиачная вода", + "quests.space_survival.heavy_ammoniacal_water.desc": "&2Тяжёлая аммиачная вода&r — ещё один вид жидкости, который можно найти только глубоко под землей с помощью буровой установки. Её можно найти только в цветущих зонах Марса, не в пустыне!\n\nЕё можно разделить на тяжёлую воду, которая важна для ядерной энергетики.", + "quests.space_survival.mars_poles.title": "Полюса Марса", + "quests.space_survival.mars_poles.subtitle": "Достаточно холодно, чтобы CO₂ замёрз!", + "quests.space_survival.mars_poles.desc": "Марс кажется вам недостаточно холодным?\n\nОтправляйтесь к одному из его полюсов по координатам Z=+15000/-5000. Если там что-то и способно выжить, то оно наверняка обладает потрясающими изоляционными свойствами...", + "quests.space_survival.glacian_ram.title": "Гласианская овца", + "quests.space_survival.glacian_ram.subtitle": "Жизнь при -110°C", + "quests.space_survival.glacian_ram.desc": "&dГласианские бараны&r и &dовцы&r обитают только на марсианских полюсах. Возможно, вы захотите привезти племенную пару на свою базу.\n\nПредстоит долгий путь? Воспользуйтесь пространственной ячейкой хранения AE2, чтобы носить их прямо в кармане.", + "quests.space_survival.glacian_ram.task": "Найдите гласианского барана или овцу", + "quests.space_survival.glacian_wool.title": "Гласианская шерсть", + "quests.space_survival.glacian_wool.subtitle": "Невероятный изолятор!", + "quests.space_survival.glacian_wool.desc": "В отличие от обычных овец на Земле, убийство гласианской овцы даст вам только обычную шерсть. Вам нужно будет повысить их уровень доверия и состричь её, чтобы получить особую &dгласианскую шерсть&r.\n\nВам понадобится 7 единиц для полного скафандра из вольфрамовой стали, но её также можно использовать как отличный компонент для ядерного реактора, чтобы увеличить его максимальный нагрев.\n\nВы также можете превратить её в обычную шерсяную нить и ткань, если вам это зачем-то нужно.", + "quests.space_survival.t2_space_suit.title": "Скафандр из вольфрамовой стали", + "quests.space_survival.t2_space_suit.subtitle": "Экстремофилия!", + "quests.space_survival.t2_space_suit.desc": "С этим новым скафандром вы сможете выжить в самых &bхолодных&r и самых &cгорячих&r условиях, которые только может предложить космос! Он необходим, чтобы вы не сгорели заживо, как только ступите на &6Венеру&r или &5Меркурий&r.\n\nВ качестве бонуса он дает больше защиты и вмещает больше воздуха!", + "quests.space_survival.mars_tapping.title": "Багреллий и Искажеллий", + "quests.space_survival.mars_tapping.subtitle": "Вы же ОБОЖАЕТЕ собирать смолу!", + "quests.space_survival.mars_tapping.desc": "Из багряных и искажённых грибов можно добывать &4Багреллий&r и &3Искажеллий&r соответственно с помощью краника.\n\nОба вещества понадобятся для производства &9йода&r, но они редко растут в одном месте, так что придётся попутешествовать. Багряные грибы чаще встречаются на восточной стороне Марса, а искажённые — на западной. Вы также можете получить их саженцы от соответствующих эндерменов.\n\nНе забудьте, что можно подключаться краником прямо к открытым трубам GregTech!\n\n&9Совет:&r Хотите похвастаться? Вы можете построить каноэ из багряных стеблей, а также гребную лодку или шлюп из искажённых!", + "quests.space_survival.iodine.title": "Линия йода", + "quests.space_survival.iodine.subtitle": "Химия на грибах!", + "quests.space_survival.iodine.desc": "Смешайте багрелий и искажеллий вместе с криптоном из дистилляции марсианского воздуха (процесс зациклен) и добавьте тепла от ядерного реактора — и вы получите йод!\n\nЭтот процесс медленный, но на данный момент вам не понадобится много йода, а в будущем на других планетах появятся более эффективные методы его получения.", + "quests.space_survival.mars_crops.title": "Марсианские культуры", + "quests.space_survival.mars_crops.subtitle": "Сколько-сколько они дают сытости?!", + "quests.space_survival.mars_crops.desc": "На Марсе растет шесть новых культур: три &aфрукта&r, два &2овоща&r и один &6злак&r. Они полны питательных веществ, и из них можно готовить еду, аналогичную земной: сэндвичи, супы и пакеты с едой.\n\nОднако некоторые из них токсичны в сыром виде, так что обязательно сначала приготовьте их!\n\nПодробности о выращивании каждой культуры ищите в Полевом руководстве. Их можно растить в обычном грунте, в теплице FirmaLife или в электротеплице.", + "quests.space_survival.mars_crops.task": "Любое марсианское семя", + "quests.space_survival.bulbkin_pie.title": "Марсианская кухня", + "quests.space_survival.bulbkin_pie.subtitle": "Ещё больше кулинарных извращений в вашем распоряжении", + "quests.space_survival.bulbkin_pie.desc": "Из яиц ирапторов можно получить заменитель сахара, а яйца нюхачей полны сливок.\n\n&eЛукыквенный пирог&r — это, пожалуй, вершина марсианской кухни; он дает огромное количество различных питательных веществ, хоть его и муторно готовить.\n\n&eНаггетсы из динозавра в пивном кляре&r сочетают в себе уйму белка с небольшим количеством злаков; их тоже можно упаковывать в пакеты с едой.\n\n&9Совет:&r Это не совсем еда, но если смешать лукыквенную мякоть и блоки альфаценового гриба, можно получить светокаменную пыль.", + "quests.space_survival.soarer.title": "Пархатель", + "quests.space_survival.soarer.subtitle": "Подбросить?", + "quests.space_survival.soarer.desc": "Самолёты на Марсе не работают, а в вашем скафандре нет джетпака, так что летать больше никак нельзя, верно?\n\nЕсли вам удастся найти неуловимого &4пархателя&r, вы сможете приручить его сырой рыбой и оседлать, чтобы с лёгкостью парить в марсианском небе.\n\nОни не могут летать вечно (индикатор крыльев слева вверху), и им нужно время от времени приземляться. Тем не менее, это отличный вариант для путешествий на дальние расстояния, к тому же они не злят песчаного червя!\n\n&9Примечание&r: Пархатели не могут выжить на очень жарких планетах, таких как &6Венера&r.", + "quests.space_survival.soarer.task": "Найдите порхателя", + "quests.space_survival.surfer.title": "Сёрфер", + "quests.space_survival.surfer.subtitle": "Хотите поплавать?", + "quests.space_survival.surfer.desc": "&bСёрферов&r можно найти в небольших водоемах. Их можно приручить, подкравшись к ним, пока они лежат на берегу, и накормив сырой рыбой. Приручив сёрфера и надев седло, вы сможете быстро плавать под водой.\n\nНа Марсе это может показаться не слишком полезным, но помните, что вы можете переносить существ с помощью пространственных ячеек хранения AE2, а в будущем вас ждет некая ледяная океаническая луна...\n\n&9Примечание&r: Сёрферы не могут выжить на очень жарких планетах, таких как &6Венера&r.", + "quests.space_survival.surfer.task": "Найдите сёрфера", + "quests.space_survival.sniffer_or_wraptor.title": "Нюхачи и ирапторы", + "quests.space_survival.sniffer_or_wraptor.subtitle": "Как корова и курица", + "quests.space_survival.sniffer_or_wraptor.desc": "&2Нюхачи&r и &dирапторы&r встречаются по всему Марсу. Их можно одомашнить ради мяса, яиц и, что самое важное, их богатых минералами пучков меха и перьев.\n\nОни едят любые марсианские культуры. Вы можете автоматизировать их кормление и разведение с помощью кормушек, как на Земле.", + "quests.space_survival.sniffer_or_wraptor.task_1": "Найдите нюхача", + "quests.space_survival.sniffer_or_wraptor.task_2": "Найдите ираптора", + "quests.space_survival.mars_nest.title": "Большой насест из соломы", + "quests.space_survival.mars_nest.subtitle": "Большой насест для больших яиц", + "quests.space_survival.mars_nest.desc": "Вы же помните, как собирать солому?\n\nИскажённую и багряную солому можно собрать с различных мелких растений, а также из любых найденных вами пластинок искажённого или багряного гриба.\n\nКак и земным птицам, нюхачам и ирапторам нужны насесты, чтобы нести яйца. Только, ну вы поняли, насесты побольше.", + "quests.space_survival.mars_nest.task": "Любой насест", + "quests.space_survival.mineral_rich_wool.title": "Богатая минералами шерсть", + "quests.space_survival.mineral_rich_wool.subtitle": "Накопленная за годы пыльных бурь", + "quests.space_survival.mineral_rich_wool.desc": "Как только ваши нюхачи или ирапторы станут достаточно ручными, вы сможете состричь с них богатые минералами пучки меха или перья.\n\nИх можно переплавить в доменной печи для получения бесконечного и дешёвого источника щелочноземельного силиката. Они также являются необходимым компонентом для создания &6био-ЩЗС укрепленного R-полиуретанового пенопласта&r.", + "quests.space_survival.aes_insulation.title": "Многослойное изоляционное покрытие", + "quests.space_survival.aes_insulation.subtitle": "Не сэндвич-мороженое", + "quests.space_survival.aes_insulation.desc": "Возможно, сейчас это не находит широкого применения, но в будущем это станет критически важным компонентом для вашей ракеты &1типа IV&r.", + "quests.space_survival.mars_shields.title": "Улучшенные щиты", + "quests.space_survival.mars_shields.subtitle": "Не пора ли обновить ваш старый железный щит?", + "quests.space_survival.mars_shields.desc": " &3Усиленный щит&r отражает урон обратно атакующим, подобно зачарованию «Шипы». Материалы для его крафта можно добыть с крушителей и пожирателей.\n\n&5Испорченный щит&r случайным образом телепортирует атакующих, что полезно для удержания их на расстоянии... но иногда они могут оказаться прямо за вашей спиной. Зубы для него можно выбить из пещерных эндерменов под поверхностью.\n\n&4Отражающий щит&r поглощает определенное количество урона, а затем выпускает ударную волну, калеча всех вокруг. Кинетическое ядро для него — редкий дроп с враждебных големов в марсианских пещерах.", + "quests.space_survival.mras_shields.task": "Любой улучшенный щит", + "quests.space_survival.mercury.title": "Я на &5Меркурии&r...?", + "quests.space_survival.mercury.subtitle": "Стой, а что здесь произошло?!", + "quests.space_survival.mercury.desc": "&5Меркурий&r станет второстепенной планетой в грядущем обновлении тира &1IV&r в TFG 0.12. Следите за новостями!", + "quests.space_survival.mercury.task": "Высадитесь на Меркурии", + "quests.space_survival.venus.title": "Я на &6Венере&r!", + "quests.space_survival.venus.subtitle": "Облачно, возможны осадки в виде серной кислоты", + "quests.space_survival.venus.desc": "&6Венера&r станет основной планетой в грядущем обновлении тира &1IV&r в TFG 0.12. Следите за новостями!", + "quests.space_survival.venus.task": "Высадитесь на Венере", "quests.steam_age": "Ранняя автоматизация", "quests.steam_age.subtitle": "От примитивных машин до паровой энергии", "quests.steam_age.basic_greate.title": "Основы Greate", @@ -3852,7 +3858,7 @@ "quests.stone_age.first_saw.title": "Металлическая пила", "quests.stone_age.first_saw.subtitle": "Время для твоего первого металлического инструмента", "quests.stone_age.first_saw.desc.1": "Чтобы начать изготовление пилы, добавьте в сосуд не менее 144mb руды желаемого металла. После этого поместите сосуд в земляную печь и зажгите ее.\n\nКогда печь прогорит, быстро поднимите сосуд, пока он еще горячий, держа деревянные клещи в свободной руке, и взаимодействуйте с ним, чтобы открыть интерфейс литья. Просто поместите форму полотна пилы в слот интерфейса литья и наблюдайте, как она наполняется вашим первым оголовьем пилы. После этого соедините оголовье с палкой, и у вас получится пила!", - "quests.stone_age.first_saw.desc.2": "Хотя самым простым металлом для работы является медь, вы можете попробовать свои силы в процессе создания сплавов. Задача этого квеста принимает предмет так из меди, так и из сплавов бронзы.\n\n&lВисмутовая бронза&r: Медь, висмут и цинк. Самая слабая из бронз, но ее легче всего изготовить.\n\n&lБронза&r: Медь и олово. Это самая средняя из бронз.\n\n&lЧерная бронза&r: Медь, Золото и Серебро: Лучшая бронза в ранней игре, но она значительно дороже.", + "quests.stone_age.first_saw.desc.2": "Хотя самым простым металлом для работы является медь, вы можете попробовать свои силы в процессе создания сплавов. Задача этого квеста принимает предмет как из меди, так и из сплавов бронзы.\n\n&lВисмутовая бронза&r: Медь, висмут и цинк. Самая слабая из бронз, но ее легче всего изготовить.\n\n&lБронза&r: Медь и олово. Это средняя из бронз.\n\n&lЧерная бронза&r: Медь, золото и серебро: Лучшая бронза в ранней игре, но она значительно дороже.", "quests.stone_age.first_saw.tasks.1": "Медное или бронзовое оголовье пилы.", "quests.stone_age.first_saw.tasks.2": "Медная или бронзовая пила.", "quests.stone_age.craft_lumber.title": "Время верстака", @@ -3884,6 +3890,11 @@ "quests.stone_age.hazards.subtitle": "Думал, на поверхности было сложно? Ошибаешься.", "quests.stone_age.hazards.desc.1": "Помимо монстров, самой большой проблемой при добыче является борьба с обрушениями. Если под блоком сырой породы или руды есть воздух, он считается \"безопорным\" и имеет шанс начать обвал каждый раз, когда будет добыт соседний блок. Потолки пещер покрыты укрепленной породой, которая не вызывает обвала. Чтобы облегчить добычу, самое безопасное, что вы можете сделать, - это просто добывать пол, но если вы хотите безопасно добывать что-то еще, вам придется научиться использовать опоры! Они создаются с помощью бревен и пилы.", "quests.stone_age.hazards.desc.2": "В Полевом руководстве есть больше подробностей и изображений о том, как именно работают опоры, но вкратце: размещайте их вот так, в пределах четырех блоков друг от друга. Только верхние вертикальные балки будут фактически поддерживать что-либо, и они имеют небольшой радиус.", + "quests.stone_age.medical_conditions.title": "Медицинские показатели", + "quests.stone_age.medical_conditions.subtitle": "Не ешьте асбест", + "quests.stone_age.medical_conditions.desc.1": "Будьте осторожны с тем, что подбираете! Не все руды или пыли безопасны для прикосновения, и некоторые из них могут привести к ухудшению вашего &6медицинского состояния&r.\n\nВсё &cОпасное&r указано в описании предмета, так что если вы внезапно заметите появление дебаффа, немедленно уберите этот предмет из своего инвентаря! Хранение его внутри контейнера, например, в малом сосуде или рюкзаке, безопасно.\n\nБольшинство этих эффектов со временем проходят сами по себе, но если позволить им накопиться, вы начнёте получать множество других неприятных эффектов, вплоть до &cсмерти&r.", + "quests.stone_age.medical_conditions.desc.2": "Со временем вам всё же придётся работать с некоторыми из этих материалов, поэтому у вас есть способы обезопасить себя.\n\nЛучший способ — это вообще не допускать развития болезней: Медицинская маска и Резиновые перчатки предотвратят опасность вдыхания и тактильного контакта соответственно.\n\nВторой по эффективности способ — лечение: обратите внимание на &aПилюли, Таблетки и Мази&r, которые вы можете изготовить. Все они помогают лечить определённые эффекты (и дают полезные баффы!), хотя у более сильных лекарств есть и неприятные побочные эффекты.", + "quests.stone_age.medical_conditions.task": "Сам себе врач", "quests.stone_age.copper_for_anvil.title": "Медь для наковальни", "quests.stone_age.copper_for_anvil.subtitle": "Привыкай добывать 14 слитков чего-либо ", "quests.stone_age.copper_for_anvil.desc": "Наковальни не дешевы! Каждая наковальня требует 14 слитков, которые затем свариваются в 7 двойных слитков.\n\nЕсли вы еще не начали добывать медь, то вам стоит начать добывать ее, ведь собрать 126 кусочков меди очень сложно.", @@ -3950,21 +3961,21 @@ "quests.tfg_tips.maxed_out_toolbelt.subtitle": "Похоже, этот пояс теперь весит очень много...", "quests.tfg_tips.maxed_out_toolbelt.desc": "&dПояс с инструментами&r может вместить 7 дополнительных сумок, целых 9 инструментов в одном поясе!", "quests.tfg_tips.maxed_out_toolbelt.task": "Получите полностью улучшенный пояс.", - "quests.tfg_tips.straw_basket.title": "Straw Basket", + "quests.tfg_tips.straw_basket.title": "Соломенная корзина", "quests.tfg_tips.straw_basket.subtitle": "Проще некуда", - "quests.tfg_tips.straw_basket.desc": "&6Straw Basket&r это простая корзина, которая может быть невероятно полезной для управления инвентарём, пока более продвинутые варианты ещё недоступны.\n\nПросто оббей солому, чтобы получить свою собственную &6Straw Basket&r!", + "quests.tfg_tips.straw_basket.desc": "&6Соломенная корзина&r это простая корзина, которая может быть невероятно полезной для управления инвентарём, пока более продвинутые варианты ещё недоступны.\n\nПросто оббей солому, чтобы получить свою собственную &6Соломенная корзину&r!", "quests.tfg_tips.toolbox.title": "Ящики для инструментов", "quests.tfg_tips.toolbox.subtitle": "Мечта строителей", "quests.tfg_tips.toolbox.desc": "&dЯщик для инструментов&r имеет 8 слотов инвентаря, и каждый из них может хранить до 4 стаков предметов. Кроме того, ты можешь использовать &cклавишу быстрого доступа&r, чтобы открывать установленный &dящик для инструментов&r с расстояния в несколько блоков. Ты даже можешь &bпокрасить&r свой &dящик для инструментов&r, чтобы персонализировать его!", - "quests.tfg_tips.first_sacks.title": "Sacks для хранения", + "quests.tfg_tips.first_sacks.title": "Мешки для хранения", "quests.tfg_tips.first_sacks.subtitle": "Следующий шаг после кувшинов", - "quests.tfg_tips.first_sacks.desc": "&6Leather Sack&r и &3Burlap Sack&r — это два варианта переносного хранилища, каждый со своими плюсами и минусами. Хорошей идеей будет посмотреть информацию о контейнере для каждого из них, чтобы узнать количество &dслотов для предметов&r, &dразмер стака&r и максимальный &dразмер предметов&r для каждого мешка.\n\n&l&3Совет:&r В &4&oПолевом справочнике&r есть более подробная информация о некоторых особых возможностях этих мешков.", - "quests.tfg_tips.special_sacks.title": "Специализированные Sacks", + "quests.tfg_tips.first_sacks.desc": "&6Кожаный мешок&r и &3Мешок из мешковины&r — это два варианта переносного хранилища, каждый со своими плюсами и минусами. Хорошей идеей будет посмотреть информацию о контейнере для каждого из них, чтобы узнать количество &dслотов для предметов&r, &dразмер стака&r и максимальный &dразмер предметов&r для каждого мешка.\n\n&l&3Совет:&r В &4&oПолевом справочнике&r есть более подробная информация о некоторых особых возможностях этих мешков.", + "quests.tfg_tips.special_sacks.title": "Специализированные мешки", "quests.tfg_tips.special_sacks.subtitle": "Подождите, сколько он может вместить?", - "quests.tfg_tips.special_sacks.desc": "&2Seed Pouch&r и &9Ore Sack&r — это два мешка, которые могут хранить только определённые типы предметов, но компенсируют это значительно &dбольшими размерами стаков&r.\n\n&2Seed Pouch&r может хранить до &c128&r штук &327&r различных видов семян.\n\n&9Ore Sack&r может хранить до &c512&r штук &39&r различных добытых ресурсов. Это значит, что в нём можно хранить такие предметы, как руды, камни, порошки и глины!", - "quests.tfg_tips.frame_pack.title": "Frame Pack", + "quests.tfg_tips.special_sacks.desc": "&2Мешочек для семян&r и &9Мешок для руд&r — это два мешка, которые могут хранить только определённые типы предметов, но компенсируют это значительно &dбольшими размерами стаков&r.\n\n&2Seed Pouch&r может хранить до &c128&r штук &327&r различных видов семян.\n\n&9Мешок для руд&r может хранить до &c512&r штук &39&r различных добытых ресурсов. Это значит, что в нём можно хранить такие предметы, как руды, камни, порошки и глины!", + "quests.tfg_tips.frame_pack.title": "Каркасный рюкзак", "quests.tfg_tips.frame_pack.subtitle": "Наличие выбора — это хорошо!", - "quests.tfg_tips.frame_pack.desc": "&5Frame Pack&r даёт тебе &318&r слотов, каждый из которых может хранить до &c64&r предметов. Преимущество &5Frame Pack&r в том, что он игнорирует стандартный размер стака у предметов, которые ты в него кладёшь. Это значит, что всего ты можешь носить с собой до &c1152&r предметов!", + "quests.tfg_tips.frame_pack.desc": "&5Каркасный рюкзак&r даёт тебе &318&r слотов, каждый из которых может хранить до &c64&r предметов. Преимущество &5Каркасного рюкзака&r в том, что он игнорирует стандартный размер стака у предметов, которые ты в него кладёшь. Это значит, что всего ты можешь носить с собой до &c1152&r предметов!", "quests.tfg_tips.vessels.title": "Большие и маленькие сосуды", "quests.tfg_tips.vessels.subtitle": "Глина может быть вполне полезной", "quests.tfg_tips.vessels.desc": "&dМаленькие сосуды&r имеют 4 слота под хранение, в то время как &6Большой сосуд&r обладает целыми 9! &dМаленький сосуд&r нужен не только для хранения вещей, но также необходим для плавки и создания сплавов основных металлов.\n&6Большой сосуд&r тяжелее для переноски, но отлично подходит для сохранения еды.\n\n&l&3Совет:&r&o Большие сосуды можно использовать как рюкзаки на ранних этапах!", @@ -4064,10 +4075,10 @@ "quests.tfg_tips.cane.subtitle": "Ими даже можно стукнуть кого-нибудь!", "quests.tfg_tips.cane.desc": "&dТрость&r позволяет полностью игнорировать любые блоки, замедляющие движение, такие как &aснег&r, если вы держите ее в &cосновной&r или &cвторостепенной руке&r. Вдобавок она &bповышает высоту шага&r — другими словами, вы сможете подниматься на один блок без прыжка. А &dЖелезная трость&r даже позволяет перешагивать через заборы!", "quests.tfg_tips.cane.task": "Любая Трость", - "quests.tfg_tips.hiking.title": "Hiking Boots", + "quests.tfg_tips.hiking.title": "Походные ботинки", "quests.tfg_tips.hiking.subtitle": "&oЭти ботинки сделаны для ходьбы", - "quests.tfg_tips.hiking.desc": "&dHiking Boots&r позволяют тебе проще исслежовать твой мир! Все &dHiking Boots&r позволяют проходить через высокую траву без замедления. Дополнительно, каждый новый уровень &dHiking Boots&r дает больше &9брони&r, &9скорости передвижения&r, и &9сопротивления к паденяим&r.", - "quests.tfg_tips.hiking.task": "Любые Hiking Boots", + "quests.tfg_tips.hiking.desc": "&dПоходные ботинки&r позволяют тебе проще исслежовать твой мир! Все &dПоходные ботинки&r позволяют проходить через высокую траву без замедления. Дополнительно, каждый новый уровень &dПоходные ботинки&r дает больше &9брони&r, &9скорости передвижения&r, и &9сопротивления к паденяим&r.", + "quests.tfg_tips.hiking.task": "Любые Походные ботинки", "quests.tfg_tips.feeding_troughs.title": "Кормушки", "quests.tfg_tips.feeding_troughs.subtitle": "Металлический батрак", "quests.tfg_tips.feeding_troughs.desc": "Кормушки (также известные как станции ухода) — это способ автоматически кормить твоих животных каждое утро. В них даже есть опция не кормить животных, у которых уже максимальный уровень привязанности, если ты не хочешь их разводить.\n\nБолее высокие тиры имеют больший радиус действия.\n\n&3&lСовет:&r&o Лучше не ставь такую вплотную к забору — иначе животные могут попытаться использовать её, чтобы сбежать из загона!", diff --git a/kubejs/assets/tfg/lang/uk_ua.json b/kubejs/assets/tfg/lang/uk_ua.json index b970c20a3..6c647a693 100644 --- a/kubejs/assets/tfg/lang/uk_ua.json +++ b/kubejs/assets/tfg/lang/uk_ua.json @@ -43,7 +43,7 @@ "biome.tfg.venus/salt_flats": "Соляні рівнини", "biome.tfg.venus/stromatolite_beach": "Строматолітовий пляж", "biome.tfg.venus/sulfuric_ravine": "Сірчаний яр", - "biome.tfg.venus/volcanic_mountains": "Палючі вулкани", + "biome.tfg.venus/scorching_volcanoes": "Палючі вулкани", "block.tfg.piglin_disguise": "Маскування Пігліна", "block.tfg.piglin_disguise_block": "Маскування Пігліна", "block.tfg.dry_ice": "Сухий лід", @@ -735,6 +735,8 @@ "item.tfg.invisibility_salvo": "Залп Невидимості", "item.tfg.luck_salvo": "Залп Удачі", "item.tfg.resistance_salvo": "Залп Опору", + "item.tfg.paracetamol_pill": "Пігулка парацетамолу", + "item.tfg.rad_away_pill": "Пігулка антирадину™", "item.tfg.paraffin_wax": "Парафіновий Віск", "item.tfg.flint_arrow_head": "Кременевий Наконечник Стріли", "item.tfg.fletching": "Оперення", @@ -1215,9 +1217,9 @@ "material.tfg.cracker_off_gas": "Побічний газ від крекінгового реформату", "material.tfg.btx_fuel": "BTX Паливо", "material.tfg.critical_steam": "Критична пара", - "material.tfg.americium_241": "Америцій-241", - "material.tfg.californium_252": "Каліфорній-252", - "material.tfg.neptunium_237": "Нептуній-237", + "material.tfg.americium_241": "Америцій 241", + "material.tfg.californium_252": "Каліфорній 252", + "material.tfg.neptunium_237": "Нептуній 237", "material.tfg.mixed_radioactive_fluid": "Змішана радіоактивна рідина", "material.tfg.degraded_solvent_stream": "Потік деградованого розчинника", "material.tfg.boron_enriched_coolant": "Збагачений бором охолоджувач", @@ -1306,7 +1308,7 @@ "ore_vein.tfg.surface_sphalerite": "Сфалерит і Сірка", "ore_vein.tfg.surface_tetrahedrite": "Тетраедрит (Поверхня)", "ore_vein.tfg.deep_mars_chromite": "Редстоун і Хроміт", - "ore_vein.tfg.deep_mars_pitchblende": "Настуран, Торій і Уранініт", + "ore_vein.tfg.deep_mars_pitchblende": "Настуран, Торіаніт і Уранініт", "ore_vein.tfg.deep_mars_sheldonite": "Борніт і Куперит", "ore_vein.tfg.mars_almandine": "Альмандин і Сапфір", "ore_vein.tfg.mars_apatite": "Апатит і Пірохлор", @@ -1317,10 +1319,11 @@ "ore_vein.tfg.mars_sapphire": "Золото, Електротин і Боксит", "ore_vein.tfg.mars_graphite": "Графіт і Діамант", "ore_vein.tfg.mars_hematite": "Гематит та Лімоніт", + "ore_vein.tfg.mars_lapis": "Лапіс, Лазурит та Содаліт", "ore_vein.tfg.mars_lubricant": "Стеатит, Тальк і Глауконіт", "ore_vein.tfg.mars_neodynium": "Бастнезит і Монацит", "ore_vein.tfg.mars_nickel": "Гарнієрит і Кобальтит", - "ore_vein.tfg.mars_pitchblende": "Настуран, Торій і Гематит", + "ore_vein.tfg.mars_pitchblende": "Настуран, Торіаніт і Гематит", "ore_vein.tfg.mars_quartzite": "Кварцит, Азбест і Барит", "ore_vein.tfg.mars_salt": "Солі і Сподумен", "ore_vein.tfg.mars_stibnite": "Тетраедрит (Звичайний)", diff --git a/kubejs/assets/tfg/lang/zh_cn.json b/kubejs/assets/tfg/lang/zh_cn.json index c3ddad4de..cc9f187a1 100644 --- a/kubejs/assets/tfg/lang/zh_cn.json +++ b/kubejs/assets/tfg/lang/zh_cn.json @@ -43,7 +43,7 @@ "biome.tfg.venus/salt_flats": "盐滩", "biome.tfg.venus/stromatolite_beach": "叠层石滩", "biome.tfg.venus/sulfuric_ravine": "硫酸峡谷", - "biome.tfg.venus/volcanic_mountains": "灼热火山", + "biome.tfg.venus/scorching_volcanoes": "炽热火山", "block.tfg.piglin_disguise": "猪灵伪装", "block.tfg.piglin_disguise_block": "猪灵伪装", "block.tfg.dry_ice": "干冰", @@ -459,11 +459,15 @@ "block.tfg.stromatolite_cluster_medium": "大型叠层石簇", "block.tfg.rock.raw.geyserite": "天然硅华", "block.tfg.rock.spike.geyserite": "硅华尖刺", + "block.tfg.geyser_source_small": "小型蒸汽间歇泉", + "block.tfg.geyser_source": "蒸汽间歇泉", + "block.tfg.smoker_source": "熔岩烟道", + "block.tfg.lava_source": "熔岩喷口", "block.tfg.rock.halite": "岩晶", "block.tfg.mushroom_roots": "菌丝根须", "block.tfg.mushroom_sprouts": "菌丝嫩芽", "block.tfg.charred_log": "焦化原木", - "block.tfg.ash_pile": "灰烬堆", + "block.tfg.ash_pile": "草木灰堆", "block.tfg.pile.white_sand": "白沙", "block.tfg.pile.black_sand": "黑沙", "block.tfg.pile.brown_sand": "棕沙", @@ -478,6 +482,7 @@ "block.tfg.pile.venus_sand_covering": "粗面岩沙", "block.tfg.pile.hematitic_sand": "赤铁矿沙", "block.tfg.pile.hematitic_sand_covering": "赤铁矿沙", + "block.tfg.pile.volcanic_ash": "火山灰堆", "block.tfg.lunar_roots": "月球光绽花", "block.tfg.lunar_sprouts": "月球光颖草", "block.tfg.lunar_chorus_plant": "紫颂植株", @@ -831,6 +836,8 @@ "item.tfg.invisibility_salvo": "隐身药膏", "item.tfg.luck_salvo": "幸运药膏", "item.tfg.resistance_salvo": "抗性提升药膏", + "item.tfg.paracetamol_pill": "对乙酰氨基酚药片", + "item.tfg.rad_away_pill": "消辐宁™药片", "item.tfg.paraffin_wax": "石蜡", "item.tfg.flint_arrow_head": "燧石箭头", "item.tfg.fletching": "箭羽", @@ -1403,7 +1410,7 @@ "ore_vein.tfg.surface_sphalerite": "闪锌矿, 硫", "ore_vein.tfg.surface_tetrahedrite": "黝铜矿 (地表)", "ore_vein.tfg.deep_mars_chromite": "红石, 铬铁矿", - "ore_vein.tfg.deep_mars_pitchblende": "沥青铀矿, 钍矿, 晶质铀矿", + "ore_vein.tfg.deep_mars_pitchblende": "沥青铀矿, 方钍石, 晶质铀矿", "ore_vein.tfg.deep_mars_sheldonite": "斑铜矿, 硫铂矿", "ore_vein.tfg.mars_almandine": "铁铝榴石, 蓝宝石", "ore_vein.tfg.mars_apatite": "磷灰石, 烧绿石", @@ -1414,10 +1421,11 @@ "ore_vein.tfg.mars_sapphire": "金矿, 蓝石, 铝土矿", "ore_vein.tfg.mars_graphite": "石墨, 钻石", "ore_vein.tfg.mars_hematite": "赤铁矿, 褐铁矿", + "ore_vein.tfg.mars_lapis": "青金石, 蓝金石, 方钠石", "ore_vein.tfg.mars_lubricant": "皂石, 滑石, 海绿石矿砂", "ore_vein.tfg.mars_neodynium": "氟碳镧铈矿, 独居石", "ore_vein.tfg.mars_nickel": "硅镁镍矿, 辉钴矿", - "ore_vein.tfg.mars_pitchblende": "沥青铀矿, 钍矿, 赤铁矿", + "ore_vein.tfg.mars_pitchblende": "沥青铀矿, 方钍石, 赤铁矿", "ore_vein.tfg.mars_quartzite": "石英岩, 石棉, 重晶石", "ore_vein.tfg.mars_salt": "盐, 锂辉石", "ore_vein.tfg.mars_stibnite": "黝铜矿 (普通)", @@ -1540,6 +1548,9 @@ "effect.tfg.berylliosis_warning": "铍中毒", "effect.tfg.methanol_poisoning_warning": "甲醇中毒", "effect.tfg.carbon_monoxide_poisoning_warning": "一氧化碳中毒", + "effect.tfg.radioactive_warning": "辐射", + "gtceu.medical_condition.radioactive": "§4辐射性", + "symptom.tfg.glowing": "发光", "tfg.greate.uls_limit": "§432§r (§8ULS§r)", "tfg.greate.ls_limit": "§f128§r (§7LS§r)", "tfg.greate.windmill_hint_1": "§7风力磨坊的效率受其相对", @@ -1728,6 +1739,8 @@ "tfg.gui.consumes": "消耗：", "tfg.gui.per_cycle": "每周期", "tfg.gui.cycle_duration": "周期时长：", + "tfg.emi.bacon_requirement": "培根 - 必须先对生猪肉进行烟熏处理", + "tag.item.tfg.dried_fruit": "干果", "tfc.jei.flint_knapping": "打制石器", "tfc.jei.straw_knapping": "编制干草", "tfc.recipe.barrel.tfg.barrel.dyeing.decorative_vase.black": "染色", @@ -1940,9 +1953,12 @@ "quests.ae2.wireless_access.desc": "当你进展到&5EV&r阶段时，将解锁ME无线访问点，其功能相当于ME网络的WiFi路由器。将其连接至基地的中心节点，插入任意数量的无线信号增幅卡以扩大覆盖范围（同时会增加能耗），随后将无线终端与之绑定。\n\n当具备环氧树脂与铑材料后，便可通过通用终端将所有无线终端整合为一体！", "quests.ae2.interplanetary_wireless.subtitle": "把东西忘在家里了？", "quests.ae2.interplanetary_wireless.desc": "这张特殊卡片可以升级你的无线终端，让你能在任何距离下访问网络，哪怕是不同的世界！这听起来好得令人难以置信？它有一个重大缺点——传输物品会消耗巨量能源。\n\n你可以通过在物品栏中配置一些能源卡和设置为放电模式的电池来勉强解决，但当你把东西忘在地球基地又不想飞回去时，它应该能足够好用。\n\n要进行恰当的自动化传输，你还是需要一个轨道炮。", + "quests.ae2.universal_circuits.title": "通用电路", + "quests.ae2.universal_circuits.subtitle": "原来如此，这就是它们的用途！", + "quests.ae2.universal_circuits.desc": "是不是一直好奇这些“通用电路”到底有什么用？除了当个好看的任务图标，它们主要是用在AE2里的！\n\n因为AE2的样板不怎么认物品标签，所以这些通用电路就是设计来当“万金油”的，任何需要电路的样板都能用它。这样一来，每当你解锁一种新电路，你只需要添加一个样板来将新电路转化为通用电路，而无需更新你&o所有&r的旧样板！", "quests.ae2.iv.title": "IV级AE2", "quests.ae2.iv.desc": "一旦你达到&1IV&r等级，整个分支即可完全解锁。", - "quests.ae2.accumulation_press.desc": "要获得这个&e新型压印模板&r，你需要投入一些资源。\n\n首先，你必须用&1两个IV级能源仓&r升级你的聚爆压缩机。\n\n然后，如果你还没有的话，为自己准备一台新的IV级激光蚀刻机。\n\n最后，准备大量的工业TNT——这是&c唯一有效&r的TNT类型。\n\n仔细计划，这一步要求相当高！", + "quests.ae2.accumulation_press.desc": "要获得这个&e新型压印模板&r，你需要投入一些资源。\n\n首先，你必须用&5两个EV级能源仓&r升级你的聚爆压缩机。\n\n然后，如果你还没有的话，为自己准备一台新的IV级激光蚀刻机。\n\n最后，准备大量的工业TNT——这是&c唯一有效&r的TNT类型。\n\n仔细计划，这一步要求相当高！", "quests.ae2.accumulation_processor.desc": "&e累加处理器&r每次制作需要大量硅。\n\n我们希望你已经有一个专门的电力高炉生产硅，或者至少有一个强大的基础设施来快速制造它。\n\n请相应准备，因为你会需要很多！", "quests.ae2.mega_crafting.desc": "这些是对&b合成单元&r的巧妙升级。\n\n它们将有助于加速自动合成，并让你轻松处理更大的任务。", "quests.ae2.mega_battery.desc": "更大的网络需要&e更大的电池&r。仅此而已！", @@ -2113,7 +2129,7 @@ "quests.development.explanation.desc.1": "格雷科技的&l电路发展进程&r起初可能看起来令人生畏，但其实没那么糟。\n\n首先，你需要明白相同等级的电路是可以互换的。例如，制作一个&6HV&r&6搅拌机&r，你可以使用任何&6HV等级&r的电路。", "quests.development.explanation.desc.2": "现在，我们来谈谈&l进程&r。你可能已经注意到，每个电路在其图标上都有一个颜色代码和一个名称。例如，所有的&a量子处理器&r都是&a绿色&r的，并且在&1IV级&r电路组装机中制作。要制作一个，你首先需要前一级的电路——这就是为什么，要制作你的第一个&dLuV&r&d电路&r（纳米处理器主机），你必须从制作一个纳米处理器开始，并逐步完成每一个&7步骤&r。在这个例子中，这需要三个步骤。\n\n这就是为什么每一行中最右侧的&6电路&r在&a制作&r上总是更实惠：它们需要更少的&7步骤&r。", "quests.development.explanation.desc.3": "此外，我们还添加了&l通用电路&r。它们可以用任何等级的&6电路&r——无论是&1IV级&r、&dLuV级&r、&3UV级&r还是其他任何等级——&a合成&r而来，并且在与应用能源2（AE2）进行&9自动化&r时极其有用。请尝试在你所有的&f样板&r中都使用&l通用电路&r进行编码，这样，每当你升级到更好的电路时，你就不必重新制作所有的&f样板&r——只需要重新制作那些用于合成通用电路的样板即可。", - "quests.development.explanation.task": "好的，我读完了全部三页", + "quests.development.explanation.task": "OK，这三页我全都读过了", "quests.development.ulv.title": "&8ULV&r电路", "quests.development.ulv.subtitle": "", "quests.development.ulv.desc": "在这一行你可以看到蒸汽时代，或者说&8ULV&r等级的等效电路。", @@ -2217,8 +2233,8 @@ "quests.extreme_voltage.refrigerant_pellet.desc": "&d钚燃料棒&r运行时会产生极高温度——事实上，你需要在使用&b制冷剂丸&r才能防止反应堆进入冷却模式。\n\n这种丸粒生产成本较高，但你仍可在早期实现批量生产，至少足够支撑最初几根钚燃料棒的运行。单根钚燃料棒全周期运行约需&9256&r颗制冷剂丸。\n\n后续若不愿持续制作这种消耗品，你将能使用&6高级反应堆组件&r。安装后反应堆最大热容量可安全提升至&e600&r，显著增强效率与稳定性。\n\n尽早投资升级内部部件，方能减少对能源核心的频繁维护。", "quests.extreme_voltage.important_info.title": "前期准备", "quests.extreme_voltage.important_info.subtitle": "开局并非易事", - "quests.extreme_voltage.important_info.desc.1": "在&c火星&r建立基地前，以下几点关键建议将助你成功立足：\n\n探索时你可能会发现&6火星遗迹&r，其中藏有&e原子机械方块&r与&e高温冶炼机械方块&r。这些虽不足以满足后期庞大需求，但能为选址期间的你提供初期优势。", - "quests.extreme_voltage.important_info.desc.2": "火星基地建设主要有两种方案：\n\n•&a准备优先型&r：在定居前预先造齐完整&6裂变生产线&r所需设施。这意味着巨额材料投入，但投产后可实现自给自足。\n\n•&a渐进建设型&r：先搭建&6核燃料工厂&r、首座&e钍燃料&r&6裂变反应堆&r及&6核能蒸汽涡轮&r。此方案启动更快，但在裂变系统稳定前能源管理将较为艰难。\n\n无论选择哪种路径，我们都建议在定居前先开展勘探任务！", + "quests.extreme_voltage.important_info.desc.1": "在&c火星&r建立基地前，以下几点关键建议将助你成功立足：\n\n在打造一套完整的基地建设方案之前，我们建议你先进行一次勘探任务，再决定落脚点！", + "quests.extreme_voltage.important_info.desc.2": "火星基地建设主要有两种方案：\n\n•&a准备优先型&r：在定居前预先造齐完整&6裂变生产线&r所需设施。这意味着巨额材料投入，但投产后可实现自给自足。\n\n•&a渐进建设型&r：先搭建&6核燃料工厂&r、首座&e钍燃料&r&6裂变反应堆&r及&6核能蒸汽涡轮&r。此方案启动更快，但在裂变系统稳定前能源管理将较为艰难。", "quests.extreme_voltage.important_info.desc.3": "由于火星上所有燃烧供能方式均无效，你需要储备足量&b兰波顿水晶&r为初始配方及供氧系统供能。\n\n强烈建议建立&6蒸馏塔&r：&e火星大气&r可被加工成可呼吸的&b空气&r与多种实用气体。此外，压缩氮氧混合气所需原料皆可取自本地的半重氨水。\n\n火星生存不靠运气，全靠准备充分！", "quests.extreme_voltage.important_info.task": "火星时间到", "quests.extreme_voltage.dense_lead.title": "加速生产致密铅板", @@ -2402,7 +2418,7 @@ "quests.extreme_voltage.gasoline.desc": "&a汽油&r是一种能量密度极高的内燃机燃料，其能量密度超过&d柴油&r的&63倍&r还多！\n\n&9注意：&r该燃料的设计初衷是作为一项&e技术挑战&r供玩家攻克，是否尝试完全取决于你的选择。\n\n由于这是完全&d可选&r的内容，我们将不会提供任何提示，请自行探索获取方式。", "quests.extreme_voltage.radiation.title": "处理辐射", "quests.extreme_voltage.radiation.subtitle": "额外辛辣的材料", - "quests.extreme_voltage.radiation.desc.1": "虽然格雷科技不像某些模组那样设置\"环境辐射\"，但&a放射性材料&r在被玩家持有时仍然具有危险性！这适用于所有标注&e致癌&r且注明&e任何方式&r触发说明的物品。\n\n应对措施有多种，最简便的方式是彻底避免接触——通过管道、背包乃至小型容器转移这些物品。它们在物品栏中停留的时间越短越好！", + "quests.extreme_voltage.radiation.desc.1": "虽然格雷科技不像某些模组那样设置\"环境辐射\"，但&a放射性材料&r在被玩家持有时仍然具有危险性！这适用于所有标注&4辐射性&r且注明&e任何方式&r触发说明的物品。\n\n应对措施有多种，最简便的方式是彻底避免接触——通过管道、背包乃至小型容器转移这些物品。它们在物品栏中停留的时间越短越好！", "quests.extreme_voltage.radiation.desc.2": "此外，你还需要其他防护手段。在四个装备槽位穿戴标有&e#ppe_armor&r的防护装备可有效抵御辐射。不过这些装备会随时间推移逐渐损耗（损耗速率与辐射对你的影响程度成正比），&o但&r&6危险材料防护服&r能完全免疫辐射损伤。\n\n需要注意的是，危险材料防护服不具备太空服功能。在火星上，你可以选择建造封闭式充氧基地来使用防护服，或是让太空服照单全收耐久损耗。", "quests.extreme_voltage.radiation.desc.3": "最后，你可以随时使用&a/medical_condition query&r指令检查辐射中毒程度。若辐射值过高，你将开始持续受到伤害甚至突发性暴毙，因此务必做好预防措施。\n\n目前唯一的治疗手段是制作并服用&b消辐宁&r药丸，每颗可消除50%%的辐射积累量。", "quests.extreme_voltage.radiation.task": "安全第一！", @@ -2538,7 +2554,7 @@ "quests.gregtech_energy.lce_fuel.subtitle": "污染者的最爱", "quests.gregtech_energy.lce_fuel.desc.1": "所有这些燃料均用于&6内燃发电机&r——此处按效率从低到高排列。\n\n在游戏早期阶段，我们建议从柴油或生物柴油起步。待发展到&6HV&r阶段后，可通过将柴油与氮气、氢气及氧气混合，升级使用&6高十六烷值柴油&r。", "quests.gregtech_energy.lce_fuel.desc.2": "当你达到&5EV&r阶段并建造&6蒸馏塔&r后，就可以转而使用汽油和高辛烷值汽油了。切勿过早尝试——油类需要被妥善分馏，使用普通蒸馏室来处理是极不经济的。\n\n为此，你需要结合原油分馏与一些有机化合物加工。所幸，一台热解炉和一座蒸馏塔即可流畅地处理全部流程。\n\n如果你能稳定供应高辛烷值汽油，仅靠内燃发电机就足以完成整个整合包的进程。", - "quests.gregtech_energy.lce_fuel.task": "我足够了", + "quests.gregtech_energy.lce_fuel.task": "我都懂了", "quests.gregtech_energy.large_solar.subtitle": "巨大的简易能源", "quests.gregtech_energy.large_solar.desc.1": "若你计划在月球上建立更大型的基地，大型太阳能阵列MK I将是你的不二之选。\n\n它对于&bAE2&r自动化处理流水线尤其有用，同时也能为你的月壤采集器提供电力。\n\n别忘了，你可以使用格雷科技终端，通过潜行右键点击控制器，来瞬间搭建这个多方块结构。\n\n只需将鼠标指向控制器并按&eU&r键，即可查看可用的合成配方。", "quests.gregtech_energy.large_solar.desc.2": "&6大型太阳能阵列MKI&r拥有&92种不同的工作模式&r：\n\n&9•被动模式&r—\n该模式会缓慢消耗&d光伏板&r。这意味着若你一次性投入一组光伏板，在基地建设阶段尚可维持，但无法永久运行。该模式仅在白天产生&62AHV&r的电流——足以支撑基础系统运转，但远非最优解。\n\n&9•主动模式&r—\n若想&a最大化能量产出&r，则需管理冷却剂。这将要求你的月球基地具备更完善的设施，但回报是可获得&52AEV&r的电流！\n\n另有针对更高阶需求的MKII与MKIII版本，需使用更先进的冷却剂。", @@ -2667,7 +2683,7 @@ "quests.high_voltage.mv_superconductors.desc": "传输&a4A&r的&bMV&r电能或许颇具吸引力，但现阶段你可能并不需要这些。若有需要，该方案始终作为备选存在。", "quests.high_voltage.circuit_assembler.title": "HV电路组装机", "quests.high_voltage.circuit_assembler.subtitle": "制作此设备前需要先建造超净间", - "quests.high_voltage.circuit_assembler.desc": "下一代&3电路组装机&r。这个等级的电路组装机只用于一种电路——你的第一个&a主机&r。你拿它们可能只有一个用途，就是制作&5EV电路组装机&r。\n\n你可以推迟到&5EV&r阶段再建造，或直接使用它来加速电路制造。", + "quests.high_voltage.circuit_assembler.desc": "下一代&3电路组装机&r。这个等级的电路组装机只用于一种电路——你的第一个&a主机&r，不过这东西得等到&5EV&r阶段上了火星才能做。你拿它们可能只有一个用途，就是制作&5EV电路组装机&r。\n\n除此之外，&6HV&r电路组装机也是制作AE2&e处理器&r的必备机器。\n\n你可以推迟到&5EV&r阶段再建造，或直接使用它来加速电路制造。", "quests.high_voltage.microprocessor_mainframe.title": "主机——第一个IV电路！", "quests.high_voltage.microprocessor_mainframe.desc": "第一个&1IV&r电路。祝贺你成功抵达此阶段！\n\n该电路将在你进入&5EV&r阶段时使用，也可立即用于制作进阶纳米服胸甲——这是对现有喷气背包的重大升级！\n\n&l&3背景知识：&r&o主机的原始纹理取自一张IBM zEnterprise主机的图片。", "quests.high_voltage.cleanroom.title": "超净间", @@ -2789,7 +2805,7 @@ "quests.high_voltage.gun.subtitle": "如果那不起作用，就带更多的枪", "quests.high_voltage.gun.task1": "任何枪", "quests.high_voltage.gun.task2": "任何药品或陈酿酒", - "quests.high_voltage.gun.desc": "在地球上过得有点太安逸了？月球可并不安宁，请务必做好自卫准备——光靠剑或石矛可不够。\n\n&4月球危机四伏&r，而且你也不想弄丢宝贵的火箭吧？\n\n挑选一把好枪（如果你拿不准，我们推荐&o\"发条\"狙击枪&r），备足弹药，若想更讲究还可以试试加装配件。\n\n建议携带提升生命上限的营养食品（试试餐包！），以及提供增益与治疗效果的酒与药品。", + "quests.high_voltage.gun.desc": "在地球上过得有点太安逸了？月球可并不安宁，请务必做好自卫准备——光靠剑或石矛可不够。\n\n&4月球危机四伏&r，而且你也不想弄丢宝贵的火箭吧？\n\n挑选一把好枪（如果你拿不准，我们推荐&o\"发条\"步枪&r），备足弹药，若想更讲究还可以试试加装配件。\n\n建议携带提升生命上限的营养食品（试试餐包！），以及提供增益与治疗效果的酒与药品。", "quests.high_voltage.space_survival.title": "远离家乡的基地", "quests.high_voltage.space_survival.subtitle": "不仅仅是一个采矿维度", "quests.high_voltage.space_survival.desc": "若尚未查看，请务必阅读&3提示与技巧-太空生存篇&r任务章节！其中包含建立完善月球基地所需的全套知识体系。", @@ -2834,6 +2850,12 @@ "quests.low_voltage.lv_age_progression.subtitle": "选择太多，时间太少！", "quests.low_voltage.lv_age_progression.desc": "&7LV&r阶段需要你制作多种不同的机器！如果你在目标规划上遇到困难，这里有个友好提示：可以选择后续任务中的某个物品，然后倒推所需的制作步骤。\n\n既然如此……我们何不从&5聚变控制器&r开始呢？好吧，这目标有点好高骛远——还是先定个更接近的目标吧。对了，&3电力高炉&r作为&7LV&r阶段的终极目标，应该是个不错的目标。\n\n电力高炉的&a造价昂贵&r，因此你应该先专注于制造能降低组件和材料成本的机器。我们的任务体系会为你指引正确方向。\n\n其他重要目标包括制作&3LV组装机&r、生产首批&aMV电路&r，以及获得第一台&b电路组装器&r。", "quests.low_voltage.lv_age_progression.task": "我……现在可能有点方向感了", + "quests.low_voltage.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.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的比例输出电力。", @@ -2841,7 +2863,7 @@ "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.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.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.lv_polariser.title": "基础两极磁化机", "quests.low_voltage.lv_polariser.subtitle": "两极磁化机用于磁化！", @@ -2849,7 +2871,7 @@ "quests.low_voltage.link_chapter.title": "给我解释一下能量", "quests.low_voltage.link_chapter.subtitle": "有一整章关于能量的内容", "quests.low_voltage.link_chapter.desc": "点击此处查看章节", - "quests.low_voltage.link_chapter.task": "我读完了", + "quests.low_voltage.link_chapter.task": "我读过了", "quests.low_voltage.lv_combuston_gen.title": "内燃发电机", "quests.low_voltage.lv_combuston_gen.subtitle": "它会轰隆作响并产生能量", "quests.low_voltage.lv_combuston_gen.desc": "&7LV内燃发电机&r的制作成本可能略高于其他发电机，但其燃料蕴含极高能量。这使得它更便于携带——当需要为远离基地的发电机供能时，一桶&2生物柴油&r即可传输大量电力。\n\n与其他&7LV发电机&r一样，它可产生&a32EU/t&r的能量。", @@ -2974,7 +2996,7 @@ "quests.low_voltage.lv_electroliser.title": "基础电解机", "quests.low_voltage.lv_electroliser.subtitle": "嗡嗡作响", "quests.low_voltage.lv_electroliser.desc.1": "&l矿石处理之外的用途：&r\n\n与离心机类似，此设备功能极为丰富——我们难以在此一一列举！幸运的是，它属于造价最低的&7LV&r机器之一，建议在需要时立即入手。", - "quests.low_voltage.lv_electroliser.desc.2": "&ld对于矿石处理：&r\n\n好吧，刚才的说法不够准确——它并非&o直接&r用于矿物处理，实际主要参与&a粉末的电解分解&r。不过大多数实用的电解配方都&b锁定在MV阶段&r。你可以通过物品提示框中的&e化学式&r来预判电解产物。", + "quests.low_voltage.lv_electroliser.desc.2": "&l对于矿石处理：&r\n\n好吧，刚才的说法不够准确——它并非&o直接&r用于矿物处理，实际主要参与&a粉末的电解分解&r。不过大多数实用的电解配方都&b锁定在MV阶段&r。你可以通过物品提示框中的&e化学式&r来预判电解产物。", "quests.low_voltage.lv_electroliser.desc.3": "&c注意！&r受矿物特性影响，将金属粉尘直接冶炼成锭相比电解分解能获得更高金属产量，但代价是你会损失粉尘中蕴含的其他副产品。必须根据需求权衡：优先追求直接收益，还是最大化获取副产物种类。", "quests.low_voltage.lv_mixer.title": "基础搅拌机", "quests.low_voltage.lv_mixer.subtitle": "搅拌机用于搅拌……", @@ -3321,7 +3343,7 @@ "quests.medium_voltage.mv_jetpack_2.desc": "这款喷气背包可实现飞行功能，但需消耗能量。\n\n充电方式与电池相同。\n\n按&4H&r（默认）启用悬停模式。\n\n&o&7（是是是，喷气背包本该靠推进剂工作——你们总爱吹毛求疵。）&r", "quests.medium_voltage.mv_cutter.title": "进阶切割机", "quests.medium_voltage.mv_cutter.subtitle": "升级，大伙，升级啊！", - "quests.medium_voltage.mv_cutter.desc": "&3MV切割机&r用于切割&7单晶硅&r，为后续的&a激光蚀刻机&r做准备。\n\n建议持续供应&d润滑剂&r以大幅缩短加工时间。\n\n润滑剂可通过&e石油&r与&a滑石&r、&2皂石&r或&c红石&r通过&3酿造室&r制备。\n\n&7注：也可选用&6格雷机械&r版本的切割机，它可以用流体储罐来填充液体&r", + "quests.medium_voltage.mv_cutter.desc": "&3MV切割机&r用于切割&7单晶硅&r，为后续的&a激光蚀刻机&r做准备。\n\n建议持续供应&d润滑剂&r以大幅缩短加工时间。\n\n润滑剂可通过&e石油&r与&a滑石&r、&2皂石&r或&c红石&r通过&3酿造室&r制备。", "quests.medium_voltage.mv_cutter.task": "任何切割机", "quests.medium_voltage.mv_laser_engraver.title": "激光蚀刻机", "quests.medium_voltage.mv_laser_engraver.subtitle": "这是顶尖技术，这也很慢", @@ -3578,7 +3600,7 @@ "quests.ore_proc.macerator_separator.task": "任何研磨机", "quests.ore_proc.thermal_centrifuge.title": "热力离心机", "quests.ore_proc.thermal_centrifuge.subtitle": "处理大多数纯净矿石的首选", - "quests.ore_proc.thermal_centrifuge.desc": "对于所有其他不需要特殊处理的纯净矿石，最好让它们通过&d热力离心机&r。这台机器可以以可靠的速度生产副产物，并且只用电。然而，它相当慢，因此我们建议制造多台机器。", + "quests.ore_proc.thermal_centrifuge.desc": "对于所有其他不需要特殊处理的纯净矿石，最佳去处就是&d热力离心机&r。这台机器可以稳定的速率产出副产物，并且不需要任何其他原料。不过它的速度相当慢，因此我们建议要么多造几台，要么直接使用蒸汽并行多方块结构。", "quests.ore_proc.thermal_centrifuge.task": "任何热力离心机", "quests.ore_proc.sifter.title": "筛选机", "quests.ore_proc.sifter.subtitle": "空岛模拟器", @@ -3870,12 +3892,12 @@ "quests.steam_age.boilers.tasks": "任意高压蒸汽锅炉", "quests.steam_age.steam_bloomery.title": "蒸汽锻铁炉", "quests.steam_age.steam_bloomery.subtitle": "锻铁炉的叔叔", - "quests.steam_age.steam_bloomery.desc": "你总会需要大量锻铁，何不将你的锻铁炉自动化？下一个最接近的锻铁自动化方法要等到LV阶段。蒸汽锻铁炉是一个新的多方块结构，能让你原有的群峦传说锻铁炉实现自动化，且效率更高！与焦炉类似，你可以按下JEI中的\"用途\"键（默认为\"U\"键）来显示多方块结构预览界面。点击其中的各个方块可以查看每个位置允许使用的方块类型。", + "quests.steam_age.steam_bloomery.desc": "你总会需要大量锻铁，何不将你的锻铁炉自动化？下一个最接近的锻铁自动化方法要等到LV阶段。\n\n&3蒸汽锻铁炉&r是一个新的多方块结构，能让你原有的群峦传说锻铁炉实现自动化，且效率更高！\n\n与焦炉类似，你可以按下JEI中的\"用途\"键（默认为\"U\"键）来显示多方块结构预览界面。点击其中的各个方块可以查看每个位置允许使用的方块类型。", "quests.steam_age.steam_furnace.title": "蒸汽熔炉", "quests.steam_age.steam_furnace.subtitle": "蒸汽熔炉用于熔炼……", "quests.steam_age.steam_furnace.desc": "需要快速将物品熔炼成金属锭？&3蒸汽熔炉&r正是为此而生！它能将许多矿石和粉尘快速转化为金属锭，但代价是无法获得任何副产品。", "quests.steam_age.steam_oven.title": "蒸汽熔炼炉", - "quests.steam_age.steam_oven.subtitle": "蒸汽碾磨机的大哥", + "quests.steam_age.steam_oven.subtitle": "蒸汽熔炉的大哥", "quests.steam_age.steam_oven.desc.1": "&o……或者说是小弟。别让它知道！&r\n\n&3蒸汽熔炼炉&r是个理想的多方块选择，当你需要&6轻松熔炼大量物品时&r。再也不必手动清空和补充一整排熔炉了！\n\n它本质上如同并行工作的熔炉，可同时熔炼多达8个物品，仅需消耗少量蒸汽。", "quests.steam_age.steam_oven.desc.2": "&l&3背景知识：&r&o这个多方块结构——尽管与其兄弟蒸汽碾磨机极为相似——并非移植自格雷科技本体或附属模组。它的真正原型是来自铁路（Railcraft）模组的蒸汽炉，其历史可追溯到1.4.7版本！&r", "quests.steam_age.steam_macerator.title": "蒸汽研磨机", @@ -4016,6 +4038,15 @@ "quests.steam_age.supers.subtitle": "超级存储抽屉", "quests.steam_age.supers.desc": "如果你有大量单一物品或流体，这是&c终&6极&e便&a携&b式&a物&5品&4存储解决方案。虽然这些&d基础&r（&8ULV&r）型号起初容量相对较小，但更高级的超级箱和超级缸能容纳惊人数量的物品——所有东西都储存在单个方块中，且完全无视温度或酸度影响！\n\n与桶类似，超级缸和超级箱在&6被破坏时会保留内部物品&r，可通过合成栏清空其内容，并能自动清空任何溢出的内容。然而，与桶不同的是，超级缸还能&a安全地容纳&r其中的流体，防止你被烫伤、冻伤或飘起来。\n\n如果你渴望&9更大&r的存储空间，可以看看更高级的量子箱、量子缸或AE2存储元件。", "quests.steam_age.supers.task": "任何超级箱或超级缸", + "quests.steam_age.steam_presser.title": "大型蒸汽锻造锤", + "quests.steam_age.steam_presser.subtitle": "蒸汽锻造锤的姑妈", + "quests.steam_age.steam_presser.desc": "大型蒸汽锻造锤是蒸汽锻造锤的多方块并行升级版本。\n\n如果锻造锤成为了你生产线中的瓶颈，这个升级或许能派上用场。否则，可以跳过它。", + "quests.steam_age.steam_fuser.title": "大型蒸汽合金炉", + "quests.steam_age.steam_fuser.subtitle": "蒸汽合金炉的远房表亲", + "quests.steam_age.steam_fuser.desc": "&3大型蒸汽合金炉&r是蒸汽合金炉的升级版，体型更大，性能更强。需要大量、快速地生产合金吗？这台机器正合你意！", + "quests.steam_age.steam_squasher.title": "大型蒸汽压缩机", + "quests.steam_age.steam_squasher.subtitle": "蒸汽压缩机的青梅竹马", + "quests.steam_age.steam_squasher.desc": "需要同时压缩大量材料？&3大型蒸汽压缩机&r作为一款多方块并行压缩机，或许能帮上忙。", "quests.stone_age": "石器时代", "quests.stone_age.subtitle": "简陋开端", "quests.stone_age.foods.title": "饿了？", diff --git a/kubejs/assets/tfg/models/block/lava_source.json b/kubejs/assets/tfg/models/block/lava_source.json new file mode 100644 index 000000000..48139f706 --- /dev/null +++ b/kubejs/assets/tfg/models/block/lava_source.json @@ -0,0 +1,65 @@ +{ + "credit": "Made with Blockbench", + "ambientocclusion": false, + "render_type": "cutout_mipped", + "textures": { + "0": "tfg:block/planets/venus/lava_source", + "particle": "tfg:block/planets/venus/lava_source" + }, + "elements": [ + { + "from": [0.8, 0, 8], + "to": [15.2, 16, 8], + "shade": false, + "rotation": {"angle": 45, "axis": "y", "origin": [8, 8, 8], "rescale": true}, + "faces": { + "north": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "east": {"uv": [0, 0, 0, 0], "texture": "#0"}, + "south": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "west": {"uv": [0, 0, 0, 0], "texture": "#0"}, + "up": {"uv": [0, 0, 0, 0], "texture": "#0"}, + "down": {"uv": [0, 0, 0, 0], "texture": "#0"} + } + }, + { + "from": [8, 0, 0.8], + "to": [8, 16, 15.2], + "shade": false, + "rotation": {"angle": 45, "axis": "y", "origin": [8, 8, 8], "rescale": true}, + "faces": { + "north": {"uv": [0, 0, 0, 0], "texture": "#0"}, + "east": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "south": {"uv": [0, 0, 0, 0], "texture": "#0"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "up": {"uv": [0, 0, 0, 0], "texture": "#0"}, + "down": {"uv": [0, 0, 0, 0], "texture": "#0"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 2.5], + "scale": [0.375, 0.375, 0.375] + }, + "thirdperson_lefthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 2.5], + "scale": [0.375, 0.375, 0.375] + }, + "firstperson_righthand": { + "rotation": [0, 45, 0], + "translation": [0, 2, 0], + "scale": [0.4, 0.4, 0.4] + }, + "firstperson_lefthand": { + "rotation": [0, 225, 0], + "translation": [0, 2, 0], + "scale": [0.4, 0.4, 0.4] + }, + "ground": { + "translation": [0, 3, 0], + "scale": [0.25, 0.25, 0.25] + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/machines/steam_bloomery.json b/kubejs/assets/tfg/models/block/machines/steam_bloomery.json new file mode 100644 index 000000000..5227238d0 --- /dev/null +++ b/kubejs/assets/tfg/models/block/machines/steam_bloomery.json @@ -0,0 +1,86 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "tfg:steam_bloomery", + "texture_overrides": { + "all": "gtceu:block/casings/solid/machine_casing_bronze_plated_bricks" + }, + "variants": { + "is_formed=false,recipe_logic_status=idle": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "gtceu:block/casings/solid/machine_casing_bronze_plated_bricks", + "overlay_front": "tfg:block/machines/steam_bloomery/overlay_front" + } + } + }, + "is_formed=false,recipe_logic_status=suspend": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "gtceu:block/casings/solid/machine_casing_bronze_plated_bricks", + "overlay_front": "tfg:block/machines/steam_bloomery/overlay_front" + } + } + }, + "is_formed=false,recipe_logic_status=waiting": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "gtceu:block/casings/solid/machine_casing_bronze_plated_bricks", + "overlay_front": "tfg:block/machines/steam_bloomery/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/steam_bloomery/overlay_front_active" + } + } + }, + "is_formed=false,recipe_logic_status=working": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "gtceu:block/casings/solid/machine_casing_bronze_plated_bricks", + "overlay_front": "tfg:block/machines/steam_bloomery/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/steam_bloomery/overlay_front_active" + } + } + }, + "is_formed=true,recipe_logic_status=idle": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "gtceu:block/casings/solid/machine_casing_bronze_plated_bricks", + "overlay_front": "tfg:block/machines/steam_bloomery/overlay_front" + } + } + }, + "is_formed=true,recipe_logic_status=suspend": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "gtceu:block/casings/solid/machine_casing_bronze_plated_bricks", + "overlay_front": "tfg:block/machines/steam_bloomery/overlay_front" + } + } + }, + "is_formed=true,recipe_logic_status=waiting": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "gtceu:block/casings/solid/machine_casing_bronze_plated_bricks", + "overlay_front": "tfg:block/machines/steam_bloomery/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/steam_bloomery/overlay_front_active" + } + } + }, + "is_formed=true,recipe_logic_status=working": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "gtceu:block/casings/solid/machine_casing_bronze_plated_bricks", + "overlay_front": "tfg:block/machines/steam_bloomery/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/steam_bloomery/overlay_front_active" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/machines/steam_fuser.json b/kubejs/assets/tfg/models/block/machines/steam_fuser.json new file mode 100644 index 000000000..07f9b8670 --- /dev/null +++ b/kubejs/assets/tfg/models/block/machines/steam_fuser.json @@ -0,0 +1,110 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "tfg:steam_fuser", + "texture_overrides": { + "all": "gtceu:block/casings/solid/machine_casing_bronze_plated_bricks" + }, + "dynamic_renders": [ + { + "type": "gtceu:boiler_multi_parts", + "casing_block": { + "Name": "gtceu:steam_machine_casing" + }, + "firebox_active": { + "Name": "gtceu:bronze_firebox_casing", + "Properties": { + "active": "true" + } + }, + "firebox_idle": { + "Name": "gtceu:bronze_firebox_casing", + "Properties": { + "active": "false" + } + } + } + ], + "variants": { + "is_formed=false,recipe_logic_status=idle": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "gtceu:block/casings/solid/machine_casing_bronze_plated_bricks", + "overlay_front": "gtceu:block/machines/alloy_smelter/overlay_front", + "overlay_front_emissive": "gtceu:block/machines/alloy_smelter/overlay_front_emissive" + } + } + }, + "is_formed=false,recipe_logic_status=suspend": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "gtceu:block/casings/solid/machine_casing_bronze_plated_bricks", + "overlay_front": "gtceu:block/machines/alloy_smelter/overlay_front_paused", + "overlay_front_emissive": "gtceu:block/machines/alloy_smelter/overlay_front_paused_emissive" + } + } + }, + "is_formed=false,recipe_logic_status=waiting": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "gtceu:block/casings/solid/machine_casing_bronze_plated_bricks", + "overlay_front": "gtceu:block/machines/alloy_smelter/overlay_front_active", + "overlay_front_emissive": "gtceu:block/machines/alloy_smelter/overlay_front_active_emissive" + } + } + }, + "is_formed=false,recipe_logic_status=working": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "gtceu:block/casings/solid/machine_casing_bronze_plated_bricks", + "overlay_front": "gtceu:block/machines/alloy_smelter/overlay_front_active", + "overlay_front_emissive": "gtceu:block/machines/alloy_smelter/overlay_front_active_emissive" + } + } + }, + "is_formed=true,recipe_logic_status=idle": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "gtceu:block/casings/solid/machine_casing_bronze_plated_bricks", + "overlay_front": "gtceu:block/machines/alloy_smelter/overlay_front", + "overlay_front_emissive": "gtceu:block/machines/alloy_smelter/overlay_front_emissive" + } + } + }, + "is_formed=true,recipe_logic_status=suspend": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "gtceu:block/casings/solid/machine_casing_bronze_plated_bricks", + "overlay_front": "gtceu:block/machines/alloy_smelter/overlay_front_paused", + "overlay_front_emissive": "gtceu:block/machines/alloy_smelter/overlay_front_paused_emissive" + } + } + }, + "is_formed=true,recipe_logic_status=waiting": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "gtceu:block/casings/solid/machine_casing_bronze_plated_bricks", + "overlay_front": "gtceu:block/machines/alloy_smelter/overlay_front_active", + "overlay_front_emissive": "gtceu:block/machines/alloy_smelter/overlay_front_active_emissive" + } + } + }, + "is_formed=true,recipe_logic_status=working": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "gtceu:block/casings/solid/machine_casing_bronze_plated_bricks", + "overlay_front": "gtceu:block/machines/alloy_smelter/overlay_front_active", + "overlay_front_emissive": "gtceu:block/machines/alloy_smelter/overlay_front_active_emissive" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/machines/steam_presser.json b/kubejs/assets/tfg/models/block/machines/steam_presser.json new file mode 100644 index 000000000..b088103a0 --- /dev/null +++ b/kubejs/assets/tfg/models/block/machines/steam_presser.json @@ -0,0 +1,86 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "tfg:steam_presser", + "texture_overrides": { + "all": "gtceu:block/casings/solid/machine_casing_bronze_plated_bricks" + }, + "variants": { + "is_formed=false,recipe_logic_status=idle": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "gtceu:block/casings/solid/machine_casing_bronze_plated_bricks", + "overlay_front": "gtceu:block/machines/forge_hammer/overlay_front" + } + } + }, + "is_formed=false,recipe_logic_status=suspend": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "gtceu:block/casings/solid/machine_casing_bronze_plated_bricks", + "overlay_front": "gtceu:block/machines/forge_hammer/overlay_front" + } + } + }, + "is_formed=false,recipe_logic_status=waiting": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "gtceu:block/casings/solid/machine_casing_bronze_plated_bricks", + "overlay_front": "gtceu:block/machines/forge_hammer/overlay_front_active", + "overlay_front_emissive": "gtceu:block/machines/forge_hammer/overlay_front_active_emissive" + } + } + }, + "is_formed=false,recipe_logic_status=working": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "gtceu:block/casings/solid/machine_casing_bronze_plated_bricks", + "overlay_front": "gtceu:block/machines/forge_hammer/overlay_front_active", + "overlay_front_emissive": "gtceu:block/machines/forge_hammer/overlay_front_active_emissive" + } + } + }, + "is_formed=true,recipe_logic_status=idle": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "gtceu:block/casings/solid/machine_casing_bronze_plated_bricks", + "overlay_front": "gtceu:block/machines/forge_hammer/overlay_front" + } + } + }, + "is_formed=true,recipe_logic_status=suspend": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "gtceu:block/casings/solid/machine_casing_bronze_plated_bricks", + "overlay_front": "gtceu:block/machines/forge_hammer/overlay_front" + } + } + }, + "is_formed=true,recipe_logic_status=waiting": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "gtceu:block/casings/solid/machine_casing_bronze_plated_bricks", + "overlay_front": "gtceu:block/machines/forge_hammer/overlay_front_active", + "overlay_front_emissive": "gtceu:block/machines/forge_hammer/overlay_front_active_emissive" + } + } + }, + "is_formed=true,recipe_logic_status=working": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "gtceu:block/casings/solid/machine_casing_bronze_plated_bricks", + "overlay_front": "gtceu:block/machines/forge_hammer/overlay_front_active", + "overlay_front_emissive": "gtceu:block/machines/forge_hammer/overlay_front_active_emissive" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/machines/steam_squasher.json b/kubejs/assets/tfg/models/block/machines/steam_squasher.json new file mode 100644 index 000000000..e2b41d508 --- /dev/null +++ b/kubejs/assets/tfg/models/block/machines/steam_squasher.json @@ -0,0 +1,90 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "tfg:steam_squasher", + "texture_overrides": { + "all": "gtceu:block/casings/solid/machine_casing_bronze_plated_bricks" + }, + "variants": { + "is_formed=false,recipe_logic_status=idle": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "gtceu:block/casings/solid/machine_casing_bronze_plated_bricks", + "overlay_front": "gtceu:block/machines/compressor/overlay_front", + "overlay_front_emissive": "gtceu:block/machines/compressor/overlay_front_emissive" + } + } + }, + "is_formed=false,recipe_logic_status=suspend": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "gtceu:block/casings/solid/machine_casing_bronze_plated_bricks", + "overlay_front": "gtceu:block/machines/compressor/overlay_front", + "overlay_front_emissive": "gtceu:block/machines/compressor/overlay_front_emissive" + } + } + }, + "is_formed=false,recipe_logic_status=waiting": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "gtceu:block/casings/solid/machine_casing_bronze_plated_bricks", + "overlay_front": "gtceu:block/machines/compressor/overlay_front_active", + "overlay_front_emissive": "gtceu:block/machines/compressor/overlay_front_active_emissive" + } + } + }, + "is_formed=false,recipe_logic_status=working": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "gtceu:block/casings/solid/machine_casing_bronze_plated_bricks", + "overlay_front": "gtceu:block/machines/compressor/overlay_front_active", + "overlay_front_emissive": "gtceu:block/machines/compressor/overlay_front_active_emissive" + } + } + }, + "is_formed=true,recipe_logic_status=idle": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "gtceu:block/casings/solid/machine_casing_bronze_plated_bricks", + "overlay_front": "gtceu:block/machines/compressor/overlay_front", + "overlay_front_emissive": "gtceu:block/machines/compressor/overlay_front_emissive" + } + } + }, + "is_formed=true,recipe_logic_status=suspend": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "gtceu:block/casings/solid/machine_casing_bronze_plated_bricks", + "overlay_front": "gtceu:block/machines/compressor/overlay_front", + "overlay_front_emissive": "gtceu:block/machines/compressor/overlay_front_emissive" + } + } + }, + "is_formed=true,recipe_logic_status=waiting": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "gtceu:block/casings/solid/machine_casing_bronze_plated_bricks", + "overlay_front": "gtceu:block/machines/compressor/overlay_front_active", + "overlay_front_emissive": "gtceu:block/machines/compressor/overlay_front_active_emissive" + } + } + }, + "is_formed=true,recipe_logic_status=working": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "gtceu:block/casings/solid/machine_casing_bronze_plated_bricks", + "overlay_front": "gtceu:block/machines/compressor/overlay_front_active", + "overlay_front_emissive": "gtceu:block/machines/compressor/overlay_front_active_emissive" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/machines/steam_thermal_centrifuge.json b/kubejs/assets/tfg/models/block/machines/steam_thermal_centrifuge.json new file mode 100644 index 000000000..270c629d8 --- /dev/null +++ b/kubejs/assets/tfg/models/block/machines/steam_thermal_centrifuge.json @@ -0,0 +1,110 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "tfg:steam_thermal_centrifuge", + "texture_overrides": { + "all": "gtceu:block/casings/gcym/industrial_steam_casing" + }, + "dynamic_renders": [ + { + "type": "gtceu:boiler_multi_parts", + "casing_block": { + "Name": "gtceu:industrial_steam_casing" + }, + "firebox_active": { + "Name": "gtceu:steel_firebox_casing", + "Properties": { + "active": "true" + } + }, + "firebox_idle": { + "Name": "gtceu:steel_firebox_casing", + "Properties": { + "active": "false" + } + } + } + ], + "variants": { + "is_formed=false,recipe_logic_status=idle": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "gtceu:block/casings/gcym/industrial_steam_casing", + "overlay_front": "gtceu:block/machines/thermal_centrifuge/overlay_front", + "overlay_front_emissive": "gtceu:block/machines/thermal_centrifuge/overlay_front_emissive" + } + } + }, + "is_formed=false,recipe_logic_status=suspend": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "gtceu:block/casings/gcym/industrial_steam_casing", + "overlay_front": "gtceu:block/machines/thermal_centrifuge/overlay_front_paused", + "overlay_front_emissive": "gtceu:block/machines/thermal_centrifuge/overlay_front_paused_emissive" + } + } + }, + "is_formed=false,recipe_logic_status=waiting": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "gtceu:block/casings/gcym/industrial_steam_casing", + "overlay_front": "gtceu:block/machines/thermal_centrifuge/overlay_front_active", + "overlay_front_emissive": "gtceu:block/machines/thermal_centrifuge/overlay_front_active_emissive" + } + } + }, + "is_formed=false,recipe_logic_status=working": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "gtceu:block/casings/gcym/industrial_steam_casing", + "overlay_front": "gtceu:block/machines/thermal_centrifuge/overlay_front_active", + "overlay_front_emissive": "gtceu:block/machines/thermal_centrifuge/overlay_front_active_emissive" + } + } + }, + "is_formed=true,recipe_logic_status=idle": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "gtceu:block/casings/gcym/industrial_steam_casing", + "overlay_front": "gtceu:block/machines/thermal_centrifuge/overlay_front", + "overlay_front_emissive": "gtceu:block/machines/thermal_centrifuge/overlay_front_emissive" + } + } + }, + "is_formed=true,recipe_logic_status=suspend": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "gtceu:block/casings/gcym/industrial_steam_casing", + "overlay_front": "gtceu:block/machines/thermal_centrifuge/overlay_front_paused", + "overlay_front_emissive": "gtceu:block/machines/thermal_centrifuge/overlay_front_paused_emissive" + } + } + }, + "is_formed=true,recipe_logic_status=waiting": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "gtceu:block/casings/gcym/industrial_steam_casing", + "overlay_front": "gtceu:block/machines/thermal_centrifuge/overlay_front_active", + "overlay_front_emissive": "gtceu:block/machines/thermal_centrifuge/overlay_front_active_emissive" + } + } + }, + "is_formed=true,recipe_logic_status=working": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "gtceu:block/casings/gcym/industrial_steam_casing", + "overlay_front": "gtceu:block/machines/thermal_centrifuge/overlay_front_active", + "overlay_front_emissive": "gtceu:block/machines/thermal_centrifuge/overlay_front_active_emissive" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/pile/volcanic_ash/ash_block.json b/kubejs/assets/tfg/models/block/pile/volcanic_ash/ash_block.json new file mode 100644 index 000000000..a4ad75964 --- /dev/null +++ b/kubejs/assets/tfg/models/block/pile/volcanic_ash/ash_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "tfg:block/planets/venus/volcanic_ash" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/pile/volcanic_ash/ash_height10.json b/kubejs/assets/tfg/models/block/pile/volcanic_ash/ash_height10.json new file mode 100644 index 000000000..7aad8a3c5 --- /dev/null +++ b/kubejs/assets/tfg/models/block/pile/volcanic_ash/ash_height10.json @@ -0,0 +1,7 @@ +{ + "parent": "tfg:block/ash_pile/ash_height10", + "textures": { + "particle": "tfg:block/planets/venus/volcanic_ash", + "texture": "tfg:block/planets/venus/volcanic_ash" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/pile/volcanic_ash/ash_height12.json b/kubejs/assets/tfg/models/block/pile/volcanic_ash/ash_height12.json new file mode 100644 index 000000000..6bf32c727 --- /dev/null +++ b/kubejs/assets/tfg/models/block/pile/volcanic_ash/ash_height12.json @@ -0,0 +1,7 @@ +{ + "parent": "tfg:block/ash_pile/ash_height12", + "textures": { + "particle": "tfg:block/planets/venus/volcanic_ash", + "texture": "tfg:block/planets/venus/volcanic_ash" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/pile/volcanic_ash/ash_height14.json b/kubejs/assets/tfg/models/block/pile/volcanic_ash/ash_height14.json new file mode 100644 index 000000000..6c760db71 --- /dev/null +++ b/kubejs/assets/tfg/models/block/pile/volcanic_ash/ash_height14.json @@ -0,0 +1,7 @@ +{ + "parent": "tfg:block/ash_pile/ash_height14", + "textures": { + "particle": "tfg:block/planets/venus/volcanic_ash", + "texture": "tfg:block/planets/venus/volcanic_ash" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/pile/volcanic_ash/ash_height2.json b/kubejs/assets/tfg/models/block/pile/volcanic_ash/ash_height2.json new file mode 100644 index 000000000..119ff312d --- /dev/null +++ b/kubejs/assets/tfg/models/block/pile/volcanic_ash/ash_height2.json @@ -0,0 +1,7 @@ +{ + "parent": "tfg:block/ash_pile/ash_height2", + "textures": { + "particle": "tfg:block/planets/venus/volcanic_ash", + "texture": "tfg:block/planets/venus/volcanic_ash" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/pile/volcanic_ash/ash_height4.json b/kubejs/assets/tfg/models/block/pile/volcanic_ash/ash_height4.json new file mode 100644 index 000000000..595ff167f --- /dev/null +++ b/kubejs/assets/tfg/models/block/pile/volcanic_ash/ash_height4.json @@ -0,0 +1,7 @@ +{ + "parent": "tfg:block/ash_pile/ash_height4", + "textures": { + "particle": "tfg:block/planets/venus/volcanic_ash", + "texture": "tfg:block/planets/venus/volcanic_ash" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/pile/volcanic_ash/ash_height6.json b/kubejs/assets/tfg/models/block/pile/volcanic_ash/ash_height6.json new file mode 100644 index 000000000..3b3b8b81d --- /dev/null +++ b/kubejs/assets/tfg/models/block/pile/volcanic_ash/ash_height6.json @@ -0,0 +1,7 @@ +{ + "parent": "tfg:block/ash_pile/ash_height6", + "textures": { + "particle": "tfg:block/planets/venus/volcanic_ash", + "texture": "tfg:block/planets/venus/volcanic_ash" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/pile/volcanic_ash/ash_height8.json b/kubejs/assets/tfg/models/block/pile/volcanic_ash/ash_height8.json new file mode 100644 index 000000000..dd568468a --- /dev/null +++ b/kubejs/assets/tfg/models/block/pile/volcanic_ash/ash_height8.json @@ -0,0 +1,7 @@ +{ + "parent": "tfg:block/ash_pile/ash_height8", + "textures": { + "particle": "tfg:block/planets/venus/volcanic_ash", + "texture": "tfg:block/planets/venus/volcanic_ash" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/smoker_source.json b/kubejs/assets/tfg/models/block/smoker_source.json new file mode 100644 index 000000000..c8969467c --- /dev/null +++ b/kubejs/assets/tfg/models/block/smoker_source.json @@ -0,0 +1,65 @@ +{ + "credit": "Made with Blockbench", + "ambientocclusion": false, + "render_type": "cutout_mipped", + "textures": { + "0": "tfg:block/planets/venus/smoker_source", + "particle": "tfg:block/planets/venus/smoker_source" + }, + "elements": [ + { + "from": [0.8, 0, 8], + "to": [15.2, 16, 8], + "shade": false, + "rotation": {"angle": 45, "axis": "y", "origin": [8, 8, 8], "rescale": true}, + "faces": { + "north": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "east": {"uv": [0, 0, 0, 0], "texture": "#0"}, + "south": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "west": {"uv": [0, 0, 0, 0], "texture": "#0"}, + "up": {"uv": [0, 0, 0, 0], "texture": "#0"}, + "down": {"uv": [0, 0, 0, 0], "texture": "#0"} + } + }, + { + "from": [8, 0, 0.8], + "to": [8, 16, 15.2], + "shade": false, + "rotation": {"angle": 45, "axis": "y", "origin": [8, 8, 8], "rescale": true}, + "faces": { + "north": {"uv": [0, 0, 0, 0], "texture": "#0"}, + "east": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "south": {"uv": [0, 0, 0, 0], "texture": "#0"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "up": {"uv": [0, 0, 0, 0], "texture": "#0"}, + "down": {"uv": [0, 0, 0, 0], "texture": "#0"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 2.5], + "scale": [0.375, 0.375, 0.375] + }, + "thirdperson_lefthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 2.5], + "scale": [0.375, 0.375, 0.375] + }, + "firstperson_righthand": { + "rotation": [0, 45, 0], + "translation": [0, 2, 0], + "scale": [0.4, 0.4, 0.4] + }, + "firstperson_lefthand": { + "rotation": [0, 225, 0], + "translation": [0, 2, 0], + "scale": [0.4, 0.4, 0.4] + }, + "ground": { + "translation": [0, 3, 0], + "scale": [0.25, 0.25, 0.25] + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/lava_source.json b/kubejs/assets/tfg/models/item/lava_source.json new file mode 100644 index 000000000..1b4b23d49 --- /dev/null +++ b/kubejs/assets/tfg/models/item/lava_source.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "tfg:block/planets/venus/lava_source" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/paracetamol_pill.json b/kubejs/assets/tfg/models/item/paracetamol_pill.json new file mode 100644 index 000000000..845b7dea0 --- /dev/null +++ b/kubejs/assets/tfg/models/item/paracetamol_pill.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "gtceu:item/paracetamol_pill" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/pile/volcanic_ash.json b/kubejs/assets/tfg/models/item/pile/volcanic_ash.json new file mode 100644 index 000000000..9d59a55c3 --- /dev/null +++ b/kubejs/assets/tfg/models/item/pile/volcanic_ash.json @@ -0,0 +1,3 @@ +{ + "parent": "tfg:block/pile/volcanic_ash/ash_block" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/rad_away_pill.json b/kubejs/assets/tfg/models/item/rad_away_pill.json new file mode 100644 index 000000000..aaec1fa82 --- /dev/null +++ b/kubejs/assets/tfg/models/item/rad_away_pill.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "gtceu:item/rad_away_pill" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/smoker_source.json b/kubejs/assets/tfg/models/item/smoker_source.json new file mode 100644 index 000000000..9f6860a25 --- /dev/null +++ b/kubejs/assets/tfg/models/item/smoker_source.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "tfg:block/planets/venus/smoker_source" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/steam_bloomery.json b/kubejs/assets/tfg/models/item/steam_bloomery.json new file mode 100644 index 000000000..f37cc19e8 --- /dev/null +++ b/kubejs/assets/tfg/models/item/steam_bloomery.json @@ -0,0 +1,3 @@ +{ + "parent": "tfg:block/machines/steam_bloomery" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/steam_fuser.json b/kubejs/assets/tfg/models/item/steam_fuser.json new file mode 100644 index 000000000..421b4d1ca --- /dev/null +++ b/kubejs/assets/tfg/models/item/steam_fuser.json @@ -0,0 +1,3 @@ +{ + "parent": "tfg:block/machines/steam_fuser" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/steam_presser.json b/kubejs/assets/tfg/models/item/steam_presser.json new file mode 100644 index 000000000..5588b3d45 --- /dev/null +++ b/kubejs/assets/tfg/models/item/steam_presser.json @@ -0,0 +1,3 @@ +{ + "parent": "tfg:block/machines/steam_presser" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/steam_squasher.json b/kubejs/assets/tfg/models/item/steam_squasher.json new file mode 100644 index 000000000..e44a2bda6 --- /dev/null +++ b/kubejs/assets/tfg/models/item/steam_squasher.json @@ -0,0 +1,3 @@ +{ + "parent": "tfg:block/machines/steam_squasher" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/steam_thermal_centrifuge.json b/kubejs/assets/tfg/models/item/steam_thermal_centrifuge.json new file mode 100644 index 000000000..7854ac2af --- /dev/null +++ b/kubejs/assets/tfg/models/item/steam_thermal_centrifuge.json @@ -0,0 +1,3 @@ +{ + "parent": "tfg:block/machines/steam_thermal_centrifuge" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/sounds.json b/kubejs/assets/tfg/sounds.json index 1a9e7be7c..56ed1adba 100644 --- a/kubejs/assets/tfg/sounds.json +++ b/kubejs/assets/tfg/sounds.json @@ -2,7 +2,7 @@ "ambient.upper_nether_lush.loop": { "sounds": [ { - "name": "ambientsounds:cave/cave_lush", + "name": "ambientsounds:cave/cave-lush", "stream": true, "volume": 1 }, @@ -203,38 +203,6 @@ { "name": "minecraft:ambient/nether/nether_wastes/ground4", "volume": 0.4 - }, - { - "name": "minecraft:ambientsounds:cave/cave-water1", - "stream": true - }, - { - "name": "minecraft:ambientsounds:cave/cave-water2", - "stream": true - }, - { - "name": "minecraft:ambientsounds:cave/cave-water3", - "stream": true - }, - { - "name": "minecraft:ambientsounds:cave/cave-water4", - "stream": true - }, - { - "name": "minecraft:ambientsounds:cave/cave-water5", - "stream": true - }, - { - "name": "minecraft:ambientsounds:cave/cave-large1", - "stream": true - }, - { - "name": "minecraft:ambientsounds:cave/cave-large2", - "stream": true - }, - { - "name": "minecraft:ambientsounds:cave/cave-lush", - "stream": true } ] }, diff --git a/kubejs/assets/tfg/textures/block/steam_bloomery/overlay_front.png b/kubejs/assets/tfg/textures/block/machines/steam_bloomery/overlay_front.png similarity index 100% rename from kubejs/assets/tfg/textures/block/steam_bloomery/overlay_front.png rename to kubejs/assets/tfg/textures/block/machines/steam_bloomery/overlay_front.png diff --git a/kubejs/assets/tfg/textures/block/steam_bloomery/overlay_front_active.png b/kubejs/assets/tfg/textures/block/machines/steam_bloomery/overlay_front_active.png similarity index 100% rename from kubejs/assets/tfg/textures/block/steam_bloomery/overlay_front_active.png rename to kubejs/assets/tfg/textures/block/machines/steam_bloomery/overlay_front_active.png diff --git a/kubejs/assets/tfg/textures/block/steam_bloomery/overlay_front_active.png.mcmeta b/kubejs/assets/tfg/textures/block/machines/steam_bloomery/overlay_front_active.png.mcmeta similarity index 100% rename from kubejs/assets/tfg/textures/block/steam_bloomery/overlay_front_active.png.mcmeta rename to kubejs/assets/tfg/textures/block/machines/steam_bloomery/overlay_front_active.png.mcmeta diff --git a/kubejs/assets/tfg/textures/block/planets/venus/lava_source.png b/kubejs/assets/tfg/textures/block/planets/venus/lava_source.png new file mode 100644 index 000000000..cc2c1ce2d Binary files /dev/null and b/kubejs/assets/tfg/textures/block/planets/venus/lava_source.png differ diff --git a/kubejs/assets/tfg/textures/block/planets/venus/smoker_source.png b/kubejs/assets/tfg/textures/block/planets/venus/smoker_source.png new file mode 100644 index 000000000..7305ee126 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/planets/venus/smoker_source.png differ diff --git a/kubejs/assets/tfg/textures/block/planets/venus/volcanic_ash.png b/kubejs/assets/tfg/textures/block/planets/venus/volcanic_ash.png new file mode 100644 index 000000000..1f657c59b Binary files /dev/null and b/kubejs/assets/tfg/textures/block/planets/venus/volcanic_ash.png differ diff --git a/kubejs/assets/tfg/textures/mob_effect/cooling.png b/kubejs/assets/tfg/textures/mob_effect/cooling.png index 609186a2b..06feddf71 100644 Binary files a/kubejs/assets/tfg/textures/mob_effect/cooling.png and b/kubejs/assets/tfg/textures/mob_effect/cooling.png differ diff --git a/kubejs/assets/tfg/textures/mob_effect/nausea_warning.png b/kubejs/assets/tfg/textures/mob_effect/nausea_warning.png index fcbb86607..5c2f3fe7d 100644 Binary files a/kubejs/assets/tfg/textures/mob_effect/nausea_warning.png and b/kubejs/assets/tfg/textures/mob_effect/nausea_warning.png differ diff --git a/kubejs/assets/tfg/textures/mob_effect/radioactive_warning.png b/kubejs/assets/tfg/textures/mob_effect/radioactive_warning.png new file mode 100644 index 000000000..b70cfb00c Binary files /dev/null and b/kubejs/assets/tfg/textures/mob_effect/radioactive_warning.png differ diff --git a/kubejs/assets/tfg/textures/mob_effect/warming.png b/kubejs/assets/tfg/textures/mob_effect/warming.png index 72ae45afb..977056ee0 100644 Binary files a/kubejs/assets/tfg/textures/mob_effect/warming.png and b/kubejs/assets/tfg/textures/mob_effect/warming.png differ diff --git a/kubejs/assets/tfg/textures/mob_effect/weak_poison_warning.png b/kubejs/assets/tfg/textures/mob_effect/weak_poison_warning.png index 657e1fa46..1fba3ae25 100644 Binary files a/kubejs/assets/tfg/textures/mob_effect/weak_poison_warning.png and b/kubejs/assets/tfg/textures/mob_effect/weak_poison_warning.png differ diff --git a/kubejs/assets/tfg_excludes.zip b/kubejs/assets/tfg_excludes.zip index bf2b199b0..fc97c92b3 100644 Binary files a/kubejs/assets/tfg_excludes.zip and b/kubejs/assets/tfg_excludes.zip differ diff --git a/kubejs/client_scripts/tooltips.js b/kubejs/client_scripts/tooltips.js index 0528360e3..2a72f591c 100644 --- a/kubejs/client_scripts/tooltips.js +++ b/kubejs/client_scripts/tooltips.js @@ -68,8 +68,8 @@ const registerTooltips = (event) => { event.addAdvanced(['tfg:ostrum_linear_accelerator'], (item, advanced, text) => { text.add(1, Text.translate('gtceu.tooltip.machine.ostrum_linear_accelerator_1')); text.add(2, Text.translate('gtceu.tooltip.machine.ostrum_linear_accelerator_2')); - text.add(2, Text.translate('gtceu.tooltip.machine.ostrum_linear_accelerator_3')); - text.add(3, Text.translate('tfg.tooltip.machine.two_energy_hatches')); + text.add(3, Text.translate('gtceu.tooltip.machine.ostrum_linear_accelerator_3')); + text.add(4, Text.translate('tfg.tooltip.machine.two_energy_hatches')); }) event.addAdvanced(['gtceu:heat_exchanger'], (item, advanced, text) => { text.add(1, Text.translate('gtceu.tooltip.machine.heat_exchanger_1')); @@ -84,11 +84,27 @@ const registerTooltips = (event) => { text.add(3, Text.translate('tfg.tooltip.machine.coil_speed_discount')); text.add(4, Text.translate('tfg.tooltip.machine.one_energy_hatch')); }) - event.addAdvanced(['gtceu:steam_bloomery'], (item, advanced, text) => { + event.addAdvanced(['tfg:steam_bloomery'], (item, advanced, text) => { text.add(1, Text.translate('gtceu.tooltip.machine.steam_bloomery_1')); text.add(2, Text.translate('gtceu.tooltip.machine.steam_bloomery_2')); - text.add(2, Text.translate('gtceu.tooltip.machine.steam_bloomery_3')); - text.add(2, Text.translate('gtceu.tooltip.machine.steam_bloomery_4')); + text.add(3, Text.translate('gtceu.tooltip.machine.steam_bloomery_3')); + text.add(4, Text.translate('gtceu.tooltip.machine.steam_parallel')); + }) + event.addAdvanced(['tfg:steam_thermal_centrifuge'], (item, advanced, text) => { + text.add(1, Text.translate('gtceu.machine.lv_thermal_centrifuge.tooltip')); + text.add(2, Text.translate('gtceu.tooltip.machine.steam_parallel')); + }) + event.addAdvanced(['tfg:steam_fuser'], (item, advanced, text) => { + text.add(1, Text.translate('gtceu.machine.hp_steam_alloy_smelter.tooltip')); + text.add(2, Text.translate('gtceu.tooltip.machine.steam_parallel')); + }) + event.addAdvanced(['tfg:steam_squasher'], (item, advanced, text) => { + text.add(1, Text.translate('gtceu.machine.hp_steam_compressor.tooltip')); + text.add(2, Text.translate('gtceu.tooltip.machine.steam_parallel')); + }) + event.addAdvanced(['tfg:steam_presser'], (item, advanced, text) => { + text.add(1, Text.translate('gtceu.machine.hp_steam_forge_hammer.tooltip')); + text.add(2, Text.translate('gtceu.tooltip.machine.steam_parallel')); }) event.addAdvanced(['gtceu:large_chemical_reactor'], (item, advanced, text) => { text.add(1, Text.translate('tfg.tooltip.machine.perfect_overclock')); @@ -98,7 +114,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(3, Text.translate('tfg.tooltip.machine.one_energy_hatch')); + text.add(4, Text.translate('tfg.tooltip.machine.one_energy_hatch')); }) // Hot or not containers @@ -277,10 +293,10 @@ const registerTooltips = (event) => { event.addAdvanced(['tfc:wooden_bucket', 'firmalife:mixing_bowl'], (item, advanced, text) => { text.add(1, Text.translate("gtceu.universal.tooltip.fluid_storage_capacity", "1,000")) }) - event.addAdvanced(['waterflasks:leather_flask'], (item, advanced, text) => { + event.addAdvanced(['waterflasks:leather_flask','tfc:silica_glass_bottle'], (item, advanced, text) => { text.add(1, Text.translate("gtceu.universal.tooltip.fluid_storage_capacity", "500")) }) - event.addAdvanced(['tfc:hematitic_glass_bottle', 'tfc:silica_glass_bottle', 'tfc:volcanic_glass_bottle', 'tfc:olivine_glass_bottle'], (item, advanced, text) => { + event.addAdvanced(['tfc:hematitic_glass_bottle', 'tfc:volcanic_glass_bottle', 'tfc:olivine_glass_bottle'], (item, advanced, text) => { text.add(1, Text.translate("gtceu.universal.tooltip.fluid_storage_capacity", "400")) }) event.addAdvanced(['#tfc:lamps'], (item, advanced, text) => { diff --git a/kubejs/data/ad_astra/dimension/venus.json b/kubejs/data/ad_astra/dimension/venus.json index b35603594..6d7dba3d4 100644 --- a/kubejs/data/ad_astra/dimension/venus.json +++ b/kubejs/data/ad_astra/dimension/venus.json @@ -790,7 +790,7 @@ { - "biome": "tfg:venus/volcanic_mountains", + "biome": "tfg:venus/scorching_volcanoes", "parameters": { "temperature": 0, "humidity": 0, @@ -802,7 +802,7 @@ } }, { - "biome": "tfg:venus/volcanic_mountains", + "biome": "tfg:venus/scorching_volcanoes", "parameters": { "temperature": 0, "humidity": 0, @@ -814,7 +814,7 @@ } }, { - "biome": "tfg:venus/volcanic_mountains", + "biome": "tfg:venus/scorching_volcanoes", "parameters": { "temperature": 0, "humidity": 0, diff --git a/kubejs/data/arthropocolypse/tags/worldgen/structure_set/desert_nest_avoid.json b/kubejs/data/arthropocolypse/tags/worldgen/structure_set/desert_nest_avoid.json new file mode 100644 index 000000000..14735be37 --- /dev/null +++ b/kubejs/data/arthropocolypse/tags/worldgen/structure_set/desert_nest_avoid.json @@ -0,0 +1,4 @@ +{ + "replace": true, + "values": [] +} \ No newline at end of file diff --git a/kubejs/data/tfc_ruined_world/worldgen/structure_set/ancient_monument_1.json b/kubejs/data/tfc_ruined_world/worldgen/structure_set/ancient_monument_1.json index 3d4cf89c4..9b4106c08 100644 --- a/kubejs/data/tfc_ruined_world/worldgen/structure_set/ancient_monument_1.json +++ b/kubejs/data/tfc_ruined_world/worldgen/structure_set/ancient_monument_1.json @@ -11,8 +11,8 @@ ], "placement": { "salt": 1442136154, - "spacing": 50, - "separation": 30, + "spacing": 40, + "separation": 25, "type": "minecraft:random_spread" } } \ No newline at end of file diff --git a/kubejs/data/tfc_ruined_world/worldgen/structure_set/limestone_church.json b/kubejs/data/tfc_ruined_world/worldgen/structure_set/limestone_church.json index 8caa99546..f3d6a08b8 100644 --- a/kubejs/data/tfc_ruined_world/worldgen/structure_set/limestone_church.json +++ b/kubejs/data/tfc_ruined_world/worldgen/structure_set/limestone_church.json @@ -23,8 +23,8 @@ ], "placement": { "salt": 1442136151, - "spacing": 50, - "separation": 35, + "spacing": 45, + "separation": 25, "type": "minecraft:random_spread" } } \ No newline at end of file diff --git a/kubejs/data/tfc_ruined_world/worldgen/structure_set/tower_1.json b/kubejs/data/tfc_ruined_world/worldgen/structure_set/tower_1.json index 798b8ee98..d2d043efa 100644 --- a/kubejs/data/tfc_ruined_world/worldgen/structure_set/tower_1.json +++ b/kubejs/data/tfc_ruined_world/worldgen/structure_set/tower_1.json @@ -23,8 +23,8 @@ ], "placement": { "salt": 1442136152, - "spacing": 45, - "separation": 25, + "spacing": 35, + "separation": 15, "type": "minecraft:random_spread" } } \ No newline at end of file diff --git a/kubejs/data/tfc_ruins/worldgen/structure_set/ruins.json b/kubejs/data/tfc_ruins/worldgen/structure_set/ruins.json new file mode 100644 index 000000000..ea30d1eee --- /dev/null +++ b/kubejs/data/tfc_ruins/worldgen/structure_set/ruins.json @@ -0,0 +1,26 @@ +{ + "structures": [ + { + "structure": "tfc_ruins:ruin_small", + "weight": 4 + }, + { + "structure": "tfc_ruins:ruin_beach", + "weight": 3 + }, + { + "structure": "tfc_ruins:ruin_rich", + "weight": 2 + } + ], + "placement": { + "type": "minecraft:random_spread", + "salt": 9134739237, + "exclusion_zone": { + "other_set": "minecraft:strongholds", + "chunk_count": 6 + }, + "spacing": 35, + "separation": 10 + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/dimension_type/venus.json b/kubejs/data/tfg/dimension_type/venus.json index 9795e2356..b46147bce 100644 --- a/kubejs/data/tfg/dimension_type/venus.json +++ b/kubejs/data/tfg/dimension_type/venus.json @@ -10,14 +10,8 @@ "infiniburn": "#minecraft:infiniburn_overworld", "logical_height": 384, "min_y": -64, - "monster_spawn_block_light_limit": 0, - "monster_spawn_light_level": { - "type": "minecraft:uniform", - "value": { - "max_inclusive": 15, - "min_inclusive": 0 - } - }, + "monster_spawn_block_light_limit": 15, + "monster_spawn_light_level": 15, "natural": true, "piglin_safe": true, "respawn_anchor_works": false, diff --git a/kubejs/data/tfg/loot_tables/chests/arabic_illager_basic.json b/kubejs/data/tfg/loot_tables/chests/arabic_illager_basic.json index 38ef47961..fd5632223 100644 --- a/kubejs/data/tfg/loot_tables/chests/arabic_illager_basic.json +++ b/kubejs/data/tfg/loot_tables/chests/arabic_illager_basic.json @@ -249,7 +249,7 @@ { "type": "minecraft:item", "name": "tfc:powder/sulfur", - "weight": 50, + "weight": 80, "functions": [ { "add": false, @@ -329,7 +329,7 @@ { "type": "minecraft:item", "name": "minecraft:emerald", - "weight": 50, + "weight": 80, "functions": [ { "add": false, diff --git a/kubejs/data/tfg/loot_tables/chests/nordic_illager_basic.json b/kubejs/data/tfg/loot_tables/chests/nordic_illager_basic.json index 08f9b91fb..e119ad391 100644 --- a/kubejs/data/tfg/loot_tables/chests/nordic_illager_basic.json +++ b/kubejs/data/tfg/loot_tables/chests/nordic_illager_basic.json @@ -249,7 +249,7 @@ { "type": "minecraft:item", "name": "tfc:powder/sulfur", - "weight": 50, + "weight": 80, "functions": [ { "add": false, @@ -329,7 +329,7 @@ { "type": "minecraft:item", "name": "minecraft:emerald", - "weight": 50, + "weight": 80, "functions": [ { "add": false, diff --git a/kubejs/data/tfg/loot_tables/chests/yurts_illager_basic.json b/kubejs/data/tfg/loot_tables/chests/yurts_illager_basic.json index eaef2a59f..1d5b919cf 100644 --- a/kubejs/data/tfg/loot_tables/chests/yurts_illager_basic.json +++ b/kubejs/data/tfg/loot_tables/chests/yurts_illager_basic.json @@ -249,7 +249,7 @@ { "type": "minecraft:item", "name": "tfc:powder/sulfur", - "weight": 50, + "weight": 80, "functions": [ { "add": false, @@ -329,7 +329,7 @@ { "type": "minecraft:item", "name": "minecraft:emerald", - "weight": 50, + "weight": 80, "functions": [ { "add": false, diff --git a/kubejs/data/tfg/structures/arabic/baseline/barracks.nbt b/kubejs/data/tfg/structures/arabic/baseline/barracks.nbt index fa92c96a3..b651d20c2 100644 Binary files a/kubejs/data/tfg/structures/arabic/baseline/barracks.nbt and b/kubejs/data/tfg/structures/arabic/baseline/barracks.nbt differ diff --git a/kubejs/data/tfg/structures/arabic/baseline/house3.nbt b/kubejs/data/tfg/structures/arabic/baseline/house3.nbt index a162e5170..85f0d0916 100644 Binary files a/kubejs/data/tfg/structures/arabic/baseline/house3.nbt and b/kubejs/data/tfg/structures/arabic/baseline/house3.nbt differ diff --git a/kubejs/data/tfg/structures/arabic/baseline/house4.nbt b/kubejs/data/tfg/structures/arabic/baseline/house4.nbt index 882a2cfc3..aa3064473 100644 Binary files a/kubejs/data/tfg/structures/arabic/baseline/house4.nbt and b/kubejs/data/tfg/structures/arabic/baseline/house4.nbt differ diff --git a/kubejs/data/tfg/structures/arabic/baseline/house_garden.nbt b/kubejs/data/tfg/structures/arabic/baseline/house_garden.nbt index dd23674e9..a4f675c91 100644 Binary files a/kubejs/data/tfg/structures/arabic/baseline/house_garden.nbt and b/kubejs/data/tfg/structures/arabic/baseline/house_garden.nbt differ diff --git a/kubejs/data/tfg/structures/arabic/baseline/smithy.nbt b/kubejs/data/tfg/structures/arabic/baseline/smithy.nbt index 1f3ab03b8..8d0153fd1 100644 Binary files a/kubejs/data/tfg/structures/arabic/baseline/smithy.nbt and b/kubejs/data/tfg/structures/arabic/baseline/smithy.nbt differ diff --git a/kubejs/data/tfg/structures/arabic/baseline/stall_gray.nbt b/kubejs/data/tfg/structures/arabic/baseline/stall_gray.nbt index d4306cab8..62b0ffe17 100644 Binary files a/kubejs/data/tfg/structures/arabic/baseline/stall_gray.nbt and b/kubejs/data/tfg/structures/arabic/baseline/stall_gray.nbt differ diff --git a/kubejs/data/tfg/structures/arabic/baseline/stall_green.nbt b/kubejs/data/tfg/structures/arabic/baseline/stall_green.nbt index 3d6a0581d..d8c4918b8 100644 Binary files a/kubejs/data/tfg/structures/arabic/baseline/stall_green.nbt and b/kubejs/data/tfg/structures/arabic/baseline/stall_green.nbt differ diff --git a/kubejs/data/tfg/structures/arabic/baseline/stall_yellow.nbt b/kubejs/data/tfg/structures/arabic/baseline/stall_yellow.nbt index ff90623b8..9f23f5f58 100644 Binary files a/kubejs/data/tfg/structures/arabic/baseline/stall_yellow.nbt and b/kubejs/data/tfg/structures/arabic/baseline/stall_yellow.nbt differ diff --git a/kubejs/data/tfg/structures/yurts/baseline/house1.nbt b/kubejs/data/tfg/structures/yurts/baseline/house1.nbt index 8c7658d69..9c18c958f 100644 Binary files a/kubejs/data/tfg/structures/yurts/baseline/house1.nbt and b/kubejs/data/tfg/structures/yurts/baseline/house1.nbt differ diff --git a/kubejs/data/tfg/structures/yurts/baseline/house2.nbt b/kubejs/data/tfg/structures/yurts/baseline/house2.nbt index 23dc63195..255d4faac 100644 Binary files a/kubejs/data/tfg/structures/yurts/baseline/house2.nbt and b/kubejs/data/tfg/structures/yurts/baseline/house2.nbt differ diff --git a/kubejs/data/tfg/structures/yurts/baseline/house3.nbt b/kubejs/data/tfg/structures/yurts/baseline/house3.nbt index 2474198ba..28d91a292 100644 Binary files a/kubejs/data/tfg/structures/yurts/baseline/house3.nbt and b/kubejs/data/tfg/structures/yurts/baseline/house3.nbt differ diff --git a/kubejs/data/tfg/structures/yurts/baseline/stable.nbt b/kubejs/data/tfg/structures/yurts/baseline/stable.nbt index 477a1b088..726767cf5 100644 Binary files a/kubejs/data/tfg/structures/yurts/baseline/stable.nbt and b/kubejs/data/tfg/structures/yurts/baseline/stable.nbt differ diff --git a/kubejs/data/tfg/structures/yurts/baseline/throne_house.nbt b/kubejs/data/tfg/structures/yurts/baseline/throne_house.nbt index 08933834b..95e355099 100644 Binary files a/kubejs/data/tfg/structures/yurts/baseline/throne_house.nbt and b/kubejs/data/tfg/structures/yurts/baseline/throne_house.nbt differ diff --git a/kubejs/data/tfg/structures/yurts/baseline/tower.nbt b/kubejs/data/tfg/structures/yurts/baseline/tower.nbt index 9c267fa6e..65fd979d6 100644 Binary files a/kubejs/data/tfg/structures/yurts/baseline/tower.nbt and b/kubejs/data/tfg/structures/yurts/baseline/tower.nbt differ 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 8919549db..a8e0f54b3 100644 --- a/kubejs/data/tfg/worldgen/biome/moon/lunar_asurine_dense.json +++ b/kubejs/data/tfg/worldgen/biome/moon/lunar_asurine_dense.json @@ -56,7 +56,7 @@ ] ], "has_precipitation": false, - "creature_spawn_probability": 0.00003, + "creature_spawn_probability": 0.0003, "spawn_costs": { "species:limpet": { "energy_budget": 0.15, 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 07556e9eb..2895ad9b1 100644 --- a/kubejs/data/tfg/worldgen/biome/moon/lunar_asurine_sparse.json +++ b/kubejs/data/tfg/worldgen/biome/moon/lunar_asurine_sparse.json @@ -60,7 +60,7 @@ ] ], "has_precipitation": false, - "creature_spawn_probability": 0.00006, + "creature_spawn_probability": 0.0006, "spawn_costs": { "species:limpet": { "energy_budget": 0.15, 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 6e49e9199..53dd80166 100644 --- a/kubejs/data/tfg/worldgen/biome/moon/lunar_chorus_dense.json +++ b/kubejs/data/tfg/worldgen/biome/moon/lunar_chorus_dense.json @@ -55,7 +55,7 @@ ] ], "has_precipitation": false, - "creature_spawn_probability": 0.00003, + "creature_spawn_probability": 0.0003, "spawn_costs": { "species:limpet": { "energy_budget": 0.15, 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 ec5c4798e..dc0984985 100644 --- a/kubejs/data/tfg/worldgen/biome/moon/lunar_chorus_sparse.json +++ b/kubejs/data/tfg/worldgen/biome/moon/lunar_chorus_sparse.json @@ -58,7 +58,7 @@ ] ], "has_precipitation": false, - "creature_spawn_probability": 0.00006, + "creature_spawn_probability": 0.0006, "spawn_costs": { "species:limpet": { "energy_budget": 0.15, 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 53ec3278d..a313d8db6 100644 --- a/kubejs/data/tfg/worldgen/biome/moon/lunar_corals_dense.json +++ b/kubejs/data/tfg/worldgen/biome/moon/lunar_corals_dense.json @@ -54,7 +54,7 @@ ] ], "has_precipitation": false, - "creature_spawn_probability": 0.00003, + "creature_spawn_probability": 0.0003, "spawn_costs": { "species:limpet": { "energy_budget": 0.15, 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 53742f3dd..3897eeeb7 100644 --- a/kubejs/data/tfg/worldgen/biome/moon/lunar_corals_sparse.json +++ b/kubejs/data/tfg/worldgen/biome/moon/lunar_corals_sparse.json @@ -58,7 +58,7 @@ ] ], "has_precipitation": false, - "creature_spawn_probability": 0.00006, + "creature_spawn_probability": 0.0006, "spawn_costs": { "species:limpet": { "energy_budget": 0.15, 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 0afe8b1ab..3ece7dd46 100644 --- a/kubejs/data/tfg/worldgen/biome/moon/lunar_lights_dense.json +++ b/kubejs/data/tfg/worldgen/biome/moon/lunar_lights_dense.json @@ -55,7 +55,7 @@ ] ], "has_precipitation": false, - "creature_spawn_probability": 0.00003, + "creature_spawn_probability": 0.0003, "spawn_costs": { "species:limpet": { "energy_budget": 0.15, 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 b37ef7ce8..82b5a6914 100644 --- a/kubejs/data/tfg/worldgen/biome/moon/lunar_lights_sparse.json +++ b/kubejs/data/tfg/worldgen/biome/moon/lunar_lights_sparse.json @@ -58,7 +58,7 @@ ] ], "has_precipitation": false, - "creature_spawn_probability": 0.00006, + "creature_spawn_probability": 0.0006, "spawn_costs": { "species:limpet": { "energy_budget": 0.15, diff --git a/kubejs/data/tfg/worldgen/biome/moon/lunar_plains.json b/kubejs/data/tfg/worldgen/biome/moon/lunar_plains.json index 6a7a803fb..031090ba2 100644 --- a/kubejs/data/tfg/worldgen/biome/moon/lunar_plains.json +++ b/kubejs/data/tfg/worldgen/biome/moon/lunar_plains.json @@ -58,7 +58,7 @@ ] ], "has_precipitation": false, - "creature_spawn_probability": 0.0001, + "creature_spawn_probability": 0.001, "spawn_costs": { "species:limpet": { "energy_budget": 0.15, diff --git a/kubejs/data/tfg/worldgen/biome/moon/lunar_sands.json b/kubejs/data/tfg/worldgen/biome/moon/lunar_sands.json index f5146e1dc..2839d273a 100644 --- a/kubejs/data/tfg/worldgen/biome/moon/lunar_sands.json +++ b/kubejs/data/tfg/worldgen/biome/moon/lunar_sands.json @@ -67,7 +67,7 @@ ] ], "has_precipitation": false, - "creature_spawn_probability": 0.0001, + "creature_spawn_probability": 0.001, "spawn_costs": { "species:limpet": { "energy_budget": 0.15, diff --git a/kubejs/data/tfg/worldgen/biome/venus/arachnoids.json b/kubejs/data/tfg/worldgen/biome/venus/arachnoids.json index 3e33bbf24..ca349ad00 100644 --- a/kubejs/data/tfg/worldgen/biome/venus/arachnoids.json +++ b/kubejs/data/tfg/worldgen/biome/venus/arachnoids.json @@ -12,8 +12,6 @@ "fog_color": 9938052, "water_color": 8241044, "water_fog_color": 10866612, - "grass_color": 13758586, - "foliage_color": 11653213, "ambient_sound": "tfg:ambient.venus_surface.loop", "mood_sound": { "block_search_extent": 8, @@ -25,7 +23,7 @@ "options": { "type": "minecraft:ash" }, - "probability": 0.1 + "probability": 0.05 } }, "features": [ @@ -64,19 +62,73 @@ "energy_budget": 0.05, "charge": 0.9 }, - "ad_astra:sulfur_creeper": { - "energy_budget": 0.2, - "charge": 0.7 - }, "species:cliff_hanger": { "energy_budget": 0.15, "charge": 0.7 + }, + "ad_astra:sulfur_creeper": { + "energy_budget": 0.15, + "charge": 0.7 + }, + "primitive_creatures:golem_2": { + "energy_budget": 0.15, + "charge": 0.7 + }, + "minecraft:blaze": { + "energy_budget": 0.15, + "charge": 0.7 + }, + "minecraft:magma_cube": { + "energy_budget": 0.15, + "charge": 0.7 + }, + "arthropocolypse:millipede_head": { + "energy_budget": 0.05, + "charge": 0.9 } }, + "creature_spawn_probability": 0.2, "spawners": { "ambient": [], "axolotls": [], - "creature": [], + "creature": [ + { + "type": "arthropocolypse:prairie_grasshopper", + "maxCount": 5, + "minCount": 3, + "weight": 100 + }, + { + "type": "arthropocolypse:field_cricket", + "maxCount": 5, + "minCount": 3, + "weight": 100 + }, + { + "type": "arthropocolypse:mealworm_beetle", + "maxCount": 2, + "minCount": 1, + "weight": 70 + }, + { + "type": "arthropocolypse:stag_beetle", + "maxCount": 2, + "minCount": 1, + "weight": 70 + }, + { + "type": "arthropocolypse:soldier_ant", + "maxCount": 6, + "minCount": 4, + "weight": 100 + }, + { + "type": "arthropocolypse:worker_ant", + "maxCount": 3, + "minCount": 2, + "weight": 50 + } + ], "misc": [], "monster": [ { @@ -104,14 +156,14 @@ "weight": 20 }, { - "type": "ad_astra:sulfur_creeper", + "type": "species:cliff_hanger", "maxCount": 3, "minCount": 1, "weight": 100 }, { - "type": "species:cliff_hanger", - "maxCount": 3, + "type": "arthropocolypse:millipede_head", + "maxCount": 1, "minCount": 1, "weight": 100 } diff --git a/kubejs/data/tfg/worldgen/biome/venus/fractured_pools.json b/kubejs/data/tfg/worldgen/biome/venus/fractured_pools.json index d0121f228..b1bcc3911 100644 --- a/kubejs/data/tfg/worldgen/biome/venus/fractured_pools.json +++ b/kubejs/data/tfg/worldgen/biome/venus/fractured_pools.json @@ -9,6 +9,9 @@ "tick_chance": 0.0111 }, "fog_color": 9938052, + "sky_color": 10465603, + "water_color": 8241044, + "water_fog_color": 10866612, "ambient_sound": "tfg:ambient.venus_surface.loop", "mood_sound": { "block_search_extent": 8, @@ -16,9 +19,12 @@ "sound": "tfg:ambient.venus_surface.mood", "tick_delay": 6000 }, - "sky_color": 10465603, - "water_color": 8241044, - "water_fog_color": 10866612 + "particle": { + "options": { + "type": "minecraft:ash" + }, + "probability": 0.05 + } }, "features": [ [ @@ -58,19 +64,67 @@ "energy_budget": 0.05, "charge": 0.9 }, + "species:cliff_hanger": { + "energy_budget": 0.15, + "charge": 0.7 + }, "ad_astra:sulfur_creeper": { "energy_budget": 0.15, "charge": 0.7 }, - "species:cliff_hanger": { + "primitive_creatures:golem_2": { "energy_budget": 0.15, "charge": 0.7 + }, + "minecraft:blaze": { + "energy_budget": 0.15, + "charge": 0.7 + }, + "minecraft:magma_cube": { + "energy_budget": 0.15, + "charge": 0.7 + }, + "arthropocolypse:millipede_head": { + "energy_budget": 0.05, + "charge": 0.9 } }, + "creature_spawn_probability": 0.2, "spawners": { "ambient": [], "axolotls": [], - "creature": [], + "creature": [ + { + "type": "arthropocolypse:mealworm_beetle", + "maxCount": 4, + "minCount": 2, + "weight": 30 + }, + { + "type": "arthropocolypse:stag_beetle", + "maxCount": 4, + "minCount": 2, + "weight": 40 + }, + { + "type": "arthropocolypse:platerodrilus", + "maxCount": 4, + "minCount": 2, + "weight": 60 + }, + { + "type": "arthropocolypse:ice_crawler", + "maxCount": 4, + "minCount": 2, + "weight": 100 + }, + { + "type": "arthropocolypse:wharf_roach", + "maxCount": 4, + "minCount": 2, + "weight": 40 + } + ], "misc": [], "monster": [ { @@ -81,13 +135,7 @@ }, { "type": "endermanoverhaul:savanna_enderman", - "maxCount": 1, - "minCount": 1, - "weight": 100 - }, - { - "type": "endermanoverhaul:nether_wastes_enderman", - "maxCount": 1, + "maxCount": 2, "minCount": 1, "weight": 100 }, @@ -108,6 +156,12 @@ "maxCount": 3, "minCount": 1, "weight": 100 + }, + { + "type": "arthropocolypse:millipede_head", + "maxCount": 1, + "minCount": 1, + "weight": 100 } ], "underground_water_creature": [], diff --git a/kubejs/data/tfg/worldgen/biome/venus/fumaroles.json b/kubejs/data/tfg/worldgen/biome/venus/fumaroles.json index 195a71a6e..16633d82a 100644 --- a/kubejs/data/tfg/worldgen/biome/venus/fumaroles.json +++ b/kubejs/data/tfg/worldgen/biome/venus/fumaroles.json @@ -12,8 +12,6 @@ "fog_color": 10788996, "water_color": 8241044, "water_fog_color": 10866612, - "grass_color": 13758586, - "foliage_color": 11653213, "ambient_sound": "tfg:ambient.venus_surface.loop", "mood_sound": { "block_search_extent": 8, @@ -71,16 +69,32 @@ "energy_budget": 0.05, "charge": 0.9 }, - "ad_astra:sulfur_creeper": { - "energy_budget": 0.2, - "charge": 0.7 - }, "species:cliff_hanger": { "energy_budget": 0.15, "charge": 0.7 + }, + "ad_astra:sulfur_creeper": { + "energy_budget": 0.2, + "charge": 0.4 + }, + "primitive_creatures:golem_2": { + "energy_budget": 0.15, + "charge": 0.7 + }, + "minecraft:blaze": { + "energy_budget": 0.15, + "charge": 0.7 + }, + "minecraft:magma_cube": { + "energy_budget": 0.15, + "charge": 0.7 + }, + "arthropocolypse:millipede_head": { + "energy_budget": 0.05, + "charge": 0.9 } }, - "creature_spawn_probability": 0.0001, + "creature_spawn_probability": 0.01, "spawners": { "ambient": [], "axolotls": [], @@ -89,6 +103,18 @@ "type": "species:trooper", "maxCount": 3, "minCount": 2, + "weight": 100 + }, + { + "type": "arthropocolypse:prairie_grasshopper", + "maxCount": 2, + "minCount": 1, + "weight": 50 + }, + { + "type": "arthropocolypse:field_cricket", + "maxCount": 2, + "minCount": 1, "weight": 50 } ], @@ -98,25 +124,19 @@ "type": "endermanoverhaul:desert_enderman", "maxCount": 1, "minCount": 1, - "weight": 100 + "weight": 50 }, { "type": "endermanoverhaul:savanna_enderman", "maxCount": 1, "minCount": 1, - "weight": 100 - }, - { - "type": "endermanoverhaul:nether_wastes_enderman", - "maxCount": 1, - "minCount": 1, - "weight": 100 + "weight": 50 }, { "type": "minecraft:enderman", "maxCount": 1, "minCount": 1, - "weight": 20 + "weight": 10 }, { "type": "ad_astra:sulfur_creeper", diff --git a/kubejs/data/tfg/worldgen/biome/venus/geysers.json b/kubejs/data/tfg/worldgen/biome/venus/geysers.json index 01f29fd97..869d87241 100644 --- a/kubejs/data/tfg/worldgen/biome/venus/geysers.json +++ b/kubejs/data/tfg/worldgen/biome/venus/geysers.json @@ -12,8 +12,6 @@ "fog_color": 9938052, "water_color": 8241044, "water_fog_color": 10866612, - "grass_color": 13758586, - "foliage_color": 11653213, "ambient_sound": "tfg:ambient.venus_surface.loop", "mood_sound": { "block_search_extent": 8, @@ -23,9 +21,9 @@ }, "particle": { "options": { - "type": "minecraft:white_ash" + "type": "minecraft:ash" }, - "probability": 0.1 + "probability": 0.07 } }, "features": [ @@ -68,19 +66,67 @@ "energy_budget": 0.05, "charge": 0.9 }, - "ad_astra:sulfur_creeper": { - "energy_budget": 0.2, - "charge": 0.7 - }, "species:cliff_hanger": { "energy_budget": 0.15, "charge": 0.7 + }, + "ad_astra:sulfur_creeper": { + "energy_budget": 0.15, + "charge": 0.7 + }, + "primitive_creatures:golem_2": { + "energy_budget": 0.15, + "charge": 0.7 + }, + "minecraft:blaze": { + "energy_budget": 0.15, + "charge": 0.8 + }, + "minecraft:magma_cube": { + "energy_budget": 0.15, + "charge": 0.8 + }, + "arthropocolypse:millipede_head": { + "energy_budget": 0.05, + "charge": 0.9 } }, + "creature_spawn_probability": 0.2, "spawners": { "ambient": [], "axolotls": [], - "creature": [], + "creature": [ + { + "type": "minecraft:strider", + "maxCount": 4, + "minCount": 2, + "weight": 100 + }, + { + "type": "arthropocolypse:mealworm_beetle", + "maxCount": 2, + "minCount": 1, + "weight": 50 + }, + { + "type": "arthropocolypse:stag_beetle", + "maxCount": 2, + "minCount": 1, + "weight": 50 + }, + { + "type": "arthropocolypse:ice_crawler", + "maxCount": 4, + "minCount": 2, + "weight": 100 + }, + { + "type": "arthropocolypse:wharf_roach", + "maxCount": 4, + "minCount": 2, + "weight": 70 + } + ], "misc": [], "monster": [ { @@ -109,15 +155,33 @@ }, { "type": "ad_astra:sulfur_creeper", - "maxCount": 3, - "minCount": 1, + "maxCount": 4, + "minCount": 2, "weight": 100 }, + { + "type": "minecraft:magma_cube", + "maxCount": 2, + "minCount": 1, + "weight": 30 + }, + { + "type": "minecraft:blaze", + "maxCount": 2, + "minCount": 1, + "weight": 70 + }, { "type": "species:cliff_hanger", "maxCount": 3, "minCount": 1, "weight": 100 + }, + { + "type": "arthropocolypse:millipede_head", + "maxCount": 1, + "minCount": 1, + "weight": 70 } ], "underground_water_creature": [], diff --git a/kubejs/data/tfg/worldgen/biome/venus/jagged_tablelands.json b/kubejs/data/tfg/worldgen/biome/venus/jagged_tablelands.json index 97fe4b4c0..68cd4aab3 100644 --- a/kubejs/data/tfg/worldgen/biome/venus/jagged_tablelands.json +++ b/kubejs/data/tfg/worldgen/biome/venus/jagged_tablelands.json @@ -12,8 +12,6 @@ "fog_color": 9938052, "water_color": 8241044, "water_fog_color": 10866612, - "grass_color": 13758586, - "foliage_color": 11653213, "ambient_sound": "tfg:ambient.venus_surface.loop", "mood_sound": { "block_search_extent": 8, @@ -23,9 +21,9 @@ }, "particle": { "options": { - "type": "minecraft:ash" + "type": "minecraft:white_ash" }, - "probability": 0.1 + "probability": 0.02 } }, "features": [ @@ -66,36 +64,84 @@ "energy_budget": 0.05, "charge": 0.9 }, - "ad_astra:sulfur_creeper": { - "energy_budget": 0.2, - "charge": 0.7 - }, "species:cliff_hanger": { "energy_budget": 0.15, "charge": 0.7 + }, + "ad_astra:sulfur_creeper": { + "energy_budget": 0.15, + "charge": 0.7 + }, + "primitive_creatures:golem_2": { + "energy_budget": 0.15, + "charge": 0.7 + }, + "minecraft:blaze": { + "energy_budget": 0.15, + "charge": 0.7 + }, + "minecraft:magma_cube": { + "energy_budget": 0.15, + "charge": 0.7 + }, + "arthropocolypse:millipede_head": { + "energy_budget": 0.05, + "charge": 0.9 } }, + "creature_spawn_probability": 0.1, "spawners": { "ambient": [], "axolotls": [], - "creature": [], + "creature": [ + { + "type": "minecraft:strider", + "maxCount": 2, + "minCount": 1, + "weight": 10 + }, + { + "type": "arthropocolypse:field_cricket", + "maxCount": 3, + "minCount": 2, + "weight": 50 + }, + { + "type": "arthropocolypse:mealworm_beetle", + "maxCount": 6, + "minCount": 3, + "weight": 100 + }, + { + "type": "arthropocolypse:mealworm", + "maxCount": 6, + "minCount": 3, + "weight": 100 + }, + { + "type": "arthropocolypse:platerodrilus", + "maxCount": 4, + "minCount": 2, + "weight": 50 + }, + { + "type": "arthropocolypse:wharf_roach", + "maxCount": 4, + "minCount": 2, + "weight": 30 + }, + { + "type": "arthropocolypse:ice_crawler", + "maxCount": 4, + "minCount": 2, + "weight": 30 + } + ], "misc": [], "monster": [ - { - "type": "endermanoverhaul:desert_enderman", - "maxCount": 1, - "minCount": 1, - "weight": 100 - }, { "type": "endermanoverhaul:savanna_enderman", - "maxCount": 1, - "minCount": 1, - "weight": 100 - }, - { - "type": "endermanoverhaul:nether_wastes_enderman", - "maxCount": 1, + "maxCount": 2, "minCount": 1, "weight": 100 }, @@ -103,7 +149,7 @@ "type": "minecraft:enderman", "maxCount": 1, "minCount": 1, - "weight": 20 + "weight": 10 }, { "type": "ad_astra:sulfur_creeper", @@ -116,6 +162,12 @@ "maxCount": 3, "minCount": 1, "weight": 100 + }, + { + "type": "arthropocolypse:millipede_head", + "maxCount": 2, + "minCount": 1, + "weight": 100 } ], "underground_water_creature": [], diff --git a/kubejs/data/tfg/worldgen/biome/venus/salt_flats.json b/kubejs/data/tfg/worldgen/biome/venus/salt_flats.json index 50a15b7c0..4eb638dd6 100644 --- a/kubejs/data/tfg/worldgen/biome/venus/salt_flats.json +++ b/kubejs/data/tfg/worldgen/biome/venus/salt_flats.json @@ -12,8 +12,6 @@ "fog_color": 12237498, "water_color": 8241044, "water_fog_color": 10866612, - "grass_color": 13758586, - "foliage_color": 11653213, "ambient_sound": "tfg:ambient.venus_surface.loop", "mood_sound": { "block_search_extent": 8, @@ -65,24 +63,72 @@ "energy_budget": 0.05, "charge": 0.9 }, - "ad_astra:sulfur_creeper": { - "energy_budget": 0.2, - "charge": 0.7 - }, "species:cliff_hanger": { "energy_budget": 0.15, "charge": 0.7 + }, + "ad_astra:sulfur_creeper": { + "energy_budget": 0.15, + "charge": 0.7 + }, + "primitive_creatures:golem_2": { + "energy_budget": 0.15, + "charge": 0.7 + }, + "minecraft:blaze": { + "energy_budget": 0.15, + "charge": 0.7 + }, + "minecraft:magma_cube": { + "energy_budget": 0.15, + "charge": 0.7 + }, + "arthropocolypse:millipede_head": { + "energy_budget": 0.05, + "charge": 0.9 } }, + "creature_spawn_probability": 0.07, "spawners": { "ambient": [], "axolotls": [], - "creature": [], + "creature": [ + { + "type": "arthropocolypse:prairie_grasshopper", + "maxCount": 4, + "minCount": 2, + "weight": 100 + }, + { + "type": "arthropocolypse:field_cricket", + "maxCount": 4, + "minCount": 2, + "weight": 100 + }, + { + "type": "arthropocolypse:wharf_roach", + "maxCount": 2, + "minCount": 1, + "weight": 70 + }, + { + "type": "arthropocolypse:mealworm_beetle", + "maxCount": 4, + "minCount": 2, + "weight": 30 + }, + { + "type": "arthropocolypse:stag_beetle", + "maxCount": 4, + "minCount": 2, + "weight": 40 + } + ], "misc": [], "monster": [ { "type": "endermanoverhaul:desert_enderman", - "maxCount": 1, + "maxCount": 2, "minCount": 1, "weight": 100 }, @@ -92,29 +138,11 @@ "minCount": 1, "weight": 100 }, - { - "type": "endermanoverhaul:nether_wastes_enderman", - "maxCount": 1, - "minCount": 1, - "weight": 100 - }, { "type": "minecraft:enderman", "maxCount": 1, "minCount": 1, "weight": 20 - }, - { - "type": "ad_astra:sulfur_creeper", - "maxCount": 3, - "minCount": 1, - "weight": 100 - }, - { - "type": "species:cliff_hanger", - "maxCount": 3, - "minCount": 1, - "weight": 100 } ], "underground_water_creature": [], diff --git a/kubejs/data/tfg/worldgen/biome/venus/volcanic_mountains.json b/kubejs/data/tfg/worldgen/biome/venus/scorching_volcanoes.json similarity index 62% rename from kubejs/data/tfg/worldgen/biome/venus/volcanic_mountains.json rename to kubejs/data/tfg/worldgen/biome/venus/scorching_volcanoes.json index 967f4e282..71655ba51 100644 --- a/kubejs/data/tfg/worldgen/biome/venus/volcanic_mountains.json +++ b/kubejs/data/tfg/worldgen/biome/venus/scorching_volcanoes.json @@ -12,8 +12,6 @@ "fog_color": 5450003, "water_color": 8241044, "water_fog_color": 10866612, - "grass_color": 13758586, - "foliage_color": 11653213, "ambient_sound": "tfg:ambient.venus_surface.loop", "mood_sound": { "block_search_extent": 8, @@ -40,9 +38,14 @@ "tfg:venus/terrain/lava_rivulet", "tfg:venus/terrain/magma_rivulet" ], + [ + "tfg:venus/terrain/basalt_pillar" + ], [], - [], - [], + [ + "tfg:venus/terrain/basalt_columns_small", + "tfg:venus/terrain/basalt_columns_large" + ], [], "#tfg:venus_veins", "#tfg:venus_underground_decoration", @@ -51,7 +54,13 @@ "tfc:cobble_boulder", "tfc:raw_boulder_small_patch", "tfc:cobble_boulder_small_patch", - "tfg:venus/terrain/thermal_vent_rare" + "tfg:venus/terrain/thermal_vent_rare", + "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/pile_black_sand" ], [ "tfg:venus/terrain/lava_fill" @@ -76,41 +85,57 @@ "energy_budget": 0.05, "charge": 0.9 }, - "ad_astra:sulfur_creeper": { - "energy_budget": 0.2, - "charge": 0.7 - }, "species:cliff_hanger": { + "energy_budget": 0.3, + "charge": 0.3 + }, + "ad_astra:sulfur_creeper": { "energy_budget": 0.15, - "charge": 0.7 + "charge": 0.6 + }, + "primitive_creatures:golem_2": { + "energy_budget": 0.15, + "charge": 0.6 + }, + "minecraft:blaze": { + "energy_budget": 0.15, + "charge": 0.6 + }, + "minecraft:magma_cube": { + "energy_budget": 0.15, + "charge": 0.6 + }, + "arthropocolypse:millipede_head": { + "energy_budget": 0.05, + "charge": 0.9 } }, - "creature_spawn_probability": 0.0001, + "creature_spawn_probability": 0.2, "spawners": { "ambient": [], "axolotls": [], "creature": [ { - "type": "species:trooper", + "type": "arthropocolypse:ice_crawler", + "maxCount": 2, + "minCount": 1, + "weight": 50 + }, + { + "type": "arthropocolypse:stag_beetle_larva", + "maxCount": 4, + "minCount": 3, + "weight": 100 + }, + { + "type": "arthropocolypse:stag_beetle", "maxCount": 3, "minCount": 2, - "weight": 50 + "weight": 100 } ], "misc": [], "monster": [ - { - "type": "endermanoverhaul:desert_enderman", - "maxCount": 1, - "minCount": 1, - "weight": 100 - }, - { - "type": "endermanoverhaul:savanna_enderman", - "maxCount": 1, - "minCount": 1, - "weight": 100 - }, { "type": "endermanoverhaul:nether_wastes_enderman", "maxCount": 1, @@ -121,10 +146,34 @@ "type": "minecraft:enderman", "maxCount": 1, "minCount": 1, - "weight": 20 + "weight": 10 }, { "type": "ad_astra:sulfur_creeper", + "maxCount": 2, + "minCount": 1, + "weight": 50 + }, + { + "type": "minecraft:magma_cube", + "maxCount": 4, + "minCount": 2, + "weight": 100 + }, + { + "type": "minecraft:blaze", + "maxCount": 4, + "minCount": 2, + "weight": 100 + }, + { + "type": "arthropocolypse:millipede_head", + "maxCount": 1, + "minCount": 1, + "weight": 100 + }, + { + "type": "primitive_creatures:golem_2", "maxCount": 3, "minCount": 1, "weight": 100 diff --git a/kubejs/data/tfg/worldgen/biome/venus/stromatolite_beach.json b/kubejs/data/tfg/worldgen/biome/venus/stromatolite_beach.json index 0e3a91225..54e087d94 100644 --- a/kubejs/data/tfg/worldgen/biome/venus/stromatolite_beach.json +++ b/kubejs/data/tfg/worldgen/biome/venus/stromatolite_beach.json @@ -12,8 +12,6 @@ "fog_color": 10788996, "water_color": 8241044, "water_fog_color": 10866612, - "grass_color": 13758586, - "foliage_color": 11653213, "ambient_sound": "tfg:ambient.venus_surface.loop", "mood_sound": { "block_search_extent": 8, @@ -68,16 +66,32 @@ "energy_budget": 0.05, "charge": 0.9 }, - "ad_astra:sulfur_creeper": { - "energy_budget": 0.2, - "charge": 0.7 - }, "species:cliff_hanger": { "energy_budget": 0.15, "charge": 0.7 + }, + "ad_astra:sulfur_creeper": { + "energy_budget": 0.15, + "charge": 0.7 + }, + "primitive_creatures:golem_2": { + "energy_budget": 0.15, + "charge": 0.7 + }, + "minecraft:blaze": { + "energy_budget": 0.15, + "charge": 0.7 + }, + "minecraft:magma_cube": { + "energy_budget": 0.15, + "charge": 0.7 + }, + "arthropocolypse:millipede_head": { + "energy_budget": 0.05, + "charge": 0.9 } }, - "creature_spawn_probability": 0.0001, + "creature_spawn_probability": 0.1, "spawners": { "ambient": [], "axolotls": [], @@ -86,6 +100,18 @@ "type": "species:trooper", "maxCount": 3, "minCount": 2, + "weight": 100 + }, + { + "type": "arthropocolypse:prairie_grasshopper", + "maxCount": 3, + "minCount": 1, + "weight": 50 + }, + { + "type": "arthropocolypse:field_cricket", + "maxCount": 3, + "minCount": 1, "weight": 50 } ], @@ -103,17 +129,11 @@ "minCount": 1, "weight": 100 }, - { - "type": "endermanoverhaul:nether_wastes_enderman", - "maxCount": 1, - "minCount": 1, - "weight": 100 - }, { "type": "minecraft:enderman", "maxCount": 1, "minCount": 1, - "weight": 20 + "weight": 10 }, { "type": "ad_astra:sulfur_creeper", diff --git a/kubejs/data/tfg/worldgen/biome/venus/sulfuric_ravine.json b/kubejs/data/tfg/worldgen/biome/venus/sulfuric_ravine.json index 6ca6e798f..c9caf6c65 100644 --- a/kubejs/data/tfg/worldgen/biome/venus/sulfuric_ravine.json +++ b/kubejs/data/tfg/worldgen/biome/venus/sulfuric_ravine.json @@ -12,8 +12,6 @@ "fog_color": 11575877, "water_color": 8241044, "water_fog_color": 10866612, - "grass_color": 13758586, - "foliage_color": 11653213, "ambient_sound": "tfg:ambient.venus_surface.loop", "mood_sound": { "block_search_extent": 8, @@ -70,16 +68,32 @@ "energy_budget": 0.05, "charge": 0.9 }, - "ad_astra:sulfur_creeper": { - "energy_budget": 0.2, - "charge": 0.7 - }, "species:cliff_hanger": { "energy_budget": 0.15, "charge": 0.7 + }, + "ad_astra:sulfur_creeper": { + "energy_budget": 0.2, + "charge": 0.4 + }, + "primitive_creatures:golem_2": { + "energy_budget": 0.15, + "charge": 0.7 + }, + "minecraft:blaze": { + "energy_budget": 0.15, + "charge": 0.7 + }, + "minecraft:magma_cube": { + "energy_budget": 0.15, + "charge": 0.7 + }, + "arthropocolypse:millipede_head": { + "energy_budget": 0.05, + "charge": 0.9 } }, - "creature_spawn_probability": 0.0001, + "creature_spawn_probability": 0.1, "spawners": { "ambient": [], "axolotls": [], @@ -88,7 +102,19 @@ "type": "species:trooper", "maxCount": 3, "minCount": 2, - "weight": 50 + "weight": 100 + }, + { + "type": "arthropocolypse:platerodrilus", + "maxCount": 3, + "minCount": 1, + "weight": 20 + }, + { + "type": "arthropocolypse:prairie_grasshopper", + "maxCount": 3, + "minCount": 2, + "weight": 70 } ], "misc": [], @@ -105,12 +131,6 @@ "minCount": 1, "weight": 100 }, - { - "type": "endermanoverhaul:nether_wastes_enderman", - "maxCount": 1, - "minCount": 1, - "weight": 100 - }, { "type": "minecraft:enderman", "maxCount": 1, @@ -119,8 +139,8 @@ }, { "type": "ad_astra:sulfur_creeper", - "maxCount": 3, - "minCount": 1, + "maxCount": 4, + "minCount": 2, "weight": 100 }, { @@ -128,6 +148,12 @@ "maxCount": 3, "minCount": 1, "weight": 100 + }, + { + "type": "arthropocolypse:millipede_head", + "maxCount": 1, + "minCount": 1, + "weight": 100 } ], "underground_water_creature": [], diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/vein/mars_lapis.json b/kubejs/data/tfg/worldgen/configured_feature/mars/vein/mars_lapis.json new file mode 100644 index 000000000..be3e3e3f7 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/vein/mars_lapis.json @@ -0,0 +1,176 @@ +{ + "__credits__": "This vein was automatically generated by OresToFieldGuide.", + "type": "tfc:cluster_vein", + "config": { + "size": 30, + "rarity": 200, + "density": 0.25, + "min_y": 0, + "max_y": 70, + "random_name": "mars_lapis", + "blocks": [ + { + "replace": [ + "ad_astra:mars_stone" + ], + "with": [ + { + "block": "gtceu:mars_stone_lazurite_ore", + "weight": 35 + }, + { + "block": "gtceu:mars_stone_sodalite_ore", + "weight": 25 + }, + { + "block": "gtceu:mars_stone_lapis_ore", + "weight": 25 + }, + { + "block": "gtceu:mars_stone_calcite_ore", + "weight": 15 + } + ] + }, + { + "replace": [ + "tfc:rock/raw/shale" + ], + "with": [ + { + "block": "gtceu:shale_lazurite_ore", + "weight": 35 + }, + { + "block": "gtceu:shale_sodalite_ore", + "weight": 25 + }, + { + "block": "gtceu:shale_lapis_ore", + "weight": 25 + }, + { + "block": "gtceu:shale_calcite_ore", + "weight": 15 + } + ] + }, + { + "replace": [ + "tfc:rock/raw/limestone" + ], + "with": [ + { + "block": "gtceu:limestone_lazurite_ore", + "weight": 35 + }, + { + "block": "gtceu:limestone_sodalite_ore", + "weight": 25 + }, + { + "block": "gtceu:limestone_lapis_ore", + "weight": 25 + }, + { + "block": "gtceu:limestone_calcite_ore", + "weight": 15 + } + ] + }, + { + "replace": [ + "tfc:rock/raw/dolomite" + ], + "with": [ + { + "block": "gtceu:dolomite_lazurite_ore", + "weight": 35 + }, + { + "block": "gtceu:dolomite_sodalite_ore", + "weight": 25 + }, + { + "block": "gtceu:dolomite_lapis_ore", + "weight": 25 + }, + { + "block": "gtceu:dolomite_calcite_ore", + "weight": 15 + } + ] + }, + { + "replace": [ + "tfc:rock/raw/chert" + ], + "with": [ + { + "block": "gtceu:chert_lazurite_ore", + "weight": 35 + }, + { + "block": "gtceu:chert_sodalite_ore", + "weight": 25 + }, + { + "block": "gtceu:chert_lapis_ore", + "weight": 25 + }, + { + "block": "gtceu:chert_calcite_ore", + "weight": 15 + } + ] + }, + { + "replace": [ + "tfc:rock/raw/chalk" + ], + "with": [ + { + "block": "gtceu:chalk_lazurite_ore", + "weight": 35 + }, + { + "block": "gtceu:chalk_sodalite_ore", + "weight": 25 + }, + { + "block": "gtceu:chalk_lapis_ore", + "weight": 25 + }, + { + "block": "gtceu:chalk_calcite_ore", + "weight": 15 + } + ] + } + ], + "indicator": { + "rarity": 15, + "depth": 20, + "underground_rarity": 40, + "underground_count": 200, + "blocks": [ + { + "block": "gtceu:lazurite_bud_indicator", + "weight": 35 + }, + { + "block": "gtceu:sodalite_bud_indicator", + "weight": 25 + }, + { + "block": "gtceu:lapis_bud_indicator", + "weight": 25 + }, + { + "block": "gtceu:calcite_indicator", + "weight": 15 + } + ] + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/venus/surface/geyser_source_patch.json b/kubejs/data/tfg/worldgen/configured_feature/venus/surface/geyser_source_patch.json index fec45853b..02ce3e1d0 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/venus/surface/geyser_source_patch.json +++ b/kubejs/data/tfg/worldgen/configured_feature/venus/surface/geyser_source_patch.json @@ -1,50 +1,55 @@ { - "type": "minecraft:random_patch", - "config": { - "feature": { - "feature": { - "type": "minecraft:simple_block", - "config": { - "to_place": { - "type": "minecraft:weighted_state_provider", - "entries": [ - { - "weight": 15, - "data": { - "Name": "tfg:geyser_source" - } - }, - { - "weight": 50, - "data": { - "Name": "tfg:geyser_source_small" - } - } - ] - } - } - }, - "placement": [ - { - "type": "minecraft:heightmap", - "heightmap": "WORLD_SURFACE" - }, - { - "type": "minecraft:block_predicate_filter", - "predicate": { - "type": "minecraft:matching_blocks", - "offset": [ - 0, - -1, - 0 - ], - "blocks": "tfg:rock/raw/geyserite" - } - } - ] - }, - "tries": 32, - "xz_spread": 16, - "y_spread": 3 - } + "type": "minecraft:random_patch", + "config": { + "feature": { + "feature": { + "type": "minecraft:simple_block", + "config": { + "to_place": { + "type": "minecraft:weighted_state_provider", + "entries": [ + { + "weight": 15, + "data": { + "Name": "tfg:geyser_source" + } + }, + { + "weight": 50, + "data": { + "Name": "tfg:geyser_source_small" + } + } + ] + } + } + }, + "placement": [ + { + "type": "minecraft:heightmap", + "heightmap": "WORLD_SURFACE" + }, + { + "type": "minecraft:block_predicate_filter", + "predicate": { + "type": "minecraft:all_of", + "predicates": [ + { + "type": "minecraft:matching_blocks", + "offset": [ 0, -1, 0 ], + "blocks": "tfg:rock/raw/geyserite" + }, + { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + } + ] + } + } + ] + }, + "tries": 32, + "xz_spread": 8, + "y_spread": 1 + } } \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/venus/surface/lava_source_patch.json b/kubejs/data/tfg/worldgen/configured_feature/venus/surface/lava_source_patch.json new file mode 100644 index 000000000..3f98163bf --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/venus/surface/lava_source_patch.json @@ -0,0 +1,44 @@ +{ + "type": "minecraft:random_patch", + "config": { + "feature": { + "feature": { + "type": "minecraft:simple_block", + "config": { + "to_place": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "tfg:lava_source" + } + } + } + }, + "placement": [ + { + "type": "minecraft:heightmap", + "heightmap": "WORLD_SURFACE" + }, + { + "type": "minecraft:block_predicate_filter", + "predicate": { + "type": "minecraft:all_of", + "predicates": [ + { + "type": "minecraft:has_sturdy_face", + "offset": [ 0, -1, 0 ], + "direction": "down" + }, + { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + } + ] + } + } + ] + }, + "tries": 12, + "xz_spread": 4, + "y_spread": 1 + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/venus/surface/pile_black_sand.json b/kubejs/data/tfg/worldgen/configured_feature/venus/surface/pile_black_sand.json new file mode 100644 index 000000000..b9bc3ca6a --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/venus/surface/pile_black_sand.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": "layers", + "values": { + "type": "minecraft:biased_to_bottom", + "value": { + "min_inclusive": 1, + "max_inclusive": 2 + } + }, + "source": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "tfg:pile/black_sand" + } + } + } + } + }, + "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": 16, + "y_spread": 2 + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/venus/surface/pile_volcanic_ash.json b/kubejs/data/tfg/worldgen/configured_feature/venus/surface/pile_volcanic_ash.json new file mode 100644 index 000000000..e0e523bb8 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/venus/surface/pile_volcanic_ash.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": "layers", + "values": { + "type": "minecraft:biased_to_bottom", + "value": { + "min_inclusive": 1, + "max_inclusive": 2 + } + }, + "source": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "tfg:pile/volcanic_ash" + } + } + } + } + }, + "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": 16, + "y_spread": 2 + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/venus/surface/shadow_plant_patch.json b/kubejs/data/tfg/worldgen/configured_feature/venus/surface/shadow_plant_patch.json new file mode 100644 index 000000000..abaeb145b --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/venus/surface/shadow_plant_patch.json @@ -0,0 +1,44 @@ +{ + "type": "minecraft:random_patch", + "config": { + "feature": { + "feature": { + "type": "minecraft:simple_block", + "config": { + "to_place": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "betterend:shadow_plant" + } + } + } + }, + "placement": [ + { + "type": "minecraft:heightmap", + "heightmap": "OCEAN_FLOOR_WG" + }, + { + "type": "minecraft:block_predicate_filter", + "predicate": { + "type": "minecraft:all_of", + "predicates": [ + { + "type": "minecraft:matching_block_tag", + "offset": [ 0, -1, 0 ], + "tag": "ad_astra:venus_stone_replaceables" + }, + { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + } + ] + } + } + ] + }, + "tries": 16, + "xz_spread": 5, + "y_spread": 0 + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/venus/surface/smoker_source_patch.json b/kubejs/data/tfg/worldgen/configured_feature/venus/surface/smoker_source_patch.json new file mode 100644 index 000000000..7e400ff27 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/venus/surface/smoker_source_patch.json @@ -0,0 +1,44 @@ +{ + "type": "minecraft:random_patch", + "config": { + "feature": { + "feature": { + "type": "minecraft:simple_block", + "config": { + "to_place": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "tfg:smoker_source" + } + } + } + }, + "placement": [ + { + "type": "minecraft:heightmap", + "heightmap": "WORLD_SURFACE" + }, + { + "type": "minecraft:block_predicate_filter", + "predicate": { + "type": "minecraft:all_of", + "predicates": [ + { + "type": "minecraft:has_sturdy_face", + "offset": [ 0, -1, 0 ], + "direction": "down" + }, + { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + } + ] + } + } + ] + }, + "tries": 12, + "xz_spread": 6, + "y_spread": 1 + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/venus/surface/sulfur_crystals.json b/kubejs/data/tfg/worldgen/configured_feature/venus/surface/sulfur_crystals.json index 65a026404..601939180 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/venus/surface/sulfur_crystals.json +++ b/kubejs/data/tfg/worldgen/configured_feature/venus/surface/sulfur_crystals.json @@ -3,35 +3,59 @@ "config": { "feature": { "feature": { - "type": "minecraft:simple_block", + "type": "lithostitched:select", "config": { - "to_place": { - "type": "minecraft:simple_state_provider", - "state": { - "Name": "betterend:sulphur_crystal" + "features": [ + { + "feature": { + "feature": { + "type": "minecraft:simple_block", + "config": { + "to_place": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "betterend:sulphur_crystal" + } + } + } + }, + "placement": [] + }, + "predicate": { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + } + }, + { + "feature": { + "feature": { + "type": "minecraft:simple_block", + "config": { + "to_place": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "betterend:sulphur_crystal", + "Properties": { + "fluid": "sulfur_fumes" + } + } + } + } + }, + "placement": [] + }, + "predicate": { + "type": "minecraft:matching_blocks", + "blocks": "tfg:fluid/sulfur_fumes" + } } - } + ] } }, "placement": [ { "type": "minecraft:heightmap", "heightmap": "OCEAN_FLOOR_WG" - }, - { - "type": "minecraft:block_predicate_filter", - "predicate": { - "type": "minecraft:all_of", - "predicates": [ - { - "type": "minecraft:matching_blocks", - "blocks": [ - "minecraft:air", - "tfg:fluid/sulfur_fumes" - ] - } - ] - } } ] }, diff --git a/kubejs/data/tfg/worldgen/configured_feature/venus/surface/twisted_vine.json b/kubejs/data/tfg/worldgen/configured_feature/venus/surface/twisted_vine.json new file mode 100644 index 000000000..1234bee2f --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/venus/surface/twisted_vine.json @@ -0,0 +1,43 @@ +{ + "type": "minecraft:random_patch", + "config": { + "feature": { + "feature": { + "type": "tfg:tall_decorative_plant", + "config": { + "block": "betterend:twisted_vine", + "plantHeight": 3, + "minHeight": 2, + "maxHeight": 4, + "middle": 1 + } + }, + "placement": [ + { + "type": "minecraft:heightmap", + "heightmap": "WORLD_SURFACE" + }, + { + "type": "minecraft:block_predicate_filter", + "predicate": { + "type": "minecraft:all_of", + "predicates": [ + { + "type": "minecraft:matching_block_tag", + "offset": [ 0, -1, 0 ], + "tag": "ad_astra:venus_stone_replaceables" + }, + { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + } + ] + } + } + ] + }, + "tries": 6, + "xz_spread": 4, + "y_spread": 0 + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/basalt_columns_large.json b/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/basalt_columns_large.json new file mode 100644 index 000000000..e52016bcb --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/basalt_columns_large.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:basalt_columns", + "config": { + "height": { + "type": "minecraft:uniform", + "value": { + "max_inclusive": 10, + "min_inclusive": 4 + } + }, + "reach": { + "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/venus/terrain/basalt_columns_small.json b/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/basalt_columns_small.json new file mode 100644 index 000000000..108d52449 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/basalt_columns_small.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:basalt_columns", + "config": { + "height": { + "type": "minecraft:uniform", + "value": { + "max_inclusive": 4, + "min_inclusive": 1 + } + }, + "reach": 1 + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/ignimbrite_tube_worms.json b/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/ignimbrite_tube_worms.json index a6eea8f10..d8b77e7ed 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/ignimbrite_tube_worms.json +++ b/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/ignimbrite_tube_worms.json @@ -3,10 +3,47 @@ "config": { "feature": { "feature": { - "type": "tfg:attached_decorative_plant", + "type": "lithostitched:select", "config": { - "block": "betterend:tube_worm", - "heightRange": 5 + "features": [ + { + "feature": { + "feature": { + "type": "tfg:attached_decorative_plant", + "config": { + "block": "betterend:tube_worm", + "heightRange": 5 + } + }, + "placement": [] + }, + "predicate": { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + } + }, + { + "feature": { + "feature": { + "type": "tfg:attached_decorative_plant", + "config": { + "block": { + "Name": "betterend:tube_worm", + "Properties": { + "fluid": "sulfur_fumes" + } + }, + "heightRange": 5 + } + }, + "placement": [] + }, + "predicate": { + "type": "minecraft:matching_blocks", + "blocks": "tfg:fluid/sulfur_fumes" + } + } + ] } }, "placement": [] diff --git a/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/ignimbrite_vents.json b/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/ignimbrite_vents.json index 2d620ef82..8e736180b 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/ignimbrite_vents.json +++ b/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/ignimbrite_vents.json @@ -3,14 +3,53 @@ "config": { "feature": { "feature": { - "type": "minecraft:simple_block", + "type": "lithostitched:select", "config": { - "to_place": { - "type": "minecraft:simple_state_provider", - "state": { - "Name": "betterend:hydrothermal_vent" + "features": [ + { + "feature": { + "feature": { + "type": "minecraft:simple_block", + "config": { + "to_place": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "betterend:hydrothermal_vent" + } + } + } + }, + "placement": [] + }, + "predicate": { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + } + }, + { + "feature": { + "feature": { + "type": "minecraft:simple_block", + "config": { + "to_place": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "betterend:hydrothermal_vent", + "Properties": { + "fluid": "sulfur_fumes" + } + } + } + } + }, + "placement": [] + }, + "predicate": { + "type": "minecraft:matching_blocks", + "blocks": "tfg:fluid/sulfur_fumes" + } } - } + ] } }, "placement": [ @@ -21,21 +60,9 @@ { "type": "minecraft:block_predicate_filter", "predicate": { - "type": "minecraft:all_of", - "predicates": [ - { - "type": "minecraft:matching_blocks", - "blocks": [ - "minecraft:air", - "tfg:fluid/sulfur_fumes" - ] - }, - { - "type": "minecraft:matching_blocks", - "offset": [ 0, -1, 0 ], - "blocks": "betterend:sulphuric_rock" - } - ] + "type": "minecraft:matching_blocks", + "offset": [ 0, -1, 0 ], + "blocks": "betterend:sulphuric_rock" } } ] 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 index 4d09ce34f..ca56083f5 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/venus/vein_manual/salt.json +++ b/kubejs/data/tfg/worldgen/configured_feature/venus/vein_manual/salt.json @@ -3,7 +3,7 @@ "config": { "height": 6, "size": 20, - "rarity": 100, + "rarity": 30, "density": 0.2, "min_y": 40, "max_y": 65, @@ -16,23 +16,23 @@ "with": [ { "block": "gtceu:venus_stone_rock_salt_ore", - "weight": 20 + "weight": 10 }, { - "block": "gtceu:raw_rock_salt_block", + "block": "gtceu:raw_salt_block", "weight": 1 }, { "block": "gtceu:venus_stone_salt_ore", - "weight": 50 + "weight": 80 }, { "block": "gtceu:venus_stone_lepidolite_ore", - "weight": 15 + "weight": 5 }, { "block": "gtceu:venus_stone_spodumene_ore", - "weight": 15 + "weight": 5 } ] }, @@ -43,23 +43,23 @@ "with": [ { "block": "gtceu:dripstone_rock_salt_ore", - "weight": 20 + "weight": 10 }, { - "block": "gtceu:raw_rock_salt_block", + "block": "gtceu:raw_salt_block", "weight": 1 }, { "block": "gtceu:dripstone_salt_ore", - "weight": 50 + "weight": 80 }, { "block": "gtceu:dripstone_lepidolite_ore", - "weight": 15 + "weight": 5 }, { "block": "gtceu:dripstone_spodumene_ore", - "weight": 15 + "weight": 5 } ] }, @@ -70,23 +70,23 @@ "with": [ { "block": "gtceu:rhyolite_rock_salt_ore", - "weight": 20 + "weight": 10 }, { - "block": "gtceu:raw_rock_salt_block", + "block": "gtceu:raw_salt_block", "weight": 1 }, { "block": "gtceu:rhyolite_salt_ore", - "weight": 50 + "weight": 80 }, { "block": "gtceu:rhyolite_lepidolite_ore", - "weight": 15 + "weight": 5 }, { "block": "gtceu:rhyolite_spodumene_ore", - "weight": 15 + "weight": 5 } ] }, @@ -97,23 +97,23 @@ "with": [ { "block": "gtceu:basalt_rock_salt_ore", - "weight": 20 + "weight": 10 }, { - "block": "gtceu:raw_rock_salt_block", + "block": "gtceu:raw_salt_block", "weight": 1 }, { "block": "gtceu:basalt_salt_ore", - "weight": 50 + "weight": 80 }, { "block": "gtceu:basalt_lepidolite_ore", - "weight": 15 + "weight": 5 }, { "block": "gtceu:basalt_spodumene_ore", - "weight": 15 + "weight": 5 } ] }, @@ -124,23 +124,23 @@ "with": [ { "block": "gtceu:andesite_rock_salt_ore", - "weight": 20 + "weight": 10 }, { - "block": "gtceu:raw_rock_salt_block", + "block": "gtceu:raw_salt_block", "weight": 1 }, { "block": "gtceu:andesite_salt_ore", - "weight": 50 + "weight": 80 }, { "block": "gtceu:andesite_lepidolite_ore", - "weight": 15 + "weight": 5 }, { "block": "gtceu:andesite_spodumene_ore", - "weight": 15 + "weight": 5 } ] }, @@ -151,56 +151,56 @@ "with": [ { "block": "gtceu:dacite_rock_salt_ore", - "weight": 20 + "weight": 10 }, { - "block": "gtceu:raw_rock_salt_block", + "block": "gtceu:raw_salt_block", "weight": 1 }, { "block": "gtceu:dacite_salt_ore", - "weight": 50 + "weight": 80 }, { "block": "gtceu:dacite_lepidolite_ore", - "weight": 15 + "weight": 5 }, { "block": "gtceu:dacite_spodumene_ore", - "weight": 15 + "weight": 5 } ] } ], "indicator": { - "rarity": 20, + "rarity": 10, "depth": 30, "underground_rarity": 40, - "underground_count": 150, + "underground_count": 180, "blocks": [ { "block": "gtceu:rock_salt_indicator", - "weight": 10 + "weight": 5 }, { "block": "gtceu:rock_salt_bud_indicator", - "weight": 10 + "weight": 5 }, { "block": "gtceu:salt_indicator", - "weight": 25 + "weight": 40 }, { "block": "gtceu:salt_bud_indicator", - "weight": 25 + "weight": 40 }, { "block": "gtceu:lepidolite_indicator", - "weight": 15 + "weight": 5 }, { "block": "gtceu:spodumene_indicator", - "weight": 15 + "weight": 5 } ] } 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 index d946548f0..e9054a1dd 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/venus/vein_manual/sulfur.json +++ b/kubejs/data/tfg/worldgen/configured_feature/venus/vein_manual/sulfur.json @@ -1,8 +1,8 @@ { "type": "tfc:cluster_vein", "config": { - "size": 15, - "rarity": 100, + "size": 20, + "rarity": 30, "density": 0.2, "min_y": 40, "max_y": 65, @@ -15,7 +15,7 @@ "with": [ { "block": "gtceu:rhyolite_sulfur_ore", - "weight": 50 + "weight": 80 }, { "block": "gtceu:raw_sulfur_block", @@ -23,19 +23,11 @@ }, { "block": "gtceu:rhyolite_pyrite_ore", - "weight": 35 - }, - { - "block": "gtceu:raw_pyrite_block", - "weight": 1 - }, - { - "block": "gtceu:rhyolite_sphalerite_ore", "weight": 15 }, { - "block": "gtceu:raw_sphalerite_block", - "weight": 1 + "block": "gtceu:rhyolite_sphalerite_ore", + "weight": 5 } ] }, @@ -47,7 +39,7 @@ "with": [ { "block": "gtceu:basalt_sulfur_ore", - "weight": 50 + "weight": 80 }, { "block": "gtceu:raw_sulfur_block", @@ -55,19 +47,11 @@ }, { "block": "gtceu:basalt_pyrite_ore", - "weight": 35 - }, - { - "block": "gtceu:raw_pyrite_block", - "weight": 1 - }, - { - "block": "gtceu:basalt_sphalerite_ore", "weight": 15 }, { - "block": "gtceu:raw_sphalerite_block", - "weight": 1 + "block": "gtceu:basalt_sphalerite_ore", + "weight": 5 } ] }, @@ -78,7 +62,7 @@ "with": [ { "block": "gtceu:dripstone_sulfur_ore", - "weight": 50 + "weight": 80 }, { "block": "gtceu:raw_sulfur_block", @@ -86,19 +70,11 @@ }, { "block": "gtceu:dripstone_pyrite_ore", - "weight": 35 - }, - { - "block": "gtceu:raw_pyrite_block", - "weight": 1 - }, - { - "block": "gtceu:dripstone_sphalerite_ore", "weight": 15 }, { - "block": "gtceu:raw_sphalerite_block", - "weight": 1 + "block": "gtceu:dripstone_sphalerite_ore", + "weight": 5 } ] }, @@ -109,7 +85,7 @@ "with": [ { "block": "gtceu:venus_stone_sulfur_ore", - "weight": 50 + "weight": 80 }, { "block": "gtceu:raw_sulfur_block", @@ -117,19 +93,11 @@ }, { "block": "gtceu:venus_stone_pyrite_ore", - "weight": 35 - }, - { - "block": "gtceu:raw_pyrite_block", - "weight": 1 - }, - { - "block": "gtceu:venus_stone_sphalerite_ore", "weight": 15 }, { - "block": "gtceu:raw_sphalerite_block", - "weight": 1 + "block": "gtceu:venus_stone_sphalerite_ore", + "weight": 5 } ] }, @@ -140,7 +108,7 @@ "with": [ { "block": "gtceu:andesite_sulfur_ore", - "weight": 50 + "weight": 80 }, { "block": "gtceu:raw_sulfur_block", @@ -148,19 +116,11 @@ }, { "block": "gtceu:andesite_pyrite_ore", - "weight": 35 - }, - { - "block": "gtceu:raw_pyrite_block", - "weight": 1 - }, - { - "block": "gtceu:andesite_sphalerite_ore", "weight": 15 }, { - "block": "gtceu:raw_sphalerite_block", - "weight": 1 + "block": "gtceu:andesite_sphalerite_ore", + "weight": 5 } ] }, @@ -171,7 +131,7 @@ "with": [ { "block": "gtceu:dacite_sulfur_ore", - "weight": 50 + "weight": 80 }, { "block": "gtceu:raw_sulfur_block", @@ -179,19 +139,11 @@ }, { "block": "gtceu:dacite_pyrite_ore", - "weight": 35 - }, - { - "block": "gtceu:raw_pyrite_block", - "weight": 1 - }, - { - "block": "gtceu:dacite_sphalerite_ore", "weight": 15 }, { - "block": "gtceu:raw_sphalerite_block", - "weight": 1 + "block": "gtceu:dacite_sphalerite_ore", + "weight": 5 } ] } @@ -200,19 +152,19 @@ "rarity": 20, "depth": 30, "underground_rarity": 40, - "underground_count": 150, + "underground_count": 180, "blocks": [ { "block": "gtceu:sulfur_indicator", - "weight": 50 + "weight": 80 }, { "block": "gtceu:pyrite_indicator", - "weight": 35 + "weight": 15 }, { "block": "tfc:ore/small_sphalerite", - "weight": 15 + "weight": 5 } ] } diff --git a/kubejs/data/tfg/worldgen/noise_settings/venus_noise.json b/kubejs/data/tfg/worldgen/noise_settings/venus_noise.json index 166ef402a..50fead7fc 100644 --- a/kubejs/data/tfg/worldgen/noise_settings/venus_noise.json +++ b/kubejs/data/tfg/worldgen/noise_settings/venus_noise.json @@ -240,16 +240,6 @@ }, - - - - - - - - - - "surface_rule": { "type": "minecraft:sequence", "sequence": [ @@ -430,7 +420,7 @@ "type": "minecraft:condition", "if_true": { "type": "minecraft:biome", - "biome_is": [ "tfg:venus/volcanic_mountains" ] + "biome_is": [ "tfg:venus/scorching_volcanoes" ] }, "then_run": { "type": "minecraft:condition", @@ -473,7 +463,7 @@ "type": "minecraft:noise_threshold", "noise": "tfg:venus_lava", "min_threshold": 0.08, - "max_threshold": 0.27 + "max_threshold": 0.37 }, "then_run": { "type": "minecraft:block", @@ -482,6 +472,21 @@ } } }, + { + "type": "minecraft:condition", + "if_true": { + "type": "minecraft:noise_threshold", + "noise": "tfg:venus_lava", + "min_threshold": -0.4, + "max_threshold": -0.31 + }, + "then_run": { + "type": "minecraft:block", + "result_state": { + "Name": "minecraft:smooth_basalt" + } + } + }, { "type": "minecraft:block", "result_state": { @@ -2767,12 +2772,56 @@ "type": "minecraft:stone_depth", "offset": 0, "surface_type": "ceiling", - "add_surface_depth": true, + "add_surface_depth": false, "secondary_depth_range": 0 }, "then_run": { - "type": "minecraft:block", - "result_state": { "Name": "minecraft:tuff" } + "type": "minecraft:sequence", + "sequence": [ + { + "type": "minecraft:condition", + "if_true": { + "type": "minecraft:noise_threshold", + "noise": "minecraft:powder_snow", + "min_threshold": 0.1, + "max_threshold": 0.2 + }, + "then_run": { + "type": "minecraft:block", + "result_state": { "Name": "tfg:sandstone/raw/fluorapatite/green" } + } + }, + { + "type": "minecraft:condition", + "if_true": { + "type": "minecraft:noise_threshold", + "noise": "minecraft:powder_snow", + "min_threshold": 0.2, + "max_threshold": 0.4 + }, + "then_run": { + "type": "minecraft:block", + "result_state": { "Name": "tfg:sandstone/raw/fluorapatite/brown" } + } + }, + { + "type": "minecraft:condition", + "if_true": { + "type": "minecraft:noise_threshold", + "noise": "minecraft:powder_snow", + "min_threshold": 0.4, + "max_threshold": 0.5 + }, + "then_run": { + "type": "minecraft:block", + "result_state": { "Name": "tfg:sandstone/raw/fluorapatite/green" } + } + }, + { + "type": "minecraft:block", + "result_state": { "Name": "minecraft:tuff" } + } + ] } }, { @@ -2897,20 +2946,6 @@ "type": "minecraft:block", "result_state": { "Name": "minecraft:tuff" } } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:stone_depth", - "offset": 0, - "surface_type": "ceiling", - "add_surface_depth": true, - "secondary_depth_range": 0 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { "Name": "tfg:sandstone/raw/fluorapatite/green" } - } } ] } @@ -3037,20 +3072,6 @@ "type": "minecraft:block", "result_state": { "Name": "minecraft:tuff" } } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:stone_depth", - "offset": 0, - "surface_type": "ceiling", - "add_surface_depth": true, - "secondary_depth_range": 0 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { "Name": "tfg:sandstone/raw/fluorapatite/brown" } - } } ] } @@ -3060,7 +3081,7 @@ "if_true": { "type": "minecraft:noise_threshold", "noise": "minecraft:powder_snow", - "min_threshold": 0.3, + "min_threshold": 0.4, "max_threshold": 0.5 }, "then_run": { @@ -3177,20 +3198,6 @@ "type": "minecraft:block", "result_state": { "Name": "tfg:sandstone/raw/fluorapatite/brown" } } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:stone_depth", - "offset": 0, - "surface_type": "ceiling", - "add_surface_depth": true, - "secondary_depth_range": 0 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { "Name": "tfg:sandstone/raw/fluorapatite/green" } - } } ] } @@ -4230,6 +4237,64 @@ "then_run": { "type": "minecraft:sequence", "sequence": [ + { + "type": "minecraft:condition", + "if_true": { + "type": "minecraft:stone_depth", + "offset": 0, + "surface_type": "ceiling", + "add_surface_depth": false, + "secondary_depth_range": 0 + }, + "then_run": { + "type": "minecraft:sequence", + "sequence": [ + { + "type": "minecraft:condition", + "if_true": { + "type": "minecraft:noise_threshold", + "noise": "minecraft:powder_snow", + "min_threshold": 0.1, + "max_threshold": 0.2 + }, + "then_run": { + "type": "minecraft:block", + "result_state": { "Name": "tfg:sandstone/raw/fluorapatite/green" } + } + }, + { + "type": "minecraft:condition", + "if_true": { + "type": "minecraft:noise_threshold", + "noise": "minecraft:powder_snow", + "min_threshold": 0.2, + "max_threshold": 0.4 + }, + "then_run": { + "type": "minecraft:block", + "result_state": { "Name": "tfg:sandstone/raw/fluorapatite/brown" } + } + }, + { + "type": "minecraft:condition", + "if_true": { + "type": "minecraft:noise_threshold", + "noise": "minecraft:powder_snow", + "min_threshold": 0.4, + "max_threshold": 0.5 + }, + "then_run": { + "type": "minecraft:block", + "result_state": { "Name": "tfg:sandstone/raw/fluorapatite/blue" } + } + }, + { + "type": "minecraft:block", + "result_state": { "Name": "tfg:sandstone/raw/fluorapatite/white" } + } + ] + } + }, { "type": "minecraft:condition", "if_true": { @@ -4529,7 +4594,7 @@ "if_true": { "type": "minecraft:noise_threshold", "noise": "minecraft:powder_snow", - "min_threshold": 0.3, + "min_threshold": 0.4, "max_threshold": 0.5 }, "then_run": { @@ -4803,20 +4868,6 @@ "type": "minecraft:block", "result_state": { "Name": "tfg:sandstone/raw/fluorapatite/green" } } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:stone_depth", - "offset": 0, - "surface_type": "ceiling", - "add_surface_depth": true, - "secondary_depth_range": 0 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { "Name": "tfg:sandstone/raw/fluorapatite/white" } - } } ] } diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/underground/ice_cave.json b/kubejs/data/tfg/worldgen/placed_feature/mars/underground/ice_cave.json index 39a11ee38..a9f8d69e2 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/mars/underground/ice_cave.json +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/underground/ice_cave.json @@ -3,7 +3,7 @@ "placement": [ { "type": "tfc:climate", - "max_temperature": -105 + "max_temperature": -75 }, { "type": "minecraft:count", diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/vein/mars_lapis.json b/kubejs/data/tfg/worldgen/placed_feature/mars/vein/mars_lapis.json new file mode 100644 index 000000000..c7d06a734 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/vein/mars_lapis.json @@ -0,0 +1,5 @@ +{ + "__credits__": "This vein was automatically generated by OresToFieldGuide.", + "feature": "tfg:mars/vein/mars_lapis", + "placement": [] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/venus/surface/geyser_source_patch.json b/kubejs/data/tfg/worldgen/placed_feature/venus/surface/geyser_source_patch.json index 814ceede1..430123383 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/venus/surface/geyser_source_patch.json +++ b/kubejs/data/tfg/worldgen/placed_feature/venus/surface/geyser_source_patch.json @@ -1,39 +1,15 @@ { - "feature": "tfg:venus/surface/geyser_source_patch", - "placement": [ - { - "type": "minecraft:count", - "count": 20 - }, + "feature": "tfg:venus/surface/geyser_source_patch", + "placement": [ + { + "type": "minecraft:rarity_filter", + "chance": 2 + }, { "type": "minecraft:in_square" }, - { - "type": "minecraft:height_range", - "height": { - "type": "minecraft:uniform", - "max_inclusive": { - "absolute": 380 - }, - "min_inclusive": { - "above_bottom": 123 - } - } - }, - { - "type": "minecraft:block_predicate_filter", - "predicate": { - "type": "minecraft:has_sturdy_face", - "offset": [ - 0, - -1, - 0 - ], - "direction": "down" - } - }, { "type": "minecraft:biome" } - ] + ] } \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/venus/surface/lava_source_patch.json b/kubejs/data/tfg/worldgen/placed_feature/venus/surface/lava_source_patch.json new file mode 100644 index 000000000..43e6e7f34 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/venus/surface/lava_source_patch.json @@ -0,0 +1,15 @@ +{ + "feature": "tfg:venus/surface/lava_source_patch", + "placement": [ + { + "type": "minecraft:rarity_filter", + "chance": 3 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:biome" + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/venus/surface/pile_black_sand.json b/kubejs/data/tfg/worldgen/placed_feature/venus/surface/pile_black_sand.json new file mode 100644 index 000000000..6eb8f33b1 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/venus/surface/pile_black_sand.json @@ -0,0 +1,19 @@ +{ + "feature": "tfg:venus/surface/pile_black_sand", + "placement": [ + { + "type": "minecraft:count", + "count": 2 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:biome" + }, + { + "type": "minecraft:heightmap", + "heightmap": "OCEAN_FLOOR" + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/venus/surface/pile_volcanic_ash.json b/kubejs/data/tfg/worldgen/placed_feature/venus/surface/pile_volcanic_ash.json new file mode 100644 index 000000000..3a6c8954d --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/venus/surface/pile_volcanic_ash.json @@ -0,0 +1,16 @@ +{ + "feature": "tfg:venus/surface/pile_volcanic_ash", + "placement": [ + { + "type": "minecraft:count", + "count": 2 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "OCEAN_FLOOR" + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/venus/surface/shadow_plant_patch.json b/kubejs/data/tfg/worldgen/placed_feature/venus/surface/shadow_plant_patch.json new file mode 100644 index 000000000..ecff092ae --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/venus/surface/shadow_plant_patch.json @@ -0,0 +1,15 @@ +{ + "feature": "tfg:venus/surface/shadow_plant_patch", + "placement": [ + { + "type": "minecraft:count", + "count": 2 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:biome" + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/venus/surface/smoker_source_patch.json b/kubejs/data/tfg/worldgen/placed_feature/venus/surface/smoker_source_patch.json new file mode 100644 index 000000000..18f4d98a6 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/venus/surface/smoker_source_patch.json @@ -0,0 +1,15 @@ +{ + "feature": "tfg:venus/surface/smoker_source_patch", + "placement": [ + { + "type": "minecraft:rarity_filter", + "chance": 3 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:biome" + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/venus/surface/twisted_vine.json b/kubejs/data/tfg/worldgen/placed_feature/venus/surface/twisted_vine.json new file mode 100644 index 000000000..9fea6b3e0 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/venus/surface/twisted_vine.json @@ -0,0 +1,19 @@ +{ + "feature": "tfg:venus/surface/twisted_vine", + "placement": [ + { + "type": "minecraft:rarity_filter", + "chance": 2 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:biome" + }, + { + "type": "minecraft:heightmap", + "heightmap": "WORLD_SURFACE" + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/venus/terrain/basalt_columns_large.json b/kubejs/data/tfg/worldgen/placed_feature/venus/terrain/basalt_columns_large.json new file mode 100644 index 000000000..19aaa0403 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/venus/terrain/basalt_columns_large.json @@ -0,0 +1,19 @@ +{ + "feature": "tfg:venus/terrain/basalt_columns_large", + "placement": [ + { + "type": "minecraft:rarity_filter", + "chance": 3 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:biome" + }, + { + "type": "minecraft:heightmap", + "heightmap": "WORLD_SURFACE" + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/venus/terrain/basalt_columns_small.json b/kubejs/data/tfg/worldgen/placed_feature/venus/terrain/basalt_columns_small.json new file mode 100644 index 000000000..e87e191c7 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/venus/terrain/basalt_columns_small.json @@ -0,0 +1,19 @@ +{ + "feature": "tfg:venus/terrain/basalt_columns_small", + "placement": [ + { + "type": "minecraft:rarity_filter", + "chance": 1 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:biome" + }, + { + "type": "minecraft:heightmap", + "heightmap": "WORLD_SURFACE" + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/venus/terrain/basalt_pillar.json b/kubejs/data/tfg/worldgen/placed_feature/venus/terrain/basalt_pillar.json new file mode 100644 index 000000000..0d156c7f7 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/venus/terrain/basalt_pillar.json @@ -0,0 +1,27 @@ +{ + "feature": "minecraft:basalt_pillar", + "placement": [ + { + "type": "minecraft:count", + "count": 20 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:height_range", + "height": { + "type": "minecraft:uniform", + "max_inclusive": { + "absolute": 200 + }, + "min_inclusive": { + "absolute": 80 + } + } + }, + { + "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 b50e70ebd..eadd12694 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 @@ -25,7 +25,11 @@ "placement": [ { "type": "minecraft:rarity_filter", - "chance": 1 + "chance": 2 + }, + { + "type": "minecraft:count", + "count": 2 }, { "type": "minecraft:in_square" diff --git a/kubejs/data/tfg/worldgen/structure_set/illagers/arabic_village.json b/kubejs/data/tfg/worldgen/structure_set/illagers/arabic_village.json index 2a74d0ac0..d72ea3701 100644 --- a/kubejs/data/tfg/worldgen/structure_set/illagers/arabic_village.json +++ b/kubejs/data/tfg/worldgen/structure_set/illagers/arabic_village.json @@ -8,10 +8,10 @@ "placement": { "type": "tfc:climate", "salt": 26256356324, - "spacing": 40, - "separation": 30, + "spacing": 60, + "separation": 45, "climate": { - "min_temperature": 10, + "min_temperature": 8, "max_temperature": 25, "min_rainfall": 100, "max_rainfall": 250, diff --git a/kubejs/data/tfg/worldgen/structure_set/illagers/illager_camps.json b/kubejs/data/tfg/worldgen/structure_set/illagers/illager_camps.json index 4096f4a32..9de015cb9 100644 --- a/kubejs/data/tfg/worldgen/structure_set/illagers/illager_camps.json +++ b/kubejs/data/tfg/worldgen/structure_set/illagers/illager_camps.json @@ -8,8 +8,8 @@ "placement": { "type": "tfc:climate", "salt": 96263635, - "spacing": 40, - "separation": 30, + "spacing": 50, + "separation": 40, "climate": { "min_temperature": -12, "max_temperature": 25, diff --git a/kubejs/data/tfg/worldgen/structure_set/illagers/illager_forest_roaming.json b/kubejs/data/tfg/worldgen/structure_set/illagers/illager_forest_roaming.json index 7f55a757a..87d5252f3 100644 --- a/kubejs/data/tfg/worldgen/structure_set/illagers/illager_forest_roaming.json +++ b/kubejs/data/tfg/worldgen/structure_set/illagers/illager_forest_roaming.json @@ -8,8 +8,8 @@ "placement": { "type": "tfc:climate", "salt": 74256242524, - "spacing": 35, - "separation": 25, + "spacing": 40, + "separation": 30, "climate": { "min_temperature": -12, "max_temperature": 25, diff --git a/kubejs/data/tfg/worldgen/structure_set/illagers/norse_village.json b/kubejs/data/tfg/worldgen/structure_set/illagers/norse_village.json index d04ff6361..3aab480c9 100644 --- a/kubejs/data/tfg/worldgen/structure_set/illagers/norse_village.json +++ b/kubejs/data/tfg/worldgen/structure_set/illagers/norse_village.json @@ -12,11 +12,11 @@ "placement": { "type": "tfc:climate", "salt": 26256356324, - "spacing": 40, - "separation": 30, + "spacing": 60, + "separation": 45, "climate": { "min_temperature": -12, - "max_temperature": 8, + "max_temperature": 2, "min_rainfall": 250, "max_forest": "edge" } diff --git a/kubejs/data/tfg/worldgen/structure_set/illagers/yurts_village.json b/kubejs/data/tfg/worldgen/structure_set/illagers/yurts_village.json index f1a76756f..f4ea7425e 100644 --- a/kubejs/data/tfg/worldgen/structure_set/illagers/yurts_village.json +++ b/kubejs/data/tfg/worldgen/structure_set/illagers/yurts_village.json @@ -8,11 +8,11 @@ "placement": { "type": "tfc:climate", "salt": 26256356324, - "spacing": 40, - "separation": 30, + "spacing": 60, + "separation": 45, "climate": { "min_temperature": -12, - "max_temperature": 8, + "max_temperature": 2, "min_rainfall": 100, "max_rainfall": 250, "max_forest": "edge" diff --git a/kubejs/server_scripts/ad_astra/data.js b/kubejs/server_scripts/ad_astra/data.js index ac8b03a0b..ad35b45b0 100644 --- a/kubejs/server_scripts/ad_astra/data.js +++ b/kubejs/server_scripts/ad_astra/data.js @@ -14,8 +14,8 @@ function registerTFCDataForAdAstra(event) { event.foodItem('ad_astra:cheese', food => { food.hunger(3) - food.saturation(3) - food.dairy(1.2) + food.saturation(2) + food.dairy(3) food.decayModifier(0.9) }) diff --git a/kubejs/server_scripts/ad_astra/recipes.js b/kubejs/server_scripts/ad_astra/recipes.js index 250a1732d..b953d9c70 100644 --- a/kubejs/server_scripts/ad_astra/recipes.js +++ b/kubejs/server_scripts/ad_astra/recipes.js @@ -288,7 +288,7 @@ const registerAdAstraRecipes = (event) => { //#region Decoration blocks global.MINECRAFT_DYE_NAMES.forEach(color => { - event.shaped(`ad_astra:${color}_industrial_lamp`, [ + event.shaped(`2x ad_astra:${color}_industrial_lamp`, [ ' N ', 'DTD', ' P ' @@ -300,7 +300,7 @@ const registerAdAstraRecipes = (event) => { }) .id(`tfg:shaped/ad_astra_${color}_industrial_lamp`); - event.shaped(`ad_astra:small_${color}_industrial_lamp`, [ + event.shaped(`2x ad_astra:small_${color}_industrial_lamp`, [ ' N ', 'DTD', ' P ' diff --git a/kubejs/server_scripts/ad_astra/tags.js b/kubejs/server_scripts/ad_astra/tags.js index a705ac40f..681fe511a 100644 --- a/kubejs/server_scripts/ad_astra/tags.js +++ b/kubejs/server_scripts/ad_astra/tags.js @@ -107,6 +107,21 @@ const registerAdAstraBlockTags = (event) => { event.add('minecraft:logs_that_burn', wood.stripped_log) } }) + const DECO_BLOCKS = [ 'iron', 'steel', 'desh', 'calorite', 'ostrum' ]; + DECO_BLOCKS.forEach(block => { + event.add(`tfg:ad_astra_${block}_block`, `ad_astra:${block}_factory_block`) + event.add(`tfg:ad_astra_${block}_block`, `ad_astra:${block}_plating`) + event.add(`tfg:ad_astra_${block}_block`, `ad_astra:${block}_panel`) + event.add(`tfg:ad_astra_${block}_block`, `ad_astra:${block}_pillar`) + event.add(`tfg:ad_astra_${block}_block`, `ad_astra:${block}_plateblock`) + event.add(`tfg:ad_astra_${block}_block`, `ad_astra:encased_${block}_block`) + }) + + event.add('tfg:ad_astra_etrium_block', 'ad_astra:etrium_factory_block') + event.add('tfg:ad_astra_etrium_block', 'ad_astra:encased_etrium_block') + event.add('tfg:ad_astra_etrium_block', 'ad_astra:etrium_plateblock') + event.add('tfg:ad_astra_etrium_block', 'ad_astra:etrium_panel') + event.add('tfg:ad_astra_etrium_block', 'ad_astra:etrium_block') } const registerAdAstraBiomeTags = (event) => { diff --git a/kubejs/server_scripts/arthropocolypse/recipes.js b/kubejs/server_scripts/arthropocolypse/recipes.js new file mode 100644 index 000000000..b531f740b --- /dev/null +++ b/kubejs/server_scripts/arthropocolypse/recipes.js @@ -0,0 +1,43 @@ +"use strict"; + +/** + * + * @param {Internal.RecipesEventJS} event + */ +function registerArthropocolypseRecipes(event) { + event.remove({ id: 'arthropocolypse:beetle_helmet' }); + event.remove({ id: 'arthropocolypse:beetle_chestplate' }); + event.remove({ id: 'arthropocolypse:beetle_leggings' }); + event.remove({ id: 'arthropocolypse:beetle_boots' }); + event.remove({ id: 'arthropocolypse:energy_bar' }); + event.remove({ id: 'arthropocolypse:gilded_scale_elytra' }); + event.remove({ id: 'arthropocolypse:mandible_shear' }); + event.remove({ id: 'arthropocolypse:mandible_dagger' }); + event.remove({ id: 'arthropocolypse:cooked_ice_crawler_meat' }); + event.remove({ id: 'minecraft:cooked_ice_crawler_meat_from_smoking' }); + event.remove({ id: 'arthropocolypse:polished_beetle_fragment_block' }); + event.remove({ id: 'arthropocolypse:beetle_fragment_block_bricks' }); + event.remove({ id: 'arthropocolypse:beetle_fragment_block_stairs' }); + event.remove({ id: 'arthropocolypse:beetle_fragment_block_slabs' }); + event.remove({ id: 'arthropocolypse:beetle_fragment_block_wall' }); + event.remove({ id: 'arthropocolypse:tiled_beetle_fragment_block' }); + event.remove({ id: 'arthropocolypse:beetle_fragment_block_bricks_stairs' }); + event.remove({ id: 'arthropocolypse:beetle_fragment_block_bricks_slabs' }); + event.remove({ id: 'arthropocolypse:beetle_fragment_block_bricks_wall' }); + event.remove({ id: 'arthropocolypse:polished_beetle_fragment_block_stairs' }); + event.remove({ id: 'arthropocolypse:polished_beetle_fragment_block_slabs' }); + event.remove({ id: 'arthropocolypse:polished_beetle_fragment_block_wall' }); + event.remove({ id: 'arthropocolypse:tiled_beetle_fragment_block_stairs' }); + event.remove({ id: 'arthropocolypse:tiled_beetle_fragment_block_slabs' }); + event.remove({ id: 'arthropocolypse:tiled_beetle_fragment_block_wall' }); + + + + //event.recipes.tfc.knapping('arthropocolypse:mandible_dagger', 'tfc:goat_horn', [ + // ' X ', + // ' XX ', + // ' XX ', + // ' XX ', + // ' XX ' + //]).ingredient('arthropocolypse:mandible_part').outsideSlotRequired(false).id('tfg:knapping/mandible_dagger') +} \ No newline at end of file diff --git a/kubejs/server_scripts/arthropocolypse/tags.js b/kubejs/server_scripts/arthropocolypse/tags.js new file mode 100644 index 000000000..7f5fa0b61 --- /dev/null +++ b/kubejs/server_scripts/arthropocolypse/tags.js @@ -0,0 +1,14 @@ +"use strict"; + +/** + * + * @param {TagEvent.Item} event + */ +const registerArthropocolypseItemTags = (event) => { + global.ARTHROPOCOLYPSE_DISABLED_ITEMS.forEach(element => { + event.removeAllTagsFrom(element); + event.add("c:hidden_from_recipe_viewers", element) + }); + + event.add('tfc:any_knapping', 'arthropocolypse:mandible_part'); +} \ No newline at end of file diff --git a/kubejs/server_scripts/create_hypertube/recipes.js b/kubejs/server_scripts/create_hypertube/recipes.js index 39b640b69..b2a5179cf 100644 --- a/kubejs/server_scripts/create_hypertube/recipes.js +++ b/kubejs/server_scripts/create_hypertube/recipes.js @@ -39,4 +39,32 @@ function registerCreateHypertubeRecipes(event) { .inputFluids(Fluid.of('gtceu:styrene_butadiene_rubber', 144)) .EUt(GTValues.VA[GTValues.HV]) .duration(100) + + event.recipes.gtceu.assembler('create_hypertube:redstone_detector_tube_attachment') + .itemInputs('#forge:plates/stainless_steel', 'gtceu:activity_detector_cover', 'ae2:charged_certus_quartz_crystal') + .itemOutputs('create_hypertube:redstone_detector_tube_attachment') + .inputFluids(Fluid.of('gtceu:silicone_rubber', 288)) + .EUt(GTValues.VA[GTValues.HV]) + .duration(100) + + event.recipes.gtceu.assembler('create_hypertube:redstone_detector_tube_attachment_sbr') + .itemInputs('#forge:plates/stainless_steel', 'gtceu:activity_detector_cover', 'ae2:charged_certus_quartz_crystal') + .itemOutputs('create_hypertube:redstone_detector_tube_attachment') + .inputFluids(Fluid.of('gtceu:styrene_butadiene_rubber', 144)) + .EUt(GTValues.VA[GTValues.HV]) + .duration(100) + + event.recipes.gtceu.assembler('create_hypertube:tube_scanner_attachment') + .itemInputs('#forge:plates/stainless_steel', 'gtceu:activity_detector_cover', 'ae2:fluix_crystal') + .itemOutputs('create_hypertube:tube_scanner_attachment') + .inputFluids(Fluid.of('gtceu:silicone_rubber', 288)) + .EUt(GTValues.VA[GTValues.HV]) + .duration(100) + + event.recipes.gtceu.assembler('create_hypertube:tube_scanner_attachment_sbr') + .itemInputs('#forge:plates/stainless_steel', 'gtceu:activity_detector_cover', 'ae2:fluix_crystal') + .itemOutputs('create_hypertube:tube_scanner_attachment') + .inputFluids(Fluid.of('gtceu:styrene_butadiene_rubber', 144)) + .EUt(GTValues.VA[GTValues.HV]) + .duration(100) } diff --git a/kubejs/server_scripts/createdeco/recipes.js b/kubejs/server_scripts/createdeco/recipes.js index 627b1cefd..148bc5606 100644 --- a/kubejs/server_scripts/createdeco/recipes.js +++ b/kubejs/server_scripts/createdeco/recipes.js @@ -131,7 +131,7 @@ const registerCreatedecoRecipes = (event) => { // Loop through each lamp type and color to create the recipes lampTypes.forEach(lampType => { lampColors.forEach(lampColor => { - let output = `createdeco:${lampColor}_${lampType}_lamp`; // Define the output item ID + let output = `2x createdeco:${lampColor}_${lampType}_lamp`; // Define the output item ID lampRecipe(output, lampType, lampColor); // Call the lampRecipe function for each combination }); }); diff --git a/kubejs/server_scripts/domum_ornamentum/tags.js b/kubejs/server_scripts/domum_ornamentum/tags.js index 9d793dc97..04b05cd50 100644 --- a/kubejs/server_scripts/domum_ornamentum/tags.js +++ b/kubejs/server_scripts/domum_ornamentum/tags.js @@ -152,6 +152,13 @@ function registerDomumOrnamentumBlockTags(event) { "createdeco:corner_pearl_bricks", "createdeco:cracked_pearl_bricks", "createdeco:mossy_pearl_bricks", + //Ad Astra blocks + "#tfg:ad_astra_iron_block", + "#tfg:ad_astra_etrium_block", + "#tfg:ad_astra_steel_block", + "#tfg:ad_astra_desh_block", + "#tfg:ad_astra_ostrum_block", + "#tfg:ad_astra_calorite_block", ]; materials.forEach((material) => { diff --git a/kubejs/server_scripts/firmalife/recipes.js b/kubejs/server_scripts/firmalife/recipes.js index de40b9c9a..868eb0a84 100644 --- a/kubejs/server_scripts/firmalife/recipes.js +++ b/kubejs/server_scripts/firmalife/recipes.js @@ -558,21 +558,6 @@ const registerFirmaLifeRecipes = (event) => { .EUt(GTValues.VA[GTValues.ULV]) .duration(200) - event.recipes.firmalife.mixing_bowl() - .itemIngredients(['#tfg:wood_dusts', '#tfg:wood_dusts', 'tfc:glue']) - .outputItem('2x tfg:chipboard_composite') - .id('tfg:mixing_bowl/chipboard_composite_glue') - - event.recipes.firmalife.mixing_bowl() - .itemIngredients(['#tfg:wood_dusts', '#tfg:wood_dusts', '#tfg:wood_dusts', '#tfg:wood_dusts', 'gtceu:sticky_resin']) - .outputItem('4x tfg:chipboard_composite') - .id('tfg:mixing_bowl/chipboard_composite_resin') - - event.recipes.firmalife.mixing_bowl() - .itemIngredients(['#tfg:wood_dusts', '#tfg:wood_dusts', '#forge:wax']) - .outputItem('2x tfg:chipboard_composite') - .id('tfg:mixing_bowl/chipboard_composite_wax') - // Dough global.TFC_GRAINS.forEach(grain => { @@ -701,30 +686,12 @@ const registerFirmaLifeRecipes = (event) => { .outputItem(`4x firmalife:food/${grain}_dough`) .id(`tfg:mixing_bowl/${grain}_dough`) - event.recipes.firmalife.mixing_bowl() - .ingredients([ - TFC.ingredient.notRotten(`tfc:food/${grain}_flour`), - TFC.ingredient.notRotten(`tfc:food/${grain}_flour`), - `#tfc:sweetener`, - `#tfc:sweetener`], - Fluid.of('firmalife:yeast_starter', 400)) - .outputItem(`8x firmalife:food/${grain}_dough`) - .id(`tfg:mixing_bowl/${grain}_dough_2`) - event.recipes.firmalife.mixing_bowl() .ingredients([ TFC.ingredient.notRotten(`tfc:food/${grain}_flour`)], Fluid.of('minecraft:water', 100)) .outputItem(`4x tfc:food/${grain}_dough`) .id(`tfg:mixing_bowl/${grain}_flatbread_dough`) - - event.recipes.firmalife.mixing_bowl() - .ingredients([ - TFC.ingredient.notRotten(`tfc:food/${grain}_flour`), - TFC.ingredient.notRotten(`tfc:food/${grain}_flour`)], - Fluid.of('minecraft:water', 200)) - .outputItem(`8x tfc:food/${grain}_dough`) - .id(`tfg:mixing_bowl/${grain}_flatbread_dough_2`) }) event.recipes.tfc.advanced_shapeless_crafting(TFC.isp.of(`2x firmalife:food/hardtack_dough`).copyFood(), [ @@ -894,12 +861,12 @@ const registerFirmaLifeRecipes = (event) => { setChocolateHeating('dark') //fixing the bread unrotting - event.remove({ id: 'firmalife:crafting/oat_slice'}) - event.remove({ id: 'firmalife:crafting/wheat_slice'}) - event.remove({ id: 'firmalife:crafting/barley_slice'}) - event.remove({ id: 'firmalife:crafting/maize_slice'}) - event.remove({ id: 'firmalife:crafting/rice_slice'}) - event.remove({ id: 'firmalife:crafting/rye_slice'}) + event.remove({ id: 'firmalife:crafting/oat_slice' }) + event.remove({ id: 'firmalife:crafting/wheat_slice' }) + event.remove({ id: 'firmalife:crafting/barley_slice' }) + event.remove({ id: 'firmalife:crafting/maize_slice' }) + event.remove({ id: 'firmalife:crafting/rice_slice' }) + event.remove({ id: 'firmalife:crafting/rye_slice' }) event.recipes.tfc.advanced_shapeless_crafting( TFC.itemStackProvider.of('2x firmalife:food/oat_slice').copyFood(), @@ -927,109 +894,137 @@ const registerFirmaLifeRecipes = (event) => { .id(`tfg:crafting/rye_slice`) //fixing the cheese curd unrotting - event.remove({ id: 'firmalife:crafting/cheddar_wheel'}) - event.remove({ id: 'firmalife:crafting/chevre_wheel'}) - event.remove({ id: 'firmalife:crafting/rajya_metok_wheel'}) - event.remove({ id: 'firmalife:barrel/gouda'}) - event.remove({ id: 'firmalife:barrel/feta'}) - event.remove({ id: 'firmalife:barrel/shosha'}) + event.remove({ id: 'firmalife:crafting/cheddar_wheel' }) + event.remove({ id: 'firmalife:crafting/chevre_wheel' }) + event.remove({ id: 'firmalife:crafting/rajya_metok_wheel' }) + event.remove({ id: 'firmalife:barrel/gouda' }) + event.remove({ id: 'firmalife:barrel/feta' }) + event.remove({ id: 'firmalife:barrel/shosha' }) event.recipes.tfc.advanced_shaped_crafting( TFC.itemStackProvider.of('firmalife:cheddar_wheel').copyFood(), [ - 'AAA', - 'BBB', - 'AAA' - ], { - A: 'tfc:powder/salt', - B: TFC.ingredient.notRotten('firmalife:food/milk_curd') - }, 0, 0).id('tfg:crafting/cheddar_wheel') + 'AAA', + 'BBB', + 'AAA' + ], { + A: 'tfc:powder/salt', + B: TFC.ingredient.notRotten('firmalife:food/milk_curd') + }, 0, 0).id('tfg:crafting/cheddar_wheel') event.recipes.tfc.advanced_shaped_crafting( TFC.itemStackProvider.of('firmalife:chevre_wheel').copyFood(), [ - 'AAA', - 'BBB', - 'AAA' - ], { - A: 'tfc:powder/salt', - B: TFC.ingredient.notRotten('firmalife:food/goat_curd') - }, 0, 0).id('tfg:crafting/chevre_wheel') + 'AAA', + 'BBB', + 'AAA' + ], { + A: 'tfc:powder/salt', + B: TFC.ingredient.notRotten('firmalife:food/goat_curd') + }, 0, 0).id('tfg:crafting/chevre_wheel') event.recipes.tfc.advanced_shaped_crafting( TFC.itemStackProvider.of('firmalife:rajya_metok_wheel').copyFood(), [ - 'AAA', - 'BBB', - 'AAA' - ], { - A: 'tfc:powder/salt', - B: TFC.ingredient.notRotten('firmalife:food/yak_curd') - }, 0, 0).id('tfg:crafting/rajya_metok_wheel') - event.custom({ - "type": "tfc:barrel_sealed", - "input_item": { - "count": 3, - "ingredient": { - "type": "tfc:not_rotten", - "ingredient": { "item": "firmalife:food/milk_curd" } - } - }, - "input_fluid": { - "ingredient": "tfc:salt_water", - "amount": 750 - }, - "output_item": { - "item": "firmalife:gouda_wheel" - }, - "duration": 16000 - }).id('tfg:barrel/gouda_wheel') - event.custom({ - "type": "tfc:barrel_sealed", - "input_item": { - "count": 3, - "ingredient": { - "type": "tfc:not_rotten", - "ingredient": { "item": "firmalife:food/goat_curd" } - } - }, - "input_fluid": { - "ingredient": "tfc:salt_water", - "amount": 750 - }, - "output_item": { - "item": "firmalife:feta_wheel" - }, - "duration": 16000 - }).id('tfg:barrel/feta_wheel') - event.custom({ - "type": "tfc:barrel_sealed", - "input_item": { - "count": 3, - "ingredient": { - "type": "tfc:not_rotten", - "ingredient": { "item": "firmalife:food/yak_curd" } - } - }, - "input_fluid": { - "ingredient": "tfc:salt_water", - "amount": 750 - }, - "output_item": { - "item": "firmalife:shosha_wheel" - }, - "duration": 16000 - }).id('tfg:barrel/shosha_wheel') - + 'AAA', + 'BBB', + 'AAA' + ], { + A: 'tfc:powder/salt', + B: TFC.ingredient.notRotten('firmalife:food/yak_curd') + }, 0, 0).id('tfg:crafting/rajya_metok_wheel') + event.custom({ + "type": "tfc:barrel_sealed", + "input_item": { + "count": 3, + "ingredient": { + "type": "tfc:not_rotten", + "ingredient": { "item": "firmalife:food/milk_curd" } + } + }, + "input_fluid": { + "ingredient": "tfc:salt_water", + "amount": 750 + }, + "output_item": { + "item": "firmalife:gouda_wheel" + }, + "duration": 16000 + }).id('tfg:barrel/gouda_wheel') + event.custom({ + "type": "tfc:barrel_sealed", + "input_item": { + "count": 3, + "ingredient": { + "type": "tfc:not_rotten", + "ingredient": { "item": "firmalife:food/goat_curd" } + } + }, + "input_fluid": { + "ingredient": "tfc:salt_water", + "amount": 750 + }, + "output_item": { + "item": "firmalife:feta_wheel" + }, + "duration": 16000 + }).id('tfg:barrel/feta_wheel') + event.custom({ + "type": "tfc:barrel_sealed", + "input_item": { + "count": 3, + "ingredient": { + "type": "tfc:not_rotten", + "ingredient": { "item": "firmalife:food/yak_curd" } + } + }, + "input_fluid": { + "ingredient": "tfc:salt_water", + "amount": 750 + }, + "output_item": { + "item": "firmalife:shosha_wheel" + }, + "duration": 16000 + }).id('tfg:barrel/shosha_wheel') + // #region Oven heating recipes - + event.recipes.tfc.heating(`firmalife:oven_top`, 1399) - .resultItem(`firmalife:cured_oven_top`) - .id(`tfg:heating/oven_top`) + .resultItem(`firmalife:cured_oven_top`) + .id(`tfg:heating/oven_top`) event.recipes.tfc.heating(`firmalife:oven_chimney`, 1399) - .resultItem(`firmalife:cured_oven_chimney`) - .id(`tfg:heating/oven_chimney`) + .resultItem(`firmalife:cured_oven_chimney`) + .id(`tfg:heating/oven_chimney`) event.recipes.tfc.heating(`firmalife:oven_bottom`, 1399) - .resultItem(`firmalife:cured_oven_bottom`) - .id(`tfg:heating/oven_bottom`) + .resultItem(`firmalife:cured_oven_bottom`) + .id(`tfg:heating/oven_bottom`) event.recipes.tfc.heating(`firmalife:oven_hopper`, 1399) - .resultItem(`firmalife:cured_oven_hopper`) - .id(`tfg:heating/oven_hopper`) + .resultItem(`firmalife:cured_oven_hopper`) + .id(`tfg:heating/oven_hopper`) // #endregion + + // Adds a tooltip to the bacon craft to tell people it needs to be smoked first, + // and adds traits that normally disappear on the craft + + event.recipes.tfc.advanced_shapeless_crafting( + TFC.isp.of(Item.of('4x firmalife:food/bacon') + .withName(Text.translate('tfg.emi.bacon_requirement'))) + .addTrait("firmalife:smoked") + .addTrait("tfc:brined") + .addTrait("tfc:salted"), + [ + TFC.ingredient.notRotten(TFC.ingredient.hasTrait('tfc:food/pork', "firmalife:smoked")), + '#forge:tools/knives', + 'tfc:powder/salt' + ]) + .modifyResult((craftingGrid, result) => { + result.resetHoverName(); + return result; + }) + .id('firmalife:crafting/bacon') + + // Replacement for yeast starter recipe that uses a different, more descriptive tag + + event.recipes.tfc.barrel_sealed(72000) + .inputFluid(Fluid.of('minecraft:water', 100)) + .inputItem(TFC.ingredient.hasTrait(Ingredient.of('#tfg:dried_fruit'), "firmalife:dried")) + .outputFluid(Fluid.of('firmalife:yeast_starter', 100)) + .id('firmalife:barrel/yeast_starter') } diff --git a/kubejs/server_scripts/firmalife/tags.js b/kubejs/server_scripts/firmalife/tags.js index e8746e3c1..0a66fefd9 100644 --- a/kubejs/server_scripts/firmalife/tags.js +++ b/kubejs/server_scripts/firmalife/tags.js @@ -16,6 +16,14 @@ const registerFirmaLifeItemTags = (event) => { // Удаление тегов у руд event.removeAllTagsFrom("/tfc:ore/[^*]+/[^*]+/") + + // Make our own "dried fruit" tag so we can display something in EMI - used for yeast starter + const fruitArray = Ingredient.of('#tfc:foods/fruits').itemIds.toArray().map(String) + fruitArray.forEach(fruit => { + if (fruit !== 'betterend:shadow_berry_cooked' && fruit !== 'minecraft:popped_chorus_fruit') { + event.add('tfg:dried_fruit', fruit) + } + }) } const registerFirmaLifeBlockTags = (event) => { diff --git a/kubejs/server_scripts/greate/recipes.js b/kubejs/server_scripts/greate/recipes.js index 6298b3e77..2f48a8e4f 100644 --- a/kubejs/server_scripts/greate/recipes.js +++ b/kubejs/server_scripts/greate/recipes.js @@ -87,53 +87,52 @@ function registerGreateRecipes(event) { // #region Gearboxes - event.recipes.gtceu.assembler('greate:andesite_alloy_gearbox') - .itemInputs('create:andesite_casing', '4x greate:andesite_alloy_shaft') - .itemOutputs('greate:andesite_alloy_gearbox') - .circuit(5) - .duration(50) - .EUt(GTValues.VA[GTValues.ULV]) + global.AVAILABLE_GREATE_MATERIAL_TIERS.forEach(tier => { + + event.shaped(`greate:${tier}_gearbox`, [ + ' A ', + 'ABA', + 'CA ' + ], { + A: `greate:${tier}_shaft`, + B: 'create:andesite_casing', + C: '#forge:tools/wrenches' + }).id(`tfg:shaped/${tier}_gearbox`) + + event.shaped(`greate:${tier}_vertical_gearbox`, [ + 'A A', + ' B ', + 'ACA' + ], { + A: `greate:${tier}_shaft`, + B: 'create:andesite_casing', + C: '#forge:tools/wrenches' + }).id(`tfg:shaped/${tier}_vertical_gearbox`) + + event.shapeless(`greate:${tier}_gearbox`, [`greate:${tier}_vertical_gearbox`]) + event.shapeless(`greate:${tier}_vertical_gearbox`, [`greate:${tier}_gearbox`]) + + event.recipes.gtceu.assembler(`greate:${tier}_gearbox`) + .itemInputs('create:andesite_casing', `4x greate:${tier}_shaft`) + .itemOutputs(`greate:${tier}_gearbox`) + .circuit(5) + .duration(50) + .EUt(GTValues.VA[GTValues.ULV]) + }) + TFGHelpers.registerMaterialInfo('greate:andesite_alloy_gearbox', { 'wood': 1, 'wrought_iron': 1 }); TFGHelpers.registerMaterialInfo('greate:andesite_alloy_vertical_gearbox', { 'wood': 1, 'wrought_iron': 1 }); - event.recipes.gtceu.assembler('greate:steel_gearbox') - .itemInputs('create:andesite_casing', '4x greate:steel_shaft') - .itemOutputs('greate:steel_gearbox') - .circuit(5) - .duration(50) - .EUt(GTValues.VA[GTValues.ULV]) - TFGHelpers.registerMaterialInfo('greate:steel_gearbox', { 'wood': 1, 'wrought_iron': 1, 'steel': 4/9 }); TFGHelpers.registerMaterialInfo('greate:steel_vertical_gearbox', { 'wood': 1, 'wrought_iron': 1, 'steel': 4/9 }); - event.recipes.gtceu.assembler('greate:aluminium_gearbox') - .itemInputs('create:andesite_casing', '4x greate:aluminium_shaft') - .itemOutputs('greate:aluminium_gearbox') - .circuit(5) - .duration(50) - .EUt(GTValues.VA[GTValues.ULV]) - TFGHelpers.registerMaterialInfo('greate:aluminium_gearbox', { 'wood': 1, 'wrought_iron': 1, 'aluminium': 4/9 }); TFGHelpers.registerMaterialInfo('greate:aluminium_vertical_gearbox', { 'wood': 1, 'wrought_iron': 1, 'aluminium': 4/9 }); - event.recipes.gtceu.assembler('greate:stainless_steel_gearbox') - .itemInputs('create:andesite_casing', '4x greate:stainless_steel_shaft') - .itemOutputs('greate:stainless_steel_gearbox') - .circuit(5) - .duration(50) - .EUt(GTValues.VA[GTValues.ULV]) - TFGHelpers.registerMaterialInfo('greate:stainless_steel_gearbox', { 'wood': 1, 'wrought_iron': 1, 'stainless_steel': 4/9 }); TFGHelpers.registerMaterialInfo('greate:stainless_steel_vertical_gearbox', { 'wood': 1, 'wrought_iron': 1, 'stainless_steel': 4/9 }); - event.recipes.gtceu.assembler('greate:titanium_gearbox') - .itemInputs('create:andesite_casing', '4x greate:titanium_shaft') - .itemOutputs('greate:titanium_gearbox') - .circuit(5) - .duration(50) - .EUt(GTValues.VA[GTValues.ULV]) - TFGHelpers.registerMaterialInfo('greate:titanium_gearbox', { 'wood': 1, 'wrought_iron': 1, 'titanium': 4/9 }); TFGHelpers.registerMaterialInfo('greate:titanium_vertical_gearbox', { 'wood': 1, 'wrought_iron': 1, 'titanium': 4/9 }); diff --git a/kubejs/server_scripts/greate/recipes.recycling.js b/kubejs/server_scripts/greate/recipes.recycling.js index c9a55500e..aef21936b 100644 --- a/kubejs/server_scripts/greate/recipes.recycling.js +++ b/kubejs/server_scripts/greate/recipes.recycling.js @@ -42,20 +42,10 @@ function registerGreateRecyclingRecipes(event) { // #region Gearbox - event.recipes.tfc.extra_products_shapeless_crafting('4x greate:andesite_alloy_shaft', - event.shapeless('create:andesite_casing', ['greate:andesite_alloy_gearbox', '#forge:tools/hammers'])) - - event.recipes.tfc.extra_products_shapeless_crafting('4x greate:steel_shaft', - event.shapeless('create:andesite_casing', ['greate:steel_gearbox', '#forge:tools/hammers'])) - - event.recipes.tfc.extra_products_shapeless_crafting('4x greate:aluminium_shaft', - event.shapeless('create:andesite_casing', ['greate:aluminium_gearbox', '#forge:tools/hammers'])) - - event.recipes.tfc.extra_products_shapeless_crafting('4x greate:stainless_steel_shaft', - event.shapeless('create:andesite_casing', ['greate:stainless_steel_gearbox', '#forge:tools/hammers'])) - - event.recipes.tfc.extra_products_shapeless_crafting('4x greate:titanium_shaft', - event.shapeless('create:andesite_casing', ['greate:titanium_gearbox', '#forge:tools/hammers'])) + global.GREATE_MATERIAL_TIERS.forEach(tier => { + event.recipes.tfc.extra_products_shapeless_crafting(`4x greate:${tier}_shaft`, + event.shapeless('create:andesite_casing', [`greate:${tier}_gearbox`, '#forge:tools/hammers'])) + }) // #endregion } \ No newline at end of file diff --git a/kubejs/server_scripts/greate/recipes.removes.js b/kubejs/server_scripts/greate/recipes.removes.js index 1f49ddb72..0177031bf 100644 --- a/kubejs/server_scripts/greate/recipes.removes.js +++ b/kubejs/server_scripts/greate/recipes.removes.js @@ -23,82 +23,37 @@ function removeGreateRecipes(event) { event.remove({ mod: 'greate', input: 'create:andesite_alloy' }); event.remove({ mod: 'greate', output: 'minecraft:bamboo_pressure_plate'}) - - event.remove({ id: 'greate:shaped/andesite_alloy_shaft' }) - event.remove({ id: 'greate:shaped/andesite_alloy_cogwheel' }) - event.remove({ id: 'greate:shaped/andesite_alloy_large_cogwheel' }) - event.remove({ id: 'greate:shaped/andesite_alloy_large_cogwheel_from_little' }) - event.remove({ id: 'greate:shaped/steel_cogwheel' }) - event.remove({ id: 'greate:shaped/steel_large_cogwheel' }) - event.remove({ id: 'greate:shaped/steel_large_cogwheel_from_little' }) - event.remove({ id: 'greate:shaped/aluminium_cogwheel' }) - event.remove({ id: 'greate:shaped/aluminium_large_cogwheel' }) - event.remove({ id: 'greate:shaped/aluminium_large_cogwheel_from_little' }) - event.remove({ id: 'greate:shaped/stainless_steel_cogwheel' }) - event.remove({ id: 'greate:shaped/stainless_steel_large_cogwheel' }) - event.remove({ id: 'greate:shaped/stainless_steel_large_cogwheel_from_little' }) - event.remove({ id: 'greate:shaped/titanium_cogwheel' }) - event.remove({ id: 'greate:shaped/titanium_large_cogwheel' }) - event.remove({ id: 'greate:shaped/titanium_large_cogwheel_from_little' }) - removeCutterRecipe(event, "andesite_alloy_shaft") - removeCutterRecipe(event, "andesite_alloy_shaft_water") - removeCutterRecipe(event, "andesite_alloy_shaft_distilled_water") - removeCutterRecipe(event, "steel_shaft") - removeCutterRecipe(event, "steel_shaft_water") - removeCutterRecipe(event, "steel_shaft_distilled_water") - removeCutterRecipe(event, "aluminium_shaft") - removeCutterRecipe(event, "aluminium_shaft_water") - removeCutterRecipe(event, "aluminium_shaft_distilled_water") - removeCutterRecipe(event, "stainless_steel_shaft") - removeCutterRecipe(event, "stainless_steel_shaft_water") - removeCutterRecipe(event, "stainless_steel_shaft_distilled_water") - removeCutterRecipe(event, "titanium_shaft") - removeCutterRecipe(event, "titanium_shaft_water") - removeCutterRecipe(event, "titanium_shaft_distilled_water") + global.GREATE_MATERIAL_TIERS.forEach(tier => { + + event.remove({ id: `greate:shaped/${tier}_shaft` }) + event.remove({ id: `greate:shaped/${tier}_cogwheel` }) + event.remove({ id: `greate:shaped/${tier}_large_cogwheel` }) + event.remove({ id: `greate:shaped/${tier}_large_cogwheel_from_little` }) + + removeCutterRecipe(event, `${tier}_shaft`) + removeCutterRecipe(event, `${tier}_shaft_water`) + removeCutterRecipe(event, `${tier}_shaft_distilled_water`) + + event.remove({ id: `gtceu:smelting/smelt_dust_${tier}_to_ingot` }) + removeMaceratorRecipe(event, `macerate_${tier}`) + + event.remove({ id: `gtceu:extractor/extract_${tier}` }) + event.remove({ id: `gtceu:extractor/extract_${tier}_shaft` }) + event.remove({ id: `gtceu:extractor/extract_${tier}_cogwheel` }) + event.remove({ id: `gtceu:extractor/extract_${tier}_alloy` }) + event.remove({ id: `gtceu:extractor/extract_${tier}_gearbox` }) + event.remove({ id: `gtceu:extractor/extract_${tier}_vertical_gearbox` }) + }) event.remove({ id: 'greate:milling/integration/gtceu/macerator/macerate_marble'}) event.remove({ id: 'gtceu:electrolyzer/decomposition_electrolyzing_andesite_alloy' }) event.remove({ id: 'gtceu:electrolyzer/decomposition_electrolyzing_chromatic_compound' }) - - event.remove({ id: 'gtceu:smelting/smelt_dust_andesite_alloy_to_ingot' }) - event.remove({ id: 'gtceu:extractor/extract_andesite_alloy_shaft' }) - - event.remove({ id: 'gtceu:extractor/extract_andesite_alloy_cogwheel' }) - event.remove({ id: 'gtceu:extractor/extract_steel_cogwheel' }) - event.remove({ id: 'gtceu:extractor/extract_aluminium_cogwheel' }) - event.remove({ id: 'gtceu:extractor/extract_stainless_steel_cogwheel' }) - event.remove({ id: 'gtceu:extractor/extract_titanium_cogwheel' }) - event.remove({ id: 'gtceu:extractor/extract_large_andesite_alloy_cogwheel' }) - event.remove({ id: 'gtceu:extractor/extract_large_steel_cogwheel' }) - event.remove({ id: 'gtceu:extractor/extract_large_aluminium_cogwheel' }) - event.remove({ id: 'gtceu:extractor/extract_large_stainless_steel_cogwheel' }) - event.remove({ id: 'gtceu:extractor/extract_large_titanium_cogwheel' }) - + event.remove({ id: 'gtceu:shaped/andesite_alloy_shaft' }) event.remove({ id: 'gtceu:extractor/extract_andesite_alloy' }) - event.remove({ id: 'gtceu:extractor/extract_steel_alloy'}) - event.remove({ id: 'gtceu:extractor/extract_aluminium_alloy' }) - event.remove({ id: 'gtceu:extractor/extract_stainless_steel_alloy' }) - event.remove({ id: 'gtceu:extractor/extract_titanium_alloy' }) - event.remove({ id: 'gtceu:extractor/extract_tungsten_steel_alloy' }) - event.remove({ id: 'gtceu:extractor/extract_rhodium_plated_palladium_alloy' }) - event.remove({ id: 'gtceu:extractor/extract_naquadah_alloy_alloy' }) - event.remove({ id: 'gtceu:extractor/extract_darmstadtium_alloy' }) - event.remove({ id: 'gtceu:extractor/extract_neutronium_alloy' }) - - removeMaceratorRecipe(event, 'macerate_andesite_alloy') - removeMaceratorRecipe(event, 'macerate_steel_alloy') - removeMaceratorRecipe(event, 'macerate_aluminium_alloy') - removeMaceratorRecipe(event, 'macerate_stainless_steel_alloy') - removeMaceratorRecipe(event, 'macerate_titanium_alloy') - removeMaceratorRecipe(event, 'macerate_tungsten_steel_alloy') - removeMaceratorRecipe(event, 'macerate_rhodium_plated_palladium_alloy') - removeMaceratorRecipe(event, 'macerate_naquadah_alloy_alloy') - removeMaceratorRecipe(event, 'macerate_darmstadtium_alloy') - removeMaceratorRecipe(event, 'macerate_neutronium_alloy') - + event.remove({ id: /^greate:mixing\/integration\/create\/.*/ }) event.remove({ id: /^greate:sawing\/integration\/create\/.*/ }) event.remove({ id: /^greate:splashing\/integration\/create\/.*/ }) diff --git a/kubejs/server_scripts/gregtech/recipes.js b/kubejs/server_scripts/gregtech/recipes.js index 950e45fe6..d5ffa3ccb 100644 --- a/kubejs/server_scripts/gregtech/recipes.js +++ b/kubejs/server_scripts/gregtech/recipes.js @@ -80,37 +80,37 @@ const registerGTCEURecipes = (event) => { //#endregion - // #region Move MV superconductor to early HV instead of post-vac freezer + // #region Move MV superconductor to mid-late MV instead of post-vac freezer - event.remove({ id: 'gtceu:shaped/hv_chemical_bath' }) - event.shaped('gtceu:hv_chemical_bath', [ + event.remove({ id: 'gtceu:shaped/mv_chemical_bath' }) + event.shaped('gtceu:mv_chemical_bath', [ 'ABC', 'DEA', 'FGF' ], { - A: 'gtceu:hv_conveyor_module', - B: 'gtceu:tempered_glass', - C: 'gtceu:gold_single_cable', - D: 'gtceu:hv_electric_pump', + A: 'gtceu:mv_conveyor_module', + B: '#forge:glass', + C: 'gtceu:copper_single_cable', + D: 'gtceu:mv_electric_pump', // swap one of the tempered glass for a PE pipe to ensure they've finished the plastic part of MV E: 'gtceu:polyethylene_normal_fluid_pipe', - F: '#gtceu:circuits/hv', - G: 'gtceu:hv_machine_hull' - }).id('tfg:shaped/hv_chemical_bath') + F: '#gtceu:circuits/mv', + G: 'gtceu:mv_machine_hull' + }).id('tfg:shaped/mv_chemical_bath') event.recipes.gtceu.chemical_bath('tfg:magnesium_diboride_cool_down_distilled_water') .itemInputs('gtceu:hot_magnesium_diboride_ingot') .inputFluids(Fluid.of('gtceu:distilled_water', 100)) .itemOutputs('gtceu:magnesium_diboride_ingot') .duration(250) - .EUt(480) + .EUt(GTValues.VA[GTValues.MV]) event.recipes.gtceu.chemical_bath('tfg:magnesium_diboride_cool_down') .itemInputs('gtceu:hot_magnesium_diboride_ingot') .inputFluids(Fluid.of('minecraft:water', 100)) .itemOutputs('gtceu:magnesium_diboride_ingot') .duration(400) - .EUt(480) + .EUt(GTValues.VA[GTValues.MV]) // #endregion @@ -368,6 +368,8 @@ const registerGTCEURecipes = (event) => { event.replaceInput({ output: 'gtceu:nano_saber' }, 'gtceu:ruridit_plate', '#forge:plates/ostrum_iodide') + event.replaceOutput({ id: 'gtceu:canner/pack_paracetamol' }, 'gtceu:paracetamol_pill', 'tfg:paracetamol_pill') + event.replaceOutput({ id: 'gtceu:canner/pack_rad_away' }, 'gtceu:rad_away_pill', 'tfg:rad_away_pill') // Intentionally long to encourage reuse instead of mindlessly creating and distilling event.recipes.gtceu.mixer('tfg:diluted_hcl_acid') @@ -376,11 +378,19 @@ const registerGTCEURecipes = (event) => { .duration(30 * 20) .EUt(GTValues.VA[GTValues.LV]) - event.recipes.gtceu.mixer('tfg:diluted_sulf_acid') .inputFluids(Fluid.of('gtceu:sulfuric_acid', 2000), Fluid.of('minecraft:water')) .outputFluids(Fluid.of('gtceu:diluted_sulfuric_acid', 3000)) .duration(30 * 20) .EUt(GTValues.VA[GTValues.LV]) + // Ladder consistency + event.replaceOutput({ id: 'gtceu:assembler/ladder' }, 'minecraft:ladder', '8x minecraft:ladder') + + event.recipes.gtceu.assembler('tfg:ladder_from_lumber') + .itemInputs('#tfc:lumber') + .itemOutputs('8x minecraft:ladder') + .circuit(7) + .duration(40) + .EUt(4) } diff --git a/kubejs/server_scripts/gregtech/recipes.machines.js b/kubejs/server_scripts/gregtech/recipes.machines.js index d51f2945e..6603488ac 100644 --- a/kubejs/server_scripts/gregtech/recipes.machines.js +++ b/kubejs/server_scripts/gregtech/recipes.machines.js @@ -781,6 +781,22 @@ function registerGTCEuMachineRecipes(event) { B: '#forge:tools/hammers' }).addMaterialInfo().id('gtceu:shaped/steel_hull') + event.recipes.gtceu.shaped('gtceu:bronze_machine_casing', [ + ' A ', + 'ABA', + ' A ' + ], { + A: ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Bronze, 1), + B: '#forge:tools/hammers' + }).addMaterialInfo().id('gtceu:shaped/bronze_hull') + + event.recipes.gtceu.assembler('bronze_machine_casing') + .itemInputs('4x #forge:ingots/bronze') + .itemOutputs('gtceu:bronze_machine_casing') + .circuit(6) + .duration(2.5 * 20) + .EUt(GTValues.VHA[GTValues.LV]) + removeMaceratorRecipe(event, 'macerate_steam_input_hatch') event.recipes.gtceu.shaped('gtceu:steam_input_hatch', [ 'ACA', @@ -799,7 +815,7 @@ function registerGTCEuMachineRecipes(event) { 'ABA' ], { A: 'gtceu:bronze_plate', - B: ChemicalHelper.get(TagPrefix.gear, GTMaterials.Invar, 1), + B: ChemicalHelper.get(TagPrefix.gear, GTMaterials.Potin, 1), C: 'gtceu:hp_steam_macerator' }).addMaterialInfo().id('gtceu:shaped/steam_grinder') @@ -810,7 +826,7 @@ function registerGTCEuMachineRecipes(event) { 'ABA' ], { A: 'gtceu:bronze_plate', - B: 'gtceu:heatproof_machine_casing', + B: ChemicalHelper.get(TagPrefix.gear, GTMaterials.Invar, 1), C: 'gtceu:hp_steam_furnace' }).addMaterialInfo().id('gtceu:shaped/steam_oven') @@ -845,9 +861,9 @@ function registerGTCEuMachineRecipes(event) { ChemicalHelper.get(TagPrefix.frameGt, GTMaterials.Ultimet, 1) ) .itemOutputs('gtceu:palladium_substation') - .duration(20 * 2.5) .circuit(6) - .EUt(GTValues.VA[GTValues.LV]) + .duration(20 * 2.5) + .EUt(GTValues.VHA[GTValues.LV]) removeMaceratorRecipe(event, 'macerate_power_substation') @@ -862,4 +878,21 @@ function registerGTCEuMachineRecipes(event) { D: 'gtceu:palladium_substation' }).addMaterialInfo().id('gtceu:shaped/power_substation') + event.recipes.gtceu.shaped('2x gtceu:industrial_steam_casing', [ + 'ABA', + 'ACA', + 'ADA' + ], { + A: '#forge:plates/brass', + B: '#forge:tools/hammers', + C: '#forge:frames/steel', + D: '#forge:tools/wrenches' + }).addMaterialInfo().id('tfg:shaped/industrial_steam_casing') + + event.recipes.gtceu.assembler('industrial_steam_casing') + .itemInputs('6x #forge:plates/brass', '#forge:frames/steel') + .itemOutputs('2x gtceu:industrial_steam_casing') + .circuit(6) + .duration(2.5 * 20) + .EUt(GTValues.VHA[GTValues.LV]) } diff --git a/kubejs/server_scripts/gregtech/recipes.materials.js b/kubejs/server_scripts/gregtech/recipes.materials.js index bba94e7a8..ea95f9635 100644 --- a/kubejs/server_scripts/gregtech/recipes.materials.js +++ b/kubejs/server_scripts/gregtech/recipes.materials.js @@ -891,7 +891,7 @@ function registerGTCEUMetalRecipes(event) { event.recipes.gtceu.assembler(`tfg:${material.getName()}_lamp_from_liquid`) .itemInputs(unfinishedLampStack) - .inputFluids(Fluid.of(GTMaterials.Glass.getFluid(), 576)) + .inputFluids(Fluid.of(GTMaterials.Glass.getFluid(), 144)) .itemOutputs(finishedLampStack) .duration(material.getMass() * 7) .circuit(13) diff --git a/kubejs/server_scripts/gregtech/recipes.removes.js b/kubejs/server_scripts/gregtech/recipes.removes.js index 3075b5634..3cf084f57 100644 --- a/kubejs/server_scripts/gregtech/recipes.removes.js +++ b/kubejs/server_scripts/gregtech/recipes.removes.js @@ -182,6 +182,39 @@ function removeGTCEURecipes(event) { // #endregion + // #region Reconstituted Stone + + event.remove({ id: 'gtceu:shaped/cobblestone_wall_saw' }) + event.remove({ id: 'gtceu:shaped/mossy_cobblestone_wall_saw' }) + event.remove({ id: 'gtceu:shaped/stone_brick_stair_saw' }) + event.remove({ id: 'gtceu:shaped/stone_brick_wall_saw' }) + event.remove({ id: 'gtceu:shaped/mossy_stone_brick_stair_saw' }) + event.remove({ id: 'gtceu:shaped/mossy_stone_brick_slab_saw' }) + event.remove({ id: 'gtceu:shaped/mossy_stone_brick_wall_saw' }) + + // #endregion + + // #region Cut Copper + + event.remove({ id: 'gtceu:shaped/cut_copper_stair_saw' }) + event.remove({ id: 'gtceu:shaped/cut_copper_slab_saw' }) + event.remove({ id: 'gtceu:shaped/exposed_cut_copper_stair_saw' }) + event.remove({ id: 'gtceu:shaped/exposed_cut_copper_slab_saw' }) + event.remove({ id: 'gtceu:shaped/weathered_cut_copper_stair_saw' }) + event.remove({ id: 'gtceu:shaped/weathered_cut_copper_slab_saw' }) + event.remove({ id: 'gtceu:shaped/oxidized_cut_copper_stair_saw' }) + event.remove({ id: 'gtceu:shaped/oxidized_cut_copper_slab_saw' }) + event.remove({ id: 'gtceu:shaped/waxed_cut_copper_stair_saw' }) + event.remove({ id: 'gtceu:shaped/waxed_cut_copper_slab_saw' }) + event.remove({ id: 'gtceu:shaped/waxed_exposed_cut_copper_stair_saw' }) + event.remove({ id: 'gtceu:shaped/waxed_exposed_cut_copper_slab_saw' }) + event.remove({ id: 'gtceu:shaped/waxed_weathered_cut_copper_stair_saw' }) + event.remove({ id: 'gtceu:shaped/waxed_weathered_cut_copper_slab_saw' }) + event.remove({ id: 'gtceu:shaped/waxed_oxidized_cut_copper_stair_saw' }) + event.remove({ id: 'gtceu:shaped/waxed_oxidized_cut_copper_slab_saw' }) + + // #endregion + // #region Plant Ball event.remove({ id: 'gtceu:compressor/plant_ball_from_wheat' }) @@ -505,6 +538,9 @@ function removeGTCEURecipes(event) { //#endregion + // Iron nugget saw recipe + event.remove({ id: 'gtceu:shapeless/nugget_disassembling_iron'}) + // Удаление рецептов связанных с Primitive Blast Furnace event.remove({ id: 'gtceu:arc_furnace/arc_primitive_blast_furnace' }) removeMaceratorRecipe(event, 'macerate_primitive_blast_furnace') @@ -665,6 +701,7 @@ function removeGTCEURecipes(event) { event.remove({ id: 'gtceu:assembler/spyglass' }) event.remove({ id: 'gtceu:assembler/assemble_purpur_into_stair' }) event.remove({ id: 'gtceu:assembler/stonecutter' }) + event.remove({ id: 'gtceu:assembler/cartography_table' }) event.remove({ id: 'gtceu:centrifuge/decomposition_centrifuging__blaze' }) @@ -689,6 +726,9 @@ function removeGTCEURecipes(event) { removeMaceratorRecipe(event, 'macerate_wool') + removeMaceratorRecipe(event, 'macerate_enchanting_table') + event.remove({ id: 'gtceu:arc_furnace/arc_enchanting_table' }) + event.remove({ id: 'gtceu:gas_collector/nether_air' }) event.remove({ id: 'gtceu:gas_collector/ender_air' }) // TODO: uncomment with venus update diff --git a/kubejs/server_scripts/main_server_script.js b/kubejs/server_scripts/main_server_script.js index 369950ec2..72e9e2bd8 100644 --- a/kubejs/server_scripts/main_server_script.js +++ b/kubejs/server_scripts/main_server_script.js @@ -11,6 +11,7 @@ ServerEvents.tags('item', event => { registerAFCItemTags(event) registerAlekiroofsItemTags(event) registerAlekishipsItemTags(event) + registerArthropocolypseItemTags(event) registerAsticorCartsItemTags(event) registerBeneathItemTags(event) registerChalkItemTags(event); @@ -207,6 +208,7 @@ ServerEvents.recipes(event => { registerAlekishipsRecipes(event) registerAE2Recipes(event) registerAFCRecipes(event) + registerArthropocolypseRecipes(event) registerAsticorCartsRecipes(event) registerAE2InsertExportCardRecipes(event) registerAE2NetworkAnalyzerRecipes(event) diff --git a/kubejs/server_scripts/minecraft/recipes.js b/kubejs/server_scripts/minecraft/recipes.js index a472e3d45..2909ccf4d 100644 --- a/kubejs/server_scripts/minecraft/recipes.js +++ b/kubejs/server_scripts/minecraft/recipes.js @@ -988,14 +988,14 @@ const registerMinecraftRecipes = (event) => { .inputFluids(Fluid.of('gtceu:glowstone', 512)) .itemOutputs('16x minecraft:glow_ink_sac') .duration(20) - .EUt(GTValues.VA[GTValues.HV]) + .EUt(GTValues.VA[GTValues.LV]) event.recipes.gtceu.chemical_bath('minecraft:glow_inc_sac1') .itemInputs("#forge:dyes/black") .inputFluids(Fluid.of('gtceu:glowstone', 144)) .itemOutputs('minecraft:glow_ink_sac') .duration(40) - .EUt(GTValues.VA[GTValues.MV]) + .EUt(GTValues.VA[GTValues.LV]) //#endregion diff --git a/kubejs/server_scripts/primitive_creatures/loot.js b/kubejs/server_scripts/primitive_creatures/loot.js index e96ef7a91..bbb54d19f 100644 --- a/kubejs/server_scripts/primitive_creatures/loot.js +++ b/kubejs/server_scripts/primitive_creatures/loot.js @@ -35,7 +35,7 @@ function registerPrimitiveCreaturesLoots(event) { Item.of('tfc:food/strawberry', 4), Item.of('tfc:food/wintergreen_berry', 5)]) .addAlternativesLoot( - LootEntry.of('gtceu:cobalt_brass_hoe').damage([0.3, 0.9]).when(c => c.randomChance(0.1)), + LootEntry.of('gtceu:cobalt_brass_hoe').damage([0.2, 0.5]).when(c => c.randomChance(0.1)), LootEntry.of('sns:straw_basket').when(c => c.randomChance(0.3)), LootEntry.of('primitive_creatures:totem_0').when(c => c.randomChance(0.05)), LootEntry.of('primitive_creatures:totem_3').when(c => c.randomChance(0.05)), @@ -54,7 +54,7 @@ function registerPrimitiveCreaturesLoots(event) { .addWeightedLoot([2, 3], ['tfg:food/raw_long_pig_filet']) .addWeightedLoot([3, 4], ['gtceu:tricalcium_phosphate_dust']) .addAlternativesLoot( - LootEntry.of('gtceu:cobalt_brass_mortar').damage([0.3, 0.9]).when(c => c.randomChance(0.3)), + LootEntry.of('gtceu:cobalt_brass_knife').damage([0.2, 0.5]).when(c => c.randomChance(0.3)), LootEntry.of('primitive_creatures:totem_0').when(c => c.randomChance(0.05)), LootEntry.of('primitive_creatures:totem_3').when(c => c.randomChance(0.05)), LootEntry.of('firmalife:beeswax')) @@ -73,7 +73,7 @@ function registerPrimitiveCreaturesLoots(event) { .addWeightedLoot([0, 2], ['minecraft:flint']) .addWeightedLoot([1, 3], ['minecraft:bone']) .addAlternativesLoot( - LootEntry.of('gtceu:cobalt_brass_shovel').damage([0.3, 0.9]).when(c => c.randomChance(0.5)), + LootEntry.of('gtceu:cobalt_brass_shovel').damage([0.2, 0.5]).when(c => c.randomChance(0.5)), LootEntry.of('minecraft:skeleton_skull').when(c => c.randomChance(0.3)), LootEntry.of('primitive_creatures:grh')) // battered wool event.addEntityLootModifier('primitive_creatures:iloger_3') @@ -91,7 +91,7 @@ function registerPrimitiveCreaturesLoots(event) { .addWeightedLoot([4, 8], ['firmalife:food/nightshade_berry']) .addWeightedLoot([2, 3], ['tfg:food/raw_long_pig_filet']) .addAlternativesLoot( - LootEntry.of('minecraft:bow').damage([0.3, 0.9]).when(c => c.randomChance(0.5)), + LootEntry.of('minecraft:bow').damage([0.2, 0.5]).when(c => c.randomChance(0.5)), LootEntry.of('primitive_creatures:totem_0').when(c => c.randomChance(0.05)), LootEntry.of('primitive_creatures:totem_2').when(c => c.randomChance(0.05)), LootEntry.of('sns:quiver')) @@ -129,7 +129,7 @@ function registerPrimitiveCreaturesLoots(event) { .addWeightedLoot([1, 2], ['primitive_creatures:f_1']) // primitive explosives .addWeightedLoot([2, 4], ['minecraft:gunpowder']) .addAlternativesLoot( - LootEntry.of('gtceu:cobalt_brass_mortar').damage([0.5, 0.9]).when(c => c.randomChance(0.3)), + LootEntry.of('gtceu:cobalt_brass_mortar').damage([0.2, 0.5]).when(c => c.randomChance(0.3)), LootEntry.of('primitive_creatures:totem_2').when(c => c.randomChance(0.05)), LootEntry.of('primitive_creatures:totem_3').when(c => c.randomChance(0.05)), LootEntry.of('primitive_creatures:grh')) // battered wool @@ -147,7 +147,7 @@ function registerPrimitiveCreaturesLoots(event) { .addWeightedLoot([2, 3], ['tfg:food/raw_long_pig_filet']) .addWeightedLoot([0, 2], ['primitive_creatures:grh']) // battered wool .addAlternativesLoot( - LootEntry.of('gtceu:cobalt_brass_butchery_knife').damage([0.3, 0.9]).when(c => c.randomChance(0.3)), + LootEntry.of('gtceu:cobalt_brass_butchery_knife').damage([0.2, 0.5]).when(c => c.randomChance(0.3)), LootEntry.of('primitive_creatures:totem_0').when(c => c.randomChance(0.05)), LootEntry.of('primitive_creatures:totem_3').when(c => c.randomChance(0.05)), LootEntry.of('minecraft:lead')) @@ -181,7 +181,7 @@ function registerPrimitiveCreaturesLoots(event) { .addWeightedLoot([2, 3], ['tfg:food/raw_long_pig_filet']) .addWeightedLoot([2, 4], ['minecraft:emerald']) .addAlternativesLoot( - LootEntry.of('gtceu:cobalt_brass_knife').damage([0.3, 0.7]).when(c => c.randomChance(0.3)), + LootEntry.of('gtceu:cobalt_brass_knife').damage([0.2, 0.5]).when(c => c.randomChance(0.3)), LootEntry.of('primitive_creatures:totem_2').when(c => c.randomChance(0.05)), LootEntry.of('primitive_creatures:totem_3').when(c => c.randomChance(0.05)), LootEntry.of('primitive_creatures:grh')) // battered wool) diff --git a/kubejs/server_scripts/railways/recipes.js b/kubejs/server_scripts/railways/recipes.js index 4efb3f49b..866d4be89 100644 --- a/kubejs/server_scripts/railways/recipes.js +++ b/kubejs/server_scripts/railways/recipes.js @@ -67,6 +67,14 @@ const registerRailWaysRecipes = (event) => { .EUt(28) .addMaterialInfo(true) + event.recipes.gtceu.assembler(`tfg:railways/wooden_headstock_screwlink_coupler`) + .itemInputs(`railways:screwlink_coupler`, `#minecraft:wooden_slabs`) + .circuit(1) + .itemOutputs(`railways:wooden_headstock_screwlink_coupler`) + .duration(200) + .EUt(28) + .addMaterialInfo(true) + event.recipes.gtceu.assembler(`tfg:railways/buffer`) .itemInputs(`6x #forge:rods/long/steel`, `2x railways:small_buffer`) .circuit(1) @@ -133,6 +141,43 @@ const registerRailWaysRecipes = (event) => { //#endregion + //portable fuel interface + event.shaped('railways:portable_fuel_interface', [ + 'C ', + 'BAD', + ], { + A: 'create:portable_fluid_interface', + B: 'create:railway_casing', + C: '#forge:tools/wrenches', + D: 'create_factory_logistics:fluid_mechanism', + }).id('tfg:railways/shaped/portable_fuel_interface') + + event.recipes.gtceu.assembler('tfg:railways/portable_fuel_interface') + .itemInputs('create:portable_fluid_interface', 'create:railway_casing', 'create_factory_logistics:fluid_mechanism') + .circuit(1) + .itemOutputs('railways:portable_fuel_interface') + .duration(200) + .EUt(28) + + //fuel tank + event.shaped('railways:fuel_tank', [ + 'CE ', + 'BAD', + ], { + A: 'create:fluid_tank', + B: 'create:railway_casing', + C: '#forge:tools/screwdrivers', + D: 'create:electron_tube', + E: 'firmalife:reinforced_glass', + }).id('tfg:railways/shaped/fuel_tank') + + event.recipes.gtceu.assembler('tfg:railways/fuel_tank') + .itemInputs ('create:fluid_tank', 'create:railway_casing', 'create:electron_tube', 'firmalife:reinforced_glass') + .circuit(1) + .itemOutputs('railways:fuel_tank') + .duration(200) + .EUt(28) + // Переключатель пути поезда из андезита event.shaped('railways:track_switch_andesite', [ 'BAB', @@ -216,13 +261,13 @@ const registerRailWaysRecipes = (event) => { 'DA ' ], { A: '#forge:storage_blocks/charcoal', - B: '#forge:bolts/black_steel', - C: '#forge:plates/black_steel', + B: '#forge:bolts/iron', + C: '#forge:plates/iron', D: '#forge:tools/hammers' }).id('tfg:railways/shaped/smokestack_caboosestyle') event.recipes.gtceu.assembler('tfg:railways/smokestack_caboosestyle') - .itemInputs('#forge:storage_blocks/charcoal', '2x #forge:bolts/black_steel', '#forge:plates/black_steel') + .itemInputs('#forge:storage_blocks/charcoal', '2x #forge:bolts/iron', '#forge:plates/iron') .circuit(4) .itemOutputs('railways:smokestack_caboosestyle') .duration(200) @@ -234,12 +279,12 @@ const registerRailWaysRecipes = (event) => { 'BAB' ], { A: '#forge:storage_blocks/charcoal', - B: '#forge:bolts/black_steel', + B: '#forge:bolts/iron', C: '#forge:tools/hammers' }).id('tfg:railways/shaped/smokestack_long') event.recipes.gtceu.assembler('tfg:railways/smokestack_long') - .itemInputs('#forge:storage_blocks/charcoal', '2x #forge:bolts/black_steel') + .itemInputs('#forge:storage_blocks/charcoal', '2x #forge:bolts/iron') .circuit(5) .itemOutputs('railways:smokestack_long') .duration(200) @@ -252,12 +297,12 @@ const registerRailWaysRecipes = (event) => { 'BAB' ], { A: '#forge:storage_blocks/charcoal', - B: '#forge:plates/black_steel', + B: '#forge:plates/iron', C: '#forge:tools/hammers' }).id('tfg:railways/shaped/smokestack_coalburner') event.recipes.gtceu.assembler('tfg:railways/smokestack_coalburner') - .itemInputs('#forge:storage_blocks/charcoal', '6x #forge:plates/black_steel') + .itemInputs('#forge:storage_blocks/charcoal', '6x #forge:plates/iron') .circuit(6) .itemOutputs('railways:smokestack_coalburner') .duration(200) @@ -269,12 +314,12 @@ const registerRailWaysRecipes = (event) => { 'BAB' ], { A: '#forge:storage_blocks/charcoal', - B: '#forge:plates/black_steel', + B: '#forge:plates/iron', C: '#forge:tools/hammers' }).id('tfg:railways/shaped/smokestack_oilburner') event.recipes.gtceu.assembler('tfg:railways/smokestack_oilburner') - .itemInputs('#forge:storage_blocks/charcoal', '6x #forge:plates/black_steel') + .itemInputs('#forge:storage_blocks/charcoal', '6x #forge:plates/iron') .circuit(7) .itemOutputs('railways:smokestack_oilburner') .duration(200) @@ -286,12 +331,12 @@ const registerRailWaysRecipes = (event) => { 'BAB' ], { A: '#forge:storage_blocks/charcoal', - B: '#forge:plates/black_steel', + B: '#forge:plates/iron', C: '#forge:tools/hammers' }).id('tfg:railways/shaped/smokestack_streamlined') event.recipes.gtceu.assembler('tfg:railways/smokestack_streamlined') - .itemInputs('#forge:storage_blocks/charcoal', '2x #forge:plates/black_steel') + .itemInputs('#forge:storage_blocks/charcoal', '2x #forge:plates/iron') .circuit(8) .itemOutputs('railways:smokestack_streamlined') .duration(200) @@ -304,13 +349,13 @@ const registerRailWaysRecipes = (event) => { 'BAB' ], { A: '#forge:storage_blocks/charcoal', - B: '#forge:plates/black_steel', - C: '#forge:bolts/black_steel', + B: '#forge:plates/iron', + C: '#forge:bolts/iron', D: '#forge:tools/hammers' }).id('tfg:railways/shaped/smokestack_woodburner') event.recipes.gtceu.assembler('tfg:railways/smokestack_woodburner') - .itemInputs('#forge:storage_blocks/charcoal', '3x #forge:plates/black_steel', '2x #forge:bolts/black_steel') + .itemInputs('#forge:storage_blocks/charcoal', '3x #forge:plates/iron', '2x #forge:bolts/iron') .circuit(9) .itemOutputs('railways:smokestack_woodburner') .duration(200) diff --git a/kubejs/server_scripts/tfc/data.js b/kubejs/server_scripts/tfc/data.js index 5e5386db3..7fe74b566 100644 --- a/kubejs/server_scripts/tfc/data.js +++ b/kubejs/server_scripts/tfc/data.js @@ -25,6 +25,9 @@ const registerTFCHeats = (event) => { // Baked Potato event.itemHeat('tfc:food/baked_potato', 1.0, null, null) + + // Soybean + event.itemHeat('tfc:food/soybean', 1.0, null, null) } diff --git a/kubejs/server_scripts/tfc/tags.js b/kubejs/server_scripts/tfc/tags.js index 708eedae4..fcd635f26 100644 --- a/kubejs/server_scripts/tfc/tags.js +++ b/kubejs/server_scripts/tfc/tags.js @@ -111,6 +111,21 @@ function registerTFCItemTags(event) { 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", "firmalife:bucket/mead") + event.add("tfc:nonplaceable", "firmalife:bucket/red_wine") + event.add("tfc:nonplaceable", "firmalife:bucket/white_wine") + event.add("tfc:nonplaceable", "firmalife:bucket/rose_wine") + event.add("tfc:nonplaceable", "firmalife:bucket/sparkling_wine") + event.add("tfc:nonplaceable", "firmalife:bucket/dessert_wine") // Ингредиенты для закваски event.add("tfg:ferments_to_rennet", "tfc:food/soybean"); diff --git a/kubejs/server_scripts/tfc_gurman/recipes.js b/kubejs/server_scripts/tfc_gurman/recipes.js index 55de880ee..8c0b80b00 100644 --- a/kubejs/server_scripts/tfc_gurman/recipes.js +++ b/kubejs/server_scripts/tfc_gurman/recipes.js @@ -2,795 +2,390 @@ "use strict"; function registerTFCGurmanRecipes(event) { - const $ISPRecipeLogic = Java.loadClass("su.terrafirmagreg.core.common.data.tfgt.machine.trait.ISPOutputRecipeLogic") - //#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'); - // Pizzas - event.recipes.gtceu.food_oven('margarita_pizza') - .itemInputs('tfc_gurman:raw_margarita_pizza') - .itemOutputs('tfc_gurman:margarita_pizza') - .duration(200) - .EUt(GTValues.VA[GTValues.LV]) + global.cookingRecipe(event, 'tandoori_chicken', 'tfc_gurman:raw_tandoori_chicken', 'tfc_gurman:tandoori_chicken'); - $ISPRecipeLogic.RegisterRecipeData('food_oven/margarita_pizza', - [Ingredient.of('tfc_gurman:raw_margarita_pizza')], - TFC.isp.of('tfc_gurman:margarita_pizza').firmaLifeCopyDynamicFood().asCanonClass(), - []) + global.cookingRecipe(event, 'placinda', 'tfc_gurman:raw_placinda', 'tfc_gurman:placinda'); - event.recipes.gtceu.food_oven('pepperoni_pizza') - .itemInputs('tfc_gurman:raw_pepperoni_pizza') - .itemOutputs('tfc_gurman:pepperoni_pizza') - .duration(200) - .EUt(GTValues.VA[GTValues.LV]) + global.cookingRecipe(event, 'tonkatsu', 'tfc_gurman:raw_tonkatsu', 'tfc_gurman:tonkatsu'); - $ISPRecipeLogic.RegisterRecipeData('food_oven/pepperoni_pizza', - [Ingredient.of('tfc_gurman:raw_pepperoni_pizza')], - TFC.isp.of('tfc_gurman:pepperoni_pizza').firmaLifeCopyDynamicFood().asCanonClass(), - []) + global.cookingRecipe(event, 'takoyaki', 'tfc_gurman:raw_takoyaki', 'tfc_gurman:takoyaki'); - event.recipes.gtceu.food_oven('havai_pizza') - .itemInputs('tfc_gurman:raw_havai_pizza') - .itemOutputs('tfc_gurman:havai_pizza') - .duration(200) - .EUt(GTValues.VA[GTValues.LV]) + global.cookingRecipe(event, 'bulgogi', 'tfc_gurman:raw_bulgogi', 'tfc_gurman:bulgogi'); - $ISPRecipeLogic.RegisterRecipeData('food_oven/havai_pizza', - [Ingredient.of('tfc_gurman:raw_havai_pizza')], - TFC.isp.of('tfc_gurman:havai_pizza').firmaLifeCopyDynamicFood().asCanonClass(), - []) + global.cookingRecipe(event, 'bratwurst', 'tfc_gurman:raw_bratwurst', 'tfc_gurman:bratwurst'); + + global.cookingRecipe(event, 'crepes', 'tfc_gurman:raw_crepes', 'tfc_gurman:crepes'); + + global.cookingRecipe(event, 'chebureki', 'tfc_gurman:raw_chebureki', 'tfc_gurman:chebureki'); - event.recipes.gtceu.food_oven('four_cheeses_pizza') - .itemInputs('tfc_gurman:raw_four_cheeses_pizza') - .itemOutputs('tfc_gurman:four_cheeses_pizza') - .duration(200) - .EUt(GTValues.VA[GTValues.LV]) + global.cookingRecipe(event, 'khachapuri', 'tfc_gurman:raw_khachapuri', 'tfc_gurman:khachapuri'); - $ISPRecipeLogic.RegisterRecipeData('food_oven/four_cheeses_pizza', - [Ingredient.of('tfc_gurman:raw_four_cheeses_pizza')], - TFC.isp.of('tfc_gurman:four_cheeses_pizza').firmaLifeCopyDynamicFood().asCanonClass(), - []) + global.cookingRecipe(event, 'lavash_wrap', 'tfc_gurman:raw_lavash_wrap', 'tfc_gurman:lavash_wrap'); - event.recipes.gtceu.food_oven('four_meats_pizza') - .itemInputs('tfc_gurman:raw_four_meats_pizza') - .itemOutputs('tfc_gurman:four_meats_pizza') - .duration(200) - .EUt(GTValues.VA[GTValues.LV]) - - $ISPRecipeLogic.RegisterRecipeData('food_oven/four_meats_pizza', - [Ingredient.of('tfc_gurman:raw_four_meats_pizza')], - TFC.isp.of('tfc_gurman:four_meats_pizza').firmaLifeCopyDynamicFood().asCanonClass(), - []) - - event.recipes.gtceu.food_oven('neapolitano_pizza') - .itemInputs('tfc_gurman:raw_neapolitano_pizza') - .itemOutputs('tfc_gurman:neapolitano_pizza') - .duration(200) - .EUt(GTValues.VA[GTValues.LV]) - - $ISPRecipeLogic.RegisterRecipeData('food_oven/neapolitano_pizza', - [Ingredient.of('tfc_gurman:raw_neapolitano_pizza')], - TFC.isp.of('tfc_gurman:neapolitano_pizza').firmaLifeCopyDynamicFood().asCanonClass(), - []) - - event.recipes.gtceu.food_oven('croissants') - .itemInputs('tfc_gurman:raw_croissants') - .itemOutputs('tfc_gurman:croissants') - .duration(200) - .EUt(GTValues.VA[GTValues.LV]) - - $ISPRecipeLogic.RegisterRecipeData('food_oven/croissants', - [Ingredient.of('tfc_gurman:raw_croissants')], - TFC.isp.of('tfc_gurman:croissants').firmaLifeCopyDynamicFood().asCanonClass(), - []) - - event.recipes.gtceu.food_oven('kiev_cutlets') - .itemInputs('tfc_gurman:raw_kiev_cutlets') - .itemOutputs('tfc_gurman:kiev_cutlets') - .duration(200) - .EUt(GTValues.VA[GTValues.LV]) - - $ISPRecipeLogic.RegisterRecipeData('food_oven/kiev_cutlets', - [Ingredient.of('tfc_gurman:raw_kiev_cutlets')], - TFC.isp.of('tfc_gurman:kiev_cutlets').firmaLifeCopyDynamicFood().asCanonClass(), - []) - - event.recipes.gtceu.food_oven('quiche') - .itemInputs('tfc_gurman:raw_quiche') - .itemOutputs('tfc_gurman:quiche') - .duration(200) - .EUt(GTValues.VA[GTValues.LV]) - - $ISPRecipeLogic.RegisterRecipeData('food_oven/quiche', - [Ingredient.of('tfc_gurman:raw_quiche')], - TFC.isp.of('tfc_gurman:quiche').firmaLifeCopyDynamicFood().asCanonClass(), - []) - - event.recipes.gtceu.food_oven('tandoori_chicken') - .itemInputs('tfc_gurman:raw_tandoori_chicken') - .itemOutputs('tfc_gurman:tandoori_chicken') - .duration(200) - .EUt(GTValues.VA[GTValues.LV]) - - $ISPRecipeLogic.RegisterRecipeData('food_oven/tandoori_chicken', - [Ingredient.of('tfc_gurman:raw_tandoori_chicken')], - TFC.isp.of('tfc_gurman:tandoori_chicken').firmaLifeCopyDynamicFood().asCanonClass(), - []) - - event.recipes.gtceu.food_oven('placinda') - .itemInputs('tfc_gurman:raw_placinda') - .itemOutputs('tfc_gurman:placinda') - .duration(200) - .EUt(GTValues.VA[GTValues.LV]) - - $ISPRecipeLogic.RegisterRecipeData('food_oven/placinda', - [Ingredient.of('tfc_gurman:raw_placinda')], - TFC.isp.of('tfc_gurman:placinda').firmaLifeCopyDynamicFood().asCanonClass(), - []) - - event.recipes.gtceu.food_oven('tonkatsu') - .itemInputs('tfc_gurman:raw_tonkatsu') - .itemOutputs('tfc_gurman:tonkatsu') - .duration(200) - .EUt(GTValues.VA[GTValues.LV]) - - $ISPRecipeLogic.RegisterRecipeData('food_oven/tonkatsu', - [Ingredient.of('tfc_gurman:raw_tonkatsu')], - TFC.isp.of('tfc_gurman:tonkatsu').copyFood().addTrait("firmalife:oven_baked").asCanonClass(), - []) - - event.recipes.gtceu.food_oven('takoyaki') - .itemInputs('tfc_gurman:raw_takoyaki') - .itemOutputs('tfc_gurman:takoyaki') - .duration(200) - .EUt(GTValues.VA[GTValues.LV]) - - $ISPRecipeLogic.RegisterRecipeData('food_oven/takoyaki', - [Ingredient.of('tfc_gurman:raw_takoyaki')], - TFC.isp.of('tfc_gurman:takoyaki').copyFood().addTrait("firmalife:oven_baked").asCanonClass(), - []) - - event.recipes.gtceu.food_oven('bulgogi') - .itemInputs('tfc_gurman:raw_bulgogi') - .itemOutputs('tfc_gurman:bulgogi') - .duration(200) - .EUt(GTValues.VA[GTValues.LV]) - - $ISPRecipeLogic.RegisterRecipeData('food_oven/bulgogi', - [Ingredient.of('tfc_gurman:raw_bulgogi')], - TFC.isp.of('tfc_gurman:bulgogi').copyFood().addTrait("firmalife:oven_baked").asCanonClass(), - []) - - event.recipes.gtceu.food_oven('bratwurst') - .itemInputs('tfc_gurman:raw_bratwurst') - .itemOutputs('tfc_gurman:bratwurst') - .duration(200) - .EUt(GTValues.VA[GTValues.LV]) - - $ISPRecipeLogic.RegisterRecipeData('food_oven/bratwurst', - [Ingredient.of('tfc_gurman:raw_bratwurst')], - TFC.isp.of('tfc_gurman:bratwurst').copyFood().addTrait("firmalife:oven_baked").asCanonClass(), - []) - - event.recipes.gtceu.food_oven('crepes') - .itemInputs('tfc_gurman:raw_crepes') - .itemOutputs('tfc_gurman:crepes') - .duration(200) - .EUt(GTValues.VA[GTValues.LV]) - - $ISPRecipeLogic.RegisterRecipeData('food_oven/crepes', - [Ingredient.of('tfc_gurman:raw_crepes')], - TFC.isp.of('tfc_gurman:crepes').copyFood().addTrait("firmalife:oven_baked").asCanonClass(), - []) - - event.recipes.gtceu.food_oven('chebureki') - .itemInputs('tfc_gurman:raw_chebureki') - .itemOutputs('tfc_gurman:chebureki') - .duration(200) - .EUt(GTValues.VA[GTValues.LV]) - - $ISPRecipeLogic.RegisterRecipeData('food_oven/chebureki', - [Ingredient.of('tfc_gurman:raw_chebureki')], - TFC.isp.of('tfc_gurman:chebureki').copyFood().addTrait("firmalife:oven_baked").asCanonClass(), - []) - - event.recipes.gtceu.food_oven('khachapuri') - .itemInputs('tfc_gurman:raw_khachapuri') - .itemOutputs('tfc_gurman:khachapuri') - .duration(200) - .EUt(GTValues.VA[GTValues.LV]) - - $ISPRecipeLogic.RegisterRecipeData('food_oven/khachapuri', - [Ingredient.of('tfc_gurman:raw_khachapuri')], - TFC.isp.of('tfc_gurman:khachapuri').copyFood().addTrait("firmalife:oven_baked").asCanonClass(), - []) - - event.recipes.gtceu.food_oven('lavash_wrap') - .itemInputs('tfc_gurman:raw_lavash_wrap') - .itemOutputs('tfc_gurman:lavash_wrap') - .duration(200) - .EUt(GTValues.VA[GTValues.LV]) - - $ISPRecipeLogic.RegisterRecipeData('food_oven/lavash_wrap', - [Ingredient.of('tfc_gurman:raw_lavash_wrap')], - TFC.isp.of('tfc_gurman:lavash_wrap').copyFood().addTrait("firmalife:oven_baked").asCanonClass(), - []) - - event.recipes.gtceu.food_oven('syrniki') - .itemInputs('tfc_gurman:raw_syrniki') - .itemOutputs('tfc_gurman:syrniki') - .duration(200) - .EUt(GTValues.VA[GTValues.LV]) - - $ISPRecipeLogic.RegisterRecipeData('food_oven/syrniki', - [Ingredient.of('tfc_gurman:raw_syrniki')], - TFC.isp.of('tfc_gurman:syrniki').copyFood().addTrait("firmalife:oven_baked").asCanonClass(), - []) - - event.recipes.gtceu.food_oven('oladyi') - .itemInputs('tfc_gurman:raw_oladyi') - .itemOutputs('tfc_gurman:oladyi') - .duration(200) - .EUt(GTValues.VA[GTValues.LV]) - - $ISPRecipeLogic.RegisterRecipeData('food_oven/oladyi', - [Ingredient.of('tfc_gurman:raw_oladyi')], - TFC.isp.of('tfc_gurman:oladyi').copyFood().addTrait("firmalife:oven_baked").asCanonClass(), - []) + global.cookingRecipe(event, 'syrniki', 'tfc_gurman:raw_syrniki', 'tfc_gurman:syrniki'); + + global.cookingRecipe(event, 'oladyi', 'tfc_gurman:raw_oladyi', 'tfc_gurman:oladyi'); // Falafel - from soybean (no raw version) - event.recipes.gtceu.food_oven('falafel') - .itemInputs('tfc:food/soybean') - .itemOutputs('tfc_gurman:falafel') - .duration(200) - .EUt(GTValues.VA[GTValues.LV]) + global.cookingRecipe(event, 'falafel', 'tfc:food/soybean', 'tfc_gurman:falafel'); - $ISPRecipeLogic.RegisterRecipeData('food_oven/falafel', - [Ingredient.of('tfc:food/soybean')], - TFC.isp.of('tfc_gurman:falafel').copyFood().addTrait("firmalife:oven_baked").asCanonClass(), - []) + global.cookingRecipe(event, 'pelmeni', 'tfc_gurman:raw_pelmeni', 'tfc_gurman:pelmeni', '#tfg:clean_water 500'); - // Pelmeni (cooking raw pelmeni) - event.recipes.gtceu.food_oven('pelmeni') - .itemInputs('tfc_gurman:raw_pelmeni') - .itemOutputs('tfc_gurman:pelmeni') - .inputFluids(Fluid.of('minecraft:water', 500)) - .duration(200) - .EUt(8) - - $ISPRecipeLogic.RegisterRecipeData('food_oven/pelmeni', - [Ingredient.of('tfc_gurman:raw_pelmeni')], - TFC.isp.of('tfc_gurman:pelmeni').copyFood().addTrait("firmalife:oven_baked").asCanonClass(), - []) - - // Vareniki (cooking raw vareniki) - event.recipes.gtceu.food_oven('vareniki') - .itemInputs('tfc_gurman:raw_vareniki') - .itemOutputs('tfc_gurman:vareniki') - .inputFluids(Fluid.of('minecraft:water', 500)) - .duration(200) - .EUt(8) - - $ISPRecipeLogic.RegisterRecipeData('food_oven/vareniki', - [Ingredient.of('tfc_gurman:raw_vareniki')], - TFC.isp.of('tfc_gurman:vareniki').copyFood().addTrait("firmalife:oven_baked").asCanonClass(), - []) + global.cookingRecipe(event, 'vareniki', 'tfc_gurman:raw_vareniki', 'tfc_gurman:vareniki', '#tfg:clean_water 500'); //#endregion //#region Food Processor Recipes // Borscht - event.recipes.gtceu.food_processor('borscht') - .circuit(20) - .itemInputs('tfc:food/beet', 'tfc:food/cabbage', 'tfc:food/carrot', 'tfc:food/onion', 'tfc:food/tomato') - .itemOutputs('3x tfc_gurman:borscht') - .inputFluids(Fluid.of('minecraft:water', 1000)) - .duration(300) - .EUt(8) - - $ISPRecipeLogic.RegisterRecipeData('food_processor/borscht', - [Ingredient.of('tfc:food/beet'), Ingredient.of('tfc:food/cabbage'), Ingredient.of('tfc:food/carrot'), Ingredient.of('tfc:food/onion'), Ingredient.of('tfc:food/tomato')], - TFC.isp.of('tfc_gurman:borscht').copyFood().asCanonClass(), - []) + 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'], + fluidInputs: ['minecraft:water 1000'], + itemOutputs: ['3x tfc_gurman:borscht'], + circuit: 20, + itemOutputProvider: TFC.isp.of('3x tfc_gurman:borscht').simpleModifier('tfg:force_add_bowl').copyOldestFood() + }); // Schi - event.recipes.gtceu.food_processor('schi') - .circuit(20) - .itemInputs('tfc:food/cabbage', 'tfc:food/cabbage', 'tfc:food/carrot', 'tfc:food/onion', 'tfc:food/tomato') - .itemOutputs('3x tfc_gurman:schi') - .inputFluids(Fluid.of('minecraft:water', 1000)) - .duration(300) - .EUt(8) - - $ISPRecipeLogic.RegisterRecipeData('food_processor/schi', - [Ingredient.of('tfc:food/cabbage'), Ingredient.of('tfc:food/cabbage'), Ingredient.of('tfc:food/carrot'), Ingredient.of('tfc:food/onion'), Ingredient.of('tfc:food/tomato')], - TFC.isp.of('tfc_gurman:schi').copyFood().asCanonClass(), - []) - + 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'], + circuit: 20, + itemOutputProvider: TFC.isp.of('3x tfc_gurman:schi').simpleModifier('tfg:force_add_bowl').copyOldestFood() + }); + // Coffee - event.recipes.gtceu.food_processor('coffee') - .circuit(2) - .itemInputs('firmalife:food/roasted_cocoa_beans', 'firmalife:food/roasted_cocoa_beans') - .inputFluids(Fluid.of('minecraft:water', 1000)) - .outputFluids(Fluid.of('tfc_gurman:coffee', 1000)) - .duration(300) - .EUt(8) + 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'], + circuit: 2 + }); // Cocoa - event.recipes.gtceu.food_processor('cocoa') - .circuit(1) - .itemInputs('firmalife:food/cocoa_powder', 'firmalife:food/cocoa_powder', 'minecraft:sugar') - .inputFluids('#tfc:milks 1000') - .outputFluids(Fluid.of('tfc_gurman:cocoa', 1000)) - .duration(300) - .EUt(8) + global.processorRecipe(event, 'cocoa', 1000, GTValues.VHA[GTValues.LV], { + itemInputs: ['2x firmalife:food/cocoa_powder'], + fluidInputs: ['#tfc:milks 1000'], + fluidOutputs: ['tfc_gurman:cocoa 1000'], + circuit: 1 + }); // Compote - event.recipes.gtceu.food_processor('compote') - .circuit(2) - .itemInputs('#tfc:foods/fruits', '#tfc:foods/fruits') - .inputFluids(Fluid.of('minecraft:water', 1000)) - .outputFluids(Fluid.of('tfc_gurman:compote', 1000)) - .duration(300) - .EUt(8) + global.processorRecipe(event, 'compote', 1000, GTValues.VHA[GTValues.LV], { + itemInputs: ['2x #tfc:foods/fruits'], + fluidInputs: ['minecraft:water 1000'], + fluidOutputs: ['tfc_gurman:compote 1000'], + circuit: 2 + }); // Lemonade - event.recipes.gtceu.food_processor('lemonade') - .circuit(2) - .itemInputs('tfc:food/lemon', 'tfc:food/lemon') - .inputFluids(Fluid.of('minecraft:water', 1000)) - .outputFluids(Fluid.of('tfc_gurman:lemonade', 1000)) - .duration(1500) - .EUt(8) + global.processorRecipe(event, 'lemonade', 1500, GTValues.VHA[GTValues.LV], { + itemInputs: ['2x tfc:food/lemon', '#tfc:sweetener'], + fluidInputs: ['minecraft:water 1000'], + fluidOutputs: ['tfc_gurman:lemonade 1000'], + circuit: 2 + }); // Kvass - event.recipes.gtceu.food_processor('kvass') - .circuit(2) - .itemInputs('2x #tfc:foods/grains') - .inputFluids(Fluid.of('minecraft:water', 1000)) - .outputFluids(Fluid.of('tfc_gurman:kvass', 1000)) - .duration(2400) - .EUt(8) + global.processorRecipe(event, 'kvass', 2400, GTValues.VHA[GTValues.LV], { + itemInputs: ['2x #tfc:foods/grains'], + fluidInputs: ['minecraft:water 1000'], + fluidOutputs: ['tfc_gurman:kvass 1000'], + circuit: 2 + }); // Tea Mint - event.recipes.gtceu.food_processor('tea_mint') - .circuit(2) - .itemInputs('tfc_gurman:dried_mint_leaves', 'tfc_gurman:dried_mint_leaves') - .inputFluids(Fluid.of('minecraft:water', 1000)) - .outputFluids(Fluid.of('tfc_gurman:tea_mint', 1000)) - .duration(300) - .EUt(8) + global.processorRecipe(event, 'tea_mint', 200, GTValues.VHA[GTValues.LV], { + itemInputs: ['2x tfc_gurman:dried_mint_leaves'], + fluidInputs: ['minecraft:water 1000'], + fluidOutputs: ['tfc_gurman:tea_mint 1000'], + circuit: 2 + }); // Tea Chamomile - event.recipes.gtceu.food_processor('tea_chamomile') - .circuit(2) - .itemInputs('tfc_gurman:dried_chamomile_leaves', 'tfc_gurman:dried_chamomile_leaves') - .inputFluids(Fluid.of('minecraft:water', 1000)) - .outputFluids(Fluid.of('tfc_gurman:tea_chamomile', 1000)) - .duration(300) - .EUt(8) + global.processorRecipe(event, 'tea_chamomile', 200, GTValues.VHA[GTValues.LV], { + itemInputs: ['2x tfc_gurman:dried_chamomile_leaves'], + fluidInputs: ['minecraft:water 1000'], + fluidOutputs: ['tfc_gurman:tea_chamomile 1000'], + circuit: 2 + }); // Tea Rosehip - event.recipes.gtceu.food_processor('tea_rosehip') - .circuit(2) - .itemInputs('tfc_gurman:dried_rosehip_leaves', 'tfc_gurman:dried_rosehip_leaves') - .inputFluids(Fluid.of('minecraft:water', 1000)) - .outputFluids(Fluid.of('tfc_gurman:tea_rosehip', 1000)) - .duration(300) - .EUt(8) + global.processorRecipe(event, 'tea_rosehip', 200, GTValues.VHA[GTValues.LV], { + itemInputs: ['2x tfc_gurman:dried_rosehip_leaves'], + fluidInputs: ['minecraft:water 1000'], + fluidOutputs: ['tfc_gurman:tea_rosehip 1000'], + circuit: 2 + }); // Tea Nettle - event.recipes.gtceu.food_processor('tea_nettle') - .circuit(2) - .itemInputs('tfc_gurman:dried_nettle_leaves', 'tfc_gurman:dried_nettle_leaves') - .inputFluids(Fluid.of('minecraft:water', 1000)) - .outputFluids(Fluid.of('tfc_gurman:tea_nettle', 1000)) - .duration(300) - .EUt(8) + global.processorRecipe(event, 'tea_nettle', 200, GTValues.VHA[GTValues.LV], { + itemInputs: ['2x tfc_gurman:dried_nettle_leaves'], + fluidInputs: ['minecraft:water 1000'], + fluidOutputs: ['tfc_gurman:tea_nettle 1000'], + circuit: 2 + }); // Solyanka - event.recipes.gtceu.food_processor('solyanka') - .circuit(20) - .itemInputs('#tfc:foods/meats', 'tfc:food/cabbage', 'tfc:food/onion', 'tfc:food/tomato', 'tfc:food/olive') - .itemOutputs('3x tfc_gurman:solyanka') - .inputFluids(Fluid.of('minecraft:water', 1000)) - .duration(300) - .EUt(8) - - $ISPRecipeLogic.RegisterRecipeData('food_processor/solyanka', - [Ingredient.of('#tfc:foods/meats'), Ingredient.of('tfc:food/cabbage'), Ingredient.of('tfc:food/onion'), Ingredient.of('tfc:food/tomato'), Ingredient.of('tfc:food/olive')], - TFC.isp.of('tfc_gurman:solyanka').copyFood().asCanonClass(), - []) + 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'], + circuit: 20, + itemOutputProvider: TFC.isp.of('3x tfc_gurman:solyanka').simpleModifier('tfg:force_add_bowl').copyOldestFood() + }); // Okroshka - event.recipes.gtceu.food_processor('okroshka') - .circuit(20) - .itemInputs('tfc:food/cabbage', 'tfc:food/tomato', 'tfc:food/potato', 'tfc:food/onion', 'minecraft:egg') - .itemOutputs('3x tfc_gurman:okroshka') - .inputFluids(Fluid.of('tfc_gurman:kvass', 1000)) - .duration(300) - .EUt(8) - - $ISPRecipeLogic.RegisterRecipeData('food_processor/okroshka', - [Ingredient.of('tfc:food/cabbage'), Ingredient.of('tfc:food/tomato'), Ingredient.of('tfc:food/potato'), Ingredient.of('tfc:food/onion'), Ingredient.of('minecraft:egg')], - TFC.isp.of('tfc_gurman:okroshka').copyFood().asCanonClass(), - []) + 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'], + circuit: 20, + itemOutputProvider: TFC.isp.of('3x tfc_gurman:okroshka').simpleModifier('tfg:force_add_bowl').copyOldestFood() + }); // Zama - event.recipes.gtceu.food_processor('zama') - .circuit(20) - .itemInputs('tfc:food/chicken', 'tfc:food/carrot', 'tfc:food/onion', 'tfc:powder/salt', 'tfc:food/garlic') - .itemOutputs('3x tfc_gurman:zama') - .inputFluids(Fluid.of('minecraft:water', 1000)) - .duration(300) - .EUt(8) - - $ISPRecipeLogic.RegisterRecipeData('food_processor/zama', - [Ingredient.of('tfc:food/chicken'), Ingredient.of('tfc:food/carrot'), Ingredient.of('tfc:food/onion'), Ingredient.of('tfc:powder/salt'), Ingredient.of('tfc:food/garlic')], - TFC.isp.of('tfc_gurman:zama').copyFood().asCanonClass(), - []) + 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'], + circuit: 20, + itemOutputProvider: TFC.isp.of('3x tfc_gurman:zama').simpleModifier('tfg:force_add_bowl').copyOldestFood() + }); // Curry - event.recipes.gtceu.food_processor('curry') - .circuit(16) - .itemInputs('#tfc:foods/cooked_meats', '#tfc:foods/vegetables', 'tfc:powder/salt', 'tfc:food/cooked_rice') - .itemOutputs('3x tfc_gurman:curry') - .inputFluids('#tfc:milks 1000') - .duration(300) - .EUt(8) - - $ISPRecipeLogic.RegisterRecipeData('food_processor/curry', - [Ingredient.of('#tfc:foods/cooked_meats'), Ingredient.of('#tfc:foods/vegetables'), Ingredient.of('tfc:powder/salt'), Ingredient.of('tfc:food/cooked_rice')], - TFC.isp.of('tfc_gurman:curry').copyFood().asCanonClass(), - []) + 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'], + circuit: 16, + itemOutputProvider: TFC.isp.of('3x tfc_gurman:curry').simpleModifier('tfg:force_add_bowl').copyOldestFood() + }); // Goulash - event.recipes.gtceu.food_processor('goulash') - .circuit(16) - .itemInputs('#tfc:foods/raw_meats', 'tfc:food/onion', 'tfc:food/potato', 'tfc:powder/salt') - .itemOutputs('3x tfc_gurman:goulash') - .inputFluids(Fluid.of('minecraft:water', 100)) - .duration(300) - .EUt(8) - - $ISPRecipeLogic.RegisterRecipeData('food_processor/goulash', - [Ingredient.of('#tfc:foods/raw_meats'), Ingredient.of('tfc:food/onion'), Ingredient.of('tfc:food/potato'), Ingredient.of('tfc:powder/salt')], - TFC.isp.of('tfc_gurman:goulash').copyFood().asCanonClass(), - []) + 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'], + circuit: 16, + itemOutputProvider: TFC.isp.of('3x tfc_gurman:goulash').simpleModifier('tfg:force_add_bowl').copyOldestFood() + }); // Pho - event.recipes.gtceu.food_processor('pho') - .circuit(16) - .itemInputs('firmalife:food/cooked_pasta', '#tfc:foods/cooked_meats', 'tfc:food/garlic', 'tfc:powder/salt') - .itemOutputs('3x tfc_gurman:pho') - .inputFluids(Fluid.of('minecraft:water', 100)) - .duration(300) - .EUt(8) - - $ISPRecipeLogic.RegisterRecipeData('food_processor/pho', - [Ingredient.of('firmalife:food/cooked_pasta'), Ingredient.of('#tfc:foods/cooked_meats'), Ingredient.of('tfc:food/garlic'), Ingredient.of('tfc:powder/salt')], - TFC.isp.of('tfc_gurman:pho').copyFood().asCanonClass(), - []) + 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'], + circuit: 16, + itemOutputProvider: TFC.isp.of('3x tfc_gurman:pho').simpleModifier('tfg:force_add_bowl').copyOldestFood() + }); // Bouillabaisse - event.recipes.gtceu.food_processor('bouillabaisse') - .circuit(16) - .itemInputs('#firmalife:foods/raw_fish', 'tfc:food/tomato', 'tfc:food/onion', 'tfc:food/garlic', 'tfc:powder/salt') - .itemOutputs('3x tfc_gurman:bouillabaisse') - .inputFluids(Fluid.of('minecraft:water', 1000)) - .duration(300) - .EUt(8) - - $ISPRecipeLogic.RegisterRecipeData('food_processor/bouillabaisse', - [Ingredient.of('#firmalife:foods/raw_fish'), Ingredient.of('tfc:food/tomato'), Ingredient.of('tfc:food/onion'), Ingredient.of('tfc:food/garlic'), Ingredient.of('tfc:powder/salt')], - TFC.isp.of('tfc_gurman:bouillabaisse').copyFood().asCanonClass(), - []) + 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'], + circuit: 16, + itemOutputProvider: TFC.isp.of('3x tfc_gurman:bouillabaisse').simpleModifier('tfg:force_add_bowl').copyOldestFood() + }); // Ramen with Beef - event.recipes.gtceu.food_processor('ramen_beef') - .circuit(21) - .itemInputs('firmalife:food/raw_egg_noodles', 'minecraft:egg', 'tfc:food/beef', 'tfc:food/onion') - .itemOutputs('2x tfc_gurman:ramen_with_beef') - .inputFluids(Fluid.of('minecraft:water', 1000)) - .duration(300) - .EUt(8) - - $ISPRecipeLogic.RegisterRecipeData('food_processor/ramen_beef', - [Ingredient.of('firmalife:food/raw_egg_noodles'), Ingredient.of('minecraft:egg'), Ingredient.of('tfc:food/beef'), Ingredient.of('tfc:food/onion')], - TFC.isp.of('tfc_gurman:ramen_with_beef').copyFood().asCanonClass(), - []) + 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'], + circuit: 21, + itemOutputProvider: TFC.isp.of('2x tfc_gurman:ramen_with_beef').simpleModifier('tfg:force_add_bowl').copyOldestFood() + }); // Ramen with Camelidae - event.recipes.gtceu.food_processor('ramen_camelidae') - .circuit(21) - .itemInputs('firmalife:food/raw_egg_noodles', 'minecraft:egg', 'tfc:food/camelidae', 'tfc:food/onion') - .itemOutputs('2x tfc_gurman:ramen_with_camelidae') - .inputFluids(Fluid.of('minecraft:water', 1000)) - .duration(300) - .EUt(8) - - $ISPRecipeLogic.RegisterRecipeData('food_processor/ramen_camelidae', - [Ingredient.of('firmalife:food/raw_egg_noodles'), Ingredient.of('minecraft:egg'), Ingredient.of('tfc:food/camelidae'), Ingredient.of('tfc:food/onion')], - TFC.isp.of('tfc_gurman:ramen_with_camelidae').copyFood().asCanonClass(), - []) + 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'], + circuit: 21, + itemOutputProvider: TFC.isp.of('2x tfc_gurman:ramen_with_camelidae').simpleModifier('tfg:force_add_bowl').copyOldestFood() + }); // Ramen with Chevon - event.recipes.gtceu.food_processor('ramen_chevon') - .circuit(21) - .itemInputs('firmalife:food/raw_egg_noodles', 'minecraft:egg', 'tfc:food/chevon', 'tfc:food/onion') - .itemOutputs('2x tfc_gurman:ramen_with_chevon') - .inputFluids(Fluid.of('minecraft:water', 1000)) - .duration(300) - .EUt(8) - - $ISPRecipeLogic.RegisterRecipeData('food_processor/ramen_chevon', - [Ingredient.of('firmalife:food/raw_egg_noodles'), Ingredient.of('minecraft:egg'), Ingredient.of('tfc:food/chevon'), Ingredient.of('tfc:food/onion')], - TFC.isp.of('tfc_gurman:ramen_with_chevon').copyFood().asCanonClass(), - []) + 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'], + circuit: 21, + itemOutputProvider: TFC.isp.of('2x tfc_gurman:ramen_with_chevon').simpleModifier('tfg:force_add_bowl').copyOldestFood() + }); // Ramen with Bacon - event.recipes.gtceu.food_processor('ramen_bacon') - .circuit(21) - .itemInputs('firmalife:food/raw_egg_noodles', 'minecraft:egg', 'firmalife:food/bacon', 'tfc:food/onion') - .itemOutputs('2x tfc_gurman:ramen_with_bacon') - .inputFluids(Fluid.of('minecraft:water', 1000)) - .duration(300) - .EUt(8) - - $ISPRecipeLogic.RegisterRecipeData('food_processor/ramen_bacon', - [Ingredient.of('firmalife:food/raw_egg_noodles'), Ingredient.of('minecraft:egg'), Ingredient.of('firmalife:food/bacon'), Ingredient.of('tfc:food/onion')], - TFC.isp.of('tfc_gurman:ramen_with_bacon').copyFood().asCanonClass(), - []) + 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'], + circuit: 21, + itemOutputProvider: TFC.isp.of('2x tfc_gurman:ramen_with_bacon').simpleModifier('tfg:force_add_bowl').copyOldestFood() + }); // Biryani - event.recipes.gtceu.food_processor('biryani') - .circuit(20) - .itemInputs('tfc:food/rice_grain', '#tfc:foods/meats', 'tfc:food/onion', 'tfc:food/carrot', 'tfc:food/tomato') - .itemOutputs('3x tfc_gurman:biryani') - .inputFluids(Fluid.of('minecraft:water', 1000)) - .duration(300) - .EUt(8) - - $ISPRecipeLogic.RegisterRecipeData('food_processor/biryani', - [Ingredient.of('tfc:food/rice_grain'), Ingredient.of('#tfc:foods/meats'), Ingredient.of('tfc:food/onion'), Ingredient.of('tfc:food/carrot'), Ingredient.of('tfc:food/tomato')], - TFC.isp.of('tfc_gurman:biryani').copyFood().asCanonClass(), - []) + 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'], + circuit: 20, + itemOutputProvider: TFC.isp.of('3x tfc_gurman:biryani').simpleModifier('tfg:force_add_bowl').copyOldestFood() + }); // Fried Rice - event.recipes.gtceu.food_processor('fried_rice') - .circuit(16) - .itemInputs('tfc:food/cooked_rice', '#forge:eggs', '#tfc:foods/vegetables', 'tfc:powder/salt') - .itemOutputs('3x tfc_gurman:fried_rice') - .inputFluids(Fluid.of('minecraft:water', 100)) - .duration(300) - .EUt(8) - - $ISPRecipeLogic.RegisterRecipeData('food_processor/fried_rice', - [Ingredient.of('tfc:food/cooked_rice'), Ingredient.of('#forge:eggs'), Ingredient.of('#tfc:foods/vegetables'), Ingredient.of('tfc:powder/salt')], - TFC.isp.of('tfc_gurman:fried_rice').copyFood().asCanonClass(), - []) + 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'], + circuit: 16, + itemOutputProvider: TFC.isp.of('3x tfc_gurman:fried_rice').simpleModifier('tfg:force_add_bowl').copyOldestFood() + }); // Kimchi - event.recipes.gtceu.food_processor('kimchi') - .circuit(20) - .itemInputs('tfc:food/cabbage', 'tfc:food/carrot', 'tfc:food/onion', 'tfc:food/garlic', 'tfc:powder/salt') - .itemOutputs('3x tfc_gurman:kimchi') - .inputFluids(Fluid.of('minecraft:water', 1000)) - .duration(300) - .EUt(8) - - $ISPRecipeLogic.RegisterRecipeData('food_processor/kimchi', - [Ingredient.of('tfc:food/cabbage'), Ingredient.of('tfc:food/carrot'), Ingredient.of('tfc:food/onion'), Ingredient.of('tfc:food/garlic'), Ingredient.of('tfc:powder/salt')], - TFC.isp.of('tfc_gurman:kimchi').copyFood().asCanonClass(), - []) + 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'], + circuit: 20, + itemOutputProvider: TFC.isp.of('3x tfc_gurman:kimchi').simpleModifier('tfg:force_add_bowl').copyOldestFood() + }); // Dolma - event.recipes.gtceu.food_processor('dolma') - .circuit(16) - .itemInputs('#tfc:foods/meats', 'tfc:food/rice_grain', 'tfc:powder/salt') - .itemOutputs('2x tfc_gurman:dolma') - .inputFluids(Fluid.of('minecraft:water', 1000)) - .duration(300) - .EUt(8) - - $ISPRecipeLogic.RegisterRecipeData('food_processor/dolma', - [Ingredient.of('#tfc:foods/meats'), Ingredient.of('tfc:food/rice_grain'), Ingredient.of('tfc:powder/salt')], - TFC.isp.of('tfc_gurman:dolma').copyFood().asCanonClass(), - []) + global.processorRecipe(event, 'dolma', 300, GTValues.VA[GTValues.LV], { + itemInputs: ['#tfc:foods/meats', 'tfc:food/rice_grain', 'tfc:powder/salt', '2x #tfc:bowls'], + fluidInputs: ['minecraft:water 1000'], + itemOutputs: ['2x tfc_gurman:dolma'], + circuit: 16, + itemOutputProvider: TFC.isp.of('2x tfc_gurman:dolma').simpleModifier('tfg:force_add_bowl').copyOldestFood() + }); // Spaghetti Bolognese - event.recipes.gtceu.food_processor('spaghetti_bolognese') - .circuit(18) - .itemInputs('firmalife:food/cooked_pasta', '#tfc:foods/cooked_meats', 'tfc:food/tomato', 'tfc:food/onion', 'tfc:food/garlic') - .itemOutputs('3x tfc_gurman:spaghetti_bolognese') - .inputFluids(Fluid.of('minecraft:water', 500)) - .duration(300) - .EUt(8) - - $ISPRecipeLogic.RegisterRecipeData('food_processor/spaghetti_bolognese', - [Ingredient.of('firmalife:food/cooked_pasta'), Ingredient.of('#tfc:foods/cooked_meats'), Ingredient.of('tfc:food/tomato'), Ingredient.of('tfc:food/onion'), Ingredient.of('tfc:food/garlic')], - TFC.isp.of('tfc_gurman:spaghetti_bolognese').copyFood().asCanonClass(), - []) + 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'], + circuit: 18, + itemOutputProvider: TFC.isp.of('3x tfc_gurman:spaghetti_bolognese').simpleModifier('tfg:force_add_bowl').copyOldestFood() + }); // Pasta Carbonara - event.recipes.gtceu.food_processor('pasta_carbonara') - .circuit(18) - .itemInputs('firmalife:food/cooked_pasta', 'firmalife:food/bacon', 'minecraft:egg', 'firmalife:food/shredded_cheese', 'tfc:powder/salt') - .itemOutputs('3x tfc_gurman:pasta_carbonara') - .inputFluids(Fluid.of('minecraft:water', 500)) - .duration(300) - .EUt(8) - - $ISPRecipeLogic.RegisterRecipeData('food_processor/pasta_carbonara', - [Ingredient.of('firmalife:food/cooked_pasta'), Ingredient.of('firmalife:food/bacon'), Ingredient.of('minecraft:egg'), Ingredient.of('firmalife:food/shredded_cheese'), Ingredient.of('tfc:powder/salt')], - TFC.isp.of('tfc_gurman:pasta_carbonara').copyFood().asCanonClass(), - []) + 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'], + circuit: 18, + itemOutputProvider: TFC.isp.of('3x tfc_gurman:pasta_carbonara').simpleModifier('tfg:force_add_bowl').copyOldestFood() + }); // Ratatouille - event.recipes.gtceu.food_processor('ratatouille') - .circuit(18) - .itemInputs('tfc:food/tomato', 'tfc:food/pumpkin_chunks', 'tfc:food/carrot', 'tfc:food/onion', 'tfc:food/garlic') - .itemOutputs('3x tfc_gurman:ratatouille') - .inputFluids(Fluid.of('minecraft:water', 500)) - .duration(300) - .EUt(8) - - $ISPRecipeLogic.RegisterRecipeData('food_processor/ratatouille', - [Ingredient.of('tfc:food/tomato'), Ingredient.of('tfc:food/pumpkin_chunks'), Ingredient.of('tfc:food/carrot'), Ingredient.of('tfc:food/onion'), Ingredient.of('tfc:food/garlic')], - TFC.isp.of('tfc_gurman:ratatouille').copyFood().asCanonClass(), - []) + 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'], + circuit: 18, + itemOutputProvider: TFC.isp.of('3x tfc_gurman:ratatouille').simpleModifier('tfg:force_add_bowl').copyOldestFood() + }); // Risotto - event.recipes.gtceu.food_processor('risotto') - .circuit(18) - .itemInputs('tfc:food/rice_grain', '#firmalife:foods/cheeses', '#tfc:foods/vegetables') - .itemOutputs('3x tfc_gurman:risotto') - .inputFluids(Fluid.of('minecraft:water', 100)) - .duration(300) - .EUt(8) - - $ISPRecipeLogic.RegisterRecipeData('food_processor/risotto', - [Ingredient.of('tfc:food/rice_grain'), Ingredient.of('#firmalife:foods/cheeses'), Ingredient.of('#tfc:foods/vegetables')], - TFC.isp.of('tfc_gurman:risotto').copyFood().asCanonClass(), - []) + 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'], + circuit: 18, + itemOutputProvider: TFC.isp.of('3x tfc_gurman:risotto').simpleModifier('tfg:force_add_bowl').copyOldestFood() + }); // Porridge - event.recipes.gtceu.food_processor('porridge') - .circuit(18) - .itemInputs('#tfc:foods/grains', 'tfc:powder/salt') - .itemOutputs('tfc_gurman:porridge') - .inputFluids(Fluid.of('minecraft:water', 250)) - .duration(300) - .EUt(8) - - $ISPRecipeLogic.RegisterRecipeData('food_processor/porridge', - [Ingredient.of('#tfc:foods/grains'), Ingredient.of('tfc:powder/salt')], - TFC.isp.of('tfc_gurman:porridge').copyFood().asCanonClass(), - []) + 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'], + circuit: 18, + itemOutputProvider: TFC.isp.of('tfc_gurman:porridge').simpleModifier('tfg:force_add_bowl').copyOldestFood() + }); // Mamaliga - event.recipes.gtceu.food_processor('mamaliga') - .circuit(16) - .itemInputs('tfc:food/maize_grain', 'tfc:powder/salt') - .itemOutputs('tfc_gurman:mamaliga') - .inputFluids(Fluid.of('minecraft:water', 250)) - .duration(300) - .EUt(8) - - $ISPRecipeLogic.RegisterRecipeData('food_processor/mamaliga', - [Ingredient.of('tfc:food/maize_grain'), Ingredient.of('tfc:powder/salt')], - TFC.isp.of('tfc_gurman:mamaliga').copyFood().asCanonClass(), - []) - - event.recipes.gtceu.food_processor('mamaliga_2') - .circuit(16) - .itemInputs('tfc:food/maize_grain', 'tfc:food/maize_grain', 'tfc:powder/salt') - .itemOutputs('2x tfc_gurman:mamaliga') - .inputFluids(Fluid.of('minecraft:water', 250)) - .duration(300) - .EUt(8) - - $ISPRecipeLogic.RegisterRecipeData('food_processor/mamaliga_2', - [Ingredient.of('tfc:food/maize_grain'), Ingredient.of('tfc:powder/salt')], - TFC.isp.of('tfc_gurman:mamaliga').copyFood().asCanonClass(), - []) - - event.recipes.gtceu.food_processor('mamaliga_3') - .circuit(16) - .itemInputs('tfc:food/maize_grain', 'tfc:food/maize_grain', 'tfc:food/maize_grain', 'tfc:powder/salt') - .itemOutputs('3x tfc_gurman:mamaliga') - .inputFluids(Fluid.of('minecraft:water', 250)) - .duration(300) - .EUt(8) - - $ISPRecipeLogic.RegisterRecipeData('food_processor/mamaliga_3', - [Ingredient.of('tfc:food/maize_grain'), Ingredient.of('tfc:powder/salt')], - TFC.isp.of('tfc_gurman:mamaliga').copyFood().asCanonClass(), - []) - - event.recipes.gtceu.food_processor('mamaliga_4') - .circuit(16) - .itemInputs('tfc:food/maize_grain', 'tfc:food/maize_grain', 'tfc:food/maize_grain', 'tfc:food/maize_grain', 'tfc:powder/salt') - .itemOutputs('4x tfc_gurman:mamaliga') - .inputFluids(Fluid.of('minecraft:water', 250)) - .duration(300) - .EUt(8) - - $ISPRecipeLogic.RegisterRecipeData('food_processor/mamaliga_4', - [Ingredient.of('tfc:food/maize_grain'), Ingredient.of('tfc:powder/salt')], - TFC.isp.of('tfc_gurman:mamaliga').copyFood().asCanonClass(), - []) + 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'], + circuit: 16, + itemOutputProvider: TFC.isp.of('tfc_gurman:mamaliga').simpleModifier('tfg:force_add_bowl').copyOldestFood() + }); // Adjika - event.recipes.gtceu.food_processor('adjika') - .circuit(8) - .itemInputs('tfc:food/green_bell_pepper', 'tfc:food/red_bell_pepper', 'tfc:powder/salt', 'tfc:food/garlic', 'firmalife:plant/cilantro') - .itemOutputs('5x tfc_gurman:adjika') - .inputFluids(Fluid.of('minecraft:water', 500)) - .duration(300) - .EUt(8) - - $ISPRecipeLogic.RegisterRecipeData('food_processor/adjika', - [Ingredient.of('tfc:food/green_bell_pepper'), Ingredient.of('tfc:food/red_bell_pepper'), Ingredient.of('tfc:powder/salt'), Ingredient.of('tfc:food/garlic'), Ingredient.of('firmalife:plant/cilantro')], - TFC.isp.of('tfc_gurman:adjika').copyFood().asCanonClass(), - []) + 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'], + fluidInputs: ['minecraft:water 500'], + itemOutputs: ['5x tfc_gurman:adjika'], + circuit: 8, + itemOutputProvider: TFC.isp.of('5x tfc_gurman:adjika').simpleModifier('tfg:force_add_bowl').copyOldestFood() + }); //#endregion // #region Drying + 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"], + circuit: 6 + }); - event.recipes.gtceu.food_processor("dried_mint") - .itemInputs("tfc:plant/foxglove") - .itemOutputs("tfc_gurman:dried_mint_leaves") - .inputFluids(Fluid.of('gtceu:nitrogen', 100)) - .EUt(8) - .duration(200) - .circuit(6) - .addDataString("action", "tfg.food_recipe.drying") + 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"], + circuit: 6 + }); - event.recipes.gtceu.food_processor("dried_chamomile") - .itemInputs("tfc:plant/lilac") - .itemOutputs("tfc_gurman:dried_chamomile_leaves") - .inputFluids(Fluid.of('gtceu:nitrogen', 100)) - .EUt(8) - .duration(200) - .circuit(6) - .addDataString("action", "tfg.food_recipe.drying") - - event.recipes.gtceu.food_processor("dried_rosehip") - .itemInputs("tfc:plant/rose") - .itemOutputs("tfc_gurman:dried_rosehip_leaves") - .inputFluids(Fluid.of('gtceu:nitrogen', 100)) - .EUt(8) - .duration(200) - .circuit(6) - .addDataString("action", "tfg.food_recipe.drying") - - event.recipes.gtceu.food_processor("dried_nettle") - .itemInputs("tfc:plant/trillium") - .itemOutputs("tfc_gurman:dried_nettle_leaves") - .inputFluids(Fluid.of('gtceu:nitrogen', 100)) - .EUt(8) - .duration(200) - .circuit(6) - .addDataString("action", "tfg.food_recipe.drying") + 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"], + 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"], + circuit: 6 + }); // #endregion Drying // #region Crafting table foods - event.recipes.gtceu.food_processor('margarita_pizza') - .circuit(4) - .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') - .duration(300) - .EUt(8) - - $ISPRecipeLogic.RegisterRecipeData('food_processor/margarita_pizza', - [Ingredient.of('firmalife:food/pizza_dough'), Ingredient.of('firmalife:food/shredded_cheese'), Ingredient.of('tfc:food/tomato'), Ingredient.of('tfc:food/red_bell_pepper'), Ingredient.of('tfc_gurman:plant_mix'), Ingredient.of('firmalife:food/tomato_sauce')], - TFC.isp.of('tfc_gurman:raw_margarita_pizza').copyFood().asCanonClass(), - []) + // 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 @@ -798,10 +393,12 @@ function registerTFCGurmanRecipes(event) { event.replaceInput({ id: "tfc_gurman:crafting/tiramisu" }, "minecraft:sugar", "#tfg:sugars"); - event.shapeless('4x tfc_gurman:raw_takoyaki', ['tfg:food/raw_crawlermari', '#tfc:foods/flour', '#forge:eggs', 'tfc:powder/salt']); + event.recipes.tfc.advanced_shapeless_crafting(TFC.isp.of('4x tfc_gurman: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'); // #endregion - - // TODO: - // buffs for the various drinks? } diff --git a/kubejs/server_scripts/tfg/food/recipes.food.js b/kubejs/server_scripts/tfg/food/recipes.food.js index a592c4cfb..17feb698f 100644 --- a/kubejs/server_scripts/tfg/food/recipes.food.js +++ b/kubejs/server_scripts/tfg/food/recipes.food.js @@ -1,127 +1,128 @@ // priority: 0 "use strict"; + +const $ISPRecipeLogic = Java.loadClass("su.terrafirmagreg.core.common.data.tfgt.machine.trait.ISPOutputRecipeLogic") +const $SizedIngredient = Java.loadClass("com.gregtechceu.gtceu.api.recipe.ingredient.SizedIngredient") +const Sized = (ing, amount) => $SizedIngredient.create(ing, amount) + +/** +* @typedef {Object} FoodRecipeData +* @property {number?} circuit +* @property {Internal.GTRecipeComponents$FluidIngredientJS_[]?} fluidInputs +* @property {Internal.FluidStackJS[]?} fluidOutputs +* @property {(string | [string, Internal.Ingredient])[]?} itemInputs +* @property {string[]?} itemOutputs Ingredient outputs - first output is replaced with ISP output if defined +* @property {Internal.ItemStackProviderJS?} itemOutputProvider ItemStackProvider which provides the recipe output. +* @property {boolean?} daytime +* @property {boolean?} perTick +* @property {(string | [string, Internal.GTRecipeSchema$GTRecipeJS.dimension])?} dimension +* @property {Internal.GTRecipeSchema$GTRecipeJS.cleanroom?} cleanroom CleanroomType +* @property {string[]?} notConsumable +* +* **NOTE:** TFC Ingredients do not support item counts higher than 1. Do `Sized(TFCIngredient('item:item'), count)` instead of `TFCIngredient('[count]x item:item')` +*/ +//#region Helper funcs + +/** +* @param {"food_oven"|"food_processor"} type +* @param {string} id +* @param {number} duration +* @param {number} EUt +* @param {string} text +* @param {FoodRecipeData} data +*/ +global.registerFoodRecipe = (event, type, id, duration, EUt, text, data) => { + if (data.itemInputs === undefined) data.itemInputs = [] + if (data.itemOutputs === undefined) data.itemOutputs = [] + if (data.fluidInputs === undefined) data.fluidInputs = [] + if (data.fluidOutputs === undefined) data.fluidOutputs = [] + if (data.notConsumable === undefined) data.notConsumable = [] + let gregInputs = [], inputs = [] + let outputFirstIndex = (data.itemOutputProvider === undefined) ? 0 : 1 + data.itemInputs.forEach(item => { + if (typeof item === "string") { + gregInputs.push(item) + + const match = item.match(/^(\d+)\s*x\s*/i); + let count = 1 + if (match) { + count = parseInt(match[1]); + item = item.slice(match[0].length); + } + inputs.push($SizedIngredient.create(item, count)) + } else { + gregInputs.push(item[0]) + inputs.push(item[1]) + } + }) + + $ISPRecipeLogic.RegisterRecipeData(`${type }/${ id}`, inputs, (data.itemOutputProvider === undefined) ? null : data.itemOutputProvider.asCanonClass(), data.itemOutputs.slice(outputFirstIndex).map(i => Item.of(i))) + + let r = event.recipes.gtceu[type](id) + .duration(duration) + .EUt(EUt) + + if (data.circuit) r.circuit(data.circuit) + if (data.daytime) r.daytime(data.daytime) + if (data.perTick) r.perTick(data.perTick) + if (data.dimension) r.dimension(data.dimension) + if (data.cleanroom) r.cleanroom(data.cleanroom) + if (data.notConsumable.length > 0) r.notConsumable(data.notConsumable) + if (data.itemOutputs.length > 0) r.itemOutputs(data.itemOutputs) + if (data.itemInputs.length > 0) r.itemInputs(data.itemInputs) + if (data.fluidInputs.length > 0) r.inputFluids(data.fluidInputs); + if (data.fluidOutputs.length > 0) r.outputFluids(data.fluidOutputs); + if (text !== "") r.addDataString("action", text); + + return r; +} + +/** +* @param {string} id +* @param {number} duration +* @param {number} EUt +* @param {FoodRecipeData} data +*/ +global.processorRecipe = (event, id, duration, EUt, data) => global.registerFoodRecipe(event, "food_processor", id, duration, EUt, "", data) + +/** +* @param {string} id +* @param {number} duration +* @param {number} EUt +* @param {FoodRecipeData} data +* @param {string} text +*/ +global.processorRecipeText = (event, id, duration, EUt, text, data) => global.registerFoodRecipe(event, "food_processor", id, duration, EUt, text, data) + +/** +* @param {string} id +* @param {string} input +* @param {string} out +* @param {Internal.FluidIngredient?} fluid +* @param {boolean?} isFirmaDynamic +*/ +global.cookingRecipe = (event, id, input, out, fluid, isFirmaDynamic) => { + return global.registerFoodRecipe(event, "food_oven", id, 20 * 10, GTValues.VA[GTValues.LV], "", { + itemInputs: [input], + itemOutputs: [out], + fluidInputs: (fluid === undefined) ? [] : [fluid], + itemOutputProvider: ((isFirmaDynamic) ? TFC.isp.of(out).firmaLifeCopyDynamicFood() : TFC.isp.of(out).copyFood()).addTrait("firmalife:oven_baked") + }) +} + +//#endregion + + /** * @param {Internal.RecipesEventJS} event */ function registerTFGFoodRecipes(event) { - const $ISPRecipeLogic = Java.loadClass("su.terrafirmagreg.core.common.data.tfgt.machine.trait.ISPOutputRecipeLogic") - const $SizedIngredient = Java.loadClass("com.gregtechceu.gtceu.api.recipe.ingredient.SizedIngredient") - const Sized = (ing, amount) => $SizedIngredient.create(ing, amount) - - /** - * @typedef {Object} FoodRecipeData - * @property {number?} circuit - * @property {Internal.GTRecipeComponents$FluidIngredientJS_[]?} fluidInputs - * @property {Internal.FluidStackJS[]?} fluidOutputs - * @property {(string | [string, Internal.Ingredient])[]?} itemInputs - * @property {string[]?} itemOutputs Ingredient outputs - first output is replaced with ISP output if defined - * @property {Internal.ItemStackProviderJS?} itemOutputProvider ItemStackProvider which provides the recipe output. - * @property {boolean?} daytime - * @property {boolean?} perTick - * @property {(string | [string, Internal.GTRecipeSchema$GTRecipeJS.dimension])?} dimension - * @property {Internal.GTRecipeSchema$GTRecipeJS.cleanroom?} cleanroom CleanroomType - * @property {string[]?} notConsumable - * - * **NOTE:** TFC Ingredients do not support item counts higher than 1. Do `Sized(TFCIngredient('item:item'), count)` instead of `TFCIngredient('[count]x item:item')` - */ - - //#region Helper funcs - - /** - * @param {"food_oven"|"food_processor"} type - * @param {string} id - * @param {number} duration - * @param {number} EUt - * @param {string} text - * @param {FoodRecipeData} data - */ - function registerFoodRecipe(type, id, duration, EUt, text, data) { - if (data.itemInputs === undefined) data.itemInputs = [] - if (data.itemOutputs === undefined) data.itemOutputs = [] - if (data.fluidInputs === undefined) data.fluidInputs = [] - if (data.fluidOutputs === undefined) data.fluidOutputs = [] - if (data.notConsumable === undefined) data.notConsumable = [] - let gregInputs = [], inputs = [] - let outputFirstIndex = (data.itemOutputProvider === undefined) ? 0 : 1 - data.itemInputs.forEach(item => { - if (typeof item === "string") { - gregInputs.push(item) - - const match = item.match(/^(\d+)\s*x\s*/i); - let count = 1 - if (match) { - count = parseInt(match[1]); - item = item.slice(match[0].length); - } - inputs.push($SizedIngredient.create(item, count)) - } else { - gregInputs.push(item[0]) - inputs.push(item[1]) - } - }) - - $ISPRecipeLogic.RegisterRecipeData(`${type }/${ id}`, inputs, (data.itemOutputProvider === undefined) ? null : data.itemOutputProvider.asCanonClass(), data.itemOutputs.slice(outputFirstIndex).map(i => Item.of(i))) - - let r = event.recipes.gtceu[type](id) - .duration(duration) - .EUt(EUt) - - if (data.circuit) r.circuit(data.circuit) - if (data.daytime) r.daytime(data.daytime) - if (data.perTick) r.perTick(data.perTick) - if (data.dimension) r.dimension(data.dimension) - if (data.cleanroom) r.cleanroom(data.cleanroom) - if (data.notConsumable.length > 0) r.notConsumable(data.notConsumable) - if (data.itemOutputs.length > 0) r.itemOutputs(data.itemOutputs) - if (data.itemInputs.length > 0) r.itemInputs(data.itemInputs) - if (data.fluidInputs.length > 0) r.inputFluids(data.fluidInputs); - if (data.fluidOutputs.length > 0) r.outputFluids(data.fluidOutputs); - if (text !== "") r.addDataString("action", text); - - return r; - } - - /** - * @param {string} id - * @param {number} duration - * @param {number} EUt - * @param {FoodRecipeData} data - */ - const processorRecipe = (id, duration, EUt, data) => registerFoodRecipe("food_processor", id, duration, EUt, "", data) - - /** - * @param {string} id - * @param {number} duration - * @param {number} EUt - * @param {FoodRecipeData} data - * @param {string} text - */ - const processorRecipeText = (id, duration, EUt, text, data) => registerFoodRecipe("food_processor", id, duration, EUt, text, data) - - /** - * @param {string} id - * @param {string} input - * @param {string} out - * @param {Internal.FluidIngredient?} fluid - * @param {boolean?} isFirmaDynamic - */ - function cookingRecipe(id, input, out, fluid, isFirmaDynamic) { - return registerFoodRecipe("food_oven", id, 20 * 10, GTValues.VA[GTValues.LV], "", { - itemInputs: [input], - itemOutputs: [out], - fluidInputs: (fluid === undefined) ? [] : [fluid], - itemOutputProvider: ((isFirmaDynamic) ? TFC.isp.of(out).firmaLifeCopyDynamicFood() : TFC.isp.of(out).copyFood()).addTrait("firmalife:oven_baked") - }) - } - - //#endregion - //#region Meat cooking global.TFC_MEAT_RECIPE_COMPONENTS.forEach(item => { - cookingRecipe(item.name, item.input, item.output) + global.cookingRecipe(event, item.name, item.input, item.output) }) //#endregion @@ -130,7 +131,7 @@ function registerTFGFoodRecipes(event) { global.TFC_GRAINS.forEach(grain => { // Raw crop to grain - processorRecipe(`${grain}_grain`, 100, 8, { + global.processorRecipe(event, `${grain}_grain`, 100, 8, { circuit: 30, itemInputs: [`tfc:food/${grain}`], itemOutputs: [`tfc:food/${grain}_grain`], @@ -138,7 +139,7 @@ function registerTFGFoodRecipes(event) { }) // Grain to flour - processorRecipe(`${grain}_flour`, 100, 8, { + global.processorRecipe(event, `${grain}_flour`, 100, 8, { circuit: 31, itemInputs: [`tfc:food/${grain}_grain`], itemOutputs: [`2x tfc:food/${grain}_flour`], @@ -155,7 +156,7 @@ function registerTFGFoodRecipes(event) { }, 0, 0).id(`tfg:mortar/${grain}_flour`) // Flatbread dough - processorRecipe(`${grain}_flatbread_dough`, 300, 8, { + global.processorRecipe(event, `${grain}_flatbread_dough`, 300, 8, { itemInputs: [`tfc:food/${grain}_flour`], itemOutputs: [`2x tfc:food/${grain}_dough`], circuit: 1, @@ -164,7 +165,7 @@ function registerTFGFoodRecipes(event) { }) // Firmalife dough - processorRecipe(`${grain}_dough`, 300, 16, { + global.processorRecipe(event, `${grain}_dough`, 300, 16, { itemInputs: [`tfc:food/${grain}_flour`, `#tfc:sweetener`], itemOutputs: [`4x firmalife:food/${grain}_dough`], circuit: 1, @@ -173,10 +174,10 @@ function registerTFGFoodRecipes(event) { }) // Bread baking - cookingRecipe(`${grain}_flatbread`, `tfc:food/${grain}_dough`, `firmalife:food/${grain}_flatbread`) - cookingRecipe(`${grain}_bread`, `firmalife:food/${grain}_dough`, `tfc:food/${grain}_bread`) + global.cookingRecipe(event, `${grain}_flatbread`, `tfc:food/${grain}_dough`, `firmalife:food/${grain}_flatbread`) + global.cookingRecipe(event, `${grain}_bread`, `firmalife:food/${grain}_dough`, `tfc:food/${grain}_bread`) - processorRecipe(`${grain}_bread_slice`, 10, 8, { + global.processorRecipe(event, `${grain}_bread_slice`, 10, 8, { circuit: 1, itemInputs: [`tfc:food/${grain}_bread`], itemOutputs: [`2x firmalife:food/${grain}_slice`], @@ -187,7 +188,7 @@ function registerTFGFoodRecipes(event) { let breadTypes = [["bread", `tfc:food/${grain}_bread`], ["flatbread", `firmalife:food/${grain}_flatbread`], ["slice", `firmalife:food/${grain}_slice`]] breadTypes.forEach((type) => { - processorRecipe(`${grain}_${type[0]}_sandwich`, 100, 16, { + global.processorRecipe(event, `${grain}_${type[0]}_sandwich`, 100, 16, { circuit: 3, itemInputs: [`2x ${type[1]}`, "3x #tfc:foods/usable_in_sandwich"], itemOutputs: [`2x tfc:food/${grain}_bread_sandwich`], @@ -200,7 +201,7 @@ function registerTFGFoodRecipes(event) { //Note: Jam needs to be first in the recipe code or else it will consider it as the usable_in_jam_sandwhich ingredients. //1 Jam - processorRecipe(`${grain}_${type[0]}_jam_sandwich_1`, 100, 16, { + global.processorRecipe(event, `${grain}_${type[0]}_jam_sandwich_1`, 100, 16, { circuit: 4, itemInputs: [`2x ${type[1]}`, '#tfc:foods/preserves', '2x #tfc:foods/usable_in_jam_sandwich_2'], itemOutputs: [`2x tfc:food/${grain}_bread_jam_sandwich`, 'tfc:empty_jar'], @@ -212,7 +213,7 @@ function registerTFGFoodRecipes(event) { }) //2 Jam - processorRecipe(`${grain}_${type[0]}_jam_sandwich_2`, 100, 16, { + global.processorRecipe(event, `${grain}_${type[0]}_jam_sandwich_2`, 100, 16, { circuit: 4, itemInputs: [`2x ${type[1]}`, '2x #tfc:foods/preserves', '1x #tfc:foods/usable_in_jam_sandwich_2'], itemOutputs: [`2x tfc:food/${grain}_bread_jam_sandwich`, '2x tfc:empty_jar'], @@ -224,7 +225,7 @@ function registerTFGFoodRecipes(event) { }) //3 Jam - processorRecipe(`${grain}_${type[0]}_jam_sandwich_3`, 100, 16, { + global.processorRecipe(event, `${grain}_${type[0]}_jam_sandwich_3`, 100, 16, { circuit: 4, itemInputs: [`2x ${type[1]}`, '3x #tfc:foods/preserves'], itemOutputs: [`2x tfc:food/${grain}_bread_jam_sandwich`, '3x tfc:empty_jar'], @@ -244,11 +245,11 @@ function registerTFGFoodRecipes(event) { //#region Firmalife global.FIRMALIFE_COOKING_RECIPE_COMPONENTS.forEach(item => { - cookingRecipe(item.name, item.input, item.output, undefined, true) + global.cookingRecipe(event, item.name, item.input, item.output, undefined, true) }) // Pineapple fiber - processorRecipe("firmalife:crafting/pineapple_fiber", 300, 16, { + global.processorRecipe(event, "firmalife:crafting/pineapple_fiber", 300, 16, { circuit: 3, itemInputs: ["firmalife:food/pineapple"], fluidInputs: [Fluid.of('gtceu:nitrogen', 100)], @@ -275,20 +276,20 @@ function registerTFGFoodRecipes(event) { .duration(300) .EUt(GTValues.VA[GTValues.LV]) - processorRecipe(`${item.id}_curd`, 1200, 16, { + global.processorRecipe(event, `${item.id}_curd`, 1200, 16, { itemOutputs: [item.curd], fluidInputs: [Fluid.of(item.curdled_fluid, 1000)], itemOutputProvider: TFC.isp.of(item.curd).resetFood() }) - processorRecipe(`${item.id}_unsalted_cheese_wheel`, 8000, 16, { + global.processorRecipe(event, `${item.id}_unsalted_cheese_wheel`, 8000, 16, { itemInputs: [`3x ${item.curd}`], itemOutputs: [item.unsalted_wheel], fluidInputs: [Fluid.of('tfc:salt_water', 750)], itemOutputProvider: TFC.isp.of(item.unsalted_wheel).copyOldestFood() }) - processorRecipe(`${item.id}_unsalted_cheese_cutting`, 100, 8, { + global.processorRecipe(event, `${item.id}_unsalted_cheese_cutting`, 100, 8, { itemInputs: [item.unsalted_wheel], itemOutputs: [`4x ${item.unsalted_cheese}`], itemOutputProvider: TFC.isp.of(`4x ${item.unsalted_cheese}`).copyOldestFood() @@ -297,14 +298,14 @@ function registerTFGFoodRecipes(event) { if (item.salted_wheel === null || item.salted_cheese === null) return; - processorRecipe(`${item.id}_salted_cheese_wheel`, 1000, 16, { + global.processorRecipe(event, `${item.id}_salted_cheese_wheel`, 1000, 16, { circuit: 2, itemInputs: [`3x ${item.curd}`, `6x tfc:powder/salt`], itemOutputs: [item.salted_wheel], itemOutputProvider: TFC.isp.of(item.salted_wheel).copyOldestFood() }) - processorRecipe(`${item.id}_salted_cheese_cutting`, 100, 8, { + global.processorRecipe(event, `${item.id}_salted_cheese_cutting`, 100, 8, { itemInputs: [item.salted_wheel], itemOutputs: [`4x ${item.salted_cheese}`], itemOutputProvider: TFC.isp.of(`4x ${item.salted_cheese}`).copyOldestFood() @@ -313,7 +314,7 @@ function registerTFGFoodRecipes(event) { // Milks - processorRecipe(`white_chocolate_blend`, 300, 16, { + global.processorRecipe(event, `white_chocolate_blend`, 300, 16, { circuit: 3, itemInputs: ['2x firmalife:food/cocoa_butter', '#tfc:sweetener'], fluidInputs: ['#tfc:milks 1000'], @@ -321,7 +322,7 @@ function registerTFGFoodRecipes(event) { itemOutputProvider: TFC.isp.of('2x firmalife:food/white_chocolate_blend').resetFood() }) - processorRecipe(`dark_chocolate_blend`, 300, 16, { + global.processorRecipe(event, `dark_chocolate_blend`, 300, 16, { circuit: 2, itemInputs: ['2x firmalife:food/cocoa_powder', '#tfc:sweetener'], fluidInputs: ['#tfc:milks 1000'], @@ -329,7 +330,7 @@ function registerTFGFoodRecipes(event) { itemOutputProvider: TFC.isp.of('2x firmalife:food/dark_chocolate_blend').resetFood() }) - processorRecipe(`milk_chocolate_blend`, 300, 16, { + global.processorRecipe(event, `milk_chocolate_blend`, 300, 16, { circuit: 1, itemInputs: ['firmalife:food/cocoa_powder', 'firmalife:food/cocoa_butter', '#tfc:sweetener'], fluidInputs: ['#tfc:milks 1000'], @@ -338,7 +339,7 @@ function registerTFGFoodRecipes(event) { }) // TODO: this has nutrition dynamically set in the pot recipe, can we do that here? - processorRecipe(`egg_noodles`, 50, 8, { + global.processorRecipe(event, `egg_noodles`, 50, 8, { circuit: 6, itemInputs: ["#tfc:foods/flour", 'tfc:powder/salt', '#forge:eggs'], fluidInputs: ['#tfc:milks 1000'], @@ -346,7 +347,7 @@ function registerTFGFoodRecipes(event) { itemOutputProvider: TFC.isp.of("firmalife:food/raw_egg_noodles").copyOldestFood() }) - processorRecipe(`rice_noodles`, 50, 8, { + global.processorRecipe(event, `rice_noodles`, 50, 8, { itemInputs: ["tfc:food/rice_flour", 'tfc:food/maize_flour', 'tfc:powder/salt'], fluidInputs: ['#tfc:milks 1000'], itemOutputs: ['2x firmalife:food/raw_rice_noodles'], @@ -370,7 +371,7 @@ function registerTFGFoodRecipes(event) { for (const ctype of chocolateType) { for (const cshape of chocolateShape) { - processorRecipe(`${ctype}_${cshape}_melting`, 100, 16, { + global.processorRecipe(event, `${ctype}_${cshape}_melting`, 100, 16, { circuit: 1, itemInputs:[cshape == "" ? `firmalife:food/${ctype}` : `tfcchannelcasting:food/${ctype}${cshape}`], fluidOutputs:[cshape == "" ? Fluid.of(`tfcchannelcasting:${ctype}`, 144) : Fluid.of(`tfcchannelcasting:${ctype}`, 100)], @@ -380,7 +381,7 @@ function registerTFGFoodRecipes(event) { for (const ctype of chocolateType) { for (const cshape of chocolateShape) { - processorRecipe(`${ctype}_${cshape}_casting`, 100, 16, { + global.processorRecipe(event, `${ctype}_${cshape}_casting`, 100, 16, { fluidInputs: [cshape == "" ? Fluid.of(`tfcchannelcasting:${ctype}`, 144) : Fluid.of(`tfcchannelcasting:${ctype}`, 100)], itemOutputs: [cshape == "" ? `firmalife:food/${ctype}` : `tfcchannelcasting:food/${ctype}${cshape}`], itemOutputProvider: TFC.isp.of(cshape == "" ? `firmalife:food/${ctype}` : `tfcchannelcasting:food/${ctype}${cshape}`).resetFood(), @@ -410,7 +411,7 @@ function registerTFGFoodRecipes(event) { const brining_ingredients = smoking_meats.concat(brining_veg); brining_ingredients.forEach(item => { - processorRecipeText(`${item.replace(/:/g, "/")}/brining`, 200, 16, "tfg.food_recipe.brining", { + global.processorRecipeText(event, `${item.replace(/:/g, "/")}/brining`, 200, 16, "tfg.food_recipe.brining", { circuit: 5, itemInputs: [item], itemOutputs: [item], @@ -420,7 +421,7 @@ function registerTFGFoodRecipes(event) { }) smoking_meats.forEach(item => { - processorRecipeText(`${item.replace(/:/g, "/")}/smoking`, 200, 16, "tfg.food_recipe.smoking", { + global.processorRecipeText(event, `${item.replace(/:/g, "/")}/smoking`, 200, 16, "tfg.food_recipe.smoking", { circuit: 6, itemInputs: [item], itemOutputs: [item], @@ -430,7 +431,7 @@ function registerTFGFoodRecipes(event) { }) smoking_cheese.forEach(item => { - processorRecipeText(`${item.replace(/:/g, "/")}/smoking`, 200, 16, "tfg.food_recipe.smoking", { + global.processorRecipeText(event, `${item.replace(/:/g, "/")}/smoking`, 200, 16, "tfg.food_recipe.smoking", { circuit: 6, itemInputs: [item], itemOutputs: [item], @@ -440,7 +441,7 @@ function registerTFGFoodRecipes(event) { }) drying_fruits.forEach(item => { - processorRecipeText(`${item.replace(/:/g, "/")}/drying`, 200, 16, "tfg.food_recipe.drying", { + global.processorRecipeText(event, `${item.replace(/:/g, "/")}/drying`, 200, 16, "tfg.food_recipe.drying", { circuit: 6, itemInputs: [item], itemOutputs: [item], @@ -450,7 +451,7 @@ function registerTFGFoodRecipes(event) { }) drying_recipes.forEach(item => { - processorRecipeText(`${item.input.replace(/:/g, "/")}/drying`, 200, 16, "tfg.food_recipe.drying", { + global.processorRecipeText(event, `${item.input.replace(/:/g, "/")}/drying`, 200, 16, "tfg.food_recipe.drying", { circuit: 6, itemInputs: [item.input], itemOutputs: [item.output], @@ -460,7 +461,7 @@ function registerTFGFoodRecipes(event) { }) global.FOOD_FRUIT.forEach(fruit => { - processorRecipeText(`${fruit.name}/drying`, 100, 120, "tfg.food_recipe.freeze_drying", { + global.processorRecipeText(event, `${fruit.name}/drying`, 100, 120, "tfg.food_recipe.freeze_drying", { circuit: 7, itemInputs: [fruit.id, 'tfg:foil_pack', 'tfg:dry_ice'], itemOutputs: [`tfg:food/freeze_dried/${fruit.name}`], @@ -472,7 +473,7 @@ function registerTFGFoodRecipes(event) { //#region Meal Bags //1 Input - processorRecipeText('meal_bag/1', 100, 120, "tfg.food_recipe.freeze_drying", { + global.processorRecipeText(event, 'meal_bag/1', 100, 120, "tfg.food_recipe.freeze_drying", { circuit: 10, itemInputs: ['1x #tfg:foods/usable_in_meal_bag', '2x tfg:foil_pack', 'tfg:dry_ice'], itemOutputs: ['2x tfg:food/meal_bag'], @@ -483,7 +484,7 @@ function registerTFGFoodRecipes(event) { }) //2 Input - processorRecipeText('meal_bag/2', 100, 120, "tfg.food_recipe.freeze_drying", { + global.processorRecipeText(event, 'meal_bag/2', 100, 120, "tfg.food_recipe.freeze_drying", { circuit: 11, itemInputs: ['2x #tfg:foods/usable_in_meal_bag', '2x tfg:foil_pack', 'tfg:dry_ice'], itemOutputs: ['2x tfg:food/meal_bag'], @@ -494,7 +495,7 @@ function registerTFGFoodRecipes(event) { }) //3 Input - processorRecipeText('meal_bag/3', 100, 120, "tfg.food_recipe.freeze_drying", { + global.processorRecipeText(event, 'meal_bag/3', 100, 120, "tfg.food_recipe.freeze_drying", { circuit: 12, itemInputs: ['3x #tfg:foods/usable_in_meal_bag', '2x tfg:foil_pack', 'tfg:dry_ice'], itemOutputs: ['2x tfg:food/meal_bag'], @@ -505,7 +506,7 @@ function registerTFGFoodRecipes(event) { }) //4 Input - processorRecipeText('meal_bag/4', 100, 120, "tfg.food_recipe.freeze_drying", { + global.processorRecipeText(event, 'meal_bag/4', 100, 120, "tfg.food_recipe.freeze_drying", { circuit: 13, itemInputs: ['4x #tfg:foods/usable_in_meal_bag', '2x tfg:foil_pack', 'tfg:dry_ice'], itemOutputs: ['2x tfg:food/meal_bag'], @@ -516,7 +517,7 @@ function registerTFGFoodRecipes(event) { }) //5 Input - processorRecipeText('meal_bag/5', 100, 120, "tfg.food_recipe.freeze_drying", { + global.processorRecipeText(event, 'meal_bag/5', 100, 120, "tfg.food_recipe.freeze_drying", { circuit: 14, itemInputs: ['5x #tfg:foods/usable_in_meal_bag', '2x tfg:foil_pack', 'tfg:dry_ice'], itemOutputs: ['2x tfg:food/meal_bag'], @@ -531,7 +532,7 @@ function registerTFGFoodRecipes(event) { //#region Jams global.TFC_JAMS.forEach(name => { - processorRecipe(`${name}_jam`, 200, 8, { + global.processorRecipe(event, `${name}_jam`, 200, 8, { circuit: 15, itemInputs: [`4x tfc:food/${name}`, "#tfc:sweetener", "4x #tfc:empty_jar_with_lid"], fluidInputs: ['#tfg:clean_water 100'], @@ -539,7 +540,7 @@ function registerTFGFoodRecipes(event) { itemOutputProvider: TFC.isp.of(`4x tfc:jar/${name}`).copyFood() }) - processorRecipe(`${name}_jam_no_seal`, 200, 8, { + global.processorRecipe(event, `${name}_jam_no_seal`, 200, 8, { circuit: 16, itemInputs: [`4x tfc:food/${name}`, "#tfc:sweetener", "4x tfc:empty_jar"], fluidInputs: ['#tfg:clean_water 100'], @@ -549,7 +550,7 @@ function registerTFGFoodRecipes(event) { }) global.FIRMALIFE_JAMS.forEach(name => { - processorRecipe(`${name}_jam`, 200, 8, { + global.processorRecipe(event, `${name}_jam`, 200, 8, { circuit: 15, itemInputs: [`4x firmalife:food/${name}`, "#tfc:sweetener", "4x #tfc:empty_jar_with_lid"], fluidInputs: ['#tfg:clean_water 100'], @@ -557,7 +558,7 @@ function registerTFGFoodRecipes(event) { itemOutputProvider: TFC.isp.of(`4x firmalife:jar/${name}`).copyFood() }) - processorRecipe(`${name}_jam_no_seal`, 200, 8, { + global.processorRecipe(event, `${name}_jam_no_seal`, 200, 8, { circuit: 16, itemInputs: [`4x firmalife:food/${name}`, "#tfc:sweetener", "4x tfc:empty_jar"], fluidInputs: ['#tfg:clean_water 100'], @@ -569,21 +570,21 @@ function registerTFGFoodRecipes(event) { //#endregion //#region Misc - cookingRecipe("pasta", "firmalife:food/raw_egg_noodles", "firmalife:food/cooked_pasta", "#tfg:clean_water 100") + global.cookingRecipe(event, "pasta", "firmalife:food/raw_egg_noodles", "firmalife:food/cooked_pasta", "#tfg:clean_water 100") - cookingRecipe("corn_tortilla", "firmalife:food/masa", "firmalife:food/corn_tortilla") + global.cookingRecipe(event, "corn_tortilla", "firmalife:food/masa", "firmalife:food/corn_tortilla") - cookingRecipe("baked_potato", "tfc:food/potato", "tfc:food/baked_potato") + global.cookingRecipe(event, "baked_potato", "tfc:food/potato", "tfc:food/baked_potato") - cookingRecipe("cooked_rice", "tfc:food/rice_grain", "tfc:food/cooked_rice", "#tfg:clean_water 200") + global.cookingRecipe(event, "cooked_rice", "tfc:food/rice_grain", "tfc:food/cooked_rice", "#tfg:clean_water 200") - processorRecipe("pasta_tomato_sauce", 60, 8, { + global.processorRecipe(event, "pasta_tomato_sauce", 60, 8, { itemInputs: ["firmalife:food/cooked_pasta", "firmalife:food/tomato_sauce"], itemOutputs: ["firmalife:food/pasta_with_tomato_sauce"], itemOutputProvider: TFC.isp.of('firmalife:food/pasta_with_tomato_sauce').copyFood() }) - processorRecipe(`masa_flour`, 100, 8, { + global.processorRecipe(event, `masa_flour`, 100, 8, { circuit: 31, itemInputs: [`firmalife:food/nixtamal`], itemOutputs: [`4x firmalife:food/masa_flour`], @@ -608,7 +609,7 @@ function registerTFGFoodRecipes(event) { B: '#forge:tools/mortars' }, 0, 0).id(`tfg:mortar/olive_paste`) - processorRecipe('firmalife_masa', 300, 2, { + global.processorRecipe(event, 'firmalife_masa', 300, 2, { circuit: 3, itemInputs: ["firmalife:food/masa_flour"], fluidInputs: ['#tfg:clean_water 100'], @@ -616,13 +617,13 @@ function registerTFGFoodRecipes(event) { itemOutputProvider: TFC.isp.of("2x firmalife:food/masa").copyFood() }) - processorRecipe("tortilla_chips", 40, 16, { + global.processorRecipe(event, "tortilla_chips", 40, 16, { itemInputs: ["firmalife:food/taco_shell", "tfc:powder/salt"], itemOutputs: ["firmalife:food/tortilla_chips"], itemOutputProvider: TFC.isp.of("firmalife:food/tortilla_chips").copyFood() }) - processorRecipe("tomato_sauce", 300, 8, { + global.processorRecipe(event, "tomato_sauce", 300, 8, { circuit: 1, itemInputs: ['tfc:food/tomato', 'tfc:powder/salt', 'tfc:food/garlic'], fluidInputs: ['#tfg:clean_water 200'], @@ -630,34 +631,34 @@ function registerTFGFoodRecipes(event) { itemOutputProvider: TFC.isp.of('5x firmalife:food/tomato_sauce').copyOldestFood() }) - processorRecipe("tomato_sauce_mix", 600, 8, { + global.processorRecipe(event, "tomato_sauce_mix", 600, 8, { circuit: 2, itemInputs: ['tfc:food/tomato', 'tfc:powder/salt', 'tfc:food/garlic'], itemOutputs: ['5x firmalife:food/tomato_sauce_mix'], itemOutputProvider: TFC.isp.of('5x firmalife:food/tomato_sauce_mix').copyOldestFood() }) - processorRecipe("tomato_sauce_from_mix", 200, 8, { + global.processorRecipe(event, "tomato_sauce_from_mix", 200, 8, { itemInputs: ['firmalife:food/tomato_sauce_mix'], fluidInputs: ['#tfg:clean_water 200'], itemOutputs: ['firmalife:food/tomato_sauce'], itemOutputProvider: TFC.isp.of('firmalife:food/tomato_sauce').copyOldestFood() }) - processorRecipe("olive_paste", 60, 8, { + global.processorRecipe(event, "olive_paste", 60, 8, { itemInputs: ['tfc:food/olive'], itemOutputs: ['2x tfc:olive_paste'], itemOutputProvider: TFC.isp.of('2x tfc:olive_paste'), circuit: 3 }) - processorRecipe("soybean_paste", 60, 8, { + global.processorRecipe(event, "soybean_paste", 60, 8, { itemInputs: ['firmalife:food/dehydrated_soybeans'], itemOutputs: ['firmalife:food/soybean_paste'], itemOutputProvider: TFC.isp.of('firmalife:food/soybean_paste').copyOldestFood() }) - processorRecipeText('calorie_paste', 100, 512, "tfg.food_recipe.freeze_drying", { + global.processorRecipeText(event, 'calorie_paste', 100, 512, "tfg.food_recipe.freeze_drying", { circuit: 8, itemInputs: ['firmalife:food/soybean_paste', 'tfg:foil_pack', '2x gtceu:small_meat_dust', 'tfg:dry_ice'], itemOutputs: ['tfg:food/calorie_paste'], @@ -665,7 +666,7 @@ function registerTFGFoodRecipes(event) { itemOutputProvider: TFC.isp.of('tfg:food/calorie_paste').copyOldestFood().addTrait('tfg:freeze_dried') }) - processorRecipe("boiled_egg", 200, 16, { + global.processorRecipe(event, "boiled_egg", 200, 16, { circuit: 1, itemInputs: ["#firmalife:foods/raw_eggs"], fluidInputs: ["#tfg:clean_water 200"], @@ -674,16 +675,16 @@ function registerTFGFoodRecipes(event) { }) //Kelp - cookingRecipe("dried_kelp_a", "tfc:plant/winged_kelp", "tfc:food/dried_kelp") - cookingRecipe("dried_kelp_b", "tfc:plant/leafy_kelp", "tfc:food/dried_kelp") - cookingRecipe("dried_kelp_c", "tfc:plant/giant_kelp_flower", "tfc:food/dried_kelp") + global.cookingRecipe(event, "dried_kelp_a", "tfc:plant/winged_kelp", "tfc:food/dried_kelp") + global.cookingRecipe(event, "dried_kelp_b", "tfc:plant/leafy_kelp", "tfc:food/dried_kelp") + global.cookingRecipe(event, "dried_kelp_c", "tfc:plant/giant_kelp_flower", "tfc:food/dried_kelp") //Seaweed - cookingRecipe("dried_seaweed_a", "tfc:food/fresh_seaweed", "tfc:food/dried_seaweed") - cookingRecipe("dried_seaweed_b", "tfc:groundcover/seaweed", "tfc:food/dried_seaweed") + global.cookingRecipe(event, "dried_seaweed_a", "tfc:food/fresh_seaweed", "tfc:food/dried_seaweed") + global.cookingRecipe(event, "dried_seaweed_b", "tfc:groundcover/seaweed", "tfc:food/dried_seaweed") // Vinegar - processorRecipe('vinegar_alcohol', 600, GTValues.VA[GTValues.LV], { + global.processorRecipe(event, 'vinegar_alcohol', 600, GTValues.VA[GTValues.LV], { circuit: 5, itemInputs: ['#tfc:foods/fruits'], fluidInputs: ['#tfg:alcohols 250'], @@ -692,7 +693,7 @@ function registerTFGFoodRecipes(event) { //#region Pizza - processorRecipe("pizza_no_extra", 600, 16, { + global.processorRecipe(event, "pizza_no_extra", 600, 16, { circuit: 3, itemInputs: ["firmalife:food/pizza_dough", "firmalife:food/tomato_sauce", "firmalife:food/shredded_cheese"], itemOutputs: ["firmalife:food/raw_pizza"], @@ -702,7 +703,7 @@ function registerTFGFoodRecipes(event) { ) }) - processorRecipe("pizza_1_extra", 600, GTValues.VHA[GTValues.MV], { + global.processorRecipe(event, "pizza_1_extra", 600, GTValues.VHA[GTValues.MV], { circuit: 1, itemInputs: ["firmalife:food/pizza_dough", "firmalife:food/tomato_sauce", "firmalife:food/shredded_cheese", "#firmalife:foods/pizza_ingredients"], itemOutputs: ["firmalife:food/raw_pizza"], @@ -712,7 +713,7 @@ function registerTFGFoodRecipes(event) { ) }) - processorRecipe("pizza_2_extra", 600, GTValues.VHA[GTValues.MV], { + global.processorRecipe(event, "pizza_2_extra", 600, GTValues.VHA[GTValues.MV], { circuit: 2, itemInputs: ["firmalife:food/pizza_dough", "firmalife:food/tomato_sauce", "firmalife:food/shredded_cheese", "2x #firmalife:foods/pizza_ingredients"], itemOutputs: ["firmalife:food/raw_pizza"], @@ -722,7 +723,7 @@ function registerTFGFoodRecipes(event) { ) }) - processorRecipe("pizza_dough", 300, 16, { + global.processorRecipe(event, "pizza_dough", 300, 16, { itemInputs: ['firmalife:spice/basil_leaves', '#tfc:foods/dough', 'tfc:powder/salt'], fluidInputs: ['#firmalife:oils 100'], itemOutputs: ['4x firmalife:food/pizza_dough'], @@ -731,14 +732,14 @@ function registerTFGFoodRecipes(event) { //#endregion - processorRecipe("shredded_cheese", 100, 16, { + global.processorRecipe(event, "shredded_cheese", 100, 16, { itemInputs: ['#firmalife:foods/cheeses'], itemOutputs: ['4x firmalife:food/shredded_cheese'], circuit: 30, itemOutputProvider: TFC.isp.of('4x firmalife:food/shredded_cheese').copyFood() }) - processorRecipe("basil", 20, 16, { + global.processorRecipe(event, "basil", 20, 16, { itemInputs: ['firmalife:plant/basil'], itemOutputs: ['2x firmalife:spice/basil_leaves'], circuit: 30, @@ -747,33 +748,33 @@ function registerTFGFoodRecipes(event) { //#region Ice cream - processorRecipe("vanilla_ice_cream", 300, 16, { + global.processorRecipe(event, "vanilla_ice_cream", 300, 16, { itemInputs: ['firmalife:ice_shavings', '#tfc:sweetener', 'firmalife:spice/vanilla'], itemOutputs: ['2x firmalife:food/vanilla_ice_cream'], fluidInputs: [Fluid.of('firmalife:cream', 1000)], itemOutputProvider: TFC.isp.of("2x firmalife:food/vanilla_ice_cream").resetFood() }) - processorRecipe("chocolate_ice_cream", 300, 16, { + global.processorRecipe(event, "chocolate_ice_cream", 300, 16, { itemInputs: ['firmalife:food/vanilla_ice_cream'], itemOutputs: ['firmalife:food/chocolate_ice_cream'], fluidInputs: [Fluid.of('tfcchannelcasting:milk_chocolate', 100)], itemOutputProvider: TFC.isp.of("firmalife:food/chocolate_ice_cream").resetFood() }) - processorRecipe("strawberry_ice_cream", 300, 16, { + global.processorRecipe(event, "strawberry_ice_cream", 300, 16, { itemInputs: ['firmalife:food/vanilla_ice_cream', '2x tfc:food/strawberry'], itemOutputs: ['firmalife:food/strawberry_ice_cream'], itemOutputProvider: TFC.isp.of("firmalife:food/strawberry_ice_cream").resetFood() }) - processorRecipe("cookie_dough_ice_cream", 300, 16, { + global.processorRecipe(event, "cookie_dough_ice_cream", 300, 16, { itemInputs: [`firmalife:food/vanilla_ice_cream`, `firmalife:food/chocolate_chip_cookie_dough`], itemOutputs: [`2x firmalife:food/cookie_dough_ice_cream`], itemOutputProvider: TFC.isp.of("firmalife:food/cookie_dough_ice_cream").resetFood() }) - processorRecipe("banana_split", 500, 16, { + global.processorRecipe(event, "banana_split", 500, 16, { itemInputs: ['firmalife:food/vanilla_ice_cream', 'firmalife:food/strawberry_ice_cream', 'firmalife:food/chocolate_ice_cream', 'firmalife:food/pineapple', 'tfc:food/cherry', '2x tfc:food/banana'], itemOutputs: ['2x firmalife:food/banana_split'], itemOutputProvider: TFC.isp.of('2x firmalife:food/banana_split').resetFood() @@ -781,14 +782,14 @@ function registerTFGFoodRecipes(event) { //#endregion - processorRecipe("butter", 300, 16, { + global.processorRecipe(event, "butter", 300, 16, { itemInputs: ["tfc:powder/salt"], fluidInputs: [Fluid.of('firmalife:cream', 1000)], itemOutputs: ["firmalife:food/butter"], itemOutputProvider: TFC.isp.of('firmalife:food/butter').resetFood() }) - processorRecipe("pie_dough", 300, 16, { + global.processorRecipe(event, "pie_dough", 300, 16, { circuit: 2, itemInputs: ['#tfc:sweetener', 'firmalife:food/butter', '#tfc:foods/flour'], fluidInputs: ['#tfg:clean_water 1000'], @@ -796,7 +797,7 @@ function registerTFGFoodRecipes(event) { itemOutputProvider: TFC.isp.of('firmalife:food/pie_dough').copyOldestFood() }) - processorRecipe("pumpkin_pie_dough", 300, 16, { + global.processorRecipe(event, "pumpkin_pie_dough", 300, 16, { circuit: 2, itemInputs: ['#tfc:sweetener', '#forge:eggs', '2x tfc:food/pumpkin_chunks', '#tfc:foods/flour'], fluidInputs: ['#tfg:clean_water 1000'], @@ -804,25 +805,25 @@ function registerTFGFoodRecipes(event) { itemOutputProvider: TFC.isp.of('firmalife:food/pumpkin_pie_dough').copyOldestFood() }) - processorRecipe("raw_pumpkin_pie", 20, 8, { + global.processorRecipe(event, "raw_pumpkin_pie", 20, 8, { itemInputs: ["firmalife:food/pumpkin_pie_dough", "#firmalife:pie_pans"], itemOutputs: ["firmalife:food/raw_pumpkin_pie"], itemOutputProvider: TFC.isp.of("firmalife:food/raw_pumpkin_pie").copyFood() }) - processorRecipe("cookie_dough", 300, 16, { + global.processorRecipe(event, "cookie_dough", 300, 16, { itemInputs: ['#tfc:sweetener', '#forge:eggs', 'firmalife:food/butter', '#tfc:foods/flour', "firmalife:spice/vanilla"], itemOutputs: ['4x firmalife:food/cookie_dough'], itemOutputProvider: TFC.isp.of('4x firmalife:food/cookie_dough').copyOldestFood() }) - processorRecipe("chocolate_chip_cookie_dough", 300, 16, { + global.processorRecipe(event, "chocolate_chip_cookie_dough", 300, 16, { itemInputs: ['4x firmalife:food/cookie_dough', '#firmalife:foods/chocolate'], itemOutputs: ['4x firmalife:food/chocolate_chip_cookie_dough'], itemOutputProvider: TFC.isp.of('4x firmalife:food/chocolate_chip_cookie_dough').copyOldestFood() }) - processorRecipe("hardtack_dough", 300, 16, { + global.processorRecipe(event, "hardtack_dough", 300, 16, { itemInputs: ['tfc:powder/salt', '#tfc:foods/flour'], fluidInputs: ['#tfg:clean_water 1000'], itemOutputs: ['4x firmalife:food/hardtack_dough'], @@ -830,47 +831,47 @@ function registerTFGFoodRecipes(event) { itemOutputProvider: TFC.isp.of('4x firmalife:food/hardtack_dough').copyFood() }) - processorRecipe("yeast_starter", 1200, 8, { + global.processorRecipe(event, "yeast_starter", 1200, 8, { circuit: 2, fluidInputs: [Fluid.of('firmalife:yeast_starter', 100)], fluidOutputs: [Fluid.of('firmalife:yeast_starter', 600)], itemInputs: ['#tfc:foods/flour'] }) - processorRecipe("yeast_starter_from_water", 7200, 8, { + global.processorRecipe(event, "yeast_starter_from_water", 7200, 8, { circuit: 10, itemInputs: ['#tfc:foods/fruits'], - fluidInputs: ['#tfg:clean_water 100'], + fluidInputs: ['#tfg:clean_water 100', 'gtceu:nitrogen 100'], fluidOutputs: [Fluid.of('firmalife:yeast_starter', 100)] }) - processorRecipe("cocoa_dust", 100, 4, { + global.processorRecipe(event, "cocoa_dust", 100, 4, { circuit: 1, itemInputs: ["firmalife:food/roasted_cocoa_beans"], itemOutputs: ["gtceu:cocoa_dust"], itemOutputProvider: TFC.isp.of("gtceu:cocoa_dust") }) - processorRecipe("cocoa_butter", 100, 4, { + global.processorRecipe(event, "cocoa_butter", 100, 4, { circuit: 2, itemInputs: ["firmalife:food/roasted_cocoa_beans"], itemOutputs: ["firmalife:food/cocoa_butter"], itemOutputProvider: TFC.isp.of("firmalife:food/cocoa_butter") }) - processorRecipe("red_grapes", 50, 8, { + global.processorRecipe(event, "red_grapes", 50, 8, { itemInputs: ["firmalife:food/red_grapes"], itemOutputs: ["firmalife:food/smashed_red_grapes"], itemOutputProvider: TFC.isp.of('firmalife:food/smashed_red_grapes').copyFood() }) - processorRecipe("white_grapes", 50, 8, { + global.processorRecipe(event, "white_grapes", 50, 8, { itemInputs: ["firmalife:food/white_grapes"], itemOutputs: ["firmalife:food/smashed_white_grapes"], itemOutputProvider: TFC.isp.of('firmalife:food/smashed_white_grapes').copyFood() }) - processorRecipe("cured_maize", 300, 8, { + global.processorRecipe(event, "cured_maize", 300, 8, { circuit: 1, itemInputs: ["tfc:food/maize_grain"], inputFluids: [Fluid.of('tfc:limewater', 100)], @@ -878,7 +879,7 @@ function registerTFGFoodRecipes(event) { itemOutputProvider: TFC.isp.of('firmalife:food/cured_maize').copyFood() }) - processorRecipe("soy_mixture", 300, 8, { + global.processorRecipe(event, "soy_mixture", 300, 8, { circuit: 1, itemInputs: ["tfc:food/soybean", 'tfc:powder/salt'], fluidInputs: ['#tfg:clean_water 50'], @@ -886,56 +887,61 @@ function registerTFGFoodRecipes(event) { itemOutputProvider: TFC.isp.of('firmalife:food/soy_mixture').copyFood() }) - processorRecipe("brown_mushroom", 100, 8, { + global.processorRecipe(event, "brown_mushroom", 100, 8, { circuit: 30, itemInputs: ["minecraft:brown_mushroom_block"], itemOutputs: ["4x minecraft:brown_mushroom"], itemOutputProvider: TFC.isp.of("4x minecraft:brown_mushroom").resetFood() }) - processorRecipe("red_mushroom", 100, 8, { + global.processorRecipe(event, "red_mushroom", 100, 8, { circuit: 30, itemInputs: ["minecraft:red_mushroom_block"], itemOutputs: ["4x minecraft:red_mushroom"], itemOutputProvider: TFC.isp.of("4x minecraft:red_mushroom").resetFood() }) - processorRecipe("cut_pumpkin", 100, 8, { + global.processorRecipe(event, "cut_pumpkin", 100, 8, { circuit: 30, itemInputs: ["tfc:pumpkin"], itemOutputs: ["4x tfc:food/pumpkin_chunks"], itemOutputProvider: TFC.isp.of("4x tfc:food/pumpkin_chunks").copyFood() }) - processorRecipe("cut_melon", 100, 8, { + global.processorRecipe(event, "cut_melon", 100, 8, { circuit: 30, itemInputs: ["tfc:melon"], itemOutputs: ["4x tfc:food/melon_slice"], itemOutputProvider: TFC.isp.of("4x tfc:food/melon_slice").copyFood() }) - processorRecipe("salsa", 300, 8, { + global.processorRecipe(event, "salsa", 300, 8, { circuit: 1, itemInputs: ['tfc:food/tomato', 'tfc:powder/salt', 'tfg:spice/cilantro_leaves'], itemOutputs: ['5x firmalife:food/salsa'], itemOutputProvider: TFC.isp.of('5x firmalife:food/salsa').copyFood() }) - processorRecipe("bacon", 300, 8, { + global.processorRecipe(event, "bacon", 300, 8, { circuit: 1, itemInputs: ['tfc:food/pork', 'tfc:powder/salt'], itemOutputs: ['4x firmalife:food/bacon'], - itemOutputProvider: TFC.isp.of('4x firmalife:food/bacon').copyFood() + fluidInputs: ['gtceu:wood_gas 5', 'tfc:brine 100'], + itemOutputProvider: TFC.isp.of('4x firmalife:food/bacon') + .addTrait("firmalife:smoked") + .addTrait("tfc:brined") + .addTrait("tfc:salted") + .copyFood() }) - processorRecipe("pickled_egg", 1000, 8, { + global.processorRecipe(event, "pickled_egg", 1000, 8, { circuit: 1, itemInputs: ['minecraft:clay_ball', 'tfc:powder/wood_ash', 'tfc:powder/salt', 'tfc:food/boiled_egg'], itemOutputs: ['firmalife:food/pickled_egg'], itemOutputProvider: TFC.isp.of('firmalife:food/pickled_egg').copyFood() }) - processorRecipe("garlic_bread", 300, 8, { + global.processorRecipe(event, "garlic_bread", 300, 8, { circuit: 1, itemInputs: ['firmalife:food/toast', 'firmalife:food/butter', 'tfc:food/garlic'], itemOutputs: ['firmalife:food/garlic_bread'], @@ -945,7 +951,7 @@ function registerTFGFoodRecipes(event) { //#region Alcohols global.TFC_ALCOHOL.forEach(alcohol => { - processorRecipe(alcohol.id.replace(/:/g, "_"), 2400, 1, { + global.processorRecipe(event, alcohol.id.replace(/:/g, "_"), 2400, 1, { itemInputs: [alcohol.ingredient], fluidInputs: ['#tfg:clean_water 500', 'firmalife:yeast_starter 10'], fluidOutputs: [Fluid.of(alcohol.id, 500)], @@ -957,7 +963,7 @@ function registerTFGFoodRecipes(event) { //#endregion //#region Cakes - processorRecipe("cake_base", 300, 8, { + global.processorRecipe(event, "cake_base", 300, 8, { circuit: 4, itemInputs: ["#forge:eggs", "2x #tfg:sugars", "2x #tfc:foods/flour"], fluidInputs: ['#tfc:milks 1000'], @@ -965,44 +971,44 @@ function registerTFGFoodRecipes(event) { itemOutputProvider: TFC.isp.of("createaddition:cake_base").copyOldestFood() }) - cookingRecipe("baked_cake_base", "createaddition:cake_base", "createaddition:cake_base_baked") + global.cookingRecipe(event, "baked_cake_base", "createaddition:cake_base", "createaddition:cake_base_baked") - processorRecipe("vanilla_cake", 300, 8, { + global.processorRecipe(event, "vanilla_cake", 300, 8, { itemInputs: ['createaddition:cake_base_baked', '3x tfc:food/strawberry', 'firmalife:spice/vanilla'], fluidInputs: [Fluid.of("tfcchannelcasting:white_chocolate", 400)], itemOutputs: ["tfc:cake"], itemOutputProvider: TFC.isp.of("tfc:cake").copyOldestFood() }) - processorRecipe("milk_chocolate_cake", 300, 8, { + global.processorRecipe(event, "milk_chocolate_cake", 300, 8, { itemInputs: ['createaddition:cake_base_baked', '3x tfc:food/cherry', 'firmalife:food/cocoa_powder'], fluidInputs: [Fluid.of("tfcchannelcasting:milk_chocolate", 400)], itemOutputs: ["createaddition:chocolate_cake"], itemOutputProvider: TFC.isp.of("createaddition:chocolate_cake").copyOldestFood() }) - processorRecipe("dark_chocolate_cake", 300, 8, { + global.processorRecipe(event, "dark_chocolate_cake", 300, 8, { itemInputs: ['createaddition:cake_base_baked', '3x tfc:food/cherry', 'firmalife:food/cocoa_powder'], fluidInputs: [Fluid.of("tfcchannelcasting:dark_chocolate", 400)], itemOutputs: ["createaddition:chocolate_cake"], itemOutputProvider: TFC.isp.of("createaddition:chocolate_cake").copyOldestFood() }) - processorRecipe("maple_honey_cake", 300, 8, { + global.processorRecipe(event, "maple_honey_cake", 300, 8, { itemInputs: ['createaddition:cake_base_baked', '4x firmalife:raw_honey'], fluidInputs: [Fluid.of("afc:maple_syrup", 1000)], itemOutputs: ["createaddition:honey_cake"], itemOutputProvider: TFC.isp.of("createaddition:honey_cake").copyOldestFood() }) - processorRecipe("birch_honey_cake", 300, 8, { + global.processorRecipe(event, "birch_honey_cake", 300, 8, { itemInputs: ['createaddition:cake_base_baked', '4x firmalife:raw_honey'], fluidInputs: [Fluid.of("afc:birch_syrup", 1000)], itemOutputs: ["createaddition:honey_cake"], itemOutputProvider: TFC.isp.of("createaddition:honey_cake").copyOldestFood() }) - processorRecipe("birtday_cake", 300, GTValues.VA[GTValues.HV], { + global.processorRecipe(event, "birtday_cake", 300, GTValues.VA[GTValues.HV], { itemInputs: ['createaddition:cake_base', '4x species:birt_egg', '4x tfc:food/blueberry', '2x minecraft:chorus_fruit', 'gtceu:blue_alloy_single_wire'], fluidInputs: [Fluid.of('gtceu:helium_3', 50)], itemOutputs: ["species:birtday_cake"], @@ -1012,7 +1018,7 @@ function registerTFGFoodRecipes(event) { //#endregion //#region Soup - processorRecipe("grain_soup", 300, 8, { + global.processorRecipe(event, "grain_soup", 300, 8, { circuit: 20, itemInputs: [ '3x #tfc:bowls', @@ -1033,7 +1039,7 @@ function registerTFGFoodRecipes(event) { ) }) - processorRecipe("fruit_soup", 200, 8, { + global.processorRecipe(event, "fruit_soup", 200, 8, { circuit: 21, itemInputs: [ '3x #tfc:bowls', @@ -1054,7 +1060,7 @@ function registerTFGFoodRecipes(event) { ) }) - processorRecipe("vegetables_soup", 200, 8, { + global.processorRecipe(event, "vegetables_soup", 200, 8, { circuit: 22, itemInputs: [ '3x #tfc:bowls', @@ -1075,7 +1081,7 @@ function registerTFGFoodRecipes(event) { ) }) - processorRecipe("protein_soup", 200, 8, { + global.processorRecipe(event, "protein_soup", 200, 8, { circuit: 23, itemInputs: [ '3x #tfc:bowls', @@ -1096,7 +1102,7 @@ function registerTFGFoodRecipes(event) { ) }) - processorRecipe("dairy_soup", 200, 8, { + global.processorRecipe(event, "dairy_soup", 200, 8, { circuit: 24, itemInputs: [ '3x #tfc:bowls', @@ -1173,17 +1179,20 @@ function registerTFGFoodRecipes(event) { //#endregion //Golden Apple - processorRecipe('golden_apple_from_red', 30 * 20, GTValues.VA[GTValues.HV], { + global.processorRecipe(event, 'golden_apple_from_red', 30 * 20, GTValues.VA[GTValues.HV], { itemInputs: ['tfc:food/red_apple'], fluidInputs: [Fluid.of('gtceu:gold', 144 * 8)], itemOutputs: ['minecraft:golden_apple'], - circuit: 5 + circuit: 5, + itemOutputProvider: TFC.isp.of('minecraft:golden_apple').resetFood() }) - processorRecipe('golden_apple_from_green', 30 * 20, GTValues.VA[GTValues.HV], { + + global.processorRecipe(event, 'golden_apple_from_green', 30 * 20, GTValues.VA[GTValues.HV], { itemInputs: ['tfc:food/green_apple'], fluidInputs: [Fluid.of('gtceu:gold', 144 * 8)], itemOutputs: ['minecraft:golden_apple'], - circuit: 5 + circuit: 5, + itemOutputProvider: TFC.isp.of('minecraft:golden_apple').resetFood() }) //#region New foods @@ -1276,14 +1285,14 @@ function registerTFGFoodRecipes(event) { [TFC.ingredient.notRotten('betterend:cave_pumpkin'), '#tfc:knives'], 'betterend:cave_pumpkin') .id(`tfg:crafting/cave_pumpkin_chunks_knife`) - processorRecipe("cut_cave_pumpkin", 100, 8, { + global.processorRecipe(event, "cut_cave_pumpkin", 100, 8, { circuit: 30, itemInputs: ["betterend:cave_pumpkin"], itemOutputs: ["4x betterend:cave_pumpkin_chunks"], itemOutputProvider: TFC.isp.of("4x betterend:cave_pumpkin_chunks").copyFood() }) - processorRecipe("cave_pumpkin_pie_dough", 300, GTValues.VA[GTValues.HV], { + global.processorRecipe(event, "cave_pumpkin_pie_dough", 300, GTValues.VA[GTValues.HV], { itemInputs: ['#tfg:martian_eggs', '2x betterend:cave_pumpkin_chunks', 'betterend:amber_root_product', 'tfg:wraptor_sugar'], fluidInputs: ['minecraft:water 1000'], itemOutputs: ["betterend:cave_pumpkin_pie_dough"], @@ -1307,7 +1316,7 @@ function registerTFGFoodRecipes(event) { '#firmalife:pie_pans' ]).id(`tfg:shapeless/cave_pumpkin_pie_raw`) - processorRecipe("raw_cave_pumpkin_pie", 20, 8, { + global.processorRecipe(event, "raw_cave_pumpkin_pie", 20, 8, { itemInputs: [`betterend:cave_pumpkin_pie_dough`, "#firmalife:pie_pans"], itemOutputs: ["betterend:cave_pumpkin_pie_raw"], itemOutputProvider: TFC.isp.of("betterend:cave_pumpkin_pie_raw").copyFood() @@ -1315,7 +1324,7 @@ function registerTFGFoodRecipes(event) { // Dino nugs - registerFoodRecipe("food_oven", "raw_dino_nugget", 300, GTValues.VA[GTValues.LV], 'tfg.food_recipe.deep_frying', { + global.registerFoodRecipe(event, "food_oven", "raw_dino_nugget", 300, GTValues.VA[GTValues.LV], 'tfg.food_recipe.deep_frying', { itemInputs: ["tfg:food/raw_dino_nugget"], itemOutputs: ["tfg:food/cooked_dino_nugget"], fluidInputs: ['#firmalife:oils 100'], @@ -1327,7 +1336,7 @@ function registerTFGFoodRecipes(event) { [(portion) => portion.nutrientModifier(2.0)]) }) - processorRecipe("raw_dino_nuggets", 300, GTValues.VA[GTValues.HV], { + global.processorRecipe(event, "raw_dino_nuggets", 300, GTValues.VA[GTValues.HV], { itemInputs: ['#tfg:raw_dinosaur_meat', '3x #tfc:foods/flour', 'tfc:powder/salt'], fluidInputs: ['tfc:beer 200'], notConsumable: ['gtceu:nugget_casting_mold'], @@ -1339,7 +1348,7 @@ function registerTFGFoodRecipes(event) { ) }) - processorRecipe("raw_dino_nuggets_aged_beer", 300, GTValues.VA[GTValues.HV], { + global.processorRecipe(event, "raw_dino_nuggets_aged_beer", 300, GTValues.VA[GTValues.HV], { itemInputs: ['#tfg:raw_dinosaur_meat', '3x #tfc:foods/flour', 'tfc:powder/salt'], fluidInputs: ['tfcagedalcohol:aged_beer 200'], notConsumable: ['gtceu:nugget_casting_mold'], @@ -1381,14 +1390,14 @@ function registerTFGFoodRecipes(event) { 'tfc:food/potato' ).id(`tfg:crafting/raw_fries_knife`); - processorRecipe('raw_fries', 20*1, 8, { + global.processorRecipe(event, 'raw_fries', 20*1, 8, { itemInputs: ['tfc:food/potato'], itemOutputs: ['4x tfg:food/raw_fries'], circuit: 7, itemOutputProvider: TFC.isp.of('4x tfg:food/raw_fries').copyFood() }); - registerFoodRecipe('food_oven', 'cooked_fries', 20*6, GTValues.VA[GTValues.ULV], 'tfg.food_recipe.deep_frying', { + global.registerFoodRecipe(event, 'food_oven', 'cooked_fries', 20*6, GTValues.VA[GTValues.ULV], 'tfg.food_recipe.deep_frying', { itemInputs: ['tfg:food/raw_fries'], itemOutputs: ['tfg:food/cooked_fries'], fluidInputs: ['#firmalife:oils 100'], @@ -1396,7 +1405,7 @@ function registerTFGFoodRecipes(event) { }); // Beer Battered Cheese Curds - registerFoodRecipe('food_oven', 'cooked_beer_battered_cheese_curds', 20*6, GTValues.VA[GTValues.ULV], 'tfg.food_recipe.deep_frying', { + global.registerFoodRecipe(event, 'food_oven', 'cooked_beer_battered_cheese_curds', 20*6, GTValues.VA[GTValues.ULV], 'tfg.food_recipe.deep_frying', { itemInputs: ['tfg:food/raw_beer_battered_cheese_curds'], itemOutputs: ['tfg:food/cooked_beer_battered_cheese_curds'], fluidInputs: ['#firmalife:oils 100'], @@ -1408,7 +1417,7 @@ function registerTFGFoodRecipes(event) { */ const beer = ['tfc:beer', 'tfcagedalcohol:aged_beer']; beer.forEach(beerType => { - processorRecipe(`raw_beer_battered_cheese_curds/${beerType.replace(':', '_')}`, 20*5, GTValues.VA[GTValues.ULV], { + global.processorRecipe(event, `raw_beer_battered_cheese_curds/${beerType.replace(':', '_')}`, 20*5, GTValues.VA[GTValues.ULV], { itemInputs: ['4x #tfg:foods/cheese_curds', '#tfc:foods/flour', 'tfc:powder/salt', '#forge:eggs'], fluidInputs: [`${beerType} 100`], itemOutputs: ['4x tfg:food/raw_beer_battered_cheese_curds'], @@ -1456,7 +1465,7 @@ function registerTFGFoodRecipes(event) { // Prosessor burgers allow extra ingredients. for (let i = 1; i <= 5; i++) { - processorRecipe(`hamburger_${i}`, 20*1, GTValues.VA[GTValues.ULV], { + global.processorRecipe(event, `hamburger_${i}`, 20*1, GTValues.VA[GTValues.ULV], { itemInputs: [`${i}x #tfg:foods/usable_in_burgers`, '2x tfg:food/brioche_bun'], itemOutputs: ['tfg:food/hamburger'], circuit: i, @@ -1468,7 +1477,7 @@ function registerTFGFoodRecipes(event) { }; for (let i = 1; i <= 4; i++) { - processorRecipe(`cheeseburger_${i}`, 20*1, GTValues.VA[GTValues.ULV], { + global.processorRecipe(event, `cheeseburger_${i}`, 20*1, GTValues.VA[GTValues.ULV], { itemInputs: [`${i}x #tfg:foods/usable_in_burgers`, '2x tfg:food/brioche_bun', '#tfg:foods/cheeses'], itemOutputs: ['tfg:food/cheeseburger'], circuit: i, @@ -1500,7 +1509,7 @@ function registerTFGFoodRecipes(event) { .outputItem('6x tfg:food/brioche_dough') .id('tfg:mixing_bowl/brioche_dough'); - processorRecipe('brioche_dough/tirage_mixture', 20*2, GTValues.VA[GTValues.ULV], { + global.processorRecipe(event, 'brioche_dough/tirage_mixture', 20*2, GTValues.VA[GTValues.ULV], { itemInputs: ['2x #tfc:foods/flour', '#forge:eggs', 'firmalife:tirage_mixture'], fluidInputs: ['#tfc:milks 500'], itemOutputs: ['6x tfg:food/brioche_dough'], @@ -1508,7 +1517,7 @@ function registerTFGFoodRecipes(event) { itemOutputProvider: TFC.isp.of('6x tfg:food/brioche_dough').copyOldestFood() }); - processorRecipe('brioche_dough/yeast', 20*2, GTValues.VA[GTValues.ULV], { + global.processorRecipe(event, 'brioche_dough/yeast', 20*2, GTValues.VA[GTValues.ULV], { itemInputs: ['2x #tfc:foods/flour', '#forge:eggs', '#tfc:sweetener'], fluidInputs: ['#tfc:milks 500', 'firmalife:yeast_starter 100'], itemOutputs: ['6x tfg:food/brioche_dough'], @@ -1516,7 +1525,7 @@ function registerTFGFoodRecipes(event) { itemOutputProvider: TFC.isp.of('6x tfg:food/brioche_dough').copyOldestFood() }); - cookingRecipe('brioche_bun', 'tfg:food/brioche_dough', 'tfg:food/brioche_bun'); + global.cookingRecipe(event, 'brioche_bun', 'tfg:food/brioche_dough', 'tfg:food/brioche_bun'); // Burger Patty event.recipes.tfc.advanced_shapeless_crafting( @@ -1527,7 +1536,7 @@ function registerTFGFoodRecipes(event) { ] ).id('tfg:crafting/raw_burger_patty'); - processorRecipe('raw_burger_patty', 20*1, GTValues.VA[GTValues.ULV], { + global.processorRecipe(event, 'raw_burger_patty', 20*1, GTValues.VA[GTValues.ULV], { itemInputs: ['#tfg:foods/burger_meats'], itemOutputs: ['tfg:food/raw_burger_patty'], notConsumable: ['gtceu:wire_extruder_mold'], @@ -1550,7 +1559,7 @@ function registerTFGFoodRecipes(event) { .fluidOutput(Fluid.of('tfg:rich_stock', 1000) ).id('tfg:pot/rich_stock'); - processorRecipe('rich_stock', 20*5, GTValues.VA[GTValues.ULV], { + global.processorRecipe(event, 'rich_stock', 20*5, GTValues.VA[GTValues.ULV], { itemInputs: [ '#tfg:foods/makes_rich_stock', '#tfc:foods/vegetables', @@ -1578,7 +1587,7 @@ function registerTFGFoodRecipes(event) { .fluidOutput(Fluid.of('tfg:light_stock', 1000) ).id('tfg:pot/light_stock'); - processorRecipe('light_stock', 20*5, GTValues.VA[GTValues.ULV], { + global.processorRecipe(event, 'light_stock', 20*5, GTValues.VA[GTValues.ULV], { itemInputs: [ '#tfg:foods/makes_light_stock', '#tfc:foods/vegetables', @@ -1591,7 +1600,7 @@ function registerTFGFoodRecipes(event) { }); // Brown Gravy - processorRecipe('brown_gravy', 20*5, GTValues.VA[GTValues.ULV], { + global.processorRecipe(event, 'brown_gravy', 20*5, GTValues.VA[GTValues.ULV], { itemInputs: [ '#tfc:foods/flour', 'firmalife:food/butter', @@ -1602,7 +1611,7 @@ function registerTFGFoodRecipes(event) { }); // Poutine - processorRecipe('poutine', 20*10, GTValues.VA[GTValues.LV], { + global.processorRecipe(event, 'poutine', 20*10, GTValues.VA[GTValues.LV], { itemInputs: [ '4x tfg:food/cooked_fries', '#tfg:foods/cheese_curds', @@ -1618,7 +1627,7 @@ function registerTFGFoodRecipes(event) { // Oatmeal for (let i = 1; i <= 4; i++) { - processorRecipe(`oatmeal_${i}`, 20*15, GTValues.VA[GTValues.LV], { + global.processorRecipe(event, `oatmeal_${i}`, 20*15, GTValues.VA[GTValues.LV], { itemInputs: [ '4x #tfc:bowls', 'tfc:food/oat_grain', @@ -1629,7 +1638,7 @@ function registerTFGFoodRecipes(event) { itemOutputs: ['4x tfg:food/oatmeal'], circuit: i, itemOutputProvider: TFC.isp.of('4x tfg:food/oatmeal').simpleModifier('tfg:add_bowl').meal( - (food) => food.hunger(5).water(5).saturation(1).decayModifier(1.4).dairy(1.5), + (food) => food.hunger(5).water(5).saturation(1).decayModifier(1.4).grain(0.8).dairy(1.5), [(portion) => portion.nutrientModifier(0.7).saturationModifier(0.7)] ) }); @@ -1650,13 +1659,14 @@ function registerTFGFoodRecipes(event) { .EUt(GTValues.VA[GTValues.HV]); // Citric Acid - processorRecipe('citric_acid', 20*20, GTValues.VA[GTValues.HV], { + global.processorRecipe(event, 'citric_acid', 20*20, GTValues.VA[GTValues.HV], { itemInputs: [ '#tfg:foods/citrus_fruits', 'gtceu:calcium_hydroxide_dust' ], fluidInputs: ['gtceu:sulfuric_acid 100'], - itemOutputs: ['2x tfg:citric_acid_dust' ] + itemOutputs: ['2x tfg:citric_acid_dust' ], + itemOutputProvider: TFC.isp.of('2x tfg:citric_acid_dust') }); // Slice of "Cheese" @@ -1673,14 +1683,14 @@ function registerTFGFoodRecipes(event) { .EUt(GTValues.VA[GTValues.LV]) // Instant Mac - processorRecipe('raw_instant_mac', 20 * 10, GTValues.VA[GTValues.LV], { + global.processorRecipe(event, 'raw_instant_mac', 20 * 10, GTValues.VA[GTValues.LV], { itemInputs: ['firmalife:food/raw_egg_noodles', '#tfg:foods/cheeses', '2x create:cardboard'], itemOutputs: ['2x tfg:food/raw_instant_mac'], fluidInputs: ['gtceu:polyethylene 100'], itemOutputProvider: TFC.isp.of('2x tfg:food/raw_instant_mac').copyFood() }); - registerFoodRecipe('food_oven', 'cooked_instant_mac', 20 * 1, GTValues.VA[GTValues.LV], '' ,{ + global.registerFoodRecipe(event, 'food_oven', 'cooked_instant_mac', 20 * 1, GTValues.VA[GTValues.LV], '' ,{ itemInputs: ['tfg:food/raw_instant_mac'], itemOutputs: ['tfg:food/cooked_instant_mac'], fluidInputs: ['#tfc:milks 500'], @@ -1723,7 +1733,7 @@ function registerTFGFoodRecipes(event) { //#endregion - processorRecipe('nixtamal', 20*30, GTValues.VA[GTValues.ULV], { + global.processorRecipe(event, 'nixtamal', 20*30, GTValues.VA[GTValues.ULV], { itemInputs: ['firmalife:food/cured_maize'], fluidInputs: ['#tfg:clean_water 100'], itemOutputs: ['firmalife:food/nixtamal'], diff --git a/kubejs/server_scripts/tfg/food/tags.food.js b/kubejs/server_scripts/tfg/food/tags.food.js index c4bc0ca81..97826d234 100644 --- a/kubejs/server_scripts/tfg/food/tags.food.js +++ b/kubejs/server_scripts/tfg/food/tags.food.js @@ -315,7 +315,7 @@ function registerTFGFoodItemTags(event) { event.add("tfc:foods/usable_in_jam_sandwich", "tfc:food/boiled_egg"); event.add("tfc:foods/usable_in_sandwich", "tfc:food/cooked_egg"); event.add("tfc:foods/usable_in_sandwich", "tfc:food/boiled_egg"); - event.add("tfc:foods/usable_in_sandwich", "tfc:food/pickled_egg"); + event.add("tfc:foods/usable_in_sandwich", "firmalife:food/pickled_egg"); event.add('tfc:foods/usable_in_salad', 'minecraft:red_mushroom') event.add('tfc:foods/usable_in_salad', 'minecraft:brown_mushroom') diff --git a/kubejs/server_scripts/tfg/loot.js b/kubejs/server_scripts/tfg/loot.js index bde84e8cc..173f8e745 100644 --- a/kubejs/server_scripts/tfg/loot.js +++ b/kubejs/server_scripts/tfg/loot.js @@ -9,7 +9,7 @@ function registerTFGLoots(event) { .removeLoot(Ingredient.all) //ore .pool((pool) => { - pool.rolls([4, 6]); + pool.rolls([2, 4]); pool.addAlternativesLoot( LootEntry.of('tfc:ore/normal_bismuthinite').when((c) => c.randomChance(0.1)), LootEntry.of('tfc:ore/rich_bismuthinite').when((c) => c.randomChance(0.2)), @@ -39,7 +39,7 @@ function registerTFGLoots(event) { }) //seeds .pool((pool) => { - pool.rolls([2, 8]); + pool.rolls([2, 4]); pool.addAlternativesLoot( LootEntry.of('tfc:seeds/onion').when((c) => c.randomChance(0.2)), LootEntry.of('tfc:seeds/cabbage').when((c) => c.randomChance(0.2)), diff --git a/kubejs/server_scripts/tfg/machines/recipes.multiblocks.js b/kubejs/server_scripts/tfg/machines/recipes.multiblocks.js index 29dc5e567..65f5b2f21 100644 --- a/kubejs/server_scripts/tfg/machines/recipes.multiblocks.js +++ b/kubejs/server_scripts/tfg/machines/recipes.multiblocks.js @@ -49,7 +49,7 @@ function registerTFGMultiblockRecipes(event) { }).id('gtceu:shaped/electric_blast_furnace2') // TFG customs - event.shaped('tfg:electric_greenhouse', [ + event.recipes.gtceu.shaped('tfg:electric_greenhouse', [ 'ABA', 'CDC', 'BCB' @@ -58,9 +58,9 @@ function registerTFGMultiblockRecipes(event) { B: '#forge:single_cables/copper', C: 'tfc:compost', D: 'gtceu:steel_machine_casing' - }).id('tfg:shaped/electric_greenhouse') + }).addMaterialInfo().id('tfg:shaped/electric_greenhouse') - event.shaped('gtceu:steam_bloomery', [ + event.recipes.gtceu.shaped('tfg:steam_bloomery', [ 'CEC', 'DAD', 'CBC' @@ -70,9 +70,51 @@ function registerTFGMultiblockRecipes(event) { C: '#forge:rods/black_steel', D: '#forge:screws/wrought_iron', E: '#forge:tools/wrenches' - }) + }).addMaterialInfo().id('tfg:shaped/steam_bloomery') - event.shaped('tfg:ostrum_linear_accelerator', [ + event.recipes.gtceu.shaped('tfg:steam_thermal_centrifuge', [ + 'ACA', + 'DBD', + 'ACA' + ], { + A: '#forge:plates/brass', + B: 'create:steam_engine', + C: ChemicalHelper.get(TagPrefix.gear, GTMaterials.Invar, 1), + D: '#gtceu:circuits/lv' + }).addMaterialInfo().id('tfg:shaped/steam_thermal_centrifuge') + + event.recipes.gtceu.shaped('tfg:steam_fuser', [ + 'ABA', + 'ACA', + 'ABA' + ], { + A: '#forge:plates/bronze', + B: 'gtceu:potin_large_fluid_pipe', + C: 'gtceu:hp_steam_alloy_smelter' + }).addMaterialInfo().id('gtceu:shaped/steam_fuser') + + event.recipes.gtceu.shaped('tfg:steam_squasher', [ + 'ABA', + 'ACA', + 'ABA' + ], { + A: '#forge:plates/brass', + B: 'gtceu:potin_large_fluid_pipe', + C: 'gtceu:hp_steam_compressor' + }).addMaterialInfo().id('gtceu:shaped/steam_squasher') + + event.recipes.gtceu.shaped('tfg:steam_presser', [ + 'ADA', + 'ACA', + 'ABA' + ], { + A: '#forge:plates/brass', + B: 'tfc:metal/anvil/steel', + C: 'gtceu:hp_steam_forge_hammer', + D: 'gtceu:potin_large_fluid_pipe' + }).addMaterialInfo().id('gtceu:shaped/steam_presser') + + event.recipes.gtceu.shaped('tfg:ostrum_linear_accelerator', [ 'USU', 'WZW', 'PTP' @@ -83,8 +125,7 @@ function registerTFGMultiblockRecipes(event) { U: '#forge:double_plates/stellite_100', T: '#forge:single_cables/platinum', P: 'gtceu:iv_electric_pump' - } - ).id('tfg:shaped/ostrum_linear_accelerator') + }).addMaterialInfo().id('tfg:shaped/ostrum_linear_accelerator') event.recipes.gtceu.assembler('tfg:ostrum_harvester') .itemInputs( @@ -123,7 +164,7 @@ function registerTFGMultiblockRecipes(event) { Z: 'gtceu:ev_machine_hull' }).addMaterialInfo().id('tfg:shaped/evaporation_tower') - event.shaped('deafission:fission_reactor_mk1', [ + event.recipes.gtceu.shaped('deafission:fission_reactor_mk1', [ 'TUT', 'WZW', 'TUT' @@ -132,10 +173,9 @@ function registerTFGMultiblockRecipes(event) { W: '#gtceu:circuits/ev', U: 'gtceu:hv_field_generator', Z: 'gtceu:ev_machine_hull' - } - ).id('tfg:shaped/fission_reactor_mk1') + }).addMaterialInfo().id('tfg:shaped/fission_reactor_mk1') - event.shaped('gtceu:nuclear_fuel_factory', [ + event.recipes.gtceu.shaped('gtceu:nuclear_fuel_factory', [ 'TUT', 'WZW', 'TBT' @@ -145,10 +185,9 @@ function registerTFGMultiblockRecipes(event) { U: 'gtceu:ev_emitter', Z: 'gtceu:ev_machine_hull', B: 'gtceu:ev_robot_arm' - } - ).id('tfg:shaped/nuclear_fuel_factory') + }).addMaterialInfo().id('tfg:shaped/nuclear_fuel_factory') - event.shaped('gtceu:heat_exchanger', [ + event.recipes.gtceu.shaped('gtceu:heat_exchanger', [ 'TUT', 'WZW', 'GBG' @@ -159,10 +198,9 @@ function registerTFGMultiblockRecipes(event) { Z: 'gtceu:ev_machine_hull', B: 'gtceu:ev_fluid_regulator', G: '#forge:gears/ostrum_iodide' - } - ).id('tfg:shaped/heat_exchanger') + }).addMaterialInfo().id('tfg:shaped/heat_exchanger') - event.shaped('tfg:nuclear_turbine', [ + event.recipes.gtceu.shaped('tfg:nuclear_turbine', [ 'CTC', 'TZT', 'BTB' @@ -171,8 +209,7 @@ function registerTFGMultiblockRecipes(event) { Z: 'gtceu:ev_machine_hull', B: 'gtceu:ultimet_large_item_pipe', C: '#gtceu:circuits/ev' - } - ).id('tfg:shaped/nuclear_turbine') + }).addMaterialInfo().id('tfg:shaped/nuclear_turbine') event.recipes.gtceu.shaped('gtceu:coal_liquefaction_tower', [ 'ABA', diff --git a/kubejs/server_scripts/tfg/machines/tags.facades.js b/kubejs/server_scripts/tfg/machines/tags.facades.js index 97fd56085..4afd087c3 100644 --- a/kubejs/server_scripts/tfg/machines/tags.facades.js +++ b/kubejs/server_scripts/tfg/machines/tags.facades.js @@ -127,6 +127,7 @@ function registerTFGFacadeWhitelistItemTags(event) { 'gtceu:spatial_storage_hazard_sign_block', 'gtceu:turret_hazard_sign_block', 'gtceu:void_hazard_sign_block', + 'gtceu:high_temperature_hazard_sign_block', 'gtceu:yellow_stripes_block_a', 'gtceu:yellow_stripes_block_b', diff --git a/kubejs/server_scripts/tfg/mars/recipes.iodine.js b/kubejs/server_scripts/tfg/mars/recipes.iodine.js index 371c0a9fc..d4ac26ee0 100644 --- a/kubejs/server_scripts/tfg/mars/recipes.iodine.js +++ b/kubejs/server_scripts/tfg/mars/recipes.iodine.js @@ -37,15 +37,29 @@ function registerTFGMarsIodineRecipes(event) { .inputFluids(Fluid.of('tfg:crimsene', 144), Fluid.of('gtceu:liquid_carbon_dioxide', 1000)) .outputFluids(Fluid.of('gtceu:carbon_monoxide', 1000)) .itemOutputs('#forge:gems/crimsene') - .duration(20 * 30) - .EUt(GTValues.VA[GTValues.EV]) + .duration(20 * 60) + .EUt(GTValues.VA[GTValues.LV]) + + event.recipes.firmalife.vat() + .inputs('10x tfg:dry_ice', Fluid.of('tfg:crimsene', 200)) + .outputItem('tfg:crimsene_gem') + .length(300) + .temperature(100) + .id('tfg:vat/crimsene') event.recipes.gtceu.autoclave('tfg:warpane') .inputFluids(Fluid.of('tfg:warpane', 144), Fluid.of('gtceu:liquid_carbon_dioxide', 1000)) .outputFluids(Fluid.of('gtceu:hydrogen', 1000)) .itemOutputs('#forge:gems/warpane') - .duration(20 * 30) - .EUt(GTValues.VA[GTValues.EV]) + .duration(20 * 60) + .EUt(GTValues.VA[GTValues.LV]) + + event.recipes.firmalife.vat() + .inputs('10x tfg:dry_ice', Fluid.of('tfg:warpane', 200)) + .outputItem('tfg:warpane_gem') + .length(300) + .temperature(100) + .id('tfg:vat/warpane') event.recipes.gtceu.macerator('tfg:crimsene') .itemInputs('#forge:gems/crimsene') @@ -99,4 +113,5 @@ function registerTFGMarsIodineRecipes(event) { .outputFluids(Fluid.of('tfg:heavy_water', 1500)) .duration(20 * 5) .EUt(GTValues.VA[GTValues.MV]) + } \ No newline at end of file diff --git a/kubejs/server_scripts/tfg/mars/recipes.mars.js b/kubejs/server_scripts/tfg/mars/recipes.mars.js index 35439105a..3b4149e2e 100644 --- a/kubejs/server_scripts/tfg/mars/recipes.mars.js +++ b/kubejs/server_scripts/tfg/mars/recipes.mars.js @@ -14,7 +14,7 @@ function registerTFGMarsRecipes(event) { .inputFluids(Fluid.of('tfg:mars_air', 10000)) .outputFluids(Fluid.of('gtceu:carbon_dioxide', 3900), Fluid.of('gtceu:nitrogen', 1000), Fluid.of('gtceu:argon', 500)) .duration(1600) - .EUt(GTValues.VA[GTValues.MV]) + .EUt(GTValues.VA[GTValues.LV]) // TODO: move neon and xenon somewhere else event.recipes.gtceu.distillation_tower('tfg:distill_liquid_mars_air') @@ -69,7 +69,7 @@ function registerTFGMarsRecipes(event) { woodBuilder(event, wood.name, wood.lumber, wood.logs, wood.log, wood.stripped_log, wood.plank, wood.stair, wood.slab, wood.door, wood.trapdoor, wood.fence, wood.fence_gate, wood.support, wood.pressure_plate, wood.button) }) - event.shaped('16x ad_astra:aeronos_ladder', [ + event.shaped('8x ad_astra:aeronos_ladder', [ 'A A', 'ABA', 'A A' @@ -78,7 +78,7 @@ function registerTFGMarsRecipes(event) { B: ChemicalHelper.get(TagPrefix.rod, GTMaterials.Wood, 1), }).id('tfg:shaped/aeronos_ladder') - event.shaped('16x ad_astra:strophar_ladder', [ + event.shaped('8x ad_astra:strophar_ladder', [ 'A A', 'ABA', 'A A' @@ -251,5 +251,24 @@ function registerTFGMarsRecipes(event) { generateGreenHouseRecipe(event, '8x betterend:shadow_berry_seeds', 'tfg:semiheavy_ammoniacal_water', 8000, '24x betterend:shadow_berry_product', 'shadow_berry', 'ad_astra:mars', 8, null, GTValues.VA[GTValues.LV]) - event.recipes.firmalife.oven('betterend:cave_pumpkin_pie_raw', 400, 60 * 20, 'betterend:cave_pumpkin_pie') + event.recipes.firmalife.oven('betterend:cave_pumpkin_pie_raw', 400, 60 * 20, 'betterend:cave_pumpkin_pie') + + // Mars primitive stuff + + event.recipes.vintageimprovements.vacuumizing( + [Fluid.of('tfg:latex', 100), Fluid.of('gtceu:ammonia', 100)], + [Fluid.of('tfg:warpane', 100), Fluid.of('tfg:crimsene', 100)]) + .secondaryFluidInput(1) + .secondaryFluidOutput(1) + .processingTime(1000) + .heated() + .id('tfg:vacuumizing/mars_latex') + + event.recipes.vintageimprovements.vacuumizing( + [Fluid.of('minecraft:water', 250), Fluid.of('gtceu:ammonia', 250)], + Fluid.of('tfg:semiheavy_ammoniacal_water', 1000)) + .secondaryFluidOutput(1) + .processingTime(300) + .heated() + .id('tfg:vacummizing/mars_water') } \ 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 bd1cbc9ef..202f69c27 100644 --- a/kubejs/server_scripts/tfg/mars/tags.mars.js +++ b/kubejs/server_scripts/tfg/mars/tags.mars.js @@ -60,7 +60,7 @@ function registerTFGMarsItemTags(event) { event.add('forge:seeds', 'betterend:amber_root_seeds') event.add('forge:seeds', 'betterend:blossom_berry_seeds') event.add('forge:seeds', 'betterend:bolux_mushroom_seeds') - event.add('forge:seeds', 'betterend:cave_pumpkin_seeds') + event.add('forge:seeds', 'betterend:cave_pumpkin_plant_seeds') event.add('forge:seeds', 'betterend:shadow_berry_seeds') event.add('tfc:foods', 'betterend:amber_root_product') diff --git a/kubejs/server_scripts/tfg/natural_blocks/recipes.rocks.js b/kubejs/server_scripts/tfg/natural_blocks/recipes.rocks.js index 208c1f9f2..425001285 100644 --- a/kubejs/server_scripts/tfg/natural_blocks/recipes.rocks.js +++ b/kubejs/server_scripts/tfg/natural_blocks/recipes.rocks.js @@ -1195,14 +1195,12 @@ function registerTFGRockRecipes(event) { .itemOutputs('ad_astra:permafrost') .duration(40*20) .EUt(2) - .dimension('ad_astra:glacio') event.recipes.gtceu.compressor('tfg:venus_sandstone') .itemInputs('4x ad_astra:venus_sand') .itemOutputs('ad_astra:venus_sandstone') .duration(40*20) .EUt(2) - .dimension('ad_astra:mars') // #endregion COMPRESSOR 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 6700415b1..8beef8cc9 100644 --- a/kubejs/server_scripts/tfg/ores_and_materials/recipes.alloys.js +++ b/kubejs/server_scripts/tfg/ores_and_materials/recipes.alloys.js @@ -91,6 +91,36 @@ function registerTFGAlloyingRecipes(event) { event.smelting('gtceu:rose_gold_ingot', '#forge:dusts/rose_gold') .id('tfg:smelting/rose_gold_ingot') + event.recipes.gtceu.alloy_blast_smelter('tfg:abs_bismuth_bronze') + .itemInputs('1x gtceu:bismuth_dust', '3x gtceu:copper_dust', '1x gtceu:zinc_dust') + .outputFluids(Fluid.of('gtceu:bismuth_bronze', 720)) + .circuit(4) + .blastFurnaceTemp(1357) + .duration(300) + .EUt(GTValues.VA[GTValues.LV]) + + event.recipes.gtceu.alloy_blast_smelter('tfg:abs_black_bronze') + .itemInputs('3x gtceu:copper_dust', '1x gtceu:gold_dust', '1x gtceu:silver_dust') + .outputFluids(Fluid.of('gtceu:black_bronze', 720)) + .circuit(4) + .blastFurnaceTemp(1357) + .duration(300) + .EUt(GTValues.VA[GTValues.LV]) + + event.recipes.gtceu.mixer('tfg:bismuth_bronze_from_raw') + .itemInputs('1x gtceu:bismuth_dust', '3x gtceu:copper_dust', '1x gtceu:zinc_dust') + .itemOutputs('5x gtceu:bismuth_bronze_dust') + .circuit(2) + .duration(100) + .EUt(7) + + event.recipes.gtceu.mixer('tfg:black_bronze_from_raw') + .itemInputs('3x gtceu:copper_dust', '1x gtceu:gold_dust', '1x gtceu:silver_dust') + .itemOutputs('5x gtceu:black_bronze_dust') + .circuit(2) + .duration(100) + .EUt(7) + //#endregion // Rose Gold + Sterling Silver @@ -126,15 +156,6 @@ function registerTFGAlloyingRecipes(event) { }); }); - // Red alloy, because crucible always makes 4+1=5 - - event.recipes.gtceu.alloy_blast_smelter('red_alloy') - .itemInputs('1x gtceu:copper_dust', '4x minecraft:redstone') - .outputFluids(Fluid.of('gtceu:red_alloy', 720)) - .circuit(5) - .duration(75) - .EUt(GTValues.VA[GTValues.LV]) - event.remove({ id: 'gtceu:mixer/red_alloy' }) // incorrect on purpose to prevent a greate duplicate recipe (the id becomes mixer/mixer/red_alloy) event.recipes.gtceu.mixer('gtceu:mixer/red_alloy') @@ -183,20 +204,41 @@ function registerTFGAlloyingRecipes(event) { 3, [], 500, 7, 64, 'gtceu:mixer/rose_gold') // Glowstone - event.recipes.gtceu.mixer('gtceu:lv_glowstone') + event.recipes.gtceu.mixer('tfg:lv_glowstone') .itemInputs('gtceu:gold_dust', 'minecraft:redstone', 'gtceu:sulfur_dust') .itemOutputs('2x minecraft:glowstone_dust') .circuit(8) .duration(1200) .EUt(30) - event.recipes.gtceu.alloy_blast_smelter('abs:liquid_glowstone') - .itemInputs('#forge:dusts/gold', '#forge:dusts/redstone', '#forge:dusts/sulfur') - .outputFluids(Fluid.of('gtceu:glowstone', 288)) - .duration(20 * 60 / 1.3) - .EUt(GTValues.VA[GTValues.LV]) - .blastFurnaceTemp(1064) + event.recipes.gtceu.alloy_blast_smelter('tfg:liquid_glowstone') + .itemInputs('10x #forge:dusts/gold', '10x #forge:dusts/redstone', '10x #forge:dusts/sulfur') + .outputFluids(Fluid.of('gtceu:glowstone', 2880)) .circuit(9) + .blastFurnaceTemp(1064) + .duration(12000) + .EUt(GTValues.VA[GTValues.LV]) + + event.recipes.gtceu.implosion_compressor('tfg:glowstone_block_dynamite') + .itemInputs('5x #forge:dusts/glowstone', '2x gtceu:dynamite') + .itemOutputs('1x minecraft:glowstone') + .chancedOutput('#forge:dusts/ash', 2500, 0) + .duration(20) + .EUt(GTValues.VA[GTValues.LV]) + + event.recipes.gtceu.implosion_compressor('tfg:glowstone_block_tnt') + .itemInputs('5x #forge:dusts/glowstone', '4x minecraft:tnt') + .itemOutputs('1x minecraft:glowstone') + .chancedOutput('#forge:dusts/ash', 2500, 0) + .duration(20) + .EUt(GTValues.VA[GTValues.LV]) + + event.recipes.gtceu.implosion_compressor('tfg:glowstone_block_industrial_tnt') + .itemInputs('5x #forge:dusts/glowstone', '1x gtceu:industrial_tnt') + .itemOutputs('1x minecraft:glowstone') + .chancedOutput('#forge:dusts/ash', 2500, 0) + .duration(20) + .EUt(GTValues.VA[GTValues.LV]) // New Alloys diff --git a/kubejs/server_scripts/tfg/powergen/nuclear/recipes.nuclear.js b/kubejs/server_scripts/tfg/powergen/nuclear/recipes.nuclear.js index ce0b60834..e548d5e55 100644 --- a/kubejs/server_scripts/tfg/powergen/nuclear/recipes.nuclear.js +++ b/kubejs/server_scripts/tfg/powergen/nuclear/recipes.nuclear.js @@ -76,7 +76,6 @@ function registerTFGNuclearRecipes(event) { //#region Processing Fuels event.recipes.gtceu.centrifuge('thorium_isotope') - //.inputFluids(Fluid.of('minecraft:water', 50)) .itemInputs('9x #forge:dusts/thorium') .chancedOutput('#forge:dusts/thorium_230', 9000, 0) .itemOutputs('8x #forge:dusts/thorium_232') @@ -141,7 +140,6 @@ function registerTFGNuclearRecipes(event) { .outputFluids(Fluid.of('gtceu:dioxygen_difluoride', 1000)) .duration(20*16) .EUt(GTValues.VA[GTValues.IV]) - .dimension('ad_astra:mars') event.recipes.gtceu.large_chemical_reactor('plutonium_dust') .itemInputs('#forge:dusts/refined_nuclear_residue') diff --git a/kubejs/server_scripts/tfg/primitive/medicine/tags.medicine.js b/kubejs/server_scripts/tfg/primitive/medicine/tags.medicine.js index ace86bfef..85d964511 100644 --- a/kubejs/server_scripts/tfg/primitive/medicine/tags.medicine.js +++ b/kubejs/server_scripts/tfg/primitive/medicine/tags.medicine.js @@ -26,8 +26,8 @@ function registerTFGMedicineItemTags(event) { event.add('tfg:medicine', 'tfg:luck_salvo') event.add('tfg:medicine', 'tfg:resistance_salvo') event.add('tfg:medicine', 'tfg:instant_health_salvo') - event.add('tfg:medicine', 'gtceu:paracetamol_pill') - event.add('tfg:medicine', 'gtceu:rad_away_pill') + event.add('tfg:medicine', 'tfg:paracetamol_pill') + event.add('tfg:medicine', 'tfg:rad_away_pill') event.add('tfg:antipoison_ingredients', 'tfc:plant/blood_lily') event.add('tfg:antipoison_ingredients', 'tfc:plant/pistia') 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 29ccd1771..b6d6c956d 100644 --- a/kubejs/server_scripts/tfg/primitive/recipes.glue_and_chipboard.js +++ b/kubejs/server_scripts/tfg/primitive/recipes.glue_and_chipboard.js @@ -29,6 +29,21 @@ function registerTFGChipboardRecipes(event) { .EUt(5) // Chipboard + event.recipes.firmalife.mixing_bowl() + .itemIngredients(['#tfg:wood_dusts', '#tfg:wood_dusts', 'tfc:glue']) + .outputItem('2x tfg:chipboard_composite') + .id('tfg:mixing_bowl/chipboard_composite_glue') + + event.recipes.firmalife.mixing_bowl() + .itemIngredients(['#tfg:wood_dusts', '#tfg:wood_dusts', '#tfg:wood_dusts', '#tfg:wood_dusts', 'gtceu:sticky_resin']) + .outputItem('4x tfg:chipboard_composite') + .id('tfg:mixing_bowl/chipboard_composite_resin') + + event.recipes.firmalife.mixing_bowl() + .itemIngredients(['#tfg:wood_dusts', '#tfg:wood_dusts', '#forge:wax']) + .outputItem('2x tfg:chipboard_composite') + .id('tfg:mixing_bowl/chipboard_composite_wax') + event.recipes.gtceu.mixer('gtceu:chipboard_composite_wax') .itemInputs('2x #tfg:wood_dusts', '1x #forge:wax') @@ -50,7 +65,6 @@ function registerTFGChipboardRecipes(event) { .duration(100) .EUt(GTValues.VA[GTValues.LV]) - event.recipes.gtceu.mixer('gtceu:chipboard_composite_fluid_glue') .itemInputs('1x #tfg:wood_dusts') .inputFluids(Fluid.of('gtceu:glue', 25)) @@ -58,6 +72,49 @@ function registerTFGChipboardRecipes(event) { .duration(10) .EUt(GTValues.VA[GTValues.LV]) + // Pre-treated chipboard + event.recipes.firmalife.mixing_bowl() + .itemIngredients(['gtceu:treated_wood_dust', 'gtceu:treated_wood_dust', 'tfc:glue']) + .outputItem('2x tfg:treated_chipboard_composite') + .id('tfg:mixing_bowl/treated_chipboard_composite_glue') + + event.recipes.firmalife.mixing_bowl() + .itemIngredients(['gtceu:treated_wood_dust', 'gtceu:treated_wood_dust', 'gtceu:treated_wood_dust', 'gtceu:treated_wood_dust', 'gtceu:sticky_resin']) + .outputItem('4x tfg:treated_chipboard_composite') + .id('tfg:mixing_bowl/treated_chipboard_composite_resin') + + event.recipes.firmalife.mixing_bowl() + .itemIngredients(['gtceu:treated_wood_dust', 'gtceu:treated_wood_dust', '#forge:wax']) + .outputItem('2x tfg:treated_chipboard_composite') + .id('tfg:mixing_bowl/treated_chipboard_composite_wax') + + event.recipes.gtceu.mixer('gtceu:treated_chipboard_composite_wax') + .itemInputs('2x gtceu:treated_wood_dust', '1x #forge:wax') + .itemOutputs('2x tfg:treated_chipboard_composite') + .duration(100) + .EUt(GTValues.VA[GTValues.LV]) + + event.recipes.gtceu.mixer('gtceu:treated_chipboard_composite_resin') + .itemInputs('4x gtceu:treated_wood_dust', '1x gtceu:sticky_resin') + .itemOutputs('4x tfg:treated_chipboard_composite') + .duration(100) + .EUt(GTValues.VA[GTValues.LV]) + + event.recipes.gtceu.mixer('gtceu:treated_chipboard_composite_glue') + .itemInputs('2x gtceu:treated_wood_dust', '1x tfc:glue') + .itemOutputs('2x tfg:treated_chipboard_composite') + .duration(100) + .EUt(GTValues.VA[GTValues.LV]) + + event.recipes.gtceu.mixer('gtceu:treated_chipboard_composite_fluid_glue') + .itemInputs('1x gtceu:treated_wood_dust') + .inputFluids(Fluid.of('gtceu:glue', 25)) + .itemOutputs('1x tfg:treated_chipboard_composite') + .duration(10) + .EUt(GTValues.VA[GTValues.LV]) + + + // event.recipes.gtceu.compressor('gtceu:wood_mdf') .itemInputs('1x tfg:chipboard_composite') .itemOutputs('gtceu:wood_plate') diff --git a/kubejs/server_scripts/tfg/primitive/recipes.paper.js b/kubejs/server_scripts/tfg/primitive/recipes.paper.js index 63cc6a933..9fba0ec9e 100644 --- a/kubejs/server_scripts/tfg/primitive/recipes.paper.js +++ b/kubejs/server_scripts/tfg/primitive/recipes.paper.js @@ -156,9 +156,11 @@ function registerTFGPapermakingRecipes(event) { //Beat thermochemically treated hardwood dust into soaked unrefined paper event.recipes.tfc.anvil('tfg:soaked_unrefined_paper', 'gtceu:thermochemically_treated_hardwood_dust', ['hit_last', 'hit_second_last', 'hit_third_last']) .id('tfg:anvil/soaked_unrefined_paper') + event.recipes.greate.pressing(Item.of('tfg:soaked_unrefined_paper'), 'gtceu:thermochemically_treated_hardwood_dust') .recipeTier(0) .id('greate:pressing/soaked_unrefined_paper') + event.custom({ type: "firmalife:stomping", ingredient: { diff --git a/kubejs/server_scripts/tfg/primitive/tags.primitive.js b/kubejs/server_scripts/tfg/primitive/tags.primitive.js index 02915188c..22246eba6 100644 --- a/kubejs/server_scripts/tfg/primitive/tags.primitive.js +++ b/kubejs/server_scripts/tfg/primitive/tags.primitive.js @@ -85,4 +85,29 @@ function registerTFGPrimitiveBlockTags(event) { //added for QOL but doesnt harvest anything event.add('tfg:harvester_harvestable', 'firmalife:grape_fluff_red') event.add('tfg:harvester_harvestable', 'firmalife:grape_fluff_white') +} + +function registerTFGPrimitiveFluidTags(event) { + event.add('tfg:usable_in_small_gear_mold', 'gtceu:copper') + event.add('tfg:usable_in_small_gear_mold', 'gtceu:tin') + event.add('tfg:usable_in_small_gear_mold', 'gtceu:sterling_silver') + event.add('tfg:usable_in_small_gear_mold', 'gtceu:bismuth_bronze') + event.add('tfg:usable_in_small_gear_mold', 'gtceu:bronze') + event.add('tfg:usable_in_small_gear_mold', 'gtceu:zinc') + event.add('tfg:usable_in_small_gear_mold', 'gtceu:silver') + event.add('tfg:usable_in_small_gear_mold', 'gtceu:potin') + event.add('tfg:usable_in_small_gear_mold', 'gtceu:bismuth') + event.add('tfg:usable_in_small_gear_mold', 'gtceu:lead') + event.add('tfg:usable_in_small_gear_mold', 'gtceu:nickel') + event.add('tfg:usable_in_small_gear_mold', 'gtceu:brass') + event.add('tfg:usable_in_small_gear_mold', 'gtceu:gold') + event.add('tfg:usable_in_small_gear_mold', 'gtceu:red_alloy') + event.add('tfg:usable_in_small_gear_mold', 'gtceu:black_bronze') + event.add('tfg:usable_in_small_gear_mold', 'gtceu:rose_gold') + + event.add('tfg:usable_in_rod_mold', 'gtceu:red_alloy') + event.add('tfg:usable_in_rod_mold', 'gtceu:bronze') + event.add('tfg:usable_in_rod_mold', 'gtceu:bismuth_bronze') + event.add('tfg:usable_in_rod_mold', 'gtceu:black_bronze') + event.add('tfg:usable_in_rod_mold', 'gtceu:brass') } \ No newline at end of file diff --git a/kubejs/server_scripts/tfg/recipes.temporary.js b/kubejs/server_scripts/tfg/recipes.temporary.js index 349d3e852..2365c1fca 100644 --- a/kubejs/server_scripts/tfg/recipes.temporary.js +++ b/kubejs/server_scripts/tfg/recipes.temporary.js @@ -9,6 +9,7 @@ function registerTFGTemporaryRecipes(event) { event.shapeless('vintageimprovements:belt_grinder', 'vintageimprovements:lathe') event.shapeless('tfg:ostrum_linear_accelerator', 'gtceu:ostrum_linear_accelerator') + event.shapeless('tfg:steam_bloomery', 'gtceu:steam_bloomery') event.shapeless('greate:rose_quartz_dust', 'gtceu:rose_quartz_dust') event.shapeless('greate:tiny_rose_quartz_dust', 'gtceu:tiny_rose_quartz_dust') diff --git a/kubejs/server_scripts/tfg/tags.js b/kubejs/server_scripts/tfg/tags.js index 0aec9d510..3a474fde3 100644 --- a/kubejs/server_scripts/tfg/tags.js +++ b/kubejs/server_scripts/tfg/tags.js @@ -18,6 +18,9 @@ const registerTFGItemTags = (event) => { registerTFGMarsItemTags(event) registerTFGVenusItemTags(event) + // TEMPORARY, REMOVE WHEN GURMAN FIXES THIS + event.remove('tfc:foods', 'tfc_gurman:havai_pizza') + //Circuit Stuff event.add('tfg:components/uv_leds', 'tfg:uv_led') event.add('tfg:components/uv_leds', 'tfg:smd_uv_led') @@ -137,6 +140,8 @@ const registerTFGBlockTags = (event) => { //#region Fluids const registerTFGFluidTags = (event) => { + registerTFGPrimitiveFluidTags(event) + event.add('tfg:clean_water', 'minecraft:water') event.add('tfg:clean_water', 'tfc:river_water') event.add('tfg:clean_water', 'tfc:spring_water') diff --git a/kubejs/server_scripts/tfg/tags.veins.js b/kubejs/server_scripts/tfg/tags.veins.js index d938a374f..3ab4438e6 100644 --- a/kubejs/server_scripts/tfg/tags.veins.js +++ b/kubejs/server_scripts/tfg/tags.veins.js @@ -72,6 +72,7 @@ const registerTFGOreVeinFeatures = (event) => { event.add('tfg:mars_veins', 'tfg:mars/vein/mars_sapphire') event.add('tfg:mars_veins', 'tfg:mars/vein/mars_graphite') event.add('tfg:mars_veins', 'tfg:mars/vein/mars_hematite') + event.add('tfg:mars_veins', 'tfg:mars/vein/mars_lapis') event.add('tfg:mars_veins', 'tfg:mars/vein/mars_lubricant') event.add('tfg:mars_veins', 'tfg:mars/vein/mars_neodynium') event.add('tfg:mars_veins', 'tfg:mars/vein/mars_nickel') diff --git a/kubejs/server_scripts/tfg/venus/tags.venus.js b/kubejs/server_scripts/tfg/venus/tags.venus.js index f2b77e41a..e9be39331 100644 --- a/kubejs/server_scripts/tfg/venus/tags.venus.js +++ b/kubejs/server_scripts/tfg/venus/tags.venus.js @@ -56,6 +56,7 @@ function registerTFGVenusBlockTags(event) { event.add('ad_astra:venus_stone_replaceables', 'tfc:rock/raw/basalt') event.add('ad_astra:venus_stone_replaceables', 'tfc:rock/hardened/basalt') event.add('ad_astra:venus_stone_replaceables', 'tfc:rock/gravel/basalt') + event.add('ad_astra:venus_stone_replaceables', 'tfc:rock/magma/basalt') event.add('ad_astra:venus_stone_replaceables', 'tfc:rock/raw/rhyolite') event.add('ad_astra:venus_stone_replaceables', 'tfc:rock/hardened/andesite') event.add('ad_astra:venus_stone_replaceables', 'tfc:rock/gravel/andesite') @@ -93,12 +94,11 @@ function registerTFGVenusBlockTags(event) { event.add('ad_astra:venus_stone_replaceables', 'tfc:raw_sandstone/red') event.add('ad_astra:venus_stone_replaceables', 'tfc:sand/black') event.add('ad_astra:venus_stone_replaceables', 'tfc:raw_sandstone/black') - //event.add('ad_astra:venus_stone_replaceables', 'tfg:fluid/geyser_slurry') - //event.add('ad_astra:venus_stone_replaceables', 'tfg:fluid/sulfur_fumes') - event.add('ad_astra:venus_stone_replaceables', 'minecraft:lava') 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', 'minecraft:tuff') + event.add('ad_astra:venus_stone_replaceables', 'minecraft:basalt') + event.add('ad_astra:venus_stone_replaceables', 'minecraft:smooth_basalt') event.add('ad_astra:venus_stone_replaceables', 'betterend:brimstone') event.add('ad_astra:venus_stone_replaceables', 'betterend:flavolite') event.add('ad_astra:venus_stone_replaceables', 'betterend:sandy_jadestone') @@ -109,6 +109,16 @@ function registerTFGVenusBlockTags(event) { event.add('tfc:can_carve', '#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("minecraft:strider_warm_blocks", "create: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('tfc:can_landslide', 'tfg:sand/fluorapatite/blue') event.add('tfc:can_landslide', 'tfg:sand/fluorapatite/green') event.add('tfc:can_landslide', 'tfg:sand/fluorapatite/brown') @@ -129,23 +139,58 @@ function registerTFGVenusBiomeTags(event) { function registerTFGVenusEntityTypeTags(event) { const ENTITIES = [ 'minecraft:enderman', + 'minecraft:magma_cube', + 'minecraft:blaze', + 'minecraft:strider', "endermanoverhaul:desert_enderman", "endermanoverhaul:savanna_enderman", "endermanoverhaul:nether_wastes_enderman", "ad_astra:sulfur_creeper", 'species:cliff_hanger', - 'species:trooper' + 'species:trooper', + 'primitive_creatures:golem_2', + 'arthropocolypse:scarab', + 'arthropocolypse:prairie_grasshopper', + 'arthropocolypse:field_cricket', + 'arthropocolypse:ice_crawler', + 'arthropocolypse:behemoth_desert_spider', + 'arthropocolypse:behemoth_desert_scorpion', + 'arthropocolypse:worker_ant', + 'arthropocolypse:soldier_ant', + 'arthropocolypse:stag_beetle', + 'arthropocolypse:stag_beetle_larva', + 'arthropocolypse:wharf_roach', + 'arthropocolypse:platerodrilus', + 'arthropocolypse:mealworm_beetle', + 'arthropocolypse:mealworm', + 'arthropocolypse:millipede_head', + 'arthropocolypse:millipede_body', + 'arthropocolypse:millipede_tail' ] ENTITIES.forEach(entity => { event.add('ad_astra:can_survive_extreme_heat', entity) event.add('ad_astra:lives_without_oxygen', entity) + event.add('ad_astra:can_survive_in_acid_rain', entity) + event.add('gtceu:heat_immune', entity) }) event.add('tfc:deals_slashing_damage', 'endermanoverhaul:desert_enderman') event.add('tfc:deals_slashing_damage', 'endermanoverhaul:savanna_enderman') event.add('tfc:deals_slashing_damage', 'endermanoverhaul:nether_wastes_enderman') event.add('tfc:deals_slashing_damage', 'species:cliff_hanger') + event.add('tfc:deals_crushing_damage', 'minecraft:magma_cube') + event.add('tfc:deals_crushing_damage', 'primitive_creatures:golem_2') + event.add('tfc:deals_piercing_damage', 'arthropocolypse:scarab') + event.add('tfc:deals_piercing_damage', 'arthropocolypse:ice_crawler') + event.add('tfc:deals_piercing_damage', 'arthropocolypse:behemoth_desert_spider') + event.add('tfc:deals_piercing_damage', 'arthropocolypse:behemoth_desert_scorpion') + event.add('tfc:deals_piercing_damage', 'arthropocolypse:soldier_ant') + event.add('tfc:deals_piercing_damage', 'arthropocolypse:stag_beetle') + event.add('tfc:deals_piercing_damage', 'arthropocolypse:wharf_roach') + event.add('tfc:deals_piercing_damage', 'arthropocolypse:platerodrilus') + event.add('tfc:deals_piercing_damage', 'arthropocolypse:mealworm_beetle') + event.add('tfc:deals_piercing_damage', 'arthropocolypse:millipede_head') } function registerTFGVenusPlacedFeatures(event) { diff --git a/kubejs/server_scripts/tfg/worldgen/entities.js b/kubejs/server_scripts/tfg/worldgen/entities.js deleted file mode 100644 index 491aee336..000000000 --- a/kubejs/server_scripts/tfg/worldgen/entities.js +++ /dev/null @@ -1,100 +0,0 @@ -// priority: 0 -"use strict"; - -const NEW_MOB_MAX_HP = { - // moon mobs - "endermanoverhaul:end_enderman": 50, - "endermanoverhaul:end_islands_enderman": 120, - "endermanoverhaul:windswept_hills_enderman": 70, - "endermanoverhaul:soulsand_valley_enderman": 80, - - // mars mobs -- wan's ancient beasts has its own config for this (also includes sniffer) - "endermanoverhaul:crimson_enderman": 60, - "endermanoverhaul:warped_enderman": 60, - "endermanoverhaul:badlands_enderman": 65, - "endermanoverhaul:cave_enderman": 60, - "ad_astra:martian_raptor": 50, - "tfg:glacian_ram": 50, - "tfg:wraptor": 60, - "species:goober": 100, - "species:stackatick": 20, - "species:springling": 60, - "species:quake": 130, - "species:cruncher": 1200, - - // venus mobs - "endermanoverhaul:savanna_enderman": 65, - "endermanoverhaul:desert_enderman": 70, - "ad_astra:sulfur_creeper": 60, - "species:cliff_hanger": 75, - - // europa mobs - "endermanoverhaul:ice_spikes_enderman": 85, - "endermanoverhaul:snowy_enderman": 80, - "endermanoverhaul:coral_enderman": 80, - "species:leaf_hanger": 85, -}; - -const NEW_MOB_ARMOR = { - // mars - "endermanoverhaul:crimson_enderman": 2, - "endermanoverhaul:warped_enderman": 2, - "endermanoverhaul:badlands_enderman": 2, - "species:quake": 6, - - // venus - "endermanoverhaul:savanna_enderman": 4, - "endermanoverhaul:desert_enderman": 4, - "endermanoverhaul:nether_wastes_enderman": 2, - "ad_astra:sulfur_creeper": 4, - "species:cliff_hanger": 2, -}; - - -// Easier to just keep all entities in here for balancing instead of spreading them around - -EntityEvents.spawned((event) => { - let { entity, entity: { type }, level, level: { dimension } } = event; - - let newHP = NEW_MOB_MAX_HP[type] ?? 0; - - // Special cases - if (type === "minecraft:enderman") { - switch (dimension) { - // use default for beneath - case "ad_astra:moon": newHP = 45; - case "ad_astra:mars": newHP = 55; - case "ad_astra:venus": newHP = 65; - case "ad_astra:mercury": newHP = 65; - case "ad_astra:glacio": newHP = 75; - } - } - else if (type === "endermanoverhaul:nether_wastes_enderman") { - switch (dimension) { - // use default for beneath - case "ad_astra:venus": newHP = 70; - } - } - - if (newHP === 0) - return; - - - let baseHealth = entity.maxHealth; - let missingHealth = newHP - baseHealth; - - entity.modifyAttribute("minecraft:generic.max_health", "tfg_health_buff_id", missingHealth, "addition"); - - if (missingHealth > 0) { - entity.health += missingHealth; - } - - - let newArmor = NEW_MOB_ARMOR[type] ?? 0; - if (newArmor === 0) - return; - - let baseArmor = entity.armor; - let missingArmor = newArmor - baseArmor; - entity.modifyAttribute("minecraft:generic.armor", "tfg_armor_buff_id", missingArmor, "addition"); -}) \ No newline at end of file diff --git a/kubejs/server_scripts/tfg/worldgen/events.entities.js b/kubejs/server_scripts/tfg/worldgen/events.entities.js new file mode 100644 index 000000000..8534d677a --- /dev/null +++ b/kubejs/server_scripts/tfg/worldgen/events.entities.js @@ -0,0 +1,184 @@ +// priority: 0 +"use strict"; + +const NEW_MOB_MAX_HP = { + // earth mobs + "primitive_creatures:beast": 40, + + // moon mobs + "endermanoverhaul:end_enderman": 50, + "endermanoverhaul:end_islands_enderman": 120, + "endermanoverhaul:windswept_hills_enderman": 70, + "endermanoverhaul:soulsand_valley_enderman": 80, + + // mars mobs -- wan's ancient beasts has its own config for this (also includes sniffer) + "endermanoverhaul:crimson_enderman": 60, + "endermanoverhaul:warped_enderman": 60, + "endermanoverhaul:badlands_enderman": 65, + "endermanoverhaul:cave_enderman": 60, + "ad_astra:martian_raptor": 50, + "tfg:glacian_ram": 50, + "tfg:wraptor": 60, + "species:goober": 100, + "species:stackatick": 20, + "species:springling": 60, + "species:quake": 130, + "species:cruncher": 1200, + + // venus mobs + "endermanoverhaul:savanna_enderman": 85, + "endermanoverhaul:desert_enderman": 90, + "ad_astra:sulfur_creeper": 60, + "species:cliff_hanger": 95, + "species:trooper": 30, + "minecraft:blaze": 80, + "minecraft:strider": 50, + 'arthropocolypse:scarab': 10, + 'arthropocolypse:prairie_grasshopper': 15, + 'arthropocolypse:field_cricket': 20, + 'arthropocolypse:ice_crawler': 70, + 'arthropocolypse:behemoth_desert_spider': 1300, + 'arthropocolypse:behemoth_desert_scorpion': 200, + 'arthropocolypse:worker_ant': 30, + 'arthropocolypse:soldier_ant': 60, + 'arthropocolypse:stag_beetle': 90, + 'arthropocolypse:stag_beetle_larva': 20, + 'arthropocolypse:wharf_roach': 20, + 'arthropocolypse:platerodrilus': 95, + 'arthropocolypse:mealworm_beetle': 50, + 'arthropocolypse:mealworm': 15, + 'arthropocolypse:millipede_head': 110, + 'arthropocolypse:millipede_body': 110, + 'arthropocolypse:millipede_tail': 110, + + // europa mobs + "endermanoverhaul:ice_spikes_enderman": 85, + "endermanoverhaul:snowy_enderman": 80, + "endermanoverhaul:coral_enderman": 80, + "species:leaf_hanger": 85, +}; + +const NEW_MOB_ARMOR = { + // mars + "endermanoverhaul:crimson_enderman": 2, + "endermanoverhaul:warped_enderman": 2, + "endermanoverhaul:badlands_enderman": 2, + "species:quake": 6, + + // venus + "endermanoverhaul:savanna_enderman": 4, + "endermanoverhaul:desert_enderman": 4, + "endermanoverhaul:nether_wastes_enderman": 2, + "ad_astra:sulfur_creeper": 4, + "species:cliff_hanger": 2, +}; + +const NEEDS_FIREPROOFING = [ + "primitive_creatures:golem_2", + "endermanoverhaul:savanna_enderman", + "endermanoverhaul:desert_enderman", + 'arthropocolypse:scarab', + 'arthropocolypse:prairie_grasshopper', + 'arthropocolypse:field_cricket', + 'arthropocolypse:ice_crawler', + 'arthropocolypse:behemoth_desert_spider', + 'arthropocolypse:behemoth_desert_scorpion', + 'arthropocolypse:worker_ant', + 'arthropocolypse:soldier_ant', + 'arthropocolypse:stag_beetle', + 'arthropocolypse:stag_beetle_larva', + 'arthropocolypse:wharf_roach', + 'arthropocolypse:platerodrilus', + 'arthropocolypse:mealworm_beetle', + 'arthropocolypse:mealworm', + 'arthropocolypse:millipede_head', + 'arthropocolypse:millipede_body', + 'arthropocolypse:millipede_tail' +]; + +const VENUS_DAMAGE_BUFFING = { + "primitive_creatures:golem_2": 10, + "endermanoverhaul:savanna_enderman": 10, + "endermanoverhaul:desert_enderman": 10, + 'arthropocolypse:scarab': 4, + 'arthropocolypse:ice_crawler': 12, + 'arthropocolypse:behemoth_desert_spider': 30, + 'arthropocolypse:behemoth_desert_scorpion': 20, + 'arthropocolypse:worker_ant': 10, + 'arthropocolypse:soldier_ant': 15, + 'arthropocolypse:stag_beetle': 8, + 'arthropocolypse:wharf_roach': 8, + 'arthropocolypse:platerodrilus': 14, + 'arthropocolypse:mealworm_beetle': 8, + 'arthropocolypse:millipede_head': 20, +}; + + +// Easier to just keep all entities in here for balancing instead of spreading them around + +EntityEvents.spawned((event) => { + let { entity, entity: { type }, level, level: { dimension } } = event; + + let newHP = NEW_MOB_MAX_HP[type] ?? 0; + + // Special cases + if (type === "minecraft:enderman") { + switch (dimension) { + // use default for beneath + case "ad_astra:moon": newHP = 45; + case "ad_astra:mars": newHP = 65; + case "ad_astra:venus": newHP = 75; + case "ad_astra:mercury": newHP = 75; + case "ad_astra:glacio": newHP = 85; + } + } + else if (type === "endermanoverhaul:nether_wastes_enderman") { + switch (dimension) { + // use default for beneath + case "ad_astra:venus": newHP = 80; + } + } + else if (type === "minecraft:magma_cube") { + switch (dimension) { + // use default for beneath + case "ad_astra:venus": newHP = entity.maxHealth * 7; + } + } + else if (type === "primitive_creatures:golem_2") { + switch (dimension) { + // use default for beneath + case "ad_astra:venus": newHP = 90; + } + } + + // Add fire immunity to some things + if (NEEDS_FIREPROOFING.includes(type)) { + entity.potionEffects.add("minecraft:fire_resistance", -1, 0, true, false); + } + + + if (newHP !== 0) { + let baseHealth = entity.maxHealth; + let missingHealth = newHP - baseHealth; + + entity.modifyAttribute("minecraft:generic.max_health", "tfg_health_buff_id", missingHealth, "addition"); + + if (missingHealth > 0) { + entity.health += missingHealth; + } + } + + let newArmor = NEW_MOB_ARMOR[type] ?? 0; + if (newArmor !== 0) { + let baseArmor = entity.armor; + let missingArmor = newArmor - baseArmor; + entity.modifyAttribute("minecraft:generic.armor", "tfg_armor_buff_id", missingArmor, "addition"); + } + + let newAttack = VENUS_DAMAGE_BUFFING[type] ?? 0 + if (dimension === "ad_astra:venus" && newAttack !== 0) { + let baseAttack = entity.attack_damage; + let missingAttack = newAttack - baseAttack; + entity.modifyAttribute("minecraft:generic.attack_damage", "tfg_attack_buff_id", missingAttack, "addition"); + } +}) \ No newline at end of file diff --git a/kubejs/server_scripts/tfg/worldgen/select_climates.js b/kubejs/server_scripts/tfg/worldgen/select_climates.js index 0fda74bd9..d31b1ecb7 100644 --- a/kubejs/server_scripts/tfg/worldgen/select_climates.js +++ b/kubejs/server_scripts/tfg/worldgen/select_climates.js @@ -14,9 +14,16 @@ TFCEvents.selectClimateModel(event => { event.setModel('tfg:mars_climate'); break; + case 'ad_astra:venus': + event.setModel('tfg:venus_climate'); + break; + case 'ad_astra:earth_orbit': case 'ad_astra:moon_orbit': case 'ad_astra:mars_orbit': + case 'ad_astra:venus_orbit': + case 'ad_astra:mercury_orbit': + case 'ad_astra:glacio_orbit': event.setModel('tfg:orbit_climate'); break; diff --git a/kubejs/server_scripts/vintage_improvements/recipes.js b/kubejs/server_scripts/vintage_improvements/recipes.js index 7bc7f8907..5f908e4b3 100644 --- a/kubejs/server_scripts/vintage_improvements/recipes.js +++ b/kubejs/server_scripts/vintage_improvements/recipes.js @@ -56,7 +56,7 @@ function registerVintageImprovementsRecipes(event) { ' A ' ], { A: '#forge:plates/treated_wood', - B: '#forge:rods/long/black_steel', + B: '#forge:rods/long/steel', C: 'create:andesite_casing', D: '#forge:frames/treated_wood', E: 'greate:steel_cogwheel' @@ -166,8 +166,7 @@ function registerVintageImprovementsRecipes(event) { ] let HAMMERING_ITEMS = [ - { input: 'tfc:raw_iron_bloom', output: 'tfc:refined_iron_bloom', blows: STARTING_BLOWS }, - { input: 'tfc:refined_iron_bloom', output: 'gtceu:wrought_iron_ingot', blows: STARTING_BLOWS } + { input: 'gtceu:thermochemically_treated_hardwood_dust', output: 'tfg:soaked_unrefined_paper', blows: 3 } ] HAMMERING_MATERIALS.forEach(x => { @@ -175,6 +174,11 @@ function registerVintageImprovementsRecipes(event) { x.blows--; }) + HAMMERING_ITEMS.forEach(x => { + generateHammeringRecipeFromItem(event, x.input, x.output, x.blows, 'copper'); + x.blows--; + }) + // Tier 2 HAMMERING_MATERIALS.push({ material: GTMaterials.Bronze, blows: STARTING_BLOWS }) HAMMERING_MATERIALS.push({ material: GTMaterials.BlackBronze, blows: STARTING_BLOWS }) @@ -183,6 +187,9 @@ function registerVintageImprovementsRecipes(event) { HAMMERING_MATERIALS.push({ material: GTMaterials.RedAlloy, blows: STARTING_BLOWS }) HAMMERING_MATERIALS.push({ material: GTMaterials.Potin, blows: STARTING_BLOWS }) + HAMMERING_ITEMS.push({ input: 'tfc:raw_iron_bloom', output: 'tfc:refined_iron_bloom', blows: STARTING_BLOWS }) + HAMMERING_ITEMS.push({ input: 'tfc:refined_iron_bloom', output: 'gtceu:wrought_iron_ingot', blows: STARTING_BLOWS }) + HAMMERING_MATERIALS.forEach(x => { generateHammeringRecipe(event, x.material, x.blows, 'bronze'); generateHammeringRecipe(event, x.material, x.blows, 'black_bronze'); diff --git a/kubejs/startup_scripts/arthropocolypse/constants.js b/kubejs/startup_scripts/arthropocolypse/constants.js new file mode 100644 index 000000000..b3db71b5d --- /dev/null +++ b/kubejs/startup_scripts/arthropocolypse/constants.js @@ -0,0 +1,12 @@ +// priority: -100 +"use strict"; + +global.ARTHROPOCOLYPSE_DISABLED_ITEMS = [ + 'arthropocolypse:beetle_helmet', + 'arthropocolypse:beetle_chestplate', + 'arthropocolypse:beetle_leggings', + 'arthropocolypse:beetle_boots', + 'arthropocolypse:gilded_scale_elytra', + 'arthropocolypse:gilded_double_head_axe', + 'arthropocolypse:carrot_piece' +]; \ No newline at end of file diff --git a/kubejs/startup_scripts/greate/constants.js b/kubejs/startup_scripts/greate/constants.js index 5d7c82439..7259a3d08 100644 --- a/kubejs/startup_scripts/greate/constants.js +++ b/kubejs/startup_scripts/greate/constants.js @@ -1,17 +1,38 @@ // priority: -100 "use strict"; +global.GREATE_MATERIAL_TIERS = [ + 'andesite_alloy', + 'steel', + 'aluminium', + 'stainless_steel', + 'titanium', + 'tungsten_steel', + 'rhodium_plated_palladium', + 'naquadah_alloy', + 'darmstadtium', + 'neutronium' +]; + +global.AVAILABLE_GREATE_MATERIAL_TIERS = [ + 'andesite_alloy', + 'steel', + 'aluminium', + 'stainless_steel', + 'titanium' +]; + global.GREATE_DISABLED_ITEMS = /** @type {const} */ ([ "greate:andesite_alloy_alloy", - "greate:steel_alloy", - "greate:aluminium_alloy", - "greate:stainless_steel_alloy", - "greate:titanium_alloy", - "greate:tungsten_steel_alloy", - "greate:rhodium_plated_palladium_alloy", - "greate:naquadah_alloy_alloy", - "greate:darmstadtium_alloy", - "greate:neutronium_alloy", + "gtceu:steel_alloy", + "gtceu:aluminium_alloy", + "gtceu:stainless_steel_alloy", + "gtceu:titanium_alloy", + "gtceu:tungsten_steel_alloy", + "gtceu:rhodium_plated_palladium_alloy", + "gtceu:naquadah_alloy_alloy", + "gtceu:darmstadtium_alloy", + "gtceu:neutronium_alloy", "gtceu:neutronium_whisk", "greate:polyethylene_belt_connector", diff --git a/kubejs/startup_scripts/gtceu/constants.js b/kubejs/startup_scripts/gtceu/constants.js index 69fb165d4..92c377a5e 100644 --- a/kubejs/startup_scripts/gtceu/constants.js +++ b/kubejs/startup_scripts/gtceu/constants.js @@ -230,7 +230,12 @@ global.GTCEU_DISABLED_ITEMS = /** @type {const} */ ([ "gtceu:thorium_block", "gtceu:thorium_plate", "gtceu:double_thorium_plate", - "gtceu:thorium_rod" + "gtceu:thorium_rod", + "gtceu:thorium_bucket", + + // Replaced with our own + "gtceu:paracetamol_pill", + "gtceu:rad_away_pill" ]); //#endregion diff --git a/kubejs/startup_scripts/gtceu/machines.js b/kubejs/startup_scripts/gtceu/machines.js index 7f2d2099f..864e69f0e 100644 --- a/kubejs/startup_scripts/gtceu/machines.js +++ b/kubejs/startup_scripts/gtceu/machines.js @@ -2,49 +2,8 @@ const registerGTCEuMachines = (event) => { - const $SteamMulti = Java.loadClass('com.gregtechceu.gtceu.common.machine.multiblock.steam.SteamParallelMultiblockMachine'); - const $Tags = Java.loadClass("dev.latvian.mods.kubejs.util.Tags") const CoilWorkableElectricMultiblockMachine = Java.loadClass("com.gregtechceu.gtceu.api.machine.multiblock.CoilWorkableElectricMultiblockMachine") - //#region Steam Bloomery - - event.create('steam_bloomery', 'multiblock') - .machine((holder) => new $SteamMulti(holder, 8)) - .rotationState(RotationState.NON_Y_AXIS) - .recipeType('steam_bloomery') - .recipeModifier((machine, recipe) => $SteamMulti.recipeModifier(machine, recipe), true) - .appearanceBlock(GTBlocks.CASING_BRONZE_BRICKS) - .pattern(definition => FactoryBlockPattern.start() - .aisle(" F ", " C ", " E ", " E ", " E ") - .aisle("FCF", "C#C", "E#E", "E#E", "E#E") - .aisle(" F ", "CXC", " E ", " E ", " E ") - .where('X', Predicates.controller(Predicates.blocks(definition.get()))) - .where('C', Predicates.blockTag($Tags.block("tfc:bloomery_insulation"))) - .where('F', Predicates.blocks(GTBlocks.FIREBOX_BRONZE.get()) - .or(Predicates.abilities(PartAbility.STEAM).setExactLimit(1))) - .where('E', Predicates.abilities(PartAbility.STEAM_IMPORT_ITEMS).setMaxGlobalLimited(2) - .or(Predicates.abilities(PartAbility.STEAM_EXPORT_ITEMS).setExactLimit(1)) - .or(Predicates.blockTag($Tags.block("tfc:bloomery_insulation")))) - .where('#', Predicates.air()) - .where(' ', Predicates.any()) - .build() - ) - .shapeInfo(controller => MultiblockShapeInfo.builder() - .aisle(" F ", " C ", " C ", " C ", " C ") - .aisle("FCF", "C#C", "C#C", "C#C", "C#C") - .aisle(" i ", "CXC", " O ", " I ", " C ") - .where('X', controller, Direction.SOUTH) - .where('C', Block.getBlock('tfc:rock/bricks/rhyolite')) - .where('F', GTBlocks.FIREBOX_BRONZE.get()) - .where('i', GTMachines.STEAM_HATCH, Direction.SOUTH) - .where('O', GTMachines.STEAM_EXPORT_BUS, Direction.SOUTH) - .where('I', GTMachines.STEAM_IMPORT_BUS, Direction.SOUTH) - .build() - ) - .workableCasingModel( - "gtceu:block/casings/solid/machine_casing_bronze_plated_bricks", - "tfg:block/steam_bloomery") - //#endregion //#region Large Solar Panels //Tier 1 diff --git a/kubejs/startup_scripts/gtceu/material_modification.js b/kubejs/startup_scripts/gtceu/material_modification.js index 50476a695..dffc9f8ed 100644 --- a/kubejs/startup_scripts/gtceu/material_modification.js +++ b/kubejs/startup_scripts/gtceu/material_modification.js @@ -12,6 +12,7 @@ const registerGTCEuMaterialModification = (event) => { const $ITEM_PIPE_PROPERTY = Java.loadClass('com.gregtechceu.gtceu.api.data.chemical.material.properties.ItemPipeProperties') const $FLUID_PIPE_PROPERTY = Java.loadClass('com.gregtechceu.gtceu.api.data.chemical.material.properties.FluidPipeProperties') const $HAZARD_PROPERTY = Java.loadClass('com.gregtechceu.gtceu.api.data.chemical.material.properties.HazardProperty') + const $TFGT_MEDICAL_CONDITIONS = Java.loadClass('su.terrafirmagreg.core.common.data.tfgt.TFGTMedicalConditions') const $MATERIAL_FLAGS = Java.loadClass('com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags') @@ -147,9 +148,9 @@ const registerGTCEuMaterialModification = (event) => { let AlSi = GTMaterials.get('aluminium_silicate') AlSi.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(1540, 1540, 1540, 1)) GTMaterials.Kyanite.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(1540, 1540, 1540, AlSi, 1, 95)) - GTMaterials.Mica.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(1540, 1540, 1540, AlSi, 1, 90)) - GTMaterials.Spodumene.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(1540, 1540, 1540, AlSi, 1, 85)) - GTMaterials.Pollucite.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(1540, 1540, 1540, AlSi, 1, 85)) + GTMaterials.Mica.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(1540, 1540, 1540, AlSi, 1, 40)) + GTMaterials.Spodumene.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(1540, 1540, 1540, AlSi, 1, 30)) + GTMaterials.Pollucite.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(1540, 1540, 1540, AlSi, 1, 25)) GTMaterials.Gold.addFlags(GENERATE_BELL); @@ -368,7 +369,7 @@ const registerGTCEuMaterialModification = (event) => { GTMaterials.Cobaltite.setProperty(PropertyKey.HAZARD, new $HAZARD_PROPERTY($HAZARD_PROPERTY.HazardTrigger.INHALATION, GTMedicalConditions.ARSENICOSIS, 1, false)); GTMaterials.Galena.setProperty(PropertyKey.HAZARD, new $HAZARD_PROPERTY($HAZARD_PROPERTY.HazardTrigger.INHALATION, GTMedicalConditions.WEAK_POISON, 1, false)); GTMaterials.Chromite.setProperty(PropertyKey.HAZARD, new $HAZARD_PROPERTY($HAZARD_PROPERTY.HazardTrigger.SKIN_CONTACT, GTMedicalConditions.IRRITANT, 1, false)); - GTMaterials.Thorium.setProperty(PropertyKey.HAZARD, new $HAZARD_PROPERTY($HAZARD_PROPERTY.HazardTrigger.ANY, GTMedicalConditions.CARCINOGEN, 1, true)); + GTMaterials.Thorium.setProperty(PropertyKey.HAZARD, new $HAZARD_PROPERTY($HAZARD_PROPERTY.HazardTrigger.ANY, $TFGT_MEDICAL_CONDITIONS.RADIOACTIVE, 1, true)); // This contains hazardous elements so GT tags it as hazardous automatically GTMaterials.get('ostrum').getProperties().removeProperty(PropertyKey.HAZARD); @@ -439,6 +440,8 @@ const registerGTCEuMaterialModification = (event) => { GTMaterials.RhodiumPlatedPalladium.setMaterialARGB(0xFFC2EC) GTMaterials.Rhenium.setMaterialARGB(0x8cb07f) GTMaterials.Rhenium.setMaterialSecondaryARGB(0x9ccbd6) + GTMaterials.Diamond.setMaterialARGB(0x4AEDD9) + GTMaterials.Diamond.setMaterialSecondaryARGB(0x1AAAA7) global.MINECRAFT_DYE_NAMES.forEach(colorName => { @@ -457,6 +460,9 @@ const registerGTCEuMaterialModification = (event) => { zirconium_diboride.setProperty(PropertyKey.BLAST, new $BLAST_PROPERTY(4500, "high", GTValues.VA[GTValues.EV], 2700, GTValues.VA[GTValues.HV], 12.5*20)); GTMaterials.CertusQuartz.setComponents('1x unknown', '1x silicon', '2x oxygen') + GTMaterials.Glowstone.setComponents('1x gold', '1x redstone') GTMaterials.GraniteRed.setComponents([]) GTMaterials.GraniteRed.setFormula("?") + GTMaterials.Thorium.setFormula('ThO2') + GTMaterials.Americium.setFormula('Am²⁴³') } \ 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 39c361169..3cffd2c81 100644 --- a/kubejs/startup_scripts/gtceu/recipe_types.js +++ b/kubejs/startup_scripts/gtceu/recipe_types.js @@ -1,12 +1,5 @@ const registerGTCEuRecipeTypes = (event) => { - event.create('steam_bloomery') - .category('steam_bloomery') - .setEUIO('in') - .setMaxIOSize(2, 1, 0, 0) - .setProgressBar(GuiTextures.PROGRESS_BAR_ARROW, FillDirection.LEFT_TO_RIGHT) - .setSound(GTSoundEntries.FIRE) - event.create('large_solar_panel') .category('generator') .setEUIO('out') diff --git a/kubejs/startup_scripts/tfc/item_stack_modifiers.js b/kubejs/startup_scripts/tfc/item_stack_modifiers.js index 713bcfab2..2f1261fd7 100644 --- a/kubejs/startup_scripts/tfc/item_stack_modifiers.js +++ b/kubejs/startup_scripts/tfc/item_stack_modifiers.js @@ -3,15 +3,31 @@ TFCEvents.registerItemStackModifier(event => { + // for adding bowls to dynamic_bowl-type foods event.withInput('tfg:add_bowl', (output, input) => { TFC.misc.getFood(output).setBowl(input) return output; }); + // for adding bowls to foods that are not dynamic_bowls + event.withInput('tfg:force_add_bowl', (output, input) => { + if (input.nbt) { + output.orCreateTag.merge(input.nbt) + } + + if (output.nbt) { + output.nbt.put('bowl', { Count: 1, id: 'minecraft:bowl' }); + } + else { + output.nbt = { bowl: { Count: true, id: 'minecraft:bowl' }}; + } + return output; + }); + + // if you're doing any sort of recipe where you need the nbt copied from input to output event.withInput('tfg:copy_nbt', (output, input) => { - let { nbt } = input - if (nbt) { - output.orCreateTag.merge(nbt) + if (input.nbt) { + output.orCreateTag.merge(input.nbt) } return output }) diff --git a/kubejs/startup_scripts/tfg/blocks.crops.js b/kubejs/startup_scripts/tfg/blocks.crops.js index 289eee7d1..700f6610d 100644 --- a/kubejs/startup_scripts/tfg/blocks.crops.js +++ b/kubejs/startup_scripts/tfg/blocks.crops.js @@ -198,7 +198,7 @@ const registerTFGCrops = (event) => { .type('spreading') .soundType('crop') .spreadingFruitBlock('betterend:cave_pumpkin') - .seeds('betterend:cave_pumpkin_seeds') + .seeds('betterend:cave_pumpkin_plant_seeds') .hardness(0.2) .tagBoth('tfc:wild_crops') .tagBlock('minecraft:mineable/hoe') diff --git a/kubejs/startup_scripts/tfg/blocks.js b/kubejs/startup_scripts/tfg/blocks.js index 85b9d9286..c358ce8c7 100644 --- a/kubejs/startup_scripts/tfg/blocks.js +++ b/kubejs/startup_scripts/tfg/blocks.js @@ -28,4 +28,8 @@ const registerTFGBlocks = (event) => { .requiresTool(false) .textureAll('tfg:item/deprecated') + event.create('gtceu:steam_bloomery') + .tagBlock('gtceu:mineable/pickaxe_or_wrench') + .requiresTool(false) + .textureAll('tfg:item/deprecated') } diff --git a/kubejs/startup_scripts/tfg/constants.js b/kubejs/startup_scripts/tfg/constants.js index 630c96719..efbac9cbe 100644 --- a/kubejs/startup_scripts/tfg/constants.js +++ b/kubejs/startup_scripts/tfg/constants.js @@ -122,7 +122,7 @@ global.VENUS_BIOMES = [ 'tfg:venus/salt_flats', 'tfg:venus/stromatolite_beach', 'tfg:venus/sulfuric_ravine', - 'tfg:venus/volcanic_mountains' + 'tfg:venus/scorching_volcanoes' ] /** diff --git a/kubejs/startup_scripts/tfg/materials.js b/kubejs/startup_scripts/tfg/materials.js index f3fad7184..061ae2404 100644 --- a/kubejs/startup_scripts/tfg/materials.js +++ b/kubejs/startup_scripts/tfg/materials.js @@ -105,6 +105,7 @@ const registerTFGMaterials = (event) => { .secondaryColor(0xfffef0) .iconSet(GTMaterialIconSet.getByName('tfc_cassiterite')) .ingot() + .liquid() .blastTemp(3700, 'mid', GTValues.VA[GTValues.IV], (20*120)) .rotorStats(250, 90, 2 ,620) .flags( diff --git a/kubejs/startup_scripts/tfg/primitive/items.primitive.js b/kubejs/startup_scripts/tfg/primitive/items.primitive.js index 4b38b1910..210b42f18 100644 --- a/kubejs/startup_scripts/tfg/primitive/items.primitive.js +++ b/kubejs/startup_scripts/tfg/primitive/items.primitive.js @@ -144,6 +144,7 @@ function registerTFGPrimitiveItems(event) { .texture("fluid", "tfg:item/mold/fired/rod_mold_overlay") .tag('tfc:fired_molds') .tag('tfc:molds') + .fluidTagAccept('tfg:usable_in_rod_mold') .tfcccAllowedInMoldTable([ "XXXXXXXXXXXXXX", "XXXXXXXXXXXXXX", @@ -167,6 +168,7 @@ function registerTFGPrimitiveItems(event) { .texture("fluid", "tfg:item/mold/fired/small_gear_mold_overlay") .tag('tfc:fired_molds') .tag('tfc:molds') + .fluidTagAccept('tfg:usable_in_small_gear_mold') .tfcccAllowedInMoldTable([ "XXXXXXXXXXXXXX", "XXXXXXX XXXX", @@ -190,6 +192,7 @@ function registerTFGPrimitiveItems(event) { .texture("fluid", "tfg:item/mold/fired/nugget_mold_overlay") .tag('tfc:fired_molds') .tag('tfc:molds') + .fluidTagAccept('tfc:usable_in_ingot_mold') .tfcccAllowedInMoldTable([ "XXXXXXXXXXXXXX", "XXXXXXXXXXXXXX", diff --git a/kubejs/startup_scripts/tfg/venus/blocks.venus_deco.js b/kubejs/startup_scripts/tfg/venus/blocks.venus_deco.js index 35f5341fa..f8eec30b8 100644 --- a/kubejs/startup_scripts/tfg/venus/blocks.venus_deco.js +++ b/kubejs/startup_scripts/tfg/venus/blocks.venus_deco.js @@ -5,6 +5,7 @@ function registerTFGWorldGenVenusDecoBlocks(event) { event.create('tfg:geyser_source', 'tfg:particle_emitter_decoration') .soundType('dripstone_block') .mapColor('color_white') + .box(3, 0, 3, 13, 10, 13) .resistance(6) .hardness(1.5) .particleOffset(0.3, 1, 0.3) @@ -16,6 +17,7 @@ function registerTFGWorldGenVenusDecoBlocks(event) { event.create('tfg:geyser_source_small', 'tfg:particle_emitter_decoration') .soundType('dripstone_block') .mapColor('color_white') + .box(3, 0, 3, 13, 10, 13) .resistance(6) .hardness(1.5) .particleOffset(0.3, 1, 0.3) @@ -24,6 +26,30 @@ function registerTFGWorldGenVenusDecoBlocks(event) { .particleCount(2) .particleForced(false) + event.create('tfg:smoker_source', 'tfg:particle_emitter_decoration') + .soundType('dripstone_block') + .mapColor('color_gray') + .box(3, 0, 3, 13, 10, 13) + .resistance(6) + .hardness(1.5) + .particleOffset(0.3, 1, 0.3) + .particleVelocity(0, 0.05, 0) + .particle('minecraft:campfire_cosy_smoke') + .particleCount(1) + .particleForced(false) + + event.create('tfg:lava_source', 'tfg:particle_emitter_decoration') + .soundType('dripstone_block') + .mapColor('color_black') + .box(3, 0, 3, 13, 10, 13) + .resistance(6) + .hardness(1.5) + .particleOffset(0.3, 0.5, 0.3) + .particleVelocity(0, 0, 0) + .particle('lava') + .particleCount(1) + .particleForced(false) + //Geyserite event.create('tfg:rock/raw/geyserite', 'tfc:raw_rock') .textureAll('tfg:block/planets/venus/geyserite') @@ -285,4 +311,20 @@ function registerTFGWorldGenVenusDecoBlocks(event) { .box(3, 0, 3, 13, 16, 13) .tagItem('tfg:venus_plants') .tagBlock('tfg:do_not_destroy_in_space') + + event.create('betterend:shadow_plant', 'tfg:decorative_plant') + .soundType('crop') + .mapColor('color_black') + .box(3, 0, 3, 13, 10, 13) + .tagItem('tfg:venus_plants') + .tagBlock('tfg:do_not_destroy_in_space') + + event.create('betterend:twisted_vine', 'tfg:tall_decorative_plant') + .height(3) + .soundType('crop') + .mapColor('color_black') + .box(3, 0, 3, 13, 16, 13) + .tagItem('tfg:venus_plants') + .tagBlock('tfg:do_not_destroy_in_space') + } \ No newline at end of file diff --git a/kubejs/startup_scripts/tfg/worldgen/register_climates.js b/kubejs/startup_scripts/tfg/worldgen/register_climates.js index 946e6d24a..12e9b7a0c 100644 --- a/kubejs/startup_scripts/tfg/worldgen/register_climates.js +++ b/kubejs/startup_scripts/tfg/worldgen/register_climates.js @@ -162,7 +162,7 @@ TFCEvents.registerClimateModel(event => { }) builder.setAirFog((level, pos, calendarTicks) => 0) - builder.setWaterFog((level, pos, calendarTicks) => 0.6) + builder.setWaterFog((level, pos, calendarTicks) => 0.02) builder.setWindVector((level, block, calendarTicks) => builder.vector(0, 0)) }) @@ -176,7 +176,7 @@ TFCEvents.registerClimateModel(event => { builder.setAverageTemperatureCalculation((level, pos) => -270) builder.setAverageRainfallCalculation((level, pos) => 0) builder.setAirFog((level, pos, calendarTicks) => 0) - builder.setWaterFog((level, pos, calendarTicks) => 0.25) + builder.setWaterFog((level, pos, calendarTicks) => 0.02) builder.setWindVector((level, block, calendarTicks) => builder.vector(0, 0)) }) @@ -192,7 +192,7 @@ TFCEvents.registerClimateModel(event => { builder.setAverageTemperatureCalculation((level, pos) => -5) builder.setAverageRainfallCalculation((level, pos) => 0) builder.setAirFog((level, pos, calendarTicks) => 0) - builder.setWaterFog((level, pos, calendarTicks) => 0.25) + builder.setWaterFog((level, pos, calendarTicks) => 0.02) builder.setWindVector((level, block, calendarTicks) => builder.vector(0, 0)) }) @@ -226,4 +226,37 @@ TFCEvents.registerClimateModel(event => { builder.setAirFog(controller.createFogCallback(builder)); builder.setWindVector(controller.createWindCallback(builder)); }) + + event.register('tfg:venus_climate', builder => { + + builder.setCurrentTemperatureCalculation((level, pos, calendarTicks, daysInMonth) => { + if (OxygenAPI.hasOxygen(level, pos.above())) { + return OXYGENATED_TEMP; + } + + let avgTemp = calcAverage(pos.z, global.VENUS_PLANET_SIZE, 454, 474); + return calcCurrentTemp(avgTemp, 58, pos.y, calendarTicks, 10, 670, 1); + }) + + // Add a little variation for these + builder.setAverageTemperatureCalculation((level, pos) => { + return calcAverage(pos.z, global.VENUS_PLANET_SIZE, 454, 474); + }) + + builder.setAverageRainfallCalculation((level, pos) => { + return calcAverage(pos.x, global.VENUS_PLANET_SIZE / 4, 250, 350); + }) + + builder.setAirFog((level, pos, calendarTicks) => 0) + builder.setWaterFog((level, pos, calendarTicks) => 0.6) + // Make up something for the wind. Apparently Venus irl is not very windy on the surface + builder.setWindVector((level, block, calendarTicks) => { + const strength = Math.max(0, Math.sin(calendarTicks / 10000)) * 0.2; + + const newX = Math.cos(calendarTicks / 2400) * strength; + const newZ = Math.sin(calendarTicks / 2400) * strength; + + return builder.vector(newX, newZ); + }) + }) }) \ No newline at end of file diff --git a/pakku-lock.json b/pakku-lock.json index 365c15b14..f6747ac0d 100644 --- a/pakku-lock.json +++ b/pakku-lock.json @@ -1499,7 +1499,7 @@ "files": [ { "type": "modrinth", - "file_name": "balm-forge-1.20.1-7.3.37-all.jar", + "file_name": "balm-forge-1.20.1-7.3.38-all.jar", "mc_versions": [ "1.20", "1.20.1" @@ -1508,20 +1508,20 @@ "forge" ], "release_type": "release", - "url": "https://cdn.modrinth.com/data/MBAkmtvl/versions/Ue8C6cKq/balm-forge-1.20.1-7.3.37-all.jar", - "id": "Ue8C6cKq", + "url": "https://cdn.modrinth.com/data/MBAkmtvl/versions/8rz04Kha/balm-forge-1.20.1-7.3.38-all.jar", + "id": "8rz04Kha", "parent_id": "MBAkmtvl", "hashes": { - "sha512": "3f01038d48f068ebc9941ad9ea23266e7f25a8851bb8f4ac4dd150bb2eddf10f6b2c0dac6e2a8d2cf4af2febfb884766f5ca000cf460d53ccde87cead2b0b5a8", - "sha1": "8ed877e61adf550c68aa4fc75d163ff97c0c5006" + "sha512": "7b7e100a9de75750e402ecc1e2d1c88bf2f16fa1cf095656d87918d37a0472f163b0c6242c68b38285410513ff6a66b31c5620139c2901e7b235657027c71f50", + "sha1": "c689f4cbe1a5250177aced15b66ca251d9476d35" }, "required_dependencies": [], - "size": 590487, - "date_published": "2025-10-09T16:46:34.849157Z" + "size": 591398, + "date_published": "2026-01-05T11:43:40.856151Z" }, { "type": "curseforge", - "file_name": "balm-forge-1.20.1-7.3.37-all.jar", + "file_name": "balm-forge-1.20.1-7.3.38-all.jar", "mc_versions": [ "1.20.1", "1.20" @@ -1530,16 +1530,16 @@ "forge" ], "release_type": "release", - "url": "https://edge.forgecdn.net/files/7087/245/balm-forge-1.20.1-7.3.37-all.jar", - "id": "7087245", + "url": "https://edge.forgecdn.net/files/7420/617/balm-forge-1.20.1-7.3.38-all.jar", + "id": "7420617", "parent_id": "531761", "hashes": { - "sha1": "bb7af11fd4bc2e76fce98f90c752279ae381b934", - "md5": "e4d3fb7b0d8e9271aca89f7964367b1a" + "sha1": "515905f87268f1eb5af2a9878a84914517efe552", + "md5": "499467bc8050be8893b08995438cc026" }, "required_dependencies": [], - "size": 590486, - "date_published": "2025-10-09T16:46:44.680Z" + "size": 591397, + "date_published": "2026-01-05T11:43:31.017Z" } ] }, @@ -2797,7 +2797,7 @@ "files": [ { "type": "modrinth", - "file_name": "colorwheel-forge-1.1.2+mc1.20.1.jar", + "file_name": "colorwheel-forge-1.2.0+mc1.20.1.jar", "mc_versions": [ "1.20.1" ], @@ -2805,22 +2805,22 @@ "forge" ], "release_type": "release", - "url": "https://cdn.modrinth.com/data/BzHgFoGz/versions/JxjWeQlq/colorwheel-forge-1.1.2+mc1.20.1.jar", - "id": "JxjWeQlq", + "url": "https://cdn.modrinth.com/data/BzHgFoGz/versions/sMMng3Id/colorwheel-forge-1.2.0+mc1.20.1.jar", + "id": "sMMng3Id", "parent_id": "BzHgFoGz", "hashes": { - "sha512": "55129a2321ca775254e0b51592c76949b193f3852fa5e5f4fb163f4f77a418dcf10f878bcfc688a79aad180e3193dcca8b65fedb5973bb2069c95ecc366cfc7d", - "sha1": "08089e16b24756e0ef1e50967dcf2286b20f5923" + "sha512": "603ad678a8dfc3fbcad5f1173e396125244eaad55727d47f7ddd4b66df725c59d90fabaf608f6db82db006a1fe7b12196cdf7cddf5135807e8549242645632a1", + "sha1": "b4caaa01971dd398d4d6112a896eea6db856c971" }, "required_dependencies": [ "GchcoXML" ], - "size": 364012, - "date_published": "2025-12-30T19:51:44.638593Z" + "size": 374988, + "date_published": "2026-01-03T13:14:56.723620Z" }, { "type": "curseforge", - "file_name": "colorwheel-forge-1.1.2+mc1.20.1.jar", + "file_name": "colorwheel-forge-1.2.0+mc1.20.1.jar", "mc_versions": [ "1.20.1" ], @@ -2828,18 +2828,18 @@ "forge" ], "release_type": "release", - "url": "https://edge.forgecdn.net/files/7397/568/colorwheel-forge-1.1.2+mc1.20.1.jar", - "id": "7397568", + "url": "https://edge.forgecdn.net/files/7412/169/colorwheel-forge-1.2.0+mc1.20.1.jar", + "id": "7412169", "parent_id": "1254143", "hashes": { - "sha1": "08089e16b24756e0ef1e50967dcf2286b20f5923", - "md5": "972d1865c0611ca0464c49e70f76868f" + "sha1": "b4caaa01971dd398d4d6112a896eea6db856c971", + "md5": "0bf318b01e6e1fcea03db73014a2abe3" }, "required_dependencies": [ "581495" ], - "size": 364012, - "date_published": "2025-12-30T19:51:46.823Z" + "size": 374988, + "date_published": "2026-01-03T13:14:54.440Z" } ] }, @@ -4909,7 +4909,7 @@ "files": [ { "type": "curseforge", - "file_name": "domum_ornamentum-1.20.1-1.0.292-snapshot-universal.jar", + "file_name": "domum_ornamentum-1.20.1-1.0.294-snapshot-universal.jar", "mc_versions": [ "1.20.1" ], @@ -4917,16 +4917,16 @@ "forge" ], "release_type": "beta", - "url": "https://edge.forgecdn.net/files/7185/824/domum_ornamentum-1.20.1-1.0.292-snapshot-universal.jar", - "id": "7185824", + "url": "https://edge.forgecdn.net/files/7418/104/domum_ornamentum-1.20.1-1.0.294-snapshot-universal.jar", + "id": "7418104", "parent_id": "527361", "hashes": { - "sha1": "1b3b96dda8dd4541afba652c7a975ba439fc1026", - "md5": "81979c0894bbe4af72a488532e898988" + "sha1": "e93b78cd1c036730dfa355248a31c3fef3f812a5", + "md5": "d48152d1459568771e9f40f262e0f424" }, "required_dependencies": [], - "size": 1141274, - "date_published": "2025-11-04T15:31:54.240Z" + "size": 1141311, + "date_published": "2026-01-04T19:54:08.390Z" } ] }, @@ -5416,7 +5416,7 @@ "files": [ { "type": "modrinth", - "file_name": "everycomp-1.20-2.9.13-forge.jar", + "file_name": "everycomp-1.20-2.9.14-forge.jar", "mc_versions": [ "1.20.1" ], @@ -5424,22 +5424,22 @@ "forge" ], "release_type": "release", - "url": "https://cdn.modrinth.com/data/eiktJyw1/versions/QHk3kJYC/everycomp-1.20-2.9.13-forge.jar", - "id": "QHk3kJYC", + "url": "https://cdn.modrinth.com/data/eiktJyw1/versions/1NKRJyBB/everycomp-1.20-2.9.14-forge.jar", + "id": "1NKRJyBB", "parent_id": "eiktJyw1", "hashes": { - "sha512": "aa306f92b4ef8eeec7eb99ef0c24de65c041888eb1432db98eeb630a827bdd895bb472bf2983fa31322090c05a13c28b6da88c5c5162c5d4044e6d9c2b58ddcf", - "sha1": "2c78942c7396b1fab9e53e4ee8172f7ce0ba4482" + "sha512": "56f617e74b89c49856b950f9174c4e651f902b0059699f367d8b9735dd4b6b0929ea2eac45c499f00747bdf9fa1f7929bd64187e8481ff1a9032a4813cc11c7d", + "sha1": "c661fb5f32f9494d63515dff9c16dc567917ab04" }, "required_dependencies": [ "twkfQtEc" ], - "size": 2828451, - "date_published": "2025-12-26T06:16:33.147989Z" + "size": 2828402, + "date_published": "2026-01-05T08:47:37.217646Z" }, { "type": "curseforge", - "file_name": "everycomp-1.20-2.9.13-forge.jar", + "file_name": "everycomp-1.20-2.9.14-forge.jar", "mc_versions": [ "1.20.1" ], @@ -5447,18 +5447,18 @@ "forge" ], "release_type": "release", - "url": "https://edge.forgecdn.net/files/7379/475/everycomp-1.20-2.9.13-forge.jar", - "id": "7379475", + "url": "https://edge.forgecdn.net/files/7420/237/everycomp-1.20-2.9.14-forge.jar", + "id": "7420237", "parent_id": "628539", "hashes": { - "sha1": "2c78942c7396b1fab9e53e4ee8172f7ce0ba4482", - "md5": "a3d97f3b2a8b828d6c6296487b231cbd" + "sha1": "c661fb5f32f9494d63515dff9c16dc567917ab04", + "md5": "c01979322a7f53d29e5ed6245b03ac00" }, "required_dependencies": [ "499980" ], - "size": 2828451, - "date_published": "2025-12-26T06:16:23.010Z" + "size": 2828402, + "date_published": "2026-01-05T08:45:28.700Z" } ] }, @@ -7130,7 +7130,7 @@ "files": [ { "type": "modrinth", - "file_name": "greate-0.0.60.jar", + "file_name": "greate-0.0.61.jar", "mc_versions": [ "1.20.1" ], @@ -7139,23 +7139,23 @@ "neoforge" ], "release_type": "alpha", - "url": "https://cdn.modrinth.com/data/8wDcQuht/versions/lkpf6G04/greate-0.0.60.jar", - "id": "lkpf6G04", + "url": "https://cdn.modrinth.com/data/8wDcQuht/versions/bZDj2HqJ/greate-0.0.61.jar", + "id": "bZDj2HqJ", "parent_id": "8wDcQuht", "hashes": { - "sha512": "2584a6b23bbcbfe0d25c4a6af60485e30cf083ff322271d5ee2a566c35943daca86b0edd71d98786811f633af04b5a7f73db9e9f3ac8b72e385b97c1769e7126", - "sha1": "3fc325df338f275847344f553ad81c3e9be0bc80" + "sha512": "bfee9bf3bbaaf4f0027100008030d6cd69fb09fd6a352b644a910523e2bf53837123cd6221fc5606d670637584901693d278e27b7d1485b592a4b4650a15944d", + "sha1": "1ad889dbd2838045a2df194bfc757b9bae57d273" }, "required_dependencies": [ - "LNytGWDc", - "7tG215v7" + "7tG215v7", + "LNytGWDc" ], - "size": 1253032, - "date_published": "2025-12-31T17:41:02.391758Z" + "size": 1253065, + "date_published": "2026-01-01T21:21:45.604190Z" }, { "type": "curseforge", - "file_name": "greate-0.0.60.jar", + "file_name": "greate-0.0.61.jar", "mc_versions": [ "1.20.1" ], @@ -7164,19 +7164,19 @@ "neoforge" ], "release_type": "alpha", - "url": "https://edge.forgecdn.net/files/7401/392/greate-0.0.60.jar", - "id": "7401392", + "url": "https://edge.forgecdn.net/files/7405/523/greate-0.0.61.jar", + "id": "7405523", "parent_id": "901996", "hashes": { - "sha1": "3fc325df338f275847344f553ad81c3e9be0bc80", - "md5": "f521d8a849e0a56b5ba2051a81bb684d" + "sha1": "1ad889dbd2838045a2df194bfc757b9bae57d273", + "md5": "0446ffaa7cafa06d3148a1944a81b431" }, "required_dependencies": [ - "328085", - "890405" + "890405", + "328085" ], - "size": 1253032, - "date_published": "2025-12-31T17:41:00.300Z" + "size": 1253065, + "date_published": "2026-01-01T21:21:43.007Z" } ] }, @@ -7259,7 +7259,7 @@ "files": [ { "type": "curseforge", - "file_name": "gtmoldraw-2.0.3.jar", + "file_name": "gtmoldraw-3.0.0.jar", "mc_versions": [ "1.20.1" ], @@ -7267,18 +7267,18 @@ "forge" ], "release_type": "release", - "url": "https://edge.forgecdn.net/files/7197/440/gtmoldraw-2.0.3.jar", - "id": "7197440", + "url": "https://edge.forgecdn.net/files/7404/876/gtmoldraw-3.0.0.jar", + "id": "7404876", "parent_id": "1348330", "hashes": { - "sha1": "24e461ca4eac2877458e125dc4c9eb678ad3c270", - "md5": "17c62be2923f14033a672d43c205e259" + "sha1": "9377694e2e3d8c62bdacd400e125acc732c54803", + "md5": "e6d36dbc5383b0649bbfa76a829c6170" }, "required_dependencies": [ "890405" ], - "size": 826764, - "date_published": "2025-11-08T02:41:54.790Z" + "size": 907581, + "date_published": "2026-01-01T18:19:59.917Z" } ] }, @@ -12932,28 +12932,31 @@ "files": [ { "type": "modrinth", - "file_name": "tfc_gurman-1.2.0.jar", + "file_name": "tfc_gurman-1.3.0.jar", "mc_versions": [ "1.20.1" ], "loaders": [ "forge" ], - "release_type": "release", - "url": "https://cdn.modrinth.com/data/ERme2o65/versions/Cz4jYtUl/tfc_gurman-1.2.0.jar", - "id": "Cz4jYtUl", + "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": "ad839d5f2b963d433fd9a9ff965953c7dcbebf5a7b1f660ed5d84b440a2af047a0684b01d0391c012ca69ea8e49a9973f1d7400f40c1e16b0877c8c08f942b7e", - "sha1": "4e219504c5ca011c2ea7036d6002d30ce14085c0" + "sha512": "b82f4b893f85f152a305a9949df8a87337b2e1d75e80a1723c512de5ede3dfa056f17a2186511acf96556e4b5ce1b1c55927d6f97fabf109ac8fdf8ba20f197c", + "sha1": "c55512789128af89d57fe0c9a2f3b4d59a491724" }, - "required_dependencies": [], - "size": 518871, - "date_published": "2025-11-28T21:26:28.110692Z" + "required_dependencies": [ + "JaCEZUhg", + "5bKeBHw2" + ], + "size": 542077, + "date_published": "2026-01-02T13:41:35.488377Z" }, { "type": "curseforge", - "file_name": "tfc_gurman-1.2.0.jar", + "file_name": "tfc_gurman-1.3.0.jar", "mc_versions": [ "1.20.1" ], @@ -12961,19 +12964,19 @@ "forge" ], "release_type": "release", - "url": "https://edge.forgecdn.net/files/7272/449/tfc_gurman-1.2.0.jar", - "id": "7272449", + "url": "https://edge.forgecdn.net/files/7408/157/tfc_gurman-1.3.0.jar", + "id": "7408157", "parent_id": "1363944", "hashes": { - "sha1": "4e219504c5ca011c2ea7036d6002d30ce14085c0", - "md5": "a10ca1fd4dd5f98f9f646d713995e95e" + "sha1": "c55512789128af89d57fe0c9a2f3b4d59a491724", + "md5": "fd8ba6a9ec34193beda55f5d34e359f1" }, "required_dependencies": [ - "453394", - "302973" + "302973", + "453394" ], - "size": 518871, - "date_published": "2025-11-28T21:24:49.587Z" + "size": 542077, + "date_published": "2026-01-02T13:43:05.680Z" } ] }, @@ -14130,7 +14133,7 @@ "files": [ { "type": "modrinth", - "file_name": "TerraFirmaGreg-Core-Modern-0.8.13.jar", + "file_name": "TerraFirmaGreg-Core-Modern-0.8.14.jar", "mc_versions": [ "1.20.1" ], @@ -14139,23 +14142,23 @@ "neoforge" ], "release_type": "release", - "url": "https://cdn.modrinth.com/data/lNttW2Xl/versions/HelwhGEr/TerraFirmaGreg-Core-Modern-0.8.13.jar", - "id": "HelwhGEr", + "url": "https://cdn.modrinth.com/data/lNttW2Xl/versions/m0KNpOTc/TerraFirmaGreg-Core-Modern-0.8.14.jar", + "id": "m0KNpOTc", "parent_id": "lNttW2Xl", "hashes": { - "sha512": "23a7efa66051fec7fae0245eb224a0ca0161292c6cac3eb7455351e722a980baa4bab8e2a7d40a5c9464669fd5eecaec136f8895b185a7daecbbc8722bf208f4", - "sha1": "557984bbe48f571e60426b370d6fa52baa4a1cef" + "sha512": "e5a7b153a2efab340c8ae8ce21624ce1f20349422534dfec64d00112f50142710c16b1a6a31e7ac9387ab771a6b1a2273c8162f46becd22705895ccff6d7c47d", + "sha1": "f1b9ac2623f3058a2bcee184a024fa4111181218" }, "required_dependencies": [ "7tG215v7", "JaCEZUhg" ], - "size": 9358358, - "date_published": "2025-12-31T00:11:28.087747Z" + "size": 9376906, + "date_published": "2026-01-05T06:28:10.973810Z" }, { "type": "curseforge", - "file_name": "TerraFirmaGreg-Core-Modern-0.8.13.jar", + "file_name": "TerraFirmaGreg-Core-Modern-0.8.14.jar", "mc_versions": [ "1.20.1" ], @@ -14164,19 +14167,19 @@ "neoforge" ], "release_type": "release", - "url": "https://edge.forgecdn.net/files/7398/423/TerraFirmaGreg-Core-Modern-0.8.13.jar", - "id": "7398423", + "url": "https://edge.forgecdn.net/files/7419/964/TerraFirmaGreg-Core-Modern-0.8.14.jar", + "id": "7419964", "parent_id": "513402", "hashes": { - "sha1": "557984bbe48f571e60426b370d6fa52baa4a1cef", - "md5": "7c86acba0fbfa684caf532b3dbc07edb" + "sha1": "f1b9ac2623f3058a2bcee184a024fa4111181218", + "md5": "b09df110b3939d76ae68167b71abb8ff" }, "required_dependencies": [ - "890405", - "302973" + "302973", + "890405" ], - "size": 9358358, - "date_published": "2025-12-31T00:11:23.020Z" + "size": 9376906, + "date_published": "2026-01-05T06:28:07.297Z" } ] }, @@ -14441,7 +14444,7 @@ "files": [ { "type": "modrinth", - "file_name": "toomanyrecipeviewers-0.7.0+mc.20.1.jar", + "file_name": "toomanyrecipeviewers-0.7.1+mc.20.1.jar", "mc_versions": [ "1.20.1" ], @@ -14449,22 +14452,22 @@ "forge" ], "release_type": "release", - "url": "https://cdn.modrinth.com/data/yFypjcfd/versions/KfDtkeCS/toomanyrecipeviewers-0.7.0+mc.20.1.jar", - "id": "KfDtkeCS", + "url": "https://cdn.modrinth.com/data/yFypjcfd/versions/OtMd1Eg9/toomanyrecipeviewers-0.7.1+mc.20.1.jar", + "id": "OtMd1Eg9", "parent_id": "yFypjcfd", "hashes": { - "sha512": "db2d525c3d6f5b1771dc8348e74cbf60bb6406a340af043690c3800be495230b6defcad38e35a61aede43eb03eb65e599570a1b212a394b51c726db687de58f8", - "sha1": "24973cc8530188fef712d34767a27d2f001c50e6" + "sha512": "a4e7f351f25e5dddc0e61b5afa91222ebd2f878e0a8803bf20cf5373cca3be20136a40d001cfa7fcc076b10555cd0c9aba8e8ad32d11a5be06e9b331db28b7dc", + "sha1": "29bec57f882d3a4bab4a2dc4c46e19cadcd32c67" }, "required_dependencies": [ "fRiHVvU7" ], - "size": 1666127, - "date_published": "2025-11-25T00:22:16.932262Z" + "size": 1667055, + "date_published": "2026-01-03T00:51:46.557524Z" }, { "type": "curseforge", - "file_name": "toomanyrecipeviewers-0.7.0+mc.20.1.jar", + "file_name": "toomanyrecipeviewers-0.7.1+mc.20.1.jar", "mc_versions": [ "1.20.1" ], @@ -14472,18 +14475,18 @@ "forge" ], "release_type": "release", - "url": "https://edge.forgecdn.net/files/7259/315/toomanyrecipeviewers-0.7.0+mc.20.1.jar", - "id": "7259315", + "url": "https://edge.forgecdn.net/files/7410/427/toomanyrecipeviewers-0.7.1+mc.20.1.jar", + "id": "7410427", "parent_id": "1194921", "hashes": { - "sha1": "24973cc8530188fef712d34767a27d2f001c50e6", - "md5": "f9d556546061c90499fa6fc0c462c00e" + "sha1": "29bec57f882d3a4bab4a2dc4c46e19cadcd32c67", + "md5": "1419bf0ba0f79042abe7af61f567d7ea" }, "required_dependencies": [ "580555" ], - "size": 1666127, - "date_published": "2025-11-25T00:22:12.340Z" + "size": 1667055, + "date_published": "2026-01-03T00:51:42.943Z" } ] }, @@ -15132,6 +15135,68 @@ } ] }, + { + "pakku_id": "khWQzXac8AltkIMj", + "type": "MOD", + "side": "BOTH", + "slug": { + "curseforge": "arthropocolypse", + "modrinth": "arthropocolypse" + }, + "name": { + "curseforge": "[Deprecated] Arthropocolypse", + "modrinth": "Arthropocolypse" + }, + "id": { + "curseforge": "1018606", + "modrinth": "uiAP959w" + }, + "redistributable": false, + "files": [ + { + "type": "curseforge", + "file_name": "arthropocolypse-1.0.6.jar", + "mc_versions": [ + "1.20.1" + ], + "loaders": [ + "forge" + ], + "release_type": "release", + "url": "https://edge.forgecdn.net/files/5397/648/arthropocolypse-1.0.6.jar", + "id": "5397648", + "parent_id": "1018606", + "hashes": { + "sha1": "c43b2c1e8a9fa11d139a202e37054a01db8fd677", + "md5": "a5a26adcf2c12df3777543fdf424c169" + }, + "required_dependencies": [], + "size": 612137, + "date_published": "2024-06-04T11:30:24.383Z" + }, + { + "type": "modrinth", + "file_name": "arthropocolypse-1.0.6.jar", + "mc_versions": [ + "1.20.1" + ], + "loaders": [ + "forge" + ], + "release_type": "release", + "url": "https://cdn.modrinth.com/data/uiAP959w/versions/4WlOZtq0/arthropocolypse-1.0.6.jar", + "id": "4WlOZtq0", + "parent_id": "uiAP959w", + "hashes": { + "sha512": "c00b798b8ecf7aad09f400601cacec8107649240e75e1ba87851e4007a30febf498d524ef818ab00472a739f6b237f8130060f0e3ae051314dfb069569d72c7b", + "sha1": "c43b2c1e8a9fa11d139a202e37054a01db8fd677" + }, + "required_dependencies": [], + "size": 612137, + "date_published": "2024-06-04T11:34:01.710669Z" + } + ] + }, { "pakku_id": "MpkpUO55EJhBt1az", "pakku_links": [ @@ -15222,7 +15287,7 @@ "files": [ { "type": "modrinth", - "file_name": "tacz-1.20.1-1.1.7-release.jar", + "file_name": "tacz-1.20.1-1.1.7-hotfix.jar", "mc_versions": [ "1.20", "1.20.1" @@ -15231,20 +15296,20 @@ "forge" ], "release_type": "release", - "url": "https://cdn.modrinth.com/data/SzzJttH8/versions/fErpFI0g/tacz-1.20.1-1.1.7-release.jar", - "id": "fErpFI0g", + "url": "https://cdn.modrinth.com/data/SzzJttH8/versions/CkNQpQcx/tacz-1.20.1-1.1.7-hotfix.jar", + "id": "CkNQpQcx", "parent_id": "SzzJttH8", "hashes": { - "sha512": "3f4aa30d50e75b1e4e5291c4eee59107da60355c5e4b59fc3be0bc84e611d1acf0320aa8a7b905ab42d0c464d19765e58bac16e9ad6770860c19695e887ccc94", - "sha1": "869decffc818e6ccd7d6d0d734aecfaa265e908b" + "sha512": "17d17133243de268cc2d071261e69e747a01b3ab64ab1cf0eec17054e4f19bf8cf30ef1c7ed3e1600523cd9061b38728810b92aefa4246f615001f835a25dc37", + "sha1": "7d4f578a42c9b880744ea6058a495847aac9e4c3" }, "required_dependencies": [], - "size": 52403127, - "date_published": "2025-12-01T04:26:59.653447Z" + "size": 52425650, + "date_published": "2026-01-01T09:15:14.812661Z" }, { "type": "curseforge", - "file_name": "tacz-1.20.1-1.1.7-release.jar", + "file_name": "tacz-1.20.1-1.1.7-hotfix.jar", "mc_versions": [ "1.20.1" ], @@ -15252,16 +15317,16 @@ "forge" ], "release_type": "release", - "url": "https://edge.forgecdn.net/files/7278/3/tacz-1.20.1-1.1.7-release.jar", - "id": "7278003", + "url": "https://edge.forgecdn.net/files/7401/617/tacz-1.20.1-1.1.7-hotfix.jar", + "id": "7401617", "parent_id": "1028108", "hashes": { - "sha1": "869decffc818e6ccd7d6d0d734aecfaa265e908b", - "md5": "27696ec987eefbec8e7ba6596e418b35" + "sha1": "7d4f578a42c9b880744ea6058a495847aac9e4c3", + "md5": "e91391b09e25ec5994c28593117f5908" }, "required_dependencies": [], - "size": 52403127, - "date_published": "2025-11-30T12:53:47.060Z" + "size": 52425650, + "date_published": "2025-12-31T19:00:25.193Z" } ] }, diff --git a/pakku.json b/pakku.json index c9a1ae485..faf8a0638 100644 --- a/pakku.json +++ b/pakku.json @@ -256,6 +256,12 @@ "detected-setblock-be-gone": { "side": "BOTH" }, + "colorwheel": { + "side": "CLIENT" + }, + "colorwheel-patcher": { + "side": "CLIENT" + }, "autopack-director": { "export": false },