Commit graph

2129 commits

Author SHA1 Message Date
Pyritie
ffc635a880 I think that one guy's install was fucked but I already wrote these, so why not 2025-08-11 02:10:17 +01:00
Pyritie
ce5db1446d updated primitive alloy patchouli page to reflect new alloy ratios 2025-08-10 21:54:57 +01:00
Pyritie
47ea14cd40 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-08-10 21:32:06 +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
fcb50c2a49 missing item models for the wild ones 2025-08-10 21:22:12 +01:00
Pyritie
877653ad9b finished textures for the mars crops (except the greenhouse ones) 2025-08-10 20:59:20 +01:00
Pyritie
4ee97185a5 sick of seeing these two bozos in the log files all the time 2025-08-10 17:53:42 +01:00
Pyritie
944fdf8c56 fix for sodium hydroxide lye recipe ID on linux 2025-08-10 14:11:30 +01:00
Pyritie
cd469833af mars farmland loot table 2025-08-10 13:04:56 +01:00
Pyritie
cf3e596905 mars farmland lang 2025-08-10 12:16:52 +01:00
Pyritie
2e66bc20e1 made brick cutting recipes cheaper/faster 2025-08-10 12:15:06 +01:00
Pyritie
90d26fb597 lang 2025-08-10 12:05: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
5a5c5040fd fixed dust secondary texture 2025-08-09 23:57:23 +01:00
Pyritie
44acd49485 added more icon sets for dusts and rods 2025-08-09 21:56:24 +01:00
Pyritie
655ef68697 fixed a duplicate fluix block, also tweaked the fluix material a little 2025-08-09 17:43:08 +01:00
Pyritie
3b9b80f52d lang updates 2025-08-09 15:47:43 +01:00
Pyritie
d196a2820e forgot these ores 2025-08-09 15:14:59 +01:00
Pyritie
cb74670ceb Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-08-09 15:08:00 +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
Gustavo
97a81e4989 update emi category order 2025-08-09 12:11:15 +10:00
Gustavo
1bc04a7a04 add EMI category lang key 2025-08-09 12:05:21 +10:00
Gustavo
37e1e2d28b Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-08-09 11:48:08 +10:00
Gustavo
68e3dc10bc change depth lang key 2025-08-09 11:48:06 +10:00
Pyritie
bca574914b Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-08-09 02:13:47 +01:00
Pyritie
a09661dd3e lye -> sodium hydroxide 2025-08-09 02:12:59 +01:00
Gustavo
253414026d lang key update 2025-08-09 10:44:20 +10:00
Gustavo
2915e03744 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-08-09 10:33:38 +10:00
Gustavo
0ff8d09856 add translation keys 2025-08-09 10:33:36 +10: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