Commit graph

4034 commits

Author SHA1 Message Date
Pyritie
c222286815 removed mixing bowl recipes involving more than 5 outputs 2025-07-25 22:14:43 +01:00
Pyritie
5d2d61014a fixed recipe conflict with kao clay 2025-07-25 22:13:03 +01:00
Pyritie
c1efdb722d added a workaround for #1361 2025-07-25 22:12:52 +01:00
Pyritie
9a9a66b69d fixes #1427
Related Work Items: #142
2025-07-25 21:59:39 +01:00
Pyritie
4984ddb14a fixes #1429 2025-07-25 21:51:56 +01:00
Pyritie
dabc75b332 moved clipboard to metallurgy age, added link in tools 2025-07-25 21:48:45 +01:00
Pyritie
ddefb3bf60 pakku 2025-07-25 21:46:56 +01:00
Xikaro
39fc153b58 Update build.yml 2025-07-26 00:49:31 +05:00
Xikaro
843a060162 workflows 2025-07-25 23:48:54 +05:00
Xikaro
c8f1c1a115 Update create-pr.yml 2025-07-25 23:30:34 +05:00
Xikaro
c49a73189e Update create-pr.yml 2025-07-25 23:28:47 +05:00
Xikaro
1e986c07ee Update create-pr.yml 2025-07-25 23:24:55 +05:00
Xikaro
63d76d7450 Update create-pr.yml 2025-07-25 23:23:32 +05:00
Xikaro
8fb40f147e Update create-pr.yml 2025-07-25 23:19:23 +05:00
Xikaro
5614acab90 workflows 2025-07-25 23:18:23 +05:00
Xikaro
45ace37a51 Update CHANGELOG.md 2025-07-25 23:16:39 +05:00
Xikaro
0a29c844e1 Update create-pr.yml 2025-07-25 23:14:54 +05:00
Xikaro
60ec1353d6 Update CHANGELOG.md 2025-07-25 23:09:59 +05:00
Xikaro
b8d622e487 Update create-pr.yml 2025-07-25 23:09:27 +05:00
Xikaro
252eaaa39f test 2025-07-25 23:08:07 +05:00
Xikaro
77cb3a0aa6 workflows 2025-07-25 23:07:36 +05:00
Xikaro
58d7d99550 build 2025-07-25 22:59:38 +05:00
Xikaro
f40b02dc3d Update build.yml 2025-07-25 22:55:59 +05:00
Xikaro
e70aee5045 Update build.yml 2025-07-25 22:50:18 +05:00
Xikaro
3b16e8abc2 Update build.yml 2025-07-25 22:45:03 +05:00
Xikaro
ba772b26d9 Update build.yml 2025-07-25 22:38:08 +05:00
Xikaro
af71ce6370 test CHANGELOG 2025-07-25 22:33:55 +05:00
Xikaro
238a626ab1 Update build.yml 2025-07-25 22:31:21 +05:00
Xikaro
e4a9a9f854 Update build.yml 2025-07-25 22:29:08 +05:00
Xikaro
439a356446 Update build.yml 2025-07-25 22:28:11 +05:00
Pyritie
93c2fdbbc1 you can also use mars water for ore washing 2025-07-25 13:16:53 +01:00
Pyritie
2764a81b53 fixed not being able to use framed chests on contraptions, and made mars water infinite via hose pulley 2025-07-25 13:16:10 +01:00
Pyritie
fdf80ff7de typo 2025-07-25 12:38:19 +01:00
Pyritie
8d4a7131af changelog 2025-07-25 12:31:54 +01:00
Pyritie
ab8d2c3e63 fixes #1426 2025-07-25 12:28:18 +01:00
Pyritie
ce21c0b4c5 fixes small spring melt amounts for #1435, also added melting recipe for nuggets 2025-07-25 12:25:48 +01:00
Pyritie
06ee7a8e4a made clipboard recipe cheaper #1432 2025-07-25 12:22:11 +01:00
Pyritie
f780e07299 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-07-25 12:19:00 +01:00
Pyritie
f5e7e48062 git pls 2025-07-25 12:18:58 +01:00
Xikaro
aa8ba96394 Update build.yml 2025-07-25 13:24:52 +05:00
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