Commit graph

284 commits

Author SHA1 Message Date
Pyritie
ffcc45475e #1625 and #1623
Related Work Items: #16, #1625
2025-08-14 20:51:36 +01:00
Pyritie
5ad5a6c892 buffed EGH sapling amount 2025-08-14 20:35:38 +01:00
Pyritie
7ae68a1636 unification with pumpkin pie stuff 2025-08-13 23:17:33 +01:00
Pyritie
365fe1e5ca moved golden apples to the food processor 2025-08-13 23:08:01 +01:00
GameStar
848dc99bf8
some modpack cleanup from glacian ram/sniffer (#1617)
* whitespace changes

* some animal compat

* snifferified recipes

* nest box recipe
2025-08-13 11:06:50 -05:00
Zippity
7fb821dae9
fix sharp tools not taking damage when cutting grass (#1614)
Co-authored-by: Redeix <brayden.j.m.ford@gmail.com>
2025-08-12 17:14:44 -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
Pyritie
b2a96fa67f use the same crimson/warped tree feature for old growth ones too 2025-08-12 12:49:39 +01:00
Pyritie
b676b5f5b4 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-08-12 12:37:22 +01:00
Pyritie
63a1f0de76 treeeeeeeeees 2025-08-12 12:37:19 +01:00
Pyritie
a07f70594d freeze dried mars fruit 2025-08-12 11:25:38 +01:00
TomPlop
1cb918ee35
Fix soy bean (#1608)
Signed-off-by: TomPlop <tomdidome@gmail.com>
2025-08-12 10:49:49 +01:00
Pyritie
2bdb46c397 mars pumpkin pie + other tag stuff 2025-08-11 22:59:10 +01:00
Pyritie
35a84dde36 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-08-11 20:58:20 +01:00
Pyritie
0349729547 mars crop greenhouse textures 2025-08-11 20:46:36 +01:00
Redeix
4a0603cec2
prospecting rework (#1594)
* prospecting rework

* changelog
2025-08-11 11:28:45 +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
Pyritie
fc0c62f77c added create packages/jars to the railgun blacklist 2025-08-09 14:12:36 +01:00
Pyritie
e53dcf2ea6 biomass and fish oil buffs, added sodium hydroxide to biodiesel from seed oil 2025-08-09 01:18:14 +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
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
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
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
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
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
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
9ae18130ed fix olive food processor conflict, fix pumpkin chunk duplicate recipe 2025-08-02 15:35:16 +01:00
Pyritie
1aaa124013 kubejs-tfc updates, pakku 2025-08-02 14:03:35 +01:00
Redeix
ed7d65e13f
-Fixed universal compost recipes (#1507) 2025-08-02 11:31:26 +01:00
Redeix
ac0de215f5
Receiver changes (#1498) 2025-08-01 09:22:23 +01:00
Pyritie
c091589136 I think this is a typo? 2025-07-31 23:32:52 +01:00
Pyritie
8fde397749 started filling out this anti-railgun tag 2025-07-31 23:32:42 +01:00
Pyritie
0fb1c66006 recipes for railgun machines + greenhouse 2025-07-31 23:32:33 +01:00