Commit graph

3994 commits

Author SHA1 Message Date
Xikaro
96880bd5a7 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-07-25 13:22:14 +05:00
Xikaro
6bc6549d30 Update pakku-lock.json 2025-07-25 13:22:13 +05:00
Redeix
668f86fcfc
Block interaction changes (#1434)
* - 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

* - Recipes, tags, assets+ for railgun

* - Brick interaction events and new function for interacting with blocks

* - Added parameter boolean to decide if blockstate should be copied

* - Change for block interaction event constant that may fix linux crash

* - Moved global array to the events file and some linter fixes.

* - Updated Changelog

---------

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-25 09:17:21 +01:00
Pyritie
46998f1151 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-07-25 01:32:41 +01:00
Pyritie
2fdb8570e9 thanks git 2025-07-25 01:32:39 +01:00
Pyritie
f860056940
Mars grass and water (#1437)
* mars grass and water and all that fun stuff

* removing the heavy water
2025-07-25 01:31:25 +01:00
Pyritie
fb53d1de86 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-07-24 23:20:16 +01:00
Pyritie
d19d8d2452 update default options, good lord that's annoying without it 2025-07-24 23:20:08 +01:00
Pyritie
2c28c1cfeb mars biomes constant 2025-07-24 12:05:24 +01:00
Pyritie
e051ffeeb3 mars loot tables 2025-07-24 12:03:09 +01:00
Xikaro
c4ba9a6709
Merge pull request #1428 from TerraFirmaGreg-Team/dev
Release: 0.10.3
2025-07-24 01:48:00 +05:00
Pyritie
51354edb59 alright xikaro, let's try your script 2025-07-23 21:42:27 +01:00
Pyritie
af8794346b sanding bricks to smooth 2025-07-23 21:41:35 +01:00
Pyritie
ec46eb3832 fixes #1423 2025-07-23 21:13:58 +01:00
Pyritie
8d686fc686 missed the solar panel and gas pressurizer too 2025-07-23 21:12:21 +01:00
Pyritie
e0a4c80fca EMI category updates for the create sandpaper recipes 2025-07-23 21:11:27 +01:00
Pyritie
3d2ed09f9b added create sandpaper recipes for early game gems, unified observer recipes 2025-07-23 21:10:59 +01:00
Pyritie
4d7fc30409 replace cave enderman with a different (passive) one in the nether 2025-07-23 20:41:32 +01:00
Pyritie
e18fe11d84 langs again 2025-07-23 20:40:32 +01:00
Pyritie
c2f9dd4215 changed the moon skeletons to strays 2025-07-23 20:38:14 +01:00
Pyritie
1e7a234b88 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-07-23 20:31:43 +01:00
Pyritie
822746efdf langs 2025-07-23 20:29:50 +01:00
Pyritie
0dada1a549 cl 2025-07-23 14:28:50 +01:00
Pyritie
044f13978a fixed deer dropping the wrong meat with a butchery knife 2025-07-23 14:28:46 +01:00
Pyritie
3e5e4a2d33 moved biome tag file into kubejs #1422 2025-07-23 11:00:43 +01:00
GameStar
96d24e7b14
Feature/tier2 rocket bugfixes (#1422)
* stuff for rocket

* worm

* Assets

* bugfix #1420

* bugfix for #1421

* rocket recipes

* color adjust fluix material

* startup rocket stuff

* everything disabling the stuff until ev

* Delete options.txt

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

* Update main_startup_script.js

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>

* Update CHANGELOG.md

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

* shhhhh

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-07-23 10:58:27 +01:00
Redeix
c57f1a6ce6
Update CHANGELOG.md
Changelog for brick interactions

Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>
2025-07-22 23:23:46 -05:00
Pyritie
83504d341c why is this tagged as not survive? 2025-07-22 22:58:56 +01:00
Pyritie
0cb6847915 enabling some species mushrooms 2025-07-22 22:58:46 +01:00
Pyritie
850dff3833 adding back warped/crimson wood 2025-07-22 22:57:48 +01:00
Pyritie
4a380e548a mars terrain changes 2025-07-22 22:57:34 +01:00
Pyritie
1920173c41 fixes #1414 2025-07-22 17:02:17 +01:00
Pyritie
42ecf404b8 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-07-22 12:39:37 +01:00
Pyritie
d047383285 gitignore 2025-07-22 12:37:50 +01:00
Redeix
9ec98b47bb
Brick interaction events and new function for interacting with blocks (#1416)
* - 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

* - Recipes, tags, assets+ for railgun

* - Brick interaction events and new function for interacting with blocks

* - Added parameter boolean to decide if blockstate should be copied

---------

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-22 11:51:09 +01:00
Xikaro
246c6e5a51 Update .gitattributes 2025-07-22 11:10:27 +05:00
Pyritie
ab1c0a7548 updated changelog 2025-07-22 01:53:12 +01:00
Nyonyix
87fac4d063
Steam Fluid Blaze Burner First Comit. (#1379) 2025-07-22 01:52:19 +01:00
Pyritie
83adf7f088 added quests for some species stuff, adjusted recipes of the grappling hook and rope coils 2025-07-22 01:31:29 +01:00
Pyritie
bbae9d2501 removed mortar recipes for metal ingots 2025-07-22 00:54:23 +01:00
Pyritie
2242f0fa15 changelog 2025-07-22 00:42:23 +01:00
Pyritie
15821eee19 added mortar recipes for flour, added missing food processor recipes for nixtamel 2025-07-22 00:21:59 +01:00
Pyritie
d1c96bf39d chests need a tag to work with contraptions now, apparently 2025-07-22 00:20:51 +01:00
Pyritie
888a227229 fixes #1413 2025-07-21 23:55:22 +01:00
Ian Laidlaw
5dc73041f5
Adds curving_heads tag to screwdriver mold so the mold works correctly with curving presses (#1412)
* Adds curving_heads tag to screwdriver mold so the mold works correctly with curving presses

* added the other molds

Signed-off-by: Pyritie <pyritie@gmail.com>

---------

Signed-off-by: Pyritie <pyritie@gmail.com>
Co-authored-by: Pyritie <pyritie@gmail.com>
2025-07-21 21:36:47 +01:00
Victor De Lomas
84389d6c1c
Added some performance oriented options to ModernFix (#1410)
CAUTION! This may add other side effects like crashes or bugs
2025-07-21 21:36:30 +01:00
Pyritie
5c6196a025 Revert "Remove some adaptive performance tweaks mods"
This reverts commit ebf1637865.
2025-07-21 16:10:40 +01:00
Pyritie
2b62124ca2 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-07-21 12:53:57 +01:00
Pyritie
081aac2a4f reduced recipe duration of biodiesel recipes 2025-07-21 12:53:54 +01:00
Gustavo
ebf1637865
Remove some adaptive performance tweaks mods 2025-07-21 21:13:46 +10:00