Commit graph

2112 commits

Author SHA1 Message Date
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
Gustavo
c349aa4ad7 revert commit to actually put them in lang files 2025-08-06 19:58:21 +10:00
Gustavo
cdf57686ba rename extruder molds 2025-08-06 19:31:02 +10: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
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
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
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
a3be818e8f updated size data 2025-08-04 12:46:14 +01: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
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
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
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
9c3c72907b EMI categories 2025-08-02 18:51:21 +01:00
Pyritie
73575f1ed3 langs 2025-08-02 18:51:08 +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
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
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
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
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
78e40b4369 regular thorium is now also radioactive 2025-08-02 14:22:39 +01:00
Pyritie
0e2114fea7 fixs #1506 2025-08-02 14:22:23 +01:00
Pyritie
a3b1fac817 changed the other thoriums to pink 2025-08-02 14:22:06 +01:00
Pyritie
760d4e5e0f fix #1491 2025-08-02 14:14:34 +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
Pyritie
5f187c605e added recipes for other kinds of train tracks 2025-08-02 12:19:53 +01:00