Commit graph

1801 commits

Author SHA1 Message Date
Pyritie
05e54ce050 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-10-11 16:26:44 +01:00
Pyritie
aac5834912 also added lunchboxes 2025-10-11 16:26:42 +01:00
Pyritie
d915788cc8 added more super tanks/chests to the railgun blacklist 2025-10-11 16:25:58 +01:00
Jason Nash
744272a27f
add conveyor assembler recipe (#2007)
* add conveyor assembler recipe

* oopsie forgot the circuit

* maybe this one?
2025-10-11 10:18:37 -05:00
Pyritie
af4777a6bc merge 2025-10-11 00:04:03 +01:00
Pyritie
dc5af357d6 added glass dust -> lamp glass 2025-10-10 23:59:32 +01:00
Adrien Vidal
65edc16a92
Quartz + Create Stone Support (#2005)
+ Blackstone uniform model

Signed-off-by: Adrien Vidal <vidal.adrien2@gmail.com>
2025-10-10 22:23:43 +01:00
Redeix
69d8e68ef1
Meats and eats (#2001)
* meats and eats

* changelog and pt_br
2025-10-10 09:14:29 +01:00
GameStar
0020bf80c4
add auto craft card recipe (#1997)
Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
2025-10-09 12:58:26 -05:00
GameStar
2575918016
Fix all tfc:heating recipes being removed (#1988)
Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
2025-10-08 21:57:36 -05:00
Pyritie
1a815a129e added required data for new fission cooling 2025-10-08 23:22:24 +01:00
TomPlop
ef1c220be0
Nerf fluorine cost for refrigerant pellet (#1983)
Signed-off-by: TomPlop <tomdidome@gmail.com>
2025-10-08 22:12:53 +01:00
The Compendium System / The Atlassian Collective
6c09147e3a
Soups in the Food Processors (#1980)
* 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

* soup

---------

Co-authored-by: Redeix <brayden.j.m.ford@gmail.com>
2025-10-08 13:49:41 -05:00
TomPlop
f92ded749e
Fix Rod and nerf dry ice (#1982)
Signed-off-by: TomPlop <tomdidome@gmail.com>
2025-10-08 19:46:19 +01:00
Pyritie
75a2726d61 quicksand nerfs 2025-10-07 23:18:16 +01:00
Pyritie
13378c91a6 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-10-07 23:16:57 +01:00
Pyritie
33f3088945 missing mineable tags for sand piles 2025-10-07 22:55:32 +01:00
Pyritie
6a007a0379 forgot to remove this logging 2025-10-07 22:48:32 +01:00
TomPlop
fd182dfddd
First fixes for Mars Fission (#1978)
* First fixes for Mars Fission

* Fix ShapeInfo
2025-10-07 22:43:16 +01:00
The Compendium System / The Atlassian Collective
f6e4935488
144mb Chocolate Melting (#1977)
* 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

* flax cutter recipe

* chocolate is now 144mb yay

* accident

* no more chocolate dupe

---------

Co-authored-by: Redeix <brayden.j.m.ford@gmail.com>
2025-10-07 19:22:41 +01:00
Pyritie
15185f3bb2 fixes https://github.com/TerraFirmaGreg-Team/Modpack-Modern/issues/1976 2025-10-07 18:53:57 +01:00
Pyritie
153ae76522
Feature/mars piles and layers (#1975)
* changes for some sand layer/pile stuff

* Martian wind (#1883)

* add texture for wind

* add multiple martian wind types

* fix semiheavy concurrent with tfg core

* rename wind to match convention

* fix blockstate registration error

* why is this even turned on by default

* translate code regions + placeholder bundle recipe

* add mars climate controller

* add debug stick functions

* cleanup

* add layer block models

* add jsons

* cleanup

---------

Signed-off-by: Zippity <i.wa.anderson.86@gmail.com>

* refactor

* undo bundle

* added a bunch of missing snow pile tags

* item model changes

* more snow piled tags

* add dust storm severity biome tags

* some cleanup

---------

Signed-off-by: Zippity <i.wa.anderson.86@gmail.com>
Co-authored-by: Zippity <i.wa.anderson.86@gmail.com>
2025-10-07 18:22:41 +01:00
GameStar
03e382702d
more cooling tower stuff (#1971)
* stuff

* eh

* stuff

* stuff to save

* stuff

* texture stuff

* lang
2025-10-07 11:34:59 +01:00
Pyritie
32b7fd2d24 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-10-07 01:30:36 +01:00
Pyritie
3fb490fe04 a bunch of small tweaks 2025-10-07 01:20:10 +01:00
Jason Nash
e51cf2f07b
all pressure plates to circ 3 (#1970) 2025-10-06 22:30:33 +01:00
Pyritie
23bc2d5bd1 I said, fixed supports 2025-10-06 21:37:41 +01:00
Pyritie
96526a31a5 fixed blackstone/keratophyre supports 2025-10-06 21:37:32 +01:00
Pyritie
6ea05e109e stackatick items 2025-10-06 21:03:50 +01:00
Pyritie
998eaa287e I assume infinite hematite is ok since we already have infinite magnetite 2025-10-06 20:58:56 +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
Pyritie
671b7169dd mars shield tweaks 2025-10-06 18:29:06 +01:00
Pyritie
ad39997f02 fix krypton imbalance 2025-10-06 18:14:26 +01:00
Pyritie
9b30950aaa fix pink bed from glacian fur 2025-10-06 18:14:01 +01:00
Pyritie
7d345cf1c9 oops the krypton wasn't looped 2025-10-06 18:13:49 +01:00
The Compendium System / The Atlassian Collective
7db93fb9dd
New ULV Flax Cutter Recipe (#1968)
* 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

* flax cutter recipe

---------

Co-authored-by: Pyritie <pyritie@gmail.com>
2025-10-06 11:50:47 -05: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
6ef371c99a adjustments for moon/mars mob HPs! 2025-10-06 16:07:12 +01:00
Pyritie
46eef4b0fe fix doubled meat yield of mars ranchable animals 2025-10-06 16:04:21 +01:00
Pyritie
9642726604 hm, the glacian rams are still appearing too south 2025-10-06 14:32:20 +01:00
Pyritie
39c91da703 fix glacian trees to be partly underground, fiddling with climate stuff for them again 2025-10-06 14:29:48 +01:00
Pyritie
afc24cdc84 buffed stainless steel lids because why not 2025-10-06 12:40:31 +01:00
Pyritie
644881ecf2 fix table whitespace 2025-10-06 11:04:29 +01:00
Pyritie
c5d6bcd103 fix recipe ID for some stone supports 2025-10-06 10:46:38 +01:00
The Compendium System / The Atlassian Collective
f47a3aac2f
Fixed a Linux crash caused by a mispressed space in Greate removes (#1962)
* oops I might've hit space and made linux upset mb gang

* > metal bar > look inside > not a metal bar
2025-10-06 10:29:32 +01:00
Pyritie
7c4f416b00 fixing floating glacian trees 2025-10-05 22:57:56 +01:00
TomPlop
a977b526bf
Some EV Quests and fixing IV Circuits and Fission Thorium (#1958)
* Quest rework for EV

* Fix lang file quests

* More quest changes

* Adding some quests and tweak fission
2025-10-05 22:18:38 +01:00
Pyritie
81fbb3d9ad langs, recipe for evaporation tower 2025-10-05 21:55:58 +01:00