Commit graph

545 commits

Author SHA1 Message Date
Pyritie
deb744ca5e Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-12-06 00:29:11 +00:00
Pyritie
095849edb0 fixed some inconsistencies with moon/mars deco plant EGH recipes 2025-12-06 00:23:24 +00:00
Mqrius
534cafd236
Remove hydration from freezedried food (#2325)
* Remove hydration from freezedried food

Change all freezedried food to give no hydration. Freezedrying removes all moisture from food, so it shouldn't fix your thirst.

Signed-off-by: Mqrius <Nuntius.Marii@Gmail.com>

* Remove .meal() from freeze dried fruit

Freeze dried fruit are not dynamic food items so they can't have .meal().  Their hydration is already set to 0 in item creation.

Signed-off-by: Mqrius <Nuntius.Marii@Gmail.com>

---------

Signed-off-by: Mqrius <Nuntius.Marii@Gmail.com>
2025-12-05 09:21:55 +00:00
applenper
f900e517af
Tallow and fish oil changes for 0.11.9 (#2318)
* reverted tallowate to fish oil, added tallow to biodiesel recipe, removed tallow to fish oil recipe

* added tallow boiler recipe, buffed fish oil extraction from fish

* added tallow to firmalife:oils

* added tallow ethanol and methanol biodiesel recipes
2025-12-03 13:16:52 +00:00
Pyritie
cc47fe55ce big tag/data refactor 2025-12-03 00:32:14 +00:00
Pyritie
d9774c2dda move over some seed oils 2025-12-02 19:33:31 +00:00
Pyritie
1545f19ce6 big refactor of a lot of the recipe files! 2025-12-02 19:12:36 +00:00
Pyritie
5a9c671384 remove stocks from any_water tag 2025-12-01 14:59:53 +00:00
Pyritie
adfea6d7bb added brewery recipes for LV syngas 2025-12-01 14:58:14 +00:00
Pyritie
0c566a045a added back old OLA recipes for now 2025-12-01 14:58:01 +00:00
Pyritie
aa22fda898 swapping OLA from gtceu to tfg namespace, some cleanup, langs 2025-12-01 14:38:48 +00:00
TomPlop
72ae40a2b4
Rework Early Game Fuel (#2309)
* Add materials and multiblock

* try to fix conflict

* Fix conflict

* Fix conflict

* Rework tungsten line (#5)

* fix materials

* Update Ostrum to core

* Fix conflict

* fix conflict

* Fix fucking conflict

* Upload more changes

* Add more things

* Introduce new gas fuel

* Add Anthracite

* Add Syngas early game and more modifications

* More fixes

* Add textures to fluid
2025-12-01 13:42:45 +00:00
Tyler
b655e00823
expand the Facade Whitelist (#2299)
* expand the Facade Whitelist

1. add Reconstituted Stone blocks (likely missing due to oversight)
2. fixes Domum Ornamentum Bricks missing (due to a typo)

Both groups seem intended to be whitelisted. Of the variants, only the "normal" Reconstituted Stone is already whitelisted (due to being a **storage block**).

This PR adds each missing Reconstituted Stone variant individually, but using `forge` or `minecraft` tags for stone/bricks (rather than the `tfc` tag) may be better. I'm unfamiliar with the best & recommended practices.

Signed-off-by: Tyler <montro.l.nakuta@gmail.com>

* Update tags.facades.js

Signed-off-by: Tyler <montro.l.nakuta@gmail.com>

* add Reconstituted Stone blocks

Signed-off-by: Tyler <montro.l.nakuta@gmail.com>

---------

Signed-off-by: Tyler <montro.l.nakuta@gmail.com>
2025-12-01 00:36:25 +00:00
Pyritie
53c5a20489
TFC Gurman integration (#2298)
* started working on tfc-gurman integration

* updated recipes, should be mostly good now?

* pizza adjustments

* meal bag tags

* ugh these crafting table foods are gonna take 5ever

* milk curdling and automation for new cheeses

* moved these

* Update tags.js

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

---------

Signed-off-by: Pyritie <pyritie@gmail.com>
2025-12-01 00:35:55 +00:00
Pyritie
4ac7a45e92 remove arc furnace recipes of colored steels, fix some chemistry mistakes 2025-11-30 13:40:42 +00:00
Spicy Noodles
9a119a6692
Zirconium balancing (#2307) 2025-11-29 19:41:52 +00:00
Pyritie
1ef4d4ae72 tweak empty fuel rod recipe 2025-11-29 10:57:41 +00:00
Pyritie
d779c5c92e tarkianite vein 2025-11-29 01:01:38 +00:00
Pyritie
a09aa72fa7 add food proc recipe for cocoa butter, fix #2287 2025-11-28 10:56:36 +00:00
Pyritie
b4e779113e fix some typos 2025-11-27 23:56:23 +00:00
Pyritie
5cebe94c03 fix typo 2025-11-27 16:37:34 +00:00
Pyritie
7a0b734411 ok so those were null for a reason 2025-11-27 13:24:50 +00:00
Pyritie
655a2010a5 and for diorite... 2025-11-27 13:02:42 +00:00
Pyritie
245ed94c8a fix empty outputs for macerating andesite stairs 2025-11-27 12:17:00 +00:00
Pyritie
acd28dc04d fix #2294 and #2295 2025-11-27 12:03:39 +00:00
Pyritie
f4a4cfc94d fixed some norite items crushing into nothing 2025-11-27 00:26:40 +00:00
TomPlop
5491daa32f
Fission update (#2281)
* Change structure of kubejs files

* Fix some stuffs
2025-11-23 16:34:37 -06:00
Pyritie
02eabff664
Zirconium stuff (#2210)
* zirconium stuff

* Adjust Zirconium for IV Tiering (#2261)

* Adjust Zirconium for IV Tiering

Signed-off-by: TomPlop <tomdidome@gmail.com>

* more balance change

---------

Signed-off-by: TomPlop <tomdidome@gmail.com>

---------

Signed-off-by: Pyritie <pyritie@gmail.com>
Signed-off-by: TomPlop <tomdidome@gmail.com>
Co-authored-by: TomPlop <tomdidome@gmail.com>
Co-authored-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
2025-11-23 18:00:49 +00:00
Pyritie
444ccbbbde I may be stupid #2221 2025-11-23 17:48:28 +00:00
Pyritie
d7a0fb28bf fix #2221
Related Work Items: #22
2025-11-23 17:20:19 +00:00
Xtrial-01
43242e652f
Missing food recipes (#2257)
* Food processor and extractor chocolate recipes

* food processor cheese smoking

* switch chocolate melting to food processor

i thought fast but ISPs thought faster

---------

Co-authored-by: Redeix <brayden.j.m.ford@gmail.com>
2025-11-22 14:21:08 -06:00
Redeix
ddd4fad824
Balancing (#2254)
* moon cheese nutrition

* carboard

* tool rack and fluid heat

* wax

* wax 2

* tool rack 2

* broken

* changelog
2025-11-21 00:10:06 -06:00
Redeix
4deb1ab0c0
Change dark stock to rich stock in recipe
Signed-off-by: Redeix <brayden.j.m.ford@gmail.com>
2025-11-20 16:52:13 -06:00
GameStar
67cc06c9ad
fix drinking all blocks (#2246)
* langs

* fix drinking dirt

* Update CHANGELOG.md

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

---------

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
2025-11-19 12:47:01 -06:00
Nebby
b2f70d3f99
Support Recycling (#2211)
Co-authored-by: Redeix <brayden.j.m.ford@gmail.com>
2025-11-17 12:53:16 -06:00
Mqrius
f01cc470f2
Add platinum group ore and fluid tags (#2230)
Allow easy filtering of platinum-containing ores

Signed-off-by: Mqrius <Nuntius.Marii@Gmail.com>
Co-authored-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
2025-11-17 11:26:03 -06:00
GameStar
8e9c1d0d8c
disable cooling tower controller for now
Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
2025-11-17 10:47:18 -06:00
Redeix
b69645a263
Food Update (#2223)
* new food

* Changelog

* Removed venus requirement so players could craft cheese now

* molecular diagrams
2025-11-16 18:54:32 -06:00
TomPlop
dd099b9121
fix railgun ammo size (#2219) 2025-11-14 14:29:48 -06:00
Pyritie
a64660a5b3 fix #2129 2025-11-11 22:06:27 +00:00
Pyritie
0bfff5ce08 merge 2025-11-11 21:59:00 +00:00
Pyritie
0ba7c6cf7b fix #2197, cleaned up armor stand recipes 2025-11-11 21:42:21 +00:00
Redeix
8982ca4949
Re-added curd recipes and did some cleanup (#2209)
* Re-added curd recipes and did some cleanup

* changelog
2025-11-11 15:41:29 -06:00
Redeix
b063392519
First day of bioline recipes (#2201)
* material and tag changes

* adds a cleanroom recipe json editor utility script

* most of the initial biochem recipes

* circuit number change

* hoisted up class loaders

* ISP output is so fickle

---------

Co-authored-by: Pyritie <pyritie@gmail.com>
2025-11-11 12:35:27 -06:00
GameStar
8388d044d8
materials + structures for normal items (#2198)
* nitrocellulose and cellulose matrix

* vent texture

* I think it actually works

* Update CHANGELOG.md

---------

Signed-off-by: Pyritie <pyritie@gmail.com>
Co-authored-by: Pyritie <pyritie@gmail.com>
2025-11-10 12:08:58 -06:00
Redeix
fbc456723d
Fluid tag unification (#2194)
* eslint change

* utility scripts

* cleanup

* beaker fluid change
2025-11-09 18:22:17 +00:00
Redeix
7ee6ff2c04
bioline materials (#2191)
* materials

* lang

* materials

* utility linting

* data and linting

* lang
2025-11-08 03:40:26 -06:00
Pyritie
e9f775791d fixed soup for realsies 2025-11-07 00:30:47 +00:00
Pyritie
693311ce59 vanilla stone bricks from stone "ingots" unification, some rearranging 2025-11-05 23:32:02 +00:00
Pyritie
dd537ea062 fixes #2159 2025-11-05 23:01:21 +00:00