Commit graph

478 commits

Author SHA1 Message Date
Pyritie
cfbd258102
Mars sandstorms (#2067)
* 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

* and uncomment again

* real math hours

* more math tweaks

* comment out debug code

* comment this file

---------

Signed-off-by: Zippity <i.wa.anderson.86@gmail.com>
Co-authored-by: Zippity <i.wa.anderson.86@gmail.com>
2025-10-21 12:21:18 +01:00
Pyritie
53eb9767c7 food balancing 2025-10-18 15:29:07 +01:00
Pyritie
d7518d98c6 added nugget molds and oils to dino nugs 2025-10-18 13:41:15 +01:00
Redeix
d940579c82
Updated circuit utility wrapper (#2047) 2025-10-18 01:54:43 -05:00
Pyritie
7f07089a99 added an aged beer recipe for slightly better grain yields 2025-10-18 01:33:08 +01:00
Pyritie
b3fdbd1571 added dinosaur nuggies 2025-10-18 01:11:32 +01:00
Pyritie
3be4cd61a7 fixed items not consuming power with wireless card 2025-10-15 22:03:54 +01:00
Pyritie
4cc0cf409e 0.11.3 2025-10-15 21:43:43 +01:00
Jason Nash
176cc3c9c9
additional pineapple fiber recipe (#2029)
* additional pineapple fiber recipe

* typo

* use food processor & use nitrogen
2025-10-15 21:08:34 +01:00
TomPlop
2a97ad0b72
Change Fission Progression (#2040) 2025-10-15 20:37:10 +01:00
Pyritie
f5ad5f091c
feature/europa-noise (#2038)
* committing here because I made something cool and I don't want to lose it

* adjusted height

* better

* good enough

* good enough for now
2025-10-15 20:16:10 +01:00
TomPlop
5094e1ff72
Nuclear changes and new quests description (#2037)
* Add dimension locked

* Remove soda ash CR recipe and add dense lead from Implosion

* Adding new quests description
2025-10-15 09:15:05 +01:00
Pyritie
9fa8d4dab6 tag cleanup 2025-10-14 16:02:36 +01:00
Pyritie
142f6ad537 fix https://github.com/TerraFirmaGreg-Team/Modpack-Modern/issues/2032 2025-10-13 18:54:55 +01:00
Pyritie
2bd0523380 added ulv super tanks/drums and 4a hv dynamo 2025-10-13 14:22:38 +01:00
Adrien Vidal
37f5a812f7
Stone tfgfication pt3.5 (#2017)
* Quartz + Create Stone Support

+ Blackstone uniform model

* loose to gravel packer recipes

* Cobble unpacking recipes

---------

Signed-off-by: Adrien Vidal <vidal.adrien2@gmail.com>
2025-10-12 11:48:45 -05:00
Pyritie
49b290772c dinosaur nest structures! 2025-10-12 02:10:27 +01:00
Pyritie
5835322410 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-10-12 01:01:37 +01:00
Pyritie
92a47d7d1a egg 🥚🍳🦖🦕 2025-10-12 01:01:33 +01:00
dimethyl
3225500a67
Impure Dust Washing in Barrels (#2013)
* allow impure dust washing in barrels

* Update CHANGELOG.md

* Changed to using gregtech materials instead
2025-10-11 18:30:21 -05:00
Pyritie
742955047c undo my previous crackrack mistake 2025-10-11 22:41:15 +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
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
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
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
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
3fb490fe04 a bunch of small tweaks 2025-10-07 01:20:10 +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
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
ad39997f02 fix krypton imbalance 2025-10-06 18:14:26 +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