Commit graph

2064 commits

Author SHA1 Message Date
Pyritie
5c0842dcff added new illager invisible structures and small camps 2025-12-15 00:38:12 +00:00
Pyritie
9ecccfc4aa fixed a dupe with the redstone link 2025-12-14 20:54:07 +00:00
Pyritie
e77519aa59 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-12-14 19:20:40 +00:00
Pyritie
6aa66d148d strange numbers 2025-12-14 19:20:36 +00:00
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
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
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
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
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
e3be7d6d1d medicine rework 2025-12-13 23:30:51 +00:00
Pyritie
4ef05a397d comment out greate belt stuff for now 2025-12-13 23:14:20 +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
Pyritie
2a61036c5b fix cobalt brass illager tools missing properties 2025-12-13 15:13:01 +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
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
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
Pyritie
a9613b372f remove logging 2025-12-11 23:44:25 +00:00
Pyritie
e85d833bce improved tooltips, added boots 2025-12-11 01:10:31 +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
0ec6f5da04 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-12-10 23:30:00 +00:00
Pyritie
f0db35c0ca fix #2373 2025-12-10 23:29:57 +00:00
Pyritie
5be37dc97f tooltips and tags for more hot/cold/light stuff 2025-12-10 23:22:23 +00:00
Redeix
bb9c0b608c
A bunch of random stuff (#2365) 2025-12-10 01:53:28 -06:00
Pyritie
ebb7fecf20 improvements to the hot or not levitation 2025-12-10 01:08:27 +00:00
Pyritie
f653703615 tags for hotornot 2025-12-09 18:51:02 +00:00
Pyritie
120d6e1c43 moved drinkable data to the right namespaces, renamed tfcgurman server script dir -> tfc_gurman, moved all alcohols to #tfg:alcohols instead of #tfc:alcohols, because agedalcohols is very fussy 2025-12-09 15:48:42 +00:00
Pyritie
e69ae9ff6d t2 space suit now also gives fire prot - it's not really _needed_, but it does make tfchotornot stop throwing your inventory items away 2025-12-09 15:41:48 +00:00
Pyritie
0b331b98bc moved the blackstone brick recipe 2025-12-09 00:02:06 +00:00
Pyritie
77ae0265e8 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-12-09 00:00:25 +00:00
Pyritie
ffd474608f fix #2353 2025-12-08 23:59:55 +00:00
GameStar
5494a07dbf
Ochem stuff for Fission (#2338)
* molecules

* Update recipes.biochem.js

* will use these later

* update this

* ugh

* lang merger

* Update fructose.json

* iconsets I guess

* Update recipes.nuclear.js

Signed-off-by: Pyritie <pyritie@gmail.com>

* Update recipes.nuclear.js

---------

Signed-off-by: Pyritie <pyritie@gmail.com>
Co-authored-by: Pyritie <pyritie@gmail.com>
2025-12-08 23:43:30 +00:00
Pyritie
12c5cb3f8f Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-12-08 22:55:38 +00:00
Pyritie
2e48d81cfb 2 tiny pipes instead of 1 2025-12-08 22:55:25 +00:00
GameStar
3d735015b6
someone forgot a closing brace
Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
2025-12-08 16:52:43 -06:00
Pyritie
deb466e801 added temporary workaround for the missing pipe recipes 2025-12-08 22:17:50 +00:00
Pyritie
a06e877943 fix #2339 2025-12-08 21:52:57 +00:00
Pyritie
811cf2766f move venus fluids into core 2025-12-08 19:53:36 +00:00
Pyritie
dd1463acdf update to forge 47.4.13, fix aged sake, fix cleanroom doors, fix butyraldehyde 2025-12-08 19:36:35 +00:00