Commit graph

3902 commits

Author SHA1 Message Date
Pyritie
4c8b0ca545 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-07-20 12:10:47 +01:00
Pyritie
4e3e55ee41 langs 2025-07-20 12:01:08 +01:00
Redeix
611f5d9199
Recipes, Tags, Assets+ for railgun (#1394)
* - 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

---------

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-20 11:59:30 +01:00
Ian Laidlaw
e024e005bd
Fixes bug where milling #tfg:hardwood would result in softwood pulp instead of the expected hardwood pulp. (#1391)
* Fixes bug where milling #tfg:hardwood would result in softwood pulp instead of the expected hardwood pulp.

Softwood pulp milling recipe still shows minecraft:logs as input but I'm not familiar enough with kubejs to know how to fix it. Logically this works though.

* Fixes bug where milling #tfg:hardwood would result in softwood pulp instead of the expected hardwood pulp.

Softwood pulp milling recipe still shows minecraft:logs as input but I'm not familiar enough with kubejs to know how to fix it. Logically this works though.

* changed to removeMaceratorRecipe instead of event.remove()

* Removed config file from pull request

* Removed irrelevant changes

* Update recipes.paper.js

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

---------

Signed-off-by: Pyritie <pyritie@gmail.com>
Co-authored-by: Pyritie <pyritie@gmail.com>
2025-07-20 11:55:41 +01:00
Pyritie
28086d40fa Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-07-20 02:06:10 +01:00
Pyritie
9ff82c5d53 nicer sand dunes! 2025-07-20 02:06:07 +01:00
Pyritie
0fa887ebe1 don't like that tfc red sandstone here 2025-07-20 01:56:35 +01:00
Pyritie
b47804f7fe added noodle caves back 2025-07-20 01:49:50 +01:00
Pyritie
e52068c81f starting mars sand dunes 2025-07-20 00:24:57 +01:00
Pyritie
b41318d7d9 remove dikes from sandy areas 2025-07-20 00:24:42 +01:00
Xikaro
c0150abe04 Update build.yml 2025-07-20 04:18:29 +05:00
Xikaro
99c89fcda0 Update pakku-lock.json 2025-07-20 04:13:05 +05:00
Xikaro
8181680c07 Update build.yml 2025-07-20 03:37:00 +05:00
Xikaro
fb0c7efb0f Update build.yml 2025-07-20 03:33:42 +05:00
Xikaro
e5d4e76ad1 Update build.yml 2025-07-20 03:18:27 +05:00
Xikaro
57ee1c331e Update build.yml 2025-07-20 03:04:42 +05:00
Xikaro
7b52de45c1 Update build.yml 2025-07-20 03:02:48 +05:00
Xikaro
208a240702 Update build.yml 2025-07-20 03:00:42 +05:00
Xikaro
6241454da4 Update build.yml 2025-07-20 02:57:53 +05:00
Xikaro
25cb86b0c8 Update build.yml 2025-07-20 02:55:58 +05:00
Xikaro
564a716f49 Update build.yml 2025-07-20 02:52:34 +05:00
Xikaro
c104a74dd0 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-07-20 02:51:02 +05:00
Xikaro
d60fc1c270 Update build.yml 2025-07-20 02:48:33 +05:00
Nebby1999
a8770917f0 Update changelog to include important pink thorium 2025-07-19 17:48:25 -04:00
Xikaro
e18b356f1a Update build.yml 2025-07-20 02:46:41 +05:00
Xikaro
d096be8798 Update build.yml 2025-07-20 02:43:16 +05:00
Xikaro
bf2935b178 Update build.yml 2025-07-20 02:39:32 +05:00
Xikaro
e15e4174d4 Update build.yml 2025-07-20 02:38:14 +05:00
Xikaro
232b0a6eb7 Update build.yml 2025-07-20 02:37:16 +05:00
Xikaro
05dc04d275 Update build.yml 2025-07-20 02:32:50 +05:00
Xikaro
fc80327273 Update build.yml 2025-07-20 02:30:28 +05:00
Xikaro
958b4ee8df Update build.yml 2025-07-20 02:25:30 +05:00
Xikaro
8854195e44 Update build.yml 2025-07-20 02:18:28 +05:00
Pyritie
d3567d3517 removed ore veins (this is for the really huge vanilla kind) 2025-07-19 22:18:14 +01:00
Xikaro
60bf78d76e Update build.yml 2025-07-20 02:13:14 +05:00
Xikaro
359965673d Update build.yml 2025-07-20 02:09:40 +05:00
Xikaro
943a3b2c0c Update build.yml 2025-07-20 02:07:37 +05:00
Xikaro
05d9a47e6d Update build.yml 2025-07-20 02:06:34 +05:00
Xikaro
8c53d5dd3c Update build.yml 2025-07-20 02:02:05 +05:00
Xikaro
2a1b0bcad3 Update build.yml 2025-07-20 02:00:02 +05:00
Xikaro
aef4de08a5 Update build.yml 2025-07-20 01:55:24 +05:00
Xikaro
1231cd4d80 Update build.yml 2025-07-20 01:53:53 +05:00
Xikaro
0c41582406 Update build.yml 2025-07-20 01:46:12 +05:00
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