Commit graph

3980 commits

Author SHA1 Message Date
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
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
Pyritie
0f9969b192 fixes #1076 2025-05-27 21:29:01 +01:00
Pyritie
bc49d77568 quests 2025-05-27 21:28:52 +01:00
Pyritie
d2cc83aeef fixes #1075 2025-05-27 21:08:19 +01:00
Pyritie
5eccb4e4a3 quests 2025-05-27 20:45:54 +01:00
Pyritie
c58f1ee5e5 fixes #1063 2025-05-27 20:42:13 +01:00
Pyritie
942b16cb35 put moss blacks back in the dirt tag so all the different ferns can be placed on them 2025-05-27 20:40:00 +01:00
Pyritie
0467750da5 quests 2025-05-27 20:14:33 +01:00
Pyritie
447a572edd langs 2025-05-27 20:13:01 +01:00
Pyritie
2ec6704d27 buffed blue steel construction wand again 2025-05-27 20:12:38 +01:00
Pyritie
0421951b84 implements #1057 2025-05-27 20:11:13 +01:00
Pyritie
d80e5a7727 fixed mismatched screw types on item vaults/silos 2025-05-27 20:00:40 +01:00
Pyritie
81871eb773 langs 2025-05-27 19:53:47 +01:00
Pyritie
928e6084c1 Merge branch 'dev' into feature/space 2025-05-27 19:52:59 +01:00
Pyritie
d7fb2981fc Merge branch 'dev' into feature/create-6 2025-05-27 19:52:43 +01:00