Commit graph

1406 commits

Author SHA1 Message Date
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
Pyritie
8991740d2a Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-08-09 01:24:25 +01:00
Pyritie
e53dcf2ea6 biomass and fish oil buffs, added sodium hydroxide to biodiesel from seed oil 2025-08-09 01:18:14 +01:00
Gustavo
49b02972b4 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-08-09 09:56:56 +10:00
Gustavo
26aad81bdd add missing ore item tags 2025-08-09 09:56:54 +10:00
Pyritie
1bea67bb09 cleaned up the red alloy recipes, also fixed #1565 2025-08-09 00:47:58 +01:00
Pyritie
b0608183e9 fixes not being able to quern hardwood/softwood, removed strophar/aeronos caps from the log tag 2025-08-09 00:34:06 +01:00
Pyritie
4664e60a98 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-08-08 23:43:06 +01:00
Pyritie
f992705780 added chalk knapping recipes for lower durability chalk items #1562 2025-08-08 23:43:00 +01:00
Gustavo
ec64419623 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-08-09 08:30:29 +10:00
Gustavo
7eda76d0c4 run lang merger 2025-08-09 08:30:27 +10:00
TomPlop
966f4f000c
Fix Pyrolyse Oven accepting other ender pearls (#1567)
You should have to make an Implosion Compressor and not skip by killing Enderman

Signed-off-by: TomPlop <tomdidome@gmail.com>
2025-08-08 23:09:24 +01:00
Pyritie
18919ae833 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-08-08 20:37:08 +01:00
TomPlop
d29c254dc4
Fix EHG for Logs and reduce cost by half (#1564)
Signed-off-by: TomPlop <tomdidome@gmail.com>
2025-08-08 14:23:38 -05:00
Pyritie
f9abebb03b Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-08-08 20:20:53 +01:00
Pyritie
cce674098d changed basin to cast iron ingots so you can actually use the mech press in the bronze age 2025-08-08 20:20:48 +01:00
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