Commit graph

57 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
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
712f8a33c7 fixes #1162 2025-06-16 16:54:28 +01:00
Pyritie
33088aa174 rearranged food recipes into hopefully a good format? 2025-06-10 20:13:03 +01:00
Pyritie
a830260b71 chorus/lightbloom stuff 2025-06-07 23:03:41 +01:00
Pyritie
3eebef1616 more greenhouse tweaks, added a recipe for grass blocks 2025-06-04 21:49:00 +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
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
4cac0114cd fixes soybean oil 2025-05-21 20:50:49 +01:00
Pyritie
f36b590c4e fixes #1056 2025-05-21 12:33:18 +01:00
Pyritie
43baa760fa smelting recipes for chocolate 2025-05-18 22:42:39 +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
Pyritie
689e4e870a added sugar water recipe 2025-05-18 19:04:46 +01:00
Risuga
f81bb6582c
Overlapping recipe fixes (#1024)
* fix overlapping recipes

* changelog
2025-05-18 18:52:12 +01:00
Pyritie
c7b3ba56b0 put tin jar lid recycling in the right category 2025-05-15 23:21:35 +01:00
Pyritie
07880e5783 added recipes for greenhouse ports, added recipes for stainless steel greenhouse (if you want to be fancy) 2025-05-11 15:35:35 +01:00
AirRice
f92a1becf1
Rubber processing recipes audit (#949)
* Rubber recipe changes
- Latex can now be extracted from rubber trees' logs, saplings, leaves via the vacuum chamber (ULV) or extractor(LV)
- values: 1000mB per log, 100mB per sapling, 50mB per leaves; Extractor recipes do this in bulk and output 1000mB per operation
- Dandelions and goldenrods can, with added sodium hydroxide, be turned into latex in a chem reactor
- Sticky resin recipes (from both conifer pitch and latex) require wood ash now instead of sulfur
- Latex -> Vulcanized latex recipe now requires sulfur instead of wood ash
- Vulcanized latex now becomes raw rubber pulp in a solidifier or vacuum chamber at a rate of 250mB/raw pulp
- Latex soaked glove recipe now is a barrel recipe that takes 50 seconds instead of a vat recipe

* Correctly set latex soaked gloves recipe to 50 seconds (was 100 seconds in previous commit)

* Quest/patchouli book updates
- Tried to catch every mention of the old rubber making recipes.

* Revert Latex-soaked gloves recipe change as it didn't need to change
- Originally I wanted to make vulc latex -> raw rubber a Vat recipe, this isn't the case anymore so there is no reason to change this recipe.

* Rebalanced recipe values
- Logs now only give 250mB of latex
- Increase overall in time required vacuumizing directly into latex (now roughly takes 150 seconds per 1000mB, logs slightly faster)
- Gregtech fluid extraction recipes for these have been rebalanced to be around 4x faster and in bulk (roughly 37.5 seconds per 1000mB, logs slightly faster)
- Made vacuum chamber recipes use kubejs tag: field for allowing tags in recipe

* Lang & Quest updates
- Changed rubber ingot quest dependency to be on vacuum chamber instead of extractor
- Removed LV circuit quest dependency on rubber (this hasn't required rubber for a while)
- Lang changes - fix ambiguous wording, typos, titles too long for book
2025-05-04 15:05:50 +01:00
Redeix
fba935817e - Added handcart recipe
- Allowed more blocks to be used as oven, forge, and bloomery insulation
- Fixed lang error with treated wood planks recipe
- Forgot to add fishing net functionality before
2025-04-26 02:35:02 -05:00
Pyritie
30d25177bc fixed not being able to pick up spring water or use it in a barrel/mixing bowl 2025-04-20 14:42:51 +01:00
Pyritie
fa22cd98fc Removed firmalife sprinklers, since now you can put gt pipes through walls 2025-04-18 20:51:37 +01:00
Pyritie
189f5aebce
Alpha Release: additions 0.9.0 (#880)
Signed-off-by: Pyritie <pyritie@gmail.com>
Signed-off-by: TomPlop <tomdidome@gmail.com>
Signed-off-by: Adora <adoradyne.58@gmail.com>
Signed-off-by: MetenBouldry <94766011+MetenBouldry@users.noreply.github.com>
Signed-off-by: CaitlynMC <135169224+CaitlynMC@users.noreply.github.com>
Signed-off-by: SverhRazum-Nah <leon.trol@mail.ru>
Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>
Signed-off-by: Xikaro <55663835+Xikaro@users.noreply.github.com>
Co-authored-by: Xikaro <os.valerievich@ya.ru>
Co-authored-by: Nebby <78170922+Nebby1999@users.noreply.github.com>
Co-authored-by: Redeix <brayden.j.m.ford@gmail.com>
Co-authored-by: TomPlop <tomdidome@gmail.com>
Co-authored-by: aidie8 <aidenvanzuilen@gmail.com>
Co-authored-by: Xikaro <55663835+Xikaro@users.noreply.github.com>
Co-authored-by: Zleub <debray.arnaud@gmail.com>
Co-authored-by: Adora <adoradyne.58@gmail.com>
Co-authored-by: Curtis Merrill <curtis.r.merrill@gmail.com>
Co-authored-by: julia <97713533+juliakity@users.noreply.github.com>
Co-authored-by: GamerDadDave <gamerdaddave@gmail.com>
Co-authored-by: MetenBouldry <94766011+MetenBouldry@users.noreply.github.com>
Co-authored-by: CaitlynMC <135169224+CaitlynMC@users.noreply.github.com>
Co-authored-by: SverhRazum-Nah <leon.trol@mail.ru>
Co-authored-by: Redeix <59435925+Redeix@users.noreply.github.com>
Co-authored-by: Nebby1999 <nebby131999@gmail.com>
2025-04-18 14:49:56 +05:00
Pyritie
ec2e3cd3c4
Alpha Release: 0.9.0 (#849)
Signed-off-by: Pyritie <pyritie@gmail.com>
Signed-off-by: TomPlop <tomdidome@gmail.com>
Co-authored-by: Xikaro <os.valerievich@ya.ru>
Co-authored-by: Nebby <78170922+Nebby1999@users.noreply.github.com>
Co-authored-by: Redeix <brayden.j.m.ford@gmail.com>
Co-authored-by: TomPlop <tomdidome@gmail.com>
Co-authored-by: aidie8 <aidenvanzuilen@gmail.com>
Co-authored-by: Xikaro <55663835+Xikaro@users.noreply.github.com>
Co-authored-by: Zleub <debray.arnaud@gmail.com>
2025-04-15 23:27:17 +05:00
Pyritie
9e34df8ffc
Update recipes.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-17 23:58:43 +00:00
Dmitry
29fe3d4e66
Merge branch 'main' into trims
Signed-off-by: Dmitry <52341158+Exzept1on@users.noreply.github.com>
2025-01-18 00:28:09 +07:00
Pyritie
52c31181cc
Update tags.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-13 14:41:11 +00:00
Pyritie
dde2ec68e9
Update recipes.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-12 22:26:02 +00:00
Pyritie
6b81d71177
Update recipes.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-12 22:02:36 +00:00
Pyritie
64bd5bc8cf
Update recipes.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-12 21:53:33 +00:00
Pyritie
b7bb295a88
Added yeast starter and cocoa powder recipes
Signed-off-by: Pyritie <pyritie@gmail.com>
2024-12-22 17:50:25 +00:00
Dmitry
49751dfd02 use tfg namespace insteaf of gtceu where applicable 2024-04-23 08:11:02 +07:00
FriendlyCube
e257f4e6f1 fix 2024-03-17 18:16:14 +02:00
FriendlyCube
49d974810e решение 2024-03-17 18:08:55 +02:00
Dmitry
23a79b9e95 Copy paste #286 because git...
Co-Authored-By: Cube <112543401+FriendlyCube@users.noreply.github.com>
2024-03-17 22:34:20 +07:00
Dmitry
e3d8721aae better way to fix #267 2024-03-16 12:21:28 +07:00
Dmitry
bdd6c1c8cc Fix #267 2024-03-16 12:11:45 +07:00
Dmitry
f8badd4076 dead 2024-02-10 15:02:04 +07:00
Dmitry
b449f53bd6 some work 2024-02-10 13:35:31 +07:00
Dmitry
1692d1a3f6 some work 2024-02-04 17:11:17 +07:00
Dmitry
1cbc03c016 restore fluid hiding 2024-01-26 17:05:09 +07:00
Dmitry
2e4366acf5 Теперь банить предметы стало еще проще 2024-01-26 16:53:02 +07:00
Dmitry
fec7d9ab3c some emi improvements 2024-01-26 12:01:34 +07:00
Dmitry
3e76e2bfa3 thank eerussianguy for this cool recipes (NOT) 2024-01-17 13:11:05 +07:00
Dmitry
4b21d22968 fix firmalife shit 2024-01-10 23:44:01 +07:00
Dmitry
42559acf97 firmalife integration (I suppose) 2024-01-10 18:55:04 +07:00