Commit graph

6210 commits

Author SHA1 Message Date
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
Inceitious
cd452ab249
feature/added more recipes for create and create deco bars to be aligned with tfc metal bars (#2641)
* Fixed duplicate create bars

* Recipes aligned with tfc metal bars recipes

Optimised the code used for creating create and create deco bars. Now aligned with tfc metal bars (double ingot to 8x bars for all types)

---------

Signed-off-by: Inceitious <124896643+Inceitious@users.noreply.github.com>
2026-01-06 18:51:44 +00:00
Pyritie
65e4e9d6a3 character encoding idk? thanks git 2026-01-06 17:22:13 +00:00
Pyritie
068a3a2c1d Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2026-01-06 17:21:42 +00:00
Pyritie
667f447ca9 changed recipes for single block steam turbines 2026-01-06 17:21:40 +00:00
Pyritie
7e9957c000 langs 2026-01-06 17:21:30 +00:00
Jeuv
5eaa31d14f
Add Tree Indices to the TFC Guidebook (#2638)
* Added Earth Trees Index

Signed-off-by: Jeuv <73312791+Jeuvke@users.noreply.github.com>

* Added Mars Tree Index

Signed-off-by: Jeuv <73312791+Jeuvke@users.noreply.github.com>

* Fix corkscrew willow name

Signed-off-by: Jeuv <73312791+Jeuvke@users.noreply.github.com>

---------

Signed-off-by: Jeuv <73312791+Jeuvke@users.noreply.github.com>
2026-01-06 11:14:29 -06:00
GameStar
930c06c847
basic pie charts for the ores (#2640)
* mini fixes

* pie charts for all the ores
2026-01-06 16:51:47 +00:00
Pyritie
bff84d8dd3 why does only this propellor need red alloy? 2026-01-06 16:06:46 +00:00
Pyritie
b3a5b1ddef steam boilers for mars 2026-01-06 16:06:34 +00:00
Pyritie
48dff7e414 fix blockstate texture of steam fuser 2026-01-06 16:06:22 +00:00
Pyritie
a283ca7b9a why are blaze cakes here 2026-01-06 15:28:14 +00:00
Pyritie
e3baa02dca whoops 2026-01-06 15:25:03 +00:00
Pyritie
0eb939f09d some tiny changes 2026-01-06 15:17:59 +00:00
Pyritie
8c77b72369 add some invisible blockstates to flax, rapeseed, and sunflowers, so they render properly in the EGH 2026-01-06 14:17:50 +00:00
Pyritie
db3428c20b add way to craft large gears in an anvil 2026-01-06 12:08:56 +00:00
Pyritie
781c4775cb pakku 2026-01-06 12:08:41 +00:00
Pyritie
fd663208f5 improve tfg casting mold tags 2026-01-06 12:08:30 +00:00
Pyritie
5a459f38c8 water wheels spin properly in rivers #2450
Related Work Items: #24
2026-01-06 12:08:13 +00:00
Pyritie
d0c8bc4f61 buff crucible to 32 ingots instead of 28, standardize tooltip of small vessel #2634, langs 2026-01-06 10:20:11 +00:00
Inceitious
5109a620f8
Fixed duplicate create bars (#2633) 2026-01-05 12:32:18 -06:00
thederpysockdude123
fd6632ae7d
Update recipes.js (#2631)
Signed-off-by: thederpysockdude123 <thederpysockdude123@gmail.com>
2026-01-05 15:50:37 +00:00
Pyritie
9dbadc4ee8 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2026-01-05 14:59:25 +00:00
Pyritie
4307b2e4f6 fixed not being able to craft new pills 2026-01-05 14:59:22 +00:00
Pyritie
f1aaae8fe2
Merge branch 'main' into dev 2026-01-05 14:09:58 +00:00
Pyritie
6d5c2b3cfd fix quest 2026-01-05 14:06:30 +00:00
Pyritie
0e9c6c571c 0.11.16 + pakku 2026-01-05 14:05:10 +00:00
Pyritie
2b3808092e langs + field guide 2026-01-05 14:03:47 +00:00
Pyritie
420d8a85bf add components to glowstone 2026-01-05 13:57:22 +00:00
Pyritie
423aec9291 oh I'm stupid 2026-01-05 13:57:10 +00:00
Pyritie
9e3d106504 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2026-01-05 13:38:16 +00:00
thederpysockdude123
c17679c64d
Add ad astra metal blocks to domum ornamentum blocks whitelist (#2627)
* Update tags.js

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

* added Ad Astra metal blocks to domum ornamentum blocks whitelist

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

* gave the Ad Astra metal blocks a block tag

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

* Update tags.js

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

* dw about that

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

* removed some s's so KubeJS behaves

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

* removed some s's so KubeJS behaves

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

* added Ad Astra metal blocks to domum ornamentum blocks whitelist (fr this time)

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

---------

Signed-off-by: thederpysockdude123 <thederpysockdude123@gmail.com>
2026-01-05 13:38:04 +00:00
Xikaro
90775f0855 Update build.yml 2026-01-05 18:10:49 +05:00
Xikaro
e7890a1ea5 Update build.yml 2026-01-05 18:02:31 +05:00
Pyritie
e0391bbaef add more fluids to the non-placeable tag 2026-01-05 12:55:07 +00:00
Pyritie
4ab41f33f5 fix kjs error with the pills 2026-01-05 12:54:44 +00:00
Xikaro
7ead0d43f5 Update build.yml 2026-01-05 17:45:41 +05:00
Pyritie
d686c18336 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2026-01-05 12:43:43 +00:00
Pyritie
9cdd11646c quest tweaks + langs 2026-01-05 12:43:40 +00:00
Xikaro
d55d1fac3b feat: docker 2026-01-05 17:29:39 +05:00
Pyritie
e57e1cff59 fix some warnings 2026-01-05 12:28:57 +00:00
Pyritie
45aca7793c age=7 doesn't exist 2026-01-05 12:27:08 +00:00
Pyritie
71ad3bf3aa langs 2026-01-05 12:22:02 +00:00
Pyritie
16c44e78fb nah ok this can start with fewer hits 2026-01-05 12:14:17 +00:00
Pyritie
2e6f78845c add recipe to make unrefined paper with the helve #2621 2026-01-05 12:13:51 +00:00