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

crowdin.yml

@@ -1,5 +1,5 @@
 base_url: "https://api.crowdin.com"
-base_path: "."
+base_path: "./kubejs/assets"
 
 # For interacting with Crowdin locally (via CLI), set these environment variables to their proper values
 project_id_env: "CROWDIN_ID"
@@ -15,7 +15,7 @@ commit_message: "[translation] New translations"
 preserve_hierarchy: true
 
 files:
-  - source: "/kubejs/assets/*/lang/en_us.json"
+  - source: "/*/lang/en_us.json"
     # Unfortunately, Crowdin doesn't have a placeholder which matches Minecraft's expected naming scheme: underscores
     # with lowercase letters (since resource location are required to be fully lowercase).
     #
@@ -26,7 +26,7 @@ files:
     # ** MAKE SURE YOU ADD THE APPROPRIATE CUSTOM LANGUAGE MAPPING FOR THE PLACEHOLDER. **
     translation: "/%original_path%/%locale_with_underscore%.%file_extension%"
     update_option: "update_without_changes"
-    dest: "/messages.%file_extension%"
+    #dest: "/messages.%file_extension%"
     
     languages_mapping:
       locale_with_underscore:

kubejs/assets/ad_astra/lang/uk_ua.json

@@ -159,7 +159,7 @@
   "tooltip.ad_astra.max_generation": "Макс.: %s FE/т",
   "tooltip.ad_astra.max_fluid_in": "Макс. вхід: %s mB/т",
   "tooltip.ad_astra.max_fluid_out": "Макс. вихід: %s mB/т",
-  "tooltip.ad_astra.fluid": "%s mB / %s mB %s",
+  "tooltip.ad_astra.fluid": "%s мВ / %s мВ %s",
   "tooltip.ad_astra.fluid_generation_per_iteration": "Генерує %s mB за ітерацію",
   "tooltip.ad_astra.fluid_in": "Вхід: %s mB/т",
   "tooltip.ad_astra.fluid_out": "Вихід: %s mB/т",

kubejs/assets/ad_astra/lang/zh_cn.json

@@ -1,5 +1,5 @@
 {
-  "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.",
+  "__COMMENT__": "此文件是由LanguageMerger自动生成的，请阅读\"minecraft/kubejs\"中发现的文件\".README IF TRANSLATING\"以获取更多信息。",
   "block.ad_astra.oxygen_distributor": "可呼吸空气分配器",
   "block.ad_astra.infernal_spire_block": "炼狱尖刺",
   "block.ad_astra.moon_sand": "灰沙",