Jika/TFG
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev

Browse Source
This commit is contained in:
Pyritie
2026-02-22 13:57:14 +00:00
parent 5acad92e54 fd2a3b6c06
commit edeb999491
4 changed files with 34 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@@ -17,7 +17,7 @@ package-lock.json
node_modules/
Modpack-Modern.sln
Modpack-Modern.esproj
crowdin.yml
# crowdin.yml
# Pakku
build/

6
config/ftbquests/quests/chapters/questssteam_age.snbt
View File

@@ -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

23
crowdin.yml Normal file
View File

@@ -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

22
kubejs/server_scripts/tfg/equipment/tags.equipment.js
View File

@@ -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')