Commit graph

514 commits

Author SHA1 Message Date
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
Pyritie
73575f1ed3 langs 2025-08-02 18:51:08 +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
6e860ccb52 langs 2025-08-02 17:32:29 +01:00
Pyritie
a44ed97c43 item tag models for composts 2025-08-02 17:31:54 +01:00
Pyritie
6f8c6cb172 mars water bucket, langs 2025-08-02 16:24:38 +01:00
Pyritie
7cbdf75a5f circuit tag models! 2025-08-02 16:11:12 +01:00
Pyritie
1aaa124013 kubejs-tfc updates, pakku 2025-08-02 14:03:35 +01:00
Pyritie
9a6c760fcc merge 2025-08-02 12:21:21 +01:00
Pyritie
1e34e098bb langs + cl 2025-08-02 12:20:13 +01:00
Redeix
2d6edff7ea
-Receiver casing fix and large solar panel tiers (#1505) 2025-08-02 11:29:52 +01:00
Pyritie
6eaf69b4be changelog 2025-08-01 23:20:16 +01:00
Pyritie
937b2ac3cd
tfc invar (#1502) 2025-08-01 23:06:38 +01:00
Pyritie
e22ea96353 ukranian langs 2025-08-01 21:35:11 +01:00
Redeix
ac0de215f5
Receiver changes (#1498) 2025-08-01 09:22:23 +01:00
Pyritie
246b1ad94e langs 2025-07-31 21:59:23 +01:00
Pyritie
db967e8ac9 who up tweakin they mars crops 2025-07-31 21:07:38 +01:00
Redeix
a09105a1ba
Universal Compost Textures (#1492) 2025-07-31 12:23:30 -05:00
Pyritie
6700a6022e more mars crop stuff 2025-07-31 12:49:35 +01:00
Pyritie
ed168a68d5 mars crop stuff 2025-07-31 12:25:53 +01:00
Redeix
ee3877b07a
Final render fixes (#1489) 2025-07-31 10:23:00 +01:00
Pyritie
077190e902 initial commit for mars crops 2025-07-31 00:53:53 +01:00
Pyritie
6a07c804fc Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-07-30 22:18:35 +01:00
Pyritie
8a0f09b267 mars plant tweaks 2025-07-30 22:18:34 +01:00
GameStar
125efd9ac1
Feature/tier3 rocket (#1483)
* stuff for rocket

* worm

* Revert "worm"

This reverts commit fa2f0fc74727a7c7f15cbaae2365b8147b2e9313.

* Update blocks.js

* rocket stuff

* Update constants.js

* More

* final stuff

* probably disalbed everything

* Delete options.txt

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

* Delete kubejs/startup_scripts/tfg/elements.js

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

* dry ice change

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

* vacuum freezer change

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

---------

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
2025-07-30 20:33:50 +01:00
Pyritie
0a0d793490 mars plants cleanup 2025-07-30 13:04:23 +01:00
Pyritie
b026feb2e8 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-07-29 18:02:01 +01:00
Pyritie
ed8bb14822 EMI categories for the new fission machines 2025-07-29 17:43:34 +01:00
Nebby
cc4f15d6f7
Improved Etched Accessibility (#1473)
* Feature.

* I did not forget about the changelog this time.

* Comply with Review

---------

Signed-off-by: Pyritie <pyritie@gmail.com>
Co-authored-by: Pyritie <pyritie@gmail.com>
2025-07-29 16:30:57 +01:00
Pyritie
da865ae6f1 model fixes, and now you can place the ad astra mushrooms on dirt again 2025-07-29 00:16:29 +01:00
Pyritie
bea7603db6 langs 2025-07-28 23:59:03 +01:00
Pyritie
9d305664ce does this work? 2025-07-28 23:52:42 +01:00
Pyritie
87f9d0cf6d
More Better End plants (#1471)
* github pls

* add initial textures + blockstates

* models

* started writing up the blocks

* model adjustments, added item models and textures

* cleanup

* git moment
2025-07-28 23:33:10 +01:00