Commit graph

67 commits

Author SHA1 Message Date
Pyritie
e9506d17d0 added some uses to mars charnia, to mirror kelp 2026-01-13 17:33:51 +00:00
Redeix
900e1de8e9
The big green PR (#2694)
* blocks

* more textures

* more textures more textures

* blocks

* more textures

* more textures more textures

* blocks

* more textures

* more textures more textures

* blocks

* more textures

* more textures more textures

* firmalife gh stuff

* chloroplasts and brick regex

* gh recipes

* pisciculture fishery

* I am going insane

* more casings = more gooder

* rotten voiding cover

* greenhouse glory

* Is this it chat

* not needed

Signed-off-by: Redeix <redeix.m@gmail.com>

* missed in conflicts

Signed-off-by: Redeix <redeix.m@gmail.com>

* consumerism

* re-add tag import

* remove unused object map

* id normalizer function

---------

Signed-off-by: Redeix <redeix.m@gmail.com>
2026-01-10 19:30:46 -06:00
glitch714
40ba6fe8b7
Add new molds (#2470)
* Added bunch of stuff for molds

* Changed rod mold recipe to not collide with oven chimmney

Signed-off-by: glitch714 <119386229+glitchplaysgames714@users.noreply.github.com>

* Removed unneeded comments

Signed-off-by: glitch714 <119386229+glitchplaysgames714@users.noreply.github.com>

* Changed gear mold to be fireclay

* fixed issues with molds

* Added break chance

Signed-off-by: glitch714 <119386229+glitchplaysgames714@users.noreply.github.com>

* Update constants.js

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

* Update recipes.knapping.js

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

* Update recipes.materials.js

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

* Updated constants.js

Signed-off-by: glitch714 <119386229+glitchplaysgames714@users.noreply.github.com>

* Update items.primitive.js

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

* Update constants.js

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

* Update recipes.knapping.js

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

---------

Signed-off-by: glitch714 <119386229+glitchplaysgames714@users.noreply.github.com>
Signed-off-by: Pyritie <pyritie@gmail.com>
Co-authored-by: Pyritie <pyritie@gmail.com>
2025-12-19 21:22:29 +00:00
Pyritie
cc47fe55ce big tag/data refactor 2025-12-03 00:32:14 +00:00
Pyritie
1545f19ce6 big refactor of a lot of the recipe files! 2025-12-02 19:12:36 +00:00
GameStar
67cc06c9ad
fix drinking all blocks (#2246)
* langs

* fix drinking dirt

* Update CHANGELOG.md

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

---------

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
2025-11-19 12:47:01 -06:00
Redeix
b69645a263
Food Update (#2223)
* new food

* Changelog

* Removed venus requirement so players could craft cheese now

* molecular diagrams
2025-11-16 18:54:32 -06:00
TomPlop
dd099b9121
fix railgun ammo size (#2219) 2025-11-14 14:29:48 -06:00
Redeix
7ee6ff2c04
bioline materials (#2191)
* materials

* lang

* materials

* utility linting

* data and linting

* lang
2025-11-08 03:40:26 -06:00
Pyritie
53eb9767c7 food balancing 2025-10-18 15:29:07 +01:00
Pyritie
b3fdbd1571 added dinosaur nuggies 2025-10-18 01:11:32 +01:00
Pyritie
142f6ad537 fix https://github.com/TerraFirmaGreg-Team/Modpack-Modern/issues/2032 2025-10-13 18:54:55 +01:00
Redeix
69d8e68ef1
Meats and eats (#2001)
* meats and eats

* changelog and pt_br
2025-10-10 09:14:29 +01:00
Pyritie
3fb490fe04 a bunch of small tweaks 2025-10-07 01:20:10 +01:00
Pyritie
12f6f0a09f hey if eggs have dairy for some reason then so can this 2025-10-06 18:36:21 +01:00
Pyritie
dc2c4af1f5 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-10-06 18:29:24 +01:00
Pyritie
722b2756f2 buffed bulbkin pie, fixed egg tag 2025-10-06 18:29:20 +01:00
The Compendium System / The Atlassian Collective
d45e2f164a
Food n' Bags Bug Fixing Compilation (#1967)
* oops I might've hit space and made linux upset mb gang

* > metal bar > look inside > not a metal bar

* sns is a mess huh

* sns is a mess huh (fixed sns and sophisticated backpack stuff)

* hot potato (pun intended)

* made bulbkin pie not allergic to firmalife ovens
2025-10-06 11:48:53 -05:00
Pyritie
9642726604 hm, the glacian rams are still appearing too south 2025-10-06 14:32:20 +01:00
Pyritie
9de693d489 more climate tweaks because I forgot that the climate was a sine wave and not linear 2025-10-05 17:50:06 +01:00
Pyritie
d68c0550f9 various crop related things 2025-10-03 01:20:03 +01:00
Pyritie
a7eba83d81 add mars liquid ice vein just for variety's sake 2025-10-02 22:48:20 +01:00
Pyritie
16ae9167a8
mars snow (#1931)
* bare bones

* snow piled tag

* added climate restriction to quicksand, added powder snow up north

* better tagging

* langs

* assets

* missed feature in deep desert

* remove waves from mars

* climate tweaks

* icicles and dry ice stuff

* langs
2025-09-30 18:15:35 +01:00
TomPlop
3d3795f828
Adding Nuclear Fission (#1926)
* Fix Chute Assembler recipe

* Fix quest tips beekeper

* Fix for wine and jar alloy smelter conflicting recipe

* fix to fit #1141

* mistakes were made

* Fix jetpack 1 quest mv

* Mistake again

* Revert the fix on chute

* Adding compatibility for nuclear Vazde mod

* Add textures to fission rods

* Updating fission with Vazde mod

* more fixes and add new rotor bismuth

* More changes

* switch recipes for fission reactor

* More fixes for nuclear mod

* more fixes

* Disable tbu

* Nerf Heavy Water cost

* Fix alloy
2025-09-29 11:26:32 -05:00
Pyritie
c96c02af23 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-09-29 17:23:29 +01:00
Redeix
4c0f2c5428
Growth Chamber (#1924)
* growth_chamber

* growth_chamber blocks

* more textures

* more casing stuff

* sterilizing pipes

* forgor

* monitor light

* emissives and casings!

* checkpoint

* final call
2025-09-29 00:53:42 +01:00
Pyritie
b86af95d06 pushed the mars poles further north 2025-09-28 20:26:58 +01:00
Pyritie
030db1280c I think this should show all the commented out mars content? 2025-09-26 23:37:23 +01:00
Pyritie
0b980344fc glacian trees! 2025-09-21 17:45:43 +01:00
Pyritie
5315111796 removed surfers from fauna 2025-09-19 01:46:59 +01:00
Pyritie
22166e7384 siiiiigh 2025-09-18 02:27:18 +01:00
Pyritie
20be34901d I'm just gonna get rid of the surfer's fauna definition, it's not playing well 2025-09-18 02:17:08 +01:00
Pyritie
b1ea189f02 fauna! 2025-09-17 23:09:44 +01:00
programmer3481
ee4d16a0bc
Add catwalk facades (#1854)
* make popped chorus fruit edible

* add catwalk facades

* fix crafting facades out of singular bricks

* Revert "fix crafting facades out of singular bricks"

This reverts commit 2f5acb5d48a943d24b229a17b0bf25ead8e6c291.

* fix mud brick properly

* put constants in one place
2025-09-17 16:50:45 +01:00
Pyritie
ae255f7b93 fix double plate stack size, remove old assline overrides 2025-09-16 12:02:28 +01:00
KonSola5
033b411363
Item sizes (#1778)
* Item sizes and some helpful tags

* Try putting item sizes in a KJS script (NOT TESTED)

* Move Greate tags to KJS, add sizes for various pipes and cables

* Whoops, accidentally overrode tiny pipe size

* Air duct sizes

* Prettier config and tags moved to JS
- Added `.prettierrc` file, which configures the tab width and code wrapping point for the Prettier formatter.
- Moved remaining tags from JSON to JS files.

* Delete floating carpet tag JSON

Signed-off-by: KonSola5 <125081901+KonSola5@users.noreply.github.com>

---------

Signed-off-by: KonSola5 <125081901+KonSola5@users.noreply.github.com>
Co-authored-by: Redeix <brayden.j.m.ford@gmail.com>
2025-09-13 13:46:20 -05:00
GameStar
020d4f9018
Flax (#1735)
* some flax stuff

* linen stuff

* flax line stuff

* flax again

* rapseed wild crop changes

* flax worldgen

* revert grooming station update

* more flax stuff

* trying to fix stuff

one doesn't work

* recipes and lang

* Update CHANGELOG.md

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

* fixes

---------

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
2025-08-31 19:14:14 +01:00
Redeix
11234d5abd
Update data.js (#1729)
Signed-off-by: Redeix <brayden.j.m.ford@gmail.com>
2025-08-30 00:00:09 -05:00
GameStar
03106270e1
Feature/wan creatures and stuff (#1633)
* whitespace changes

* some animal compat

* snifferified recipes

* nest box recipe

* tag stuff

* spawn stuff

* tooltip

* wan config

* foods

* loot tables

* Update pakku-lock.json

* Update wan_ancient_beasts-server.toml

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

* Update tags.js

Signed-off-by: Pyritie <pyritie@gmail.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-08-15 22:45:09 +01:00
GameStar
9e9b5bfb55
stuff for core pr (#1612)
* 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>

* 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>

* 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>

* 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>

* Add files via upload

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

* Update items.food.js

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

* Update constants.js

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

* Update data.js

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

* Update recipes.food.js

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

---------

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
2025-08-12 20:45:38 +01:00
Pyritie
a07f70594d freeze dried mars fruit 2025-08-12 11:25:38 +01:00
Pyritie
2bdb46c397 mars pumpkin pie + other tag stuff 2025-08-11 22:59:10 +01:00
Pyritie
0349729547 mars crop greenhouse textures 2025-08-11 20:46:36 +01:00
Pyritie
fbbfe31ba8 mars farmland stuff, also fixed nox berry EGH recipe 2025-08-09 23:57:45 +01:00
Pyritie
0ea561e78e removed rotting from canola 2025-08-08 01:06:04 +01:00
Pyritie
a3be818e8f updated size data 2025-08-04 12:46:14 +01:00
Pyritie
1cdbd052cc 0 days without py breaking the build 2025-07-31 19:54:58 +01:00
Pyritie
cc594452cf maybe 2025-07-31 13:09:09 +01:00
Pyritie
9259a0e711 drinkable mars water 2025-07-31 13:07:46 +01:00
Pyritie
caf958c4f6 firmalife planter data for mars crops (still need to do textures) 2025-07-31 13:03:33 +01:00