Commit graph

4139 commits

Author SHA1 Message Date
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
Redeix
ee3877b07a
Final render fixes (#1489) 2025-07-31 10:23:00 +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
Gustavo
28e2ffcf0c hide 2025-07-31 08:49:28 +10:00
Gustavo
5577d59041 remove tool disables 2025-07-31 08:48:37 +10: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
Pyritie
f0f160add0 minor spelling mistake 2025-07-30 21:18:53 +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
Pyritie
0a0d793490 mars plants cleanup 2025-07-30 13:04:23 +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
Pyritie
209539957d started small mars surface plants 2025-07-30 00:42:46 +01:00
Pyritie
903be368b2 fixes #1445, also added gt recipes to make alcohol for bio diesel 2025-07-29 18:44:20 +01:00
Pyritie
b026feb2e8 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-07-29 18:02:01 +01:00
Pyritie
5582be75d2 fixes #1476 2025-07-29 17:47:24 +01:00
Pyritie
ed8bb14822 EMI categories for the new fission machines 2025-07-29 17:43:34 +01:00
Pyritie
764f149423 fixed wire cutter head extruder mold typo 2025-07-29 17:39:32 +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
c94418447d removed tfc stone -> vanilla stone conversion via rods 2025-07-29 12:36:13 +01:00
Pyritie
6eb61fd9c7 biome adjustments 2025-07-29 12:07:40 +01:00
Pyritie
75461a6496 oh so THAT's how you remove material properties 2025-07-29 11:55:53 +01:00
Pyritie
5b92048fe0 grass tags 2025-07-29 02:41:07 +01:00
Pyritie
3f97561bd8 added a few entities to mars for fun 2025-07-29 02:13:55 +01:00
Pyritie
d1c375c1ee mushrooms don't glow!! 2025-07-29 01:31:32 +01:00
Pyritie
8892faef5d easier dough recipes 2025-07-29 01:28:31 +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
Pyritie
ffe3d8f4de py go 5 seconds without breaking the build challenge (impossible) 2025-07-29 00:03:02 +01:00
Pyritie
0a908ab1a2 whoops 2025-07-29 00:00:48 +01:00
Pyritie
bea7603db6 langs 2025-07-28 23:59:03 +01:00
Pyritie
9d305664ce does this work? 2025-07-28 23:52:42 +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
22af9eda3e gregnant man emoji 2025-07-28 23:10:23 +01:00
Pyritie
fd209eb5bf fixed some old asset references that were showing up in the log 2025-07-28 22:40:19 +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
TomPlop
3c72e94109
Adding Nuclear Line on Mars (#1467)
* 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
2025-07-28 20:02:05 +01:00
Pyritie
e83833bcf5 changed all fluid tags to the new format 2025-07-28 15:46:18 +01:00
Pyritie
3119919a47 changelog 2025-07-28 15:20:58 +01:00
Pyritie
8dae355fe0 typo 2025-07-28 15:20:49 +01:00
Pyritie
6886bc8d3a leaves 2025-07-28 15:20:39 +01:00
Pyritie
cfbd82e595 moon wood stuff 2025-07-28 15:20:25 +01:00