Commit graph

3959 commits

Author SHA1 Message Date
Xikaro
123396b10b Update build.yml 2025-07-20 01:36:30 +05:00
Xikaro
8313499f2a Update build.yml 2025-07-20 01:34:09 +05:00
Xikaro
6724f4d9ac Update build.yml 2025-07-20 01:32:28 +05:00
Xikaro
ae8fd3f1b1 workflows 2025-07-20 01:22:41 +05:00
Pyritie
c4dce6bb99 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-07-19 21:21:16 +01:00
Pyritie
91ab7307d0 langs 2025-07-19 21:21:14 +01:00
Xikaro
ed3756bd5f Update CHANGELOG.md 2025-07-20 01:01:59 +05:00
TomPlop
3529de6be1
Fix #1373 and #1380 (#1385)
* Update quests and lang

* Changelog

* changelog

* fix conflict

* changelog

* Fix quest and add smooth stone
2025-07-19 19:59:04 +01:00
Pyritie
0523ff9a02 fix mushroom conflicting recipes 2025-07-19 19:43:09 +01:00
Pyritie
c8ac4fd7fd let's fucking go 2025-07-19 19:22:54 +01:00
Pyritie
15664c26ee update create-hypertubes and tfg-core 2025-07-19 18:36:02 +01:00
Pyritie
2104de2147 fixed bad merge 2025-07-19 18:32:30 +01:00
Pyritie
8044b18082 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-07-19 18:32:10 +01:00
Xikaro
85314b6c83 Update .gitignore 2025-07-19 22:29:45 +05:00
Xikaro
d071414716 config update 2025-07-19 22:15:40 +05:00
Pyritie
d2ec89f2b8 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-07-19 18:03:00 +01:00
Pyritie
eee7bc96f5 adding tfc-kjs's new chunk data provider 2025-07-19 18:02:50 +01:00
Pyritie
c84960c04a fixed glass dupe with lamps 2025-07-19 17:07:49 +01:00
Pyritie
16264c5783 no carvers allowed in the desert 2025-07-19 16:27:16 +01:00
Pyritie
c099daf52b added back vanilla red sand, started work on some tags, added mars deep desert biome 2025-07-19 16:20:15 +01:00
Pyritie
610fc45bf3 langs 2025-07-19 15:22:23 +01:00
Pyritie
557f7bbd5c added red granite ores 2025-07-19 15:18:25 +01:00
Redeix
d6f9e1770a
Title screen should now look good in all resolutions. (#1381)
* - Yeast recipe conflict fix

* - Fixed seed oil voiding in barrels. And item weight inconsistency.

* - Reduced loading screen logo size by 4MB

* - Update Changelog

* - Compressed loading screen images to maybe help with ram

* - Added default gui scale to make the main menu look better on first launch

* - Update Changelog

* - Added utility script for adding circuits to existing recipes

* fixed changelog conflict

Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>

* - Added harvest baskets

* - Fixed baked potato recipe mixing from oven

* - Allowed elytras to be repaired regardless of damage

* - Fixed sea water barrel recipe

* - Gave plants tags to bushes so they can have other uses

* - Pushed stubborn models

* - updated Changelog

* - Changelog typo

* - Integrated Ad Astra wood

* - Updated changelog

* - Treated chipboard composite barrel lang

* - Some Tacz fixes

* - Jar dupe fix

* - tacz data

* - updated changelog

* - we hate git

* - Loading screen and main menu optimizations

* - image push

* - I think I got the title screen looking good on all resolutions

* - Updated Changelog

* - Added scale fix to loading screen too

* - Fix pixel alignment

---------

Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>
Signed-off-by: Pyritie <pyritie@gmail.com>
Co-authored-by: Pyritie <pyritie@gmail.com>
2025-07-19 10:51:55 +01:00
GameStar
d068b91bae
Changed firmalife greenhouse to prevent exploits (#1371)
* Update tags.js

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

* Update tag_prefixes.js

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

* Update CHANGELOG.md

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

---------

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
2025-07-19 10:34:24 +01:00
Nebby
f323e46e22
Pink Thorium (#1378) 2025-07-19 01:42:14 +01:00
Pyritie
55b3e45697 I think gregtech uses these to say if something is a gas or liquid 2025-07-19 00:46:03 +01:00
Pyritie
c9b3168d0a typo 2025-07-19 00:44:35 +01:00
Pyritie
3c01fc1fa2 langs 2025-07-19 00:44:27 +01:00
Pyritie
4cb3248854 update balm, client tweaks, crafting tweaks, entity culling, fancymenu, packetfixer 2025-07-19 00:24:25 +01:00
Pyritie
3bb8599d75 oops 2025-07-19 00:19:53 +01:00
Pyritie
ed7fdf5c3a added adaptive performance tweaks bundle, removed txnilib, cerulean, despawn-tweaks, redirected 2025-07-19 00:18:50 +01:00
Pyritie
af849291ca blue steel is the lavaproof one, akshually 2025-07-18 22:59:37 +01:00
Pyritie
f22e404d74 remove garbage in beneath quest 2025-07-18 22:54:23 +01:00
Pyritie
5b10f5e452 fix typo in piglin drop table guide 2025-07-18 22:54:06 +01:00
Pyritie
41b9ebab98 gas pressurizer recipes + langs 2025-07-18 22:53:30 +01:00
Pyritie
b4b8acdf63 nerfed nether lava 2025-07-18 22:20:38 +01:00
Pyritie
087170ffc9 implements #1375 2025-07-18 21:48:25 +01:00
Pyritie
0bf9ceed26 unified processing time of all 3 create mechanisms #1376 2025-07-18 21:46:29 +01:00
Pyritie
df5add25e7 glue 2025-07-18 21:44:05 +01:00
Pyritie
2342870fd0 langs 2025-07-18 21:38:52 +01:00
Redeix
09ab48319a
More main menu optimizations (#1372)
* - Yeast recipe conflict fix

* - Fixed seed oil voiding in barrels. And item weight inconsistency.

* - Reduced loading screen logo size by 4MB

* - Update Changelog

* - Compressed loading screen images to maybe help with ram

* - Added default gui scale to make the main menu look better on first launch

* - Update Changelog

* - Added utility script for adding circuits to existing recipes

* fixed changelog conflict

Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>

* - Added harvest baskets

* - Fixed baked potato recipe mixing from oven

* - Allowed elytras to be repaired regardless of damage

* - Fixed sea water barrel recipe

* - Gave plants tags to bushes so they can have other uses

* - Pushed stubborn models

* - updated Changelog

* - Changelog typo

* - Integrated Ad Astra wood

* - Updated changelog

* - Treated chipboard composite barrel lang

* - Some Tacz fixes

* - Jar dupe fix

* - tacz data

* - updated changelog

* - we hate git

* - Loading screen and main menu optimizations

* - image push

---------

Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>
2025-07-18 10:09:11 +01:00
Pyritie
d1baf88d5b
Merging in mars worldgen branch (#1370)
* red granite is now a real stone type

* starting mars rock layers

* fixed red granite

* flipped the continentalness! thanks stardust
2025-07-18 02:28:21 +01:00
GameStar
d1dd3c9e35
Bugfix/glass item drop compat (#1369)
* glass breaking drops

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

* Update CHANGELOG.md

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

* Update CHANGELOG.md

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

---------

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
2025-07-18 01:33:58 +01:00
Zippity
e84254ee4e
fix blurry tacz refit screen (#1360)
* Update ULV_guns.zip

* fix: blurry tacz refit screen

added tacz refit screen class to blur excluded screens list

* Revert "Update ULV_guns.zip"

This reverts commit 504238879e2d7737ad8e299d7900d6bba6fc811e.
2025-07-18 01:33:44 +01:00
Pyritie
eb79d1d85b fixed moon rock layers 2025-07-17 21:50:23 +01:00
Pyritie
6d9c1f8fc2 fixed floating indicators in geodes 2025-07-17 21:35:20 +01:00
Pyritie
a18a53ab03
Add files via upload
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-07-17 00:42:00 +01:00
Pyritie
dff99ce68d asdfdsf 2025-07-17 00:41:01 +01:00
Pyritie
584cf0ee66 thanks github 2025-07-17 00:40:55 +01:00
Pyritie
41ec9bc274 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-07-17 00:40:11 +01:00