Commit graph

6758 commits

Author SHA1 Message Date
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
Pyritie
90535daf1a add new skulls to mars, update loot tables, add new recipes, hide items 2026-02-01 16:05:14 +00:00
Coox1e
45ac3cb2a4
Added furnace recipe for dead grass to match drying recipe (#2935)
Signed-off-by: Coox1e <166007852+Coox1e@users.noreply.github.com>
2026-02-01 12:35:04 +00:00
woopSmile
30ddad417a
Add bluemap support v2 (#2922)
* Add pack.mcmeta for TFG_fix resource pack

Signed-off-by: woopSmile <tristanjobin@gmail.com>

* added the rest of the files

my bad, still learning to use github

Signed-off-by: woopSmile <tristanjobin@gmail.com>

---------

Signed-off-by: woopSmile <tristanjobin@gmail.com>
2026-01-31 14:46:29 -06:00
Inceitious
98241ed899
Bugfix/blast property (#2920)
* Removing blast property

* extractor recipes

* Hid unused molten fluids

* Updated hidden fluids

* Removed molten rocket alloy

* Typo and removed molten desh
2026-01-31 14:43:47 -06:00
GameStar
8b1403031e
double rockets (#2910)
* first things

* yes

* legally distinct rockets

* Update tags.js

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

---------

Signed-off-by: Pyritie <pyritie@gmail.com>
Co-authored-by: Pyritie <pyritie@gmail.com>
2026-01-31 14:42:37 -06:00
Pyritie
34c4bb5fb4 stuff and things 2026-01-31 18:50:46 +00:00
Pyritie
11d83ff913 changelog, fix mars tags 2026-01-31 17:17:04 +00:00
Pyritie
c30ebf249b add kinetic bridge #2881, pakku 2026-01-31 15:24:40 +00:00
Pyritie
e8116ba65b changelog 2026-01-31 14:53:15 +00:00
Pyritie
5a43e40aa4 removed armor welding bonus cuz it's complicated #2841 2026-01-31 14:50:18 +00:00
Pyritie
0ee8774718 add better vessel warning 2026-01-31 14:49:20 +00:00
Pyritie
d4da49043a #2913 fixes missing heat data for some tag prefixes 2026-01-31 14:49:06 +00:00
Pyritie
80198e0a4c langs 2026-01-31 14:41:06 +00:00
Pyritie
b1fddab3e9 cleanup rock loot tables 2026-01-31 14:27:52 +00:00
Pyritie
e90cccbcc8 mars quartzite, fix tetramethoxysilane #2898 2026-01-31 14:27:25 +00:00
Pyritie
ffaced187f more loot for piglin brutes 2026-01-31 14:25:46 +00:00
Pyritie
14d20f48da #2870 fix rnr roof tags, remove framing stair/slab compat with additional placements 2026-01-31 13:09:45 +00:00
Pyritie
bd3895e217 nerf some of gurman's dumplings 2026-01-31 12:18:18 +00:00
Pyritie
fe85a29b31 #2912 fix rnr slab and stair speed bonus 2026-01-31 12:17:32 +00:00
Pyritie
bc15723eca add loot table for piglin brutes 2026-01-31 11:56:52 +00:00
Pyritie
0aa56d5a90 small chromite groundcover texture 2026-01-31 11:03:39 +00:00
Pyritie
61ec1c6356 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2026-01-31 11:03:04 +00:00
Xikaro
7f3c432a96
Merge pull request #2917 from TerraFirmaGreg-Team/feature/template_change
Template Update
2026-01-31 14:30:05 +05:00
Xikaro
125daf12fe ISSUE_TEMPLATE 2026-01-31 14:29:48 +05:00
Xikaro
0c358bf181 Update BUG_REPORT.yml 2026-01-31 14:25:18 +05:00
Xikaro
c27aa89da1 ISSUE_TEMPLATE 2026-01-31 14:23:30 +05:00
Redeix
c2007496ca fix feedback 2026-01-30 17:40:35 -06:00
Redeix
fcf0b8a19e oops 2026-01-30 17:19:33 -06:00
Redeix
e9b0de90db please? 2026-01-30 17:14:07 -06:00
Redeix
f2b079aac5 maybe this? 2026-01-30 17:12:41 -06:00
Redeix
22c884cf67 maybe this? 2026-01-30 17:12:30 -06:00
Redeix
87d0cda1d5 md 2026-01-30 17:11:43 -06:00
Redeix
3046ee6906 cleanup 2026-01-30 17:10:21 -06:00
Redeix
12223d4687 launcher change 2026-01-30 17:04:37 -06:00
Redeix
40c95d6635 Github Issue Templates 2026-01-30 16:59:37 -06:00
Pyritie
328241e593 change small wood gear to lumber instead of sticks 2026-01-30 22:51:58 +00:00
Pyritie
6048c27421 some more vexxed textures 2026-01-30 22:51:46 +00:00