Commit graph

2742 commits

Author SHA1 Message Date
Pyritie
4fb23f4e94 will you leave me alone if I submit these, ftbquests? 2025-04-29 00:21:58 +01:00
Pyritie
72f7349cfe Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-04-29 00:16:24 +01:00
Pyritie
389c6d4ef5 Added more details to ore hazards field guide entry 2025-04-29 00:16:16 +01:00
Pyritie
87f67c8be5 lowered recipe speed of bulk washing 2025-04-29 00:15:59 +01:00
Pyritie
70a9dfd920 Added recycling recipes for your old molds 2025-04-29 00:15:21 +01:00
Pyritie
79ac1b6799 Fixed nano legs buff from also removing speed buff, for now 2025-04-29 00:14:32 +01:00
Redeix
bcc6c9cbf6
Merge pull request #924 from Redeix/dev
Actual fix for astikor cart item size!
2025-04-28 14:07:33 -05:00
Redeix
26322a1550
Merge branch 'TerraFirmaGreg-Team:dev' into dev 2025-04-28 13:17:10 -05:00
Redeix
1d47b73d4d - Missed this commit last time oops 2025-04-28 13:16:17 -05:00
Redeix
9fac32f5d0
Merge pull request #923 from NobleWasTaken/patch-1
Update carryon-common.toml
2025-04-28 09:26:26 -05:00
NobleWasTaken
1a811cff18
Update carryon-common.toml
Carry On's config doesn't seem to work with tags (#), so I explicitly added the framedblocks chest and the tfc chests to the whitelist. I also removed storage drawers since they aren't in use.

Signed-off-by: NobleWasTaken <137561393+NobleWasTaken@users.noreply.github.com>
2025-04-28 05:33:32 -04:00
Pyritie
a69e32beac changed early game recipes to use small gears instead of large, to avoid duping, and make cogs easier 2025-04-27 17:12:25 +01:00
Pyritie
f16f525f05 fixed lang files for universal circuits 2025-04-27 17:11:41 +01:00
Pyritie
c1c9382d26 fixed stress levels on the rolling mill 2025-04-27 17:11:32 +01:00
Pyritie
323bd1d04f added caelum + tfc-caelum to pakku 2025-04-27 12:15:47 +01:00
Pyritie
745f5f26c0 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-04-27 11:30:22 +01:00
Pyritie
7eeb258445 changed Caelum to be on the server too, since tfc-caelum is also a server mod 2025-04-27 11:30:20 +01:00
Xikaro
84014d405e Update build.yml 2025-04-27 12:49:52 +05:00
Xikaro
0cc983613f Update build.yml 2025-04-27 12:46:58 +05:00
Xikaro
8b9b009646 Update build.yml 2025-04-27 12:44:17 +05:00
Xikaro
10bf9482c7 Update build.yml 2025-04-27 12:42:36 +05:00
Xikaro
46634beabd Update build.yml 2025-04-27 12:34:13 +05:00
Xikaro
4ad8117e3f
Merge pull request #919 from TerraFirmaGreg-Team/dev
Alpha Release: 0.9.2
2025-04-27 12:20:56 +05:00
Xikaro
0c3b28549f update 2025-04-27 12:18:51 +05:00
Xikaro
c1aa2dc7b7 pakku-lock.json 2025-04-27 12:14:49 +05:00
Xikaro
fdd400c8aa Update mods 2025-04-27 12:09:28 +05:00
Xikaro
e831055770 Update CHANGELOG.md 2025-04-27 12:06:54 +05:00
Pyritie
f6121eb23c fixed crash when making a new world 2025-04-26 19:13:51 +01:00
Pyritie
9eccbdcfa3 added anvils to the progression chapter 2025-04-26 19:13:42 +01:00
Pyritie
5df8384508 added missing circuits to progression quest 2025-04-26 18:54:01 +01:00
Pyritie
a9faa552f4 missed a removal 2025-04-26 18:47:10 +01:00
Pyritie
f3aebd0bc8 deleted multiblock dilemma chapter 2025-04-26 18:39:57 +01:00
Pyritie
bc26664aa0 more glue for the glue gods 2025-04-26 18:23:41 +01:00
Pyritie
bff1604f5d added missing ULV bus/hatch recipes, fixed LV ones 2025-04-26 18:22:47 +01:00
Pyritie
3c0688a4a3 lang merging 2025-04-26 17:39:59 +01:00
Pyritie
fc6993d32a lang merge 2025-04-26 17:21:09 +01:00
Pyritie
e289fe5375 merge 2025-04-26 17:19:38 +01:00
Pyritie
8a1c6fecf7 lang update 2025-04-26 17:19:04 +01:00
Redeix
8eb77c41c0
Merge pull request #913 from Redeix/dev
Added support for armor trims. Added fishing nets. Added more cloth alternatives
2025-04-26 11:18:27 -05:00
Pyritie
b15a700cfe
Merge branch 'dev' into dev
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-04-26 15:34:35 +01:00
Pyritie
d8b2f7f154 fixed rolling mills having no stress 2025-04-26 15:23:00 +01:00
Pyritie
6a8e763c36 Revert "quest fixes"
This reverts commit 61bcac2693.
2025-04-26 15:20:23 +01:00
Pyritie
61bcac2693 quest fixes 2025-04-26 15:19:44 +01:00
Pyritie
bf3bde4b16 quest fixes 2025-04-26 14:31:35 +01:00
Pyritie
61252b01ce updated changelog 2025-04-26 14:11:51 +01:00
Pyritie
294c4ed59d slime now smelts into glue 2025-04-26 14:00:58 +01:00
Pyritie
a478baa1a4 remove better-biome-reblend and model-gap-fix 2025-04-26 13:38:28 +01:00
Pyritie
f48474a849 added tfc-caelum and caelum 2025-04-26 13:37:06 +01:00
Pyritie
14abfd2acd pakku update 2025-04-26 13:34:25 +01:00
Pyritie
62c12473b2 update pakku 2025-04-26 13:30:05 +01:00