Commit graph

6565 commits

Author SHA1 Message Date
Pyritie
b9e14a46e0 tags for damage types #2868
Related Work Items: #28
2026-02-02 13:50:27 +00:00
Pyritie
fb87520e22 fix concrete dupe #2948, fix other stone recycling recipes 2026-02-02 13:11:12 +00:00
Pyritie
3fb458b0a2 cl 2026-02-02 12:24:25 +00:00
Pyritie
47dce4a489 make void upgrade cheaper 2026-02-02 12:23:59 +00:00
Pyritie
0135b40c95 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2026-02-02 12:23:30 +00:00
Mqrius
bfc385ea8a
Fix method overload (#2946)
There was never actually any overload?
2026-02-02 12:22:24 +00:00
Redeix
961786b8ee
egh update (#2950)
* egh update

* changelog and config

* add spore blossom, remove beneath leaves (those are for mars)

Signed-off-by: Pyritie <pyritie@gmail.com>

* Update tags.beneath.js

Signed-off-by: Pyritie <pyritie@gmail.com>

---------

Signed-off-by: Pyritie <pyritie@gmail.com>
Co-authored-by: Pyritie <pyritie@gmail.com>
2026-02-02 12:21:48 +00:00
Pyritie
f92ce6e6df lowered the % of tiny dusts from ores 2026-02-02 12:02:16 +00:00
Pyritie
255e65e178 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2026-02-02 00:46:50 +00:00
Pyritie
952370e6da actually removes a bunch of recycling recipes for disabled items 2026-02-02 00:46:48 +00:00
thederpysockdude123
63b3ad76bb
Added roe to the mealbags whitelist (#2945)
* Added roe to the mealbags whitelist

Signed-off-by: thederpysockdude123 <thederpysockdude123@gmail.com>

* much more epic solution :D

Signed-off-by: thederpysockdude123 <thederpysockdude123@gmail.com>

---------

Signed-off-by: thederpysockdude123 <thederpysockdude123@gmail.com>
2026-02-01 18:18:04 -06:00
Pyritie
8fe763fcce Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2026-02-02 00:07:54 +00:00
Pyritie
e7eaef730f clean out some more missing recipe removals 2026-02-02 00:07:51 +00:00
thederpysockdude123
92e1c653a6
Added a couple recipes to egh (#2944)
* added a couple recipes to EGH

Signed-off-by: thederpysockdude123 <thederpysockdude123@gmail.com>

* some tag stuff to get it working lol

Signed-off-by: thederpysockdude123 <thederpysockdude123@gmail.com>

---------

Signed-off-by: thederpysockdude123 <thederpysockdude123@gmail.com>
2026-02-01 23:40:16 +00:00
Pyritie
6e147dbece modlist 2026-02-01 23:30:07 +00:00
Pyritie
08065dc12a fix raw oil vacuumizer recipe 2026-02-01 23:30:01 +00:00
Pyritie
675c159dfe fix #2942 2026-02-01 23:29:40 +00:00
OLOXpl
ecba52b775
cotta fix (#2940)
dupe fix + valid recipe
2026-02-01 16:44:59 -06:00
Pyritie
e772cd10ec Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2026-02-01 22:02:39 +00:00
Pyritie
9228cd7645 change hss-g coils, update mars quests, langs 2026-02-01 22:02:37 +00:00
OLOXpl
36125f7d5d
Dye mixing (#2938)
* Update recipes.dyes.js

added base 9 dye mixing as fluids + 2 custom ones as stated in the issue #2818

* Revert "Update recipes.dyes.js"

This reverts commit b06ed24bf42fafc4233c6c6278fa5199e5542bfd.

* Update recipes.dyes.js

added base 9 dye mixing as fluids + 2 custom ones as stated in the issue #2818
attempt nr 2

* barrel recipe

barrel recipes and fix due to my colour blindness (;

---------

Signed-off-by: OLOXpl <125832723+OLOXpl@users.noreply.github.com>
2026-02-01 15:45:44 -06:00
Pyritie
27cab596a9 add double rocket to quests 2026-02-01 21:07:46 +00:00
Pyritie
177fa41697 convert more bucket quests into checkboxes 2026-02-01 20:13:06 +00:00
Pyritie
f3888958a2 pakku 2026-02-01 20:03:08 +00:00
Pyritie
90d0c8e915 more rockwool for the RTM coils 2026-02-01 20:03:03 +00:00
Pyritie
614472d659 quest tweaks 2026-02-01 20:02:41 +00:00
Pyritie
679cd48f38 add optional pouch 2026-02-01 19:16:17 +00:00
Pyritie
79f5afe347 langs, quest for toolbelt 2026-02-01 19:14:16 +00:00
Pyritie
852d31a271 fix #2839 2026-02-01 19:04:37 +00:00
Pyritie
a74407c10c tidy colors and isotopes 2026-02-01 19:02:40 +00:00
Pyritie
4db618ff37 langs 2026-02-01 19:02:33 +00:00
Pyritie
7a1ed98f5d Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2026-02-01 18:55:57 +00:00
Pyritie
c9c60944bb fix quest 2026-02-01 18:25:44 +00:00
Pyritie
5872199c7a emi tabs 2026-02-01 18:25:35 +00:00
TomPlop
3b3ae9c4f0
Oupsi Oupsi (#2937)
Signed-off-by: TomPlop <tomdidome@gmail.com>
2026-02-01 18:18:26 +00:00
Pyritie
d8bebc627c rename mars food tags 2026-02-01 18:04:33 +00:00
Pyritie
41bfc7397c update veins 2026-02-01 18:02:34 +00:00
Pyritie
2203ad942a Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2026-02-01 17:47:31 +00:00
Pyritie
fbbb9715d9 langs 2026-02-01 17:47:29 +00:00
Pyritie
e30b293440 fix #2928, update cl 2026-02-01 17:44:41 +00:00
OLOXpl
9e0c303438
Update recipes.dyes.js (#2925)
* Update recipes.dyes.js

added base 9 dye mixing as fluids + 2 custom ones as stated in the issue #2818

* Revert "Update recipes.dyes.js"

This reverts commit b06ed24bf42fafc4233c6c6278fa5199e5542bfd.

* Update recipes.dyes.js

added base 9 dye mixing as fluids + 2 custom ones as stated in the issue #2818
attempt nr 2
2026-02-01 17:43:07 +00:00
Pyritie
849f6409d5 Merge branch 'dev' into feature/wab-1.4 2026-02-01 17:37:25 +00:00
Pyritie
9cf62b2a80 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2026-02-01 17:37:15 +00:00
Pyritie
365acb1e9e recipes and fauna data 2026-02-01 17:21:10 +00:00
Pyritie
b2fe5d351a add them to biomes 2026-02-01 17:20:59 +00:00
Pyritie
40ddd4f30e field guide for new mobs 2026-02-01 16:53:05 +00:00
TomPlop
50eff2f5b9
Fission energy rework (#2931)
* everything should be fine

* Balance early power (#6)

* balance update

* Add textures

* last balance tweaks

* more balance

* Fix conflicts

* Balance early power (#8)

* balance update

* Add textures

* last balance tweaks

* Oupsi

* more fixes

* add changed quests

* push latest balance

* fix tallow

* add btx

* Update quests

* Oups

* Adding some nuclear stuffs so I can merge my branches

* Isotopic solvent stuff (#10)

* push

* fix iconset issue

* adding all the textures change

* add more stuffs

* Push recipes

* new stuffs

* add stuffs

* more changes

* add textures and some recipes

* tons of change

* fix texture

* add textures and other stuffs

* more recipes

* add recycling for fission rods

* more recipes

* fix fluid textures

* comment out FLiBe again and balance rods

* fix fluids

* some latest fix

* fix more texture

* more recipe changes

* more recipes

* some last minute balance changes

* add quests

* fix conflict

* more fixes

* fix components

* var to const

---------

Co-authored-by: Spicy Noodles <93035068+SpicyNoodle5@users.noreply.github.com>
2026-02-01 10:52:11 -06:00
Pyritie
4ce5226af9 fix it for realsies 2026-02-01 16:21:03 +00:00
Pyritie
e5c0dd2642 pakku 2026-02-01 16:10:03 +00:00
Pyritie
ecd7c3a782 github moment 2026-02-01 16:07:37 +00:00