Commit graph

1429 commits

Author SHA1 Message Date
Pyritie
ce2a38285c added 3 more mars trees + tfc-style saplings for all 6 2025-08-15 02:14:07 +01:00
Pyritie
90ce71d94a mars biome particle tags 2025-08-15 01:17:18 +01:00
Pyritie
3e11443023 locometal refactor #1624 2025-08-14 21:03:02 +01:00
Pyritie
ffcc45475e #1625 and #1623
Related Work Items: #16, #1625
2025-08-14 20:51:36 +01:00
Pyritie
fa9b9687ab fixed maple log centrifuge recipe to be the right kind of wood pulp 2025-08-14 20:38:00 +01:00
Pyritie
5ad5a6c892 buffed EGH sapling amount 2025-08-14 20:35:38 +01:00
Pyritie
f0466e53bd finally killed off all damascus steel recipes 2025-08-14 20:28:16 +01:00
Pyritie
7ae68a1636 unification with pumpkin pie stuff 2025-08-13 23:17:33 +01:00
Pyritie
365fe1e5ca moved golden apples to the food processor 2025-08-13 23:08:01 +01:00
Pyritie
6bba775be0 mushroom and bamboo EGH recipes, also changed them all to the appropriate kind of water 2025-08-13 22:51:43 +01:00
Pyritie
8657cc38b1 fixed a dupe with certus quartz 2025-08-13 22:33:28 +01:00
Pyritie
af5e279954 moon rabbits can eat chorus fruit now 2025-08-13 22:31:18 +01:00
Pyritie
7767f58399 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-08-13 22:28:47 +01:00
Pyritie
4cb712ceab never mind! that actually wasn't that bad 2025-08-13 22:24:40 +01:00
Pyritie
8787781f27 this doesn't fix dyed toolbelts (#368), but it does fix the other long-standing issue with upgrading them 2025-08-13 21:29:56 +01:00
GameStar
848dc99bf8
some modpack cleanup from glacian ram/sniffer (#1617)
* whitespace changes

* some animal compat

* snifferified recipes

* nest box recipe
2025-08-13 11:06:50 -05:00
Pyritie
fc35769678 removed the lye to sodium hydroxide pot recipe, now it's vat-only #1615 2025-08-13 00:19:36 +01:00
Pyritie
a0e1a0a088 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-08-12 23:37:46 +01:00
Pyritie
463784a90a nerfed ore crushing in a forge hammer to be a little less stupidly fast 2025-08-12 23:37:43 +01:00
Zippity
7fb821dae9
fix sharp tools not taking damage when cutting grass (#1614)
Co-authored-by: Redeix <brayden.j.m.ford@gmail.com>
2025-08-12 17:14:44 -05:00
Pyritie
ea9fa54021 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-08-12 22:55:05 +01:00
Pyritie
a71a6e79e1 small fixes 2025-08-12 22:55:03 +01:00
GameStar
9e9b5bfb55
stuff for core pr (#1612)
* Add files via upload

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

* Add files via upload

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

* Add files via upload

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

* Add files via upload

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

* Add files via upload

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

* Add files via upload

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

* Add files via upload

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

* Add files via upload

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

* Add files via upload

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

* Update items.food.js

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

* Update constants.js

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

* Update data.js

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

* Update recipes.food.js

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

---------

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
2025-08-12 20:45:38 +01:00
Pyritie
b2a96fa67f use the same crimson/warped tree feature for old growth ones too 2025-08-12 12:49:39 +01:00
Pyritie
b676b5f5b4 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-08-12 12:37:22 +01:00
Pyritie
63a1f0de76 treeeeeeeeees 2025-08-12 12:37:19 +01:00
Pyritie
0da4ff3e8e hollow shell can be crushed for flux now 2025-08-12 11:44:43 +01:00
Pyritie
a07f70594d freeze dried mars fruit 2025-08-12 11:25:38 +01:00
TomPlop
1cb918ee35
Fix soy bean (#1608)
Signed-off-by: TomPlop <tomdidome@gmail.com>
2025-08-12 10:49:49 +01:00
Pyritie
7bd4862c5e Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-08-11 22:59:40 +01:00
Pyritie
2bdb46c397 mars pumpkin pie + other tag stuff 2025-08-11 22:59:10 +01:00
TomPlop
de8fe6ce78
Rebalance LSA (#1591)
* Balance LSA

* Add changelog

* Add Parallel Hatch ability

* Trying to fix changelog

* Try again
2025-08-11 21:44:22 +01:00
Pyritie
35a84dde36 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-08-11 20:58:20 +01:00
Pyritie
a9d3141ecb changed recipes for sprinkler and tree tap to extruder, added curving press ones too 2025-08-11 20:58:15 +01:00
Pyritie
0349729547 mars crop greenhouse textures 2025-08-11 20:46:36 +01:00
Pyritie
94d37acde2 added recipes for emptying gas tank/space suits 2025-08-11 16:00:19 +01:00
Redeix
4a0603cec2
prospecting rework (#1594)
* prospecting rework

* changelog
2025-08-11 11:28:45 +01:00
Redeix
6802646d85
Update recipes.js
Signed-off-by: Redeix <brayden.j.m.ford@gmail.com>
2025-08-10 15:29:14 -05:00
Pyritie
944fdf8c56 fix for sodium hydroxide lye recipe ID on linux 2025-08-10 14:11:30 +01:00
Pyritie
2e66bc20e1 made brick cutting recipes cheaper/faster 2025-08-10 12:15:06 +01:00
Redeix
2c5658a185
Reflector block and some other fixes (#1575)
* Reflector block and some other fixes

* Updated Changelog
2025-08-10 11:39:10 +01:00
Pyritie
f74316154d slightly buffed tree tap amounts 2025-08-10 02:13:26 +01:00
Pyritie
e59dc4d57d remove lava buckets as fuel 2025-08-10 00:13:25 +01:00
Pyritie
fbbfe31ba8 mars farmland stuff, also fixed nox berry EGH recipe 2025-08-09 23:57:45 +01:00
Pyritie
d196a2820e forgot these ores 2025-08-09 15:14:59 +01:00
Pyritie
7de1910ee1 cleaned up and fixed the raw ore to smelting recipes #1566 2025-08-09 15:07:51 +01:00
Pyritie
7a0b6898cf changed plated block recipes to be shapeless so people stop plating their floors by accident 2025-08-09 14:23:50 +01:00
Pyritie
fc0c62f77c added create packages/jars to the railgun blacklist 2025-08-09 14:12:36 +01:00
Pyritie
7f254aae51 added small to large cog recipes (#1571) 2025-08-09 14:09:19 +01:00
Pyritie
a09661dd3e lye -> sodium hydroxide 2025-08-09 02:12:59 +01:00