3292 Commits

Author SHA1 Message Date
9fa0885f6d TEMP 2025-12-19 16:16:25 +01:00
cd9129cc0b Update ae2 quest with new prog 2025-12-19 16:16:25 +01:00
cc4e8edf51 Port gregitas certus to waffer chain 2025-12-19 16:16:25 +01:00
Pyritie
1493fd9c6f fix rose quartz lens tag, fix rose quartz russian lang 2025-12-19 13:04:59 +00:00
Pyritie
79f4af85bc remove tungsten-bismuth large gear 2025-12-19 12:58:42 +00:00
Pyritie
d2b3470480 fix sand item tag model 2025-12-19 12:54:41 +00:00
Pyritie
6b769eebf1 fix tooltips, changelog 2025-12-19 12:10:22 +00:00
Pyritie
2a0b25db49 brick wooden form for clay bricks #2461 2025-12-19 12:10:14 +00:00
Pyritie
cc4f34b405 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-12-19 11:38:39 +00:00
Pyritie
e5c644cad0 langs 2025-12-19 11:38:38 +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
f04923e491 fix accidentally deleting coke blocks 2025-12-19 00:45:45 +00:00
Pyritie
45385b7581 langs and quests 2025-12-18 22:06:10 +00:00
Pyritie
01ec083e6d better rnr textures 2025-12-18 21:23:39 +00: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
Epicificator
ec8f3519f7 New New belt textures! (#2454)
* Natural rubber belt block textures

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

* remove old styrene butadiene rubber belt block textures

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

* New SBR belt textures!

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

* Delete old rubber belt item texture

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

* New belt item textures

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

* Delete old silicone rubber belts

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

* New silicone belt textures!

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

---------

Signed-off-by: Epicificator <143143550+Epicificator@users.noreply.github.com>
2025-12-18 08:37:46 +00:00
Pyritie
3fe50f6345 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-12-17 20:24:32 +00:00
Pyritie
146d0bf2d0 some tweaks to moon structures 2025-12-17 20:24:29 +00:00
Pyritie
098e1e6f06 remove animal fat from beasts cuz you can mob farm them 2025-12-17 13:47:35 +00:00
Pyritie
6805b6368f langs 2025-12-16 23:19:59 +00:00
Pyritie
88af05c97e mining machines now replace rocks with the correct cobble 2025-12-15 22:54:23 +00:00
Pyritie
0a16e94ab1 oh yeah there's a tag prefix for this now 2025-12-15 22:53:20 +00:00
Pyritie
1c82bded8f langs 2025-12-15 19:46:49 +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
1b161d09f8 Revert "remove conk"
This reverts commit 15a94f150f.
2025-12-15 19:07:53 +00:00
Pyritie
15a94f150f remove conk 2025-12-15 19:06:42 +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
6ae4bf942d langs 2025-12-15 18:37:39 +00:00
Pyritie
75c94eb364 remove fancier coke gems 2025-12-15 18:37:34 +00:00
Pyritie
77abafee3e fix recipe collision with vanilla stone plates 2025-12-15 18:37:19 +00:00
Pyritie
f2d633ff8e thanks vexxed 2025-12-15 18:34:54 +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
a807d2694f hide tfc gypsum, add some tag models for dirt and sand 2025-12-15 17:49:53 +00:00
Pyritie
7dc6ab64e4 halite so good I made halite2 2025-12-15 16:52:06 +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
Pyritie
0e6b484224 fixed not being able to grow warped trees on mars dirt 2025-12-15 16:09:05 +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
Pyritie
0f3b4df973 langs 2025-12-15 13:45:05 +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