Commit graph

63 commits

Author SHA1 Message Date
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
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
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
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
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
56d8103f2d glacio/europa marker 2025-10-12 13:14:51 +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
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
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
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
TomPlop
df86f11eb5
add evaporation tower and nuclear turbine (#1887) 2025-09-26 21:41:48 +01:00
Pyritie
0b980344fc glacian trees! 2025-09-21 17:45:43 +01:00
Adrien Vidal
96188e761d
TFG-fication of all exotic stone types (#1764)
* Deepslate, Blackstone and Dripstone + hammer crushing refactor

* crackrack and space stones

* tags + stonecutting + fixes

* Moon deepslate set + QoL recipes + tags fixes

* pyroxenite tags

* Update tags.js

* Update constants.js

* Update constants.js

---------

Signed-off-by: Pyritie <pyritie@gmail.com>
Co-authored-by: Pyritie <pyritie@gmail.com>
2025-09-09 00:16:27 +01:00
Pyritie
521fc19ce5 spike cleanup 2025-09-08 16:54:35 +01:00
Pyritie
bf192d1390 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-09-03 22:16:05 +01:00
Pyritie
ede77ef950 textures for mars twigs, fixed models for saplings, some tags 2025-09-03 22:16:02 +01:00
Redeix
957da2cbba
bioreactor stuff (#1742)
* bioreactor stuff

* Update recipes.js

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

---------

Signed-off-by: Redeix <brayden.j.m.ford@gmail.com>
2025-09-03 11:56:36 -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
Pyritie
6bdff96aee fix sangnum clay block texture 2025-08-26 01:42:16 +01:00
Pyritie
5bec53e7cd spice stuff! 2025-08-26 00:00:43 +01:00
Pyritie
c5082530e1 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-08-25 21:56:39 +01:00
Pyritie
c8d20c30ae new clay/kaolin clay blocks 2025-08-25 21:56:36 +01:00
GameStar
5fb7ef9093
more mars entity stuff (#1697)
* stuff

* Create wraptor.json

* Update tags.js

* fix wool

* eggs

* Update constants.js

* more recipe stuff

* doing tooltips the correct way

* oops

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

---------

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
2025-08-25 21:18:46 +01:00
Pyritie
fea8530ada added higher tier greg machines 2025-08-22 00:17:27 +01:00
Redeix
2f4b9fa954
Feature/quick fixes (#1664)
* Some reflector block fixes

* Trim tool changes

* Added rose gold alloy smelter recipes
2025-08-21 02:33:46 -05: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
Redeix
2c5658a185
Reflector block and some other fixes (#1575)
* Reflector block and some other fixes

* Updated Changelog
2025-08-10 11:39:10 +01:00
Pyritie
fbbfe31ba8 mars farmland stuff, also fixed nox berry EGH recipe 2025-08-09 23:57:45 +01:00
Redeix
be35e4e823
- railgun fanfare (#1557)
* - railgun fanfare

* updated changelog
2025-08-08 09:25:12 +01:00
Redeix
140c5531b2
accumulator render fix (#1533)
* Fix colored steel recipe with Amp loss (#1517)

Signed-off-by: TomPlop <tomdidome@gmail.com>

* fix yeast starter from water giving too much

* Feature/mars rock layers (#1519)

* moving to real tfc rock layers!

* thanks git

* git pls

* that's a good start for the mars rock layer stuff now

* langs, some desert block height tweaks

* mars water fog color

* forgot to convert back from hex to dec

* fix #1518

* pakku

* updated size data

* bump gregtech version

* - crash fix

---------

Signed-off-by: TomPlop <tomdidome@gmail.com>
Co-authored-by: TomPlop <tomdidome@gmail.com>
Co-authored-by: Gustavo <ofoxsmith@outlook.com>
Co-authored-by: Pyritie <pyritie@gmail.com>
2025-08-05 11:54:24 -05:00
Redeix
af517e1721
quick crash fix (#1526) 2025-08-04 17:59:16 -05:00
Redeix
2d6edff7ea
-Receiver casing fix and large solar panel tiers (#1505) 2025-08-02 11:29:52 +01:00
Redeix
ac0de215f5
Receiver changes (#1498) 2025-08-01 09:22:23 +01:00
Redeix
ee3877b07a
Final render fixes (#1489) 2025-07-31 10:23:00 +01:00
Pyritie
22af9eda3e gregnant man emoji 2025-07-28 23:10:23 +01:00
Redeix
9d2e5518a7
More multiblock fixes (#1470)
* Casing recipe changes

* Render fixes for greenhouse and railgun controllers
2025-07-28 10:10:11 +01:00