Commit graph

109 commits

Author SHA1 Message Date
Pyritie
8a46a01b7c Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2026-02-02 17:44:30 +00:00
TomPlop
928c7129aa
Heat battery (#2955)
* heat battery and tooltips

* Add tooltip back

* fix tooltip
2026-02-02 17:32:49 +00:00
Pyritie
b3f43feeb3 figured out how to do emissives finally 2026-02-02 16:34:11 +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
GameStar
8b1403031e
double rockets (#2910)
* first things

* yes

* legally distinct rockets

* Update tags.js

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

---------

Signed-off-by: Pyritie <pyritie@gmail.com>
Co-authored-by: Pyritie <pyritie@gmail.com>
2026-01-31 14:42:37 -06:00
Redeix
809bca72cf fix render type and changelog 2026-01-25 20:52:47 -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
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
Pyritie
75f0fc13ce fix vacuum engine intake model 2026-01-12 14:48:02 +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
48dff7e414 fix blockstate texture of steam fuser 2026-01-06 16:06:22 +00: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
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
Pyritie
546c598bc4 add item models for pills 2025-12-13 22:12:14 +00:00
Pyritie
22ed55306a electric greenhouse renderer 2025-12-13 18:11:56 +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
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
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
Pyritie
627ef389aa fix spawn eggs again 2025-10-13 23:07:24 +01:00
Pyritie
c2d6df8468 fixed spawn egg textures, added surfer/soarer 2025-10-13 19:11:14 +01:00
Pyritie
56d8103f2d glacio/europa marker 2025-10-12 13:14:51 +01:00
Redeix
69d8e68ef1
Meats and eats (#2001)
* meats and eats

* changelog and pt_br
2025-10-10 09:14:29 +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
Kolja
5d9aa258a8
fix wireless card (#1965)
Signed-off-by: Kolja <104643407+ko-lja@users.noreply.github.com>
2025-10-06 12:50:50 +01:00
Pyritie
a64614c7f1 item tag model for softwood 2025-10-05 19:23:32 +01: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
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
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
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
Pyritie
1a8172e27a added mars dirt path, moved mars dirt/grass blocks to java, fixed snowy variants and made the clay/kaolin blocks have proper connected textures 2025-09-28 18:00:31 +01:00
TomPlop
1f005c318e
Add textures to Nuclear Turbine (#1918)
* add evaporation tower and nuclear turbine

* Add textures for Nuclear Turbine
2025-09-28 13:31:21 +01:00
Pyritie
dd566d3820 goodbye, terrariums, you will be missed 2025-09-28 00:12:32 +01:00
GameStar
04fa4cd9db
cooling tower blocks (#1909) 2025-09-26 21:47:54 -05:00
Pyritie
e0fb68f842 what was I smoking 2025-09-26 23:06:56 +01:00
TomPlop
df86f11eb5
add evaporation tower and nuclear turbine (#1887) 2025-09-26 21:41:48 +01:00
Pyritie
09adc74719 different sugars tag icon 2025-09-22 18:17:33 +01:00
Pyritie
406277278f better icons for some tags 2025-09-22 18:04:56 +01:00
Pyritie
0b980344fc glacian trees! 2025-09-21 17:45:43 +01:00