Commit graph

601 commits

Author SHA1 Message Date
Pyritie
a04e4c55ba Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-09-02 01:54:59 +01:00
GameStar
ab7d6e5173
some backpack tweaks and updated backpack quests (#1741)
* 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

* recipe changes

* quest changes

* Update sophisticatedbackpacks-server.toml

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

* Update sns-server.toml

* horseshoes

---------

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
2025-09-02 00:29:46 +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
da3a541439 chinese field guide ores 2025-08-31 12:32:20 +01:00
Pyritie
012143feb8 emi 2025-08-31 12:30:39 +01:00
Pyritie
04df604943 langs 2025-08-31 02:26:37 +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
23dd0eb36f a bunch more better end textures 2025-08-30 20:06:39 +01:00
Pyritie
bb59f9040b new chinese translation! 2025-08-29 23:50:30 +01:00
Pyritie
6a260712ab emi categories 2025-08-29 13:07:57 +01:00
Pyritie
bf5705d320 ae2 quest langs 2025-08-29 13:07:35 +01:00
GameStar
934aa209d9
some container changes (#1716)
* 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

* sack tags

* sewing table change

* Update tags.js

* straw knapping

* Update CHANGELOG.md

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

---------

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
2025-08-27 18:18:49 -05:00
Pyritie
bc7e3122d0 lang 2025-08-27 21:38:49 +01:00
Pyritie
5081209de7 langs 2025-08-26 19:59:39 +01:00
Pyritie
6bdff96aee fix sangnum clay block texture 2025-08-26 01:42:16 +01:00
Pyritie
5bec53e7cd spice stuff! 2025-08-26 00:00:43 +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
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
d7cccd77b4 liquid fuel blaze burner quest + langs + CL 2025-08-25 01:47:45 +01:00
Pyritie
31edc20312 fix mars water lang key 2025-08-24 11:51:49 +01:00
Pyritie
4c68e2ab59 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-08-24 11:47:04 +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
69fa9c1b23 lang 2025-08-24 00:53:03 +01:00
Pyritie
6c27029842 fucking formatting 2025-08-23 22:19:51 +01:00
Pyritie
9b6cc9cbd1 remove old bedrock miner quest, fix typo 2025-08-23 22:18:05 +01:00
Pyritie
143db245ab fix typo 2025-08-23 22:15:49 +01:00
Pyritie
4812aa5634 langs 2025-08-23 22:01:57 +01:00
Pyritie
8d7abd4cf7 langs 2025-08-23 21:54:21 +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
Frédéric Nieto
c7769c1382
fix: Fixed Oven quest after tongs were removed, still need russian localization update (#1677) 2025-08-23 16:53:12 +01:00
Pyritie
3b57773792 langs 2025-08-23 13:03:23 +01:00
Pyritie
1b8cec25ff some new quests 2025-08-22 23:44:08 +01:00
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