Commit graph

1376 commits

Author SHA1 Message Date
Pyritie
e53dcf2ea6 biomass and fish oil buffs, added sodium hydroxide to biodiesel from seed oil 2025-08-09 01:18:14 +01:00
Pyritie
1bea67bb09 cleaned up the red alloy recipes, also fixed #1565 2025-08-09 00:47:58 +01:00
Pyritie
b0608183e9 fixes not being able to quern hardwood/softwood, removed strophar/aeronos caps from the log tag 2025-08-09 00:34:06 +01:00
Pyritie
4664e60a98 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-08-08 23:43:06 +01:00
Pyritie
f992705780 added chalk knapping recipes for lower durability chalk items #1562 2025-08-08 23:43:00 +01:00
Gustavo
ec64419623 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-08-09 08:30:29 +10:00
Gustavo
7eda76d0c4 run lang merger 2025-08-09 08:30:27 +10:00
TomPlop
966f4f000c
Fix Pyrolyse Oven accepting other ender pearls (#1567)
You should have to make an Implosion Compressor and not skip by killing Enderman

Signed-off-by: TomPlop <tomdidome@gmail.com>
2025-08-08 23:09:24 +01:00
Pyritie
18919ae833 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-08-08 20:37:08 +01:00
TomPlop
d29c254dc4
Fix EHG for Logs and reduce cost by half (#1564)
Signed-off-by: TomPlop <tomdidome@gmail.com>
2025-08-08 14:23:38 -05:00
Pyritie
f9abebb03b Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-08-08 20:20:53 +01:00
Pyritie
cce674098d changed basin to cast iron ingots so you can actually use the mech press in the bronze age 2025-08-08 20:20:48 +01:00
Pyritie
125a6fc293 once again I break the modpack by committing on my lunch break, thanks krazh 2025-08-08 17:24:50 +01:00
Pyritie
6f7ad3bf48 fixes #1559 2025-08-08 12:46:40 +01:00
Pyritie
65090aa58e fixed moon log spam 2025-08-08 12:40:13 +01:00
Pyritie
f3bfbf6285 fixed aqueous accumulator 2025-08-08 12:36:50 +01:00
Pyritie
0ea561e78e removed rotting from canola 2025-08-08 01:06:04 +01:00
TomPlop
e4a9c2de6b
Rework of all resins (#1550)
* Rework of the resins done

* Fix wood gas
2025-08-07 20:46:50 +01:00
Pyritie
7210213f1f let's try that again 2025-08-07 13:02:03 +01:00
Pyritie
bfaad34f2d merge 2025-08-07 13:01:29 +01:00
Pyritie
cc0c49643f removed dimension-specific AA water recipes 2025-08-07 13:00:34 +01:00
Pyritie
cbad72ecf8 added potin, cobalt, and cobalt brass as tfc metals, fixed ratios of tfc brass/bronze 2025-08-07 00:39:42 +01:00
dimethyl
b773887c45
Fix mining hammer bug (#1538)
Set correct sizes for mining hammers, wrenches, and spades

Co-authored-by: entropen1 <127608685+entropen1@users.noreply.github.com>
2025-08-06 11:12:41 +10:00
TomPlop
86c8a108e3
Fix circuit duplicate recipes (#1535)
We should try to avoid GTm circuits that are used for basic materials.

Mainly #4 and #6

Put everything on #11 so it says harmonized

Signed-off-by: TomPlop <tomdidome@gmail.com>
2025-08-06 00:47:49 +01:00
Gustavo
530c4382e2 add lv electric furnace multi smelter recipe 2025-08-06 09:47:29 +10:00
Pyritie
f99ce1f868 don't need these tags any more either 2025-08-06 00:42:32 +01:00
Pyritie
3dbb282ef4 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-08-06 00:40:31 +01:00
Pyritie
1dce4d76a4 fixed all the greate mess 2025-08-06 00:40:28 +01:00
GameStar
d6b0715c52
Adding stuff related to tree saps + minor fixes (#1531)
* tree juice changes

* fixed texture stretch

* glacian wool

* Update CHANGELOG.md

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

* oops

* Update glacian_wool.png

---------

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
2025-08-05 11:07:04 -05:00
Pyritie
b42479cd34 recipe for digger helmet wool lining 2025-08-05 14:52:01 +01:00
Pyritie
3df6032030 fix silk lining being hidden, fix crafting recipe consuming the needle 2025-08-05 14:13:43 +01:00
Pyritie
a2510f91de added a second EBF recipe but from LV furnaces 2025-08-05 11:50:49 +01:00
Pyritie
561be8c20c fixes missing moon chunk data, must've been a kjs-tfc change #1528 2025-08-05 11:44:41 +01:00
Pyritie
a3be818e8f updated size data 2025-08-04 12:46:14 +01:00
Pyritie
084c99db07
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
2025-08-04 11:22:18 +01:00
Gustavo
e978f798f7 fix yeast starter from water giving too much 2025-08-04 18:04:36 +10:00
TomPlop
42c85bc38f
Fix colored steel recipe with Amp loss (#1517)
Signed-off-by: TomPlop <tomdidome@gmail.com>
2025-08-03 18:21:07 -05:00
TomPlop
91e0d36fa0
Rework of Large Solar Array (#1511)
* Rework of Large Solar Array

* Add quests

* Fix Ad Astra to use the T1 photocell
2025-08-02 23:09:49 -05:00
Redeix
2cee1a2cdb
Baskets and fixes (#1510)
* - Added grape bushes to harvest basket tags

* - More LSP fixes

* - updated changelog
2025-08-02 15:24:23 -05:00
Pyritie
1b01b244d9 merge 2025-08-02 18:52:31 +01:00
Pyritie
1820e8256d solar panel stuff 2025-08-02 18:51:05 +01:00
GameStar
c68b78ce67
Updating guns & some bug fixes (#1501)
* new gun enables

* new modifiers

* lang

* adding data loaders

* ammo changes

* attachments

* new guns

* remove old

* updated create armorer

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

* new applied armorer

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

* I put the wrong one in 

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

* py's fixes

* adds sandworm mod

* Delete tacz/ULVguns.zip

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

* Add files via upload

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

* stuff

* more gun stuff

* bug fix for alabaster

* forgot to remove a log

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

* Update recipes.alabaster.js

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

* Update recipes.ammo.js

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

* updated alabaster to match chem bath recipes

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

---------

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
Signed-off-by: Pyritie <pyritie@gmail.com>
Co-authored-by: Pyritie <pyritie@gmail.com>
2025-08-02 18:18:40 +01:00
Pyritie
14bc503908 added tags to turn phantom silk into clothes too 2025-08-02 16:52:18 +01:00
Pyritie
3ed46ca8e6 added recipe for new digger helmet upgrade 2025-08-02 16:49:00 +01:00
Pyritie
b7e5710fd4 latex tweak 2025-08-02 15:43:23 +01:00
Pyritie
9ae18130ed fix olive food processor conflict, fix pumpkin chunk duplicate recipe 2025-08-02 15:35:16 +01:00
Pyritie
08a8e00914 added machine recipe for shears 2025-08-02 15:10:45 +01:00
Pyritie
ba20957a18 button unification (#1461), fixing beneath wood recipes 2025-08-02 15:10:39 +01:00
Pyritie
0e2114fea7 fixs #1506 2025-08-02 14:22:23 +01:00
Pyritie
760d4e5e0f fix #1491 2025-08-02 14:14:34 +01:00