Commit graph

2293 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
a95d2aaf09 fixes #1405 2025-07-20 17:13:06 +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
Pyritie
5bb1c17eae update changelog, revert unnecessary changes from #1390 2025-07-20 12:53:25 +01: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
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
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
Pyritie
d3567d3517 removed ore veins (this is for the really huge vanilla kind) 2025-07-19 22:18:14 +01: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
TomPlop
3529de6be1
Fix #1373 and #1380 (#1385)
* Update quests and lang

* Changelog

* changelog

* fix conflict

* changelog

* Fix quest and add smooth stone
2025-07-19 19:59:04 +01:00
Pyritie
0523ff9a02 fix mushroom conflicting recipes 2025-07-19 19:43:09 +01:00