Commit graph

5397 commits

Author SHA1 Message Date
Pyritie
3908a5cf06 changelog 2025-05-31 19:43:53 +01:00
Pyritie
a9d35c95d1 changelog 2025-05-31 19:35:52 +01:00
Pyritie
050c90ae35 I finally found that pesky "combatting lag" quest 2025-05-31 19:35:02 +01:00
Pyritie
3f0206f35c ore processing chapter tweaks 2025-05-31 19:34:49 +01: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
Pyritie
3055a9a230 removed dogs and cats from the carryon whitelist because it was getting in the way of the keybind to assign commands to them 2025-05-30 22:45:40 +01:00
TomPlop
6ad1717237
Fix for Hopper conflict with Assembler (#1098) 2025-05-30 19:58:37 +01:00
Pyritie
0828126688 removed spark because it makes macos crash (fixes #1096) 2025-05-30 14:55:21 +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
Xikaro
c24ac801bd Update pakku.json 2025-05-30 12:49:52 +01:00
Xikaro
261a266450 Update pakku.json 2025-05-30 15:26:16 +05: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
df499fc8ff changelog for #947 2025-05-30 00:36:40 +01:00
Xikaro
90885fe76d
Merge pull request #1088 from TerraFirmaGreg-Team/dev
### Changes
- Added and changed many mods for optimization, please report any problems on github. @Xikaro
- Disabled ability to sort items in the crucible and vessels, which let you stack things that shouldn't be stacked. (#1045) @esotericist
- Other TFC waters also work for bulk washing now. (#1051) @Pyritie
- Added machine recipes for compost and humus. (#1049) @Pyritie
- You can now also use soybean oil to make pizza dough via machines. (#1056) @Pyritie
- Create Deco's metal bars are now breakable with a pickaxe. (#1053) @Pyritie
- Aircraft engine recipes now use the correct tier cables. @Pyritie
- Added Piglin disguise item to prevent Piglin aggro. (#1058) @Redeix
- Fixed recipes involving dyeing terracotta. (#1075) @Pyritie
- Fixed pot recipe for dye liquids. (#1076) @Pyritie
- Fixed anthracite not spawning in the Beneath. (#1063) @Pyritie
- Buffed durability of construction wands. @Pyritie
- Reorganized boat quests, added horse and akistor carts quests. (#1077) @deneth-weerasinghe
- Added missing tin double ingot to plate helve hammer recipe. (#1078) @oogabooga-dev
- Fixed sprinklers, added support for connecting GregTech pipes to hydroponic planters (#1033) @Thomasx0
- Added some more medicinal plants. @Pyritie
- Added lathe recipes to strip logs. @Pyritie
- Iron flask now accepts any cloth, red steel flask now requires phantom silk. @Pyritie
- Make food jars and firmalife jars stack to 16. (#1081) @Zeropol
- Fixed medicine not working with cheats disabled. (#1084) @Redeix
- Added recipes for strings to the coiling machine (#1083) @Pyritie
- Fixed assembler recipe for brass funnel. @TomPlop
2025-05-30 03:15:25 +05:00
Xikaro
ef3fe83260 pakku 2025-05-30 02:56:54 +05:00
Xikaro
06b24095ab
Merge branch 'main' into dev 2025-05-30 01:36:38 +05:00
Xikaro
5ccc454711 Update build.yml 2025-05-30 01:30:21 +05:00
Pyritie
8a283343e4 Merge branch 'dev' into feature/create-6 2025-05-29 21:01:44 +01:00
Pyritie
1305d713f4 merge 2025-05-29 21:01:25 +01:00
Pyritie
5827a67cbb Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-05-29 20:31:15 +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
Xikaro
d21dc6aeaa Update build.yml 2025-05-29 16:08:49 +05:00
Xikaro
d3edcfd352 remove: submodule "mods" 2025-05-29 15:40:34 +05:00
Pyritie
b01fe3f7f2 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-05-29 00:42:20 +01:00
Pyritie
110da9a1a3 update changelog 2025-05-29 00:42:16 +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
7a0c4b02d7 quests 2025-05-28 22:32:06 +01:00
Pyritie
86f2a7cfd8 pakku updates 2025-05-28 22:32:02 +01:00
Pyritie
c8c0c06a1e I know tom wants to overhaul the ae2 quests with space but we might as well fix the broken ores one in the meantime 2025-05-28 22:31:47 +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
fbbac7b70b quests 2025-05-27 22:41:48 +01:00
Pyritie
aec3ee50e3 removed double mention of piglin disguise in changelog 2025-05-27 22:20:20 +01:00