Merge pull request #3507 from TerraFirmaGreg-Team/dev

Release: 0.11.28

Author: Xikaro

.gitattributes

@@ -3,37 +3,16 @@
 # On commit, the line endings will be reset to lf
 * text=auto
 
-# Text Files
-*.txt text
-*.md text
-LICENSE text
-
-*.cfg text
-*.lang text
-
-*.bat text
-*.sh text
-
-*.json text
-*.yml text
-*.yaml text
-*.toml text
-
-*.js text
-*.ts text
-
-*.zs text
-*.groovy text
-
-*.xml text
-*.xsd text
-*.svg text
-
 # Binary Files
 *.png binary
 *.jpg binary
 *.jpeg binary
+*.gif binary
+*.ico binary
 *.pdf binary
+*.zip binary
+*.jar binary
 
+# GitHub Linguist
 dumps/**/*.* linguist-generated=true
 *.log linguist-generated=true

.github/CONTRIBUTING.md

@@ -261,13 +261,51 @@ There are two approaches to creating a Pull Request: via terminal and via GitHub
   - Always test the integration of your changes with the main project.
   - Before sending a Pull Request, it is important to ensure that your changes do not disrupt the modpack's operation and comply with [internal code of conduct](CODE_OF_CONDUCT.md).
 
-- #### Localization: 
-  - If you're looking for Localizing the modpack to a Language, please feel free to head to the [Tools-Modern]
+- #### Localization:
+  - If you're looking for Localizing the modpack to a Language, please feel free to head to the [Crowdin]
+
 - #### Linting & Typescript support
-  - Install NodeJS and use an editor with Typescript and ESLint support (e.g. Visual Studio Code).
-  - Run `npm init`, and create a project with default options. (required for language support to work properly)
-  - Run `npm install --save-dev eslint@latest @eslint/js@latest @stylistic/eslint-plugin`
-  - To enable type annotations & diagnostics, run [ProbeJS] and set `noCheck: false` in tsconfig.json.
+
+  All development tools configuration is located in the `kubejs/` folder.
+
+  **Installation:**
+
+  ```bash
+  # From the modpack root
+  npm install --prefix kubejs
+
+  # Or from the kubejs folder
+  npm install
+  ```
+
+  **Running the linter:**
+
+  ```bash
+  # From the modpack root
+  npm run lint --prefix kubejs
+  npm run lint:fix --prefix kubejs
+
+  # Or from the kubejs folder
+  cd kubejs
+  npm run lint
+  npm run lint:fix
+  ```
+
+  **Code formatting (Prettier):**
+
+  ```bash
+  # Format all files
+  npm run format --prefix kubejs
+
+  # Check formatting without changes
+  npm run format:check --prefix kubejs
+  ```
+
+  **TypeScript checking:**
+
+  1. Install dependencies (see above)
+  2. Run ProbeJS to generate types
+  3. Set `"noCheck": false` in `kubejs/tsconfig.json`
 
 ---
 
@@ -487,29 +525,71 @@ There are two approaches to creating a Pull Request: via terminal and via GitHub
     - Регулярно синхронизируйте свой форк с оригинальным репозиторием для избежания конфликтов. 
     - Используйте понятные сообщения коммитов для лучшего понимания изменений.
 
-- #### Отладка и тестирование: 
-  - Перед внесением ваших изменений убедитесь, что проект запускается без ошибок. 
-  - Проверяйте логи PrismLauncher для выявления возможных проблем. 
+- #### Отладка и тестирование:
+  - Перед внесением ваших изменений убедитесь, что проект запускается без ошибок.
+  - Проверяйте логи PrismLauncher для выявления возможных проблем.
   - Использование Visual Studio Code с расширением [ProbeJs] поможет быстрее обнаруживать и устранять ошибки.
 
 - #### Документация и обсуждение: 
   - Если у вас возникли вопросы или проблемы, обратитесь к разделу Issues или Discussions на GitHub проекта, а так же форумах [Discord]. 
   - Коллективное обсуждение часто приводит к нахождению оптимальных решений и улучшению проекта в целом.
 
 - #### Совместная разработка: 
-  - Всегда тестируйте интеграцию ваших изменений с основным проектом. 
+  - Всегда тестируйте интеграцию ваших изменений с основным проектом.
   - Перед отправкой Pull Request важно убедиться, что ваши изменения не нарушают работу модпака и соответствуют [внутренним соглашениям по коду](CODE_OF_CONDUCT.md).
 
-- #### Локализация: 
-  - Если вы ищете локализацию Modpack на языке, пожалуйста, не стесняйтесь перейти к [Tools-Modern]
+- #### Локализация:
+  - Если вы ищете локализацию Modpack на языке, пожалуйста, не стесняйтесь перейти к [Crowdin]
+
+- #### Линтинг и поддержка TypeScript:
+
+  Вся конфигурация инструментов разработки находится в папке `kubejs/`.
+
+  **Установка:**
+
+  ```bash
+  # Из корня модпака
+  npm install --prefix kubejs
+
+  # Или из папки kubejs
+  npm install
+  ```
+
+  **Запуск линтера:**
+
+  ```bash
+  # Из корня модпака
+  npm run lint --prefix kubejs
+  npm run lint:fix --prefix kubejs
+
+  # Или из папки kubejs
+  npm run lint
+  npm run lint:fix
+  ```
+
+  **Форматирование кода (Prettier):**
+
+  ```bash
+  # Форматировать все файлы
+  npm run format --prefix kubejs
+
+  # Проверка форматирования без изменений
+  npm run format:check --prefix kubejs
+  ```
+
+  **Проверка типов TypeScript:**
+
+  1. Установите зависимости (см. выше)
+  2. Запустите ProbeJS для генерации типов
+  3. Установите `"noCheck": false` в `kubejs/tsconfig.json`
 
 ---
 
 <!-- Links: -->
 [TerraFirmaGreg-Modern]: https://github.com/TerraFirmaGreg-Team/Modpack-Modern
 [Dev-Modern]: https://github.com/orgs/TerraFirmaGreg-Team/teams/dev-modern
 [Contributor-Modern]: https://github.com/orgs/TerraFirmaGreg-Team/teams/contributor-modern
-[Tools-Modern]: https://github.com/TerraFirmaGreg-Team/Tools-Modern
+[Crowdin]: https://crowdin.com/project/terrafirmagreg-modern
 [PrismLauncher]: https://prismlauncher.org
 [Visual Studio Code]: https://code.visualstudio.com
 [Git]: https://git-scm.com

.github/workflows/build.yml

@@ -463,7 +463,7 @@ jobs:
         uses: actions/checkout@v6
 
       - name: 📦 Download artifact
-        uses: actions/download-artifact@v8.0.0
+        uses: actions/download-artifact@v8.0.1
         with:
           merge-multiple: true
 
@@ -500,7 +500,7 @@ jobs:
 
       - name: 🚀 Create release
         id: release
-        uses: softprops/action-gh-release@v2.5.0
+        uses: softprops/action-gh-release@v2.6.1
         with:
           name: ${{ needs.info.outputs.project_version }}
           tag_name: ${{ needs.info.outputs.project_version }}
@@ -535,7 +535,7 @@ jobs:
           fi  
 
       - name: 📦 Download artifact
-        uses: actions/download-artifact@v8.0.0
+        uses: actions/download-artifact@v8.0.1
         with:
           merge-multiple: true
 
@@ -585,7 +585,7 @@ jobs:
             fi  
     
         - name: 📦 Download artifact
-          uses: actions/download-artifact@v8.0.0
+          uses: actions/download-artifact@v8.0.1
           with:
             merge-multiple: true
 

.github/workflows/crowdin.yml

@@ -107,7 +107,7 @@ jobs:
           fi
 
       - name: Create Pull Request
-        uses: crowdin/github-action@v2.15.0
+        uses: crowdin/github-action@v2.15.2
         with:
           upload_sources: ${{ github.event.inputs.operation == 'upload' || github.event.inputs.operation == 'both' || github.event_name == 'schedule' }}
           upload_translations: false
@@ -171,7 +171,7 @@ jobs:
           echo "Project name: $PROJECT_NAME"
 
       - name: Crowdin Translations Progress
-        uses: crowdin/github-action@v2.15.0
+        uses: crowdin/github-action@v2.15.2
         with:
           command: 'status translation'
           config: crowdin.yml

.gitignore

@@ -11,9 +11,7 @@
 .vs/
 .vscode/
 .idea/
-package.json
 package.g.props
-package-lock.json
 node_modules/
 Modpack-Modern.sln
 Modpack-Modern.esproj

.prettierrc

@@ -5,6 +5,43 @@
 ### Bug fixes
 ### Translation updates
 
+## [0.11.28] - 22-03-2026
+No, this isn't the worldgen update. That's version 0.12.
+### Breaking changes
+- Circuit change for Tier 1 Rocket Fin / ASM Alloy Mixer / Rocket Fin Tier 2 / Rocket Cone Tier 2 to avoid recipe conflicts @TomPlop
+- Chorus-Infused Ceramic Insulation now requires a fluix crystal instead of dust, to avoid a recipe conflict (#3411) @Pyritie
+- All other laser engraver lens recipes now require gem lenses instead of glass ones (#3460) @TomPlop
+- The Heat Exchanger needs to be broken and recrafted because of a namespace change @TomPlop
+- Fixed dust consistency for Redstone Etching Fluid but now it needs a lot more redstone to craft (#3486) @SpicyNoodle5
+### Changes
+- Cleaned up some of the stonecutter recipes so there should be fewer duplicates @Pyritie @SpicyNoodle5
+- Added equivalent assembler recipes for Immersive Aircraft crafting table recipes (#3410) @SpicyNoodle5
+- Changed the rain screen effect to a clear transparent texture instead of blue dots (#3422) @applenper
+- Cassiterite and Cassiterite Sand ores now smelt directly into 1 tin instead of 2, to match TFC @Pyritie
+- The highest tier airplanes now actually require stainless steel as their quest says, and tweaked some of the other aircraft recipes @Pyritie
+- Added more gem slurries for ore processing and lens crafting, although the Clean slurries won't be craftable until Venus (#3460) @TomPlop @SakuraKitsurugi
+- Sped up the crafting times of basalt fiber insulation and silicon carbide (#3460) @TomPlop
+- More balance changes to the new large boilers, and added EMI tabs for the information (#3460) @TomPlop
+- Added fuels for trains! Like with solid fuel, liquid fuels make your train go faster, except fluids have to be in a separate Fuel Tank. Most combustible liquid fuels work. (#3273) @SakuraKitsurugi
+- Increased the speed and acceleration of fuelled trains to double their unfuelled stats @Pyritie
+- Added recycling recipes for Input/Output Hatches/Buses (#3470) @Nixieeunrare
+- Added recipes to craft more locometal items before LV machines, and improved locometal crafting in general (#3462, #3484) @SakuraKitsurugi
+- Added crafting for copycat pressure plates and recycling for most copycat blocks (#3463) @SakuraKitsurugi
+### Bug fixes
+- Fixed the field guide not working @Mqrius
+- Fixed not being able to put the copper spindle on a tool rack (#3445) @DrEthan77
+- Fixed not being able to macerate Raw Suevite @Pyritie
+- Fixed René-41 so it makes twice as much dust in the mixer, but halved the duration of the EBF/cooling recipes and doubled the cost of the foils per coil, so the end result is the same (#3446) @Pyritie
+- Fixed being able to stonecut slabs back into full blocks (#3156) @Pyritie 
+- Fixed being able to dupe chorus fruit by repeatedly breaking and placing a chorus flower (#3433) @Pyritie
+- Fixed Keratophyre missing a texture when knapping (#3418) @Pyritie
+- Fixed High Voltage Coils only requiring 1 black steel fine wire instead of 16 like the others @Pyritie
+- Fixed not being able to use vintage alcohols for general alcohol crafts (#3464) @lysteryale
+### Translation updates
+- Chinese (simplified) @jmecn
+- Ukranian @MetEnBouldry @furrydenis, s5edranner
+- Russian @Nixieeunrare, Polimerka, mihikav, Regrifone, Arka
+
 ## [0.11.27] - 13-03-2026
 ### Changes
 - Added new large boilers that will soon replace the original gregtech boilers. These ones can accept more kinds of water and booster fluids to push your boilers further - check the new quest for more information. (#3360) @TomPlop