Commit graph

1229 commits

Author SHA1 Message Date
Pyritie
83adf7f088 added quests for some species stuff, adjusted recipes of the grappling hook and rope coils 2025-07-22 01:31:29 +01:00
Pyritie
bbae9d2501 removed mortar recipes for metal ingots 2025-07-22 00:54:23 +01:00
Pyritie
15821eee19 added mortar recipes for flour, added missing food processor recipes for nixtamel 2025-07-22 00:21:59 +01:00
Pyritie
d1c96bf39d chests need a tag to work with contraptions now, apparently 2025-07-22 00:20:51 +01:00
Pyritie
888a227229 fixes #1413 2025-07-21 23:55:22 +01:00
Ian Laidlaw
5dc73041f5
Adds curving_heads tag to screwdriver mold so the mold works correctly with curving presses (#1412)
* Adds curving_heads tag to screwdriver mold so the mold works correctly with curving presses

* added the other molds

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

---------

Signed-off-by: Pyritie <pyritie@gmail.com>
Co-authored-by: Pyritie <pyritie@gmail.com>
2025-07-21 21:36:47 +01:00
Pyritie
2b62124ca2 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-07-21 12:53:57 +01:00
Pyritie
081aac2a4f reduced recipe duration of biodiesel recipes 2025-07-21 12:53:54 +01:00
Gustavo
3d89d59d4d use strict 2025-07-21 13:52:18 +10:00
Pyritie
a95d2aaf09 fixes #1405 2025-07-20 17:13:06 +01:00
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
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
e52068c81f starting mars sand dunes 2025-07-20 00:24:57 +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
c099daf52b added back vanilla red sand, started work on some tags, added mars deep desert biome 2025-07-19 16:20:15 +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
Pyritie
c9b3168d0a typo 2025-07-19 00:44:35 +01:00
Pyritie
af849291ca blue steel is the lavaproof one, akshually 2025-07-18 22:59:37 +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
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
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
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
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
Redeix
911ede670a
Created utility function to add circuit numbers to pre-existing recipes (#1320)
* - 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>

---------

Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>
2025-07-14 10:10:37 +01:00
GameStar
f9ece44a81
Bug fix/Adding in some missing recipes (#1319)
* kelp + seaweed dry

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

* add assembler 45-70

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

* fixed afc wood stomping barrel recipes

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

* give lead tfc properties

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

* give lead nuggets an anvil recipe

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-14 10:06:47 +01:00
GameStar
a350467f09
Bug fix for #1298; extruder molds being goofy (#1314)
* Add files via upload

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.molds.js

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

* Update recipes.misc.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-14 11:03:25 +10:00