Commit graph

260 commits

Author SHA1 Message Date
Pyritie
125a6fc293 once again I break the modpack by committing on my lunch break, thanks krazh 2025-08-08 17:24:50 +01:00
Pyritie
6f7ad3bf48 fixes #1559 2025-08-08 12:46:40 +01:00
Pyritie
65090aa58e fixed moon log spam 2025-08-08 12:40:13 +01:00
Pyritie
f3bfbf6285 fixed aqueous accumulator 2025-08-08 12:36:50 +01:00
Pyritie
0ea561e78e removed rotting from canola 2025-08-08 01:06:04 +01:00
TomPlop
e4a9c2de6b
Rework of all resins (#1550)
* Rework of the resins done

* Fix wood gas
2025-08-07 20:46:50 +01:00
Pyritie
7210213f1f let's try that again 2025-08-07 13:02:03 +01:00
Pyritie
bfaad34f2d merge 2025-08-07 13:01:29 +01:00
Pyritie
cc0c49643f removed dimension-specific AA water recipes 2025-08-07 13:00:34 +01:00
TomPlop
86c8a108e3
Fix circuit duplicate recipes (#1535)
We should try to avoid GTm circuits that are used for basic materials.

Mainly #4 and #6

Put everything on #11 so it says harmonized

Signed-off-by: TomPlop <tomdidome@gmail.com>
2025-08-06 00:47:49 +01:00
Pyritie
3dbb282ef4 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-08-06 00:40:31 +01:00
Pyritie
1dce4d76a4 fixed all the greate mess 2025-08-06 00:40:28 +01:00
GameStar
d6b0715c52
Adding stuff related to tree saps + minor fixes (#1531)
* tree juice changes

* fixed texture stretch

* glacian wool

* Update CHANGELOG.md

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

* oops

* Update glacian_wool.png

---------

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
2025-08-05 11:07:04 -05:00
Pyritie
561be8c20c fixes missing moon chunk data, must've been a kjs-tfc change #1528 2025-08-05 11:44:41 +01:00
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
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
9ae18130ed fix olive food processor conflict, fix pumpkin chunk duplicate recipe 2025-08-02 15:35:16 +01:00
Pyritie
1aaa124013 kubejs-tfc updates, pakku 2025-08-02 14:03:35 +01:00
Redeix
ed7d65e13f
-Fixed universal compost recipes (#1507) 2025-08-02 11:31:26 +01:00
Redeix
ac0de215f5
Receiver changes (#1498) 2025-08-01 09:22:23 +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
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
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
903be368b2 fixes #1445, also added gt recipes to make alcohol for bio diesel 2025-07-29 18:44:20 +01:00
Nebby
cc4f15d6f7
Improved Etched Accessibility (#1473)
* Feature.

* I did not forget about the changelog this time.

* Comply with Review

---------

Signed-off-by: Pyritie <pyritie@gmail.com>
Co-authored-by: Pyritie <pyritie@gmail.com>
2025-07-29 16:30:57 +01:00
Pyritie
da865ae6f1 model fixes, and now you can place the ad astra mushrooms on dirt again 2025-07-29 00:16:29 +01:00
Zippity
5f151cdab2
Forge, Anvil Tweaks (#1417)
* rearrange anvil sequences to match convention

* add heating and melting to basic forgeable gears

* another anvil tweak

* Update changelog

* typo!

* refactor heating and forging of small gears

* refactor gear forging to use built-in material forge tier

* one last fix

---------

Signed-off-by: Gustavo <77560533+gustovafing@users.noreply.github.com>
Co-authored-by: Gustavo <77560533+gustovafing@users.noreply.github.com>
Co-authored-by: Pyritie <pyritie@gmail.com>
2025-07-28 23:43:54 +01:00
Pyritie
87f9d0cf6d
More Better End plants (#1471)
* github pls

* add initial textures + blockstates

* models

* started writing up the blocks

* model adjustments, added item models and textures

* cleanup

* git moment
2025-07-28 23:33:10 +01:00
Pyritie
a607627d98 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-07-28 23:10:32 +01:00
Pyritie
a6bdb3d5b4 more water tags 2025-07-28 23:10:29 +01:00
Pyritie
3f47f0b48b water tags 2025-07-28 22:39:50 +01:00
Pyritie
e804a8a9dd added fluid parameter to the greenhouse recipe builder 2025-07-28 21:04:10 +01:00