Commit graph

6514 commits

Author SHA1 Message Date
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
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
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
Pyritie
cafa289f76 remove create stock bridge #2915 2026-01-30 21:45:00 +00:00
Yan
00e5a9b85f
Update zh_cn translation for patchouli_book of corps and bloomery (#2911)
* feat: update zh_cn translation for new drinkings

* feat: update zh_cn lang for patchouli book

* feat: update zh_cn translation for tfg patchouli_book

* feat: update zh_cn for patchouli_book corps and bloomery

* fix: fix conflicts

---------

Co-authored-by: 闫茂源 <yanmaoyuan@baijiayun.com>
2026-01-30 12:19:48 +00:00
Coox1e
4462abee2c
Added assembler recipe for framed cube (#2889)
Signed-off-by: Coox1e <166007852+Coox1e@users.noreply.github.com>
2026-01-29 20:44:56 -06:00
Pyritie
438a2349c3 #2904
Related Work Items: #29
2026-01-30 00:49:28 +00:00
Pyritie
0d64c4df4f #2876 2026-01-30 00:47:38 +00:00
Pyritie
a0085fa56b fix #2905 2026-01-29 23:50:17 +00:00
Pyritie
783a87b2ff fix #2909 2026-01-29 23:50:11 +00:00
Pyritie
79a169de20 added different oil spouts, changed ore veins a little 2026-01-29 23:35:02 +00:00
Pyritie
941c5848a3 #2862 sedimentary carbonate dust to flux 2026-01-29 12:21:30 +00:00
Pyritie
af398a45d8 #2900 add shapeless recipes to convert old stone dusts into new 2026-01-29 12:17:47 +00:00
Pyritie
a3cbbc0dcf Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2026-01-29 12:07:52 +00:00
Pyritie
e080411447 fix #2899 2026-01-29 12:07:47 +00:00
Pyritie
52f686c179 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2026-01-28 23:05:17 +00:00
Pyritie
34039b2517 langs 2026-01-28 23:05:13 +00:00