Commit graph

306 commits

Author SHA1 Message Date
Pyritie
d16b4288af tag fixes, collapse recipes 2025-08-25 22:51:55 +01:00
Pyritie
a2bfae2f53 added clay discs, updated their tags 2025-08-25 22:44:44 +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
Pyritie
1bbaebc577 added higher tier AA recipe for even more water 2025-08-24 13:05:31 +01:00
Redeix
3ab8616b8f
Patchouli stuff (#1684)
* Prospecting Stuff

* correction

* another correction

* another another correction

* lets just make this better
2025-08-24 00:56:37 +01:00
Pyritie
e4e9e10ff2 fix banana split warning 2025-08-23 22:06:32 +01:00
TomPlop
e64c8bc6aa
Fix Board rework (#1681)
* fix board

* remove from tag

* more update

* last changes

* Add new quests

* fix the weird file

* Fixes

* fix quest optional

* fix duplicate recipe

* more fix

* Fix fur for insulation

* an other fix
2025-08-23 22:00:35 +01:00
Pyritie
941a0e2d0c tags to hide the sand piles from jei 2025-08-22 22:59:56 +01:00
Pyritie
6a06eb815c a few new ore veins 2025-08-22 22:26:56 +01:00
Pyritie
46b6a2da60 gregtech papyrus tweaks 2025-08-22 21:27:18 +01:00
Pyritie
0e151376ea fixed alabaster 2025-08-22 21:21:47 +01:00
Pyritie
bbdeb9ba12 reduced food oven recipes from 1A LV to slightly-less-than-1A LV 2025-08-22 15:10:26 +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
Gustavo
98e873cba5 add Alabaster rock crushing 2025-08-22 20:54:59 +10: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
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
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
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
ffcc45475e #1625 and #1623
Related Work Items: #16, #1625
2025-08-14 20:51:36 +01:00
Pyritie
5ad5a6c892 buffed EGH sapling amount 2025-08-14 20:35:38 +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
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
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
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
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
Pyritie
2bdb46c397 mars pumpkin pie + other tag stuff 2025-08-11 22:59:10 +01:00
Pyritie
35a84dde36 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-08-11 20:58:20 +01:00
Pyritie
0349729547 mars crop greenhouse textures 2025-08-11 20:46:36 +01:00
Redeix
4a0603cec2
prospecting rework (#1594)
* prospecting rework

* changelog
2025-08-11 11:28:45 +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
fbbfe31ba8 mars farmland stuff, also fixed nox berry EGH recipe 2025-08-09 23:57:45 +01:00
Pyritie
fc0c62f77c added create packages/jars to the railgun blacklist 2025-08-09 14:12:36 +01:00
Pyritie
e53dcf2ea6 biomass and fish oil buffs, added sodium hydroxide to biodiesel from seed oil 2025-08-09 01:18:14 +01:00
Pyritie
b0608183e9 fixes not being able to quern hardwood/softwood, removed strophar/aeronos caps from the log tag 2025-08-09 00:34:06 +01:00
Gustavo
ec64419623 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-08-09 08:30:29 +10:00
Gustavo
7eda76d0c4 run lang merger 2025-08-09 08:30:27 +10:00
TomPlop
966f4f000c
Fix Pyrolyse Oven accepting other ender pearls (#1567)
You should have to make an Implosion Compressor and not skip by killing Enderman

Signed-off-by: TomPlop <tomdidome@gmail.com>
2025-08-08 23:09:24 +01:00
Pyritie
125a6fc293 once again I break the modpack by committing on my lunch break, thanks krazh 2025-08-08 17:24:50 +01:00
Pyritie
6f7ad3bf48 fixes #1559 2025-08-08 12:46:40 +01:00
Pyritie
65090aa58e fixed moon log spam 2025-08-08 12:40:13 +01:00
Pyritie
f3bfbf6285 fixed aqueous accumulator 2025-08-08 12:36:50 +01:00