Commit graph

2926 commits

Author SHA1 Message Date
Xikaro
bdf374137f bump 2025-05-17 15:07:45 +05:00
Xikaro
1f9c0751a3 Update mods 2025-05-17 15:05:40 +05:00
Xikaro
cea8e2983a Update pakku-lock.json 2025-05-17 15:04:56 +05:00
Xikaro
174e47da63 Update pakku-lock.json 2025-05-17 14:55:44 +05:00
Xikaro
7ef7bc2714 Update mods 2025-05-17 14:55:42 +05:00
NobleWasTaken
5cf2df7781
Updated carryon-common.toml for afc (#1023)
Undated the carryon config file to include the arborafirmacraft chests in the whitelist

Signed-off-by: NobleWasTaken <137561393+NobleWasTaken@users.noreply.github.com>
2025-05-16 18:23:05 -05:00
Xikaro
18af864815
Merge branch 'main' into dev 2025-05-16 18:46:58 +05:00
Xikaro
3c904f7d85 CHANGELOG 2025-05-16 18:46:36 +05:00
Xikaro
5e801ef9fc Update mods 2025-05-16 18:43:54 +05:00
Xikaro
14fb2de026 aa 2025-05-16 18:43:42 +05:00
Pyritie
6afc562845 I FORGOT TO ADD PUNISHMENT FOR DEATH 2025-05-16 01:40:03 +01:00
Pyritie
9081294a29 updated pakku 2025-05-16 00:07:23 +01:00
Pyritie
b8da3a31d2 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-05-15 23:21:50 +01:00
Pyritie
077ebdaf83 hid the new space tfg blocks 2025-05-15 23:21:48 +01:00
Pyritie
c7b3ba56b0 put tin jar lid recycling in the right category 2025-05-15 23:21:35 +01:00
Pyritie
4cf0aa8b6b langs, quest tweaks, updated field guide for sprinklers 2025-05-15 23:21:20 +01:00
Xikaro
2d0a876e35 github 2025-05-16 00:58:30 +05:00
Xikaro
c0a35f04af ISSUE_TEMPLATE 2025-05-16 00:39:17 +05:00
Pyritie
81623727e6 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-05-15 20:38:04 +01:00
Pyritie
71157ac7cf tweaked Y levels of the overworld <-> beneath teleporting 2025-05-15 20:05:32 +01:00
Xikaro
ba4cc2ecf6 ISSUE_TEMPLATE 2025-05-15 23:45:00 +05:00
Xikaro
5ea2857944 Update ENHANCEMENT.yml 2025-05-15 23:44:15 +05:00
Xikaro
22e8fd9267 Update ENHANCEMENT.yml 2025-05-15 23:41:08 +05:00
Xikaro
0bfb5007f1 Update ENHANCEMENT.yml 2025-05-15 23:40:39 +05:00
Xikaro
0498585be9 Update ENHANCEMENT.yml 2025-05-15 23:37:58 +05:00
Xikaro
6c3c575304 Update ENHANCEMENT.yml 2025-05-15 23:37:43 +05:00
Xikaro
fd91d3c098 Update ENHANCEMENT.yml 2025-05-15 23:37:14 +05:00
Xikaro
a594c48db3 Update ENHANCEMENT.yml 2025-05-15 23:36:57 +05:00
Xikaro
737f6e1749 Update ENHANCEMENT.yml 2025-05-15 23:35:56 +05:00
Xikaro
7c4ca2ba0f Update ENHANCEMENT.yml 2025-05-15 23:32:14 +05:00
Xikaro
c3476cc9c9 Update ENHANCEMENT.yml 2025-05-15 23:31:47 +05:00
Xikaro
890e183900 Update CHANGELOG.md 2025-05-15 22:45:19 +05:00
Pyritie
b1e8a852af updated changelog 2025-05-15 12:23:20 +01:00
Pyritie
4772397870 removing the gregtech material error suppression because it's just causing more confusion 2025-05-14 22:23:10 +01:00
Pyritie
36683465ff Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-05-14 21:06:32 +01:00
TomPlop
9c8369262a
Fix for Create Deco bricks conflict with Minecraft bricks in the assembler (#1005)
Signed-off-by: TomPlop <tomdidome@gmail.com>
2025-05-14 20:59:22 +01:00
Pyritie
761f396080 removed obsidian framed pressure plate - idk what it even does, but it's causing crashes
fixes #1006
2025-05-14 20:59:01 +01:00
Pyritie
27a6f70141 fixed the basin having the wrong tag to be used with the charcoal forge 2025-05-14 20:57:48 +01:00
Risuga
165cc8d2cd
Some recipe changes (#1003)
* misc recipes

* add saw to jar lid recipe

* revert table salt name changing that didn't work
2025-05-14 19:42:32 +01:00
Redeix
9c258d452f
Branch merge (#995) 2025-05-13 17:08:47 +01:00
Redeix
a097ec6174
Merge branch 'dev' into dev
Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>
2025-05-13 01:25:09 -05:00
Redeix
a2ed5209c2 - Revert mold changes from #987 2025-05-13 01:19:09 -05:00
SverhRazum-Nah
72c2bce583
salt water fast fix (#992)
no more circuits

Signed-off-by: SverhRazum-Nah <leon.trol@mail.ru>
2025-05-12 20:23:08 -05:00
Zack
f1fadb4e99
Add wrought iron alternatives for early game cast iron recipes (#985)
* Add wrought iron alternatives for early game cast iron recipes

* Change doulbe iron ingots tag to use #forge item tags
2025-05-12 11:02:11 -05:00
Redeix
cf54f584b4
Fixes and features (#987)
* - Fixed hide duping recipes.
- Added quest book and field guide instances for fishing nets.
- Fixed rebar support recipe crash.
- Fixed red steel flask dupe.
- Fixed red alloy recipe inconsistency.

* - Fixed blue steel backpack block lang

* - Added max vessel fluid warning to small vessels.

* - Moved red steel flask recipe

* - Fixed fishing nets event function

* Update queststfc_tips.snbt

Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>

* Update en_us.json

Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>

* - Added item to summon armor stands with arms

* - Added recipes to empty vessels and molds

* - Added recipes for extracting/ forming magma blocks.

* - Added recipes for extracting/ forming magma blocks.

* - Nerfed steel support recipe output.

---------

Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>
2025-05-12 12:29:10 +01:00
Redeix
1b3e4c98db - Nerfed steel support recipe output. 2025-05-11 23:33:00 -05:00
Redeix
f2d98359de - Added recipes for extracting/ forming magma blocks. 2025-05-11 23:22:38 -05:00
Redeix
0d96bc775a - Added recipes for extracting/ forming magma blocks. 2025-05-11 23:22:30 -05:00
Redeix
7176adfc8d - Added recipes to empty vessels and molds 2025-05-11 22:49:16 -05:00
Redeix
9564090c1b - Added item to summon armor stands with arms 2025-05-11 22:15:31 -05:00