Commit graph

3560 commits

Author SHA1 Message Date
Pyritie
241b80a4a0 migrate everything over to linuxUnfucker() 2026-01-12 15:32:18 +00:00
Pyritie
e74043472d cleanup this recycling file 2026-01-12 14:53:58 +00:00
Pyritie
75f0fc13ce fix vacuum engine intake model 2026-01-12 14:48:02 +00:00
Pyritie
1fceb61e43 fix helve hammer blows being < 1 #2584 2026-01-12 13:58:08 +00:00
Pyritie
8026bfed69 reduce frequency of wolf sounds at night, make crickets etc look for grass plants instead of grass blocks #2680 2026-01-12 13:56:51 +00:00
Pyritie
9870970c89 fix #2714 2026-01-12 13:44:45 +00:00
Pyritie
a27fe966a8 langs 2026-01-12 13:28:47 +00:00
Pyritie
543128e6e8 blockrunner compat 2026-01-12 09:59:54 +00:00
Yan
05cc0a8a59
feat: update zh_cn translation for new drinkings (#2721)
Co-authored-by: 闫茂源 <yanmaoyuan@baijiayun.com>
2026-01-12 09:09:26 +00:00
Inceitious
96b0e79aff
Feature/tfc tools integration (#2716)
* Bugfix/Scraping Knives

Code should be more robust now

* Recycling

---------

Co-authored-by: Redeix <redeix.m@gmail.com>
2026-01-11 22:01:08 -06:00
Pyritie
7e2816c917 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2026-01-12 01:04:08 +00:00
Pyritie
9fb45e2e0c changelog, fix invar crucible alloying, add tooltip to ice slush 2026-01-12 01:04:03 +00:00
Inceitious
882c477037
Feature/drinkable (#2708)
* Drinkable ice slush

* Update thirst value

* Added quests

* Edited some text

* a

---------

Co-authored-by: Redeix <redeix.m@gmail.com>
2026-01-11 13:48:11 -06:00
Inceitious
563bf2306a
Incorrect tiering for extractor for Bis and Black Bronze (#2684)
* Incorrect tiering for extractor for Bis and Black Bronze

Bismuth Bronze and Black Bronze wrong tiering in extractor
Added some documentation

* Update recipes.materials.js

* Updated

* Updated

* Unified tiering

* Revert "Unified tiering"

This reverts commit ea9e00d2bca8f70c2f95bb1362766edcc9e29498.

---------

Co-authored-by: Redeix <redeix.m@gmail.com>
2026-01-11 13:46:10 -06:00
thederpysockdude123
17be437196
Added alloy smelter recipes for jar lids (#2705)
* added alloy smelter recipes for jar lids

Signed-off-by: thederpysockdude123 <thederpysockdude123@gmail.com>

* remove TFC jar lid anvil recipe

Signed-off-by: thederpysockdude123 <thederpysockdude123@gmail.com>

* Update recipes.js

Signed-off-by: thederpysockdude123 <thederpysockdude123@gmail.com>

* new jar lid recipe

Signed-off-by: thederpysockdude123 <thederpysockdude123@gmail.com>

* recipes changed for consistency

Signed-off-by: thederpysockdude123 <thederpysockdude123@gmail.com>

* Update recipes.metals.js

Signed-off-by: thederpysockdude123 <thederpysockdude123@gmail.com>

* Update recipes.metals.js

Signed-off-by: thederpysockdude123 <thederpysockdude123@gmail.com>

* Update recipes.metals.js

Signed-off-by: thederpysockdude123 <thederpysockdude123@gmail.com>

* Update recipes.removes.js

Signed-off-by: thederpysockdude123 <thederpysockdude123@gmail.com>

---------

Signed-off-by: thederpysockdude123 <thederpysockdude123@gmail.com>
Co-authored-by: Redeix <redeix.m@gmail.com>
2026-01-11 13:41:56 -06:00
Pyritie
7636a38223 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2026-01-11 12:27:29 +00:00
Pyritie
6c59adbcf7 langs 2026-01-11 12:27:27 +00:00
Redeix
900e1de8e9
The big green PR (#2694)
* blocks

* more textures

* more textures more textures

* blocks

* more textures

* more textures more textures

* blocks

* more textures

* more textures more textures

* blocks

* more textures

* more textures more textures

* firmalife gh stuff

* chloroplasts and brick regex

* gh recipes

* pisciculture fishery

* I am going insane

* more casings = more gooder

* rotten voiding cover

* greenhouse glory

* Is this it chat

* not needed

Signed-off-by: Redeix <redeix.m@gmail.com>

* missed in conflicts

Signed-off-by: Redeix <redeix.m@gmail.com>

* consumerism

* re-add tag import

* remove unused object map

* id normalizer function

---------

Signed-off-by: Redeix <redeix.m@gmail.com>
2026-01-10 19:30:46 -06:00
Pyritie
edd6d3eb51 fix #2687 2026-01-10 22:32:01 +00:00
Pyritie
334e435042 adjusted mars wind volume 2026-01-10 22:29:53 +00:00
Pyritie
012da662f2 fix some mars plants self-destructing 2026-01-10 21:31:20 +00:00
Pyritie
277f8b8973 actually the bee is from firmalife 2026-01-10 20:46:39 +00:00
Pyritie
a6ec313d09 blossom berry counts as a flower for bees 2026-01-10 20:39:16 +00:00
Pyritie
05fc0aa6f6 bees ignore gravity in space 2026-01-10 20:10:06 +00:00
Pyritie
515461560e changed blood lily to be visible all year-round (as well as in the beneath) 2026-01-10 18:41:54 +00:00
Pyritie
6b778d7ab1 langs 2026-01-10 11:55:56 +00:00
Pyritie
a1450016d3 langs 2026-01-10 00:40:47 +00:00
Pyritie
8b28f2d652 pizza unification 2026-01-10 00:39:38 +00:00
Pyritie
68cfeca7fa rock salt and sylvite are actually the same thing 2026-01-10 00:33:34 +00:00
Pyritie
936a098ff1 add tfc powders to dye tags 2026-01-10 00:33:23 +00:00
Pyritie
68e5731474 fix turning any cobble into domum cobble extra 2026-01-10 00:33:08 +00:00
Pyritie
4b85045325 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2026-01-10 00:18:14 +00:00
Pyritie
8562c8a195 I think this is less confusing 2026-01-10 00:17:58 +00:00
Pyritie
73b8039ede update grammar of drinkables entry, buff tea a little 2026-01-10 00:07:48 +00:00
Petr211071
12a5e96f55
Ru ru translation (#2692)
* Sticky resin

* Add lang files and translation for irrigation

* TFG's AFC chapter tranlastion

* ArborFirmaCraft and Rnr

* Some translation

---------

Signed-off-by: Petr211071 <55793813+Petr211071@users.noreply.github.com>
2026-01-09 17:57:12 -06:00
FlightingFalcon
ece7a39b89
Added Drinks Entry (#2676)
* Update hazards.json

Signed-off-by: FlightingFalcon <100160941@ccisd.net>

* Create drinks

Signed-off-by: FlightingFalcon <100160941@ccisd.net>

* Update drinks

Signed-off-by: FlightingFalcon <100160941@ccisd.net>

* Rename drinks to drinks.json

Signed-off-by: FlightingFalcon <100160941@ccisd.net>

* Update drinks.json

Signed-off-by: FlightingFalcon <100160941@ccisd.net>

* Update drinks.json

Signed-off-by: FlightingFalcon <100160941@ccisd.net>

* Update drinks.json

Signed-off-by: FlightingFalcon <100160941@ccisd.net>

---------

Signed-off-by: FlightingFalcon <100160941@ccisd.net>
2026-01-09 22:53:54 +00:00
jurjen909
b3f1308fdf
Inconsistency fix at recipes.coal.js (#2688)
* Inconsistency fix at recipes.coal.js

Removed duplicate gtceu:raw_coal recipe with an odd time of 1710 ticks.
Changed recipe duration to reflect how many Coke is being made (ie 4x coke = 4x the base of 900 ticks, 45 seconds)
Changed tfc:poor_raw_coal recipe input to 1x tfc:poor_raw_coal instead of 2x tfc:poor_raw_coal to reflect the amount of Coal a piece or Poor Raw gives in a furnace.

* Update recipes.coal.js

Reverted recipe duration changes back to 900 ticks for the raw coal items in the Coke oven.
Removed redundant "1x" input in poor_raw_coal recipe.

Signed-off-by: jurjen909 <jurjen909@ziggo.nl>

---------

Signed-off-by: jurjen909 <jurjen909@ziggo.nl>
2026-01-09 14:49:29 -06:00
thederpysockdude123
fc80829058
Add files via upload (#2686)
Signed-off-by: thederpysockdude123 <thederpysockdude123@gmail.com>
2026-01-09 16:10:26 +00:00
Mqrius
8f5127c450
Add cast iron to gear/rod molds (#2677)
* Add irons and steels to casting molds

* Remove steels and wrought iron
2026-01-09 08:39:11 +00:00
Petr211071
b26bc60132
ru_ru update (#2679)
* Sticky resin

* Add lang files and translation for irrigation

* TFG's AFC chapter tranlastion

* ArborFirmaCraft and Rnr

---------

Signed-off-by: Petr211071 <55793813+Petr211071@users.noreply.github.com>
2026-01-09 08:38:32 +00:00
Jean Roberto de Souza
5bc2d12bfd
Add vinegar as option for curdled milk crafting (#2675)
* Add vinegar as option for curdled milk crafting

This adds an earlier way to make cheese without relying on acetic acid. As vinegar is partially composed of acetic acid, and the recipe for homemade cheese using vinegar is realistic, that would be an useful and accurate recipe.

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

* Update vinegar input and output for lactose milk recipe

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>
2026-01-09 02:26:08 -06:00
Redeix
6a5de3c172
Sowey fow cwashing dev
I didnt mwean tooo

Signed-off-by: Redeix <redeix.m@gmail.com>
2026-01-09 00:47:55 -06:00
Mqrius
5985f389b2
Give Mars tree leaves distance property (#2661)
* Make TFG copies of Mars foliage
They still return the original items.

* Change strophar supports to match item color

* Change soundType to shroomlight

---------

Co-authored-by: Xikaro <os.valerievich@ya.ru>
2026-01-08 16:25:19 -06:00
Mqrius
9ece43f122
Fix dried fruit recipe (#2673)
* Fix dried fruit recipe

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

* Register tags based on constant array

---------

Signed-off-by: Mqrius <Nuntius.Marii@Gmail.com>
2026-01-08 15:27:17 -06:00
Petr211071
45c28807e2
Ru_Ru sticky resin (#2663)
* Sticky resin

* Add lang files and translation for irrigation
2026-01-08 10:42:59 +00:00
Redeix
70c25711f1
I guess this makes it support fluids?
Signed-off-by: Redeix <redeix.m@gmail.com>
2026-01-08 00:53:26 -06:00
Redeix
0a19d09a43
Volcanic Glass Tube Casting (#2667)
No glass batch to tube recipe. Tubes can only be made from glass dust which is a bit annoying. I figured volcanic glass makes sense since its high temp? idk

Signed-off-by: Redeix <brayden.j.m.ford@gmail.com>
2026-01-08 00:49:22 -06:00
thederpysockdude123
4bfcd6f7d4
removed sandworm spawning in the vanilla Minecraft desert biome (#2662)
Signed-off-by: thederpysockdude123 <thederpysockdude123@gmail.com>
2026-01-07 18:45:52 -06:00
thederpysockdude123
bec8ffee42
moved cut and copy paste gadgets to EV (#2660)
Signed-off-by: thederpysockdude123 <thederpysockdude123@gmail.com>
2026-01-07 18:17:28 -06:00
Pyritie
95aa1862b9 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2026-01-07 22:52:46 +00:00