Commit graph

2110 commits

Author SHA1 Message Date
Pyritie
dfdc8937d8 git moment 2025-12-22 22:55:53 +00:00
glitch714
e699bb2789
Add scraping knives integration (#2494)
* Redid recipes

* merged recipe files

---------

Co-authored-by: Pyritie <pyritie@gmail.com>
2025-12-22 22:54:55 +00:00
Pyritie
c725428991 added milks to the placeable fluid blacklist 2025-12-22 22:45:28 +00:00
Pyritie
b093d321de Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-12-22 01:43:52 +00:00
Pyritie
72f20ea7fb fix fishbig 2025-12-22 00:32:32 +00:00
Pyritie
bbd0dbd947 adding thermal vents, sulfur blobs and crystals 2025-12-21 23:47:03 +00:00
bigtho80
04d5639053
Prevent placement of alcohol buckets (#2491)
* Prevent alcohol bucket usage on right click

Signed-off-by: bigtho80 <97521928+bigtho80@users.noreply.github.com>

* Rename cancelalcoholbucket to cancelalcoholbucket.js

Signed-off-by: bigtho80 <97521928+bigtho80@users.noreply.github.com>

* rename cancelalcoholbucket.js into nonplaceableliquid.js and edit to add tfc:nonplaceable tag

Signed-off-by: bigtho80 <97521928+bigtho80@users.noreply.github.com>

* Add non-placeable liquid items to event

Added various non-placeable liquid items to the event.

Signed-off-by: bigtho80 <97521928+bigtho80@users.noreply.github.com>

---------

Signed-off-by: bigtho80 <97521928+bigtho80@users.noreply.github.com>
2025-12-21 14:42:46 -06:00
Pyritie
f885552aeb oh neutral is moderate temp + not an acid, gas etc 2025-12-21 18:19:52 +00:00
Pyritie
9a9083c9f7 change the usable in pot/vat tags to moderate fluids and not all liquids 2025-12-21 18:19:10 +00:00
Pyritie
8e77b5dfc5 Added a recipe to craft old gregtech facades into ones with a new texture 2025-12-21 18:08:59 +00:00
Pyritie
5279b6e999 magma is now hot 2025-12-21 14:33:31 +00:00
glitch714
6401083023
Added hardened rock recipes (#2480) 2025-12-20 12:22:58 -06:00
glitch714
7b43091b90
added super silly secret item (#2482) 2025-12-20 12:22:24 -06:00
Pyritie
757dd63ff6
Add mossy cobble to beneath, fix bastion loot chests (#2485)
* add mossy cobble blobs to beneath

* fix deepslate mossy cobble landslide

* fix mossy cobble

* fix bastion chests
2025-12-20 17:58:23 +00:00
Pyritie
6de6777850 fixs #2478 2025-12-20 15:16:05 +00:00
Pyritie
5e330e2d1f some cleanup, fixed small gears not melting 2025-12-19 23:55:29 +00:00
Pyritie
44466752e4 some tidying 2025-12-19 21:31:58 +00:00
glitch714
40ba6fe8b7
Add new molds (#2470)
* Added bunch of stuff for molds

* Changed rod mold recipe to not collide with oven chimmney

Signed-off-by: glitch714 <119386229+glitchplaysgames714@users.noreply.github.com>

* Removed unneeded comments

Signed-off-by: glitch714 <119386229+glitchplaysgames714@users.noreply.github.com>

* Changed gear mold to be fireclay

* fixed issues with molds

* Added break chance

Signed-off-by: glitch714 <119386229+glitchplaysgames714@users.noreply.github.com>

* Update constants.js

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

* Update recipes.knapping.js

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

* Update recipes.materials.js

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

* Updated constants.js

Signed-off-by: glitch714 <119386229+glitchplaysgames714@users.noreply.github.com>

* Update items.primitive.js

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

* Update constants.js

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

* Update recipes.knapping.js

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

---------

Signed-off-by: glitch714 <119386229+glitchplaysgames714@users.noreply.github.com>
Signed-off-by: Pyritie <pyritie@gmail.com>
Co-authored-by: Pyritie <pyritie@gmail.com>
2025-12-19 21:22:29 +00:00
Pyritie
bdfbeb6851 fixed being able to pick up sea ice with a saw 2025-12-19 20:23:15 +00:00
Pyritie
1493fd9c6f fix rose quartz lens tag, fix rose quartz russian lang 2025-12-19 13:04:59 +00:00
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