Commit graph

1849 commits

Author SHA1 Message Date
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
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
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
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
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
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
0f9969b192 fixes #1076 2025-05-27 21:29:01 +01:00
Pyritie
d2cc83aeef fixes #1075 2025-05-27 21:08:19 +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
d80e5a7727 fixed mismatched screw types on item vaults/silos 2025-05-27 20:00:40 +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
oogabooga-dev
3675c86936
add tin hammering recipe (#1078) 2025-05-27 11:05:54 -05:00
Redeix
e3c11b1e88
Added Piglin disguise. (#1058)
* - Added piglin disguise.

* - Updated Changelog
2025-05-22 10:18:16 +01:00
Pyritie
37c1e0794e fixed merge 2025-05-21 21:05:53 +01:00
Pyritie
0c2a7164b5 Merge branch 'dev' into feature/create-6 2025-05-21 21:00:20 +01:00
Pyritie
ae4abcadec merge 2025-05-21 20:59:36 +01:00
Pyritie
4cac0114cd fixes soybean oil 2025-05-21 20:50:49 +01:00
Pyritie
68acb6b7c1 properly fixes #1049 2025-05-21 20:50:37 +01:00
Pyritie
b2d535b33b actually fixes #1053 2025-05-21 20:40:10 +01:00
Pyritie
02d784801e maybe #1051 2025-05-21 12:54:45 +01:00
Pyritie
ea96a6c825 implements #1049 2025-05-21 12:49:04 +01:00
Pyritie
f36b590c4e fixes #1056 2025-05-21 12:33:18 +01:00
Pyritie
b33abc5ba8 fixes #1053 2025-05-21 12:23:04 +01:00
Pyritie
53647c30ae changed aircraft engine recipes to use the correct tier cables 2025-05-19 16:57:26 +01:00
Spicy Noodles
f9c2a5f70d
Add extra small gear anvil recipes (#1041)
* Add extra small gear anvil recipes

* Update recipes.metals.js

Signed-off-by: Pyritie <pyritie@gmail.com>

---------

Signed-off-by: Pyritie <pyritie@gmail.com>
Co-authored-by: Pyritie <pyritie@gmail.com>
2025-05-19 02:26:39 +01:00
Pyritie
7cd9cde0b7 added circuit to the two different salt waters in the mixer 2025-05-19 00:35:14 +01:00
Pyritie
0cd0489998 added vacuumizer recipe for dandelions/goldenrod 2025-05-19 00:23:30 +01:00
Pyritie
43baa760fa smelting recipes for chocolate 2025-05-18 22:42:39 +01:00
Pyritie
027039d44a electric greenhouse now uses way less electricity 2025-05-18 22:07:56 +01:00
Pyritie
0e6b6d5998 added chisel recipes for stone walls 2025-05-18 22:06:29 +01:00
Pyritie
54e9155f49 fixed framed pressure plates 2025-05-18 21:59:07 +01:00
Pyritie
11b52b9ec3 made pressure plates cheaper 2025-05-18 21:51:27 +01:00
Pyritie
be0f6ab296 fixed being able to get infinite lights through domum 2025-05-18 21:49:06 +01:00
Pyritie
5bf1d24f1f removed raw ore block recipes 2025-05-18 21:40:46 +01:00
Pyritie
6bf4a74479 removed the last few ways of getting perma lights pre-LV 2025-05-18 21:31:42 +01:00
Pyritie
6048af8042
Entity loot table changes (#1035)
* trying stuff, might delete later

* updated all loot tables so looting only affects animal meat drops
2025-05-18 21:11:53 +01:00
Pyritie
30c8a05036 credit crafting 2025-05-18 20:11:49 +01:00
Pyritie
58e29c68e7 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-05-18 19:14:27 +01:00