Jika/TFG
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
6,598 Commits 4 Branches 84 Tags
main
Commit Graph

2385 Commits

Author SHA1 Message Date
Pyritie
92a4574c88 fix a dupe with hp steam miners/rock breakers 2026-02-03 11:50:05 +00:00
Pyritie
8fd7cf3847 improvements to jagged tablelands + some skew for the rock layers 2026-02-03 01:34:28 +00:00
Pyritie
5aa82d80af make chorus flowers drop 100% of the time, but now more are required 2026-02-03 01:34:00 +00:00
Pyritie
260851074c Feature/venus stone ores (#2961) 
* langs

* fix veins

* missing knapping textures

* rename ignimbrite features

* new ores

* feature stuff

* entity tweaks
 2026-02-02 23:42:42 +00:00
Pyritie
b5b7e26fee update tfc gourmet 2026-02-02 22:52:24 +00:00
Pyritie
f678f084d4 fix recycling of laser cable 2026-02-02 18:23:28 +00:00
Pyritie
68d0681c0b buff helium3 from asurine 2026-02-02 17:48:35 +00:00
Pyritie
4c208a0928 #2927 2026-02-02 17:46:54 +00:00
Pyritie
8a46a01b7c Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2026-02-02 17:44:30 +00:00
TomPlop
928c7129aa Heat battery (#2955) 
* heat battery and tooltips

* Add tooltip back

* fix tooltip
 2026-02-02 17:32:49 +00:00
Pyritie
2c9c5a2fd5 adjust stray HP, add gurman notes to changelog 2026-02-02 17:21:54 +00:00
Pyritie
3c6b79adc9 fix wrong gurman tags 2026-02-02 15:23:37 +00:00
Pyritie
dd3e90f428 fix recycling for laser pipes 2026-02-02 15:11:54 +00:00
Pyritie
19bf4de976 gurman update 2026-02-02 14:54:21 +00:00
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
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
08065dc12a fix raw oil vacuumizer recipe 2026-02-01 23:30:01 +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
90d0c8e915 more rockwool for the RTM coils 2026-02-01 20:03:03 +00:00
Pyritie
a74407c10c tidy colors and isotopes 2026-02-01 19:02:40 +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
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
365acb1e9e recipes and fauna data 2026-02-01 17:21:10 +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
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
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
c30ebf249b add kinetic bridge #2881, pakku 2026-01-31 15:24:40 +00:00
Pyritie
5a43e40aa4 removed armor welding bonus cuz it's complicated #2841 2026-01-31 14:50:18 +00:00
Pyritie
d4da49043a #2913 fixes missing heat data for some tag prefixes 2026-01-31 14:49: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