Commit graph

4279 commits

Author SHA1 Message Date
Pyritie
e53dcf2ea6 biomass and fish oil buffs, added sodium hydroxide to biodiesel from seed oil 2025-08-09 01:18:14 +01: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
Pyritie
4a2e6ed229 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-08-08 23:18:00 +01:00
Pyritie
9e33fb65ca pakku updates for snr, gt, tfclunchbox, greate 2025-08-08 23:17:56 +01:00
TomPlop
d4b963ad74
Change the config of FTBQuests to be back to linear (#1568)
Hopefully this will future proof the issue of quests being not completed even though the tasks are done

This one will need a massive announcement and asking for feedback. It shouldn't fix the already bugged quest but hopefully will prevent any future one.

Signed-off-by: TomPlop <tomdidome@gmail.com>
2025-08-08 23:15:02 +01: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
18835836a8 updated changelog 2025-08-08 20:22:40 +01: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
TomPlop
feec2487ef
Fix infinite energy with Large Solar Arrays (#1563)
Signed-off-by: TomPlop <tomdidome@gmail.com>
2025-08-08 14:01:55 -05: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
Redeix
be35e4e823
- railgun fanfare (#1557)
* - railgun fanfare

* updated changelog
2025-08-08 09:25:12 +01:00
Pyritie
626bdb0de0 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-08-08 01:06:05 +01:00
Pyritie
0ea561e78e removed rotting from canola 2025-08-08 01:06:04 +01:00
Pyritie
308b14bcad
Merge branch 'main' into dev 2025-08-07 23:35:16 +01:00
Pyritie
0e9a56713b thanks pakku 2025-08-07 23:30:02 +01:00
Xikaro
b08b673070
Merge pull request #1551 from TerraFirmaGreg-Team/dev
Release: 0.10.6
2025-08-08 01:12:07 +03:00
Pyritie
e0d8be434e whoops this isn't done yet 2025-08-07 23:11:10 +01:00
Pyritie
9aa277a889 I know I'm going to get questions about this 2025-08-07 23:06:08 +01:00
Pyritie
2c173e209f pull the trigger, piglet 2025-08-07 23:02:08 +01:00
Pyritie
7af3303fe9 rapeseed -> canola 2025-08-07 22:56:28 +01:00
Pyritie
c8f79aaa62 changelog, also added red granite knapping texture just cuz that's ugly to new players 2025-08-07 22:46:18 +01:00
Pyritie
8c118d61f4 updated pakku 2025-08-07 22:35:53 +01:00
Pyritie
361cb69e59 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-08-07 22:35:02 +01:00
Pyritie
627efa9d57 ok found the right setting this time 2025-08-07 22:34:59 +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
Spicy Noodles
8c1aec9d30
Remove cinnabar to redstone recipe (#1548)
* Remove cinnabar to redstone recipe

* Changelog

---------

Co-authored-by: Gustavo <77560533+gustovafing@users.noreply.github.com>
2025-08-07 22:11:52 +10: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
Gustavo
696909486a Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-08-07 21:02:22 +10:00
Gustavo
52dfa01bb4 add missing tag to loose rock items 2025-08-07 21:02:20 +10:00
dependabot[bot]
15bad0ccb5
Bump roamingowl/template-output-with-eta in the dependencies group (#1527)
Bumps the dependencies group with 1 update: [roamingowl/template-output-with-eta](https://github.com/roamingowl/template-output-with-eta).


Updates `roamingowl/template-output-with-eta` from 1.12.0 to 1.13.0
- [Release notes](https://github.com/roamingowl/template-output-with-eta/releases)
- [Commits](https://github.com/roamingowl/template-output-with-eta/compare/v1.12.0...v1.13.0)

---
updated-dependencies:
- dependency-name: roamingowl/template-output-with-eta
  dependency-version: 1.13.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-08-07 12:56:02 +03:00
Redeix
1c6fb19b76
- Railgun particles (#1547) 2025-08-07 09:37:39 +01:00
Pyritie
cbad72ecf8 added potin, cobalt, and cobalt brass as tfc metals, fixed ratios of tfc brass/bronze 2025-08-07 00:39:42 +01:00
Gustavo
4327da326f Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-08-06 19:58:26 +10:00
Gustavo
c349aa4ad7 revert commit to actually put them in lang files 2025-08-06 19:58:21 +10:00
Gustavo
8f8d04b0d8 revert commit to actually put them in lang files 2025-08-06 19:57:51 +10:00
Gustavo
cdf57686ba rename extruder molds 2025-08-06 19:31:02 +10:00
Redeix
7a2c63d2d0
Update CHANGELOG.md
Signed-off-by: Redeix <brayden.j.m.ford@gmail.com>
2025-08-05 20:17:48 -05:00