Commit graph

354 commits

Author SHA1 Message Date
Pyritie
1cc0aafa45 dyes 2025-06-17 20:11:29 +01:00
Pyritie
54da8a20e5 oh so that's why 2025-06-17 19:29:19 +01:00
Pyritie
a9c4bbf473 firmalife moment 2025-06-17 17:44:31 +01:00
Pyritie
d688ee0d11 fix duplicate dyes 2025-06-17 16:57:37 +01:00
Pyritie
9e3768eb5b fixed vat having the wrong fluid for dyes, added other dye fluids 2025-06-17 16:24:44 +01:00
Pyritie
c13edcabdc merge food branch into space branch 2025-06-17 12:12:43 +01:00
Redeix
50ad90af2a
Merge branch 'active/food' into revert-3-feature/food
Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>
2025-06-17 00:57:55 -05:00
Redeix
2e5295614c
Revert "merge" 2025-06-17 00:56:25 -05:00
Redeix
fb90ef6666
Merge branch 'dev' into active/food
Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>
2025-06-16 23:54:43 -05:00
Pyritie
bc61d06232 merge 2025-06-17 01:02:15 +01:00
Pyritie
8bc9247b24 nerfed durability of wooden tongs, slightly tweaked their recipe 2025-06-16 17:42:01 +01:00
Pyritie
5b0e9bda98 fixes #1165 2025-06-16 16:47:43 +01:00
Pyritie
b7cc04f188 merge 2025-06-12 13:33:44 +01:00
Pyritie
33088aa174 rearranged food recipes into hopefully a good format? 2025-06-10 20:13:03 +01:00
Pyritie
01ce7e19fb moved backpack size data to its own file, added lunchbox size data 2025-06-10 16:58:06 +01:00
Pyritie
9c41fe262f merge 2025-06-09 21:15:19 +01:00
Jean Roberto de Souza
8beb9ba090
Conflict issues fix (#1141)
* Remove Scaffolding Frame recipe

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

* Update Scaffolding Frame recipe

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

* Fix Glass Jar conflict 

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-08 22:21:46 +01:00
Pyritie
a830260b71 chorus/lightbloom stuff 2025-06-07 23:03:41 +01:00
Pyritie
29a713cb6c asurine dust + centrifuge recipes 2025-06-07 21:29:41 +01:00
Pyritie
69b4d83067 added recipes for ae2 deco blocks, stone dust centrifuge recipes for the moon 2025-06-07 00:58:45 +01:00
Pyritie
07f984c288 yumy popped chorus fruit (needs a cooking recipe) 2025-06-06 01:22:48 +01:00
Pyritie
263a9dfab7 merge 2025-06-05 12:24:32 +01:00
Pyritie
ecbc791b30 better recipes for bars, doors, trapdoors 2025-06-04 23:23:45 +01:00
Pyritie
3eebef1616 more greenhouse tweaks, added a recipe for grass blocks 2025-06-04 21:49:00 +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
5efc7a607d removed the "nether hint vein" because it's just confusing people 2025-05-31 00:28:26 +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
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
Pyritie
f3769b38c3 added recipes for auto log stripping 2025-05-27 22:10:06 +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
ae4abcadec merge 2025-05-21 20:59:36 +01:00
Pyritie
68acb6b7c1 properly fixes #1049 2025-05-21 20:50:37 +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
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
0e6b6d5998 added chisel recipes for stone walls 2025-05-18 22:06:29 +01:00
Pyritie
11b52b9ec3 made pressure plates cheaper 2025-05-18 21:51:27 +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
b72c9fbeaa merge 2025-05-18 12:24:48 +01:00
Risuga
165cc8d2cd
Some recipe changes (#1003)
* misc recipes

* add saw to jar lid recipe

* revert table salt name changing that didn't work
2025-05-14 19:42:32 +01:00
Pyritie
9262133484 merge 2025-05-13 10:55:31 +01:00
Pyritie
3aafbc709a fixed iron door inconsistency 2025-05-11 17:24:36 +01:00
Pyritie
ec576813c2 Merge branch 'dev' into feature/space 2025-05-08 22:15:15 +01:00
Pyritie
cef7822876 workaround for #910 2025-05-07 21:54:07 +01:00