Commit graph

796 commits

Author SHA1 Message Date
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
63a1f0de76 treeeeeeeeees 2025-08-12 12:37:19 +01:00
Pyritie
a07f70594d freeze dried mars fruit 2025-08-12 11:25:38 +01:00
Pyritie
41fc80fdd2 langs 2025-08-12 11:25:07 +01:00
Pyritie
5c25b1581a finally got these dumb models working 2025-08-12 10:53:52 +01:00
Pyritie
b38476aebb fixed item model positions 2025-08-12 00:53:51 +01:00
Pyritie
3b613c22d4 reverting these 2025-08-11 22:59:32 +01:00
Pyritie
a90f1c06ab langs 2025-08-11 22:59:21 +01:00
Pyritie
2bdb46c397 mars pumpkin pie + other tag stuff 2025-08-11 22:59:10 +01:00
Pyritie
b7abbd0f49 cave pumpkin pie + chunks 2025-08-11 21:07:26 +01:00
Pyritie
6253092e5d since everyone hates the copper sheet texture so much 2025-08-11 21:03:26 +01:00
Pyritie
6ce1abdcb9 oh, those don't render right 2025-08-11 21:02:59 +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
Pyritie
ce5db1446d updated primitive alloy patchouli page to reflect new alloy ratios 2025-08-10 21:54:57 +01:00
Pyritie
fcb50c2a49 missing item models for the wild ones 2025-08-10 21:22:12 +01:00
Pyritie
877653ad9b finished textures for the mars crops (except the greenhouse ones) 2025-08-10 20:59:20 +01:00
Pyritie
cf3e596905 mars farmland lang 2025-08-10 12:16:52 +01:00
Pyritie
90d26fb597 lang 2025-08-10 12:05:06 +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
f74316154d slightly buffed tree tap amounts 2025-08-10 02:13:26 +01:00
Pyritie
fbbfe31ba8 mars farmland stuff, also fixed nox berry EGH recipe 2025-08-09 23:57:45 +01:00
Pyritie
5a5c5040fd fixed dust secondary texture 2025-08-09 23:57:23 +01:00
Pyritie
44acd49485 added more icon sets for dusts and rods 2025-08-09 21:56:24 +01:00
Pyritie
3b9b80f52d lang updates 2025-08-09 15:47:43 +01:00
Gustavo
97a81e4989 update emi category order 2025-08-09 12:11:15 +10:00
Gustavo
1bc04a7a04 add EMI category lang key 2025-08-09 12:05:21 +10:00
Gustavo
68e3dc10bc change depth lang key 2025-08-09 11:48:06 +10:00
Gustavo
253414026d lang key update 2025-08-09 10:44:20 +10:00
Gustavo
0ff8d09856 add translation keys 2025-08-09 10:33:36 +10:00
Gustavo
26aad81bdd add missing ore item tags 2025-08-09 09:56:54 +10:00
Gustavo
7eda76d0c4 run lang merger 2025-08-09 08:30:27 +10:00
Redeix
be35e4e823
- railgun fanfare (#1557)
* - railgun fanfare

* updated changelog
2025-08-08 09:25:12 +01:00
Pyritie
0e9a56713b thanks pakku 2025-08-07 23:30:02 +01:00
Pyritie
7af3303fe9 rapeseed -> canola 2025-08-07 22:56:28 +01:00
Pyritie
c8f79aaa62 changelog, also added red granite knapping texture just cuz that's ugly to new players 2025-08-07 22:46:18 +01:00
Redeix
1c6fb19b76
- Railgun particles (#1547) 2025-08-07 09:37:39 +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
Redeix
140c5531b2
accumulator render fix (#1533)
* Fix colored steel recipe with Amp loss (#1517)

Signed-off-by: TomPlop <tomdidome@gmail.com>

* fix yeast starter from water giving too much

* 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

* fix #1518

* pakku

* updated size data

* bump gregtech version

* - crash fix

---------

Signed-off-by: TomPlop <tomdidome@gmail.com>
Co-authored-by: TomPlop <tomdidome@gmail.com>
Co-authored-by: Gustavo <ofoxsmith@outlook.com>
Co-authored-by: Pyritie <pyritie@gmail.com>
2025-08-05 11:54:24 -05: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
dc9e57c3bf langs 2025-08-05 11:23:55 +01:00
Redeix
af517e1721
quick crash fix (#1526) 2025-08-04 17:59:16 -05:00
Pyritie
305e10a976 fix #1518 2025-08-04 11:25:15 +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
Pyritie
eb6cd8080b langs, pakku 2025-08-03 12:55:23 +01:00
Redeix
705a48d659
- PBR textures (#1512)
* - PBR textures

* - updated changelog
2025-08-03 11:54:08 +01: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
Pyritie
1b01b244d9 merge 2025-08-02 18:52:31 +01:00
Pyritie
9c3c72907b EMI categories 2025-08-02 18:51:21 +01:00