Commit graph

6254 commits

Author SHA1 Message Date
Pyritie
012da662f2 fix some mars plants self-destructing 2026-01-10 21:31:20 +00:00
Pyritie
6178c5cb1d fixed rocket fuel quest not using lang IDs 2026-01-10 21:13:03 +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
d0bc60c3d6 tweak waves config to reduce tps load a little 2026-01-10 00:07: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
Pyritie
89d6446ac7 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2026-01-09 23:30:58 +00:00
Pyritie
3f042cca92 pakku 2026-01-09 23:30:20 +00:00
Pyritie
78be4b480d update create picky wheels 2026-01-09 23:29:36 +00:00
Pyritie
8d65491639 update changelog 2026-01-09 22:54:36 +00: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
Xikaro
b34b373373 fix: docker 2026-01-09 03:27:16 +05: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
31167b7eff
Update CHANGELOG
Signed-off-by: Redeix <brayden.j.m.ford@gmail.com>
2026-01-08 00:50: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
Xikaro
dd0b6b7e09 fix: #2659 2026-01-08 07:47:27 +05: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
Pyritie
f4aa5f0614 does this stop the earth bug spawns? 2026-01-07 22:52:42 +00:00
Inceitious
11544b1cce
Feature/new greens and browns (#2653)
* New greens and browns

* huh

* Revert "huh"

This reverts commit 75d84143c447f8c3eba8efbbaabfc693de7510e6.

* huh
2026-01-07 12:03:12 -06:00
Yan
fddf28c13a
Fix category of tfg_tips/mars_tree_index from tfc:arborfirmacraft to tfc:tfg_tips (#2652)
* feat: update zh_cn patchouli books

* fix: fix category of tfg_tips/mars_tree_index from tfc:arborfirmacraft to tfc:tfg_tips

---------

Co-authored-by: 闫茂源 <yanmaoyuan@baijiayun.com>
2026-01-07 13:45:29 +00:00
woopSmile
6cc7866328
Add ModernUI (#2620)
* Add Modern UI configuration file

Disabled zoom key
disable rounded edge
set the fonts to match vanilla TFG
and maybe a few other tweaks but those are the main one

Signed-off-by: woopSmile <tristanjobin@gmail.com>

* Add files via upload

Signed-off-by: woopSmile <tristanjobin@gmail.com>

* Disable font atlas resizing and fast text lookup

changes required for ModernUI

Signed-off-by: woopSmile <tristanjobin@gmail.com>

* Add modernUI

remove blur
remove Fps Reducer

Signed-off-by: woopSmile <tristanjobin@gmail.com>

* complete version of unifont

minecraft bundled unifont is incomplete and unsuitable for modernUI use (from the mod author himself) 

Signed-off-by: woopSmile <tristanjobin@gmail.com>

* Updated client config to use unifont

Signed-off-by: woopSmile <tristanjobin@gmail.com>

---------

Signed-off-by: woopSmile <tristanjobin@gmail.com>
Co-authored-by: Pyritie <pyritie@gmail.com>
2026-01-07 13:23:46 +00:00
thederpysockdude123
00df70669d
added locometal to Domum Ornamentum whitelist (#2651)
Signed-off-by: thederpysockdude123 <thederpysockdude123@gmail.com>
2026-01-07 13:23:28 +00:00
Yan
6c1905558b
feat: update zh_cn patchouli books (#2644)
Co-authored-by: 闫茂源 <yanmaoyuan@baijiayun.com>
2026-01-07 09:27:15 +00:00
Pyritie
c2503e6b0f update russian field guide ores + langs 2026-01-07 00:27:44 +00:00
Xikaro
9603f2a2e8 Update server-icon.png 2026-01-07 03:26:37 +05:00
Pyritie
9ad5fe7b2d Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2026-01-06 20:28:55 +00:00
Pyritie
588eaf8940 removing this reflector block recipe because people keep getting tripped up on it 2026-01-06 20:28:53 +00:00
Petr211071
5b1a78d92e
ru_ru translation update (and fix typo in space crops) (#2636)
* Update ru_ru dairy

Signed-off-by: Petr211071 <55793813+Petr211071@users.noreply.github.com>

* Few fixes and a bit ru_ru translation

* ru_ru translation update

* Fix typo

* ru_ru translation update

* Change Thorium back to thorinite

* Add ru_ru for categories

And change name of space crops chapter for better fitting

* ТориАнит

* ru_ru update

* Add Red Granite

* Fire brick

Replace gtceu:compressed_fireclay with tfc:ceramic/unfired_fire_brick

* typo

---------

Signed-off-by: Petr211071 <55793813+Petr211071@users.noreply.github.com>
2026-01-06 19:57:23 +00:00