Commit graph

5371 commits

Author SHA1 Message Date
Pyritie
b2fe101e19 tweak icon sets of nuclear materials 2025-10-21 16:13:24 +01:00
Pyritie
7adc06188a quests + langs 2025-10-21 16:13:10 +01:00
Pyritie
1f830ae9cf veins 2025-10-21 13:54:27 +01:00
Pyritie
54dc948f5d added a missing overlay for bright/shiny dusts 2025-10-21 13:30:52 +01:00
Pyritie
66ca0b27a8 tweak color of FOOF 2025-10-21 13:26:02 +01:00
Pyritie
de6a852443 added another stonecutter recipe for the markings so it's more obvious which item is the start point 2025-10-21 13:08:14 +01:00
Pyritie
82b9cc7036 emi categories 2025-10-21 12:59:17 +01:00
Pyritie
9f095d7a82 langs 2025-10-21 12:59:02 +01:00
Pyritie
befeb81f02 does this hide potions? 2025-10-21 12:58:49 +01:00
Pyritie
2b0a38dadc pakku 2025-10-21 12:46:07 +01:00
Pyritie
265f47b0f5 cl update 2025-10-21 12:42:11 +01:00
Pyritie
35d667e50a Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-10-21 12:23:09 +01:00
Pyritie
0c2cba8811 ore indexes 2025-10-21 12:23:06 +01:00
Pyritie
cfbd258102
Mars sandstorms (#2067)
* changes for some sand layer/pile stuff

* Martian wind (#1883)

* add texture for wind

* add multiple martian wind types

* fix semiheavy concurrent with tfg core

* rename wind to match convention

* fix blockstate registration error

* why is this even turned on by default

* translate code regions + placeholder bundle recipe

* add mars climate controller

* add debug stick functions

* cleanup

* add layer block models

* add jsons

* cleanup

---------

Signed-off-by: Zippity <i.wa.anderson.86@gmail.com>

* refactor

* undo bundle

* added a bunch of missing snow pile tags

* item model changes

* more snow piled tags

* add dust storm severity biome tags

* some cleanup

* and uncomment again

* real math hours

* more math tweaks

* comment out debug code

* comment this file

---------

Signed-off-by: Zippity <i.wa.anderson.86@gmail.com>
Co-authored-by: Zippity <i.wa.anderson.86@gmail.com>
2025-10-21 12:21:18 +01:00
Pyritie
9b55d7ce9a langs 2025-10-21 12:17:12 +01:00
dependabot[bot]
ed252448e7
Bump the dependencies group across 1 directory with 3 updates (#2068)
Bumps the dependencies group with 3 updates in the / directory: [roamingowl/template-output-with-eta](https://github.com/roamingowl/template-output-with-eta), [devops-infra/action-pull-request](https://github.com/devops-infra/action-pull-request) and [softprops/action-gh-release](https://github.com/softprops/action-gh-release).


Updates `roamingowl/template-output-with-eta` from 2.0.0 to 2.1.0
- [Release notes](https://github.com/roamingowl/template-output-with-eta/releases)
- [Commits](https://github.com/roamingowl/template-output-with-eta/compare/v2.0.0...v2.1.0)

Updates `devops-infra/action-pull-request` from 0.6.1 to 1.0.2
- [Release notes](https://github.com/devops-infra/action-pull-request/releases)
- [Commits](https://github.com/devops-infra/action-pull-request/compare/v0.6.1...v1.0.2)

Updates `softprops/action-gh-release` from 2.3.4 to 2.4.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/v2.3.4...v2.4.1)

---
updated-dependencies:
- dependency-name: roamingowl/template-output-with-eta
  dependency-version: 2.1.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dependencies
- dependency-name: devops-infra/action-pull-request
  dependency-version: 1.0.2
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: dependencies
- dependency-name: softprops/action-gh-release
  dependency-version: 2.4.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-10-21 13:27:35 +05:00
Redeix
3240a84af1
fission textures mk1 (#2073) 2025-10-21 02:47:08 -05:00
TomPlop
b2701d73b0
update quests (#2069) 2025-10-20 18:26:30 -05:00
Pyritie
9f67e25535 CLs 2025-10-20 21:49:56 +01:00
Pyritie
f3f69dbdd6 fixed wrong spring being used for crimson/warped/glacian pressure plates 2025-10-20 21:49:08 +01:00
GameStar
dc22ab10bc
fix some recipe issues in EV TACZ extended mags (#2065)
* Update materials.js

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* Update recipes.attach.js

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

---------

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
2025-10-20 21:40:09 +01:00
Pyritie
b9280ab856 more CLs 2025-10-20 21:22:39 +01:00
Pyritie
31d62c45dd changelog, added molds to tool racks 2025-10-20 21:18:03 +01:00
Spicy Noodles
7c2b67b446
Unify emitter recipes (#2059)
* Unify emitter recipes

* Fix for field generator recycling
2025-10-20 17:44:07 +01:00
Pyritie
3ec41ceb60 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-10-20 12:57:17 +01:00
Pyritie
2df627be1d pakku 2025-10-20 12:57:15 +01:00
Redeix
4fcbae00ac
Fridge Assets (#2062) 2025-10-20 10:59:56 +01:00
Pyritie
bbcc2d55e6
adjust claims (#2060) 2025-10-20 14:20:19 +05:00
Pyritie
fdb61f960c added dimensions 2025-10-19 17:30:27 +01:00
Pyritie
96396fb73a fix #2018, removes sorting from all sns containers and lunchboxes 2025-10-19 17:25:35 +01:00
Pyritie
138bf5efe3 fix #2055 2025-10-19 17:18:02 +01:00
Pyritie
15025af2c0 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-10-19 17:15:57 +01:00
Pyritie
df61ed4963 fix #2002 + #2012 2025-10-19 17:15:54 +01:00
Pyritie
3f599cc69a fix #2022 2025-10-19 16:50:50 +01:00
Yan
45b227f37d
Add language entry "Large Boilder" for quest/gregtech_energy (#2056)
* doc: Add zh_cn translation for patchouli_books

* feat: Add quest/gregtech_energy/Large Boilers to language files

* feat: remove unreviewed contents

* feat: remove unreviewed contents

* fix: fix typo

* fix: fix Large Boilers

* fix: update task for Large Boilers

---------

Co-authored-by: 闫茂源 <yanmaoyuan@baijiayun.com>
2025-10-19 12:29:16 +01:00
Risuga
c196d3d82f
Update ore_processing.snbt (#2058)
Signed-off-by: Risuga <oosyrag@gmail.com>
2025-10-19 12:22:03 +01:00
WIPocket
ac8ec2a9e5
double plate stacking to 16, fixes #1952 (#2051) 2025-10-18 16:22:33 -05:00
Pyritie
cfe31092e6 cl for the rockets 2025-10-18 15:55:26 +01:00
Pyritie
53eb9767c7 food balancing 2025-10-18 15:29:07 +01:00
Pyritie
a2217c20c8 fix #2049
Related Work Items: #20
2025-10-18 13:56:49 +01:00
Pyritie
63ea1965a8 forgor this cl 2025-10-18 13:54:41 +01:00
Pyritie
0c0a18833b illage changes 2025-10-18 13:51:32 +01:00
Pyritie
115a7a42eb lang 2025-10-18 13:45:46 +01:00
Pyritie
dc4cf6ba5c emi categories 2025-10-18 13:41:43 +01:00
Pyritie
d2c4e4b0af some cleanup with the alloy smelter category, removed vanilla glass bottles 2025-10-18 13:41:28 +01:00
Pyritie
d7518d98c6 added nugget molds and oils to dino nugs 2025-10-18 13:41:15 +01:00
Redeix
18884e6587
Update CHANGELOG.md (#2048)
Fixed inconsistent circuit numbers for specific recipes.

Signed-off-by: Redeix <brayden.j.m.ford@gmail.com>
2025-10-18 01:57:02 -05:00
Redeix
d940579c82
Updated circuit utility wrapper (#2047) 2025-10-18 01:54:43 -05:00
Pyritie
7f07089a99 added an aged beer recipe for slightly better grain yields 2025-10-18 01:33:08 +01:00
Pyritie
e1bca6ef13 langs 2025-10-18 01:30:15 +01:00