Commit graph

5849 commits

Author SHA1 Message Date
Mqrius
bcd3a0c356
Fix sharp tools BlockEvent filter (#2419)
Signed-off-by: Mqrius <Nuntius.Marii@Gmail.com>
2025-12-14 18:03:13 +00:00
Pyritie
4fbd9755ed move syngas to the new format too 2025-12-14 17:45:15 +00:00
Pyritie
3896d00977 migrate all vintageimprovements recipes to the new kjs format 2025-12-14 17:32:25 +00:00
Pyritie
b532670de1 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-12-14 15:35:29 +00:00
Pyritie
eb55f20a43 remove modrinth baguettelib, update greate, add vintage improvements kubejs mod, fix all the greate rose quartz namespace changes 2025-12-14 15:35:22 +00:00
Xikaro
f3e2152a22 fix: icon build 2025-12-14 18:28:02 +05:00
Pyritie
fe1b8585da nerfed biomass from vanilla plants, changed honey to sugar to the extractor 2025-12-14 12:37:00 +00:00
Pyritie
0650cfd65a more animal fat #2367 2025-12-14 12:29:41 +00:00
Pyritie
1186134cd6 #2398 2025-12-14 11:59:28 +00:00
Pyritie
d5066e637a removed butchery knife additional meat drop from illagers 2025-12-14 11:47:01 +00:00
Pyritie
40a54fd1ff Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-12-14 02:30:54 +00:00
Pyritie
316dc2f5fb moved syngas in the vacuumizer to the top #2378
Related Work Items: #23
2025-12-14 02:30:50 +00:00
Pyritie
ab7f443772 changelog, quests, langs 2025-12-14 02:10:17 +00:00
GameStar
630d39bc78
add first smr boosters (#2381)
* dfgdfgdfgdfg

* molecules

* ran lang merger

---------

Co-authored-by: Pyritie <pyritie@gmail.com>
2025-12-14 01:57:31 +00:00
Pyritie
74ab10ed92 got distracted and added way more field guide links to the quests 2025-12-14 00:43:46 +00:00
Pyritie
0c806488e6 some crop fixes for the greenhouse renderer 2025-12-13 23:33:23 +00:00
Pyritie
e3be7d6d1d medicine rework 2025-12-13 23:30:51 +00:00
Pyritie
793e2c0158 pakku update 2025-12-13 23:22:20 +00:00
Pyritie
4ef05a397d comment out greate belt stuff for now 2025-12-13 23:14:20 +00:00
Pyritie
3b05453c88 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-12-13 22:32:43 +00:00
Pyritie
6862c7a7d4 langs 2025-12-13 22:27:26 +00:00
Pyritie
546c598bc4 add item models for pills 2025-12-13 22:12:14 +00:00
Mqrius
c40ffcc0bf
Move boiled eggs to food processor to deconflict with cooked egg, fix pickled egg recipe name typo (#2407)
* Move boiled eggs to food processor to deconflict with cooked egg

Signed-off-by: Mqrius <Nuntius.Marii@Gmail.com>

* Move boiled_egg recipe, fix pickled egg recipe name

Signed-off-by: Mqrius <Nuntius.Marii@Gmail.com>

---------

Signed-off-by: Mqrius <Nuntius.Marii@Gmail.com>
2025-12-13 20:14:22 +00:00
thederpysockdude123
ea04149a63
updating tags of cover facades/domum ornamentum stuff to include treated wood planks (#2404)
* Updated tags to include treated wood planks.js

Signed-off-by: thederpysockdude123 <thederpysockdude123@gmail.com>

* Updated tags to include treated wood planks.facades.js

Signed-off-by: thederpysockdude123 <thederpysockdude123@gmail.com>

* Update tags.facades.js

Signed-off-by: thederpysockdude123 <thederpysockdude123@gmail.com>

---------

Signed-off-by: thederpysockdude123 <thederpysockdude123@gmail.com>
2025-12-13 12:23:25 -06:00
Mqrius
ab0226f74d
Don't backup DistantHorizons LODs (#2406)
Exclude "DistantHorizons.sqlite" from ftbbackups2 since that's not critical data and leads to a lot of backup bloat.

Signed-off-by: Mqrius <Nuntius.Marii@Gmail.com>
2025-12-13 12:22:44 -06:00
thederpysockdude123
5f6089dd60
added tfc:foods tag to a whole bunch of tfg foods (#2405)
* Update items.food.js

Signed-off-by: thederpysockdude123 <thederpysockdude123@gmail.com>

* Update items.food.js

Signed-off-by: thederpysockdude123 <thederpysockdude123@gmail.com>

---------

Signed-off-by: thederpysockdude123 <thederpysockdude123@gmail.com>
Co-authored-by: Redeix <brayden.j.m.ford@gmail.com>
2025-12-13 12:21:49 -06:00
Pyritie
22ed55306a electric greenhouse renderer 2025-12-13 18:11:56 +00:00
Pyritie
bb5ca3c541 charred trees should fall over now? 2025-12-13 15:13:14 +00:00
Pyritie
2a61036c5b fix cobalt brass illager tools missing properties 2025-12-13 15:13:01 +00:00
Pyritie
dcafe25325 fix swine-steel axes from not having the lumberjack property 2025-12-13 15:12:47 +00:00
Pyritie
88b13b566b update gtceu config 2025-12-13 14:52:21 +00:00
Pyritie
e5a4a356b3 remove c&a accumulator 2025-12-13 14:47:35 +00:00
Pyritie
8ed92f17f8 update changelog 2025-12-13 14:10:37 +00:00
Redeix
35a14ab62c
particles (#2401) 2025-12-13 11:59:20 +00:00
Mqrius
4ac447cf62
Add circuit to Silicon Tetrachloride (#2387)
Fixes #2383, deconflicts with Polydimethylsiloxane (and various other recipes!)

Signed-off-by: Mqrius <Nuntius.Marii@Gmail.com>
2025-12-13 11:57:59 +00:00
Pyritie
73d7bd46ed whoops 2025-12-13 03:01:08 +00:00
Pyritie
a65289562d new belts! 2025-12-13 03:00:58 +00:00
Pyritie
24bd4b9fca langs 2025-12-12 22:11:14 +00:00
Pyritie
a9017c622a Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-12-12 22:10:38 +00:00
Epicificator
2a9f70e35e
add acetic acid and vinegar conversion (#2390)
* add acetic acid and vinegar conversion

Signed-off-by: Epicificator <143143550+Epicificator@users.noreply.github.com>

* add circuit condition to prevent conflicting with dye recipes

Signed-off-by: Epicificator <143143550+Epicificator@users.noreply.github.com>

* changed machine to mixer, and voltage tier to mv

Signed-off-by: Epicificator <143143550+Epicificator@users.noreply.github.com>

---------

Signed-off-by: Epicificator <143143550+Epicificator@users.noreply.github.com>
2025-12-12 15:35:44 -06:00
Mqrius
90c133aa45
Various optional tags for quest items (#2386)
* Make Greate shaft & small cogwheel optional 

Signed-off-by: Mqrius <Nuntius.Marii@Gmail.com>

* LV: Make greate shaft and small cogwheel optional

Signed-off-by: Mqrius <Nuntius.Marii@Gmail.com>

* LV: make light fuel bucket optional

Signed-off-by: Mqrius <Nuntius.Marii@Gmail.com>

* MV: Make greate shaft and small cogwheel optional

Signed-off-by: Mqrius <Nuntius.Marii@Gmail.com>

* HV: Make greate shaft and small cogwheel optional

Signed-off-by: Mqrius <Nuntius.Marii@Gmail.com>

---------

Signed-off-by: Mqrius <Nuntius.Marii@Gmail.com>
Co-authored-by: Redeix <brayden.j.m.ford@gmail.com>
2025-12-11 18:37:54 -06:00
Mqrius
a90bc5ceab
Fix quest MV quad pipe accepted items (#2384)
Accept any quadruple or nonuple pipe based on item tags, instead of one of three specific items.

Signed-off-by: Mqrius <Nuntius.Marii@Gmail.com>
2025-12-12 00:02:30 +00:00
Pyritie
a9613b372f remove logging 2025-12-11 23:44:25 +00:00
Redeix
29f4d54af3
Tags (#2385)
Signed-off-by: Redeix <brayden.j.m.ford@gmail.com>
2025-12-11 17:37:22 -06:00
Pyritie
e85d833bce improved tooltips, added boots 2025-12-11 01:10:31 +00:00
Pyritie
183c071f17 changed requirements for cleanroom quest 2025-12-11 00:58:26 +00:00
Pyritie
1ed6ffb51f added machine recipes for tongs 2025-12-11 00:45:22 +00:00
Pyritie
3f8bd83a1a fixed some dupes? 2025-12-11 00:43:31 +00:00
Pyritie
c0ddacd1cb fix this for nether bricks too 2025-12-10 23:45:17 +00:00
Pyritie
ab1fb30b85 change mv plastic quests to accept liquids 2025-12-10 23:36:23 +00:00