Commit graph

2978 commits

Author SHA1 Message Date
Redeix
fbc456723d
Fluid tag unification (#2194)
* eslint change

* utility scripts

* cleanup

* beaker fluid change
2025-11-09 18:22:17 +00:00
Pyritie
bcd423e824 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-11-09 18:08:20 +00:00
Pyritie
828a2f119d ore updates 2025-11-09 18:08:15 +00:00
GameStar
2e6d87a525 some bioline molecules 2025-11-09 00:51:20 -06:00
Redeix
7ee6ff2c04
bioline materials (#2191)
* materials

* lang

* materials

* utility linting

* data and linting

* lang
2025-11-08 03:40:26 -06:00
DI
324847ccde
Fix cannon.json (#2190)
Signed-off-by: DI <di.workbuis@gmail.com>
2025-11-08 02:44:47 -06:00
GameStar
8ba6243a2c tungstate correct color 2025-11-07 22:37:25 -06:00
Pyritie
52e81ba582 changing a lot of custom formulas to components for moldraw coloring 2025-11-08 02:38:14 +00:00
GameStar
f8376dee60
Surely this is the last one (#2186)
* om

* maddie told me they should be in ""

* adjusted some things

* more mol updates

* more adjustments

* surely I'm done

* Update pakku-lock.json

* Create moldraw.yaml

---------

Co-authored-by: Pyritie <pyritie@gmail.com>
2025-11-08 00:00:29 +00:00
Felix Gill
25dc829fdb
Update tags.js (#2172) 2025-11-07 14:44:25 -06:00
Pyritie
88835d932f big langs 2025-11-07 00:32:07 +00:00
Pyritie
e9f775791d fixed soup for realsies 2025-11-07 00:30:47 +00:00
Pyritie
693311ce59 vanilla stone bricks from stone "ingots" unification, some rearranging 2025-11-05 23:32:02 +00:00
Pyritie
28e9c59f85 fix #2169 2025-11-05 23:24:50 +00:00
Pyritie
dd537ea062 fixes #2159 2025-11-05 23:01:21 +00:00
Pyritie
ca23237e96 fixed the tag for cleanroom doors 2025-11-05 22:57:23 +00:00
Pyritie
15085607cb fixes #2091
Related Work Items: #20
2025-11-05 22:56:12 +00:00
GameStar
d8f8639ee3
more molecule stuff (#2166)
* om

* maddie told me they should be in ""

* adjusted some things

---------

Co-authored-by: Pyritie <pyritie@gmail.com>
2025-11-05 16:44:17 +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
theMegaTech
9ea490354f
add boots, recipe (#2161) 2025-11-04 15:13:18 -06:00
GameStar
1eea85dcb2
om (#2158) 2025-11-04 12:51:52 +00:00
theMegaTech
abbc815663
add tfc resistances to non-tfc armours (#2157)
Signed-off-by: theMegaTech <36931007+theMegaTech@users.noreply.github.com>
2025-11-03 18:37:53 -06:00
theMegaTech
160045f59a
Add the Heatproof set buff to Blue Steel Boots (#2155)
* make normal (non-diving) blue steel armour be a possible part of the blue steel set

Signed-off-by: theMegaTech <36931007+theMegaTech@users.noreply.github.com>

* Add the tooltip to reflect new behavior

i hope i did this right

Signed-off-by: theMegaTech <36931007+theMegaTech@users.noreply.github.com>

---------

Signed-off-by: theMegaTech <36931007+theMegaTech@users.noreply.github.com>
2025-11-03 17:47:02 -06: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
Pyritie
4982a02519 langs 2025-11-01 13:24:10 +00:00
Pyritie
92ab8fd320 also hide vanilla tipped arrow crafting recipes 2025-11-01 00:04:14 +00:00
Pyritie
eb211cfb2e added applied ammo box to pakku and hid its original recipes via emi since kjs seems to be having trouble with it 2025-10-31 23:55:55 +00:00
Pyritie
07268f8bef fixed the HV aqueous accumulator water recipe so it actually works in an HV machine 2025-10-31 23:32:09 +00:00
Pyritie
b1da4adad6 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-10-30 23:00:58 +00:00
Pyritie
f51861c4c9 oops missed the fission recipe call 2025-10-30 22:14:41 +00:00
Pyritie
4335ecf066 remove leftover mech press -> curving press conversion recipe 2025-10-30 15:20:38 +00:00
GameStar
64d28c7efd
Tweak the spawn of tfg earth crops (#2125)
* this was broken I guess

* tweak these so they are a little less

idk they still seem to spawn everywhere lol

* these are better lol

* is this not in tools?
2025-10-29 22:46:00 -05:00
theMegaTech
9479e23309
syrup buff (#2126)
* tapping recipes

Signed-off-by: theMegaTech <36931007+theMegaTech@users.noreply.github.com>

* update the field guide

Signed-off-by: theMegaTech <36931007+theMegaTech@users.noreply.github.com>

---------

Signed-off-by: theMegaTech <36931007+theMegaTech@users.noreply.github.com>
2025-10-29 22:44:52 -05:00
TomPlop
f2b15b18ed
Fixes for 0.11.6 (#2123)
* Casings and nerf apt

* Change Rotor Holder recipes

* nerf refrigerant pellet duration
2025-10-29 22:44:32 +00:00
Pyritie
4e7438b8ff emi categories 2025-10-29 13:10:03 +00:00
Pyritie
1883aa824f langs 2025-10-29 13:09:21 +00:00
GameStar
1a3e868f69
fixing graphite frame block interaction (#2122)
* Update events.js

* Update CHANGELOG.md

* Update CHANGELOG.md
2025-10-29 13:07:25 +00:00
Pyritie
9835c25113 adjust mars sand intensity 2025-10-28 20:09:10 +00:00
Pyritie
7cf97960d9 fix bulbkin plants not dropping seeds 2025-10-28 19:50:50 +00:00
Pyritie
f833fbb456 made a couple more foods allowable in meal bags 2025-10-28 19:43:42 +00:00
Pyritie
04e195890d never mind, it's not fixed, because of some weird tag issue 2025-10-28 18:20:43 +00:00
Pyritie
68ca4775ba aged alcohol update, pakku 2025-10-28 17:23:19 +00:00
Xtrial-01
a07c9acd75
Few quick bug fixes (#1999, #2111 and #2112) (#2119)
* T2 Rocket Alloy ABS recipes

Adds Alloy Blast Smelter recipe for t2 rocket alloy and Vacuum Freezer recipe for cooling molten t2 rocket alloy.

* #2111 Fix

Changes salves recipes from Aminophenol to Phenol

* #2112 Fix

Adds cobalt brass wrench to "Tools of the Trade" quest smart filter

* #1999 Fix

Adds assembler recipes for converting item busses to railgun item busses

* recipes.space.js optimization

---------

Co-authored-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
Co-authored-by: Pyritie <pyritie@gmail.com>
2025-10-28 12:02:22 -05:00
Pyritie
b9932777ce Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-10-28 13:54:52 +00:00
Pyritie
0ecd6fbed1 don't need recipes to use the canner, it can already do that 2025-10-28 13:54:49 +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
Xtrial-01
8983acfd2a
T2 Rocket Alloy ABS recipes (#2109)
Adds Alloy Blast Smelter recipe for t2 rocket alloy and Vacuum Freezer recipe for cooling molten t2 rocket alloy.

Co-authored-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
2025-10-27 19:06:16 -05:00
Pyritie
2a2d2da626 added normal tfc bowl dough recipes 2025-10-27 21:39:28 +00:00
Pyritie
84387af048 fixed some recycling tag issues 2025-10-26 18:09:53 +00:00