Commit graph

690 commits

Author SHA1 Message Date
Pyritie
2f90e7ad2b Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2026-01-21 23:30:20 +00:00
Pyritie
48d2e0b479 delete sylvite 2026-01-21 23:30:13 +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
0c146a673f buff mars greenhouses so they output the same amount of logs as earth trees 2026-01-21 22:22:40 +00:00
Pyritie
6c9418949f fix casting into ingot molds #2794 #2789 2026-01-21 22:00:07 +00:00
thederpysockdude123
fd76389591
re-added glass dust recipe for glass tubes (#2795)
Signed-off-by: thederpysockdude123 <thederpysockdude123@gmail.com>
2026-01-21 21:16:25 +00:00
Redeix
8ea2c45d77 Merge remote-tracking branch 'origin/dev' into dev 2026-01-21 00:35:35 -06:00
Redeix
682788970c pisciculture rebalance 2026-01-21 00:35:11 -06:00
Pyritie
dcd5e8be5f fix timing with forming press compared to bender 2026-01-20 16:12:21 +00:00
Pyritie
c3d2b5df64 quartz autoclave consistency 2026-01-20 12:54:47 +00:00
Pyritie
bba55fdd3f move all the rubber/latex-related recipes into one file, removed mixer vulcanized latex recipe, buffed fluid solidifier sticky resin recipe 2026-01-20 12:38:51 +00:00
Pyritie
36a9dc5099 add anthracite as boiler fuel, add more items to the grain tag for soups #2785 2026-01-20 11:38:46 +00:00
Pyritie
5595cf6899 fix merge issue? 2026-01-19 23:46:08 +00:00
Pyritie
653583e39b #2773
Related Work Items: #277
2026-01-19 23:26:37 +00:00
Pyritie
69cde26b65 reduced required rpm for the VI centrifuge because it works badly on low tps servers 2026-01-19 23:23:22 +00:00
Pyritie
c67320ffae merge 2026-01-19 23:06:32 +00:00
Pyritie
46b74fb19b change fish machine to require EV circuits, move the quest 2026-01-19 22:52:49 +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
Pyritie
88eee093be #2740 and #2759 2026-01-19 22:21:06 +00:00
Pyritie
7df74b47b3 fixed recycling issues from the material rewrite, updated everything to the new recycling helper method 2026-01-18 14:30:55 +00:00
Pyritie
f02c40fc99 disable electrolsis of clay this way instead 2026-01-17 11:54:53 +00:00
Pyritie
e3a365fa84 who is peat and why does he have a use? 2026-01-15 22:58:10 +00:00
Pyritie
91c65c75f7 added wrapped locometal to facades #2726 2026-01-14 22:43:58 +00:00
Pyritie
9df19277c6 bloomery update 2026-01-14 22:37:22 +00:00
Pyritie
cff9ab16f1 add portable cells and drums to the railgun blacklist 2026-01-14 21:58:30 +00: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
e9506d17d0 added some uses to mars charnia, to mirror kelp 2026-01-13 17:33:51 +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
Pyritie
241b80a4a0 migrate everything over to linuxUnfucker() 2026-01-12 15:32:18 +00:00
Pyritie
8026bfed69 reduce frequency of wolf sounds at night, make crickets etc look for grass plants instead of grass blocks #2680 2026-01-12 13:56:51 +00:00
Pyritie
9870970c89 fix #2714 2026-01-12 13:44:45 +00:00
Inceitious
882c477037
Feature/drinkable (#2708)
* Drinkable ice slush

* Update thirst value

* Added quests

* Edited some text

* a

---------

Co-authored-by: Redeix <redeix.m@gmail.com>
2026-01-11 13:48:11 -06: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
277f8b8973 actually the bee is from firmalife 2026-01-10 20:46:39 +00:00
Pyritie
05fc0aa6f6 bees ignore gravity in space 2026-01-10 20:10:06 +00:00
Pyritie
8b28f2d652 pizza unification 2026-01-10 00:39:38 +00:00
Pyritie
8562c8a195 I think this is less confusing 2026-01-10 00:17:58 +00:00
jurjen909
b3f1308fdf
Inconsistency fix at recipes.coal.js (#2688)
* Inconsistency fix at recipes.coal.js

Removed duplicate gtceu:raw_coal recipe with an odd time of 1710 ticks.
Changed recipe duration to reflect how many Coke is being made (ie 4x coke = 4x the base of 900 ticks, 45 seconds)
Changed tfc:poor_raw_coal recipe input to 1x tfc:poor_raw_coal instead of 2x tfc:poor_raw_coal to reflect the amount of Coal a piece or Poor Raw gives in a furnace.

* Update recipes.coal.js

Reverted recipe duration changes back to 900 ticks for the raw coal items in the Coke oven.
Removed redundant "1x" input in poor_raw_coal recipe.

Signed-off-by: jurjen909 <jurjen909@ziggo.nl>

---------

Signed-off-by: jurjen909 <jurjen909@ziggo.nl>
2026-01-09 14:49:29 -06:00
Jean Roberto de Souza
5bc2d12bfd
Add vinegar as option for curdled milk crafting (#2675)
* Add vinegar as option for curdled milk crafting

This adds an earlier way to make cheese without relying on acetic acid. As vinegar is partially composed of acetic acid, and the recipe for homemade cheese using vinegar is realistic, that would be an useful and accurate recipe.

Signed-off-by: Jean Roberto de Souza <81846511+JeanRdSz@users.noreply.github.com>

* Update vinegar input and output for lactose milk recipe

Signed-off-by: Jean Roberto de Souza <81846511+JeanRdSz@users.noreply.github.com>

---------

Signed-off-by: Jean Roberto de Souza <81846511+JeanRdSz@users.noreply.github.com>
2026-01-09 02:26:08 -06: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
thederpysockdude123
4bfcd6f7d4
removed sandworm spawning in the vanilla Minecraft desert biome (#2662)
Signed-off-by: thederpysockdude123 <thederpysockdude123@gmail.com>
2026-01-07 18:45:52 -06:00
Pyritie
c2503e6b0f update russian field guide ores + langs 2026-01-07 00:27:44 +00:00
Pyritie
588eaf8940 removing this reflector block recipe because people keep getting tripped up on it 2026-01-06 20:28:53 +00:00
Pyritie
b3a5b1ddef steam boilers for mars 2026-01-06 16:06:34 +00:00
Pyritie
0eb939f09d some tiny changes 2026-01-06 15:17:59 +00: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
2e6f78845c add recipe to make unrefined paper with the helve #2621 2026-01-05 12:13:51 +00:00