Commit graph

1862 commits

Author SHA1 Message Date
Pyritie
07245d6d07 removed leftover species recipes 2025-07-20 13:03:13 +01:00
Pyritie
d1f76ca1bd fixes #1395 2025-07-20 13:03:01 +01:00
Pyritie
5bb1c17eae update changelog, revert unnecessary changes from #1390 2025-07-20 12:53:25 +01:00
Pyritie
91d9738f1c fixes #1397 2025-07-20 12:46:23 +01:00
Eve
b98c3bc135
[🪶]: Give Aged Corn Whiskey and Aged Rye Whiskey status effects (#1390)
* Export ".json"s from TFCagedalcohol mod to TFC

Exporting effects ".json"s

Signed-off-by: Eve <93487878+EveProgrammingsockson@users.noreply.github.com>

* Create tfc

There is tfc/tfc/*files*
Need additional file to access them

Signed-off-by: Eve <93487878+EveProgrammingsockson@users.noreply.github.com>

* Delete kubejs/data/tfc/drinkables directory

not there sh*

Signed-off-by: Eve <93487878+EveProgrammingsockson@users.noreply.github.com>

* Delete kubejs/data/tfc/tfc

Signed-off-by: Eve <93487878+EveProgrammingsockson@users.noreply.github.com>

* Create tfc

Signed-off-by: Eve <93487878+EveProgrammingsockson@users.noreply.github.com>

* Delete kubejs/data/tfc/tfc

Signed-off-by: Eve <93487878+EveProgrammingsockson@users.noreply.github.com>

* Create tfc

Signed-off-by: Eve <93487878+EveProgrammingsockson@users.noreply.github.com>

* Delete kubejs/data/tfc/tfc

Signed-off-by: Eve <93487878+EveProgrammingsockson@users.noreply.github.com>

* Create ihategithub

Signed-off-by: Eve <93487878+EveProgrammingsockson@users.noreply.github.com>

* Exporting aged alcohol from TFCagedalcohol data

Signed-off-by: Eve <93487878+EveProgrammingsockson@users.noreply.github.com>

* Create alcohols.json

Signed-off-by: Eve <93487878+EveProgrammingsockson@users.noreply.github.com>

* Delete kubejs/data/tfc/tfc/ihategithub

Signed-off-by: Eve <93487878+EveProgrammingsockson@users.noreply.github.com>

---------

Signed-off-by: Eve <93487878+EveProgrammingsockson@users.noreply.github.com>
2025-07-20 12:36:45 +01:00
Pyritie
4c8b0ca545 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-07-20 12:10:47 +01:00
Pyritie
4e3e55ee41 langs 2025-07-20 12:01:08 +01:00
Redeix
611f5d9199
Recipes, Tags, Assets+ for railgun (#1394)
* - 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

* - I think I got the title screen looking good on all resolutions

* - Updated Changelog

* - Added scale fix to loading screen too

* - Fix pixel alignment

* - Recipes, tags, assets+ for railgun

---------

Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>
Signed-off-by: Pyritie <pyritie@gmail.com>
Co-authored-by: Pyritie <pyritie@gmail.com>
2025-07-20 11:59:30 +01:00
Ian Laidlaw
e024e005bd
Fixes bug where milling #tfg:hardwood would result in softwood pulp instead of the expected hardwood pulp. (#1391)
* Fixes bug where milling #tfg:hardwood would result in softwood pulp instead of the expected hardwood pulp.

Softwood pulp milling recipe still shows minecraft:logs as input but I'm not familiar enough with kubejs to know how to fix it. Logically this works though.

* Fixes bug where milling #tfg:hardwood would result in softwood pulp instead of the expected hardwood pulp.

Softwood pulp milling recipe still shows minecraft:logs as input but I'm not familiar enough with kubejs to know how to fix it. Logically this works though.

* changed to removeMaceratorRecipe instead of event.remove()

* Removed config file from pull request

* Removed irrelevant changes

* Update recipes.paper.js

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

---------

Signed-off-by: Pyritie <pyritie@gmail.com>
Co-authored-by: Pyritie <pyritie@gmail.com>
2025-07-20 11:55:41 +01:00
Pyritie
9ff82c5d53 nicer sand dunes! 2025-07-20 02:06:07 +01:00
Pyritie
0fa887ebe1 don't like that tfc red sandstone here 2025-07-20 01:56:35 +01:00
Pyritie
b47804f7fe added noodle caves back 2025-07-20 01:49:50 +01:00
Pyritie
e52068c81f starting mars sand dunes 2025-07-20 00:24:57 +01:00
Pyritie
b41318d7d9 remove dikes from sandy areas 2025-07-20 00:24:42 +01:00
Pyritie
d3567d3517 removed ore veins (this is for the really huge vanilla kind) 2025-07-19 22:18:14 +01:00
Pyritie
c4dce6bb99 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-07-19 21:21:16 +01:00
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