Commit graph

593 commits

Author SHA1 Message Date
Pyritie
61e6164777 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-09-07 15:45:41 +01:00
Pyritie
5dc1a7b90e rainfall should be X axis, not Z 2025-09-07 15:45:35 +01:00
Pyritie
0559136e04 fix some blocks disappearing 2025-09-07 15:16:54 +01:00
GameStar
af01173039
temperature changing foods (#1753)
* update sack mod

* Update wan_ancient_beasts-server.toml

* stuff

* lang

* images

* Update CHANGELOG.md

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

---------

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
2025-09-06 21:35:42 +01:00
Pyritie
5696104621 more mars plants 2025-09-06 14:28:34 +01:00
Pyritie
42829779c8 gtceu -> tfg semiheavy/heavy water 2025-09-06 13:04:22 +01:00
Pyritie
f8b8c09f28 added floating water plants 2025-09-06 00:58:30 +01:00
Pyritie
ab63d9ad40 damn 2025-09-05 22:02:37 +01:00
Pyritie
934ac6a792 small tweaks 2025-09-05 01:52:46 +01:00
TomPlop
07f896b9d6
Add decompozition for heavy and semiheavy water (#1745)
* add semiheavy water

* add semiheavy water to centrifuge

* fix color
2025-09-04 11:13:14 -05:00
Pyritie
bf192d1390 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-09-03 22:16:05 +01:00
Pyritie
ede77ef950 textures for mars twigs, fixed models for saplings, some tags 2025-09-03 22:16:02 +01:00
Redeix
957da2cbba
bioreactor stuff (#1742)
* bioreactor stuff

* Update recipes.js

Signed-off-by: Redeix <brayden.j.m.ford@gmail.com>

---------

Signed-off-by: Redeix <brayden.j.m.ford@gmail.com>
2025-09-03 11:56:36 -05:00
Pyritie
ee2c464802 hide molten ad astra materials 2025-09-03 00:33:30 +01:00
Pyritie
358fea7717 enabled t2 spacesuit, space suits count as PPE now 2025-09-02 23:58:32 +01:00
Pyritie
3359f6e6df ostrum formula 2025-09-02 23:42:48 +01:00
Pyritie
4a763e120e hid raw ostrum since we aren't using it any more 2025-09-02 23:04:48 +01:00
TomPlop
ad67a00027
Ostrum line (#1734)
* Adding the Ostrum Line

* fix comment and add geysers to blacklist

* Remove muffler hatch

* Adding the Ostrum Line

* fix comment and add geysers to blacklist

* Remove muffler hatch

* fix tfg for id recipe

* Fix fucking Git

* change a line
2025-09-02 18:40:16 +01:00
Pyritie
0a95af3c8b tags to stop mars saplings from being destroyed 2025-09-02 01:19:51 +01:00
Pyritie
b18d2ab939 lanceleaf, large amaranita mushroom, and some fixes 2025-09-02 00:16:29 +01:00
GameStar
020d4f9018
Flax (#1735)
* some flax stuff

* linen stuff

* flax line stuff

* flax again

* rapseed wild crop changes

* flax worldgen

* revert grooming station update

* more flax stuff

* trying to fix stuff

one doesn't work

* recipes and lang

* Update CHANGELOG.md

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

* fixes

---------

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
2025-08-31 19:14:14 +01:00
Pyritie
a7d71c8e6b added more variants of a few plans, added some leaf blocks to use as bushes, added some new feather groundcover and started work on some twigs 2025-08-31 02:25:11 +01:00
Pyritie
943835fbad Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-08-29 01:05:44 +01:00
Pyritie
37e08a9597 added charnia and reduced mountain biome range 2025-08-29 00:59:31 +01:00
programmer3481
9784879282
make popped chorus fruit edible (#1722) 2025-08-28 21:54:32 +01:00
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