Commit graph

1896 commits

Author SHA1 Message Date
Pyritie
91ab7307d0 langs 2025-07-19 21:21:14 +01:00
TomPlop
3529de6be1
Fix #1373 and #1380 (#1385)
* Update quests and lang

* Changelog

* changelog

* fix conflict

* changelog

* Fix quest and add smooth stone
2025-07-19 19:59:04 +01:00
Pyritie
0523ff9a02 fix mushroom conflicting recipes 2025-07-19 19:43:09 +01:00
Pyritie
c8ac4fd7fd let's fucking go 2025-07-19 19:22:54 +01:00
Pyritie
2104de2147 fixed bad merge 2025-07-19 18:32:30 +01:00
Pyritie
d2ec89f2b8 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-07-19 18:03:00 +01:00
Pyritie
eee7bc96f5 adding tfc-kjs's new chunk data provider 2025-07-19 18:02:50 +01:00
Pyritie
c84960c04a fixed glass dupe with lamps 2025-07-19 17:07:49 +01:00
Pyritie
16264c5783 no carvers allowed in the desert 2025-07-19 16:27:16 +01:00
Pyritie
c099daf52b added back vanilla red sand, started work on some tags, added mars deep desert biome 2025-07-19 16:20:15 +01:00
Pyritie
610fc45bf3 langs 2025-07-19 15:22:23 +01:00
Pyritie
557f7bbd5c added red granite ores 2025-07-19 15:18:25 +01:00
GameStar
d068b91bae
Changed firmalife greenhouse to prevent exploits (#1371)
* Update tags.js

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

* Update tag_prefixes.js

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

* Update CHANGELOG.md

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

---------

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
2025-07-19 10:34:24 +01:00
Nebby
f323e46e22
Pink Thorium (#1378) 2025-07-19 01:42:14 +01:00
Pyritie
55b3e45697 I think gregtech uses these to say if something is a gas or liquid 2025-07-19 00:46:03 +01:00
Pyritie
c9b3168d0a typo 2025-07-19 00:44:35 +01:00
Pyritie
3c01fc1fa2 langs 2025-07-19 00:44:27 +01:00
Pyritie
af849291ca blue steel is the lavaproof one, akshually 2025-07-18 22:59:37 +01:00
Pyritie
5b10f5e452 fix typo in piglin drop table guide 2025-07-18 22:54:06 +01:00
Pyritie
41b9ebab98 gas pressurizer recipes + langs 2025-07-18 22:53:30 +01:00
Pyritie
b4b8acdf63 nerfed nether lava 2025-07-18 22:20:38 +01:00
Pyritie
087170ffc9 implements #1375 2025-07-18 21:48:25 +01:00
Pyritie
0bf9ceed26 unified processing time of all 3 create mechanisms #1376 2025-07-18 21:46:29 +01:00
Pyritie
df5add25e7 glue 2025-07-18 21:44:05 +01:00
Pyritie
2342870fd0 langs 2025-07-18 21:38:52 +01:00
Redeix
09ab48319a
More main menu optimizations (#1372)
* - Yeast recipe conflict fix

* - Fixed seed oil voiding in barrels. And item weight inconsistency.

* - Reduced loading screen logo size by 4MB

* - Update Changelog

* - Compressed loading screen images to maybe help with ram

* - Added default gui scale to make the main menu look better on first launch

* - Update Changelog

* - Added utility script for adding circuits to existing recipes

* fixed changelog conflict

Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>

* - Added harvest baskets

* - Fixed baked potato recipe mixing from oven

* - Allowed elytras to be repaired regardless of damage

* - Fixed sea water barrel recipe

* - Gave plants tags to bushes so they can have other uses

* - Pushed stubborn models

* - updated Changelog

* - Changelog typo

* - Integrated Ad Astra wood

* - Updated changelog

* - Treated chipboard composite barrel lang

* - Some Tacz fixes

* - Jar dupe fix

* - tacz data

* - updated changelog

* - we hate git

* - Loading screen and main menu optimizations

* - image push

---------

Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>
2025-07-18 10:09:11 +01:00
Pyritie
d1baf88d5b
Merging in mars worldgen branch (#1370)
* red granite is now a real stone type

* starting mars rock layers

* fixed red granite

* flipped the continentalness! thanks stardust
2025-07-18 02:28:21 +01:00
GameStar
d1dd3c9e35
Bugfix/glass item drop compat (#1369)
* glass breaking drops

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

* Update CHANGELOG.md

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

* Update CHANGELOG.md

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

---------

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
2025-07-18 01:33:58 +01:00
Pyritie
eb79d1d85b fixed moon rock layers 2025-07-17 21:50:23 +01:00
Pyritie
6d9c1f8fc2 fixed floating indicators in geodes 2025-07-17 21:35:20 +01:00
Pyritie
8c445ad1e4 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-07-16 22:16:53 +01:00
Pyritie
2d3976182d fix for #1356 because firmaciv won't do it themselves 2025-07-16 22:16:48 +01:00
GameStar
0a32609a4b
Feature: Tier 2 insulation (#1349)
* Add files via upload

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

* models

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

* textures

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

* ad as

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

* Update tags.js

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

* Add files via upload

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

* Update recipes.removes.js

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

* Update recipes.js

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

* Update recipes.removes.js

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

* Update recipes.js

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

* Update recipes.miscellaneous.js

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

* Update items.js

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

* Update materials.js

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

* Update recipes.miscellaneous.js

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

* Add files via upload

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

* Update CHANGELOG.md

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

---------

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
Signed-off-by: Pyritie <pyritie@gmail.com>
Co-authored-by: Pyritie <pyritie@gmail.com>
2025-07-16 12:05:10 +01:00
Redeix
2855552f11
Some fixes (#1353)
* - Yeast recipe conflict fix

* - Fixed seed oil voiding in barrels. And item weight inconsistency.

* - Reduced loading screen logo size by 4MB

* - Update Changelog

* - Compressed loading screen images to maybe help with ram

* - Added default gui scale to make the main menu look better on first launch

* - Update Changelog

* - Added utility script for adding circuits to existing recipes

* fixed changelog conflict

Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>

* - Added harvest baskets

* - Fixed baked potato recipe mixing from oven

* - Allowed elytras to be repaired regardless of damage

* - Fixed sea water barrel recipe

* - Gave plants tags to bushes so they can have other uses

* - Pushed stubborn models

* - updated Changelog

* - Changelog typo

* - Integrated Ad Astra wood

* - Updated changelog

* - Treated chipboard composite barrel lang

* - Some Tacz fixes

* - Jar dupe fix

* - tacz data

* - updated changelog

---------

Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>
2025-07-16 09:18:54 +01:00
Gifpxto
f5c97ca618
Begin Portuguese (Brazil) translation of Field Guide content (#1352)
* add pt_br lang for categories folder in the field guide

* add pt_br entries for irrigation and hazards  to the field guide
2025-07-16 09:16:39 +01:00
Pyritie
e72a0dd0b3 added phantoms to the last two beneath biomes cuz why not 2025-07-15 23:43:55 +01:00
Pyritie
c7831a072e fixed duplicate pizza dough 2025-07-15 23:22:41 +01:00
Pyritie
3760367600 primitive creatures tweaks 2025-07-15 23:21:40 +01:00
Pyritie
0e881871e9 fixed primitive creatures spawning 2025-07-15 23:12:53 +01:00
Pyritie
0da8506b4e pt-br for ores field guide 2025-07-15 23:02:56 +01:00
Pyritie
0753b9b932 langs 2025-07-15 23:02:21 +01:00
Pyritie
b24ac77bb3 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-07-15 22:29:56 +01:00
Redeix
31b6da9f1c
Integrated Ad Astra wood & and added wood recipe utility (#1346)
* - Yeast recipe conflict fix

* - Fixed seed oil voiding in barrels. And item weight inconsistency.

* - Reduced loading screen logo size by 4MB

* - Update Changelog

* - Compressed loading screen images to maybe help with ram

* - Added default gui scale to make the main menu look better on first launch

* - Update Changelog

* - Added utility script for adding circuits to existing recipes

* fixed changelog conflict

Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>

* - Added harvest baskets

* - Fixed baked potato recipe mixing from oven

* - Allowed elytras to be repaired regardless of damage

* - Fixed sea water barrel recipe

* - Gave plants tags to bushes so they can have other uses

* - Pushed stubborn models

* - updated Changelog

* - Changelog typo

* - Integrated Ad Astra wood

* - Updated changelog

---------

Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>
2025-07-15 17:41:08 +01:00
Pyritie
64244314e0
Updated Primitive Creatures (#1337)
* updated primitive creatures, and figured out how to make them not spawn randomly any more

* tags and items and recipes

* tweak

* langs

* adding loot

* mod ID rename

* langs

* more loot tweaks

* loot tweaks
2025-07-15 11:48:00 +01:00
Redeix
28d87caae3
Harvest baskets + (#1338)
* - Yeast recipe conflict fix

* - Fixed seed oil voiding in barrels. And item weight inconsistency.

* - Reduced loading screen logo size by 4MB

* - Update Changelog

* - Compressed loading screen images to maybe help with ram

* - Added default gui scale to make the main menu look better on first launch

* - Update Changelog

* - Added utility script for adding circuits to existing recipes

* fixed changelog conflict

Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>

* - Added harvest baskets

* - Fixed baked potato recipe mixing from oven

* - Allowed elytras to be repaired regardless of damage

* - Fixed sea water barrel recipe

* - Gave plants tags to bushes so they can have other uses

* - Pushed stubborn models

* - updated Changelog

* - Changelog typo

---------

Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>
2025-07-15 03:37:45 +01:00
Pyritie
d036c4c960 fixed the stressometer recipe disappearing 2025-07-15 02:48:37 +01:00
Pyritie
8e3fe6d528 fixed anthracite not working with blaze burners 2025-07-15 01:55:36 +01:00
Pyritie
9de6557326
nugget material fix, changelog (#1332) 2025-07-14 21:34:23 +01:00
Pyritie
8dd8d5b344 added ice soup 2025-07-14 20:00:44 +01:00
Pyritie
84750a0607 langs 2025-07-14 20:00:01 +01:00