Commit graph

1450 commits

Author SHA1 Message Date
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
Gustavo
98e873cba5 add Alabaster rock crushing 2025-08-22 20:54:59 +10:00
Pyritie
37ef72ee01 shipping container dye/bleach recipes 2025-08-22 00:32:42 +01:00
Pyritie
fea8530ada added higher tier greg machines 2025-08-22 00:17:27 +01:00
Pyritie
17828ff679 fixed broken water tag for making paper, added AA recipe for spring water 2025-08-21 22:41:08 +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
Pyritie
0804d81d6c fix #1659 2025-08-21 21:39:31 +01:00
Pyritie
5e85474cf1 fix #1652 2025-08-21 21:37:46 +01:00
Pyritie
4395da4c2b fix #1639
Related Work Items: #1
2025-08-21 12:15:07 +01:00
Pyritie
a2a30eb84b sterling silver alloy smelter 2025-08-21 12:06:38 +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
Redeix
2f4b9fa954
Feature/quick fixes (#1664)
* Some reflector block fixes

* Trim tool changes

* Added rose gold alloy smelter recipes
2025-08-21 02:33:46 -05: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
4a0c61c240 tags for wab 2025-08-16 02:55:54 +01:00
Pyritie
f2380e9ebd tree stuff 2025-08-16 02:55:49 +01:00
Pyritie
427b77e99a fiddling with forest noise 2025-08-15 23:05:22 +01:00
Pyritie
81b3dcc8e4 butn 2025-08-15 23:05:10 +01:00
Pyritie
f57564d3a0 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-08-15 22:47:58 +01:00
Pyritie
beed3094f3 buttons again #1625 2025-08-15 22:47:44 +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
f844601b55 adding meat tag to cruncher foods 2025-08-15 21:40:02 +01:00
Pyritie
ce2a38285c added 3 more mars trees + tfc-style saplings for all 6 2025-08-15 02:14:07 +01:00
Pyritie
90ce71d94a mars biome particle tags 2025-08-15 01:17:18 +01:00
Pyritie
3e11443023 locometal refactor #1624 2025-08-14 21:03:02 +01:00
Pyritie
ffcc45475e #1625 and #1623
Related Work Items: #16, #1625
2025-08-14 20:51:36 +01:00
Pyritie
fa9b9687ab fixed maple log centrifuge recipe to be the right kind of wood pulp 2025-08-14 20:38:00 +01:00
Pyritie
5ad5a6c892 buffed EGH sapling amount 2025-08-14 20:35:38 +01:00
Pyritie
f0466e53bd finally killed off all damascus steel recipes 2025-08-14 20:28:16 +01:00
Pyritie
7ae68a1636 unification with pumpkin pie stuff 2025-08-13 23:17:33 +01:00
Pyritie
365fe1e5ca moved golden apples to the food processor 2025-08-13 23:08:01 +01:00
Pyritie
6bba775be0 mushroom and bamboo EGH recipes, also changed them all to the appropriate kind of water 2025-08-13 22:51:43 +01:00
Pyritie
8657cc38b1 fixed a dupe with certus quartz 2025-08-13 22:33:28 +01:00
Pyritie
af5e279954 moon rabbits can eat chorus fruit now 2025-08-13 22:31:18 +01:00
Pyritie
7767f58399 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-08-13 22:28:47 +01:00
Pyritie
4cb712ceab never mind! that actually wasn't that bad 2025-08-13 22:24:40 +01:00
Pyritie
8787781f27 this doesn't fix dyed toolbelts (#368), but it does fix the other long-standing issue with upgrading them 2025-08-13 21:29:56 +01:00
GameStar
848dc99bf8
some modpack cleanup from glacian ram/sniffer (#1617)
* whitespace changes

* some animal compat

* snifferified recipes

* nest box recipe
2025-08-13 11:06:50 -05:00
Pyritie
fc35769678 removed the lye to sodium hydroxide pot recipe, now it's vat-only #1615 2025-08-13 00:19:36 +01:00
Pyritie
a0e1a0a088 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-08-12 23:37:46 +01:00
Pyritie
463784a90a nerfed ore crushing in a forge hammer to be a little less stupidly fast 2025-08-12 23:37:43 +01:00
Zippity
7fb821dae9
fix sharp tools not taking damage when cutting grass (#1614)
Co-authored-by: Redeix <brayden.j.m.ford@gmail.com>
2025-08-12 17:14:44 -05:00
Pyritie
ea9fa54021 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-08-12 22:55:05 +01:00
Pyritie
a71a6e79e1 small fixes 2025-08-12 22:55:03 +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
b2a96fa67f use the same crimson/warped tree feature for old growth ones too 2025-08-12 12:49:39 +01:00
Pyritie
b676b5f5b4 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-08-12 12:37:22 +01:00
Pyritie
63a1f0de76 treeeeeeeeees 2025-08-12 12:37:19 +01:00
Pyritie
0da4ff3e8e hollow shell can be crushed for flux now 2025-08-12 11:44:43 +01:00
Pyritie
a07f70594d freeze dried mars fruit 2025-08-12 11:25:38 +01:00
TomPlop
1cb918ee35
Fix soy bean (#1608)
Signed-off-by: TomPlop <tomdidome@gmail.com>
2025-08-12 10:49:49 +01:00