diff --git a/.gitignore b/.gitignore index 8a5d7d8da..1ae11eef3 100644 --- a/.gitignore +++ b/.gitignore @@ -17,7 +17,7 @@ package-lock.json node_modules/ Modpack-Modern.sln Modpack-Modern.esproj -crowdin.yml +# crowdin.yml # Pakku build/ diff --git a/config/ftbquests/quests/chapters/questssteam_age.snbt b/config/ftbquests/quests/chapters/questssteam_age.snbt index 7447e9716..2530218af 100644 --- a/config/ftbquests/quests/chapters/questssteam_age.snbt +++ b/config/ftbquests/quests/chapters/questssteam_age.snbt @@ -635,7 +635,11 @@ } { dependencies: ["46FA9DD4755A5548"] - description: ["{quests.steam_age.steam_bloomery.desc}"] + description:[ + "{quests.steam_age.steam_bloomery.desc.1}" + "{@pagebreak}" + "{quests.steam_age.steam_bloomery.desc.2}" + ] icon: "tfg:steam_bloomery" id: "0805CCABC8E7F6CF" optional: true diff --git a/crowdin.yml b/crowdin.yml new file mode 100644 index 000000000..b0430f22a --- /dev/null +++ b/crowdin.yml @@ -0,0 +1,23 @@ +project_id_env: '${{ vars.CROWDIN_ID }}' +api_token_env: '${{ secrets.CROWDIN_TOKEN }}' +base_url: 'https://api.crowdin.com' +preserve_hierarchy: 1 +pull_request_title: New Crowdin updates +pull_request_labels: + - 'Pull request: Translation' +commit_message: '[translation] New translations {fileName} ({languageName})' +files: + - source: /kubejs/assets/*/lang/en_us.json + translation: /%original_path%/%locale_with_underscore%.json + update_option: update_without_changes + languages_mapping: + locale_with_underscore: + en-US: en_us + en-GB: en_gb + ru: ru_ru + uk: uk_ua + ja: ja_jp + zh-CN: zh_cn + zh-TW: zh_tw + es-ES: es_es + de: de_de diff --git a/kubejs/server_scripts/tfg/equipment/tags.equipment.js b/kubejs/server_scripts/tfg/equipment/tags.equipment.js index c6e4d9ac4..173781ab5 100644 --- a/kubejs/server_scripts/tfg/equipment/tags.equipment.js +++ b/kubejs/server_scripts/tfg/equipment/tags.equipment.js @@ -31,23 +31,11 @@ function registerTFGEquipmentItemTags(event) { event.add('gtceu:ppe_armor', '#ad_astra:space_suit_items') event.add('minecraft:trimmable_armor', '#ad_astra:space_suit_items') - event.add('ad_astra:space_suit_items', 'gtceu:quarktech_helmet') - event.add('ad_astra:space_suit_items', 'gtceu:quarktech_chestplate') - event.add('ad_astra:space_suit_items', 'gtceu:advanced_quarktech_chestplate') - event.add('ad_astra:space_suit_items', 'gtceu:quarktech_leggings') - event.add('ad_astra:space_suit_items', 'gtceu:quarktech_boots') - - event.add('ad_astra:freeze_resistant_armor', 'gtceu:quarktech_helmet') - event.add('ad_astra:freeze_resistant_armor', 'gtceu:quarktech_chestplate') - event.add('ad_astra:freeze_resistant_armor', 'gtceu:advanced_quarktech_chestplate') - event.add('ad_astra:freeze_resistant_armor', 'gtceu:quarktech_leggings') - event.add('ad_astra:freeze_resistant_armor', 'gtceu:quarktech_boots') - - event.add('ad_astra:heat_resistant_armor', 'gtceu:quarktech_helmet') - event.add('ad_astra:heat_resistant_armor', 'gtceu:quarktech_chestplate') - event.add('ad_astra:heat_resistant_armor', 'gtceu:advanced_quarktech_chestplate') - event.add('ad_astra:heat_resistant_armor', 'gtceu:quarktech_leggings') - event.add('ad_astra:heat_resistant_armor', 'gtceu:quarktech_boots') + event.add('ad_astra:space_resistant_armor', 'gtceu:quarktech_helmet') + event.add('ad_astra:space_resistant_armor', 'gtceu:quarktech_chestplate') + event.add('ad_astra:space_resistant_armor', 'gtceu:advanced_quarktech_chestplate') + event.add('ad_astra:space_resistant_armor', 'gtceu:quarktech_leggings') + event.add('ad_astra:space_resistant_armor', 'gtceu:quarktech_boots') event.add('tfc:deals_crushing_damage', '#forge:tools/mining_hammers') event.add('tfc:deals_crushing_damage', '#minecraft:shovels')