Commit graph

568 commits

Author SHA1 Message Date
Pyritie
a99dd0f986 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-08-27 01:56:11 +01:00
Pyritie
032d6fa49c some progress on mars worldgen stuff 2025-08-27 01:56:04 +01:00
GameStar
d59f73b1ee
Feature/sandworm, sacks, soulbind (#1710)
* stuff

* Create wraptor.json

* Update tags.js

* fix wool

* eggs

* Update constants.js

* more recipe stuff

* doing tooltips the correct way

* oops

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* oops

* eater mixin stuff

* add sandworm+dep to pakku

* new configs I think

* soulbind recipes

* thumper

* Update main_server_script.js

* Update pakku-lock.json

* sack configs

* Update sns-server.toml

* Update sns-server.toml

* sack recipes and stuff

* Create soulbinding-common.toml

* soulbind fix

* Update pakku-lock.json

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* Update recipes.js

* Update recipes.js

* Delete EffekseerNativeForJava.dll

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* Update .gitignore

---------

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
2025-08-27 00:09:54 +01:00
Pyritie
1826674f63 made deposits invisible on xaeros 2025-08-26 00:09:28 +01:00
Pyritie
5bec53e7cd spice stuff! 2025-08-26 00:00:43 +01:00
Pyritie
d16b4288af tag fixes, collapse recipes 2025-08-25 22:51:55 +01:00
Pyritie
c5082530e1 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-08-25 21:56:39 +01:00
Pyritie
c8d20c30ae new clay/kaolin clay blocks 2025-08-25 21:56:36 +01:00
Pyritie
d15290b9de make the deposit size a little bigger 2025-08-25 21:56:27 +01:00
GameStar
5fb7ef9093
more mars entity stuff (#1697)
* stuff

* Create wraptor.json

* Update tags.js

* fix wool

* eggs

* Update constants.js

* more recipe stuff

* doing tooltips the correct way

* oops

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

---------

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
2025-08-25 21:18:46 +01:00
TomPlop
2ebfaf2e3a
Board rework (#1679)
* fix board

* remove from tag

* more update

* last changes

* Add new quests

* fix the weird file

* Fixes

* fix quest optional
2025-08-23 14:13:07 -05:00
Pyritie
ac99b9db87
Solar tweaks (#1678)
* solar tweaks

* langs
2025-08-23 18:30:27 +01:00
Pyritie
d41827abdc oh you can just change this in the config! that's cool. Also changed the infinity wand recipe 2025-08-22 22:56:06 +01:00
Pyritie
7b3f4e8726 fix #1672 2025-08-22 21:53:02 +01:00
Pyritie
acc03bbe72 removed portable energy interface because it doesn't work with FE converters 2025-08-22 21:22:04 +01:00
TomPlop
6eb2de0220
Mars ressources (#1569)
* stupid git again

* First entry for the mars ore line

* Adding the Ostrum Harvester in its first version

* Adding new casings

* Adding the complete Mars Ore Line

* Bugs again

* Add ores and textures

* More changes

* Changes to heavy and semi water and more fluid veins

* Adding more crafting recipes

* More recipes

* weird

* nerf ores

* fix thorium

* Adding dusty ores

* More circuits change to gate IV at the end of Mars

* Fix multiblocks

* Changes to AE2

* Unified Pattern Provider and Interface

* Removing Bedrock

* Fully remove Bedrock Miner

* Disable many stuffs until Mars

* More fixes until Mars is out

* Requested changes

* Cleaning kubejs files

* Adding Moon Ore Line

* Change Mars water to Centrifuge

* Fix duplicate
2025-08-22 12:41:27 +01:00
Pyritie
dec69df3b9 mods can't even name themselves properly smh 2025-08-22 00:23:51 +01:00
Pyritie
fea8530ada added higher tier greg machines 2025-08-22 00:17:27 +01:00
Pyritie
c608491857 added some more food recipes for #1638, fixed the wrong chocolate in #1632 2025-08-21 22:19:55 +01:00
TomPlop
4d801d9c96
Disable energy p2p (#1661)
* github being github

* First bandage fix for removing FE P2P
2025-08-21 09:42:07 +01:00
GameStar
3521adc4de
idk some recipes (#1635)
Co-authored-by: Redeix <brayden.j.m.ford@gmail.com>
2025-08-15 22:20:48 -05:00
Pyritie
a341470cee removed cobalt oxide's meltability #1634 2025-08-15 23:30:14 +01:00
GameStar
03106270e1
Feature/wan creatures and stuff (#1633)
* whitespace changes

* some animal compat

* snifferified recipes

* nest box recipe

* tag stuff

* spawn stuff

* tooltip

* wan config

* foods

* loot tables

* Update pakku-lock.json

* Update wan_ancient_beasts-server.toml

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* Update tags.js

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-08-15 22:45:09 +01:00
Pyritie
ce2a38285c added 3 more mars trees + tfc-style saplings for all 6 2025-08-15 02:14:07 +01:00
Pyritie
7c8d765768 do you like your bread with or without the peel 2025-08-15 00:50:20 +01:00
Pyritie
b1f29a2ed0 added mineable tags to all crops, renamed file from crops to plants in prep for saplings 2025-08-14 22:12:48 +01:00
Pyritie
f0466e53bd finally killed off all damascus steel recipes 2025-08-14 20:28:16 +01:00
GameStar
9e9b5bfb55
stuff for core pr (#1612)
* Add files via upload

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* Add files via upload

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* Add files via upload

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* Add files via upload

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* Add files via upload

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* Add files via upload

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* Add files via upload

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* Add files via upload

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* Add files via upload

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* Update items.food.js

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* Update constants.js

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* Update data.js

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* Update recipes.food.js

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

---------

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
2025-08-12 20:45:38 +01:00
Pyritie
63a1f0de76 treeeeeeeeees 2025-08-12 12:37:19 +01:00
Pyritie
a07f70594d freeze dried mars fruit 2025-08-12 11:25:38 +01:00
Pyritie
99ce711397 fix 2025-08-12 10:53:10 +01:00
Pyritie
7bd4862c5e Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-08-11 22:59:40 +01:00
Pyritie
2bdb46c397 mars pumpkin pie + other tag stuff 2025-08-11 22:59:10 +01:00
TomPlop
de8fe6ce78
Rebalance LSA (#1591)
* Balance LSA

* Add changelog

* Add Parallel Hatch ability

* Trying to fix changelog

* Try again
2025-08-11 21:44:22 +01:00
Redeix
2c5658a185
Reflector block and some other fixes (#1575)
* Reflector block and some other fixes

* Updated Changelog
2025-08-10 11:39:10 +01:00
Pyritie
e59dc4d57d remove lava buckets as fuel 2025-08-10 00:13:25 +01:00
Pyritie
44acd49485 added more icon sets for dusts and rods 2025-08-09 21:56:24 +01:00
Pyritie
655ef68697 fixed a duplicate fluix block, also tweaked the fluix material a little 2025-08-09 17:43:08 +01:00
TomPlop
feec2487ef
Fix infinite energy with Large Solar Arrays (#1563)
Signed-off-by: TomPlop <tomdidome@gmail.com>
2025-08-08 14:01:55 -05:00
Spicy Noodles
8c1aec9d30
Remove cinnabar to redstone recipe (#1548)
* Remove cinnabar to redstone recipe

* Changelog

---------

Co-authored-by: Gustavo <77560533+gustovafing@users.noreply.github.com>
2025-08-07 22:11:52 +10:00
Gustavo
52dfa01bb4 add missing tag to loose rock items 2025-08-07 21:02:20 +10:00
Pyritie
cbad72ecf8 added potin, cobalt, and cobalt brass as tfc metals, fixed ratios of tfc brass/bronze 2025-08-07 00:39:42 +01:00
Gustavo
c349aa4ad7 revert commit to actually put them in lang files 2025-08-06 19:58:21 +10:00
Gustavo
cdf57686ba rename extruder molds 2025-08-06 19:31:02 +10:00
Pyritie
3dbb282ef4 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-08-06 00:40:31 +01:00
Pyritie
1dce4d76a4 fixed all the greate mess 2025-08-06 00:40:28 +01:00
GameStar
d6b0715c52
Adding stuff related to tree saps + minor fixes (#1531)
* tree juice changes

* fixed texture stretch

* glacian wool

* Update CHANGELOG.md

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* oops

* Update glacian_wool.png

---------

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
2025-08-05 11:07:04 -05:00
TomPlop
91e0d36fa0
Rework of Large Solar Array (#1511)
* Rework of Large Solar Array

* Add quests

* Fix Ad Astra to use the T1 photocell
2025-08-02 23:09:49 -05:00
Redeix
2cee1a2cdb
Baskets and fixes (#1510)
* - Added grape bushes to harvest basket tags

* - More LSP fixes

* - updated changelog
2025-08-02 15:24:23 -05:00
Pyritie
1b01b244d9 merge 2025-08-02 18:52:31 +01:00