Commit graph

1357 commits

Author SHA1 Message Date
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
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
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
Pyritie
9bea38834b fixes #1108 2025-05-31 19:34:26 +01:00
Pyritie
58a4c3ee55 Changed materials of steam grinder/oven, HS greate things, HV cutter 2025-05-31 15:14:53 +01:00
Pyritie
dc96173174 Fixes #1103 2025-05-31 15:14:16 +01:00
Pyritie
0b47224d98 added better aqueous accumulator machine textures, added a quest for it, rearranged LV a bit because it was getting cramped 2025-05-31 15:14:03 +01:00
Pyritie
17e7981da7 merge 2025-05-31 13:22:08 +01:00
Pyritie
2ceba8b259 aqueous accumulator recipes 2025-05-31 13:21:37 +01:00
Redeix
e0cbe907f4
Trowel item (#1106)
* - Changed the weird assembler piston recipe.

* - Updated Changelog

* - Added Trowel tool.
- Increased size of piglin disguise to prevent texture clipping.

* - Updated Changelog
2025-05-31 11:35:36 +01:00
Pyritie
6f5ce5e6d7 langs 2025-05-31 03:15:12 +01:00
Pyritie
d5d395f9c7 langs for aqueous accumulator 2025-05-31 02:36:53 +01:00
Pyritie
43d3717900 brazilian portuguese langs 2025-05-31 02:33:41 +01:00
Pyritie
fae04de6f4 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-05-31 00:28:32 +01:00
Pyritie
5efc7a607d removed the "nether hint vein" because it's just confusing people 2025-05-31 00:28:26 +01:00
Jean Roberto de Souza
eb182e18b8
Stick Bundling (#1101)
Just packer recipes to make compacting sticks easier

Signed-off-by: Jean Roberto de Souza <81846511+JeanRdSz@users.noreply.github.com>
2025-05-31 00:22:34 +01:00
TomPlop
6ad1717237
Fix for Hopper conflict with Assembler (#1098) 2025-05-30 19:58:37 +01:00
Pyritie
2a6db3a271 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-05-30 12:51:30 +01:00
Redeix
2bf3746f33
- Changed the weird assembler piston recipe. (#1092)
* - Changed the weird assembler piston recipe.

* - Updated Changelog
2025-05-30 08:24:11 +01:00
Pyritie
1305d713f4 merge 2025-05-29 21:01:25 +01:00
Pyritie
f7e8efdd7c added more precise kaolin data to the field guide 2025-05-29 20:31:08 +01:00
Pyritie
ca354a55a9 updated ore vein tags so they're now all in one auto-generated file 2025-05-29 13:00:15 +01:00
TomPlop
f589e3a53d
Fix circuit for Brass Funnel (#1089)
Change the circuit due to a conflict issue

Signed-off-by: TomPlop <tomdidome@gmail.com>
2025-05-29 00:41:42 +01:00
Pyritie
a4d8c8ba6d fixes #1083 2025-05-28 22:29:57 +01:00
Pyritie
d521b0e6d4 langs 2025-05-28 22:22:49 +01:00
Zeropol
a3715d8c46
Harmonize jars size (#1081)
* make TFC full jars the same size as empty jars

added itemSize() events for #tfc:foods/sealed_preserves and #tfc:foods/preserves. I don't understand the last parameter

* make Firmalife full jars the same size as empty jars

added itemSize() events for Firmalife full jars. I don't understand the last parameter

* Make food preserves and firmalife jar weight "medium"

By modifying server_scripts/tfc/data.js
It is to make them stack by 16.

* Update CHANGELOG.md

- Make food jars and firmalife jars stacks by 16. (#1081) #Zeropol

* Moved Firmalife's item itemSize changes to its own file

moved Firmalife related modifications from \kubejs\server_scripts\tfc\data.js to \kubejs\server_scripts\firmalife\data.js
Updated main_server_script.js

* Added ResourceLocations to itemSize()s

I advise extra scrutiny to this commit because I dont fully understand what a ResourceLocation is and how to use it.

---------

Signed-off-by: Zeropol <tn.zeropol@gmail.com>
Signed-off-by: Pyritie <pyritie@gmail.com>
Co-authored-by: Pyritie <pyritie@gmail.com>
2025-05-28 12:32:43 -05:00
oogabooga-dev
899663b64f
Merge pull request #1074 from oogabooga-dev/feature/hammer_ru_questbook_fix
fix ore basics questbook ru translation
2025-05-28 16:47:57 +05:00
Redeix
e3dd2e8e2d
- Fixed pill behavior with cheats off (#1084)
* - Fixed pill behavior with cheats off

* - Updated Changelog
2025-05-28 08:26:25 +01:00
Pyritie
88817266c0 flask changes 2025-05-27 23:01:30 +01:00
Pyritie
aec3ee50e3 removed double mention of piglin disguise in changelog 2025-05-27 22:20:20 +01:00
Pyritie
f3769b38c3 added recipes for auto log stripping 2025-05-27 22:10:06 +01:00
Pyritie
59d2fa64a1 added some more medicine plants 2025-05-27 21:48:21 +01:00
Pyritie
3f87252d2e langs, changelog 2025-05-27 21:43:10 +01:00