Commit graph

4207 commits

Author SHA1 Message Date
Pyritie
084c99db07
Feature/mars rock layers (#1519)
* moving to real tfc rock layers!

* thanks git

* git pls

* that's a good start for the mars rock layer stuff now

* langs, some desert block height tweaks

* mars water fog color

* forgot to convert back from hex to dec
2025-08-04 11:22:18 +01:00
Gustavo
e978f798f7 fix yeast starter from water giving too much 2025-08-04 18:04:36 +10:00
TomPlop
42c85bc38f
Fix colored steel recipe with Amp loss (#1517)
Signed-off-by: TomPlop <tomdidome@gmail.com>
2025-08-03 18:21:07 -05:00
Pyritie
2b732e4792 Merge branch 'main' into dev 2025-08-03 19:54:27 +01:00
Pyritie
fe0dadd643 Merge branch 'main' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern 2025-08-03 19:53:47 +01:00
Pyritie
4bc13a34d3 a 2025-08-03 19:53:40 +01:00
GameStar
4dade7b6d6
cc tweaked pakku update (#1516) 2025-08-03 18:46:50 +01:00
Xikaro
a463571bc1
Merge pull request #1513 from TerraFirmaGreg-Team/dev
Release: 0.10.5
2025-08-03 19:30:19 +05:00
Pyritie
30ee82f9c1 newline 2025-08-03 12:57:42 +01:00
Pyritie
1ca140342f changelog + release 2025-08-03 12:57:09 +01:00
Pyritie
eb6cd8080b langs, pakku 2025-08-03 12:55:23 +01:00
Redeix
705a48d659
- PBR textures (#1512)
* - PBR textures

* - updated changelog
2025-08-03 11:54:08 +01:00
TomPlop
91e0d36fa0
Rework of Large Solar Array (#1511)
* Rework of Large Solar Array

* Add quests

* Fix Ad Astra to use the T1 photocell
2025-08-02 23:09:49 -05:00
Xikaro
91bc6c03c0 Update pakku-lock.json 2025-08-03 01:32:28 +05:00
Redeix
2cee1a2cdb
Baskets and fixes (#1510)
* - Added grape bushes to harvest basket tags

* - More LSP fixes

* - updated changelog
2025-08-02 15:24:23 -05:00
Pyritie
1b01b244d9 merge 2025-08-02 18:52:31 +01:00
Pyritie
9c3c72907b EMI categories 2025-08-02 18:51:21 +01:00
Pyritie
73575f1ed3 langs 2025-08-02 18:51:08 +01:00
Pyritie
1820e8256d solar panel stuff 2025-08-02 18:51:05 +01:00
GameStar
c68b78ce67
Updating guns & some bug fixes (#1501)
* new gun enables

* new modifiers

* lang

* adding data loaders

* ammo changes

* attachments

* new guns

* remove old

* updated create armorer

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

* new applied armorer

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

* I put the wrong one in 

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

* py's fixes

* adds sandworm mod

* Delete tacz/ULVguns.zip

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

* Add files via upload

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

* stuff

* more gun stuff

* bug fix for alabaster

* forgot to remove a log

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

* Update recipes.alabaster.js

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

* Update recipes.ammo.js

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

* updated alabaster to match chem bath recipes

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

---------

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
Signed-off-by: Pyritie <pyritie@gmail.com>
Co-authored-by: Pyritie <pyritie@gmail.com>
2025-08-02 18:18:40 +01:00
Pyritie
6e860ccb52 langs 2025-08-02 17:32:29 +01:00
Pyritie
855ae09384 removed a dependency 2025-08-02 17:32:05 +01:00
Pyritie
a44ed97c43 item tag models for composts 2025-08-02 17:31:54 +01:00
Pyritie
14bc503908 added tags to turn phantom silk into clothes too 2025-08-02 16:52:18 +01:00
Pyritie
3ed46ca8e6 added recipe for new digger helmet upgrade 2025-08-02 16:49:00 +01:00
Pyritie
6f8c6cb172 mars water bucket, langs 2025-08-02 16:24:38 +01:00
Pyritie
7cbdf75a5f circuit tag models! 2025-08-02 16:11:12 +01:00
Pyritie
b7e5710fd4 latex tweak 2025-08-02 15:43:23 +01:00
Pyritie
9ae18130ed fix olive food processor conflict, fix pumpkin chunk duplicate recipe 2025-08-02 15:35:16 +01:00
Pyritie
08a8e00914 added machine recipe for shears 2025-08-02 15:10:45 +01:00
Pyritie
ba20957a18 button unification (#1461), fixing beneath wood recipes 2025-08-02 15:10:39 +01:00
Pyritie
68f9591c70 cl 2025-08-02 14:26:13 +01:00
Pyritie
78e40b4369 regular thorium is now also radioactive 2025-08-02 14:22:39 +01:00
Pyritie
0e2114fea7 fixs #1506 2025-08-02 14:22:23 +01:00
Pyritie
a3b1fac817 changed the other thoriums to pink 2025-08-02 14:22:06 +01:00
Pyritie
760d4e5e0f fix #1491 2025-08-02 14:14:34 +01:00
Pyritie
1aaa124013 kubejs-tfc updates, pakku 2025-08-02 14:03:35 +01:00
Pyritie
9a6c760fcc merge 2025-08-02 12:21:21 +01:00
Pyritie
1e34e098bb langs + cl 2025-08-02 12:20:13 +01:00
Pyritie
5f187c605e added recipes for other kinds of train tracks 2025-08-02 12:19:53 +01:00
Redeix
ed7d65e13f
-Fixed universal compost recipes (#1507) 2025-08-02 11:31:26 +01:00
Redeix
2d6edff7ea
-Receiver casing fix and large solar panel tiers (#1505) 2025-08-02 11:29:52 +01:00
Pyritie
6eaf69b4be changelog 2025-08-01 23:20:16 +01:00
Pyritie
1d326f820e merge 2025-08-01 23:15:28 +01:00
Pyritie
a94a02772f machine recipes for tuyeres #1499 2025-08-01 23:15:08 +01:00
TomPlop
e700c45062
Quests for railguns and fixes (#1495)
* Adding quests to the railgun

* Adding all the quests for the Railgun

* Fix Mixer HV

* more fixes for quest

* Add an input bus to the Steam Bloomery #1481

* Add lang file to railgun

* Change for Energy Chapter
2025-08-01 23:08:41 +01:00
Pyritie
937b2ac3cd
tfc invar (#1502) 2025-08-01 23:06:38 +01:00
Pyritie
25ef6bbb5e forgot to actually remove this 2025-08-01 22:52:26 +01:00
Pyritie
9221614253 fix a dupe with buzz saw blades 2025-08-01 22:51:19 +01:00
Pyritie
e22ea96353 ukranian langs 2025-08-01 21:35:11 +01:00