Commit graph

1343 commits

Author SHA1 Message Date
Pyritie
a3be818e8f updated size data 2025-08-04 12:46:14 +01:00
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
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
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
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
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
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
0e2114fea7 fixs #1506 2025-08-02 14:22:23 +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
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
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
Pyritie
937b2ac3cd
tfc invar (#1502) 2025-08-01 23:06:38 +01:00
Pyritie
9221614253 fix a dupe with buzz saw blades 2025-08-01 22:51:19 +01:00
Pyritie
84e0039933 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-08-01 19:13:48 +01:00
Redeix
ac0de215f5
Receiver changes (#1498) 2025-08-01 09:22:23 +01:00
Pyritie
c1f13c02ca banned some advanced peripherals for not being family friendly 2025-08-01 00:26:11 +01:00
Pyritie
c091589136 I think this is a typo? 2025-07-31 23:32:52 +01:00
Pyritie
8fde397749 started filling out this anti-railgun tag 2025-07-31 23:32:42 +01:00
Pyritie
0fb1c66006 recipes for railgun machines + greenhouse 2025-07-31 23:32:33 +01:00
Pyritie
234f88551d ah feature order crashes, my favourite 2025-07-31 23:21:18 +01:00
Pyritie
db967e8ac9 who up tweakin they mars crops 2025-07-31 21:07:38 +01:00
Pyritie
1cdbd052cc 0 days without py breaking the build 2025-07-31 19:54:58 +01:00
Pyritie
cc594452cf maybe 2025-07-31 13:09:09 +01:00
Pyritie
9259a0e711 drinkable mars water 2025-07-31 13:07:46 +01:00
Pyritie
caf958c4f6 firmalife planter data for mars crops (still need to do textures) 2025-07-31 13:03:33 +01:00
Pyritie
ac3af1e410 missing climate range for bolux 2025-07-31 12:50:32 +01:00
Pyritie
6700a6022e more mars crop stuff 2025-07-31 12:49:35 +01:00
Pyritie
ed168a68d5 mars crop stuff 2025-07-31 12:25:53 +01:00
Pyritie
332754992f merge 2025-07-31 00:59:09 +01:00
Pyritie
077190e902 initial commit for mars crops 2025-07-31 00:53:53 +01:00
TheAshenWolf
4109747e6e
Added concrete into facade materials (#1487)
#forge:concretes represents all vanilla concrete
2025-07-30 17:46:34 -05:00
Pyritie
6a07c804fc Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-07-30 22:18:35 +01:00
Pyritie
8a0f09b267 mars plant tweaks 2025-07-30 22:18:34 +01:00
Pyritie
5c6ecefa9a portar and mestle recipes for soybean/olive paste, salt, and melting recipes for tfc metal powders 2025-07-30 22:09:58 +01:00
Pyritie
743b34b7b2 fixes 1478 2025-07-30 21:39:50 +01:00
GameStar
125efd9ac1
Feature/tier3 rocket (#1483)
* stuff for rocket

* worm

* Revert "worm"

This reverts commit fa2f0fc74727a7c7f15cbaae2365b8147b2e9313.

* Update blocks.js

* rocket stuff

* Update constants.js

* More

* final stuff

* probably disalbed everything

* Delete options.txt

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

* Delete kubejs/startup_scripts/tfg/elements.js

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

* dry ice change

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

* vacuum freezer change

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

---------

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
2025-07-30 20:33:50 +01:00
TomPlop
31d0e68058
More fixes to nuclear line (#1477)
* Adding the Nuclear Line CPU Wafer

* merge

* Revert "merge"

This reverts commit b29b5e324f587042a7aad01a49cfdf63b33ab7b4.

* revert

* Revert "revert"

This reverts commit 38376879b37a1150bd84dfa524621c2ffe6350db.

* no change weird things happening to me

* add fluid textures

* Modification of nuclear line

* fix conflict for fluids

* first balance change

* fix conflict with recipes.rocks

* Nuclear Line

* Add the bromine line and more fixes

* Fully added back the bromine line

* Add nuclear energy line and more fixes

* fix conflit

* Add back the recipes change to gtceu for nuclear

* revert

* fix conflict

* One last try

* Adjust Reactor rates

* Added change to uranium dust commented out until Mars Update

* Remove long rod from nuclear pellet

* more fixes to nuclear line

* test to increase output
2025-07-30 12:01:21 +01:00
Pyritie
64e6834f07 plants 2025-07-30 00:51:09 +01:00