Commit graph

4265 commits

Author SHA1 Message Date
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
TomPlop
feec2487ef
Fix infinite energy with Large Solar Arrays (#1563)
Signed-off-by: TomPlop <tomdidome@gmail.com>
2025-08-08 14:01:55 -05: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
Redeix
be35e4e823
- railgun fanfare (#1557)
* - railgun fanfare

* updated changelog
2025-08-08 09:25:12 +01:00
Pyritie
626bdb0de0 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-08-08 01:06:05 +01:00
Pyritie
0ea561e78e removed rotting from canola 2025-08-08 01:06:04 +01:00
Pyritie
308b14bcad
Merge branch 'main' into dev 2025-08-07 23:35:16 +01:00
Pyritie
0e9a56713b thanks pakku 2025-08-07 23:30:02 +01:00
Xikaro
b08b673070
Merge pull request #1551 from TerraFirmaGreg-Team/dev
Release: 0.10.6
2025-08-08 01:12:07 +03:00
Pyritie
e0d8be434e whoops this isn't done yet 2025-08-07 23:11:10 +01:00
Pyritie
9aa277a889 I know I'm going to get questions about this 2025-08-07 23:06:08 +01:00
Pyritie
2c173e209f pull the trigger, piglet 2025-08-07 23:02:08 +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
Pyritie
8c118d61f4 updated pakku 2025-08-07 22:35:53 +01:00
Pyritie
361cb69e59 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-08-07 22:35:02 +01:00
Pyritie
627efa9d57 ok found the right setting this time 2025-08-07 22:34:59 +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
Spicy Noodles
8c1aec9d30
Remove cinnabar to redstone recipe (#1548)
* Remove cinnabar to redstone recipe

* Changelog

---------

Co-authored-by: Gustavo <77560533+gustovafing@users.noreply.github.com>
2025-08-07 22:11:52 +10: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
Gustavo
696909486a Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-08-07 21:02:22 +10:00
Gustavo
52dfa01bb4 add missing tag to loose rock items 2025-08-07 21:02:20 +10:00
dependabot[bot]
15bad0ccb5
Bump roamingowl/template-output-with-eta in the dependencies group (#1527)
Bumps the dependencies group with 1 update: [roamingowl/template-output-with-eta](https://github.com/roamingowl/template-output-with-eta).


Updates `roamingowl/template-output-with-eta` from 1.12.0 to 1.13.0
- [Release notes](https://github.com/roamingowl/template-output-with-eta/releases)
- [Commits](https://github.com/roamingowl/template-output-with-eta/compare/v1.12.0...v1.13.0)

---
updated-dependencies:
- dependency-name: roamingowl/template-output-with-eta
  dependency-version: 1.13.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-08-07 12:56:02 +03: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
Gustavo
4327da326f Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-08-06 19:58:26 +10:00
Gustavo
c349aa4ad7 revert commit to actually put them in lang files 2025-08-06 19:58:21 +10:00
Gustavo
8f8d04b0d8 revert commit to actually put them in lang files 2025-08-06 19:57:51 +10:00
Gustavo
cdf57686ba rename extruder molds 2025-08-06 19:31:02 +10:00
Redeix
7a2c63d2d0
Update CHANGELOG.md
Signed-off-by: Redeix <brayden.j.m.ford@gmail.com>
2025-08-05 20:17:48 -05: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
33ff5ffcbf changelog 2025-08-05 11:45:13 +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