Commit graph

299 commits

Author SHA1 Message Date
Pyritie
d5974bf0c8 more tags 2026-02-03 13:03:27 +00:00
Pyritie
b1ec5ad5b4 #2965 add tfg crop block colors 2026-02-03 13:03:19 +00:00
Pyritie
4516d9ce50 icon set changes 2026-02-03 12:57:42 +00:00
Pyritie
c9b6fbe65f things endermen can pick up and move around 2026-02-03 12:36:12 +00:00
Pyritie
e7beb2763c 0.11.19 2026-02-03 12:02:46 +00:00
Pyritie
260851074c
Feature/venus stone ores (#2961)
* langs

* fix veins

* missing knapping textures

* rename ignimbrite features

* new ores

* feature stuff

* entity tweaks
2026-02-02 23:42:42 +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
3c6b79adc9 fix wrong gurman tags 2026-02-02 15:23:37 +00:00
Pyritie
19bf4de976 gurman update 2026-02-02 14:54:21 +00:00
Pyritie
a74407c10c tidy colors and isotopes 2026-02-01 19:02:40 +00:00
Pyritie
849f6409d5 Merge branch 'dev' into feature/wab-1.4 2026-02-01 17:37:25 +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
Pyritie
34c4bb5fb4 stuff and things 2026-01-31 18:50:46 +00:00
Madeline Vergani
e32a797368
Noodle and Cereal Box icon sets (#2875)
* Create a new material icon set `noodle` and give it to vanadium

* Create the `cereal_box` material set for ostrum

* Make Osmium Iodide be a cereal box

* Add a model for radioactive hot ingots
2026-01-27 15:01:05 -06:00
Pyritie
f324e7e6da
New content for ULV + LV (#2873)
* require black steel plates before the forge hammer, add some blue steel things post-deployer that require a colored steel anvil, start refractory clay dust

* first draft of bakelite, new phenolic boards, new cupro coils

* add another page to the medicine quest

* cl

* backup of lv quests

* quest stuff and some recipe tweaks

* tweak

---------

Co-authored-by: Redeix <redeix.m@gmail.com>
2026-01-26 18:10:22 -06:00
Pyritie
91f41fc8d7 does this fix music? 2026-01-25 18:57:38 +00:00
Pyritie
e9e6530a61 fix large miners and deepslate/red granite loot tables 2026-01-24 15:27:11 +00:00
Pyritie
8d17dca5c6 move saltpeter chem reactor to a circuit 2026-01-23 21:12:18 +00:00
Pyritie
53ab136758 add create stock bridge, add missing recipes for certus/fluix deco blocks 2026-01-23 01:43:41 +00:00
Pyritie
1e42ed442a
. (#2796) 2026-01-21 22:40:31 +00:00
Pyritie
f93e33ab8e fix pitcher plants and torchflowers self destructing on mars 2026-01-21 22:36:54 +00: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
Mqrius
d1f1ff212b Add space foods to tfc:foods 2026-01-18 23:34:31 +01:00
Pyritie
2e10938e1c
Refactor of material recipes (#2732)
* refactor

* phew

* drive-by fix

* all done I think

* cleaned up some lines that didn't do anything, added more comments, removed log spam
2026-01-14 21:36:52 +00:00
Pyritie
75f0fc13ce fix vacuum engine intake model 2026-01-12 14:48:02 +00:00
Pyritie
9870970c89 fix #2714 2026-01-12 13:44:45 +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
012da662f2 fix some mars plants self-destructing 2026-01-10 21:31:20 +00:00
Pyritie
a6ec313d09 blossom berry counts as a flower for bees 2026-01-10 20:39:16 +00:00
Mqrius
5985f389b2
Give Mars tree leaves distance property (#2661)
* Make TFG copies of Mars foliage
They still return the original items.

* Change strophar supports to match item color

* Change soundType to shroomlight

---------

Co-authored-by: Xikaro <os.valerievich@ya.ru>
2026-01-08 16:25:19 -06:00
Pyritie
fd663208f5 improve tfg casting mold tags 2026-01-06 12:08:30 +00:00
Pyritie
e57e1cff59 fix some warnings 2026-01-05 12:28:57 +00:00
Pyritie
2a00a4b4c6 venus 2026-01-03 16:46:56 +00:00
Pyritie
0ed3d48dd9 fix being able to put wrong metals into the new fire clay molds 2026-01-02 20:06:43 +00:00
The Compendium System / The Atlassian Collective
5b60f268cf
glowstone and lamp balancing (#2581)
* glowstone and lamp balancing

* moved glowstone thingies

* fix evil glowstone recipes

* make tungsten thingy have a liquid form

* evil bronze recipes

* fixed ratios (I'm a little special ok)

* fixed ratios electric boogalo

* deleted weird red alloy recipe + fixed abs temps

* fixed ratios electrocution boogalo

---------

Co-authored-by: Redeix <brayden.j.m.ford@gmail.com>
2026-01-01 22:45:16 -06: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
Jean Roberto de Souza
41f1e063e8
Change small gear mold capacity from 288 to 144 (#2544)
This will fix the issue #2543, were small gears used double the intended value.

Signed-off-by: Jean Roberto de Souza <81846511+JeanRdSz@users.noreply.github.com>
2025-12-29 18:10:37 +00:00
Pyritie
a69b5827cb tweak gas fuel temps more 2025-12-28 11:08:46 +00:00
Pyritie
65b9083aad lower the temp of new gas fuels 2025-12-28 10:19:16 +00:00
Pyritie
2bdabbfc54 exposure mod overhaul 2025-12-27 21:37:51 +00:00
Pyritie
cc31e49b6c langs, and cleanup propylene 2025-12-27 00:23:12 +00:00
Pyritie
9e27221791 #809 finally got around to changing loose to cobble 2025-12-26 22:17:05 +00:00
Pyritie
4406eef411 add trooper? and tweak beneath sounds 2025-12-25 13:36:21 +00:00
Pyritie
d3adf40927 ambient sounds adjustments, I think it works better with tfc now? still not perfect but it's never going to be 2025-12-24 13:32:41 +00:00
Pyritie
a7dcafad78 finally, sounds! 2025-12-24 12:12:06 +00:00
Pyritie
74a22fd9c9 add hydralux and some ambient sounds 2025-12-22 01:43:49 +00:00
Pyritie
bbd0dbd947 adding thermal vents, sulfur blobs and crystals 2025-12-21 23:47:03 +00:00
Pyritie
7c96161bd7 fixed mars saplings and glacian logs missing map color 2025-12-21 17:44:22 +00:00