Commit graph

5399 commits

Author SHA1 Message Date
Xikaro
3c362658eb Update build.yml 2025-10-22 21:29:18 +05:00
Xikaro
30919b53a0 downgrade pakku 1.2.1 2025-10-22 20:52:27 +05:00
Pyritie
d052d41d4b
Merge branch 'main' into dev 2025-10-22 14:39:02 +01:00
Pyritie
1ed086458b Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-10-22 14:36:22 +01:00
Pyritie
950b033de9 0.11.4 2025-10-22 14:36:20 +01:00
Pyritie
b1971da0db CL 2025-10-22 13:42:38 +01:00
TomPlop
a22293e66e
Buff the Tungsten Bismuth Rotor (#2078)
The HSS-G was available at the same time and better in all regards.

Signed-off-by: TomPlop <tomdidome@gmail.com>
2025-10-22 13:41:14 +01:00
Pyritie
65ddc001fb whitespace or something 2025-10-22 13:13:08 +01:00
Pyritie
8c0914c96b
Update README.md (#2077)
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-10-22 13:12:54 +01:00
Pyritie
248e7570fc Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-10-22 13:12:03 +01:00
Pyritie
6cdbf388d5 lowered the brightness of the mars panoramas a little 2025-10-22 13:11:36 +01:00
Pyritie
7685fbe5da
Server overrides (#2076)
* Update ranks.snbt

Signed-off-by: Pyritie <pyritie@gmail.com>

* Update ranks.snbt

Signed-off-by: Pyritie <pyritie@gmail.com>

* Add files via upload

Signed-off-by: Pyritie <pyritie@gmail.com>

* Update tfc-server.toml

Signed-off-by: Pyritie <pyritie@gmail.com>

* Update ranks.snbt

Signed-off-by: Pyritie <pyritie@gmail.com>

* Update ranks.snbt

Signed-off-by: Pyritie <pyritie@gmail.com>

---------

Signed-off-by: Pyritie <pyritie@gmail.com>
2025-10-22 12:12:55 +01:00
Pyritie
367c29285e langs 2025-10-22 10:58:34 +01:00
Pyritie
9fcfbc3c8d bucket 2025-10-22 10:57:05 +01:00
Pyritie
a32327847a added a third rope coil back to the grappling hook 2025-10-22 10:32:46 +01:00
Pyritie
58ffb59ced Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-10-22 10:25:00 +01:00
Pyritie
a2dee63297 langs 2025-10-22 10:24:58 +01:00
Pyritie
b200270cb3 modified biome temperature in case it's what's making a certain server host put snow on the moon 2025-10-22 10:19:13 +01:00
Xikaro
f41f1c366b update: pakku 2025-10-22 11:30:05 +05:00
Pyritie
604b335fe1 just have both surfers so we don't have to deal with eggs being weird 2025-10-21 22:14:46 +01:00
Pyritie
04cc18536e better initial angle 2025-10-21 19:06:52 +01:00
Pyritie
969f372c01 new panorama 2025-10-21 18:58:38 +01:00
Pyritie
9fbb842b20 pakku 2025-10-21 18:52:04 +01:00
Pyritie
b1e2da127d added one more quest 2025-10-21 18:42:00 +01:00
Pyritie
1a44e7010a fix typo 2025-10-21 16:28:52 +01:00
Pyritie
35ecaf0c2a fix t2 rocket alloy so it doesn't dupe, remove small dusts 2025-10-21 16:13:35 +01:00
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