Commit graph

5272 commits

Author SHA1 Message Date
Pyritie
82c83faace pakku updates 2025-10-12 17:46:57 +01:00
Pyritie
56d8103f2d glacio/europa marker 2025-10-12 13:14:51 +01:00
Pyritie
27ba858aa6 changed icon set for potin to make it more visually distinct from wrought iron 2025-10-12 13:14:43 +01:00
Pyritie
9a0c1d9f9c changelog 2025-10-12 02:38:20 +01:00
Pyritie
bbcd2d0350 water wheel whitelists 2025-10-12 02:32:41 +01:00
Pyritie
2ce68145bf langs 2025-10-12 02:32:35 +01:00
Pyritie
14e1ff4e8e water wheel adjustments 2025-10-12 02:32:25 +01:00
Pyritie
48dc6804ce remove extra goober/springling loot 2025-10-12 02:18:44 +01:00
Pyritie
6722af3f16 thorium coloring 2025-10-12 02:18:35 +01:00
Pyritie
49b290772c dinosaur nest structures! 2025-10-12 02:10:27 +01:00
Pyritie
095bce1626 removed raw rubber ingots (it keeps confusing people) 2025-10-12 02:04:29 +01:00
Pyritie
d8cce59b7e removed "raw" thorium metal so there's only ores and dusts left 2025-10-12 02:04:10 +01:00
Pyritie
5835322410 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-10-12 01:01:37 +01:00
Pyritie
92a47d7d1a egg 🥚🍳🦖🦕 2025-10-12 01:01:33 +01:00
dimethyl
3225500a67
Impure Dust Washing in Barrels (#2013)
* allow impure dust washing in barrels

* Update CHANGELOG.md

* Changed to using gregtech materials instead
2025-10-11 18:30:21 -05:00
Redeix
da4e4fbebf
reworked the rest of the alien meat textures (#2014) 2025-10-11 18:25:34 -05:00
Pyritie
c1d17780d8 langs 2025-10-11 22:53:18 +01:00
Pyritie
742955047c undo my previous crackrack mistake 2025-10-11 22:41:15 +01:00
Pyritie
05e54ce050 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-10-11 16:26:44 +01:00
Pyritie
aac5834912 also added lunchboxes 2025-10-11 16:26:42 +01:00
Pyritie
d915788cc8 added more super tanks/chests to the railgun blacklist 2025-10-11 16:25:58 +01:00
Jason Nash
744272a27f
add conveyor assembler recipe (#2007)
* add conveyor assembler recipe

* oopsie forgot the circuit

* maybe this one?
2025-10-11 10:18:37 -05:00
Pyritie
af4777a6bc merge 2025-10-11 00:04:03 +01:00
Pyritie
dc5af357d6 added glass dust -> lamp glass 2025-10-10 23:59:32 +01:00
Adrien Vidal
65edc16a92
Quartz + Create Stone Support (#2005)
+ Blackstone uniform model

Signed-off-by: Adrien Vidal <vidal.adrien2@gmail.com>
2025-10-10 22:23:43 +01:00
GameStar
3b9906ed6b
fixes stupid worm on server (#2006)
* Update pakku-lock.json

* my pakku wants to export the ftb stuff

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

---------

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
2025-10-10 20:40:02 +01:00
Redeix
69d8e68ef1
Meats and eats (#2001)
* meats and eats

* changelog and pt_br
2025-10-10 09:14:29 +01:00
Pyritie
9f530f8fb3 0.11.2 2025-10-09 20:08:40 +01:00
Pyritie
37e9f30013 cl 2025-10-09 19:55:03 +01:00
Pyritie
8bf6b8965c fix parallel hatch on fuel factory maximum 2025-10-09 19:53:51 +01:00
Pyritie
edd5ecd87b updated cn langs 2025-10-09 19:52:46 +01:00
GameStar
0020bf80c4
add auto craft card recipe (#1997)
Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
2025-10-09 12:58:26 -05:00
TomPlop
21935dccf6
Fix Fuel Factory requiring a Parallel Hatch (#1995)
Signed-off-by: TomPlop <tomdidome@gmail.com>
2025-10-09 18:27:33 +01:00
GameStar
280e57a3a7
Update CHANGELOG.md
Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
2025-10-08 22:11:22 -05:00
GameStar
2575918016
Fix all tfc:heating recipes being removed (#1988)
Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
2025-10-08 21:57:36 -05:00
dependabot[bot]
4615054c54
Bump softprops/action-gh-release in the dependencies group (#1969)
Bumps the dependencies group with 1 update: [softprops/action-gh-release](https://github.com/softprops/action-gh-release).


Updates `softprops/action-gh-release` from 2.3.3 to 2.3.4
- [Release notes](https://github.com/softprops/action-gh-release/releases)
- [Changelog](https://github.com/softprops/action-gh-release/blob/master/CHANGELOG.md)
- [Commits](https://github.com/softprops/action-gh-release/compare/v2.3.3...v2.3.4)

---
updated-dependencies:
- dependency-name: softprops/action-gh-release
  dependency-version: 2.3.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-10-09 04:05:42 +05:00
Pyritie
2557ad69c5
Merge branch 'main' into dev 2025-10-09 00:02:25 +01:00
Pyritie
180abcd610 0.11.1 cl 2025-10-08 23:57:08 +01:00
Pyritie
36f0dd07f9 pakku 2025-10-08 23:56:36 +01:00
Pyritie
bae24058c3 removing these just in case they're what's spawning the warrior 2025-10-08 23:56:29 +01:00
Pyritie
98a0bf9e18 changelog 2025-10-08 23:22:51 +01:00
Pyritie
1a815a129e added required data for new fission cooling 2025-10-08 23:22:24 +01:00
Pyritie
1b327bf83e something fishy is going on 2025-10-08 23:22:13 +01:00
Pyritie
0eea305e8e dino hp adjustments 2025-10-08 22:55:38 +01:00
Pyritie
9a628983aa Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-10-08 22:44:52 +01:00
Pyritie
2cf16acc29
Feature/space fauna (#1984)
* start of space fauna entry

* added 3

* pakku

* finished this
2025-10-08 22:44:40 +01:00
Pyritie
b03e7357c2 cl 2025-10-08 22:22:55 +01:00
TomPlop
ef1c220be0
Nerf fluorine cost for refrigerant pellet (#1983)
Signed-off-by: TomPlop <tomdidome@gmail.com>
2025-10-08 22:12:53 +01:00
Pyritie
da17861b90 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-10-08 21:25:04 +01:00
Pyritie
88885dd65c changelog 2025-10-08 21:25:01 +01:00