Commit graph

566 commits

Author SHA1 Message Date
Pyritie
b87c42be06 langs 2025-08-22 23:11:35 +01:00
Pyritie
6a06eb815c a few new ore veins 2025-08-22 22:26:56 +01:00
Pyritie
7e62c260d2 emi categories 2025-08-22 22:00:09 +01:00
Pyritie
e76bed1b25 langs 2025-08-22 21:59:42 +01:00
Pyritie
55b56630eb changelist for tom, also removed all the redundant dusty_raw_ore item models and the old bedrock ore function 2025-08-22 12:49:53 +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
fea8530ada added higher tier greg machines 2025-08-22 00:17:27 +01:00
Pyritie
cdd8213bed langs 2025-08-21 22:29:55 +01:00
Pyritie
4cfe059c71 merge 2025-08-21 12:02:01 +01:00
Pyritie
08011735a1 whitespace? github tweakin again 2025-08-21 12:01:02 +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
Redeix
cd085be512
Updated tooltip file to use lang strings (#1663) 2025-08-21 00:27:42 -05: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
5cc07ffca1 added quest pointing people at the space survival chapter 2025-08-14 21:47:21 +01:00
Pyritie
f594b8a27e added gun quest to HV 2025-08-14 21:38:41 +01:00
Pyritie
55a2d32aea langs 2025-08-13 23:19:31 +01:00
Redeix
d82addb351
prospecting vein particle (#1618) 2025-08-13 18:47:12 +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
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
41fc80fdd2 langs 2025-08-12 11:25:07 +01:00
Pyritie
5c25b1581a finally got these dumb models working 2025-08-12 10:53:52 +01:00
Pyritie
b38476aebb fixed item model positions 2025-08-12 00:53:51 +01:00
Pyritie
3b613c22d4 reverting these 2025-08-11 22:59:32 +01:00
Pyritie
a90f1c06ab langs 2025-08-11 22:59:21 +01:00
Pyritie
2bdb46c397 mars pumpkin pie + other tag stuff 2025-08-11 22:59:10 +01:00
Pyritie
b7abbd0f49 cave pumpkin pie + chunks 2025-08-11 21:07:26 +01:00
Pyritie
6253092e5d since everyone hates the copper sheet texture so much 2025-08-11 21:03:26 +01:00
Pyritie
6ce1abdcb9 oh, those don't render right 2025-08-11 21:02:59 +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
Pyritie
ce5db1446d updated primitive alloy patchouli page to reflect new alloy ratios 2025-08-10 21:54:57 +01:00
Pyritie
fcb50c2a49 missing item models for the wild ones 2025-08-10 21:22:12 +01:00
Pyritie
877653ad9b finished textures for the mars crops (except the greenhouse ones) 2025-08-10 20:59:20 +01:00
Pyritie
cf3e596905 mars farmland lang 2025-08-10 12:16:52 +01:00
Pyritie
90d26fb597 lang 2025-08-10 12:05:06 +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
f74316154d slightly buffed tree tap amounts 2025-08-10 02:13:26 +01:00
Pyritie
fbbfe31ba8 mars farmland stuff, also fixed nox berry EGH recipe 2025-08-09 23:57:45 +01:00
Pyritie
5a5c5040fd fixed dust secondary texture 2025-08-09 23:57:23 +01:00
Pyritie
44acd49485 added more icon sets for dusts and rods 2025-08-09 21:56:24 +01:00
Pyritie
3b9b80f52d lang updates 2025-08-09 15:47:43 +01:00
Gustavo
97a81e4989 update emi category order 2025-08-09 12:11:15 +10:00
Gustavo
1bc04a7a04 add EMI category lang key 2025-08-09 12:05:21 +10:00
Gustavo
68e3dc10bc change depth lang key 2025-08-09 11:48:06 +10:00
Gustavo
253414026d lang key update 2025-08-09 10:44:20 +10:00