Commit graph

3197 commits

Author SHA1 Message Date
Pyritie
263a9dfab7 merge 2025-06-05 12:24:32 +01:00
Xikaro
c2b330acf0 Update pakku-lock.json 2025-06-05 12:53:22 +05:00
Xikaro
33e056943b Revert "fix merge"
This reverts commit 331f29bf06.
2025-06-05 12:48:28 +05:00
Pyritie
b3d95e9c9c changed stone layers so they all follow the same noise (easier to understand since that's how tfc does it too, more or less) 2025-06-04 23:43:34 +01:00
Pyritie
331f29bf06 fix merge 2025-06-04 23:35:46 +01:00
Pyritie
5279972f48 merge 2025-06-04 23:28:02 +01:00
Pyritie
3610e29c7b changelog 2025-06-04 23:26:23 +01:00
Pyritie
3832fbbe2e langs 2025-06-04 23:25:59 +01:00
TomPlop
955a838aca
Quests work (Langfile, WIP) (#1126) 2025-06-04 23:24:40 +01:00
Pyritie
ecbc791b30 better recipes for bars, doors, trapdoors 2025-06-04 23:23:45 +01:00
Pyritie
d8c4713247 pakku moment 2025-06-04 22:36:54 +01:00
Pyritie
1f507feefa changed copper diving equipment durability to match copper armor, all diving equipment now copies any forging bonuses 2025-06-04 21:59:56 +01:00
Pyritie
3eebef1616 more greenhouse tweaks, added a recipe for grass blocks 2025-06-04 21:49:00 +01:00
Pyritie
e13960638f fixed greenhouse perfect OC 2025-06-04 21:14:15 +01:00
Pyritie
da64f9975c updating langs 2025-06-04 20:34:39 +01:00
Pyritie
3f172255ac added high quality fabric tags to phantom silk and nylon 2025-06-04 20:01:04 +01:00
Pyritie
435f514db2 increased durability of blue steel diving suit 2025-06-04 12:41:23 +01:00
Pyritie
706db40033 added tooltip for elec greenhouse overclock, improved armor insulated tooltips for more clarity 2025-06-04 12:33:24 +01:00
Pyritie
4ac7cc16a2 added perfect OC to the elec greenhouse 2025-06-04 12:30:58 +01:00
Pyritie
f6660c6a48 updated changelog (are sections like this ok?) 2025-06-04 12:24:43 +01:00
Pyritie
9de617d8b1 you can now use anthracite to superheat blaze burners like coke 2025-06-04 12:09:45 +01:00
Pyritie
e1bbc3a708 forgor to add lunar sands to the moon biome list 2025-06-03 20:16:03 +01:00
Pyritie
7b1b2a82b1 biome lang 2025-06-03 01:39:34 +01:00
Pyritie
0a7c1496c6 added loose rocks back to lunar_sands 2025-06-03 01:37:10 +01:00
Pyritie
34cffe8f77 oops fixed the spikes 2025-06-03 01:36:57 +01:00
Pyritie
02132ca387 removed moon spikes 2025-06-03 01:14:05 +01:00
Pyritie
30382b7346 added sand piles, added new sandy biome that replaces lunar_plains sometimes 2025-06-03 01:13:18 +01:00
Pyritie
076775bfc5 Merge branch 'dev' into feature/space 2025-06-02 23:07:47 +01:00
Redeix
6a26c9b6e2
- Added loot table to piglin disguise and updated its texture. (#1123)
- Reformated lootjs file
2025-06-02 22:17:52 +01:00
Spicy Noodles
52dcc54089
Add Optional Bacon Quest (#1122)
* Add bacon quest

* Fix merging issue

* Changelog

---------

Signed-off-by: Pyritie <pyritie@gmail.com>
Co-authored-by: Pyritie <pyritie@gmail.com>
2025-06-02 15:45:47 -05:00
Pyritie
e237fa04f2 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-06-02 21:15:42 +01:00
Pyritie
e8938115ca fixed assembler crafting recipe for item silos 2025-06-02 21:15:40 +01:00
Pyritie
da452c88e3 fixed some field guide pages 2025-06-02 21:15:32 +01:00
ofoxsmith
c87af7bf16
Change lv chem reactor quest to require any container with rubber instead of a rubber bucket (#1116)
Signed-off-by: ofoxsmith <77560533+ofoxsmith@users.noreply.github.com>
2025-06-02 11:07:24 -05:00
eso
043e1655d0
add the create toolbox to the list of unsortable inventories (#1120)
* add the create toolbox to the list of unsortable inventories

* changelog update
2025-06-02 11:05:15 -05:00
Pyritie
b1187d43ef removed ftb-quests-optimizer because it's causing problems with quests not completing 2025-06-02 10:30:47 +01:00
Pyritie
0552a51721 added sand layer blocks 2025-06-02 00:19:53 +01:00
Pyritie
003ecb6489 removed dead firmalife event 2025-06-01 23:36:37 +01:00
Pyritie
1ae52e5506 removed brittle charcoal 2025-06-01 23:36:29 +01:00
Pyritie
3130f54818 retextured raw iron block / raw iron ore, changed ad astra sky stone to look like more of a meteorite, langs 2025-06-01 22:25:54 +01:00
Pyritie
7a3c5647b3 removed sparks_on_sulfur tag 2025-06-01 21:32:45 +01:00
Pyritie
95c99d761b moved these into a different file 2025-06-01 21:19:24 +01:00
Pyritie
b90e389e86 existing greenhouse recipes now require to be on earth 2025-06-01 21:19:07 +01:00
Pyritie
a79652844d merge 2025-06-01 21:18:02 +01:00
Pyritie
2027047130 reverted the sugars change 2025-06-01 18:26:42 +01:00
Pyritie
08b8cf7f1c changed the sugars recipe to just work for everything 2025-06-01 18:24:11 +01:00
Spicy Noodles
d83a774a63
TFC sugar recipes use tfg:sugars tag and kaolin dupe fix (#1099) 2025-06-01 12:21:31 -05:00
Pyritie
916ea99440 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-06-01 18:14:03 +01:00
Pyritie
e4d943eab4 langs 2025-06-01 18:14:01 +01:00
Jean Roberto de Souza
a85f4dafe3
Winemaking Recipes (#1111)
* Winemaking recipes

Signed-off-by: Jean Roberto de Souza <81846511+JeanRdSz@users.noreply.github.com>

* Update CHANGELOG.md

Signed-off-by: Jean Roberto de Souza <81846511+JeanRdSz@users.noreply.github.com>

* Update CHANGELOG.md

Signed-off-by: Jean Roberto de Souza <81846511+JeanRdSz@users.noreply.github.com>

---------

Signed-off-by: Jean Roberto de Souza <81846511+JeanRdSz@users.noreply.github.com>
2025-06-01 12:06:03 -05:00