Commit graph

2090 commits

Author SHA1 Message Date
Pyritie
2a0b25db49 brick wooden form for clay bricks #2461 2025-12-19 12:10:14 +00:00
Mqrius
5fee8d740e
Hotfix raw rubber vacuumizer recipe (#2464)
Order got reversed in 11.11

Signed-off-by: Mqrius <Nuntius.Marii@Gmail.com>
2025-12-19 11:19:43 +00:00
applenper
3e68785de2
Boiler cleanup fix (#2463)
* boiler recipe cleanup

* removed duplicate bundle event remove

* adjusted charcoal nerf to affect all instances of charcoal

* fixed a some regex typos that caused blocks of charcoal to be excluded inadvertently

---------

Signed-off-by: applenper <deadboy688@gmail.com>
2025-12-18 21:25:26 -06:00
Pyritie
8932a00c2a merry christmas 2025-12-18 21:20:11 +00:00
TomPlop
906c64b4b6
Add quests (#2456) 2025-12-18 18:29:10 +00:00
Pyritie
098e1e6f06 remove animal fat from beasts cuz you can mob farm them 2025-12-17 13:47:35 +00:00
Pyritie
0a16e94ab1 oh yeah there's a tag prefix for this now 2025-12-15 22:53:20 +00:00
Pyritie
1a798b6185 cleanup 2025-12-15 19:26:01 +00:00
Pyritie
4ffdf39e07 fix typo 2025-12-15 19:21:06 +00:00
Pyritie
6944cb7083 coke gem trim -> armalcolite gem trim 2025-12-15 19:12:36 +00:00
Pyritie
aeca63edfb Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-12-15 18:46:47 +00:00
Pyritie
84203c20ab added some missing fuels 2025-12-15 18:46:44 +00:00
Pyritie
77abafee3e fix recipe collision with vanilla stone plates 2025-12-15 18:37:19 +00:00
Jeuv
bb74c1ea4c
Fix #2429 (#2436)
Filter the bronze drum emptying recipe to prevent bronze drum transmutation.

Signed-off-by: Jeuv <73312791+Jeuvke@users.noreply.github.com>
2025-12-15 18:15:52 +00:00
TomPlop
8ab09abe56
Add btx (#2416)
* adding textures and recipes

* Balance BTX and Reformate Gas

* Oups

* fix material amount
2025-12-15 12:12:49 -06:00
Pyritie
404d2f3cd0 concrete dyes 2025-12-15 17:50:03 +00:00
Pyritie
748f058578 added renewable clay 2025-12-15 16:50:05 +00:00
Pyritie
4eed49cb82 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-12-15 16:09:53 +00:00
Pyritie
557e459954 just doing #2434 myself because merge conflicts 2025-12-15 16:09:51 +00:00
applenper
858d6ccfe0
Boiler recipe cleanup (#2421)
* boiler recipe cleanup

* removed duplicate bundle event remove
2025-12-15 15:59:48 +00:00
thederpysockdude123
892f2dcb4f
Remove macaw's stuff from boiler recipes for easier menu nav (#2415)
* Update items.food.js

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

* Revert "add tfc:foods tag to a whole bunch of TFG foods"

* remove macaw's stuff from boiler recipes for easier menu nav

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

* Update recipes.js

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

* Update recipes.js

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

* removed that line :P

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

---------

Signed-off-by: thederpysockdude123 <thederpysockdude123@gmail.com>
2025-12-15 15:59:32 +00:00
Mqrius
0e415d81f5
Fix toolUsed being referenced before definition (#2428)
Oops #2419

Signed-off-by: Mqrius <Nuntius.Marii@Gmail.com>
2025-12-15 11:19:44 +00:00
FlightingFalcon
cfe7ad1b6f
fixed ostrum machine casing recipe (#2427)
Signed-off-by: FlightingFalcon <100160941@ccisd.net>
Co-authored-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
2025-12-15 11:19:15 +00:00
GameStar
389c084ee5
Fix error in duration of packing flax
Potential cause of server crash

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
2025-12-14 22:07:11 -06:00
Pyritie
2a626b422c Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-12-15 00:38:14 +00:00
Pyritie
5c0842dcff added new illager invisible structures and small camps 2025-12-15 00:38:12 +00:00
GameStar
e06ca51081
New Active Transformer (#2424)
* textures and stuff

* recipes

* looks a little better

* got texture thing to be

* probably good enough

* cooling tower touchup
2025-12-14 22:03:41 +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