Commit graph

172 commits

Author SHA1 Message Date
TomPlop
928c7129aa
Heat battery (#2955)
* heat battery and tooltips

* Add tooltip back

* fix tooltip
2026-02-02 17:32:49 +00:00
TomPlop
50eff2f5b9
Fission energy rework (#2931)
* everything should be fine

* Balance early power (#6)

* balance update

* Add textures

* last balance tweaks

* more balance

* Fix conflicts

* Balance early power (#8)

* balance update

* Add textures

* last balance tweaks

* Oupsi

* more fixes

* add changed quests

* push latest balance

* fix tallow

* add btx

* Update quests

* Oups

* Adding some nuclear stuffs so I can merge my branches

* Isotopic solvent stuff (#10)

* push

* fix iconset issue

* adding all the textures change

* add more stuffs

* Push recipes

* new stuffs

* add stuffs

* more changes

* add textures and some recipes

* tons of change

* fix texture

* add textures and other stuffs

* more recipes

* add recycling for fission rods

* more recipes

* fix fluid textures

* comment out FLiBe again and balance rods

* fix fluids

* some latest fix

* fix more texture

* more recipe changes

* more recipes

* some last minute balance changes

* add quests

* fix conflict

* more fixes

* fix components

* var to const

---------

Co-authored-by: Spicy Noodles <93035068+SpicyNoodle5@users.noreply.github.com>
2026-02-01 10:52:11 -06:00
Redeix
75b0cea000
Artisan Table (#2857)
* artisan table merging (#2766)

* these should be good

* Update recipes.miscellaneous.js

* little typo

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

* fix typo, my bad gang

* fix charnia

* fixed recycling issues from the material rewrite, updated everything to the new recycling helper method

* I'll move these eventually

---------

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
Co-authored-by: Pyritie <pyritie@gmail.com>

* artisan table assets

* asset update

* Update recipes.artisan_table.js

* asset update

* lang

* tag refactor

* waiter! more assets please

* recipes

* done?

* I forgor

---------

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
Co-authored-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
Co-authored-by: Pyritie <pyritie@gmail.com>
2026-01-25 19:22:50 -06:00
Pyritie
89030d3564
Stone dust rework (#2782)
* geology

* starting some loot table stuff

* more stuff

* swap some rocks

* refactor

* phew

* drive-by fix

* all done I think

* remove sylvite

* oh yeah baby it's all coming together

* cleaned up some lines that didn't do anything, added more comments, removed log spam

* blah blah

* fix drying mat

* fix ladders

* tfc, beneath, and moon stuff done...? this is gonna take 5ever

* a

* some sand stuff, more stone types

* wrong way around

* unifying various brick block recipes

* remove shaped create deco brick recipes

* some progress on block creation

* we got into the create world screen!

* getting somewhere

* Reloaded with no KubeJS errors!

* new assets

* I thiiiink that's about everything

* fix some stonecutting

* recipe declared but never used
2026-01-19 22:39:15 +00:00
Redeix
e9e4ad90cf
Greenhouse Rework Finishing Touches (#2719)
* asset changes

* recipe changes

* lang and quests

* fixes

---------

Signed-off-by: Redeix <redeix.m@gmail.com>
2026-01-13 11:11:07 +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
Pyritie
434a36d0b8 added new radioactive hazard effect, langs 2026-01-04 23:59:55 +00:00
Pyritie
8ee28e76a6 more venus stuff 2026-01-01 23:31:11 +00:00
Pyritie
5d4fd1c739 more stuff for the volcano biome 2026-01-01 19:39:06 +00:00
Pyritie
3a590aca60
Feature/steam multis (#2574)
* init

* langs?

* more steam multis
2025-12-31 23:59:28 +00:00
Pyritie
f3760f342e item textures for venus fluids, thanks ayzer 2025-12-25 18:01:37 +00:00
thederpysockdude123
848b0db31b
Add new page with prospector GUI to drilling rig quest (#2517)
* add new page with prospector GUI to drilling rig quest

Signed-off-by: thederpysockdude123 <thederpysockdude123@gmail.com>

* Add files via upload

Signed-off-by: thederpysockdude123 <thederpysockdude123@gmail.com>

---------

Signed-off-by: thederpysockdude123 <thederpysockdude123@gmail.com>
2025-12-24 20:01:48 +00:00
Pyritie
d5da69f79b fire clay textures for new molds 2025-12-19 21:31:47 +00: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
aeca63edfb Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-12-15 18:46:47 +00:00
Pyritie
f2d633ff8e thanks vexxed 2025-12-15 18:34:54 +00:00
TomPlop
8ab09abe56
Add btx (#2416)
* adding textures and recipes

* Balance BTX and Reformate Gas

* Oups

* fix material amount
2025-12-15 12:12:49 -06:00
GameStar
e06ca51081
New Active Transformer (#2424)
* textures and stuff

* recipes

* looks a little better

* got texture thing to be

* probably good enough

* cooling tower touchup
2025-12-14 22:03:41 +00:00
Redeix
35a14ab62c
particles (#2401) 2025-12-13 11:59:20 +00:00
Pyritie
0ec6f5da04 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-12-10 23:30:00 +00:00
Pyritie
9f6c342e8d better warning icons 2025-12-10 21:42:28 +00:00
Redeix
bb9c0b608c
A bunch of random stuff (#2365) 2025-12-10 01:53:28 -06:00
Pyritie
068466301b mob effect icons + langs 2025-12-10 01:08:09 +00:00
TomPlop
6c4775d58e
Balance early power (#2319)
* balance update

* Add textures

* last balance tweaks

* Oupsi

* more fixes

* add changed quests

* push latest balance

* fix tallow

* add btx

* Update quests

* Oups

* Adding some nuclear stuffs so I can merge my branches

* fix tallow

* balance update

* Add textures

* last balance tweaks

* Oupsi

* more fixes

* add changed quests

* push latest balance

* fix tallow

* add btx

* Update quests

* Oups

* Adding some nuclear stuffs so I can merge my branches

* fix tallow

* fix

* add tfg:
2025-12-07 17:05:21 +00:00
TomPlop
72ae40a2b4
Rework Early Game Fuel (#2309)
* Add materials and multiblock

* try to fix conflict

* Fix conflict

* Fix conflict

* Rework tungsten line (#5)

* fix materials

* Update Ostrum to core

* Fix conflict

* fix conflict

* Fix fucking conflict

* Upload more changes

* Add more things

* Introduce new gas fuel

* Add Anthracite

* Add Syngas early game and more modifications

* More fixes

* Add textures to fluid
2025-12-01 13:42:45 +00: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
GameStar
8388d044d8
materials + structures for normal items (#2198)
* nitrocellulose and cellulose matrix

* vent texture

* I think it actually works

* Update CHANGELOG.md

---------

Signed-off-by: Pyritie <pyritie@gmail.com>
Co-authored-by: Pyritie <pyritie@gmail.com>
2025-11-10 12:08:58 -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
feda38112d
Feature/venus noise (#2165)
* initial pass of venus stuff

* more

* typo

* venus mob hp/armor? adjustments

* temp biomes to figure out where everything is, starting work on noises

* almost there

* fix glacio visibility on the menu

* more beachy

* biome renames

* biomes in the constant

* had to turn off cheese caves cuz they kept fucking up the terrain

* added random y rotation to all cobble/gravel/hardened

* ok I think I'm done with noise for now, caves still need work
2025-11-05 01:08:18 +00:00
Pyritie
7fdec8c923 added image to the EBF quest 2025-11-02 14:07:54 +00:00
Redeix
18a689b4ad
Paving Cart Files (#2144)
* paving cart files

* Updated Changelog

* idk why my changelog was behind

Signed-off-by: Redeix <brayden.j.m.ford@gmail.com>

---------

Signed-off-by: Redeix <brayden.j.m.ford@gmail.com>
2025-11-02 13:02:45 +00:00
GameStar
0d264949ba
Update ad astra planet screen (#2117)
* images (#2084)

* planet

* more things

* better textures

* thing

* images (#2084)

* planet

* more things

* better textures

* thing

* images (#2084)

* planet

* more things

* better textures

* Updated Planets

* Create europa_orbit.png

* make rpp pink

* better planets

* Update CHANGELOG.md

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

---------

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
Co-authored-by: Redeix <brayden.j.m.ford@gmail.com>
2025-10-28 10:15:16 +00:00
The Compendium System / The Atlassian Collective
9943370b28
Flax Bundles (#2080)
* yay flax bundle

* yay flax recipes and scraped flax pile

* more flax stuffs

* yay vintage improvements isn't useless now

* the one missing letter of doom

---------

Co-authored-by: Pyritie <pyritie@gmail.com>
Co-authored-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
2025-10-25 16:56:17 +01:00
Redeix
4fcbae00ac
Fridge Assets (#2062) 2025-10-20 10:59:56 +01:00
Pyritie
b3fdbd1571 added dinosaur nuggies 2025-10-18 01:11:32 +01:00
Redeix
da4e4fbebf
reworked the rest of the alien meat textures (#2014) 2025-10-11 18:25:34 -05:00
Redeix
69d8e68ef1
Meats and eats (#2001)
* meats and eats

* changelog and pt_br
2025-10-10 09:14:29 +01:00
Pyritie
2cf16acc29
Feature/space fauna (#1984)
* start of space fauna entry

* added 3

* pakku

* finished this
2025-10-08 22:44:40 +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
GameStar
302c394a47
cooling tower particles (#1954)
* stuff

* eh

* stuff

* stuff to save
2025-10-04 13:01:23 -05:00
TomPlop
744f34cda3
Finishing adding the Fission Reactor to TFG (#1951)
* Some cleaning

* Some multiblocks change

* more changes

* More changes to nuclear line adding coolant

* Graphite line

* Last changes to Fission Line

* Finishing the nuclear line

* add impure moderator

* fix removal of plutonium

* fix Tag Prefix
2025-10-04 16:44:53 +01:00
Pyritie
bcbf7664f4 langs, updated changelog, basic mv circuits now need sequenced assembly 2025-10-04 15:26:06 +01:00
GameStar
8c691a3b08
change the fission component block model (#1948)
* stuff

* eh

* stuff
2025-10-03 12:25:34 -05:00
GameStar
38eb2d70e5
Fission Insulations (#1943)
* stuff

* eh
2025-10-02 18:32:04 +01:00
Kolja
9c25217b08
animated wireless card (#1942) 2025-10-01 18:55:47 -05:00
Pyritie
af9ca62bd9 assets and recipes for new wireless card! 2025-10-01 23:38:13 +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
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
GameStar
933cb23fc5
Some more blocks for cooling tower (#1923)
* yes

* yes

* some stuff

* blocks
2025-09-28 14:05:55 -05:00