From ec7fd2e023aa49f90882b71f09bc7e90ae1f34e7 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 22 Jun 2026 00:23:05 +0100 Subject: [PATCH 01/43] lower the amount of bat poop --- .../worldgen/configured_feature/nether/surface/guano_patch.json | 2 +- .../tfg/worldgen/placed_feature/nether/surface/guano_patch.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kubejs/data/tfg/worldgen/configured_feature/nether/surface/guano_patch.json b/kubejs/data/tfg/worldgen/configured_feature/nether/surface/guano_patch.json index 616cadd114..a22f5fe319 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/nether/surface/guano_patch.json +++ b/kubejs/data/tfg/worldgen/configured_feature/nether/surface/guano_patch.json @@ -23,7 +23,7 @@ } ] }, - "tries": 96, + "tries": 64, "xz_spread": 6, "y_spread": 2 } diff --git a/kubejs/data/tfg/worldgen/placed_feature/nether/surface/guano_patch.json b/kubejs/data/tfg/worldgen/placed_feature/nether/surface/guano_patch.json index 979a0f3332..367d9cc294 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/nether/surface/guano_patch.json +++ b/kubejs/data/tfg/worldgen/placed_feature/nether/surface/guano_patch.json @@ -3,7 +3,7 @@ "placement": [ { "type": "minecraft:count", - "count": 10 + "count": 7 }, { "type": "minecraft:in_square" From 2d598f126423d583b4338397f9a4cb3efb203774 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 22 Jun 2026 00:38:44 +0100 Subject: [PATCH 02/43] cl --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 90444f7ecd..b73711bee1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## Unreleased ### Changes +- Accumulators (the multiblock battery for trains) and energy interfaces can now charge and discharge way faster, and hold more power @Pyritie ### Bug fixes ## [0.13.0] - 21-06-2026 From 73095e812dfe9de9c1bc791565e340ddecfcb41f Mon Sep 17 00:00:00 2001 From: Xikaro Date: Mon, 22 Jun 2026 12:31:12 +0500 Subject: [PATCH 03/43] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 22f5589405..199ced8160 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -333,7 +333,7 @@ jobs: sed -i -e "s/DEV/${VERSION}/g" pakku.json 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" config/fancymenu/customization/* sed -i -e "s/DEV/${VERSION}/g" .pakku/multimc-overrides/instance.cfg sed -i -e "s/DEV/${VERSION}/g" .pakku/server-overrides/server.properties sed -i -e "s/DEV/${VERSION}/g" .pakku/docker-overrides/docker-compose.yml From 049728440aa679ca49ad8976ce556f0c7c93f0bc Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 22 Jun 2026 15:16:18 +0100 Subject: [PATCH 04/43] remove dripstone skeletons from overworld --- kubejs/server_scripts/realmrpg_skeletons/tags.js | 1 - 1 file changed, 1 deletion(-) diff --git a/kubejs/server_scripts/realmrpg_skeletons/tags.js b/kubejs/server_scripts/realmrpg_skeletons/tags.js index 15b9637d8b..82b504ce6d 100644 --- a/kubejs/server_scripts/realmrpg_skeletons/tags.js +++ b/kubejs/server_scripts/realmrpg_skeletons/tags.js @@ -8,7 +8,6 @@ function registerRealmRpgBiomeTags(event) { event.add('realmrpg_skeletons:has_overworld_surface_skeletons', '#tfg:overworld_biomes'); event.add('realmrpg_skeletons:has_lava_overworld_skeletons', '#tfg:overworld_biomes'); event.add('realmrpg_skeletons:has_jumped_skeletons', '#tfg:overworld_biomes'); - event.add('realmrpg_skeletons:has_dripstone_skeletons', '#tfg:overworld_biomes'); event.add('realmrpg_skeletons:has_desert_skeletons', '#tfg:overworld_biomes'); event.add('realmrpg_skeletons:has_deep_cave_skeletons', '#tfg:overworld_biomes'); event.add('realmrpg_skeletons:has_cave_skeletons', '#tfg:overworld_biomes'); From 1d9eccc8d5087a262994a02c00f62a442977c1ba Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 22 Jun 2026 16:46:56 +0100 Subject: [PATCH 05/43] add back ae2 creative energy cell --- config/reliable_remover/ae2.json | 1 - kubejs/server_scripts/ae2/tags.js | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/config/reliable_remover/ae2.json b/config/reliable_remover/ae2.json index b112261fdc..040cdd92d7 100644 --- a/config/reliable_remover/ae2.json +++ b/config/reliable_remover/ae2.json @@ -37,7 +37,6 @@ "ae2:meteorite_compass", "ae2:silicon", - "ae2:creative_energy_cell", "ae2:tiny_tnt", "ae2:crystal_resonance_generator" ] diff --git a/kubejs/server_scripts/ae2/tags.js b/kubejs/server_scripts/ae2/tags.js index fbad95d5b0..1a18418669 100644 --- a/kubejs/server_scripts/ae2/tags.js +++ b/kubejs/server_scripts/ae2/tags.js @@ -5,6 +5,7 @@ const registerAE2ItemTags = (event) => { event.add('c:hidden_from_recipe_viewers', 'ae2:creative_item_cell') event.add('c:hidden_from_recipe_viewers', 'ae2:creative_fluid_cell') + event.add('c:hidden_from_recipe_viewers', "ae2:creative_energy_cell") event.remove('forge:storage_blocks', 'ae2:quartz_block') event.remove('forge:storage_blocks/certus_quartz', 'ae2:quartz_block') From edd30c2a508a97095e90b0da73e21bbbe03026e6 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 22 Jun 2026 17:05:01 +0100 Subject: [PATCH 06/43] add peanut oil --- CHANGELOG.md | 1 + .../blaze_burner_fuel/peanut_oil.json | 6 +++++ .../tfg/powergen/nuclear/recipes.nuclear.js | 6 +++++ .../tfg/powergen/recipes.biodiesel.js | 15 +++++++++++++ .../tfg/powergen/recipes.boiler.js | 22 +++++++++++++++---- .../vintage_improvements/recipes.js | 6 ++++- 6 files changed, 51 insertions(+), 5 deletions(-) create mode 100644 kubejs/data/create_liquid_fuel/blaze_burner_fuel/peanut_oil.json diff --git a/CHANGELOG.md b/CHANGELOG.md index b73711bee1..18897804f1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## Unreleased ### Changes - Accumulators (the multiblock battery for trains) and energy interfaces can now charge and discharge way faster, and hold more power @Pyritie +- Added peanut oil recipes, with all the same uses as seed oil @Redeix @Pyritie ### Bug fixes ## [0.13.0] - 21-06-2026 diff --git a/kubejs/data/create_liquid_fuel/blaze_burner_fuel/peanut_oil.json b/kubejs/data/create_liquid_fuel/blaze_burner_fuel/peanut_oil.json new file mode 100644 index 0000000000..a210eaed26 --- /dev/null +++ b/kubejs/data/create_liquid_fuel/blaze_burner_fuel/peanut_oil.json @@ -0,0 +1,6 @@ +{ + "fluid": "tfg:peanut_oil", + "burnTime": 50, + "superHeat": false, + "amountConsumedPerTick" : 25 +} diff --git a/kubejs/server_scripts/tfg/powergen/nuclear/recipes.nuclear.js b/kubejs/server_scripts/tfg/powergen/nuclear/recipes.nuclear.js index ef228cf028..bf7f331708 100644 --- a/kubejs/server_scripts/tfg/powergen/nuclear/recipes.nuclear.js +++ b/kubejs/server_scripts/tfg/powergen/nuclear/recipes.nuclear.js @@ -1296,6 +1296,12 @@ function registerTFGNuclearRecipes(event) { .circuit(2) .duration(100) .EUt(GTValues.VA[GTValues.MV]) + event.recipes.gtceu.distillery('tfg:linolenic_from_peanut') + .inputFluids(Fluid.of('tfg:peanut_oil', 1000)) + .outputFluids(Fluid.of('tfg:linolenic_acid', 10)) + .circuit(2) + .duration(100) + .EUt(GTValues.VA[GTValues.MV]) event.recipes.gtceu.distillery('tfg:linolenic_from_olive') .inputFluids(Fluid.of('tfc:olive_oil', 1000)) .outputFluids(Fluid.of('tfg:linolenic_acid', 20)) diff --git a/kubejs/server_scripts/tfg/powergen/recipes.biodiesel.js b/kubejs/server_scripts/tfg/powergen/recipes.biodiesel.js index 8611840696..651eeb3362 100644 --- a/kubejs/server_scripts/tfg/powergen/recipes.biodiesel.js +++ b/kubejs/server_scripts/tfg/powergen/recipes.biodiesel.js @@ -19,6 +19,21 @@ function registerTFGBiodieselRecipes(event) { .duration(20 * 10) .EUt(GTValues.VHA[GTValues.ULV]) + event.recipes.gtceu.chemical_reactor(`peanut_oil_alcohol_biodiesel`) + .inputFluids("#tfg:alcohols 1000", Fluid.of('tfg:peanut_oil', 6000)) + .itemInputs('#forge:tiny_dusts/sodium_hydroxide') + .outputFluids(Fluid.of('gtceu:bio_diesel', 6000)) + .duration(20 * 10) + .EUt(GTValues.VHA[GTValues.ULV]) + + // So you can craft Biodiesel without Chemical Reactor + event.recipes.gtceu.mixer(`tfg:peanut_oil_alcohol_biodiesel`) + .inputFluids("#tfg:alcohols 1000", Fluid.of('tfg:peanut_oil', 1000)) + .itemInputs('#forge:tiny_dusts/sodium_hydroxide') + .outputFluids(Fluid.of('gtceu:bio_diesel', 500)) + .duration(20 * 10) + .EUt(GTValues.VHA[GTValues.ULV]) + event.recipes.gtceu.chemical_reactor(`olive_oil_alcohol_biodiesel`) .inputFluids("#tfg:alcohols 1000", Fluid.of('tfc:olive_oil', 4000)) .itemInputs('#forge:tiny_dusts/sodium_hydroxide') diff --git a/kubejs/server_scripts/tfg/powergen/recipes.boiler.js b/kubejs/server_scripts/tfg/powergen/recipes.boiler.js index 2ce201ee69..e4b5901238 100644 --- a/kubejs/server_scripts/tfg/powergen/recipes.boiler.js +++ b/kubejs/server_scripts/tfg/powergen/recipes.boiler.js @@ -166,6 +166,12 @@ function registerTFGBoilerRecipes(event) { .dimension('minecraft:overworld') .dimension('minecraft:the_nether') + event.recipes.gtceu.steam_boiler('tfg:peanut_oil') + .inputFluids(Fluid.of('tfg:peanut_oil', 160)) + .duration(200) + .dimension('minecraft:overworld') + .dimension('minecraft:the_nether') + event.recipes.gtceu.steam_boiler('tfg:soybean_oil') .inputFluids(Fluid.of('firmalife:soybean_oil', 160)) .duration(200) @@ -256,16 +262,19 @@ function registerTFGBoilerRecipes(event) { .outputFluids(Fluid.of('gtceu:seed_oil', 50)) .duration(32) .EUt(2) - event.recipes.gtceu.extractor(`rapeseed_oil`) .itemInputs('tfg:rapeseed_product') .outputFluids(Fluid.of('gtceu:seed_oil', 600)) .duration(20 * 5) .EUt(GTValues.VHA[GTValues.ULV]) - event.recipes.gtceu.extractor(`sunflower_oil`) .itemInputs('tfg:sunflower_product') - .outputFluids(Fluid.of('gtceu:seed_oil', 350)) + .outputFluids(Fluid.of('gtceu:seed_oil', 500)) + .duration(20 * 5) + .EUt(GTValues.VHA[GTValues.ULV]) + event.recipes.gtceu.extractor(`tfg:peanut_oil`) + .itemInputs('tfg:peanut_product') + .outputFluids(Fluid.of('tfg:peanut_oil', 500)) .duration(20 * 5) .EUt(GTValues.VHA[GTValues.ULV]) @@ -276,6 +285,11 @@ function registerTFGBoilerRecipes(event) { event.recipes.tfc.barrel_sealed(1000) .inputs('tfg:sunflower_product', Fluid.of('minecraft:water', 100)) - .outputFluid(Fluid.of('gtceu:seed_oil', 120)) + .outputFluid(Fluid.of('gtceu:seed_oil', 200)) .id('tfg:barrel/sunflower_to_oil') + + event.recipes.tfc.barrel_sealed(1000) + .inputs('tfg:peanut_product', Fluid.of('minecraft:water', 100)) + .outputFluid(Fluid.of('tfg:peanut_oil', 200)) + .id('tfg:barrel/peanut_to_oil') } \ No newline at end of file diff --git a/kubejs/server_scripts/vintage_improvements/recipes.js b/kubejs/server_scripts/vintage_improvements/recipes.js index cfb479a453..af3ca94773 100644 --- a/kubejs/server_scripts/vintage_improvements/recipes.js +++ b/kubejs/server_scripts/vintage_improvements/recipes.js @@ -489,7 +489,7 @@ function registerVintageImprovementsRecipes(event) { // Seed oils - event.recipes.vintageimprovements.vacuumizing(Fluid.of('gtceu:seed_oil', 350), 'tfg:sunflower_product') + event.recipes.vintageimprovements.vacuumizing(Fluid.of('gtceu:seed_oil', 500), 'tfg:sunflower_product') .processingTime(500 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER) .id('tfg:vi/vacuumizing/sunflower') @@ -497,6 +497,10 @@ function registerVintageImprovementsRecipes(event) { .processingTime(500 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER) .id('tfg:vi/vacuumizing/rapeseed') + event.recipes.vintageimprovements.vacuumizing(Fluid.of('tfg:peanut_oil', 500), 'tfg:peanut_product') + .processingTime(500 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER) + .id('tfg:vi/vacuumizing/peanut') + event.recipes.vintageimprovements.vacuumizing(Fluid.of('gtceu:seed_oil', 16), '#forge:seeds') .processingTime(50 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER) .id('tfg:vi/vacuumizing/seed_oil') From 06df1042d1302babf638c7b5ac286394f56f3565 Mon Sep 17 00:00:00 2001 From: Xikaro Date: Mon, 22 Jun 2026 21:07:04 +0500 Subject: [PATCH 07/43] Update ranks.snbt --- .../defaultconfigs/ftbranks/ranks.snbt | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/.pakku/server-overrides/defaultconfigs/ftbranks/ranks.snbt b/.pakku/server-overrides/defaultconfigs/ftbranks/ranks.snbt index 2efbbaef31..ac81949c30 100644 --- a/.pakku/server-overrides/defaultconfigs/ftbranks/ranks.snbt +++ b/.pakku/server-overrides/defaultconfigs/ftbranks/ranks.snbt @@ -98,6 +98,39 @@ ftbranks.name_format: "&c{name}&c" ftbchunks.max_claimed: 10000 ftbchunks.max_force_loaded: 10000 + ftbchunks.chunk_load_offline: true ftbessentials.rtp.cooldown: 0 + + command.enderchest: true + command.ldlib: true + command.compass_server: true + command.chunky: true + command.catnip: true + command.bookshelf: true + command.aptweaks: true + command.afc: true + command.advancement: true + command.bossbar: true + command.clone: true + command.cucumber: true + command.gamemode: true + command.give: true + command.guideme: true + command.kubejs: true + command.kubejs_tfc: true + command.letmedespawn: true + command.locate: true + command.lode: true + command.octolib: true + command.worldborder: true + command.whitelist: true + command.uteamcore: true + command.tpx: true + command.tp_offline: true + command.tpa: true + command.tpaccept: true + command.tpahere: true + command.tpdeny: true + command.grieflogger: true } } From 17b8350553a95bcc30be71c88d2f5356ac011cf1 Mon Sep 17 00:00:00 2001 From: Xikaro Date: Mon, 22 Jun 2026 21:07:08 +0500 Subject: [PATCH 08/43] Delete players.snbt --- .../defaultconfigs/ftbranks/players.snbt | 1462 ----------------- 1 file changed, 1462 deletions(-) delete mode 100644 .pakku/server-overrides/defaultconfigs/ftbranks/players.snbt diff --git a/.pakku/server-overrides/defaultconfigs/ftbranks/players.snbt b/.pakku/server-overrides/defaultconfigs/ftbranks/players.snbt deleted file mode 100644 index 10e631e213..0000000000 --- a/.pakku/server-overrides/defaultconfigs/ftbranks/players.snbt +++ /dev/null @@ -1,1462 +0,0 @@ -{ - c154610e-8875-4bb5-99ef-8c167a0f2237: { - name: "Pyritie" - } - 980f7b55-a9e0-3980-aecb-9977407c2213: { - name: "Boott" - } - 80bf5993-3a7f-3c84-85ea-2722b4cc9c0a: { - name: "NikolayBrony" - } - fda587e8-33f9-344e-90f3-705afc571353: { - name: "Voland_Infernis" - } - 6067234b-21ff-348c-9b59-591badcc9e0a: { - name: "ExpectoAmogus" - } - fa43e603-d4a1-32e3-bff4-f763ca339c7f: { - name: "DalgorStoner" - } - 477d8b42-bf3e-37f1-938f-cc0595f74e5b: { - name: "SpeeeDCraft" - } - 4e6d2bd9-7757-3ade-97e3-be35dffd8041: { - name: "Light" - } - bebda334-226d-3288-9601-434406ab6f6f: { - name: "Funny_tuna" - } - 2e7afaa9-c803-332f-ad4e-cfa69912389a: { - name: "Konstancia" - } - 430499ac-17e5-3556-89bf-bdede8daee5b: { - name: "Boottov" - } - 919bd44e-1437-3114-b689-d78c04865eaa: { - name: "Redmener" - } - 4f35b884-3063-3906-820b-460f90f69af2: { - name: "BobStar" - } - 9c64da4e-02b2-31fb-a31b-f45553d7a0f3: { - name: "LEDlump" - } - a043dc1d-ac7e-3a10-8e2a-c8724a981fb5: { - name: "Hellz20" - } - a01e3843-e521-3998-958a-f459800e4d11: { - name: "Player" - } - 8f0c4a6c-77e7-3a61-953f-ec08192ca7cb: { - name: "Demon400" - } - 7a9bc8a7-a327-3446-aa2c-32c6cd55f985: { - name: "_S1337_" - } - abd401fd-6894-38d9-9487-54be68a728a3: { - name: "a2kat" - } - ffb40c41-3d99-3bb7-843d-7f2b0fe5db96: { - name: "M0nfers" - } - dfb62fb6-3ece-3cc1-a94e-ffef6b4a6586: { - name: "C0ffo12" - } - 99622e36-463e-3c2a-93c9-7713d8405a6c: { - name: "DruidDB" - } - d5df6218-0947-36ad-8597-4b6edd5c8d85: { - name: "GlesCraft" - } - ea112821-f404-38c5-b469-801e5199a3bd: { - name: "Goffman" - } - 466926bf-33e8-3bc1-9d0f-c790800f84d2: { - name: "Lotrik_tut" - } - d2057b38-0a9f-39de-bbb9-5d2b9016477c: { - name: "DrVegapunk" - } - fdb0b41e-7924-3e81-9c2f-d521e3f2c175: { - name: "_TEOC_" - } - e1d396da-6d46-3368-89a0-cc1b1a780a91: { - name: "BedlamInBelgium" - } - 74d7722c-f118-375e-ae8d-fc74f72f3214: { - name: "Amirius" - } - 109b9105-f7b7-34d3-b279-5f354d064ecf: { - name: "Kraft" - } - 7c8eb9ed-cbc7-3556-9914-f25ae079fff4: { - name: "Reidenshi" - } - 750c3cbd-6643-3697-82de-d09fc90ed978: { - name: "Denlon" - } - 04b82b2c-68c7-33a5-a392-96b75579c729: { - name: "LAVRON" - } - 952ab13c-96d5-346d-8339-b37c106e4cd0: { - name: "teacher_dt" - } - da7dacf3-732d-3811-b9a7-cb500cf8bf97: { - name: "ikazut0" - } - c05d1abb-e7f8-3a66-9197-514fbbb8f443: { - name: "VinDust" - } - c7fd0e73-38eb-3535-a39b-8e80d880c3d5: { - name: "Floda28" - } - d61f02f0-225c-3273-8585-538ac1757b92: { - name: "Winders_Chak" - } - c651ffd9-84de-350d-91a6-63c3f5383547: { - name: "VaynoT" - } - fe66b986-0106-3612-9381-8c4070095ee5: { - name: "Zadapek1233" - } - a3383e45-8fe9-3cc4-9ceb-240affcb8f08: { - name: "YahorPi" - } - 4ce893c9-ebe0-3617-b6a6-2d49ff231e6c: { - name: "Gelad" - } - fff79562-1337-352f-b430-9878e21b99c5: { - name: "Sv9z1st" - } - 5239c98a-6b25-3930-badc-ddd081e28533: { - name: "gre4ka" - } - 76563bc1-adc6-3c0d-a4e8-ea56057469df: { - name: "SugarSid" - } - 7a6b97e5-e14e-3f43-877c-611afebfe2c6: { - name: "FTBAngel" - } - c178cee6-5749-36bc-8555-f0d5a5d326bf: { - name: "Vinishko" - } - 364ac14a-30fb-360a-81c2-e674b06e438d: { - name: "OldMan" - } - 59497643-9f4d-3e4f-875f-8b8e4f661e43: { - name: "Neon4301" - } - fa938427-4f24-33e0-b94a-1eeb21e18f6c: { - name: "Tarhun" - } - aeba751d-f103-30e8-83af-277a78d2589b: { - name: "cfifskin" - } - 6576e741-3be2-3cf3-b310-0f286cc9c9fe: { - name: "rebellionik" - } - 6b47c21d-2b81-3260-82b1-0b70449901c4: { - name: "Maxitanker" - } - e86b4dfc-9bf3-3e28-8b3f-03703b2c611a: { - name: "desenter" - } - 9c45ca93-3d48-3de5-a933-e664ce8bfda7: { - name: "Minecraft" - } - 1cb53870-4ea0-3eea-9961-06108f807ef4: { - name: "Edo_ninja" - } - f20e9db0-7c14-3de1-a2ef-18ec231e9f15: { - name: "Politbot" - } - 479df017-b7ff-33d3-acd8-34cfc59c180c: { - name: "_Iksanbro_" - } - 50b99a9c-ca82-3695-9eb1-1140b932f622: { - name: "snowluminum" - } - ea58fa4b-6eb5-3168-9162-37ea0b7ff846: { - name: "Ex3meXL" - } - d8cc2ea9-4cbb-36a0-9d3e-bf43a14283db: { - name: "angrycat_" - } - 9e8a77d9-119e-3c29-bb33-3e58d3ac3044: { - name: "Ex3mePro" - } - 1065fc45-d391-394c-9002-a591d473c0b3: { - name: "Mwyah" - } - f931ef66-23ef-3b47-950d-b18f0f98f3a0: { - name: "Nashatir" - } - 2738f0db-af92-35fd-8860-957542db9b1e: { - name: "ripiters" - } - d40d1595-d195-39f8-80b0-b732dda93abf: { - name: "santariver" - } - 85b06c68-965b-36f8-832b-a9e3ec07bb8f: { - name: "danilprokat" - } - 5b9902a1-2e79-3331-9131-9cbe96518944: { - name: "kiveraV" - } - fdf3b517-4365-3162-b575-16ece0408cd6: { - name: "NaelsyaAndSpit" - } - 57b3dfb5-f8a6-49e2-8b54-4e4ffc63256f: { - name: "Xikaro" - } - 4e9706c5-cd8f-478f-abb7-236cc345ce1c: { - name: "Rexmast" - ranks: { - vip: "2026-01-15T08:09:58.187219968Z" - } - } - b4bbb691-2ddb-473d-92d9-4c57aed86ec6: { - name: "ExpectoAmogus" - } - 9d9c39ad-4d3a-4e61-91c7-3d327f5dcf51: { - name: "SpeeeDCraft" - } - bb5029b7-9381-4d99-aaa9-106da41aa659: { - name: "OfficialyAwsome" - } - e8677213-7862-41be-a1fc-204ee6c0321e: { - name: "FTBAngel" - } - 2bb5cc59-bb38-4c43-83ee-ec4838da590d: { - name: "FriendlyCube" - } - 7aafbdcc-f519-4979-96e5-cfbb77f791b9: { - name: "Kastodio" - } - 49cfdaf1-4767-4a47-a62b-7b980e962a3d: { - name: "Redmener" - } - ea36dfa9-6215-4c36-88ac-477350a66d6f: { - name: "Mwyah" - } - 767f564b-d7d4-47f8-9627-9ce6e3c3b7ac: { - name: "WaterMelwin" - } - 9534016c-792d-4af5-bd95-7742e500c0ad: { - name: "BedlamInBelgium" - } - 6c11f0fd-5a8f-4172-a079-2d4b2de079fb: { - name: "NastyKore" - } - e2d5a5c9-dc0d-4c72-8ce8-bd665986b1f3: { - name: "XyCrosier" - } - fa490351-ab29-4f80-ba41-a7bfb14cb348: { - name: "H0RUZ_CHORUS" - } - bc685b49-8eb0-400b-b7f4-544e00687659: { - name: "Ap1sinus" - } - 7efb9886-44bc-43c2-baa9-d218387c1c07: { - name: "PutWards" - } - 6e572719-cd74-4a29-a89d-cc82f274b235: { - name: "donka_0iq" - } - d2bd6f78-aca8-404c-b571-04cb93463bf9: { - name: "TechnoVell" - } - b236ad2f-b77d-4d62-a537-1fdf2ba4eca1: { - name: "a2kat" - } - e1fe54e7-6d37-4af5-bfb1-12e60fa81a0a: { - name: "VaynoT" - } - a9c5f538-bc11-4005-ad5b-17d6e9d88d8c: { - name: "YahorPi" - ranks: { - vip: "2026-01-15T05:36:12.514801589Z" - } - } - 5c2487ff-e3a4-469c-8f01-210b2cd95693: { - name: "danilprokat" - } - 1a32f55a-a50b-43b0-80ac-8162ea55155f: { - name: "leolllx" - } - a1efc1d6-9b45-4603-9883-0acf98f85e33: { - name: "iqGooog" - } - 31ff576e-0584-40ac-8fee-b9782a9ceceb: { - name: "WhiteOak1122" - } - 32e781bd-e416-4f8d-961b-f17fbe165b44: { - name: "qwepoq" - } - 07e3fc43-35e4-4d5f-9f33-2353d0aab634: { - name: "Magerow20" - } - 8329b6e3-3bb0-4d28-93da-9e134fed774f: { - name: "Redo27" - } - d6cbf6a3-af20-4873-9a62-ab0bc50dae6c: { - name: "TETIRS" - } - 6f9117c1-dfc8-4439-a6c6-de8bb123b04d: { - name: "BoredCain" - } - 83b98655-f2a6-4828-9f6c-905ba189e88d: { - name: "ZasHeibirgerhid" - } - 1211dcd4-b6a4-48c5-879d-d6d7844c1223: { - name: "Len191" - } - 0b1d44c6-5068-45eb-b802-a5d03133c775: { - name: "C0ffo" - } - 892c2375-8313-47fa-9812-31ca024f5a8f: { - name: "ZhychokPaychok" - } - 0a25c000-cf43-4c49-b59d-70722351f497: { - name: "Arabchik1487" - } - 093b0ce6-a31b-4f13-b41c-71ad5de88f15: { - name: "SuperGubka" - } - 4d20385e-c1ae-4275-b3da-9b462f118843: { - name: "Crayce_" - } - 91c123d6-0c0d-4a3a-a009-c377dbc099a2: { - name: "Paul_A_Lavender" - } - b2f61fdf-cbd9-466f-86ec-0badb819c8a0: { - name: "flamecobra_nr2" - } - b61cc0af-8f43-4feb-9769-c62dd013914e: { - name: "MindKT" - } - 58168790-ed1c-4119-bcb0-58b66e7307c2: { - name: "timmmmmik" - } - 0b1e3353-1b3e-4a0b-9848-551d0d98a880: { - name: "_Sliver__" - } - 9934d47f-ff7a-445a-a23c-4a35aa466ec2: { - name: "NikiWright" - } - d1da5f84-a0a2-4b30-9788-89cb6a813aec: { - name: "Dr_Coungrations" - } - 0b471597-0601-4e01-9c3d-fdc75c4a196e: { - name: "Scrymmery" - } - 66e86ac7-c0ac-4959-b6d4-534fe1e729cf: { - name: "romko1zi" - } - 384d6f54-801e-477d-ad8d-9d86667d38f7: { - name: "EnricFur" - } - 7becce31-fd92-4b78-b732-37847c060a79: { - name: "Keperey" - } - 0bae4c2a-4f08-484d-80de-0cd84deaae53: { - name: "KOT_SLIZEN" - } - b4254cac-8e23-4a81-9a86-658b78492559: { - name: "Thorrbrand" - ranks: { - vip: "2026-01-15T08:08:37.424913931Z" - moderator: "2026-03-19T17:28:56.327091465Z" - } - } - 5f8523e7-6cb4-4629-a0bf-b74f4be9b943: { - name: "KireSenooJ" - } - da0aecab-2e7c-4eab-9451-4c4971c5849f: { - name: "Fessanist" - } - 86b146ab-2491-45b5-b636-f793bfa54d80: { - name: "Atlas_br" - } - ab8dac3f-9a4b-4ad8-ad50-8ba52f9a78db: { - name: "KerSonExx" - } - c38882a8-2fe6-4629-a90b-11314c3a2518: { - name: "monashkadyra" - } - 213129f0-fc57-4cc4-9eb2-b5ab9b8628ec: { - name: "CCCP12413" - } - bac5c579-966b-423d-94c4-51500749c328: { - name: "CSL_Virevierr99" - } - 1585beba-f77d-4a81-ade6-14cfaa53baaa: { - name: "Yvtteka" - } - 3f077f65-80fb-432c-8ff4-51621540cd08: { - name: "RonyDze" - } - 7aa2c3b5-9180-442d-894d-c320b709738f: { - name: "AustinChesnut" - } - 34d0b05f-d9b6-4c58-ad6d-f232f95717f9: { - name: "corne32" - } - 52ee23c4-aa17-4e01-bc6f-3cd831622003: { - name: "ducklovin" - } - db65e9f3-b5c9-47e1-8c91-c444f265a895: { - name: "Rodrigo2202" - } - bfb2e52a-bbc5-4f82-ab35-551ddf8ce2c8: { - name: "passwordisp0tat0" - } - e2e3493a-a7ef-464f-9adb-8d816dd7e9b1: { - name: "Fierryv" - } - fb3d03a4-bda6-43f5-8b88-488e6674f759: { - name: "pjpoppy" - } - ec17033c-242b-4765-bf21-03572431ac09: { - name: "colliecan" - } - 7ac42e5d-b956-4843-897b-77e99886ce19: { - name: "Neon4301" - ranks: { - vip: "2026-01-15T11:45:16.433228173Z" - } - } - 6c3fda48-e2e7-40fd-b606-3288eb7eefcb: { - name: "OperaticAphid" - } - b91e6484-8911-4def-ab04-9fa3452fca5f: { - name: "Bia_prowell" - } - cc165dab-e0a1-4ce9-92e4-11cf9679896b: { - name: "CurlyBucket9645" - } - 9823794e-06c5-4b0d-81a9-0329da214ef7: { - name: "KingBit72" - } - d5f5f042-fc67-453a-b96d-088d6f884be8: { - name: "emiflake" - } - 311671fd-0d61-4a61-b113-d7b0749094a0: { - name: "sapphire_429" - } - 5e644dc3-ca69-4ae8-810e-867b1c732d1b: { - name: "Arnold5453" - } - e5e15a7f-268d-4e09-a02b-d76711feb8ec: { - name: "greenballs_" - } - 9010e1e2-14ef-44ab-81e5-55a4306b1914: { - name: "SupportoMorale" - } - 60f6439f-c431-4d83-ba5f-d3665966c53a: { - name: "FiveQMan" - } - 1e5ed79a-b1e8-4f44-9ea3-3fa9fc219d93: { - name: "GlacialSadness" - } - 1a76f9bf-3e25-431c-b2f2-63dbe915a2ec: { - name: "SewahDragon" - } - 9c6b4e42-ce50-4fcb-8c9e-851ccda10d04: { - name: "nikitos_proman" - } - 8494500e-787b-45d7-a68d-2203d788ea9d: { - name: "PortableSteam48" - } - 088e4961-e1b4-407a-917e-2e012a936c0c: { - name: "Labery" - } - 049553a1-43eb-4863-880d-c8ea9043ce27: { - name: "Maro919" - } - 963df5f6-c2a7-4eef-a7b1-73fea5653757: { - name: "DarkMarkus0" - } - 55fd0966-e492-41d8-9039-b7c4e0aacaa1: { - name: "TLAres" - } - 81b69c96-4957-432a-a4ce-b3eac3f3522b: { - name: "KT188" - } - aa45d976-547a-4dcb-bace-5494ab932ec3: { - name: "nicknator012" - } - f9a25bf2-750e-4d65-8c13-a64a37a4cb42: { - name: "Dovahpine" - } - d7f2797b-beb9-4142-8a79-caf7ac6fd110: { - name: "TenGiggleton" - } - 1e9a3834-b87b-4ce1-9d12-67e59de852e1: { - name: "UltimateElements" - } - 461ea1d3-0320-4a58-91aa-ddf9262ae5f4: { - name: "EnergizedHopper" - } - bb358215-a19f-4872-9ab6-de564c95134e: { - name: "GIGO1st" - } - 029ca8d9-b542-4f75-956d-513a814d75ec: { - name: "SenBoruto" - } - e6479fae-6ef3-4308-aa90-99400c0de5c6: { - name: "MaxGamesFive" - } - 1736b1a1-1698-4c65-ac48-d93f8d0f17bd: { - name: "Hackerman5000" - } - 0d92c729-baff-4d61-b2f0-3119a75ee6df: { - name: "Apoornoob" - } - 19adbcc4-d7ef-471b-a206-9bf0d2b56ef9: { - name: "senya_" - } - 70fb6275-78dd-4462-a5d0-5bf32447ca74: { - name: "Purple_Creeper14" - } - 66a1f35d-0581-4bec-8b2d-4d8125b93d0c: { - name: "sea_Starling" - } - f598ef5b-e499-4e57-a1ba-765cd6f813c1: { - name: "bugivugic" - } - 42873a62-fad1-4f16-b28b-8e27f6347469: { - name: "Khtar" - ranks: { - vip: "2026-01-15T08:10:28.166708088Z" - } - } - 8e8169c4-4772-42a4-9fe2-bc3e10921e94: { - name: "Kytakoo" - } - 31bb0f89-7bad-4026-9eef-4957e3ba9167: { - name: "Devios_" - } - 6bb20caf-6666-4e31-a656-a65aea1c3ce1: { - name: "Tenri_Shiels" - } - 5fc2aba5-df59-4da3-8d92-b19175c99f81: { - name: "FursoTurbin" - } - 919cf90c-176c-44e4-911f-80615124bc3f: { - name: "vzxc_" - } - abe4b561-e10d-44a7-b01d-14d5f01fd57b: { - name: "vPiraa" - } - fa3639f6-d306-4196-8685-a19b2676ad37: { - name: "Xtimeti" - } - eed43136-86d3-43ec-a3a1-77ba44524861: { - name: "ibnzealous" - } - 86dcdc5c-f1d9-4538-ae36-bb44180a5419: { - name: "Irfan2453" - } - 21981679-a9e7-435d-b120-a58692edb84d: { - name: "Malusi" - } - 764cb41a-f8a6-4073-8d8d-84a8f96d3a99: { - name: "Franzuar333" - } - 3f92a1fd-bc30-4ba3-b9d2-98d117f689ad: { - name: "EnderYKW" - } - 5c28dbc3-2f16-40b4-ae5d-cf8421fb4903: { - name: "Problematic2711" - } - cf6858b1-7ddf-4565-88b7-1aba4e95a186: { - name: "Lobster_Dish" - } - 56249665-f4f9-49f7-abb5-68b45b8cbf8d: { - name: "Den666Bah666" - } - ae307f00-c4a7-414e-84c8-00b16dbce6c7: { - name: "rasensusano" - } - 8230a743-e11c-448a-af16-8f826647342e: { - name: "WGOS" - } - efa99c78-53ca-4da5-bf54-788a19d8a302: { - name: "Goffmanss" - ranks: { - vip: "2026-01-15T08:09:07.553778988Z" - } - } - 68a228d9-69c0-46e0-b3d3-b118b07fe2a2: { - name: "D1ktutor" - } - 58fe43d8-c162-494a-94f3-a2abfcd7cc0c: { - name: "joflashstudios" - } - e60ff9b5-4756-43ff-aee9-7aac0be6eb43: { - name: "Icyetnotcold" - } - f04e8ec7-1ff6-4a4c-88dc-4af5d6bc0714: { - name: "peacock11" - } - 207de9ff-d8b2-4767-9c9c-3222b764183e: { - name: "AlmightySponge" - } - d044b890-acc4-4614-9b7e-6d9952585dee: { - name: "K4rlt00n" - } - 6a548eb9-b202-468c-98d8-906815f45846: { - name: "REVISIONOFF" - } - 19f537be-b30e-47c6-909a-32ab9c3acc1c: { - name: "FLOCK1ch_" - } - 21ca4f3b-5d4e-42e0-8eb3-3bf1c88394d2: { - name: "qiao_liang" - } - 10939363-c06f-45a6-8be3-9bcdd5c3fe12: { - name: "Sasqach" - } - c78a4f57-8f7b-4f7a-a31c-088afbe48ee0: { - name: "Sp_ChronoM" - } - cca9d92e-1f91-43f6-825c-36d1b9def147: { - name: "X_Gaster" - } - 5660b338-e75e-4118-bca0-89807e8d245b: { - name: "Edo_ninja" - } - 10baddd0-8a3a-42f3-b351-2583065c87a6: { - name: "Skyman2975" - } - 64abc936-5ac6-4f68-8ab2-d1144b41227a: { - name: "404Archi" - } - 98b37fb0-f3c1-421f-b2b9-03465a3db1d4: { - name: "vagenedestroyer" - } - 508cb4c1-6e5a-4bf3-8ef1-b93c5256bd50: { - name: "LovelyCuteKit" - } - 2a1e209f-9831-4a14-bfc3-d01008c3f705: { - name: "Deffgeor" - } - 0e0e70c6-2dfc-46f7-8462-db402b75d0cc: { - name: "voltack2" - } - fd1d0798-56e4-4d5f-985c-cc2945a3e9b9: { - name: "Shaunne" - } - a19936c8-ebdb-434e-a5fd-5912e8a0430a: { - name: "BLSKis1" - } - ac458f7a-c51f-4cd4-a660-b7a6eea0cb63: { - name: "VengefulAzana" - } - b2a28f91-88b7-4056-b264-19862c89a928: { - name: "Sutarso" - } - 7916320d-fe60-437b-ab1f-52b9d1d93768: { - name: "ABCDEFG111102" - } - e025a79a-036c-4383-9c14-35ceca0ac698: { - name: "Mastiox" - } - 4057cc01-39be-4e69-b940-5f07c942e9e6: { - name: "KingCreeper83" - } - d7ceca38-713f-4b5c-aae3-8fd8d1b5e6dd: { - name: "DrVegapunk" - } - 3e828dd5-f019-4fb2-b524-770d8355f200: { - name: "Anunknownentity2" - } - 5a13c45c-8961-4b2f-affb-183d781f48e8: { - name: "Quentar_no1" - } - 58073fdc-90c0-42c1-82f7-c61df5534044: { - name: "Froggi1234" - } - 54bb9161-3efe-4a7c-97a2-30334f7a33b0: { - name: "Red_Void201" - } - f7086d48-d504-455f-8fbe-51638ab4b9cc: { - name: "Wimmmy" - } - 9e4cc1ed-8d73-4299-812a-1a72a5af8544: { - name: "Rockhound31" - } - b554009f-a1b9-430c-96e0-fdb7093e1d79: { - name: "HolyNotch" - } - 62a57b67-6d49-4347-931a-bd7e80d45a0d: { - name: "Cptmog" - } - c1daf871-27c4-4627-b020-6a718370ffe1: { - name: "th3b0rg" - } - 67646284-7a83-49ec-af94-432c4175882e: { - name: "ihorshim" - } - 7ee366c5-b490-4489-a0a7-e6ef5bbb24f9: { - name: "LaughedCoast" - } - bc7f9511-47fb-4e03-ad7f-a9fc1612cdcb: { - name: "Reusablebowl_466" - } - 9c0cf88d-c64f-44dd-b4ca-bcce55f1c563: { - name: "sieha" - } - ec09b3ea-2fbd-423d-bcc6-916bcd4eb84f: { - name: "CommanderBoomy" - } - 47d8b0f4-a6a0-4a55-870f-c0e9f9595bd9: { - name: "checksout" - } - 12d627aa-5c6d-4963-a7f5-fac192582fc9: { - name: "PseudoNoob" - } - 6210f603-934f-43c4-83a3-920f42ee20a9: { - name: "Lord_Burglere" - } - c13d9bf8-e732-4734-916f-91e502519edf: { - name: "ReaLMoT" - } - 42e56709-eeb8-4f1e-923c-7b65093b5048: { - name: "The_Manbost" - } - 7c598244-0cfd-422c-9a4d-2b8808fd21ff: { - name: "meltyli" - } - 435b3327-16f9-4e0c-a8af-1d7eb59c17ec: { - name: "Casual_Prism" - } - 95781145-cf8f-4006-8568-5b6ca06f688c: { - name: "Sirkillalot1999" - } - fde1dd7e-9886-46fe-9431-695c1d090f32: { - name: "Boolean_false" - } - eb07097a-4330-4502-b6b0-8dfdadf4c3c0: { - name: "misaki_moor" - } - 612b780d-4a8d-420c-af46-0d9428d6bc0b: { - name: "kingsaucey1" - } - fd2a8eda-af44-4fa8-9f4b-124be287478f: { - name: "ortitho97" - } - 35c0a494-3ac1-4b21-8a3b-d27200da81f1: { - name: "0xQuixotic" - } - e8b529a9-9f4a-499d-9eef-638132e00884: { - name: "e7lk" - } - 7ac07417-2b58-4f85-b2de-2e10b8563276: { - name: "Kaldor__Draigo" - } - 236c8630-03ea-4b5b-b2c6-98fe07dc9719: { - name: "kosteyss" - } - 9d7c351a-e9b7-4da6-a42f-9fab2181226c: { - name: "No_Shiz" - } - b2305069-ec1d-4323-9403-02c447b96f2f: { - name: "Carrick22" - } - 3d35714d-46ad-45ff-b04a-18a23419ffed: { - name: "skyewarper" - } - b5e82df3-debf-4162-8d15-49ab59a801c7: { - name: "0x57F" - } - 4c4e608a-f982-4847-a744-3da64eae218f: { - name: "yahor" - ranks: { - vip: "2026-01-15T08:10:33.593761409Z" - } - } - 63af109a-e9b5-418f-890e-ceb6e6eb3ae2: { - name: "Zas" - ranks: { - vip: "2026-01-15T08:10:22.385821288Z" - } - } - 3688cc6c-4fc6-4489-8a85-5a1b50774e5b: { - name: "_CobaltB" - } - cb0650f9-a412-40e2-989c-ff344ef8babc: { - name: "FoxSlyme" - ranks: { - vip: "2026-01-15T08:10:06.604174779Z" - } - } - 1eda8ba5-8d0d-4094-af37-94f4d0f85ad7: { - name: "VALKYRYA151" - } - 9d4d2021-5bc9-4709-b3c6-be3ce6db26d9: { - name: "Shahar682" - } - 6f66454c-1fdc-4437-87f6-6c6d87bb09de: { - name: "dutsky" - ranks: { - vip: "2026-01-15T08:09:42.743381744Z" - } - } - a3540cb2-54ae-46b4-b54c-055494e6d4ea: { - name: "fr1pr1" - } - 25ae03ed-5115-4887-bbb9-4e0becfc6d56: { - name: "DarkNovu" - } - 2b87637a-a1d3-4844-b83a-b8aa054ad7a2: { - name: "MrAlex25250" - } - fb208927-7a80-4590-b04b-580f8d87ad25: { - name: "Giannhs610" - } - befdc545-f1f2-4c12-9dca-d9c089d11ed7: { - name: "idriveby" - } - dd23a8c8-488b-443d-8619-ed05645f2a65: { - name: "Omirian" - ranks: { - vip: "2026-01-15T08:10:15.809515349Z" - } - } - 899fabee-c628-41d8-a629-53c525181b2a: { - name: "Yaposhk" - } - db9722da-434b-4c22-9384-26b48021cfde: { - name: "santariver" - } - 4ae919a7-625f-48df-a2af-b63e440489aa: { - name: "mihaib967" - } - c1624e90-57ba-4e63-88ff-1bb573880353: { - name: "GTLB" - } - 203a2306-9c53-4fb3-b70d-45c62dac3204: { - name: "CryyBaby641" - } - e35b4087-2639-4b98-9f9e-8baa8e34a1be: { - name: "Bel_Maschione" - } - a1a4f501-4763-45f5-92ed-3b38172fe938: { - name: "Anxious_Tooth" - } - 14a22341-d190-4cf1-a935-5c90ddf4002d: { - name: "Almesii" - } - 6b9fd04d-389b-4ee9-b7fd-49abe78e5a4f: { - name: "KaMleter" - } - ea8bb99a-96cb-42a6-902f-cce7899b85b6: { - name: "Magnus_der_Rote" - } - 0d1c614a-a71a-41b1-bf50-579aa831d214: { - name: "WOVE_KFC" - } - 83143a01-445a-485e-b4e6-a792d90d594e: { - name: "Nabbo_" - } - c696f10c-290e-44c8-8576-f01a7244ad84: { - name: "Baklakus" - } - 747b1a7c-7d97-462b-8d11-b39bc90a63a5: { - name: "GamerDante" - } - 9d8063e8-d169-4243-8a73-f3d2424f6d36: { - name: "Gameron18" - } - 41f88455-6aaa-477a-bfdd-709aa0021d30: { - name: "KadeBeastMode" - } - 4e7ef4b9-bb06-4515-8c88-95dc3f802214: { - name: "Alttiex" - } - 987c3f56-7a04-4725-a9ec-bc36ba9a54bd: { - name: "DarkIceMan55" - } - bb52ac71-0f48-473c-957e-edeecd01259b: { - name: "AtTheMoro_" - } - 8e99e5f3-ab93-40b4-962c-6cad06050e93: { - name: "Demon400" - ranks: { - vip: "2026-01-15T08:09:16.926812965Z" - } - } - 9e89b0e8-717b-4532-b4e3-abd472946081: { - name: "ViinaTwo" - ranks: { - vip: "2026-01-15T05:17:00.387426169Z" - moderator: "2026-02-10T13:48:15.702844194Z" - } - } - 252c5b10-875f-4a56-91da-b1501b034852: { - name: "Unchained" - ranks: { - vip: "2026-01-15T08:09:34.836846595Z" - } - } - 349aecaf-dba2-4bd0-aba8-90e749d64204: { - name: "Petr211" - } - 79f7d3bd-6556-4e0f-854d-1c36bfba8a8b: { - name: "4fiu" - } - 255df3f3-bce1-493d-b37d-200fa863438b: { - name: "Mizzz_Manon" - } - 61863086-a8d9-4b49-9abe-de71eb8f52e6: { - name: "spuffik" - ranks: { - vip: "2026-01-15T08:09:01.588659163Z" - } - } - 21820824-24ad-4dcb-b439-675991a5b023: { - name: "Aurimas_Val" - } - 72c15b3f-be17-4cdc-9d40-cbaf5b63fdaf: { - name: "ezergol" - } - 4203f124-c74d-4d6b-833b-8b984a74eb8b: { - name: "woofwooff_xd" - } - 0e85352c-e672-4732-abe0-06c199e63804: { - name: "Halo_omega" - } - 0f5b533a-e1c6-4856-b858-7836f4daf1d9: { - name: "Samu239" - } - ce7958ea-f4f2-44fa-9b91-4eba802e7cc8: { - name: "Scolmax" - } - a13a9cf7-3295-40d4-b0de-668275f5aa00: { - name: "TGuigz" - } - 5b531b3a-ef9b-418d-8492-7a61ccc5cbef: { - name: "Jacksun_Ourabor" - } - 80744f93-ea97-4cf3-a47a-913a79edf8a4: { - name: "KonSola5" - } - a3b70b9a-957a-4d3c-9c9f-9856ec586038: { - name: "MnCl" - } - a54aeee0-fc04-41a6-8ae8-5b7eab34c16c: { - name: "Its_Arka_" - ranks: { - moderator: "2026-01-15T23:12:28.324656121Z" - } - } - 9f5f06d1-5c9b-4fe6-ba29-7969ae0418bb: { - name: "raskastil" - } - b76955c5-254a-48ec-baea-c598063d857b: { - name: "Demon_Femboy_Nik" - } - 9237b269-23fa-4ea0-a24f-abc601b8683e: { - name: "Ote4k" - } - 821ff0d0-43bf-408d-af7e-a974fe834c50: { - name: "muzzy124" - } - f88045e5-6f69-48b3-a371-3716879ba66a: { - name: "SamuelNeuge" - } - 1427e0e0-2cd6-4cc0-88d7-4892751c6c66: { - name: "YueSha" - } - 2eeefd9d-7ef0-463d-ba17-eafdd83ae56f: { - name: "CaptainWinters" - } - aef47e86-7b58-4f39-b57e-2cf5c20b370a: { - name: "berry_explosion" - } - de529898-d589-4fc9-8b30-02698478bf92: { - name: "Henrygon_l" - } - c011d197-7747-4910-95b0-e7b3f7278ebd: { - name: "Terrupoke1" - } - f8294d81-7698-4588-adac-d83558ecfa5a: { - name: "BreakingMDD" - } - c40a037b-09fb-4d23-a60a-54791dc8cb1d: { - name: "NecoArcTheSecond" - } - b1d01629-8975-46f2-bfd5-39df7abe81ab: { - name: "Shira_Kojima" - ranks: { - vip: "2026-01-15T05:17:29.205166344Z" - } - } - 68fa8980-ef4f-4928-9f8b-46f6de74f718: { - name: "ItsArka" - } - aa8a983f-0c74-4764-8565-879367373823: { - name: "ChadPUA" - } - 20634051-b19d-45b3-9095-66ff1d08109e: { - name: "MeadowDestiny" - } - 6a5fda80-8426-4ce3-b0ec-f25c4e562f60: { - name: "Zaraney_" - } - 89b75353-9ce6-442e-916d-f6012111d9e1: { - name: "glitch714" - } - f73784d1-9668-47c8-a1d3-5ba5ba0be104: { - name: "Miner1277" - } - c84fda94-f7c4-4815-874c-1f310dc82df0: { - name: "CkoPJIynKuH" - } - 478ccdc0-1bb6-4509-926f-a121ca0772f3: { - name: "MrKevlin" - } - 5959ceff-bf82-42cd-b262-29c7e8ded373: { - name: "Millizi" - ranks: { - vip: "2026-01-15T08:10:41.086610635Z" - } - } - e6ba2968-9423-4840-b788-50a79f6f8155: { - name: "SilentSmith" - } - c2903f2a-dff8-4183-aab3-95bb15e28e8c: { - name: "Gummyy0911" - } - 1019c349-99e8-4cb4-b132-fb0aa68bb2f3: { - name: "Mallon_Calc" - } - aa844cd2-b5dd-4075-af72-3b0818c7b368: { - name: "SeniorIvan" - } - d3c6e6a4-e51c-4d7e-8bd3-942acf872114: { - name: "loltnt_pvp" - } - e71726e1-9c59-4f8e-b276-ff700baf9081: { - name: "DelphSX" - } - 4dc238b1-0ac3-4cd5-9dbe-05895ee83539: { - name: "Franzuar" - } - 24ae0c43-33e7-4575-a7a3-a23dc7be7937: { - name: "LunaticFirework_" - } - 86a47332-b7ee-4546-84b9-7fd997c21ccb: { - name: "ItzDZIMBO_FTW" - } - 5f47e75a-478c-4fbb-9fe7-12c0373386d3: { - name: "HowlClaw" - } - 2e7e45f0-cb7f-415a-8ee9-08c857de1342: { - name: "Yuraser" - } - 48bef028-6c4a-42e2-9ee7-dc0b90b065a9: { - name: "Praktykalny" - } - 6cc6e47a-bef9-4d3d-8ac5-5336f60c1975: { - name: "rGalexy" - } - 95b51048-76e6-46bd-859b-b6d0824f33e8: { - name: "Ravenherr" - } - 17064bb6-96d8-4b0b-a001-b5d8a39a9c0f: { - name: "Kangorg21" - } - 1ec8bb45-e61a-437a-9c66-f76071ad5355: { - name: "kotovoxel" - } - d344393a-6eb9-415b-a684-594100f46a8f: { - name: "boby3435" - } - 61248dc4-9dac-4e6b-baea-c869cf51208a: { - name: "Encyclophreniac" - } - 93fa5e6f-39e5-4f89-8e0f-1984113e4821: { - name: "KombeckND" - } - 1de415e3-41f3-4abf-9761-e0559d4b0490: { - name: "MakSerg" - } - a676499a-f627-4f3f-a2e8-38c2a22e61b1: { - name: "Jazz241" - } - 77971b75-9a62-4aa3-8541-60c0bc3fd8c8: { - name: "Battlemaster3000" - } - 31d3cbe7-91cd-4049-bc00-0ec6db4d80a3: { - name: "DioBrandoSan" - } - 194f4d79-844d-4172-a4e7-7d633ac29dda: { - name: "SniKich" - } - 7e8d7498-aad7-4c04-add4-0094902b6592: { - name: "Vaime_" - } - 2000687d-8836-4afe-8ace-5b2506320a70: { - name: "SeeEff" - } - 10f21874-f205-432c-8cec-d80084290299: { - name: "Motux_" - } - f934ba65-4abf-47c4-9bf5-8933b7fe1851: { - name: "c1rcusfr3ak" - } - aa2bb68f-59f8-4300-947f-17674828db50: { - name: "Tr3tty" - } - 3b33fb2a-1b35-44e1-83d6-bb5ef3878eee: { - name: "Catfishfish" - } - 40cb8d13-b38e-415a-923e-0fce24f16d32: { - name: "BigusDikus176" - } - be54a83a-31bb-4215-a867-485dac3aa167: { - name: "MantaMaria221" - } - 50580c85-0410-497c-b518-616b39c6e7d3: { - name: "kiberkolobok" - } - af9431f6-8aa9-459f-b9bd-a32e704115f5: { - name: "Ttigor" - } - bbb98bb0-9737-4333-95e8-b0409b853b8f: { - name: "Voland_Infernis" - } - 3d759a1c-12bf-439c-a007-2bb093d71d86: { - name: "Poprock1st" - } - 229aefa5-e469-4d39-a924-a29f2e03063a: { - name: "AtTheMoro" - ranks: { - vip: "2026-01-15T08:09:27.144452837Z" - } - } - 35e4594f-0a0a-4fd5-8e15-869f428e7319: { - name: "Puffy_Owl_" - } - ac7b7c3a-d9ff-4cb6-91fa-1f3c0c045eb0: { - name: "TheRealMuhammad" - } - fcf35c25-122e-4f9b-9fd7-0faed8ff1c76: { - name: "Sybrux" - } - 9d036a4e-c577-49e1-aed1-c4b0735419f3: { - name: "3x1eee" - } - 1d5f943f-162e-4aa9-b7c2-463c1326c317: { - name: "multiplehitters" - } - 73dab1cf-59b6-4dac-967e-190db6acce0e: { - name: "Neon_Neiny" - } - f0acc096-4087-46c3-bd4e-5bf262574b1c: { - name: "ashleney" - } - 87f9493b-d5ae-4374-8347-dd9fb44ba76a: { - name: "Feed0r_bug" - } - ef6057c4-45e6-46ce-bb16-973886da902d: { - name: "Qwavka" - } - 5dcfcfa9-4656-4379-85a3-95c81e17a885: { - name: "e9orka" - } - 15a29bbb-a462-4de7-b8d2-ca1be930cafb: { - name: "mrp77" - } - 3eeb509a-42a0-44d7-8b22-5a32db4b9a45: { - name: "Maksimm205" - } - 0109f031-7f0c-4c56-8fdb-2a458cc57925: { - name: "TheBruh78" - } - 285a8bf2-7841-4584-8c97-1ebdbc1a15e5: { - name: "Spermaster1528" - } - 6419b63a-9ee9-4cf3-aeb2-0ef80e16f4a3: { - name: "Artekanit" - } - 177271fc-8c5a-4d9a-b0d5-803176fbae2a: { - name: "AlexMickson" - } - 20076b5b-52a5-4ffb-80ea-9642a6a4c4fe: { - name: "QW8RTY" - } - 27b0f706-abc6-4c24-9a1a-bbffd09840da: { - name: "Danilkes1337" - } - e1713f80-357b-46fa-bf0c-b9014ae93c7e: { - name: "Hexai_HK" - } - 81b8ba06-3a17-4381-8a41-7e7d36e7b4b5: { - name: "nullexe890" - } - 93020194-0fbe-402b-aa5f-e0baf7ef84c3: { - name: "FeatherForTruce2" - } - 1872807b-d66d-408f-aefc-8ec5d0b9b7e8: { - name: "Alas" - } - 5ff58ca8-f179-42fd-be74-6b599e2d4431: { - name: "Ded_Akakiy" - } - ff836f80-99a3-46e5-83b2-f6afcdd79d32: { - name: "ItzV3rtX" - } - 224b8d2e-1554-4944-89e5-dd6b1b61be57: { - name: "n_____r4959458" - } - 2c9a2efa-ecb9-4913-a0da-4ba892603010: { - name: "Kosmman" - } - e3985ef8-df8d-4e84-b016-292952c1add7: { - name: "joshiitf2" - } - 8c7270ea-833b-4ac7-866b-6caef9ed9e2e: { - name: "MiraKagami" - } - f54e6368-9069-40c3-ad3e-f479cf4a6212: { - name: "LuckySavePro" - } - 11858cbb-599f-4aa8-be52-29748456ab39: { - name: "Kloopovich" - } - 054fed4c-fe95-4ee4-919a-f77e04b04c28: { - name: "CrispLocket1489" - } - b40b92c8-3030-4f4c-a6c6-909f7dd418ef: { - name: "ChrisAdamWhite" - } - 20bd03fa-088d-4a7c-a798-f845d372ab2a: { - name: "egr177" - } - 1ea87100-2381-4002-98b1-2a1b1957e505: { - name: "RPoem471" - } - a2e91763-1f22-4de4-a22e-63d078c8e5a3: { - name: "Xenon131_" - } - 2a08826f-79bb-4792-a8c0-bdc739bc44b0: { - name: "stasyk2" - } - 1fde9cfe-1c2d-4e16-826b-a167811dacd2: { - name: "KozmoChief" - } - 2e658f52-cb63-40bd-ad1a-2a83b5a9aced: { - name: "Smusl" - } - 4c2bb983-075c-4c26-93b8-67c37c33ec97: { - name: "_eeeeeeeeeeeeee_" - } - 17d2cbca-9c9c-41a3-95e4-534a41ebb8a0: { - name: "Ertzun" - } - ee698993-1fb9-441e-8606-d68e35b25977: { - name: "Muldys" - } - 2cdf9f9e-13c8-44ec-9145-6c88ea10e802: { - name: "Herrosblade" - } - c0e5730b-9aa4-4f43-82c7-b048122fd193: { - name: "Mydarbin" - } - a388035b-11cf-41b9-9870-73e13c52b829: { - name: "EvanDude47" - } - d06baf1a-be32-4e77-bed2-222a6d4c4bdc: { - name: "W4ffleSt0mperXx" - } - a28a4940-3573-4758-a6fd-0bf9a3247980: { - name: "kalekadance" - } - f7ab10ee-b4f7-489d-8b15-ba9467c4785e: { - name: "dilay916" - } - fb897146-6bc5-4570-b1f1-2fd3339ab7d1: { - name: "_ActualDinosaur" - } - 9ef7f419-d40d-48e7-96af-3a336922c67b: { - name: "ToxaPlaySS" - } - 28ab0fa5-a109-44be-aca3-e1a56d819c3d: { - name: "Stybox" - } - 4ac91386-29a0-4f30-a016-dc935b7399c9: { - name: "Mr_VIIION" - } - 7922db79-3311-4e07-9959-af267bd85026: { - name: "MugenHd101" - } - 97d370da-2cc7-40b6-98f1-30f73347dc56: { - name: "Sapun90" - } - a04b00a2-2803-48e8-9498-c8898fbf5c70: { - name: "danveem" - } - 5a4f623e-6004-4be5-b4b5-653b8b7c77d3: { - name: "majus12301" - } - 171fac18-cfa1-4f57-a089-a4c59580d735: { - name: "Sirensir" - } - fc061361-3155-4638-ad7e-c6e1fa86fa3f: { - name: "kirstencot" - } - 7315be30-51c4-4b5f-928e-683947c59366: { - name: "MAKAKAAAAAAAAAA" - } - 19b72322-cf4a-4804-9a1a-f132c072ad8b: { - name: "Omuymis" - } - 2da55b02-e527-4bfa-a519-07e3b0c146a3: { - name: "Enotik153" - } - bc80d5c5-398a-443c-b4ad-8e1c1e6a95d0: { - name: "Zarcherz_" - } - 69bb8150-6fae-4071-a278-5f86ffb08728: { - name: "mayk250" - } - 0df2a197-597a-4c07-8e60-f4aca5a7da84: { - name: "Rossina_Luppino" - } - 8072eb2e-3aee-41ab-8310-041c736775c9: { - name: "JonnyDJ" - } - 287917e3-57ee-4a77-98a4-ff8b1585b385: { - name: "Sckreates" - } - 0eafb7d4-e8bc-4f72-bd60-1b408215bc75: { - name: "ZloDeM" - } - 960645bf-6f19-49ee-8d8d-32a78522af87: { - name: "Kyle_Forbes" - } - b8409819-a8e1-4740-b854-ab89de42a320: { - name: "CyberDuck427" - } - 0833bff1-a025-4495-a3c4-6aa490b3d640: { - name: "Bloodmech" - } - 1b4a8cfd-8937-452f-9b0c-60e292e89c93: { - name: "FeaReRSS" - } - d100da38-06ac-476a-a4da-3b6c785c5d4e: { - name: "IWantToDooge" - } - 20bb70d4-1345-47d6-802e-1effe8537b17: { - name: "HolyyBurgerr" - } - 8bd90b44-6245-45b5-a5da-94915ca36362: { - name: "hate256" - } - d656f3cc-1703-4881-90ca-4fc8b26a3c26: { - name: "z_ora" - } - 590b0eab-e5a7-4d34-af42-3c1fb0c36db3: { - name: "Komatoz_z" - } - 21c2ae31-8c43-4294-8205-9f07eaf14a77: { - name: "Walther100" - } - d6545bd7-4334-4ea9-8bd4-0a0dfa308dfe: { - name: "Manzanaa28" - } - bdb0f30d-da49-45ab-a316-95dd747f5fd3: { - name: "Green_de_Vald" - } - 0cc18bf9-d5fe-470e-9879-ab3fafd0ec8e: { - name: "ZylGriffin" - } - e77c9967-3631-458d-b3c2-dd5e9e756dc9: { - name: "DrEsquire" - } - c6d46db2-8b32-4173-9a9e-ca1ab92e4611: { - name: "mortalitie" - } - 170a00de-6fb7-42a6-b902-5b31b4357bfc: { - name: "Fuelerr" - } - a7cef560-ef93-4b3e-b8dc-c6a268d6f703: { - name: "TriStateS" - } - e14b00ee-d994-4f8e-aa38-98d08683b7d6: { - name: "DeppressedSeal" - } - f9ff234c-06c0-434d-9a98-40b57f003058: { - name: "nicotgk" - } - 37f5ac52-5080-4f2f-b402-ab80316c9e32: { - name: "zvvyoo" - } - df75dba2-cb98-41ac-a071-b7e7b780f64b: { - name: "Anoobus" - } - 8e4e3b15-382f-4769-89ec-b1500dded2ac: { - name: "Modkon23" - } - 0a742df1-3a54-4d4d-9a6f-980522bd97c7: { - name: "KVetal" - } - 28a4761f-a154-45ff-a849-6c76284d6bba: { - name: "yy098" - } - 9014d604-c18b-41e4-adeb-fa98f44d39c7: { - name: "ayzer96" - } - 6dd7e31c-47ad-498a-9406-0d89026a8dc8: { - name: "duck_egg" - } - 801900d6-f909-4da8-915b-1f3dc84f38a3: { - name: "megalightik" - } - 7419fc47-5c0b-4daf-a62f-f193587a02cb: { - name: "NahodneJmeno" - } - 6fc14cb8-9f42-4d32-8533-494cde61d2fc: { - name: "Pyse4ka" - } - c0aa6dac-8b09-4989-a4cc-5d0122198f9b: { - name: "Goofy228" - } - 4a0665ea-2cc8-4d51-835c-f9a867d43ea5: { - name: "Margyge" - } - b7a400e1-7bc4-407c-b2ed-de3d58ce687b: { - name: "DrawHyZZe" - } - a05ba842-24ec-42f7-b3ec-de75dfa98569: { - name: "Arse09" - } - 6d640124-b8b2-4854-8411-ba438cc36ac1: { - name: "_ZippoX" - } - 0afbb044-dbe3-4a3b-a85e-49bec864e872: { - name: "Huntq" - } - 9c205a75-2578-451c-aecf-5516d8c57d2b: { - name: "TimerHotel" - } - 36f60935-d3ea-4484-8a04-0dc05edde5dc: { - name: "FAMNP" - } - d9a304e4-287a-417a-a249-3a145d8e418b: { - name: "BlockedSte899" - } - 27cff000-2c07-4908-a6cb-e4d69550988c: { - name: "KeinTrust" - } - 9f8d7eab-6262-42c5-ad44-0fd62b158231: { - name: "xletaskok" - } - d8caa848-f3e8-446a-aa21-60809796d914: { - name: "s5edranner" - } -} From bc8333d14bf58e5996c87b2d7845ade00c30f681 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 22 Jun 2026 17:43:22 +0100 Subject: [PATCH 09/43] fix skeletons --- .../textures/block/cactus_skeleton.png | Bin 0 -> 2861 bytes .../monument_skeletons.json | 71 ++++++++++++++++++ .../placed_feature/desert_skeletons.json | 37 +++++++++ .../placed_feature/snow_layer_skeletons.json | 37 +++++++++ .../placed_feature/snow_skeletons.json | 37 +++++++++ .../server_scripts/realmrpg_skeletons/tags.js | 16 ++-- 6 files changed, 189 insertions(+), 9 deletions(-) create mode 100644 kubejs/assets/realmrpg_skeletons/textures/block/cactus_skeleton.png create mode 100644 kubejs/data/realmrpg_skeletons/worldgen/configured_feature/monument_skeletons.json create mode 100644 kubejs/data/realmrpg_skeletons/worldgen/placed_feature/desert_skeletons.json create mode 100644 kubejs/data/realmrpg_skeletons/worldgen/placed_feature/snow_layer_skeletons.json create mode 100644 kubejs/data/realmrpg_skeletons/worldgen/placed_feature/snow_skeletons.json diff --git a/kubejs/assets/realmrpg_skeletons/textures/block/cactus_skeleton.png b/kubejs/assets/realmrpg_skeletons/textures/block/cactus_skeleton.png new file mode 100644 index 0000000000000000000000000000000000000000..14a3f2b01061c23945035c44502e58500f98a1fb GIT binary patch literal 2861 zcmV+|3)1w7P)7jVt8ie4Cl<8IX4Q{!RY9y1SncXqOoYhIYq0u zCjX&l4vF=C<91-qotLS;-J%(~(O9UNAKAHcC%J46EupRGpPHHi))sPPctkd{{(}dS za>w?&KvpR`WzuPrzB_tx92X&~2&u4`{R};&qpB)avBdoREWaPih*aNhVa}bGr_US) zS*2K*<>5!~kUoF0Fw2jR4#>sqXA}#wyzs);q*W~O)MKxb>f0@pW`qaO5*oQ|uHo42 zLQnN^>C^wQTv(#&RH;@SW@fG;q>B)+u((K1vIj*`kh03${4BcO7x2Gy>IwFJ^GTKq zOPv1W&XQdW8RJBNAc)Dr-#djPet%Qm{MV;IJ&!?+!^wYRfl+g1#7 z0mpIJw5it{5DKcQQnZUiS|gN7HkU46A=%wcTYLKo{@33cZkqqpYsUlrrVb#N&0!b@ zx~_BK!Uc3)Z>SNU7q06drKG#7lgwgadL|Gwsy>g zMPktymC7QU`Zj$b{7rcQAb0|eFgiLa>s?{9!UHIZLMquq6$h(mv%GAvtA8gSU7X~j zi<1EK-JxS<7KlY#QAG=i;wi5=cU~3?vy8p|v(LpZ#?OsQSgFp9TwbHTTaDM-heqoG z?Ag0V96frsj7C~1mMlV{5cBf}MY{yRmv{B^@h6i+BCT|^cMyxUf~(+4c>ehh1il))S&uc&(#@NGt|G zXJ_Y%u}CaNBo@QAEOJXr!6Enp2I~TmmPkXv{W2ais%7Fg<;Z*||AdTEl#4 z+jc(wWRgplub}tnw6{laU6@O!gLQ6)U#Z`W4_(&-;Q_8+zuwRWL}Ia3{q<|vWxL_W z$6ecZ5Dtg1OC_eKuc4=U$mN%5i$$58pQBT2XUDc}7z-xLR)KIh#Exy-0nY{;`TmO= z=0E)ONzV=D^LhMFE}P@R2Nzb{lx2Qe_EF1QyJkM0Uv+3c{IQBt zA-}YYVPx2`eH*PUtq1|_ZSC}Q_h8v26h)y|PhlF1GII2FKigKxh5>W2B>eA^3! zL$yhcme9Cw*L}S6&O0kMdf>qWXbFwK{_Sr84KOovEtvD+#~*V4{r6)S24=t1#G!h}%lO$~z#M|0e@ISi$IevNi zXjA-;?thLq|MD_$!wt?{zD$qa8zeUX(=*e-_jf1WU9tK1-g^&#`|iDOMZaMfOifKu zw2CYkX?pbDh62~)+Wb7JWH%l0HiT3#7UtQ!xsOW40qL-H^A^m^0;yz@xYmh~lF3g$ z4fvmU>=eVVJWOY&#=dVJ;^!~_kj_|CVU;digU5bz&<>P61J{VKoy-Ep3I>NH1w zv>S0`a8TB6bnBL_4c%S+J8u*W<+8aI2e)9PSIw!%Pfwn_t#o;#>2Ez95F^7QG8&5p z>U!|t!4(_xgB^d)S}Cv}SFE|=j7ch)3cmYDB~xe#jeGCCcf$wr(D#xut|drzcazO# z$Y!tO(JAawiF|I6rKKWmZ5rL(8oB%;`JBbrYx6fl;acGvscY@ndQskXo54-grai^LgU&I6%dKj*iOl zbK^3X&0%ItCMG82__=Xe`y`r$Id@+EW6)|D=9RidaW2!ZRmJbV1xoEclZX#?uj zuUWd0F&r5lkrNXW(m#ZWi3xe(gA3~xNXO5OOS^1usE``ifM0zdMNz%?ud0O95TQ_* zs_UXEDykYH99B^k?@0_D`x7sn+$6=w@QBoVbp{3ouq}&!{PSPI>BG&spC8{xS|Tf2 zBkj4vXe=7szCXWzSAS4GtL-;4W?*Qev1njle4Aiq%%HCs8*|{{l+-#CqBWfOOQy!F-?<#RYZ$-qG<`BLMF3Fp-@EAQgn4kSTGk@E)*F% zZFn{y(h?z0zF|xJrp0g6KJdT;4K-lT-aW$i>%Q>o-K-x(ZNvs-7yc{lVw#a(9YRq( z_lE>2K~Y1vu8X32NpHFA0N$Jv&;5a+W34h&@Biyt-|el{Hp2AGG>wd4GuUV>km&h} z*#A&cYMluxbf|NgX2_#J}F%)jyGrM*jY}V=#Zg& zKEEo=t#7Airq^u0NZcx8TnpX$H^lw}N!gX?Mp0WmSEwqqwzd+DMzJgz^tFV&VyL31 zH#H!YOa%!_qqg>c!A9*DiM8^OTfx_WkzfA+=?YvaQ5BU?$O~~?S0aPHFm6>KrOVK< zvkd>VM{YRts)z5ofS`mnd2y2Ind#suj0}&+ty{Lzf1^-YTS@Zy48y=M3?eNNw1kGP z>)4jXSHJ%Cb@%wt_fj&E=%&5BgT=)(mSyA78ij&Q!OCFU72+L9qR|LTOA8c>CB|Me z*8gKKj#CzBT^gHSjgkFN--;HG!UWpk?vt82lW zJ1-Tbg`wf^q9_7YRgp-~`YQ^dke3 { event.add('realmrpg_skeletons:lava_skeletons_can_generate_on', magma) From 23aa1297a298031e4548f3d01f0fa244289f5139 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 22 Jun 2026 17:43:31 +0100 Subject: [PATCH 10/43] fix tower top loot tables --- kubejs/data/tfg/loot_tables/chests/beneath_tower_top.json | 2 +- kubejs/server_scripts/tfc/tags.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kubejs/data/tfg/loot_tables/chests/beneath_tower_top.json b/kubejs/data/tfg/loot_tables/chests/beneath_tower_top.json index 17eb36f135..e5a20d9d9a 100644 --- a/kubejs/data/tfg/loot_tables/chests/beneath_tower_top.json +++ b/kubejs/data/tfg/loot_tables/chests/beneath_tower_top.json @@ -314,7 +314,7 @@ }, { "type": "minecraft:item", - "name": "tfc:powder/gold", + "name": "tfc:powder/native_gold", "weight": 100, "functions": [ { diff --git a/kubejs/server_scripts/tfc/tags.js b/kubejs/server_scripts/tfc/tags.js index ec76e475cd..6df8dbe969 100644 --- a/kubejs/server_scripts/tfc/tags.js +++ b/kubejs/server_scripts/tfc/tags.js @@ -463,7 +463,7 @@ function registerTFCItemTags(event) { event.add('forge:dyes/green', 'tfc:powder/malachite') event.add('forge:dyes/brown', 'tfc:powder/garnierite') event.add('forge:dyes/yellow', 'tfc:powder/limonite') - event.add('forge:dyes/yellow', 'tfc:powder/gold') + event.add('forge:dyes/yellow', 'tfc:powder/native_gold') //Hanging Signs Soft & Hard Wood global.TFC_EQUIPMENT_METALS.forEach(metal => { From 3e61004b0a6566c0c675a7af413928e2fcf7688c Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 22 Jun 2026 17:44:02 +0100 Subject: [PATCH 11/43] remove enchant from top crossbow --- kubejs/data/tfg/loot_tables/chests/beneath_tower_top.json | 8 -------- 1 file changed, 8 deletions(-) diff --git a/kubejs/data/tfg/loot_tables/chests/beneath_tower_top.json b/kubejs/data/tfg/loot_tables/chests/beneath_tower_top.json index e5a20d9d9a..1e40ce33ce 100644 --- a/kubejs/data/tfg/loot_tables/chests/beneath_tower_top.json +++ b/kubejs/data/tfg/loot_tables/chests/beneath_tower_top.json @@ -15,14 +15,6 @@ "min": 0.75, "max": 1 } - }, - { - "function": "minecraft:set_enchantments", - "enchantments": { - "minecraft:quick_charge": 2, - "minecraft:piercing": 1 - }, - "add": false } ], "weight": 100 From 514c07c9eba173814053713c654467258db3a78e Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 22 Jun 2026 17:47:22 +0100 Subject: [PATCH 12/43] fix supports --- kubejs/client_scripts/tooltips.js | 2 ++ kubejs/server_scripts/tfg/data.js | 2 ++ 2 files changed, 4 insertions(+) diff --git a/kubejs/client_scripts/tooltips.js b/kubejs/client_scripts/tooltips.js index 67008eda82..8885296a6e 100644 --- a/kubejs/client_scripts/tooltips.js +++ b/kubejs/client_scripts/tooltips.js @@ -324,6 +324,8 @@ const registerTooltips = (event) => { }) for (let [rockId, rock] of Object.entries(global.BIG_ROCK_TABLE)) { if (rock.support) { + if (rockId === "light_concrete" || rockId === "dark_concrete") + continue; event.addAdvanced([rock.support], (item, advanced, text) => { text.add(1, Text.translate('tfg.tooltip.support.tier1')) }) diff --git a/kubejs/server_scripts/tfg/data.js b/kubejs/server_scripts/tfg/data.js index 3f90e0ae0b..f4d547110f 100644 --- a/kubejs/server_scripts/tfg/data.js +++ b/kubejs/server_scripts/tfg/data.js @@ -372,6 +372,8 @@ function registerTFGSupportData(event) { for (let [rockId, rock] of Object.entries(global.BIG_ROCK_TABLE)) { if (rock.support) { + if (rockId === "light_concrete" || rockId === "dark_concrete") + continue; event.support(`${rock.support}_horizontal`, 2, 2, 4, `${rockId}_support`); } } From 646a57a398031ca6ee0d5fd0325e0342fb902c2b Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 22 Jun 2026 17:56:55 +0100 Subject: [PATCH 13/43] improve mineshafts to avoid floating blocks and make them avoid rivers better --- .../worldgen_modifier/avoid_water_large.json | 5 +++-- .../worldgen_modifier/avoid_water_small.json | 2 +- .../structures/mineshaft/hallway/end_1_loot.nbt | Bin 619 -> 619 bytes .../structures/mineshaft/hallway/end_1_pk.nbt | Bin 654 -> 662 bytes .../structures/mineshaft/hallway/end_2_loot.nbt | Bin 654 -> 657 bytes .../structures/mineshaft/hallway/end_2_pk.nbt | Bin 650 -> 704 bytes .../structures/mineshaft/hallway/end_3_pb.nbt | Bin 679 -> 678 bytes .../tfg/overworld/tags.overworld.js | 12 ++++++------ 8 files changed, 10 insertions(+), 9 deletions(-) diff --git a/kubejs/data/tfg/lithostitched/worldgen_modifier/avoid_water_large.json b/kubejs/data/tfg/lithostitched/worldgen_modifier/avoid_water_large.json index 5fea405f75..6f0a58a54b 100644 --- a/kubejs/data/tfg/lithostitched/worldgen_modifier/avoid_water_large.json +++ b/kubejs/data/tfg/lithostitched/worldgen_modifier/avoid_water_large.json @@ -4,13 +4,14 @@ "tfg:illagers/norse_village_living", "tfg:illagers/norse_village_ruined", "tfg:illagers/arabic_village_living", - "tfg:illagers/yurts_village_living" + "tfg:illagers/yurts_village_living", + "tfg:mineshaft/mineshaft" ], "spawn_condition": { "type": "lithostitched:grid", "condition": { "type": "lithostitched:in_biome", - "biomes": "#tfg:never_has_structure/illages" + "biomes": "#tfg:never_has_structure/water" }, "radius": 105, "distance_between_points": 8, diff --git a/kubejs/data/tfg/lithostitched/worldgen_modifier/avoid_water_small.json b/kubejs/data/tfg/lithostitched/worldgen_modifier/avoid_water_small.json index d736c86684..31a7c7cb45 100644 --- a/kubejs/data/tfg/lithostitched/worldgen_modifier/avoid_water_small.json +++ b/kubejs/data/tfg/lithostitched/worldgen_modifier/avoid_water_small.json @@ -9,7 +9,7 @@ "type": "lithostitched:grid", "condition": { "type": "lithostitched:in_biome", - "biomes": "#tfg:never_has_structure/illages" + "biomes": "#tfg:never_has_structure/water" }, "radius": 50, "distance_between_points": 8, diff --git a/kubejs/data/tfg/structures/mineshaft/hallway/end_1_loot.nbt b/kubejs/data/tfg/structures/mineshaft/hallway/end_1_loot.nbt index d50ad1875bdba86637fdc1e59db84856fb40b2c9..f3cd88dc30acee923b015e7f2bcca11c35e04e09 100644 GIT binary patch delta 459 zcmV;+0W|*W1nUHlMFM7Qkw~D~YI+gz98|U*6f6gf%_ZG^`n$kH;F&jLm0^m4q~T_#C1F zuvnQKCWfen8hEy4f>w&uW=XfLIpmPtOC}8DN^(wCoaT_WQu2UuUNb>|c=-qUvI|$_ zftG|Rn<>ba!W&aJOBdD~8(wS(=X-J}sW4O(F#9a6laHj;kVC@O@Vu*Z&l*kky&=xR z7b7`0Hv1x_`R0017q B>$m^_ delta 459 zcmV;+0W|*W1nUHlMFPfSkw$ug1YNHn&zM+CDRt3N>xJ^~d<9m6`bAK7rmT+neb^q*zZRx9P z=~d^Evn?(6Zimjn*IjUbODxWie*8&tbs(Z2d}r!vX}?)79;h;`avQvBTdB-~=$48C zif>A`E=ILY+B=(BO}Ms`%4)u|jbx_*rIb7kYPmC;ZYgZd^AaxnyUv^);lHz$8nqjC z_5On2NW~td-P6Bo;JAYSHkB*9cO|ZPbGs?-oEatsOdY)3wOzVCf3UCpnnO!rqM2yi zg`e;3T~k~(4P9THO=?ov_^CI0F>*^}F8}m9H~&No`9YO-CgAQD{03Z=Dzq>Q0040n B;&cE2 diff --git a/kubejs/data/tfg/structures/mineshaft/hallway/end_1_pk.nbt b/kubejs/data/tfg/structures/mineshaft/hallway/end_1_pk.nbt index 58101ef5b0bfdeb235c2e5baea57d2cc935167ed..3d6bad7e5a7dab7e7cd9a9dd1df353abd35bd59b 100644 GIT binary patch literal 662 zcmV;H0%`ppiwFP!00000|HYNTj?*v@hR1QzCRtV>khpL_JV80{brBL5goMPk^0w2~ zyRIGC&Q{$w;H|ND+oq|L#ytR)BGsAS^ZlNgBqcxrso_sZ0l;7B?xF>Z?u42>n9{92 zQ^<^E7TtfhgI3DyH#EOt4T;bsXEY>&MIu-vf|W$Dk_c83!J-i?8o{DnEE4)5r>q_g ziO{rIN$4kF^=L?hX6Rf=1S`;xZq2!~H@x$HXhfZ9#My&9J(?lU^wcvApTVGCJ(^aY zGo$nsclqB2UtlCkxLN%*Lo&(_)RgHAD3YSUsAd z`V6s>E=}G&hol55?`#eu%k&a0yk2vOGtCzE2G^C{=8)YhE-mC*3Bm3J=8#rOi4Nt} zf=ec*FUYq|c*Y)a%D8qrC0iqWu#4r551W+>PgYEb4ckspTGS;JUzKxm%PIpoBzz8U znoRe6Y1pP!#G?Db*d5HJAJjxlB$klaDWx=fm>kNM6Kb-xuWCE@n3`!3SLWZ|JyU0(e zQ=u%O{GnClV`$u_4H^sCf(heBH(Q9>9U|LJY>MnSXjE-i%~HCY`z0Ls*Nr(h)Bny^ zYIWW3>eB(gQkp+0SJS_1;CTiAtt%(^;2m+oyK+VGb7r}cF!u0iT^;qbHPk12$1Z>x w=LZWTgKpyI`+`ux?V%q9I<{%7i#0taQz$p02%<@pf?Nv0E4Gc;Q#;t literal 654 zcmV;90&)ExiwFP!00000|HYNhj?*v@#>a8erdd`XkhpL_Ji&6_>mnpB2x%p*mD^5J z@49wmJ6m<%fValp{z+3OjX407BE^}{^ZUj#X$pV|q=r8u1pt4g`-@IsG!tt6XbQLb zOd&ItS#d}x0%}`xQ1S`;xZq23I8{TCKjZwFz&k9($Q~4z7ILkGU^9U^q?J;lLwU92 zl8NaK`L+qq*%M9~*KVg|YlIJWS>F1vS-J4diV3k{+bK$mx`4@7<(%BH%0LbYU%;Ct z(*rLJ+q4dG(%txdVJ;n)PcF04+tYgr>Am}IJK?JdWZx{VU%u3-e=d~u$FqaKYv5%q zE45jmCXn5!T3X+zgPaV@lM{LNXW7Rw@`L4TyPV(df{$4GuiUs|0tQ|kuJl`_e4u13o+>^!46Kc!nekSUwQrg}yQ=u%N_@Pzh zV`$u_4H^sCk_qF6D_e@%6_M>{Dn)i0G^)0%W+`3H!xE1C>&Bd$x_@UYwYu(i_34OT zDb1giJJY{w;AI8>tt)5v;4MDmUAaT?b7r}cF!u0iU7hr_HPmN&$1Z>x7e@;tgKpv% ohXbL4+hac_kUI|dJNJLcS6`TAKT#WxhU;JO8*2&aPT30p04{|=p8x;= diff --git a/kubejs/data/tfg/structures/mineshaft/hallway/end_2_loot.nbt b/kubejs/data/tfg/structures/mineshaft/hallway/end_2_loot.nbt index bba79cde0c4460bcb704b4fe9995554bfa45181c..2f6b0f04f28c7033589d95d7c9087c78e6502253 100644 GIT binary patch literal 657 zcmb2|=3oGW|8u8#_s=#EIL>arsU_p;^R-id2^O8-8hX_^^lQM^E}5i`?R;+AZfg8x z`+IHcX73v;n|!1@S&aMd*S9IEG0$KwezkoGgFt_zMTE`#!#QhxKb}ra{MyP?9#^IQCzJ}935p~4Z?l%UEX=D2~Q$yGq7D+gWI>j0g$R~|i#WtwpCoeF@=R=3{!+lwtsKE{ zx7gxs@iD2H@=Y`5Ylaye+x5uU)IM0JDFLWODMAFK#d(87(@_DPzJx-Mj)Grvzs;QG z+%@AcOnEzQ<^3C9{IHvm;_!N_f8w*&wM*K?twT>A>bkW4$-0m2B0uH^Zf(CJwf1P# zX_1KJ9=VS(Q&x#t)jRBaceZuM^qm1_F4vOOAI{ZZ9cr>W*Fb-})9bw!Pd0tKlxFZh zr)g6EqQVJGfzlN>({}|=75=@MZR1DYoPZmXb+RAty&1dy&D))Jx7YQ%M3pXhn7K$hz39R<~w i4ulvUe7yhgqsbp0E#IPds^PZ%2XXl-^*zUU85jWTP(P;t literal 654 zcmV;90&)ExiwFP!00000|DD!LkJ>O00N{xq*$}kq^VUlJ3Ea81s(PrZ9#*|ZCOE-c z6GyhQX!{TPuWPeF77{k2BJoH(_BWmkgdAW7%&9+;0ziDG;mP9X8Kf(1%HJ*zN8c!L z=Y^NybC^L}6kNXq<;vaf2OQt%(@aY)jv}fL0AM~QG`Vi7DZSLVKIco5Ee&R9AR;U1*iAvn5jOb zh(4UMk}>N_%v2vvSp;Dbghde+MOYMJF@(hs7DHGZVR3}T$1FO2A53zf&B|wxdSPqn z;nh|(vb3V|OSx_RV+Q=*sK!HPjn-nNWd^J@Mvp|!E7b^HJdtnv;Zi)vLMR(%HexH` zgRkmk9Cn*9yx0h>cjB>-jh8lu*;f-X`7Bxo84$IG*ZoTOs&-;`RvEW)0E7cPLjV8( diff --git a/kubejs/data/tfg/structures/mineshaft/hallway/end_2_pk.nbt b/kubejs/data/tfg/structures/mineshaft/hallway/end_2_pk.nbt index 8ab9c1b51648868ba7b1d927c1e3723fda586694..490fba5541c6064056e531fca360ccae663d65da 100644 GIT binary patch literal 704 zcmV;x0zds9iwFP!00000|DBfGj@mE~h9^EifUa7#z3W9EfqQPZs@j{XQl;J^0|vZn z;>ezW=o|E{YcGdz2%Diu5pm|9`DV-?l0HBWL@<9e2Y_^R;vv#`4>}X;rq7`tSKm0u zfC_ayj~Tpl;gC>&+BF$L!(P#31Xf01Wds%@uo!{G2rN!uaRQ4ISc1S31ePGMB!MLf zEZM}$uKkl;vTkV3>ac5XT-CXu$q1U)Sd7481QsK(IDy3pbp)Y~AoMH$$-{jNqR(R@TJ2p=t9^8;cQGjKJaq7ALScfh7nmL0}02OA=U;z>)+O9KYK& zZ9e1#AGWcwCe{s2n-AMqjKE?97ALScfyD_dL0}02OAuI+z>)-(Y+~`|=U~iisX9|SeJ8RX%>KsJroNZ7J=B7|~yhFaP!&9}^V`Y5I zEYwQFC!8-vDIAtDJX|VkH)=c91!~`i-d7hpc~oV99GIEGySmboSp>B?+aS^W0J|FO zq{_r0y4CH;KA!jItI11{I^GrO?wMrs18zT4EN6;!+%4y~r{^5RulODxg>QNwzoTBg zyt(J;x^8fZ z{doDx#ut4IoHx;&3XLnEo0=L|CH!A{UX|lruXR^vJA0AbjREcT>^NE{=(z1O5a_G8 mb22`Um~%+T{@-fy^yZM1sdY<6$7_1N1<6{Tn#|q@xoLkXu zE35ZUc5B^;Sl3)RxeuwQb zS5`y+Fhc*dSy_{HC#J1`+AKz}7{THMixVtPumr&p1WOPsNw6frk^~FR@9i;deaH!Y z*k)x-)}5HPK5VlX!D0l96D&@!IKdJGOAstUuq45f1WPtqy!k$u^??`DkV7XZx5NOi z*Sf%&Q;RUhbs6?K$S13d0J*cqsHwpmL}{&Qh#V|*q0Hn!zO9C5YKs%4U7T5{HNuCm zSdP=MU&Z0kN*S|L`w12ST_1X1Y|P}7Dm~=D^c>z)D?RC@SG%hMiRPPJZDSX!Ol=5u zeSc@~uk&-8>Aykh_G;3L_avM5#14Ck%jsept7YB(@|=VC8K2{0;Hw_UZvof-_)QxPxVRcJoFa%5w_??*k_muv-DmA0mIN7C=oCZIpHR31p(H33Mvs8~w zSy~rH%9mL5q5s3#GL4~+lXmC>$b~XK7EmtCCgvfJ?IKWJ4tl!@tLn0dYo0FQ><_Et zV#UuN*UEX5$G|!ri==|K1$0wVlT8W#H$C5!lS8gmR#%n1ncR&7=x~1CTE}B7dv(o? k4(E;bAdiwxQ;&ZIgU>3cU+8?oVfY9B0_KruakC8o0LP*^4gdfE diff --git a/kubejs/data/tfg/structures/mineshaft/hallway/end_3_pb.nbt b/kubejs/data/tfg/structures/mineshaft/hallway/end_3_pb.nbt index fa9bdaadf6c0589b295c3479668e016e4e787fe8..27b75dfe8ba8bf6537fca0bf76ff9ea2fcb0c9d9 100644 GIT binary patch delta 631 zcmV--0*L*m1*Qd%I)50#v{l#d=Ui8$upw4)_N*mXBch2$ny@S`2>&y%_v*Vyf@{|9%QKZT$ z)`Ax-+1pT?p`-lcVz`e)#FvYKjC*$@h53}`gaRB zj^Mwo$_3upv=_XkZA!Dx43{O$>nb_&e>1#^P3r0o=tqP0SVi_JZ#2)Jj^!t6=si=q R5yH)P_yO7xmL4+>002IGI<5c! delta 632 zcmV-;0*C#k1*Zj&I)B*2ZmYJDkTCPleDewEisNtMV>z4(sG0T4PUw4XJ zXvLb*ie!78sw>pEBJgsEk*ZOL6c(Sk?&TwHBqV_77G4dK2U<$JAB`xrzk&>Fm!OlU zL~zFNhLPTssT{ev9l|+&BpIfnH}iHpjvZ!fj}IBC6@L-GY;0+NCmP1is%*GYyqb3Q zX51eaL}s$mUHV%zXnwvHFmEs;N|EmG=?h)$OIOXdGoTONmMSOhy5ajR5gRN78De)s zVuedRU_8z}E1Vy2Jr2H8MZVTowyQ@X6wN!|ZPRd}R#-NqP9gm&c+BAveq^GC7k#-Lvwnv|E{e_iFUfH_b2?03;M+MO#f~J z#})jyyK;dyHthv(sfW_-Gevm~^R~&3{NGIPa S*$Lt1JNy8Zn4GUO4gdhvp)Vf* diff --git a/kubejs/server_scripts/tfg/overworld/tags.overworld.js b/kubejs/server_scripts/tfg/overworld/tags.overworld.js index 39dc69ad54..36aa38bbc5 100644 --- a/kubejs/server_scripts/tfg/overworld/tags.overworld.js +++ b/kubejs/server_scripts/tfg/overworld/tags.overworld.js @@ -319,12 +319,12 @@ function registerTFGOverworldBiomeTags(event) { event.add('tfg:has_structure/illager_roaming', '#tfg:has_structure/illager_camp') - event.add('tfg:never_has_structure/illages', '#tfc:is_lake') - event.add('tfg:never_has_structure/illages', '#tfc:is_ocean') - event.add('tfg:never_has_structure/illages', '#tfc:is_river') - event.add('tfg:never_has_structure/illages', '#tfg:earth/is_lake') - event.add('tfg:never_has_structure/illages', '#tfg:earth/is_ocean') - event.add('tfg:never_has_structure/illages', '#tfg:earth/is_river') + event.add('tfg:never_has_structure/water', '#tfc:is_lake') + event.add('tfg:never_has_structure/water', '#tfc:is_ocean') + event.add('tfg:never_has_structure/water', '#tfc:is_river') + event.add('tfg:never_has_structure/water', '#tfg:earth/is_lake') + event.add('tfg:never_has_structure/water', '#tfg:earth/is_ocean') + event.add('tfg:never_has_structure/water', '#tfg:earth/is_river') event.add('tfc_ruins:has_structure/ruin_beach', 'tfg:earth/coastal_dunes') event.add('tfc_ruins:has_structure/ruin_beach', 'tfg:earth/embayments') From 595de58c72b808db0aecfa12b4afc44d21492c06 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 22 Jun 2026 18:02:29 +0100 Subject: [PATCH 14/43] fix dirt from biochaff #4332 --- kubejs/server_scripts/tfg/natural_blocks/recipes.dirt.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kubejs/server_scripts/tfg/natural_blocks/recipes.dirt.js b/kubejs/server_scripts/tfg/natural_blocks/recipes.dirt.js index e8ab3b0e8e..365c18dc0b 100644 --- a/kubejs/server_scripts/tfg/natural_blocks/recipes.dirt.js +++ b/kubejs/server_scripts/tfg/natural_blocks/recipes.dirt.js @@ -4,7 +4,8 @@ function registerTFGDirtRecipes(event) { // Dirt creation - event.recipes.gtceu.macerator('tfg:dirt_from_bio_chaff') + event.remove({ id: 'gtceu:macerator/dirt_from_bio_chaff' }) + event.recipes.gtceu.macerator('tfg:loam_dirt_from_bio_chaff') .itemInputs('gtceu:bio_chaff') .itemOutputs('tfc:dirt/loam') .duration(300) From 31c2da9b73de14801e5de96cfa23f74549ce9a65 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 22 Jun 2026 18:18:31 +0100 Subject: [PATCH 15/43] wack #4331 --- .../railways/recipes.locometal.js | 65 +++++++++++++------ 1 file changed, 44 insertions(+), 21 deletions(-) diff --git a/kubejs/server_scripts/railways/recipes.locometal.js b/kubejs/server_scripts/railways/recipes.locometal.js index e68e6cb636..2cc3d7e1fa 100644 --- a/kubejs/server_scripts/railways/recipes.locometal.js +++ b/kubejs/server_scripts/railways/recipes.locometal.js @@ -131,10 +131,15 @@ const registerRailwaysLocometalRecipes = (event) => { // Base Locometal Regular & Undying Recipes LOCOMETAL_BASE.forEach(locometal => { - event.stonecutting(`8x railways:${locometal.id}`, '#forge:storage_blocks/iron'); - event.stonecutting(`16x railways:${locometal.id}`, '#forge:storage_blocks/wrought_iron'); - event.stonecutting(`32x railways:${locometal.id}`, '#forge:storage_blocks/steel'); + event.stonecutting(`8x railways:${locometal.id}`, '#forge:storage_blocks/iron') + .id(`tfg:stonecutting/locometal_${locometal.id}_iron`); + event.stonecutting(`16x railways:${locometal.id}`, '#forge:storage_blocks/wrought_iron') + .id(`tfg:stonecutting/locometal_${locometal.id}_wrought_iron`); + event.stonecutting(`32x railways:${locometal.id}`, '#forge:storage_blocks/steel') + .id(`tfg:stonecutting/locometal_${locometal.id}_steel`); + event.stonecutting(`railways:${locometal.id}`, `#railways:palettes/cycle_groups/netherite/base`); + event.recipes.gtceu.chemical_bath(`tfg:undying/locometal/${locometal.id}`) .itemInputs(`${locometal.dye_group}`) .inputFluids(Fluid.of(`gtceu:chlorine`, 18)) @@ -145,29 +150,47 @@ const registerRailwaysLocometalRecipes = (event) => { }) // Base Functional Decorative Block Recipes - event.stonecutting(`16x railways:locometal_end_ladder`, '#forge:storage_blocks/iron'); - event.stonecutting(`32x railways:locometal_end_ladder`, '#forge:storage_blocks/wrought_iron'); - event.stonecutting(`64x railways:locometal_end_ladder`, '#forge:storage_blocks/steel'); + event.stonecutting(`16x railways:locometal_end_ladder`, '#forge:storage_blocks/iron') + .id('tfg:stonecutting/locometal_end_ladder_iron'); + event.stonecutting(`32x railways:locometal_end_ladder`, '#forge:storage_blocks/wrought_iron') + .id('tfg:stonecutting/locometal_end_ladder_wrought_iron'); + event.stonecutting(`64x railways:locometal_end_ladder`, '#forge:storage_blocks/steel') + .id('tfg:stonecutting/locometal_end_ladder_steel'); - event.stonecutting(`16x railways:locometal_rung_ladder`, '#forge:storage_blocks/iron'); - event.stonecutting(`32x railways:locometal_rung_ladder`, '#forge:storage_blocks/wrought_iron'); - event.stonecutting(`64x railways:locometal_rung_ladder`, '#forge:storage_blocks/steel'); + event.stonecutting(`16x railways:locometal_rung_ladder`, '#forge:storage_blocks/iron') + .id('tfg:stonecutting/locometal_rung_ladder_iron'); + event.stonecutting(`32x railways:locometal_rung_ladder`, '#forge:storage_blocks/wrought_iron') + .id('tfg:stonecutting/locometal_rung_ladder_wrought_iron'); + event.stonecutting(`64x railways:locometal_rung_ladder`, '#forge:storage_blocks/steel') + .id('tfg:stonecutting/locometal_rung_ladder_steel'); - event.stonecutting(`4x railways:locometal_trapdoor`, '#forge:storage_blocks/iron'); - event.stonecutting(`8x railways:locometal_trapdoor`, '#forge:storage_blocks/wrought_iron'); - event.stonecutting(`16x railways:locometal_trapdoor`, '#forge:storage_blocks/steel'); + event.stonecutting(`4x railways:locometal_trapdoor`, '#forge:storage_blocks/iron') + .id('tfg:stonecutting/locometal_trapdoor_iron'); + event.stonecutting(`8x railways:locometal_trapdoor`, '#forge:storage_blocks/wrought_iron') + .id('tfg:stonecutting/locometal_trapdoor_wrought_iron'); + event.stonecutting(`16x railways:locometal_trapdoor`, '#forge:storage_blocks/steel') + .id('tfg:stonecutting/locometal_trapdoor_steel'); - event.stonecutting(`2x railways:hinged_locometal_door`, '#forge:storage_blocks/iron'); - event.stonecutting(`4x railways:hinged_locometal_door`, '#forge:storage_blocks/wrought_iron'); - event.stonecutting(`8x railways:hinged_locometal_door`, '#forge:storage_blocks/steel'); + event.stonecutting(`2x railways:hinged_locometal_door`, '#forge:storage_blocks/iron') + .id('tfg:stonecutting/hinged_locometal_door_iron'); + event.stonecutting(`4x railways:hinged_locometal_door`, '#forge:storage_blocks/wrought_iron') + .id('tfg:stonecutting/hinged_locometal_door_wrought_iron'); + event.stonecutting(`8x railways:hinged_locometal_door`, '#forge:storage_blocks/steel') + .id('tfg:stonecutting/hinged_locometal_door_steel'); - event.stonecutting(`2x railways:sliding_locometal_door`, '#forge:storage_blocks/iron'); - event.stonecutting(`4x railways:sliding_locometal_door`, '#forge:storage_blocks/wrought_iron'); - event.stonecutting(`8x railways:sliding_locometal_door`, '#forge:storage_blocks/steel'); + event.stonecutting(`2x railways:sliding_locometal_door`, '#forge:storage_blocks/iron') + .id('tfg:stonecutting/sliding_locometal_door_iron'); + event.stonecutting(`4x railways:sliding_locometal_door`, '#forge:storage_blocks/wrought_iron') + .id('tfg:stonecutting/sliding_locometal_door_wrought_iron'); + event.stonecutting(`8x railways:sliding_locometal_door`, '#forge:storage_blocks/steel') + .id('tfg:stonecutting/sliding_locometal_door_steel'); - event.stonecutting(`2x railways:folding_locometal_door`, '#forge:storage_blocks/iron'); - event.stonecutting(`4x railways:folding_locometal_door`, '#forge:storage_blocks/wrought_iron'); - event.stonecutting(`8x railways:folding_locometal_door`, '#forge:storage_blocks/steel'); + event.stonecutting(`2x railways:folding_locometal_door`, '#forge:storage_blocks/iron') + .id('tfg:stonecutting/folding_locometal_door_iron'); + event.stonecutting(`4x railways:folding_locometal_door`, '#forge:storage_blocks/wrought_iron') + .id('tfg:stonecutting/folding_locometal_door_wrought_iron'); + event.stonecutting(`8x railways:folding_locometal_door`, '#forge:storage_blocks/steel') + .id('tfg:stonecutting/folding_locometal_door_steel'); // Base RNR Flywheel Recipes event.shapeless('railways:locometal_flywheel', [ From 4738d08fc4cb54bc0a4f63d7c6e52362af56529d Mon Sep 17 00:00:00 2001 From: ashlen Date: Mon, 22 Jun 2026 19:31:15 +0200 Subject: [PATCH 16/43] Add a 4th wireless card tooltip (#4334) --- kubejs/client_scripts/tooltips.js | 1 + 1 file changed, 1 insertion(+) diff --git a/kubejs/client_scripts/tooltips.js b/kubejs/client_scripts/tooltips.js index 67008eda82..833071eb1c 100644 --- a/kubejs/client_scripts/tooltips.js +++ b/kubejs/client_scripts/tooltips.js @@ -517,6 +517,7 @@ const registerTooltips = (event) => { text.add(1, Text.translate('tfg.tooltip.wireless_card_1')); text.add(2, Text.translate('tfg.tooltip.wireless_card_2')); text.add(3, Text.translate('tfg.tooltip.wireless_card_3')); + text.add(4, Text.translate('tfg.tooltip.wireless_card_4')); }) // Deprecated Items From c4f14e7a48baa333093fad6164715f4904ef3c1b Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 22 Jun 2026 18:41:12 +0100 Subject: [PATCH 17/43] make all the tower large vessels contain something --- .../loot_tables/chests/beneath_tower_top.json | 15 -------- .../tfg/structures/beneath/tower_vessel_1.nbt | Bin 279 -> 480 bytes .../tfg/structures/beneath/tower_vessel_2.nbt | Bin 279 -> 435 bytes .../tfg/structures/beneath/tower_vessel_3.nbt | Bin 279 -> 434 bytes .../tfg/structures/beneath/tower_vessel_4.nbt | Bin 0 -> 481 bytes .../tfg/structures/beneath/tower_vessel_5.nbt | Bin 0 -> 488 bytes .../tfg/structures/beneath/tower_vessel_6.nbt | Bin 0 -> 491 bytes .../beneath/mob_piglin_easy.json | 33 ++++++++++++++++-- .../beneath/mob_piglin_hard.json | 33 ++++++++++++++++-- .../beneath/mob_piglin_medium.json | 33 ++++++++++++++++-- kubejs/server_scripts/createdeco/recipes.js | 24 ++++++++++--- 11 files changed, 109 insertions(+), 29 deletions(-) create mode 100644 kubejs/data/tfg/structures/beneath/tower_vessel_4.nbt create mode 100644 kubejs/data/tfg/structures/beneath/tower_vessel_5.nbt create mode 100644 kubejs/data/tfg/structures/beneath/tower_vessel_6.nbt diff --git a/kubejs/data/tfg/loot_tables/chests/beneath_tower_top.json b/kubejs/data/tfg/loot_tables/chests/beneath_tower_top.json index 1e40ce33ce..0ce678fb84 100644 --- a/kubejs/data/tfg/loot_tables/chests/beneath_tower_top.json +++ b/kubejs/data/tfg/loot_tables/chests/beneath_tower_top.json @@ -680,21 +680,6 @@ ], "weight": 50 }, - { - "type": "minecraft:item", - "name": "ae2:ender_dust", - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "min": 1, - "max": 2, - "type": "minecraft:uniform" - } - } - ], - "weight": 80 - }, { "type": "minecraft:item", "name": "tfc:food/cooked_venison", diff --git a/kubejs/data/tfg/structures/beneath/tower_vessel_1.nbt b/kubejs/data/tfg/structures/beneath/tower_vessel_1.nbt index 6ee7064b76b17805ab865626b84193fcdc744121..3ce04b0fe903ec5250051d06784b214d27c3f02c 100644 GIT binary patch literal 480 zcmV<60U!P!iwFP!00000|GiXAkJB&^oqV-PRuy{zj@-EJz1KxZTo4ix*T_kxsTao+ z*^}*-f55+H+)@%K5(kvEl-QZPnKy3|y%L~+)a!4U06@5+%U-~$Hq?CeWr!q@c~*>a zmW*T|e@O@{KHX=S=o)icB_y`y99FDchYT-zZLx7`$6M?NKIV`;khToDBV$x;Fo$#? zGJiqd?6g&;I#a%#UN?K~(O_E*WVGMQp*Bi%FxgPesvhC>1n;S?8nW`pb`k*_n4!;SFuZ2dFP${SFBU-6^Od$O%a}M(>Ap5}BpC(&`xFJ3#P3$FX zc-L&T;Ho_;&L9n2fTfVJ7D3Zk&z-)UI_=1`l^r{oaRk{tjaCXwOwpoD>5M5}lqsGu zCI89vs^bR7ts{@sKSZU^Hok08rewyndNxh#Wk1yXpU9V`T3>Ltp|A;-Rz0E@_X#Gs z9+W|5Jo%>>&&Oaqn`ul+JGg|eOs0hLlcND0YxLrEADV&9clZI*<^Lr{1^@ti_vY~c literal 279 zcmV+y0qFi8iwFP!00000|9z0bP69CyhJRSVrG)5>o3Fr~tHz`8Lr~7IEqU2 zA2a;T3@(}PWl)7yYfO~lmKE2X3v458bj4k-?={9daY0c>@t#`GHAcON|AU-uTp-{4 zl)TlAU0IIQIlJ`5ym{l4*e_d8cAs4Wb&SQ?rIWU?5^|^#4W!)*FkOy_5kT*N7TVPIgMqVycqamxKmbR2T`P6EtY4xvf%sxPHZ dogZAmj)R@ulhQNCR9MVE@dc)+`P$t9000woi3R`w diff --git a/kubejs/data/tfg/structures/beneath/tower_vessel_2.nbt b/kubejs/data/tfg/structures/beneath/tower_vessel_2.nbt index f5ea407e7745c972560401a669c2d1fc175a93de..7ec4a3280164b7acb7c524fcb6b5ae41c1b384c4 100644 GIT binary patch literal 435 zcmV;k0ZjfMiwFP!00000|CLk0Zks?59Sk^_C~8m5vA14x_cc|eUaCr!dPM__@uthp zYG)iL{e%8>ckMW&bt9FPfMt1a=DpFQ23SEM<|pLH==wO1 z1q;)|+X;GS2EqLwMi=Ksv&m>IXWTuxSotxB;#-_^n%@e_&r0KAvQ;{_tcmp0P&dQc z6S|!?LextJ5LbJ9lKHag`V* zcmv*=1XfjIh)7Xl=lg%hHoy|IXg|0BkoRObmsr$JnwMyDrocQZDW`i<6urbjfRiXk z|1s0w%;cQ;UIvA)wZuXx>{)TySs`d(sw5bG6X5a+0NTw>OXxIf5MYdyK@ zr{s;c&9>n{oozNQn^$ifBfE_R^80M#sbgG^Hl5T}BR+*H!C-kWNp(woM2V^0;c7$= zb|2}OJHP13u`1`mO_S+EHeHV-*?=K^W?*0*gY+EKa!d_Ku0K_XfJm)a2EjN!+#+4LuQB(@^ z5Rncnhk!UHyZaj^Ic9dFgw)kqz*NyMN#UY5jv9}hE~p>$xq$qEjZ-K*TZ^@&0av}3`3fW!gbL`(7@^4E0uCqm4x2!R6zu_nC zmWu{OaD$Z)wUR)7%WJ0zjPPU+UqrYjbn<^R{WzL^9L-NrJ3R%SodOr{DLx#dcFn>@ z*Hs&mV36qJ*?^W*soZxd`yRbzS+QA^3+1!p_Sm=sZdbcLZ*Hljf_u5AbE;)6k%f% c!(RTwvoEN4PhO%HIR6E|0oxdvBIpAE0PmjCLI3~& literal 279 zcmV+y0qFi8iwFP!00000|9z0bPQx$^hX1YGXfsW45LbJGW${ag`V* zcmv*=1U5}#h)7Xl=lg##jm$a``;D=Zo(?MpN{Q(zvIl+!&aic#WGfP*MU z|1s0w%;cQ;UIvA4w8TOw^sKlXtmigRryCwdeJ?TJiS>#yh;!69E-@QL+#lq!vz}c2 zQ}RZ;cGGg8!M1Cc&FeRgk=?ovl;D}CfpL8@8KkLO@hMaZ2GzYJ%`J@)C8lFPw14LGLH3=GU;kdcF0j;VbKmVIj8iig?C-q%rH^*Prm d(}T^}VXn(NQhMSLGmF(Hz5w>)BYxZg001$Eg}ML$ diff --git a/kubejs/data/tfg/structures/beneath/tower_vessel_4.nbt b/kubejs/data/tfg/structures/beneath/tower_vessel_4.nbt new file mode 100644 index 0000000000000000000000000000000000000000..3995e9c31c91aba0776e631191b6bb32e674f65f GIT binary patch literal 481 zcmV<70UrJziwFP!00000|GiYfj?*v@ois_CWL3cd#Em1@z4y8Zi3>tP;u<;0H1*9tZ5c90#;D3*21!q3 z{tmM_RHSy X-YZsL(fPmywm;w}IP1IZKL!8*e%IwW literal 0 HcmV?d00001 diff --git a/kubejs/data/tfg/structures/beneath/tower_vessel_5.nbt b/kubejs/data/tfg/structures/beneath/tower_vessel_5.nbt new file mode 100644 index 0000000000000000000000000000000000000000..5e940905e208759d2e59e1e26b43104a941c9f64 GIT binary patch literal 488 zcmVNi;OsE!fYKkUA@w}QA6RKohs_9LoFQ;lbFV*y}RxhV2n_Jc35&>s| zsTC*m;y=MASDiA*jJ<=3^?VN2vl;zFX$M32#%6NJzc}j9u|_X$M^1~8NDE{kujyS{Y}WlK)k2LCCz5>@E1hIFrt7iV00ly+-K*d2pWsweFsdI~}^ eVb&q-x6j{wP^`Y8^Pw5o{DfbqrJbWl1^@t#u=9Y1*Bg8zytuo9gSlFi`r0g@5``~K;~I7 z%3LCnp8OaPuK4tvVWM-)=_(d9!olSyrq!LT{UFomC2P*d?Imn zt9lPP#JYv+33{iuULF2OG(Jx>ni3T{Z6DAI^D%++o76efuYl|`V|S`-5!MZH2pR-m zHx7lo#fH{fGOf7NHiGPy_LdWv@X<5y@eCi&vnyf6n`W)WN41mq4AL+J8!2S0rC`&x z4MK0GN}P1;ek*%8Dn&D;E1@aeFibvRW z;5DITs|WPbUEvT|_R1hLmcxdpUqWN8CPJkhjLTN`3g%)sg=`~ppsmI)>W006{M>ka?_ literal 0 HcmV?d00001 diff --git a/kubejs/data/tfg/worldgen/template_pool/beneath/mob_piglin_easy.json b/kubejs/data/tfg/worldgen/template_pool/beneath/mob_piglin_easy.json index 919aee1585..d49a591389 100644 --- a/kubejs/data/tfg/worldgen/template_pool/beneath/mob_piglin_easy.json +++ b/kubejs/data/tfg/worldgen/template_pool/beneath/mob_piglin_easy.json @@ -30,7 +30,7 @@ } }, { - "weight": 20, + "weight": 10, "element": { "location": "tfg:beneath/tower_vessel_1", "processors": "minecraft:empty", @@ -39,7 +39,7 @@ } }, { - "weight": 20, + "weight": 10, "element": { "location": "tfg:beneath/tower_vessel_2", "processors": "minecraft:empty", @@ -48,7 +48,7 @@ } }, { - "weight": 20, + "weight": 10, "element": { "location": "tfg:beneath/tower_vessel_3", "processors": "minecraft:empty", @@ -56,6 +56,33 @@ "element_type": "minecraft:single_pool_element" } }, + { + "weight": 10, + "element": { + "location": "tfg:beneath/tower_vessel_4", + "processors": "minecraft:empty", + "projection": "rigid", + "element_type": "minecraft:single_pool_element" + } + }, + { + "weight": 10, + "element": { + "location": "tfg:beneath/tower_vessel_5", + "processors": "minecraft:empty", + "projection": "rigid", + "element_type": "minecraft:single_pool_element" + } + }, + { + "weight": 10, + "element": { + "location": "tfg:beneath/tower_vessel_6", + "processors": "minecraft:empty", + "projection": "rigid", + "element_type": "minecraft:single_pool_element" + } + }, { "weight": 30, "element": { diff --git a/kubejs/data/tfg/worldgen/template_pool/beneath/mob_piglin_hard.json b/kubejs/data/tfg/worldgen/template_pool/beneath/mob_piglin_hard.json index 45d208e53b..63a3ba040a 100644 --- a/kubejs/data/tfg/worldgen/template_pool/beneath/mob_piglin_hard.json +++ b/kubejs/data/tfg/worldgen/template_pool/beneath/mob_piglin_hard.json @@ -30,7 +30,7 @@ } }, { - "weight": 5, + "weight": 2, "element": { "location": "tfg:beneath/tower_vessel_1", "processors": "minecraft:empty", @@ -39,7 +39,7 @@ } }, { - "weight": 5, + "weight": 2, "element": { "location": "tfg:beneath/tower_vessel_2", "processors": "minecraft:empty", @@ -48,7 +48,7 @@ } }, { - "weight": 5, + "weight": 2, "element": { "location": "tfg:beneath/tower_vessel_3", "processors": "minecraft:empty", @@ -56,6 +56,33 @@ "element_type": "minecraft:single_pool_element" } }, + { + "weight": 3, + "element": { + "location": "tfg:beneath/tower_vessel_4", + "processors": "minecraft:empty", + "projection": "rigid", + "element_type": "minecraft:single_pool_element" + } + }, + { + "weight": 3, + "element": { + "location": "tfg:beneath/tower_vessel_5", + "processors": "minecraft:empty", + "projection": "rigid", + "element_type": "minecraft:single_pool_element" + } + }, + { + "weight": 3, + "element": { + "location": "tfg:beneath/tower_vessel_6", + "processors": "minecraft:empty", + "projection": "rigid", + "element_type": "minecraft:single_pool_element" + } + }, { "weight": 10, "element": { diff --git a/kubejs/data/tfg/worldgen/template_pool/beneath/mob_piglin_medium.json b/kubejs/data/tfg/worldgen/template_pool/beneath/mob_piglin_medium.json index 5806416747..bdcec6fbef 100644 --- a/kubejs/data/tfg/worldgen/template_pool/beneath/mob_piglin_medium.json +++ b/kubejs/data/tfg/worldgen/template_pool/beneath/mob_piglin_medium.json @@ -39,7 +39,7 @@ } }, { - "weight": 10, + "weight": 5, "element": { "location": "tfg:beneath/tower_vessel_1", "processors": "minecraft:empty", @@ -48,7 +48,7 @@ } }, { - "weight": 10, + "weight": 5, "element": { "location": "tfg:beneath/tower_vessel_2", "processors": "minecraft:empty", @@ -57,7 +57,7 @@ } }, { - "weight": 10, + "weight": 5, "element": { "location": "tfg:beneath/tower_vessel_3", "processors": "minecraft:empty", @@ -65,6 +65,33 @@ "element_type": "minecraft:single_pool_element" } }, + { + "weight": 5, + "element": { + "location": "tfg:beneath/tower_vessel_4", + "processors": "minecraft:empty", + "projection": "rigid", + "element_type": "minecraft:single_pool_element" + } + }, + { + "weight": 5, + "element": { + "location": "tfg:beneath/tower_vessel_5", + "processors": "minecraft:empty", + "projection": "rigid", + "element_type": "minecraft:single_pool_element" + } + }, + { + "weight": 5, + "element": { + "location": "tfg:beneath/tower_vessel_6", + "processors": "minecraft:empty", + "projection": "rigid", + "element_type": "minecraft:single_pool_element" + } + }, { "weight": 20, "element": { diff --git a/kubejs/server_scripts/createdeco/recipes.js b/kubejs/server_scripts/createdeco/recipes.js index 68dd7a255a..beae63cc42 100644 --- a/kubejs/server_scripts/createdeco/recipes.js +++ b/kubejs/server_scripts/createdeco/recipes.js @@ -327,38 +327,48 @@ const registerCreatedecoRecipes = (event) => { event.recipes.gtceu.forming_press('createdeco:gold_coin') .itemInputs('#forge:nuggets/gold') .notConsumable('gtceu:cylinder_casting_mold') - .itemOutputs('4x createdeco:gold_coin') + .itemOutputs('createdeco:gold_coin') .duration(50) .EUt(16) + TFGHelpers.registerMaterialInfo('createdeco:gold_coin', [GTMaterials.Gold, 1/9]) + event.recipes.gtceu.forming_press('createdeco:netherite_coin') .itemInputs('#forge:nuggets/blue_steel') .notConsumable('gtceu:cylinder_casting_mold') - .itemOutputs('4x createdeco:netherite_coin') + .itemOutputs('createdeco:netherite_coin') .duration(50) .EUt(16) + TFGHelpers.registerMaterialInfo('createdeco:netherite_coin', [GTMaterials.BlueSteel, 1/9]) + event.recipes.gtceu.forming_press('createdeco:brass_coin') .itemInputs('#forge:nuggets/brass') .notConsumable('gtceu:cylinder_casting_mold') - .itemOutputs('4x createdeco:brass_coin') + .itemOutputs('createdeco:brass_coin') .duration(50) .EUt(16) + TFGHelpers.registerMaterialInfo('createdeco:brass_coin', [GTMaterials.Brass, 1/9]) + event.recipes.gtceu.forming_press('createdeco:iron_coin') .itemInputs('#forge:nuggets/wrought_iron') .notConsumable('gtceu:cylinder_casting_mold') - .itemOutputs('4x createdeco:iron_coin') + .itemOutputs('createdeco:iron_coin') .duration(50) .EUt(16) + TFGHelpers.registerMaterialInfo('createdeco:iron_coin', [GTMaterials.WroughtIron, 1/9]) + event.recipes.gtceu.forming_press('createdeco:copper_coin') .itemInputs('#forge:nuggets/copper') .notConsumable('gtceu:cylinder_casting_mold') - .itemOutputs('4x createdeco:copper_coin') + .itemOutputs('createdeco:copper_coin') .duration(50) .EUt(16) + TFGHelpers.registerMaterialInfo('createdeco:copper_coin', [GTMaterials.Copper, 1/9]) + event.recipes.gtceu.forming_press('createdeco:industrial_iron_coin') .itemInputs('#forge:nuggets/steel') .notConsumable('gtceu:cylinder_casting_mold') @@ -366,6 +376,8 @@ const registerCreatedecoRecipes = (event) => { .duration(50) .EUt(16) + TFGHelpers.registerMaterialInfo('createdeco:industrial_iron_coin', [GTMaterials.Steel, 1/9]) + event.recipes.gtceu.forming_press('createdeco:zinc_coin') .itemInputs('#forge:nuggets/zinc') .notConsumable('gtceu:cylinder_casting_mold') @@ -373,6 +385,8 @@ const registerCreatedecoRecipes = (event) => { .duration(50) .EUt(16) + TFGHelpers.registerMaterialInfo('createdeco:zinc_coin', [GTMaterials.Zinc, 1/9]) + // #region // #region Window panes From 43401256671fcb2f383fce01eb5ff4e8080a26a1 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 22 Jun 2026 18:42:05 +0100 Subject: [PATCH 18/43] langs --- kubejs/assets/tfg/lang/en_us.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/kubejs/assets/tfg/lang/en_us.json b/kubejs/assets/tfg/lang/en_us.json index 6ff6c804f6..e3f6ba7c18 100644 --- a/kubejs/assets/tfg/lang/en_us.json +++ b/kubejs/assets/tfg/lang/en_us.json @@ -3192,6 +3192,7 @@ "tfc.recipe.barrel.tfg.sealed_barrel.prepared_leather_gloves": "Soaking Leather Gloves", "tfc.recipe.barrel.tfg.barrel.rapeseed_to_oil": "Extracting Canola Oil", "tfc.recipe.barrel.tfg.barrel.sunflower_to_oil": "Extracting Sunflower Oil", + "tfc.recipe.barrel.tfg.barrel.peanut_to_oil": "Extracting Peanut Oil", "tfc.recipe.barrel.tfg.barrel.maple_syrup_to_sugar": "Making sugar", "tfc.recipe.barrel.tfg.barrel.birch_syrup_to_sugar": "Making sugar", "tfc.recipe.barrel.tfg.barrel.develop_black_and_white_film": "Developing film", @@ -3390,7 +3391,8 @@ "tfg.tooltip.growth_chamber": "This machine can run more recipes at once by increasing the number of layers.", "tfg.tooltip.wireless_card_1": "Enables wireless connections from any range, even from different planets!", "tfg.tooltip.wireless_card_2": "Items can still be transferred through the terminal, but at a very high power cost.", - "tfg.tooltip.wireless_card_3": "Use a §dRailgun§r for your interplanetary logistical needs instead.", + "tfg.tooltip.wireless_card_3": "Transferring items is 8x more expensive than transferring blocks.", + "tfg.tooltip.wireless_card_4": "Use a §dRailgun§r for your interplanetary logistical needs instead.", "tfg.tooltip.component.nuclear_turbine_1": "§eBase Production:§r 8192 EU/t", "tfg.tooltip.component.nuclear_turbine_2": "Each Rotor Holder above §5EV§r §7adds§r 10% efficiency and multiplies EU/t by 2.", "tfg.tooltip.component.smr_generator_1": "§eBase Production:§r 4096 EU/t", From 9b602769f7bd7d68cb7b0bc1ecf9e4d43f5e8293 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 22 Jun 2026 19:17:37 +0100 Subject: [PATCH 19/43] loot table stuff --- .../chests/beneath_tower_bottom.json | 394 +++++++++++++----- .../loot_tables/chests/beneath_tower_top.json | 72 +--- .../loot_tables/chests/mineshaft/generic.json | 11 + .../loot_tables/chests/mineshaft/spider.json | 11 + 4 files changed, 326 insertions(+), 162 deletions(-) diff --git a/kubejs/data/tfg/loot_tables/chests/beneath_tower_bottom.json b/kubejs/data/tfg/loot_tables/chests/beneath_tower_bottom.json index 69689ebb36..ce920e82a7 100644 --- a/kubejs/data/tfg/loot_tables/chests/beneath_tower_bottom.json +++ b/kubejs/data/tfg/loot_tables/chests/beneath_tower_bottom.json @@ -2,7 +2,8 @@ "type": "minecraft:chest", "pools": [ { - "bonus_rolls": 0, + "name": "loot_pool", + "rolls": 1, "entries": [ { "type": "minecraft:item", @@ -19,14 +20,284 @@ { "function": "minecraft:set_enchantments", "enchantments": { - "minecraft:quick_charge": 2, - "minecraft:piercing": 1 + "minecraft:quick_charge": 1 }, "add": false } ], "weight": 100 }, + { + "type": "minecraft:item", + "name": "tfc:metal/chestplate/black_bronze", + "weight": 50, + "functions": [ + { + "function": "minecraft:set_damage", + "damage": { + "type": "minecraft:uniform", + "min": 0.75, + "max": 1 + } + }, + { + "function": "minecraft:set_nbt", + "tag": "{\"tfc:forging_bonus\": 3}" + } + ] + }, + { + "type": "minecraft:item", + "name": "tfc:metal/helmet/black_bronze", + "weight": 50, + "functions": [ + { + "function": "minecraft:set_damage", + "damage": { + "type": "minecraft:uniform", + "min": 0.75, + "max": 1 + } + }, + { + "function": "minecraft:set_nbt", + "tag": "{\"tfc:forging_bonus\": 3}" + } + ] + }, + { + "type": "minecraft:item", + "name": "tfc:metal/greaves/black_bronze", + "weight": 50, + "functions": [ + { + "function": "minecraft:set_damage", + "damage": { + "type": "minecraft:uniform", + "min": 0.75, + "max": 1 + } + }, + { + "function": "minecraft:set_nbt", + "tag": "{\"tfc:forging_bonus\": 3}" + } + ] + }, + { + "type": "minecraft:item", + "name": "tfc:metal/boots/black_bronze", + "weight": 50, + "functions": [ + { + "function": "minecraft:set_damage", + "damage": { + "type": "minecraft:uniform", + "min": 0.75, + "max": 1 + } + }, + { + "function": "minecraft:set_nbt", + "tag": "{\"tfc:forging_bonus\": 3}" + } + ] + }, + { + "type": "minecraft:item", + "name": "tfc:metal/shield/black_bronze", + "weight": 50, + "functions": [ + { + "function": "minecraft:set_damage", + "damage": { + "type": "minecraft:uniform", + "min": 0.75, + "max": 1 + } + }, + { + "function": "minecraft:set_nbt", + "tag": "{\"tfc:forging_bonus\": 3}" + } + ] + }, + { + "type": "minecraft:item", + "name": "gtceu:black_bronze_pickaxe", + "functions": [ + { + "function": "minecraft:set_damage", + "damage": { + "type": "minecraft:uniform", + "min": 0.1, + "max": 0.9 + } + }, + { + "function": "minecraft:set_nbt", + "tag": "{\"tfc:forging_bonus\": 3}" + } + ], + "weight": 100 + }, + { + "type": "minecraft:item", + "name": "gtceu:black_bronze_shovel", + "functions": [ + { + "function": "minecraft:set_damage", + "damage": { + "type": "minecraft:uniform", + "min": 0.1, + "max": 0.9 + } + }, + { + "function": "minecraft:set_nbt", + "tag": "{\"tfc:forging_bonus\": 3}" + } + ], + "weight": 100 + }, + { + "type": "minecraft:item", + "name": "gtceu:black_bronze_hammer", + "functions": [ + { + "function": "minecraft:set_damage", + "damage": { + "type": "minecraft:uniform", + "min": 0.1, + "max": 0.9 + } + }, + { + "function": "minecraft:set_nbt", + "tag": "{\"tfc:forging_bonus\": 3}" + } + ], + "weight": 100 + }, + { + "type": "minecraft:item", + "name": "gtceu:black_bronze_sword", + "functions": [ + { + "function": "minecraft:set_damage", + "damage": { + "type": "minecraft:uniform", + "min": 0.1, + "max": 0.9 + } + }, + { + "function": "minecraft:set_nbt", + "tag": "{\"tfc:forging_bonus\": 3}" + } + ], + "weight": 100 + }, + { + "type": "minecraft:item", + "name": "gtceu:black_bronze_axe", + "functions": [ + { + "function": "minecraft:set_damage", + "damage": { + "type": "minecraft:uniform", + "min": 0.1, + "max": 0.9 + } + }, + { + "function": "minecraft:set_nbt", + "tag": "{\"tfc:forging_bonus\": 3, \"GT.Behaviours\":{\"DisableShields\":1, \"TreeFelling\":1}}" + } + ], + "weight": 100 + }, + { + "type": "minecraft:item", + "name": "tfc:metal/mace/black_bronze", + "functions": [ + { + "function": "minecraft:set_damage", + "damage": { + "type": "minecraft:uniform", + "min": 0.1, + "max": 0.9 + } + }, + { + "function": "minecraft:set_nbt", + "tag": "{\"tfc:forging_bonus\": 3}" + } + ], + "weight": 100 + }, + { + "type": "minecraft:item", + "name": "tfc:metal/javelin/black_bronze", + "functions": [ + { + "function": "minecraft:set_damage", + "damage": { + "type": "minecraft:uniform", + "min": 0.1, + "max": 0.9 + } + }, + { + "function": "minecraft:set_nbt", + "tag": "{\"tfc:forging_bonus\": 3}" + } + ], + "weight": 100 + }, + { + "type": "minecraft:item", + "name": "tfchotornot:tongs/rose_gold", + "functions": [ + { + "function": "minecraft:set_damage", + "damage": { + "type": "minecraft:uniform", + "min": 0.5, + "max": 0.9 + } + }, + { + "function": "minecraft:set_nbt", + "tag": "{\"tfc:forging_bonus\": 4}" + } + ], + "weight": 100 + }, + { + "type": "minecraft:item", + "name": "tfchotornot:tongs/gold", + "functions": [ + { + "function": "minecraft:set_damage", + "damage": { + "type": "minecraft:uniform", + "min": 0.5, + "max": 0.9 + } + }, + { + "function": "minecraft:set_nbt", + "tag": "{\"tfc:forging_bonus\": 4}" + } + ], + "weight": 100 + } + ] + }, + { + "bonus_rolls": 0, + "entries": [ { "type": "minecraft:item", "name": "minecraft:arrow", @@ -57,22 +328,6 @@ ], "weight": 100 }, - { - "type": "minecraft:item", - "name": "minecraft:string", - "weight": 50, - "functions": [ - { - "add": false, - "count": { - "type": "minecraft:uniform", - "max": 3, - "min": 1 - }, - "function": "minecraft:set_count" - } - ] - }, { "type": "minecraft:item", "name": "minecraft:leather", @@ -309,8 +564,8 @@ "add": false, "count": { "type": "minecraft:uniform", - "max": 4, - "min": 2 + "max": 2, + "min": 1 }, "function": "minecraft:set_count" } @@ -325,8 +580,8 @@ "add": false, "count": { "type": "minecraft:uniform", - "max": 4, - "min": 2 + "max": 2, + "min": 1 }, "function": "minecraft:set_count" } @@ -341,8 +596,8 @@ "add": false, "count": { "type": "minecraft:uniform", - "max": 4, - "min": 2 + "max": 2, + "min": 1 }, "function": "minecraft:set_count" } @@ -352,22 +607,6 @@ "type": "minecraft:item", "name": "tfg:mining_powder", "weight": 100, - "functions": [ - { - "add": false, - "count": { - "type": "minecraft:uniform", - "max": 4, - "min": 2 - }, - "function": "minecraft:set_count" - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:bowl", - "weight": 50, "functions": [ { "add": false, @@ -399,44 +638,6 @@ ], "weight": 100 }, - { - "type": "minecraft:item", - "name": "tfchotornot:tongs/rose_gold", - "functions": [ - { - "function": "minecraft:set_damage", - "damage": { - "type": "minecraft:uniform", - "min": 0.5, - "max": 0.9 - } - }, - { - "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" - } - ], - "weight": 50 - }, - { - "type": "minecraft:item", - "name": "tfchotornot:tongs/gold", - "functions": [ - { - "function": "minecraft:set_damage", - "damage": { - "type": "minecraft:uniform", - "min": 0.5, - "max": 0.9 - } - }, - { - "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" - } - ], - "weight": 50 - }, { "type": "minecraft:item", "name": "tfc:volcanic_glass_bottle", @@ -459,22 +660,6 @@ } ] }, - { - "type": "minecraft:item", - "name": "tfc:ceramic/ingot_mold", - "weight": 100, - "functions": [ - { - "add": false, - "count": { - "type": "minecraft:uniform", - "max": 4, - "min": 2 - }, - "function": "minecraft:set_count" - } - ] - }, { "type": "minecraft:item", "name": "gtceu:matches", @@ -579,8 +764,8 @@ "add": false, "count": { "type": "minecraft:uniform", - "max": 5, - "min": 2 + "max": 10, + "min": 6 }, "function": "minecraft:set_count" } @@ -591,21 +776,6 @@ "name": "ae2:ender_dust", "weight": 50 }, - { - "type": "minecraft:item", - "name": "tfc:silk_cloth", - "weight": 50 - }, - { - "type": "minecraft:item", - "name": "tfc:burlap_cloth", - "weight": 50 - }, - { - "type": "minecraft:item", - "name": "chalk:yellow_chalk", - "weight": 70 - }, { "type": "minecraft:item", "name": "gtceu:dynamite", diff --git a/kubejs/data/tfg/loot_tables/chests/beneath_tower_top.json b/kubejs/data/tfg/loot_tables/chests/beneath_tower_top.json index 0ce678fb84..7143f81d7e 100644 --- a/kubejs/data/tfg/loot_tables/chests/beneath_tower_top.json +++ b/kubejs/data/tfg/loot_tables/chests/beneath_tower_top.json @@ -234,8 +234,8 @@ "add": false, "count": { "type": "minecraft:uniform", - "max": 10, - "min": 6 + "max": 5, + "min": 2 }, "function": "minecraft:set_count" } @@ -402,66 +402,22 @@ { "type": "minecraft:item", "name": "tfg:combat_powder", - "weight": 100, - "functions": [ - { - "add": false, - "count": { - "type": "minecraft:uniform", - "max": 4, - "min": 2 - }, - "function": "minecraft:set_count" - } - ] + "weight": 100 }, { "type": "minecraft:item", "name": "tfg:recovery_powder", - "weight": 100, - "functions": [ - { - "add": false, - "count": { - "type": "minecraft:uniform", - "max": 4, - "min": 2 - }, - "function": "minecraft:set_count" - } - ] + "weight": 100 }, { "type": "minecraft:item", "name": "tfg:acrobat_powder", - "weight": 100, - "functions": [ - { - "add": false, - "count": { - "type": "minecraft:uniform", - "max": 4, - "min": 2 - }, - "function": "minecraft:set_count" - } - ] + "weight": 100 }, { "type": "minecraft:item", "name": "tfg:mining_powder", - "weight": 100, - "functions": [ - { - "add": false, - "count": { - "type": "minecraft:uniform", - "max": 4, - "min": 2 - }, - "function": "minecraft:set_count" - } - ] + "weight": 100 }, { "type": "minecraft:item", @@ -511,6 +467,22 @@ } ] }, + { + "type": "minecraft:item", + "name": "tfc:ceramic/ingot_mold", + "weight": 100, + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 4, + "min": 2 + }, + "function": "minecraft:set_count" + } + ] + }, { "type": "minecraft:item", "name": "gtceu:matches", diff --git a/kubejs/data/tfg/loot_tables/chests/mineshaft/generic.json b/kubejs/data/tfg/loot_tables/chests/mineshaft/generic.json index 348b33ea89..4a73b9da4e 100644 --- a/kubejs/data/tfg/loot_tables/chests/mineshaft/generic.json +++ b/kubejs/data/tfg/loot_tables/chests/mineshaft/generic.json @@ -196,6 +196,17 @@ } ] }, + { + "type": "minecraft:item", + "name": "tfc:volcanic_glass_bottle", + "weight": 60, + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{fluid:{Amount:400,FluidName:\"gtceu:seed_oil\"}}" + } + ] + }, { "type": "minecraft:item", "name": "tfc:ceramic/jug", diff --git a/kubejs/data/tfg/loot_tables/chests/mineshaft/spider.json b/kubejs/data/tfg/loot_tables/chests/mineshaft/spider.json index 454f2de3b7..7bdb791d39 100644 --- a/kubejs/data/tfg/loot_tables/chests/mineshaft/spider.json +++ b/kubejs/data/tfg/loot_tables/chests/mineshaft/spider.json @@ -206,6 +206,17 @@ } ] }, + { + "type": "minecraft:item", + "name": "tfc:hematitic_glass_bottle", + "weight": 60, + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{fluid:{Amount:400,FluidName:\"gtceu:seed_oil\"}}" + } + ] + }, { "type": "minecraft:item", "name": "tfc:ceramic/jug", From e3dc5dd497968917b18718f03e23a497a2b5b8b1 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 22 Jun 2026 19:32:21 +0100 Subject: [PATCH 20/43] change huge quartz to be nether flavoured --- .../assets/tfg/textures/block/huge_quartz.png | Bin 249 -> 250 bytes .../tfg/loot_tables/blocks/huge_quartz.json | 6 +++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/kubejs/assets/tfg/textures/block/huge_quartz.png b/kubejs/assets/tfg/textures/block/huge_quartz.png index efb6a98ecbd52af75e2da728ce63ccbafc654411..5cab90c2aa8eee357f405bcd426522a5c62f0fb1 100644 GIT binary patch delta 201 zcmV;)05<>m0r~-uIe)B4L_t(IjfImj7Q-M6LzVY5F!cV{>1{f6=#+uMLk0phwjfOA z*&oRUj^Fq5hFVtVt=WiKUjGSq49hh%VGAs)jTA5ZNgov^+K;|;}%x+AfFVL@8lNF z2RM)gM-B%@PKSBKIJDR4|y^AiEoD(9QJhq4WwtoLJCGS00000NkvXXu0mjf D#im(< delta 200 zcmV;(05|{o0r>%tIe)83L_t(IjfImj4#Xe~1m~nJT;%^!KA7?<3KtZqKn4tPW#SCG zY{>8VKQ~D^KCEl4y}xwzUXEkf5y-$MqNtWZ0Fp2)b*K{rY{4d|8JLeyD1DZRDT139 zjx)^X{$`K7SCCrx Date: Mon, 22 Jun 2026 19:34:45 +0100 Subject: [PATCH 21/43] cl --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 18897804f1..542797739f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,11 @@ - Accumulators (the multiblock battery for trains) and energy interfaces can now charge and discharge way faster, and hold more power @Pyritie - Added peanut oil recipes, with all the same uses as seed oil @Redeix @Pyritie ### Bug fixes +- Fixed some floating chests in the new mineshafts, and made them avoid spawning near rivers @Pyritie +- Fixed some beneath tower chests being empty @Pyritie +- Fixed light/dark concrete supports only being as good as wood/stone ones, and having double tooltips @Pyritie +- Removed "dristone skeletons" from appearing on the surface of the overworld, as well as some other tweaks to other skeletons @Pyritie +- Fixed biochaff macerating into vanilla dirt (#4332) @Pyritie ## [0.13.0] - 21-06-2026 - We've [written up a page](https://wiki.terrafirmagreg.team/modern/en_us/major-changelogs/0.13) with all of the major changes between 0.12 and 0.13. From 748ad86732e4df28ff31b7a1a6eef0dec87a701f Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 22 Jun 2026 19:47:00 +0100 Subject: [PATCH 22/43] cl --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 542797739f..6fa8904571 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,12 +4,14 @@ ### Changes - Accumulators (the multiblock battery for trains) and energy interfaces can now charge and discharge way faster, and hold more power @Pyritie - Added peanut oil recipes, with all the same uses as seed oil @Redeix @Pyritie +- Containers can no longer be used with the Interplanetary Wireless Card, and transferring items is now 8x more expensive. Set up railguns! @ashleney ### Bug fixes - Fixed some floating chests in the new mineshafts, and made them avoid spawning near rivers @Pyritie - Fixed some beneath tower chests being empty @Pyritie - Fixed light/dark concrete supports only being as good as wood/stone ones, and having double tooltips @Pyritie - Removed "dristone skeletons" from appearing on the surface of the overworld, as well as some other tweaks to other skeletons @Pyritie - Fixed biochaff macerating into vanilla dirt (#4332) @Pyritie +- Fixed Pastoral Rancher not forming with tfc stone bricks (#4336) @Pyritie ## [0.13.0] - 21-06-2026 - We've [written up a page](https://wiki.terrafirmagreg.team/modern/en_us/major-changelogs/0.13) with all of the major changes between 0.12 and 0.13. From bea3d6b8214fb534b0e63a0dbe465f8368d7de8a Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 22 Jun 2026 19:56:37 +0100 Subject: [PATCH 23/43] thanks mailman #4183 --- .../data/tfg/loot_tables/blocks/cucumber.json | 79 ------------------- kubejs/data/tfg/loot_tables/blocks/flax.json | 58 -------------- .../data/tfg/loot_tables/blocks/rapeseed.json | 58 -------------- .../tfg/loot_tables/blocks/sunflower.json | 58 -------------- 4 files changed, 253 deletions(-) delete mode 100644 kubejs/data/tfg/loot_tables/blocks/cucumber.json delete mode 100644 kubejs/data/tfg/loot_tables/blocks/flax.json delete mode 100644 kubejs/data/tfg/loot_tables/blocks/rapeseed.json delete mode 100644 kubejs/data/tfg/loot_tables/blocks/sunflower.json diff --git a/kubejs/data/tfg/loot_tables/blocks/cucumber.json b/kubejs/data/tfg/loot_tables/blocks/cucumber.json deleted file mode 100644 index b4733b2c00..0000000000 --- a/kubejs/data/tfg/loot_tables/blocks/cucumber.json +++ /dev/null @@ -1,79 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "name": "loot_pool", - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "tfg:cucumber_product", - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "tfg:cucumber", - "properties": { - "age": "5", - "part": "bottom" - } - } - ], - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "type": "tfc:crop_yield_uniform", - "min": 0, - "max": { - "type": "minecraft:uniform", - "min": 6, - "max": 10 - } - } - } - ] - } - ], - "conditions": [ { "condition": "minecraft:survives_explosion" } ] - }, - { - "name": "loot_pool", - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "tfg:cucumber_seeds", - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "tfg:cucumber", - "properties": { "part": "bottom" } - } - ] - } - ], - "conditions": [ { "condition": "minecraft:survives_explosion" } ] - }, - { - "name": "loot_pool", - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:stick", - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "tfg:cucumber", - "properties": { - "part": "bottom", - "stick": "true" - } - } - ] - } - ], - "conditions": [ { "condition": "minecraft:survives_explosion" } ] - } - ] -} \ No newline at end of file diff --git a/kubejs/data/tfg/loot_tables/blocks/flax.json b/kubejs/data/tfg/loot_tables/blocks/flax.json deleted file mode 100644 index a124bac3b8..0000000000 --- a/kubejs/data/tfg/loot_tables/blocks/flax.json +++ /dev/null @@ -1,58 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "name": "loot_pool", - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "tfg:flax_product", - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "tfg:flax", - "properties": { - "age": "6", - "part": "bottom" - } - } - ], - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "type": "tfc:crop_yield_uniform", - "min": 0, - "max": { - "type": "minecraft:uniform", - "min": 6, - "max": 10 - } - } - } - ] - } - ], - "conditions": [ { "condition": "minecraft:survives_explosion" } ] - }, - { - "name": "loot_pool", - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "tfg:flax_seeds", - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "tfg:flax", - "properties": { "part": "bottom" } - } - ] - } - ], - "conditions": [ { "condition": "minecraft:survives_explosion" } ] - } - ] -} \ No newline at end of file diff --git a/kubejs/data/tfg/loot_tables/blocks/rapeseed.json b/kubejs/data/tfg/loot_tables/blocks/rapeseed.json deleted file mode 100644 index f1a3138492..0000000000 --- a/kubejs/data/tfg/loot_tables/blocks/rapeseed.json +++ /dev/null @@ -1,58 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "name": "loot_pool", - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "tfg:rapeseed_product", - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "tfg:rapeseed", - "properties": { - "age": "5", - "part": "bottom" - } - } - ], - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "type": "tfc:crop_yield_uniform", - "min": 0, - "max": { - "type": "minecraft:uniform", - "min": 6, - "max": 10 - } - } - } - ] - } - ], - "conditions": [ { "condition": "minecraft:survives_explosion" } ] - }, - { - "name": "loot_pool", - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "tfg:rapeseed_seeds", - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "tfg:rapeseed", - "properties": { "part": "bottom" } - } - ] - } - ], - "conditions": [ { "condition": "minecraft:survives_explosion" } ] - } - ] -} \ No newline at end of file diff --git a/kubejs/data/tfg/loot_tables/blocks/sunflower.json b/kubejs/data/tfg/loot_tables/blocks/sunflower.json deleted file mode 100644 index aa49fc77d1..0000000000 --- a/kubejs/data/tfg/loot_tables/blocks/sunflower.json +++ /dev/null @@ -1,58 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "name": "loot_pool", - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "tfg:sunflower_product", - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "tfg:sunflower", - "properties": { - "age": "5", - "part": "bottom" - } - } - ], - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "type": "tfc:crop_yield_uniform", - "min": 0, - "max": { - "type": "minecraft:uniform", - "min": 6, - "max": 10 - } - } - } - ] - } - ], - "conditions": [ { "condition": "minecraft:survives_explosion" } ] - }, - { - "name": "loot_pool", - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "tfg:sunflower_seeds", - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "tfg:sunflower", - "properties": { "part": "bottom" } - } - ] - } - ], - "conditions": [ { "condition": "minecraft:survives_explosion" } ] - } - ] -} \ No newline at end of file From 0c9a25c3b3eabc66df2a5b0b0338d0a67e0e13ee Mon Sep 17 00:00:00 2001 From: GameStar <56610486+BlueBoat29@users.noreply.github.com> Date: Mon, 22 Jun 2026 16:11:55 -0500 Subject: [PATCH 24/43] probably fix ladder based flooding (#4338) --- .../structures/mineshaft/ladder/ladder_1.nbt | Bin 617 -> 800 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/kubejs/data/tfg/structures/mineshaft/ladder/ladder_1.nbt b/kubejs/data/tfg/structures/mineshaft/ladder/ladder_1.nbt index c076a3bee1b7d75e359ed155fdb024aebffe9b3b..bdcc240e07c39bcaa773c4658a1165a6f906ff30 100644 GIT binary patch literal 800 zcmV+*1K<1~iwFP!00000|HYTlZqqOnhL7E(O;RQh2rfW~N7#LDL0lrPxUIa@ZN0g1 zl(;L~8}QcH+mbG|({qFbM5@}=H-tmA^Vh&9pf+phZ8uR2Fs3l`C~@NJ|kqu zIE=vI1Wu>HvIky~{hpnAjc6D_gY_ry8qr|=!8n};>rddtLrs3_HKJhz4dzu4yb6L> zfq3~o&k6O+3H8hg^#op%_%qUglf<8Y7{cKMPM}HS&k~qd@VgxGqG*EOuZUN0pO0_? zO@tHNGb5Zp6X68+p9qJd3HE8kE7*f08h&O?S&TEHId^Tam{+8pU@xa}4VFFF%aM98 zFBbC}(G0w%VLib;VHVd6yt23k%N2NyXa-(+{QnLsU{YP#45n5z8)@N#U2hgURmpZM z*7kBMv_6QtrL3%MGDxqDsw`xU(OO(-nL$z;qv36IRtEF6s)SxX7V+8(%Ek#6rMQ(# zp&T)(#7@Hd5!au}7Lb26uC&jhZr!%vY6Y*3plh{h#bMBmBEAcPq%V&YxvTBnc)CzY z&2_Guv|u^RYN4gI(qD#i2ma>4Z=QMHiE4T9bw&oY+R5SIyW`+aY+NN`IR4SD%Z2-9 zb$Kfrt4bepU)QFwmqy$aP<(Gp?MGzmrW|BzAzcgIx^AUwy>}_nrzRy*JRfY$-foYl zl_PeiaICIur0eNIR4dskE0Raq%?~3G2o@m3BXr*_h$UjhHo8rm)H7}z z+3u8?H{h+YJ8d(Goz_AEBK0Tn=X1`zwvz#*5J~z-LI5~@UYOq$=4-~wJDKUbWeBlU zsEGcrXM`P>C-`&)FwF!W%*=x^SLDGYhwtl*kIw8l6WE!vvDX9>crcf|Ob>I9Jh?}n ze4J-y*B*?S(9UBq4xO2Yj>SZFW{Yung&tlOoA5Ji{3u_U$bS9WfYZ|z`9C@s>9J!fmwOeP|k>{FM;PRSa241n9$9gBs z-ORvi;byMYWqD071FytBgNJuZ24TBa3CtCWhA8-;>Snd2Es-0n)pCQ3?eU=?ts)|U z_?FXFK_WO~xMn1QsNp%$hK1t)79CeZ(WzV=~q|^iw+r4ikNMf zY2j~1_)SkTx+TTlj$^kXfqs+e^hn3(od@8JrRnQrjlLPaiNwR?=r}~3*MO# zBK4F#kqY7(nbZx5Yqrxt<6|Epg3kvf->FT1+iJzrE%fP1L3GY z&G(uSj5iIb&WiIIOWHO^+q2?LU$5@{zbZ3QVmDpor?dHn3;M|QBK%GJ!yWvm6&{&e zyLh~`x*=v$D#}|}82w_`{poa*{V+X+L_ej5IldqBFR1Vb5z>Hg^9z0h@V6zcj0*q& DsD3cO From dd2db9ac5096050035ffc0d1a6d4442012e9761a Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 22 Jun 2026 22:35:39 +0100 Subject: [PATCH 25/43] cl --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6fa8904571..715f4edc58 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,9 +4,9 @@ ### Changes - Accumulators (the multiblock battery for trains) and energy interfaces can now charge and discharge way faster, and hold more power @Pyritie - Added peanut oil recipes, with all the same uses as seed oil @Redeix @Pyritie -- Containers can no longer be used with the Interplanetary Wireless Card, and transferring items is now 8x more expensive. Set up railguns! @ashleney +- Containers can no longer be used with the Interplanetary Wireless Card, and transferring items is now 8x more expensive (blocks are the same energy cost as before). Set up railguns! @ashleney ### Bug fixes -- Fixed some floating chests in the new mineshafts, and made them avoid spawning near rivers @Pyritie +- Fixed some floating chests in the new mineshafts, made mineshafts avoid spawning near rivers, and fixed one of the segments not blocking water correctly @Pyritie @BlueBoat29 - Fixed some beneath tower chests being empty @Pyritie - Fixed light/dark concrete supports only being as good as wood/stone ones, and having double tooltips @Pyritie - Removed "dristone skeletons" from appearing on the surface of the overworld, as well as some other tweaks to other skeletons @Pyritie From 2527dcacb72f198ab4d9989f595ee0ff2765f87c Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 22 Jun 2026 23:24:27 +0100 Subject: [PATCH 26/43] basalt magma next to the basalt cobble --- kubejs/data/tfg/worldgen/noise_settings/nether_noise.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kubejs/data/tfg/worldgen/noise_settings/nether_noise.json b/kubejs/data/tfg/worldgen/noise_settings/nether_noise.json index 993c1749cb..5500b550d2 100644 --- a/kubejs/data/tfg/worldgen/noise_settings/nether_noise.json +++ b/kubejs/data/tfg/worldgen/noise_settings/nether_noise.json @@ -1296,7 +1296,7 @@ "then_run": { "type": "minecraft:block", "result_state": { - "Name": "minecraft:magma_block" + "Name": "tfc:rock/magma/basalt" } } }, @@ -1371,7 +1371,7 @@ "then_run": { "type": "minecraft:block", "result_state": { - "Name": "minecraft:magma_block" + "Name": "tfc:rock/magma/basalt" } } }, From 78df000fb09738c3e00f1270bd21fb61bf3d0eb6 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Tue, 23 Jun 2026 00:08:29 +0100 Subject: [PATCH 27/43] duh --- kubejs/server_scripts/minecraft/tags.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/kubejs/server_scripts/minecraft/tags.js b/kubejs/server_scripts/minecraft/tags.js index 290c621c6a..05070e69dc 100644 --- a/kubejs/server_scripts/minecraft/tags.js +++ b/kubejs/server_scripts/minecraft/tags.js @@ -5,17 +5,17 @@ * * @param {TagEvent.Item} event */ -const registerMinecraftItemTags = (event) => { - global.MINECRAFT_HIDED_ITEMS.forEach(item => { - event.add('c:hidden_from_recipe_viewers', item) - }) - +const registerMinecraftItemTags = (event) => { event.removeAllTagsFrom("minecraft:lantern"); event.removeAllTagsFrom("minecraft:raw_iron_block"); event.removeAllTagsFrom("minecraft:grass_block"); event.removeAllTagsFrom("minecraft:infested_deepslate"); event.removeAllTagsFrom("minecraft:furnace"); + global.MINECRAFT_HIDED_ITEMS.forEach(item => { + event.add('c:hidden_from_recipe_viewers', item) + }) + // Hide potions event.add('c:hidden_from_recipe_viewers', /minecraft.*potion.*/) From 1c74818c5c0cd8c4d342fbe4c1c77a44d3f4aef7 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Tue, 23 Jun 2026 00:08:46 +0100 Subject: [PATCH 28/43] add peanut oil to quests --- .../quests/chapters/lv__low_voltage.snbt | 20 +++++++++++++- .../quests/chapters/tips__tools.snbt | 27 ++++++++++++------- .../server_scripts/realmrpg_skeletons/tags.js | 1 - 3 files changed, 36 insertions(+), 12 deletions(-) diff --git a/config/ftbquests/quests/chapters/lv__low_voltage.snbt b/config/ftbquests/quests/chapters/lv__low_voltage.snbt index ebe733745a..00fa891ef0 100644 --- a/config/ftbquests/quests/chapters/lv__low_voltage.snbt +++ b/config/ftbquests/quests/chapters/lv__low_voltage.snbt @@ -1614,7 +1614,25 @@ type: "item" } { - id: "674CEEB9EAFE84A0" + id: "63D0D52966213B49" + item: "tfg:peanut_oil_bucket" + optional_task: true + type: "item" + } + { + id: "4C6DF0905D0D35A2" + item: "firmalife:bucket/soybean_oil" + optional_task: true + type: "item" + } + { + id: "31B846079D376069" + item: "tfc:bucket/olive_oil" + optional_task: true + type: "item" + } + { + id: "4DD43C796578251A" type: "checkmark" } ] diff --git a/config/ftbquests/quests/chapters/tips__tools.snbt b/config/ftbquests/quests/chapters/tips__tools.snbt index 07bc0e6ca0..0bcda746e1 100644 --- a/config/ftbquests/quests/chapters/tips__tools.snbt +++ b/config/ftbquests/quests/chapters/tips__tools.snbt @@ -2431,18 +2431,25 @@ optional: true size: 1.25d subtitle: "{quests.tfg_tips.tools_tips.seed_oil.subtitle}" - tasks: [{ - id: "795A37FA87569C51" - item: { - Count: 1 - id: "ftbfiltersystem:smart_filter" - tag: { - "ftbfiltersystem:filter": "item(gtceu:seed_oil_bucket)" + tasks: [ + { + id: "795A37FA87569C51" + item: { + Count: 1 + id: "ftbfiltersystem:smart_filter" + tag: { + "ftbfiltersystem:filter": "item(gtceu:seed_oil_bucket)" + } } + title: "{quests.tfg_tips.tools_tips.seed_oil.task}" + type: "item" } - title: "{quests.tfg_tips.tools_tips.seed_oil.task}" - type: "item" - }] + { + id: "62C27C8AC16CBE20" + item: "tfg:peanut_oil_bucket" + type: "item" + } + ] title: "{quests.tfg_tips.tools_tips.seed_oil.title}" x: -8.72d y: 15.8d diff --git a/kubejs/server_scripts/realmrpg_skeletons/tags.js b/kubejs/server_scripts/realmrpg_skeletons/tags.js index 5ec35d3ce5..eb04f81eff 100644 --- a/kubejs/server_scripts/realmrpg_skeletons/tags.js +++ b/kubejs/server_scripts/realmrpg_skeletons/tags.js @@ -32,7 +32,6 @@ function registerRealmRpgBiomeTags(event) { event.add('realmrpg_skeletons:has_crimson_skeletons', '#tfg:mars_biomes'); event.add('realmrpg_skeletons:has_snow_skeletons', '#tfg:mars_biomes'); event.add('realmrpg_skeletons:has_surface_skeletons', '#tfg:mars_biomes'); - event.add('realmrpg_skeletons:has_cave_skeletons', '#tfg:mars_biomes'); event.add('realmrpg_skeletons:has_burnt_skeletons', '#tfg:venus_biomes'); From 1b71e707a4eb7c22b979fa41d70b286dc0239798 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Tue, 23 Jun 2026 00:12:29 +0100 Subject: [PATCH 29/43] fix tower misalignment --- CHANGELOG.md | 2 ++ kubejs/data/tfg/worldgen/structure/beneath/tower.json | 2 +- kubejs/data/tfg/worldgen/structure/beneath/tower_top.json | 2 +- kubejs/data/tfg/worldgen/structure/beneath/tower_upper.json | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 715f4edc58..21548e7c18 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,8 @@ - Removed "dristone skeletons" from appearing on the surface of the overworld, as well as some other tweaks to other skeletons @Pyritie - Fixed biochaff macerating into vanilla dirt (#4332) @Pyritie - Fixed Pastoral Rancher not forming with tfc stone bricks (#4336) @Pyritie +- Fixed a bunch of log spam (#4330) @Pyritie +- Fixed beneath towers not being aligned to the lava level properly @Pyritie ## [0.13.0] - 21-06-2026 - We've [written up a page](https://wiki.terrafirmagreg.team/modern/en_us/major-changelogs/0.13) with all of the major changes between 0.12 and 0.13. diff --git a/kubejs/data/tfg/worldgen/structure/beneath/tower.json b/kubejs/data/tfg/worldgen/structure/beneath/tower.json index 5f6a130394..c893289938 100644 --- a/kubejs/data/tfg/worldgen/structure/beneath/tower.json +++ b/kubejs/data/tfg/worldgen/structure/beneath/tower.json @@ -7,7 +7,7 @@ "step": "surface_structures", "terrain_adaptation": "none", "start_height": { - "absolute": 96 + "absolute": 93 }, "use_expansion_hack": false, "spawn_overrides": {} diff --git a/kubejs/data/tfg/worldgen/structure/beneath/tower_top.json b/kubejs/data/tfg/worldgen/structure/beneath/tower_top.json index 3267518650..1e618c9ffa 100644 --- a/kubejs/data/tfg/worldgen/structure/beneath/tower_top.json +++ b/kubejs/data/tfg/worldgen/structure/beneath/tower_top.json @@ -7,7 +7,7 @@ "step": "surface_structures", "terrain_adaptation": "none", "start_height": { - "absolute": 156 + "absolute": 153 }, "use_expansion_hack": false, "spawn_overrides": {} diff --git a/kubejs/data/tfg/worldgen/structure/beneath/tower_upper.json b/kubejs/data/tfg/worldgen/structure/beneath/tower_upper.json index b5c3ed8b98..a32a4d4813 100644 --- a/kubejs/data/tfg/worldgen/structure/beneath/tower_upper.json +++ b/kubejs/data/tfg/worldgen/structure/beneath/tower_upper.json @@ -7,7 +7,7 @@ "step": "surface_structures", "terrain_adaptation": "none", "start_height": { - "absolute": 126 + "absolute": 123 }, "use_expansion_hack": false, "spawn_overrides": {} From 8f6b1f7d86f925ed78261bf9dfe4ba87f3cfbbf7 Mon Sep 17 00:00:00 2001 From: strangelyng Date: Mon, 22 Jun 2026 17:12:01 -0700 Subject: [PATCH 30/43] Add shaped crafting recipes for train tracks (#4335) * Added shaped crafting recipes for train tracks * Reduced monorail bolts to 2 * Adjusted wide and narrow track recipes, alphabetized ingredient keys --- kubejs/server_scripts/railways/recipes.js | 112 ++++++++++++++++++++++ 1 file changed, 112 insertions(+) diff --git a/kubejs/server_scripts/railways/recipes.js b/kubejs/server_scripts/railways/recipes.js index 9b3702ea64..001b082c90 100644 --- a/kubejs/server_scripts/railways/recipes.js +++ b/kubejs/server_scripts/railways/recipes.js @@ -518,6 +518,16 @@ const registerRailWaysRecipes = (event) => { .itemOutputs('32x railways:track_monorail') .duration(200) .EUt(32) + + event.shaped(`24x railways:track_monorail`, [ + 'PHP', + 'BGB' + ], { + B: '#forge:bolts/wrought_iron', + G: 'create:metal_girder', + H: '#forge:tools/hammers', + P: '#forge:plates/wrought_iron' + }).id(`tfg:railways/shaped/track_monorail`) event.recipes.createSequencedAssembly([ '64x railways:track_monorail', @@ -565,6 +575,17 @@ const registerRailWaysRecipes = (event) => { .EUt(16) .circuit(1) + event.shaped(`16x railways:track_${x.rail}_narrow`, [ + 'R R', + 'MHM', + ' S ' + ], { + H: '#forge:tools/hammers', + M: '#tfc:mortar', + R: '#tfg:track_rods', + S: x.slab + }).id(`tfg:railways/shaped/track_${x.rail}_narrow`) + event.recipes.createSequencedAssembly([ `32x railways:track_${x.rail}`, ], x.slab, [ @@ -582,6 +603,17 @@ const registerRailWaysRecipes = (event) => { .EUt(16) .circuit(2) + event.shaped(`16x railways:track_${x.rail}`, [ + 'R R', + 'MHM', + 'SSS' + ], { + H: '#forge:tools/hammers', + M: '#tfc:mortar', + R: '#tfg:track_rods', + S: x.slab + }).id(`tfg:railways/shaped/track_${x.rail}`) + event.recipes.createSequencedAssembly([ `32x railways:track_${x.rail}_wide`, ], x.slab, [ @@ -598,6 +630,18 @@ const registerRailWaysRecipes = (event) => { .duration(200) .EUt(16) .circuit(3) + + event.shaped(`16x railways:track_${x.rail}_wide`, [ + 'R R', + 'MHM', + 'BSB' + ], { + B: x.block, + H: '#forge:tools/hammers', + M: '#tfc:mortar', + R: '#tfg:track_rods', + S: x.slab + }).id(`tfg:railways/shaped/track_${x.rail}_wide`) }) event.recipes.createSequencedAssembly([ @@ -617,6 +661,17 @@ const registerRailWaysRecipes = (event) => { .EUt(16) .circuit(2) + event.shaped('16x create:track', [ + 'R R', + 'MHM', + 'SSS' + ], { + H: '#forge:tools/hammers', + M: '#tfc:mortar', + R: '#tfg:track_rods', + S: '#tfg:rock_slabs' + }).id(`tfg:railways/shaped/track_create_andesite`) + // Create Stone Tracks (Narrow) event.recipes.createSequencedAssembly([ '32x railways:track_create_andesite_narrow', @@ -633,6 +688,17 @@ const registerRailWaysRecipes = (event) => { .duration(200) .EUt(16) .circuit(1) + + event.shaped('16x railways:track_create_andesite_narrow', [ + 'R R', + 'MHM', + ' S ' + ], { + H: '#forge:tools/hammers', + M: '#tfc:mortar', + R: '#tfg:track_rods', + S: '#tfg:rock_slabs' + }).id(`tfg:railways/shaped/track_create_andesite_narrow`) // Create Stone Tracks (Wide) event.recipes.createSequencedAssembly([ @@ -651,6 +717,18 @@ const registerRailWaysRecipes = (event) => { .duration(200) .EUt(16) .circuit(3) + + event.shaped('16x railways:track_create_andesite_wide', [ + 'R R', + 'MHM', + 'BSB' + ], { + B: '#forge:stone', + H: '#forge:tools/hammers', + M: '#tfc:mortar', + R: '#tfg:track_rods', + S: '#tfg:rock_slabs' + }).id(`tfg:railways/shaped/track_create_andesite_wide`) event.recipes.gtceu.assembler('tfg:railways/phantom_tracks') .itemInputs('32x #create:tracks', '#forge:small_dusts/ender_pearl') @@ -678,6 +756,17 @@ const registerRailWaysRecipes = (event) => { .EUt(16) .circuit(2) + event.shaped(`16x railways:track_tfc_${woodType}`, [ + 'R R', + 'MHM', + 'SSS' + ], { + H: '#forge:tools/hammers', + M: '#tfc:mortar', + R: '#tfg:track_rods', + S: `tfc:wood/planks/${woodType}_slab` + }).id(`tfg:railways/shaped/track_create_${woodType}`) + // Narrow event.recipes.createSequencedAssembly([ `32x railways:track_tfc_${woodType}_narrow`, @@ -695,6 +784,17 @@ const registerRailWaysRecipes = (event) => { .EUt(16) .circuit(1) + event.shaped(`16x railways:track_tfc_${woodType}_narrow`, [ + 'R R', + 'MHM', + ' S ' + ], { + H: '#forge:tools/hammers', + M: '#tfc:mortar', + R: '#tfg:track_rods', + S: `tfc:wood/planks/${woodType}_slab` + }).id(`tfg:railways/shaped/track_create_${woodType}_narrow`) + // Wide event.recipes.createSequencedAssembly([ `32x railways:track_tfc_${woodType}_wide`, @@ -712,6 +812,18 @@ const registerRailWaysRecipes = (event) => { .duration(200) .EUt(16) .circuit(3) + + event.shaped(`16x railways:track_tfc_${woodType}_wide`, [ + 'R R', + 'MHM', + 'BSB' + ], { + B: `tfc:wood/planks/${woodType}`, + H: '#forge:tools/hammers', + M: '#tfc:mortar', + R: '#tfg:track_rods', + S: `tfc:wood/planks/${woodType}_slab` + }).id(`tfg:railways/shaped/track_create_${woodType}_wide`) }); event.shapeless('8x railways:track_phantom', ['#forge:tiny_dusts/ender_pearl', '8x #create:tracks']) From 2e2541f0d4979bc6c67b408e24922d82eb26ba35 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 23 Jun 2026 12:13:47 +0500 Subject: [PATCH 31/43] Bump the dependencies group with 2 updates (#4340) Bumps the dependencies group with 2 updates: [actions/checkout](https://github.com/actions/checkout) and [softprops/action-gh-release](https://github.com/softprops/action-gh-release). Updates `actions/checkout` from 6 to 7 - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v6...v7) Updates `softprops/action-gh-release` from 3.0.0 to 3.0.1 - [Release notes](https://github.com/softprops/action-gh-release/releases) - [Changelog](https://github.com/softprops/action-gh-release/blob/master/CHANGELOG.md) - [Commits](https://github.com/softprops/action-gh-release/compare/v3.0.0...v3.0.1) --- updated-dependencies: - dependency-name: actions/checkout dependency-version: '7' dependency-type: direct:production update-type: version-update:semver-major dependency-group: dependencies - dependency-name: softprops/action-gh-release dependency-version: 3.0.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dependencies ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/build.yml | 10 +++++----- .github/workflows/crowdin.yml | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 199ced8160..ade734487f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -43,7 +43,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v6 + uses: actions/checkout@v7 with: fetch-depth: 0 @@ -231,7 +231,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v6 + uses: actions/checkout@v7 with: fetch-depth: 0 @@ -318,7 +318,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v6 + uses: actions/checkout@v7 - name: Preparing shell: bash @@ -467,7 +467,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v6 + uses: actions/checkout@v7 - name: Download artifact uses: actions/download-artifact@v8.0.1 @@ -507,7 +507,7 @@ jobs: - name: Create release id: release - uses: softprops/action-gh-release@v3.0.0 + uses: softprops/action-gh-release@v3.0.1 with: name: ${{ needs.info.outputs.project_version }} tag_name: ${{ needs.info.outputs.project_version }} diff --git a/.github/workflows/crowdin.yml b/.github/workflows/crowdin.yml index d6e039ae31..9fe4b6fa0f 100644 --- a/.github/workflows/crowdin.yml +++ b/.github/workflows/crowdin.yml @@ -32,7 +32,7 @@ jobs: runs-on: ubuntu-latest steps: - name: "Checkout repository" - uses: actions/checkout@v6 + uses: actions/checkout@v7 - name: "Crowdin" uses: crowdin/github-action@v2 @@ -57,7 +57,7 @@ jobs: needs: [sync-patchouli] steps: - name: "Checkout repository" - uses: actions/checkout@v6 + uses: actions/checkout@v7 - name: "Crowdin" uses: crowdin/github-action@v2 @@ -83,7 +83,7 @@ jobs: if: github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' steps: - name: "Checkout translations branch" - uses: actions/checkout@v6 + uses: actions/checkout@v7 with: ref: ${{ env.LOCALIZATION_BRANCH }} fetch-depth: 0 @@ -108,7 +108,7 @@ jobs: if: (github.event_name == 'schedule') || (github.event_name == 'workflow_dispatch' && inputs.create_pr) steps: - name: "Checkout repository" - uses: actions/checkout@v6 + uses: actions/checkout@v7 - name: "Create Pull Request" uses: devops-infra/action-pull-request@v1 From 01fd9ebee583ffb3343a46dd7a7c3b52760c2412 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 23 Jun 2026 10:47:27 +0100 Subject: [PATCH 32/43] add: New Crowdin translations (#4347) * [translation] New translations * [translation] New translations * Remove empty translation files --------- Co-authored-by: Crowdin Bot Co-authored-by: Xikaro <55663835+Xikaro@users.noreply.github.com> --- .../ae2insertexportcard/lang/fr_fr.json | 7 + kubejs/assets/afc/lang/pl_pl.json | 6 +- kubejs/assets/afc/lang/zh_tw.json | 384 +++++------ kubejs/assets/create/lang/uk_ua.json | 10 +- .../assets/endermanoverhaul/lang/zh_cn.json | 4 +- .../assets/endermanoverhaul/lang/zh_tw.json | 6 +- kubejs/assets/firmacivplus/lang/zh_tw.json | 12 +- kubejs/assets/ftbquests/lang/fr_fr.json | 55 ++ kubejs/assets/greate/lang/pl_pl.json | 2 +- kubejs/assets/gtceu/lang/pl_pl.json | 16 +- kubejs/assets/gtceu/lang/uk_ua.json | 6 +- kubejs/assets/gtceu/lang/zh_cn.json | 5 + kubejs/assets/gtmutils/lang/zh_tw.json | 2 +- .../assets/immersive_aircraft/lang/tr_tr.json | 4 + kubejs/assets/minecraft/lang/ru_ru.json | 1 + kubejs/assets/rnr/lang/zh_tw.json | 605 +++++++++++++++++- kubejs/assets/species/lang/ru_ru.json | 1 + kubejs/assets/species/lang/zh_tw.json | 4 +- .../entries/beneath/beneath_wild_fruits.json | 4 +- .../ru_ru/entries/firmalife/berry_bushes.json | 2 +- .../ru_ru/entries/firmalife/cheese.json | 2 +- .../ru_ru/entries/firmalife/pizza.json | 2 +- .../field_guide/tr_tr/categories/beneath.json | 2 +- .../entries/getting_started/finding_ores.json | 8 +- .../entries/getting_started/introduction.json | 14 +- .../arborfirmacraft/earth_tree_index.json | 16 +- .../zh_tw/entries/firmaciv/beneath.json | 16 +- kubejs/assets/tfcagedalcohol/lang/zh_tw.json | 39 ++ kubejs/assets/tfcastikorcarts/lang/zh_tw.json | 190 ++++++ kubejs/assets/tfccanes/lang/zh_tw.json | 6 + kubejs/assets/tfcgenviewer/lang/zh_tw.json | 71 ++ kubejs/assets/tfcscraping/lang/zh_tw.json | 23 + .../assets/tfcvesseltooltip/lang/zh_tw.json | 2 + kubejs/assets/tfcweldbutton/lang/zh_tw.json | 3 + kubejs/assets/tfg/lang/de_de.json | 2 - kubejs/assets/tfg/lang/fr_fr.json | 12 +- kubejs/assets/tfg/lang/ja_jp.json | 16 +- kubejs/assets/tfg/lang/pl_pl.json | 10 +- kubejs/assets/tfg/lang/ru_ru.json | 77 ++- kubejs/assets/tfg/lang/uk_ua.json | 95 +-- kubejs/assets/tfg/lang/zh_cn.json | 116 +++- kubejs/assets/tfg/lang/zh_tw.json | 2 + 42 files changed, 1486 insertions(+), 374 deletions(-) create mode 100644 kubejs/assets/ae2insertexportcard/lang/fr_fr.json create mode 100644 kubejs/assets/tfcagedalcohol/lang/zh_tw.json create mode 100644 kubejs/assets/tfcastikorcarts/lang/zh_tw.json create mode 100644 kubejs/assets/tfccanes/lang/zh_tw.json create mode 100644 kubejs/assets/tfcscraping/lang/zh_tw.json create mode 100644 kubejs/assets/tfcweldbutton/lang/zh_tw.json diff --git a/kubejs/assets/ae2insertexportcard/lang/fr_fr.json b/kubejs/assets/ae2insertexportcard/lang/fr_fr.json new file mode 100644 index 0000000000..a3dd6235d4 --- /dev/null +++ b/kubejs/assets/ae2insertexportcard/lang/fr_fr.json @@ -0,0 +1,7 @@ +{ + "gui.ae2insertexportcard.blacklist": "Liste noire", + "gui.ae2insertexportcard.whitelist": "Liste blanche", + "item.ae2insertexportcard.export_card": "Carte d'Exportation", + "item.ae2insertexportcard.insert_card": "Carte d'Insertion", + "itemGroup.ae2insertexportcard": "Carte AE2 d'insertion et d'exportation" +} \ No newline at end of file diff --git a/kubejs/assets/afc/lang/pl_pl.json b/kubejs/assets/afc/lang/pl_pl.json index 0360a4653f..ebbd7651c0 100644 --- a/kubejs/assets/afc/lang/pl_pl.json +++ b/kubejs/assets/afc/lang/pl_pl.json @@ -30,12 +30,12 @@ "block.afc.wood.barrel_press.mahogany": "Mahoniowa prasa beczkowa", "block.afc.wood.barrel_press.teak": "Tekowa prasa beczkowa", "block.afc.wood.barrel_press.tualang": "Prasa beczkowa z tualangu", - "block.afc.wood.big_barrel.baobab": "Duża beczka z baobabu", + "block.afc.wood.big_barrel.baobab": "Baobabowy keg", "block.afc.wood.big_barrel.cypress": "Duża beczka z cyprysu", "block.afc.wood.big_barrel.eucalyptus": "Duża beczka z eukaliptusa", - "block.afc.wood.big_barrel.fig": "Duża beczka z figowca", + "block.afc.wood.big_barrel.fig": "Figowy keg", "block.afc.wood.big_barrel.hevea": "Kauczukowy keg", - "block.afc.wood.big_barrel.ipe": "Duża beczka z ipe", + "block.afc.wood.big_barrel.ipe": "Keg z ipe", "block.afc.wood.big_barrel.ironwood": "Keg z drewna żelaznego", "block.afc.wood.big_barrel.mahogany": "Duża beczka z mahoniu", "block.afc.wood.big_barrel.teak": "Tekowy keg", diff --git a/kubejs/assets/afc/lang/zh_tw.json b/kubejs/assets/afc/lang/zh_tw.json index 04420df4a5..0d00d1e4cc 100644 --- a/kubejs/assets/afc/lang/zh_tw.json +++ b/kubejs/assets/afc/lang/zh_tw.json @@ -2,9 +2,9 @@ "block.afc.tree_tap": "樹液提取器", "block.afc.wood.axle.baobab": "猴麵包木傳動桿", "block.afc.wood.axle.cypress": "柏木傳動桿", - "block.afc.wood.axle.eucalyptus": "桉木傳動桿", + "block.afc.wood.axle.eucalyptus": "尤加利木傳動桿", "block.afc.wood.axle.fig": "無花果木傳動桿", - "block.afc.wood.axle.hevea": "乳膠木傳動桿", + "block.afc.wood.axle.hevea": "橡膠木傳動桿", "block.afc.wood.axle.ipe": "紫心木傳動桿", "block.afc.wood.axle.ironwood": "鐵木傳動桿", "block.afc.wood.axle.mahogany": "桃花心木傳動桿", @@ -12,9 +12,9 @@ "block.afc.wood.axle.tualang": "督亞冷木傳動桿", "block.afc.wood.barrel.baobab": "猴麵包木桶", "block.afc.wood.barrel.cypress": "柏木桶", - "block.afc.wood.barrel.eucalyptus": "桉木桶", + "block.afc.wood.barrel.eucalyptus": "尤加利木桶", "block.afc.wood.barrel.fig": "無花果木桶", - "block.afc.wood.barrel.hevea": "乳膠木桶", + "block.afc.wood.barrel.hevea": "橡膠木桶", "block.afc.wood.barrel.ipe": "紫心木桶", "block.afc.wood.barrel.ironwood": "鐵木桶", "block.afc.wood.barrel.mahogany": "桃花心木桶", @@ -22,9 +22,9 @@ "block.afc.wood.barrel.tualang": "督亞冷木桶", "block.afc.wood.barrel_press.baobab": "猴麵包木桶壓機", "block.afc.wood.barrel_press.cypress": "柏木桶壓機", - "block.afc.wood.barrel_press.eucalyptus": "桉木桶壓機", + "block.afc.wood.barrel_press.eucalyptus": "尤加利木桶壓機", "block.afc.wood.barrel_press.fig": "無花果木桶壓機", - "block.afc.wood.barrel_press.hevea": "乳膠木桶壓機", + "block.afc.wood.barrel_press.hevea": "橡膠木桶壓機", "block.afc.wood.barrel_press.ipe": "紫心木桶壓機", "block.afc.wood.barrel_press.ironwood": "鐵木桶壓機", "block.afc.wood.barrel_press.mahogany": "桃花心木桶壓機", @@ -32,9 +32,9 @@ "block.afc.wood.barrel_press.tualang": "督亞冷木桶壓機", "block.afc.wood.big_barrel.baobab": "猴麵包木酒桶", "block.afc.wood.big_barrel.cypress": "柏木酒桶", - "block.afc.wood.big_barrel.eucalyptus": "桉木酒桶", + "block.afc.wood.big_barrel.eucalyptus": "尤加利木酒桶", "block.afc.wood.big_barrel.fig": "無花果木酒桶", - "block.afc.wood.big_barrel.hevea": "乳膠木酒桶", + "block.afc.wood.big_barrel.hevea": "橡膠木酒桶", "block.afc.wood.big_barrel.ipe": "紫心木酒桶", "block.afc.wood.big_barrel.ironwood": "鐵木酒桶", "block.afc.wood.big_barrel.mahogany": "桃花心木酒桶", @@ -42,9 +42,9 @@ "block.afc.wood.big_barrel.tualang": "督亞冷木酒桶", "block.afc.wood.bladed_axle.baobab": "猴麵包木傳動桿", "block.afc.wood.bladed_axle.cypress": "柏木傳動桿", - "block.afc.wood.bladed_axle.eucalyptus": "桉木傳動桿", + "block.afc.wood.bladed_axle.eucalyptus": "尤加利木傳動桿", "block.afc.wood.bladed_axle.fig": "無花果木傳動桿", - "block.afc.wood.bladed_axle.hevea": "乳膠木傳動桿", + "block.afc.wood.bladed_axle.hevea": "橡膠木傳動桿", "block.afc.wood.bladed_axle.ipe": "紫心木傳動桿", "block.afc.wood.bladed_axle.ironwood": "鐵木傳動桿", "block.afc.wood.bladed_axle.mahogany": "桃花心木傳動桿", @@ -52,9 +52,9 @@ "block.afc.wood.bladed_axle.tualang": "督亞冷木傳動桿", "block.afc.wood.chest.baobab": "猴麵包木箱", "block.afc.wood.chest.cypress": "柏木箱", - "block.afc.wood.chest.eucalyptus": "桉木箱", + "block.afc.wood.chest.eucalyptus": "尤加利木箱", "block.afc.wood.chest.fig": "無花果木箱", - "block.afc.wood.chest.hevea": "乳膠木箱", + "block.afc.wood.chest.hevea": "橡膠木箱", "block.afc.wood.chest.ipe": "紫心木箱", "block.afc.wood.chest.ironwood": "鐵木箱", "block.afc.wood.chest.mahogany": "桃花心木箱", @@ -62,9 +62,9 @@ "block.afc.wood.chest.tualang": "督亞冷木箱", "block.afc.wood.clutch.baobab": "猴麵包木離合器", "block.afc.wood.clutch.cypress": "柏木離合器", - "block.afc.wood.clutch.eucalyptus": "桉木離合器", + "block.afc.wood.clutch.eucalyptus": "尤加利木離合器", "block.afc.wood.clutch.fig": "無花果木離合器", - "block.afc.wood.clutch.hevea": "乳膠木離合器", + "block.afc.wood.clutch.hevea": "橡膠木離合器", "block.afc.wood.clutch.ipe": "紫心木離合器", "block.afc.wood.clutch.ironwood": "鐵木離合器", "block.afc.wood.clutch.mahogany": "桃花心木離合器", @@ -72,7 +72,7 @@ "block.afc.wood.clutch.tualang": "督亞冷木離合器", "block.afc.wood.encased_axle.baobab": "猴麵包木傳動桿", "block.afc.wood.encased_axle.cypress": "柏木傳動桿", - "block.afc.wood.encased_axle.eucalyptus": "桉木傳動桿", + "block.afc.wood.encased_axle.eucalyptus": "尤加利木傳動桿", "block.afc.wood.encased_axle.fig": "無花果木傳動桿", "block.afc.wood.encased_axle.hevea": "三葉橡膠木傳動桿", "block.afc.wood.encased_axle.ipe": "紫心木傳動桿", @@ -91,12 +91,12 @@ "block.afc.wood.fallen_leaves.coast_redwood": "海岸紅木落葉", "block.afc.wood.fallen_leaves.coast_spruce": "錫特卡雲杉木落葉", "block.afc.wood.fallen_leaves.cypress": "柏木落葉", - "block.afc.wood.fallen_leaves.eucalyptus": "桉木落葉", + "block.afc.wood.fallen_leaves.eucalyptus": "尤加利木落葉", "block.afc.wood.fallen_leaves.fig": "無花果木落葉", "block.afc.wood.fallen_leaves.flame_of_the_forest": "鳳凰木落葉", "block.afc.wood.fallen_leaves.giant_rosewood": "巨人玫瑰木落葉", "block.afc.wood.fallen_leaves.gum_arabic": "阿拉伯膠木落葉", - "block.afc.wood.fallen_leaves.hevea": "乳膠木落葉", + "block.afc.wood.fallen_leaves.hevea": "橡膠木落葉", "block.afc.wood.fallen_leaves.horsetail_ironwood": "馬尾鐵木落葉", "block.afc.wood.fallen_leaves.ipe": "紫心木落葉", "block.afc.wood.fallen_leaves.iroko_teak": "伊羅科柚木落葉", @@ -110,7 +110,7 @@ "block.afc.wood.fallen_leaves.mpingo_blackwood": "Mpingo Blackwood落葉", "block.afc.wood.fallen_leaves.mulga_blackwood": "黑檀木落葉", "block.afc.wood.fallen_leaves.poplar": "柳木落葉", - "block.afc.wood.fallen_leaves.rainbow_eucalyptus": "彩虹桉木落葉", + "block.afc.wood.fallen_leaves.rainbow_eucalyptus": "彩虹尤加利木落葉", "block.afc.wood.fallen_leaves.red_pine": "紅松木落葉", "block.afc.wood.fallen_leaves.red_silk_cotton": "木棉木落葉", "block.afc.wood.fallen_leaves.redcedar": "紅雪松木落葉", @@ -129,9 +129,9 @@ "block.afc.wood.fallen_leaves.weeping_willow": "垂柳木落葉", "block.afc.wood.food_shelf.baobab": "猴麵包木食物架", "block.afc.wood.food_shelf.cypress": "柏木食物架", - "block.afc.wood.food_shelf.eucalyptus": "桉木食物架", + "block.afc.wood.food_shelf.eucalyptus": "尤加利木食物架", "block.afc.wood.food_shelf.fig": "無花果木食物架", - "block.afc.wood.food_shelf.hevea": "乳膠木食物架", + "block.afc.wood.food_shelf.hevea": "橡膠木食物架", "block.afc.wood.food_shelf.ipe": "紫心木食物架", "block.afc.wood.food_shelf.ironwood": "鐵木食物架", "block.afc.wood.food_shelf.mahogany": "桃花心木食物架", @@ -139,9 +139,9 @@ "block.afc.wood.food_shelf.tualang": "督亞冷木食物架", "block.afc.wood.gear_box.baobab": "猴麵包木齒輪箱", "block.afc.wood.gear_box.cypress": "柏木齒輪箱", - "block.afc.wood.gear_box.eucalyptus": "桉木齒輪箱", + "block.afc.wood.gear_box.eucalyptus": "尤加利木齒輪箱", "block.afc.wood.gear_box.fig": "無花果木齒輪箱", - "block.afc.wood.gear_box.hevea": "乳膠木齒輪箱", + "block.afc.wood.gear_box.hevea": "橡膠木齒輪箱", "block.afc.wood.gear_box.ipe": "紫心木齒輪箱", "block.afc.wood.gear_box.ironwood": "鐵木齒輪箱", "block.afc.wood.gear_box.mahogany": "桃花心木齒輪箱", @@ -149,9 +149,9 @@ "block.afc.wood.gear_box.tualang": "督亞冷木齒輪箱", "block.afc.wood.hanger.baobab": "猴麵包木懸掛架", "block.afc.wood.hanger.cypress": "柏木懸掛架", - "block.afc.wood.hanger.eucalyptus": "桉木懸掛架", + "block.afc.wood.hanger.eucalyptus": "尤加利木懸掛架", "block.afc.wood.hanger.fig": "無花果木懸掛架", - "block.afc.wood.hanger.hevea": "乳膠木懸掛架", + "block.afc.wood.hanger.hevea": "橡膠木懸掛架", "block.afc.wood.hanger.ipe": "紫心木懸掛架", "block.afc.wood.hanger.ironwood": "鐵木懸掛架", "block.afc.wood.hanger.mahogany": "桃花心木懸掛架", @@ -159,9 +159,9 @@ "block.afc.wood.hanger.tualang": "督亞冷木懸掛架", "block.afc.wood.horizontal_support.baobab": "猴麵包木支撐梁", "block.afc.wood.horizontal_support.cypress": "柏木支撐梁", - "block.afc.wood.horizontal_support.eucalyptus": "桉木支撐梁", + "block.afc.wood.horizontal_support.eucalyptus": "尤加利木支撐梁", "block.afc.wood.horizontal_support.fig": "無花果木支撐梁", - "block.afc.wood.horizontal_support.hevea": "乳膠木支撐梁", + "block.afc.wood.horizontal_support.hevea": "橡膠木支撐梁", "block.afc.wood.horizontal_support.ipe": "紫心木支撐梁", "block.afc.wood.horizontal_support.ironwood": "鐵木支撐梁", "block.afc.wood.horizontal_support.mahogany": "桃花心木支撐梁", @@ -169,9 +169,9 @@ "block.afc.wood.horizontal_support.tualang": "督亞冷木支撐梁", "block.afc.wood.jar_shelf.baobab": "猴麵包木果醬架", "block.afc.wood.jar_shelf.cypress": "柏木果醬架", - "block.afc.wood.jar_shelf.eucalyptus": "桉木果醬架", + "block.afc.wood.jar_shelf.eucalyptus": "尤加利木果醬架", "block.afc.wood.jar_shelf.fig": "無花果木果醬架", - "block.afc.wood.jar_shelf.hevea": "乳膠木果醬架", + "block.afc.wood.jar_shelf.hevea": "橡膠木果醬架", "block.afc.wood.jar_shelf.ipe": "紫心木果醬架", "block.afc.wood.jar_shelf.ironwood": "鐵木果醬架", "block.afc.wood.jar_shelf.mahogany": "桃花心木果醬架", @@ -179,9 +179,9 @@ "block.afc.wood.jar_shelf.tualang": "督亞冷木果醬架", "block.afc.wood.jarbnet.baobab": "猴麵包木罐頭櫃", "block.afc.wood.jarbnet.cypress": "柏木罐頭櫃", - "block.afc.wood.jarbnet.eucalyptus": "桉木罐頭櫃", + "block.afc.wood.jarbnet.eucalyptus": "尤加利木罐頭櫃", "block.afc.wood.jarbnet.fig": "無花果木罐頭櫃", - "block.afc.wood.jarbnet.hevea": "乳膠木罐頭櫃", + "block.afc.wood.jarbnet.hevea": "橡膠木罐頭櫃", "block.afc.wood.jarbnet.ipe": "紫心木罐頭櫃", "block.afc.wood.jarbnet.ironwood": "鐵木罐頭櫃", "block.afc.wood.jarbnet.mahogany": "桃花心木罐頭櫃", @@ -198,12 +198,12 @@ "block.afc.wood.leaves.coast_redwood": "海岸紅杉木樹葉", "block.afc.wood.leaves.coast_spruce": "錫特卡雲杉木樹葉", "block.afc.wood.leaves.cypress": "柏木樹葉", - "block.afc.wood.leaves.eucalyptus": "桉木樹葉", + "block.afc.wood.leaves.eucalyptus": "尤加利木樹葉", "block.afc.wood.leaves.fig": "無花果木樹葉", "block.afc.wood.leaves.flame_of_the_forest": "鳳凰木樹葉", "block.afc.wood.leaves.giant_rosewood": "巨人玫瑰木樹葉", "block.afc.wood.leaves.gum_arabic": "阿拉伯膠木樹葉", - "block.afc.wood.leaves.hevea": "乳膠木樹葉", + "block.afc.wood.leaves.hevea": "橡膠木樹葉", "block.afc.wood.leaves.horsetail_ironwood": "馬尾鐵木樹葉", "block.afc.wood.leaves.ipe": "紫心木樹葉", "block.afc.wood.leaves.iroko_teak": "伊羅科柚木樹葉", @@ -217,7 +217,7 @@ "block.afc.wood.leaves.mpingo_blackwood": "Mpingo Blackwood樹葉", "block.afc.wood.leaves.mulga_blackwood": "黑檀木樹葉", "block.afc.wood.leaves.poplar": "柳木樹葉", - "block.afc.wood.leaves.rainbow_eucalyptus": "彩虹桉木樹葉", + "block.afc.wood.leaves.rainbow_eucalyptus": "彩虹尤加利木樹葉", "block.afc.wood.leaves.red_pine": "紅松木樹葉", "block.afc.wood.leaves.red_silk_cotton": "木棉木樹葉", "block.afc.wood.leaves.redcedar": "紅雪松木樹葉", @@ -236,59 +236,59 @@ "block.afc.wood.leaves.weeping_willow": "垂柳木樹葉", "block.afc.wood.lectern.baobab": "猴麵包木講台", "block.afc.wood.lectern.cypress": "柏木講台", - "block.afc.wood.lectern.eucalyptus": "桉木講台", + "block.afc.wood.lectern.eucalyptus": "尤加利木講台", "block.afc.wood.lectern.fig": "無花果木講台", - "block.afc.wood.lectern.hevea": "乳膠木講台", + "block.afc.wood.lectern.hevea": "橡膠木講台", "block.afc.wood.lectern.ipe": "紫心木講台", "block.afc.wood.lectern.ironwood": "鐵木講台", "block.afc.wood.lectern.mahogany": "桃花心木講台", "block.afc.wood.lectern.teak": "柚木講台", "block.afc.wood.lectern.tualang": "督亞冷木講台", - "block.afc.wood.log.ancient_acacia": "遠古相思木原木", - "block.afc.wood.log.ancient_ash": "遠古山楂木原木", - "block.afc.wood.log.ancient_aspen": "遠古山楊木原木", - "block.afc.wood.log.ancient_baobab": "遠古猴麵包木原木", - "block.afc.wood.log.ancient_birch": "遠古Birch原木", - "block.afc.wood.log.ancient_black_oak": "遠古黑橡木原木", - "block.afc.wood.log.ancient_blackwood": "遠古黑木原木", - "block.afc.wood.log.ancient_chestnut": "遠古栗木原木", - "block.afc.wood.log.ancient_cypress": "遠古柏木原木", + "block.afc.wood.log.ancient_acacia": "古相思木原木", + "block.afc.wood.log.ancient_ash": "古山楂木原木", + "block.afc.wood.log.ancient_aspen": "古山楊木原木", + "block.afc.wood.log.ancient_baobab": "古猴麵包木原木", + "block.afc.wood.log.ancient_birch": "古Birch原木", + "block.afc.wood.log.ancient_black_oak": "古黑橡木原木", + "block.afc.wood.log.ancient_blackwood": "古黑木原木", + "block.afc.wood.log.ancient_chestnut": "古栗木原木", + "block.afc.wood.log.ancient_cypress": "古柏木原木", "block.afc.wood.log.ancient_douglas_fir": "道格拉斯冷杉木原木", - "block.afc.wood.log.ancient_eucalyptus": "遠古桉木原木", - "block.afc.wood.log.ancient_fig": "遠古無花果木原木", - "block.afc.wood.log.ancient_gum_arabic": "遠古阿拉伯膠木原木", - "block.afc.wood.log.ancient_hevea": "遠古乳膠木原木", - "block.afc.wood.log.ancient_hickory": "遠古山胡桃木原木", - "block.afc.wood.log.ancient_ipe": "遠古紫心木原木", - "block.afc.wood.log.ancient_ironwood": "遠古鐵木原木", - "block.afc.wood.log.ancient_kapok": "遠古木棉木原木", - "block.afc.wood.log.ancient_mahogany": "遠古桃花心木原木", - "block.afc.wood.log.ancient_maple": "遠古楓木原木", - "block.afc.wood.log.ancient_oak": "遠古橡木原木", - "block.afc.wood.log.ancient_palm": "遠古棕櫚木原木", - "block.afc.wood.log.ancient_pine": "遠古松木原木", - "block.afc.wood.log.ancient_rainbow_eucalyptus": "遠古彩虹桉木原木", - "block.afc.wood.log.ancient_redcedar": "遠古紅雪松木原木", - "block.afc.wood.log.ancient_rosewood": "遠古印度黃檀木原木", - "block.afc.wood.log.ancient_sequoia": "遠古紅杉木原木", - "block.afc.wood.log.ancient_spruce": "遠古雲杉木原木", - "block.afc.wood.log.ancient_sycamore": "遠古無花果木原木", - "block.afc.wood.log.ancient_teak": "遠古柚木原木", - "block.afc.wood.log.ancient_tualang": "遠古督亞冷木原木", - "block.afc.wood.log.ancient_white_cedar": "遠古白雪松木原木", - "block.afc.wood.log.ancient_willow": "遠古Willow原木", + "block.afc.wood.log.ancient_eucalyptus": "古尤加利木原木", + "block.afc.wood.log.ancient_fig": "古無花果木原木", + "block.afc.wood.log.ancient_gum_arabic": "古阿拉伯膠木原木", + "block.afc.wood.log.ancient_hevea": "古橡膠木原木", + "block.afc.wood.log.ancient_hickory": "古山胡桃木原木", + "block.afc.wood.log.ancient_ipe": "古紫心木原木", + "block.afc.wood.log.ancient_ironwood": "古鐵木原木", + "block.afc.wood.log.ancient_kapok": "古木棉木原木", + "block.afc.wood.log.ancient_mahogany": "古桃花心木原木", + "block.afc.wood.log.ancient_maple": "古楓木原木", + "block.afc.wood.log.ancient_oak": "古橡木原木", + "block.afc.wood.log.ancient_palm": "古棕櫚木原木", + "block.afc.wood.log.ancient_pine": "古松木原木", + "block.afc.wood.log.ancient_rainbow_eucalyptus": "古彩虹尤加利木原木", + "block.afc.wood.log.ancient_redcedar": "古紅雪松木原木", + "block.afc.wood.log.ancient_rosewood": "古印度黃檀木原木", + "block.afc.wood.log.ancient_sequoia": "古紅杉木原木", + "block.afc.wood.log.ancient_spruce": "古雲杉木原木", + "block.afc.wood.log.ancient_sycamore": "古無花果木原木", + "block.afc.wood.log.ancient_teak": "古柚木原木", + "block.afc.wood.log.ancient_tualang": "古督亞冷木原木", + "block.afc.wood.log.ancient_white_cedar": "古白雪松木原木", + "block.afc.wood.log.ancient_willow": "古柳木原木", "block.afc.wood.log.baobab": "猴麵包木原木", "block.afc.wood.log.black_oak": "黑橡木原木", "block.afc.wood.log.cypress": "柏木原木", - "block.afc.wood.log.eucalyptus": "桉木原木", + "block.afc.wood.log.eucalyptus": "尤加利木原木", "block.afc.wood.log.fig": "無花果木原木", "block.afc.wood.log.gum_arabic": "阿拉伯膠木原木", - "block.afc.wood.log.hevea": "乳膠木原木", + "block.afc.wood.log.hevea": "橡膠木原木", "block.afc.wood.log.ipe": "紫心木原木", "block.afc.wood.log.ironwood": "鐵木原木", "block.afc.wood.log.mahogany": "桃花心木原木", "block.afc.wood.log.poplar": "柳木原木", - "block.afc.wood.log.rainbow_eucalyptus": "彩虹桉木原木", + "block.afc.wood.log.rainbow_eucalyptus": "彩虹尤加利木原木", "block.afc.wood.log.redcedar": "Redcedar原木", "block.afc.wood.log.rubber_fig": "橡膠無花果木原木", "block.afc.wood.log.teak": "柚木原木", @@ -323,21 +323,21 @@ "block.afc.wood.planks.cypress_tool_rack": "柏木工具架", "block.afc.wood.planks.cypress_trapdoor": "柏木地板門", "block.afc.wood.planks.cypress_workbench": "柏木工作台", - "block.afc.wood.planks.eucalyptus": "桉木木板", - "block.afc.wood.planks.eucalyptus_bookshelf": "桉木書櫃", - "block.afc.wood.planks.eucalyptus_button": "桉木按鈕", - "block.afc.wood.planks.eucalyptus_door": "桉木門", - "block.afc.wood.planks.eucalyptus_fence": "桉木柵欄", - "block.afc.wood.planks.eucalyptus_fence_gate": "桉木柵欄門", - "block.afc.wood.planks.eucalyptus_log_fence": "桉木原木柵欄", - "block.afc.wood.planks.eucalyptus_loom": "桉木織布機", - "block.afc.wood.planks.eucalyptus_pressure_plate": "桉木壓力板", - "block.afc.wood.planks.eucalyptus_sign": "桉木告示牌", - "block.afc.wood.planks.eucalyptus_slab": "桉木木板", - "block.afc.wood.planks.eucalyptus_stairs": "桉木階梯", - "block.afc.wood.planks.eucalyptus_tool_rack": "桉木工具架", - "block.afc.wood.planks.eucalyptus_trapdoor": "桉木地板門", - "block.afc.wood.planks.eucalyptus_workbench": "桉木工作台", + "block.afc.wood.planks.eucalyptus": "尤加利木木板", + "block.afc.wood.planks.eucalyptus_bookshelf": "尤加利木書櫃", + "block.afc.wood.planks.eucalyptus_button": "尤加利木按鈕", + "block.afc.wood.planks.eucalyptus_door": "尤加利木門", + "block.afc.wood.planks.eucalyptus_fence": "尤加利木柵欄", + "block.afc.wood.planks.eucalyptus_fence_gate": "尤加利木柵欄門", + "block.afc.wood.planks.eucalyptus_log_fence": "尤加利木原木柵欄", + "block.afc.wood.planks.eucalyptus_loom": "尤加利木織布機", + "block.afc.wood.planks.eucalyptus_pressure_plate": "尤加利木壓力板", + "block.afc.wood.planks.eucalyptus_sign": "尤加利木告示牌", + "block.afc.wood.planks.eucalyptus_slab": "尤加利木木板", + "block.afc.wood.planks.eucalyptus_stairs": "尤加利木階梯", + "block.afc.wood.planks.eucalyptus_tool_rack": "尤加利木工具架", + "block.afc.wood.planks.eucalyptus_trapdoor": "尤加利木地板門", + "block.afc.wood.planks.eucalyptus_workbench": "尤加利木工作台", "block.afc.wood.planks.fig": "無花果木木板", "block.afc.wood.planks.fig_bookshelf": "無花果木書櫃", "block.afc.wood.planks.fig_button": "無花果木按鈕", @@ -355,9 +355,9 @@ "block.afc.wood.planks.fig_workbench": "無花果木工作台", "block.afc.wood.planks.hanging_sign.bismuth_bronze.baobab": "鉍青銅猴麵包木懸掛式告示牌", "block.afc.wood.planks.hanging_sign.bismuth_bronze.cypress": "鉍青銅柏木懸掛式告示牌", - "block.afc.wood.planks.hanging_sign.bismuth_bronze.eucalyptus": "鉍青銅桉木懸掛式告示牌", + "block.afc.wood.planks.hanging_sign.bismuth_bronze.eucalyptus": "鉍青銅尤加利木懸掛式告示牌", "block.afc.wood.planks.hanging_sign.bismuth_bronze.fig": "鉍青銅無花果木懸掛式告示牌", - "block.afc.wood.planks.hanging_sign.bismuth_bronze.hevea": "鉍青銅乳膠木懸掛式告示牌", + "block.afc.wood.planks.hanging_sign.bismuth_bronze.hevea": "鉍青銅橡膠木懸掛式告示牌", "block.afc.wood.planks.hanging_sign.bismuth_bronze.ipe": "鉍青銅紫心木懸掛式告示牌", "block.afc.wood.planks.hanging_sign.bismuth_bronze.ironwood": "鉍青銅鐵木懸掛式告示牌", "block.afc.wood.planks.hanging_sign.bismuth_bronze.mahogany": "鉍青銅桃花心木懸掛式告示牌", @@ -365,9 +365,9 @@ "block.afc.wood.planks.hanging_sign.bismuth_bronze.tualang": "鉍青銅督亞冷木懸掛式告示牌", "block.afc.wood.planks.hanging_sign.black_bronze.baobab": "黑青銅猴麵包木懸掛式告示牌", "block.afc.wood.planks.hanging_sign.black_bronze.cypress": "黑青銅柏木懸掛式告示牌", - "block.afc.wood.planks.hanging_sign.black_bronze.eucalyptus": "黑青銅桉木懸掛式告示牌", + "block.afc.wood.planks.hanging_sign.black_bronze.eucalyptus": "黑青銅尤加利木懸掛式告示牌", "block.afc.wood.planks.hanging_sign.black_bronze.fig": "黑青銅無花果木懸掛式告示牌", - "block.afc.wood.planks.hanging_sign.black_bronze.hevea": "黑青銅乳膠木懸掛式告示牌", + "block.afc.wood.planks.hanging_sign.black_bronze.hevea": "黑青銅橡膠木懸掛式告示牌", "block.afc.wood.planks.hanging_sign.black_bronze.ipe": "黑青銅紫心木懸掛式告示牌", "block.afc.wood.planks.hanging_sign.black_bronze.ironwood": "黑青銅鐵木懸掛式告示牌", "block.afc.wood.planks.hanging_sign.black_bronze.mahogany": "黑青銅桃花心木懸掛式告示牌", @@ -375,9 +375,9 @@ "block.afc.wood.planks.hanging_sign.black_bronze.tualang": "黑青銅督亞冷木懸掛式告示牌", "block.afc.wood.planks.hanging_sign.black_steel.baobab": "黑鋼猴麵包木懸掛式告示牌", "block.afc.wood.planks.hanging_sign.black_steel.cypress": "黑鋼柏木懸掛式告示牌", - "block.afc.wood.planks.hanging_sign.black_steel.eucalyptus": "黑鋼桉木懸掛式告示牌", + "block.afc.wood.planks.hanging_sign.black_steel.eucalyptus": "黑鋼尤加利木懸掛式告示牌", "block.afc.wood.planks.hanging_sign.black_steel.fig": "黑鋼無花果木懸掛式告示牌", - "block.afc.wood.planks.hanging_sign.black_steel.hevea": "黑鋼乳膠木懸掛式告示牌", + "block.afc.wood.planks.hanging_sign.black_steel.hevea": "黑鋼橡膠木懸掛式告示牌", "block.afc.wood.planks.hanging_sign.black_steel.ipe": "黑鋼紫心木懸掛式告示牌", "block.afc.wood.planks.hanging_sign.black_steel.ironwood": "黑鋼鐵木懸掛式告示牌", "block.afc.wood.planks.hanging_sign.black_steel.mahogany": "黑鋼桃花心木懸掛式告示牌", @@ -385,9 +385,9 @@ "block.afc.wood.planks.hanging_sign.black_steel.tualang": "黑鋼督亞冷木懸掛式告示牌", "block.afc.wood.planks.hanging_sign.blue_steel.baobab": "藍鋼猴麵包木懸掛式告示牌", "block.afc.wood.planks.hanging_sign.blue_steel.cypress": "藍鋼柏木懸掛式告示牌", - "block.afc.wood.planks.hanging_sign.blue_steel.eucalyptus": "藍鋼桉木懸掛式告示牌", + "block.afc.wood.planks.hanging_sign.blue_steel.eucalyptus": "藍鋼尤加利木懸掛式告示牌", "block.afc.wood.planks.hanging_sign.blue_steel.fig": "藍鋼無花果木懸掛式告示牌", - "block.afc.wood.planks.hanging_sign.blue_steel.hevea": "藍鋼乳膠木懸掛式告示牌", + "block.afc.wood.planks.hanging_sign.blue_steel.hevea": "藍鋼橡膠木懸掛式告示牌", "block.afc.wood.planks.hanging_sign.blue_steel.ipe": "藍鋼紫心木懸掛式告示牌", "block.afc.wood.planks.hanging_sign.blue_steel.ironwood": "藍鋼鐵木懸掛式告示牌", "block.afc.wood.planks.hanging_sign.blue_steel.mahogany": "藍鋼桃花心木懸掛式告示牌", @@ -395,9 +395,9 @@ "block.afc.wood.planks.hanging_sign.blue_steel.tualang": "藍鋼督亞冷木懸掛式告示牌", "block.afc.wood.planks.hanging_sign.bronze.baobab": "青銅猴麵包木懸掛式告示牌", "block.afc.wood.planks.hanging_sign.bronze.cypress": "青銅柏木懸掛式告示牌", - "block.afc.wood.planks.hanging_sign.bronze.eucalyptus": "青銅桉木懸掛式告示牌", + "block.afc.wood.planks.hanging_sign.bronze.eucalyptus": "青銅尤加利木懸掛式告示牌", "block.afc.wood.planks.hanging_sign.bronze.fig": "青銅無花果木懸掛式告示牌", - "block.afc.wood.planks.hanging_sign.bronze.hevea": "青銅乳膠木懸掛式告示牌", + "block.afc.wood.planks.hanging_sign.bronze.hevea": "青銅橡膠木懸掛式告示牌", "block.afc.wood.planks.hanging_sign.bronze.ipe": "青銅紫心木懸掛式告示牌", "block.afc.wood.planks.hanging_sign.bronze.ironwood": "青銅鐵木懸掛式告示牌", "block.afc.wood.planks.hanging_sign.bronze.mahogany": "青銅桃花心木懸掛式告示牌", @@ -405,9 +405,9 @@ "block.afc.wood.planks.hanging_sign.bronze.tualang": "青銅督亞冷木懸掛式告示牌", "block.afc.wood.planks.hanging_sign.copper.baobab": "銅猴麵包木懸掛式告示牌", "block.afc.wood.planks.hanging_sign.copper.cypress": "銅柏木懸掛式告示牌", - "block.afc.wood.planks.hanging_sign.copper.eucalyptus": "銅桉木懸掛式告示牌", + "block.afc.wood.planks.hanging_sign.copper.eucalyptus": "銅尤加利木懸掛式告示牌", "block.afc.wood.planks.hanging_sign.copper.fig": "銅無花果木懸掛式告示牌", - "block.afc.wood.planks.hanging_sign.copper.hevea": "銅乳膠木懸掛式告示牌", + "block.afc.wood.planks.hanging_sign.copper.hevea": "銅橡膠木懸掛式告示牌", "block.afc.wood.planks.hanging_sign.copper.ipe": "銅紫心木懸掛式告示牌", "block.afc.wood.planks.hanging_sign.copper.ironwood": "銅鐵木懸掛式告示牌", "block.afc.wood.planks.hanging_sign.copper.mahogany": "銅桃花心木懸掛式告示牌", @@ -415,9 +415,9 @@ "block.afc.wood.planks.hanging_sign.copper.tualang": "銅督亞冷木懸掛式告示牌", "block.afc.wood.planks.hanging_sign.red_steel.baobab": "紅鋼猴麵包木懸掛式告示牌", "block.afc.wood.planks.hanging_sign.red_steel.cypress": "紅鋼柏木懸掛式告示牌", - "block.afc.wood.planks.hanging_sign.red_steel.eucalyptus": "紅鋼桉木懸掛式告示牌", + "block.afc.wood.planks.hanging_sign.red_steel.eucalyptus": "紅鋼尤加利木懸掛式告示牌", "block.afc.wood.planks.hanging_sign.red_steel.fig": "紅鋼無花果木懸掛式告示牌", - "block.afc.wood.planks.hanging_sign.red_steel.hevea": "紅鋼乳膠木懸掛式告示牌", + "block.afc.wood.planks.hanging_sign.red_steel.hevea": "紅鋼橡膠木懸掛式告示牌", "block.afc.wood.planks.hanging_sign.red_steel.ipe": "紅鋼紫心木懸掛式告示牌", "block.afc.wood.planks.hanging_sign.red_steel.ironwood": "紅鋼鐵木懸掛式告示牌", "block.afc.wood.planks.hanging_sign.red_steel.mahogany": "紅鋼桃花心木懸掛式告示牌", @@ -425,9 +425,9 @@ "block.afc.wood.planks.hanging_sign.red_steel.tualang": "紅鋼督亞冷木懸掛式告示牌", "block.afc.wood.planks.hanging_sign.steel.baobab": "鋼猴麵包木懸掛式告示牌", "block.afc.wood.planks.hanging_sign.steel.cypress": "鋼柏木懸掛式告示牌", - "block.afc.wood.planks.hanging_sign.steel.eucalyptus": "鋼桉木懸掛式告示牌", + "block.afc.wood.planks.hanging_sign.steel.eucalyptus": "鋼尤加利木懸掛式告示牌", "block.afc.wood.planks.hanging_sign.steel.fig": "鋼無花果木懸掛式告示牌", - "block.afc.wood.planks.hanging_sign.steel.hevea": "鋼乳膠木懸掛式告示牌", + "block.afc.wood.planks.hanging_sign.steel.hevea": "鋼橡膠木懸掛式告示牌", "block.afc.wood.planks.hanging_sign.steel.ipe": "鋼紫心木懸掛式告示牌", "block.afc.wood.planks.hanging_sign.steel.ironwood": "鋼鐵木懸掛式告示牌", "block.afc.wood.planks.hanging_sign.steel.mahogany": "鋼桃花心木懸掛式告示牌", @@ -435,29 +435,29 @@ "block.afc.wood.planks.hanging_sign.steel.tualang": "鋼督亞冷木懸掛式告示牌", "block.afc.wood.planks.hanging_sign.wrought_iron.baobab": "鍛鐵猴麵包木懸掛式告示牌", "block.afc.wood.planks.hanging_sign.wrought_iron.cypress": "鍛鐵柏木懸掛式告示牌", - "block.afc.wood.planks.hanging_sign.wrought_iron.eucalyptus": "鍛鐵桉木懸掛式告示牌", + "block.afc.wood.planks.hanging_sign.wrought_iron.eucalyptus": "鍛鐵尤加利木懸掛式告示牌", "block.afc.wood.planks.hanging_sign.wrought_iron.fig": "鍛鐵無花果木懸掛式告示牌", - "block.afc.wood.planks.hanging_sign.wrought_iron.hevea": "鍛鐵乳膠木懸掛式告示牌", + "block.afc.wood.planks.hanging_sign.wrought_iron.hevea": "鍛鐵橡膠木懸掛式告示牌", "block.afc.wood.planks.hanging_sign.wrought_iron.ipe": "鍛鐵紫心木懸掛式告示牌", "block.afc.wood.planks.hanging_sign.wrought_iron.ironwood": "鍛鐵鐵木懸掛式告示牌", "block.afc.wood.planks.hanging_sign.wrought_iron.mahogany": "鍛鐵桃花心木懸掛式告示牌", "block.afc.wood.planks.hanging_sign.wrought_iron.teak": "鍛鐵柚木懸掛式告示牌", "block.afc.wood.planks.hanging_sign.wrought_iron.tualang": "鍛鐵督亞冷木懸掛式告示牌", - "block.afc.wood.planks.hevea": "乳膠木木板", - "block.afc.wood.planks.hevea_bookshelf": "乳膠木書櫃", - "block.afc.wood.planks.hevea_button": "乳膠木按鈕", - "block.afc.wood.planks.hevea_door": "乳膠木門", - "block.afc.wood.planks.hevea_fence": "乳膠木柵欄", - "block.afc.wood.planks.hevea_fence_gate": "乳膠木柵欄門", - "block.afc.wood.planks.hevea_log_fence": "乳膠木原木柵欄", - "block.afc.wood.planks.hevea_loom": "乳膠木織布機", - "block.afc.wood.planks.hevea_pressure_plate": "乳膠木壓力板", - "block.afc.wood.planks.hevea_sign": "乳膠木告示牌", - "block.afc.wood.planks.hevea_slab": "乳膠木木板", - "block.afc.wood.planks.hevea_stairs": "乳膠木階梯", - "block.afc.wood.planks.hevea_tool_rack": "乳膠木工具架", - "block.afc.wood.planks.hevea_trapdoor": "乳膠木地板門", - "block.afc.wood.planks.hevea_workbench": "乳膠木工作台", + "block.afc.wood.planks.hevea": "橡膠木木板", + "block.afc.wood.planks.hevea_bookshelf": "橡膠木書櫃", + "block.afc.wood.planks.hevea_button": "橡膠木按鈕", + "block.afc.wood.planks.hevea_door": "橡膠木門", + "block.afc.wood.planks.hevea_fence": "橡膠木柵欄", + "block.afc.wood.planks.hevea_fence_gate": "橡膠木柵欄門", + "block.afc.wood.planks.hevea_log_fence": "橡膠木原木柵欄", + "block.afc.wood.planks.hevea_loom": "橡膠木織布機", + "block.afc.wood.planks.hevea_pressure_plate": "橡膠木壓力板", + "block.afc.wood.planks.hevea_sign": "橡膠木告示牌", + "block.afc.wood.planks.hevea_slab": "橡膠木木板", + "block.afc.wood.planks.hevea_stairs": "橡膠木階梯", + "block.afc.wood.planks.hevea_tool_rack": "橡膠木工具架", + "block.afc.wood.planks.hevea_trapdoor": "橡膠木地板門", + "block.afc.wood.planks.hevea_workbench": "橡膠木工作台", "block.afc.wood.planks.ipe": "紫心木木板", "block.afc.wood.planks.ipe_bookshelf": "紫心木書櫃", "block.afc.wood.planks.ipe_button": "紫心木按鈕", @@ -544,12 +544,12 @@ "block.afc.wood.potted_sapling.coast_redwood": "海岸紅杉木盆栽樹苗", "block.afc.wood.potted_sapling.coast_spruce": "錫特卡雲杉木盆栽樹苗", "block.afc.wood.potted_sapling.cypress": "日本扁柏木盆栽樹苗", - "block.afc.wood.potted_sapling.eucalyptus": "桉木盆栽樹苗", + "block.afc.wood.potted_sapling.eucalyptus": "尤加利木盆栽樹苗", "block.afc.wood.potted_sapling.fig": "無花果木盆栽樹苗", "block.afc.wood.potted_sapling.flame_of_the_forest": "鳳凰木盆栽樹苗", "block.afc.wood.potted_sapling.giant_rosewood": "巨人玫瑰木盆栽樹苗", "block.afc.wood.potted_sapling.gum_arabic": "阿拉伯膠木盆栽樹苗", - "block.afc.wood.potted_sapling.hevea": "乳膠木盆栽樹苗", + "block.afc.wood.potted_sapling.hevea": "橡膠木盆栽樹苗", "block.afc.wood.potted_sapling.horsetail_ironwood": "馬尾鐵木盆栽樹苗", "block.afc.wood.potted_sapling.ipe": "紫心木盆栽樹苗", "block.afc.wood.potted_sapling.iroko_teak": "伊羅科柚木盆栽樹苗", @@ -563,7 +563,7 @@ "block.afc.wood.potted_sapling.mpingo_blackwood": "Mpingo Blackwood盆栽樹苗", "block.afc.wood.potted_sapling.mulga_blackwood": "黑檀木樹苗盆栽", "block.afc.wood.potted_sapling.poplar": "柳木盆栽樹苗", - "block.afc.wood.potted_sapling.rainbow_eucalyptus": "彩虹桉木盆栽樹苗", + "block.afc.wood.potted_sapling.rainbow_eucalyptus": "彩虹尤加利木盆栽樹苗", "block.afc.wood.potted_sapling.red_pine": "紅松木盆栽樹苗", "block.afc.wood.potted_sapling.red_silk_cotton": "木棉木盆栽樹苗", "block.afc.wood.potted_sapling.redcedar": "紅雪松木盆栽樹苗", @@ -591,12 +591,12 @@ "block.afc.wood.sapling.coast_redwood": "海岸紅杉木樹苗", "block.afc.wood.sapling.coast_spruce": "Coast 雲杉木樹苗", "block.afc.wood.sapling.cypress": "日本扁柏木樹苗", - "block.afc.wood.sapling.eucalyptus": "桉木樹苗", + "block.afc.wood.sapling.eucalyptus": "尤加利木樹苗", "block.afc.wood.sapling.fig": "無花果木樹苗", "block.afc.wood.sapling.flame_of_the_forest": "鳳凰木樹苗", "block.afc.wood.sapling.giant_rosewood": "巨人玫瑰木樹苗", "block.afc.wood.sapling.gum_arabic": "阿拉伯膠木樹苗", - "block.afc.wood.sapling.hevea": "乳膠木樹苗", + "block.afc.wood.sapling.hevea": "橡膠木樹苗", "block.afc.wood.sapling.horsetail_ironwood": "馬尾鐵木樹苗", "block.afc.wood.sapling.ipe": "紫心木樹苗", "block.afc.wood.sapling.iroko_teak": "伊羅科柚木樹苗", @@ -610,7 +610,7 @@ "block.afc.wood.sapling.mpingo_blackwood": "Mpingo Blackwood樹苗", "block.afc.wood.sapling.mulga_blackwood": "黑檀木樹苗", "block.afc.wood.sapling.poplar": "柳木樹苗", - "block.afc.wood.sapling.rainbow_eucalyptus": "彩虹桉木樹苗", + "block.afc.wood.sapling.rainbow_eucalyptus": "彩虹尤加利木樹苗", "block.afc.wood.sapling.red_pine": "紅松木樹苗", "block.afc.wood.sapling.red_silk_cotton": "木棉木樹苗", "block.afc.wood.sapling.redcedar": "紅雪松木樹苗", @@ -629,9 +629,9 @@ "block.afc.wood.sapling.weeping_willow": "垂柳木樹苗", "block.afc.wood.scribing_table.baobab": "猴麵包木書寫桌", "block.afc.wood.scribing_table.cypress": "柏木書寫桌", - "block.afc.wood.scribing_table.eucalyptus": "桉木書寫桌", + "block.afc.wood.scribing_table.eucalyptus": "尤加利木書寫桌", "block.afc.wood.scribing_table.fig": "無花果木書寫桌", - "block.afc.wood.scribing_table.hevea": "乳膠木書寫桌", + "block.afc.wood.scribing_table.hevea": "橡膠木書寫桌", "block.afc.wood.scribing_table.ipe": "紫心木書寫桌", "block.afc.wood.scribing_table.ironwood": "鐵木書寫桌", "block.afc.wood.scribing_table.mahogany": "桃花心木書寫桌", @@ -639,9 +639,9 @@ "block.afc.wood.scribing_table.tualang": "督亞冷木書寫桌", "block.afc.wood.sewing_table.baobab": "猴麵包木縫紉桌", "block.afc.wood.sewing_table.cypress": "柏木縫紉桌", - "block.afc.wood.sewing_table.eucalyptus": "桉木縫紉桌", + "block.afc.wood.sewing_table.eucalyptus": "尤加利木縫紉桌", "block.afc.wood.sewing_table.fig": "無花果木縫紉桌", - "block.afc.wood.sewing_table.hevea": "乳膠木縫紉桌", + "block.afc.wood.sewing_table.hevea": "橡膠木縫紉桌", "block.afc.wood.sewing_table.ipe": "紫心木縫紉桌", "block.afc.wood.sewing_table.ironwood": "鐵木縫紉桌", "block.afc.wood.sewing_table.mahogany": "桃花心木縫紉桌", @@ -649,9 +649,9 @@ "block.afc.wood.sewing_table.tualang": "督亞冷木縫紉桌", "block.afc.wood.sign.baobab": "猴麵包木告示牌", "block.afc.wood.sign.cypress": "柏木告示牌", - "block.afc.wood.sign.eucalyptus": "桉木告示牌", + "block.afc.wood.sign.eucalyptus": "尤加利木告示牌", "block.afc.wood.sign.fig": "無花果木告示牌", - "block.afc.wood.sign.hevea": "乳膠木告示牌", + "block.afc.wood.sign.hevea": "橡膠木告示牌", "block.afc.wood.sign.ipe": "紫心木告示牌", "block.afc.wood.sign.ironwood": "鐵木告示牌", "block.afc.wood.sign.mahogany": "桃花心木告示牌", @@ -659,9 +659,9 @@ "block.afc.wood.sign.tualang": "督亞冷木告示牌", "block.afc.wood.sluice.baobab": "猴麵包木洗礦槽", "block.afc.wood.sluice.cypress": "柏木洗礦槽", - "block.afc.wood.sluice.eucalyptus": "桉木洗礦槽", + "block.afc.wood.sluice.eucalyptus": "尤加利木洗礦槽", "block.afc.wood.sluice.fig": "無花果木洗礦槽", - "block.afc.wood.sluice.hevea": "乳膠木洗礦槽", + "block.afc.wood.sluice.hevea": "橡膠木洗礦槽", "block.afc.wood.sluice.ipe": "紫心木洗礦槽", "block.afc.wood.sluice.ironwood": "鐵木洗礦槽", "block.afc.wood.sluice.mahogany": "桃花心木洗礦槽", @@ -669,9 +669,9 @@ "block.afc.wood.sluice.tualang": "督亞冷木洗礦槽", "block.afc.wood.stomping_barrel.baobab": "猴麵包木踩踏盆", "block.afc.wood.stomping_barrel.cypress": "柏木踩踏盆", - "block.afc.wood.stomping_barrel.eucalyptus": "桉木踩踏盆", + "block.afc.wood.stomping_barrel.eucalyptus": "尤加利木踩踏盆", "block.afc.wood.stomping_barrel.fig": "無花果木踩踏盆", - "block.afc.wood.stomping_barrel.hevea": "乳膠木踩踏盆", + "block.afc.wood.stomping_barrel.hevea": "橡膠木踩踏盆", "block.afc.wood.stomping_barrel.ipe": "紫心木踩踏盆", "block.afc.wood.stomping_barrel.ironwood": "鐵木踩踏盆", "block.afc.wood.stomping_barrel.mahogany": "桃花心木踩踏盆", @@ -679,9 +679,9 @@ "block.afc.wood.stomping_barrel.tualang": "督亞冷木踩踏盆", "block.afc.wood.stripped_log.baobab": "剝皮猴麵包木原木", "block.afc.wood.stripped_log.cypress": "剝皮柏木原木", - "block.afc.wood.stripped_log.eucalyptus": "剝皮桉木原木", + "block.afc.wood.stripped_log.eucalyptus": "剝皮尤加利木原木", "block.afc.wood.stripped_log.fig": "剝皮無花果木原木", - "block.afc.wood.stripped_log.hevea": "剝皮乳膠木原木", + "block.afc.wood.stripped_log.hevea": "剝皮橡膠木原木", "block.afc.wood.stripped_log.ipe": "剝皮紫心木原木", "block.afc.wood.stripped_log.ironwood": "剝皮鐵木原木", "block.afc.wood.stripped_log.mahogany": "剝皮桃花心木原木", @@ -689,9 +689,9 @@ "block.afc.wood.stripped_log.tualang": "剝皮督亞冷木原木", "block.afc.wood.stripped_wood.baobab": "剝皮猴麵包木塊", "block.afc.wood.stripped_wood.cypress": "剝皮柏木塊", - "block.afc.wood.stripped_wood.eucalyptus": "剝皮桉木塊", + "block.afc.wood.stripped_wood.eucalyptus": "剝皮尤加利木塊", "block.afc.wood.stripped_wood.fig": "剝皮無花果木塊", - "block.afc.wood.stripped_wood.hevea": "剝皮乳膠木塊", + "block.afc.wood.stripped_wood.hevea": "剝皮橡膠木塊", "block.afc.wood.stripped_wood.ipe": "剝皮紫心木塊", "block.afc.wood.stripped_wood.ironwood": "剝皮鐵木塊", "block.afc.wood.stripped_wood.mahogany": "剝皮桃花心木塊", @@ -699,9 +699,9 @@ "block.afc.wood.stripped_wood.tualang": "剝皮督亞冷木塊", "block.afc.wood.trapped_chest.baobab": "猴麵包木陷阱箱", "block.afc.wood.trapped_chest.cypress": "柏木陷阱箱", - "block.afc.wood.trapped_chest.eucalyptus": "桉木陷阱箱", + "block.afc.wood.trapped_chest.eucalyptus": "尤加利木陷阱箱", "block.afc.wood.trapped_chest.fig": "無花果木陷阱箱", - "block.afc.wood.trapped_chest.hevea": "乳膠木陷阱箱", + "block.afc.wood.trapped_chest.hevea": "橡膠木陷阱箱", "block.afc.wood.trapped_chest.ipe": "紫心木陷阱箱", "block.afc.wood.trapped_chest.ironwood": "鐵木陷阱箱", "block.afc.wood.trapped_chest.mahogany": "桃花心木陷阱箱", @@ -710,24 +710,24 @@ "block.afc.wood.twig.baobab": "猴麵包木枝", "block.afc.wood.twig.black_oak": "黑橡木枝", "block.afc.wood.twig.cypress": "柏木枝", - "block.afc.wood.twig.eucalyptus": "桉木枝", + "block.afc.wood.twig.eucalyptus": "尤加利木枝", "block.afc.wood.twig.fig": "無花果木枝", "block.afc.wood.twig.gum_arabic": "阿拉伯膠木枝", - "block.afc.wood.twig.hevea": "乳膠木枝", + "block.afc.wood.twig.hevea": "橡膠木枝", "block.afc.wood.twig.ipe": "紫心木枝", "block.afc.wood.twig.ironwood": "鐵木枝", "block.afc.wood.twig.mahogany": "桃花心木枝", "block.afc.wood.twig.poplar": "柳木枝", - "block.afc.wood.twig.rainbow_eucalyptus": "彩虹桉木枝", + "block.afc.wood.twig.rainbow_eucalyptus": "彩虹尤加利木枝", "block.afc.wood.twig.redcedar": "紅雪松木枝", "block.afc.wood.twig.rubber_fig": "橡膠無花果木枝", "block.afc.wood.twig.teak": "柚木枝", "block.afc.wood.twig.tualang": "督亞冷木枝", "block.afc.wood.vertical_support.baobab": "猴麵包木支撐梁", "block.afc.wood.vertical_support.cypress": "柏木支撐梁", - "block.afc.wood.vertical_support.eucalyptus": "桉木支撐梁", + "block.afc.wood.vertical_support.eucalyptus": "尤加利木支撐梁", "block.afc.wood.vertical_support.fig": "無花果木支撐梁", - "block.afc.wood.vertical_support.hevea": "乳膠木支撐梁", + "block.afc.wood.vertical_support.hevea": "橡膠木支撐梁", "block.afc.wood.vertical_support.ipe": "紫心木支撐梁", "block.afc.wood.vertical_support.ironwood": "鐵木支撐梁", "block.afc.wood.vertical_support.mahogany": "桃花心木支撐梁", @@ -735,7 +735,7 @@ "block.afc.wood.vertical_support.tualang": "督亞冷木支撐梁", "block.afc.wood.water_wheel.baobab": "猴麵包木水車", "block.afc.wood.water_wheel.cypress": "柏木水車", - "block.afc.wood.water_wheel.eucalyptus": "桉木水車", + "block.afc.wood.water_wheel.eucalyptus": "尤加利木水車", "block.afc.wood.water_wheel.fig": "無花果木水車", "block.afc.wood.water_wheel.hevea": "三葉橡膠木水車", "block.afc.wood.water_wheel.ipe": "紫心木水車", @@ -745,59 +745,59 @@ "block.afc.wood.water_wheel.tualang": "督亞冷木水車", "block.afc.wood.wine_shelf.baobab": "猴麵包木紅酒櫃", "block.afc.wood.wine_shelf.cypress": "柏木紅酒櫃", - "block.afc.wood.wine_shelf.eucalyptus": "桉木紅酒櫃", + "block.afc.wood.wine_shelf.eucalyptus": "尤加利木紅酒櫃", "block.afc.wood.wine_shelf.fig": "無花果木紅酒櫃", - "block.afc.wood.wine_shelf.hevea": "乳膠木紅酒櫃", + "block.afc.wood.wine_shelf.hevea": "橡膠木紅酒櫃", "block.afc.wood.wine_shelf.ipe": "紫心木紅酒櫃", "block.afc.wood.wine_shelf.ironwood": "鐵木紅酒櫃", "block.afc.wood.wine_shelf.mahogany": "桃花心木紅酒櫃", "block.afc.wood.wine_shelf.teak": "柚木紅酒櫃", "block.afc.wood.wine_shelf.tualang": "督亞冷木紅酒櫃", - "block.afc.wood.wood.ancient_acacia": "遠古相思木", - "block.afc.wood.wood.ancient_ash": "遠古山楂木", - "block.afc.wood.wood.ancient_aspen": "遠古山楊木", - "block.afc.wood.wood.ancient_baobab": "遠古猴麵包木", - "block.afc.wood.wood.ancient_birch": "遠古樺木", - "block.afc.wood.wood.ancient_black_oak": "遠古黑橡木", - "block.afc.wood.wood.ancient_blackwood": "遠古黑木", - "block.afc.wood.wood.ancient_chestnut": "遠古栗木", - "block.afc.wood.wood.ancient_cypress": "遠古柏木", - "block.afc.wood.wood.ancient_douglas_fir": "遠古道格拉斯冷杉木", - "block.afc.wood.wood.ancient_eucalyptus": "遠古桉木", - "block.afc.wood.wood.ancient_fig": "遠古無花果木", - "block.afc.wood.wood.ancient_gum_arabic": "遠古阿拉伯膠木", - "block.afc.wood.wood.ancient_hevea": "遠古乳膠木", - "block.afc.wood.wood.ancient_hickory": "遠古山胡桃木", - "block.afc.wood.wood.ancient_ipe": "遠古紫心木", - "block.afc.wood.wood.ancient_ironwood": "遠古鐵木", - "block.afc.wood.wood.ancient_kapok": "遠古木棉木", - "block.afc.wood.wood.ancient_mahogany": "遠古桃花心木", - "block.afc.wood.wood.ancient_maple": "遠古楓木", - "block.afc.wood.wood.ancient_oak": "遠古橡木", - "block.afc.wood.wood.ancient_palm": "遠古棕櫚木", - "block.afc.wood.wood.ancient_pine": "遠古松木", - "block.afc.wood.wood.ancient_rainbow_eucalyptus": "遠古彩虹桉木", - "block.afc.wood.wood.ancient_redcedar": "遠古紅雪松木", - "block.afc.wood.wood.ancient_rosewood": "遠古玫瑰木", - "block.afc.wood.wood.ancient_sequoia": "遠古紅杉木", - "block.afc.wood.wood.ancient_spruce": "遠古雲杉木", - "block.afc.wood.wood.ancient_sycamore": "遠古無花果木", - "block.afc.wood.wood.ancient_teak": "遠古柚木", - "block.afc.wood.wood.ancient_tualang": "遠古督亞冷木", - "block.afc.wood.wood.ancient_white_cedar": "遠古白雪松木", - "block.afc.wood.wood.ancient_willow": "遠古柳木", + "block.afc.wood.wood.ancient_acacia": "古相思木", + "block.afc.wood.wood.ancient_ash": "古山楂木", + "block.afc.wood.wood.ancient_aspen": "古山楊木", + "block.afc.wood.wood.ancient_baobab": "古猴麵包木", + "block.afc.wood.wood.ancient_birch": "古樺木", + "block.afc.wood.wood.ancient_black_oak": "古黑橡木", + "block.afc.wood.wood.ancient_blackwood": "古黑木", + "block.afc.wood.wood.ancient_chestnut": "古栗木", + "block.afc.wood.wood.ancient_cypress": "古柏木", + "block.afc.wood.wood.ancient_douglas_fir": "古道格拉斯冷杉木", + "block.afc.wood.wood.ancient_eucalyptus": "古尤加利木", + "block.afc.wood.wood.ancient_fig": "古無花果木", + "block.afc.wood.wood.ancient_gum_arabic": "古阿拉伯膠木", + "block.afc.wood.wood.ancient_hevea": "古橡膠木", + "block.afc.wood.wood.ancient_hickory": "古山胡桃木", + "block.afc.wood.wood.ancient_ipe": "古紫心木", + "block.afc.wood.wood.ancient_ironwood": "古鐵木", + "block.afc.wood.wood.ancient_kapok": "古木棉木", + "block.afc.wood.wood.ancient_mahogany": "古桃花心木", + "block.afc.wood.wood.ancient_maple": "古楓木", + "block.afc.wood.wood.ancient_oak": "古橡木", + "block.afc.wood.wood.ancient_palm": "古棕櫚木", + "block.afc.wood.wood.ancient_pine": "古松木", + "block.afc.wood.wood.ancient_rainbow_eucalyptus": "古彩虹尤加利木", + "block.afc.wood.wood.ancient_redcedar": "古紅雪松木", + "block.afc.wood.wood.ancient_rosewood": "古玫瑰木", + "block.afc.wood.wood.ancient_sequoia": "古紅杉木", + "block.afc.wood.wood.ancient_spruce": "古雲杉木", + "block.afc.wood.wood.ancient_sycamore": "古無花果木", + "block.afc.wood.wood.ancient_teak": "古柚木", + "block.afc.wood.wood.ancient_tualang": "古督亞冷木", + "block.afc.wood.wood.ancient_white_cedar": "古白雪松木", + "block.afc.wood.wood.ancient_willow": "古柳木", "block.afc.wood.wood.baobab": "猴麵包木", "block.afc.wood.wood.black_oak": "黑橡木", "block.afc.wood.wood.cypress": "柏木", - "block.afc.wood.wood.eucalyptus": "桉木", + "block.afc.wood.wood.eucalyptus": "尤加利木", "block.afc.wood.wood.fig": "無花果木", "block.afc.wood.wood.gum_arabic": "阿拉伯膠木", - "block.afc.wood.wood.hevea": "乳膠木", + "block.afc.wood.wood.hevea": "橡膠木", "block.afc.wood.wood.ipe": "紫心木", "block.afc.wood.wood.ironwood": "鐵木", "block.afc.wood.wood.mahogany": "桃花心木", "block.afc.wood.wood.poplar": "柳木", - "block.afc.wood.wood.rainbow_eucalyptus": "彩虹桉木", + "block.afc.wood.wood.rainbow_eucalyptus": "彩虹尤加利木", "block.afc.wood.wood.redcedar": "紅雪松木", "block.afc.wood.wood.rubber_fig": "橡膠無花果木", "block.afc.wood.wood.teak": "柚木", @@ -805,7 +805,7 @@ "config.jade.plugin_afc.tap": "林海傳說樹液採集Jade資訊", "entity.afc.boat.baobab": "猴麵包木船", "entity.afc.boat.cypress": "柏木船", - "entity.afc.boat.eucalyptus": "桉木船", + "entity.afc.boat.eucalyptus": "尤加利木船", "entity.afc.boat.fig": "無花果木船", "entity.afc.boat.hevea": "三葉橡膠木船", "entity.afc.boat.ipe": "紫心木船", @@ -825,7 +825,7 @@ "item.afc.rubber_bar": "橡膠棒", "item.afc.wood.boat.baobab": "猴麵包木船", "item.afc.wood.boat.cypress": "柏木船", - "item.afc.wood.boat.eucalyptus": "桉木船", + "item.afc.wood.boat.eucalyptus": "尤加利木船", "item.afc.wood.boat.fig": "無花果木船", "item.afc.wood.boat.hevea": "三葉橡膠木船", "item.afc.wood.boat.ipe": "紫心木船", @@ -835,9 +835,9 @@ "item.afc.wood.boat.tualang": "督亞冷木船", "item.afc.wood.chest_minecart.baobab": "猴麵包木儲物箱礦車", "item.afc.wood.chest_minecart.cypress": "柏木儲物箱礦車", - "item.afc.wood.chest_minecart.eucalyptus": "桉木儲物箱礦車", + "item.afc.wood.chest_minecart.eucalyptus": "尤加利木儲物箱礦車", "item.afc.wood.chest_minecart.fig": "無花果木儲物箱礦車", - "item.afc.wood.chest_minecart.hevea": "乳膠木儲物箱礦車", + "item.afc.wood.chest_minecart.hevea": "橡膠木儲物箱礦車", "item.afc.wood.chest_minecart.ipe": "紫心木儲物箱礦車", "item.afc.wood.chest_minecart.ironwood": "鐵木儲物箱礦車", "item.afc.wood.chest_minecart.mahogany": "桃花心木儲物箱礦車", @@ -845,9 +845,9 @@ "item.afc.wood.chest_minecart.tualang": "督亞冷木儲物箱礦車", "item.afc.wood.lumber.baobab": "猴麵包木木板", "item.afc.wood.lumber.cypress": "柏木木板", - "item.afc.wood.lumber.eucalyptus": "桉木木板", + "item.afc.wood.lumber.eucalyptus": "尤加利木木板", "item.afc.wood.lumber.fig": "無花果木木板", - "item.afc.wood.lumber.hevea": "乳膠木木板", + "item.afc.wood.lumber.hevea": "橡膠木木板", "item.afc.wood.lumber.ipe": "紫心木木板", "item.afc.wood.lumber.ironwood": "鐵木木板", "item.afc.wood.lumber.mahogany": "桃花心木木板", @@ -855,9 +855,9 @@ "item.afc.wood.lumber.tualang": "督亞冷木木板", "item.tfc.wood.support.baobab": "猴麵包木支撐梁", "item.tfc.wood.support.cypress": "柏木支撐梁", - "item.tfc.wood.support.eucalyptus": "桉木支撐梁", + "item.tfc.wood.support.eucalyptus": "尤加利木支撐梁", "item.tfc.wood.support.fig": "無花果木支撐梁", - "item.tfc.wood.support.hevea": "乳膠木支撐梁", + "item.tfc.wood.support.hevea": "橡膠木支撐梁", "item.tfc.wood.support.ipe": "紫心木支撐梁", "item.tfc.wood.support.ironwood": "鐵木支撐梁", "item.tfc.wood.support.mahogany": "桃花心木支撐梁", diff --git a/kubejs/assets/create/lang/uk_ua.json b/kubejs/assets/create/lang/uk_ua.json index 3cd77af12c..0a0d8543fb 100644 --- a/kubejs/assets/create/lang/uk_ua.json +++ b/kubejs/assets/create/lang/uk_ua.json @@ -1953,7 +1953,7 @@ "create.ponder.funnel_transfer.text_3": "Те саме стосується і поземного переміщення. Тут вам придасться механічний ремінь.", "create.ponder.gantry_carriage.header": "Використання шасі портального візка", "create.ponder.gantry_carriage.text_1": "Шасі портального візка можуть прикріплюватися і рухатися вздовж портального вала", - "create.ponder.gantry_carriage.text_2": "Портальні установки можуть рухати приєднані блоки", + "create.ponder.gantry_carriage.text_2": "Портальні устави можуть рухати приєднані блоки", "create.ponder.gantry_cascaded.header": "Каскадні портали", "create.ponder.gantry_cascaded.text_1": "Вали портального крана прикріплюються до візка, не потребуючи використання суперклею", "create.ponder.gantry_cascaded.text_2": "Те саме стосується і візків на рухомих портальних валах", @@ -1967,8 +1967,8 @@ "create.ponder.gantry_redstone.text_1": "Заживлений редстоуном портальний вал припиняє рухати візок", "create.ponder.gantry_redstone.text_2": "Натомість сила обертання передається вихідному валу візка", "create.ponder.gantry_shaft.header": "Використання валів портального візка", - "create.ponder.gantry_shaft.text_1": "Портальні вали становлять основу портальної установки. Вздовж них рухатимуться приєднані візки", - "create.ponder.gantry_shaft.text_2": "Портальні установки можуть рухати приєднані блоки", + "create.ponder.gantry_shaft.text_1": "Портальні вали становлять основу портальної устави. Вздовж них рухатимуться приєднані візки", + "create.ponder.gantry_shaft.text_2": "Портальні устави можуть рухати приєднані блоки", "create.ponder.gearbox.header": "Передача сили обертання коробками передач", "create.ponder.gearbox.text_1": "Переходи між осями обертання можуть швидко стати громіздкими", "create.ponder.gearbox.text_2": "Коробка передач — це більш компактний еквівалент цьому механізму", @@ -2080,7 +2080,7 @@ "create.ponder.mechanical_crafter.header": "Налаштування механічних збирачів", "create.ponder.mechanical_crafter.text_1": "Масив механічних збирачів можна використовувати для автоматизації будь-якого рецепту", "create.ponder.mechanical_crafter.text_2": "За допомогою гайкового ключа можна налаштувати шляхи збирачів", - "create.ponder.mechanical_crafter.text_3": "Для дієвої установки всі шляхи повинні сходитися в один вихід з будь-якої сторони", + "create.ponder.mechanical_crafter.text_3": "Для дієвої устави всі шляхи повинні сходитися в один вихід з будь-якої сторони", "create.ponder.mechanical_crafter.text_4": "Вироби буде поміщено в містило біля виходу", "create.ponder.mechanical_crafter.text_5": "Для роботи механічних збирачів потрібна сила обертання", "create.ponder.mechanical_crafter.text_6": "Клацніть ПКМ по передній стороні, щоб вставити предмет вручну", @@ -2401,7 +2401,7 @@ "create.ponder.steam_engine.text_2": "Клацніть по двигуну із валом у руці, щоб створити вихід для кінетичної енергії", "create.ponder.steam_engine.text_3": "З достатньою кількістю води, рівнем тепла та обсягом котла…", "create.ponder.steam_engine.text_4": "…вони творитимуть силу обертання", - "create.ponder.steam_engine.text_5": "Найменша установка потребує 4 рідинних резервуари", + "create.ponder.steam_engine.text_5": "Найменша устава потребує 4 рідинних резервуари", "create.ponder.steam_engine.text_6": "За допомогою пальників пломеня можна збільшити вихідну потужність", "create.ponder.steam_engine.text_7": "Вищі рівні потужности вимагають більше води, розміру котла та рівня тепла", "create.ponder.steam_engine.text_8": "Поточний рівень потужности котла можна перевірити за допомогою інженерних окулярів", diff --git a/kubejs/assets/endermanoverhaul/lang/zh_cn.json b/kubejs/assets/endermanoverhaul/lang/zh_cn.json index 3428b564dc..14fb10b986 100644 --- a/kubejs/assets/endermanoverhaul/lang/zh_cn.json +++ b/kubejs/assets/endermanoverhaul/lang/zh_cn.json @@ -46,7 +46,7 @@ "entity.endermanoverhaul.nether_wastes_enderman": "狂躁末影人", "entity.endermanoverhaul.pet_enderman": "宠物末影人", "entity.endermanoverhaul.savanna_enderman": "沙地末影人", - "entity.endermanoverhaul.scarab": "甲虫", + "entity.endermanoverhaul.scarab": "幼蛛", "entity.endermanoverhaul.snowy_enderman": "雪地末影人", "entity.endermanoverhaul.soul_pearl": "灵魂珍珠", "entity.endermanoverhaul.soulsand_valley_enderman": "光花触染末影人", @@ -79,7 +79,7 @@ "item.endermanoverhaul.nether_wastes_enderman_spawn_egg": "狂躁末影人刷怪蛋", "item.endermanoverhaul.savanna_enderman_spawn_egg": "沙地末影人刷怪蛋", "item.endermanoverhaul.savanna_hood": "旱地兜帽", - "item.endermanoverhaul.scarab_spawn_egg": "甲虫刷怪蛋", + "item.endermanoverhaul.scarab_spawn_egg": "幼蛛刷怪蛋", "item.endermanoverhaul.snowy_enderman_spawn_egg": "雪地末影人刷怪蛋", "item.endermanoverhaul.snowy_hood": "雪原兜帽", "item.endermanoverhaul.soul_pearl": "灵魂珍珠", diff --git a/kubejs/assets/endermanoverhaul/lang/zh_tw.json b/kubejs/assets/endermanoverhaul/lang/zh_tw.json index 9cc118bb42..f70fe9124a 100644 --- a/kubejs/assets/endermanoverhaul/lang/zh_tw.json +++ b/kubejs/assets/endermanoverhaul/lang/zh_tw.json @@ -24,7 +24,7 @@ "config.endermanoverhaul.spawnSwampEnderman": "生成沼澤終界使者", "config.endermanoverhaul.spawnWarpedForestEnderman": "生成詭異終界使者", "config.endermanoverhaul.spawnWindsweptHillsEnderman": "生成丘陵終界使者", - "entity.endermanoverhaul.ancient_pearl": "遠古珍珠", + "entity.endermanoverhaul.ancient_pearl": "古珍珠", "entity.endermanoverhaul.axolotl_pet_enderman": "六角終界使者", "entity.endermanoverhaul.badlands_enderman": "荒地終界使者", "entity.endermanoverhaul.bubble_pearl": "泡沫珍珠", @@ -56,7 +56,7 @@ "entity.endermanoverhaul.warped_forest_enderman": "扭曲森林終界使者", "entity.endermanoverhaul.warped_pearl": "扭曲珍珠", "entity.endermanoverhaul.windswept_hills_enderman": "月海終界使者", - "item.endermanoverhaul.ancient_pearl": "遠古珍珠", + "item.endermanoverhaul.ancient_pearl": "古珍珠", "item.endermanoverhaul.badlands_enderman_spawn_egg": "荒地終界使者生怪蛋", "item.endermanoverhaul.badlands_hood": "荒地兜帽", "item.endermanoverhaul.bubble_pearl": "泡沫珍珠", @@ -91,7 +91,7 @@ "item.endermanoverhaul.warped_pearl": "扭曲珍珠", "item.endermanoverhaul.windswept_hills_enderman_spawn_egg": "月海終界使者生成蛋", "itemGroup.endermanoverhaul.main": "終界使者重製", - "subtitles.endermanoverhaul.entity.ancient_pearl.hit": "遠古珍珠擊中", + "subtitles.endermanoverhaul.entity.ancient_pearl.hit": "古珍珠擊中", "subtitles.endermanoverhaul.entity.bubble_pearl.hit": "泡沫珍珠爆裂", "subtitles.endermanoverhaul.entity.bubble_pearl.thrown": "泡沫珍珠投擲", "subtitles.endermanoverhaul.entity.cave_enderman.ambient": "深穴終界使者發出嗚嗚聲", diff --git a/kubejs/assets/firmacivplus/lang/zh_tw.json b/kubejs/assets/firmacivplus/lang/zh_tw.json index 3185c5a1d9..43f954a308 100644 --- a/kubejs/assets/firmacivplus/lang/zh_tw.json +++ b/kubejs/assets/firmacivplus/lang/zh_tw.json @@ -6,7 +6,7 @@ "block.firmacivplus.wood.canoe_component_block.tualang": "大甘巴豆木獨木舟組件", "block.firmacivplus.wood.crimson_roofing": "緋紅蕈木屋頂", "block.firmacivplus.wood.cypress_roofing": "柏木屋頂", - "block.firmacivplus.wood.eucalyptus_roofing": "桉木屋頂", + "block.firmacivplus.wood.eucalyptus_roofing": "尤加利木屋頂", "block.firmacivplus.wood.fig_roofing": "無花果木屋頂", "block.firmacivplus.wood.hevea_roofing": "橡膠木屋頂", "block.firmacivplus.wood.ipe_roofing": "重蟻木屋頂", @@ -16,7 +16,7 @@ "block.firmacivplus.wood.tualang_roofing": "大甘巴豆木屋頂", "block.firmacivplus.wood.warped_roofing": "扭曲蕈木屋頂", "block.firmacivplus.wood.watercraft_frame.angled.baobab": "猴麵包樹木斜面船匠腳手架", - "block.firmacivplus.wood.watercraft_frame.angled.eucalyptus": "桉木斜面船匠腳手架", + "block.firmacivplus.wood.watercraft_frame.angled.eucalyptus": "尤加利木斜面船匠腳手架", "block.firmacivplus.wood.watercraft_frame.angled.hevea": "橡膠木斜面船匠腳手架", "block.firmacivplus.wood.watercraft_frame.angled.ipe": "重蟻木斜面船匠腳手架", "block.firmacivplus.wood.watercraft_frame.angled.ironwood": "鐵木斜面船匠腳手架", @@ -24,7 +24,7 @@ "block.firmacivplus.wood.watercraft_frame.angled.teak": "柚木斜面船匠腳手架", "block.firmacivplus.wood.watercraft_frame.angled.warped": "扭曲蕈木斜面船匠腳手架", "block.firmacivplus.wood.watercraft_frame.flat.baobab": "猴麵包樹木平面船匠腳手架", - "block.firmacivplus.wood.watercraft_frame.flat.eucalyptus": "桉木平面船匠腳手架", + "block.firmacivplus.wood.watercraft_frame.flat.eucalyptus": "尤加利木平面船匠腳手架", "block.firmacivplus.wood.watercraft_frame.flat.hevea": "橡膠木平面船匠腳手架", "block.firmacivplus.wood.watercraft_frame.flat.ipe": "重蟻木平面船匠腳手架", "block.firmacivplus.wood.watercraft_frame.flat.ironwood": "鐵木平面船匠腳手架", @@ -36,7 +36,7 @@ "entity.firmacivplus.dugout_canoe.fig": "無花果木獨木舟", "entity.firmacivplus.dugout_canoe.tualang": "大甘巴豆木獨木舟", "entity.firmacivplus.rowboat.baobab": "猴麵包樹木划艇", - "entity.firmacivplus.rowboat.eucalyptus": "桉木划艇", + "entity.firmacivplus.rowboat.eucalyptus": "尤加利木划艇", "entity.firmacivplus.rowboat.hevea": "橡膠木划艇", "entity.firmacivplus.rowboat.ipe": "重蟻木划艇", "entity.firmacivplus.rowboat.ironwood": "鐵木划艇", @@ -44,7 +44,7 @@ "entity.firmacivplus.rowboat.teak": "柚木划艇", "entity.firmacivplus.rowboat.warped": "扭曲蕈木划艇", "entity.firmacivplus.sloop.baobab": "猴麵包樹木單桅縱帆船", - "entity.firmacivplus.sloop.eucalyptus": "桉木單桅縱帆船", + "entity.firmacivplus.sloop.eucalyptus": "尤加利木單桅縱帆船", "entity.firmacivplus.sloop.hevea": "橡膠木單桅縱帆船", "entity.firmacivplus.sloop.ipe": "重蟻木單桅縱帆船", "entity.firmacivplus.sloop.ironwood": "鐵木單桅縱帆船", @@ -52,7 +52,7 @@ "entity.firmacivplus.sloop.teak": "柚木單桅縱帆船", "entity.firmacivplus.sloop.warped": "扭曲蕈木單桅縱帆船", "entity.firmacivplus.sloop_construction.baobab": "猴麵包樹木單桅縱帆船", - "entity.firmacivplus.sloop_construction.eucalyptus": "桉木單桅縱帆船", + "entity.firmacivplus.sloop_construction.eucalyptus": "尤加利木單桅縱帆船", "entity.firmacivplus.sloop_construction.hevea": "橡膠木單桅縱帆船", "entity.firmacivplus.sloop_construction.ipe": "重蟻木單桅縱帆船", "entity.firmacivplus.sloop_construction.ironwood": "鐵木單桅縱帆船", diff --git a/kubejs/assets/ftbquests/lang/fr_fr.json b/kubejs/assets/ftbquests/lang/fr_fr.json index 071aac27ce..de20fa4fb3 100644 --- a/kubejs/assets/ftbquests/lang/fr_fr.json +++ b/kubejs/assets/ftbquests/lang/fr_fr.json @@ -1,9 +1,63 @@ { "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.", + "block.ftbquests.aux_task_screen": "Écran de tâche", + "block.ftbquests.barrier": "Barrière de quête", + "block.ftbquests.barrier.object": "ID de l'objet", + "block.ftbquests.chest": "Coffre de Quête", + "block.ftbquests.chest.input": "Emplacement d'Entrée", + "block.ftbquests.chest.input_desc": "Déposez un objet ici pour compléter la quête", + "block.ftbquests.chest.output": "Emplacement de sortie", + "block.ftbquests.chest.output_desc": "Les récompenses apparaîtront ici", + "block.ftbquests.chest.transfer_all": "Transférer automatiquement tous les objets", + "block.ftbquests.detector": "Détecteur de quête", + "block.ftbquests.detector.notifications": "Notifications", "block.ftbquests.detector.player": "Détecteur de joueurs", "block.ftbquests.detector.player.height": "Hauteur", + "block.ftbquests.detector.player.offset_y": "Décalage en Y", "block.ftbquests.detector.player.radius": "Rayon", + "block.ftbquests.detector.redstone": "Détecteur de redstone", + "block.ftbquests.detector.redstone.required_redstone": "Niveau de redstone requis", + "block.ftbquests.detector.task": "Tâche", + "block.ftbquests.loot_crate_opener": "Ouvre-boîte de caisse de butins", + "block.ftbquests.loot_crate_opener.rightclick": "Objets stockés : %d", + "block.ftbquests.loot_crate_storage": "Stockage de caisse de butins", + "block.ftbquests.progress_detector": "Détecteur de progression de quête", + "block.ftbquests.progress_detector.level": "Niveau de sortie", + "block.ftbquests.progress_detector.object": "ID de l'objet", + "block.ftbquests.progress_screen": "Écran de progression", + "block.ftbquests.screen.fullscreen": "Plein écran", + "block.ftbquests.screen.hide_icons": "Masquer l'icône", + "block.ftbquests.screen.indestructible": "Indestructible ", + "block.ftbquests.screen.input_mode_icon": "Icône du mode d'entrée", + "block.ftbquests.screen.input_only": "Entrée uniquement", + "block.ftbquests.screen.missing_data": "Bloc cassé / Données manquantes !", + "block.ftbquests.screen.no_permission": "Vous n'avez pas la permission de configurer ceci !", "block.ftbquests.screen.size": "Taille", + "block.ftbquests.screen.skin": "Apparence", + "block.ftbquests.screen.task_index": "Index des tâches", + "block.ftbquests.screen.text_shadow": "Dessiner les ombres du texte", + "block.ftbquests.screen_1": "Écran de tâches (1x1)", + "block.ftbquests.screen_3": "Écran de tâches (3x3)", + "block.ftbquests.screen_5": "Écran de tâche (5x5)", + "block.ftbquests.screen_7": "Écran de tâches (7x7)", + "block.ftbquests.stage_barrier": "Barrière d'étape", + "commands.ftbquests.change_consumable.text": "Changement du paramètre consommable de la tâche %d en %s", + "commands.ftbquests.change_progress.invalid_type": "Type de progression invalide : %s", + "commands.ftbquests.change_progress.text": "La progression a été modifiée !", + "commands.ftbquests.change_team_rewards.invalid_id": "ID de chapitre invalide !", + "commands.ftbquests.change_team_rewards.text": "Changement du paramètre de l'équipe de récompenses %d en %s", + "commands.ftbquests.command.delete_empty_reward_tables.text": "Tables de récompenses %s supprimées", + "commands.ftbquests.command.error.invalid_id": "ID de l'objet invalide : %s !", + "commands.ftbquests.command.error.invalid_type": "Type de changement de progression invalide : %s!", + "commands.ftbquests.command.error.no_file": "Aucun fichier de quête n'a été trouvé, que se passe-t-il ?!", + "commands.ftbquests.command.error.no_inventory": "Le bloc cible ne contient pas d'inventaire !", + "commands.ftbquests.command.error.no_object": "Aucun objet de quête trouvé pour l'ID %s!", + "commands.ftbquests.command.error.not_editing": "Vous devez être en mode édition (/ftbquests editing_mode) pour faire cela !", + "commands.ftbquests.command.feedback.clear_display_cache": "Le cache d'affichage des objets a été vidé pour tous les joueurs", + "commands.ftbquests.command.feedback.reloaded": "Données de quête rechargées à partir du fichier !", + "commands.ftbquests.command.feedback.reloaded.disclaimer": "Note : Le rechargement des quêtes est un outil de commodité pour les développeurs de quêtes et n'est pas recommandé pour une utilisation sur les serveurs en fonctionnement.", + "commands.ftbquests.command.feedback.rewards_blocked": "Le blocage des récompenses de quête pour l'équipe '%s' a été défini à : %s", + "commands.ftbquests.command.feedback.table_exported": "A exporté avec succès la table de récompenses '%s' avec des objets %s vers le bloc cible !", "ftbquests.chapter.image.height": "Hauteur", "ftbquests.chapter.image.rotation": "Rotation", "ftbquests.chapter.image.width": "Largeur", @@ -27,6 +81,7 @@ "ftbquests.reward_table.loot_crate.color": "Couleur", "ftbquests.reward_table.weight": "Poids", "ftbquests.tags": "Tags", + "ftbquests.task": "Tâche", "ftbquests.task.ftbquests.fluid.amount": "Quantité", "ftbquests.task.ftbquests.kill.entity": "Nom de l'entité", "ftbquests.task.ftbquests.stat.value": "Valeur" diff --git a/kubejs/assets/greate/lang/pl_pl.json b/kubejs/assets/greate/lang/pl_pl.json index d7d3e45839..ad4efee51d 100644 --- a/kubejs/assets/greate/lang/pl_pl.json +++ b/kubejs/assets/greate/lang/pl_pl.json @@ -244,7 +244,7 @@ "item.greate.stainless_steel_vertical_gearbox": "Przekładnia pionowa ze stali nierdzewnej", "item.greate.steel_vertical_gearbox": "Stalowa przekładnia pionowa", "item.greate.stone_belt_connector": "Skórzany pas mechaniczny", - "item.greate.styrene_butadiene_rubber_belt_connector": "Pas Mechaniczny Z Kauczuku Butadienowo-Styrenowego", + "item.greate.styrene_butadiene_rubber_belt_connector": "Pas mechaniczny z gumy butadienowo-styrenowej", "item.greate.titanium_vertical_gearbox": "Tytanowa przekładnia pionowa", "itemGroup.greate": "Greate", "material.greate.andesite_alloy": "Stop andezytu", diff --git a/kubejs/assets/gtceu/lang/pl_pl.json b/kubejs/assets/gtceu/lang/pl_pl.json index 4ebc2050ee..8f064aafce 100644 --- a/kubejs/assets/gtceu/lang/pl_pl.json +++ b/kubejs/assets/gtceu/lang/pl_pl.json @@ -131,7 +131,7 @@ "block.gtceu.bismuth_bronze_drum": "Baryłka z brązu bizmutowego", "block.gtceu.black_borderless_lamp": "Czarna lampa bez krawędzi", "block.gtceu.black_bronze_crate": "Skrzynia z czarnego brązu", - "block.gtceu.black_bronze_drum": "Beczka z czarnego brązu", + "block.gtceu.black_bronze_drum": "Baryłka z czarnego brązu", "block.gtceu.black_lamp": "Czarna lampa", "block.gtceu.black_large_metal_sheet": "Wielka czarna blacha", "block.gtceu.black_metal_sheet": "Czarna blacha", @@ -144,7 +144,7 @@ "block.gtceu.boss_hazard_sign_block": "Blok ostrzegawczy (boss)", "block.gtceu.bronze_brick_casing": "Ceglana obudowa z brązu", "block.gtceu.bronze_crate": "Skrzynia z brązu", - "block.gtceu.bronze_drum": "Beczułka z brązu", + "block.gtceu.bronze_drum": "Brązowa baryłka", "block.gtceu.bronze_firebox_casing": "Obudowa paleniska z brązu", "block.gtceu.bronze_gearbox": "Obudowa przekładni z brązu", "block.gtceu.bronze_large_boiler": "Duży kocioł parowy z brązu", @@ -727,7 +727,7 @@ "block.gtceu.lv_miner": "Podstawowa maszyna górnicza §r", "block.gtceu.lv_mixer": "Podstawowy mieszalnik §r", "block.gtceu.lv_muffler_hatch": "Rura wydechowa §7NN", - "block.gtceu.lv_ore_washer": "Dowolna oczyszczalnia rud §r", + "block.gtceu.lv_ore_washer": "Podstawowa oczyszczalnia rud §r", "block.gtceu.lv_output_bus": "§7Magistrala wyjściowa NN", "block.gtceu.lv_output_hatch": "§7Zawór wyjściowy NN", "block.gtceu.lv_packer": "Podstawowy pakowacz §r", @@ -976,7 +976,7 @@ "block.gtceu.the_end_marker": "End", "block.gtceu.the_nether_marker": "Głębiny", "block.gtceu.titanium_crate": "Skrzynia z tytanu", - "block.gtceu.titanium_drum": "Baryłka z tytanu", + "block.gtceu.titanium_drum": "Tytanowa baryłka", "block.gtceu.titanium_firebox_casing": "Tytanowa obudowa paleniska", "block.gtceu.titanium_gearbox": "Tytanowa obudowa przekładni", "block.gtceu.titanium_large_boiler": "Duży tytanowy kocioł parowy", @@ -1286,7 +1286,7 @@ "config.gtceu.option.doBedrockOres": "doBedrockOres", "config.gtceu.option.doesExplosionDamagesTerrain": "doesExplosionDamagesTerrain", "config.gtceu.option.doSuperflatOres": "doSuperflatOres", - "config.gtceu.option.drum": "beczka", + "config.gtceu.option.drum": "drum", "config.gtceu.option.dumpAssets": "dumpAssets", "config.gtceu.option.dumpRecipes": "dumpRecipes", "config.gtceu.option.enableArcRecycling": "enableArcRecycling", @@ -3519,7 +3519,7 @@ "item.gtceu.rotor_casting_mold.tooltip": "§7Forma do odlewania wirników", "item.gtceu.rotor_extruder_mold": "Forma wytłaczarki (wirnik)", "item.gtceu.rotor_extruder_mold.tooltip": "§7Forma wytłaczarki do tworzenia wirników", - "item.gtceu.rubber_gloves": "Gumowe rękawiczki", + "item.gtceu.rubber_gloves": "Gumowe rękawice", "item.gtceu.salt_dust": "Sól", "item.gtceu.salt_gem": "Kryształ soli", "item.gtceu.saw_extruder_mold.tooltip": "§7Forma wytłaczarki do tworzenia pił", @@ -4392,7 +4392,7 @@ "material.gtceu.raw_gasoline": "Surowa benzyna", "material.gtceu.raw_growth_medium": "Surowe podłoże hodowlane", "material.gtceu.raw_rubber": "Surowa guma", - "material.gtceu.raw_styrene_butadiene_rubber": "Surowy kauczuk butadienowo-styrenowy", + "material.gtceu.raw_styrene_butadiene_rubber": "Surowa guma butadienowo-styrenowa", "material.gtceu.realgar": "Realgar", "material.gtceu.red_alloy": "Czerwony stop", "material.gtceu.red_dye": "Czerwony barwnik", @@ -4483,7 +4483,7 @@ "material.gtceu.stone": "Kamień", "material.gtceu.strontium": "Stront", "material.gtceu.styrene": "Styren", - "material.gtceu.styrene_butadiene_rubber": "Kauczuk butadienowo-styrenowy", + "material.gtceu.styrene_butadiene_rubber": "Guma butadienowo-styrenowa", "material.gtceu.sugar": "Cukier", "material.gtceu.sulfur": "Siarka", "material.gtceu.sulfur_dioxide": "Dwutlenek siarki", diff --git a/kubejs/assets/gtceu/lang/uk_ua.json b/kubejs/assets/gtceu/lang/uk_ua.json index 98f609c262..9af83586e3 100644 --- a/kubejs/assets/gtceu/lang/uk_ua.json +++ b/kubejs/assets/gtceu/lang/uk_ua.json @@ -143,7 +143,7 @@ "block.gtceu.blue_studs": "Сині кубики", "block.gtceu.boss_hazard_sign_block": "Блок зі знаком босової небезпеки", "block.gtceu.brittle_charcoal": "Крихке деревне вугілля", - "block.gtceu.bronze_brick_casing": "Мурований бронзовий корпус", + "block.gtceu.bronze_brick_casing": "Мурований бронзою корпус", "block.gtceu.bronze_crate": "Бронзовий ящик", "block.gtceu.bronze_drum": "Бронзова бочка", "block.gtceu.bronze_firebox_casing": "Бронзова топка", @@ -1126,7 +1126,7 @@ "block.gtceu.stainless_steel_turbine_casing": "Нержавійний турбінний корпус", "block.gtceu.steam_casing_bricked_bronze": "Мурований бронзовий корпус", "block.gtceu.steam_casing_bricked_bronze.tooltip": "§7Для твоїх перших парових машин", - "block.gtceu.steam_casing_bricked_steel": "Мурований кованозалізний корпус", + "block.gtceu.steam_casing_bricked_steel": "Мурований кованим залізом корпус", "block.gtceu.steam_casing_bricked_steel.tooltip": "§7Для покращених парових машин", "block.gtceu.steam_casing_bronze": "Бронзовий корпус", "block.gtceu.steam_casing_bronze.tooltip": "§7Для твоїх перших парових машин", @@ -1141,7 +1141,7 @@ "block.gtceu.steam_output_bus": "Парова вихідна шина", "block.gtceu.steam_oven": "Парова піч", "block.gtceu.steam_solid_boiler.bronze": "Малий паровий твердопаливний котел", - "block.gtceu.steel_brick_casing": "Мурований кованозалізний корпус", + "block.gtceu.steel_brick_casing": "Мурований кованим залізом корпус", "block.gtceu.steel_crate": "Сталевий ящик", "block.gtceu.steel_drum": "Сталева бочка", "block.gtceu.steel_firebox_casing": "Сталева топка", diff --git a/kubejs/assets/gtceu/lang/zh_cn.json b/kubejs/assets/gtceu/lang/zh_cn.json index a342bc922d..ffe5a53667 100644 --- a/kubejs/assets/gtceu/lang/zh_cn.json +++ b/kubejs/assets/gtceu/lang/zh_cn.json @@ -3589,6 +3589,7 @@ "gtceu.oc.tooltip.2": "右键单击降低超频等级", "gtceu.oc.tooltip.3": "中键单击重设超频等级", "gtceu.oc.tooltip.4": "按住Shift以无损超频显示", + "gtceu.ore_processing_gas": "地质硫化机", "gtceu.ore_washer": "洗矿厂", "gtceu.ostrum_harvester": "紫金采集器", "gtceu.ostrum_linear_accelerator": "紫金线性加速器", @@ -5430,6 +5431,7 @@ "material.gtceu.ethylbenzene": "乙苯", "material.gtceu.ethylene": "乙烯", "material.gtceu.europium": "铕", + "material.gtceu.ferhodsite": "铁铑矿", "material.gtceu.fermented_biomass": "发酵生物质", "material.gtceu.fermium": "镄", "material.gtceu.ferrite_mixture": "铁氧体混合物", @@ -5525,6 +5527,7 @@ "material.gtceu.inert_metal_mixture": "惰性金属混合物", "material.gtceu.invar": "殷钢", "material.gtceu.iodine": "碘", + "material.gtceu.irarsite": "铱砷矿", "material.gtceu.iridium": "铱", "material.gtceu.iridium_chloride": "氯化铱", "material.gtceu.iridium_metal_residue": "铱金属渣", @@ -5675,6 +5678,7 @@ "material.gtceu.pentlandite": "镍黄铁矿", "material.gtceu.perlite": "珍珠岩", "material.gtceu.phenol": "苯酚", + "material.gtceu.phlogopite": "金云母", "material.gtceu.phosphate": "磷酸盐", "material.gtceu.phosphoric_acid": "磷酸", "material.gtceu.phosphorus": "磷", @@ -5762,6 +5766,7 @@ "material.gtceu.roentgenium": "𬬭", "material.gtceu.rose_gold": "玫瑰金", "material.gtceu.rtm_alloy": "钌钨钼合金", + "material.gtceu.ruarsite": "钌砷矿", "material.gtceu.rubber": "橡胶", "material.gtceu.rubidium": "铷", "material.gtceu.ruby": "红宝石", diff --git a/kubejs/assets/gtmutils/lang/zh_tw.json b/kubejs/assets/gtmutils/lang/zh_tw.json index 104afa9ff2..7657033aac 100644 --- a/kubejs/assets/gtmutils/lang/zh_tw.json +++ b/kubejs/assets/gtmutils/lang/zh_tw.json @@ -119,7 +119,7 @@ "item.gtceu.tool.zpm_screwdriver": "%s 電動螺絲起子(§cZPM§r)", "item.gtceu.tool.zpm_wirecutter": "%s 剪線鉗(§cZPM§r)", "item.gtceu.tool.zpm_wrench": "%s 扳手(§cZPM§r)", - "item.gtmutils.ancient_gold_coin": "遠古金幣", + "item.gtmutils.ancient_gold_coin": "古金幣", "item.gtmutils.chocolate_coin": "巧克力金幣", "item.gtmutils.copper_credit": "銅幣", "item.gtmutils.cupronickel_credit": "白銅幣", diff --git a/kubejs/assets/immersive_aircraft/lang/tr_tr.json b/kubejs/assets/immersive_aircraft/lang/tr_tr.json index 73bed84ade..3f337d0ee2 100644 --- a/kubejs/assets/immersive_aircraft/lang/tr_tr.json +++ b/kubejs/assets/immersive_aircraft/lang/tr_tr.json @@ -27,10 +27,12 @@ "immersive_aircraft.tooltip.no_target": "Zeminde birleştirilmesi gerekiyor!", "immersive_aircraft.tried_dismount": "Atlamak için tekrar basın!", "immersive_aircraft.upgrade.acceleration": "%s%% kalkış hızı", + "immersive_aircraft.upgrade.dials": "Mekanik menü", "immersive_aircraft.upgrade.durability": "%s%% dayanıklılık", "immersive_aircraft.upgrade.enginespeed": "%s%% motor gücü", "immersive_aircraft.upgrade.friction": "%s%% hava sürtünmesi", "immersive_aircraft.upgrade.fuel": "%s%% yakıt ihtiyacı", + "immersive_aircraft.upgrade.hud": "Elektronik menü", "immersive_aircraft.upgrade.stabilizer": "%s% stabilize", "immersive_aircraft.upgrade.wind": "%s%% rüzgar etkisi", "item.immersive_aircraft.airship": "Hava Gemisi", @@ -50,6 +52,8 @@ "item.immersive_aircraft.gyrodyne": "Gyrodyne", "item.immersive_aircraft.gyrodyne.description": "Uçağa saf kas gücüyle güç verilebiliyorsa motora ne gerek var? İyi bir itme verin ve uçsun!", "item.immersive_aircraft.gyroscope": "Jiroskop", + "item.immersive_aircraft.gyroscope_dials": "Gelişmiş Jiroskop", + "item.immersive_aircraft.gyroscope_hud": "Elektronik Jiroskop", "item.immersive_aircraft.heavy_crossbow": "Ağır Arbalet", "item.immersive_aircraft.heavy_crossbow.description": "Güçlü bir darbeye sahip ağır bir arbalet, ok gerektirir.", "item.immersive_aircraft.hull": "Gövde", diff --git a/kubejs/assets/minecraft/lang/ru_ru.json b/kubejs/assets/minecraft/lang/ru_ru.json index 99a2f4ee99..27d7f7d652 100644 --- a/kubejs/assets/minecraft/lang/ru_ru.json +++ b/kubejs/assets/minecraft/lang/ru_ru.json @@ -102,6 +102,7 @@ "dimension.minecraft.the_nether": "Бездна", "effect.minecraft.dolphins_grace": "Скорость плавания", "entity.minecraft.furnace_minecart": "Вагонетка с бойлером", + "entity.minecraft.hoglin": "Зоглин", "item.minecraft.furnace_minecart": "Вагонетка с бойлером", "item.minecraft.glow_ink_sac": "Светящийся краситель", "item.minecraft.iron_block": "Серый чугун (Блок)", diff --git a/kubejs/assets/rnr/lang/zh_tw.json b/kubejs/assets/rnr/lang/zh_tw.json index db86e646db..3114e7ebec 100644 --- a/kubejs/assets/rnr/lang/zh_tw.json +++ b/kubejs/assets/rnr/lang/zh_tw.json @@ -1,4 +1,605 @@ { - "block.rnr.concrete_road": "混凝土道路", - "block.rnr.thatch_roof": "茅草屋頂" + "block.rnr.base_course": "路基", + "block.rnr.black_sandstone_flagstones": "黑砂岩磚路", + "block.rnr.black_sandstone_flagstones_slab": "黑砂岩磚路半磚", + "block.rnr.black_sandstone_flagstones_stairs": "黑砂岩磚路階梯", + "block.rnr.brick_road": "磚砌路", + "block.rnr.brick_road_slab": "磚砌路半磚", + "block.rnr.brick_road_stairs": "磚砌路階梯", + "block.rnr.brown_sandstone_flagstones": "棕砂岩磚路", + "block.rnr.brown_sandstone_flagstones_slab": "棕砂岩磚路半磚", + "block.rnr.brown_sandstone_flagstones_stairs": "棕砂岩磚路階梯", + "block.rnr.ceramic_roof": "陶瓦屋頂", + "block.rnr.ceramic_roof_slab": "陶瓦屋頂半磚", + "block.rnr.ceramic_roof_stairs": "陶瓦屋頂階梯", + "block.rnr.concrete_road": "混凝土路", + "block.rnr.concrete_road_control_joint": "混凝土路控制縫", + "block.rnr.concrete_road_flagstones": "混凝土路", + "block.rnr.concrete_road_flagstones_slab": "混凝土路半磚", + "block.rnr.concrete_road_flagstones_stairs": "混凝土路階梯", + "block.rnr.concrete_road_panel": "混凝土路", + "block.rnr.concrete_road_panel_slab": "混凝土路半磚", + "block.rnr.concrete_road_panel_stairs": "混凝土路階梯", + "block.rnr.concrete_road_sett": "混凝土路", + "block.rnr.concrete_road_sett_slab": "混凝土路半磚", + "block.rnr.concrete_road_sett_stairs": "混凝土路階梯", + "block.rnr.concrete_road_slab": "混凝土路半磚", + "block.rnr.concrete_road_stairs": "混凝土路階梯", + "block.rnr.cracked_concrete_road": "裂紋混凝土路", + "block.rnr.cracked_concrete_road_slab": "裂紋混凝土路半磚", + "block.rnr.cracked_concrete_road_stairs": "裂紋混凝土路階梯", + "block.rnr.cracked_trodden_concrete_road": "裂紋混凝土路", + "block.rnr.cracked_trodden_concrete_road_slab": "裂紋混凝土路半磚", + "block.rnr.cracked_trodden_concrete_road_stairs": "裂紋混凝土路階梯", + "block.rnr.green_sandstone_flagstones": "綠砂岩磚路", + "block.rnr.green_sandstone_flagstones_slab": "綠砂岩磚路半磚", + "block.rnr.green_sandstone_flagstones_stairs": "綠砂岩磚路階梯", + "block.rnr.hoggin": "碎石路", + "block.rnr.hoggin_slab": "碎石路半磚", + "block.rnr.hoggin_stairs": "碎石路階梯", + "block.rnr.pink_sandstone_flagstones": "粉砂岩磚路", + "block.rnr.pink_sandstone_flagstones_slab": "粉砂岩磚路半磚", + "block.rnr.pink_sandstone_flagstones_stairs": "紅砂岩磚路階梯", + "block.rnr.pouring_concrete_road": "澆築混凝土路", + "block.rnr.red_sandstone_flagstones": "紅砂岩磚路", + "block.rnr.red_sandstone_flagstones_slab": "紅砂岩磚路半磚", + "block.rnr.red_sandstone_flagstones_stairs": "紅砂岩磚路階梯", + "block.rnr.rock.cobbled_road.andesite": "安山岩卵石路", + "block.rnr.rock.cobbled_road.andesite_slab": "安山岩卵石路半磚", + "block.rnr.rock.cobbled_road.andesite_stairs": "安山岩卵石路階梯", + "block.rnr.rock.cobbled_road.basalt": "玄武岩卵石路", + "block.rnr.rock.cobbled_road.basalt_slab": "玄武岩卵石路半磚", + "block.rnr.rock.cobbled_road.basalt_stairs": "玄武岩卵石路階梯", + "block.rnr.rock.cobbled_road.chalk": "白惡岩卵石路", + "block.rnr.rock.cobbled_road.chalk_slab": "白惡岩卵石路半磚", + "block.rnr.rock.cobbled_road.chalk_stairs": "白惡岩卵石路階梯", + "block.rnr.rock.cobbled_road.chert": "燧岩卵石路", + "block.rnr.rock.cobbled_road.chert_slab": "燧岩卵石路半磚", + "block.rnr.rock.cobbled_road.chert_stairs": "燧岩卵石路階梯", + "block.rnr.rock.cobbled_road.claystone": "黏土岩卵石路", + "block.rnr.rock.cobbled_road.claystone_slab": "黏土岩卵石路半磚", + "block.rnr.rock.cobbled_road.claystone_stairs": "黏土岩卵石路階梯", + "block.rnr.rock.cobbled_road.conglomerate": "礫岩卵石路", + "block.rnr.rock.cobbled_road.conglomerate_slab": "礫岩卵石路半磚", + "block.rnr.rock.cobbled_road.conglomerate_stairs": "礫岩卵石路階梯", + "block.rnr.rock.cobbled_road.dacite": "英安岩卵石路", + "block.rnr.rock.cobbled_road.dacite_slab": "英安岩卵石路半磚", + "block.rnr.rock.cobbled_road.dacite_stairs": "英安岩卵石路階梯", + "block.rnr.rock.cobbled_road.diorite": "閃長岩卵石路", + "block.rnr.rock.cobbled_road.diorite_slab": "閃長岩卵石路半磚", + "block.rnr.rock.cobbled_road.diorite_stairs": "閃長岩卵石路階梯", + "block.rnr.rock.cobbled_road.dolomite": "白雲岩卵石路", + "block.rnr.rock.cobbled_road.dolomite_slab": "白雲岩卵石路半磚", + "block.rnr.rock.cobbled_road.dolomite_stairs": "白雲岩卵石路階梯", + "block.rnr.rock.cobbled_road.gabbro": "輝長岩卵石路", + "block.rnr.rock.cobbled_road.gabbro_slab": "輝長岩卵石路半磚", + "block.rnr.rock.cobbled_road.gabbro_stairs": "輝長岩卵石路階梯", + "block.rnr.rock.cobbled_road.gneiss": "片麻岩卵石路", + "block.rnr.rock.cobbled_road.gneiss_slab": "片麻岩卵石路半磚", + "block.rnr.rock.cobbled_road.gneiss_stairs": "片麻岩卵石路階梯", + "block.rnr.rock.cobbled_road.granite": "花崗岩卵石路", + "block.rnr.rock.cobbled_road.granite_slab": "花崗岩卵石路半磚", + "block.rnr.rock.cobbled_road.granite_stairs": "花崗岩卵石路階梯", + "block.rnr.rock.cobbled_road.limestone": "石灰岩卵石路", + "block.rnr.rock.cobbled_road.limestone_slab": "石灰岩卵石路半磚", + "block.rnr.rock.cobbled_road.limestone_stairs": "石灰岩卵石路階梯", + "block.rnr.rock.cobbled_road.marble": "大理岩卵石路", + "block.rnr.rock.cobbled_road.marble_slab": "大理岩卵石路半磚", + "block.rnr.rock.cobbled_road.marble_stairs": "大理岩卵石路階梯", + "block.rnr.rock.cobbled_road.phyllite": "千枚岩卵石路", + "block.rnr.rock.cobbled_road.phyllite_slab": "千枚岩卵石路半磚", + "block.rnr.rock.cobbled_road.phyllite_stairs": "千枚岩卵石路階梯", + "block.rnr.rock.cobbled_road.quartzite": "石英岩卵石路", + "block.rnr.rock.cobbled_road.quartzite_slab": "石英岩卵石路半磚", + "block.rnr.rock.cobbled_road.quartzite_stairs": "石英岩卵石路階梯", + "block.rnr.rock.cobbled_road.rhyolite": "流紋岩卵石路", + "block.rnr.rock.cobbled_road.rhyolite_slab": "流紋岩卵石路半磚", + "block.rnr.rock.cobbled_road.rhyolite_stairs": "流紋岩卵石路階梯", + "block.rnr.rock.cobbled_road.schist": "片岩卵石路", + "block.rnr.rock.cobbled_road.schist_slab": "片岩卵石路半磚", + "block.rnr.rock.cobbled_road.schist_stairs": "片岩卵石路階梯", + "block.rnr.rock.cobbled_road.shale": "頁岩卵石路", + "block.rnr.rock.cobbled_road.shale_slab": "頁岩卵石路半磚", + "block.rnr.rock.cobbled_road.shale_stairs": "頁岩卵石路階梯", + "block.rnr.rock.cobbled_road.slate": "板岩卵石路", + "block.rnr.rock.cobbled_road.slate_slab": "板岩卵石路半磚", + "block.rnr.rock.cobbled_road.slate_stairs": "板岩卵石路階梯", + "block.rnr.rock.flagstones.andesite": "安山岩磚路", + "block.rnr.rock.flagstones.andesite_slab": "安山岩磚路半磚", + "block.rnr.rock.flagstones.andesite_stairs": "安山岩磚路階梯", + "block.rnr.rock.flagstones.basalt": "玄武岩磚路", + "block.rnr.rock.flagstones.basalt_slab": "玄武岩磚路半磚", + "block.rnr.rock.flagstones.basalt_stairs": "玄武岩磚路階梯", + "block.rnr.rock.flagstones.chalk": "白惡岩磚路", + "block.rnr.rock.flagstones.chalk_slab": "白惡岩磚路半磚", + "block.rnr.rock.flagstones.chalk_stairs": "白惡岩磚路階梯", + "block.rnr.rock.flagstones.chert": "燧岩磚路", + "block.rnr.rock.flagstones.chert_slab": "燧岩磚路半磚", + "block.rnr.rock.flagstones.chert_stairs": "燧岩磚路階梯", + "block.rnr.rock.flagstones.claystone": "黏土岩磚路", + "block.rnr.rock.flagstones.claystone_slab": "黏土岩磚路半磚", + "block.rnr.rock.flagstones.claystone_stairs": "黏土岩磚路階梯", + "block.rnr.rock.flagstones.conglomerate": "礫岩磚路", + "block.rnr.rock.flagstones.conglomerate_slab": "礫岩磚路半磚", + "block.rnr.rock.flagstones.conglomerate_stairs": "礫岩磚路階梯", + "block.rnr.rock.flagstones.dacite": "英安岩磚路", + "block.rnr.rock.flagstones.dacite_slab": "英安岩磚路半磚", + "block.rnr.rock.flagstones.dacite_stairs": "英安岩磚路階梯", + "block.rnr.rock.flagstones.diorite": "閃長岩磚路", + "block.rnr.rock.flagstones.diorite_slab": "閃長岩磚路半磚", + "block.rnr.rock.flagstones.diorite_stairs": "閃長岩磚路階梯", + "block.rnr.rock.flagstones.dolomite": "白雲岩磚路", + "block.rnr.rock.flagstones.dolomite_slab": "白雲岩磚路半磚", + "block.rnr.rock.flagstones.dolomite_stairs": "白雲岩磚路階梯", + "block.rnr.rock.flagstones.gabbro": "輝長岩磚路", + "block.rnr.rock.flagstones.gabbro_slab": "輝長岩磚路半磚", + "block.rnr.rock.flagstones.gabbro_stairs": "輝長岩磚路階梯", + "block.rnr.rock.flagstones.gneiss": "片麻岩磚路", + "block.rnr.rock.flagstones.gneiss_slab": "片麻岩磚路半磚", + "block.rnr.rock.flagstones.gneiss_stairs": "片麻岩磚路階梯", + "block.rnr.rock.flagstones.granite": "花崗岩磚路", + "block.rnr.rock.flagstones.granite_slab": "花崗岩磚路半磚", + "block.rnr.rock.flagstones.granite_stairs": "花崗岩磚路階梯", + "block.rnr.rock.flagstones.limestone": "石灰岩磚路", + "block.rnr.rock.flagstones.limestone_slab": "石灰岩磚路半磚", + "block.rnr.rock.flagstones.limestone_stairs": "石灰岩磚路階梯", + "block.rnr.rock.flagstones.marble": "大理岩磚路", + "block.rnr.rock.flagstones.marble_slab": "大理岩磚路半磚", + "block.rnr.rock.flagstones.marble_stairs": "大理岩磚路階梯", + "block.rnr.rock.flagstones.phyllite": "千枚岩磚路", + "block.rnr.rock.flagstones.phyllite_slab": "千枚岩磚路半磚", + "block.rnr.rock.flagstones.phyllite_stairs": "千枚岩磚路階梯", + "block.rnr.rock.flagstones.quartzite": "石英岩磚路", + "block.rnr.rock.flagstones.quartzite_slab": "石英岩磚路半磚", + "block.rnr.rock.flagstones.quartzite_stairs": "石英岩磚路階梯", + "block.rnr.rock.flagstones.rhyolite": "流紋岩磚路", + "block.rnr.rock.flagstones.rhyolite_slab": "流紋岩磚路半磚", + "block.rnr.rock.flagstones.rhyolite_stairs": "流紋岩磚路階梯", + "block.rnr.rock.flagstones.schist": "片岩磚路", + "block.rnr.rock.flagstones.schist_slab": "片岩磚路半磚", + "block.rnr.rock.flagstones.schist_stairs": "片岩磚路階梯", + "block.rnr.rock.flagstones.shale": "頁岩磚路", + "block.rnr.rock.flagstones.shale_slab": "頁岩磚路半磚", + "block.rnr.rock.flagstones.shale_stairs": "頁岩磚路階梯", + "block.rnr.rock.flagstones.slate": "板岩磚路", + "block.rnr.rock.flagstones.slate_slab": "板岩磚路半磚", + "block.rnr.rock.flagstones.slate_stairs": "板岩磚路階梯", + "block.rnr.rock.gravel_road.andesite": "安山岩礫石路", + "block.rnr.rock.gravel_road.andesite_slab": "安山岩礫石路半磚", + "block.rnr.rock.gravel_road.andesite_stairs": "安山岩礫石路階梯", + "block.rnr.rock.gravel_road.basalt": "玄武岩礫石路", + "block.rnr.rock.gravel_road.basalt_slab": "玄武岩礫石路半磚", + "block.rnr.rock.gravel_road.basalt_stairs": "玄武岩礫石路階梯", + "block.rnr.rock.gravel_road.chalk": "白惡岩礫石路", + "block.rnr.rock.gravel_road.chalk_slab": "白惡岩礫石路半磚", + "block.rnr.rock.gravel_road.chalk_stairs": "白惡岩礫石路階梯", + "block.rnr.rock.gravel_road.chert": "燧岩礫石路", + "block.rnr.rock.gravel_road.chert_slab": "燧岩礫石路半磚", + "block.rnr.rock.gravel_road.chert_stairs": "燧岩礫石路階梯", + "block.rnr.rock.gravel_road.claystone": "黏土岩礫石路", + "block.rnr.rock.gravel_road.claystone_slab": "黏土岩礫石路半磚", + "block.rnr.rock.gravel_road.claystone_stairs": "黏土岩礫石路階梯", + "block.rnr.rock.gravel_road.conglomerate": "礫岩礫石路", + "block.rnr.rock.gravel_road.conglomerate_slab": "礫岩礫石路半磚", + "block.rnr.rock.gravel_road.conglomerate_stairs": "礫岩礫石路階梯", + "block.rnr.rock.gravel_road.dacite": "英安岩礫石路", + "block.rnr.rock.gravel_road.dacite_slab": "英安岩礫石路半磚", + "block.rnr.rock.gravel_road.dacite_stairs": "英安岩礫石路階梯", + "block.rnr.rock.gravel_road.diorite": "閃長岩礫石路", + "block.rnr.rock.gravel_road.diorite_slab": "閃長岩礫石路半磚", + "block.rnr.rock.gravel_road.diorite_stairs": "閃長岩礫石路階梯", + "block.rnr.rock.gravel_road.dolomite": "白雲岩礫石路", + "block.rnr.rock.gravel_road.dolomite_slab": "白雲岩礫石路半磚", + "block.rnr.rock.gravel_road.dolomite_stairs": "白雲岩礫石路階梯", + "block.rnr.rock.gravel_road.gabbro": "輝長岩礫石路", + "block.rnr.rock.gravel_road.gabbro_slab": "輝長岩礫石路半磚", + "block.rnr.rock.gravel_road.gabbro_stairs": "輝長岩礫石路階梯", + "block.rnr.rock.gravel_road.gneiss": "片麻岩礫石路", + "block.rnr.rock.gravel_road.gneiss_slab": "片麻岩礫石路半磚", + "block.rnr.rock.gravel_road.gneiss_stairs": "片麻岩礫石路階梯", + "block.rnr.rock.gravel_road.granite": "花崗岩礫石路", + "block.rnr.rock.gravel_road.granite_slab": "花崗岩礫石路半磚", + "block.rnr.rock.gravel_road.granite_stairs": "花崗岩礫石路階梯", + "block.rnr.rock.gravel_road.limestone": "石灰岩礫石路", + "block.rnr.rock.gravel_road.limestone_slab": "石灰岩礫石路半磚", + "block.rnr.rock.gravel_road.limestone_stairs": "石灰岩礫石路階梯", + "block.rnr.rock.gravel_road.marble": "大理岩礫石路", + "block.rnr.rock.gravel_road.marble_slab": "大理岩礫石路半磚", + "block.rnr.rock.gravel_road.marble_stairs": "大理岩礫石路階梯", + "block.rnr.rock.gravel_road.phyllite": "千枚岩礫石路", + "block.rnr.rock.gravel_road.phyllite_slab": "千枚岩礫石路半磚", + "block.rnr.rock.gravel_road.phyllite_stairs": "千枚岩礫石路階梯", + "block.rnr.rock.gravel_road.quartzite": "石英岩礫石路", + "block.rnr.rock.gravel_road.quartzite_slab": "石英岩礫石路半磚", + "block.rnr.rock.gravel_road.quartzite_stairs": "石英岩礫石路階梯", + "block.rnr.rock.gravel_road.rhyolite": "流紋岩礫石路", + "block.rnr.rock.gravel_road.rhyolite_slab": "流紋岩礫石路半磚", + "block.rnr.rock.gravel_road.rhyolite_stairs": "流紋岩礫石路階梯", + "block.rnr.rock.gravel_road.schist": "片岩礫石路", + "block.rnr.rock.gravel_road.schist_slab": "片岩礫石路半磚", + "block.rnr.rock.gravel_road.schist_stairs": "片岩礫石路階梯", + "block.rnr.rock.gravel_road.shale": "頁岩礫石路", + "block.rnr.rock.gravel_road.shale_slab": "頁岩礫石路半磚", + "block.rnr.rock.gravel_road.shale_stairs": "頁岩礫石路階梯", + "block.rnr.rock.gravel_road.slate": "板岩礫石路", + "block.rnr.rock.gravel_road.slate_slab": "板岩礫石路半磚", + "block.rnr.rock.gravel_road.slate_stairs": "板岩礫石路階梯", + "block.rnr.rock.macadam_road.andesite": "安山岩碎石路", + "block.rnr.rock.macadam_road.andesite_slab": "安山岩碎石路半磚", + "block.rnr.rock.macadam_road.andesite_stairs": "安山岩碎石路階梯", + "block.rnr.rock.macadam_road.basalt": "玄武岩碎石路", + "block.rnr.rock.macadam_road.basalt_slab": "玄武岩碎石路半磚", + "block.rnr.rock.macadam_road.basalt_stairs": "玄武岩碎石路階梯", + "block.rnr.rock.macadam_road.chalk": "白惡岩碎石路", + "block.rnr.rock.macadam_road.chalk_slab": "白惡岩碎石路半磚", + "block.rnr.rock.macadam_road.chalk_stairs": "白惡岩碎石路階梯", + "block.rnr.rock.macadam_road.chert": "燧岩碎石路", + "block.rnr.rock.macadam_road.chert_slab": "燧岩碎石路半磚", + "block.rnr.rock.macadam_road.chert_stairs": "燧岩碎石路階梯", + "block.rnr.rock.macadam_road.claystone": "黏土岩碎石路", + "block.rnr.rock.macadam_road.claystone_slab": "黏土岩碎石路半磚", + "block.rnr.rock.macadam_road.claystone_stairs": "黏土岩碎石路階梯", + "block.rnr.rock.macadam_road.conglomerate": "礫岩碎石路", + "block.rnr.rock.macadam_road.conglomerate_slab": "礫岩碎石路半磚", + "block.rnr.rock.macadam_road.conglomerate_stairs": "礫岩碎石路階梯", + "block.rnr.rock.macadam_road.dacite": "英安岩碎石路", + "block.rnr.rock.macadam_road.dacite_slab": "英安岩碎石路半磚", + "block.rnr.rock.macadam_road.dacite_stairs": "英安岩碎石路階梯", + "block.rnr.rock.macadam_road.diorite": "閃長岩碎石路", + "block.rnr.rock.macadam_road.diorite_slab": "閃長岩碎石路半磚", + "block.rnr.rock.macadam_road.diorite_stairs": "閃長岩碎石路階梯", + "block.rnr.rock.macadam_road.dolomite": "白雲岩碎石路", + "block.rnr.rock.macadam_road.dolomite_slab": "白雲岩碎石路半磚", + "block.rnr.rock.macadam_road.dolomite_stairs": "白雲岩碎石路階梯", + "block.rnr.rock.macadam_road.gabbro": "輝長岩碎石路", + "block.rnr.rock.macadam_road.gabbro_slab": "輝長岩碎石路半磚", + "block.rnr.rock.macadam_road.gabbro_stairs": "輝長岩碎石路階梯", + "block.rnr.rock.macadam_road.gneiss": "片麻岩碎石路", + "block.rnr.rock.macadam_road.gneiss_slab": "片麻岩碎石路半磚", + "block.rnr.rock.macadam_road.gneiss_stairs": "片麻岩碎石路階梯", + "block.rnr.rock.macadam_road.granite": "花崗岩碎石路", + "block.rnr.rock.macadam_road.granite_slab": "花崗岩碎石路半磚", + "block.rnr.rock.macadam_road.granite_stairs": "花崗岩碎石路階梯", + "block.rnr.rock.macadam_road.limestone": "石灰岩碎石路", + "block.rnr.rock.macadam_road.limestone_slab": "石灰岩碎石路半磚", + "block.rnr.rock.macadam_road.limestone_stairs": "石灰岩碎石路階梯", + "block.rnr.rock.macadam_road.marble": "大理岩碎石路", + "block.rnr.rock.macadam_road.marble_slab": "大理岩碎石路半磚", + "block.rnr.rock.macadam_road.marble_stairs": "大理岩碎石路階梯", + "block.rnr.rock.macadam_road.phyllite": "千枚岩碎石路", + "block.rnr.rock.macadam_road.phyllite_slab": "千枚岩碎石路半磚", + "block.rnr.rock.macadam_road.phyllite_stairs": "千枚岩碎石路階梯", + "block.rnr.rock.macadam_road.quartzite": "石英岩碎石路", + "block.rnr.rock.macadam_road.quartzite_slab": "石英岩碎石路半磚", + "block.rnr.rock.macadam_road.quartzite_stairs": "石英岩碎石路階梯", + "block.rnr.rock.macadam_road.rhyolite": "流紋岩碎石路", + "block.rnr.rock.macadam_road.rhyolite_slab": "流紋岩碎石路半磚", + "block.rnr.rock.macadam_road.rhyolite_stairs": "流紋岩碎石路階梯", + "block.rnr.rock.macadam_road.schist": "片岩碎石路", + "block.rnr.rock.macadam_road.schist_slab": "片岩碎石路半磚", + "block.rnr.rock.macadam_road.schist_stairs": "片岩碎石路階梯", + "block.rnr.rock.macadam_road.shale": "頁岩碎石路", + "block.rnr.rock.macadam_road.shale_slab": "頁岩碎石路半磚", + "block.rnr.rock.macadam_road.shale_stairs": "頁岩碎石路階梯", + "block.rnr.rock.macadam_road.slate": "板岩碎石路", + "block.rnr.rock.macadam_road.slate_slab": "板岩碎石路半磚", + "block.rnr.rock.macadam_road.slate_stairs": "板岩碎石路階梯", + "block.rnr.rock.over_height_gravel.andesite": "安山岩凸起礫石", + "block.rnr.rock.over_height_gravel.basalt": "玄武岩凸起礫石", + "block.rnr.rock.over_height_gravel.chalk": "白惡岩凸起礫石", + "block.rnr.rock.over_height_gravel.chert": "燧岩凸起礫石", + "block.rnr.rock.over_height_gravel.claystone": "黏土岩凸起礫石", + "block.rnr.rock.over_height_gravel.conglomerate": "礫岩凸起礫石", + "block.rnr.rock.over_height_gravel.dacite": "英安岩凸起礫石", + "block.rnr.rock.over_height_gravel.diorite": "閃長岩凸起礫石", + "block.rnr.rock.over_height_gravel.dolomite": "白雲岩凸起礫石", + "block.rnr.rock.over_height_gravel.gabbro": "輝長岩凸起礫石", + "block.rnr.rock.over_height_gravel.gneiss": "片麻岩凸起礫石", + "block.rnr.rock.over_height_gravel.granite": "花崗岩凸起礫石", + "block.rnr.rock.over_height_gravel.limestone": "石灰岩凸起礫石", + "block.rnr.rock.over_height_gravel.marble": "大理岩凸起礫石", + "block.rnr.rock.over_height_gravel.phyllite": "千枚岩凸起礫石", + "block.rnr.rock.over_height_gravel.quartzite": "石英岩凸起礫石", + "block.rnr.rock.over_height_gravel.rhyolite": "流紋岩凸起礫石", + "block.rnr.rock.over_height_gravel.schist": "片岩凸起礫石", + "block.rnr.rock.over_height_gravel.shale": "頁岩凸起礫石", + "block.rnr.rock.over_height_gravel.slate": "板岩凸起礫石", + "block.rnr.rock.sett_road.andesite": "安山岩磚路", + "block.rnr.rock.sett_road.andesite_slab": "安山岩磚路半磚", + "block.rnr.rock.sett_road.andesite_stairs": "安山岩磚路階梯", + "block.rnr.rock.sett_road.basalt": "玄武岩磚路", + "block.rnr.rock.sett_road.basalt_slab": "玄武岩磚路半磚", + "block.rnr.rock.sett_road.basalt_stairs": "玄武岩磚路階梯", + "block.rnr.rock.sett_road.chalk": "白惡岩磚路", + "block.rnr.rock.sett_road.chalk_slab": "白惡岩磚路半磚", + "block.rnr.rock.sett_road.chalk_stairs": "白惡岩磚路階梯", + "block.rnr.rock.sett_road.chert": "燧岩磚路", + "block.rnr.rock.sett_road.chert_slab": "燧岩磚路半磚", + "block.rnr.rock.sett_road.chert_stairs": "燧岩磚路階梯", + "block.rnr.rock.sett_road.claystone": "黏土岩磚路", + "block.rnr.rock.sett_road.claystone_slab": "黏土岩磚路半磚", + "block.rnr.rock.sett_road.claystone_stairs": "黏土岩磚路階梯", + "block.rnr.rock.sett_road.conglomerate": "礫岩磚路", + "block.rnr.rock.sett_road.conglomerate_slab": "礫岩磚路半磚", + "block.rnr.rock.sett_road.conglomerate_stairs": "礫岩磚路階梯", + "block.rnr.rock.sett_road.dacite": "英安岩磚路", + "block.rnr.rock.sett_road.dacite_slab": "英安岩磚路半磚", + "block.rnr.rock.sett_road.dacite_stairs": "英安岩磚路階梯", + "block.rnr.rock.sett_road.diorite": "閃長岩磚路", + "block.rnr.rock.sett_road.diorite_slab": "閃長岩磚路半磚", + "block.rnr.rock.sett_road.diorite_stairs": "閃長岩磚路階梯", + "block.rnr.rock.sett_road.dolomite": "白雲岩磚路", + "block.rnr.rock.sett_road.dolomite_slab": "白雲岩磚路半磚", + "block.rnr.rock.sett_road.dolomite_stairs": "白雲岩磚路階梯", + "block.rnr.rock.sett_road.gabbro": "輝長岩磚路", + "block.rnr.rock.sett_road.gabbro_slab": "輝長岩磚路半磚", + "block.rnr.rock.sett_road.gabbro_stairs": "輝長岩磚路階梯", + "block.rnr.rock.sett_road.gneiss": "片麻岩磚路", + "block.rnr.rock.sett_road.gneiss_slab": "片麻岩磚路半磚", + "block.rnr.rock.sett_road.gneiss_stairs": "片麻岩磚路階梯", + "block.rnr.rock.sett_road.granite": "花崗岩磚路", + "block.rnr.rock.sett_road.granite_slab": "花崗岩磚路半磚", + "block.rnr.rock.sett_road.granite_stairs": "花崗岩磚路階梯", + "block.rnr.rock.sett_road.limestone": "石灰岩磚路", + "block.rnr.rock.sett_road.limestone_slab": "石灰岩磚路半磚", + "block.rnr.rock.sett_road.limestone_stairs": "石灰岩磚路階梯", + "block.rnr.rock.sett_road.marble": "大理岩磚路", + "block.rnr.rock.sett_road.marble_slab": "大理岩磚路半磚", + "block.rnr.rock.sett_road.marble_stairs": "大理岩磚路階梯", + "block.rnr.rock.sett_road.phyllite": "千枚岩磚路", + "block.rnr.rock.sett_road.phyllite_slab": "千枚岩磚路半磚", + "block.rnr.rock.sett_road.phyllite_stairs": "千枚岩磚路階梯", + "block.rnr.rock.sett_road.quartzite": "石英岩磚路", + "block.rnr.rock.sett_road.quartzite_slab": "石英岩磚路半磚", + "block.rnr.rock.sett_road.quartzite_stairs": "石英岩磚路階梯", + "block.rnr.rock.sett_road.rhyolite": "流紋岩磚路", + "block.rnr.rock.sett_road.rhyolite_slab": "流紋岩磚路半磚", + "block.rnr.rock.sett_road.rhyolite_stairs": "流紋岩磚路階梯", + "block.rnr.rock.sett_road.schist": "片岩磚路", + "block.rnr.rock.sett_road.schist_slab": "片岩磚路半磚", + "block.rnr.rock.sett_road.schist_stairs": "片岩磚路階梯", + "block.rnr.rock.sett_road.shale": "頁岩磚路", + "block.rnr.rock.sett_road.shale_slab": "頁岩磚路半磚", + "block.rnr.rock.sett_road.shale_stairs": "頁岩磚路階梯", + "block.rnr.rock.sett_road.slate": "板岩磚路", + "block.rnr.rock.sett_road.slate_slab": "板岩磚路半磚", + "block.rnr.rock.sett_road.slate_stairs": "板岩磚路階梯", + "block.rnr.roof_frame": "屋頂框架", + "block.rnr.roof_frame_slab": "屋頂框架半磚", + "block.rnr.roof_frame_stairs": "屋頂框架階梯", + "block.rnr.tamped_kaolin": "夯實的高嶺土", + "block.rnr.tamped_loam": "夯實的壤土", + "block.rnr.tamped_loam_mud": "夯實的壤泥", + "block.rnr.tamped_peat": "夯實的泥炭", + "block.rnr.tamped_sandy_loam": "夯實的沙壤土", + "block.rnr.tamped_sandy_loam_mud": "夯實的沙壤泥", + "block.rnr.tamped_silt": "夯實的泥土", + "block.rnr.tamped_silt_mud": "夯實的淤泥", + "block.rnr.tamped_silty_loam": "夯實的粉壤土", + "block.rnr.tamped_silty_loam_mud": "夯實的粉壤泥", + "block.rnr.terracotta_roof": "紅磚屋頂", + "block.rnr.terracotta_roof_slab": "紅磚屋頂半磚", + "block.rnr.terracotta_roof_stairs": "紅磚屋頂階梯", + "block.rnr.thatch_roof": "茅草屋頂", + "block.rnr.thatch_roof_slab": "茅草屋頂半磚", + "block.rnr.thatch_roof_stairs": "茅草屋頂階梯", + "block.rnr.trodden_concrete_road": "踩過的混凝土路", + "block.rnr.trodden_concrete_road_slab": "踩過的混凝土路半磚", + "block.rnr.trodden_concrete_road_stairs": "踩過的混凝土路階梯", + "block.rnr.wet_concrete_road": "濕混凝土路", + "block.rnr.wet_concrete_road_control_joint": "濕混凝土路控制縫", + "block.rnr.wet_concrete_road_flagstones": "濕混凝土磚路", + "block.rnr.wet_concrete_road_panel": "濕混凝土路", + "block.rnr.wet_concrete_road_sett": "濕混凝土磚路", + "block.rnr.wet_trodden_concrete_road": "濕踩過的混凝土路", + "block.rnr.white_sandstone_flagstones": "白砂岩磚路", + "block.rnr.white_sandstone_flagstones_slab": "白砂岩磚路半磚", + "block.rnr.white_sandstone_flagstones_stairs": "白砂岩磚路階梯", + "block.rnr.wood.shingles.acacia": "相思木屋頂", + "block.rnr.wood.shingles.acacia_slab": "相思木屋頂半磚", + "block.rnr.wood.shingles.acacia_stairs": "相思木屋頂階梯", + "block.rnr.wood.shingles.ash": "梣木屋頂", + "block.rnr.wood.shingles.ash_slab": "梣木屋頂半磚", + "block.rnr.wood.shingles.ash_stairs": "梣木屋頂階梯", + "block.rnr.wood.shingles.aspen": "山楊木屋頂", + "block.rnr.wood.shingles.aspen_slab": "山楊木屋頂半磚", + "block.rnr.wood.shingles.aspen_stairs": "山楊木屋頂階梯", + "block.rnr.wood.shingles.baobab": "猴麵包木屋頂", + "block.rnr.wood.shingles.baobab_slab": "猴麵包木屋頂半磚", + "block.rnr.wood.shingles.baobab_stairs": "猴麵包木屋頂階梯", + "block.rnr.wood.shingles.birch": "樺木屋頂", + "block.rnr.wood.shingles.birch_slab": "樺木屋頂半磚", + "block.rnr.wood.shingles.birch_stairs": "樺木屋頂階梯", + "block.rnr.wood.shingles.blackwood": "黑檀木屋頂", + "block.rnr.wood.shingles.blackwood_slab": "黑檀木屋頂半磚", + "block.rnr.wood.shingles.blackwood_stairs": "黑檀木屋頂階梯", + "block.rnr.wood.shingles.chestnut": "栗木屋頂", + "block.rnr.wood.shingles.chestnut_slab": "栗木屋頂半磚", + "block.rnr.wood.shingles.chestnut_stairs": "栗木屋頂階梯", + "block.rnr.wood.shingles.cypress": "柏木屋頂", + "block.rnr.wood.shingles.cypress_slab": "柏木屋頂半磚", + "block.rnr.wood.shingles.cypress_stairs": "柏木屋頂階梯", + "block.rnr.wood.shingles.douglas_fir": "花旗松木屋頂", + "block.rnr.wood.shingles.douglas_fir_slab": "花旗松木屋頂半磚", + "block.rnr.wood.shingles.douglas_fir_stairs": "花旗松木屋頂階梯", + "block.rnr.wood.shingles.eucalyptus": "尤加利木屋頂", + "block.rnr.wood.shingles.eucalyptus_slab": "尤加利木屋頂半磚", + "block.rnr.wood.shingles.eucalyptus_stairs": "尤加利木屋頂階梯", + "block.rnr.wood.shingles.fig": "無花果木屋頂", + "block.rnr.wood.shingles.fig_slab": "無花果木屋頂半磚", + "block.rnr.wood.shingles.fig_stairs": "無花果木屋頂階梯", + "block.rnr.wood.shingles.hevea": "橡膠木屋頂", + "block.rnr.wood.shingles.hevea_slab": "橡膠木屋頂半磚", + "block.rnr.wood.shingles.hevea_stairs": "橡膠木屋頂階梯", + "block.rnr.wood.shingles.hickory": "山核桃木屋頂", + "block.rnr.wood.shingles.hickory_slab": "山核桃木屋頂半磚", + "block.rnr.wood.shingles.hickory_stairs": "山核桃木屋頂階梯", + "block.rnr.wood.shingles.ipe": "風鈴木屋頂", + "block.rnr.wood.shingles.ipe_slab": "風鈴木屋頂半磚", + "block.rnr.wood.shingles.ipe_stairs": "風鈴木屋頂階梯", + "block.rnr.wood.shingles.ironwood": "鐵木屋頂", + "block.rnr.wood.shingles.ironwood_slab": "鐵木屋頂半磚", + "block.rnr.wood.shingles.ironwood_stairs": "鐵木屋頂階梯", + "block.rnr.wood.shingles.kapok": "木棉木屋頂", + "block.rnr.wood.shingles.kapok_slab": "木棉木屋頂半磚", + "block.rnr.wood.shingles.kapok_stairs": "木棉木屋頂階梯", + "block.rnr.wood.shingles.mahogany": "桃花心木屋頂", + "block.rnr.wood.shingles.mahogany_slab": "桃花心木屋頂半磚", + "block.rnr.wood.shingles.mahogany_stairs": "桃花心木屋頂階梯", + "block.rnr.wood.shingles.mangrove": "Mangrove屋頂", + "block.rnr.wood.shingles.mangrove_slab": "Mangrove屋頂半磚", + "block.rnr.wood.shingles.mangrove_stairs": "Mangrove屋頂階梯", + "block.rnr.wood.shingles.maple": "楓木屋頂", + "block.rnr.wood.shingles.maple_slab": "楓木屋頂半磚", + "block.rnr.wood.shingles.maple_stairs": "楓木屋頂階梯", + "block.rnr.wood.shingles.oak": "橡木屋頂", + "block.rnr.wood.shingles.oak_slab": "橡木屋頂半磚", + "block.rnr.wood.shingles.oak_stairs": "橡木屋頂階梯", + "block.rnr.wood.shingles.palm": "棕櫚木屋頂", + "block.rnr.wood.shingles.palm_slab": "棕櫚木屋頂半磚", + "block.rnr.wood.shingles.palm_stairs": "棕櫚木屋頂階梯", + "block.rnr.wood.shingles.pine": "松木屋頂", + "block.rnr.wood.shingles.pine_slab": "松木屋頂半磚", + "block.rnr.wood.shingles.pine_stairs": "松木屋頂階梯", + "block.rnr.wood.shingles.rosewood": "紅木屋頂", + "block.rnr.wood.shingles.rosewood_slab": "紅木屋頂半磚", + "block.rnr.wood.shingles.rosewood_stairs": "紅木屋頂階梯", + "block.rnr.wood.shingles.sequoia": "紅杉木屋頂", + "block.rnr.wood.shingles.sequoia_slab": "紅杉木屋頂半磚", + "block.rnr.wood.shingles.sequoia_stairs": "紅杉木屋頂階梯", + "block.rnr.wood.shingles.spruce": "雲杉木屋頂", + "block.rnr.wood.shingles.spruce_slab": "雲杉木屋頂半磚", + "block.rnr.wood.shingles.spruce_stairs": "雲杉木屋頂階梯", + "block.rnr.wood.shingles.sycamore": "懸鈴木屋頂", + "block.rnr.wood.shingles.sycamore_slab": "懸鈴木屋頂半磚", + "block.rnr.wood.shingles.sycamore_stairs": "懸鈴木屋頂階梯", + "block.rnr.wood.shingles.teak": "柚木屋頂", + "block.rnr.wood.shingles.teak_slab": "柚木屋頂半磚", + "block.rnr.wood.shingles.teak_stairs": "柚木屋頂階梯", + "block.rnr.wood.shingles.tualang": "督亞冷木屋頂", + "block.rnr.wood.shingles.tualang_slab": "督亞冷木屋頂半磚", + "block.rnr.wood.shingles.tualang_stairs": "督亞冷木屋頂階梯", + "block.rnr.wood.shingles.white_cedar": "白雪松木屋頂", + "block.rnr.wood.shingles.white_cedar_slab": "白雪松木屋頂半磚", + "block.rnr.wood.shingles.white_cedar_stairs": "白雪松木屋頂階梯", + "block.rnr.wood.shingles.willow": "柳木屋頂", + "block.rnr.wood.shingles.willow_slab": "柳木屋頂半磚", + "block.rnr.wood.shingles.willow_stairs": "柳木屋頂階梯", + "block.rnr.yellow_sandstone_flagstones": "黃砂岩磚路", + "block.rnr.yellow_sandstone_flagstones_slab": "黃砂岩磚路半磚", + "block.rnr.yellow_sandstone_flagstones_stairs": "黃砂岩磚路階梯", + "config.jade.plugin_tfc.wet_concrete": "濕混凝土", + "fluid.rnr.concrete": "混凝土", + "item.rnr.bucket.concrete": "混凝土桶", + "item.rnr.ceramic_roof_tile": "屋頂瓦片", + "item.rnr.concrete_powder": "混凝土", + "item.rnr.crushed_base_course": "裂開的路基", + "item.rnr.flagstone.andesite": "安山岩磚路", + "item.rnr.flagstone.basalt": "玄武岩磚路", + "item.rnr.flagstone.black_sandstone": "黑砂岩磚路", + "item.rnr.flagstone.brown_sandstone": "棕砂岩磚路", + "item.rnr.flagstone.chalk": "白惡岩磚路", + "item.rnr.flagstone.chert": "燧岩磚路", + "item.rnr.flagstone.claystone": "黏土岩磚路", + "item.rnr.flagstone.conglomerate": "礫岩磚路", + "item.rnr.flagstone.dacite": "英安岩磚路", + "item.rnr.flagstone.diorite": "閃長岩磚路", + "item.rnr.flagstone.dolomite": "白雲岩磚路", + "item.rnr.flagstone.gabbro": "輝長岩磚路", + "item.rnr.flagstone.gneiss": "片麻岩磚路", + "item.rnr.flagstone.granite": "花崗岩磚路", + "item.rnr.flagstone.green_sandstone": "綠砂岩磚路", + "item.rnr.flagstone.limestone": "石灰岩磚路", + "item.rnr.flagstone.marble": "大理岩磚路", + "item.rnr.flagstone.phyllite": "千枚岩磚路", + "item.rnr.flagstone.pink_sandstone": "粉砂岩磚路", + "item.rnr.flagstone.quartzite": "石英岩磚路", + "item.rnr.flagstone.red_sandstone": "紅砂岩磚路", + "item.rnr.flagstone.rhyolite": "流紋岩磚路", + "item.rnr.flagstone.schist": "片岩磚路", + "item.rnr.flagstone.shale": "頁岩磚路", + "item.rnr.flagstone.slate": "板岩磚路", + "item.rnr.flagstone.white_sandstone": "白砂岩磚路", + "item.rnr.flagstone.yellow_sandstone": "黃砂岩磚路", + "item.rnr.gravel_fill.andesite": "安山岩填充砂礫", + "item.rnr.gravel_fill.basalt": "玄武岩填充砂礫", + "item.rnr.gravel_fill.chalk": "白惡岩填充砂礫", + "item.rnr.gravel_fill.chert": "燧岩填充砂礫", + "item.rnr.gravel_fill.claystone": "黏土岩填充砂礫", + "item.rnr.gravel_fill.conglomerate": "礫岩填充砂礫", + "item.rnr.gravel_fill.dacite": "英安岩填充砂礫", + "item.rnr.gravel_fill.diorite": "閃長岩填充砂礫", + "item.rnr.gravel_fill.dolomite": "白雲岩填充砂礫", + "item.rnr.gravel_fill.gabbro": "輝長岩填充砂礫", + "item.rnr.gravel_fill.gneiss": "片麻岩填充砂礫", + "item.rnr.gravel_fill.granite": "花崗岩填充砂礫", + "item.rnr.gravel_fill.limestone": "石灰岩填充砂礫", + "item.rnr.gravel_fill.marble": "大理岩填充砂礫", + "item.rnr.gravel_fill.phyllite": "千枚岩填充砂礫", + "item.rnr.gravel_fill.quartzite": "石英岩填充砂礫", + "item.rnr.gravel_fill.rhyolite": "流紋岩填充砂礫", + "item.rnr.gravel_fill.schist": "片岩填充砂礫", + "item.rnr.gravel_fill.shale": "頁岩填充砂礫", + "item.rnr.gravel_fill.slate": "板岩填充砂礫", + "item.rnr.hoggin_mix": "混合碎石", + "item.rnr.metal.mattock.bismuth_bronze": "鉍青銅鶴嘴鋤", + "item.rnr.metal.mattock.black_bronze": "黑青銅鶴嘴鋤", + "item.rnr.metal.mattock.black_steel": "黑鋼鶴嘴鋤", + "item.rnr.metal.mattock.blue_steel": "藍鋼鶴嘴鋤", + "item.rnr.metal.mattock.bronze": "青銅鶴嘴鋤", + "item.rnr.metal.mattock.copper": "銅鶴嘴鋤", + "item.rnr.metal.mattock.red_steel": "紅鋼鶴嘴鋤", + "item.rnr.metal.mattock.steel": "鋼鶴嘴鋤", + "item.rnr.metal.mattock.wrought_iron": "鍛鐵鶴嘴鋤", + "item.rnr.metal.mattock_head.bismuth_bronze": "鉍青銅鶴嘴鋤頭", + "item.rnr.metal.mattock_head.black_bronze": "黑青銅鶴嘴鋤頭", + "item.rnr.metal.mattock_head.black_steel": "黑鋼鶴嘴鋤頭", + "item.rnr.metal.mattock_head.blue_steel": "藍鋼鶴嘴鋤頭", + "item.rnr.metal.mattock_head.bronze": "青銅鶴嘴鋤頭", + "item.rnr.metal.mattock_head.copper": "銅鶴嘴鋤頭", + "item.rnr.metal.mattock_head.red_steel": "紅鋼鶴嘴鋤頭", + "item.rnr.metal.mattock_head.steel": "鋼鶴嘴鋤頭", + "item.rnr.metal.mattock_head.wrought_iron": "鍛鐵鶴嘴鋤頭", + "item.rnr.terracotta_roof_tile": "陶土屋頂", + "item.rnr.unfired_roof_tile": "未燒製的屋頂", + "item.rnr.unfired_terracotta_roof_tile": "未燒製的陶土屋頂", + "item.rnr.wood.shingle.acacia": "相思木瓦", + "item.rnr.wood.shingle.ash": "梣木瓦", + "item.rnr.wood.shingle.aspen": "山楊木瓦", + "item.rnr.wood.shingle.baobab": "猴面包樹瓦", + "item.rnr.wood.shingle.birch": "樺木瓦", + "item.rnr.wood.shingle.blackwood": "黑壇木瓦", + "item.rnr.wood.shingle.chestnut": "栗木瓦", + "item.rnr.wood.shingle.cypress": "柏木瓦", + "item.rnr.wood.shingle.douglas_fir": "花旗松木瓦", + "item.rnr.wood.shingle.eucalyptus": "尤加利木瓦", + "item.rnr.wood.shingle.fig": "無花果木瓦", + "item.rnr.wood.shingle.hevea": "橡膠木瓦", + "item.rnr.wood.shingle.hickory": "山核桃木瓦", + "item.rnr.wood.shingle.ipe": "無花果木瓦", + "item.rnr.wood.shingle.ironwood": "鐵木瓦", + "item.rnr.wood.shingle.kapok": "木棉木瓦", + "item.rnr.wood.shingle.mahogany": "桃花心木瓦", + "item.rnr.wood.shingle.mangrove": "紅樹林木瓦", + "item.rnr.wood.shingle.maple": "楓木瓦", + "item.rnr.wood.shingle.oak": "橡木瓦", + "item.rnr.wood.shingle.palm": "棕櫚木瓦", + "item.rnr.wood.shingle.pine": "松木瓦", + "item.rnr.wood.shingle.rosewood": "紅木瓦", + "item.rnr.wood.shingle.sequoia": "紅杉木瓦", + "item.rnr.wood.shingle.spruce": "雲杉木瓦", + "item.rnr.wood.shingle.sycamore": "懸鈴木瓦", + "item.rnr.wood.shingle.teak": "柚木瓦", + "item.rnr.wood.shingle.tualang": "督亞冷木瓦", + "item.rnr.wood.shingle.white_cedar": "白雪松木瓦", + "item.rnr.wood.shingle.willow": "柳木瓦", + "rnr.creative_tab.roads_and_roofs": "道路與屋頂", + "rnr.jade.will_crack": "乾掉時會裂開", + "rnr.jade.will_not_crack": "乾掉時不裂開", + "rnr.mattock.bad_fluid": "這把鶴嘴鋤不能處理這個流體", + "rnr.mattock.cannot_place": "這把鶴嘴鋤不能處理這個方塊", + "rnr.mattock.no_recipe": "不能夯實這個方塊", + "roads_and_roofs": "道路與屋頂", + "tfc.jei.block_mod": "修改方塊", + "tfc.jei.mattock": "鶴嘴鋤" } \ No newline at end of file diff --git a/kubejs/assets/species/lang/ru_ru.json b/kubejs/assets/species/lang/ru_ru.json index b7d486c8d7..06b93e9bc7 100644 --- a/kubejs/assets/species/lang/ru_ru.json +++ b/kubejs/assets/species/lang/ru_ru.json @@ -179,6 +179,7 @@ "entity.species.trooper": "Друпер", "entity.species.trooper.__comment__": "Это милые приручаемые сернистые криперы, Вы даже можете дать им милое имя", "entity.species.wicked": "Озорник", + "entity.species.wicked_fireball": "Злой огненный шар", "entity.species.wraptor": "Ираптор", "item.minecraft.lingering_potion.effect.bloodlust": "Туманное зелье кровопития", "item.minecraft.potion.effect.bloodlust": "Зелье кровопития", diff --git a/kubejs/assets/species/lang/zh_tw.json b/kubejs/assets/species/lang/zh_tw.json index db4f0f29c1..791a316503 100644 --- a/kubejs/assets/species/lang/zh_tw.json +++ b/kubejs/assets/species/lang/zh_tw.json @@ -46,7 +46,7 @@ "advancements.species.summon_spectre.title": "以魂換魂", "advancements.species.survive_ghoul.description": "不要在食屍鬼搜尋時被其發現", "advancements.species.survive_ghoul.title": "綠燈", - "advancements.species.tame_trooper.description": "種下一顆遠古松果並馴服從它生長出來的苗力怕", + "advancements.species.tame_trooper.description": "種下一顆古松果並馴服從它生長出來的苗力怕", "advancements.species.tame_trooper.title": "綠色行動", "advancements.species.tickle_goober.description": "讓哈欠獸打噴嚏，讓周遭史蘊化", "advancements.species.tickle_goober.title": "過敏季", @@ -185,7 +185,7 @@ "item.minecraft.potion.effect.bloodlust": "嗜血藥水", "item.minecraft.splash_potion.effect.bloodlust": "飛濺 嗜血藥水", "item.minecraft.tipped_arrow.effect.bloodlust": "嗜血之箭", - "item.species.ancient_pinecone": "遠古松果", + "item.species.ancient_pinecone": "古松果", "item.species.bewereager_spawn_egg": "飢渴獸 生怪蛋", "item.species.birt_egg": "痴音鳥蛋", "item.species.birt_egg.desc.birtd": "音顫 (0:03)", diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/pl_pl/entries/beneath/beneath_wild_fruits.json b/kubejs/assets/tfc/patchouli_books/field_guide/pl_pl/entries/beneath/beneath_wild_fruits.json index a5ff8be051..a0a16900d3 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/pl_pl/entries/beneath/beneath_wild_fruits.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/pl_pl/entries/beneath/beneath_wild_fruits.json @@ -20,7 +20,7 @@ }, { "type": "tfc:multimultiblock", - "text": "Wild Lavacado trees can be found between Y=198 and Y=60.", + "text": "Dzikie drzewa lawacado można znaleźć pomiędzy Y=198 i Y=60.", "multiblocks": [ { "pattern": [ @@ -85,7 +85,7 @@ }, { "type": "tfc:multimultiblock", - "text": "Wild Magmango trees can be found between Y=198 and Y=60.", + "text": "Dzikie drzewa magmango można znaleźć pomiędzy Y=198 i Y=60.", "multiblocks": [ { "pattern": [ diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/firmalife/berry_bushes.json b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/firmalife/berry_bushes.json index 0efdb2fd6d..8fa42cffc8 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/firmalife/berry_bushes.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/firmalife/berry_bushes.json @@ -1,6 +1,6 @@ { "__comment__": "This file was automatically created by mcresources", - "name": "Berry Bushes", + "name": "Ягодные кусты:", "category": "tfc:firmalife", "icon": "firmalife:plant/pineapple_bush", "pages": [ diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/firmalife/cheese.json b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/firmalife/cheese.json index 4f4fc222d7..4caa2514ea 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/firmalife/cheese.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/firmalife/cheese.json @@ -39,7 +39,7 @@ }, { "type": "tfc:multimultiblock", - "text": "The aging stages of a wheel of Gouda: $(thing)Fresh$(), $(thing)Aged$(), and $(thing)Vintage$().", + "text": "Стадии старения колеса Гауды: $(thing)Fresh$(), $(thing)Aged$() и $(thing)Vintage$().", "multiblocks": [ { "pattern": [ diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/firmalife/pizza.json b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/firmalife/pizza.json index 5dd3b32bf8..6ef73d3f80 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/firmalife/pizza.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/firmalife/pizza.json @@ -22,7 +22,7 @@ { "type": "patchouli:crafting", "recipe": "tfg:shapeless/raw_pizza_2", - "text": "Pizza is made from 1-3 of vegetables, cooked meats, or fruits, one shredded cheese, and one tomato sauce." + "text": "Пицца изготавливается из 1-3 овощей, приготовленных мяса или фруктов, одного измельченного сыра и одного соуса томата." } ], "read_by_default": true, diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/tr_tr/categories/beneath.json b/kubejs/assets/tfc/patchouli_books/field_guide/tr_tr/categories/beneath.json index 08a9bc1f3b..9188698bc5 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/tr_tr/categories/beneath.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/tr_tr/categories/beneath.json @@ -1,5 +1,5 @@ { - "name": "Bu Nether mi...?", + "name": "Nether?", "description": "Beneath'te olan her şey", "icon": "minecraft:netherrack", "sortnum": 10 diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/tr_tr/entries/getting_started/finding_ores.json b/kubejs/assets/tfc/patchouli_books/field_guide/tr_tr/entries/getting_started/finding_ores.json index 589996c15c..bb8a65c3ad 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/tr_tr/entries/getting_started/finding_ores.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/tr_tr/entries/getting_started/finding_ores.json @@ -1,12 +1,12 @@ { "__comment__": "This file was automatically created by mcresources", - "name": "Ores, Metal, and Casting", + "name": "Madenler,Metaller ve Dökümcülük", "category": "tfc:getting_started", "icon": "tfc:ore/normal_native_copper", "pages": [ { "type": "patchouli:text", - "text": "In addition to sticks, twigs, and stones on the ground, in your travels you may encounter small pieces of ores scattered around the ground. These are important, as they are one of the only sources of ore and metal before obtaining a pickaxe." + "text": "Etrafta gezerken çubuk ve taşların yanında ufak maden parçalarına rastlamış olabilirsiniz.Bunlar önemli çünkü bunlar kazma yapmadan erişebildiğiniz tek madenler." }, { "type": "patchouli:multiblock", @@ -45,12 +45,12 @@ } }, "name": "", - "text": "All small ore pieces", + "text": "Bütün ufak maden parçaları", "enable_visualize": false }, { "type": "patchouli:text", - "text": "These small ore pieces can serve two purposes: they can provide a source of metal, and more importantly, they indicate the presence of a larger vein of ore somewhere nearby, probably underground and close to the surface. Be sure to note where you find small ores, as the location of ore veins will be useful later during $(l:mechanics/prospecting)Prospecting$().$(br2)The twelve types of small ores, and the metal they can be melted into are listed on the next page." + "text": "Bu ufak maden parçaları iki işe yarar: size kullanmak için maden kaynağı olurlar ve daha önemli olarak aşağılarında büyük bir maden damarı olduğunu belirtirler.Bu yüzden bu küçük madenleri bulduğunuz yerleri işaretleyin çünkü ileride $(l:mechanics/prospecting)Prospecting$().$(br2) yaparken işinize yarayacak.yan sayafada on iki çeşit metalin eriyip neye dönüştüğü yazmakta." }, { "type": "patchouli:text", diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/tr_tr/entries/getting_started/introduction.json b/kubejs/assets/tfc/patchouli_books/field_guide/tr_tr/entries/getting_started/introduction.json index f584cbe854..0903718a0f 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/tr_tr/entries/getting_started/introduction.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/tr_tr/entries/getting_started/introduction.json @@ -1,12 +1,12 @@ { "__comment__": "This file was automatically created by mcresources", - "name": "Introduction", + "name": "Giriş", "category": "tfc:getting_started", "icon": "tfc:rock/loose/granite", "pages": [ { "type": "patchouli:text", - "text": "In TerraFirmaCraft, the first things you can obtain are sticks, twigs, and loose rocks. They can be found in almost every climate, lying scattered on the ground. $(item)$(k:key.use)$() or break these to pick them up." + "text": "Terrafirmacraftta yapmanız gereken ilk şey çubuk,dal ve taş toplamaktır.Neredeyse her yerde bulunabilirler.$(item)$(k:key.use)$() ile veya kırarak bunları toplayabilirsiniz." }, { "type": "patchouli:multiblock", @@ -36,25 +36,25 @@ "5": "tfc:wood/twig/ash" } }, - "name": "Example", - "text": "A smattering of common sticks and stones.", + "name": "Örnek", + "text": "Bazı yaygın çubuk ve taşlar.", "enable_visualize": false }, { "type": "patchouli:text", - "text": "In addition to gathering sticks and twigs on the ground, sticks can also be obtained by breaking leaves with your fist. Once you have a number of rocks and sticks, you are ready to start $(thing)Knapping$(). Knapping is a process where two rocks are hit together, to form a particular shape. In order to knap, first hold at least two rocks in your hand, then right click in the air, which will open up the $(thing)Knapping Interface$()." + "text": "Yerdeki dallar ve çubukların haricinde ağaçların yapraklarını kırarak da çubuk elde edebilirsiniz.Bir miktar çubuk ve taş topladıktan sonra $(thing)Knapping$() yapmaya hazırsınız.Yontma,iki taşın birbirine vurulup belirli bir şekile getirilmesine denir.Yontma yapmak için en az iki tane taşı elinizde tutun ve havaya sağ tıklayın.bundan sonra $(thing)Knapping Interface$() açılacaktır." }, { "type": "patchouli:image", "images": [ "tfc:textures/gui/book/gui/rock_knapping.png" ], - "text": "The Knapping Interface.", + "text": "Yontma menüsü", "border": false }, { "type": "patchouli:text", - "text": "In order to knap a particular item, you want to remove squares until you form the desired pattern. For example, create a knife blade by matching the recipe shown to the right.$(br2)Like crafting recipes, the location of the desired pattern doesn't matter for the output, and some recipes have multiple variants that are valid." + "text": "Bir eşya yapmak için yontma menüsünden istediğiniz eşyanın şekli olana kadar üstüne tıklayıp kareleri silmeniz gerekir.Örnek olarak bıçak yapmak için bir taşı sağdaki gibi yontun..$(br2) diğer eşya yapımları gibi şeklin konumu önemli değil ve bazı tariflerin geçerli olan birkaç farklı şekli var.Daha fazla detay için aradığınız eşyanın yapımına Jei̇ dan bakabilirsiniz." }, { "type": "tfc:rock_knapping_recipe", diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/zh_tw/entries/arborfirmacraft/earth_tree_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/zh_tw/entries/arborfirmacraft/earth_tree_index.json index f285dcbc20..0affc301c7 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/zh_tw/entries/arborfirmacraft/earth_tree_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/zh_tw/entries/arborfirmacraft/earth_tree_index.json @@ -1,34 +1,34 @@ { - "name": "Earth Tree Index", + "name": "地球樹木指南", "category": "tfc:arborfirmacraft", "icon": "afc:wood/sapling/flame_of_the_forest", "read_by_default": true, "pages": [ { "type": "patchouli:text", - "text": "This is a list of every tree in the world, and what climates they grow in.$(br2)Looking for particular wood type to decorate your base? This should help you find it. The list is sorted alphabetically by wood type.$(br2)Also check out the $(l:tfc:tfg_tips/mars_tree_index)Mars Mushroom Index$()." + "text": "本列表收錄了世界上所有的樹木及其生長氣候。$(br2)想尋找特定木材來裝飾基地嗎？本指南將有所幫助。列表已依木材名稱字母順序排列。$(br2)亦可查閱 $(l:tfc:tfg_tips/mars_tree_index)火星蕈菇指南$()。" }, { "type": "patchouli:spotlight", - "title": "Acacia, Gum Arabic", + "title": "相思木與阿拉伯膠木", "item": "tag:tfc:acacia_logs", - "text": "$(bold)Umbrella Thorn Acacia$()$(br)$(thing)Rainfall$(): 90 — 275mm$(br)$(thing)Temperature$(): 13.4 — 40°C$(br2)$(bold)Acacia Koa$()$(br)$(thing)Rainfall$(): 350 — 500mm$(br)$(thing)Temperature$(): 15.3 — 24.4°C$(br2)$(bold)Gum Arabic$()$(br)$(thing)Rainfall$(): 90 — 275mm$(br)$(thing)Temperature$(): 11.6 — 40°C" + "text": "$(bold)傘刺相思木$()$(br)$(thing)降雨量$(): 90 — 275mm$(br)$(thing)溫度$(): 13.4 — 40°C$(br2)$(bold)夏威夷相思木$()$(br)$(thing)降雨量$(): 350 — 500mm$(br)$(thing)溫度$(): 15.3 — 24.4°C$(br2)$(bold)阿拉伯膠樹$()$(br)$(thing)降雨量$(): 90 — 275mm$(br)$(thing)溫度$(): 11.6 — 40°C" }, { "type": "patchouli:spotlight", - "title": "Ash", + "title": "梣木", "item": "tag:tfc:ash_logs", - "text": "$(bold)White Ash$()$(br)$(thing)Rainfall$(): 60 — 240mm$(br)$(thing)Temperature$(): -13.9 — 0.7°C" + "text": "$(bold)白梣木$()$(br)$(thing)降雨量$(): 60 — 240mm$(br)$(thing)溫度$(): -13.9 — 0.7°C" }, { "type": "patchouli:spotlight", - "title": "Aspen, Poplar", + "title": "山楊木與白楊木", "item": "tag:tfc:aspen_logs", "text": "$(bold)Quaking Aspen$()$(br)$(thing)Rainfall$(): 350 — 500mm$(br)$(thing)Temperature$(): -15.7 — -1.1°C$(br2)$(bold)Poplar$()$(br)$(thing)Rainfall$(): 170 — 310mm$(br)$(thing)Temperature$(): -15.7 — -6.6°C" }, { "type": "patchouli:spotlight", - "title": "Baobab", + "title": "猴麵包木", "item": "tag:afc:baobab_logs", "text": "$(bold)Baobab$()$(br)$(thing)Rainfall$(): 30 — 190mm$(br)$(thing)Temperature$(): 15.3 — 26.2°C" }, diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/zh_tw/entries/firmaciv/beneath.json b/kubejs/assets/tfc/patchouli_books/field_guide/zh_tw/entries/firmaciv/beneath.json index 38da342d6d..af626de7b0 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/zh_tw/entries/firmaciv/beneath.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/zh_tw/entries/firmaciv/beneath.json @@ -1,5 +1,5 @@ { - "name": "Martian Boats", + "name": "火星船", "category": "tfc:firmaciv", "icon": "beneath:wood/sapling/crimson", "flag": "mod:beneath", @@ -8,30 +8,30 @@ "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$()." + "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": "$(thing)軟木$() 的質地與樹皮相當軟韌，非常適合用來製作 $(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": "$(thing)硬木$() 以極堅固的結構著稱，非常適合用來建造 $(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/tfcagedalcohol/lang/zh_tw.json b/kubejs/assets/tfcagedalcohol/lang/zh_tw.json new file mode 100644 index 0000000000..a14c8124da --- /dev/null +++ b/kubejs/assets/tfcagedalcohol/lang/zh_tw.json @@ -0,0 +1,39 @@ +{ + "block.tfcagedalcohol.fluid.aged_beer": "熟成啤酒", + "block.tfcagedalcohol.fluid.aged_cider": "熟成蘋果酒", + "block.tfcagedalcohol.fluid.aged_corn_whiskey": "熟成玉米威士忌", + "block.tfcagedalcohol.fluid.aged_mead": "熟成蜂蜜酒", + "block.tfcagedalcohol.fluid.aged_rum": "熟成萊姆酒", + "block.tfcagedalcohol.fluid.aged_rye_whiskey": "熟成黑麥威士忌", + "block.tfcagedalcohol.fluid.aged_sake": "熟成清酒", + "block.tfcagedalcohol.fluid.aged_vodka": "熟成伏特加", + "block.tfcagedalcohol.fluid.aged_whiskey": "熟成威士忌", + "fluid.tfcagedalcohol.aged_beer": "熟成啤酒", + "fluid.tfcagedalcohol.aged_cider": "熟成蘋果酒", + "fluid.tfcagedalcohol.aged_corn_whiskey": "熟成玉米威士忌", + "fluid.tfcagedalcohol.aged_mead": "熟成蜂蜜酒", + "fluid.tfcagedalcohol.aged_rum": "熟成萊姆酒", + "fluid.tfcagedalcohol.aged_rye_whiskey": "熟成黑麥威士忌", + "fluid.tfcagedalcohol.aged_sake": "熟成清酒", + "fluid.tfcagedalcohol.aged_vodka": "熟成伏特加", + "fluid.tfcagedalcohol.aged_whiskey": "熟成威士忌", + "item.tfcagedalcohol.bucket.aged_beer": "熟成啤酒桶", + "item.tfcagedalcohol.bucket.aged_cider": "熟成蘋果酒桶", + "item.tfcagedalcohol.bucket.aged_corn_whiskey": "熟成玉米威士忌桶", + "item.tfcagedalcohol.bucket.aged_mead": "熟成蜂蜜酒桶", + "item.tfcagedalcohol.bucket.aged_rum": "熟成萊姆酒桶", + "item.tfcagedalcohol.bucket.aged_rye_whiskey": "熟成黑麥威士忌桶", + "item.tfcagedalcohol.bucket.aged_sake": "熟成清酒桶", + "item.tfcagedalcohol.bucket.aged_vodka": "熟成伏特加桶", + "item.tfcagedalcohol.bucket.aged_whiskey": "熟成威士忌桶", + "tfc.recipe.barrel.tfcagedalcohol.barrel.aged_beer": "熟成啤酒", + "tfc.recipe.barrel.tfcagedalcohol.barrel.aged_cider": "熟成蘋果酒", + "tfc.recipe.barrel.tfcagedalcohol.barrel.aged_corn_whiskey": "熟成玉米威士忌", + "tfc.recipe.barrel.tfcagedalcohol.barrel.aged_mead": "熟成蜂蜜酒", + "tfc.recipe.barrel.tfcagedalcohol.barrel.aged_rum": "熟成萊姆酒", + "tfc.recipe.barrel.tfcagedalcohol.barrel.aged_rye_whiskey": "熟成黑麥威士忌", + "tfc.recipe.barrel.tfcagedalcohol.barrel.aged_sake": "熟成清酒", + "tfc.recipe.barrel.tfcagedalcohol.barrel.aged_vodka": "熟成伏特加", + "tfc.recipe.barrel.tfcagedalcohol.barrel.aged_whiskey": "熟成威士忌", + "tfcagedalcohol.creative_tab.main": "群巒傳說：玉液瓊漿" +} \ No newline at end of file diff --git a/kubejs/assets/tfcastikorcarts/lang/zh_tw.json b/kubejs/assets/tfcastikorcarts/lang/zh_tw.json new file mode 100644 index 0000000000..d13fc612a2 --- /dev/null +++ b/kubejs/assets/tfcastikorcarts/lang/zh_tw.json @@ -0,0 +1,190 @@ +{ + "entity.tfcastikorcarts.animal_cart.acacia": "相思木動物搬運車", + "entity.tfcastikorcarts.animal_cart.ash": "梣木動物搬運車", + "entity.tfcastikorcarts.animal_cart.aspen": "山楊木動物搬運車", + "entity.tfcastikorcarts.animal_cart.baobab": "猴麵包木動物搬運車", + "entity.tfcastikorcarts.animal_cart.birch": "樺木動物搬運車", + "entity.tfcastikorcarts.animal_cart.blackwood": "黑檀木動物搬運車", + "entity.tfcastikorcarts.animal_cart.chestnut": "栗木動物搬運車", + "entity.tfcastikorcarts.animal_cart.cypress": "柏木動物搬運車", + "entity.tfcastikorcarts.animal_cart.douglas_fir": "花旗松木動物搬運車", + "entity.tfcastikorcarts.animal_cart.hickory": "山核桃木動物搬運車", + "entity.tfcastikorcarts.animal_cart.ironwood": "鐵木動物搬運車", + "entity.tfcastikorcarts.animal_cart.kapok": "木棉木動物搬運車", + "entity.tfcastikorcarts.animal_cart.mahogany": "桃花心木動物搬運車", + "entity.tfcastikorcarts.animal_cart.mangrove": "紅樹林木動物搬運車", + "entity.tfcastikorcarts.animal_cart.maple": "楓木動物搬運車", + "entity.tfcastikorcarts.animal_cart.oak": "橡木動物搬運車", + "entity.tfcastikorcarts.animal_cart.palm": "棕櫚木動物搬運車", + "entity.tfcastikorcarts.animal_cart.pine": "松木動物搬運車", + "entity.tfcastikorcarts.animal_cart.rainbow_eucalyptus": "彩虹桉木動物搬運車", + "entity.tfcastikorcarts.animal_cart.rosewood": "紅木動物搬運車", + "entity.tfcastikorcarts.animal_cart.rubber_fig": "橡膠榕木動物搬運車", + "entity.tfcastikorcarts.animal_cart.sequoia": "紅杉木動物搬運車", + "entity.tfcastikorcarts.animal_cart.spruce": "雲杉木動物搬運車", + "entity.tfcastikorcarts.animal_cart.sycamore": "懸鈴木動物搬運車", + "entity.tfcastikorcarts.animal_cart.teak": "柚木動物搬運車", + "entity.tfcastikorcarts.animal_cart.white_cedar": "白雪松木動物搬運車", + "entity.tfcastikorcarts.animal_cart.willow": "柳木動物搬運車", + "entity.tfcastikorcarts.plow.acacia": "相思木犁地車", + "entity.tfcastikorcarts.plow.ash": "梣木犁地車", + "entity.tfcastikorcarts.plow.aspen": "山楊木犁地車", + "entity.tfcastikorcarts.plow.baobab": "猴麵包木犁地車", + "entity.tfcastikorcarts.plow.birch": "樺木犁地車", + "entity.tfcastikorcarts.plow.blackwood": "黑檀木犁地車", + "entity.tfcastikorcarts.plow.chestnut": "栗木犁地車", + "entity.tfcastikorcarts.plow.cypress": "柏木犁地車", + "entity.tfcastikorcarts.plow.douglas_fir": "花旗松木犁地車", + "entity.tfcastikorcarts.plow.hickory": "山核桃木犁地車", + "entity.tfcastikorcarts.plow.ironwood": "鐵木犁地車", + "entity.tfcastikorcarts.plow.kapok": "木棉木犁地車", + "entity.tfcastikorcarts.plow.mahogany": "桃花心木犁地車", + "entity.tfcastikorcarts.plow.mangrove": "紅樹林木犁地車", + "entity.tfcastikorcarts.plow.maple": "楓木犁地車", + "entity.tfcastikorcarts.plow.oak": "橡木犁地車", + "entity.tfcastikorcarts.plow.palm": "棕櫚木犁地車", + "entity.tfcastikorcarts.plow.pine": "松木犁地車", + "entity.tfcastikorcarts.plow.rainbow_eucalyptus": "彩虹桉木犁地車", + "entity.tfcastikorcarts.plow.rosewood": "紅木犁地車", + "entity.tfcastikorcarts.plow.rubber_fig": "橡膠榕木犁地車", + "entity.tfcastikorcarts.plow.sequoia": "紅杉木犁地車", + "entity.tfcastikorcarts.plow.spruce": "雲杉木犁地車", + "entity.tfcastikorcarts.plow.sycamore": "懸鈴木犁地車", + "entity.tfcastikorcarts.plow.teak": "柚木犁地車", + "entity.tfcastikorcarts.plow.white_cedar": "白雪松木白雪松木", + "entity.tfcastikorcarts.plow.willow": "柳木犁地車", + "entity.tfcastikorcarts.supply_cart.acacia": "相思木物資車", + "entity.tfcastikorcarts.supply_cart.ash": "梣木物資車", + "entity.tfcastikorcarts.supply_cart.aspen": "山楊木物資車", + "entity.tfcastikorcarts.supply_cart.baobab": "猴麵包木物資車", + "entity.tfcastikorcarts.supply_cart.birch": "樺木物資車", + "entity.tfcastikorcarts.supply_cart.blackwood": "黑檀木物資車", + "entity.tfcastikorcarts.supply_cart.chestnut": "栗木物資車", + "entity.tfcastikorcarts.supply_cart.cypress": "柏木物資車", + "entity.tfcastikorcarts.supply_cart.douglas_fir": "花旗松木物資車", + "entity.tfcastikorcarts.supply_cart.hickory": "山核桃木物資車", + "entity.tfcastikorcarts.supply_cart.ironwood": "鐵木物資車", + "entity.tfcastikorcarts.supply_cart.kapok": "木棉木物資車", + "entity.tfcastikorcarts.supply_cart.mahogany": "桃花心木物資車", + "entity.tfcastikorcarts.supply_cart.mangrove": "紅樹林木物資車", + "entity.tfcastikorcarts.supply_cart.maple": "楓木物資車", + "entity.tfcastikorcarts.supply_cart.oak": "橡木物資車", + "entity.tfcastikorcarts.supply_cart.palm": "棕櫚木物資車", + "entity.tfcastikorcarts.supply_cart.pine": "松木物資車", + "entity.tfcastikorcarts.supply_cart.rainbow_eucalyptus": "彩虹桉木物資車", + "entity.tfcastikorcarts.supply_cart.rosewood": "紅木物資車", + "entity.tfcastikorcarts.supply_cart.rubber_fig": "橡膠榕木物資車", + "entity.tfcastikorcarts.supply_cart.sequoia": "紅杉木物資車", + "entity.tfcastikorcarts.supply_cart.spruce": "雲杉木物資車", + "entity.tfcastikorcarts.supply_cart.sycamore": "懸鈴木物資車", + "entity.tfcastikorcarts.supply_cart.teak": "柚木物資車", + "entity.tfcastikorcarts.supply_cart.white_cedar": "白雪松木物資車", + "entity.tfcastikorcarts.supply_cart.willow": "柳木物資車", + "item.tfcastikorcarts.animal_cart.acacia": "相思木動物搬運車", + "item.tfcastikorcarts.animal_cart.ash": "梣木動物搬運車", + "item.tfcastikorcarts.animal_cart.aspen": "山楊木動物搬運車", + "item.tfcastikorcarts.animal_cart.baobab": "猴麵包木動物搬運車", + "item.tfcastikorcarts.animal_cart.birch": "樺木動物搬運車", + "item.tfcastikorcarts.animal_cart.blackwood": "黑檀木動物搬運車", + "item.tfcastikorcarts.animal_cart.chestnut": "栗木動物搬運車", + "item.tfcastikorcarts.animal_cart.cypress": "柏木動物搬運車", + "item.tfcastikorcarts.animal_cart.douglas_fir": "花旗松木動物搬運車", + "item.tfcastikorcarts.animal_cart.hickory": "山核桃木動物搬運車", + "item.tfcastikorcarts.animal_cart.ironwood": "鐵木動物搬運車", + "item.tfcastikorcarts.animal_cart.kapok": "木棉木動物搬運車", + "item.tfcastikorcarts.animal_cart.mahogany": "桃花心木動物搬運車", + "item.tfcastikorcarts.animal_cart.mangrove": "紅樹林木動物搬運車", + "item.tfcastikorcarts.animal_cart.maple": "楓木動物搬運車", + "item.tfcastikorcarts.animal_cart.oak": "橡木動物搬運車", + "item.tfcastikorcarts.animal_cart.palm": "棕櫚木動物搬運車", + "item.tfcastikorcarts.animal_cart.pine": "松木動物搬運車", + "item.tfcastikorcarts.animal_cart.rainbow_eucalyptus": "彩虹桉木動物搬運車", + "item.tfcastikorcarts.animal_cart.rosewood": "紅木動物搬運車", + "item.tfcastikorcarts.animal_cart.rubber_fig": "橡膠榕木動物搬運車", + "item.tfcastikorcarts.animal_cart.sequoia": "紅杉木動物搬運車", + "item.tfcastikorcarts.animal_cart.spruce": "雲杉木動物搬運車", + "item.tfcastikorcarts.animal_cart.sycamore": "懸鈴木動物搬運車", + "item.tfcastikorcarts.animal_cart.teak": "柚木動物搬運車", + "item.tfcastikorcarts.animal_cart.white_cedar": "白雪松木動物搬運車", + "item.tfcastikorcarts.animal_cart.willow": "柳木動物搬運車", + "item.tfcastikorcarts.plow.acacia": "相思木犁地車", + "item.tfcastikorcarts.plow.ash": "梣木犁地車", + "item.tfcastikorcarts.plow.aspen": "山楊木犁地車", + "item.tfcastikorcarts.plow.baobab": "猴麵包木犁地車", + "item.tfcastikorcarts.plow.birch": "樺木犁地車", + "item.tfcastikorcarts.plow.blackwood": "黑檀木犁地車", + "item.tfcastikorcarts.plow.chestnut": "栗木犁地車", + "item.tfcastikorcarts.plow.cypress": "柏木犁地車", + "item.tfcastikorcarts.plow.douglas_fir": "花旗松木犁地車", + "item.tfcastikorcarts.plow.hickory": "山核桃木犁地車", + "item.tfcastikorcarts.plow.ironwood": "鐵木犁地車", + "item.tfcastikorcarts.plow.kapok": "木棉木犁地車", + "item.tfcastikorcarts.plow.mahogany": "桃花心木犁地車", + "item.tfcastikorcarts.plow.mangrove": "紅樹林木犁地車", + "item.tfcastikorcarts.plow.maple": "楓木犁地車", + "item.tfcastikorcarts.plow.oak": "橡木犁地車", + "item.tfcastikorcarts.plow.palm": "棕櫚木犁地車", + "item.tfcastikorcarts.plow.pine": "松木犁地車", + "item.tfcastikorcarts.plow.rainbow_eucalyptus": "彩虹桉木犁地車", + "item.tfcastikorcarts.plow.rosewood": "紅木犁地車", + "item.tfcastikorcarts.plow.rubber_fig": "橡膠榕木犁地車", + "item.tfcastikorcarts.plow.sequoia": "紅杉木犁地車", + "item.tfcastikorcarts.plow.spruce": "雲杉木犁地車", + "item.tfcastikorcarts.plow.sycamore": "懸鈴木犁地車", + "item.tfcastikorcarts.plow.teak": "柚木犁地車", + "item.tfcastikorcarts.plow.white_cedar": "白雪松木犁地車", + "item.tfcastikorcarts.plow.willow": "柳木犁地車", + "item.tfcastikorcarts.supply_cart.acacia": "相思木物資車", + "item.tfcastikorcarts.supply_cart.ash": "梣木物資車", + "item.tfcastikorcarts.supply_cart.aspen": "山楊木物資車", + "item.tfcastikorcarts.supply_cart.baobab": "猴麵包木物資車", + "item.tfcastikorcarts.supply_cart.birch": "樺木物資車", + "item.tfcastikorcarts.supply_cart.blackwood": "黑檀木物資車", + "item.tfcastikorcarts.supply_cart.chestnut": "栗木物資車", + "item.tfcastikorcarts.supply_cart.cypress": "柏木物資車", + "item.tfcastikorcarts.supply_cart.douglas_fir": "花旗松木物資車", + "item.tfcastikorcarts.supply_cart.hickory": "山核桃木物資車", + "item.tfcastikorcarts.supply_cart.ironwood": "鐵木物資車", + "item.tfcastikorcarts.supply_cart.kapok": "木棉木物資車", + "item.tfcastikorcarts.supply_cart.mahogany": "桃花心木物資車", + "item.tfcastikorcarts.supply_cart.mangrove": "紅樹林木物資車", + "item.tfcastikorcarts.supply_cart.maple": "楓木物資車", + "item.tfcastikorcarts.supply_cart.oak": "橡木物資車", + "item.tfcastikorcarts.supply_cart.palm": "棕櫚木物資車", + "item.tfcastikorcarts.supply_cart.pine": "松木物資車", + "item.tfcastikorcarts.supply_cart.rainbow_eucalyptus": "彩虹桉木物資車", + "item.tfcastikorcarts.supply_cart.rosewood": "紅木物資車", + "item.tfcastikorcarts.supply_cart.rubber_fig": "橡膠榕木物資車", + "item.tfcastikorcarts.supply_cart.sequoia": "紅杉木物資車", + "item.tfcastikorcarts.supply_cart.spruce": "雲杉木物資車", + "item.tfcastikorcarts.supply_cart.sycamore": "懸鈴木物資車", + "item.tfcastikorcarts.supply_cart.teak": "柚木物資車", + "item.tfcastikorcarts.supply_cart.white_cedar": "白雪松木物資車", + "item.tfcastikorcarts.supply_cart.willow": "柳木物資車", + "item.tfcastikorcarts.wheel.acacia": "相思木輪", + "item.tfcastikorcarts.wheel.ash": "梣木輪", + "item.tfcastikorcarts.wheel.aspen": "山楊木輪", + "item.tfcastikorcarts.wheel.birch": "樺木輪", + "item.tfcastikorcarts.wheel.blackwood": "黑檀木輪", + "item.tfcastikorcarts.wheel.chestnut": "栗木輪", + "item.tfcastikorcarts.wheel.cypress": "柏木輪", + "item.tfcastikorcarts.wheel.douglas_fir": "花旗松木輪", + "item.tfcastikorcarts.wheel.hickory": "山核桃木輪", + "item.tfcastikorcarts.wheel.ironwood": "鐵木輪", + "item.tfcastikorcarts.wheel.kapok": "木棉木輪", + "item.tfcastikorcarts.wheel.mahogany": "桃花心木輪", + "item.tfcastikorcarts.wheel.mangrove": "紅樹林木輪", + "item.tfcastikorcarts.wheel.maple": "楓木輪", + "item.tfcastikorcarts.wheel.oak": "橡木輪", + "item.tfcastikorcarts.wheel.palm": "棕櫚木輪", + "item.tfcastikorcarts.wheel.pine": "松木輪", + "item.tfcastikorcarts.wheel.rainbow_eucalyptus": "彩虹桉木輪", + "item.tfcastikorcarts.wheel.rosewood": "紅木輪", + "item.tfcastikorcarts.wheel.rubber_fig": "橡膠榕木輪", + "item.tfcastikorcarts.wheel.sequoia": "紅杉木輪", + "item.tfcastikorcarts.wheel.spruce": "雲杉木輪", + "item.tfcastikorcarts.wheel.sycamore": "懸鈴木輪", + "item.tfcastikorcarts.wheel.teak": "柚木輪", + "item.tfcastikorcarts.wheel.white_cedar": "白雪松木輪", + "item.tfcastikorcarts.wheel.willow": "柳木輪" +} \ No newline at end of file diff --git a/kubejs/assets/tfccanes/lang/zh_tw.json b/kubejs/assets/tfccanes/lang/zh_tw.json new file mode 100644 index 0000000000..a78670396c --- /dev/null +++ b/kubejs/assets/tfccanes/lang/zh_tw.json @@ -0,0 +1,6 @@ +{ + "item.tfccanes.refined_walking_cane": "鐵製手杖", + "item.tfccanes.walking_cane": "木製手杖", + "tfccanes.creative_tab.canes": "手杖", + "tile.crate.name": "金屬箱" +} \ No newline at end of file diff --git a/kubejs/assets/tfcgenviewer/lang/zh_tw.json b/kubejs/assets/tfcgenviewer/lang/zh_tw.json index 1e471f7d2b..977d0dc8f6 100644 --- a/kubejs/assets/tfcgenviewer/lang/zh_tw.json +++ b/kubejs/assets/tfcgenviewer/lang/zh_tw.json @@ -1,9 +1,80 @@ { + "button.tfcgenviewer.preview_world": "預覽世界", + "button.tfcgenviewer.apply": "套用", + "button.tfcgenviewer.apply.will_not_apply": "預覽生成即將完成因此 %s 不會執行", + "button.tfcgenviewer.export": "匯出預覽", "button.tfcgenviewer.save": "保存", + "button.tfcgenviewer.current_seed": "當前種子： %s", + "button.tfcgenviewer.current_seed.tooltip": "點擊複製", + "button.tfcgenviewer.edit_rocks": "編輯地層", + "button.tfcgenviewer.clear_rock_settings": "清除設定", + "tfcgenviewer.preview_world.title": "預覽世界", + "tfcgenviewer.preview_world.invalid_generator": "當前生成的世界類型不是群巒傳說，請更換世界類型", + "tfcgenviewer.preview_world.visualizer_type": "可視類型", + "tfcgenviewer.preview_world.visualizer_type.biomes": "生態域", + "tfcgenviewer.preview_world.visualizer_type.rainfall": "降雨量", + "tfcgenviewer.preview_world.visualizer_type.temperature": "溫度", + "tfcgenviewer.preview_world.visualizer_type.climate_features": "氣候生成限制", + "tfcgenviewer.preview_world.visualizer_type.biome_altitude": "生態域海拔", + "tfcgenviewer.preview_world.visualizer_type.inland_height": "內陸高度", + "tfcgenviewer.preview_world.visualizer_type.rivers_and_mountains": "河與山", + "tfcgenviewer.preview_world.visualizer_type.rock_types": "岩石類型", "tfcgenviewer.preview_world.visualizer_type.rocks": "Rocks", + "tfcgenviewer.preview_world.x_offset": "X軸偏移", + "tfcgenviewer.preview_world.x_offset.tooltip": "預覽中心相對於 0 的 x 軸偏移量（單位：公里）", + "tfcgenviewer.preview_world.z_offset": "Z軸偏移", + "tfcgenviewer.preview_world.z_offset.tooltip": "預覽中心相對於 0 的 z 軸偏移量（單位：公里）", + "tfcgenviewer.preview_world.spawn_overlay": "顯示重生點", + "tfcgenviewer.preview_world.preview_info": "生成 %s 個區域耗時 %s 秒\n尺寸： %s 公里 x %s公里\n中心點：(%s, %s)\n可視類型：%s\n\n色標：%s", + "tfcgenviewer.preview_world.preview_info.no_coords": "生成 %s 個區域耗時 %s 秒\n尺寸： %s 公里 x %s公里\n可視類型：%s\n\n色標：%s", + "tfcgenviewer.preview_world.preview_info.generating": "正在生成...", + "tfcgenviewer.preview_world.preview_info.error": "生成時發生錯誤\n\n請查看日誌、錯誤報告與用其他種子重新生成", + "tfcgenviewer.preview_world.color_key_template": "%s : %s", "tfcgenviewer.preview_world.km": "%s km", + "tfcgenviewer.preview_world.preview_scale": "預覽比例", + "tfcgenviewer.preview_world.preview_pos": "(%s,%s)", + "tfcgenviewer.preview_world.no_tooltip_available": "無可用提示", + "tfcgenviewer.rock_editor.title": "編輯地層", + "tfcgenviewer.rock_editor.graph": "線上圖表", + "tfcgenviewer.rock_editor.validate": "驗證", + "tfcgenviewer.rock_editor.validate.fail": "驗證失敗：%s", + "tfcgenviewer.rock_editor.validate.success": "驗證成功", "tfcgenviewer.rock_editor.delete_tooltip": "移除", + "tfcgenviewer.rock_editor.delete_tooltip.named": "移除 %s", + "tfcgenviewer.rock_editor.edit_tooltip": "將 %s 移至編輯器", + "tfcgenviewer.rock_editor.change_block": "切換編輯 %s 方块", + "tfcgenviewer.rock_editor.rock_layer_type.bottom": "底層岩石", + "tfcgenviewer.rock_editor.rock_layer_type.ocean_floor": "海床岩石層", + "tfcgenviewer.rock_editor.rock_layer_type.volcanic": "火山岩石層", + "tfcgenviewer.rock_editor.rock_layer_type.land": "陸地岩石層", + "tfcgenviewer.rock_editor.rock_layer_type.uplift": "隆起岩石層", + "tfcgenviewer.rock_editor.layer_in_editor": "在編輯器內", + "tfcgenviewer.rock_editor.currently_editing_layer": "當前編輯：%s", + "tfcgenviewer.rock_editor.layer_definition_mapping": "%s -> %s", + "tfcgenviewer.rock_editor.layer_id": "地層 ID", "tfcgenviewer.rock_editor.confirm": "確認", + "tfcgenviewer.rock_editor.add_layer_definition_mapping": "添加岩石到地層映射", + "tfcgenviewer.rock_editor.create_layer_definition": "建立地層定義", + "tfcgenviewer.rock_editor.hint.edit_rock_settings_name": "正在編輯的岩石名稱", + "tfcgenviewer.rock_editor.hint.layer_definition_rock": "岩石 -->", + "tfcgenviewer.rock_editor.hint.layer_definition_layer": "--> 地層", + "tfcgenviewer.rock_editor.hint.raw_selection": "方塊為", + "tfcgenviewer.rock_editor.hint.hardened_selection": "硬化方塊為", + "tfcgenviewer.rock_editor.hint.gravel_selection": "砂礫方塊為", + "tfcgenviewer.rock_editor.hint.cobble_selection": "卵石方塊為", + "tfcgenviewer.rock_editor.hint.sand_selection": "沙方塊為", + "tfcgenviewer.rock_editor.hint.sandstone_selection": "砂岩方塊為", + "tfcgenviewer.rock_editor.hint.spike_selection": "岩錐方塊為(可空)", + "tfcgenviewer.rock_editor.hint.loose_selection": "石子方塊為(可空)", + "tfcgenviewer.rock_editor.hint.mossy_loose_selection": "青苔方塊為(可空)", + "tfcgenviewer.rock_editor.tab.rock_settings": "岩石設定", + "tfcgenviewer.rock_editor.tab.layer_types": "地層類型", + "tfcgenviewer.rock_editor.tab.layer_definitions": "地層定義", + "tfcgenviewer.rock_editor.error.empty_rock_name": "岩石名稱不可為空", + "tfcgenviewer.rock_editor.error.rock_already_exists": "%s 岩石已存在", + "tfcgenviewer.rock_editor.error.invalid_id": "%s 是無效的註冊 ID", + "tfcgenviewer.rock_editor.error.unknown_block": "%s 方塊不存在", + "tfcgenviewer.rock_editor.error.layer_already_has": "%s 已有名為 %s 的值", "rock.tfc.andesite": "安山岩", "rock.tfc.chalk": "粉筆", "rock.tfc.diorite": "閃長岩", diff --git a/kubejs/assets/tfcscraping/lang/zh_tw.json b/kubejs/assets/tfcscraping/lang/zh_tw.json new file mode 100644 index 0000000000..503c9aa584 --- /dev/null +++ b/kubejs/assets/tfcscraping/lang/zh_tw.json @@ -0,0 +1,23 @@ +{ + "item.tfcscraping.ceramic.scraping_knife_blade_mold": "剝皮刀刃模具", + "item.tfcscraping.ceramic.unfired_scraping_knife_blade_mold": "未燒製的剝皮刀刃模具", + "item.tfcscraping.metal.scraping_knife.bismuth_bronze": "鉍青銅剝皮刀", + "item.tfcscraping.metal.scraping_knife.black_bronze": "黑青銅剝皮刀", + "item.tfcscraping.metal.scraping_knife.black_steel": "黑鋼剝皮刀", + "item.tfcscraping.metal.scraping_knife.blue_steel": "藍鋼剝皮刀", + "item.tfcscraping.metal.scraping_knife.bronze": "青銅剝皮刀", + "item.tfcscraping.metal.scraping_knife.copper": "銅剝皮刀", + "item.tfcscraping.metal.scraping_knife.red_steel": "紅鋼剝皮刀", + "item.tfcscraping.metal.scraping_knife.steel": "鋼剝皮刀", + "item.tfcscraping.metal.scraping_knife.wrought_iron": "剝皮刀", + "item.tfcscraping.metal.scraping_knife_blade.bismuth_bronze": "鉍青銅剝皮刀刃", + "item.tfcscraping.metal.scraping_knife_blade.black_bronze": "黑青銅剝皮刀刃", + "item.tfcscraping.metal.scraping_knife_blade.black_steel": "黑鋼剝皮刀刃", + "item.tfcscraping.metal.scraping_knife_blade.blue_steel": "藍鋼剝皮刀刃", + "item.tfcscraping.metal.scraping_knife_blade.bronze": "青銅青銅剝皮刀刃", + "item.tfcscraping.metal.scraping_knife_blade.copper": "銅剝皮刀刃", + "item.tfcscraping.metal.scraping_knife_blade.red_steel": "紅鋼剝皮刀刃", + "item.tfcscraping.metal.scraping_knife_blade.steel": "鋼剝皮刀刃", + "item.tfcscraping.metal.scraping_knife_blade.wrought_iron": "鍛鐵剝皮刀刃", + "tfcscraping.creative_tab.scraping": "剝皮刀" +} \ No newline at end of file diff --git a/kubejs/assets/tfcvesseltooltip/lang/zh_tw.json b/kubejs/assets/tfcvesseltooltip/lang/zh_tw.json index 1f66bf781e..a859fe1dc4 100644 --- a/kubejs/assets/tfcvesseltooltip/lang/zh_tw.json +++ b/kubejs/assets/tfcvesseltooltip/lang/zh_tw.json @@ -1,3 +1,5 @@ { + "tfcvesseltooltip.tooltip.metal": "§f%s mB的%s§7 (%s§7)", + "tfcvesseltooltip.tooltip.smelts_into": "熔成：", "tfcvesseltooltip.tooltip.alloy": "%s mB的%s" } diff --git a/kubejs/assets/tfcweldbutton/lang/zh_tw.json b/kubejs/assets/tfcweldbutton/lang/zh_tw.json new file mode 100644 index 0000000000..f8121c0000 --- /dev/null +++ b/kubejs/assets/tfcweldbutton/lang/zh_tw.json @@ -0,0 +1,3 @@ +{ + "tfcweldbutton.gui.weld_button": "焊接" +} diff --git a/kubejs/assets/tfg/lang/de_de.json b/kubejs/assets/tfg/lang/de_de.json index e8aa846782..4c0f5aa772 100644 --- a/kubejs/assets/tfg/lang/de_de.json +++ b/kubejs/assets/tfg/lang/de_de.json @@ -435,7 +435,6 @@ "block.tfg.loose.permafrost": "Loser Permafrost", "block.tfg.rock.aqueduct_permafrost": "Permafrostaquädukt", "block.tfg.rock.hardened_red_granite": "Gehärteter Roter Granit", - "block.tfg.rock.red_granite_stair": "Raue Rote Granittreppe", "block.tfg.rock.red_granite_slab": "Raue Rote Granitstufe", "block.tfg.rock.red_granite_wall": "Raue Rote Granitwand", "block.tfg.rock.polished_red_granite_stairs": "Polierte Rote Granittreppe", @@ -541,7 +540,6 @@ "block.tfg.rock.cut_red_sandstone_stairs": "Geschnittene Hematitische Sandsteintreppe", "block.tfg.rock.cut_red_sandstone_wall": "Geschnittene Hematitische Sandsteinwand", "block.tfg.rock.bricks_venus_sandstone_wall": "Trachyt Sandsteinziegelwand", - "block.tfg.rock.cracked_bricks_venus_sandstone_stair": "Rissige Trachyt Sandsteinziegeltreppe", "block.tfg.rock.cracked_bricks_venus_sandstone_slab": "Rissige Trachyt Sandsteinziegelstufe", "block.tfg.rock.cracked_bricks_venus_sandstone_wall": "Rissige Trachyt Sandsteinziegelwand", "block.tfg.rock.quartz_wall": "Quarzwand", diff --git a/kubejs/assets/tfg/lang/fr_fr.json b/kubejs/assets/tfg/lang/fr_fr.json index beb523ccaf..9bfc968167 100644 --- a/kubejs/assets/tfg/lang/fr_fr.json +++ b/kubejs/assets/tfg/lang/fr_fr.json @@ -522,7 +522,6 @@ "block.tfg.loose.permafrost": "Caillou en Pergélisol", "block.tfg.rock.aqueduct_permafrost": "Aqueduc de pergélisol", "block.tfg.rock.hardened_red_granite": "Granite Rouge Endurci", - "block.tfg.rock.red_granite_stair": "Escalier en granite rouge brut", "block.tfg.rock.red_granite_slab": "Dalle de Granite Rouge Brute", "block.tfg.rock.red_granite_wall": "Mur de Granite Rouge Brute", "block.tfg.rock.polished_red_granite_stairs": "Escaliers en Granite Rouge Poli", @@ -615,7 +614,6 @@ "block.tfg.rock.cut_red_sandstone_stairs": "Escalier en grès hématitique taillé", "block.tfg.rock.cut_red_sandstone_wall": "Mur de Grès Hématitique Taillé", "block.tfg.rock.bricks_venus_sandstone_wall": "Mur de briques de grès trachytique", - "block.tfg.rock.cracked_bricks_venus_sandstone_stair": "Escalier en briques de grès trachytique craquelées", "block.tfg.rock.cracked_bricks_venus_sandstone_slab": "Dalle de briques de grès trachytique craquelées", "block.tfg.rock.cracked_bricks_venus_sandstone_wall": "Mur de briques de grès trachytique craquelées", "block.tfg.rock.quartz_wall": "Mur de quartz", @@ -655,20 +653,15 @@ "block.tfg.rock.tuff_wall": "Mur de tuf", "block.tfg.rock.cobble_tuff": "Pierres de tuf", "block.tfg.rock.cobble_tuff_slab": "Dalle de pierres de tuf", - "block.tfg.rock.cobble_tuff_stair": "Escalier en pierres de tuf", "block.tfg.rock.cobble_tuff_wall": "Mur de pierres de tuf", "block.tfg.rock.mossy_cobble_tuff_slab": "Dalle de pierres de tuf", - "block.tfg.rock.mossy_cobble_tuff_stair": "Escalier en pierres de tuf", "block.tfg.rock.mossy_cobble_tuff_wall": "Mur de pierres de tuf", "block.tfg.rock.bricks_tuff": "Briques de tuf", "block.tfg.rock.bricks_tuff_slab": "Dalle de briques de tuf", - "block.tfg.rock.bricks_tuff_stair": "Escalier en briques de tuf", "block.tfg.rock.bricks_tuff_wall": "Mur de briques de tuf", "block.tfg.rock.mossy_bricks_tuff_slab": "Dalle de briques de tuf moussues", - "block.tfg.rock.mossy_bricks_tuff_stair": "Escalier en briques de tuf moussues", "block.tfg.rock.mossy_bricks_tuff_wall": "Mur de briques de tuf moussues", "block.tfg.rock.cracked_bricks_tuff_slab": "Dalle de briques de tuf craquelées", - "block.tfg.rock.cracked_bricks_tuff_stair": "Escalier en briques de tuf craquelées", "block.tfg.rock.cracked_bricks_tuff_wall": "Mur de briques de tuf craquelées", "block.tfg.rock.chiseled_tuff": "Tuf taillé", "block.tfg.rock.chiseled_tuff_bricks": "Briques de tuf taillé", @@ -2619,6 +2612,7 @@ "tfg.ore_vein.moon_topaz": "Topaze bleue, topaze, chalcocite...", "tfg.ore_vein.beneath_graphite": "Graphite, charbon bitumineux", "tfg.ore_vein.beneath_iron_magnetite": "Magnétite, magnétite vanadifère...", + "tfg.ore_vein.beneath_molydbenum": "Wulfénite, molybdénite...", "tfg.ore_vein.venus_manual_salt": "Halite, sylvine, lépidolite...", "tfg.ore_vein.venus_manual_sulfur": "Soufre, pyrite, sphalérite", "tfg.creative_tab.tfg": "TerraFirmaGreg", @@ -4747,10 +4741,6 @@ "quests.ore_proc.bauxite.title": "The Bauxite Line", "quests.ore_proc.bauxite.subtitle": "New to modern GregTech versions!", "quests.ore_proc.bauxite.desc": "You &ocould&r just electrolyze all your Bauxite dust to get a measly 6 Aluminium and 1 Rutile per 15 Bauxite... Or you could try out the &6Bauxite Line&r!\n\nThis new processing line returns about 2x as much &bAluminium&r and 3x as much &4Rutile&r per Bauxite, while also giving you a bunch of Gallium, Iron, Neodymium, and Chromium for free!", - "quests.ore_proc.gem_slurry.title": "Gem Slurries", - "quests.ore_proc.gem_slurry.subtitle": "We... are the crystal—hblrlrlr", - "quests.ore_proc.gem_slurry.desc": "&6Gem Slurries&r are optional but short processing lines for Ruby, Sapphire, and Green Sapphire to squeeze a bit more resources out of them. Compared to electrolysis:\n\n- &cRuby Slurry&r returns almost 3x as much Aluminium and Chromium\n\n- &9Sapphire Slurry&r returns 2x as much Aluminium\n\n- &aGreen Sapphire Slurry&r returns 2x as much Aluminium and a little extra Beryllium\n\nAnd on top of that, they all have a small chance to return some extra Titanium, Iron, and Vanadium too!", - "quests.ore_proc.gem_slurry.task": "Any Gem Slurry Ore", "quests.moon": "La Lune", "quests.space_survival.preparations.title": "Pre-Launch Preparations", "quests.space_survival.preparations.subtitle": "Make sure you're ready!", diff --git a/kubejs/assets/tfg/lang/ja_jp.json b/kubejs/assets/tfg/lang/ja_jp.json index 7a357a3fb2..80aa9102a1 100644 --- a/kubejs/assets/tfg/lang/ja_jp.json +++ b/kubejs/assets/tfg/lang/ja_jp.json @@ -516,7 +516,6 @@ "block.tfg.loose.permafrost": "永久凍土の小石", "block.tfg.rock.aqueduct_permafrost": "永久凍土の用水路", "block.tfg.rock.hardened_red_granite": "硬い赤色花崗岩", - "block.tfg.rock.red_granite_stair": "赤色花崗岩の階段", "block.tfg.rock.red_granite_slab": "赤色花崗岩のハーフブロック", "block.tfg.rock.red_granite_wall": "赤色花崗岩の塀", "block.tfg.rock.polished_red_granite_stairs": "磨かれた赤色花崗岩の階段", @@ -626,7 +625,6 @@ "block.tfg.rock.cut_red_sandstone_stairs": "研がれた赤鉄質の砂岩の階段", "block.tfg.rock.cut_red_sandstone_wall": "研がれた赤鉄質の砂岩の塀", "block.tfg.rock.bricks_venus_sandstone_wall": "粗面岩の砂岩のレンガの塀", - "block.tfg.rock.cracked_bricks_venus_sandstone_stair": "ひび割れた粗面岩の砂岩のレンガの階段", "block.tfg.rock.cracked_bricks_venus_sandstone_slab": "ひび割れた粗面岩の砂岩のレンガのハーフブロック", "block.tfg.rock.cracked_bricks_venus_sandstone_wall": "ひび割れた粗面岩の砂岩のレンガの塀", "block.tfg.rock.quartz_wall": "クォーツの塀", @@ -696,21 +694,16 @@ "block.tfg.rock.tuff_wall": "凝灰岩の塀", "block.tfg.rock.cobble_tuff": "凝灰岩の丸石", "block.tfg.rock.cobble_tuff_slab": "凝灰岩の丸石のハーフブロック", - "block.tfg.rock.cobble_tuff_stair": "凝灰岩の丸石の階段", "block.tfg.rock.cobble_tuff_wall": "凝灰岩の丸石の塀", "block.tfg.rock.mossy_cobble_tuff": "苔むした凝灰岩の丸石", "block.tfg.rock.mossy_cobble_tuff_slab": "凝灰岩の丸石のハーフブロック", - "block.tfg.rock.mossy_cobble_tuff_stair": "凝灰岩の丸石の階段", "block.tfg.rock.mossy_cobble_tuff_wall": "凝灰岩の丸石の塀", "block.tfg.rock.bricks_tuff": "凝灰岩のレンガ", "block.tfg.rock.bricks_tuff_slab": "凝灰岩のレンガのハーフブロック", - "block.tfg.rock.bricks_tuff_stair": "凝灰岩のレンガの階段", "block.tfg.rock.bricks_tuff_wall": "凝灰岩のレンガの塀", "block.tfg.rock.mossy_bricks_tuff_slab": "苔むした凝灰岩のレンガのハーフブロック", - "block.tfg.rock.mossy_bricks_tuff_stair": "苔むした凝灰岩のレンガの階段", "block.tfg.rock.mossy_bricks_tuff_wall": "苔むした凝灰岩のレンガの塀", "block.tfg.rock.cracked_bricks_tuff_slab": "ひび割れた凝灰岩のレンガのハーフブロック", - "block.tfg.rock.cracked_bricks_tuff_stair": "ひび割れた凝灰岩のレンガの階段", "block.tfg.rock.cracked_bricks_tuff_wall": "ひび割れた凝灰岩のレンガの塀", "block.tfg.rock.chiseled_tuff": "模様入りの凝灰岩", "block.tfg.rock.chiseled_tuff_bricks": "模様入り凝灰岩のレンガ", @@ -1085,6 +1078,7 @@ "block.tfg.mud_bricks.alfisol_slab": "アルカリ泥のレンガのハーフブロック", "block.tfg.mud_bricks.alfisol_wall": "アルカリ泥のレンガの塀", "block.tfg.tamped.dirt.alfisol": "突き固められたアルカリ土", + "block.tfg.tamped.mud.alfisol": "突き固められたアルカリ泥", "block.tfg.dirt.mollisol": "火山性土", "block.tfg.grass_path.mollisol": "火山性土の道", "block.tfg.farmland.mollisol": "火山性の耕地", @@ -1102,6 +1096,7 @@ "block.tfg.mud_bricks.mollisol_slab": "火山性泥のレンガのハーフブロック", "block.tfg.mud_bricks.mollisol_wall": "火山性泥のレンガの塀", "block.tfg.tamped.dirt.mollisol": "突き固められた火山性土", + "block.tfg.tamped.mud.mollisol": "突き固められた火山性泥", "block.tfg.dirt.oxisol": "熱帯性土", "block.tfg.grass_path.oxisol": "熱帯性土の道", "block.tfg.farmland.oxisol": "熱帯性の耕地", @@ -1119,6 +1114,7 @@ "block.tfg.mud_bricks.oxisol_slab": "熱帯性泥のレンガのハーフブロック", "block.tfg.mud_bricks.oxisol_wall": "熱帯性泥のレンガの塀", "block.tfg.tamped.dirt.oxisol": "突き固められた熱帯性土", + "block.tfg.tamped.mud.oxisol": "突き固められた熱帯性泥", "block.tfg.dirt.podzol": "層状の土", "block.tfg.grass_path.podzol": "層状の土の道", "block.tfg.farmland.podzol": "層状の耕地", @@ -1136,6 +1132,7 @@ "block.tfg.mud_bricks.podzol_slab": "層状のレンガのハーフブロック", "block.tfg.mud_bricks.podzol_wall": "層状のレンガの塀", "block.tfg.tamped.dirt.podzol": "突き固められた層状の土", + "block.tfg.tamped.mud.podzol": "突き固められた層状の泥", "block.tfg.large_bronze_boiler": "ブロンズ製大型ボイラー", "block.tfg.large_steel_boiler": "スチール製大型ボイラー", "block.tfg.large_steam_turbine": "大型蒸気タービン", @@ -2641,6 +2638,7 @@ "tfg.ore_vein.beneath_coal_lignite": "褐炭", "tfg.ore_vein.beneath_graphite": "グラファイト, 歴青炭…", "tfg.ore_vein.beneath_iron_magnetite": "磁鉄鉱, バナジウム磁鉄鉱…", + "tfg.ore_vein.beneath_molydbenum": "モリブデン鉛鉱, 輝水鉛鉱…", "tfg.ore_vein.venus_manual_salt": "岩塩, カリ岩塩, リチア雲母…", "tfg.ore_vein.venus_manual_sulfur": "硫黄, 黄鉄鉱, 閃亜鉛鉱", "tfg.creative_tab.tfg": "TerraFirmaGreg", @@ -5438,10 +5436,6 @@ "quests.ore_proc.bauxite.title": "ボーキサイト", "quests.ore_proc.bauxite.subtitle": "これが現代のGregTechです", "quests.ore_proc.bauxite.desc": "ボーキサイトをそのまま電解しても、15個からアルミが6個とルチルが1個しか手に入りません...でも、&6ボーキサイトライン&rなら話は別です！\n\nこの新しい処理ルートでは、アルミは約2倍、ルチルは約3倍の効率で回収できます。しかも、ガリウム・鉄・ネオジム・クロムといったおまけの素材まで手に入る、本当におトクな精錬ラインです！", - "quests.ore_proc.gem_slurry.title": "宝石の泥漿", - "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": "Any Gem Slurry Ore", "quests.moon": "月", "quests.moon.subtitle": "人の手がまだ及んでいない、人類最後の秘境……それは宇宙！", "quests.space_survival.preparations.title": "出発に先立って", diff --git a/kubejs/assets/tfg/lang/pl_pl.json b/kubejs/assets/tfg/lang/pl_pl.json index faf5988f85..3a1d5f6a91 100644 --- a/kubejs/assets/tfg/lang/pl_pl.json +++ b/kubejs/assets/tfg/lang/pl_pl.json @@ -518,7 +518,6 @@ "block.tfg.permafrost_support_horizontal": "Pozioma podpora z wiecznej zmarzliny", "block.tfg.rock.aqueduct_permafrost": "Akwedukt z wiecznej zmarzliny", "block.tfg.rock.hardened_red_granite": "Wzmocniony czerwony granit", - "block.tfg.rock.red_granite_stair": "Surowe czerwone granitowe schody", "block.tfg.rock.red_granite_slab": "Surowa czerwona granitowa płyta", "block.tfg.rock.red_granite_wall": "Surowy czerwony granitowy murek", "block.tfg.rock.polished_red_granite_stairs": "Wypolerowane czerwone granitowe schody", @@ -630,7 +629,6 @@ "block.tfg.rock.cut_red_sandstone_stairs": "Przycięte hematytowe piaskowcowe schody", "block.tfg.rock.cut_red_sandstone_wall": "Przycięty hematytowy piaskowcowy murek", "block.tfg.rock.bricks_venus_sandstone_wall": "Trachitowy piaskowcowy ceglany murek", - "block.tfg.rock.cracked_bricks_venus_sandstone_stair": "Popękane trachitowe piaskowcowe ceglane schody", "block.tfg.rock.cracked_bricks_venus_sandstone_slab": "Popękana trachitowa piaskowcowa ceglana płyta", "block.tfg.rock.cracked_bricks_venus_sandstone_wall": "Popękany trachitowy piaskowcowy ceglany murek", "block.tfg.rock.quartz_wall": "Kwarcowy murek", @@ -701,21 +699,16 @@ "block.tfg.rock.tuff_wall": "Tufowy murek", "block.tfg.rock.cobble_tuff": "Tufowy bruk", "block.tfg.rock.cobble_tuff_slab": "Tufowa brukowa płyta", - "block.tfg.rock.cobble_tuff_stair": "Schody z bruku tufowego", "block.tfg.rock.cobble_tuff_wall": "Tufowy brukowy murek", "block.tfg.rock.mossy_cobble_tuff": "Tufowy zamszony bruk", "block.tfg.rock.mossy_cobble_tuff_slab": "Tufowa brukowa płyta", - "block.tfg.rock.mossy_cobble_tuff_stair": "Tufowe zamszone brukowe schody", "block.tfg.rock.mossy_cobble_tuff_wall": "Tufowy brukowy murek", "block.tfg.rock.bricks_tuff": "Cegły z tufu", "block.tfg.rock.bricks_tuff_slab": "Tufowa ceglana płyta", - "block.tfg.rock.bricks_tuff_stair": "Tufowe ceglane schody", "block.tfg.rock.bricks_tuff_wall": "Tufowy ceglany murek", "block.tfg.rock.mossy_bricks_tuff_slab": "Zamszona tufowa ceglana płyta", - "block.tfg.rock.mossy_bricks_tuff_stair": "Zamszone tufowe ceglane schody", "block.tfg.rock.mossy_bricks_tuff_wall": "Zamszony tufowy ceglany murek", "block.tfg.rock.cracked_bricks_tuff_slab": "Popękana tufowa ceglana płyta", - "block.tfg.rock.cracked_bricks_tuff_stair": "Popękane tufowe ceglane schody", "block.tfg.rock.cracked_bricks_tuff_wall": "Popękany tufowy ceglany murek", "block.tfg.rock.chiseled_tuff": "Rzeźbiony tuf", "block.tfg.rock.chiseled_tuff_bricks": "Rzeźbione cegły z tufu", @@ -2585,6 +2578,7 @@ "tfg.ore_vein.beneath_gold_rich": "Złoto rodzime, magnetyt...", "tfg.ore_vein.beneath_iron_hematite": "Hematyt, goethyt", "tfg.ore_vein.beneath_manganese": "Piroluzyt, Grossular...", + "tfg.ore_vein.beneath_molydbenum": "Wulfenit, molibdenit...", "tfg.ore_vein.beneath_nickel": "Pentlandyt, garnieryt...", "tfg.ore_vein.beneath_redstone": "Redstone, cynober...", "tfg.ore_vein.beneath_salt": "Halit, sylwin, trona", @@ -4330,8 +4324,6 @@ "quests.ore_proc.packer.subtitle": "Jest naprawdę szybki", "quests.ore_proc.packer.task": "Dowolny packowacz", "quests.ore_proc.bauxite.title": "Linia boksytowa", - "quests.ore_proc.gem_slurry.title": "Muł z kamieni szlachetnych", - "quests.ore_proc.gem_slurry.task": "Dowolny muł z kamieni szlachetnych", "quests.ore_proc.chromium.subtitle": "Więcej niż jedna ścieżka do zwycięstwa", "quests.moon": "Księżyc", "quests.space_survival.preparations.title": "Przygotowania przed startem", diff --git a/kubejs/assets/tfg/lang/ru_ru.json b/kubejs/assets/tfg/lang/ru_ru.json index 709fb407d8..fae838f88f 100644 --- a/kubejs/assets/tfg/lang/ru_ru.json +++ b/kubejs/assets/tfg/lang/ru_ru.json @@ -538,7 +538,7 @@ "block.tfg.permafrost_support_horizontal": "Опора из многолетней мерзлоты", "block.tfg.rock.aqueduct_permafrost": "Акведук из многолетней мерзлоты", "block.tfg.rock.hardened_red_granite": "Укреплённый красный гранит", - "block.tfg.rock.red_granite_stair": "Ступеньки из красного гранита", + "block.tfg.rock.red_granite_stairs": "Ступеньки из красного гранита", "block.tfg.rock.red_granite_slab": "Плита из красного гранита", "block.tfg.rock.red_granite_wall": "Ограда из красного гранита", "block.tfg.rock.polished_red_granite_stairs": "Ступеньки из полированного красного гранита", @@ -650,7 +650,7 @@ "block.tfg.rock.cut_red_sandstone_stairs": "Ступеньки Hиз резного гематитового песчаника", "block.tfg.rock.cut_red_sandstone_wall": "Ограда из резного гематитового песчаника", "block.tfg.rock.bricks_venus_sandstone_wall": "Ограда из трахитового песчаника", - "block.tfg.rock.cracked_bricks_venus_sandstone_stair": "Ступеньки из потрескавшегося трахитового песчаника", + "block.tfg.rock.cracked_bricks_venus_sandstone_stairs": "Ступеньки из потрескавшегося трахитового песчаника", "block.tfg.rock.cracked_bricks_venus_sandstone_slab": "Плита из потрескавшегося трахитового песчаника", "block.tfg.rock.cracked_bricks_venus_sandstone_wall": "Ограда из потрескавшегося трахитового песчаника", "block.tfg.rock.quartz_wall": "Ограда из кварца", @@ -721,21 +721,21 @@ "block.tfg.rock.tuff_wall": "Ограда из туфа", "block.tfg.rock.cobble_tuff": "Туфовый булыжник", "block.tfg.rock.cobble_tuff_slab": "Плита из туфового булыжника", - "block.tfg.rock.cobble_tuff_stair": "Ступеньки из туфового булыжника", + "block.tfg.rock.cobble_tuff_stairs": "Ступеньки из туфового булыжника", "block.tfg.rock.cobble_tuff_wall": "Ограда из туфового булыжника", "block.tfg.rock.mossy_cobble_tuff": "Замшелый туфовый булыжник", "block.tfg.rock.mossy_cobble_tuff_slab": "Плита из замшелого туфового булыжника", - "block.tfg.rock.mossy_cobble_tuff_stair": "Ступеньки из замшелого туфового булыжника", + "block.tfg.rock.mossy_cobble_tuff_stairs": "Ступеньки из замшелого туфового булыжника", "block.tfg.rock.mossy_cobble_tuff_wall": "Ограда из замшелого туфового булыжника", "block.tfg.rock.bricks_tuff": "Туфовые кирпичи", "block.tfg.rock.bricks_tuff_slab": "Плита из туфовых кирпичей", - "block.tfg.rock.bricks_tuff_stair": "Ступени из туфовых кирпичей", + "block.tfg.rock.bricks_tuff_stairs": "Ступени из туфовых кирпичей", "block.tfg.rock.bricks_tuff_wall": "Ограда из туфовых кирпичей", "block.tfg.rock.mossy_bricks_tuff_slab": "Плита из замшелых туфовых кирпичей", - "block.tfg.rock.mossy_bricks_tuff_stair": "Ступени из замшелых туфовых кирпичей", + "block.tfg.rock.mossy_bricks_tuff_stairs": "Ступени из замшелых туфовых кирпичей", "block.tfg.rock.mossy_bricks_tuff_wall": "Ограда из замшелых туфовых кирпичей", "block.tfg.rock.cracked_bricks_tuff_slab": "Плита из потрескавшихся туфовых кирпичей", - "block.tfg.rock.cracked_bricks_tuff_stair": "Ступени из потрескавшихся туфовых кирпичей", + "block.tfg.rock.cracked_bricks_tuff_stairs": "Ступени из потрескавшихся туфовых кирпичей", "block.tfg.rock.cracked_bricks_tuff_wall": "Ограда из потрескавшихся туфовых кирпичей", "block.tfg.rock.chiseled_tuff": "Резной туфф", "block.tfg.rock.chiseled_tuff_bricks": "Резные туфовые кирпичи", @@ -812,6 +812,13 @@ "block.tfg.luv_gas_pressurizer": "§dПревосходный газовый компрессор II§r", "block.tfg.zpm_gas_pressurizer": "§cПревосходный газовый компрессор III§r", "block.tfg.uv_gas_pressurizer": "§3Безупречный газовый компрессор§r", + "block.tfg.hv_wireless_charger": "§6Улучшенная беспроводная зарядка II§r", + "block.tfg.ev_wireless_charger": "§6Улучшенная беспроводная зарядка III§r", + "block.tfg.iv_wireless_charger": "§9Превосходная беспроводная зарядка", + "block.tfg.luv_wireless_charger": "§dПревосходная беспроводная зарядкаII§r", + "block.tfg.zpm_wireless_charger": "§dПревосходная беспроводная зарядкаIII§r", + "block.tfg.uv_wireless_charger": "§3Безупречная беспроводная зарядка", + "block.tfg.uhv_wireless_charger": "§Эпичная беспроводная зарядка§r", "block.tfg.fluid.semiheavy_ammoniacal_water": "Полутяжёлая аммиачная вода", "block.tfg.fluid.sulfur_fumes": "Пары серы", "block.tfg.fluid.geyser_slurry": "Метастабильный шлам", @@ -1577,6 +1584,17 @@ "block.tfg.strut.truss.copper": "Распорка фермы из меди", "block.tfg.strut.truss.steel": "Распорка фермы из стали", "block.tfg.strut.truss.zinc": "Распорка фермы из цинка", + "block.tfg.groundcover.fallen_copper_lamp": "Упавший фонарь из меди", + "block.tfg.groundcover.fallen_bronze_lamp": "Упавший фонарь из бронзы", + "block.tfg.groundcover.fallen_black_bronze_lamp": "Упавший фонарь из чёрной бронзы", + "block.tfg.groundcover.fallen_bismuth_bronze_lamp": "Упавший фонарь из висмутовой бронзы", + "block.tfg.groundcover.fallen_wrought_iron_lamp": "Упавший фонарь из кованного железа", + "block.tfg.groundcover.fallen_steel_lamp": "Упавший фонарь из стали", + "block.tfg.groundcover.fallen_black_steel_lamp": "Упавший фонарь из чёрной стали", + "block.tfg.groundcover.fallen_red_steel_lamp": "Упавший фонарь из красной стали", + "block.tfg.groundcover.fallen_blue_steel_lamp": "Упавший фонарь из синей стали", + "block.tfg.spider_web": "Хрупкая паутина", + "block.tfg.spider_sac": "Паучий кокон", "tfg.block_entity.artisan_table": "Ремесленный стол", "tfg.block_entity.large_nest_box": "Большой насест", "effect.tfg.arsenicosis_warning": "Отравление мышьяком", @@ -1697,6 +1715,7 @@ "gui.tfg.chromatic_select.format": "&%1$s %2$s: %1$s", "gui.tfg.color_select.title": "Выбрать цвет", "gui.tfg.color_select.chromatic_btn": "§bХроматические эффекты", + "tfg.gui.ore_processing_gas.optimal_ratio.1": "Наилучшую эффективность можно получить с жидкостным люком", "tfg.gui.ore_processing_gas.optimal_ratio.2": "Заполнено газом на половину", "item.tfg.antipoison_pill": "Пилюля противоядия", "item.tfg.haste_pill": "Пилюля спешки", @@ -1738,6 +1757,7 @@ "item.tfg.polycaprolactam_string": "Поликапролактамовая нить", "item.tfg.copper_spindle": "Веретено (Медь)", "item.tfg.copper_spindle_head": "Головка веретена (Медь)", + "item.tfg.silk_fibers": "Шёлковое волокно", "item.tfg.space_suit_fabric": "Ткань скафандра", "item.tfg.vitrified_pearl": "Остеклованный эндер-жемчуг", "item.tfg.fishing_net.wood": "Рыболовная сеть (Дерево)", @@ -2230,6 +2250,12 @@ "ali/loot_table/chests/moonbase": "Сундук на разрушенной лунной базе", "ali/loot_table/chests/cruncher_nest": "Сундук марсианских руин", "ali/loot_table/chests/illager_camps": "Сундук в лагере Разбойников", + "ali/loot_table/chests/mineshaft/generic": "Сундук из заброшенной шахты", + "ali/loot_table/chests/mineshaft/spider": "Сундук из заражённой шахты", + "ali/loot_table/chests/mineshaft/start": "Сундук у входа в заброшенную шахту ", + "ali/loot_table/chests/beneath_hut": "Сундук из заброшенной хижины в бездне", + "ali/loot_table/chests/beneath_tower_top": "Сундук из вершины башни пиглинов", + "ali/loot_table/chests/beneath_tower_bottom": "Сундук из дна башни пиглинов", "ali/loot_table/panning/deposits/native_copper_granite": "Месторождение самородной меди (Гранит)", "ali/loot_table/panning/deposits/native_copper_diorite": "Месторождение самородной меди (Диорит)", "ali/loot_table/panning/deposits/native_copper_gabbro": "Месторождение самородной меди (Габбро)", @@ -2795,6 +2821,7 @@ "tfg.ore_vein.normal_sulfide": "Сера, Стибнит, Борнит (Вулканическое)", "tfg.ore_vein.normal_tarkianite": "Таркианит, Бура, Трона", "tfg.ore_vein.sand_basaltic": "Базальтовый минеральный песок...", + "tfg.ore_vein.sand_garnet": "Глауконитовый песок", "tfg.ore_vein.sand_granitic": "Гранитный минеральный песок...", "tfg.ore_vein.sand_tin": "Касситеритовий песок", "tfg.ore_vein.surface_bismuth": "Висмут (Поверхностный)", @@ -2885,6 +2912,7 @@ "tfg.ore_vein.beneath_lead_silver": "Галена, Самородное серебро, Свинец", "tfg.ore_vein.beneath_lithium": "Сподумен, Литиум, Сильвит", "tfg.ore_vein.beneath_manganese": "Пиролюзит, Гроссуляр...", + "tfg.ore_vein.beneath_molydbenum": "Вульфенит, Молибденит...", "tfg.ore_vein.beneath_nickel": "Пентландит, Гарниерит...", "tfg.ore_vein.beneath_phlogopite": "Флогопит, сера, апатит.", "tfg.ore_vein.beneath_phosphate": "Трикалийфосфат, Апатит...", @@ -3253,6 +3281,7 @@ "tfg.tooltip.surfer_variant.tube": "Цвета нокс-ягоды", "tfg.tooltip.surfer_variant.fire": "Рыжий", "tfg.tooltip.surfer_variant.brain": "Гласианский", + "tfg.tooltip.surfer_variant.silver": "Серебрянная шкура", "tfg.tooltip.nametag": "§7Используется на столе писаря вместе с предметом для его переименования или с помощью черной краски для переименования бирки.", "tfg.tooltip.yeast_starter": "§7Приготовлено с использованием сухофруктов.", "tfg.tooltip.beehive": "§7Необходимо заполнить ульи пустыми рамками и окружить цветами, чтобы привлечь пчел.", @@ -3461,7 +3490,7 @@ "tfg.tooltip.nutrition.exhaustion_multiplier_info": "Умножает базовое значение источников истощения.\n(Например бег, прыжки и т.д.)", "tfg.tooltip.nutrition.fruit_info": "Потребность во фруктах можно восполнить, собирая их с фруктовых деревьев и ягодных кустов, которых плодоносят в определённые месяца.\n\n§f§lЭффекты:§r\n ›§n§f55%§r → §bУменьшает потребление жажды на 25%§r\n ›§n§f85%§r → §b Увеличивает скорость копания на 30%§r", "tfg.tooltip.nutrition.vegetables_info": "Потребность в овощах в основном восполняют, выращивая растения. \n§f§lЭффекты:§r\n\n ›§n§f55%§r → §bУбирает замедление скорости копания под водой§r\n ›§n§f85%§r → §bДаёт эффект подводного дыхания§r", - "tfg.tooltip.nutrition.protein_info": "Потребность в белке в основном можно получить из мяса или рыбы. Но некоторые растения могут обеспечить тебя белками.\n\n§f§lЭффекты:§r\n ›§n§f55%§r → §bУменьшает множитель истощения на 25%§r\n ›§n§f85%§r → §Позволяет носить с собой дополнительный большой или тяжёлый предмет без перегрузки§r", + "tfg.tooltip.nutrition.protein_info": "Потребность в белке в основном можно получить из мяса или рыбы. Но некоторые растения могут обеспечить тебя белками.\n\n§f§lЭффекты:§r\n ›§n§f55%§r → §bУменьшает множитель утомления на 25%§r\n ›§n§f85%§r → §bПозволяет переносить дополнительный тяжёлый предмет без перегрузки§r", "tfg.tooltip.nutrition.dairy_info": "Потребность в молоке можно восполнить, поедая молочную продукцию. Так же, потребность в молоке можно восполнить обычным питьём молока.\n\n§f§lЭффекты:§r\n ›§n§f55%§r → §bДаёт эффект невесомости I§r\n ›§n§f85%§r → §bДаёт эффект невесомости IV§r\n", "tfg.tooltip.nutrition.grain_info": "Потребность в зерновых можно восполнить, поедая хлебобулочные изделия из пшеницы, риса, ржи и т.д.\n\n§f§lЭффекты:§r\n ›§n§f55%§r → §bУвеличение скорости передвижения на 5%§r\n ›§n§f85%§r → §bУвеличение скорости передвижения на 15%f§r", "tfg.tooltip.nutrition.toxins_info": "Заражение токсинами можно получить, поедая определённые опасные продукты.\n\n§8§oЗаражение уменьшается каждый день на 3%§r\n\n§f§Эффекты:§r\n ›§n§f0%§r → §nПри любом новом увеличении§r → §cШанс 25% получить случайный негативный эффект на 10 секунд§r\n ›§n§f99%§r → §cСмерть§r", @@ -3503,6 +3532,8 @@ "tfg.emi.ore_veins.density": "Плотность: %d", "tfg.emi.ore_veins.y_ranges": "Глубина: %d to %d", "tfg.emi.ore_veins.projected": "Глубина поверхности: %d до %d", + "tfg.emi.ore_veins.projected.emi.0": "Глубина залежи относительная", + "tfg.emi.ore_veins.projected.emi.1": "До уровня Y поверхности.", "tfg.emi.ore_veins.near_lava": "Требует лаву вблизи", "tfg.emi.ore_veins.indicator_depth": "Индикатор глубины: ", "tfg.emi.ore_veins.size": "Размер: %d", @@ -3719,6 +3750,8 @@ "tfg.ore_patchouli_info.yellow_limonite": "$(thing)Плавится в$(): Серый чугун", "tfg.ore_patchouli_info.zeolite": "$(thing)Источник для$(): Алюминий, Кислород", "tfg.ore_patchouli_info.irarsite": "$(thing)Источникf$(): Индия, Мышьяка, Серы", + "tfg.ore_patchouli_info.ferhodsite": "$(thing)Источник дляf$(): Родия, железа, никеля", + "tfg.ore_patchouli_info.ruarsite": "$(thing)Источник дляf$(): Рутения, мышьяка, серы", "tfg.ore_patchouli_info.phlogopite": "$(thing)Источник для$(): Алюминий, Фтор", "tfg.rock_patchouli_info.andesite": "Андезит", "tfg.rock_patchouli_info.basalt": "Базальт", @@ -3841,7 +3874,12 @@ "tfg.emi.fluid_veins.liquid_carbon_dioxide": "Martian Liquid Carbon Dioxide", "tfg.emi.fluid_veins.semiheavy_ammoniacal_water": "Martian Semiheavy Ammoniacal Water", "tfg.emi.fluid_veins.heavy_ammoniacal_water": "Martian Heavy Ammoniacal Water", + "tfg.emi.fluid_veins.beneath_gas_weak": "Месторождение природного газа низкой плотности", + "tfg.emi.fluid_veins.beneath_gas_strong": "Месторождение природного газа высокой плотности", "tfg.emi.fluid_veins.lava_beneath": "Залежи магмы в Бездне", + "tfg.emi.fluid_veins.beneath_glowstone": "Месторождение жидкого светокамня", + "tfg.emi.fluid_veins.beneath_gold": "Месторождение жидкого золота", + "tfg.emi.fluid_veins.beneath_steam": "Паровой карман", "tfg.emi.fluid_veins.venus_sulfuric_acid": "Венерианские залежи серной кислоты", "tfg.emi.fluid_veins.venus_lava": "Венерианские залежи магмы", "quests.ae2": "Applied Energistics 2", @@ -3980,7 +4018,7 @@ "quests.tfg_tips.beneath_prep.desc": "&4Бездна&r — крайне враждебная среда. Из-за огромной глубины средняя температура здесь всегда &cвыше 20°C&r и повышается по мере погружения. Не говоря уже о количестве враждебных существ, населяющих эти пещеры.\n\nСвязанные с этим квесты обеспечивают базовую подготовку к вашему приключению.", "quests.tfg_tips.beneath_temp_management.title": "Активный контроль температуры", "quests.tfg_tips.beneath_temp_management.subtitle": "Как быстро охладиться", - "quests.tfg_tips.beneath_temp_management.desc": "В &4Бездне&r, где температура довольно высокая, стоит носить с собой &aВоду& или &aЛедяной суп&r для экстренного охлаждения, или &bПлотный лед&r (который можно сделать из осколков льда и снега!), если планируешь создать временную базу.\n\nНекоторые виды напитков также могут охладить вас, например, &aЛедяную слякоть&r.", + "quests.tfg_tips.beneath_temp_management.desc": "В &4Бездне&r, где температура довольно высокая, стоит носить с собой &aВоду&r или &aЛедяной суп&r для экстренного охлаждения, или &bПлотный лед&r (который можно сделать из осколков льда и снега!), если планируешь создать временную базу.\n\nНекоторые виды напитков также могут охладить вас, например, &aЛедяную слякоть&r.", "quests.tfg_tips.beneath_clothes.title": "Пассивный контроль температуры", "quests.tfg_tips.beneath_clothes.subtitle": "Пассивное охлаждение", "quests.tfg_tips.beneath_clothes.desc": "&bОдежда&r также помогает регулировать температуру. Перед походом в &4Бездну&r проще всего скрафтить &dОдежду из джутовой&r или &dльняной ткани.&r\n\n&dШелковая одежда&r требует &aНитей&r, которые в большом количестве можно найти в биоме &cПаучье логово.&r\n\nЕсли у вас есть доступ к &9Синей стали&r, то существует более эффективный вариант...", @@ -4028,14 +4066,14 @@ "quests.tfg_tips.hellforge.desc": "&cАдская кузня&r — неоправданно большая версия угольной кузни. Она совершенно необязательна, но у неё есть свои преимущества:\n\n— Больший инвентарь топлива и предметов для плавки\n— Не требует доступ к небу, а также работает в &4Бездне&r\n— Нагревает до 9 тигелей одновременно\n\nПроверь полевое руководство, там есть инструкции на то, как построить мультиблочную конструкцию.", "quests.tfg_tips.beneath_tower.title": "Башни Пиглинов", "quests.tfg_tips.beneath_tower.subtitle": "Они знают что делают", - "quests.tfg_tips.beneath_tower.desc": "Хочешь попасть на уровни &4Бездны&r пониже? Или может ты очень хочешь домой?\n\nМестные жители специально построили эти длинные, спиральные лестницы! Только будь внимателен, ведь они не будут рады видеть &aчужака&...", + "quests.tfg_tips.beneath_tower.desc": "Хочешь попасть на уровни &4Бездны&r пониже? Или может ты очень хочешь домой?\n\nМестные жители специально построили эти длинные, спиральные лестницы! Только будь внимателен, ведь они не будут рады видеть &aчужака&r...", "quests.tfg_tips.beneath_tower.task": "Посети башню", "quests.tfg_tips.unposter.subtitle": "Я могу выращивать свои галлюциногенные грибы сам!", "quests.tfg_tips.unposter.desc": "&cГрибница&r нужна для выращивания грибов.\n\nОна используется почти как компостер, за исключением того, что вместо компоста, грибница клонирует грибы в радиусе 11х11 от себя.\n\nУчти, что это работает только с натурально сгенерированными грибами, как только ты соберешь гриб, ты больше не сможешь посадить его обратно.", "quests.tfg_tips.top_slimes.title": "Укрощаемые Слизни", "quests.tfg_tips.top_slimes.subtitle": "Это не Slime Rancher случаем?", "quests.tfg_tips.top_slimes.desc.1": "&4Бездна&r встретит тебя типичными зелёными, агрессивными слизнями которые успели всем надоесть. Но если поискать, ты сможешь найти &eДружелюбных слизней&r\n\nОни могут быть приручены прямо как обычные животные, корми их &6грибами&r для приручения. Слизни бесполые, поэтому ты можешь скрещать представителей одного типа. Каждый слизень полезен, Одни производят предметы, а другие дают пассивные эффекты.\n\nПриручай своих слизней, и они станут твоими питомцами, что позволит тебе обучить их командам.", - "quests.tfg_tips.top_slimes.desc.2": "На верхнем уровне бездны ты можешь встретить &bЛедяного слизня&r и &aПриродного слизня&r.\n\n&bЛедяной слизень&r даёт эффект охлаждения игрокам поблизости, но не производит предметы.\n\n&aПриродный слизень&r производит биослизь, которую можно раздробить в биомассу и использовать для удобрения\n\nУчти что слизни производят продукты &lтолько& &dкогда игрок их кормит&r, и &lтолько& когда они находятся в &4Бездне&r.", + "quests.tfg_tips.top_slimes.desc.2": "На верхнем уровне бездны ты можешь встретить &bЛедяного слизня&r и &aПриродного слизня&r.\n\n&bЛедяной слизень&r даёт эффект охлаждения игрокам поблизости, но не производит предметы.\n\n&aПриродный слизень&r производит биослизь, которую можно раздробить в биомассу и использовать для удобрения\n\nУчти что слизни производят продукты &lтолько&r &dкогда игрок их кормит&r, и &lтолько&r когда они находятся в &4Бездне&r.", "quests.tfg_tips.top_slimes.task.1": "Посети Соляные пещеры", "quests.tfg_tips.top_slimes.task.2": "Посети Знойную трясину", "quests.tfg_tips.top_slimes.task.3": "Найди дружелюбного Слизня", @@ -4060,6 +4098,7 @@ "quests.tfg_tips.bastions.task": "Посети Бастион", "quests.tfg_tips.bottom_slimes.title": "Еще больше укрощаемых Слизней", "quests.tfg_tips.bottom_slimes.subtitle": "Необычные разновидности!", + "quests.tfg_tips.bottom_slimes.desc.1": "Только один дружелюбный вид слизней может выжить на дне &4Бездны&r: &cЛавовый слизень&r, который даёт эффект нагрева игрокам стоящим рядом.\n\nСамо по себе это бесполезно, но лавовые слизни имеют один секрет, они могут быть скрещены с &aПриродными слизнями&r для получения &eЛатексных слизней&r, которые могут служить источником латекса!\n\nУчти что слизни производят продукты &lтолько&r &dкогда игрок их кормит&r, и &lтолько&r когда они находятся в &4Бездне&r.", "quests.tfg_tips.bottom_slimes.task": "Найди дружелюбного Слизня", "quests.chemical_elements.chapter_title": "Химические элементы", "quests.chemical_elements.element": "Элемент", @@ -4223,10 +4262,13 @@ "quests.computer": "ComputerCraft", "quests.computer.subtitle": "Очень мощный мод для скриптинга на Lua", "quests.computer.welcome.title": "Добро пожаловать в ComputerCraft!", + "quests.computer.welcome.subtitle": "Ты уже знаешь луну, будь готов к луа.", "quests.computer.ap_peripherals.title": "Advanced Peripherals", "quests.computer.inventory.title": "Инвентарь", "quests.computer.tank.title": "Жидкостный бак", "quests.computer.monitor.title": "Монитор", + "quests.computer.wireless_modem.title": "Беспроводные и эндер-модемы", + "quests.computer.wireless_modem.subtitle": "RCE Машины", "quests.computer.nbt_storage.title": "Хранилище NBT", "quests.computer.geo_scanner.title": "Гео-сканер", "quests.computer.me_bridge.title": "ME-мост", @@ -5082,6 +5124,11 @@ "quests.high_voltage.large_steam_turbine.subtitle": "Дорого-богато", "quests.high_voltage.large_steam_turbine.task": "Любой Энергетических выходной разъём, хотя мы рекомендуем минимум 4А", "quests.high_voltage.large_steam_turbine.desc": "&eБольшая паровая турбина&r — это очень мощный &bМультиблок&r для генерации &6HV&r электричества. На этом уровне нет одноблочного генератора &bпара&r, поэтому тебе нужно построить много таких, если ты планируешь использовать пар как основу твоей энергетики.\n\nДля понимания её работы, прочитай главу &bЭнергия в GregTech&r, вместе с записью про турбины.", + "quests.high_voltage.wireless_charger.title": "Беспроводная зарядка.", + "quests.high_voltage.wireless_charger.subtitle": "Больше никаких спутанных проводов.", + "quests.high_voltage.wireless_charger.task": "Больше = лучше.", + "quests.high_voltage.wireless_charger.desc.1": "&6Беспроводная зарядка&r это полезная машина которая может заряжать любые предметы в инвентаре или в слотах Curios имеющие аккумулятор. В многопользовательской игре, она будет заряжать только внутри твоей команды.\n\nБеспроводная зарядка не может зарядить инструмент GregTech более высокого уровня чем она сама, но зато, она эффективнее работает с инструментами уровней ниже её самой.\n\nДля беспроводной зарядки доступно два режима которые можно переключать нажимая шифт + ПКМ держа в руках &6Отвёртку&r: Режим для коротких дистанций для быстрой зарядки, и режим дальнего действия для медленной зарядки соответственно.", + "quests.high_voltage.wireless_charger.desc.2": "&l&3Лор&r&o Код этой машинки был заимствован из &6Cosmic Frontiers&r: Модпак на основе GregTech, который совмещает магию с прогрессией GT.", "quests.low_voltage": "&7LV&r - Низкое Напряжение", "quests.low_voltage.subtitle": "Подчините электричество и начните своё путешествие в GregTech", "quests.low_voltage.lv_machine_hull.title": "Корпус вашей второй машины", @@ -5935,10 +5982,6 @@ "quests.ore_proc.bauxite.title": "Линия Бокситов", "quests.ore_proc.bauxite.subtitle": "Новинка для современных версий GregTech!", "quests.ore_proc.bauxite.desc": "Вы &oможете&r просто электролизовать всю вашу Бокситовую пыль, чтобы получить жалкие 6 алюминия и 1 рутил с 15 бокситов... Или вы можете попробовать &6Линию Бокситов&r!\n\nЭта новая линия переработки даёт примерно в 2 раза больше &bАлюминия&r и в 3 раза больше &4Рутила&r с каждого боксита, а также бесплатно даёт немного Галлия, Железа, Неодима и Хрома!", - "quests.ore_proc.gem_slurry.title": "Самоцветный шлам", - "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.moon": "Луна", "quests.moon.subtitle": "Единственное место, которое не было испорчено капитализмом... Космос!", "quests.space_survival.preparations.title": "Предполётная подготовка", @@ -6117,11 +6160,11 @@ "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.desc": "&5Меркурий&r станет второстепенной планетой в грядущем обновлении тира &1IV&r в TFG 0.14. Следите за новостями!", "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.desc": "&6Венера&r станет основной планетой в грядущем обновлении тира &1IV&r в TFG 0.14. Следите за новостями!", "quests.space_survival.venus.task": "Высадитесь на Венере", "quests.steam_age": "Ранняя автоматизация", "quests.steam_age.subtitle": "От примитивных машин до паровой энергии", diff --git a/kubejs/assets/tfg/lang/uk_ua.json b/kubejs/assets/tfg/lang/uk_ua.json index dad09d9453..53eb0fe6f4 100644 --- a/kubejs/assets/tfg/lang/uk_ua.json +++ b/kubejs/assets/tfg/lang/uk_ua.json @@ -538,7 +538,7 @@ "block.tfg.permafrost_support_horizontal": "Горизонтальна вічномерзла опора", "block.tfg.rock.aqueduct_permafrost": "Акведук з вічно мерзлого блоку", "block.tfg.rock.hardened_red_granite": "Загартований червоний граніт", - "block.tfg.rock.red_granite_stair": "Сходи з необробленого червоного граніту", + "block.tfg.rock.red_granite_stairs": "Сходи з необробленого червоного граніту", "block.tfg.rock.red_granite_slab": "Плита з необробленого червоного граніту", "block.tfg.rock.red_granite_wall": "Стіна з необробленого червоного граніту", "block.tfg.rock.polished_red_granite_stairs": "Сходи з гладкого червоного граніту", @@ -650,7 +650,7 @@ "block.tfg.rock.cut_red_sandstone_stairs": "Різані гематитові пісковикові сходи", "block.tfg.rock.cut_red_sandstone_wall": "Стіна з різаного гематитового пісковику", "block.tfg.rock.bricks_venus_sandstone_wall": "Стіна з цеглини трахітового пісковикову", - "block.tfg.rock.cracked_bricks_venus_sandstone_stair": "Тріснуті сходи з трахітової пісковикової цегли", + "block.tfg.rock.cracked_bricks_venus_sandstone_stairs": "Сходи з тріснутої трахітової пісковикової цегли", "block.tfg.rock.cracked_bricks_venus_sandstone_slab": "Тріснута трахітова пісковикова цегляна плита", "block.tfg.rock.cracked_bricks_venus_sandstone_wall": "Тріснута трахітова пісковикова цегляна стіна", "block.tfg.rock.quartz_wall": "Стіна з кварцу", @@ -721,21 +721,21 @@ "block.tfg.rock.tuff_wall": "Стіна з туфа", "block.tfg.rock.cobble_tuff": "Туфовий кругляк", "block.tfg.rock.cobble_tuff_slab": "Плита з туфового кругляка", - "block.tfg.rock.cobble_tuff_stair": "Сходи з туфового кругляка", + "block.tfg.rock.cobble_tuff_stairs": "Сходи з туфового кругляка", "block.tfg.rock.cobble_tuff_wall": "Стіна з туфового кругляка", "block.tfg.rock.mossy_cobble_tuff": "Моховитий туфовий кругляк", "block.tfg.rock.mossy_cobble_tuff_slab": "Плита з моховитого туфового кругляка", - "block.tfg.rock.mossy_cobble_tuff_stair": "Сходи з моховитого туфового кругляка", + "block.tfg.rock.mossy_cobble_tuff_stairs": "Сходи з моховитого туфового кругляка", "block.tfg.rock.mossy_cobble_tuff_wall": "Стіна з моховитого туфового кругляка", "block.tfg.rock.bricks_tuff": "Цеглини з туфа", "block.tfg.rock.bricks_tuff_slab": "Плита з цеглини туфу", - "block.tfg.rock.bricks_tuff_stair": "Сходи з цеглини туфу", + "block.tfg.rock.bricks_tuff_stairs": "Сходи з туфової цегли", "block.tfg.rock.bricks_tuff_wall": "Стіна з цеглини туфа", "block.tfg.rock.mossy_bricks_tuff_slab": "Плита з моховитої цегли туфа", - "block.tfg.rock.mossy_bricks_tuff_stair": "Сходи з моховитої цегли туфа", + "block.tfg.rock.mossy_bricks_tuff_stairs": "Сходи з моховитої туфової цегли", "block.tfg.rock.mossy_bricks_tuff_wall": "Стіна з моховитої цегли туфа", "block.tfg.rock.cracked_bricks_tuff_slab": "Тріснута плита з туфової цегли", - "block.tfg.rock.cracked_bricks_tuff_stair": "Тріснуті сходи з туфової цегли", + "block.tfg.rock.cracked_bricks_tuff_stairs": "Сходи з тріснутої туфової цегли", "block.tfg.rock.cracked_bricks_tuff_wall": "Тріснута стіна з туфової цегли", "block.tfg.rock.chiseled_tuff": "Тесаний туф", "block.tfg.rock.chiseled_tuff_bricks": "Тесана цеглина туфа", @@ -1584,10 +1584,15 @@ "block.tfg.strut.truss.copper": "Поздовжня ферма з міді", "block.tfg.strut.truss.steel": "Поздовжня ферма з металу", "block.tfg.strut.truss.zinc": "Поздовжня ферма з цинку", + "block.tfg.groundcover.fallen_copper_lamp": "Повалена мідна лампа", "block.tfg.groundcover.fallen_bronze_lamp": "Повалена бронзова лампа", "block.tfg.groundcover.fallen_black_bronze_lamp": "Повалена чорно-бронзова лампа", "block.tfg.groundcover.fallen_bismuth_bronze_lamp": "Повалена бісмутово-бронзова лампа", "block.tfg.groundcover.fallen_wrought_iron_lamp": "Повалена ковано-залізна лампа", + "block.tfg.groundcover.fallen_steel_lamp": "Повалена сталева лампа", + "block.tfg.groundcover.fallen_black_steel_lamp": "Повалена чорно-сталева лампа", + "block.tfg.groundcover.fallen_red_steel_lamp": "Повалена червоно-сталева лампа", + "block.tfg.groundcover.fallen_blue_steel_lamp": "Повалена синьо-сталева лампа", "block.tfg.spider_web": "Квола павутина", "block.tfg.spider_sac": "Павучий кокон", "tfg.block_entity.artisan_table": "Ремісничий стіл", @@ -2245,12 +2250,12 @@ "ali/loot_table/chests/moonbase": "Скриня на зруйнованій місячній базі", "ali/loot_table/chests/cruncher_nest": "Скриня в руїнах на Марсі", "ali/loot_table/chests/illager_camps": "Скриня в таборі розбійників", - "ali/loot_table/chests/mineshaft/generic": "Занедбана штольня", - "ali/loot_table/chests/mineshaft/spider": "Заражена штольня", - "ali/loot_table/chests/mineshaft/start": "Вхід до штольні", - "ali/loot_table/chests/beneath_hut": "Покинута хатина в Безодні", - "ali/loot_table/chests/beneath_tower_top": "Вежа піґлінів (верхівка)", - "ali/loot_table/chests/beneath_tower_bottom": "Вежа піґлінів (низ)", + "ali/loot_table/chests/mineshaft/generic": "Скриня у занедбаній штольні", + "ali/loot_table/chests/mineshaft/spider": "Скриня у зараженій штольні", + "ali/loot_table/chests/mineshaft/start": "Скриня біля входу в штольню", + "ali/loot_table/chests/beneath_hut": "Скриня у занедбаній хатині в Безодні", + "ali/loot_table/chests/beneath_tower_top": "Скриня у вежі піґлінів (верх)", + "ali/loot_table/chests/beneath_tower_bottom": "Скриня у вежі піґлінів (низ)", "ali/loot_table/panning/deposits/native_copper_granite": "Родовище самородної міді у граніті", "ali/loot_table/panning/deposits/native_copper_diorite": "Родовище самородної міді у діориті", "ali/loot_table/panning/deposits/native_copper_gabbro": "Родовище самородної міді у габро", @@ -2816,6 +2821,7 @@ "tfg.ore_vein.normal_sulfide": "Сірка, Стибніт, Борніт (Вулканічні)", "tfg.ore_vein.normal_tarkianite": "Таркіаніт, Бура, Трона", "tfg.ore_vein.sand_basaltic": "Мінеральний пісок з базальту...", + "tfg.ore_vein.sand_garnet": "Глауконітовий пісок...", "tfg.ore_vein.sand_granitic": "Мінеральний пісок з граніту...", "tfg.ore_vein.sand_tin": "Пісок з каситериту", "tfg.ore_vein.surface_bismuth": "Бісмут (Поверхневий)", @@ -2906,6 +2912,7 @@ "tfg.ore_vein.beneath_lead_silver": "Галеніт, Самородне срібло, Свинець", "tfg.ore_vein.beneath_lithium": "Сподумен, Літій, Сильвін", "tfg.ore_vein.beneath_manganese": "Пиролюзит, Гроссуляр...", + "tfg.ore_vein.beneath_molydbenum": "Вульфеніт, Молібденіт...", "tfg.ore_vein.beneath_nickel": "Пентландит, Гарнієрит...", "tfg.ore_vein.beneath_phlogopite": "Флогопіт, Сірка, Апатит", "tfg.ore_vein.beneath_phosphate": "Трикальційфосфат, Апатит...", @@ -3015,8 +3022,8 @@ "tfg.clientmessage.spatialioblocked.claimedchunks": "Просторовий ввід/вивід заблоковано: Регіон містить чанки, заявлені іншою командою", "tfg.clientmessage.nether_contraption_created": "§cБезодня — §~спекотна!§c Пристрої з механічними бурами не будуть видобувати руду нижче висоти Y=%s.", "tfg.clientmessage.hot_planet_contraption_created": "§cЦя планета — §~спекотна!§c Пристрої з механічними бурами не будуть видобувати тут руду.", - "tfg.clientmessage.nether_miner_placed": "§cБезодня — §~спекотна!§c Одноблокові бурові установки не будуть працювати нижче висоти Y=%s.", - "tfg.clientmessage.hot_planet_miner_placed": "§cЦя планета — §~спекотна!§c Одноблокові бурові установки не будуть працювати тут.", + "tfg.clientmessage.nether_miner_placed": "§cБезодня — §~спекотна!§c Одноблокові бурові устави не будуть працювати нижче висоти Y=%s.", + "tfg.clientmessage.hot_planet_miner_placed": "§cЦя планета — §~спекотна!§c Одноблокові бурові устави не будуть працювати тут.", "tfg.machine.gas_well.active": "Активний", "tfg.machine.gas_well.waiting_explosive": "Очікування вибухівки", "tfg.machine.gas_well.waiting_explosive.tooltip": "Вставте вибухівку, щоб запустити механізм", @@ -3183,6 +3190,7 @@ "tfc.recipe.barrel.tfg.sealed_barrel.prepared_leather_gloves": "Замочування шкіряних рукавичок", "tfc.recipe.barrel.tfg.barrel.rapeseed_to_oil": "Отримання олії з ріпаку", "tfc.recipe.barrel.tfg.barrel.sunflower_to_oil": "Витискання олії з соняшника", + "tfc.recipe.barrel.tfg.barrel.peanut_to_oil": "Добування арахісової олії", "tfc.recipe.barrel.tfg.barrel.maple_syrup_to_sugar": "Виготовлення цукру", "tfc.recipe.barrel.tfg.barrel.birch_syrup_to_sugar": "Виготовлення цукру", "tfc.recipe.barrel.tfg.barrel.develop_black_and_white_film": "Проявлення плівки", @@ -3351,7 +3359,7 @@ "tfg.tooltip.machine.cooling_tower_1": "§7Нагрівання атмосфери§r", "tfg.tooltip.machine.cooling_tower_2": "§7Охолоджує гарячий теплоносій, розсіюючи надлишкове тепло в атмосферу.§r", "tfg.tooltip.machine.hydroponics_facility_1": "§7§oФермерство довгим шляхом§r", - "tfg.tooltip.machine.hydroponics_facility_2": "§7Покращена версія ЕТ! Гідропонічна установка підвищує шанси на врожай у теплиці та не має обмежень щодо насичення киснем.§r", + "tfg.tooltip.machine.hydroponics_facility_2": "§7Покращена версія ЕТ! Гідропонічна устава підвищує шанси на врожай у теплиці та не має обмежень щодо насичення киснем.§r", "tfg.tooltip.machine.pisciculture_fishery_1": "§7§o1 рибка, 2 рибка...§r", "tfg.tooltip.machine.pisciculture_fishery_2": "§7Рибні ферми — це не лише джерело свіжої риби, а й важливий елемент підвищення продуктивності теплиць завдяки §3аквапоніці.§7 Структуру можна заповнити будь-якою рідиною з тегом §o#tfg:pisciculture_fishery_fluids§r", "tfg.tooltip.machine.high_temp_precision_fabricator_1": "§7Екстремальна машина для цукрової вати§r", @@ -3381,7 +3389,8 @@ "tfg.tooltip.growth_chamber": "Ця машина може виконувати більше рецептів одночасно, збільшуючи кількість шарів.", "tfg.tooltip.wireless_card_1": "Дозволяє бездротові з’єднання на будь‑якій відстані, навіть з інших планет!", "tfg.tooltip.wireless_card_2": "Предмети все ще можна передавати через термінал, але з дуже високими витратами енергії.", - "tfg.tooltip.wireless_card_3": "Використовуйте §dрейкотрон§r для своїх міжпланетних логістичних потреб.", + "tfg.tooltip.wireless_card_3": "Транспортування предметів у 8 разів дорожче, ніж транспортування блоків.", + "tfg.tooltip.wireless_card_4": "Використовуйте §dрейкотрон§r для своїх міжпланетних логістичних потреб.", "tfg.tooltip.component.nuclear_turbine_1": "§eБазове виробництво:§r 8192 EU/t", "tfg.tooltip.component.nuclear_turbine_2": "Кожен тримач ротора вище §5EV§r §7додає§r 10% ефективності та множить EU/t на 2.", "tfg.tooltip.component.smr_generator_1": "§eБазове виробництво:§r 4096 EU/t", @@ -4101,7 +4110,7 @@ "quests.chemical_elements.plutonium.title": "Плутоній", "quests.chemical_elements.americium.title": "Америцій", "quests.chemical_elements.hydrogen.desc": "Водень є важливим компонентом незліченних хімічних процесів &bMV+&r, таких як виробництво кислот або аміаку.\n\nЙого можна отримати на рівні &7LV&r у нескінченній кількості шляхом електролізу води або реакції води через цикл мурашиної кислоти.\n\nДейтерій і тритій використовуються на &dLuV&r для термоядерного синтезу; їх можна отримати шляхом центрифугування водню або електролізу важкої води.", - "quests.chemical_elements.helium.desc": "Гелій використовується на &6HV&r+ для охолодження гарячих злитків у вакуумній морозилці та для прискорення ЕДП.\n\nЙого можна отримати на &6HV&r шляхом дистиляції рідкого земного повітря та за допомогою бурової установки для рідин на Місяці.\n\nГелій-3 використовується для рецептів на Місяці; його можна отримати за допомогою бурової установки для рідин на Місяці або шляхом центрифугування гелію.", + "quests.chemical_elements.helium.desc": "Гелій використовується на &6HV&r+ для охолодження гарячих злитків у вакуумній морозилці та для прискорення ЕДП.\n\nЙого можна отримати на &6HV&r шляхом дистиляції рідкого земного повітря та за допомогою бурової устави для рідин на Місяці.\n\nГелій-3 використовується для рецептів на Місяці; його можна отримати за допомогою бурової устави для рідин на Місяці або шляхом центрифугування гелію.", "quests.chemical_elements.lithium.desc": "Літій — найкращий електроліт для акумуляторів рівнів &7LV&r, &bMV&r та &6HV&r.\n\nВін у великій кількості міститься в вольфрамітових та шеєлітових жилах. Технологічний ланцюжок вольфраму дає літій як побічний продукт.", "quests.chemical_elements.beryllium.desc": "Берилій широко використовується в ядерній енергетиці, зокрема для виготовлення ядерних паливних стрижнів, теплових акумуляторів та палива, як-от FLiBe. Він також використовується на рівні &6HV&r для створення пилу Краю.\n\nЙого можна отримати зі смарагдових жил.", "quests.chemical_elements.boron.desc": "Бор є компонентом боросилікатного скла, що використовується на рівні &bMV&r+ для виготовлення лінз із самоцвітів, а також на рівні &6HV&r+ для виготовлення кабелів AE2, вітрифікованих перлів Краю та армованих скловолокном друкованих плат.\n\nЙого можна отримати на рівні &bMV&r з бури.", @@ -4117,7 +4126,7 @@ "quests.chemical_elements.phosphorus.desc": "Фосфор є поживною речовиною для рослин, що використовується на рівні &bMV&r+ для виготовлення надпровідників рівня &7LV&r, а на рівні &6HV&r+ — для фосфорно-легованих кремнієвих булів.\n\nЙого можна отримати з апатиту, а на рівні &5EV&r — у необмеженій кількості з пилу сирого трикальційфосфату.", "quests.chemical_elements.sulfur.desc": "Сірка використовується на рівні &8ULV&r+ для виготовлення гуми, а на рівні &bMV&r+ — для виробництва сірчаної кислоти.\n\nЇї можна отримати в необмеженій кількості шляхом дистиляції нафти.", "quests.chemical_elements.chlorine.desc": "Хлор використовується на рівні &bMV&r+ для виробництва соляної кислоти.\n\nЙого можна отримати на рівні &7LV&r у необмеженій кількості шляхом електролізу солоної води.", - "quests.chemical_elements.argon.desc": "Аргон використовується на рівні &5EV&r+ для прискорення роботи ЕДП.\n\nЙого можна отримати на рівні &6HV&r у необмеженій кількості шляхом дистиляції рідкого повітря, а також за допомогою рідинної бурової установки на Місяці.", + "quests.chemical_elements.argon.desc": "Аргон використовується на рівні &5EV&r+ для прискорення роботи ЕДП.\n\nЙого можна отримати на рівні &6HV&r у необмеженій кількості шляхом дистиляції рідкого повітря, а також за допомогою рідинної бурової устави на Місяці.", "quests.chemical_elements.potassium.desc": "Калій є поживною речовиною для рослин. Він використовується на рівні &6HV&r+ для виготовлення пилу Краю, а на рівні &5EV&r+ — у невеликих кількостях для виробництва полібензимідазолу.\n\nЙого можна отримати на рівні &bMV&r із селітри.", "quests.chemical_elements.calcium.desc": "Кальцій є поживною речовиною для рослин. Він використовується на рівні &6HV&r+ для виготовлення надпровідників рівня &6HV&r.\n\nЙого можна отримати в необмеженій кількості з кісткового борошна, а на рівні &5EV&r — із пилу сирого трикальційфосфату.", "quests.chemical_elements.titanium.desc": "Титан є основним матеріалом рівня &5EV&r.\n\nЙого можна отримати на рівні &6HV&r шляхом перероблення ільменіту або через технологічну лінію бокситів; обидва ресурси в достатку зустрічаються на Місяці.", @@ -4644,7 +4653,7 @@ "quests.extreme_voltage.nano_cpu_wafer.desc": "&dНанопроцесорна пластина&r — це твій пропуск до IV схем, а також до &b64k комірок зберігання AE2&r. \n\nТобі знадобиться величезна кількість цих схем, адже відтепер вони використовуються майже в кожному вдосконалому рівні схем — як при &eоновлені самої пластини&r, так і при створенні &aнайвищих версій схем&r. \n\nВони також потрібні для твоїх &6IV акумуляторів&r, &dлапотронних енергетичних сфер&r. \n\nДля довідки: &b1 Плутонієвий паливний стрижень&r виробить достатньо тритієвої води для &eрівно 9 нанопроцесорних пластин&r.", "quests.extreme_voltage.first_iv_circuit.title": "Мейнфрейми — це перші IV схеми!", "quests.extreme_voltage.first_iv_circuit.subtitle": "Ми вже закінчили з EV?", - "quests.extreme_voltage.first_iv_circuit.desc": "Нарешті, після всього цього часу, ти отримав нову схему та розблокував абсолютно новий рівень. Тепер перед тобою відкрито багато можливостей, але твоїм головним пріоритетом має стати &6IV збирач&r, адже він дозволить створити &eкаркасне помірне ядро&r, яке значно підвищує &cмакс. тепло&r твого реактора, усуваючи потребу в холодоагентних гранулах. \n\nТи також можеш збудувати &5EV схемотехнічний збирач&r, щоб розблокувати &bнанопроцесорні схеми&r. Проте май на увазі, що для них знадобляться нанопроцесорні чіпи, тож тобі потрібна добре налагоджена установка ядерного поділу, щоб їх підтримувати. \n\nБільше деталей буде надано у &6IV розділі&r, тож ти нарешті зможеш почуватися повністю впевнено, просуваючись у цьому новому рівні.", + "quests.extreme_voltage.first_iv_circuit.desc": "Нарешті, після всього цього часу, ти отримав нову схему та розблокував абсолютно новий рівень. Тепер перед тобою відкрито багато можливостей, але твоїм головним пріоритетом має стати &6IV збирач&r, адже він дозволить створити &eкаркасне помірне ядро&r, яке значно підвищує &cмакс. тепло&r твого реактора, усуваючи потребу в холодоагентних гранулах. \n\nТи також можеш збудувати &5EV схемотехнічний збирач&r, щоб розблокувати &bнанопроцесорні схеми&r. Проте май на увазі, що для них знадобляться нанопроцесорні чіпи, тож тобі потрібна добре налагоджена устава ядерного поділу, щоб їх підтримувати. \n\nБільше деталей буде надано у &6IV розділі&r, тож ти нарешті зможеш почуватися повністю впевнено, просуваючись у цьому новому рівні.", "quests.extreme_voltage.moderate_core.subtitle": "Це велике оновлення", "quests.extreme_voltage.moderate_core.desc": "Настав час для серйозного оновлення твого &6реактора поділу&r. &eкаркасні помірні ядра&r існують у двох версіях, залежно від твоєї вдачі. Краща версія дозволяє твоєму &dплутонієвому реактору&r працювати &aз одним стрижнем повністю пасивно&r, тож ти можеш попрощатися з постійним виготовленням &bхолодоагентних гранул&r! Ти також можеш поекспериментувати, поєднуючи їх із новими каркасними компонентами, потенційно запустивши &aдва плутонієвих стрижні&r одночасно. \n\nТакож відомий як &6графітова лінія&r, процес створення цих нових блоків є дещо випадковим: ти можеш провалити створення або отримати нижчорівневу версію. Це може ускладнити повну автоматизацію за допомогою &dAE2&r, хоча з ретельним налаштуванням це все ж можливо. \n\nМи залишаємо вам простір для експериментів і пошуку найбільш ефективного способу виробництва цих ядер.", "quests.extreme_voltage.abs.subtitle": "Ми обожнюємо цей нагрівач", @@ -4742,7 +4751,7 @@ "quests.extreme_voltage.tunsgten_line_step_2.desc": "Коли ти вже отримав &bвольфрамову кислоту&r і зациклив &cкальциновану соду&r, то найважчу частину завершено. \nДалі тобі знадобиться лише &6вежа випаровування&r, щоб повністю зациклити &aводень&r, необхідний для &6дугової печі&r, та &6піролізна піч&r, щоб відновити &3аміак&r, використаний на початку.\n\nНічого надто складного, тож насолоджуйся своїм &5вольфрамом&r!", "quests.extreme_voltage.advanced_fluid_rig.title": "Екстремальне буріння рідин", "quests.extreme_voltage.advanced_fluid_rig.subtitle": "Екстремальне — справді влучний опис", - "quests.extreme_voltage.advanced_fluid_rig.desc.1": "За рахунок у 4 рази більшого споживання енергії &3вдосконалена рідинна бурова установка&r отримує &616-ти кратний вихід&r рідини.\n\nВиснаження жил також зменшується вдвічі. Це означає, що ти отримаєш загалом &632-ти кратний&r обсяг нафти (або будь-якої іншої рідини) з базової рідинної жили до її виснаження!\n\nНавіть після виснаження ти все одно можеш її використовувати й залишатися у впевненому енергетичному плюсі.\n\nОднієї &3вдосконалої рідинної бурової установки&r має вистачити, щоб забезпечити енергією базу аж до рівня &dLuV&r… і, можливо, навіть далі!", + "quests.extreme_voltage.advanced_fluid_rig.desc.1": "За рахунок у 4 рази більшого споживання енергії &3вдосконалена рідинна бурова устава&r отримує &616-ти кратний вихід&r рідини.\n\nВиснаження жил також зменшується вдвічі. Це означає, що ти отримаєш загалом &632-ти кратний&r обсяг нафти (або будь-якої іншої рідини) з базової рідинної жили до її виснаження!\n\nНавіть після виснаження ти все одно можеш її використовувати й залишатися у впевненому енергетичному плюсі.\n\nОднієї &3вдосконалої рідинної бурової устави&r має вистачити, щоб забезпечити енергією базу аж до рівня &dLuV&r… і, можливо, навіть далі!", "quests.extreme_voltage.advanced_fluid_rig.desc.2": "Як &9нагадування&r, адже востаннє це з’являлося ще в &bMV&r:\n\n&9-&r &aЛегка нафта&r може бути використана для виробництва &dВГТ&r та &dметану&r для роботи у &3великих газових турбінах&r.\n\n&9-&r &aНафта&r може бути використана для виробництва &dдизеля&r та &dвисокоцетановго дизеля&r для роботи у &3великих двигунах внутрішнього згоряння&r.\n\n&9-&r &aВажка нафта&r може бути використана для виробництва &dнітробензолу&r для роботи у &3великих газових турбінах&r.", "quests.extreme_voltage.mpic_chip.title": "Інтегральна схема живлення", "quests.extreme_voltage.mpic_chip.desc": "Нова різальна машина? &a✓&r\n\nНова лінза? &a✓&r\n\nНова схема живлення? &a✓&r\n\nНовий метал для ЕДП? &a✓&r\n\nНова котушка для енергетичного люка? &a✓&r", @@ -4920,12 +4929,12 @@ "quests.gregtech_energy.fission_rod.desc.3": "Будь дуже обережним: якщо твої &бридерні паливні стрижні&r працюють при надто високій температурі, ти втратиш частину &8відходів РТУ&r і не зможеш повністю переробити стрижень; завжди будь надзвичайно уважними при роботі зі &бридерним паливним стрижнем&r, адже їхня втрата — це те, чого слід будь-що уникати.\n\nПри виборі конкретних температур для збільшення виходу ізотопів пам’ятай, що ти може комбінувати кілька стрижнів разом, і, як завжди, звертайся до EMI, щоб дізнатися, які стрижні використовують як охолоджувачі.", "quests.gregtech_energy.smr.title": "Малий модульний реактор", "quests.gregtech_energy.smr.subtitle": "Нарешті — енергія для цих далеких форпостів", - "quests.gregtech_energy.smr.desc.1": "Якщо тобі вдасться отримати два &aстрижні з америцію-241&r, ти можеш почати розглядати &eмалий реактор поділу&r та &aмалу модульну турбіну&r; ця генераторна установка ідеально підходить для довготривалого, стабільного виробництва енергії без необхідності втручання, що робить її чудовим варіантом для віддалених форпостів або як резервне джерело живлення для бази, якщо щось піде не так.", + "quests.gregtech_energy.smr.desc.1": "Якщо тобі вдасться отримати два &aстрижні з америцію-241&r, ти можеш почати розглядати &eмалий реактор поділу&r та &aмалу модульну турбіну&r; ця генераторна устава ідеально підходить для довготривалого, стабільного виробництва енергії без необхідності втручання, що робить її чудовим варіантом для віддалених форпостів або як резервне джерело живлення для бази, якщо щось піде не так.", "quests.gregtech_energy.smr.desc.2": "У &мМалому реакторі поділу&r потрібно встановити два &bтримачі палива&r, адже це мінімальна вимога для виробництва енергії, а також виготовити достатньо &3TiCl2-легованого надкритичного CO2&r, який є єдиним охолоджувачем, що може використовувати цей реактор; гарна новина полягає в тому, що система буде повністю замкненою.\n\nДля налаштування &aмалої модульної турбіни&r необхідно використовувати її спеціальні &aSMT вхідні люки&r, оскільки інші вхідні люки не працюватимуть; модульність полягає у вимозі застосування &eмастила&r для роботи генератора — або &bGregTech&r, або версії, виробленої за допомогою &5OLA&r, яка подвоює ефективність. Додатково можна підвищити вихід, додавши &dпідсилювач&r — наразі &bозон&r або &61,1-циклогександіїл гідропероксид&r — щоб збільшити кількість виробленої &eEU&r.", - "quests.gregtech_energy.smr.desc.3": "Хоча ця установка може здаватися лячною на перший погляд, перевага надзвичайно довговічного та надійного джерела енергії будь-де у світі є значною, що робить її добре придатною для віддалених збирачів, бурів або навіть повністю незалежної бази.", + "quests.gregtech_energy.smr.desc.3": "Хоча ця устава може здаватися лячною на перший погляд, перевага надзвичайно довговічного та надійного джерела енергії будь-де у світі є значною, що робить її добре придатною для віддалених збирачів, бурів або навіть повністю незалежної бази.", "quests.gregtech_energy.cooling_tower.subtitle": "Нарешті енергія поділу на Землі", "quests.gregtech_energy.cooling_tower.desc.1": "Найбільш традиційний спосіб виробництва енергії за допомогою &eенергії поділу&r — це комбінація &6акумулятора тепла&r та &9охолоджувальної вежі&r; кількість необхідної &9дистильованої води&r настільки велика, що пропустити вежу не вийде. Початкове налаштування зазвичай складається з &cреактора поділу&r, що працює на &bстрижнях з нептунію&r (можна також додати кілька &aстрижнів з америцію&r), використовуючи &eборний охолоджувач&r, який потім охолоджується через &6Акумулятор тепла&r.", - "quests.gregtech_energy.cooling_tower.desc.2": "&cОдиниці тепла&r, згенеровані таким чином, слід використовувати для виробництва &bпари високого тиску&r з &9дистильованої води&r; ця пара може бути направлена до &eядерних турбін&r, які видаватимуть &aтеплу воду&r, що охолоджується назад у &9дистильовану воду&r за допомогою &9охолоджувальної вежі&r. Будь готовий виділити велику площу для цієї установки.\n\nКорисна порада: пам’ятай, що для роботи &9охолоджувальної вежі&r потрібно вибрати схему, і чим вища схема, тим більший об’єм потоку вона може обробляти.", + "quests.gregtech_energy.cooling_tower.desc.2": "&cОдиниці тепла&r, згенеровані таким чином, слід використовувати для виробництва &bпари високого тиску&r з &9дистильованої води&r; ця пара може бути направлена до &eядерних турбін&r, які видаватимуть &aтеплу воду&r, що охолоджується назад у &9дистильовану воду&r за допомогою &9охолоджувальної вежі&r. Будь готовий виділити велику площу для цієї устави.\n\nКорисна порада: пам’ятай, що для роботи &9охолоджувальної вежі&r потрібно вибрати схему, і чим вища схема, тим більший об’єм потоку вона може обробляти.", "quests.gregtech_energy.gasoline.title": "Бензин", "quests.gregtech_energy.gasoline.subtitle": "Середня дитина", "quests.gregtech_energy.gasoline.desc": "&aБензин&r — це справді потужне паливо для згоряння, яке ти розблокуєш на &6HV&r, але на практиці починаєте виробляти лише після побудови своїх перших &6дистиляційних веж&r. &7Толуол&r легко виготовляється з &7деревного дьогтю&r або &7важкого палива&r, а все інше, що тобі потрібно — це &dнафтовий газ&r, &eнафта&r та суміш з &3кисню&r, &bводню&r і &1вуглецю&r.\n\nЦе потужне паливо, досить просте у виробництві, і що ще краще — його можна покращити до &cвисокооктановго бензину&r.", @@ -4947,7 +4956,7 @@ "quests.gregtech_energy.large_solar.desc.2": "&6Великий сонячний масив MK I&r має &92 різні режими роботи&r:\n\n&9• Пасивний режим&r — \nУ цьому режимі поступово витрачаються &dфотовольтаїчні елементи&r, тож під час активного облаштування бази можна просто закинути туди стос, але він не працюватиме вічно. Генерує лише &62A HV&r удень — достатньо для базових систем, але далеко не оптимально.\n\n&9• Активний режим&r — \nЯкщо хочете &aмаксимізувати виробіток енергії&r, потрібно буде керувати охолодженням. Це вимагатиме більш розвиненої Місячної бази, але винагородою стане &52A EV&r!\n\nІснують також версії MK II та MK III для вищих рівнів, що потребують більш вдосконалених охолоджувачів.", "quests.gregtech_energy.large_solar_t2.subtitle": "Ще потужніше", "quests.gregtech_energy.large_solar_t2.desc.1": "Якщо ти будуєш &dбазу AE2 на Місяці&r, тобі, швидше за все, знадобиться набагато більше енергії. І саме тут вступає в гру &6великий сонячний масив MK II&r!\n\nЯк і MK I, вона має 2 рецепти — але цього разу жоден із них не є повністю пасивним.", - "quests.gregtech_energy.large_solar_t2.desc.2": "&bОхолоджувач сонячного масиву&r і &bкріогенізований флюїкс&r є повністю відновлюваними на Місяці. Ба більше — цикл охолоджувача сонячного масиву переробляє свої &eфтор&r та &eхлор&r, тобто тобі потрібне лише стабільне постачання:\n\n• Гелій-3 — добувається за допомогою &aбурової установки для рідин&r \n• Вода — збирається пасивно через &aаодяний акумулятор&r\n\n&cАварійне резервне живлення:&r \nЯкщо постачання рідин буде перерване, ВСМ MK II все одно зможе працювати на фотоелементах. \nЦей резервний режим дозволяє базі залишатися онлайн, поки ти вирішуєш проблему.\n\nОбов’язковий елемент для будь-якої серйозної позаземної інфраструктури AE2.", + "quests.gregtech_energy.large_solar_t2.desc.2": "&bОхолоджувач сонячного масиву&r і &bкріогенізований флюїкс&r є повністю відновлюваними на Місяці. Ба більше — цикл охолоджувача сонячного масиву переробляє свої &eфтор&r та &eхлор&r, тобто тобі потрібне лише стабільне постачання:\n\n• Гелій-3 — добувається за допомогою &aбурової устави для рідин&r \n• Вода — збирається пасивно через &aаодяний акумулятор&r\n\n&cАварійне резервне живлення:&r \nЯкщо постачання рідин буде перерване, ВСМ MK II все одно зможе працювати на фотоелементах. \nЦей резервний режим дозволяє базі залишатися онлайн, поки ти вирішуєш проблему.\n\nОбов’язковий елемент для будь-якої серйозної позаземної інфраструктури AE2.", "quests.gregtech_energy.large_solar_t3.subtitle": "Максимальна потужність", "quests.gregtech_energy.large_solar_t3.desc": "Останній рівень — це &6великий сонячний масив MK III&r. Вона працює так само, як MK II, але її новий охолоджувач потребує додавання &aпргону&r та &bсилікатного аерогелю&r.\n\nТи вже знайомий із &bсилікатним аерогелем&r — ти використовував його у своєму &dракетному рівні 3&r. \nВтім, на Місяці його набагато складніше виробляти, і тобі, можливо, доведеться постійно доставляти його з &aЗемлі&r.\n\nЯк вирішити цю логістичну задачу — автоматизацією чи міжпланетним транспортом — вирішувати тобі.\n\n&eВисокотехнологічна енергія&r потребує &cінфраструктури високого рівня&r. Плануй мудро!", "quests.gregtech_energy.solar_panel.subtitle": "Світло в темряві", @@ -5080,7 +5089,7 @@ "quests.high_voltage.cleanroom.task": "Люк технічного обслуговування або автоматичний люк технічного обслуговування", "quests.high_voltage.prospector.title": "HV розвідник", "quests.high_voltage.prospector.desc.1": "Цей розвідник має &6більший радіус дії&r, ніж його &7LV&r версія.\n\nЯкщо ти зробиш присідання та клацнеш ПКМ з розвідником у руці, його режим зміниться на &6режим пошуку рідин&r. У цьому режимі буде показано базовий &dвихід&r рідинних жил, а також рівень їх заповнення.\n\nЦе буде надзвичайно корисно для пошуку &9гелію-3&r та &9жил у корінній породі&r на Місяці.", - "quests.high_voltage.prospector.desc.2": "&9Нагадування:&r Вихід &3рідинної бурової установки&r прямо пропорційний “заповненості” жили. Якщо вона занадто низька, вихід за замовчуванням буде визначено в конфігурації CEu.\n\n&9Порада:&r Коли заповненість падає нижче 30%% (груба оцінка), варто розглянути можливість переходу до іншої жили задля ефективності витрат енергії. Можливо, тобі буде цікаво перейти на &3вдосконалену рідинну бурову установку&r на рівні &5EV&r — вона не лише значно підвищує вихід, але й зменшує швидкість виснаження жили!\n\n&cУвага:&r Через баг відображення в розвіднику може бути зміщене на один чанк, тому уникай розміщення установки в кутах рідинної жили — інакше можеш почати качати не ту рідину!", + "quests.high_voltage.prospector.desc.2": "&9Нагадування:&r Вихід &3рідинної бурової устави&r прямо пропорційний “заповненості” жили. Якщо вона занадто низька, вихід за замовчуванням буде визначено в конфігурації CEu.\n\n&9Порада:&r Коли заповненість падає нижче 30%% (груба оцінка), варто розглянути можливість переходу до іншої жили задля ефективності витрат енергії. Можливо, тобі буде цікаво перейти на &3вдосконалену рідинну бурову установку&r на рівні &5EV&r — вона не лише значно підвищує вихід, але й зменшує швидкість виснаження жили!\n\n&cУвага:&r Через баг відображення в розвіднику може бути зміщене на один чанк, тому уникай розміщення устави в кутах рідинної жили — інакше можеш почати качати не ту рідину!", "quests.high_voltage.fluorine.title": "Фтор", "quests.high_voltage.fluorine.subtitle": "Чи почистив ти зуби сьогодні?", "quests.high_voltage.fluorine.desc": "Фтор — це найрідкісніший газ, який можна отримати шляхом електролізу в цій грі.\n\nЙого можна добути з &aлепідоліту&r, &aбастназіту&r та &aслюди&r, але найкращим джерелом є &aтопаз&r.", @@ -5161,7 +5170,7 @@ "quests.high_voltage.250_iq.desc.1": "Цей посібник про те, як автоматично направити &lвсі&r твої гарячі злитки до &3хімічної ванни&r, зберігаючи повну автоматизацію в ідеальному стані.\n\nДешевий варіант — використовувати фільтри та вручну додавати гарячі злитки по одному... але це ж так нудно! Давай краще оберемо веселий варіант.\n\nВстанови &aпредметний теґовий фільтр&r на бік &3хімічної ванни&r, відкрий його та встанови режим whitelist на -&e&l*hot_ingots*&r-.\n\nЗвідси ти можеш прокладати маршрути через &9будь-яку логістичну систему&r на свій вибір.", "quests.high_voltage.250_iq.desc.2": "Підключи вихід твого &3ЕДП(ів)&r до входу &3хімічної ванни&r та до вихідного контейнера (скрині або ящика). Також можеш поставити &dобмежувальну трубу&r перед контейнером, щоб забезпечити пріоритет для хімічної ванни.\n\n&l&9Примітка:&r Якщо хочеш дізнатися більше тегів для автоматизації, вони відображаються при наведенні на предмет із затиснутим Shift. Наприклад, предмет із тегом &e&o#forge:plates/copper&r буде фільтруватися як &e&lplates/copper&r.\n\n&9&lІнша примітка:&r Фільтр за тегом предмета частково підтримує &dregex&r. Наведи курсор на іконку інформації, щоб дізнатися більше.", "quests.high_voltage.bedrock_miner.subtitle": "Необмежені руди?", - "quests.high_voltage.bedrock_miner.desc.1": "Це може бути твоє перше знайомство з &cглибокореневим рудокопом&r, адже його рідко використовують у GregTech.\n\nВін працює подібно до &bрідинної бурової устава&r, але цільові жили &nніколи не виснажуються&r.\n\nВін майже не споживає енергії — чудово працює на &bMV&r або &6HV&r — і не потребує &aжодних вхідних матеріалів&r.\n\nТо в чому ж підступ? \nПотрібно знайти самі жили.", + "quests.high_voltage.bedrock_miner.desc.1": "Це може бути твоє перше знайомство з &cглибокореневим рудокопом&r, адже його рідко використовують у GregTech.\n\nВін працює подібно до &bрідинної бурової устави&r, але цільові жили &nніколи не виснажуються&r.\n\nВін майже не споживає енергії — чудово працює на &bMV&r або &6HV&r — і не потребує &aжодних вхідних матеріалів&r.\n\nТо в чому ж підступ? \nПотрібно знайти самі жили.", "quests.high_voltage.bedrock_miner.desc.2": "Тобі знадобиться &6HV&r розвідник, налаштований на режим &oрошуку руд у корінній породі&r (&7Shift + ПКМ&r), а також трохи терпіння. Коли знайдеш потрібну жилу, доведеться ще й придумати, як доставити ресурси назад на свою базу.\n\nНа &fМісяці&r ти зможеш знайти свої перші рудні жили в корінній породі, що дозволить пасивно отримувати кілька важливих елементів абсолютно безкоштовно — назавжди. Перевір JEI, щоб побачити доступні варіанти! Чим вища &aвисота&r, тим частіше трапляється жила.\n\nОскільки вони будуть дуже розкидані, це чудова нагода побудувати &7місячний потяг&r!", "quests.high_voltage.space_alloy.title": "R-алюміносталь", "quests.high_voltage.space_alloy.subtitle": "Ми це вигадали самі", @@ -5196,13 +5205,13 @@ "quests.high_voltage.space_survival.desc": "Якщо ти ще не ознайомився, обов’язково переглянь розділ завдань &3Поради — Космічне виживання&r! У ньому є вся необхідна інформація для створення повноцінної колонії на Місяці.", "quests.high_voltage.hypertubes.title": "Гіперканал", "quests.high_voltage.hypertubes.subtitle": "Майбутнє вже тут, старий", - "quests.high_voltage.hypertubes.desc": "Шукаєш крутіший спосіб швидко пересуватися по базі? Спробуй &3гіпертруби&r! Просто стань біля одного кінця, і вас затягне та перенесе на інший, при цьому вони можуть йти в будь-якому напрямку!\n\nДля роботи потрібні одиниці стресу, але якщо у вас більше немає установки Create, можна перетворити EU в SU за допомогою GregTech конвертера енергії та електродвигуна з &9&oCreate Crafts and Additions&r.", + "quests.high_voltage.hypertubes.desc": "Шукаєш крутіший спосіб швидко пересуватися по базі? Спробуй &3гіпертруби&r! Просто стань біля одного кінця, і вас затягне та перенесе на інший, при цьому вони можуть йти в будь-якому напрямку!\n\nДля роботи потрібні одиниці стресу, але якщо у вас більше немає устави Create, можна перетворити EU в SU за допомогою GregTech конвертера енергії та електродвигуна з &9&oCreate Crafts and Additions&r.", "quests.high_voltage.wand.title": "Чарівна паличка нескінченності", "quests.high_voltage.wand.subtitle": "Ультимативний інструмент Skyblock", "quests.high_voltage.wand.desc": "Ця паличка робить те саме, що й інші, але з &3без зносу&r. Любите будувати високі будівлі або покривати акри первозданної трави? Тоді це саме твій інструмент!\n\nМай на увазі, що Building Gadgets з’явиться незабаром у &5EV&r, пропонуючи ще потужніші інструменти для завзятих будівельників.", "quests.high_voltage.moon_harvester.title": "Місячний жнивар", "quests.high_voltage.moon_harvester.subtitle": "Пам’ятаєте глибокореневий рудокоп?", - "quests.high_voltage.moon_harvester.desc": "&7Місяць&r — це твій перший крок до &eнескінченних руд&r, але процес цей повільний.\nТобі знадобиться збирати різні види &bреголітового пилу&r, кожен з яких можна знайти лише в певному біомі.\nДля цього ти використовуватимеш &6місячний збирач&r. При його використанні важливо пам'ятати дві речі:\n\n• Йому потрібна &9вхідна шина&r, щоб ти міг налаштувати правильну &9схему&r.\n• Він підтримує &eнагрівальні катушки&r так само, як і &6крекінг-установка&r — чим вища віха катушок, тим більша знижка на енергію.\nЦе особливо корисно при зборі реголіту далеко від твоєї бази.\n\nЗвісно, самого сирого пилу недостатньо.\nТобі знадобиться &aневелика лінія обробки&r, щоб видобувати ресурси з реголітового пилу. Тому обов'язково привозь його на свою &7Місячну базу&r для подальшої переробки.", + "quests.high_voltage.moon_harvester.desc": "&7Місяць&r — це твій перший крок до &eнескінченних руд&r, але процес цей повільний.\nТобі знадобиться збирати різні види &bреголітового пилу&r, кожен з яких можна знайти лише в певному біомі.\nДля цього ти використовуватимеш &6місячний збирач&r. При його використанні важливо пам'ятати дві речі:\n\n• Йому потрібна &9вхідна шина&r, щоб ти міг налаштувати правильну &9схему&r.\n• Він підтримує &eнагрівальні катушки&r так само, як і &6крекінг устава&r — чим вищий рівень катушок, тим більша знижка на енергію.\nЦе особливо корисно при зборі реголіту далеко від твоєї бази.\n\nЗвісно, самого сирого пилу недостатньо.\nТобі знадобиться &aневелика лінія обробки&r, щоб видобувати ресурси з реголітового пилу. Тому обов'язково привозь його на свою &7місячну базу&r для подальшої переробки.", "quests.high_voltage.regolith_vapor.title": "Випарний реголіт", "quests.high_voltage.regolith_vapor.subtitle": "Невеликий пристрій, щоб перетворювати пил у руди", "quests.high_voltage.regolith_vapor.desc": "Щоб обробити твій &bреголітовий пил&r, тобі знадобиться &bпара реголіту&r — і її налаштування потребує трохи більше зусиль.\n\nОсь що тобі знадобиться:\n\n• &7Азуриновий пил&r — можна отримувати нескінченно за допомогою &кам'яної дробарки&r.\n• &eДіоксид вуглецю&r — виробляється з &9кисню&r та &7вуглецевого пилу&r (це легко, завдяки нескінченному &діамантовому пилу&r, який ти отримуватимеш).\n• &9Азот&r — отримується через вирощування &dплодів хорусу&r.\n\nПорада: Ти можеш пустити свій &9кисень&r по колу через &bдіоксид кремнію&r, що також дасть тобі стабільний бонус у вигляді &eкремнієвого пилу&r — дуже корисного побічного продукту.", @@ -5616,12 +5625,12 @@ "quests.medium_voltage.pyrolyse.desc.2": "Побічні продукти можна переганяти для отримання різноманітних органічних ресурсів, причому &oрізні&r побічні продукти дають &oрізні&r співвідношення &oрізних&r хімічних речовин. \n\nТобі потрібно заглянути в &9завдання з перегонки&r, щоб розібратися в силі дистиляції...", "quests.medium_voltage.pyrolyse.desc.3": "Є рецепти, які можуть приймати &bазот&r для подвоєння швидкості. Зараз це не надто варто переслідувати, але азот згодом стане безкоштовним і нескінченним. \n\nТобі цілком вистачить одного &3LV енергетичного люка&r та надпровідників для стабільного постачання &d64 EU/t&r. \n\nКрім того, &3мельхіорові котушки&r ідеальні для початкового використання піролізної печі, але з часом ти можеш захотіти оновитися до &bканталу&r.", "quests.medium_voltage.pyrolyse.desc.4": "&9&lПримітка:&r&l Рослинний шлях — один із варіантів отримання &9&lетилену&r&l, який є необхідним хімічним елементом для прогресу до &6HV&r&l. Інший шлях включає використання нафти.&r \n\nПіролізна піч залишається &dнеобов’язковою&r. Однак її створення дуже вигідне — як для отримання енергії, так і для різних побічних продуктів, тому ми настійно рекомендуємо тобі розглянути цей варіант. \n\n&l&3Історія:&r&o У GT5u структура піролізної печі була відомою як гігантська коробка з лише 9 котушками всередині. Гравці зазвичай витрачали кілька хвилин на пошук проблеми через відсутність попереднього перегляду EMI.", - "quests.medium_voltage.mv_fluid_rig.title": "Рідинні бурові установки", - "quests.medium_voltage.mv_fluid_rig.subtitle": "Рідинні бурові установки в CEu!", + "quests.medium_voltage.mv_fluid_rig.title": "Рідинні бурові устави", + "quests.medium_voltage.mv_fluid_rig.subtitle": "Рідинні бурові устави в CEu!", "quests.medium_voltage.mv_fluid_rig.desc.1": "Володіння &3рідинною буровою установкою&r — це значна інвестиція, але вона &oбезперечно&r є найважливішим &6джерелом нафти&r. \n\nВона качає рідини з-під самого Бедроку. Зауваж, що рідини там насправді немає — вони симулюються. \n\nРідинні жили зберігаються в межах &cчанк-узгоджених регіонів&r. Кожна жила містить різну рідину, але здебільшого це різні типи нафти. \n\nПроводити розвідку рідинних жил &oще&r не можна — це стане доступним на рівні &6HV&r.", - "quests.medium_voltage.mv_fluid_rig.desc.2": "Кожна жила генерується з різною базовою продуктивністю. Зазвичай це від &d150мВ&r до &d300мВ&r за секунду при використанні &bвдосконаленої рідинної бурової установки&r, також відомої як &bрідинна бурова установка Mk1&r. \n\nПісля виснаження, рідинні жили поступово зменшують продуктивність. Це призводить до зниження виходу рідини з часом, доки він не досягне рівня виснаження. У цей момент слід перемістити установку на іншу жилу. \n\n&3Базова рідинна бурова установка&r працюватиме 100 000 операцій (по 1 секунді кожна) до виснаження. Цього достатньо для &6понад 10 000&r відер нафти. Установки вищої віхи значно збільшують продуктивність завдяки множнику, зазначеному в їх підказці, а також зменшують швидкість виснаження.", + "quests.medium_voltage.mv_fluid_rig.desc.2": "Кожна жила генерується з різною базовою продуктивністю. Зазвичай це від &d150мВ&r до &d300мВ&r за секунду при використанні &bвдосконаленої рідинної бурової устави&r, також відомої як &bрідинна бурова устава Mk1&r. \n\nПісля виснаження, рідинні жили поступово зменшують продуктивність. Це призводить до зниження виходу рідини з часом, доки він не досягне рівня виснаження. У цей момент слід перемістити установку на іншу жилу. \n\n&3Базова рідинна бурова устава&r працюватиме 100 000 операцій (по 1 секунді кожна) до виснаження. Цього достатньо для &6понад 10 000&r відер нафти. Установки вищої віхи значно збільшують продуктивність завдяки множнику, зазначеному в їх підказці, а також зменшують швидкість виснаження.", "quests.medium_voltage.mv_fluid_rig.desc.3": "&lЩо можна знайти в &2основному світі&r&l:&r \n\n&9Нафта:&r багатша на &aлеге паливо\n&r, найбільш цінний варіант. \n&9Легка нафта:&r багатша на &aгаз із нафтопереробки&r, придатний для енергії. \n&9Важка нафта:&r багатша на &aважке паливо&r, яке має більш вузьке застосування, зокрема толуол. \n&9Сира нафта:&r багатша на &aнафту&r, найкраще джерело ранніх нафтопродуктів. \n&9Природний газ:&r дає &aгаз із нафтопереробки&r без необхідності перегонки. \n&9Солона вода:&r дає &aгідроксид натрію&r та &aхлор&r, корисні пізніше.", - "quests.medium_voltage.mv_fluid_rig.desc.4": "&lЩо можна знайти в &cБезодні&r&l:&r\n\n&9Природний газ:&r дає &aрафінерійний газ&r, але з вищим виходом, ніж жила в основоного. \n&9Лава:&r сподіваємось, ти знаєш, що це таке.\n\nНа початку, можливо, доведеться бурити навмання, поки не знайдеш щось корисне. Пам’ятай: усе, що ви перекачуєте, також можна використати для заправки твоєї рідинної установки.", + "quests.medium_voltage.mv_fluid_rig.desc.4": "&lЩо можна знайти в &cБезодні&r&l:&r\n\n&9Природний газ:&r дає &aрафінерійний газ&r, але з вищим виходом, ніж жила в основоного. \n&9Лава:&r сподіваємось, ти знаєш, що це таке.\n\nНа початку, можливо, доведеться бурити навмання, поки не знайдеш щось корисне. Пам’ятай: усе, що ви перекачуєте, також можна використати для заправки твоєї рідинної устави.", "quests.medium_voltage.mv_fluid_rig.desc.5": "Приклад рідинних регіонів на &9Місяці&r:", "quests.medium_voltage.mv_oilsands.title": "Симулятор Америки", "quests.medium_voltage.mv_oilsands.subtitle": "Цей квест був спонсорований ЗС США", @@ -5629,7 +5638,7 @@ "quests.medium_voltage.mv_lpg.title": "Царство природних газів", "quests.medium_voltage.mv_lpg.subtitle": "Хто перший відчув запах...", "quests.medium_voltage.mv_lpg.desc.1": "&aРафінований Газ&r, &aLPG&r та &aметан&r — це &9газові палива&r. LPG (зріджений нафтогаз) — це суміш вуглеводнів, яка зазвичай використовується в опалювальних пристроях. \n\nРафінований газ отримується або з &dприродного газу&r, або з &dлегкої нафти&r, причому останній варіант дає більший вихід, але вимагає додаткового етапу дистиляції. \n\nВикористання &3центрифуги&r для розділення на &aLPG&r та &aметан&r завжди варто проводити, оскільки це практично безкоштовно.", - "quests.medium_voltage.mv_lpg.desc.2": "&a&aLPG&r та &aметан&r спалюються в &3газовій турбіні&r. Серед інших варіантів палива вони найпростіші у налаштуванні, що робить їх чудовими для старту. \nЇхній недолік у тому, що їх не можна додатково очищати, тому оновлення &3рідинної бурової установки&r може стати пріоритетом, якщо ти вирішиш використовувати цей тип палива. \n\n&aМетан&r також можна отримати з кількох &aприродних джерел&r. &eМіж нами&r, це меми, але ти можеш дослідити їх, якщо хочеш. Врешті-решт, вибір джерела енергії — твій.", + "quests.medium_voltage.mv_lpg.desc.2": "&a&aLPG&r та &aметан&r спалюються в &3газовій турбіні&r. Серед інших варіантів палива вони найпростіші у налаштуванні, що робить їх чудовими для старту. \nЇхній недолік у тому, що їх не можна додатково очищати, тому оновлення &3рідинної бурової устави&r може стати пріоритетом, якщо ти вирішиш використовувати цей тип палива. \n\n&aМетан&r також можна отримати з кількох &aприродних джерел&r. &eМіж нами&r, це меми, але ти можеш дослідити їх, якщо хочеш. Врешті-решт, вибір джерела енергії — твій.", "quests.medium_voltage.mv_brewery.title": "Місцевий варильник, що продає алкоголь", "quests.medium_voltage.mv_brewery.subtitle": "*ік*... *ік*", "quests.medium_voltage.mv_brewery.desc.1": "Варильник можна використовувати для виготовлення &aзмазки&r з &aредстоуна&r та &aкреозоту&r/&aнафти&r. Змазка має кілька вузьких застосувань — зокрема її можна використовувати в &3різаку&r для значного скорочення часу виконання рецептів.\n\nВарильня — надзвичайно повільна машина, але вона майже не потребує енергії для роботи. Побудова &2багатьох варильників&r допоможе тобі отримати достатньо Ббомаси для створення пластику.\n\n&9Примітка:&r Варильник відкриває шлях біомаси до &еЕтилену&r. Те ж саме можна здійснити в &3піролізній печі&r. Альтернативний шлях передбачає використання нафти.&r", @@ -6117,12 +6126,8 @@ "quests.ore_proc.bauxite.title": "Лінія бокситу", "quests.ore_proc.bauxite.subtitle": "Нове у сучасних версіях GregTech!", "quests.ore_proc.bauxite.desc": "Ти &oможеш&r просто електролізувати весь свій пил бокситу, щоб отримати жалюгідні 6 алюмінію та 1 рутил із 15 бокситу... Або ж ти можеш спробувати &6лінію бокситу&r!\n\nЦя нова лінія переробки повертає приблизно в 2 рази більше &bалюмінію&r та в 3 рази більше &4рутилу&r з кожного бокситу, а також додатково дарує тобі галій, залізо, Ннеодим і хром!", - "quests.ore_proc.gem_slurry.title": "Шлам із коштовного каміння", - "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.ore_proc.chromium.title": "Хромова лінія", - "quests.ore_proc.chromium.subtitle": "Більше ніж один шлях до перемоги", + "quests.ore_proc.chromium.subtitle": "Обвішай мене хромом, чум!", "quests.ore_proc.chromium.desc": "Процес отримання &bхрому&r може бути масштабнішим, ніж ти звик. Спочатку давай розглянемо доступні джерела:\n\n&6Уваровіт&r можна отримати з &6жовтого гранату&r та &eгранатового піску&r. Невелика кількість доступна вже на ранніх етапах, і її можна переробити на &6уваровіт&r. Після розблокування &bвежи зрідження&r ще одним джерелом стане рубін. Пізніше, на місяці, ти матимеш прямий доступ до &6хроміту&r та &6жовтого гранату&r.\n\nЩодо методу відновлення — вуглець або водень підійдуть, але використання алюмінію також дає &9оксид алюмінію&r, який необхідний для створення &5керамічної друкованої плати&r.\n\nРетельно вивчи &aEMI&r і обери той метод, який найкраще підходить для твоєї ситуації.", "quests.moon": "Місяць", "quests.moon.subtitle": "Єдине місце, яке ще не зіпсоване капіталізмом... Космос!", @@ -6238,7 +6243,7 @@ "quests.space_survival.semiheavy_ammoniacal_water.desc": "Вода на Марсі є &bнапівважкою&r, тобто містить один атом дейтерію, а також насичена &aаміаком&r, чудовим антифризом, завдяки чому вона може залишатися рідкою навіть за дуже низьких температур.\n\nТехнічно її можна пити, але, ймовірно, ви захочете спершу перегнати її в звичайну воду. Ви також можете переміщати вихідні блоки напівважкої аміачної води й отримувати більше за допомогою водяного акумулятора, так само як зі звичайною водою!", "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.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. Якщо там щось і здатне вижити, то воно напевно має неймовірні теплоізоляційні властивості...", @@ -6302,17 +6307,17 @@ "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.13. Слідкуйте за новинами!", + "quests.space_survival.mercury.desc": "&5Меркурій&r буде другорядною планетою в майбутньому &1IV&r‑оновленні TFG 0.14. Стежте за новинами!", "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.13. Стеж за оновленнями!", + "quests.space_survival.venus.desc": "&6Венера&r стане основною планетою для майбутньої переробки &1IV&r-тиру в TFG 0.14. Стежте за новинами!", "quests.space_survival.venus.task": "Приземлення на Венері", "quests.steam_age": "Рання автоматизація", "quests.steam_age.subtitle": "Від примітивних машин до парової енергії", "quests.steam_age.basic_greate.title": "Основи Greate", "quests.steam_age.basic_greate.subtitle": "Втомилися від Create? Це зробить його цікавішим", - "quests.steam_age.basic_greate.desc": "Greate — це злиття &3Create&r і &3GregTech&r, яке вводить різнорівневі версії машин Create. Воно також впроваджує обмеження на навантаження валів і зубчастих коліс, тому тобі доведеться ретельніше планувати, як живити свої механізми!\n\nЗагалом, ти захочеш створювати менші установки з власними джерелами живлення, замість того, щоб робити звичну для Create конфігурацію зі скупчення водяних коліс, підключених до одного вала твоєї бази.", + "quests.steam_age.basic_greate.desc": "Greate — це злиття &3Create&r і &3GregTech&r, яке вводить різнорівневі версії машин Create. Воно також впроваджує обмеження на навантаження валів і зубчастих коліс, тому тобі доведеться ретельніше планувати, як живити свої механізми!\n\nЗагалом, ти захочеш створювати менші устави з власними джерелами живлення, замість того, щоб робити звичну для Create конфігурацію зі скупчення водяних коліс, підключених до одного вала твоєї бази.", "quests.steam_age.create_tools.title": "Інструменти ремесла", "quests.steam_age.create_tools.subtitle": "Це може бути корисним", "quests.steam_age.create_tools.desc": "Гайковий ключ дозволить тобі швидко підбирати блоки Create за допомогою комбінації Shift + ПКМ на них, хоча сокира чи кайло теж підійдуть. Окуляри дозволять тобі бачити набагато детальнішу інформацію про свої механізми, наприклад, скільки навантаження вони створюють або споживають.\n\nОкуляри наразі необов'язкові, але вони виявляться дуже корисними, і ти точно захочеш мати їх пізніше. \n\nПеревір розділ «Поради TFG», щоб отримати допомогу щодо видування скла. А ти знав, що руйнування кругляка молотом перетворює його на гравій, а якщо розбити його ще раз, він перетвориться на пісок...?", @@ -6460,7 +6465,7 @@ "quests.steam_age.steam_engine.desc": "Водяні колеса та вітряки вже не справляються? Яка ж епоха пари без справжнього парового двигуна! Кожен паровий двигун може видавати цілих 256 SU, надаючи тобі значно більше потужності для роботи.\n\nПальники пломеня можна створити, не виходячи з дому, а за допомогою механічної руки їх можна автоматично живити твердим паливом або напряму подавати рідке паливо (наприклад, креозот). Також для їх перегріву можна використовувати вугільні самоцвіти, антрацит і кокс.", "quests.steam_age.fuel_sources.title": "Додаткові джерела пального", "quests.steam_age.fuel_sources.subtitle": "Впроваджуємо силу в парову силу", - "quests.steam_age.fuel_sources.desc": "Парова машина може працювати з ширшим набором рідинних палив, ніж котел високого тиску. Хоча креозот або лава — це найпростіші варіанти на даному етапі, ти можеш зацікавитися й рослинними оліями, такими як &eолія з насіння&r з соняшників або каноли.\n\nКреозот і лава погано масштабуються на пізніх рівнях, натомість біопаиво може бути перетворене в дизель, а потім — у високоцетановий дизель . Тож якщо тобі до душі ця ідея — почни закладати великі поля для вирощування рослин на олію!", + "quests.steam_age.fuel_sources.desc": "Парова машина може працювати з ширшим набором рідинних палив, ніж котел високого тиску. Хоча креозот або лава — це найпростіші варіанти на даному етапі, ти можеш зацікавитися й рослинними оліями, такими як &eолія з насіння&r з соняшників або каноли.\n\nКреозот і лава погано масштабуються на пізніх рівнях, натомість біопаливо може бути перетворене в дизель, а потім — у високоцетановий дизель . Тож якщо тобі до душі ця ідея — почни закладати великі поля для вирощування рослин на олію!", "quests.steam_age.deployers.title": "Активатори", "quests.steam_age.deployers.subtitle": "Примітивна лінія збірки", "quests.steam_age.deployers.desc": "Хоча ти мог би використовувати один активатор протягом усього цього розділу, ми &3дійсно&r не рекомендуємо цього. Налаштування лінії активаторів уздовж конвеєрної стрічки збереже тобі купу часу та нервів, і це не марна трата матеріалів, оскільки ти завжди зможеш повторно використати їх для оновлення твоєї ферми деревини згодом.\n\nКрім того, це зробить електронні трубки значно дешевшими!", @@ -6932,7 +6937,7 @@ "quests.tfg_tips.scraping_knives.task": "Будь-який скребковий ніж", "quests.tfg_tips.glassblowing.title": "Склодувне ремесло", "quests.tfg_tips.glassblowing.subtitle": "Реалістична робота зі склом!", - "quests.tfg_tips.glassblowing.desc": "Щоб створити будь-яку &dскляну панель&r або &dблок&r, тобі знадобиться &3склодувна&r установка. \n\n&3Склодувне ремесло&r потребує &aдухову трубку&r та платформу з відповідних блоків для заливання розплавленого скла. \nПереглянь &2польовий посібник&r, щоб дізнатися більше про форму платформи та допустимі блоки. Ти отримаєш доступ до склодувного ремесла, щойно зможеш обробляти &aлатунь!&r", + "quests.tfg_tips.glassblowing.desc": "Щоб створити будь-яку &dскляну панель&r або &dблок&r, тобі знадобиться &3склодувна&r устава. \n\n&3Склодувне ремесло&r потребує &aдухову трубку&r та платформу з відповідних блоків для заливання розплавленого скла. \nПереглянь &2польовий посібник&r, щоб дізнатися більше про форму платформи та допустимі блоки. Ти отримаєш доступ до склодувного ремесла, щойно зможеш обробляти &aлатунь!&r", "quests.tfg_tips.glassblowing.task.1": "Будь-які склодувні блоки.", "quests.tfg_tips.glassblowing_tools.title": "Інструменти для склодувного ремесла", "quests.tfg_tips.glassblowing_tools.subtitle": "Інструменти ремесла", diff --git a/kubejs/assets/tfg/lang/zh_cn.json b/kubejs/assets/tfg/lang/zh_cn.json index b77b26679b..b48cee542e 100644 --- a/kubejs/assets/tfg/lang/zh_cn.json +++ b/kubejs/assets/tfg/lang/zh_cn.json @@ -538,7 +538,7 @@ "block.tfg.permafrost_support_horizontal": "冻土水平支撑梁", "block.tfg.rock.aqueduct_permafrost": "冻土引水桥", "block.tfg.rock.hardened_red_granite": "硬化红色花岗岩", - "block.tfg.rock.red_granite_stair": "天然红花岗岩楼梯", + "block.tfg.rock.red_granite_stairs": "天然红花岗岩楼梯", "block.tfg.rock.red_granite_slab": "天然红花岗岩台阶", "block.tfg.rock.red_granite_wall": "天然红花岗岩墙", "block.tfg.rock.polished_red_granite_stairs": "磨制红花岗岩楼梯", @@ -650,7 +650,7 @@ "block.tfg.rock.cut_red_sandstone_stairs": "切制赤铁矿砂岩楼梯", "block.tfg.rock.cut_red_sandstone_wall": "切制赤铁矿砂岩墙", "block.tfg.rock.bricks_venus_sandstone_wall": "粗面岩砂岩砖墙", - "block.tfg.rock.cracked_bricks_venus_sandstone_stair": "裂纹粗面岩砂岩砖楼梯", + "block.tfg.rock.cracked_bricks_venus_sandstone_stairs": "裂纹粗面岩砂岩砖楼梯", "block.tfg.rock.cracked_bricks_venus_sandstone_slab": "裂纹粗面岩砂岩砖台阶", "block.tfg.rock.cracked_bricks_venus_sandstone_wall": "裂纹粗面岩砂岩砖墙", "block.tfg.rock.quartz_wall": "石英墙", @@ -721,21 +721,21 @@ "block.tfg.rock.tuff_wall": "凝灰岩墙", "block.tfg.rock.cobble_tuff": "凝灰岩圆石", "block.tfg.rock.cobble_tuff_slab": "凝灰岩原石台阶", - "block.tfg.rock.cobble_tuff_stair": "凝灰岩原石楼梯", + "block.tfg.rock.cobble_tuff_stairs": "凝灰岩圆石楼梯", "block.tfg.rock.cobble_tuff_wall": "凝灰岩原石墙", "block.tfg.rock.mossy_cobble_tuff": "凝灰岩苔石", "block.tfg.rock.mossy_cobble_tuff_slab": "凝灰岩苔石台阶", - "block.tfg.rock.mossy_cobble_tuff_stair": "凝灰岩苔石楼梯", + "block.tfg.rock.mossy_cobble_tuff_stairs": "凝灰岩苔石楼梯", "block.tfg.rock.mossy_cobble_tuff_wall": "凝灰岩苔石墙", "block.tfg.rock.bricks_tuff": "凝灰岩砖块", "block.tfg.rock.bricks_tuff_slab": "凝灰岩砖台阶", - "block.tfg.rock.bricks_tuff_stair": "凝灰岩砖楼梯", + "block.tfg.rock.bricks_tuff_stairs": "凝灰岩砖楼梯", "block.tfg.rock.bricks_tuff_wall": "凝灰岩砖墙", "block.tfg.rock.mossy_bricks_tuff_slab": "覆苔凝灰岩砖台阶", - "block.tfg.rock.mossy_bricks_tuff_stair": "覆苔凝灰岩砖楼梯", + "block.tfg.rock.mossy_bricks_tuff_stairs": "覆苔凝灰岩砖楼梯", "block.tfg.rock.mossy_bricks_tuff_wall": "覆苔凝灰岩砖墙", "block.tfg.rock.cracked_bricks_tuff_slab": "裂纹凝灰岩砖台阶", - "block.tfg.rock.cracked_bricks_tuff_stair": "裂纹凝灰岩砖楼梯", + "block.tfg.rock.cracked_bricks_tuff_stairs": "裂纹凝灰岩砖楼梯", "block.tfg.rock.cracked_bricks_tuff_wall": "裂纹凝灰岩砖墙", "block.tfg.rock.chiseled_tuff": "雕纹凝灰岩", "block.tfg.rock.chiseled_tuff_bricks": "雕纹凝灰岩砖", @@ -812,6 +812,13 @@ "block.tfg.luv_gas_pressurizer": "§d精英气体加压器 II§r", "block.tfg.zpm_gas_pressurizer": "§c精英气体加压器 III§r", "block.tfg.uv_gas_pressurizer": "§3终极气体加压器§r", + "block.tfg.hv_wireless_charger": "§6进阶无线充电器 II§r", + "block.tfg.ev_wireless_charger": "§5进阶无线充电器 III§r", + "block.tfg.iv_wireless_charger": "§9精英无线充电器", + "block.tfg.luv_wireless_charger": "§d精英无线充电器 II§r", + "block.tfg.zpm_wireless_charger": "§c精英无线充电器 III§r", + "block.tfg.uv_wireless_charger": "§3终极无线充电器", + "block.tfg.uhv_wireless_charger": "§4史诗无线充电器§r", "block.tfg.fluid.semiheavy_ammoniacal_water": "半重氨水", "block.tfg.fluid.sulfur_fumes": "浓硫酸烟雾", "block.tfg.fluid.geyser_slurry": "超高温浆液", @@ -1076,6 +1083,7 @@ "block.tfg.smr_generator": "小型模块化涡轮机", "block.tfg.casings.machine_casing_desh_ptfe": "防辐射戴斯机械方块", "block.tfg.uv_smr_fluid_import_hatch": "小型模块化涡轮机输入仓", + "block.tfg.ore_processing_beneath": "地质硫化机", "block.tfg.growth_monitor": "生长监控器", "block.tfg.sample_rack": "样本架", "block.tfg.casings.machine_casing_sterilizing_pipes": "除菌管道", @@ -1576,6 +1584,17 @@ "block.tfg.strut.truss.copper": "铜桁架支柱", "block.tfg.strut.truss.steel": "金属桁架支柱", "block.tfg.strut.truss.zinc": "锌桁架支柱", + "block.tfg.groundcover.fallen_copper_lamp": "掉落的铜灯", + "block.tfg.groundcover.fallen_bronze_lamp": "掉落的青铜灯", + "block.tfg.groundcover.fallen_black_bronze_lamp": "掉落的黑青铜灯", + "block.tfg.groundcover.fallen_bismuth_bronze_lamp": "掉落的铋青铜灯", + "block.tfg.groundcover.fallen_wrought_iron_lamp": "掉落的锻铁灯", + "block.tfg.groundcover.fallen_steel_lamp": "掉落的钢灯", + "block.tfg.groundcover.fallen_black_steel_lamp": "掉落黑钢灯", + "block.tfg.groundcover.fallen_red_steel_lamp": "掉落的红钢灯", + "block.tfg.groundcover.fallen_blue_steel_lamp": "掉落的蓝钢灯", + "block.tfg.spider_web": "脆弱的蜘蛛网", + "block.tfg.spider_sac": "蜘蛛卵囊", "tfg.block_entity.artisan_table": "工匠台", "tfg.block_entity.large_nest_box": "大型巢箱", "effect.tfg.arsenicosis_warning": "砷中毒", @@ -1696,6 +1715,8 @@ "gui.tfg.chromatic_select.format": "&%1$s %2$s: %1$s", "gui.tfg.color_select.title": "选择颜色", "gui.tfg.color_select.chromatic_btn": "§b色彩效果", + "tfg.gui.ore_processing_gas.optimal_ratio.1": "仓内气体填充至一半容量时", + "tfg.gui.ore_processing_gas.optimal_ratio.2": "可获得最佳产量", "item.tfg.antipoison_pill": "抗毒药丸", "item.tfg.haste_pill": "急迫药丸", "item.tfg.night_vision_pill": "夜视药丸", @@ -1736,6 +1757,7 @@ "item.tfg.polycaprolactam_string": "聚己内酰胺线", "item.tfg.copper_spindle": "铜纺锤", "item.tfg.copper_spindle_head": "铜纺锤头", + "item.tfg.silk_fibers": "丝纤维", "item.tfg.space_suit_fabric": "航天服面料", "item.tfg.vitrified_pearl": "玻璃化末影珍珠", "item.tfg.fishing_net.wood": "木质渔网", @@ -2228,6 +2250,12 @@ "ali/loot_table/chests/moonbase": "废弃月球基地宝箱", "ali/loot_table/chests/cruncher_nest": "火星废墟宝箱", "ali/loot_table/chests/illager_camps": "灾厄村民营地宝箱", + "ali/loot_table/chests/mineshaft/generic": "废弃矿井宝箱", + "ali/loot_table/chests/mineshaft/spider": "虫蚀矿井宝箱", + "ali/loot_table/chests/mineshaft/start": "矿井入口宝箱", + "ali/loot_table/chests/beneath_hut": "废弃幽冥小屋宝箱", + "ali/loot_table/chests/beneath_tower_top": "猪灵塔楼宝箱（顶层）", + "ali/loot_table/chests/beneath_tower_bottom": "猪灵塔楼宝箱（底层）", "ali/loot_table/panning/deposits/native_copper_granite": "花岗岩原生铜沉积物", "ali/loot_table/panning/deposits/native_copper_diorite": "闪长岩原生铜沉积物", "ali/loot_table/panning/deposits/native_copper_gabbro": "辉长岩原生铜沉积物", @@ -2733,6 +2761,10 @@ "material.tfg.sodium_chromate": "铬酸钠", "material.tfg.sodium_dichromate": "重铬酸钠", "material.tfg.wollastonite": "硅灰石", + "material.tfg.sodium_molybdate": "钼酸钠", + "material.tfg.calcium_sulfate": "硫酸钙", + "material.tfg.lead_hydroxide": "氢氧化铅", + "material.tfg.molybdenum_trioxide": "三氧化钼", "tfg.ore_vein.deep_apatite": "磷灰石, 磷酸三钙……（深层）", "tfg.ore_vein.deep_asbestos": "锡石, 石棉……", "tfg.ore_vein.deep_banded_iron": "针铁矿, 褐铁矿, 赤铁矿", @@ -2789,6 +2821,7 @@ "tfg.ore_vein.normal_sulfide": "硫, 辉锑矿, 斑铜矿（火山）", "tfg.ore_vein.normal_tarkianite": "塔基安矿, 硼砂, 天然碱", "tfg.ore_vein.sand_basaltic": "玄武岩矿砂……", + "tfg.ore_vein.sand_garnet": "海绿石矿砂……", "tfg.ore_vein.sand_granitic": "花岗岩矿砂……", "tfg.ore_vein.sand_tin": "锡石矿砂", "tfg.ore_vein.surface_bismuth": "辉铋矿 (地表)", @@ -2863,11 +2896,12 @@ "tfg.ore_vein.moon_tetrahedrite": "黝铜矿, 原生铜……", "tfg.ore_vein.moon_topaz": "蓝黄玉, 黄玉, 辉铜矿……", "tfg.ore_vein.beneath_aluminium": "明矾石, 沸石, 重晶石", + "tfg.ore_vein.beneath_bismuth": "铋, 硫, 硝石", "tfg.ore_vein.beneath_coal_anthracite": "无烟煤, 石墨", "tfg.ore_vein.beneath_coal_bituminous": "烟煤, 黄铁矿", "tfg.ore_vein.beneath_coal_lignite": "褐煤", "tfg.ore_vein.beneath_copper_native": "原生铜, 孔雀石", - "tfg.ore_vein.beneath_copper_sulfide": "黄铜矿, 黄铁矿, 斑铜矿", + "tfg.ore_vein.beneath_copper_sulfide": "辉铜矿, 黄铁矿, 斑铜矿", "tfg.ore_vein.beneath_copper_tetrahedrite": "黝铜矿, 辉锑矿……", "tfg.ore_vein.beneath_gold": "原生金, 黄铁矿……", "tfg.ore_vein.beneath_gold_rich": "原生金, 磁铁矿……", @@ -2878,8 +2912,11 @@ "tfg.ore_vein.beneath_lead_silver": "方铅矿, 原生银, 铅", "tfg.ore_vein.beneath_lithium": "锂辉石, 锂, 钾石盐", "tfg.ore_vein.beneath_manganese": "软锰矿, 钙铝榴石……", + "tfg.ore_vein.beneath_molydbenum": "钼铅矿, 辉钼矿……", "tfg.ore_vein.beneath_nickel": "镍黄铁矿, 硅镁镍矿……", + "tfg.ore_vein.beneath_phlogopite": "金云母, 硫, 磷灰石", "tfg.ore_vein.beneath_phosphate": "磷酸三钙, 磷灰石……", + "tfg.ore_vein.beneath_psg": "铱砷矿, 钌砷矿……", "tfg.ore_vein.beneath_quartz": "下界石英, 石英, 重晶石……", "tfg.ore_vein.beneath_realgar": "雄黄, 辉锑矿, 朱砂", "tfg.ore_vein.beneath_redstone": "红石, 朱砂……", @@ -3001,6 +3038,10 @@ "tfg.machine.pastoral_engine.next_harvest_title": "下次收获：", "tfg.machine.pastoral_engine.next_harvest_days": " %s: %s天%s小时", "tfg.machine.pastoral_engine.next_harvest_hours": " %s: %s小时", + "tfg.machine.ore_processing_beneath.no_gas": "未检测到天然气", + "tfg.machine.ore_processing_beneath.gas_critical": "天然气储量过低：%s%%", + "tfg.machine.ore_processing_beneath.gas_level": "天然气储量：%s%%", + "tfg.machine.ore_processing_beneath.output_modifier": "产出效率：%s%%", "key.tfg.spray_can_menu": "打开喷漆罐菜单", "key.categories.tfg": "群峦格雷(现代版)", "behaviour.paintspray.chameleon.status.color": "§7模式: §f%s", @@ -3011,6 +3052,10 @@ "behaviour.paintspray.chameleon.tooltip.fluid": "§7涂料：%s / %s mB", "behaviour.paintspray.chameleon.message.out_of_paint": "§c棱彩涂料已耗尽！", "behaviour.paintspray.solvent.short": "溶剂", + "tfg.wireless_charger.enter_range": "§a充电范围：半径§f%s§a格", + "tfg.wireless_charger.left_range": "§c已离开无线充电范围", + "tfg.wireless_charger.mode.0": "§e模式：快充 §7(半径§f%s§7格，4A)", + "tfg.wireless_charger.mode.1": "§e模式：远程 §7(半径§f%s§7格，1A)", "tfc.recipe.barrel.tfg.barrel.dyeing.decorative_vase.black": "染色", "tfc.recipe.barrel.tfg.barrel.dyeing.decorative_vase.gray": "染色", "tfc.recipe.barrel.tfg.barrel.dyeing.decorative_vase.light_gray": "染色", @@ -3115,6 +3160,15 @@ "tfc.recipe.barrel.tfg.corrode_rusted_iron_greenhouse_trapdoor": "风化", "tfc.recipe.barrel.tfg.corrode_rusted_iron_greenhouse_door": "风化", "tfc.recipe.barrel.tfg.corrode_rusted_iron_greenhouse_port": "风化", + "tfc.recipe.barrel.tfg.barrel_alcohol.tfg_vintage_beer": "进一步陈化", + "tfc.recipe.barrel.tfg.barrel_alcohol.tfg_vintage_cider": "进一步陈化", + "tfc.recipe.barrel.tfg.barrel_alcohol.tfg_vintage_rum": "进一步陈化", + "tfc.recipe.barrel.tfg.barrel_alcohol.tfg_vintage_sake": "进一步陈化", + "tfc.recipe.barrel.tfg.barrel_alcohol.tfg_vintage_vodka": "进一步陈化", + "tfc.recipe.barrel.tfg.barrel_alcohol.tfg_vintage_whiskey": "进一步陈化", + "tfc.recipe.barrel.tfg.barrel_alcohol.tfg_vintage_rye_whiskey": "进一步陈化", + "tfc.recipe.barrel.tfg.barrel_alcohol.tfg_vintage_corn_whiskey": "进一步陈化", + "tfc.recipe.barrel.tfg.barrel_alcohol.tfg_vintage_mead": "进一步陈化", "tfc.recipe.barrel.tfg.barrel.treated_chipboard_composite": "防腐刨花板复合材料", "tfc.recipe.barrel.tfg.barrel.soak_hardwood_strip": "浸泡硬木条", "tfc.recipe.barrel.tfg.barrel.gtceu_treated_wood_plate": "防腐木板", @@ -3137,6 +3191,7 @@ "tfc.recipe.barrel.tfg.sealed_barrel.prepared_leather_gloves": "浸泡皮革手套", "tfc.recipe.barrel.tfg.barrel.rapeseed_to_oil": "提取菜籽油", "tfc.recipe.barrel.tfg.barrel.sunflower_to_oil": "提取葵花籽油", + "tfc.recipe.barrel.tfg.barrel.peanut_to_oil": "提取花生油", "tfc.recipe.barrel.tfg.barrel.maple_syrup_to_sugar": "制糖", "tfc.recipe.barrel.tfg.barrel.birch_syrup_to_sugar": "制糖", "tfc.recipe.barrel.tfg.barrel.develop_black_and_white_film": "冲洗胶卷", @@ -3228,6 +3283,7 @@ "tfg.tooltip.surfer_variant.tube": "夜影蓝毛皮", "tfg.tooltip.surfer_variant.fire": "血红色毛皮", "tfg.tooltip.surfer_variant.brain": "霜原粉毛皮", + "tfg.tooltip.surfer_variant.silver": "银白毛皮", "tfg.tooltip.nametag": "§7在书写桌上配合物品使用以命名该物品，或配合黑色染料来命名标签。", "tfg.tooltip.yeast_starter": "§7用干果制成", "tfg.tooltip.beehive": "§7需要填满空框，并周围种植花朵，以吸引蜜蜂。", @@ -3276,6 +3332,7 @@ "tfg.tooltip.wearable.snowshoes.snow": "减少在雪及类似方块上的移动减速效果", "tfg.tooltip.piglin_disguise": "伪装使猪灵变为中立，便于交易。但请小心！它们的耐心并非无限……", "tfg.tooltip.rope_ladders": "潜行+右击可瞬间拾起整个绳梯。", + "tfg.tooltip.player_head": "可以在书写桌上改名", "tfg.tooltip.cooling_foods": "§b使你体温降低：2°C", "tfg.tooltip.cooling_foods_strong": "§b使你体温降低：10°C", "tfg.tooltip.warming_foods": "§6使你体温升高：4°C", @@ -3296,6 +3353,8 @@ "tfg.tooltip.machine.growth_chamber_2": "§7生物工程的全套解决方案。§r", "tfg.tooltip.machine.evaporation_tower_1": "§7请勿与蒸馏塔混淆§r", "tfg.tooltip.machine.evaporation_tower_2": "§7通过去除多余溶剂来浓缩溶液。§r", + "tfg.tooltip.machine.ore_proc_beneath_1": "§7可一次性处理矿石及其他材料，跳过所有中间步骤。§r", + "tfg.tooltip.machine.ore_proc_beneath_2": "§7无法处理产出宝石的矿石。§r", "tfg.tooltip.machine.electric_greenhouse_1": "§7§o打造工厂化农业的真正含义§r", "tfg.tooltip.machine.electric_greenhouse_2": "§7使用电力驱动，全年种植作物！电力温室可以接受肥料以促进生长，或与水产养殖场形成循环以实现极致效率。§r", "tfg.tooltip.machine.cooling_tower_1": "§7给空气加热§r", @@ -3331,7 +3390,8 @@ "tfg.tooltip.growth_chamber": "通过增加层数，该机器可以同时运行更多配方。", "tfg.tooltip.wireless_card_1": "支持无线连接，无论相隔多远，即使是不同行星之间也能联通！", "tfg.tooltip.wireless_card_2": "物品仍可通过终端传输，但会消耗极高的电力。", - "tfg.tooltip.wireless_card_3": "星际物流需求请使用 §d轨道炮§r 。", + "tfg.tooltip.wireless_card_3": "传输物品比传输方块贵八倍。", + "tfg.tooltip.wireless_card_4": "星际物流需求请使用 §d轨道炮§r 。", "tfg.tooltip.component.nuclear_turbine_1": "§e基础产出：§r 8192 EU/t", "tfg.tooltip.component.nuclear_turbine_2": "每个高于 §5EV§r 阶段的转子支架 §7可提升§r 10% 效率，并使 EU/t 产出翻倍。", "tfg.tooltip.component.smr_generator_1": "§e基础产出：§r 4096 EU/t", @@ -3389,7 +3449,7 @@ "tfg.tooltip.crop.stick": " §c�§r该作物需要攀附§n木棍§r才能生长！", "tfg.tooltip.crop.grape_trellis": " §c�§r该作物需要§n葡萄架§r才能生长！", "tfg.tooltip.tier_locked_block": "需要用钢或更高级工具来破坏", - "tfg.tooltip.tier_locked_block_explosives": "易被炸药破坏", + "tfg.tooltip.tier_locked_block_explosives": "用炸药破坏，或者寻找角斑岩或岩浆", "tfg.tooltip.nutrition.health": "生命值", "tfg.tooltip.nutrition.style_button_2": "样式：纯色", "tfg.tooltip.nutrition.style_button_1": "样式：多色", @@ -3461,6 +3521,9 @@ "tooltip.tfg.chameleon_spray_can.features.mass_paint_line1": " §7• §f批量喷涂 §7- 喷涂时按住§eShift§7可", "tooltip.tfg.chameleon_spray_can.features.mass_paint_line2": " §7连锁喷涂同类型的相邻表面。", "tooltip.tfg.chameleon_spray_can.features.discount": " §a批量操作时享受 %1$d%% 流体消耗减免。", + "tfg.tooltip.machine.wireless_charger.short_range": "§7快充模式：半径§f%s§7格，4A", + "tfg.tooltip.machine.wireless_charger.long_range": "§7远程模式：半径§f%s§7格，1A", + "tfg.tooltip.machine.wireless_charger.usage": "§7使用§b螺丝刀§7切换模式", "emi.category.tfg.ore_vein_info": "矿脉信息", "tfg.emi.ore_veins.rock_types": "存在于岩石类型：", "tfg.emi.ore_veins.rarity": "稀有度：%d", @@ -3471,7 +3534,9 @@ "tfg.emi.ore_veins.rarity.tooltip": "平均每%d个区块生成一个矿脉", "tfg.emi.ore_veins.density": "密度：%d", "tfg.emi.ore_veins.y_ranges": "Y轴高度：%d 至 %d", - "tfg.emi.ore_veins.projected": "地表深度：%d至%d", + "tfg.emi.ore_veins.projected": "矿脉深度：%d 至 %d", + "tfg.emi.ore_veins.projected.emi.0": "矿脉相对于地表", + "tfg.emi.ore_veins.projected.emi.1": "Y轴的深度。", "tfg.emi.ore_veins.near_lava": "需要附近有岩浆", "tfg.emi.ore_veins.indicator_depth": "指示物深度： ", "tfg.emi.ore_veins.size": "尺寸：%d", @@ -3687,6 +3752,9 @@ "tfg.ore_patchouli_info.yellow_garnet": "$(thing)来源$(): 钙铁榴石, 钙铝榴石, 钙铬榴石", "tfg.ore_patchouli_info.yellow_limonite": "$(thing)熔化$(): 铸铁", "tfg.ore_patchouli_info.zeolite": "$(thing)来源$(): 铝, 氧", + "tfg.ore_patchouli_info.irarsite": "$(thing)来源$(): 铱, 砷, 硫", + "tfg.ore_patchouli_info.ferhodsite": "$(thing)来源$(): 铑, 铁, 镍", + "tfg.ore_patchouli_info.ruarsite": "$(thing)来源$(): 钌, 砷, 硫", "tfg.ore_patchouli_info.phlogopite": "$(thing)来源$(): 铝, 氟", "tfg.rock_patchouli_info.andesite": "安山岩", "tfg.rock_patchouli_info.basalt": "玄武岩", @@ -3809,7 +3877,12 @@ "tfg.emi.fluid_veins.liquid_carbon_dioxide": "火星液态二氧化碳矿藏", "tfg.emi.fluid_veins.semiheavy_ammoniacal_water": "火星半重氨水矿藏", "tfg.emi.fluid_veins.heavy_ammoniacal_water": "火星重氨水矿藏", + "tfg.emi.fluid_veins.beneath_gas_weak": "低密度天然气矿脉", + "tfg.emi.fluid_veins.beneath_gas_strong": "高密度天然气矿脉", "tfg.emi.fluid_veins.lava_beneath": "幽冥之地岩浆矿脉", + "tfg.emi.fluid_veins.beneath_glowstone": "液态荧石矿脉", + "tfg.emi.fluid_veins.beneath_gold": "液态金矿脉", + "tfg.emi.fluid_veins.beneath_steam": "蒸汽口袋", "tfg.emi.fluid_veins.venus_sulfuric_acid": "金星硫酸矿脉", "tfg.emi.fluid_veins.venus_lava": "金星岩浆矿脉", "quests.ae2": "应用能源2", @@ -5190,6 +5263,11 @@ "quests.high_voltage.large_steam_turbine.subtitle": "物有所值", "quests.high_voltage.large_steam_turbine.task": "任意动力仓（推荐至少4安）", "quests.high_voltage.large_steam_turbine.desc": "&e大型蒸汽涡轮&r是在&6HV&r阶段发电的强大&b多方块结构&r。由于该等级没有单方块发电机可以替代&b蒸汽&r发电，如果你打算继续使用蒸汽发电，就需要投资建造这个多方块结构。\n\n要了解其工作原理，请参阅&b格雷科技能源&r章节中与涡轮机相关的条目。", + "quests.high_voltage.wireless_charger.title": "无线充电器", + "quests.high_voltage.wireless_charger.subtitle": "现在你可以在合成样板时顺便充电了", + "quests.high_voltage.wireless_charger.task": "更高等级提供更大范围和更好的工具支持", + "quests.high_voltage.wireless_charger.desc.1": "&6无线充电器&r是一种实用的机器，可以无线为物品栏或饰品槽中任何带有能量容量的物品充电。在多人游戏中，它只会为同队伍的玩家充电。\n\n它不能将格雷科技工具充至超过其自身电压等级，但可以高效地为低等级工具充电。\n\n使用&6螺丝刀&r潜行右键点击可切换两种模式：短距离快充或远距离慢充。", + "quests.high_voltage.wireless_charger.desc.2": "&l&3背景知识：&r&o该机器的代码借鉴了&6Cosmic Frontiers&r，一个在格雷科技发展线中融入魔法元素的整合包。", "quests.low_voltage": "&7LV&r - 低压", "quests.low_voltage.subtitle": "驯服电力，开启你的格雷科技之旅", "quests.low_voltage.lv_machine_hull.title": "你的第二个机器外壳", @@ -5491,6 +5569,9 @@ "quests.low_voltage.lv_forming_press.desc": "这台机器通常用途不多，但在TFG中，如果你因任何原因仍需使用TFC的焊接配方，它都可以胜任。它也能轻松复制任何模头或模具。\n\n更迫在眉睫的是（双关语见谅），你需要用它来制作下一阶段电路的关键组件——&a酚醛电路板&r。\n\n进入&bMV&r阶段后，你将获得一个更便宜的配方。", "quests.low_voltage.lv_laser_engraver.subtitle": "biu biu！", "quests.low_voltage.lv_laser_engraver.desc": "制作机械动力物流系统所需的发信线圈需要用到基础激光蚀刻机。除此之外，它目前的功能不多，只能制作磨制石头。\n\n关于激光的更多应用，要等到&bMV&r阶段再处理了。", + "quests.low_voltage.geologic_vulcanizer.subtitle": "一站式服务", + "quests.low_voltage.geologic_vulcanizer.desc.1": "&6地质硫化机&r是一种功能强大的多方块结构，可在单次操作中完成矿石处理的所有步骤。你仍然可以获得完整处理产线所能得到的所有产出，但它的运作并非没有挑战。\n\n首先，这台机器只能在&5幽冥之地&r的最底层运行，即 Y=40 以下。它还需要大量的&9蒸馏水&r才能运作。但最重要的参数是，你需要将其中一个流体仓中的&a天然气&r维持在约 50%% 的容量。偏离这个 50%% 目标越远，获得副产物的几率就越低。\n\n格雷科技提供了许多工具来辅助管理，例如流体校准器、流体探测器和机器控制覆盖板。请注意，&6地质硫化机&r内置安全机制，当&a天然气&r容量低于 15%% 或高于 85%% 时会自动停机。", + "quests.low_voltage.geologic_vulcanizer.desc.2": "&l&3背景知识：&r&o其部分代码和设计灵感来自&6Monifactory&r&o，这是另一个格雷科技现代版整合包，专注于后期复杂多方块结构的自动化，包括对&b微域&r&o（一种独特的资源获取方式）的自动化。而“管理多方块内流体数量”这一核心机制，则借鉴了他们的&b幽匿缸&r&o。\n\nMonifactory 的概念本身又源自&6GTNH&r&o，一个无需赘述的整合包。&r", "quests.medium_voltage": "&bMV&r - 中压", "quests.medium_voltage.subtitle": "进军石油化工，精炼电子技术", "quests.medium_voltage.mv_machine_hull.title": "欢迎来到MV！", @@ -5789,6 +5870,9 @@ "quests.medium_voltage.large_steel_boiler.desc.1": "&e大型钢锅炉&r可能是你生产&b蒸汽&r的最佳方式。与&e大型青铜锅炉&r一样，它可以使用特定流体进行助燃，但这一版本解锁了许多新型&a助燃剂&r，包括一些你可能尚未解锁的。\n\n&e大型钢锅炉&r还拥有第二种模式。你可以直接在控制器GUI中切换模式，从而使用&e大型青铜锅炉&r无法使用的新型燃料。请注意，每个配方都需要一种流体和一种&6粘合剂&r，使用&8木炭&r作为粘合剂可以大幅减少所需流体量。\n\n&c要切换模式，你的大型钢锅炉不能正在运行配方，你可以使用软锤使其停止。&r", "quests.medium_voltage.large_steel_boiler.desc.2": "以下是所有可用&a助燃剂&r及其消耗列表：\n\n- 杂酚油 => 温度提升：&c200&r — 消耗：&b32 mB/s&r — 可用等级：&8ULV&r\n\n- 松脂和枫/桦树汁 => 温度提升：&c200&r — 消耗：&b32 mB/s&r — 可用等级：&8ULV&r\n\n- 橄榄油 => 温度提升：&c400&r — 消耗：&b8 mB/s&r — 可用等级：&8ULV&r\n\n- 木煤气 => 温度提升：&c400&r — 消耗：&b52 mB/s&r — 可用等级：&7LV&r\n\n&6大型钢锅炉专属&r：\n\n- 粗制芳香混合物 => 温度提升：&c1000&r — 消耗：&b600 mB/s&r — 可用等级：&bMV&r\n\n- 火箭燃料 => 温度提升：&c4000&r — 消耗：&b200 mB/s&r — 可用等级：&6HV&r\n\n- 放射性废液 => 温度提升：&c8000&r — 消耗：&b1 mB/s&r — 可用等级：&5EV&r", "quests.medium_voltage.large_steel_boiler.desc.3": "&l&3背景知识&r：&r&o在格雷科技现代版中，大型锅炉通常相当简单直接，只是燃烧燃料，没有任何模块化设计。显然，在群峦格雷中我们想增加一点变化，使其更复杂但也更具模块化。&r", + "quests.medium_voltage.chameleon_spray.subtitle": "&[rainbow]彩虹之力", + "quests.medium_voltage.chameleon_spray.desc.1": "&6变色龙喷漆罐&r让你用一个喷漆罐就能喷涂所有颜色，不再需要随身携带十几个。只需填充&d棱彩涂料&r，你就能随心所欲地为一切物品着色。\n\n请注意，&e群峦格雷&r中的某些物品可以通过它着色，而普通喷漆罐则无法做到。我们留给你去尽情探索和实验各种可能性。\n\n它还有一个巧妙功能，可以为文本应用不同的字体，例如在告示牌上。", + "quests.medium_voltage.chameleon_spray.desc.2": "&l&3背景知识：&r&o&6格雷科技现代实用设备&r&o也包含一种无需填充的无限&6喷漆罐&r&o。然而，该物品本应在整合包后期才能获得，因此在此期间，&bPhoenix&r&o本人与新版文本格式化功能一同实现了&6变色龙喷漆罐&r&o，让你能享受这款强大而更合理的喷漆罐。", "quests.metal_age": "冶金时代", "quests.metal_age.subtitle": "你的第一次技术进步。", "quests.metal_age.weld_bronze_ingots.title": "焊接青铜", @@ -6043,12 +6127,8 @@ "quests.ore_proc.bauxite.title": "铝土矿生产线", "quests.ore_proc.bauxite.subtitle": "格雷科技现代版全新加入！", "quests.ore_proc.bauxite.desc": "你&o可以&r仅仅通过电解所有铝土矿粉，来从每15个铝土矿中获取少得可怜的6份&b铝&r和1份&4金红石&r……但何不试试全新的&6铝土矿生产线&r呢？\n\n这条全新的加工路线能从每份铝土矿中产出约&b两倍&r的铝和&4三倍&r的金红石，同时还能额外获得大量的镓、铁、钕和铬！", - "quests.ore_proc.gem_slurry.title": "宝石浆液", - "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.ore_proc.chromium.title": "铬产线", - "quests.ore_proc.chromium.subtitle": "通往胜利的路不止一条", + "quests.ore_proc.chromium.subtitle": "给我镀铬，老铁！", "quests.ore_proc.chromium.desc": "获取&b铬&r的流程可能比你习惯的要更复杂。首先，来看看可用的来源：\n\n&6钙铬榴石&r可以从&6黄石榴石&r和&e石榴石砂&r中获得。早期就能接触到少量，并可以精炼成&6钙铬榴石&r。解锁&b液化塔&r后，红宝石也会成为另一个来源。之后在月球上，你将能直接获取&6铬铁矿&r和&6黄石榴石&r。\n\n至于还原方法，碳或氢都可以，但使用铝还能产出&9氧化铝&r，后者是制作&5陶瓷电路板&r的必需品。\n\n多翻翻&aEMI&r，选择最适合你情况的方案。", "quests.moon": "月球", "quests.moon.subtitle": "那个尚未被资本主义腐蚀的地方……太空！", @@ -6228,11 +6308,11 @@ "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将在即将到来的TFG0.13版本中，作为&1IV&r阶段的次级行星登场。敬请期待！", + "quests.space_survival.mercury.desc": "&5水星&r将在即将到来的TFG0.14版本中，作为&1IV&r阶段的次级行星登场。敬请期待！", "quests.space_survival.mercury.task": "登陆水星", "quests.space_survival.venus.title": "我在&6金星&r上！", "quests.space_survival.venus.subtitle": "多云，局部有硫酸雨", - "quests.space_survival.venus.desc": "&6金星&r将成为TFG0.13版本中&1IV&r阶段重制的核心行星。敬请期待！", + "quests.space_survival.venus.desc": "&6金星&r将成为TFG0.14版本中&1IV&r阶段重制的核心行星。敬请期待！", "quests.space_survival.venus.task": "登陆金星", "quests.steam_age": "早期自动化", "quests.steam_age.subtitle": "从原始机械到蒸汽动力", diff --git a/kubejs/assets/tfg/lang/zh_tw.json b/kubejs/assets/tfg/lang/zh_tw.json index 7650decfc8..9661831cd6 100644 --- a/kubejs/assets/tfg/lang/zh_tw.json +++ b/kubejs/assets/tfg/lang/zh_tw.json @@ -299,6 +299,8 @@ "tfg.ore_patchouli_info.height": "高", "tfg.ore_patchouli_info.radius": "半徑", "tfg.ore_patchouli_info.biomes_any": "任意", + "tfg.ore_patchouli_info.rainfall": "降雨量", + "tfg.ore_patchouli_info.temperature": "溫度", "tfg.ore_patchouli_info.percentage": "百分比", "tfg.ore_patchouli_name.copper": "原生銅", "tfg.ore_patchouli_name.gold": "原生金", From ff8a1414a3c474b94a0090746e6913c27387b782 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Tue, 23 Jun 2026 11:48:19 +0100 Subject: [PATCH 33/43] fixed breaking a hellforge side returning anthracite #4345 Related Work Items: #4 --- .../loot_tables/blocks/hellforge_side.json | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 kubejs/data/beneath/loot_tables/blocks/hellforge_side.json diff --git a/kubejs/data/beneath/loot_tables/blocks/hellforge_side.json b/kubejs/data/beneath/loot_tables/blocks/hellforge_side.json new file mode 100644 index 0000000000..30c2e41073 --- /dev/null +++ b/kubejs/data/beneath/loot_tables/blocks/hellforge_side.json @@ -0,0 +1,23 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": 7.0, + "function": "minecraft:set_count" + } + ], + "name": "minecraft:charcoal" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "beneath:blocks/hellforge" +} \ No newline at end of file From b8c7af331c0620635fe215463b348204ae31baa7 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Tue, 23 Jun 2026 12:54:26 +0100 Subject: [PATCH 34/43] cl --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 21548e7c18..907e40e508 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ - Fixed Pastoral Rancher not forming with tfc stone bricks (#4336) @Pyritie - Fixed a bunch of log spam (#4330) @Pyritie - Fixed beneath towers not being aligned to the lava level properly @Pyritie +- Fixed breaking parts of a hellforge returning anthracite instead of charcoal (#4345) @Pyritie ## [0.13.0] - 21-06-2026 - We've [written up a page](https://wiki.terrafirmagreg.team/modern/en_us/major-changelogs/0.13) with all of the major changes between 0.12 and 0.13. From 0604e72ead293093dbde673cad4c9631e7999879 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Tue, 23 Jun 2026 12:55:35 +0100 Subject: [PATCH 35/43] langs for ore tool --- .../entries/tfg_ores/nether_vein_index.json | 4 +- .../entries/tfg_ores/nether_ore_index.json | 8 +- .../entries/tfg_ores/nether_vein_index.json | 272 +++++++++--------- 3 files changed, 142 insertions(+), 142 deletions(-) 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 4f91978073..7410ddcbdd 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 @@ -696,7 +696,7 @@ ] }, "enable_visualize": false, - "text": "$(thing)Процент нагрузки$(): 35%$(br)$(thing)Source of$(): Ruthenium, Arsenic, Sulfur$(br)$(thing)Формула$(): RuAsS", + "text": "$(thing)Процент нагрузки$(): 35%$(br)$(thing)Источник дляf$(): Рутения, мышьяка, серы$(br)$(thing)Формула$(): RuAsS", "type": "patchouli:multiblock" }, { @@ -716,7 +716,7 @@ ] }, "enable_visualize": false, - "text": "$(thing)Процент нагрузки$(): 27%$(br)$(thing)Source of$(): Rhodium, Iron, Nickel$(br)$(thing)Формула$(): Fe₂Rh₂Ir₁Ni₃Cu₁S₉", + "text": "$(thing)Процент нагрузки$(): 27%$(br)$(thing)Источник дляf$(): Родия, железа, никеля$(br)$(thing)Формула$(): Fe₂Rh₂Ir₁Ni₃Cu₁S₉", "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 de516cb218..a9402ced8e 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,22 +14,22 @@ }, { "Type": "patchouli:text", - "text": "$(li)Ferhodsite: $(l:tfg_ores/nether_vein_index#beneath_psg)27%$(/l)$()$(li)Irarsite: $(l:tfg_ores/nether_vein_index#beneath_psg)37%$(/l)$()$(li)Phlogopite: $(l:tfg_ores/nether_vein_index#beneath_phlogopite)60%$(/l)$()$(li)Ruarsite: $(l:tfg_ores/nether_vein_index#beneath_psg)35%$(/l)$()$(li)下界石英: $(l:tfg_ores/nether_vein_index#beneath_quartz)44%$(/l), $(l:tfg_ores/nether_vein_index#beneath_redstone)16%$(/l)$()$(li)原生金: $(l:tfg_ores/nether_vein_index#beneath_gold)45%$(/l), $(l:tfg_ores/nether_vein_index#beneath_gold_rich)44%$(/l), $(l:tfg_ores/nether_vein_index#beneath_iron_magnetite)8%$(/l)$()$(li)原生铜: $(l:tfg_ores/nether_vein_index#beneath_copper_native)75%$(/l)$()$(li)原生银: $(l:tfg_ores/nether_vein_index#beneath_lead_silver)28%$(/l), $(l:tfg_ores/nether_vein_index#beneath_copper_tetrahedrite)11%$(/l)$()$(li)天然碱: $(l:tfg_ores/nether_vein_index#beneath_salt)14%$(/l)$()$(li)孔雀石: $(l:tfg_ores/nether_vein_index#beneath_iron_banded)30%$(/l), $(l:tfg_ores/nether_vein_index#beneath_copper_native)25%$(/l)$()$(li)岩盐: $(l:tfg_ores/nether_vein_index#beneath_salt)50%$(/l)$()$(li)斑铜矿: $(l:tfg_ores/nether_vein_index#beneath_copper_sulfide)16%$(/l)$()$(li)方铅矿: $(l:tfg_ores/nether_vein_index#beneath_lead_silver)57%$(/l), $(l:tfg_ores/nether_vein_index#beneath_zinc)30%$(/l)$()$(li)无烟煤: $(l:tfg_ores/nether_vein_index#beneath_coal_anthracite)75%$(/l)$()", + "text": "$(li)下界石英: $(l:tfg_ores/nether_vein_index#beneath_quartz)44%$(/l), $(l:tfg_ores/nether_vein_index#beneath_redstone)16%$(/l)$()$(li)原生金: $(l:tfg_ores/nether_vein_index#beneath_gold)45%$(/l), $(l:tfg_ores/nether_vein_index#beneath_gold_rich)44%$(/l), $(l:tfg_ores/nether_vein_index#beneath_iron_magnetite)8%$(/l)$()$(li)原生铜: $(l:tfg_ores/nether_vein_index#beneath_copper_native)75%$(/l)$()$(li)原生银: $(l:tfg_ores/nether_vein_index#beneath_lead_silver)28%$(/l), $(l:tfg_ores/nether_vein_index#beneath_copper_tetrahedrite)11%$(/l)$()$(li)天然碱: $(l:tfg_ores/nether_vein_index#beneath_salt)14%$(/l)$()$(li)孔雀石: $(l:tfg_ores/nether_vein_index#beneath_iron_banded)30%$(/l), $(l:tfg_ores/nether_vein_index#beneath_copper_native)25%$(/l)$()$(li)岩盐: $(l:tfg_ores/nether_vein_index#beneath_salt)50%$(/l)$()$(li)斑铜矿: $(l:tfg_ores/nether_vein_index#beneath_copper_sulfide)16%$(/l)$()$(li)方铅矿: $(l:tfg_ores/nether_vein_index#beneath_lead_silver)57%$(/l), $(l:tfg_ores/nether_vein_index#beneath_zinc)30%$(/l)$()$(li)无烟煤: $(l:tfg_ores/nether_vein_index#beneath_coal_anthracite)75%$(/l)$()$(li)明矾石: $(l:tfg_ores/nether_vein_index#beneath_aluminium)50%$(/l)$()$(li)朱砂: $(l:tfg_ores/nether_vein_index#beneath_redstone)25%$(/l), $(l:tfg_ores/nether_vein_index#beneath_realgar)10%$(/l)$()$(li)沸石: $(l:tfg_ores/nether_vein_index#beneath_aluminium)30%$(/l), $(l:tfg_ores/nether_vein_index#beneath_quartz)11%$(/l)$()$(li)烟煤: $(l:tfg_ores/nether_vein_index#beneath_coal_bituminous)66%$(/l), $(l:tfg_ores/nether_vein_index#beneath_graphite)18%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)明矾石: $(l:tfg_ores/nether_vein_index#beneath_aluminium)50%$(/l)$()$(li)朱砂: $(l:tfg_ores/nether_vein_index#beneath_redstone)25%$(/l), $(l:tfg_ores/nether_vein_index#beneath_realgar)10%$(/l)$()$(li)沸石: $(l:tfg_ores/nether_vein_index#beneath_aluminium)30%$(/l), $(l:tfg_ores/nether_vein_index#beneath_quartz)11%$(/l)$()$(li)烟煤: $(l:tfg_ores/nether_vein_index#beneath_coal_bituminous)66%$(/l), $(l:tfg_ores/nether_vein_index#beneath_graphite)18%$(/l)$()$(li)石英: $(l:tfg_ores/nether_vein_index#beneath_quartz)27%$(/l)$()$(li)石墨: $(l:tfg_ores/nether_vein_index#beneath_coal_anthracite)25%$(/l), $(l:tfg_ores/nether_vein_index#beneath_graphite)72%$(/l)$()$(li)硅镁镍矿: $(l:tfg_ores/nether_vein_index#beneath_nickel)27%$(/l)$()$(li)硝石: $(l:tfg_ores/nether_vein_index#beneath_bismuth)28%$(/l)$()$(li)硫: $(l:tfg_ores/nether_vein_index#beneath_bismuth)33%$(/l), $(l:tfg_ores/nether_vein_index#beneath_sulfur)64%$(/l), $(l:tfg_ores/nether_vein_index#beneath_phlogopite)28%$(/l), $(l:tfg_ores/nether_vein_index#beneath_zinc)10%$(/l)$()$(li)磁铁矿: $(l:tfg_ores/nether_vein_index#beneath_gold_rich)33%$(/l), $(l:tfg_ores/nether_vein_index#beneath_iron_magnetite)66%$(/l)$()$(li)磷灰石: $(l:tfg_ores/nether_vein_index#beneath_phosphate)36%$(/l), $(l:tfg_ores/nether_vein_index#beneath_phlogopite)12%$(/l)$()$(li)磷酸三钙: $(l:tfg_ores/nether_vein_index#beneath_phosphate)54%$(/l)$()$(li)红宝石: $(l:tfg_ores/nether_vein_index#beneath_redstone)8%$(/l)$()$(li)红石: $(l:tfg_ores/nether_vein_index#beneath_redstone)50%$(/l)$()", + "text": "$(li)石英: $(l:tfg_ores/nether_vein_index#beneath_quartz)27%$(/l)$()$(li)石墨: $(l:tfg_ores/nether_vein_index#beneath_coal_anthracite)25%$(/l), $(l:tfg_ores/nether_vein_index#beneath_graphite)72%$(/l)$()$(li)硅镁镍矿: $(l:tfg_ores/nether_vein_index#beneath_nickel)27%$(/l)$()$(li)硝石: $(l:tfg_ores/nether_vein_index#beneath_bismuth)28%$(/l)$()$(li)硫: $(l:tfg_ores/nether_vein_index#beneath_bismuth)33%$(/l), $(l:tfg_ores/nether_vein_index#beneath_sulfur)64%$(/l), $(l:tfg_ores/nether_vein_index#beneath_phlogopite)28%$(/l), $(l:tfg_ores/nether_vein_index#beneath_zinc)10%$(/l)$()$(li)磁铁矿: $(l:tfg_ores/nether_vein_index#beneath_gold_rich)33%$(/l), $(l:tfg_ores/nether_vein_index#beneath_iron_magnetite)66%$(/l)$()$(li)磷灰石: $(l:tfg_ores/nether_vein_index#beneath_phosphate)36%$(/l), $(l:tfg_ores/nether_vein_index#beneath_phlogopite)12%$(/l)$()$(li)磷酸三钙: $(l:tfg_ores/nether_vein_index#beneath_phosphate)54%$(/l)$()$(li)红宝石: $(l:tfg_ores/nether_vein_index#beneath_redstone)8%$(/l)$()$(li)红石: $(l:tfg_ores/nether_vein_index#beneath_redstone)50%$(/l)$()$(li)蓝石: $(l:tfg_ores/nether_vein_index#beneath_gold_rich)22%$(/l)$()$(li)褐煤: $(l:tfg_ores/nether_vein_index#beneath_coal_lignite)100%$(/l)$()$(li)褐铁矿: $(l:tfg_ores/nether_vein_index#beneath_iron_banded)30%$(/l)$()$(li)赤铁矿: $(l:tfg_ores/nether_vein_index#beneath_iron_hematite)70%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)蓝石: $(l:tfg_ores/nether_vein_index#beneath_gold_rich)22%$(/l)$()$(li)褐煤: $(l:tfg_ores/nether_vein_index#beneath_coal_lignite)100%$(/l)$()$(li)褐铁矿: $(l:tfg_ores/nether_vein_index#beneath_iron_banded)30%$(/l)$()$(li)赤铁矿: $(l:tfg_ores/nether_vein_index#beneath_iron_hematite)70%$(/l)$()$(li)软锰矿: $(l:tfg_ores/nether_vein_index#beneath_manganese)53%$(/l)$()$(li)辉钴矿: $(l:tfg_ores/nether_vein_index#beneath_nickel)18%$(/l)$()$(li)辉钼矿: $(l:tfg_ores/nether_vein_index#beneath_molydbenum)21%$(/l)$()$(li)辉铜矿: $(l:tfg_ores/nether_vein_index#beneath_gold)18%$(/l), $(l:tfg_ores/nether_vein_index#beneath_copper_sulfide)50%$(/l)$()$(li)辉锑矿: $(l:tfg_ores/nether_vein_index#beneath_realgar)30%$(/l), $(l:tfg_ores/nether_vein_index#beneath_copper_tetrahedrite)33%$(/l), $(l:tfg_ores/nether_vein_index#beneath_sulfur)7%$(/l)$()$(li)重晶石: $(l:tfg_ores/nether_vein_index#beneath_quartz)16%$(/l), $(l:tfg_ores/nether_vein_index#beneath_aluminium)20%$(/l)$()$(li)针铁矿: $(l:tfg_ores/nether_vein_index#beneath_iron_banded)38%$(/l), $(l:tfg_ores/nether_vein_index#beneath_iron_hematite)30%$(/l)$()$(li)钒磁铁矿: $(l:tfg_ores/nether_vein_index#beneath_iron_magnetite)25%$(/l)$()$(li)钙铝榴石: $(l:tfg_ores/nether_vein_index#beneath_manganese)30%$(/l)$()$(li)钻石: $(l:tfg_ores/nether_vein_index#beneath_graphite)9%$(/l)$()", + "text": "$(li)软锰矿: $(l:tfg_ores/nether_vein_index#beneath_manganese)53%$(/l)$()$(li)辉钴矿: $(l:tfg_ores/nether_vein_index#beneath_nickel)18%$(/l)$()$(li)辉钼矿: $(l:tfg_ores/nether_vein_index#beneath_molydbenum)21%$(/l)$()$(li)辉铜矿: $(l:tfg_ores/nether_vein_index#beneath_gold)18%$(/l), $(l:tfg_ores/nether_vein_index#beneath_copper_sulfide)50%$(/l)$()$(li)辉锑矿: $(l:tfg_ores/nether_vein_index#beneath_realgar)30%$(/l), $(l:tfg_ores/nether_vein_index#beneath_copper_tetrahedrite)33%$(/l), $(l:tfg_ores/nether_vein_index#beneath_sulfur)7%$(/l)$()$(li)重晶石: $(l:tfg_ores/nether_vein_index#beneath_quartz)16%$(/l), $(l:tfg_ores/nether_vein_index#beneath_aluminium)20%$(/l)$()$(li)金云母: $(l:tfg_ores/nether_vein_index#beneath_phlogopite)60%$(/l)$()$(li)针铁矿: $(l:tfg_ores/nether_vein_index#beneath_iron_banded)38%$(/l), $(l:tfg_ores/nether_vein_index#beneath_iron_hematite)30%$(/l)$()$(li)钌砷矿: $(l:tfg_ores/nether_vein_index#beneath_psg)35%$(/l)$()$(li)钒磁铁矿: $(l:tfg_ores/nether_vein_index#beneath_iron_magnetite)25%$(/l)$()$(li)钙铝榴石: $(l:tfg_ores/nether_vein_index#beneath_manganese)30%$(/l)$()$(li)钻石: $(l:tfg_ores/nether_vein_index#beneath_graphite)9%$(/l)$()$(li)钼钙矿: $(l:tfg_ores/nether_vein_index#beneath_molydbenum)34%$(/l)$()$(li)钼铅矿: $(l:tfg_ores/nether_vein_index#beneath_molydbenum)43%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)钼钙矿: $(l:tfg_ores/nether_vein_index#beneath_molydbenum)34%$(/l)$()$(li)钼铅矿: $(l:tfg_ores/nether_vein_index#beneath_molydbenum)43%$(/l)$()$(li)钽铁矿: $(l:tfg_ores/nether_vein_index#beneath_manganese)15%$(/l)$()$(li)钾石盐: $(l:tfg_ores/nether_vein_index#beneath_salt)35%$(/l), $(l:tfg_ores/nether_vein_index#beneath_lithium)15%$(/l)$()$(li)铅: $(l:tfg_ores/nether_vein_index#beneath_lead_silver)14%$(/l)$()$(li)铋: $(l:tfg_ores/nether_vein_index#beneath_bismuth)37%$(/l)$()$(li)锂: $(l:tfg_ores/nether_vein_index#beneath_lithium)23%$(/l)$()$(li)锂辉石: $(l:tfg_ores/nether_vein_index#beneath_lithium)61%$(/l)$()$(li)锡: $(l:tfg_ores/nether_vein_index#beneath_tin)22%$(/l)$()$(li)锡石: $(l:tfg_ores/nether_vein_index#beneath_tin)77%$(/l)$()$(li)镍黄铁矿: $(l:tfg_ores/nether_vein_index#beneath_nickel)54%$(/l)$()$(li)闪锌矿: $(l:tfg_ores/nether_vein_index#beneath_zinc)60%$(/l)$()$(li)雄黄: $(l:tfg_ores/nether_vein_index#beneath_realgar)60%$(/l)$()$(li)黄铁矿: $(l:tfg_ores/nether_vein_index#beneath_gold)36%$(/l), $(l:tfg_ores/nether_vein_index#beneath_coal_bituminous)33%$(/l), $(l:tfg_ores/nether_vein_index#beneath_copper_sulfide)33%$(/l), $(l:tfg_ores/nether_vein_index#beneath_sulfur)28%$(/l), $(l:tfg_ores/nether_vein_index#beneath_phosphate)9%$(/l)$()", + "text": "$(li)钽铁矿: $(l:tfg_ores/nether_vein_index#beneath_manganese)15%$(/l)$()$(li)钾石盐: $(l:tfg_ores/nether_vein_index#beneath_salt)35%$(/l), $(l:tfg_ores/nether_vein_index#beneath_lithium)15%$(/l)$()$(li)铁铑矿: $(l:tfg_ores/nether_vein_index#beneath_psg)27%$(/l)$()$(li)铅: $(l:tfg_ores/nether_vein_index#beneath_lead_silver)14%$(/l)$()$(li)铋: $(l:tfg_ores/nether_vein_index#beneath_bismuth)37%$(/l)$()$(li)铱砷矿: $(l:tfg_ores/nether_vein_index#beneath_psg)37%$(/l)$()$(li)锂: $(l:tfg_ores/nether_vein_index#beneath_lithium)23%$(/l)$()$(li)锂辉石: $(l:tfg_ores/nether_vein_index#beneath_lithium)61%$(/l)$()$(li)锡: $(l:tfg_ores/nether_vein_index#beneath_tin)22%$(/l)$()$(li)锡石: $(l:tfg_ores/nether_vein_index#beneath_tin)77%$(/l)$()$(li)镍黄铁矿: $(l:tfg_ores/nether_vein_index#beneath_nickel)54%$(/l)$()$(li)闪锌矿: $(l:tfg_ores/nether_vein_index#beneath_zinc)60%$(/l)$()$(li)雄黄: $(l:tfg_ores/nether_vein_index#beneath_realgar)60%$(/l)$()$(li)黄铁矿: $(l:tfg_ores/nether_vein_index#beneath_gold)36%$(/l), $(l:tfg_ores/nether_vein_index#beneath_coal_bituminous)33%$(/l), $(l:tfg_ores/nether_vein_index#beneath_copper_sulfide)33%$(/l), $(l:tfg_ores/nether_vein_index#beneath_sulfur)28%$(/l), $(l:tfg_ores/nether_vein_index#beneath_phosphate)9%$(/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 4169945275..7bc05c27ba 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 @@ -14,12 +14,12 @@ }, { "Type": "patchouli:text", - "text": "$(li)$(l:tfg_ores/nether_vein_index#beneath_psg)Irarsite, Ruarsite...$()$()$(li)$(l:tfg_ores/nether_vein_index#beneath_phlogopite)Phlogopite, 硫, 磷灰石$()$()$(li)$(l:tfg_ores/nether_vein_index#beneath_quartz)下界石英, 石英, 重晶石, 沸石$()$()$(li)$(l:tfg_ores/nether_vein_index#beneath_gold_rich)原生金, 磁铁矿, 蓝石$()$()$(li)$(l:tfg_ores/nether_vein_index#beneath_gold)原生金, 黄铁矿, 辉铜矿$()$()$(li)$(l:tfg_ores/nether_vein_index#beneath_copper_native)原生铜, 孔雀石$()$()$(li)$(l:tfg_ores/nether_vein_index#beneath_salt)岩盐, 钾石盐, 天然碱$()$()$(li)$(l:tfg_ores/nether_vein_index#beneath_lead_silver)方铅矿, 原生银, 铅$()$()$(li)$(l:tfg_ores/nether_vein_index#beneath_coal_anthracite)无烟煤, 石墨$()$()$(li)$(l:tfg_ores/nether_vein_index#beneath_aluminium)明矾石, 沸石, 重晶石$()$()$(li)$(l:tfg_ores/nether_vein_index#beneath_coal_bituminous)烟煤, 黄铁矿$()$()$(li)$(l:tfg_ores/nether_vein_index#beneath_graphite)石墨, 烟煤, 钻石$()$()$(li)$(l:tfg_ores/nether_vein_index#beneath_sulfur)硫, 黄铁矿, 辉锑矿$()$()$(li)$(l:tfg_ores/nether_vein_index#beneath_iron_magnetite)磁铁矿, 钒磁铁矿, 原生金$()$()", + "text": "$(li)$(l:tfg_ores/nether_vein_index#beneath_quartz)下界石英, 石英, 重晶石, 沸石$()$()$(li)$(l:tfg_ores/nether_vein_index#beneath_gold_rich)原生金, 磁铁矿, 蓝石$()$()$(li)$(l:tfg_ores/nether_vein_index#beneath_gold)原生金, 黄铁矿, 辉铜矿$()$()$(li)$(l:tfg_ores/nether_vein_index#beneath_copper_native)原生铜, 孔雀石$()$()$(li)$(l:tfg_ores/nether_vein_index#beneath_salt)岩盐, 钾石盐, 天然碱$()$()$(li)$(l:tfg_ores/nether_vein_index#beneath_lead_silver)方铅矿, 原生银, 铅$()$()$(li)$(l:tfg_ores/nether_vein_index#beneath_coal_anthracite)无烟煤, 石墨$()$()$(li)$(l:tfg_ores/nether_vein_index#beneath_aluminium)明矾石, 沸石, 重晶石$()$()$(li)$(l:tfg_ores/nether_vein_index#beneath_coal_bituminous)烟煤, 黄铁矿$()$()$(li)$(l:tfg_ores/nether_vein_index#beneath_graphite)石墨, 烟煤, 钻石$()$()$(li)$(l:tfg_ores/nether_vein_index#beneath_sulfur)硫, 黄铁矿, 辉锑矿$()$()$(li)$(l:tfg_ores/nether_vein_index#beneath_iron_magnetite)磁铁矿, 钒磁铁矿, 原生金$()$()$(li)$(l:tfg_ores/nether_vein_index#beneath_phosphate)磷酸三钙, 磷灰石, 黄铁矿$()$()$(li)$(l:tfg_ores/nether_vein_index#beneath_redstone)红石, 朱砂, 下界石英, 红宝石$()$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)$(l:tfg_ores/nether_vein_index#beneath_phosphate)磷酸三钙, 磷灰石, 黄铁矿$()$()$(li)$(l:tfg_ores/nether_vein_index#beneath_redstone)红石, 朱砂, 下界石英, 红宝石$()$()$(li)$(l:tfg_ores/nether_vein_index#beneath_coal_lignite)褐煤$()$()$(li)$(l:tfg_ores/nether_vein_index#beneath_iron_hematite)赤铁矿, 针铁矿$()$()$(li)$(l:tfg_ores/nether_vein_index#beneath_manganese)软锰矿, 钙铝榴石, 钽铁矿$()$()$(li)$(l:tfg_ores/nether_vein_index#beneath_copper_sulfide)辉铜矿, 黄铁矿, 斑铜矿$()$()$(li)$(l:tfg_ores/nether_vein_index#beneath_iron_banded)针铁矿, 褐铁矿, 孔雀石$()$()$(li)$(l:tfg_ores/nether_vein_index#beneath_molydbenum)钼铅矿, 辉钼矿, 钼钙矿$()$()$(li)$(l:tfg_ores/nether_vein_index#beneath_bismuth)铋, 硫, 硝石$()$()$(li)$(l:tfg_ores/nether_vein_index#beneath_lithium)锂辉石, 锂, 钾石盐$()$()$(li)$(l:tfg_ores/nether_vein_index#beneath_tin)锡石, 锡$()$()$(li)$(l:tfg_ores/nether_vein_index#beneath_nickel)镍黄铁矿, 硅镁镍矿, 辉钴矿$()$()$(li)$(l:tfg_ores/nether_vein_index#beneath_zinc)闪锌矿, 方铅矿, 硫$()$()$(li)$(l:tfg_ores/nether_vein_index#beneath_realgar)雄黄, 辉锑矿, 朱砂$()$()", + "text": "$(li)$(l:tfg_ores/nether_vein_index#beneath_coal_lignite)褐煤$()$()$(li)$(l:tfg_ores/nether_vein_index#beneath_iron_hematite)赤铁矿, 针铁矿$()$()$(li)$(l:tfg_ores/nether_vein_index#beneath_manganese)软锰矿, 钙铝榴石, 钽铁矿$()$()$(li)$(l:tfg_ores/nether_vein_index#beneath_copper_sulfide)辉铜矿, 黄铁矿, 斑铜矿$()$()$(li)$(l:tfg_ores/nether_vein_index#beneath_phlogopite)金云母, 硫, 磷灰石$()$()$(li)$(l:tfg_ores/nether_vein_index#beneath_iron_banded)针铁矿, 褐铁矿, 孔雀石$()$()$(li)$(l:tfg_ores/nether_vein_index#beneath_molydbenum)钼铅矿, 辉钼矿, 钼钙矿$()$()$(li)$(l:tfg_ores/nether_vein_index#beneath_bismuth)铋, 硫, 硝石$()$()$(li)$(l:tfg_ores/nether_vein_index#beneath_psg)铱砷矿, 钌砷矿, 铁铑矿$()$()$(li)$(l:tfg_ores/nether_vein_index#beneath_lithium)锂辉石, 锂, 钾石盐$()$()$(li)$(l:tfg_ores/nether_vein_index#beneath_tin)锡石, 锡$()$()$(li)$(l:tfg_ores/nether_vein_index#beneath_nickel)镍黄铁矿, 硅镁镍矿, 辉钴矿$()$()$(li)$(l:tfg_ores/nether_vein_index#beneath_zinc)闪锌矿, 方铅矿, 硫$()$()$(li)$(l:tfg_ores/nether_vein_index#beneath_realgar)雄黄, 辉锑矿, 朱砂$()$()", "type": "patchouli:text" }, { @@ -27,140 +27,6 @@ "text": "$(li)$(l:tfg_ores/nether_vein_index#beneath_copper_tetrahedrite)黝铜矿, 辉锑矿, 原生银$()$()", "type": "patchouli:text" }, - { - "Type": "patchouli:text", - "text": "$(thing)$(t:每个区块生成矿脉的几率。下面的数字越小就越常见。)稀有度$(/t)$(): 1/30 区块$(br)$(thing)$(t:矿脉中矿石方块所占的百分比。百分比越高，矿石越多。)密度$(/t)$(): 18%$(br)$(thing)$(t:矿脉的形状。)类型$(/t)$(): $(t:宽而扁平)盘状矿脉$(/t)$(br)$(thing)$(t:矿脉可能生成的 Y 轴范围。)Y$(/t)$(): 0 — 80$(br)$(thing)$(t:矿脉的平均直径)尺寸$(/t)$(): 50$(br)$(thing)高度$(): 10$(br)$(thing)生物群系$(): $(t:熔岩浮岛)熔岩浮岛$(/t)$(br2)$(thing)岩石类型$(): 混合岩, 玄武岩, 辉石岩", - "title": "Irarsite, Ruarsite...", - "type": "patchouli:text", - "anchor": "beneath_psg" - }, - { - "Type": "patchouli:multiblock", - "name": "Irarsite", - "multiblock": { - "mapping": { - "0": "#forge:ores/irarsite" - }, - "pattern": [ - [ - "0" - ], - [ - " " - ] - ] - }, - "enable_visualize": false, - "text": "$(thing)百分比$(): 37%$(br)$(thing)Source of$(): Iridium, Arsenic, Sulfur$(br)$(thing)化学式$(): Ir₄Ru₁Rh₁Pt₁As₇S₇", - "type": "patchouli:multiblock" - }, - { - "Type": "patchouli:multiblock", - "name": "Ruarsite", - "multiblock": { - "mapping": { - "0": "#forge:ores/ruarsite" - }, - "pattern": [ - [ - "0" - ], - [ - " " - ] - ] - }, - "enable_visualize": false, - "text": "$(thing)百分比$(): 35%$(br)$(thing)Source of$(): Ruthenium, Arsenic, Sulfur$(br)$(thing)化学式$(): RuAsS", - "type": "patchouli:multiblock" - }, - { - "Type": "patchouli:multiblock", - "name": "Ferhodsite", - "multiblock": { - "mapping": { - "0": "#forge:ores/ferhodsite" - }, - "pattern": [ - [ - "0" - ], - [ - " " - ] - ] - }, - "enable_visualize": false, - "text": "$(thing)百分比$(): 27%$(br)$(thing)Source of$(): Rhodium, Iron, Nickel$(br)$(thing)化学式$(): Fe₂Rh₂Ir₁Ni₃Cu₁S₉", - "type": "patchouli:multiblock" - }, - { - "Type": "patchouli:text", - "text": "$(thing)$(t:每个区块生成矿脉的几率。下面的数字越小就越常见。)稀有度$(/t)$(): 1/10 区块$(br)$(thing)$(t:矿脉中矿石方块所占的百分比。百分比越高，矿石越多。)密度$(/t)$(): 20%$(br)$(thing)$(t:矿脉的形状。)类型$(/t)$(): $(t:宽而扁平)盘状矿脉$(/t)$(br)$(thing)$(t:矿脉可能生成的 Y 轴范围。)Y$(/t)$(): 0 — 80$(br)$(thing)$(t:矿脉的平均直径)尺寸$(/t)$(): 45$(br)$(thing)高度$(): 10$(br)$(thing)生物群系$(): $(t:玄武岩三角洲)玄武岩三角洲$(/t)$(br2)$(thing)岩石类型$(): 混合岩, 玄武岩, 辉石岩", - "title": "Phlogopite, 硫, 磷灰石", - "type": "patchouli:text", - "anchor": "beneath_phlogopite" - }, - { - "Type": "patchouli:multiblock", - "name": "Phlogopite", - "multiblock": { - "mapping": { - "0": "#forge:ores/phlogopite" - }, - "pattern": [ - [ - "0" - ], - [ - " " - ] - ] - }, - "enable_visualize": false, - "text": "$(thing)百分比$(): 60%$(br)$(thing)来源$(): 铝, 氟$(br)$(thing)化学式$(): KMg₃AlSi₃O₁₀F₂", - "type": "patchouli:multiblock" - }, - { - "Type": "patchouli:multiblock", - "name": "硫", - "multiblock": { - "mapping": { - "0": "#forge:ores/sulfur" - }, - "pattern": [ - [ - "0" - ], - [ - " " - ] - ] - }, - "enable_visualize": false, - "text": "$(thing)百分比$(): 28%$(br)$(thing)来源$(): 硫$(br)$(thing)化学式$(): S", - "type": "patchouli:multiblock" - }, - { - "Type": "patchouli:multiblock", - "name": "磷灰石", - "multiblock": { - "mapping": { - "0": "#forge:ores/apatite" - }, - "pattern": [ - [ - "0" - ], - [ - " " - ] - ] - }, - "enable_visualize": false, - "text": "$(thing)百分比$(): 12%$(br)$(thing)来源$(): 钙, 磷, 林业PTSD$(br)$(thing)化学式$(): Ca₅(PO₄)₃Cl", - "type": "patchouli:multiblock" - }, { "Type": "patchouli:text", "text": "$(thing)$(t:每个区块生成矿脉的几率。下面的数字越小就越常见。)稀有度$(/t)$(): 1/20 区块$(br)$(thing)$(t:矿脉中矿石方块所占的百分比。百分比越高，矿石越多。)密度$(/t)$(): 22%$(br)$(thing)$(t:矿脉的形状。)类型$(/t)$(): $(t:高而狭窄)管状矿脉$(/t)$(br)$(thing)$(t:矿脉可能生成的 Y 轴范围。)Y$(/t)$(): 80 — 140$(br)$(thing)高度$(): 60$(br)$(thing)半径$(): 15$(br)$(thing)生物群系$(): $(t:荆棘林地)荆棘灌丛$(/t)$(br2)$(thing)岩石类型$(): 凝灰岩, 混合岩, 片岩, 片麻岩, 石灰华, 花岗岩, 辉长岩, 闪长岩", @@ -1317,6 +1183,73 @@ "text": "$(thing)百分比$(): 16%$(br)$(thing)熔化$(): 铜$(br)$(thing)化学式$(): Cu₅FeS₄", "type": "patchouli:multiblock" }, + { + "Type": "patchouli:text", + "text": "$(thing)$(t:每个区块生成矿脉的几率。下面的数字越小就越常见。)稀有度$(/t)$(): 1/10 区块$(br)$(thing)$(t:矿脉中矿石方块所占的百分比。百分比越高，矿石越多。)密度$(/t)$(): 20%$(br)$(thing)$(t:矿脉的形状。)类型$(/t)$(): $(t:宽而扁平)盘状矿脉$(/t)$(br)$(thing)$(t:矿脉可能生成的 Y 轴范围。)Y$(/t)$(): 0 — 80$(br)$(thing)$(t:矿脉的平均直径)尺寸$(/t)$(): 45$(br)$(thing)高度$(): 10$(br)$(thing)生物群系$(): $(t:玄武岩三角洲)玄武岩三角洲$(/t)$(br2)$(thing)岩石类型$(): 混合岩, 玄武岩, 辉石岩", + "title": "金云母, 硫, 磷灰石", + "type": "patchouli:text", + "anchor": "beneath_phlogopite" + }, + { + "Type": "patchouli:multiblock", + "name": "金云母", + "multiblock": { + "mapping": { + "0": "#forge:ores/phlogopite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)百分比$(): 60%$(br)$(thing)来源$(): 铝, 氟$(br)$(thing)化学式$(): KMg₃AlSi₃O₁₀F₂", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "硫", + "multiblock": { + "mapping": { + "0": "#forge:ores/sulfur" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)百分比$(): 28%$(br)$(thing)来源$(): 硫$(br)$(thing)化学式$(): S", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "磷灰石", + "multiblock": { + "mapping": { + "0": "#forge:ores/apatite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)百分比$(): 12%$(br)$(thing)来源$(): 钙, 磷, 林业PTSD$(br)$(thing)化学式$(): Ca₅(PO₄)₃Cl", + "type": "patchouli:multiblock" + }, { "Type": "patchouli:text", "text": "$(thing)$(t:每个区块生成矿脉的几率。下面的数字越小就越常见。)稀有度$(/t)$(): 1/10 区块$(br)$(thing)$(t:矿脉中矿石方块所占的百分比。百分比越高，矿石越多。)密度$(/t)$(): 28%$(br)$(thing)$(t:矿脉的形状。)类型$(/t)$(): $(t:大致呈圆形)团簇状矿脉$(/t)$(br)$(thing)$(t:矿脉可能生成的 Y 轴范围。)Y$(/t)$(): 140 — 190$(br)$(thing)$(t:矿脉的平均直径)尺寸$(/t)$(): 31$(br)$(thing)生物群系$(): $(t:蛛网巢穴)灰烬森林$(/t)$(br2)$(thing)岩石类型$(): 凝灰岩, 千枚岩, 大理岩, 板岩, 混合岩, 片岩, 片麻岩, 石灰华, 闪长岩", @@ -1518,6 +1451,73 @@ "text": "$(thing)百分比$(): 28%$(br)$(thing)来源$(): 钾, 氮$(br)$(thing)化学式$(): KNO₃", "type": "patchouli:multiblock" }, + { + "Type": "patchouli:text", + "text": "$(thing)$(t:每个区块生成矿脉的几率。下面的数字越小就越常见。)稀有度$(/t)$(): 1/30 区块$(br)$(thing)$(t:矿脉中矿石方块所占的百分比。百分比越高，矿石越多。)密度$(/t)$(): 18%$(br)$(thing)$(t:矿脉的形状。)类型$(/t)$(): $(t:宽而扁平)盘状矿脉$(/t)$(br)$(thing)$(t:矿脉可能生成的 Y 轴范围。)Y$(/t)$(): 0 — 80$(br)$(thing)$(t:矿脉的平均直径)尺寸$(/t)$(): 50$(br)$(thing)高度$(): 10$(br)$(thing)生物群系$(): $(t:熔岩浮岛)熔岩浮岛$(/t)$(br2)$(thing)岩石类型$(): 混合岩, 玄武岩, 辉石岩", + "title": "铱砷矿, 钌砷矿, 铁铑矿", + "type": "patchouli:text", + "anchor": "beneath_psg" + }, + { + "Type": "patchouli:multiblock", + "name": "铱砷矿", + "multiblock": { + "mapping": { + "0": "#forge:ores/irarsite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)百分比$(): 37%$(br)$(thing)来源$(): 铱, 砷, 硫$(br)$(thing)化学式$(): Ir₄Ru₁Rh₁Pt₁As₇S₇", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "钌砷矿", + "multiblock": { + "mapping": { + "0": "#forge:ores/ruarsite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)百分比$(): 35%$(br)$(thing)来源$(): 钌, 砷, 硫$(br)$(thing)化学式$(): RuAsS", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "铁铑矿", + "multiblock": { + "mapping": { + "0": "#forge:ores/ferhodsite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)百分比$(): 27%$(br)$(thing)来源$(): 铑, 铁, 镍$(br)$(thing)化学式$(): Fe₂Rh₂Ir₁Ni₃Cu₁S₉", + "type": "patchouli:multiblock" + }, { "Type": "patchouli:text", "text": "$(thing)$(t:每个区块生成矿脉的几率。下面的数字越小就越常见。)稀有度$(/t)$(): 1/10 区块$(br)$(thing)$(t:矿脉中矿石方块所占的百分比。百分比越高，矿石越多。)密度$(/t)$(): 22%$(br)$(thing)$(t:矿脉的形状。)类型$(/t)$(): $(t:大致呈圆形)团簇状矿脉$(/t)$(br)$(thing)$(t:矿脉可能生成的 Y 轴范围。)Y$(/t)$(): 0 — 80$(br)$(thing)$(t:矿脉的平均直径)尺寸$(/t)$(): 25$(br)$(thing)生物群系$(): $(t:熔岩浮岛)熔岩浮岛$(/t)$(br2)$(thing)岩石类型$(): 混合岩, 玄武岩, 辉石岩", From 17b8ba7565dda45784f40a1a377250bab0636587 Mon Sep 17 00:00:00 2001 From: strangelyng Date: Tue, 23 Jun 2026 06:26:45 -0700 Subject: [PATCH 36/43] Adds shield models from Vexxed Visuals v1.2.7.1 (#4344) --- .../item/metal/shield/bismuth_bronze.json | 408 +++++++++++++++ .../metal/shield/bismuth_bronze_blocking.json | 51 ++ .../item/metal/shield/black_bronze.json | 408 +++++++++++++++ .../metal/shield/black_bronze_blocking.json | 51 ++ .../models/item/metal/shield/black_steel.json | 394 +++++++++++++++ .../metal/shield/black_steel_blocking.json | 50 ++ .../models/item/metal/shield/blue_steel.json | 405 +++++++++++++++ .../metal/shield/blue_steel_blocking.json | 49 ++ .../tfc/models/item/metal/shield/bronze.json | 408 +++++++++++++++ .../item/metal/shield/bronze_blocking.json | 51 ++ .../tfc/models/item/metal/shield/copper.json | 408 +++++++++++++++ .../item/metal/shield/copper_blocking.json | 51 ++ .../models/item/metal/shield/red_steel.json | 417 ++++++++++++++++ .../item/metal/shield/red_steel_blocking.json | 49 ++ .../tfc/models/item/metal/shield/steel.json | 471 ++++++++++++++++++ .../item/metal/shield/steel_blocking.json | 39 ++ .../item/metal/shield/wrought_iron.json | 324 ++++++++++++ .../metal/shield/wrought_iron_blocking.json | 43 ++ 18 files changed, 4077 insertions(+) create mode 100644 kubejs/assets/tfc/models/item/metal/shield/bismuth_bronze.json create mode 100644 kubejs/assets/tfc/models/item/metal/shield/bismuth_bronze_blocking.json create mode 100644 kubejs/assets/tfc/models/item/metal/shield/black_bronze.json create mode 100644 kubejs/assets/tfc/models/item/metal/shield/black_bronze_blocking.json create mode 100644 kubejs/assets/tfc/models/item/metal/shield/black_steel.json create mode 100644 kubejs/assets/tfc/models/item/metal/shield/black_steel_blocking.json create mode 100644 kubejs/assets/tfc/models/item/metal/shield/blue_steel.json create mode 100644 kubejs/assets/tfc/models/item/metal/shield/blue_steel_blocking.json create mode 100644 kubejs/assets/tfc/models/item/metal/shield/bronze.json create mode 100644 kubejs/assets/tfc/models/item/metal/shield/bronze_blocking.json create mode 100644 kubejs/assets/tfc/models/item/metal/shield/copper.json create mode 100644 kubejs/assets/tfc/models/item/metal/shield/copper_blocking.json create mode 100644 kubejs/assets/tfc/models/item/metal/shield/red_steel.json create mode 100644 kubejs/assets/tfc/models/item/metal/shield/red_steel_blocking.json create mode 100644 kubejs/assets/tfc/models/item/metal/shield/steel.json create mode 100644 kubejs/assets/tfc/models/item/metal/shield/steel_blocking.json create mode 100644 kubejs/assets/tfc/models/item/metal/shield/wrought_iron.json create mode 100644 kubejs/assets/tfc/models/item/metal/shield/wrought_iron_blocking.json diff --git a/kubejs/assets/tfc/models/item/metal/shield/bismuth_bronze.json b/kubejs/assets/tfc/models/item/metal/shield/bismuth_bronze.json new file mode 100644 index 0000000000..289a7420a7 --- /dev/null +++ b/kubejs/assets/tfc/models/item/metal/shield/bismuth_bronze.json @@ -0,0 +1,408 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "tfc:item/metal/shield/bismuth_bronze", + "particle": "tfc:item/metal/shield/bismuth_bronze" + }, + "elements": [ + { + "name": "board", + "from": [2, 6, 7], + "to": [14, 10, 8], + "faces": { + "north": {"uv": [0.5, 14, 6.5, 16], "rotation": 180, "texture": "#0"}, + "east": {"uv": [6, 14, 6.5, 16], "texture": "#0"}, + "south": {"uv": [0.5, 14, 6.5, 16], "texture": "#0"}, + "west": {"uv": [0.5, 14, 1, 16], "texture": "#0"}, + "up": {"uv": [0.5, 14, 6.5, 14.5], "texture": "#0"}, + "down": {"uv": [0.5, 15.5, 6.5, 16], "texture": "#0"} + } + }, + { + "name": "handle", + "from": [9, 6, 12], + "to": [10, 10, 13], + "faces": { + "north": {"uv": [7, 14, 9, 14.5], "rotation": 90, "texture": "#0"}, + "east": {"uv": [7, 14, 9, 14.5], "rotation": 90, "texture": "#0"}, + "south": {"uv": [7, 14, 9, 14.5], "rotation": 90, "texture": "#0"}, + "west": {"uv": [7, 14, 9, 14.5], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "handle", + "from": [5, 6, 12], + "to": [6, 10, 13], + "faces": { + "north": {"uv": [7, 14, 9, 14.5], "rotation": 90, "texture": "#0"}, + "east": {"uv": [7, 14, 9, 14.5], "rotation": 90, "texture": "#0"}, + "south": {"uv": [7, 14, 9, 14.5], "rotation": 90, "texture": "#0"}, + "west": {"uv": [7, 14, 9, 14.5], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "handle", + "from": [9, 5, 7], + "to": [10, 6, 13], + "faces": { + "north": {"uv": [6.5, 14, 7, 14.5], "texture": "#0"}, + "east": {"uv": [6.5, 14, 9.5, 14.5], "texture": "#0"}, + "south": {"uv": [6.5, 14, 7, 14.5], "texture": "#0"}, + "west": {"uv": [6.5, 14, 9.5, 14.5], "rotation": 180, "texture": "#0"}, + "up": {"uv": [6.5, 14, 9.5, 14.5], "rotation": 270, "texture": "#0"}, + "down": {"uv": [6.5, 14, 9.5, 14.5], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "handle", + "from": [5, 5, 7], + "to": [6, 6, 13], + "faces": { + "north": {"uv": [6.5, 14, 7, 14.5], "texture": "#0"}, + "east": {"uv": [6.5, 14, 9.5, 14.5], "texture": "#0"}, + "south": {"uv": [6.5, 14, 7, 14.5], "texture": "#0"}, + "west": {"uv": [6.5, 14, 9.5, 14.5], "rotation": 180, "texture": "#0"}, + "up": {"uv": [6.5, 14, 9.5, 14.5], "rotation": 270, "texture": "#0"}, + "down": {"uv": [6.5, 14, 9.5, 14.5], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "handle", + "from": [9, 10, 7], + "to": [10, 11, 13], + "faces": { + "north": {"uv": [6.5, 14, 7, 14.5], "texture": "#0"}, + "east": {"uv": [6.5, 14, 9.5, 14.5], "texture": "#0"}, + "south": {"uv": [6.5, 14, 7, 14.5], "texture": "#0"}, + "west": {"uv": [6.5, 14, 9.5, 14.5], "rotation": 180, "texture": "#0"}, + "up": {"uv": [6.5, 14, 9.5, 14.5], "rotation": 270, "texture": "#0"}, + "down": {"uv": [6.5, 14, 9.5, 14.5], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "handle", + "from": [5, 10, 7], + "to": [6, 11, 13], + "faces": { + "north": {"uv": [6.5, 14, 7, 14.5], "texture": "#0"}, + "east": {"uv": [6.5, 14, 9.5, 14.5], "texture": "#0"}, + "south": {"uv": [6.5, 14, 7, 14.5], "texture": "#0"}, + "west": {"uv": [6.5, 14, 9.5, 14.5], "rotation": 180, "texture": "#0"}, + "up": {"uv": [6.5, 14, 9.5, 14.5], "rotation": 270, "texture": "#0"}, + "down": {"uv": [6.5, 14, 9.5, 14.5], "rotation": 90, "texture": "#0"} + } + }, + { + "from": [5, 5, 5], + "to": [11, 11, 6], + "faces": { + "north": {"uv": [2.5, 2.5, 5.5, 5.5], "texture": "#0"}, + "east": {"uv": [2.5, 2.5, 3, 5.5], "texture": "#0"}, + "south": {"uv": [10.5, 2.5, 13.5, 5.5], "texture": "#0"}, + "west": {"uv": [5, 2.5, 5.5, 5.5], "texture": "#0"}, + "up": {"uv": [2.5, 2.5, 5.5, 3], "rotation": 180, "texture": "#0"}, + "down": {"uv": [2.5, 5, 5.5, 5.5], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [3, 3, 6], + "to": [13, 13, 7], + "faces": { + "north": {"uv": [1.5, 1.5, 6.5, 6.5], "texture": "#0"}, + "east": {"uv": [1.5, 1.5, 2, 6.5], "texture": "#0"}, + "south": {"uv": [9.5, 1.5, 14.5, 6.5], "texture": "#0"}, + "west": {"uv": [6, 1.5, 6.5, 6.5], "texture": "#0"}, + "up": {"uv": [1.5, 1.5, 6.5, 2], "rotation": 180, "texture": "#0"}, + "down": {"uv": [1.5, 6, 6.5, 6.5], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [5, 13, 6], + "to": [11, 14, 7], + "faces": { + "north": {"uv": [2.5, 1, 5.5, 1.5], "texture": "#0"}, + "east": {"uv": [2.5, 1, 3, 1.5], "texture": "#0"}, + "south": {"uv": [10.5, 1, 13.5, 1.5], "texture": "#0"}, + "west": {"uv": [5, 1, 5.5, 1.5], "texture": "#0"}, + "up": {"uv": [2.5, 1, 5.5, 1.5], "rotation": 180, "texture": "#0"}, + "down": {"uv": [2.5, 1, 5.5, 1.5], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [5, 14, 7], + "to": [11, 15, 8], + "faces": { + "north": {"uv": [2.5, 0.5, 5.5, 1], "texture": "#0"}, + "east": {"uv": [2.5, 0.5, 3, 1], "texture": "#0"}, + "south": {"uv": [10.5, 0.5, 13.5, 1], "texture": "#0"}, + "west": {"uv": [5, 0.5, 5.5, 1], "texture": "#0"}, + "up": {"uv": [2.5, 0.5, 5.5, 1], "rotation": 180, "texture": "#0"}, + "down": {"uv": [10.5, 0.5, 13.5, 1], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [5, 1, 7], + "to": [11, 2, 8], + "faces": { + "north": {"uv": [2.5, 7, 5.5, 7.5], "texture": "#0"}, + "east": {"uv": [2.5, 7, 3, 7.5], "texture": "#0"}, + "south": {"uv": [10.5, 7, 13.5, 7.5], "texture": "#0"}, + "west": {"uv": [5, 7, 5.5, 7.5], "texture": "#0"}, + "up": {"uv": [10.5, 7, 13.5, 7.5], "rotation": 180, "texture": "#0"}, + "down": {"uv": [2.5, 7, 5.5, 7.5], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [5, 2, 6], + "to": [11, 3, 7], + "faces": { + "north": {"uv": [2.5, 6.5, 5.5, 7], "texture": "#0"}, + "east": {"uv": [2.5, 6.5, 3, 7], "texture": "#0"}, + "south": {"uv": [10.5, 6.5, 13.5, 7], "texture": "#0"}, + "west": {"uv": [5, 6.5, 5.5, 7], "texture": "#0"}, + "up": {"uv": [2.5, 6.5, 5.5, 7], "rotation": 180, "texture": "#0"}, + "down": {"uv": [2.5, 6.5, 5.5, 7], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [13, 5, 6], + "to": [14, 11, 7], + "faces": { + "north": {"uv": [1, 2.5, 1.5, 5.5], "texture": "#0"}, + "east": {"uv": [1, 2.5, 1.5, 5.5], "texture": "#0"}, + "south": {"uv": [14.5, 2.5, 15, 5.5], "texture": "#0"}, + "west": {"uv": [1, 2.5, 1.5, 5.5], "texture": "#0"}, + "up": {"uv": [1, 2.5, 1.5, 3], "rotation": 180, "texture": "#0"}, + "down": {"uv": [1, 5, 1.5, 5.5], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [14, 5, 7], + "to": [15, 11, 8], + "faces": { + "north": {"uv": [0.5, 2.5, 1, 5.5], "texture": "#0"}, + "east": {"uv": [0.5, 2.5, 1, 5.5], "texture": "#0"}, + "south": {"uv": [15, 2.5, 15.5, 5.5], "texture": "#0"}, + "west": {"uv": [15, 2.5, 15.5, 5.5], "texture": "#0"}, + "up": {"uv": [0.5, 2.5, 1, 3], "rotation": 180, "texture": "#0"}, + "down": {"uv": [0.5, 5, 1, 5.5], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [13, 11, 7], + "to": [14, 13, 8], + "faces": { + "north": {"uv": [1, 1.5, 1.5, 2.5], "texture": "#0"}, + "east": {"uv": [1, 1.5, 1.5, 2.5], "texture": "#0"}, + "south": {"uv": [14.5, 1.5, 15, 2.5], "texture": "#0"}, + "west": {"uv": [14.5, 1.5, 15, 2.5], "texture": "#0"}, + "up": {"uv": [1, 1.5, 1.5, 2], "texture": "#0"}, + "down": {"uv": [14.5, 2, 15, 2.5], "texture": "#0"} + } + }, + { + "from": [11, 13, 7], + "to": [13, 14, 8], + "faces": { + "north": {"uv": [1.5, 1, 2.5, 1.5], "texture": "#0"}, + "east": {"uv": [1.5, 1, 2, 1.5], "texture": "#0"}, + "south": {"uv": [13.5, 1, 14.5, 1.5], "texture": "#0"}, + "west": {"uv": [13.5, 1, 14, 1.5], "texture": "#0"}, + "up": {"uv": [1.5, 1, 2.5, 1.5], "texture": "#0"}, + "down": {"uv": [13.5, 1, 14.5, 1.5], "texture": "#0"} + } + }, + { + "from": [11, 2, 7], + "to": [13, 3, 8], + "faces": { + "north": {"uv": [1.5, 6.5, 2.5, 7], "texture": "#0"}, + "east": {"uv": [1.5, 6.5, 2, 7], "texture": "#0"}, + "south": {"uv": [13.5, 6.5, 14.5, 7], "texture": "#0"}, + "west": {"uv": [13.5, 6.5, 14, 7], "texture": "#0"}, + "up": {"uv": [13.5, 6.5, 14.5, 7], "texture": "#0"}, + "down": {"uv": [1.5, 6.5, 2.5, 7], "texture": "#0"} + } + }, + { + "from": [3, 13, 7], + "to": [5, 14, 8], + "faces": { + "north": {"uv": [5.5, 1, 6.5, 1.5], "texture": "#0"}, + "east": {"uv": [10, 1, 10.5, 1.5], "texture": "#0"}, + "south": {"uv": [9.5, 1, 10.5, 1.5], "texture": "#0"}, + "west": {"uv": [6, 1, 6.5, 1.5], "texture": "#0"}, + "up": {"uv": [5.5, 1, 6.5, 1.5], "texture": "#0"}, + "down": {"uv": [9.5, 1, 10.5, 1.5], "texture": "#0"} + } + }, + { + "from": [3, 2, 7], + "to": [5, 3, 8], + "faces": { + "north": {"uv": [5.5, 6.5, 6.5, 7], "texture": "#0"}, + "east": {"uv": [10, 6.5, 10.5, 7], "texture": "#0"}, + "south": {"uv": [9.5, 6.5, 10.5, 7], "texture": "#0"}, + "west": {"uv": [6, 6.5, 6.5, 7], "texture": "#0"}, + "up": {"uv": [9.5, 6.5, 10.5, 7], "texture": "#0"}, + "down": {"uv": [5.5, 6.5, 6.5, 7], "texture": "#0"} + } + }, + { + "from": [13, 3, 7], + "to": [14, 5, 8], + "faces": { + "north": {"uv": [1, 5.5, 1.5, 6.5], "texture": "#0"}, + "east": {"uv": [1, 5.5, 1.5, 6.5], "texture": "#0"}, + "south": {"uv": [14.5, 5.5, 15, 6.5], "texture": "#0"}, + "west": {"uv": [14.5, 5.5, 15, 6.5], "texture": "#0"}, + "up": {"uv": [1, 5.5, 1.5, 6], "texture": "#0"}, + "down": {"uv": [14.5, 6, 15, 6.5], "texture": "#0"} + } + }, + { + "from": [2, 11, 7], + "to": [3, 13, 8], + "faces": { + "north": {"uv": [6.5, 1.5, 7, 2.5], "texture": "#0"}, + "east": {"uv": [9, 1.5, 9.5, 2.5], "texture": "#0"}, + "south": {"uv": [9, 1.5, 9.5, 2.5], "texture": "#0"}, + "west": {"uv": [6.5, 1.5, 7, 2.5], "texture": "#0"}, + "up": {"uv": [6.5, 1.5, 7, 2], "texture": "#0"}, + "down": {"uv": [9, 2, 9.5, 2.5], "texture": "#0"} + } + }, + { + "from": [2, 3, 7], + "to": [3, 5, 8], + "faces": { + "north": {"uv": [6.5, 5.5, 7, 6.5], "texture": "#0"}, + "east": {"uv": [9, 5.5, 9.5, 6.5], "texture": "#0"}, + "south": {"uv": [9, 5.5, 9.5, 6.5], "texture": "#0"}, + "west": {"uv": [6.5, 5.5, 7, 6.5], "texture": "#0"}, + "up": {"uv": [9, 5.5, 9.5, 6], "texture": "#0"}, + "down": {"uv": [6.5, 6, 7, 6.5], "texture": "#0"} + } + }, + { + "from": [1, 5, 7], + "to": [2, 11, 8], + "faces": { + "north": {"uv": [7, 2.5, 7.5, 5.5], "texture": "#0"}, + "east": {"uv": [8.5, 2.5, 9, 5.5], "texture": "#0"}, + "south": {"uv": [8.5, 2.5, 9, 5.5], "texture": "#0"}, + "west": {"uv": [7, 2.5, 7.5, 5.5], "texture": "#0"}, + "up": {"uv": [7, 2.5, 7.5, 3], "rotation": 180, "texture": "#0"}, + "down": {"uv": [7, 5, 7.5, 5.5], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [2, 5, 6], + "to": [3, 11, 7], + "faces": { + "north": {"uv": [6.5, 2.5, 7, 5.5], "texture": "#0"}, + "east": {"uv": [6.5, 2.5, 7, 5.5], "texture": "#0"}, + "south": {"uv": [9, 2.5, 9.5, 5.5], "texture": "#0"}, + "west": {"uv": [6.5, 2.5, 7, 5.5], "texture": "#0"}, + "up": {"uv": [6.5, 2.5, 7, 3], "rotation": 180, "texture": "#0"}, + "down": {"uv": [6.5, 5, 7, 5.5], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [11, 5, 5], + "to": [12, 11, 6], + "faces": { + "north": {"uv": [2, 2.5, 2.5, 5.5], "texture": "#0"}, + "east": {"uv": [2, 2.5, 2.5, 5.5], "texture": "#0"}, + "south": {"uv": [13.5, 2.5, 14, 5.5], "texture": "#0"}, + "west": {"uv": [2, 2.5, 2.5, 5.5], "texture": "#0"}, + "up": {"uv": [2, 2.5, 2.5, 3], "rotation": 180, "texture": "#0"}, + "down": {"uv": [2, 5, 2.5, 5.5], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [4, 5, 5], + "to": [5, 11, 6], + "faces": { + "north": {"uv": [5.5, 2.5, 6, 5.5], "texture": "#0"}, + "east": {"uv": [5.5, 2.5, 6, 5.5], "texture": "#0"}, + "south": {"uv": [5.5, 2.5, 6, 5.5], "texture": "#0"}, + "west": {"uv": [5.5, 2.5, 6, 5.5], "texture": "#0"}, + "up": {"uv": [5.5, 2.5, 6, 3], "rotation": 180, "texture": "#0"}, + "down": {"uv": [5.5, 5, 6, 5.5], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [5, 11, 5], + "to": [11, 12, 6], + "faces": { + "north": {"uv": [2.5, 2, 5.5, 2.5], "texture": "#0"}, + "east": {"uv": [2.5, 2, 3, 2.5], "texture": "#0"}, + "south": {"uv": [10.5, 2, 13.5, 2.5], "texture": "#0"}, + "west": {"uv": [5, 2, 5.5, 2.5], "texture": "#0"}, + "up": {"uv": [2.5, 2, 5.5, 2.5], "rotation": 180, "texture": "#0"}, + "down": {"uv": [2.5, 2, 5.5, 2.5], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [5, 4, 5], + "to": [11, 5, 6], + "faces": { + "north": {"uv": [2.5, 5.5, 5.5, 6], "texture": "#0"}, + "east": {"uv": [2.5, 5.5, 3, 6], "texture": "#0"}, + "south": {"uv": [2.5, 5.5, 5.5, 6], "texture": "#0"}, + "west": {"uv": [5, 5.5, 5.5, 6], "texture": "#0"}, + "up": {"uv": [2.5, 5.5, 5.5, 6], "rotation": 180, "texture": "#0"}, + "down": {"uv": [2.5, 5.5, 5.5, 6], "rotation": 180, "texture": "#0"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [0, -90, 0], + "translation": [2.3, -2, 5] + }, + "thirdperson_lefthand": { + "rotation": [0, -90, 0], + "translation": [2.3, -2, 5] + }, + "firstperson_righthand": { + "rotation": [0, -75, 15], + "translation": [4, -4, 0] + }, + "firstperson_lefthand": { + "rotation": [0, -75, 15], + "translation": [4, -4, 0] + }, + "ground": { + "translation": [0, 3, 0], + "scale": [0.5, 0.5, 0.5] + }, + "gui": { + "rotation": [30, 145, 0], + "translation": [0.25, 0.25, 0], + "scale": [0.65, 0.65, 0.65] + }, + "head": { + "rotation": [90, 0, 0], + "translation": [0, 5.5, -0.5], + "scale": [1.5, 1.5, 1.5] + }, + "fixed": { + "translation": [0, 0, 0], + "scale": [0.75, 0.75, 0.75] + } + }, + "groups": [ + { + "name": "handle", + "origin": [8, 8, 8], + "children": [0, 1, 2, 3, 4, 5, 6] + }, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28 + ], + "overrides": [{ + "predicate": { "blocking": 1 }, + "model": "tfc:item/metal/shield/bismuth_bronze_blocking" + } + ] +} \ No newline at end of file diff --git a/kubejs/assets/tfc/models/item/metal/shield/bismuth_bronze_blocking.json b/kubejs/assets/tfc/models/item/metal/shield/bismuth_bronze_blocking.json new file mode 100644 index 0000000000..f4cc1a4b0f --- /dev/null +++ b/kubejs/assets/tfc/models/item/metal/shield/bismuth_bronze_blocking.json @@ -0,0 +1,51 @@ +{ + "credit": "Made with Blockbench", + "parent":"tfc:item/metal/shield/bismuth_bronze", + "textures": { + "0": "tfc:item/metal/shield/bismuth_bronze", + "particle": "tfc:item/metal/shield/bismuth_bronze" + }, + "display": { + "thirdperson_righthand": { + "rotation": [0, -90, 0], + "translation": [2.3, -2, 5] + }, + "thirdperson_lefthand": { + "rotation": [0, -90, 0], + "translation": [2.3, -2, 5] + }, + "firstperson_righthand": { + "rotation": [5, -30, 5], + "translation": [-1.5, 0.5, 2.5] + }, + "firstperson_lefthand": { + "rotation": [5, -30, 5], + "translation": [-1.5, 0.5, 2.5] + }, + "ground": { + "translation": [0, 2, 0], + "scale": [0.5, 0.5, 0.5] + }, + "gui": { + "rotation": [30, 145, 0], + "translation": [0.25, 0.25, 0], + "scale": [0.65, 0.65, 0.65] + }, + "head": { + "rotation": [90, 0, 0], + "translation": [0, 5.5, -0.5], + "scale": [1.5, 1.5, 1.5] + }, + "fixed": { + "translation": [0, 0, -2.13], + "scale": [2.02, 2.02, 2.02] + } + }, + "groups": [ + { + "name": "handle", + "origin": [8, 8, 8], + "children": [0, 1, 2, 3, 4, 5, 6] + }, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28 + ] +} \ No newline at end of file diff --git a/kubejs/assets/tfc/models/item/metal/shield/black_bronze.json b/kubejs/assets/tfc/models/item/metal/shield/black_bronze.json new file mode 100644 index 0000000000..f2bd92f9ca --- /dev/null +++ b/kubejs/assets/tfc/models/item/metal/shield/black_bronze.json @@ -0,0 +1,408 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "tfc:item/metal/shield/black_bronze", + "particle": "tfc:item/metal/shield/black_bronze" + }, + "elements": [ + { + "name": "board", + "from": [2, 6, 7], + "to": [14, 10, 8], + "faces": { + "north": {"uv": [0.5, 14, 6.5, 16], "rotation": 180, "texture": "#0"}, + "east": {"uv": [6, 14, 6.5, 16], "texture": "#0"}, + "south": {"uv": [0.5, 14, 6.5, 16], "texture": "#0"}, + "west": {"uv": [0.5, 14, 1, 16], "texture": "#0"}, + "up": {"uv": [0.5, 14, 6.5, 14.5], "texture": "#0"}, + "down": {"uv": [0.5, 15.5, 6.5, 16], "texture": "#0"} + } + }, + { + "name": "handle", + "from": [9, 6, 12], + "to": [10, 10, 13], + "faces": { + "north": {"uv": [7, 14, 9, 14.5], "rotation": 90, "texture": "#0"}, + "east": {"uv": [7, 14, 9, 14.5], "rotation": 90, "texture": "#0"}, + "south": {"uv": [7, 14, 9, 14.5], "rotation": 90, "texture": "#0"}, + "west": {"uv": [7, 14, 9, 14.5], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "handle", + "from": [5, 6, 12], + "to": [6, 10, 13], + "faces": { + "north": {"uv": [7, 14, 9, 14.5], "rotation": 90, "texture": "#0"}, + "east": {"uv": [7, 14, 9, 14.5], "rotation": 90, "texture": "#0"}, + "south": {"uv": [7, 14, 9, 14.5], "rotation": 90, "texture": "#0"}, + "west": {"uv": [7, 14, 9, 14.5], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "handle", + "from": [9, 5, 7], + "to": [10, 6, 13], + "faces": { + "north": {"uv": [6.5, 14, 7, 14.5], "texture": "#0"}, + "east": {"uv": [6.5, 14, 9.5, 14.5], "texture": "#0"}, + "south": {"uv": [6.5, 14, 7, 14.5], "texture": "#0"}, + "west": {"uv": [6.5, 14, 9.5, 14.5], "rotation": 180, "texture": "#0"}, + "up": {"uv": [6.5, 14, 9.5, 14.5], "rotation": 270, "texture": "#0"}, + "down": {"uv": [6.5, 14, 9.5, 14.5], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "handle", + "from": [5, 5, 7], + "to": [6, 6, 13], + "faces": { + "north": {"uv": [6.5, 14, 7, 14.5], "texture": "#0"}, + "east": {"uv": [6.5, 14, 9.5, 14.5], "texture": "#0"}, + "south": {"uv": [6.5, 14, 7, 14.5], "texture": "#0"}, + "west": {"uv": [6.5, 14, 9.5, 14.5], "rotation": 180, "texture": "#0"}, + "up": {"uv": [6.5, 14, 9.5, 14.5], "rotation": 270, "texture": "#0"}, + "down": {"uv": [6.5, 14, 9.5, 14.5], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "handle", + "from": [9, 10, 7], + "to": [10, 11, 13], + "faces": { + "north": {"uv": [6.5, 14, 7, 14.5], "texture": "#0"}, + "east": {"uv": [6.5, 14, 9.5, 14.5], "texture": "#0"}, + "south": {"uv": [6.5, 14, 7, 14.5], "texture": "#0"}, + "west": {"uv": [6.5, 14, 9.5, 14.5], "rotation": 180, "texture": "#0"}, + "up": {"uv": [6.5, 14, 9.5, 14.5], "rotation": 270, "texture": "#0"}, + "down": {"uv": [6.5, 14, 9.5, 14.5], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "handle", + "from": [5, 10, 7], + "to": [6, 11, 13], + "faces": { + "north": {"uv": [6.5, 14, 7, 14.5], "texture": "#0"}, + "east": {"uv": [6.5, 14, 9.5, 14.5], "texture": "#0"}, + "south": {"uv": [6.5, 14, 7, 14.5], "texture": "#0"}, + "west": {"uv": [6.5, 14, 9.5, 14.5], "rotation": 180, "texture": "#0"}, + "up": {"uv": [6.5, 14, 9.5, 14.5], "rotation": 270, "texture": "#0"}, + "down": {"uv": [6.5, 14, 9.5, 14.5], "rotation": 90, "texture": "#0"} + } + }, + { + "from": [5, 5, 5], + "to": [11, 11, 6], + "faces": { + "north": {"uv": [2.5, 2.5, 5.5, 5.5], "texture": "#0"}, + "east": {"uv": [2.5, 2.5, 3, 5.5], "texture": "#0"}, + "south": {"uv": [10.5, 2.5, 13.5, 5.5], "texture": "#0"}, + "west": {"uv": [5, 2.5, 5.5, 5.5], "texture": "#0"}, + "up": {"uv": [2.5, 2.5, 5.5, 3], "rotation": 180, "texture": "#0"}, + "down": {"uv": [2.5, 5, 5.5, 5.5], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [3, 3, 6], + "to": [13, 13, 7], + "faces": { + "north": {"uv": [1.5, 1.5, 6.5, 6.5], "texture": "#0"}, + "east": {"uv": [1.5, 1.5, 2, 6.5], "texture": "#0"}, + "south": {"uv": [9.5, 1.5, 14.5, 6.5], "texture": "#0"}, + "west": {"uv": [6, 1.5, 6.5, 6.5], "texture": "#0"}, + "up": {"uv": [1.5, 1.5, 6.5, 2], "rotation": 180, "texture": "#0"}, + "down": {"uv": [1.5, 6, 6.5, 6.5], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [5, 13, 6], + "to": [11, 14, 7], + "faces": { + "north": {"uv": [2.5, 1, 5.5, 1.5], "texture": "#0"}, + "east": {"uv": [2.5, 1, 3, 1.5], "texture": "#0"}, + "south": {"uv": [10.5, 1, 13.5, 1.5], "texture": "#0"}, + "west": {"uv": [5, 1, 5.5, 1.5], "texture": "#0"}, + "up": {"uv": [2.5, 1, 5.5, 1.5], "rotation": 180, "texture": "#0"}, + "down": {"uv": [2.5, 1, 5.5, 1.5], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [5, 14, 7], + "to": [11, 15, 8], + "faces": { + "north": {"uv": [2.5, 0.5, 5.5, 1], "texture": "#0"}, + "east": {"uv": [2.5, 0.5, 3, 1], "texture": "#0"}, + "south": {"uv": [10.5, 0.5, 13.5, 1], "texture": "#0"}, + "west": {"uv": [5, 0.5, 5.5, 1], "texture": "#0"}, + "up": {"uv": [2.5, 0.5, 5.5, 1], "rotation": 180, "texture": "#0"}, + "down": {"uv": [10.5, 0.5, 13.5, 1], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [5, 1, 7], + "to": [11, 2, 8], + "faces": { + "north": {"uv": [2.5, 7, 5.5, 7.5], "texture": "#0"}, + "east": {"uv": [2.5, 7, 3, 7.5], "texture": "#0"}, + "south": {"uv": [10.5, 7, 13.5, 7.5], "texture": "#0"}, + "west": {"uv": [5, 7, 5.5, 7.5], "texture": "#0"}, + "up": {"uv": [10.5, 7, 13.5, 7.5], "rotation": 180, "texture": "#0"}, + "down": {"uv": [2.5, 7, 5.5, 7.5], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [5, 2, 6], + "to": [11, 3, 7], + "faces": { + "north": {"uv": [2.5, 6.5, 5.5, 7], "texture": "#0"}, + "east": {"uv": [2.5, 6.5, 3, 7], "texture": "#0"}, + "south": {"uv": [10.5, 6.5, 13.5, 7], "texture": "#0"}, + "west": {"uv": [5, 6.5, 5.5, 7], "texture": "#0"}, + "up": {"uv": [2.5, 6.5, 5.5, 7], "rotation": 180, "texture": "#0"}, + "down": {"uv": [2.5, 6.5, 5.5, 7], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [13, 5, 6], + "to": [14, 11, 7], + "faces": { + "north": {"uv": [1, 2.5, 1.5, 5.5], "texture": "#0"}, + "east": {"uv": [1, 2.5, 1.5, 5.5], "texture": "#0"}, + "south": {"uv": [14.5, 2.5, 15, 5.5], "texture": "#0"}, + "west": {"uv": [1, 2.5, 1.5, 5.5], "texture": "#0"}, + "up": {"uv": [1, 2.5, 1.5, 3], "rotation": 180, "texture": "#0"}, + "down": {"uv": [1, 5, 1.5, 5.5], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [14, 5, 7], + "to": [15, 11, 8], + "faces": { + "north": {"uv": [0.5, 2.5, 1, 5.5], "texture": "#0"}, + "east": {"uv": [0.5, 2.5, 1, 5.5], "texture": "#0"}, + "south": {"uv": [15, 2.5, 15.5, 5.5], "texture": "#0"}, + "west": {"uv": [15, 2.5, 15.5, 5.5], "texture": "#0"}, + "up": {"uv": [0.5, 2.5, 1, 3], "rotation": 180, "texture": "#0"}, + "down": {"uv": [0.5, 5, 1, 5.5], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [13, 11, 7], + "to": [14, 13, 8], + "faces": { + "north": {"uv": [1, 1.5, 1.5, 2.5], "texture": "#0"}, + "east": {"uv": [1, 1.5, 1.5, 2.5], "texture": "#0"}, + "south": {"uv": [14.5, 1.5, 15, 2.5], "texture": "#0"}, + "west": {"uv": [14.5, 1.5, 15, 2.5], "texture": "#0"}, + "up": {"uv": [1, 1.5, 1.5, 2], "texture": "#0"}, + "down": {"uv": [14.5, 2, 15, 2.5], "texture": "#0"} + } + }, + { + "from": [11, 13, 7], + "to": [13, 14, 8], + "faces": { + "north": {"uv": [1.5, 1, 2.5, 1.5], "texture": "#0"}, + "east": {"uv": [1.5, 1, 2, 1.5], "texture": "#0"}, + "south": {"uv": [13.5, 1, 14.5, 1.5], "texture": "#0"}, + "west": {"uv": [13.5, 1, 14, 1.5], "texture": "#0"}, + "up": {"uv": [1.5, 1, 2.5, 1.5], "texture": "#0"}, + "down": {"uv": [13.5, 1, 14.5, 1.5], "texture": "#0"} + } + }, + { + "from": [11, 2, 7], + "to": [13, 3, 8], + "faces": { + "north": {"uv": [1.5, 6.5, 2.5, 7], "texture": "#0"}, + "east": {"uv": [1.5, 6.5, 2, 7], "texture": "#0"}, + "south": {"uv": [13.5, 6.5, 14.5, 7], "texture": "#0"}, + "west": {"uv": [13.5, 6.5, 14, 7], "texture": "#0"}, + "up": {"uv": [13.5, 6.5, 14.5, 7], "texture": "#0"}, + "down": {"uv": [1.5, 6.5, 2.5, 7], "texture": "#0"} + } + }, + { + "from": [3, 13, 7], + "to": [5, 14, 8], + "faces": { + "north": {"uv": [5.5, 1, 6.5, 1.5], "texture": "#0"}, + "east": {"uv": [10, 1, 10.5, 1.5], "texture": "#0"}, + "south": {"uv": [9.5, 1, 10.5, 1.5], "texture": "#0"}, + "west": {"uv": [6, 1, 6.5, 1.5], "texture": "#0"}, + "up": {"uv": [5.5, 1, 6.5, 1.5], "texture": "#0"}, + "down": {"uv": [9.5, 1, 10.5, 1.5], "texture": "#0"} + } + }, + { + "from": [3, 2, 7], + "to": [5, 3, 8], + "faces": { + "north": {"uv": [5.5, 6.5, 6.5, 7], "texture": "#0"}, + "east": {"uv": [10, 6.5, 10.5, 7], "texture": "#0"}, + "south": {"uv": [9.5, 6.5, 10.5, 7], "texture": "#0"}, + "west": {"uv": [6, 6.5, 6.5, 7], "texture": "#0"}, + "up": {"uv": [9.5, 6.5, 10.5, 7], "texture": "#0"}, + "down": {"uv": [5.5, 6.5, 6.5, 7], "texture": "#0"} + } + }, + { + "from": [13, 3, 7], + "to": [14, 5, 8], + "faces": { + "north": {"uv": [1, 5.5, 1.5, 6.5], "texture": "#0"}, + "east": {"uv": [1, 5.5, 1.5, 6.5], "texture": "#0"}, + "south": {"uv": [14.5, 5.5, 15, 6.5], "texture": "#0"}, + "west": {"uv": [14.5, 5.5, 15, 6.5], "texture": "#0"}, + "up": {"uv": [1, 5.5, 1.5, 6], "texture": "#0"}, + "down": {"uv": [14.5, 6, 15, 6.5], "texture": "#0"} + } + }, + { + "from": [2, 11, 7], + "to": [3, 13, 8], + "faces": { + "north": {"uv": [6.5, 1.5, 7, 2.5], "texture": "#0"}, + "east": {"uv": [9, 1.5, 9.5, 2.5], "texture": "#0"}, + "south": {"uv": [9, 1.5, 9.5, 2.5], "texture": "#0"}, + "west": {"uv": [6.5, 1.5, 7, 2.5], "texture": "#0"}, + "up": {"uv": [6.5, 1.5, 7, 2], "texture": "#0"}, + "down": {"uv": [9, 2, 9.5, 2.5], "texture": "#0"} + } + }, + { + "from": [2, 3, 7], + "to": [3, 5, 8], + "faces": { + "north": {"uv": [6.5, 5.5, 7, 6.5], "texture": "#0"}, + "east": {"uv": [9, 5.5, 9.5, 6.5], "texture": "#0"}, + "south": {"uv": [9, 5.5, 9.5, 6.5], "texture": "#0"}, + "west": {"uv": [6.5, 5.5, 7, 6.5], "texture": "#0"}, + "up": {"uv": [9, 5.5, 9.5, 6], "texture": "#0"}, + "down": {"uv": [6.5, 6, 7, 6.5], "texture": "#0"} + } + }, + { + "from": [1, 5, 7], + "to": [2, 11, 8], + "faces": { + "north": {"uv": [7, 2.5, 7.5, 5.5], "texture": "#0"}, + "east": {"uv": [8.5, 2.5, 9, 5.5], "texture": "#0"}, + "south": {"uv": [8.5, 2.5, 9, 5.5], "texture": "#0"}, + "west": {"uv": [7, 2.5, 7.5, 5.5], "texture": "#0"}, + "up": {"uv": [7, 2.5, 7.5, 3], "rotation": 180, "texture": "#0"}, + "down": {"uv": [7, 5, 7.5, 5.5], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [2, 5, 6], + "to": [3, 11, 7], + "faces": { + "north": {"uv": [6.5, 2.5, 7, 5.5], "texture": "#0"}, + "east": {"uv": [6.5, 2.5, 7, 5.5], "texture": "#0"}, + "south": {"uv": [9, 2.5, 9.5, 5.5], "texture": "#0"}, + "west": {"uv": [6.5, 2.5, 7, 5.5], "texture": "#0"}, + "up": {"uv": [6.5, 2.5, 7, 3], "rotation": 180, "texture": "#0"}, + "down": {"uv": [6.5, 5, 7, 5.5], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [11, 5, 5], + "to": [12, 11, 6], + "faces": { + "north": {"uv": [2, 2.5, 2.5, 5.5], "texture": "#0"}, + "east": {"uv": [2, 2.5, 2.5, 5.5], "texture": "#0"}, + "south": {"uv": [13.5, 2.5, 14, 5.5], "texture": "#0"}, + "west": {"uv": [2, 2.5, 2.5, 5.5], "texture": "#0"}, + "up": {"uv": [2, 2.5, 2.5, 3], "rotation": 180, "texture": "#0"}, + "down": {"uv": [2, 5, 2.5, 5.5], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [4, 5, 5], + "to": [5, 11, 6], + "faces": { + "north": {"uv": [5.5, 2.5, 6, 5.5], "texture": "#0"}, + "east": {"uv": [5.5, 2.5, 6, 5.5], "texture": "#0"}, + "south": {"uv": [5.5, 2.5, 6, 5.5], "texture": "#0"}, + "west": {"uv": [5.5, 2.5, 6, 5.5], "texture": "#0"}, + "up": {"uv": [5.5, 2.5, 6, 3], "rotation": 180, "texture": "#0"}, + "down": {"uv": [5.5, 5, 6, 5.5], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [5, 11, 5], + "to": [11, 12, 6], + "faces": { + "north": {"uv": [2.5, 2, 5.5, 2.5], "texture": "#0"}, + "east": {"uv": [2.5, 2, 3, 2.5], "texture": "#0"}, + "south": {"uv": [10.5, 2, 13.5, 2.5], "texture": "#0"}, + "west": {"uv": [5, 2, 5.5, 2.5], "texture": "#0"}, + "up": {"uv": [2.5, 2, 5.5, 2.5], "rotation": 180, "texture": "#0"}, + "down": {"uv": [2.5, 2, 5.5, 2.5], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [5, 4, 5], + "to": [11, 5, 6], + "faces": { + "north": {"uv": [2.5, 5.5, 5.5, 6], "texture": "#0"}, + "east": {"uv": [2.5, 5.5, 3, 6], "texture": "#0"}, + "south": {"uv": [2.5, 5.5, 5.5, 6], "texture": "#0"}, + "west": {"uv": [5, 5.5, 5.5, 6], "texture": "#0"}, + "up": {"uv": [2.5, 5.5, 5.5, 6], "rotation": 180, "texture": "#0"}, + "down": {"uv": [2.5, 5.5, 5.5, 6], "rotation": 180, "texture": "#0"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [0, -90, 0], + "translation": [2.3, -2, 5] + }, + "thirdperson_lefthand": { + "rotation": [0, -90, 0], + "translation": [2.3, -2, 5] + }, + "firstperson_righthand": { + "rotation": [0, -75, 15], + "translation": [4, -4, 0] + }, + "firstperson_lefthand": { + "rotation": [0, -75, 15], + "translation": [4, -4, 0] + }, + "ground": { + "translation": [0, 3, 0], + "scale": [0.5, 0.5, 0.5] + }, + "gui": { + "rotation": [30, 145, 0], + "translation": [0.25, 0.25, 0], + "scale": [0.65, 0.65, 0.65] + }, + "head": { + "rotation": [90, 0, 0], + "translation": [0, 5.5, -0.5], + "scale": [1.5, 1.5, 1.5] + }, + "fixed": { + "translation": [0, 0, 0], + "scale": [0.75, 0.75, 0.75] + } + }, + "groups": [ + { + "name": "handle", + "origin": [8, 8, 8], + "children": [0, 1, 2, 3, 4, 5, 6] + }, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28 + ], + "overrides": [{ + "predicate": { "blocking": 1 }, + "model": "tfc:item/metal/shield/black_bronze_blocking" + } + ] +} \ No newline at end of file diff --git a/kubejs/assets/tfc/models/item/metal/shield/black_bronze_blocking.json b/kubejs/assets/tfc/models/item/metal/shield/black_bronze_blocking.json new file mode 100644 index 0000000000..92823aa242 --- /dev/null +++ b/kubejs/assets/tfc/models/item/metal/shield/black_bronze_blocking.json @@ -0,0 +1,51 @@ +{ + "credit": "Made with Blockbench", + "parent":"tfc:item/metal/shield/black_bronze", + "textures": { + "0": "tfc:item/metal/shield/black_bronze", + "particle": "tfc:item/metal/shield/black_bronze" + }, + "display": { + "thirdperson_righthand": { + "rotation": [0, -90, 0], + "translation": [2.3, -2, 5] + }, + "thirdperson_lefthand": { + "rotation": [0, -90, 0], + "translation": [2.3, -2, 5] + }, + "firstperson_righthand": { + "rotation": [5, -30, 5], + "translation": [-1.5, 0.5, 2.5] + }, + "firstperson_lefthand": { + "rotation": [5, -30, 5], + "translation": [-1.5, 0.5, 2.5] + }, + "ground": { + "translation": [0, 2, 0], + "scale": [0.5, 0.5, 0.5] + }, + "gui": { + "rotation": [30, 145, 0], + "translation": [0.25, 0.25, 0], + "scale": [0.65, 0.65, 0.65] + }, + "head": { + "rotation": [90, 0, 0], + "translation": [0, 5.5, -0.5], + "scale": [1.5, 1.5, 1.5] + }, + "fixed": { + "translation": [0, 0, -2.13], + "scale": [2.02, 2.02, 2.02] + } + }, + "groups": [ + { + "name": "handle", + "origin": [8, 8, 8], + "children": [0, 1, 2, 3, 4, 5, 6] + }, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28 + ] +} \ No newline at end of file diff --git a/kubejs/assets/tfc/models/item/metal/shield/black_steel.json b/kubejs/assets/tfc/models/item/metal/shield/black_steel.json new file mode 100644 index 0000000000..abffb23c86 --- /dev/null +++ b/kubejs/assets/tfc/models/item/metal/shield/black_steel.json @@ -0,0 +1,394 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "tfc:item/metal/shield/black_steel", + "particle": "tfc:item/metal/shield/black_steel" + }, + "elements": [ + { + "name": "handle", + "from": [9, 6, 12], + "to": [10, 10, 13], + "faces": { + "north": {"uv": [7, 14, 9, 14.5], "rotation": 90, "texture": "#0"}, + "east": {"uv": [7, 14, 9, 14.5], "rotation": 90, "texture": "#0"}, + "south": {"uv": [7, 14, 9, 14.5], "rotation": 90, "texture": "#0"}, + "west": {"uv": [7, 14, 9, 14.5], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "handle", + "from": [5, 6, 12], + "to": [6, 10, 13], + "faces": { + "north": {"uv": [7, 14, 9, 14.5], "rotation": 90, "texture": "#0"}, + "east": {"uv": [7, 14, 9, 14.5], "rotation": 90, "texture": "#0"}, + "south": {"uv": [7, 14, 9, 14.5], "rotation": 90, "texture": "#0"}, + "west": {"uv": [7, 14, 9, 14.5], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "handle", + "from": [9, 5, 7], + "to": [10, 6, 13], + "faces": { + "north": {"uv": [6.5, 14, 7, 14.5], "texture": "#0"}, + "east": {"uv": [6.5, 14, 9.5, 14.5], "texture": "#0"}, + "south": {"uv": [6.5, 14, 7, 14.5], "texture": "#0"}, + "west": {"uv": [6.5, 14, 9.5, 14.5], "rotation": 180, "texture": "#0"}, + "up": {"uv": [6.5, 14, 9.5, 14.5], "rotation": 270, "texture": "#0"}, + "down": {"uv": [6.5, 14, 9.5, 14.5], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "handle", + "from": [5, 5, 7], + "to": [6, 6, 13], + "faces": { + "north": {"uv": [6.5, 14, 7, 14.5], "texture": "#0"}, + "east": {"uv": [6.5, 14, 9.5, 14.5], "texture": "#0"}, + "south": {"uv": [6.5, 14, 7, 14.5], "texture": "#0"}, + "west": {"uv": [6.5, 14, 9.5, 14.5], "rotation": 180, "texture": "#0"}, + "up": {"uv": [6.5, 14, 9.5, 14.5], "rotation": 270, "texture": "#0"}, + "down": {"uv": [6.5, 14, 9.5, 14.5], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "handle", + "from": [9, 10, 7], + "to": [10, 11, 13], + "faces": { + "north": {"uv": [6.5, 14, 7, 14.5], "texture": "#0"}, + "east": {"uv": [6.5, 14, 9.5, 14.5], "texture": "#0"}, + "south": {"uv": [6.5, 14, 7, 14.5], "texture": "#0"}, + "west": {"uv": [6.5, 14, 9.5, 14.5], "rotation": 180, "texture": "#0"}, + "up": {"uv": [6.5, 14, 9.5, 14.5], "rotation": 270, "texture": "#0"}, + "down": {"uv": [6.5, 14, 9.5, 14.5], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "handle", + "from": [5, 10, 7], + "to": [6, 11, 13], + "faces": { + "north": {"uv": [6.5, 14, 7, 14.5], "texture": "#0"}, + "east": {"uv": [6.5, 14, 9.5, 14.5], "texture": "#0"}, + "south": {"uv": [6.5, 14, 7, 14.5], "texture": "#0"}, + "west": {"uv": [6.5, 14, 9.5, 14.5], "rotation": 180, "texture": "#0"}, + "up": {"uv": [6.5, 14, 9.5, 14.5], "rotation": 270, "texture": "#0"}, + "down": {"uv": [6.5, 14, 9.5, 14.5], "rotation": 90, "texture": "#0"} + } + }, + { + "from": [2, 6, 7], + "to": [14, 10, 8], + "faces": { + "north": {"uv": [0.5, 13.5, 6.5, 15.5], "texture": "#0"}, + "east": {"uv": [6, 13.5, 6.5, 15.5], "texture": "#0"}, + "south": {"uv": [0.5, 13.5, 6.5, 15.5], "texture": "#0"}, + "west": {"uv": [0.5, 13.5, 1, 15.5], "texture": "#0"}, + "up": {"uv": [0.5, 13.5, 6.5, 14], "texture": "#0"}, + "down": {"uv": [0.5, 15, 6.5, 15.5], "texture": "#0"} + } + }, + { + "from": [2, -8, 6], + "to": [5, 18, 7], + "faces": { + "north": {"uv": [5.5, 0, 7, 13], "texture": "#0"}, + "east": {"uv": [10, 0, 10.5, 13], "texture": "#0"}, + "south": {"uv": [9, 0, 10.5, 13], "texture": "#0"}, + "west": {"uv": [6.5, 0, 7, 13], "texture": "#0"}, + "up": {"uv": [13.5, 0, 15, 0.5], "rotation": 180, "texture": "#0"}, + "down": {"uv": [13.5, 12.5, 15, 13], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [11, -8, 6], + "to": [14, 18, 7], + "faces": { + "north": {"uv": [1, 0, 2.5, 13], "texture": "#0"}, + "east": {"uv": [1, 0, 1.5, 13], "texture": "#0"}, + "south": {"uv": [13.5, 0, 15, 13], "texture": "#0"}, + "west": {"uv": [13.5, 0, 14, 13], "texture": "#0"}, + "up": {"uv": [9, 0, 10.5, 0.5], "rotation": 180, "texture": "#0"}, + "down": {"uv": [9, 12.5, 10.5, 13], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [11, -8, 5], + "to": [14, -4, 6], + "faces": { + "north": {"uv": [1, 11, 2.5, 13], "texture": "#0"}, + "east": {"uv": [1, 11, 1.5, 13], "texture": "#0"}, + "south": {"uv": [13.5, 11, 15, 13], "texture": "#0"}, + "west": {"uv": [13.5, 11, 14, 13], "texture": "#0"}, + "up": {"uv": [1, 11, 2.5, 11.5], "rotation": 180, "texture": "#0"}, + "down": {"uv": [1, 12.5, 2.5, 13], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [11, 3, 5], + "to": [14, 7, 6], + "faces": { + "north": {"uv": [1, 5.5, 2.5, 7.5], "texture": "#0"}, + "east": {"uv": [1, 5.5, 1.5, 7.5], "texture": "#0"}, + "south": {"uv": [13.5, 5.5, 15, 7.5], "texture": "#0"}, + "west": {"uv": [13.5, 5.5, 14, 7.5], "texture": "#0"}, + "up": {"uv": [1, 5.5, 2.5, 6], "rotation": 180, "texture": "#0"}, + "down": {"uv": [1, 7, 2.5, 7.5], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [2, -8, 5], + "to": [5, -4, 6], + "faces": { + "north": {"uv": [5.5, 11, 7, 13], "texture": "#0"}, + "east": {"uv": [5.5, 11, 6, 13], "texture": "#0"}, + "south": {"uv": [9, 11, 10.5, 13], "texture": "#0"}, + "west": {"uv": [6.5, 11, 7, 13], "texture": "#0"}, + "up": {"uv": [5.5, 11, 7, 11.5], "rotation": 180, "texture": "#0"}, + "down": {"uv": [5.5, 12.5, 7, 13], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [2, 3, 5], + "to": [5, 7, 6], + "faces": { + "north": {"uv": [5.5, 5.5, 7, 7.5], "texture": "#0"}, + "east": {"uv": [5.5, 5.5, 6, 7.5], "texture": "#0"}, + "south": {"uv": [9, 5.5, 10.5, 7.5], "texture": "#0"}, + "west": {"uv": [6.5, 5.5, 7, 7.5], "texture": "#0"}, + "up": {"uv": [5.5, 5.5, 7, 6], "rotation": 180, "texture": "#0"}, + "down": {"uv": [5.5, 7, 7, 7.5], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [11, 14, 5], + "to": [14, 18, 6], + "faces": { + "north": {"uv": [1, 0, 2.5, 2], "texture": "#0"}, + "east": {"uv": [1, 0, 1.5, 2], "texture": "#0"}, + "south": {"uv": [13.5, 0, 15, 2], "texture": "#0"}, + "west": {"uv": [13.5, 0, 14, 2], "texture": "#0"}, + "up": {"uv": [1, 0, 2.5, 0.5], "rotation": 180, "texture": "#0"}, + "down": {"uv": [1, 1.5, 2.5, 2], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [2, 14, 5], + "to": [5, 18, 6], + "faces": { + "north": {"uv": [5.5, 0, 7, 2], "texture": "#0"}, + "east": {"uv": [5.5, 0, 6, 2], "texture": "#0"}, + "south": {"uv": [9, 0, 10.5, 2], "texture": "#0"}, + "west": {"uv": [6.5, 0, 7, 2], "texture": "#0"}, + "up": {"uv": [5.5, 0, 7, 0.5], "rotation": 180, "texture": "#0"}, + "down": {"uv": [5.5, 1.5, 7, 2], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [5, -8, 5], + "to": [11, 18, 6], + "faces": { + "north": {"uv": [2.5, 0, 5.5, 13], "texture": "#0"}, + "east": {"uv": [2.5, 0, 3, 13], "texture": "#0"}, + "south": {"uv": [10.5, 0, 13.5, 13], "texture": "#0"}, + "west": {"uv": [5, 0, 5.5, 13], "texture": "#0"}, + "up": {"uv": [10.5, 0, 13.5, 0.5], "rotation": 180, "texture": "#0"}, + "down": {"uv": [10.5, 12.5, 13.5, 13], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [5, -8, 4], + "to": [11, -4, 5], + "faces": { + "north": {"uv": [2.5, 11, 5.5, 13], "texture": "#0"}, + "east": {"uv": [2.5, 11, 3, 13], "texture": "#0"}, + "south": {"uv": [10.5, 11, 13.5, 13], "texture": "#0"}, + "west": {"uv": [5, 11, 5.5, 13], "texture": "#0"}, + "up": {"uv": [2.5, 11, 5.5, 11.5], "rotation": 180, "texture": "#0"}, + "down": {"uv": [2.5, 12.5, 5.5, 13], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [5, 3, 4], + "to": [11, 7, 5], + "faces": { + "north": {"uv": [2.5, 5.5, 5.5, 7.5], "texture": "#0"}, + "east": {"uv": [2.5, 5.5, 3, 7.5], "texture": "#0"}, + "south": {"uv": [10.5, 5.5, 13.5, 7.5], "texture": "#0"}, + "west": {"uv": [5, 5.5, 5.5, 7.5], "texture": "#0"}, + "up": {"uv": [2.5, 5.5, 5.5, 6], "rotation": 180, "texture": "#0"}, + "down": {"uv": [2.5, 7, 5.5, 7.5], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [5, 14, 4], + "to": [11, 18, 5], + "faces": { + "north": {"uv": [2.5, 0, 5.5, 2], "texture": "#0"}, + "east": {"uv": [2.5, 0, 3, 2], "texture": "#0"}, + "south": {"uv": [10.5, 0, 13.5, 2], "texture": "#0"}, + "west": {"uv": [5, 0, 5.5, 2], "texture": "#0"}, + "up": {"uv": [2.5, 0, 5.5, 0.5], "rotation": 180, "texture": "#0"}, + "down": {"uv": [2.5, 1.5, 5.5, 2], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [5, 5, 6], + "to": [11, 11, 7], + "faces": { + "north": {"uv": [2, 13, 5, 16], "texture": "#0"}, + "east": {"uv": [4.5, 13, 5, 16], "texture": "#0"}, + "south": {"uv": [2, 13, 5, 16], "texture": "#0"}, + "west": {"uv": [2, 13, 2.5, 16], "texture": "#0"}, + "up": {"uv": [2, 13, 5, 13.5], "texture": "#0"}, + "down": {"uv": [2, 15.5, 5, 16], "texture": "#0"} + } + }, + { + "from": [0, -8, 7], + "to": [2, 18, 8], + "faces": { + "north": {"uv": [7, 0, 8, 13], "texture": "#0"}, + "east": {"uv": [8.5, 0, 9, 13], "texture": "#0"}, + "south": {"uv": [8, 0, 9, 13], "texture": "#0"}, + "west": {"uv": [7.5, 0, 8, 13], "texture": "#0"}, + "up": {"uv": [15, 0, 16, 0.5], "rotation": 180, "texture": "#0"}, + "down": {"uv": [15, 12.5, 16, 13], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [14, -8, 7], + "to": [16, 18, 8], + "faces": { + "north": {"uv": [0, 0, 1, 13], "texture": "#0"}, + "east": {"uv": [0, 0, 0.5, 13], "texture": "#0"}, + "south": {"uv": [15, 0, 16, 13], "texture": "#0"}, + "west": {"uv": [15, 0, 15.5, 13], "texture": "#0"}, + "up": {"uv": [8, 0, 9, 0.5], "rotation": 180, "texture": "#0"}, + "down": {"uv": [8, 12.5, 9, 13], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [14, 14, 6], + "to": [16, 18, 7], + "faces": { + "north": {"uv": [0, 0, 1, 2], "texture": "#0"}, + "east": {"uv": [0, 0, 0.5, 2], "texture": "#0"}, + "south": {"uv": [15, 0, 16, 2], "texture": "#0"}, + "west": {"uv": [15, 0, 15.5, 2], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 0.5], "rotation": 180, "texture": "#0"}, + "down": {"uv": [0, 1.5, 1, 2], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [14, -8, 6], + "to": [16, -4, 7], + "faces": { + "north": {"uv": [0, 11, 1, 13], "texture": "#0"}, + "east": {"uv": [0, 11, 0.5, 13], "texture": "#0"}, + "south": {"uv": [15, 11, 16, 13], "texture": "#0"}, + "west": {"uv": [15, 11, 15.5, 13], "texture": "#0"}, + "up": {"uv": [0, 11, 1, 11.5], "rotation": 180, "texture": "#0"}, + "down": {"uv": [0, 12.5, 1, 13], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [14, 3, 6], + "to": [16, 7, 7], + "faces": { + "north": {"uv": [0, 5.5, 1, 7.5], "texture": "#0"}, + "east": {"uv": [0, 5.5, 0.5, 7.5], "texture": "#0"}, + "south": {"uv": [15, 5.5, 16, 7.5], "texture": "#0"}, + "west": {"uv": [15, 5.5, 15.5, 7.5], "texture": "#0"}, + "up": {"uv": [0, 5.5, 1, 6], "rotation": 180, "texture": "#0"}, + "down": {"uv": [0, 7, 1, 7.5], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [0, -8, 6], + "to": [2, -4, 7], + "faces": { + "north": {"uv": [7, 11, 8, 13], "texture": "#0"}, + "east": {"uv": [7, 11, 7.5, 13], "texture": "#0"}, + "south": {"uv": [8, 11, 9, 13], "texture": "#0"}, + "west": {"uv": [7.5, 11, 8, 13], "texture": "#0"}, + "up": {"uv": [7, 11, 8, 11.5], "rotation": 180, "texture": "#0"}, + "down": {"uv": [7, 12.5, 8, 13], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [0, 3, 6], + "to": [2, 7, 7], + "faces": { + "north": {"uv": [7, 5.5, 8, 7.5], "texture": "#0"}, + "east": {"uv": [7, 5.5, 7.5, 7.5], "texture": "#0"}, + "south": {"uv": [8, 5.5, 9, 7.5], "texture": "#0"}, + "west": {"uv": [7.5, 5.5, 8, 7.5], "texture": "#0"}, + "up": {"uv": [7, 5.5, 8, 6], "rotation": 180, "texture": "#0"}, + "down": {"uv": [7, 7, 8, 7.5], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [0, 14, 6], + "to": [2, 18, 7], + "faces": { + "north": {"uv": [7, 0, 8, 2], "texture": "#0"}, + "east": {"uv": [7, 0, 7.5, 2], "texture": "#0"}, + "south": {"uv": [8, 0, 9, 2], "texture": "#0"}, + "west": {"uv": [7.5, 0, 8, 2], "texture": "#0"}, + "up": {"uv": [7, 0, 8, 0.5], "rotation": 180, "texture": "#0"}, + "down": {"uv": [7, 1.5, 8, 2], "rotation": 180, "texture": "#0"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [0, -90, 0], + "translation": [2.3, -2, 5] + }, + "thirdperson_lefthand": { + "rotation": [0, -90, 0], + "translation": [2.3, -2, 5] + }, + "firstperson_righthand": { + "rotation": [0, -75, 15], + "translation": [4, -4, 0] + }, + "firstperson_lefthand": { + "rotation": [0, -75, 15], + "translation": [4, -4, 0] + }, + "ground": { + "translation": [0, 3, 0], + "scale": [0.5, 0.5, 0.5] + }, + "gui": { + "rotation": [30, 145, 0], + "translation": [0.5, 1.5, 0], + "scale": [0.5, 0.5, 0.5] + }, + "head": { + "rotation": [90, 0, -180], + "translation": [0, 4.25, -1.31], + "scale": [1.5, 1.5, 1.5] + }, + "fixed": { + "translation": [0, 1.4, 0], + "scale": [0.6, 0.6, 0.6] + } + }, + "overrides": [{ + "predicate": { "blocking": 1 }, + "model": "tfc:item/metal/shield/black_steel_blocking" + } + ], + "groups": [ + { + "name": "handle", + "origin": [8, 8, 8], + "children": [0, 1, 2, 3, 4, 5, 6] + }, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27] +} \ No newline at end of file diff --git a/kubejs/assets/tfc/models/item/metal/shield/black_steel_blocking.json b/kubejs/assets/tfc/models/item/metal/shield/black_steel_blocking.json new file mode 100644 index 0000000000..bdb6068119 --- /dev/null +++ b/kubejs/assets/tfc/models/item/metal/shield/black_steel_blocking.json @@ -0,0 +1,50 @@ +{ + "credit": "Made with Blockbench", + "parent":"tfc:item/metal/shield/black_steel", + "textures": { + "0": "tfc:item/metal/shield/black_steel", + "particle": "tfc:item/metal/shield/black_steel" + }, + "display": { + "thirdperson_righthand": { + "rotation": [0, -90, 0], + "translation": [2.3, -2, 5] + }, + "thirdperson_lefthand": { + "rotation": [0, -90, 0], + "translation": [2.3, -2, 5] + }, + "firstperson_righthand": { + "rotation": [5, -30, 5], + "translation": [-1.5, 0.5, 2.5] + }, + "firstperson_lefthand": { + "rotation": [3, -30, 5], + "translation": [-1.5, 0.5, 2.5] + }, + "ground": { + "translation": [0, 1, 0], + "scale": [0.3, 0.3, 0.3] + }, + "gui": { + "rotation": [30, 145, 0], + "translation": [0.5, 1.5, 0], + "scale": [0.5, 0.5, 0.5] + }, + "head": { + "rotation": [90, 0, -180], + "translation": [0, 4.25, -1.31], + "scale": [1.5, 1.5, 1.5] + }, + "fixed": { + "translation": [0, 5.5, -0.38], + "scale": [2.02, 2.02, 2.02] + } + }, + "groups": [ + { + "name": "handle", + "origin": [8, 8, 8], + "children": [0, 1, 2, 3, 4, 5, 6] + }, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27] +} \ No newline at end of file diff --git a/kubejs/assets/tfc/models/item/metal/shield/blue_steel.json b/kubejs/assets/tfc/models/item/metal/shield/blue_steel.json new file mode 100644 index 0000000000..41974e9991 --- /dev/null +++ b/kubejs/assets/tfc/models/item/metal/shield/blue_steel.json @@ -0,0 +1,405 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "tfc:item/metal/shield/blue_steel", + "particle": "tfc:item/metal/shield/blue_steel" + }, + "elements": [ + { + "name": "handle", + "from": [9, 6, 12], + "to": [10, 10, 13], + "faces": { + "north": {"uv": [7, 14, 9, 14.5], "rotation": 90, "texture": "#0"}, + "east": {"uv": [7, 14, 9, 14.5], "rotation": 90, "texture": "#0"}, + "south": {"uv": [7, 14, 9, 14.5], "rotation": 90, "texture": "#0"}, + "west": {"uv": [7, 14, 9, 14.5], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "handle", + "from": [5, 6, 12], + "to": [6, 10, 13], + "faces": { + "north": {"uv": [7, 14, 9, 14.5], "rotation": 90, "texture": "#0"}, + "east": {"uv": [7, 14, 9, 14.5], "rotation": 90, "texture": "#0"}, + "south": {"uv": [7, 14, 9, 14.5], "rotation": 90, "texture": "#0"}, + "west": {"uv": [7, 14, 9, 14.5], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "handle", + "from": [9, 5, 7], + "to": [10, 6, 13], + "faces": { + "north": {"uv": [6.5, 14, 7, 14.5], "texture": "#0"}, + "east": {"uv": [6.5, 14, 9.5, 14.5], "texture": "#0"}, + "south": {"uv": [6.5, 14, 7, 14.5], "texture": "#0"}, + "west": {"uv": [6.5, 14, 9.5, 14.5], "rotation": 180, "texture": "#0"}, + "up": {"uv": [6.5, 14, 9.5, 14.5], "rotation": 270, "texture": "#0"}, + "down": {"uv": [6.5, 14, 9.5, 14.5], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "handle", + "from": [5, 5, 7], + "to": [6, 6, 13], + "faces": { + "north": {"uv": [6.5, 14, 7, 14.5], "texture": "#0"}, + "east": {"uv": [6.5, 14, 9.5, 14.5], "texture": "#0"}, + "south": {"uv": [6.5, 14, 7, 14.5], "texture": "#0"}, + "west": {"uv": [6.5, 14, 9.5, 14.5], "rotation": 180, "texture": "#0"}, + "up": {"uv": [6.5, 14, 9.5, 14.5], "rotation": 270, "texture": "#0"}, + "down": {"uv": [6.5, 14, 9.5, 14.5], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "handle", + "from": [9, 10, 7], + "to": [10, 11, 13], + "faces": { + "north": {"uv": [6.5, 14, 7, 14.5], "texture": "#0"}, + "east": {"uv": [6.5, 14, 9.5, 14.5], "texture": "#0"}, + "south": {"uv": [6.5, 14, 7, 14.5], "texture": "#0"}, + "west": {"uv": [6.5, 14, 9.5, 14.5], "rotation": 180, "texture": "#0"}, + "up": {"uv": [6.5, 14, 9.5, 14.5], "rotation": 270, "texture": "#0"}, + "down": {"uv": [6.5, 14, 9.5, 14.5], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "handle", + "from": [5, 10, 7], + "to": [6, 11, 13], + "faces": { + "north": {"uv": [6.5, 14, 7, 14.5], "texture": "#0"}, + "east": {"uv": [6.5, 14, 9.5, 14.5], "texture": "#0"}, + "south": {"uv": [6.5, 14, 7, 14.5], "texture": "#0"}, + "west": {"uv": [6.5, 14, 9.5, 14.5], "rotation": 180, "texture": "#0"}, + "up": {"uv": [6.5, 14, 9.5, 14.5], "rotation": 270, "texture": "#0"}, + "down": {"uv": [6.5, 14, 9.5, 14.5], "rotation": 90, "texture": "#0"} + } + }, + { + "from": [3, 6, 7], + "to": [13, 10, 8], + "faces": { + "north": {"uv": [0.5, 14, 6.5, 16], "texture": "#0"}, + "east": {"uv": [0.5, 14, 1, 16], "texture": "#0"}, + "south": {"uv": [0.5, 14, 6.5, 16], "texture": "#0"}, + "west": {"uv": [6, 14, 6.5, 16], "texture": "#0"}, + "up": {"uv": [0.5, 14, 6.5, 14.5], "texture": "#0"}, + "down": {"uv": [0.5, 15.5, 6.5, 16], "texture": "#0"} + } + }, + { + "from": [6, 5, 6], + "to": [10, 11, 7], + "faces": { + "north": {"uv": [2, 14, 4, 16], "texture": "#0"}, + "east": {"uv": [3.5, 14, 4, 16], "texture": "#0"}, + "south": {"uv": [2, 14, 4, 16], "texture": "#0"}, + "west": {"uv": [2, 14, 2.5, 16], "texture": "#0"}, + "up": {"uv": [2, 14, 4, 14.5], "texture": "#0"}, + "down": {"uv": [2, 15.5, 4, 16], "texture": "#0"} + } + }, + { + "from": [7, -6, 5], + "to": [9, 4, 6], + "faces": { + "north": {"uv": [3.5, 7.5, 4.5, 12.5], "texture": "#0"}, + "east": {"uv": [3.5, 7.5, 4, 12.5], "texture": "#0"}, + "south": {"uv": [11.5, 7.5, 12.5, 12.5], "texture": "#0"}, + "west": {"uv": [4, 7.5, 4.5, 12.5], "texture": "#0"}, + "up": {"uv": [3.5, 7.5, 4.5, 8], "rotation": 180, "texture": "#0"}, + "down": {"uv": [3.5, 12, 4.5, 12.5], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [7, 9, 5], + "to": [9, 19, 6], + "faces": { + "north": {"uv": [3.5, 0, 4.5, 5], "texture": "#0"}, + "east": {"uv": [3.5, 0, 4, 5], "texture": "#0"}, + "south": {"uv": [11.5, 0, 12.5, 5], "texture": "#0"}, + "west": {"uv": [4, 0, 4.5, 5], "texture": "#0"}, + "up": {"uv": [3.5, 0, 4.5, 0.5], "rotation": 180, "texture": "#0"}, + "down": {"uv": [3.5, 4.5, 4.5, 5], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [6, -5, 5], + "to": [7, 4, 6], + "faces": { + "north": {"uv": [4.5, 7.5, 5, 12], "texture": "#0"}, + "east": {"uv": [11, 7.5, 11.5, 12], "texture": "#0"}, + "south": {"uv": [11, 7.5, 11.5, 12], "texture": "#0"}, + "west": {"uv": [4.5, 7.5, 5, 12], "texture": "#0"}, + "up": {"uv": [4.5, 7.5, 5, 8], "texture": "#0"}, + "down": {"uv": [4.5, 11.5, 5, 12], "texture": "#0"} + } + }, + { + "from": [6, 9, 5], + "to": [7, 18, 6], + "faces": { + "north": {"uv": [4.5, 0.5, 5, 5], "texture": "#0"}, + "east": {"uv": [11, 0.5, 11.5, 5], "texture": "#0"}, + "south": {"uv": [11, 0.5, 11.5, 5], "texture": "#0"}, + "west": {"uv": [4.5, 0.5, 5, 5], "texture": "#0"}, + "up": {"uv": [4.5, 0.5, 5, 1], "texture": "#0"}, + "down": {"uv": [4.5, 4.5, 5, 5], "texture": "#0"} + } + }, + { + "from": [5, 4, 5], + "to": [11, 9, 6], + "faces": { + "north": {"uv": [2.5, 5, 5.5, 7.5], "texture": "#0"}, + "east": {"uv": [2.5, 5, 3, 7.5], "texture": "#0"}, + "south": {"uv": [10.5, 5, 13.5, 7.5], "texture": "#0"}, + "west": {"uv": [5, 5, 5.5, 7.5], "texture": "#0"}, + "up": {"uv": [2.5, 5, 5.5, 5.5], "rotation": 180, "texture": "#0"}, + "down": {"uv": [2.5, 7, 5.5, 7.5], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [11, 5, 5], + "to": [13, 8, 6], + "faces": { + "north": {"uv": [1.5, 5.5, 2.5, 7], "texture": "#0"}, + "east": {"uv": [1.5, 5.5, 2, 7], "texture": "#0"}, + "south": {"uv": [1.5, 5.5, 2.5, 7], "texture": "#0"}, + "west": {"uv": [2, 5.5, 2.5, 7], "texture": "#0"}, + "up": {"uv": [1.5, 5.5, 2.5, 6], "rotation": 180, "texture": "#0"}, + "down": {"uv": [1.5, 6.5, 2.5, 7], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [3, 5, 5], + "to": [5, 8, 6], + "faces": { + "north": {"uv": [5.5, 5.5, 6.5, 7], "texture": "#0"}, + "east": {"uv": [5.5, 5.5, 6, 7], "texture": "#0"}, + "south": {"uv": [5.5, 5.5, 6.5, 7], "texture": "#0"}, + "west": {"uv": [6, 5.5, 6.5, 7], "texture": "#0"}, + "up": {"uv": [5.5, 5.5, 6.5, 6], "rotation": 180, "texture": "#0"}, + "down": {"uv": [5.5, 6.5, 6.5, 7], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [9, -5, 5], + "to": [10, 4, 6], + "faces": { + "north": {"uv": [3, 7.5, 3.5, 12], "texture": "#0"}, + "east": {"uv": [3, 7.5, 3.5, 12], "texture": "#0"}, + "south": {"uv": [12.5, 7.5, 13, 12], "texture": "#0"}, + "west": {"uv": [3, 7.5, 3.5, 12], "texture": "#0"}, + "up": {"uv": [3, 7.5, 3.5, 8], "texture": "#0"}, + "down": {"uv": [3, 11.5, 3.5, 12], "texture": "#0"} + } + }, + { + "from": [9, 9, 5], + "to": [10, 18, 6], + "faces": { + "north": {"uv": [3, 0.5, 3.5, 5], "texture": "#0"}, + "east": {"uv": [3, 0.5, 3.5, 5], "texture": "#0"}, + "south": {"uv": [12.5, 0.5, 13, 5], "texture": "#0"}, + "west": {"uv": [12.5, 0.5, 13, 5], "texture": "#0"}, + "up": {"uv": [3, 0.5, 3.5, 1], "texture": "#0"}, + "down": {"uv": [3, 4.5, 3.5, 5], "texture": "#0"} + } + }, + { + "from": [10, -3, 6], + "to": [11, 16, 7], + "faces": { + "north": {"uv": [2.5, 1.5, 3, 11], "texture": "#0"}, + "east": {"uv": [2.5, 1.5, 3, 11], "texture": "#0"}, + "south": {"uv": [13, 1.5, 13.5, 11], "texture": "#0"}, + "west": {"uv": [13, 1.5, 13.5, 11], "texture": "#0"}, + "up": {"uv": [2.5, 1.5, 3, 2], "texture": "#0"}, + "down": {"uv": [2.5, 10.5, 3, 11], "texture": "#0"} + } + }, + { + "from": [5, -3, 6], + "to": [6, 16, 7], + "faces": { + "north": {"uv": [5, 1.5, 5.5, 11], "texture": "#0"}, + "east": {"uv": [10.5, 1.5, 11, 11], "texture": "#0"}, + "south": {"uv": [10.5, 1.5, 11, 11], "texture": "#0"}, + "west": {"uv": [5, 1.5, 5.5, 11], "texture": "#0"}, + "up": {"uv": [5, 1.5, 5.5, 2], "texture": "#0"}, + "down": {"uv": [5, 10.5, 5.5, 11], "texture": "#0"} + } + }, + { + "from": [11, -1, 6], + "to": [12, 14, 7], + "faces": { + "north": {"uv": [2, 2.5, 2.5, 10], "texture": "#0"}, + "east": {"uv": [2, 2.5, 2.5, 10], "texture": "#0"}, + "south": {"uv": [13.5, 2.5, 14, 10], "texture": "#0"}, + "west": {"uv": [13.5, 2.5, 14, 10], "texture": "#0"}, + "up": {"uv": [2, 2.5, 2.5, 3], "texture": "#0"}, + "down": {"uv": [2, 9.5, 2.5, 10], "texture": "#0"} + } + }, + { + "from": [4, -1, 6], + "to": [5, 14, 7], + "faces": { + "north": {"uv": [5.5, 2.5, 6, 10], "texture": "#0"}, + "east": {"uv": [5.5, 2.5, 6, 10], "texture": "#0"}, + "south": {"uv": [10, 2.5, 10.5, 10], "texture": "#0"}, + "west": {"uv": [5.5, 2.5, 6, 10], "texture": "#0"}, + "up": {"uv": [5.5, 2.5, 6, 3], "texture": "#0"}, + "down": {"uv": [5.5, 9.5, 6, 10], "texture": "#0"} + } + }, + { + "from": [13, 3, 7], + "to": [14, 10, 8], + "faces": { + "north": {"uv": [1, 4.5, 1.5, 8], "texture": "#0"}, + "east": {"uv": [1, 4.5, 1.5, 8], "texture": "#0"}, + "south": {"uv": [14.5, 4.5, 15, 8], "texture": "#0"}, + "west": {"uv": [14.5, 4.5, 15, 8], "texture": "#0"}, + "up": {"uv": [1, 4.5, 1.5, 5], "texture": "#0"}, + "down": {"uv": [1, 7.5, 1.5, 8], "texture": "#0"} + } + }, + { + "from": [2, 3, 7], + "to": [3, 10, 8], + "faces": { + "north": {"uv": [6.5, 4.5, 7, 8], "texture": "#0"}, + "east": {"uv": [9, 4.5, 9.5, 8], "texture": "#0"}, + "south": {"uv": [9, 4.5, 9.5, 8], "texture": "#0"}, + "west": {"uv": [6.5, 4.5, 7, 8], "texture": "#0"}, + "up": {"uv": [6.5, 4.5, 7, 5], "texture": "#0"}, + "down": {"uv": [6.5, 7.5, 7, 8], "texture": "#0"} + } + }, + { + "from": [13, 5, 6], + "to": [14, 8, 7], + "faces": { + "north": {"uv": [1, 5.5, 1.5, 7], "texture": "#0"}, + "east": {"uv": [1, 5.5, 1.5, 7], "texture": "#0"}, + "south": {"uv": [1, 5.5, 1.5, 7], "texture": "#0"}, + "west": {"uv": [1, 5.5, 1.5, 7], "texture": "#0"}, + "up": {"uv": [1, 5.5, 1.5, 7], "texture": "#0"}, + "down": {"uv": [1, 5.5, 1.5, 7], "texture": "#0"} + } + }, + { + "from": [2, 5, 6], + "to": [3, 8, 7], + "faces": { + "north": {"uv": [6.5, 5.5, 7, 7], "texture": "#0"}, + "east": {"uv": [6.5, 5.5, 7, 7], "texture": "#0"}, + "south": {"uv": [6.5, 5.5, 7, 7], "texture": "#0"}, + "west": {"uv": [6.5, 5.5, 7, 7], "texture": "#0"}, + "up": {"uv": [6.5, 5.5, 7, 6], "texture": "#0"}, + "down": {"uv": [6.5, 6.5, 7, 7], "texture": "#0"} + } + }, + { + "from": [14, 5, 7], + "to": [15, 8, 8], + "faces": { + "north": {"uv": [0.5, 5.5, 1, 7], "texture": "#0"}, + "east": {"uv": [0.5, 5.5, 1, 7], "texture": "#0"}, + "south": {"uv": [15, 5.5, 15.5, 7], "texture": "#0"}, + "west": {"uv": [15, 5.5, 15.5, 7], "texture": "#0"}, + "up": {"uv": [0.5, 5.5, 1, 6], "texture": "#0"}, + "down": {"uv": [0.5, 6.5, 1, 7], "texture": "#0"} + } + }, + { + "from": [1, 5, 7], + "to": [2, 8, 8], + "faces": { + "north": {"uv": [7, 5.5, 7.5, 7], "texture": "#0"}, + "east": {"uv": [7, 5.5, 7.5, 7], "texture": "#0"}, + "south": {"uv": [8.5, 5.5, 9, 7], "texture": "#0"}, + "west": {"uv": [7, 5.5, 7.5, 7], "texture": "#0"}, + "up": {"uv": [7, 5.5, 7.5, 6], "texture": "#0"}, + "down": {"uv": [7, 6.5, 7.5, 7], "texture": "#0"} + } + }, + { + "from": [12, 1, 6], + "to": [13, 12, 7], + "faces": { + "north": {"uv": [1.5, 3.5, 2, 9], "texture": "#0"}, + "east": {"uv": [1.5, 3.5, 2, 9], "texture": "#0"}, + "south": {"uv": [14, 3.5, 14.5, 9], "texture": "#0"}, + "west": {"uv": [14, 3.5, 14.5, 9], "texture": "#0"}, + "up": {"uv": [1.5, 3.5, 2, 4], "texture": "#0"}, + "down": {"uv": [1.5, 8.5, 2, 9], "texture": "#0"} + } + }, + { + "from": [3, 1, 6], + "to": [4, 12, 7], + "faces": { + "north": {"uv": [6, 3.5, 6.5, 9], "texture": "#0"}, + "east": {"uv": [9.5, 3.5, 10, 9], "texture": "#0"}, + "south": {"uv": [9.5, 3.5, 10, 9], "texture": "#0"}, + "west": {"uv": [6, 3.5, 6.5, 9], "texture": "#0"}, + "up": {"uv": [6, 3.5, 6.5, 4], "texture": "#0"}, + "down": {"uv": [6, 8.5, 6.5, 9], "texture": "#0"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [0, -90, 0], + "translation": [2.3, -2, 5] + }, + "thirdperson_lefthand": { + "rotation": [0, -90, 0], + "translation": [2.3, -2, 5] + }, + "firstperson_righthand": { + "rotation": [0, -75, 15], + "translation": [4, -4, 0] + }, + "firstperson_lefthand": { + "rotation": [0, -75, 15], + "translation": [4, -4, 0] + }, + "ground": { + "translation": [0, 3, 0], + "scale": [0.5, 0.5, 0.5] + }, + "gui": { + "rotation": [30, 145, 0], + "translation": [0.5, 1.25, 0], + "scale": [0.5, 0.5, 0.5] + }, + "head": { + "translation": [0, 1.25, -6.56], + "scale": [1.5, 1.5, 1.5] + }, + "fixed": { + "translation": [0, 1.2, 0], + "scale": [0.66, 0.66, 0.66] + } + }, + "overrides": [{ + "predicate": { "blocking": 1 }, + "model": "tfc:item/metal/shield/blue_steel_blocking" + } + ], + "groups": [ + { + "name": "handle", + "origin": [8, 8, 8], + "children": [0, 1, 2, 3, 4, 5, 6, 7] + }, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28] +} \ No newline at end of file diff --git a/kubejs/assets/tfc/models/item/metal/shield/blue_steel_blocking.json b/kubejs/assets/tfc/models/item/metal/shield/blue_steel_blocking.json new file mode 100644 index 0000000000..000ebc375f --- /dev/null +++ b/kubejs/assets/tfc/models/item/metal/shield/blue_steel_blocking.json @@ -0,0 +1,49 @@ +{ + "credit": "Made with Blockbench", + "parent":"tfc:item/metal/shield/blue_steel", + "textures": { + "0": "tfc:item/metal/shield/blue_steel", + "particle": "tfc:item/metal/shield/blue_steel" + }, + "display": { + "thirdperson_righthand": { + "rotation": [0, -90, 0], + "translation": [2.3, -2, 5] + }, + "thirdperson_lefthand": { + "rotation": [0, -90, 0], + "translation": [2.3, -2, 5] + }, + "firstperson_righthand": { + "rotation": [5, -30, 5], + "translation": [-1.5, 0.5, 2.5] + }, + "firstperson_lefthand": { + "rotation": [5, -30, 5], + "translation": [-1.5, 0.5, 2.5] + }, + "ground": { + "translation": [0, 1, 0], + "scale": [0.3, 0.3, 0.3] + }, + "gui": { + "rotation": [30, 145, 0], + "translation": [0.5, 1.25, 0], + "scale": [0.5, 0.5, 0.5] + }, + "head": { + "translation": [0, 1.25, -6.56], + "scale": [1.5, 1.5, 1.5] + }, + "fixed": { + "translation": [0, 4.25, 0.12], + "scale": [2.02, 2.02, 2.02] + } + }, + "groups": [ + { + "name": "handle", + "origin": [8, 8, 8], + "children": [0, 1, 2, 3, 4, 5, 6, 7] + }, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28] +} \ No newline at end of file diff --git a/kubejs/assets/tfc/models/item/metal/shield/bronze.json b/kubejs/assets/tfc/models/item/metal/shield/bronze.json new file mode 100644 index 0000000000..48bf110fa6 --- /dev/null +++ b/kubejs/assets/tfc/models/item/metal/shield/bronze.json @@ -0,0 +1,408 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "tfc:item/metal/shield/bronze", + "particle": "tfc:item/metal/shield/bronze" + }, + "elements": [ + { + "name": "board", + "from": [2, 6, 7], + "to": [14, 10, 8], + "faces": { + "north": {"uv": [0.5, 14, 6.5, 16], "rotation": 180, "texture": "#0"}, + "east": {"uv": [6, 14, 6.5, 16], "texture": "#0"}, + "south": {"uv": [0.5, 14, 6.5, 16], "texture": "#0"}, + "west": {"uv": [0.5, 14, 1, 16], "texture": "#0"}, + "up": {"uv": [0.5, 14, 6.5, 14.5], "texture": "#0"}, + "down": {"uv": [0.5, 15.5, 6.5, 16], "texture": "#0"} + } + }, + { + "name": "handle", + "from": [9, 6, 12], + "to": [10, 10, 13], + "faces": { + "north": {"uv": [7, 14, 9, 14.5], "rotation": 90, "texture": "#0"}, + "east": {"uv": [7, 14, 9, 14.5], "rotation": 90, "texture": "#0"}, + "south": {"uv": [7, 14, 9, 14.5], "rotation": 90, "texture": "#0"}, + "west": {"uv": [7, 14, 9, 14.5], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "handle", + "from": [5, 6, 12], + "to": [6, 10, 13], + "faces": { + "north": {"uv": [7, 14, 9, 14.5], "rotation": 90, "texture": "#0"}, + "east": {"uv": [7, 14, 9, 14.5], "rotation": 90, "texture": "#0"}, + "south": {"uv": [7, 14, 9, 14.5], "rotation": 90, "texture": "#0"}, + "west": {"uv": [7, 14, 9, 14.5], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "handle", + "from": [9, 5, 7], + "to": [10, 6, 13], + "faces": { + "north": {"uv": [6.5, 14, 7, 14.5], "texture": "#0"}, + "east": {"uv": [6.5, 14, 9.5, 14.5], "texture": "#0"}, + "south": {"uv": [6.5, 14, 7, 14.5], "texture": "#0"}, + "west": {"uv": [6.5, 14, 9.5, 14.5], "rotation": 180, "texture": "#0"}, + "up": {"uv": [6.5, 14, 9.5, 14.5], "rotation": 270, "texture": "#0"}, + "down": {"uv": [6.5, 14, 9.5, 14.5], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "handle", + "from": [5, 5, 7], + "to": [6, 6, 13], + "faces": { + "north": {"uv": [6.5, 14, 7, 14.5], "texture": "#0"}, + "east": {"uv": [6.5, 14, 9.5, 14.5], "texture": "#0"}, + "south": {"uv": [6.5, 14, 7, 14.5], "texture": "#0"}, + "west": {"uv": [6.5, 14, 9.5, 14.5], "rotation": 180, "texture": "#0"}, + "up": {"uv": [6.5, 14, 9.5, 14.5], "rotation": 270, "texture": "#0"}, + "down": {"uv": [6.5, 14, 9.5, 14.5], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "handle", + "from": [9, 10, 7], + "to": [10, 11, 13], + "faces": { + "north": {"uv": [6.5, 14, 7, 14.5], "texture": "#0"}, + "east": {"uv": [6.5, 14, 9.5, 14.5], "texture": "#0"}, + "south": {"uv": [6.5, 14, 7, 14.5], "texture": "#0"}, + "west": {"uv": [6.5, 14, 9.5, 14.5], "rotation": 180, "texture": "#0"}, + "up": {"uv": [6.5, 14, 9.5, 14.5], "rotation": 270, "texture": "#0"}, + "down": {"uv": [6.5, 14, 9.5, 14.5], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "handle", + "from": [5, 10, 7], + "to": [6, 11, 13], + "faces": { + "north": {"uv": [6.5, 14, 7, 14.5], "texture": "#0"}, + "east": {"uv": [6.5, 14, 9.5, 14.5], "texture": "#0"}, + "south": {"uv": [6.5, 14, 7, 14.5], "texture": "#0"}, + "west": {"uv": [6.5, 14, 9.5, 14.5], "rotation": 180, "texture": "#0"}, + "up": {"uv": [6.5, 14, 9.5, 14.5], "rotation": 270, "texture": "#0"}, + "down": {"uv": [6.5, 14, 9.5, 14.5], "rotation": 90, "texture": "#0"} + } + }, + { + "from": [5, 5, 5], + "to": [11, 11, 6], + "faces": { + "north": {"uv": [2.5, 2.5, 5.5, 5.5], "texture": "#0"}, + "east": {"uv": [2.5, 2.5, 3, 5.5], "texture": "#0"}, + "south": {"uv": [10.5, 2.5, 13.5, 5.5], "texture": "#0"}, + "west": {"uv": [5, 2.5, 5.5, 5.5], "texture": "#0"}, + "up": {"uv": [2.5, 2.5, 5.5, 3], "rotation": 180, "texture": "#0"}, + "down": {"uv": [2.5, 5, 5.5, 5.5], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [3, 3, 6], + "to": [13, 13, 7], + "faces": { + "north": {"uv": [1.5, 1.5, 6.5, 6.5], "texture": "#0"}, + "east": {"uv": [1.5, 1.5, 2, 6.5], "texture": "#0"}, + "south": {"uv": [9.5, 1.5, 14.5, 6.5], "texture": "#0"}, + "west": {"uv": [6, 1.5, 6.5, 6.5], "texture": "#0"}, + "up": {"uv": [1.5, 1.5, 6.5, 2], "rotation": 180, "texture": "#0"}, + "down": {"uv": [1.5, 6, 6.5, 6.5], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [5, 13, 6], + "to": [11, 14, 7], + "faces": { + "north": {"uv": [2.5, 1, 5.5, 1.5], "texture": "#0"}, + "east": {"uv": [2.5, 1, 3, 1.5], "texture": "#0"}, + "south": {"uv": [10.5, 1, 13.5, 1.5], "texture": "#0"}, + "west": {"uv": [5, 1, 5.5, 1.5], "texture": "#0"}, + "up": {"uv": [2.5, 1, 5.5, 1.5], "rotation": 180, "texture": "#0"}, + "down": {"uv": [2.5, 1, 5.5, 1.5], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [5, 14, 7], + "to": [11, 15, 8], + "faces": { + "north": {"uv": [2.5, 0.5, 5.5, 1], "texture": "#0"}, + "east": {"uv": [2.5, 0.5, 3, 1], "texture": "#0"}, + "south": {"uv": [10.5, 0.5, 13.5, 1], "texture": "#0"}, + "west": {"uv": [5, 0.5, 5.5, 1], "texture": "#0"}, + "up": {"uv": [2.5, 0.5, 5.5, 1], "rotation": 180, "texture": "#0"}, + "down": {"uv": [10.5, 0.5, 13.5, 1], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [5, 1, 7], + "to": [11, 2, 8], + "faces": { + "north": {"uv": [2.5, 7, 5.5, 7.5], "texture": "#0"}, + "east": {"uv": [2.5, 7, 3, 7.5], "texture": "#0"}, + "south": {"uv": [10.5, 7, 13.5, 7.5], "texture": "#0"}, + "west": {"uv": [5, 7, 5.5, 7.5], "texture": "#0"}, + "up": {"uv": [10.5, 7, 13.5, 7.5], "rotation": 180, "texture": "#0"}, + "down": {"uv": [2.5, 7, 5.5, 7.5], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [5, 2, 6], + "to": [11, 3, 7], + "faces": { + "north": {"uv": [2.5, 6.5, 5.5, 7], "texture": "#0"}, + "east": {"uv": [2.5, 6.5, 3, 7], "texture": "#0"}, + "south": {"uv": [10.5, 6.5, 13.5, 7], "texture": "#0"}, + "west": {"uv": [5, 6.5, 5.5, 7], "texture": "#0"}, + "up": {"uv": [2.5, 6.5, 5.5, 7], "rotation": 180, "texture": "#0"}, + "down": {"uv": [2.5, 6.5, 5.5, 7], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [13, 5, 6], + "to": [14, 11, 7], + "faces": { + "north": {"uv": [1, 2.5, 1.5, 5.5], "texture": "#0"}, + "east": {"uv": [1, 2.5, 1.5, 5.5], "texture": "#0"}, + "south": {"uv": [14.5, 2.5, 15, 5.5], "texture": "#0"}, + "west": {"uv": [1, 2.5, 1.5, 5.5], "texture": "#0"}, + "up": {"uv": [1, 2.5, 1.5, 3], "rotation": 180, "texture": "#0"}, + "down": {"uv": [1, 5, 1.5, 5.5], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [14, 5, 7], + "to": [15, 11, 8], + "faces": { + "north": {"uv": [0.5, 2.5, 1, 5.5], "texture": "#0"}, + "east": {"uv": [0.5, 2.5, 1, 5.5], "texture": "#0"}, + "south": {"uv": [15, 2.5, 15.5, 5.5], "texture": "#0"}, + "west": {"uv": [15, 2.5, 15.5, 5.5], "texture": "#0"}, + "up": {"uv": [0.5, 2.5, 1, 3], "rotation": 180, "texture": "#0"}, + "down": {"uv": [0.5, 5, 1, 5.5], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [13, 11, 7], + "to": [14, 13, 8], + "faces": { + "north": {"uv": [1, 1.5, 1.5, 2.5], "texture": "#0"}, + "east": {"uv": [1, 1.5, 1.5, 2.5], "texture": "#0"}, + "south": {"uv": [14.5, 1.5, 15, 2.5], "texture": "#0"}, + "west": {"uv": [14.5, 1.5, 15, 2.5], "texture": "#0"}, + "up": {"uv": [1, 1.5, 1.5, 2], "texture": "#0"}, + "down": {"uv": [14.5, 2, 15, 2.5], "texture": "#0"} + } + }, + { + "from": [11, 13, 7], + "to": [13, 14, 8], + "faces": { + "north": {"uv": [1.5, 1, 2.5, 1.5], "texture": "#0"}, + "east": {"uv": [1.5, 1, 2, 1.5], "texture": "#0"}, + "south": {"uv": [13.5, 1, 14.5, 1.5], "texture": "#0"}, + "west": {"uv": [13.5, 1, 14, 1.5], "texture": "#0"}, + "up": {"uv": [1.5, 1, 2.5, 1.5], "texture": "#0"}, + "down": {"uv": [13.5, 1, 14.5, 1.5], "texture": "#0"} + } + }, + { + "from": [11, 2, 7], + "to": [13, 3, 8], + "faces": { + "north": {"uv": [1.5, 6.5, 2.5, 7], "texture": "#0"}, + "east": {"uv": [1.5, 6.5, 2, 7], "texture": "#0"}, + "south": {"uv": [13.5, 6.5, 14.5, 7], "texture": "#0"}, + "west": {"uv": [13.5, 6.5, 14, 7], "texture": "#0"}, + "up": {"uv": [13.5, 6.5, 14.5, 7], "texture": "#0"}, + "down": {"uv": [1.5, 6.5, 2.5, 7], "texture": "#0"} + } + }, + { + "from": [3, 13, 7], + "to": [5, 14, 8], + "faces": { + "north": {"uv": [5.5, 1, 6.5, 1.5], "texture": "#0"}, + "east": {"uv": [10, 1, 10.5, 1.5], "texture": "#0"}, + "south": {"uv": [9.5, 1, 10.5, 1.5], "texture": "#0"}, + "west": {"uv": [6, 1, 6.5, 1.5], "texture": "#0"}, + "up": {"uv": [5.5, 1, 6.5, 1.5], "texture": "#0"}, + "down": {"uv": [9.5, 1, 10.5, 1.5], "texture": "#0"} + } + }, + { + "from": [3, 2, 7], + "to": [5, 3, 8], + "faces": { + "north": {"uv": [5.5, 6.5, 6.5, 7], "texture": "#0"}, + "east": {"uv": [10, 6.5, 10.5, 7], "texture": "#0"}, + "south": {"uv": [9.5, 6.5, 10.5, 7], "texture": "#0"}, + "west": {"uv": [6, 6.5, 6.5, 7], "texture": "#0"}, + "up": {"uv": [9.5, 6.5, 10.5, 7], "texture": "#0"}, + "down": {"uv": [5.5, 6.5, 6.5, 7], "texture": "#0"} + } + }, + { + "from": [13, 3, 7], + "to": [14, 5, 8], + "faces": { + "north": {"uv": [1, 5.5, 1.5, 6.5], "texture": "#0"}, + "east": {"uv": [1, 5.5, 1.5, 6.5], "texture": "#0"}, + "south": {"uv": [14.5, 5.5, 15, 6.5], "texture": "#0"}, + "west": {"uv": [14.5, 5.5, 15, 6.5], "texture": "#0"}, + "up": {"uv": [1, 5.5, 1.5, 6], "texture": "#0"}, + "down": {"uv": [14.5, 6, 15, 6.5], "texture": "#0"} + } + }, + { + "from": [2, 11, 7], + "to": [3, 13, 8], + "faces": { + "north": {"uv": [6.5, 1.5, 7, 2.5], "texture": "#0"}, + "east": {"uv": [9, 1.5, 9.5, 2.5], "texture": "#0"}, + "south": {"uv": [9, 1.5, 9.5, 2.5], "texture": "#0"}, + "west": {"uv": [6.5, 1.5, 7, 2.5], "texture": "#0"}, + "up": {"uv": [6.5, 1.5, 7, 2], "texture": "#0"}, + "down": {"uv": [9, 2, 9.5, 2.5], "texture": "#0"} + } + }, + { + "from": [2, 3, 7], + "to": [3, 5, 8], + "faces": { + "north": {"uv": [6.5, 5.5, 7, 6.5], "texture": "#0"}, + "east": {"uv": [9, 5.5, 9.5, 6.5], "texture": "#0"}, + "south": {"uv": [9, 5.5, 9.5, 6.5], "texture": "#0"}, + "west": {"uv": [6.5, 5.5, 7, 6.5], "texture": "#0"}, + "up": {"uv": [9, 5.5, 9.5, 6], "texture": "#0"}, + "down": {"uv": [6.5, 6, 7, 6.5], "texture": "#0"} + } + }, + { + "from": [1, 5, 7], + "to": [2, 11, 8], + "faces": { + "north": {"uv": [7, 2.5, 7.5, 5.5], "texture": "#0"}, + "east": {"uv": [8.5, 2.5, 9, 5.5], "texture": "#0"}, + "south": {"uv": [8.5, 2.5, 9, 5.5], "texture": "#0"}, + "west": {"uv": [7, 2.5, 7.5, 5.5], "texture": "#0"}, + "up": {"uv": [7, 2.5, 7.5, 3], "rotation": 180, "texture": "#0"}, + "down": {"uv": [7, 5, 7.5, 5.5], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [2, 5, 6], + "to": [3, 11, 7], + "faces": { + "north": {"uv": [6.5, 2.5, 7, 5.5], "texture": "#0"}, + "east": {"uv": [6.5, 2.5, 7, 5.5], "texture": "#0"}, + "south": {"uv": [9, 2.5, 9.5, 5.5], "texture": "#0"}, + "west": {"uv": [6.5, 2.5, 7, 5.5], "texture": "#0"}, + "up": {"uv": [6.5, 2.5, 7, 3], "rotation": 180, "texture": "#0"}, + "down": {"uv": [6.5, 5, 7, 5.5], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [11, 5, 5], + "to": [12, 11, 6], + "faces": { + "north": {"uv": [2, 2.5, 2.5, 5.5], "texture": "#0"}, + "east": {"uv": [2, 2.5, 2.5, 5.5], "texture": "#0"}, + "south": {"uv": [13.5, 2.5, 14, 5.5], "texture": "#0"}, + "west": {"uv": [2, 2.5, 2.5, 5.5], "texture": "#0"}, + "up": {"uv": [2, 2.5, 2.5, 3], "rotation": 180, "texture": "#0"}, + "down": {"uv": [2, 5, 2.5, 5.5], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [4, 5, 5], + "to": [5, 11, 6], + "faces": { + "north": {"uv": [5.5, 2.5, 6, 5.5], "texture": "#0"}, + "east": {"uv": [5.5, 2.5, 6, 5.5], "texture": "#0"}, + "south": {"uv": [5.5, 2.5, 6, 5.5], "texture": "#0"}, + "west": {"uv": [5.5, 2.5, 6, 5.5], "texture": "#0"}, + "up": {"uv": [5.5, 2.5, 6, 3], "rotation": 180, "texture": "#0"}, + "down": {"uv": [5.5, 5, 6, 5.5], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [5, 11, 5], + "to": [11, 12, 6], + "faces": { + "north": {"uv": [2.5, 2, 5.5, 2.5], "texture": "#0"}, + "east": {"uv": [2.5, 2, 3, 2.5], "texture": "#0"}, + "south": {"uv": [10.5, 2, 13.5, 2.5], "texture": "#0"}, + "west": {"uv": [5, 2, 5.5, 2.5], "texture": "#0"}, + "up": {"uv": [2.5, 2, 5.5, 2.5], "rotation": 180, "texture": "#0"}, + "down": {"uv": [2.5, 2, 5.5, 2.5], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [5, 4, 5], + "to": [11, 5, 6], + "faces": { + "north": {"uv": [2.5, 5.5, 5.5, 6], "texture": "#0"}, + "east": {"uv": [2.5, 5.5, 3, 6], "texture": "#0"}, + "south": {"uv": [2.5, 5.5, 5.5, 6], "texture": "#0"}, + "west": {"uv": [5, 5.5, 5.5, 6], "texture": "#0"}, + "up": {"uv": [2.5, 5.5, 5.5, 6], "rotation": 180, "texture": "#0"}, + "down": {"uv": [2.5, 5.5, 5.5, 6], "rotation": 180, "texture": "#0"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [0, -90, 0], + "translation": [2.3, -2, 5] + }, + "thirdperson_lefthand": { + "rotation": [0, -90, 0], + "translation": [2.3, -2, 5] + }, + "firstperson_righthand": { + "rotation": [0, -75, 15], + "translation": [4, -4, 0] + }, + "firstperson_lefthand": { + "rotation": [0, -75, 15], + "translation": [4, -4, 0] + }, + "ground": { + "translation": [0, 3, 0], + "scale": [0.5, 0.5, 0.5] + }, + "gui": { + "rotation": [30, 145, 0], + "translation": [0.25, 0.25, 0], + "scale": [0.65, 0.65, 0.65] + }, + "head": { + "rotation": [90, 0, 0], + "translation": [0, 5.5, -0.5], + "scale": [1.5, 1.5, 1.5] + }, + "fixed": { + "translation": [0, 0, 0], + "scale": [0.75, 0.75, 0.75] + } + }, + "groups": [ + { + "name": "handle", + "origin": [8, 8, 8], + "children": [0, 1, 2, 3, 4, 5, 6] + }, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28 + ], + "overrides": [{ + "predicate": { "blocking": 1 }, + "model": "tfc:item/metal/shield/bronze_blocking" + } + ] +} \ No newline at end of file diff --git a/kubejs/assets/tfc/models/item/metal/shield/bronze_blocking.json b/kubejs/assets/tfc/models/item/metal/shield/bronze_blocking.json new file mode 100644 index 0000000000..03bddcc821 --- /dev/null +++ b/kubejs/assets/tfc/models/item/metal/shield/bronze_blocking.json @@ -0,0 +1,51 @@ +{ + "credit": "Made with Blockbench", + "parent":"tfc:item/metal/shield/bronze", + "textures": { + "0": "tfc:item/metal/shield/bronze", + "particle": "tfc:item/metal/shield/bronze" + }, + "display": { + "thirdperson_righthand": { + "rotation": [0, -90, 0], + "translation": [2.3, -2, 5] + }, + "thirdperson_lefthand": { + "rotation": [0, -90, 0], + "translation": [2.3, -2, 5] + }, + "firstperson_righthand": { + "rotation": [5, -30, 5], + "translation": [-1.5, 0.5, 2.5] + }, + "firstperson_lefthand": { + "rotation": [5, -30, 5], + "translation": [-1.5, 0.5, 2.5] + }, + "ground": { + "translation": [0, 2, 0], + "scale": [0.5, 0.5, 0.5] + }, + "gui": { + "rotation": [30, 145, 0], + "translation": [0.25, 0.25, 0], + "scale": [0.65, 0.65, 0.65] + }, + "head": { + "rotation": [90, 0, 0], + "translation": [0, 5.5, -0.5], + "scale": [1.5, 1.5, 1.5] + }, + "fixed": { + "translation": [0, 0, -2.13], + "scale": [2.02, 2.02, 2.02] + } + }, + "groups": [ + { + "name": "handle", + "origin": [8, 8, 8], + "children": [0, 1, 2, 3, 4, 5, 6] + }, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28 + ] +} \ No newline at end of file diff --git a/kubejs/assets/tfc/models/item/metal/shield/copper.json b/kubejs/assets/tfc/models/item/metal/shield/copper.json new file mode 100644 index 0000000000..eb00b07691 --- /dev/null +++ b/kubejs/assets/tfc/models/item/metal/shield/copper.json @@ -0,0 +1,408 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "tfc:item/metal/shield/copper", + "particle": "tfc:item/metal/shield/copper" + }, + "elements": [ + { + "name": "board", + "from": [2, 6, 7], + "to": [14, 10, 8], + "faces": { + "north": {"uv": [0.5, 14, 6.5, 16], "rotation": 180, "texture": "#0"}, + "east": {"uv": [6, 14, 6.5, 16], "texture": "#0"}, + "south": {"uv": [0.5, 14, 6.5, 16], "texture": "#0"}, + "west": {"uv": [0.5, 14, 1, 16], "texture": "#0"}, + "up": {"uv": [0.5, 14, 6.5, 14.5], "texture": "#0"}, + "down": {"uv": [0.5, 15.5, 6.5, 16], "texture": "#0"} + } + }, + { + "name": "handle", + "from": [9, 6, 12], + "to": [10, 10, 13], + "faces": { + "north": {"uv": [7, 14, 9, 14.5], "rotation": 90, "texture": "#0"}, + "east": {"uv": [7, 14, 9, 14.5], "rotation": 90, "texture": "#0"}, + "south": {"uv": [7, 14, 9, 14.5], "rotation": 90, "texture": "#0"}, + "west": {"uv": [7, 14, 9, 14.5], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "handle", + "from": [5, 6, 12], + "to": [6, 10, 13], + "faces": { + "north": {"uv": [7, 14, 9, 14.5], "rotation": 90, "texture": "#0"}, + "east": {"uv": [7, 14, 9, 14.5], "rotation": 90, "texture": "#0"}, + "south": {"uv": [7, 14, 9, 14.5], "rotation": 90, "texture": "#0"}, + "west": {"uv": [7, 14, 9, 14.5], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "handle", + "from": [9, 5, 7], + "to": [10, 6, 13], + "faces": { + "north": {"uv": [6.5, 14, 7, 14.5], "texture": "#0"}, + "east": {"uv": [6.5, 14, 9.5, 14.5], "texture": "#0"}, + "south": {"uv": [6.5, 14, 7, 14.5], "texture": "#0"}, + "west": {"uv": [6.5, 14, 9.5, 14.5], "rotation": 180, "texture": "#0"}, + "up": {"uv": [6.5, 14, 9.5, 14.5], "rotation": 270, "texture": "#0"}, + "down": {"uv": [6.5, 14, 9.5, 14.5], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "handle", + "from": [5, 5, 7], + "to": [6, 6, 13], + "faces": { + "north": {"uv": [6.5, 14, 7, 14.5], "texture": "#0"}, + "east": {"uv": [6.5, 14, 9.5, 14.5], "texture": "#0"}, + "south": {"uv": [6.5, 14, 7, 14.5], "texture": "#0"}, + "west": {"uv": [6.5, 14, 9.5, 14.5], "rotation": 180, "texture": "#0"}, + "up": {"uv": [6.5, 14, 9.5, 14.5], "rotation": 270, "texture": "#0"}, + "down": {"uv": [6.5, 14, 9.5, 14.5], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "handle", + "from": [9, 10, 7], + "to": [10, 11, 13], + "faces": { + "north": {"uv": [6.5, 14, 7, 14.5], "texture": "#0"}, + "east": {"uv": [6.5, 14, 9.5, 14.5], "texture": "#0"}, + "south": {"uv": [6.5, 14, 7, 14.5], "texture": "#0"}, + "west": {"uv": [6.5, 14, 9.5, 14.5], "rotation": 180, "texture": "#0"}, + "up": {"uv": [6.5, 14, 9.5, 14.5], "rotation": 270, "texture": "#0"}, + "down": {"uv": [6.5, 14, 9.5, 14.5], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "handle", + "from": [5, 10, 7], + "to": [6, 11, 13], + "faces": { + "north": {"uv": [6.5, 14, 7, 14.5], "texture": "#0"}, + "east": {"uv": [6.5, 14, 9.5, 14.5], "texture": "#0"}, + "south": {"uv": [6.5, 14, 7, 14.5], "texture": "#0"}, + "west": {"uv": [6.5, 14, 9.5, 14.5], "rotation": 180, "texture": "#0"}, + "up": {"uv": [6.5, 14, 9.5, 14.5], "rotation": 270, "texture": "#0"}, + "down": {"uv": [6.5, 14, 9.5, 14.5], "rotation": 90, "texture": "#0"} + } + }, + { + "from": [5, 5, 5], + "to": [11, 11, 6], + "faces": { + "north": {"uv": [2.5, 2.5, 5.5, 5.5], "texture": "#0"}, + "east": {"uv": [2.5, 2.5, 3, 5.5], "texture": "#0"}, + "south": {"uv": [10.5, 2.5, 13.5, 5.5], "texture": "#0"}, + "west": {"uv": [5, 2.5, 5.5, 5.5], "texture": "#0"}, + "up": {"uv": [2.5, 2.5, 5.5, 3], "rotation": 180, "texture": "#0"}, + "down": {"uv": [2.5, 5, 5.5, 5.5], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [3, 3, 6], + "to": [13, 13, 7], + "faces": { + "north": {"uv": [1.5, 1.5, 6.5, 6.5], "texture": "#0"}, + "east": {"uv": [1.5, 1.5, 2, 6.5], "texture": "#0"}, + "south": {"uv": [9.5, 1.5, 14.5, 6.5], "texture": "#0"}, + "west": {"uv": [6, 1.5, 6.5, 6.5], "texture": "#0"}, + "up": {"uv": [1.5, 1.5, 6.5, 2], "rotation": 180, "texture": "#0"}, + "down": {"uv": [1.5, 6, 6.5, 6.5], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [5, 13, 6], + "to": [11, 14, 7], + "faces": { + "north": {"uv": [2.5, 1, 5.5, 1.5], "texture": "#0"}, + "east": {"uv": [2.5, 1, 3, 1.5], "texture": "#0"}, + "south": {"uv": [10.5, 1, 13.5, 1.5], "texture": "#0"}, + "west": {"uv": [5, 1, 5.5, 1.5], "texture": "#0"}, + "up": {"uv": [2.5, 1, 5.5, 1.5], "rotation": 180, "texture": "#0"}, + "down": {"uv": [2.5, 1, 5.5, 1.5], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [5, 14, 7], + "to": [11, 15, 8], + "faces": { + "north": {"uv": [2.5, 0.5, 5.5, 1], "texture": "#0"}, + "east": {"uv": [2.5, 0.5, 3, 1], "texture": "#0"}, + "south": {"uv": [10.5, 0.5, 13.5, 1], "texture": "#0"}, + "west": {"uv": [5, 0.5, 5.5, 1], "texture": "#0"}, + "up": {"uv": [2.5, 0.5, 5.5, 1], "rotation": 180, "texture": "#0"}, + "down": {"uv": [10.5, 0.5, 13.5, 1], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [5, 1, 7], + "to": [11, 2, 8], + "faces": { + "north": {"uv": [2.5, 7, 5.5, 7.5], "texture": "#0"}, + "east": {"uv": [2.5, 7, 3, 7.5], "texture": "#0"}, + "south": {"uv": [10.5, 7, 13.5, 7.5], "texture": "#0"}, + "west": {"uv": [5, 7, 5.5, 7.5], "texture": "#0"}, + "up": {"uv": [10.5, 7, 13.5, 7.5], "rotation": 180, "texture": "#0"}, + "down": {"uv": [2.5, 7, 5.5, 7.5], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [5, 2, 6], + "to": [11, 3, 7], + "faces": { + "north": {"uv": [2.5, 6.5, 5.5, 7], "texture": "#0"}, + "east": {"uv": [2.5, 6.5, 3, 7], "texture": "#0"}, + "south": {"uv": [10.5, 6.5, 13.5, 7], "texture": "#0"}, + "west": {"uv": [5, 6.5, 5.5, 7], "texture": "#0"}, + "up": {"uv": [2.5, 6.5, 5.5, 7], "rotation": 180, "texture": "#0"}, + "down": {"uv": [2.5, 6.5, 5.5, 7], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [13, 5, 6], + "to": [14, 11, 7], + "faces": { + "north": {"uv": [1, 2.5, 1.5, 5.5], "texture": "#0"}, + "east": {"uv": [1, 2.5, 1.5, 5.5], "texture": "#0"}, + "south": {"uv": [14.5, 2.5, 15, 5.5], "texture": "#0"}, + "west": {"uv": [1, 2.5, 1.5, 5.5], "texture": "#0"}, + "up": {"uv": [1, 2.5, 1.5, 3], "rotation": 180, "texture": "#0"}, + "down": {"uv": [1, 5, 1.5, 5.5], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [14, 5, 7], + "to": [15, 11, 8], + "faces": { + "north": {"uv": [0.5, 2.5, 1, 5.5], "texture": "#0"}, + "east": {"uv": [0.5, 2.5, 1, 5.5], "texture": "#0"}, + "south": {"uv": [15, 2.5, 15.5, 5.5], "texture": "#0"}, + "west": {"uv": [15, 2.5, 15.5, 5.5], "texture": "#0"}, + "up": {"uv": [0.5, 2.5, 1, 3], "rotation": 180, "texture": "#0"}, + "down": {"uv": [0.5, 5, 1, 5.5], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [13, 11, 7], + "to": [14, 13, 8], + "faces": { + "north": {"uv": [1, 1.5, 1.5, 2.5], "texture": "#0"}, + "east": {"uv": [1, 1.5, 1.5, 2.5], "texture": "#0"}, + "south": {"uv": [14.5, 1.5, 15, 2.5], "texture": "#0"}, + "west": {"uv": [14.5, 1.5, 15, 2.5], "texture": "#0"}, + "up": {"uv": [1, 1.5, 1.5, 2], "texture": "#0"}, + "down": {"uv": [14.5, 2, 15, 2.5], "texture": "#0"} + } + }, + { + "from": [11, 13, 7], + "to": [13, 14, 8], + "faces": { + "north": {"uv": [1.5, 1, 2.5, 1.5], "texture": "#0"}, + "east": {"uv": [1.5, 1, 2, 1.5], "texture": "#0"}, + "south": {"uv": [13.5, 1, 14.5, 1.5], "texture": "#0"}, + "west": {"uv": [13.5, 1, 14, 1.5], "texture": "#0"}, + "up": {"uv": [1.5, 1, 2.5, 1.5], "texture": "#0"}, + "down": {"uv": [13.5, 1, 14.5, 1.5], "texture": "#0"} + } + }, + { + "from": [11, 2, 7], + "to": [13, 3, 8], + "faces": { + "north": {"uv": [1.5, 6.5, 2.5, 7], "texture": "#0"}, + "east": {"uv": [1.5, 6.5, 2, 7], "texture": "#0"}, + "south": {"uv": [13.5, 6.5, 14.5, 7], "texture": "#0"}, + "west": {"uv": [13.5, 6.5, 14, 7], "texture": "#0"}, + "up": {"uv": [13.5, 6.5, 14.5, 7], "texture": "#0"}, + "down": {"uv": [1.5, 6.5, 2.5, 7], "texture": "#0"} + } + }, + { + "from": [3, 13, 7], + "to": [5, 14, 8], + "faces": { + "north": {"uv": [5.5, 1, 6.5, 1.5], "texture": "#0"}, + "east": {"uv": [10, 1, 10.5, 1.5], "texture": "#0"}, + "south": {"uv": [9.5, 1, 10.5, 1.5], "texture": "#0"}, + "west": {"uv": [6, 1, 6.5, 1.5], "texture": "#0"}, + "up": {"uv": [5.5, 1, 6.5, 1.5], "texture": "#0"}, + "down": {"uv": [9.5, 1, 10.5, 1.5], "texture": "#0"} + } + }, + { + "from": [3, 2, 7], + "to": [5, 3, 8], + "faces": { + "north": {"uv": [5.5, 6.5, 6.5, 7], "texture": "#0"}, + "east": {"uv": [10, 6.5, 10.5, 7], "texture": "#0"}, + "south": {"uv": [9.5, 6.5, 10.5, 7], "texture": "#0"}, + "west": {"uv": [6, 6.5, 6.5, 7], "texture": "#0"}, + "up": {"uv": [9.5, 6.5, 10.5, 7], "texture": "#0"}, + "down": {"uv": [5.5, 6.5, 6.5, 7], "texture": "#0"} + } + }, + { + "from": [13, 3, 7], + "to": [14, 5, 8], + "faces": { + "north": {"uv": [1, 5.5, 1.5, 6.5], "texture": "#0"}, + "east": {"uv": [1, 5.5, 1.5, 6.5], "texture": "#0"}, + "south": {"uv": [14.5, 5.5, 15, 6.5], "texture": "#0"}, + "west": {"uv": [14.5, 5.5, 15, 6.5], "texture": "#0"}, + "up": {"uv": [1, 5.5, 1.5, 6], "texture": "#0"}, + "down": {"uv": [14.5, 6, 15, 6.5], "texture": "#0"} + } + }, + { + "from": [2, 11, 7], + "to": [3, 13, 8], + "faces": { + "north": {"uv": [6.5, 1.5, 7, 2.5], "texture": "#0"}, + "east": {"uv": [9, 1.5, 9.5, 2.5], "texture": "#0"}, + "south": {"uv": [9, 1.5, 9.5, 2.5], "texture": "#0"}, + "west": {"uv": [6.5, 1.5, 7, 2.5], "texture": "#0"}, + "up": {"uv": [6.5, 1.5, 7, 2], "texture": "#0"}, + "down": {"uv": [9, 2, 9.5, 2.5], "texture": "#0"} + } + }, + { + "from": [2, 3, 7], + "to": [3, 5, 8], + "faces": { + "north": {"uv": [6.5, 5.5, 7, 6.5], "texture": "#0"}, + "east": {"uv": [9, 5.5, 9.5, 6.5], "texture": "#0"}, + "south": {"uv": [9, 5.5, 9.5, 6.5], "texture": "#0"}, + "west": {"uv": [6.5, 5.5, 7, 6.5], "texture": "#0"}, + "up": {"uv": [9, 5.5, 9.5, 6], "texture": "#0"}, + "down": {"uv": [6.5, 6, 7, 6.5], "texture": "#0"} + } + }, + { + "from": [1, 5, 7], + "to": [2, 11, 8], + "faces": { + "north": {"uv": [7, 2.5, 7.5, 5.5], "texture": "#0"}, + "east": {"uv": [8.5, 2.5, 9, 5.5], "texture": "#0"}, + "south": {"uv": [8.5, 2.5, 9, 5.5], "texture": "#0"}, + "west": {"uv": [7, 2.5, 7.5, 5.5], "texture": "#0"}, + "up": {"uv": [7, 2.5, 7.5, 3], "rotation": 180, "texture": "#0"}, + "down": {"uv": [7, 5, 7.5, 5.5], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [2, 5, 6], + "to": [3, 11, 7], + "faces": { + "north": {"uv": [6.5, 2.5, 7, 5.5], "texture": "#0"}, + "east": {"uv": [6.5, 2.5, 7, 5.5], "texture": "#0"}, + "south": {"uv": [9, 2.5, 9.5, 5.5], "texture": "#0"}, + "west": {"uv": [6.5, 2.5, 7, 5.5], "texture": "#0"}, + "up": {"uv": [6.5, 2.5, 7, 3], "rotation": 180, "texture": "#0"}, + "down": {"uv": [6.5, 5, 7, 5.5], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [11, 5, 5], + "to": [12, 11, 6], + "faces": { + "north": {"uv": [2, 2.5, 2.5, 5.5], "texture": "#0"}, + "east": {"uv": [2, 2.5, 2.5, 5.5], "texture": "#0"}, + "south": {"uv": [13.5, 2.5, 14, 5.5], "texture": "#0"}, + "west": {"uv": [2, 2.5, 2.5, 5.5], "texture": "#0"}, + "up": {"uv": [2, 2.5, 2.5, 3], "rotation": 180, "texture": "#0"}, + "down": {"uv": [2, 5, 2.5, 5.5], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [4, 5, 5], + "to": [5, 11, 6], + "faces": { + "north": {"uv": [5.5, 2.5, 6, 5.5], "texture": "#0"}, + "east": {"uv": [5.5, 2.5, 6, 5.5], "texture": "#0"}, + "south": {"uv": [5.5, 2.5, 6, 5.5], "texture": "#0"}, + "west": {"uv": [5.5, 2.5, 6, 5.5], "texture": "#0"}, + "up": {"uv": [5.5, 2.5, 6, 3], "rotation": 180, "texture": "#0"}, + "down": {"uv": [5.5, 5, 6, 5.5], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [5, 11, 5], + "to": [11, 12, 6], + "faces": { + "north": {"uv": [2.5, 2, 5.5, 2.5], "texture": "#0"}, + "east": {"uv": [2.5, 2, 3, 2.5], "texture": "#0"}, + "south": {"uv": [10.5, 2, 13.5, 2.5], "texture": "#0"}, + "west": {"uv": [5, 2, 5.5, 2.5], "texture": "#0"}, + "up": {"uv": [2.5, 2, 5.5, 2.5], "rotation": 180, "texture": "#0"}, + "down": {"uv": [2.5, 2, 5.5, 2.5], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [5, 4, 5], + "to": [11, 5, 6], + "faces": { + "north": {"uv": [2.5, 5.5, 5.5, 6], "texture": "#0"}, + "east": {"uv": [2.5, 5.5, 3, 6], "texture": "#0"}, + "south": {"uv": [2.5, 5.5, 5.5, 6], "texture": "#0"}, + "west": {"uv": [5, 5.5, 5.5, 6], "texture": "#0"}, + "up": {"uv": [2.5, 5.5, 5.5, 6], "rotation": 180, "texture": "#0"}, + "down": {"uv": [2.5, 5.5, 5.5, 6], "rotation": 180, "texture": "#0"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [0, -90, 0], + "translation": [2.3, -2, 5] + }, + "thirdperson_lefthand": { + "rotation": [0, -90, 0], + "translation": [2.3, -2, 5] + }, + "firstperson_righthand": { + "rotation": [0, -75, 15], + "translation": [4, -4, 0] + }, + "firstperson_lefthand": { + "rotation": [0, -75, 15], + "translation": [4, -4, 0] + }, + "ground": { + "translation": [0, 3, 0], + "scale": [0.5, 0.5, 0.5] + }, + "gui": { + "rotation": [30, 145, 0], + "translation": [0.25, 0.25, 0], + "scale": [0.65, 0.65, 0.65] + }, + "head": { + "rotation": [90, 0, 0], + "translation": [0, 5.5, -0.5], + "scale": [1.5, 1.5, 1.5] + }, + "fixed": { + "translation": [0, 0, 0], + "scale": [0.75, 0.75, 0.75] + } + }, + "groups": [ + { + "name": "handle", + "origin": [8, 8, 8], + "children": [0, 1, 2, 3, 4, 5, 6] + }, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28 + ], + "overrides": [{ + "predicate": { "blocking": 1 }, + "model": "tfc:item/metal/shield/copper_blocking" + } + ] +} \ No newline at end of file diff --git a/kubejs/assets/tfc/models/item/metal/shield/copper_blocking.json b/kubejs/assets/tfc/models/item/metal/shield/copper_blocking.json new file mode 100644 index 0000000000..437c93f203 --- /dev/null +++ b/kubejs/assets/tfc/models/item/metal/shield/copper_blocking.json @@ -0,0 +1,51 @@ +{ + "credit": "Made with Blockbench", + "parent":"tfc:item/metal/shield/copper", + "textures": { + "0": "tfc:item/metal/shield/copper", + "particle": "tfc:item/metal/shield/copper" + }, + "display": { + "thirdperson_righthand": { + "rotation": [0, -90, 0], + "translation": [2.3, -2, 5] + }, + "thirdperson_lefthand": { + "rotation": [0, -90, 0], + "translation": [2.3, -2, 5] + }, + "firstperson_righthand": { + "rotation": [5, -30, 5], + "translation": [-1.5, 0.5, 2.5] + }, + "firstperson_lefthand": { + "rotation": [5, -30, 5], + "translation": [-1.5, 0.5, 2.5] + }, + "ground": { + "translation": [0, 2, 0], + "scale": [0.5, 0.5, 0.5] + }, + "gui": { + "rotation": [30, 145, 0], + "translation": [0.25, 0.25, 0], + "scale": [0.65, 0.65, 0.65] + }, + "head": { + "rotation": [90, 0, 0], + "translation": [0, 5.5, -0.5], + "scale": [1.5, 1.5, 1.5] + }, + "fixed": { + "translation": [0, 0, -2.13], + "scale": [2.02, 2.02, 2.02] + } + }, + "groups": [ + { + "name": "handle", + "origin": [8, 8, 8], + "children": [0, 1, 2, 3, 4, 5, 6] + }, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28 + ] +} \ No newline at end of file diff --git a/kubejs/assets/tfc/models/item/metal/shield/red_steel.json b/kubejs/assets/tfc/models/item/metal/shield/red_steel.json new file mode 100644 index 0000000000..93e55841ac --- /dev/null +++ b/kubejs/assets/tfc/models/item/metal/shield/red_steel.json @@ -0,0 +1,417 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "tfc:item/metal/shield/red_steel", + "particle": "tfc:item/metal/shield/red_steel" + }, + "elements": [ + { + "name": "handle", + "from": [9, 6, 12], + "to": [10, 10, 13], + "faces": { + "north": {"uv": [7, 14, 9, 14.5], "rotation": 90, "texture": "#0"}, + "east": {"uv": [7, 14, 9, 14.5], "rotation": 90, "texture": "#0"}, + "south": {"uv": [7, 14, 9, 14.5], "rotation": 90, "texture": "#0"}, + "west": {"uv": [7, 14, 9, 14.5], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "handle", + "from": [5, 6, 12], + "to": [6, 10, 13], + "faces": { + "north": {"uv": [7, 14, 9, 14.5], "rotation": 90, "texture": "#0"}, + "east": {"uv": [7, 14, 9, 14.5], "rotation": 90, "texture": "#0"}, + "south": {"uv": [7, 14, 9, 14.5], "rotation": 90, "texture": "#0"}, + "west": {"uv": [7, 14, 9, 14.5], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "handle", + "from": [9, 5, 7], + "to": [10, 6, 13], + "faces": { + "north": {"uv": [6.5, 14, 7, 14.5], "texture": "#0"}, + "east": {"uv": [6.5, 14, 9.5, 14.5], "texture": "#0"}, + "south": {"uv": [6.5, 14, 7, 14.5], "texture": "#0"}, + "west": {"uv": [6.5, 14, 9.5, 14.5], "rotation": 180, "texture": "#0"}, + "up": {"uv": [6.5, 14, 9.5, 14.5], "rotation": 270, "texture": "#0"}, + "down": {"uv": [6.5, 14, 9.5, 14.5], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "handle", + "from": [5, 5, 7], + "to": [6, 6, 13], + "faces": { + "north": {"uv": [6.5, 14, 7, 14.5], "texture": "#0"}, + "east": {"uv": [6.5, 14, 9.5, 14.5], "texture": "#0"}, + "south": {"uv": [6.5, 14, 7, 14.5], "texture": "#0"}, + "west": {"uv": [6.5, 14, 9.5, 14.5], "rotation": 180, "texture": "#0"}, + "up": {"uv": [6.5, 14, 9.5, 14.5], "rotation": 270, "texture": "#0"}, + "down": {"uv": [6.5, 14, 9.5, 14.5], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "handle", + "from": [9, 10, 7], + "to": [10, 11, 13], + "faces": { + "north": {"uv": [6.5, 14, 7, 14.5], "texture": "#0"}, + "east": {"uv": [6.5, 14, 9.5, 14.5], "texture": "#0"}, + "south": {"uv": [6.5, 14, 7, 14.5], "texture": "#0"}, + "west": {"uv": [6.5, 14, 9.5, 14.5], "rotation": 180, "texture": "#0"}, + "up": {"uv": [6.5, 14, 9.5, 14.5], "rotation": 270, "texture": "#0"}, + "down": {"uv": [6.5, 14, 9.5, 14.5], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "handle", + "from": [5, 10, 7], + "to": [6, 11, 13], + "faces": { + "north": {"uv": [6.5, 14, 7, 14.5], "texture": "#0"}, + "east": {"uv": [6.5, 14, 9.5, 14.5], "texture": "#0"}, + "south": {"uv": [6.5, 14, 7, 14.5], "texture": "#0"}, + "west": {"uv": [6.5, 14, 9.5, 14.5], "rotation": 180, "texture": "#0"}, + "up": {"uv": [6.5, 14, 9.5, 14.5], "rotation": 270, "texture": "#0"}, + "down": {"uv": [6.5, 14, 9.5, 14.5], "rotation": 90, "texture": "#0"} + } + }, + { + "from": [3, 6, 7], + "to": [13, 10, 8], + "faces": { + "north": {"uv": [1, 14, 6, 16], "texture": "#0"}, + "east": {"uv": [1, 14, 1.5, 16], "texture": "#0"}, + "south": {"uv": [1, 14, 6, 16], "texture": "#0"}, + "west": {"uv": [5.5, 14, 6, 16], "texture": "#0"}, + "up": {"uv": [1, 14, 6, 14.5], "texture": "#0"}, + "down": {"uv": [1, 15.5, 6, 16], "texture": "#0"} + } + }, + { + "from": [5, 5, 6], + "to": [11, 11, 7], + "faces": { + "north": {"uv": [2, 14, 5, 16], "texture": "#0"}, + "east": {"uv": [4.5, 14, 5, 16], "texture": "#0"}, + "south": {"uv": [2, 14, 5, 16], "texture": "#0"}, + "west": {"uv": [2, 14, 2.5, 16], "texture": "#0"}, + "up": {"uv": [2, 14, 5, 14.5], "texture": "#0"}, + "down": {"uv": [2, 15.5, 5, 16], "texture": "#0"} + } + }, + { + "from": [5, -6, 5], + "to": [7, 18, 6], + "faces": { + "north": {"uv": [4.5, 0.5, 5.5, 12.5], "texture": "#0"}, + "east": {"uv": [4.5, 0.5, 5, 12.5], "texture": "#0"}, + "south": {"uv": [10.5, 0.5, 11.5, 12.5], "texture": "#0"}, + "west": {"uv": [5, 0.5, 5.5, 12.5], "texture": "#0"}, + "up": {"uv": [4.5, 0.5, 5.5, 1], "rotation": 180, "texture": "#0"}, + "down": {"uv": [4.5, 12, 5.5, 12.5], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [9, -6, 5], + "to": [11, 18, 6], + "faces": { + "north": {"uv": [2.5, 0.5, 3.5, 12.5], "texture": "#0"}, + "east": {"uv": [2.5, 0.5, 3, 12.5], "texture": "#0"}, + "south": {"uv": [12.5, 0.5, 13.5, 12.5], "texture": "#0"}, + "west": {"uv": [3, 0.5, 3.5, 12.5], "texture": "#0"}, + "up": {"uv": [2.5, 0.5, 3.5, 1], "rotation": 180, "texture": "#0"}, + "down": {"uv": [2.5, 12, 3.5, 12.5], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [4, -5, 6], + "to": [5, 18, 7], + "faces": { + "north": {"uv": [5.5, 0.5, 6, 12], "texture": "#0"}, + "east": {"uv": [10, 0.5, 10.5, 12], "texture": "#0"}, + "south": {"uv": [10, 0.5, 10.5, 12], "texture": "#0"}, + "west": {"uv": [5.5, 0.5, 6, 12], "texture": "#0"}, + "up": {"uv": [5.5, 0.5, 6, 1], "texture": "#0"}, + "down": {"uv": [5.5, 11.5, 6, 12], "texture": "#0"} + } + }, + { + "from": [11, -5, 6], + "to": [12, 18, 7], + "faces": { + "north": {"uv": [2, 0.5, 2.5, 12], "texture": "#0"}, + "east": {"uv": [2, 0.5, 2.5, 12], "texture": "#0"}, + "south": {"uv": [13.5, 0.5, 14, 12], "texture": "#0"}, + "west": {"uv": [13.5, 0.5, 14, 12], "texture": "#0"}, + "up": {"uv": [2, 0.5, 2.5, 1], "texture": "#0"}, + "down": {"uv": [2, 11.5, 2.5, 12], "texture": "#0"} + } + }, + { + "from": [12, -4, 6], + "to": [13, 17, 7], + "faces": { + "north": {"uv": [1.5, 1, 2, 11.5], "texture": "#0"}, + "east": {"uv": [1.5, 1, 2, 11.5], "texture": "#0"}, + "south": {"uv": [14, 1, 14.5, 11.5], "texture": "#0"}, + "west": {"uv": [14, 1, 14.5, 11.5], "texture": "#0"}, + "up": {"uv": [1.5, 1, 2, 1.5], "texture": "#0"}, + "down": {"uv": [1.5, 11, 2, 11.5], "texture": "#0"} + } + }, + { + "from": [3, -4, 6], + "to": [4, 17, 7], + "faces": { + "north": {"uv": [6, 1, 6.5, 11.5], "texture": "#0"}, + "east": {"uv": [9.5, 1, 10, 11.5], "texture": "#0"}, + "south": {"uv": [9.5, 1, 10, 11.5], "texture": "#0"}, + "west": {"uv": [6, 1, 6.5, 11.5], "texture": "#0"}, + "up": {"uv": [6, 1, 6.5, 1.5], "texture": "#0"}, + "down": {"uv": [6, 11, 6.5, 11.5], "texture": "#0"} + } + }, + { + "from": [13, -2, 7], + "to": [14, 17, 8], + "faces": { + "north": {"uv": [1, 1, 1.5, 10.5], "texture": "#0"}, + "east": {"uv": [1, 1, 1.5, 10.5], "texture": "#0"}, + "south": {"uv": [14.5, 1, 15, 10.5], "texture": "#0"}, + "west": {"uv": [14.5, 1, 15, 10.5], "texture": "#0"}, + "up": {"uv": [1, 1, 1.5, 1.5], "texture": "#0"}, + "down": {"uv": [1, 10, 1.5, 10.5], "texture": "#0"} + } + }, + { + "from": [2, -2, 7], + "to": [3, 17, 8], + "faces": { + "north": {"uv": [6.5, 1, 7, 10.5], "texture": "#0"}, + "east": {"uv": [9, 1, 9.5, 10.5], "texture": "#0"}, + "south": {"uv": [9, 1, 9.5, 10.5], "texture": "#0"}, + "west": {"uv": [6.5, 1, 7, 10.5], "texture": "#0"}, + "up": {"uv": [6.5, 1, 7, 1.5], "texture": "#0"}, + "down": {"uv": [6.5, 10, 7, 10.5], "texture": "#0"} + } + }, + { + "from": [14, 1, 7], + "to": [15, 16, 8], + "faces": { + "north": {"uv": [0.5, 1.5, 1, 9], "texture": "#0"}, + "east": {"uv": [0.5, 1.5, 1, 9], "texture": "#0"}, + "south": {"uv": [15, 1.5, 15.5, 9], "texture": "#0"}, + "west": {"uv": [15, 1.5, 15.5, 9], "texture": "#0"}, + "up": {"uv": [0.5, 1.5, 1, 2], "texture": "#0"}, + "down": {"uv": [0.5, 8.5, 1, 9], "texture": "#0"} + } + }, + { + "from": [1, 1, 7], + "to": [2, 16, 8], + "faces": { + "north": {"uv": [7, 1.5, 7.5, 9], "texture": "#0"}, + "east": {"uv": [8.5, 1.5, 9, 9], "texture": "#0"}, + "south": {"uv": [8.5, 1.5, 9, 9], "texture": "#0"}, + "west": {"uv": [7, 1.5, 7.5, 9], "texture": "#0"}, + "up": {"uv": [7, 1.5, 7.5, 2], "texture": "#0"}, + "down": {"uv": [7, 8.5, 7.5, 9], "texture": "#0"} + } + }, + { + "from": [15, 5, 7], + "to": [16, 9, 8], + "faces": { + "north": {"uv": [0, 5, 0.5, 7], "texture": "#0"}, + "east": {"uv": [0, 5, 0.5, 7], "texture": "#0"}, + "south": {"uv": [15.5, 5, 16, 7], "texture": "#0"}, + "west": {"uv": [0, 5, 0.5, 7], "texture": "#0"}, + "up": {"uv": [0, 5, 0.5, 5.5], "texture": "#0"}, + "down": {"uv": [0, 6.5, 0.5, 7], "texture": "#0"} + } + }, + { + "from": [0, 5, 7], + "to": [1, 9, 8], + "faces": { + "north": {"uv": [7.5, 5, 8, 7], "texture": "#0"}, + "east": {"uv": [8, 5, 8.5, 7], "texture": "#0"}, + "south": {"uv": [8, 5, 8.5, 7], "texture": "#0"}, + "west": {"uv": [7.5, 5, 8, 7], "texture": "#0"}, + "up": {"uv": [7.5, 5, 8, 5.5], "texture": "#0"}, + "down": {"uv": [7.5, 6.5, 8, 7], "texture": "#0"} + } + }, + { + "from": [15, 13, 7], + "to": [16, 16, 8], + "faces": { + "north": {"uv": [0, 1.5, 0.5, 3], "texture": "#0"}, + "east": {"uv": [0, 1.5, 0.5, 3], "texture": "#0"}, + "south": {"uv": [15.5, 1.5, 16, 3], "texture": "#0"}, + "west": {"uv": [0, 1.5, 0.5, 3], "texture": "#0"}, + "up": {"uv": [0, 1.5, 0.5, 2], "texture": "#0"}, + "down": {"uv": [0, 2.5, 0.5, 3], "texture": "#0"} + } + }, + { + "from": [0, 13, 7], + "to": [1, 16, 8], + "faces": { + "north": {"uv": [7.5, 1.5, 8, 3], "texture": "#0"}, + "east": {"uv": [8, 1.5, 8.5, 3], "texture": "#0"}, + "south": {"uv": [8, 1.5, 8.5, 3], "texture": "#0"}, + "west": {"uv": [7.5, 1.5, 8, 3], "texture": "#0"}, + "up": {"uv": [7.5, 1.5, 8, 2], "texture": "#0"}, + "down": {"uv": [7.5, 2.5, 8, 3], "texture": "#0"} + } + }, + { + "from": [7, -1, 5], + "to": [9, 15, 6], + "faces": { + "north": {"uv": [3.5, 2, 4.5, 10], "texture": "#0"}, + "east": {"uv": [3.5, 2, 4, 9.5], "texture": "#0"}, + "south": {"uv": [11.5, 2, 12.5, 10], "texture": "#0"}, + "west": {"uv": [4, 2, 4.5, 9.5], "texture": "#0"}, + "up": {"uv": [3.5, 2, 4.5, 2.5], "rotation": 180, "texture": "#0"}, + "down": {"uv": [3.5, 9, 4.5, 9.5], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [6, 0, 4], + "to": [10, 5, 5], + "faces": { + "north": {"uv": [3, 7, 5, 9.5], "texture": "#0"}, + "east": {"uv": [3, 7, 3.5, 9.5], "texture": "#0"}, + "south": {"uv": [11, 7, 13, 9.5], "texture": "#0"}, + "west": {"uv": [4.5, 7, 5, 9.5], "texture": "#0"}, + "up": {"uv": [3, 7, 5, 7.5], "texture": "#0"}, + "down": {"uv": [3, 9, 5, 9.5], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [6, 9, 4], + "to": [10, 14, 5], + "faces": { + "north": {"uv": [3, 2.5, 5, 5], "texture": "#0"}, + "east": {"uv": [3, 2.5, 3.5, 5], "texture": "#0"}, + "south": {"uv": [3, 2.5, 5, 5], "texture": "#0"}, + "west": {"uv": [4.5, 2.5, 5, 5], "texture": "#0"}, + "up": {"uv": [3, 2.5, 5, 3], "rotation": 180, "texture": "#0"}, + "down": {"uv": [3, 4.5, 5, 5], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [1, 5, 6], + "to": [3, 9, 7], + "faces": { + "north": {"uv": [6.5, 5, 7.5, 7], "texture": "#0"}, + "east": {"uv": [6.5, 5, 7, 7], "texture": "#0"}, + "south": {"uv": [6.5, 5, 7.5, 7], "texture": "#0"}, + "west": {"uv": [7, 5, 7.5, 7], "texture": "#0"}, + "up": {"uv": [6.5, 5, 7.5, 5.5], "rotation": 180, "texture": "#0"}, + "down": {"uv": [6.5, 6.5, 7.5, 7], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [13, 5, 6], + "to": [15, 9, 7], + "faces": { + "north": {"uv": [0.5, 5, 1.5, 7], "texture": "#0"}, + "east": {"uv": [0.5, 5, 1, 7], "texture": "#0"}, + "south": {"uv": [0.5, 5, 1.5, 7], "texture": "#0"}, + "west": {"uv": [1, 5, 1.5, 7], "texture": "#0"}, + "up": {"uv": [0.5, 5, 1.5, 5.5], "rotation": 180, "texture": "#0"}, + "down": {"uv": [0.5, 6.5, 1.5, 7], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [3, 5, 5], + "to": [5, 9, 6], + "faces": { + "north": {"uv": [5.5, 5, 6.5, 7], "texture": "#0"}, + "east": {"uv": [5.5, 5, 6, 7], "texture": "#0"}, + "south": {"uv": [5.5, 5, 6.5, 7], "texture": "#0"}, + "west": {"uv": [6, 5, 6.5, 7], "texture": "#0"}, + "up": {"uv": [5.5, 5, 6.5, 5.5], "rotation": 180, "texture": "#0"}, + "down": {"uv": [5.5, 6.5, 6.5, 7], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [11, 5, 5], + "to": [13, 9, 6], + "faces": { + "north": {"uv": [2, 5, 3, 7], "texture": "#0"}, + "east": {"uv": [2, 5, 2.5, 7], "texture": "#0"}, + "south": {"uv": [2, 5, 3, 7], "texture": "#0"}, + "west": {"uv": [2.5, 5, 3, 7], "texture": "#0"}, + "up": {"uv": [2, 5, 3, 5.5], "rotation": 180, "texture": "#0"}, + "down": {"uv": [2, 6.5, 3, 7], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [5, 5, 4], + "to": [11, 9, 5], + "faces": { + "north": {"uv": [2.5, 5, 5.5, 7], "texture": "#0"}, + "east": {"uv": [2.5, 5, 3, 7], "texture": "#0"}, + "south": {"uv": [2.5, 5, 5.5, 7], "texture": "#0"}, + "west": {"uv": [5, 5, 5.5, 7], "texture": "#0"}, + "up": {"uv": [2.5, 5, 5.5, 5.5], "rotation": 180, "texture": "#0"}, + "down": {"uv": [2.5, 6.5, 5.5, 7], "rotation": 180, "texture": "#0"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [0, -90, 0], + "translation": [2.3, -2, 5] + }, + "thirdperson_lefthand": { + "rotation": [0, -90, 0], + "translation": [2.3, -2, 5] + }, + "firstperson_righthand": { + "rotation": [0, -75, 15], + "translation": [4, -4, 0] + }, + "firstperson_lefthand": { + "rotation": [0, -75, 15], + "translation": [4, -4, 0] + }, + "ground": { + "translation": [0, 3, 0], + "scale": [0.5, 0.5, 0.5] + }, + "gui": { + "rotation": [30, 145, 0], + "translation": [0.5, 1.25, 0], + "scale": [0.5, 0.5, 0.5] + }, + "head": { + "translation": [0, 1.25, -6.56], + "scale": [1.5, 1.5, 1.5] + }, + "fixed": { + "translation": [0, 1.2, 0], + "scale": [0.66, 0.66, 0.66] + } + }, + "overrides": [{ + "predicate": { "blocking": 1 }, + "model": "tfc:item/metal/shield/red_steel_blocking" + } + ], + "groups": [ + { + "name": "handle", + "origin": [8, 8, 8], + "children": [0, 1, 2, 3, 4, 5, 6, 7] + }, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29] +} \ No newline at end of file diff --git a/kubejs/assets/tfc/models/item/metal/shield/red_steel_blocking.json b/kubejs/assets/tfc/models/item/metal/shield/red_steel_blocking.json new file mode 100644 index 0000000000..564216b967 --- /dev/null +++ b/kubejs/assets/tfc/models/item/metal/shield/red_steel_blocking.json @@ -0,0 +1,49 @@ +{ + "credit": "Made with Blockbench", + "parent":"tfc:item/metal/shield/red_steel", + "textures": { + "0": "tfc:item/metal/shield/red_steel", + "particle": "tfc:item/metal/shield/red_steel" + }, + "display": { + "thirdperson_righthand": { + "rotation": [0, -90, 0], + "translation": [2.3, -2, 5] + }, + "thirdperson_lefthand": { + "rotation": [0, -90, 0], + "translation": [2.3, -2, 5] + }, + "firstperson_righthand": { + "rotation": [5, -30, 5], + "translation": [-1.5, 0.5, 2.5] + }, + "firstperson_lefthand": { + "rotation": [5, -30, 5], + "translation": [-1.5, 0.5, 2.5] + }, + "ground": { + "translation": [0, 1, 0], + "scale": [0.3, 0.3, 0.3] + }, + "gui": { + "rotation": [30, 145, 0], + "translation": [0.5, 1.25, 0], + "scale": [0.5, 0.5, 0.5] + }, + "head": { + "translation": [0, 1.25, -6.56], + "scale": [1.5, 1.5, 1.5] + }, + "fixed": { + "translation": [0, 4.25, 0.12], + "scale": [2.02, 2.02, 2.02] + } + }, + "groups": [ + { + "name": "handle", + "origin": [8, 8, 8], + "children": [0, 1, 2, 3, 4, 5, 6, 7] + }, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29] +} \ No newline at end of file diff --git a/kubejs/assets/tfc/models/item/metal/shield/steel.json b/kubejs/assets/tfc/models/item/metal/shield/steel.json new file mode 100644 index 0000000000..dbf4e18e2b --- /dev/null +++ b/kubejs/assets/tfc/models/item/metal/shield/steel.json @@ -0,0 +1,471 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "tfc:item/metal/shield/steel", + "particle": "tfc:item/metal/shield/steel" + }, + "elements": [ + { + "name": "handle", + "from": [9, 6, 12], + "to": [10, 10, 13], + "faces": { + "north": {"uv": [7, 14, 9, 14.5], "rotation": 90, "texture": "#0"}, + "east": {"uv": [7, 14, 9, 14.5], "rotation": 90, "texture": "#0"}, + "south": {"uv": [7, 14, 9, 14.5], "rotation": 90, "texture": "#0"}, + "west": {"uv": [7, 14, 9, 14.5], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "handle", + "from": [5, 6, 12], + "to": [6, 10, 13], + "faces": { + "north": {"uv": [7, 14, 9, 14.5], "rotation": 90, "texture": "#0"}, + "east": {"uv": [7, 14, 9, 14.5], "rotation": 90, "texture": "#0"}, + "south": {"uv": [7, 14, 9, 14.5], "rotation": 90, "texture": "#0"}, + "west": {"uv": [7, 14, 9, 14.5], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "handle", + "from": [9, 5, 7], + "to": [10, 6, 13], + "faces": { + "north": {"uv": [6.5, 14, 7, 14.5], "texture": "#0"}, + "east": {"uv": [6.5, 14, 9.5, 14.5], "texture": "#0"}, + "south": {"uv": [6.5, 14, 7, 14.5], "texture": "#0"}, + "west": {"uv": [6.5, 14, 9.5, 14.5], "rotation": 180, "texture": "#0"}, + "up": {"uv": [6.5, 14, 9.5, 14.5], "rotation": 270, "texture": "#0"}, + "down": {"uv": [6.5, 14, 9.5, 14.5], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "handle", + "from": [5, 5, 7], + "to": [6, 6, 13], + "faces": { + "north": {"uv": [6.5, 14, 7, 14.5], "texture": "#0"}, + "east": {"uv": [6.5, 14, 9.5, 14.5], "texture": "#0"}, + "south": {"uv": [6.5, 14, 7, 14.5], "texture": "#0"}, + "west": {"uv": [6.5, 14, 9.5, 14.5], "rotation": 180, "texture": "#0"}, + "up": {"uv": [6.5, 14, 9.5, 14.5], "rotation": 270, "texture": "#0"}, + "down": {"uv": [6.5, 14, 9.5, 14.5], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "handle", + "from": [9, 10, 7], + "to": [10, 11, 13], + "faces": { + "north": {"uv": [6.5, 14, 7, 14.5], "texture": "#0"}, + "east": {"uv": [6.5, 14, 9.5, 14.5], "texture": "#0"}, + "south": {"uv": [6.5, 14, 7, 14.5], "texture": "#0"}, + "west": {"uv": [6.5, 14, 9.5, 14.5], "rotation": 180, "texture": "#0"}, + "up": {"uv": [6.5, 14, 9.5, 14.5], "rotation": 270, "texture": "#0"}, + "down": {"uv": [6.5, 14, 9.5, 14.5], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "handle", + "from": [5, 10, 7], + "to": [6, 11, 13], + "faces": { + "north": {"uv": [6.5, 14, 7, 14.5], "texture": "#0"}, + "east": {"uv": [6.5, 14, 9.5, 14.5], "texture": "#0"}, + "south": {"uv": [6.5, 14, 7, 14.5], "texture": "#0"}, + "west": {"uv": [6.5, 14, 9.5, 14.5], "rotation": 180, "texture": "#0"}, + "up": {"uv": [6.5, 14, 9.5, 14.5], "rotation": 270, "texture": "#0"}, + "down": {"uv": [6.5, 14, 9.5, 14.5], "rotation": 90, "texture": "#0"} + } + }, + { + "from": [7, -1, 6], + "to": [9, 14, 7], + "faces": { + "north": {"uv": [3.5, 1, 4.5, 8.5], "texture": "#0"}, + "east": {"uv": [3.5, 1, 4, 8.5], "texture": "#0"}, + "south": {"uv": [11.5, 1, 12.5, 8.5], "texture": "#0"}, + "west": {"uv": [4, 1, 4.5, 8.5], "texture": "#0"}, + "up": {"uv": [3.5, 1, 4.5, 1.5], "rotation": 180, "texture": "#0"}, + "down": {"uv": [3.5, 7.5, 4.5, 8], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [9, 0, 6], + "to": [10, 13, 7], + "faces": { + "north": {"uv": [3, 1.5, 3.5, 8], "texture": "#0"}, + "east": {"uv": [3, 1.5, 3.5, 8], "texture": "#0"}, + "south": {"uv": [12.5, 1.5, 13, 8], "texture": "#0"}, + "west": {"uv": [3, 1.5, 3.5, 8], "texture": "#0"}, + "up": {"uv": [3, 1.5, 3.5, 2], "rotation": 180, "texture": "#0"}, + "down": {"uv": [3, 7.5, 3.5, 8], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [10, 1, 6], + "to": [11, 13, 7], + "faces": { + "north": {"uv": [2.5, 1.5, 3, 7.5], "texture": "#0"}, + "east": {"uv": [2.5, 1.5, 3, 7.5], "texture": "#0"}, + "south": {"uv": [13, 1.5, 13.5, 7.5], "texture": "#0"}, + "west": {"uv": [2.5, 1.5, 3, 7.5], "texture": "#0"}, + "up": {"uv": [2.5, 1.5, 3, 2], "texture": "#0"}, + "down": {"uv": [2.5, 7, 3, 7.5], "texture": "#0"} + } + }, + { + "from": [11, 2, 6], + "to": [12, 13, 7], + "faces": { + "north": {"uv": [2, 1.5, 2.5, 7], "texture": "#0"}, + "east": {"uv": [2, 1.5, 2.5, 7], "texture": "#0"}, + "south": {"uv": [13.5, 1.5, 14, 7], "texture": "#0"}, + "west": {"uv": [2, 1.5, 2.5, 7], "texture": "#0"}, + "up": {"uv": [2, 1.5, 2.5, 2], "texture": "#0"}, + "down": {"uv": [2, 6.5, 2.5, 7], "texture": "#0"} + } + }, + { + "from": [12, 4, 6], + "to": [13, 14, 7], + "faces": { + "north": {"uv": [1.5, 1, 2, 6], "texture": "#0"}, + "east": {"uv": [1.5, 1, 2, 6], "texture": "#0"}, + "south": {"uv": [14, 1, 14.5, 6], "texture": "#0"}, + "west": {"uv": [1.5, 1, 2, 6], "texture": "#0"}, + "up": {"uv": [1.5, 1, 2, 1.5], "texture": "#0"}, + "down": {"uv": [1.5, 5.5, 2, 6], "texture": "#0"} + } + }, + { + "from": [13, 7, 6], + "to": [14, 14, 7], + "faces": { + "north": {"uv": [1, 1, 1.5, 4.5], "texture": "#0"}, + "east": {"uv": [1, 1, 1.5, 4.5], "texture": "#0"}, + "south": {"uv": [14.5, 1, 15, 4.5], "texture": "#0"}, + "west": {"uv": [1, 1, 1.5, 4.5], "texture": "#0"}, + "up": {"uv": [1, 1, 1.5, 1.5], "texture": "#0"}, + "down": {"uv": [1, 4, 1.5, 4.5], "texture": "#0"} + } + }, + { + "from": [13, 7, 7], + "to": [15, 15, 8], + "faces": { + "north": {"uv": [0.5, 0.5, 1.5, 4.5], "texture": "#0"}, + "east": {"uv": [0.5, 0.5, 1, 4.5], "texture": "#0"}, + "south": {"uv": [14.5, 0.5, 15.5, 4.5], "texture": "#0"}, + "west": {"uv": [14.5, 0.5, 15, 4.5], "texture": "#0"}, + "up": {"uv": [0.5, 0.5, 1.5, 1], "rotation": 180, "texture": "#0"}, + "down": {"uv": [0.5, 4, 1.5, 4.5], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [1, 7, 7], + "to": [3, 15, 8], + "faces": { + "north": {"uv": [6.5, 0.5, 7.5, 4.5], "texture": "#0"}, + "east": {"uv": [9, 0.5, 9.5, 4.5], "texture": "#0"}, + "south": {"uv": [8.5, 0.5, 9.5, 4.5], "texture": "#0"}, + "west": {"uv": [7, 0.5, 7.5, 4.5], "texture": "#0"}, + "up": {"uv": [6.5, 0.5, 7.5, 1], "rotation": 180, "texture": "#0"}, + "down": {"uv": [6.5, 4, 7.5, 4.5], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [2, 7, 6], + "to": [3, 14, 7], + "faces": { + "north": {"uv": [6.5, 1, 7, 4.5], "texture": "#0"}, + "east": {"uv": [6.5, 1, 7, 4.5], "texture": "#0"}, + "south": {"uv": [9, 1, 9.5, 4.5], "texture": "#0"}, + "west": {"uv": [6.5, 1, 7, 4.5], "texture": "#0"}, + "up": {"uv": [6.5, 1, 7, 1.5], "texture": "#0"}, + "down": {"uv": [6.5, 4, 7, 4.5], "texture": "#0"} + } + }, + { + "from": [3, 4, 6], + "to": [4, 14, 7], + "faces": { + "north": {"uv": [6, 1, 6.5, 6], "texture": "#0"}, + "east": {"uv": [6, 1, 6.5, 6], "texture": "#0"}, + "south": {"uv": [9.5, 1, 10, 6], "texture": "#0"}, + "west": {"uv": [6, 1, 6.5, 6], "texture": "#0"}, + "up": {"uv": [6, 1, 6.5, 1.5], "texture": "#0"}, + "down": {"uv": [6, 5.5, 6.5, 6], "texture": "#0"} + } + }, + { + "from": [4, 2, 6], + "to": [5, 13, 7], + "faces": { + "north": {"uv": [5.5, 1.5, 6, 7], "texture": "#0"}, + "east": {"uv": [5.5, 1.5, 6, 7], "texture": "#0"}, + "south": {"uv": [10, 1.5, 10.5, 7], "texture": "#0"}, + "west": {"uv": [5.5, 1.5, 6, 7], "texture": "#0"}, + "up": {"uv": [5.5, 1.5, 6, 2], "texture": "#0"}, + "down": {"uv": [5.5, 6.5, 6, 7], "texture": "#0"} + } + }, + { + "from": [5, 1, 6], + "to": [6, 13, 7], + "faces": { + "north": {"uv": [5, 1.5, 5.5, 7.5], "texture": "#0"}, + "east": {"uv": [5, 1.5, 5.5, 7.5], "texture": "#0"}, + "south": {"uv": [10.5, 1.5, 11, 7.5], "texture": "#0"}, + "west": {"uv": [5, 1.5, 5.5, 7.5], "texture": "#0"}, + "up": {"uv": [5, 1.5, 5.5, 2], "texture": "#0"}, + "down": {"uv": [5, 7, 5.5, 7.5], "texture": "#0"} + } + }, + { + "from": [6, 0, 6], + "to": [7, 13, 7], + "faces": { + "north": {"uv": [4.5, 1.5, 5, 8], "texture": "#0"}, + "east": {"uv": [4.5, 1.5, 5, 8], "texture": "#0"}, + "south": {"uv": [11, 1.5, 11.5, 8], "texture": "#0"}, + "west": {"uv": [4.5, 1.5, 5, 8], "texture": "#0"}, + "up": {"uv": [4.5, 1.5, 5, 2], "rotation": 180, "texture": "#0"}, + "down": {"uv": [4.5, 7.5, 5, 8], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [3, 6, 7], + "to": [13, 10, 8], + "faces": { + "north": {"uv": [9.5, 3, 14.5, 5], "texture": "#0"}, + "east": {"uv": [14, 3, 14.5, 5], "texture": "#0"}, + "south": {"uv": [9.5, 3, 14.5, 5], "texture": "#0"}, + "west": {"uv": [9.5, 3, 10, 5], "texture": "#0"}, + "up": {"uv": [9.5, 3, 14.5, 3.5], "texture": "#0"}, + "down": {"uv": [9.5, 4.5, 14.5, 5], "texture": "#0"} + } + }, + { + "from": [9, 12, 7], + "to": [12, 14, 8], + "faces": { + "north": {"uv": [2, 1, 3.5, 2], "texture": "#0"}, + "east": {"uv": [13.5, 1, 14, 2], "texture": "#0"}, + "south": {"uv": [12.5, 1, 14, 2], "texture": "#0"}, + "west": {"uv": [12.5, 1, 13, 2], "texture": "#0"}, + "up": {"uv": [2, 1, 3.5, 1.5], "texture": "#0"}, + "down": {"uv": [12.5, 1.5, 14, 2], "texture": "#0"} + } + }, + { + "from": [4, 12, 7], + "to": [7, 14, 8], + "faces": { + "north": {"uv": [4.5, 1, 6, 2], "texture": "#0"}, + "east": {"uv": [11, 1, 11.5, 2], "texture": "#0"}, + "south": {"uv": [10, 1, 11.5, 2], "texture": "#0"}, + "west": {"uv": [10, 1, 10.5, 2], "texture": "#0"}, + "up": {"uv": [4.5, 1, 6, 1.5], "texture": "#0"}, + "down": {"uv": [10, 1.5, 11.5, 2], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [7, 13, 7], + "to": [9, 15, 8], + "faces": { + "north": {"uv": [3.5, 0.5, 4.5, 1.5], "texture": "#0"}, + "east": {"uv": [3.5, 0.5, 4, 1.5], "texture": "#0"}, + "south": {"uv": [11.5, 0.5, 12.5, 1.5], "texture": "#0"}, + "west": {"uv": [4, 0.5, 4.5, 1.5], "texture": "#0"}, + "up": {"uv": [3.5, 0.5, 4.5, 1], "rotation": 180, "texture": "#0"}, + "down": {"uv": [11.5, 1, 12.5, 1.5], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [12, 13, 7], + "to": [13, 15, 8], + "faces": { + "north": {"uv": [1.5, 0.5, 2, 1.5], "texture": "#0"}, + "east": {"uv": [1.5, 0.5, 2, 1.5], "texture": "#0"}, + "south": {"uv": [14, 0.5, 14.5, 1.5], "texture": "#0"}, + "west": {"uv": [1.5, 0.5, 2, 1.5], "texture": "#0"}, + "up": {"uv": [1.5, 0.5, 2, 1], "texture": "#0"}, + "down": {"uv": [14, 1, 14.5, 1.5], "texture": "#0"} + } + }, + { + "from": [3, 13, 7], + "to": [4, 15, 8], + "faces": { + "north": {"uv": [6, 0.5, 6.5, 1.5], "texture": "#0"}, + "east": {"uv": [6, 0.5, 6.5, 1.5], "texture": "#0"}, + "south": {"uv": [9.5, 0.5, 10, 1.5], "texture": "#0"}, + "west": {"uv": [6, 0.5, 6.5, 1.5], "texture": "#0"}, + "up": {"uv": [6, 0.5, 6.5, 1], "texture": "#0"}, + "down": {"uv": [9.5, 1, 10, 1.5], "texture": "#0"} + } + }, + { + "from": [12, 4, 7], + "to": [14, 7, 8], + "faces": { + "north": {"uv": [1, 4.5, 2, 6], "texture": "#0"}, + "east": {"uv": [1, 4.5, 1.5, 6], "texture": "#0"}, + "south": {"uv": [14, 4.5, 15, 6], "texture": "#0"}, + "west": {"uv": [14, 4.5, 14.5, 6], "texture": "#0"}, + "up": {"uv": [1, 4.5, 2, 5], "texture": "#0"}, + "down": {"uv": [1, 5.5, 2, 6], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [2, 4, 7], + "to": [4, 7, 8], + "faces": { + "north": {"uv": [6, 4.5, 7, 6], "texture": "#0"}, + "east": {"uv": [9.5, 4.5, 10, 6], "texture": "#0"}, + "south": {"uv": [9, 4.5, 10, 6], "texture": "#0"}, + "west": {"uv": [6.5, 4.5, 7, 6], "texture": "#0"}, + "up": {"uv": [1, 4.5, 2, 5], "texture": "#0"}, + "down": {"uv": [6, 5.5, 7, 6], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [3, 2, 7], + "to": [5, 4, 8], + "faces": { + "north": {"uv": [5.5, 6, 6.5, 7], "texture": "#0"}, + "east": {"uv": [10, 6, 10.5, 7], "texture": "#0"}, + "south": {"uv": [9.5, 6, 10.5, 7], "texture": "#0"}, + "west": {"uv": [6, 6, 6.5, 7], "texture": "#0"}, + "up": {"uv": [9.5, 6, 10.5, 6.5], "texture": "#0"}, + "down": {"uv": [5.5, 6.5, 6.5, 7], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [11, 2, 7], + "to": [13, 4, 8], + "faces": { + "north": {"uv": [1.5, 6, 2.5, 7], "texture": "#0"}, + "east": {"uv": [1.5, 6, 2, 7], "texture": "#0"}, + "south": {"uv": [13.5, 6, 14.5, 7], "texture": "#0"}, + "west": {"uv": [13.5, 6, 14, 7], "texture": "#0"}, + "up": {"uv": [13.5, 6, 14.5, 6.5], "texture": "#0"}, + "down": {"uv": [1.5, 6.5, 2.5, 7], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [10, 1, 7], + "to": [12, 2, 8], + "faces": { + "north": {"uv": [2, 7, 3, 7.5], "texture": "#0"}, + "east": {"uv": [2, 7, 2.5, 7.5], "texture": "#0"}, + "south": {"uv": [13, 7, 14, 7.5], "texture": "#0"}, + "west": {"uv": [13, 7, 13.5, 7.5], "texture": "#0"}, + "up": {"uv": [13, 7, 14, 7.5], "texture": "#0"}, + "down": {"uv": [2, 7, 3, 7.5], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [9, 0, 7], + "to": [11, 1, 8], + "faces": { + "north": {"uv": [2.5, 7.5, 3.5, 8], "texture": "#0"}, + "east": {"uv": [2.5, 7.5, 3, 8], "texture": "#0"}, + "south": {"uv": [12.5, 7.5, 13.5, 8], "texture": "#0"}, + "west": {"uv": [12.5, 7.5, 13, 8], "texture": "#0"}, + "up": {"uv": [12.5, 7.5, 13.5, 8], "texture": "#0"}, + "down": {"uv": [2.5, 7.5, 3.5, 8], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [4, 1, 7], + "to": [6, 2, 8], + "faces": { + "north": {"uv": [5, 7, 6, 7.5], "texture": "#0"}, + "east": {"uv": [10.5, 7, 11, 7.5], "texture": "#0"}, + "south": {"uv": [10, 7, 11, 7.5], "texture": "#0"}, + "west": {"uv": [2, 7, 2.5, 7.5], "texture": "#0"}, + "up": {"uv": [10, 7, 11, 7.5], "texture": "#0"}, + "down": {"uv": [5, 7, 6, 7.5], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [5, 0, 7], + "to": [7, 1, 8], + "faces": { + "north": {"uv": [4.5, 7.5, 5.5, 8], "texture": "#0"}, + "east": {"uv": [11, 7.5, 11.5, 8], "texture": "#0"}, + "south": {"uv": [10.5, 7.5, 11.5, 8], "texture": "#0"}, + "west": {"uv": [2.5, 7.5, 3, 8], "texture": "#0"}, + "up": {"uv": [10.5, 7.5, 11.5, 8], "texture": "#0"}, + "down": {"uv": [4.5, 7.5, 5.5, 8], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [6, -1, 7], + "to": [10, 0, 8], + "faces": { + "north": {"uv": [3, 8, 5, 8.5], "texture": "#0"}, + "east": {"uv": [3, 8, 3.5, 8.5], "texture": "#0"}, + "south": {"uv": [11, 8, 13, 8.5], "texture": "#0"}, + "west": {"uv": [4.5, 8, 5, 8.5], "texture": "#0"}, + "up": {"uv": [11, 8, 13, 8.5], "texture": "#0"}, + "down": {"uv": [3, 8, 5, 8.5], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [7, -2, 7], + "to": [9, -1, 8], + "faces": { + "north": {"uv": [3.5, 8.5, 4.5, 9], "texture": "#0"}, + "east": {"uv": [3.5, 8.5, 4, 9], "texture": "#0"}, + "south": {"uv": [11.5, 8.5, 12.5, 9], "texture": "#0"}, + "west": {"uv": [4, 8.5, 4.5, 9], "texture": "#0"}, + "up": {"uv": [3.5, 8.5, 4.5, 9], "texture": "#0"}, + "down": {"uv": [3.5, 8.5, 4.5, 9], "rotation": 180, "texture": "#0"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [0, -90, 0], + "translation": [2.3, -2, 5] + }, + "thirdperson_lefthand": { + "rotation": [0, -90, 0], + "translation": [2.3, -2, 5] + }, + "firstperson_righthand": { + "rotation": [0, -75, 15], + "translation": [4, -4, 0] + }, + "firstperson_lefthand": { + "rotation": [0, -75, 15], + "translation": [4, -4, 0] + }, + "ground": { + "translation": [0, 3, 0], + "scale": [0.5, 0.5, 0.5] + }, + "gui": { + "rotation": [30, 145, 0], + "translation": [0.25, 0.75, 0], + "scale": [0.65, 0.65, 0.65] + }, + "head": { + "translation": [0, 0.75, -7.25], + "scale": [1.5, 1.5, 1.5] + }, + "fixed": { + "translation": [0, 0.5, 0], + "scale": [0.75, 0.75, 0.75] + } + }, + "overrides": [{ + "predicate": { "blocking": 1 }, + "model": "tfc:item/metal/shield/steel_blocking" + } + ] +} \ No newline at end of file diff --git a/kubejs/assets/tfc/models/item/metal/shield/steel_blocking.json b/kubejs/assets/tfc/models/item/metal/shield/steel_blocking.json new file mode 100644 index 0000000000..858d008aec --- /dev/null +++ b/kubejs/assets/tfc/models/item/metal/shield/steel_blocking.json @@ -0,0 +1,39 @@ +{ + "credit": "Made with Blockbench", + "parent":"tfc:item/metal/shield/steel", + "display": { + "thirdperson_righthand": { + "rotation": [0, -90, 0], + "translation": [2.3, -2, 5] + }, + "thirdperson_lefthand": { + "rotation": [0, -90, 0], + "translation": [2.3, -2, 5] + }, + "firstperson_righthand": { + "rotation": [5, -30, 5], + "translation": [-1.5, 0.5, 2.5] + }, + "firstperson_lefthand": { + "rotation": [5, -30, 5], + "translation": [-1.5, 0.5, 2.5] + }, + "ground": { + "translation": [0, 3, 0], + "scale": [0.5, 0.5, 0.5] + }, + "gui": { + "rotation": [30, 145, 0], + "translation": [0.25, 0.75, 0], + "scale": [0.65, 0.65, 0.65] + }, + "head": { + "translation": [0, 0.75, -7.25], + "scale": [1.5, 1.5, 1.5] + }, + "fixed": { + "translation": [0, 0, -0.38], + "scale": [2.02, 2.02, 2.02] + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfc/models/item/metal/shield/wrought_iron.json b/kubejs/assets/tfc/models/item/metal/shield/wrought_iron.json new file mode 100644 index 0000000000..5bc490a070 --- /dev/null +++ b/kubejs/assets/tfc/models/item/metal/shield/wrought_iron.json @@ -0,0 +1,324 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "texture": "tfc:item/metal/shield/wrought_iron" + }, + "elements": [ + { + "from": [5, 10, 7], + "to": [6, 11, 13], + "faces": { + "north": {"uv": [6.5, 14, 7, 14.5], "texture": "#texture"}, + "east": {"uv": [6.5, 14, 9.5, 14.5], "texture": "#texture"}, + "south": {"uv": [6.5, 14, 7, 14.5], "texture": "#texture"}, + "west": {"uv": [6.5, 14, 9.5, 14.5], "rotation": 180, "texture": "#texture"}, + "up": {"uv": [6.5, 14, 9.5, 14.5], "rotation": 270, "texture": "#texture"}, + "down": {"uv": [6.5, 14, 9.5, 14.5], "rotation": 90, "texture": "#texture"} + } + }, + { + "from": [9, 10, 7], + "to": [10, 11, 13], + "faces": { + "north": {"uv": [6.5, 14, 7, 14.5], "texture": "#texture"}, + "east": {"uv": [6.5, 14, 9.5, 14.5], "texture": "#texture"}, + "south": {"uv": [6.5, 14, 7, 14.5], "texture": "#texture"}, + "west": {"uv": [6.5, 14, 9.5, 14.5], "rotation": 180, "texture": "#texture"}, + "up": {"uv": [6.5, 14, 9.5, 14.5], "rotation": 270, "texture": "#texture"}, + "down": {"uv": [6.5, 14, 9.5, 14.5], "rotation": 90, "texture": "#texture"} + } + }, + { + "from": [5, 5, 7], + "to": [6, 6, 13], + "faces": { + "north": {"uv": [6.5, 14, 7, 14.5], "texture": "#texture"}, + "east": {"uv": [6.5, 14, 9.5, 14.5], "texture": "#texture"}, + "south": {"uv": [6.5, 14, 7, 14.5], "texture": "#texture"}, + "west": {"uv": [6.5, 14, 9.5, 14.5], "rotation": 180, "texture": "#texture"}, + "up": {"uv": [6.5, 14, 9.5, 14.5], "rotation": 270, "texture": "#texture"}, + "down": {"uv": [6.5, 14, 9.5, 14.5], "rotation": 90, "texture": "#texture"} + } + }, + { + "from": [9, 5, 7], + "to": [10, 6, 13], + "faces": { + "north": {"uv": [6.5, 14, 7, 14.5], "texture": "#texture"}, + "east": {"uv": [6.5, 14, 9.5, 14.5], "texture": "#texture"}, + "south": {"uv": [6.5, 14, 7, 14.5], "texture": "#texture"}, + "west": {"uv": [6.5, 14, 9.5, 14.5], "rotation": 180, "texture": "#texture"}, + "up": {"uv": [6.5, 14, 9.5, 14.5], "rotation": 270, "texture": "#texture"}, + "down": {"uv": [6.5, 14, 9.5, 14.5], "rotation": 90, "texture": "#texture"} + } + }, + { + "from": [5, 6, 12], + "to": [6, 10, 13], + "faces": { + "north": {"uv": [7, 14, 9, 14.5], "rotation": 90, "texture": "#texture"}, + "east": {"uv": [7, 14, 9, 14.5], "rotation": 90, "texture": "#texture"}, + "south": {"uv": [7, 14, 9, 14.5], "rotation": 90, "texture": "#texture"}, + "west": {"uv": [7, 14, 9, 14.5], "rotation": 90, "texture": "#texture"} + } + }, + { + "from": [9, 6, 12], + "to": [10, 10, 13], + "faces": { + "north": {"uv": [7, 14, 9, 14.5], "rotation": 90, "texture": "#texture"}, + "east": {"uv": [7, 14, 9, 14.5], "rotation": 90, "texture": "#texture"}, + "south": {"uv": [7, 14, 9, 14.5], "rotation": 90, "texture": "#texture"}, + "west": {"uv": [7, 14, 9, 14.5], "rotation": 90, "texture": "#texture"} + } + }, + { + "name": "board", + "from": [3, 6, 7], + "to": [13, 10, 8], + "faces": { + "north": {"uv": [1, 14, 6, 16], "texture": "#texture"}, + "east": {"uv": [12, 0.5, 12.5, 1], "texture": "#texture"}, + "south": {"uv": [1, 14, 6, 16], "texture": "#texture"}, + "west": {"uv": [12.5, 0.5, 13, 1], "texture": "#texture"}, + "up": {"uv": [6, 14.5, 1, 14], "rotation": 180, "texture": "#texture"}, + "down": {"uv": [6, 16, 1, 15.5], "texture": "#texture"} + } + }, + { + "name": "center", + "from": [7, -6, 6], + "to": [9, 17, 7], + "faces": { + "north": {"uv": [3.5, 0.5, 4.5, 12], "texture": "#texture"}, + "east": {"uv": [3.5, 0.5, 4, 12], "texture": "#texture"}, + "south": {"uv": [11.5, 0.5, 12.5, 12], "texture": "#texture"}, + "west": {"uv": [4, 0.5, 4.5, 12], "texture": "#texture"}, + "up": {"uv": [3.5, 0.5, 4.5, 1], "rotation": 180, "texture": "#texture"}, + "down": {"uv": [11.5, 11.5, 12.5, 12], "texture": "#texture"} + } + }, + { + "name": "center", + "from": [5, -3, 6], + "to": [7, 17, 7], + "faces": { + "north": {"uv": [4.5, 0.5, 5.5, 10.5], "texture": "#texture"}, + "south": {"uv": [10.5, 0.5, 11.5, 10.5], "texture": "#texture"}, + "west": {"uv": [5, 0.5, 5.5, 10.5], "texture": "#texture"}, + "up": {"uv": [4.5, 0.5, 5.5, 1], "texture": "#texture"}, + "down": {"uv": [10.5, 10, 11.5, 10.5], "texture": "#texture"} + } + }, + { + "name": "center", + "from": [6, -5, 6], + "to": [7, -3, 7], + "faces": { + "north": {"uv": [4.5, 10.5, 5, 11.5], "texture": "#texture"}, + "east": {"uv": [0, 0, 1, 2], "texture": "#texture"}, + "south": {"uv": [11, 10.5, 11.5, 11.5], "texture": "#texture"}, + "west": {"uv": [4.5, 10.5, 5, 11.5], "texture": "#texture"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#texture"}, + "down": {"uv": [11, 11, 11.5, 11.5], "texture": "#texture"} + } + }, + { + "name": "center", + "from": [9, -5, 6], + "to": [10, -3, 7], + "faces": { + "north": {"uv": [3, 10.5, 3.5, 11.5], "texture": "#texture"}, + "east": {"uv": [3, 10.5, 3.5, 11.5], "texture": "#texture"}, + "south": {"uv": [12.5, 10.5, 13, 11.5], "texture": "#texture"}, + "west": {"uv": [0, 0, 1, 2], "texture": "#texture"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#texture"}, + "down": {"uv": [12.5, 11, 13, 11.5], "texture": "#texture"} + } + }, + { + "name": "center", + "from": [9, -3, 6], + "to": [11, 17, 7], + "faces": { + "north": {"uv": [2.5, 0.5, 3.5, 10.5], "texture": "#texture"}, + "east": {"uv": [2.5, 0.5, 3, 10.5], "texture": "#texture"}, + "south": {"uv": [12.5, 0.5, 13.5, 10.5], "texture": "#texture"}, + "up": {"uv": [2.5, 0.5, 3.5, 1], "texture": "#texture"}, + "down": {"uv": [12.5, 10, 13.5, 10.5], "texture": "#texture"} + } + }, + { + "name": "outside", + "from": [11, 0, 6], + "to": [12, 3, 7], + "faces": { + "north": {"uv": [2.5, 9, 3, 10.5], "texture": "#texture"}, + "east": {"uv": [2.5, 9, 3, 10.5], "texture": "#texture"}, + "south": {"uv": [13.5, 7.5, 14, 9], "texture": "#texture"}, + "west": {"uv": [13.5, 7.5, 14, 9], "texture": "#texture"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#texture"}, + "down": {"uv": [2.5, 10, 3, 10.5], "texture": "#texture"} + } + }, + { + "name": "outside", + "from": [4, 0, 6], + "to": [5, 3, 7], + "faces": { + "north": {"uv": [5, 9, 5.5, 10.5], "texture": "#texture"}, + "east": {"uv": [10, 7.5, 10.5, 9], "texture": "#texture"}, + "south": {"uv": [10.5, 9, 11, 10.5], "texture": "#texture"}, + "west": {"uv": [5.5, 7.5, 6, 9], "texture": "#texture"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#texture"}, + "down": {"uv": [5.5, 8.5, 6, 9], "texture": "#texture"} + } + }, + { + "name": "outside", + "from": [3, 3, 6], + "to": [5, 16, 7], + "faces": { + "north": {"uv": [5.5, 1, 6.5, 7.5], "texture": "#texture"}, + "east": {"uv": [10, 1, 10.5, 7.5], "texture": "#texture"}, + "south": {"uv": [9.5, 1, 10.5, 7.5], "texture": "#texture"}, + "west": {"uv": [6, 1, 6.5, 7.5], "texture": "#texture"}, + "up": {"uv": [5.5, 1, 6.5, 1.5], "texture": "#texture"}, + "down": {"uv": [9.5, 7, 10.5, 7.5], "texture": "#texture"} + } + }, + { + "name": "outside", + "from": [2, 5, 7], + "to": [3, 15, 8], + "faces": { + "north": {"uv": [6.5, 1.5, 7, 6.5], "texture": "#texture"}, + "east": {"uv": [9, 1.5, 9.5, 6.5], "texture": "#texture"}, + "south": {"uv": [9, 1.5, 9.5, 6.5], "texture": "#texture"}, + "west": {"uv": [6.5, 1.5, 7, 6.5], "texture": "#texture"}, + "up": {"uv": [6.5, 1.5, 7, 2], "texture": "#texture"}, + "down": {"uv": [6.5, 6, 7, 6.5], "texture": "#texture"} + } + }, + { + "name": "outside", + "from": [1, 9, 7], + "to": [2, 14, 8], + "faces": { + "north": {"uv": [7, 2, 7.5, 4.5], "texture": "#texture"}, + "east": {"uv": [0, 0, 1, 5], "texture": "#texture"}, + "south": {"uv": [8.5, 2, 9, 4.5], "texture": "#texture"}, + "west": {"uv": [7, 2, 7.5, 4.5], "texture": "#texture"}, + "up": {"uv": [7, 2, 7.5, 2.5], "texture": "#texture"}, + "down": {"uv": [7, 4, 7.5, 4.5], "texture": "#texture"} + } + }, + { + "name": "outside", + "from": [11, 3, 6], + "to": [13, 16, 7], + "faces": { + "north": {"uv": [1.5, 1, 2.5, 7.5], "texture": "#texture"}, + "east": {"uv": [1.5, 1, 2, 7.5], "texture": "#texture"}, + "south": {"uv": [13.5, 1, 14.5, 7.5], "texture": "#texture"}, + "west": {"uv": [13.5, 1, 14, 7.5], "texture": "#texture"}, + "up": {"uv": [1.5, 1, 2.5, 1.5], "texture": "#texture"}, + "down": {"uv": [13, 8.5, 14, 9], "rotation": 180, "texture": "#texture"} + } + }, + { + "name": "outside", + "from": [13, 5, 7], + "to": [14, 15, 8], + "faces": { + "north": {"uv": [1, 1.5, 1.5, 6.5], "texture": "#texture"}, + "east": {"uv": [1, 1.5, 1.5, 6.5], "texture": "#texture"}, + "south": {"uv": [14.5, 1.5, 15, 6.5], "texture": "#texture"}, + "west": {"uv": [14.5, 1.5, 15, 6.5], "texture": "#texture"}, + "up": {"uv": [1, 1.5, 1.5, 2], "texture": "#texture"}, + "down": {"uv": [1, 6, 1.5, 6.5], "texture": "#texture"} + } + }, + { + "name": "outside", + "from": [14, 9, 7], + "to": [15, 14, 8], + "faces": { + "north": {"uv": [0.5, 2, 1, 4.5], "texture": "#texture"}, + "east": {"uv": [0.5, 2, 1, 4.5], "texture": "#texture"}, + "south": {"uv": [15, 2, 15.5, 4.5], "texture": "#texture"}, + "west": {"uv": [0, 0, 1, 4], "texture": "#texture"}, + "up": {"uv": [0.5, 2, 1, 2.5], "texture": "#texture"}, + "down": {"uv": [0.5, 4, 1, 4.5], "texture": "#texture"} + } + }, + { + "from": [2, 9, 6], + "to": [3, 14, 7], + "faces": { + "north": {"uv": [6.5, 2, 7, 4.5], "texture": "#texture"}, + "east": {"uv": [6.5, 2, 7, 4.5], "texture": "#texture"}, + "south": {"uv": [6.5, 2, 7, 4.5], "texture": "#texture"}, + "west": {"uv": [6.5, 2, 7, 4.5], "texture": "#texture"}, + "up": {"uv": [6.5, 2, 7, 2.5], "texture": "#texture"}, + "down": {"uv": [6.5, 4, 7, 4.5], "texture": "#texture"} + } + }, + { + "from": [13, 9, 6], + "to": [14, 14, 7], + "faces": { + "north": {"uv": [1, 2, 1.5, 4.5], "texture": "#texture"}, + "east": {"uv": [1, 2, 1.5, 4.5], "texture": "#texture"}, + "south": {"uv": [1, 2, 1.5, 4.5], "texture": "#texture"}, + "west": {"uv": [1, 2, 1.5, 4.5], "texture": "#texture"}, + "up": {"uv": [1, 2, 1.5, 2.5], "texture": "#texture"}, + "down": {"uv": [1, 4, 1.5, 4.5], "texture": "#texture"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [0, -90, 0], + "translation": [2.3, -2, 5] + }, + "thirdperson_lefthand": { + "rotation": [0, -90, 0], + "translation": [2.3, -2, 5] + }, + "firstperson_righthand": { + "rotation": [0, -75, 15], + "translation": [4, -4, 0] + }, + "firstperson_lefthand": { + "rotation": [0, -75, 15], + "translation": [4, -4, 0] + }, + "ground": { + "translation": [0, 3, 0], + "scale": [0.5, 0.5, 0.5] + }, + "gui": { + "rotation": [30, 145, 0], + "translation": [0.5, 1.5, 0], + "scale": [0.65, 0.65, 0.65] + }, + "head": { + "rotation": [90, 0, -180], + "translation": [0, 5.5, -1.31], + "scale": [1.5, 1.5, 1.5] + }, + "fixed": { + "translation": [0, 1.5, 0], + "scale": [0.66, 0.66, 0.66] + } + }, + "overrides": [ + { + "predicate": { + "blocking": 1 + }, + "model": "tfc:item/metal/shield/wrought_iron_blocking" + } + ] +} \ No newline at end of file diff --git a/kubejs/assets/tfc/models/item/metal/shield/wrought_iron_blocking.json b/kubejs/assets/tfc/models/item/metal/shield/wrought_iron_blocking.json new file mode 100644 index 0000000000..2bb5ac541d --- /dev/null +++ b/kubejs/assets/tfc/models/item/metal/shield/wrought_iron_blocking.json @@ -0,0 +1,43 @@ +{ + "credit": "Made with Blockbench", + "parent":"tfc:item/metal/shield/wrought_iron", + "textures": { + "texture": "tfc:item/metal/shield/wrought_iron" + }, + "display": { + "thirdperson_righthand": { + "rotation": [0, -90, 0], + "translation": [2.3, -2, 5] + }, + "thirdperson_lefthand": { + "rotation": [0, -90, 0], + "translation": [2.3, -2, 5] + }, + "firstperson_righthand": { + "rotation": [5, -30, 5], + "translation": [-1.5, 0.5, 2.5] + }, + "firstperson_lefthand": { + "rotation": [5, -30, 5], + "translation": [-1.5, 0.5, 2.5] + }, + "ground": { + "translation": [0, 3, 0], + "scale": [0.5, 0.5, 0.5] + }, + "gui": { + "rotation": [30, 145, 0], + "translation": [0.5, 1.5, 0], + "scale": [0.65, 0.65, 0.65] + }, + "head": { + "rotation": [90, 0, -180], + "translation": [0, 5.5, -1.31], + "scale": [1.5, 1.5, 1.5] + }, + "fixed": { + "translation": [0, 0, -0.38], + "scale": [2.02, 2.02, 2.02] + } + } +} \ No newline at end of file From 6c08b5cadfc020324ec833e08b9a414ae3c81dd5 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Tue, 23 Jun 2026 14:53:19 +0100 Subject: [PATCH 37/43] cl --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 907e40e508..118f99d72a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ - Accumulators (the multiblock battery for trains) and energy interfaces can now charge and discharge way faster, and hold more power @Pyritie - Added peanut oil recipes, with all the same uses as seed oil @Redeix @Pyritie - Containers can no longer be used with the Interplanetary Wireless Card, and transferring items is now 8x more expensive (blocks are the same energy cost as before). Set up railguns! @ashleney +- Added shaped crafting recipes for train tracks (#4335) @strangelyng ### Bug fixes - Fixed some floating chests in the new mineshafts, made mineshafts avoid spawning near rivers, and fixed one of the segments not blocking water correctly @Pyritie @BlueBoat29 - Fixed some beneath tower chests being empty @Pyritie @@ -15,6 +16,9 @@ - Fixed a bunch of log spam (#4330) @Pyritie - Fixed beneath towers not being aligned to the lava level properly @Pyritie - Fixed breaking parts of a hellforge returning anthracite instead of charcoal (#4345) @Pyritie +- Fixed held models of shields (#4344) @strangelyng +- Fixed more issues with two-tall crops (#4183) +- Fixed sniffers and wraptors not laying eggs (#4311) @jmecn ## [0.13.0] - 21-06-2026 - We've [written up a page](https://wiki.terrafirmagreg.team/modern/en_us/major-changelogs/0.13) with all of the major changes between 0.12 and 0.13. From 39109e5a1a4a15a5353a4f28d971d2ff7edb5c7c Mon Sep 17 00:00:00 2001 From: Pyritie Date: Tue, 23 Jun 2026 16:17:37 +0100 Subject: [PATCH 38/43] change (most) tfc material ore blocks to use the tfc texture --- .../block/material_sets/tfc_borax/ore.json | 29 +++++------------ .../material_sets/tfc_cassiterite/ore.json | 29 +++++------------ .../block/material_sets/tfc_copper/ore.json | 29 +++++------------ .../block/material_sets/tfc_diamond/ore.json | 29 +++++------------ .../block/material_sets/tfc_emerald/ore.json | 29 +++++------------ .../material_sets/tfc_garnierite/ore.json | 29 +++++------------ .../block/material_sets/tfc_gold/ore.json | 29 +++++------------ .../block/material_sets/tfc_graphite/ore.json | 29 +++++------------ .../block/material_sets/tfc_gypsum/ore.json | 29 +++++------------ .../block/material_sets/tfc_hematite/ore.json | 29 +++++------------ .../block/material_sets/tfc_lapis/ore.json | 29 +++++------------ .../block/material_sets/tfc_limonite/ore.json | 29 +++++------------ .../material_sets/tfc_magnetite/ore.json | 29 +++++------------ .../material_sets/tfc_malachite/ore.json | 29 +++++------------ .../block/material_sets/tfc_opal/ore.json | 29 +++++------------ .../block/material_sets/tfc_redstone/ore.json | 31 ++++++------------- .../block/material_sets/tfc_ruby/ore.json | 29 +++++------------ .../material_sets/tfc_saltpeter/ore.json | 29 +++++------------ .../block/material_sets/tfc_sapphire/ore.json | 29 +++++------------ .../block/material_sets/tfc_silver/ore.json | 29 +++++------------ .../material_sets/tfc_tetrahedrite/ore.json | 29 +++++------------ kubejs/startup_scripts/tfg/icon_sets.js | 4 +-- 22 files changed, 171 insertions(+), 444 deletions(-) diff --git a/kubejs/assets/gtceu/models/block/material_sets/tfc_borax/ore.json b/kubejs/assets/gtceu/models/block/material_sets/tfc_borax/ore.json index e0375600ca..71c2b44ea7 100644 --- a/kubejs/assets/gtceu/models/block/material_sets/tfc_borax/ore.json +++ b/kubejs/assets/gtceu/models/block/material_sets/tfc_borax/ore.json @@ -2,7 +2,7 @@ "parent": "block/block", "loader": "forge:composite", "textures": { - "particle": "gtceu:block/material_sets/tfc_borax/ore" + "particle": "tfc:block/ore/borax" }, "children": { "base_stone": { @@ -11,8 +11,7 @@ "ore_texture": { "parent": "block/block", "textures": { - "layer0": "gtceu:block/material_sets/tfc_borax/ore", - "layer1": "gtceu:block/material_sets/tfc_borax/ore_layer2", + "layer0": "tfc:block/ore/borax", "particle": "#layer0" }, "render_type": "translucent", @@ -21,24 +20,12 @@ "from": [0, 0, 0 ], "to": [16, 16, 16], "faces": { - "down": { "texture": "#layer0", "cullface": "down", "tintindex": 0 }, - "up": { "texture": "#layer0", "cullface": "up", "tintindex": 0 }, - "north": { "texture": "#layer0", "cullface": "north", "tintindex": 0 }, - "south": { "texture": "#layer0", "cullface": "south", "tintindex": 0 }, - "west": { "texture": "#layer0", "cullface": "west", "tintindex": 0 }, - "east": { "texture": "#layer0", "cullface": "east", "tintindex": 0 } - } - }, - { - "from": [0, 0, 0 ], - "to": [16, 16, 16], - "faces": { - "down": { "texture": "#layer1", "cullface": "down", "tintindex": 1 }, - "up": { "texture": "#layer1", "cullface": "up", "tintindex": 1 }, - "north": { "texture": "#layer1", "cullface": "north", "tintindex": 1 }, - "south": { "texture": "#layer1", "cullface": "south", "tintindex": 1 }, - "west": { "texture": "#layer1", "cullface": "west", "tintindex": 1 }, - "east": { "texture": "#layer1", "cullface": "east", "tintindex": 1 } + "down": { "texture": "#layer0", "cullface": "down" }, + "up": { "texture": "#layer0", "cullface": "up" }, + "north": { "texture": "#layer0", "cullface": "north" }, + "south": { "texture": "#layer0", "cullface": "south" }, + "west": { "texture": "#layer0", "cullface": "west" }, + "east": { "texture": "#layer0", "cullface": "east" } } } ] diff --git a/kubejs/assets/gtceu/models/block/material_sets/tfc_cassiterite/ore.json b/kubejs/assets/gtceu/models/block/material_sets/tfc_cassiterite/ore.json index 743b3477a1..5306038dac 100644 --- a/kubejs/assets/gtceu/models/block/material_sets/tfc_cassiterite/ore.json +++ b/kubejs/assets/gtceu/models/block/material_sets/tfc_cassiterite/ore.json @@ -2,7 +2,7 @@ "parent": "block/block", "loader": "forge:composite", "textures": { - "particle": "gtceu:block/material_sets/tfc_cassiterite/ore" + "particle": "tfc:block/ore/normal_cassiterite" }, "children": { "base_stone": { @@ -11,8 +11,7 @@ "ore_texture": { "parent": "block/block", "textures": { - "layer0": "gtceu:block/material_sets/tfc_cassiterite/ore", - "layer1": "gtceu:block/material_sets/tfc_cassiterite/ore_layer2", + "layer0": "tfc:block/ore/normal_cassiterite", "particle": "#layer0" }, "render_type": "translucent", @@ -21,24 +20,12 @@ "from": [0, 0, 0 ], "to": [16, 16, 16], "faces": { - "down": { "texture": "#layer0", "cullface": "down", "tintindex": 0 }, - "up": { "texture": "#layer0", "cullface": "up", "tintindex": 0 }, - "north": { "texture": "#layer0", "cullface": "north", "tintindex": 0 }, - "south": { "texture": "#layer0", "cullface": "south", "tintindex": 0 }, - "west": { "texture": "#layer0", "cullface": "west", "tintindex": 0 }, - "east": { "texture": "#layer0", "cullface": "east", "tintindex": 0 } - } - }, - { - "from": [0, 0, 0 ], - "to": [16, 16, 16], - "faces": { - "down": { "texture": "#layer1", "cullface": "down", "tintindex": 1 }, - "up": { "texture": "#layer1", "cullface": "up", "tintindex": 1 }, - "north": { "texture": "#layer1", "cullface": "north", "tintindex": 1 }, - "south": { "texture": "#layer1", "cullface": "south", "tintindex": 1 }, - "west": { "texture": "#layer1", "cullface": "west", "tintindex": 1 }, - "east": { "texture": "#layer1", "cullface": "east", "tintindex": 1 } + "down": { "texture": "#layer0", "cullface": "down" }, + "up": { "texture": "#layer0", "cullface": "up" }, + "north": { "texture": "#layer0", "cullface": "north" }, + "south": { "texture": "#layer0", "cullface": "south" }, + "west": { "texture": "#layer0", "cullface": "west" }, + "east": { "texture": "#layer0", "cullface": "east" } } } ] diff --git a/kubejs/assets/gtceu/models/block/material_sets/tfc_copper/ore.json b/kubejs/assets/gtceu/models/block/material_sets/tfc_copper/ore.json index 8149bf8159..60f461452d 100644 --- a/kubejs/assets/gtceu/models/block/material_sets/tfc_copper/ore.json +++ b/kubejs/assets/gtceu/models/block/material_sets/tfc_copper/ore.json @@ -2,7 +2,7 @@ "parent": "block/block", "loader": "forge:composite", "textures": { - "particle": "gtceu:block/material_sets/tfc_copper/ore" + "particle": "tfc:block/ore/normal_native_copper" }, "children": { "base_stone": { @@ -11,8 +11,7 @@ "ore_texture": { "parent": "block/block", "textures": { - "layer0": "gtceu:block/material_sets/tfc_copper/ore", - "layer1": "gtceu:block/material_sets/tfc_copper/ore_layer2", + "layer0": "tfc:block/ore/normal_native_copper", "particle": "#layer0" }, "render_type": "translucent", @@ -21,24 +20,12 @@ "from": [0, 0, 0 ], "to": [16, 16, 16], "faces": { - "down": { "texture": "#layer0", "cullface": "down", "tintindex": 0 }, - "up": { "texture": "#layer0", "cullface": "up", "tintindex": 0 }, - "north": { "texture": "#layer0", "cullface": "north", "tintindex": 0 }, - "south": { "texture": "#layer0", "cullface": "south", "tintindex": 0 }, - "west": { "texture": "#layer0", "cullface": "west", "tintindex": 0 }, - "east": { "texture": "#layer0", "cullface": "east", "tintindex": 0 } - } - }, - { - "from": [0, 0, 0 ], - "to": [16, 16, 16], - "faces": { - "down": { "texture": "#layer1", "cullface": "down", "tintindex": 1 }, - "up": { "texture": "#layer1", "cullface": "up", "tintindex": 1 }, - "north": { "texture": "#layer1", "cullface": "north", "tintindex": 1 }, - "south": { "texture": "#layer1", "cullface": "south", "tintindex": 1 }, - "west": { "texture": "#layer1", "cullface": "west", "tintindex": 1 }, - "east": { "texture": "#layer1", "cullface": "east", "tintindex": 1 } + "down": { "texture": "#layer0", "cullface": "down" }, + "up": { "texture": "#layer0", "cullface": "up" }, + "north": { "texture": "#layer0", "cullface": "north" }, + "south": { "texture": "#layer0", "cullface": "south" }, + "west": { "texture": "#layer0", "cullface": "west" }, + "east": { "texture": "#layer0", "cullface": "east" } } } ] diff --git a/kubejs/assets/gtceu/models/block/material_sets/tfc_diamond/ore.json b/kubejs/assets/gtceu/models/block/material_sets/tfc_diamond/ore.json index 6fb2a0f45d..e53dc99520 100644 --- a/kubejs/assets/gtceu/models/block/material_sets/tfc_diamond/ore.json +++ b/kubejs/assets/gtceu/models/block/material_sets/tfc_diamond/ore.json @@ -2,7 +2,7 @@ "parent": "block/block", "loader": "forge:composite", "textures": { - "particle": "gtceu:block/material_sets/tfc_diamond/ore" + "particle": "tfc:block/ore/diamond" }, "children": { "base_stone": { @@ -11,8 +11,7 @@ "ore_texture": { "parent": "block/block", "textures": { - "layer0": "gtceu:block/material_sets/tfc_diamond/ore", - "layer1": "gtceu:block/material_sets/tfc_diamond/ore_layer2", + "layer0": "tfc:block/ore/diamond", "particle": "#layer0" }, "render_type": "translucent", @@ -21,24 +20,12 @@ "from": [0, 0, 0 ], "to": [16, 16, 16], "faces": { - "down": { "texture": "#layer0", "cullface": "down", "tintindex": 0 }, - "up": { "texture": "#layer0", "cullface": "up", "tintindex": 0 }, - "north": { "texture": "#layer0", "cullface": "north", "tintindex": 0 }, - "south": { "texture": "#layer0", "cullface": "south", "tintindex": 0 }, - "west": { "texture": "#layer0", "cullface": "west", "tintindex": 0 }, - "east": { "texture": "#layer0", "cullface": "east", "tintindex": 0 } - } - }, - { - "from": [0, 0, 0 ], - "to": [16, 16, 16], - "faces": { - "down": { "texture": "#layer1", "cullface": "down", "tintindex": 1 }, - "up": { "texture": "#layer1", "cullface": "up", "tintindex": 1 }, - "north": { "texture": "#layer1", "cullface": "north", "tintindex": 1 }, - "south": { "texture": "#layer1", "cullface": "south", "tintindex": 1 }, - "west": { "texture": "#layer1", "cullface": "west", "tintindex": 1 }, - "east": { "texture": "#layer1", "cullface": "east", "tintindex": 1 } + "down": { "texture": "#layer0", "cullface": "down" }, + "up": { "texture": "#layer0", "cullface": "up" }, + "north": { "texture": "#layer0", "cullface": "north" }, + "south": { "texture": "#layer0", "cullface": "south" }, + "west": { "texture": "#layer0", "cullface": "west" }, + "east": { "texture": "#layer0", "cullface": "east" } } } ] diff --git a/kubejs/assets/gtceu/models/block/material_sets/tfc_emerald/ore.json b/kubejs/assets/gtceu/models/block/material_sets/tfc_emerald/ore.json index f559b00a99..7a50d84be2 100644 --- a/kubejs/assets/gtceu/models/block/material_sets/tfc_emerald/ore.json +++ b/kubejs/assets/gtceu/models/block/material_sets/tfc_emerald/ore.json @@ -2,7 +2,7 @@ "parent": "block/block", "loader": "forge:composite", "textures": { - "particle": "gtceu:block/material_sets/tfc_emerald/ore" + "particle": "tfc:block/ore/emerald" }, "children": { "base_stone": { @@ -11,8 +11,7 @@ "ore_texture": { "parent": "block/block", "textures": { - "layer0": "gtceu:block/material_sets/tfc_emerald/ore", - "layer1": "gtceu:block/material_sets/tfc_emerald/ore_layer2", + "layer0": "tfc:block/ore/emerald", "particle": "#layer0" }, "render_type": "translucent", @@ -21,24 +20,12 @@ "from": [0, 0, 0 ], "to": [16, 16, 16], "faces": { - "down": { "texture": "#layer0", "cullface": "down", "tintindex": 0 }, - "up": { "texture": "#layer0", "cullface": "up", "tintindex": 0 }, - "north": { "texture": "#layer0", "cullface": "north", "tintindex": 0 }, - "south": { "texture": "#layer0", "cullface": "south", "tintindex": 0 }, - "west": { "texture": "#layer0", "cullface": "west", "tintindex": 0 }, - "east": { "texture": "#layer0", "cullface": "east", "tintindex": 0 } - } - }, - { - "from": [0, 0, 0 ], - "to": [16, 16, 16], - "faces": { - "down": { "texture": "#layer1", "cullface": "down", "tintindex": 1 }, - "up": { "texture": "#layer1", "cullface": "up", "tintindex": 1 }, - "north": { "texture": "#layer1", "cullface": "north", "tintindex": 1 }, - "south": { "texture": "#layer1", "cullface": "south", "tintindex": 1 }, - "west": { "texture": "#layer1", "cullface": "west", "tintindex": 1 }, - "east": { "texture": "#layer1", "cullface": "east", "tintindex": 1 } + "down": { "texture": "#layer0", "cullface": "down" }, + "up": { "texture": "#layer0", "cullface": "up" }, + "north": { "texture": "#layer0", "cullface": "north" }, + "south": { "texture": "#layer0", "cullface": "south" }, + "west": { "texture": "#layer0", "cullface": "west" }, + "east": { "texture": "#layer0", "cullface": "east" } } } ] diff --git a/kubejs/assets/gtceu/models/block/material_sets/tfc_garnierite/ore.json b/kubejs/assets/gtceu/models/block/material_sets/tfc_garnierite/ore.json index 35a7fd6834..8d3f322991 100644 --- a/kubejs/assets/gtceu/models/block/material_sets/tfc_garnierite/ore.json +++ b/kubejs/assets/gtceu/models/block/material_sets/tfc_garnierite/ore.json @@ -2,7 +2,7 @@ "parent": "block/block", "loader": "forge:composite", "textures": { - "particle": "gtceu:block/material_sets/tfc_garnierite/ore" + "particle": "tfc:block/ore/normal_garnierite" }, "children": { "base_stone": { @@ -11,8 +11,7 @@ "ore_texture": { "parent": "block/block", "textures": { - "layer0": "gtceu:block/material_sets/tfc_garnierite/ore", - "layer1": "gtceu:block/material_sets/tfc_garnierite/ore_layer2", + "layer0": "tfc:block/ore/normal_garnierite", "particle": "#layer0" }, "render_type": "translucent", @@ -21,24 +20,12 @@ "from": [0, 0, 0 ], "to": [16, 16, 16], "faces": { - "down": { "texture": "#layer0", "cullface": "down", "tintindex": 0 }, - "up": { "texture": "#layer0", "cullface": "up", "tintindex": 0 }, - "north": { "texture": "#layer0", "cullface": "north", "tintindex": 0 }, - "south": { "texture": "#layer0", "cullface": "south", "tintindex": 0 }, - "west": { "texture": "#layer0", "cullface": "west", "tintindex": 0 }, - "east": { "texture": "#layer0", "cullface": "east", "tintindex": 0 } - } - }, - { - "from": [0, 0, 0 ], - "to": [16, 16, 16], - "faces": { - "down": { "texture": "#layer1", "cullface": "down", "tintindex": 1 }, - "up": { "texture": "#layer1", "cullface": "up", "tintindex": 1 }, - "north": { "texture": "#layer1", "cullface": "north", "tintindex": 1 }, - "south": { "texture": "#layer1", "cullface": "south", "tintindex": 1 }, - "west": { "texture": "#layer1", "cullface": "west", "tintindex": 1 }, - "east": { "texture": "#layer1", "cullface": "east", "tintindex": 1 } + "down": { "texture": "#layer0", "cullface": "down" }, + "up": { "texture": "#layer0", "cullface": "up" }, + "north": { "texture": "#layer0", "cullface": "north" }, + "south": { "texture": "#layer0", "cullface": "south" }, + "west": { "texture": "#layer0", "cullface": "west" }, + "east": { "texture": "#layer0", "cullface": "east" } } } ] diff --git a/kubejs/assets/gtceu/models/block/material_sets/tfc_gold/ore.json b/kubejs/assets/gtceu/models/block/material_sets/tfc_gold/ore.json index cb8316804f..d91b317594 100644 --- a/kubejs/assets/gtceu/models/block/material_sets/tfc_gold/ore.json +++ b/kubejs/assets/gtceu/models/block/material_sets/tfc_gold/ore.json @@ -2,7 +2,7 @@ "parent": "block/block", "loader": "forge:composite", "textures": { - "particle": "gtceu:block/material_sets/tfc_gold/ore" + "particle": "tfc:block/ore/normal_native_gold" }, "children": { "base_stone": { @@ -11,8 +11,7 @@ "ore_texture": { "parent": "block/block", "textures": { - "layer0": "gtceu:block/material_sets/tfc_gold/ore", - "layer1": "gtceu:block/material_sets/tfc_gold/ore_layer2", + "layer0": "tfc:block/ore/normal_native_gold", "particle": "#layer0" }, "render_type": "translucent", @@ -21,24 +20,12 @@ "from": [0, 0, 0 ], "to": [16, 16, 16], "faces": { - "down": { "texture": "#layer0", "cullface": "down", "tintindex": 0 }, - "up": { "texture": "#layer0", "cullface": "up", "tintindex": 0 }, - "north": { "texture": "#layer0", "cullface": "north", "tintindex": 0 }, - "south": { "texture": "#layer0", "cullface": "south", "tintindex": 0 }, - "west": { "texture": "#layer0", "cullface": "west", "tintindex": 0 }, - "east": { "texture": "#layer0", "cullface": "east", "tintindex": 0 } - } - }, - { - "from": [0, 0, 0 ], - "to": [16, 16, 16], - "faces": { - "down": { "texture": "#layer1", "cullface": "down", "tintindex": 1 }, - "up": { "texture": "#layer1", "cullface": "up", "tintindex": 1 }, - "north": { "texture": "#layer1", "cullface": "north", "tintindex": 1 }, - "south": { "texture": "#layer1", "cullface": "south", "tintindex": 1 }, - "west": { "texture": "#layer1", "cullface": "west", "tintindex": 1 }, - "east": { "texture": "#layer1", "cullface": "east", "tintindex": 1 } + "down": { "texture": "#layer0", "cullface": "down" }, + "up": { "texture": "#layer0", "cullface": "up" }, + "north": { "texture": "#layer0", "cullface": "north" }, + "south": { "texture": "#layer0", "cullface": "south" }, + "west": { "texture": "#layer0", "cullface": "west" }, + "east": { "texture": "#layer0", "cullface": "east" } } } ] diff --git a/kubejs/assets/gtceu/models/block/material_sets/tfc_graphite/ore.json b/kubejs/assets/gtceu/models/block/material_sets/tfc_graphite/ore.json index c5f2947d46..98c0eeea2f 100644 --- a/kubejs/assets/gtceu/models/block/material_sets/tfc_graphite/ore.json +++ b/kubejs/assets/gtceu/models/block/material_sets/tfc_graphite/ore.json @@ -2,7 +2,7 @@ "parent": "block/block", "loader": "forge:composite", "textures": { - "particle": "gtceu:block/material_sets/tfc_graphite/ore" + "particle": "tfc:block/ore/graphite" }, "children": { "base_stone": { @@ -11,8 +11,7 @@ "ore_texture": { "parent": "block/block", "textures": { - "layer0": "gtceu:block/material_sets/tfc_graphite/ore", - "layer1": "gtceu:block/material_sets/tfc_graphite/ore_layer2", + "layer0": "tfc:block/ore/graphite", "particle": "#layer0" }, "render_type": "translucent", @@ -21,24 +20,12 @@ "from": [0, 0, 0 ], "to": [16, 16, 16], "faces": { - "down": { "texture": "#layer0", "cullface": "down", "tintindex": 0 }, - "up": { "texture": "#layer0", "cullface": "up", "tintindex": 0 }, - "north": { "texture": "#layer0", "cullface": "north", "tintindex": 0 }, - "south": { "texture": "#layer0", "cullface": "south", "tintindex": 0 }, - "west": { "texture": "#layer0", "cullface": "west", "tintindex": 0 }, - "east": { "texture": "#layer0", "cullface": "east", "tintindex": 0 } - } - }, - { - "from": [0, 0, 0 ], - "to": [16, 16, 16], - "faces": { - "down": { "texture": "#layer1", "cullface": "down", "tintindex": 1 }, - "up": { "texture": "#layer1", "cullface": "up", "tintindex": 1 }, - "north": { "texture": "#layer1", "cullface": "north", "tintindex": 1 }, - "south": { "texture": "#layer1", "cullface": "south", "tintindex": 1 }, - "west": { "texture": "#layer1", "cullface": "west", "tintindex": 1 }, - "east": { "texture": "#layer1", "cullface": "east", "tintindex": 1 } + "down": { "texture": "#layer0", "cullface": "down" }, + "up": { "texture": "#layer0", "cullface": "up" }, + "north": { "texture": "#layer0", "cullface": "north" }, + "south": { "texture": "#layer0", "cullface": "south" }, + "west": { "texture": "#layer0", "cullface": "west" }, + "east": { "texture": "#layer0", "cullface": "east" } } } ] diff --git a/kubejs/assets/gtceu/models/block/material_sets/tfc_gypsum/ore.json b/kubejs/assets/gtceu/models/block/material_sets/tfc_gypsum/ore.json index c6f3222d7b..9a0e450acb 100644 --- a/kubejs/assets/gtceu/models/block/material_sets/tfc_gypsum/ore.json +++ b/kubejs/assets/gtceu/models/block/material_sets/tfc_gypsum/ore.json @@ -2,7 +2,7 @@ "parent": "block/block", "loader": "forge:composite", "textures": { - "particle": "gtceu:block/material_sets/tfc_gypsum/ore" + "particle": "tfc:block/ore/gypsum" }, "children": { "base_stone": { @@ -11,8 +11,7 @@ "ore_texture": { "parent": "block/block", "textures": { - "layer0": "gtceu:block/material_sets/tfc_gypsum/ore", - "layer1": "gtceu:block/material_sets/tfc_gypsum/ore_layer2", + "layer0": "tfc:block/ore/gypsum", "particle": "#layer0" }, "render_type": "translucent", @@ -21,24 +20,12 @@ "from": [0, 0, 0 ], "to": [16, 16, 16], "faces": { - "down": { "texture": "#layer0", "cullface": "down", "tintindex": 0 }, - "up": { "texture": "#layer0", "cullface": "up", "tintindex": 0 }, - "north": { "texture": "#layer0", "cullface": "north", "tintindex": 0 }, - "south": { "texture": "#layer0", "cullface": "south", "tintindex": 0 }, - "west": { "texture": "#layer0", "cullface": "west", "tintindex": 0 }, - "east": { "texture": "#layer0", "cullface": "east", "tintindex": 0 } - } - }, - { - "from": [0, 0, 0 ], - "to": [16, 16, 16], - "faces": { - "down": { "texture": "#layer1", "cullface": "down", "tintindex": 1 }, - "up": { "texture": "#layer1", "cullface": "up", "tintindex": 1 }, - "north": { "texture": "#layer1", "cullface": "north", "tintindex": 1 }, - "south": { "texture": "#layer1", "cullface": "south", "tintindex": 1 }, - "west": { "texture": "#layer1", "cullface": "west", "tintindex": 1 }, - "east": { "texture": "#layer1", "cullface": "east", "tintindex": 1 } + "down": { "texture": "#layer0", "cullface": "down" }, + "up": { "texture": "#layer0", "cullface": "up" }, + "north": { "texture": "#layer0", "cullface": "north" }, + "south": { "texture": "#layer0", "cullface": "south" }, + "west": { "texture": "#layer0", "cullface": "west" }, + "east": { "texture": "#layer0", "cullface": "east" } } } ] diff --git a/kubejs/assets/gtceu/models/block/material_sets/tfc_hematite/ore.json b/kubejs/assets/gtceu/models/block/material_sets/tfc_hematite/ore.json index 3860be4610..771ed59be4 100644 --- a/kubejs/assets/gtceu/models/block/material_sets/tfc_hematite/ore.json +++ b/kubejs/assets/gtceu/models/block/material_sets/tfc_hematite/ore.json @@ -2,7 +2,7 @@ "parent": "block/block", "loader": "forge:composite", "textures": { - "particle": "gtceu:block/material_sets/tfc_hematite/ore" + "particle": "tfc:block/ore/normal_hematite" }, "children": { "base_stone": { @@ -11,8 +11,7 @@ "ore_texture": { "parent": "block/block", "textures": { - "layer0": "gtceu:block/material_sets/tfc_hematite/ore", - "layer1": "gtceu:block/material_sets/tfc_hematite/ore_layer2", + "layer0": "tfc:block/ore/normal_hematite", "particle": "#layer0" }, "render_type": "translucent", @@ -21,24 +20,12 @@ "from": [0, 0, 0 ], "to": [16, 16, 16], "faces": { - "down": { "texture": "#layer0", "cullface": "down", "tintindex": 0 }, - "up": { "texture": "#layer0", "cullface": "up", "tintindex": 0 }, - "north": { "texture": "#layer0", "cullface": "north", "tintindex": 0 }, - "south": { "texture": "#layer0", "cullface": "south", "tintindex": 0 }, - "west": { "texture": "#layer0", "cullface": "west", "tintindex": 0 }, - "east": { "texture": "#layer0", "cullface": "east", "tintindex": 0 } - } - }, - { - "from": [0, 0, 0 ], - "to": [16, 16, 16], - "faces": { - "down": { "texture": "#layer1", "cullface": "down", "tintindex": 1 }, - "up": { "texture": "#layer1", "cullface": "up", "tintindex": 1 }, - "north": { "texture": "#layer1", "cullface": "north", "tintindex": 1 }, - "south": { "texture": "#layer1", "cullface": "south", "tintindex": 1 }, - "west": { "texture": "#layer1", "cullface": "west", "tintindex": 1 }, - "east": { "texture": "#layer1", "cullface": "east", "tintindex": 1 } + "down": { "texture": "#layer0", "cullface": "down" }, + "up": { "texture": "#layer0", "cullface": "up" }, + "north": { "texture": "#layer0", "cullface": "north" }, + "south": { "texture": "#layer0", "cullface": "south" }, + "west": { "texture": "#layer0", "cullface": "west" }, + "east": { "texture": "#layer0", "cullface": "east" } } } ] diff --git a/kubejs/assets/gtceu/models/block/material_sets/tfc_lapis/ore.json b/kubejs/assets/gtceu/models/block/material_sets/tfc_lapis/ore.json index c819c888e1..b1f9b95a5b 100644 --- a/kubejs/assets/gtceu/models/block/material_sets/tfc_lapis/ore.json +++ b/kubejs/assets/gtceu/models/block/material_sets/tfc_lapis/ore.json @@ -2,7 +2,7 @@ "parent": "block/block", "loader": "forge:composite", "textures": { - "particle": "gtceu:block/material_sets/tfc_lapis/ore" + "particle": "tfc:block/ore/lapis_lazuli" }, "children": { "base_stone": { @@ -11,8 +11,7 @@ "ore_texture": { "parent": "block/block", "textures": { - "layer0": "gtceu:block/material_sets/tfc_lapis/ore", - "layer1": "gtceu:block/material_sets/tfc_lapis/ore_layer2", + "layer0": "tfc:block/ore/lapis_lazuli", "particle": "#layer0" }, "render_type": "translucent", @@ -21,24 +20,12 @@ "from": [0, 0, 0 ], "to": [16, 16, 16], "faces": { - "down": { "texture": "#layer0", "cullface": "down", "tintindex": 0 }, - "up": { "texture": "#layer0", "cullface": "up", "tintindex": 0 }, - "north": { "texture": "#layer0", "cullface": "north", "tintindex": 0 }, - "south": { "texture": "#layer0", "cullface": "south", "tintindex": 0 }, - "west": { "texture": "#layer0", "cullface": "west", "tintindex": 0 }, - "east": { "texture": "#layer0", "cullface": "east", "tintindex": 0 } - } - }, - { - "from": [0, 0, 0 ], - "to": [16, 16, 16], - "faces": { - "down": { "texture": "#layer1", "cullface": "down", "tintindex": 1 }, - "up": { "texture": "#layer1", "cullface": "up", "tintindex": 1 }, - "north": { "texture": "#layer1", "cullface": "north", "tintindex": 1 }, - "south": { "texture": "#layer1", "cullface": "south", "tintindex": 1 }, - "west": { "texture": "#layer1", "cullface": "west", "tintindex": 1 }, - "east": { "texture": "#layer1", "cullface": "east", "tintindex": 1 } + "down": { "texture": "#layer0", "cullface": "down" }, + "up": { "texture": "#layer0", "cullface": "up" }, + "north": { "texture": "#layer0", "cullface": "north" }, + "south": { "texture": "#layer0", "cullface": "south" }, + "west": { "texture": "#layer0", "cullface": "west" }, + "east": { "texture": "#layer0", "cullface": "east" } } } ] diff --git a/kubejs/assets/gtceu/models/block/material_sets/tfc_limonite/ore.json b/kubejs/assets/gtceu/models/block/material_sets/tfc_limonite/ore.json index 32192333bd..c27fc85c67 100644 --- a/kubejs/assets/gtceu/models/block/material_sets/tfc_limonite/ore.json +++ b/kubejs/assets/gtceu/models/block/material_sets/tfc_limonite/ore.json @@ -2,7 +2,7 @@ "parent": "block/block", "loader": "forge:composite", "textures": { - "particle": "gtceu:block/material_sets/tfc_limonite/ore" + "particle": "tfc:block/ore/normal_limonite" }, "children": { "base_stone": { @@ -11,8 +11,7 @@ "ore_texture": { "parent": "block/block", "textures": { - "layer0": "gtceu:block/material_sets/tfc_limonite/ore", - "layer1": "gtceu:block/material_sets/tfc_limonite/ore_layer2", + "layer0": "tfc:block/ore/normal_limonite", "particle": "#layer0" }, "render_type": "translucent", @@ -21,24 +20,12 @@ "from": [0, 0, 0 ], "to": [16, 16, 16], "faces": { - "down": { "texture": "#layer0", "cullface": "down", "tintindex": 0 }, - "up": { "texture": "#layer0", "cullface": "up", "tintindex": 0 }, - "north": { "texture": "#layer0", "cullface": "north", "tintindex": 0 }, - "south": { "texture": "#layer0", "cullface": "south", "tintindex": 0 }, - "west": { "texture": "#layer0", "cullface": "west", "tintindex": 0 }, - "east": { "texture": "#layer0", "cullface": "east", "tintindex": 0 } - } - }, - { - "from": [0, 0, 0 ], - "to": [16, 16, 16], - "faces": { - "down": { "texture": "#layer1", "cullface": "down", "tintindex": 1 }, - "up": { "texture": "#layer1", "cullface": "up", "tintindex": 1 }, - "north": { "texture": "#layer1", "cullface": "north", "tintindex": 1 }, - "south": { "texture": "#layer1", "cullface": "south", "tintindex": 1 }, - "west": { "texture": "#layer1", "cullface": "west", "tintindex": 1 }, - "east": { "texture": "#layer1", "cullface": "east", "tintindex": 1 } + "down": { "texture": "#layer0", "cullface": "down" }, + "up": { "texture": "#layer0", "cullface": "up" }, + "north": { "texture": "#layer0", "cullface": "north" }, + "south": { "texture": "#layer0", "cullface": "south" }, + "west": { "texture": "#layer0", "cullface": "west" }, + "east": { "texture": "#layer0", "cullface": "east" } } } ] diff --git a/kubejs/assets/gtceu/models/block/material_sets/tfc_magnetite/ore.json b/kubejs/assets/gtceu/models/block/material_sets/tfc_magnetite/ore.json index 0f781a6bdd..3e76a1c4ea 100644 --- a/kubejs/assets/gtceu/models/block/material_sets/tfc_magnetite/ore.json +++ b/kubejs/assets/gtceu/models/block/material_sets/tfc_magnetite/ore.json @@ -2,7 +2,7 @@ "parent": "block/block", "loader": "forge:composite", "textures": { - "particle": "gtceu:block/material_sets/tfc_magnetite/ore" + "particle": "tfc:block/ore/normal_magnetite" }, "children": { "base_stone": { @@ -11,8 +11,7 @@ "ore_texture": { "parent": "block/block", "textures": { - "layer0": "gtceu:block/material_sets/tfc_magnetite/ore", - "layer1": "gtceu:block/material_sets/tfc_magnetite/ore_layer2", + "layer0": "tfc:block/ore/normal_magnetite", "particle": "#layer0" }, "render_type": "translucent", @@ -21,24 +20,12 @@ "from": [0, 0, 0 ], "to": [16, 16, 16], "faces": { - "down": { "texture": "#layer0", "cullface": "down", "tintindex": 0 }, - "up": { "texture": "#layer0", "cullface": "up", "tintindex": 0 }, - "north": { "texture": "#layer0", "cullface": "north", "tintindex": 0 }, - "south": { "texture": "#layer0", "cullface": "south", "tintindex": 0 }, - "west": { "texture": "#layer0", "cullface": "west", "tintindex": 0 }, - "east": { "texture": "#layer0", "cullface": "east", "tintindex": 0 } - } - }, - { - "from": [0, 0, 0 ], - "to": [16, 16, 16], - "faces": { - "down": { "texture": "#layer1", "cullface": "down", "tintindex": 1 }, - "up": { "texture": "#layer1", "cullface": "up", "tintindex": 1 }, - "north": { "texture": "#layer1", "cullface": "north", "tintindex": 1 }, - "south": { "texture": "#layer1", "cullface": "south", "tintindex": 1 }, - "west": { "texture": "#layer1", "cullface": "west", "tintindex": 1 }, - "east": { "texture": "#layer1", "cullface": "east", "tintindex": 1 } + "down": { "texture": "#layer0", "cullface": "down" }, + "up": { "texture": "#layer0", "cullface": "up" }, + "north": { "texture": "#layer0", "cullface": "north" }, + "south": { "texture": "#layer0", "cullface": "south" }, + "west": { "texture": "#layer0", "cullface": "west" }, + "east": { "texture": "#layer0", "cullface": "east" } } } ] diff --git a/kubejs/assets/gtceu/models/block/material_sets/tfc_malachite/ore.json b/kubejs/assets/gtceu/models/block/material_sets/tfc_malachite/ore.json index ba4edb7c13..777b9ed826 100644 --- a/kubejs/assets/gtceu/models/block/material_sets/tfc_malachite/ore.json +++ b/kubejs/assets/gtceu/models/block/material_sets/tfc_malachite/ore.json @@ -2,7 +2,7 @@ "parent": "block/block", "loader": "forge:composite", "textures": { - "particle": "gtceu:block/material_sets/tfc_malachite/ore" + "particle": "tfc:block/ore/normal_malachite" }, "children": { "base_stone": { @@ -11,8 +11,7 @@ "ore_texture": { "parent": "block/block", "textures": { - "layer0": "gtceu:block/material_sets/tfc_malachite/ore", - "layer1": "gtceu:block/material_sets/tfc_malachite/ore_layer2", + "layer0": "tfc:block/ore/normal_malachite", "particle": "#layer0" }, "render_type": "translucent", @@ -21,24 +20,12 @@ "from": [0, 0, 0 ], "to": [16, 16, 16], "faces": { - "down": { "texture": "#layer0", "cullface": "down", "tintindex": 0 }, - "up": { "texture": "#layer0", "cullface": "up", "tintindex": 0 }, - "north": { "texture": "#layer0", "cullface": "north", "tintindex": 0 }, - "south": { "texture": "#layer0", "cullface": "south", "tintindex": 0 }, - "west": { "texture": "#layer0", "cullface": "west", "tintindex": 0 }, - "east": { "texture": "#layer0", "cullface": "east", "tintindex": 0 } - } - }, - { - "from": [0, 0, 0 ], - "to": [16, 16, 16], - "faces": { - "down": { "texture": "#layer1", "cullface": "down", "tintindex": 1 }, - "up": { "texture": "#layer1", "cullface": "up", "tintindex": 1 }, - "north": { "texture": "#layer1", "cullface": "north", "tintindex": 1 }, - "south": { "texture": "#layer1", "cullface": "south", "tintindex": 1 }, - "west": { "texture": "#layer1", "cullface": "west", "tintindex": 1 }, - "east": { "texture": "#layer1", "cullface": "east", "tintindex": 1 } + "down": { "texture": "#layer0", "cullface": "down" }, + "up": { "texture": "#layer0", "cullface": "up" }, + "north": { "texture": "#layer0", "cullface": "north" }, + "south": { "texture": "#layer0", "cullface": "south" }, + "west": { "texture": "#layer0", "cullface": "west" }, + "east": { "texture": "#layer0", "cullface": "east" } } } ] diff --git a/kubejs/assets/gtceu/models/block/material_sets/tfc_opal/ore.json b/kubejs/assets/gtceu/models/block/material_sets/tfc_opal/ore.json index 32c9e518c9..e97d2e9d90 100644 --- a/kubejs/assets/gtceu/models/block/material_sets/tfc_opal/ore.json +++ b/kubejs/assets/gtceu/models/block/material_sets/tfc_opal/ore.json @@ -2,7 +2,7 @@ "parent": "block/block", "loader": "forge:composite", "textures": { - "particle": "gtceu:block/material_sets/tfc_opal/ore" + "particle": "tfc:block/ore/opal" }, "children": { "base_stone": { @@ -11,8 +11,7 @@ "ore_texture": { "parent": "block/block", "textures": { - "layer0": "gtceu:block/material_sets/tfc_opal/ore", - "layer1": "gtceu:block/material_sets/tfc_opal/ore_layer2", + "layer0": "tfc:block/ore/opal", "particle": "#layer0" }, "render_type": "translucent", @@ -21,24 +20,12 @@ "from": [0, 0, 0 ], "to": [16, 16, 16], "faces": { - "down": { "texture": "#layer0", "cullface": "down", "tintindex": 0 }, - "up": { "texture": "#layer0", "cullface": "up", "tintindex": 0 }, - "north": { "texture": "#layer0", "cullface": "north", "tintindex": 0 }, - "south": { "texture": "#layer0", "cullface": "south", "tintindex": 0 }, - "west": { "texture": "#layer0", "cullface": "west", "tintindex": 0 }, - "east": { "texture": "#layer0", "cullface": "east", "tintindex": 0 } - } - }, - { - "from": [0, 0, 0 ], - "to": [16, 16, 16], - "faces": { - "down": { "texture": "#layer1", "cullface": "down", "tintindex": 1 }, - "up": { "texture": "#layer1", "cullface": "up", "tintindex": 1 }, - "north": { "texture": "#layer1", "cullface": "north", "tintindex": 1 }, - "south": { "texture": "#layer1", "cullface": "south", "tintindex": 1 }, - "west": { "texture": "#layer1", "cullface": "west", "tintindex": 1 }, - "east": { "texture": "#layer1", "cullface": "east", "tintindex": 1 } + "down": { "texture": "#layer0", "cullface": "down" }, + "up": { "texture": "#layer0", "cullface": "up" }, + "north": { "texture": "#layer0", "cullface": "north" }, + "south": { "texture": "#layer0", "cullface": "south" }, + "west": { "texture": "#layer0", "cullface": "west" }, + "east": { "texture": "#layer0", "cullface": "east" } } } ] diff --git a/kubejs/assets/gtceu/models/block/material_sets/tfc_redstone/ore.json b/kubejs/assets/gtceu/models/block/material_sets/tfc_redstone/ore.json index bf81873063..7df6e3af9f 100644 --- a/kubejs/assets/gtceu/models/block/material_sets/tfc_redstone/ore.json +++ b/kubejs/assets/gtceu/models/block/material_sets/tfc_redstone/ore.json @@ -2,7 +2,7 @@ "parent": "block/block", "loader": "forge:composite", "textures": { - "particle": "gtceu:block/material_sets/tfc_redstone/ore" + "particle": "tfc:block/ore/cinnabar" }, "children": { "base_stone": { @@ -11,9 +11,8 @@ "ore_texture": { "parent": "block/block", "textures": { - "layer0": "gtceu:block/material_sets/tfc_redstone/ore", - "layer1": "gtceu:block/material_sets/tfc_redstone/ore_layer2", - "particle": "#layer0" + "layer0": "tfc:block/ore/cinnabar", + "particle": "#layer0" }, "render_type": "translucent", "elements": [ @@ -21,24 +20,12 @@ "from": [0, 0, 0 ], "to": [16, 16, 16], "faces": { - "down": { "texture": "#layer0", "cullface": "down", "tintindex": 0 }, - "up": { "texture": "#layer0", "cullface": "up", "tintindex": 0 }, - "north": { "texture": "#layer0", "cullface": "north", "tintindex": 0 }, - "south": { "texture": "#layer0", "cullface": "south", "tintindex": 0 }, - "west": { "texture": "#layer0", "cullface": "west", "tintindex": 0 }, - "east": { "texture": "#layer0", "cullface": "east", "tintindex": 0 } - } - }, - { - "from": [0, 0, 0 ], - "to": [16, 16, 16], - "faces": { - "down": { "texture": "#layer1", "cullface": "down", "tintindex": 1 }, - "up": { "texture": "#layer1", "cullface": "up", "tintindex": 1 }, - "north": { "texture": "#layer1", "cullface": "north", "tintindex": 1 }, - "south": { "texture": "#layer1", "cullface": "south", "tintindex": 1 }, - "west": { "texture": "#layer1", "cullface": "west", "tintindex": 1 }, - "east": { "texture": "#layer1", "cullface": "east", "tintindex": 1 } + "down": { "texture": "#layer0", "cullface": "down" }, + "up": { "texture": "#layer0", "cullface": "up" }, + "north": { "texture": "#layer0", "cullface": "north" }, + "south": { "texture": "#layer0", "cullface": "south" }, + "west": { "texture": "#layer0", "cullface": "west" }, + "east": { "texture": "#layer0", "cullface": "east" } } } ] diff --git a/kubejs/assets/gtceu/models/block/material_sets/tfc_ruby/ore.json b/kubejs/assets/gtceu/models/block/material_sets/tfc_ruby/ore.json index 5a32e7ac37..80401b06a5 100644 --- a/kubejs/assets/gtceu/models/block/material_sets/tfc_ruby/ore.json +++ b/kubejs/assets/gtceu/models/block/material_sets/tfc_ruby/ore.json @@ -2,7 +2,7 @@ "parent": "block/block", "loader": "forge:composite", "textures": { - "particle": "gtceu:block/material_sets/tfc_ruby/ore" + "particle": "tfc:block/ore/ruby" }, "children": { "base_stone": { @@ -11,8 +11,7 @@ "ore_texture": { "parent": "block/block", "textures": { - "layer0": "gtceu:block/material_sets/tfc_ruby/ore", - "layer1": "gtceu:block/material_sets/tfc_ruby/ore_layer2", + "layer0": "tfc:block/ore/ruby", "particle": "#layer0" }, "render_type": "translucent", @@ -21,24 +20,12 @@ "from": [0, 0, 0 ], "to": [16, 16, 16], "faces": { - "down": { "texture": "#layer0", "cullface": "down", "tintindex": 0 }, - "up": { "texture": "#layer0", "cullface": "up", "tintindex": 0 }, - "north": { "texture": "#layer0", "cullface": "north", "tintindex": 0 }, - "south": { "texture": "#layer0", "cullface": "south", "tintindex": 0 }, - "west": { "texture": "#layer0", "cullface": "west", "tintindex": 0 }, - "east": { "texture": "#layer0", "cullface": "east", "tintindex": 0 } - } - }, - { - "from": [0, 0, 0 ], - "to": [16, 16, 16], - "faces": { - "down": { "texture": "#layer1", "cullface": "down", "tintindex": 1 }, - "up": { "texture": "#layer1", "cullface": "up", "tintindex": 1 }, - "north": { "texture": "#layer1", "cullface": "north", "tintindex": 1 }, - "south": { "texture": "#layer1", "cullface": "south", "tintindex": 1 }, - "west": { "texture": "#layer1", "cullface": "west", "tintindex": 1 }, - "east": { "texture": "#layer1", "cullface": "east", "tintindex": 1 } + "down": { "texture": "#layer0", "cullface": "down" }, + "up": { "texture": "#layer0", "cullface": "up" }, + "north": { "texture": "#layer0", "cullface": "north" }, + "south": { "texture": "#layer0", "cullface": "south" }, + "west": { "texture": "#layer0", "cullface": "west" }, + "east": { "texture": "#layer0", "cullface": "east" } } } ] diff --git a/kubejs/assets/gtceu/models/block/material_sets/tfc_saltpeter/ore.json b/kubejs/assets/gtceu/models/block/material_sets/tfc_saltpeter/ore.json index 09a44e728c..6562e0dbf5 100644 --- a/kubejs/assets/gtceu/models/block/material_sets/tfc_saltpeter/ore.json +++ b/kubejs/assets/gtceu/models/block/material_sets/tfc_saltpeter/ore.json @@ -2,7 +2,7 @@ "parent": "block/block", "loader": "forge:composite", "textures": { - "particle": "gtceu:block/material_sets/tfc_saltpeter/ore" + "particle": "tfc:block/ore/saltpeter" }, "children": { "base_stone": { @@ -11,8 +11,7 @@ "ore_texture": { "parent": "block/block", "textures": { - "layer0": "gtceu:block/material_sets/tfc_saltpeter/ore", - "layer1": "gtceu:block/material_sets/tfc_saltpeter/ore_layer2", + "layer0": "tfc:block/ore/saltpeter", "particle": "#layer0" }, "render_type": "translucent", @@ -21,24 +20,12 @@ "from": [0, 0, 0 ], "to": [16, 16, 16], "faces": { - "down": { "texture": "#layer0", "cullface": "down", "tintindex": 0 }, - "up": { "texture": "#layer0", "cullface": "up", "tintindex": 0 }, - "north": { "texture": "#layer0", "cullface": "north", "tintindex": 0 }, - "south": { "texture": "#layer0", "cullface": "south", "tintindex": 0 }, - "west": { "texture": "#layer0", "cullface": "west", "tintindex": 0 }, - "east": { "texture": "#layer0", "cullface": "east", "tintindex": 0 } - } - }, - { - "from": [0, 0, 0 ], - "to": [16, 16, 16], - "faces": { - "down": { "texture": "#layer1", "cullface": "down", "tintindex": 1 }, - "up": { "texture": "#layer1", "cullface": "up", "tintindex": 1 }, - "north": { "texture": "#layer1", "cullface": "north", "tintindex": 1 }, - "south": { "texture": "#layer1", "cullface": "south", "tintindex": 1 }, - "west": { "texture": "#layer1", "cullface": "west", "tintindex": 1 }, - "east": { "texture": "#layer1", "cullface": "east", "tintindex": 1 } + "down": { "texture": "#layer0", "cullface": "down" }, + "up": { "texture": "#layer0", "cullface": "up" }, + "north": { "texture": "#layer0", "cullface": "north" }, + "south": { "texture": "#layer0", "cullface": "south" }, + "west": { "texture": "#layer0", "cullface": "west" }, + "east": { "texture": "#layer0", "cullface": "east" } } } ] diff --git a/kubejs/assets/gtceu/models/block/material_sets/tfc_sapphire/ore.json b/kubejs/assets/gtceu/models/block/material_sets/tfc_sapphire/ore.json index 641c61ddc6..384dae139b 100644 --- a/kubejs/assets/gtceu/models/block/material_sets/tfc_sapphire/ore.json +++ b/kubejs/assets/gtceu/models/block/material_sets/tfc_sapphire/ore.json @@ -2,7 +2,7 @@ "parent": "block/block", "loader": "forge:composite", "textures": { - "particle": "gtceu:block/material_sets/tfc_sapphire/ore" + "particle": "tfc:block/ore/sapphire" }, "children": { "base_stone": { @@ -11,8 +11,7 @@ "ore_texture": { "parent": "block/block", "textures": { - "layer0": "gtceu:block/material_sets/tfc_sapphire/ore", - "layer1": "gtceu:block/material_sets/tfc_sapphire/ore_layer2", + "layer0": "tfc:block/ore/sapphire", "particle": "#layer0" }, "render_type": "translucent", @@ -21,24 +20,12 @@ "from": [0, 0, 0 ], "to": [16, 16, 16], "faces": { - "down": { "texture": "#layer0", "cullface": "down", "tintindex": 0 }, - "up": { "texture": "#layer0", "cullface": "up", "tintindex": 0 }, - "north": { "texture": "#layer0", "cullface": "north", "tintindex": 0 }, - "south": { "texture": "#layer0", "cullface": "south", "tintindex": 0 }, - "west": { "texture": "#layer0", "cullface": "west", "tintindex": 0 }, - "east": { "texture": "#layer0", "cullface": "east", "tintindex": 0 } - } - }, - { - "from": [0, 0, 0 ], - "to": [16, 16, 16], - "faces": { - "down": { "texture": "#layer1", "cullface": "down", "tintindex": 1 }, - "up": { "texture": "#layer1", "cullface": "up", "tintindex": 1 }, - "north": { "texture": "#layer1", "cullface": "north", "tintindex": 1 }, - "south": { "texture": "#layer1", "cullface": "south", "tintindex": 1 }, - "west": { "texture": "#layer1", "cullface": "west", "tintindex": 1 }, - "east": { "texture": "#layer1", "cullface": "east", "tintindex": 1 } + "down": { "texture": "#layer0", "cullface": "down" }, + "up": { "texture": "#layer0", "cullface": "up" }, + "north": { "texture": "#layer0", "cullface": "north" }, + "south": { "texture": "#layer0", "cullface": "south" }, + "west": { "texture": "#layer0", "cullface": "west" }, + "east": { "texture": "#layer0", "cullface": "east" } } } ] diff --git a/kubejs/assets/gtceu/models/block/material_sets/tfc_silver/ore.json b/kubejs/assets/gtceu/models/block/material_sets/tfc_silver/ore.json index ff2065dc55..acae7f4c85 100644 --- a/kubejs/assets/gtceu/models/block/material_sets/tfc_silver/ore.json +++ b/kubejs/assets/gtceu/models/block/material_sets/tfc_silver/ore.json @@ -2,7 +2,7 @@ "parent": "block/block", "loader": "forge:composite", "textures": { - "particle": "gtceu:block/material_sets/tfc_silver/ore" + "particle": "tfc:block/ore/normal_native_silver" }, "children": { "base_stone": { @@ -11,8 +11,7 @@ "ore_texture": { "parent": "block/block", "textures": { - "layer0": "gtceu:block/material_sets/tfc_silver/ore", - "layer1": "gtceu:block/material_sets/tfc_silver/ore_layer2", + "layer0": "tfc:block/ore/normal_native_silver", "particle": "#layer0" }, "render_type": "translucent", @@ -21,24 +20,12 @@ "from": [0, 0, 0 ], "to": [16, 16, 16], "faces": { - "down": { "texture": "#layer0", "cullface": "down", "tintindex": 0 }, - "up": { "texture": "#layer0", "cullface": "up", "tintindex": 0 }, - "north": { "texture": "#layer0", "cullface": "north", "tintindex": 0 }, - "south": { "texture": "#layer0", "cullface": "south", "tintindex": 0 }, - "west": { "texture": "#layer0", "cullface": "west", "tintindex": 0 }, - "east": { "texture": "#layer0", "cullface": "east", "tintindex": 0 } - } - }, - { - "from": [0, 0, 0 ], - "to": [16, 16, 16], - "faces": { - "down": { "texture": "#layer1", "cullface": "down", "tintindex": 1 }, - "up": { "texture": "#layer1", "cullface": "up", "tintindex": 1 }, - "north": { "texture": "#layer1", "cullface": "north", "tintindex": 1 }, - "south": { "texture": "#layer1", "cullface": "south", "tintindex": 1 }, - "west": { "texture": "#layer1", "cullface": "west", "tintindex": 1 }, - "east": { "texture": "#layer1", "cullface": "east", "tintindex": 1 } + "down": { "texture": "#layer0", "cullface": "down" }, + "up": { "texture": "#layer0", "cullface": "up" }, + "north": { "texture": "#layer0", "cullface": "north" }, + "south": { "texture": "#layer0", "cullface": "south" }, + "west": { "texture": "#layer0", "cullface": "west" }, + "east": { "texture": "#layer0", "cullface": "east" } } } ] diff --git a/kubejs/assets/gtceu/models/block/material_sets/tfc_tetrahedrite/ore.json b/kubejs/assets/gtceu/models/block/material_sets/tfc_tetrahedrite/ore.json index d2aac50a56..2e001138cd 100644 --- a/kubejs/assets/gtceu/models/block/material_sets/tfc_tetrahedrite/ore.json +++ b/kubejs/assets/gtceu/models/block/material_sets/tfc_tetrahedrite/ore.json @@ -2,7 +2,7 @@ "parent": "block/block", "loader": "forge:composite", "textures": { - "particle": "gtceu:block/material_sets/tfc_tetrahedrite/ore" + "particle": "tfc:block/ore/normal_tetrahedrite" }, "children": { "base_stone": { @@ -11,8 +11,7 @@ "ore_texture": { "parent": "block/block", "textures": { - "layer0": "gtceu:block/material_sets/tfc_tetrahedrite/ore", - "layer1": "gtceu:block/material_sets/tfc_tetrahedrite/ore_layer2", + "layer0": "tfc:block/ore/normal_tetrahedrite", "particle": "#layer0" }, "render_type": "translucent", @@ -21,24 +20,12 @@ "from": [0, 0, 0 ], "to": [16, 16, 16], "faces": { - "down": { "texture": "#layer0", "cullface": "down", "tintindex": 0 }, - "up": { "texture": "#layer0", "cullface": "up", "tintindex": 0 }, - "north": { "texture": "#layer0", "cullface": "north", "tintindex": 0 }, - "south": { "texture": "#layer0", "cullface": "south", "tintindex": 0 }, - "west": { "texture": "#layer0", "cullface": "west", "tintindex": 0 }, - "east": { "texture": "#layer0", "cullface": "east", "tintindex": 0 } - } - }, - { - "from": [0, 0, 0 ], - "to": [16, 16, 16], - "faces": { - "down": { "texture": "#layer1", "cullface": "down", "tintindex": 1 }, - "up": { "texture": "#layer1", "cullface": "up", "tintindex": 1 }, - "north": { "texture": "#layer1", "cullface": "north", "tintindex": 1 }, - "south": { "texture": "#layer1", "cullface": "south", "tintindex": 1 }, - "west": { "texture": "#layer1", "cullface": "west", "tintindex": 1 }, - "east": { "texture": "#layer1", "cullface": "east", "tintindex": 1 } + "down": { "texture": "#layer0", "cullface": "down" }, + "up": { "texture": "#layer0", "cullface": "up" }, + "north": { "texture": "#layer0", "cullface": "north" }, + "south": { "texture": "#layer0", "cullface": "south" }, + "west": { "texture": "#layer0", "cullface": "west" }, + "east": { "texture": "#layer0", "cullface": "east" } } } ] diff --git a/kubejs/startup_scripts/tfg/icon_sets.js b/kubejs/startup_scripts/tfg/icon_sets.js index 9be69670b7..8b7f4181e6 100644 --- a/kubejs/startup_scripts/tfg/icon_sets.js +++ b/kubejs/startup_scripts/tfg/icon_sets.js @@ -32,7 +32,7 @@ function registerTFGIconSets(event) { event.create('tfc_saltpeter').parent('fine') event.create('tfc_sulfur').parent('fine') event.create('tfc_amethyst').parent('ruby') - event.create('tfc_redstone').parent('fine') + event.create('tfc_redstone').parent('sand') event.create('tfc_diamond').parent('diamond') event.create('tfc_emerald').parent('emerald') event.create('tfc_lapis').parent('lapis') @@ -87,7 +87,6 @@ function modifyTFGIconSets(event) { GTMaterials.Pyrite.setMaterialIconSet(GTMaterialIconSet.getByName('tfc_pyrite')) GTMaterials.Ruby.setMaterialIconSet(GTMaterialIconSet.getByName('tfc_ruby')) GTMaterials.Sapphire.setMaterialIconSet(GTMaterialIconSet.getByName('tfc_sapphire')) - GTMaterials.GreenSapphire.setMaterialIconSet(GTMaterialIconSet.getByName('tfc_sapphire')) GTMaterials.Topaz.setMaterialIconSet(GTMaterialIconSet.getByName('tfc_topaz')) GTMaterials.BlueTopaz.setMaterialIconSet(GTMaterialIconSet.getByName('tfc_topaz')) @@ -152,6 +151,7 @@ function modifyTFGIconSets(event) { GTMaterials.GlauconiteSand.setMaterialIconSet(GTMaterialIconSet.SAND) GTMaterials.Goethite.setMaterialIconSet(GTMaterialIconSet.getByName('bladed')) GTMaterials.GraniticMineralSand.setMaterialIconSet(GTMaterialIconSet.SAND) + GTMaterials.GreenSapphire.setMaterialIconSet(GTMaterialIconSet.getByName('monoclinic_gem_horizontal')) GTMaterials.Grossular.setMaterialIconSet(GTMaterialIconSet.getByName('monoclinic_ruby')) GTMaterials.Ilmenite.setMaterialIconSet(GTMaterialIconSet.getByName('monoclinic_gem_horizontal')) GTMaterials.Kyanite.setMaterialIconSet(GTMaterialIconSet.getByName('bladed')) From 85dcd145f358098320401749af3286c5a645fbeb Mon Sep 17 00:00:00 2001 From: Pyritie Date: Tue, 23 Jun 2026 16:17:56 +0100 Subject: [PATCH 39/43] renamed nether quartz to smoky quartz --- kubejs/assets/ae2/lang/en_us.json | 1 + kubejs/assets/gtceu/lang/en_us.json | 2 +- kubejs/assets/minecraft/lang/en_us.json | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/kubejs/assets/ae2/lang/en_us.json b/kubejs/assets/ae2/lang/en_us.json index 79c169239f..15bc23691d 100644 --- a/kubejs/assets/ae2/lang/en_us.json +++ b/kubejs/assets/ae2/lang/en_us.json @@ -18,5 +18,6 @@ "gui.advanced_ae.AdvPatternProvider": "", "gui.ae2.inWorldCraftingPresses": "Crafting Presses are obtained by breaking a Mysterious Cube. Mysterious Cubes are in the center of meteorites which can be found on the moon.", "gui.expandedae.exp_pattern_provider": "", + "item.ae2.nether_quartz_cutting_knife": "Smoky Quartz Cutting Knife", "item.ae2.sky_dust": "Suevite Dust" } \ 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 0432b5bab8..14b4004f9c 100644 --- a/kubejs/assets/gtceu/lang/en_us.json +++ b/kubejs/assets/gtceu/lang/en_us.json @@ -5628,7 +5628,7 @@ "material.gtceu.neptunium": "Neptunium", "material.gtceu.neptunium_237": "Neptunium 237", "material.gtceu.nether_air": "Nether Air", - "material.gtceu.nether_quartz": "Nether Quartz", + "material.gtceu.nether_quartz": "Smoky Quartz", "material.gtceu.nether_star": "Nether Star", "material.gtceu.netherite": "Netherite", "material.gtceu.netherrack": "Netherrack", diff --git a/kubejs/assets/minecraft/lang/en_us.json b/kubejs/assets/minecraft/lang/en_us.json index 842ba2240a..c1ad0dac05 100644 --- a/kubejs/assets/minecraft/lang/en_us.json +++ b/kubejs/assets/minecraft/lang/en_us.json @@ -112,6 +112,7 @@ "item.minecraft.nether_brick": "Keratophyre Brick", "item.minecraft.netherite_boots": "Blue Steel Lavaproof Boots", "item.minecraft.netherite_leggings": "Blue Steel Diving Leggings", + "item.minecraft.quartz": "Smoky Quartz", "item.minecraft.shield": "Wooden Shield", "item.minecraft.shield.black": "Black Wooden Shield", "item.minecraft.shield.blue": "Blue Wooden Shield", From 43b54e59c17c13ab3ea205499d38101edb226aeb Mon Sep 17 00:00:00 2001 From: Pyritie Date: Tue, 23 Jun 2026 17:09:55 +0100 Subject: [PATCH 40/43] horse crank --- CHANGELOG.md | 2 ++ defaultconfigs/createhorsepower-server.toml | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 118f99d72a..f43dc66be8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ - Added peanut oil recipes, with all the same uses as seed oil @Redeix @Pyritie - Containers can no longer be used with the Interplanetary Wireless Card, and transferring items is now 8x more expensive (blocks are the same energy cost as before). Set up railguns! @ashleney - Added shaped crafting recipes for train tracks (#4335) @strangelyng +- Renamed Nether Quartz to Smoky Quartz @Pyritie +- Mammutilations and slimes can now be used on the animal crank @Pyritie ### Bug fixes - Fixed some floating chests in the new mineshafts, made mineshafts avoid spawning near rivers, and fixed one of the segments not blocking water correctly @Pyritie @BlueBoat29 - Fixed some beneath tower chests being empty @Pyritie diff --git a/defaultconfigs/createhorsepower-server.toml b/defaultconfigs/createhorsepower-server.toml index 64d180f5a8..116728791a 100644 --- a/defaultconfigs/createhorsepower-server.toml +++ b/defaultconfigs/createhorsepower-server.toml @@ -26,9 +26,9 @@ normalPathBlock = ["tfc:rock/gravel/granite", "tfc:rock/gravel/diorite", "tfc:ro #Types of blocks valid as "Great" quality greatPathBlock = ["rnr:rock/gravel_road/chert", "rnr:rock/gravel_road/chalk", "rnr:rock/gravel_road/rhyolite", "rnr:rock/gravel_road/basalt", "rnr:rock/gravel_road/andesite", "rnr:rock/gravel_road/claystone", "rnr:rock/gravel_road/limestone", "rnr:rock/gravel_road/conglomerate", "rnr:rock/gravel_road/dolomite", "rnr:rock/sett_road/granite", "rnr:rock/sett_road/diorite", "rnr:rock/sett_road/chalk", "rnr:rock/sett_road/rhyolite", "rnr:rock/sett_road/basalt", "rnr:rock/sett_road/quartzite", "rnr:rock/sett_road/dacite", "rnr:rock/sett_road/andesite", "rnr:rock/cobbled_road/chert", "rnr:rock/cobbled_road/dolomite", "rnr:rock/gravel_road/granite", "rnr:rock/gravel_road/marble", "rnr:rock/gravel_road/schist", "rnr:rock/gravel_road/phyllite", "rnr:rock/gravel_road/slate", "rnr:rock/gravel_road/quartzite", "rnr:rock/gravel_road/dacite", "rnr:rock/macadam_road/rhyolite", "rnr:rock/macadam_road/chalk", "rnr:rock/macadam_road/chert", "rnr:rock/macadam_road/dolomite", "rnr:rock/macadam_road/conglomerate", "rnr:rock/macadam_road/limestone", "rnr:rock/macadam_road/gabbro", "rnr:rock/macadam_road/claystone", "rnr:rock/macadam_road/shale", "rnr:rock/macadam_road/gneiss", "rnr:rock/macadam_road/marble", "rnr:rock/macadam_road/schist", "rnr:rock/macadam_road/phyllite", "rnr:rock/macadam_road/slate", "rnr:rock/macadam_road/quartzite", "rnr:rock/macadam_road/dacite", "rnr:rock/macadam_road/andesite", "rnr:rock/macadam_road/basalt", "rnr:rock/gravel_road/diorite", "rnr:rock/gravel_road/gabbro", "rnr:rock/gravel_road/shale", "rnr:rock/macadam_road/diorite", "rnr:rock/macadam_road/granite", "rnr:rock/cobbled_road/conglomerate", "rnr:rock/cobbled_road/limestone", "rnr:rock/cobbled_road/claystone", "rnr:rock/cobbled_road/shale", "rnr:rock/cobbled_road/gabbro", "rnr:rock/cobbled_road/diorite", "rnr:rock/cobbled_road/granite", "rnr:rock/cobbled_road/phyllite", "rnr:rock/cobbled_road/schist", "rnr:rock/cobbled_road/slate", "rnr:rock/cobbled_road/quartzite", "rnr:rock/cobbled_road/dacite", "rnr:rock/cobbled_road/andesite", "rnr:rock/cobbled_road/rhyolite", "rnr:rock/cobbled_road/basalt", "rnr:rock/cobbled_road/chalk", "rnr:rock/cobbled_road/gneiss", "rnr:rock/cobbled_road/marble", "rnr:rock/sett_road/chert", "rnr:rock/sett_road/dolomite", "rnr:rock/sett_road/conglomerate", "rnr:rock/sett_road/limestone", "rnr:rock/sett_road/claystone", "rnr:rock/sett_road/shale", "rnr:rock/sett_road/gabbro", "rnr:rock/flagstones/gneiss", "rnr:rock/flagstones/marble", "rnr:black_sandstone_flagstones", "rnr:brown_sandstone_flagstones", "rnr:green_sandstone_flagstones", "rnr:pink_sandstone_flagstones", "rnr:red_sandstone_flagstones", "rnr:white_sandstone_flagstones", "rnr:yellow_sandstone_flagstones", "rnr:concrete_road_sett", "rnr:brick_road", "rnr:rock/sett_road/marble", "rnr:rock/sett_road/gneiss", "rnr:rock/sett_road/schist", "rnr:rock/sett_road/phyllite", "rnr:rock/sett_road/slate", "rnr:rock/sett_road/quartzite", "rnr:rock/sett_road/dacite", "rnr:rock/flagstones/chert", "rnr:rock/flagstones/dolomite", "rnr:rock/flagstones/conglomerate", "rnr:rock/flagstones/limestone", "rnr:rock/flagstones/claystone", "rnr:rock/flagstones/shale", "rnr:rock/flagstones/gabbro", "rnr:rock/flagstones/diorite", "rnr:rock/flagstones/granite", "rnr:rock/flagstones/schist", "rnr:rock/flagstones/phyllite", "rnr:rock/flagstones/slate", "rnr:rock/flagstones/quartzite", "rnr:rock/flagstones/andesite", "rnr:rock/flagstones/dacite", "rnr:rock/flagstones/basalt", "rnr:rock/flagstones/rhyolite", "rnr:rock/flagstones/chalk", "greate:steel_shaft", "greate:steel_cogwheel", "greate:large_steel_cogwheel", "greate:andesite_alloy_shaft", "greate:andesite_alloy_cogwheel", "greate:large_andesite_alloy_cogwheel"] #Valid "Small" creatures -smallCreatures = ["tfc:wolf", "tfc:dog", "tfc:pig", "tfc:sheep", "tfc:goat", "tfc:alpaca", "tfg:glacian_ram", "tfg:wraptor", "tfg:surfer"] +smallCreatures = ["tfc:wolf", "tfc:dog", "tfc:pig", "tfc:sheep", "tfc:goat", "tfc:alpaca", "tfg:glacian_ram", "tfg:wraptor", "tfg:surfer", "tfg:slime"] #Valid "Medium" creatures mediumCreatures = ["tfc:cow", "tfc:donkey", "tfc:dolphin", "wan_ancient_beasts:glider", "wan_ancient_beasts:soarer"] #Valid "Large" creatures -largeCreatures = ["tfc:horse", "tfc:mule", "tfc:musk_ox", "tfc:yak", "tfg:sniffer", "wan_ancient_beasts:walker", "species:cruncher", "wan_ancient_beasts:charger"] +largeCreatures = ["tfc:horse", "tfc:mule", "tfc:musk_ox", "tfc:yak", "tfg:sniffer", "wan_ancient_beasts:walker", "species:cruncher", "wan_ancient_beasts:charger", "species:mammutilation"] From 577ee3244733bf2dccb9e13b53dbe230bea1a4d0 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Tue, 23 Jun 2026 18:29:55 +0100 Subject: [PATCH 41/43] pakku --- pakku-lock.json | 285 ++++++++++++++++++++++++------------------------ 1 file changed, 142 insertions(+), 143 deletions(-) diff --git a/pakku-lock.json b/pakku-lock.json index e9d178b1af..3513377c15 100644 --- a/pakku-lock.json +++ b/pakku-lock.json @@ -4834,7 +4834,7 @@ "files": [ { "type": "modrinth", - "file_name": "CreativeCore_FORGE_v2.12.38_mc1.20.1.jar", + "file_name": "CreativeCore_FORGE_v2.12.39_mc1.20.1.jar", "mc_versions": [ "1.20.1" ], @@ -4843,20 +4843,20 @@ "neoforge" ], "release_type": "release", - "url": "https://cdn.modrinth.com/data/OsZiaDHq/versions/J9tluyYl/CreativeCore_FORGE_v2.12.38_mc1.20.1.jar", - "id": "J9tluyYl", + "url": "https://cdn.modrinth.com/data/OsZiaDHq/versions/m9VEcxwz/CreativeCore_FORGE_v2.12.39_mc1.20.1.jar", + "id": "m9VEcxwz", "parent_id": "OsZiaDHq", "hashes": { - "sha512": "fb4460c6c808369bd8a2191413e2f59126ff6113ff266f40a8c872b9d412b7a804a66c8f8de58af48581c649cd23d59ae1b183af8031d532d5bbd595c3187f04", - "sha1": "1004b6ae4e494039e28b14f2ba3ebe6b182487a8" + "sha512": "6eb47ce94e00d2321deed8c646b81f0463b8a42e628fdfb07f3792c4bcb15fa7638ad3e52e332a0819c14a1346d71b6496dda64094f6b626a2dbfba0fba2d021", + "sha1": "aef9a8ebdf0be50b6bd8da8ab4153f5085f71a80" }, "required_dependencies": [], - "size": 1144069, - "date_published": "2026-05-22T11:45:52.667177Z" + "size": 1144128, + "date_published": "2026-06-23T06:57:03.995569Z" }, { "type": "curseforge", - "file_name": "CreativeCore_FORGE_v2.12.38_mc1.20.1.jar", + "file_name": "CreativeCore_FORGE_v2.12.39_mc1.20.1.jar", "mc_versions": [ "1.20.1" ], @@ -4865,16 +4865,16 @@ "neoforge" ], "release_type": "release", - "url": "https://edge.forgecdn.net/files/8127/295/CreativeCore_FORGE_v2.12.38_mc1.20.1.jar", - "id": "8127295", + "url": "https://edge.forgecdn.net/files/8304/882/CreativeCore_FORGE_v2.12.39_mc1.20.1.jar", + "id": "8304882", "parent_id": "257814", "hashes": { - "sha1": "1004b6ae4e494039e28b14f2ba3ebe6b182487a8", - "md5": "2dcd30a9a9c1f0cd468915dad15d6401" + "sha1": "aef9a8ebdf0be50b6bd8da8ab4153f5085f71a80", + "md5": "941e290ecd7ca54c2ed6a543b68d754b" }, "required_dependencies": [], - "size": 1144069, - "date_published": "2026-05-22T11:45:54.267Z" + "size": 1144128, + "date_published": "2026-06-23T06:57:05.353Z" } ] }, @@ -5171,52 +5171,52 @@ }, "files": [ { - "type": "curseforge", - "file_name": "defaultoptions-forge-1.20.1-18.0.4.jar", + "type": "modrinth", + "file_name": "defaultoptions-forge-1.20.1-18.0.5.jar", "mc_versions": [ - "1.20.1", - "1.20" + "1.20", + "1.20.1" ], "loaders": [ "forge" ], "release_type": "release", - "url": "https://edge.forgecdn.net/files/6972/483/defaultoptions-forge-1.20.1-18.0.4.jar", - "id": "6972483", - "parent_id": "232131", + "url": "https://cdn.modrinth.com/data/WEg59z5b/versions/AVz3mvZZ/defaultoptions-forge-1.20.1-18.0.5.jar", + "id": "AVz3mvZZ", + "parent_id": "WEg59z5b", "hashes": { - "sha1": "37ef64d3ae7fda292c882ee949a0280bf6c7f033", - "md5": "2a453bba939907b55d4d7e0c31e6d8ad" + "sha512": "703f2a710ab099fadaaeb96a02fd381ef8eda2f60bb80537c2e7855fc505bf36bbff3e1df216bc85fd60841bb548c3785314fdcef39d12c2ebfabb224b066e0d", + "sha1": "7189cbc87aaa982a44514bf92b139f7b43203a91" }, "required_dependencies": [ - "531761" + "MBAkmtvl" ], - "size": 94684, - "date_published": "2025-09-07T12:29:22.480Z" + "size": 101393, + "date_published": "2026-06-20T12:47:15.845893Z" }, { - "type": "modrinth", - "file_name": "defaultoptions-forge-1.20.1-18.0.4.jar", + "type": "curseforge", + "file_name": "defaultoptions-forge-1.20.1-18.0.5.jar", "mc_versions": [ - "1.20", - "1.20.1" + "1.20.1", + "1.20" ], "loaders": [ "forge" ], "release_type": "release", - "url": "https://cdn.modrinth.com/data/WEg59z5b/versions/t5i53ltA/defaultoptions-forge-1.20.1-18.0.4.jar", - "id": "t5i53ltA", - "parent_id": "WEg59z5b", + "url": "https://edge.forgecdn.net/files/8286/304/defaultoptions-forge-1.20.1-18.0.5.jar", + "id": "8286304", + "parent_id": "232131", "hashes": { - "sha512": "01e9bc32c967a9ccce0504d0b88245e8a3b27cea1e29ed4740a06064179387e28f36dbd2e95401eb38854984361e06b8d58cca3f0d4ba88d660b2d0013845bc9", - "sha1": "37ef64d3ae7fda292c882ee949a0280bf6c7f033" + "sha1": "dddab6a5ff092b4535e9fdfb01e1e011afb90e57", + "md5": "37321393e4891b2cd40bde1f16de4c7b" }, "required_dependencies": [ - "MBAkmtvl" + "531761" ], - "size": 94684, - "date_published": "2025-09-07T12:29:20.644337Z" + "size": 101393, + "date_published": "2026-06-20T12:46:40.787Z" } ] }, @@ -8172,8 +8172,8 @@ }, "files": [ { - "type": "curseforge", - "file_name": "geckolib-forge-1.20.1-4.8.3.jar", + "type": "modrinth", + "file_name": "geckolib-forge-1.20.1-4.8.4.jar", "mc_versions": [ "1.20.1" ], @@ -8181,20 +8181,20 @@ "forge" ], "release_type": "release", - "url": "https://edge.forgecdn.net/files/7553/267/geckolib-forge-1.20.1-4.8.3.jar", - "id": "7553267", - "parent_id": "388172", + "url": "https://cdn.modrinth.com/data/8BmcQJ2H/versions/aC5KMoNg/geckolib-forge-1.20.1-4.8.4.jar", + "id": "aC5KMoNg", + "parent_id": "8BmcQJ2H", "hashes": { - "sha1": "5428765c6c2e2135da6ee01f2f0478fa0db6aee7", - "md5": "33b0f8fe0a8d59fcf9d4e222741ecba7" + "sha512": "443a321a293e3cb92fbbc3c97a38b179a45d1db703cd7bdb123270a9e04e7b7d67d5b06cd8e77a6d4d9139e033e901b9660cccf53ad5f9beaae6d06eae68febf", + "sha1": "50e1407869ef0e909e3bdda9328b8bd7db03fdc0" }, "required_dependencies": [], - "size": 1039046, - "date_published": "2026-01-31T01:40:51.330Z" + "size": 1038209, + "date_published": "2026-06-20T11:07:31.386330Z" }, { - "type": "modrinth", - "file_name": "geckolib-forge-1.20.1-4.8.3.jar", + "type": "curseforge", + "file_name": "geckolib-forge-1.20.1-4.8.4.jar", "mc_versions": [ "1.20.1" ], @@ -8202,16 +8202,16 @@ "forge" ], "release_type": "release", - "url": "https://cdn.modrinth.com/data/8BmcQJ2H/versions/HVdLnQMI/geckolib-forge-1.20.1-4.8.3.jar", - "id": "HVdLnQMI", - "parent_id": "8BmcQJ2H", + "url": "https://edge.forgecdn.net/files/8285/794/geckolib-forge-1.20.1-4.8.4.jar", + "id": "8285794", + "parent_id": "388172", "hashes": { - "sha512": "938f1f703fa77a2e05aad4afa1052260521badee006d29529d0ed4e2d3fbaae47c9ffbc95b5c4982c3386e7e7d6592c9c79df31597cc8238db41fc0b1e431db6", - "sha1": "fead1d1645e16cfa02f39113481ead355230f8fd" + "sha1": "81982cc287f80ffabb2fd36d22cc95e4255c739d", + "md5": "83c73bcbf5778235569025ed968dc3ec" }, "required_dependencies": [], - "size": 1039047, - "date_published": "2026-01-31T01:40:17.094003Z" + "size": 1038209, + "date_published": "2026-06-20T11:07:46.873Z" } ] }, @@ -9721,7 +9721,7 @@ "files": [ { "type": "modrinth", - "file_name": "iris_shader_folder-1.3.2-forge.jar", + "file_name": "iris_shader_folder-1.3.3-forge.jar", "mc_versions": [ "1.16", "1.16.1", @@ -9751,51 +9751,47 @@ "forge" ], "release_type": "release", - "url": "https://cdn.modrinth.com/data/yv6sGJzN/versions/eP25Ybe8/iris_shader_folder-1.3.2-forge.jar", - "id": "eP25Ybe8", + "url": "https://cdn.modrinth.com/data/yv6sGJzN/versions/7cXscX3A/iris_shader_folder-1.3.3-forge.jar", + "id": "7cXscX3A", "parent_id": "yv6sGJzN", "hashes": { - "sha512": "f1df5804a4d018a025d41c75553d935681d3068e0a0e3791c765d6fac13f2bd574e2e76d206a54d330c5564a1acd65d982ce4a7dbabe397f91b666275ae61287", - "sha1": "33b73231c5e7bc54f5fe6159b4c8903205c7af66" + "sha512": "35723eb87237385fab389b22e2ba306941e137d574bc07586ebfb4ddb54dfd1ba9cb0160b2bc825d1075b33885e944ee030935a7f99b035616c4e576c6c052e2", + "sha1": "33135c8e3b288e7b6503b1b80893494ce7d0a8f0" }, "required_dependencies": [ "GchcoXML" ], - "size": 201262, - "date_published": "2026-05-13T08:39:45.335608Z" + "size": 838571, + "date_published": "2026-06-23T07:14:16.863071Z" }, { "type": "curseforge", - "file_name": "iris_shader_folder-1.3.2-forge.jar", + "file_name": "iris_shader_folder-1.3.3-forge.jar", "mc_versions": [ - "1.20.2-Snapshot", - "1.20.5-Snapshot", "1.20.2", "1.20.5", "1.20.1", "1.20", "1.20.6", - "1.20-Snapshot", "1.20.4", - "1.20.3-Snapshot", "1.20.3" ], "loaders": [ "forge" ], "release_type": "release", - "url": "https://edge.forgecdn.net/files/8081/779/iris_shader_folder-1.3.2-forge.jar", - "id": "8081779", + "url": "https://edge.forgecdn.net/files/8304/951/iris_shader_folder-1.3.3-forge.jar", + "id": "8304951", "parent_id": "1351246", "hashes": { - "sha1": "33b73231c5e7bc54f5fe6159b4c8903205c7af66", - "md5": "e9e83c4db1ea720d25e35782b649069c" + "sha1": "33135c8e3b288e7b6503b1b80893494ce7d0a8f0", + "md5": "e8d237989a1c29e4ee5f6a2944171d01" }, "required_dependencies": [ "581495" ], - "size": 201262, - "date_published": "2026-05-13T08:46:13.223Z" + "size": 838571, + "date_published": "2026-06-23T07:14:17.217Z" } ] }, @@ -9883,8 +9879,8 @@ }, "files": [ { - "type": "curseforge", - "file_name": "ItemPhysicLite_FORGE_v1.6.10_mc1.20.1.jar", + "type": "modrinth", + "file_name": "ItemPhysicLite_FORGE_v1.6.11_mc1.20.1.jar", "mc_versions": [ "1.20.1" ], @@ -9893,22 +9889,22 @@ "neoforge" ], "release_type": "release", - "url": "https://edge.forgecdn.net/files/8004/884/ItemPhysicLite_FORGE_v1.6.10_mc1.20.1.jar", - "id": "8004884", - "parent_id": "270441", + "url": "https://cdn.modrinth.com/data/OuyCgP8t/versions/Zh7HJ29w/ItemPhysicLite_FORGE_v1.6.11_mc1.20.1.jar", + "id": "Zh7HJ29w", + "parent_id": "OuyCgP8t", "hashes": { - "sha1": "7176737db20a4deb50bd5624b07ded22acb81fd5", - "md5": "1587b853be01d951fbbf2c374d35d757" + "sha512": "7dee05b646a3e6d75f044f47cbc1597ecd4d7a4c293cdb0fdda4ff85af109ea13c8ea0dd7c61f35dc6ee58016391a407cd3ec09574fc66da19778908b7b16974", + "sha1": "c89e1b6493dfa8c129f7f36f6cc788ca4351f4c5" }, "required_dependencies": [ - "257814" + "OsZiaDHq" ], - "size": 19504, - "date_published": "2026-04-28T11:50:59.467Z" + "size": 21284, + "date_published": "2026-06-22T09:18:01.016249Z" }, { - "type": "modrinth", - "file_name": "ItemPhysicLite_FORGE_v1.6.10_mc1.20.1.jar", + "type": "curseforge", + "file_name": "ItemPhysicLite_FORGE_v1.6.11_mc1.20.1.jar", "mc_versions": [ "1.20.1" ], @@ -9917,18 +9913,18 @@ "neoforge" ], "release_type": "release", - "url": "https://cdn.modrinth.com/data/OuyCgP8t/versions/PjXlVWZI/ItemPhysicLite_FORGE_v1.6.10_mc1.20.1.jar", - "id": "PjXlVWZI", - "parent_id": "OuyCgP8t", + "url": "https://edge.forgecdn.net/files/8299/30/ItemPhysicLite_FORGE_v1.6.11_mc1.20.1.jar", + "id": "8299030", + "parent_id": "270441", "hashes": { - "sha512": "d7d992311d9c3bbfe1a1c1ab89b7c6618cfcf95e4a4fdfbee10b341cd9ca184575b6e9b54c7d0c15805848a38ceb948fd4eac5158a9ebedcb4eae0079e74940f", - "sha1": "7176737db20a4deb50bd5624b07ded22acb81fd5" + "sha1": "c89e1b6493dfa8c129f7f36f6cc788ca4351f4c5", + "md5": "f2f72dbbea21af593f48a3c934e42bfe" }, "required_dependencies": [ - "OsZiaDHq" + "257814" ], - "size": 19504, - "date_published": "2026-04-28T11:50:57.918201Z" + "size": 21284, + "date_published": "2026-06-22T09:18:03.010Z" } ] }, @@ -10427,8 +10423,8 @@ }, "files": [ { - "type": "curseforge", - "file_name": "kubejs_tfc-1.20.1-1.3.4.jar", + "type": "modrinth", + "file_name": "kubejs_tfc-1.20.1-1.3.5.jar", "mc_versions": [ "1.20.1" ], @@ -10437,23 +10433,23 @@ "neoforge" ], "release_type": "release", - "url": "https://edge.forgecdn.net/files/7948/670/kubejs_tfc-1.20.1-1.3.4.jar", - "id": "7948670", - "parent_id": "841001", + "url": "https://cdn.modrinth.com/data/mhtClB2S/versions/HNprLaYs/kubejs_tfc-1.20.1-1.3.5.jar", + "id": "HNprLaYs", + "parent_id": "mhtClB2S", "hashes": { - "sha1": "4d252791f33012f81d28a6ce19ebcd3f6081e8b4", - "md5": "a90a7abe437aa1ec4d8376c2c635be0e" + "sha512": "ccba8d3fab2e44e3fe07d76338a69ae646cba7f41738736748f0e15de224993b93ee599c60b62bb2c83e435042f4d8963600c7cc2f6ad0642cc3d36c6e4bac7c", + "sha1": "b6b6d0520bb144c8802385c4e8a7f9103a86c258" }, "required_dependencies": [ - "238086", - "302973" + "JaCEZUhg", + "umyGl7zF" ], - "size": 986787, - "date_published": "2026-04-19T05:54:37.090Z" + "size": 986791, + "date_published": "2026-06-20T01:00:23.492183Z" }, { - "type": "modrinth", - "file_name": "kubejs_tfc-1.20.1-1.3.4.jar", + "type": "curseforge", + "file_name": "kubejs_tfc-1.20.1-1.3.5.jar", "mc_versions": [ "1.20.1" ], @@ -10462,16 +10458,19 @@ "neoforge" ], "release_type": "release", - "url": "https://cdn.modrinth.com/data/mhtClB2S/versions/3uRavUwO/kubejs_tfc-1.20.1-1.3.4.jar", - "id": "3uRavUwO", - "parent_id": "mhtClB2S", + "url": "https://edge.forgecdn.net/files/8283/526/kubejs_tfc-1.20.1-1.3.5.jar", + "id": "8283526", + "parent_id": "841001", "hashes": { - "sha512": "516b1352b1952476e000ca020107d7fb0b724d2769669b40bc453b46322ebc911939f568058b87bac511f216ca021e4d534ac3542578f2439f660156c21f7811", - "sha1": "4d252791f33012f81d28a6ce19ebcd3f6081e8b4" + "sha1": "b6b6d0520bb144c8802385c4e8a7f9103a86c258", + "md5": "fe2626896e79a7c8beccaa00c79cee0b" }, - "required_dependencies": [], - "size": 986787, - "date_published": "2026-04-19T05:54:39.885870Z" + "required_dependencies": [ + "238086", + "302973" + ], + "size": 986791, + "date_published": "2026-06-20T01:00:14.780Z" } ] }, @@ -14120,7 +14119,7 @@ "files": [ { "type": "modrinth", - "file_name": "sophisticatedcore-1.20.1-1.3.55.2031.jar", + "file_name": "sophisticatedcore-1.20.1-1.3.56.2042.jar", "mc_versions": [ "1.20.1" ], @@ -14129,20 +14128,20 @@ "neoforge" ], "release_type": "release", - "url": "https://cdn.modrinth.com/data/nmoqTijg/versions/bu49Ey12/sophisticatedcore-1.20.1-1.3.55.2031.jar", - "id": "bu49Ey12", + "url": "https://cdn.modrinth.com/data/nmoqTijg/versions/XlE1jclJ/sophisticatedcore-1.20.1-1.3.56.2042.jar", + "id": "XlE1jclJ", "parent_id": "nmoqTijg", "hashes": { - "sha512": "81569ee6b6570021ce3aaab892cb8f90dcee2b61d1916161c2dd5b08dde4e6a23000896386562c420fafacdb0d063b63962c13fe16bae015f0b94d14c1b3960d", - "sha1": "02d5c3e42f26a58a110d1cb99d2f56a0b300096a" + "sha512": "ac38d361300d0856b82d5e593a3d658c889eb6bdd27ae051ca78cffc1a0cfbb2cd1d6ae75cacc04f364323fc348bffcef78b754d4a3d03955abcb90e244f8b8b", + "sha1": "a8097dc3a58605f85ff3ac7c0c85ef13c9ae3ad3" }, "required_dependencies": [], - "size": 1606240, - "date_published": "2026-06-18T11:39:01.893433Z" + "size": 1606249, + "date_published": "2026-06-23T07:01:05.960228Z" }, { "type": "curseforge", - "file_name": "sophisticatedcore-1.20.1-1.3.55.2031.jar", + "file_name": "sophisticatedcore-1.20.1-1.3.56.2042.jar", "mc_versions": [ "1.20.1" ], @@ -14151,16 +14150,16 @@ "neoforge" ], "release_type": "release", - "url": "https://edge.forgecdn.net/files/8272/318/sophisticatedcore-1.20.1-1.3.55.2031.jar", - "id": "8272318", + "url": "https://edge.forgecdn.net/files/8304/899/sophisticatedcore-1.20.1-1.3.56.2042.jar", + "id": "8304899", "parent_id": "618298", "hashes": { - "sha1": "a6692d8c0d8cf50fdd7b19976de4e55bb01cdffa", - "md5": "2362410dcc61474698b82005d7eee137" + "sha1": "62698715c9f514a0f76b19fd58a55d97d04c4bb4", + "md5": "72ae42a446aa5d4f506829082d606a4d" }, "required_dependencies": [], - "size": 1606240, - "date_published": "2026-06-18T11:37:56.107Z" + "size": 1606250, + "date_published": "2026-06-23T07:00:21.393Z" } ] }, @@ -16844,7 +16843,7 @@ "files": [ { "type": "modrinth", - "file_name": "xaeroworldmap-forge-1.20.1-1.41.0.jar", + "file_name": "xaeroworldmap-forge-1.20.1-1.41.2.jar", "mc_versions": [ "1.20", "1.20.1" @@ -16853,20 +16852,20 @@ "forge" ], "release_type": "release", - "url": "https://cdn.modrinth.com/data/NcUtCpym/versions/2QCjQ4y4/xaeroworldmap-forge-1.20.1-1.41.0.jar", - "id": "2QCjQ4y4", + "url": "https://cdn.modrinth.com/data/NcUtCpym/versions/wciL1Yas/xaeroworldmap-forge-1.20.1-1.41.2.jar", + "id": "wciL1Yas", "parent_id": "NcUtCpym", "hashes": { - "sha512": "dd21c47593eb8caa0627bbde1e31733741272dc519fdbf0ff957d59a073604f7dd5cb6bbd228d88dc124eb57307c819f52a0a5594c9d6608f6843afcfae1b12c", - "sha1": "f2c63673810ff7b87a7fee40d34e70a04fc80ef6" + "sha512": "d8291479bb21c7aeff9a507c09f1f62e820a55dfb0a3d447a8938837eb754ca2dc72671ed01cbb4ca21cc39402820980abca936899767c02048463eecd9689a2", + "sha1": "a60d4c8e04a65ffe82f1ac89ab28a52f357fbbf2" }, "required_dependencies": [], - "size": 1389429, - "date_published": "2026-06-11T11:49:50.792631Z" + "size": 1390482, + "date_published": "2026-06-22T08:10:00.621697Z" }, { "type": "curseforge", - "file_name": "xaeroworldmap-forge-1.20.1-1.41.0.jar", + "file_name": "xaeroworldmap-forge-1.20.1-1.41.2.jar", "mc_versions": [ "1.20.1", "1.20" @@ -16875,16 +16874,16 @@ "forge" ], "release_type": "release", - "url": "https://edge.forgecdn.net/files/8231/23/xaeroworldmap-forge-1.20.1-1.41.0.jar", - "id": "8231023", + "url": "https://edge.forgecdn.net/files/8298/683/xaeroworldmap-forge-1.20.1-1.41.2.jar", + "id": "8298683", "parent_id": "317780", "hashes": { - "sha1": "f2c63673810ff7b87a7fee40d34e70a04fc80ef6", - "md5": "3d7d37fb8d136135332a5618f7d03d4f" + "sha1": "a60d4c8e04a65ffe82f1ac89ab28a52f357fbbf2", + "md5": "8e5480d7ea106fb6da96e3a84f8dfe03" }, "required_dependencies": [], - "size": 1389429, - "date_published": "2026-06-11T10:42:06.597Z" + "size": 1390482, + "date_published": "2026-06-22T07:37:56.790Z" } ] }, From 2a28945563bfbbe3c437823ecc505a9d5056901c Mon Sep 17 00:00:00 2001 From: Pyritie Date: Tue, 23 Jun 2026 18:31:02 +0100 Subject: [PATCH 42/43] 0.13.1 --- CHANGELOG.md | 6 +- config/crash_assistant/modlist.json | 90 ++++++++++++++--------------- pakku-lock.json | 32 +++++----- 3 files changed, 66 insertions(+), 62 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f43dc66be8..d1a601a638 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,9 +2,13 @@ ## Unreleased ### Changes +### Bug fixes + +## [0.13.1] - 23-06-2026 +### Changes - Accumulators (the multiblock battery for trains) and energy interfaces can now charge and discharge way faster, and hold more power @Pyritie - Added peanut oil recipes, with all the same uses as seed oil @Redeix @Pyritie -- Containers can no longer be used with the Interplanetary Wireless Card, and transferring items is now 8x more expensive (blocks are the same energy cost as before). Set up railguns! @ashleney +- Transferring items and containers is now 8x more expensive with the Interplanetary Wireless Card (blocks are the same energy cost as before). Set up railguns! @ashleney - Added shaped crafting recipes for train tracks (#4335) @strangelyng - Renamed Nether Quartz to Smoky Quartz @Pyritie - Mammutilations and slimes can now be used on the animal crank @Pyritie diff --git a/config/crash_assistant/modlist.json b/config/crash_assistant/modlist.json index 4e2d21254d..a94a174388 100644 --- a/config/crash_assistant/modlist.json +++ b/config/crash_assistant/modlist.json @@ -581,13 +581,13 @@ "curseForgeHash": 3897099345, "modrinthHash": "fa7f118552646b9bbd5c9ec103e90fa0ee282d46" }, - "CreativeCore_FORGE_v2.12.38_mc1.20.1.jar": { - "jarName": "CreativeCore_FORGE_v2.12.38_mc1.20.1.jar", + "CreativeCore_FORGE_v2.12.39_mc1.20.1.jar": { + "jarName": "CreativeCore_FORGE_v2.12.39_mc1.20.1.jar", "modId": "creativecore", "name": "CreativeCore", - "version": "2.12.38", - "curseForgeHash": 1408451101, - "modrinthHash": "1004b6ae4e494039e28b14f2ba3ebe6b182487a8" + "version": "2.12.39", + "curseForgeHash": 3260091100, + "modrinthHash": "aef9a8ebdf0be50b6bd8da8ab4153f5085f71a80" }, "Cucumber-1.20.1-7.0.16.jar": { "jarName": "Cucumber-1.20.1-7.0.16.jar", @@ -629,13 +629,13 @@ "curseForgeHash": 1396324362, "modrinthHash": "c9290eefa38a51fca425af0d45dfcd46fe050483" }, - "defaultoptions-forge-1.20.1-18.0.4.jar": { - "jarName": "defaultoptions-forge-1.20.1-18.0.4.jar", + "defaultoptions-forge-1.20.1-18.0.5.jar": { + "jarName": "defaultoptions-forge-1.20.1-18.0.5.jar", "modId": "defaultoptions", "name": "Default Options", - "version": "18.0.4", - "curseForgeHash": 3843138404, - "modrinthHash": "37ef64d3ae7fda292c882ee949a0280bf6c7f033" + "version": "18.0.5", + "curseForgeHash": 636635991, + "modrinthHash": "7189cbc87aaa982a44514bf92b139f7b43203a91" }, "diggerhelmet-1.20.1-1.0.0.29.jar": { "jarName": "diggerhelmet-1.20.1-1.0.0.29.jar", @@ -981,13 +981,13 @@ "curseForgeHash": 3620637257, "modrinthHash": "2e9ca1c5f028c251e1bc18b9ebaa06d401c8e624" }, - "geckolib-forge-1.20.1-4.8.3.jar": { - "jarName": "geckolib-forge-1.20.1-4.8.3.jar", + "geckolib-forge-1.20.1-4.8.4.jar": { + "jarName": "geckolib-forge-1.20.1-4.8.4.jar", "modId": "geckolib", "name": "GeckoLib 4", - "version": "4.8.3", - "curseForgeHash": 4092514766, - "modrinthHash": "5428765c6c2e2135da6ee01f2f0478fa0db6aee7" + "version": "4.8.4", + "curseForgeHash": 3690314662, + "modrinthHash": "81982cc287f80ffabb2fd36d22cc95e4255c739d" }, "Glodium-1.20-1.5-forge.jar": { "jarName": "Glodium-1.20-1.5-forge.jar", @@ -1125,13 +1125,13 @@ "curseForgeHash": 2510845465, "modrinthHash": "979e74fa10b24a7d7c4d9aeb5824b80f4f9235cf" }, - "iris_shader_folder-1.3.2-forge.jar": { - "jarName": "iris_shader_folder-1.3.2-forge.jar", + "iris_shader_folder-1.3.3-forge.jar": { + "jarName": "iris_shader_folder-1.3.3-forge.jar", "modId": "iris_shader_folder", "name": "Iris Shader Folder", - "version": "1.3.2-forge", - "curseForgeHash": 605797791, - "modrinthHash": "33b73231c5e7bc54f5fe6159b4c8903205c7af66" + "version": "1.3.3-forge", + "curseForgeHash": 1246533858, + "modrinthHash": "33135c8e3b288e7b6503b1b80893494ce7d0a8f0" }, "itemphysicguns-1.0.3-7686b43.jar": { "jarName": "itemphysicguns-1.0.3-7686b43.jar", @@ -1141,13 +1141,13 @@ "curseForgeHash": 2761700421, "modrinthHash": "109c8d57603fe4e1a464c3e4a876eb41ea56d5fd" }, - "ItemPhysicLite_FORGE_v1.6.10_mc1.20.1.jar": { - "jarName": "ItemPhysicLite_FORGE_v1.6.10_mc1.20.1.jar", + "ItemPhysicLite_FORGE_v1.6.11_mc1.20.1.jar": { + "jarName": "ItemPhysicLite_FORGE_v1.6.11_mc1.20.1.jar", "modId": "itemphysiclite", "name": "ItemPhysicLite", - "version": "1.6.10", - "curseForgeHash": 1592574959, - "modrinthHash": "7176737db20a4deb50bd5624b07ded22acb81fd5" + "version": "1.6.11", + "curseForgeHash": 1054871430, + "modrinthHash": "c89e1b6493dfa8c129f7f36f6cc788ca4351f4c5" }, "Jade-1.20.1-Forge-11.13.2.jar": { "jarName": "Jade-1.20.1-Forge-11.13.2.jar", @@ -1202,13 +1202,13 @@ "curseForgeHash": 1395152208, "modrinthHash": "95594c74234c653fe93554d21a3728c32a1eff5f" }, - "kubejs_tfc-1.20.1-1.3.4.jar": { - "jarName": "kubejs_tfc-1.20.1-1.3.4.jar", + "kubejs_tfc-1.20.1-1.3.5.jar": { + "jarName": "kubejs_tfc-1.20.1-1.3.5.jar", "modId": "kubejs_tfc", "name": "KubeJS TFC", - "version": "1.3.4", - "curseForgeHash": 3359540868, - "modrinthHash": "4d252791f33012f81d28a6ce19ebcd3f6081e8b4" + "version": "1.3.5", + "curseForgeHash": 1584326498, + "modrinthHash": "b6b6d0520bb144c8802385c4e8a7f9103a86c258" }, "letmedespawn-1.20.x-forge-1.5.0.jar": { "jarName": "letmedespawn-1.20.x-forge-1.5.0.jar", @@ -1666,13 +1666,13 @@ "curseForgeHash": 342643202, "modrinthHash": "ac87e37f193640c4ec8aa6e6faef34e951721669" }, - "sophisticatedcore-1.20.1-1.3.55.2031.jar": { - "jarName": "sophisticatedcore-1.20.1-1.3.55.2031.jar", + "sophisticatedcore-1.20.1-1.3.56.2042.jar": { + "jarName": "sophisticatedcore-1.20.1-1.3.56.2042.jar", "modId": "sophisticatedcore", "name": "Sophisticated Core", - "version": "1.3.55.2031", - "curseForgeHash": 1740994118, - "modrinthHash": "02d5c3e42f26a58a110d1cb99d2f56a0b300096a" + "version": "1.3.56.2042", + "curseForgeHash": 642051355, + "modrinthHash": "a8097dc3a58605f85ff3ac7c0c85ef13c9ae3ad3" }, "SoulBinding1.20.1(Forge)vs1.0.2.jar": { "jarName": "SoulBinding1.20.1(Forge)vs1.0.2.jar", @@ -1769,13 +1769,13 @@ "curseForgeHash": 2200793179, "modrinthHash": "30e162b774ae76c7032cd5eb3e25de26c2a101f2" }, - "TerraFirmaGreg-Core-Modern-0.9.12.jar": { - "jarName": "TerraFirmaGreg-Core-Modern-0.9.12.jar", + "TerraFirmaGreg-Core-Modern-0.9.14.jar": { + "jarName": "TerraFirmaGreg-Core-Modern-0.9.14.jar", "modId": "tfg", "name": "TerraFirmaGreg-Core", - "version": "0.9.12", - "curseForgeHash": 3532798208, - "modrinthHash": "e590820c9e372ca0b5e0e7d4a48627fd44c60a21" + "version": "0.9.14", + "curseForgeHash": 2327524129, + "modrinthHash": "fb64a6fa105eabd319dcd100f1e61ea8c3f616d6" }, "TFC_punishment_for_death-1.20.1-1.0.0.16.jar": { "jarName": "TFC_punishment_for_death-1.20.1-1.0.0.16.jar", @@ -2033,13 +2033,13 @@ "curseForgeHash": 3263469048, "modrinthHash": "5b2be59a71add73676596d0d3350b832552bac70" }, - "xaeroworldmap-forge-1.20.1-1.41.0.jar": { - "jarName": "xaeroworldmap-forge-1.20.1-1.41.0.jar", + "xaeroworldmap-forge-1.20.1-1.41.2.jar": { + "jarName": "xaeroworldmap-forge-1.20.1-1.41.2.jar", "modId": "xaeroworldmap", "name": "Xaero\u0027s World Map", - "version": "1.41.0", - "curseForgeHash": 2246022767, - "modrinthHash": "f2c63673810ff7b87a7fee40d34e70a04fc80ef6" + "version": "1.41.2", + "curseForgeHash": 856638396, + "modrinthHash": "a60d4c8e04a65ffe82f1ac89ab28a52f357fbbf2" }, "YeetusExperimentus-Forge-2.3.1-build.6+mc1.20.1.jar": { "jarName": "YeetusExperimentus-Forge-2.3.1-build.6+mc1.20.1.jar", diff --git a/pakku-lock.json b/pakku-lock.json index 3513377c15..ec33a926ec 100644 --- a/pakku-lock.json +++ b/pakku-lock.json @@ -15960,7 +15960,7 @@ "files": [ { "type": "modrinth", - "file_name": "TerraFirmaGreg-Core-Modern-0.9.13.jar", + "file_name": "TerraFirmaGreg-Core-Modern-0.9.14.jar", "mc_versions": [ "1.20.1" ], @@ -15968,23 +15968,23 @@ "forge" ], "release_type": "release", - "url": "https://cdn.modrinth.com/data/lNttW2Xl/versions/8OEljfZF/TerraFirmaGreg-Core-Modern-0.9.13.jar", - "id": "8OEljfZF", + "url": "https://cdn.modrinth.com/data/lNttW2Xl/versions/3BUwsara/TerraFirmaGreg-Core-Modern-0.9.14.jar", + "id": "3BUwsara", "parent_id": "lNttW2Xl", "hashes": { - "sha512": "00ee77127106cf96c5256180ac65df93340b0fa64fbf35f567e7e3c7d36f68bf1faea36e05b60881856f49cdef85fde509a1bfb47d47ef188516cec1e06be93d", - "sha1": "1cfeca08d6b6ff2d0c8686f49d4164fe2f959540" + "sha512": "1063b161f50e5fe5f87827273a9ea88129eacaad43b5fb0dd3283cb123d0dd9d85d66e8817500e409d48d5606a557b4abe3cc8d75f44680c0fa034b58206ad7f", + "sha1": "a627b12282202d3f03c799533456dcd095223088" }, "required_dependencies": [ - "1o7aFiY6", - "vvuO3ImH" + "vvuO3ImH", + "1o7aFiY6" ], - "size": 14243289, - "date_published": "2026-06-21T21:07:53.655575Z" + "size": 14244486, + "date_published": "2026-06-23T17:08:09.199887Z" }, { "type": "curseforge", - "file_name": "TerraFirmaGreg-Core-Modern-0.9.13.jar", + "file_name": "TerraFirmaGreg-Core-Modern-0.9.14.jar", "mc_versions": [ "1.20.1" ], @@ -15992,18 +15992,18 @@ "forge" ], "release_type": "release", - "url": "https://edge.forgecdn.net/files/8296/323/TerraFirmaGreg-Core-Modern-0.9.13.jar", - "id": "8296323", + "url": "https://edge.forgecdn.net/files/8307/533/TerraFirmaGreg-Core-Modern-0.9.14.jar", + "id": "8307533", "parent_id": "513402", "hashes": { - "sha1": "1cfeca08d6b6ff2d0c8686f49d4164fe2f959540", - "md5": "84aace0a86b25c3e4e2626e8b521f962" + "sha1": "a627b12282202d3f03c799533456dcd095223088", + "md5": "57a110d2642522ec7119d8be3f50a1ba" }, "required_dependencies": [ "309927" ], - "size": 14243289, - "date_published": "2026-06-21T21:07:51.180Z" + "size": 14244486, + "date_published": "2026-06-23T17:08:06.790Z" } ] }, From 3e98f3b58450f838f46111f8efcabbca42dbf338 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Tue, 23 Jun 2026 18:34:43 +0100 Subject: [PATCH 43/43] friendly --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d1a601a638..987c33608f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,7 +11,7 @@ - Transferring items and containers is now 8x more expensive with the Interplanetary Wireless Card (blocks are the same energy cost as before). Set up railguns! @ashleney - Added shaped crafting recipes for train tracks (#4335) @strangelyng - Renamed Nether Quartz to Smoky Quartz @Pyritie -- Mammutilations and slimes can now be used on the animal crank @Pyritie +- Mammutilations and friendly slimes can now be used on the animal crank @Pyritie ### Bug fixes - Fixed some floating chests in the new mineshafts, made mineshafts avoid spawning near rivers, and fixed one of the segments not blocking water correctly @Pyritie @BlueBoat29 - Fixed some beneath tower chests being empty @Pyritie