Commit graph

3941 commits

Author SHA1 Message Date
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
Xikaro
e81935032f Update build.yml 2025-07-20 16:57:02 +05:00
Xikaro
d006c1e9fc Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-07-20 16:54:27 +05:00
Xikaro
c73c393b10 Update build.yml 2025-07-20 16:53:48 +05:00
Pyritie
ea2ef45f21 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-07-20 12:53:32 +01:00
Pyritie
5bb1c17eae update changelog, revert unnecessary changes from #1390 2025-07-20 12:53:25 +01:00
Xikaro
de3e7dacb8 Update build.yml 2025-07-20 16:51:29 +05:00
Pyritie
91d9738f1c fixes #1397 2025-07-20 12:46:23 +01:00
Eve
b98c3bc135
[🪶]: Give Aged Corn Whiskey and Aged Rye Whiskey status effects (#1390)
* Export ".json"s from TFCagedalcohol mod to TFC

Exporting effects ".json"s

Signed-off-by: Eve <93487878+EveProgrammingsockson@users.noreply.github.com>

* Create tfc

There is tfc/tfc/*files*
Need additional file to access them

Signed-off-by: Eve <93487878+EveProgrammingsockson@users.noreply.github.com>

* Delete kubejs/data/tfc/drinkables directory

not there sh*

Signed-off-by: Eve <93487878+EveProgrammingsockson@users.noreply.github.com>

* Delete kubejs/data/tfc/tfc

Signed-off-by: Eve <93487878+EveProgrammingsockson@users.noreply.github.com>

* Create tfc

Signed-off-by: Eve <93487878+EveProgrammingsockson@users.noreply.github.com>

* Delete kubejs/data/tfc/tfc

Signed-off-by: Eve <93487878+EveProgrammingsockson@users.noreply.github.com>

* Create tfc

Signed-off-by: Eve <93487878+EveProgrammingsockson@users.noreply.github.com>

* Delete kubejs/data/tfc/tfc

Signed-off-by: Eve <93487878+EveProgrammingsockson@users.noreply.github.com>

* Create ihategithub

Signed-off-by: Eve <93487878+EveProgrammingsockson@users.noreply.github.com>

* Exporting aged alcohol from TFCagedalcohol data

Signed-off-by: Eve <93487878+EveProgrammingsockson@users.noreply.github.com>

* Create alcohols.json

Signed-off-by: Eve <93487878+EveProgrammingsockson@users.noreply.github.com>

* Delete kubejs/data/tfc/tfc/ihategithub

Signed-off-by: Eve <93487878+EveProgrammingsockson@users.noreply.github.com>

---------

Signed-off-by: Eve <93487878+EveProgrammingsockson@users.noreply.github.com>
2025-07-20 12:36:45 +01:00
Pyritie
54cf3e5cea Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-07-20 12:34:48 +01:00
Xikaro
d9979bae64 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-07-20 16:29:08 +05:00
Xikaro
cc769b5a8a Update pakku-lock.json 2025-07-20 16:28:59 +05:00
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