Commit graph

3965 commits

Author SHA1 Message Date
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
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
Gustavo
e8fdc4e5cf
Remove some unnecessary optimisation mods 2025-07-21 21:06:06 +10:00
Gustavo
93bcf32e08
Update pakku.json
Signed-off-by: Gustavo <77560533+gustovafing@users.noreply.github.com>
2025-07-21 20:54:59 +10:00
Gustavo
e817a88c8f
Update CONTRIBUTING.md
Signed-off-by: Gustavo <77560533+gustovafing@users.noreply.github.com>
2025-07-21 14:47:38 +10:00
Gustavo
db84caf1a7 update tsconfig 2025-07-21 14:42:03 +10:00
Gustavo
3d89d59d4d use strict 2025-07-21 13:52:18 +10:00
Pyritie
89d74ee72d moving sand piles over to their new kjs block builder 2025-07-20 23:16:26 +01:00
Pyritie
ab7ae4a936 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-07-20 21:44:39 +01:00
Pyritie
e832b58d29 fixed hand crank SU generation 2025-07-20 21:44:36 +01:00
Xikaro
8a452e8982 Update build.yml 2025-07-21 01:41:47 +05:00
Pyritie
a95d2aaf09 fixes #1405 2025-07-20 17:13:06 +01:00
Xikaro
27a528ef90
Merge pull request #1404 from TerraFirmaGreg-Team/dev
Release: 0.10.2
2025-07-20 17:50:53 +05:00
Xikaro
78d0d38469 Update build.yml 2025-07-20 17:50:05 +05:00
Xikaro
676d14796c Update build.yml 2025-07-20 17:44:45 +05:00
Xikaro
0333cd89c8 Update build.yml 2025-07-20 17:40:30 +05:00
Xikaro
78a1f7e7d8 Update build.yml 2025-07-20 17:33:26 +05:00
Xikaro
e7b5cade92 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-07-20 17:25:48 +05:00
Xikaro
e895ae9b49 Update build.yml 2025-07-20 17:25:47 +05:00
Pyritie
a044c703f2
credit links (#1401) 2025-07-20 17:24:24 +05:00
Xikaro
c1c51231d8 Update build.yml 2025-07-20 17:17:25 +05:00
Xikaro
4a1a6344dd Update build.yml 2025-07-20 17:14:25 +05:00
Xikaro
321af9545c Update build.yml 2025-07-20 17:11:36 +05:00
Pyritie
3ef1750163 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-07-20 13:06:07 +01:00
Pyritie
6041840dfa Merge branch 'main' into dev 2025-07-20 13:06:04 +01:00
Xikaro
a752914a5e Update build.yml 2025-07-20 17:06:00 +05:00
Pyritie
5ea8eac6aa Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-07-20 13:03:27 +01:00
Pyritie
e8e53f25bf changelog 2025-07-20 13:03:25 +01:00
Pyritie
07245d6d07 removed leftover species recipes 2025-07-20 13:03:13 +01:00
Pyritie
d1f76ca1bd fixes #1395 2025-07-20 13:03:01 +01:00
Xikaro
62dbe15231 Update build.yml 2025-07-20 16:58:06 +05:00