Commit graph

5874 commits

Author SHA1 Message Date
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
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
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
GameStar
18e2113366
Update CHANGELOG.md
Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
2025-12-14 21:27:11 -06:00
Pyritie
c7d73a805d hid the other greate things, hid the rest of the swine-steel tool heads 2025-12-15 01:29:07 +00:00
Pyritie
60ca14c696 pakku 2025-12-15 00:44:54 +00:00
Pyritie
001c8c3e36 added the new structures to the CL 2025-12-15 00:44:15 +00: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
woopSmile
dc34dd8b98
Revert "Add colorwheel fall back mode to support TFG 2.0.4 (#2425)" (#2426)
This reverts commit 88824c5282.
2025-12-14 23:24:55 +00:00
woopSmile
88824c5282
Add colorwheel fall back mode to support TFG 2.0.4 (#2425)
title pretty self explanatory

Signed-off-by: woopSmile <tristanjobin@gmail.com>
2025-12-14 23:19:20 +00:00
Pyritie
b79493883b good thing I caught this 2025-12-14 22:56:48 +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
e614f45983 remove illager spawns 2025-12-14 17:52:55 +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