illuc/neuralgia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
5902 commits 1 branch 0 tags 1.5 GiB
Commit graph

3272 commits

Author SHA1 Message Date
GameStar
630d39bc78
add first smr boosters (#2381) 
* dfgdfgdfgdfg

* molecules

* ran lang merger

---------

Co-authored-by: Pyritie <pyritie@gmail.com>
 2025-12-14 01:57:31 +00:00
Pyritie
0c806488e6 some crop fixes for the greenhouse renderer 2025-12-13 23:33:23 +00:00
Pyritie
e3be7d6d1d medicine rework 2025-12-13 23:30:51 +00:00
Pyritie
4ef05a397d comment out greate belt stuff for now 2025-12-13 23:14:20 +00:00
Pyritie
3b05453c88 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-12-13 22:32:43 +00:00
Pyritie
6862c7a7d4 langs 2025-12-13 22:27:26 +00:00
Pyritie
546c598bc4 add item models for pills 2025-12-13 22:12:14 +00:00
Mqrius
c40ffcc0bf
Move boiled eggs to food processor to deconflict with cooked egg, fix pickled egg recipe name typo (#2407) 
* Move boiled eggs to food processor to deconflict with cooked egg

Signed-off-by: Mqrius <Nuntius.Marii@Gmail.com>

* Move boiled_egg recipe, fix pickled egg recipe name

Signed-off-by: Mqrius <Nuntius.Marii@Gmail.com>

---------

Signed-off-by: Mqrius <Nuntius.Marii@Gmail.com>
 2025-12-13 20:14:22 +00:00
thederpysockdude123
ea04149a63
updating tags of cover facades/domum ornamentum stuff to include treated wood planks (#2404) 
* Updated tags to include treated wood planks.js

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

* Updated tags to include treated wood planks.facades.js

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

* Update tags.facades.js

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

---------

Signed-off-by: thederpysockdude123 <thederpysockdude123@gmail.com>
 2025-12-13 12:23:25 -06:00
thederpysockdude123
5f6089dd60
added tfc:foods tag to a whole bunch of tfg foods (#2405) 
* Update items.food.js

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

* Update items.food.js

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

---------

Signed-off-by: thederpysockdude123 <thederpysockdude123@gmail.com>
Co-authored-by: Redeix <brayden.j.m.ford@gmail.com>
 2025-12-13 12:21:49 -06:00
Pyritie
22ed55306a electric greenhouse renderer 2025-12-13 18:11:56 +00:00
Pyritie
2a61036c5b fix cobalt brass illager tools missing properties 2025-12-13 15:13:01 +00:00
Pyritie
dcafe25325 fix swine-steel axes from not having the lumberjack property 2025-12-13 15:12:47 +00:00
Pyritie
e5a4a356b3 remove c&a accumulator 2025-12-13 14:47:35 +00:00
Pyritie
8ed92f17f8 update changelog 2025-12-13 14:10:37 +00:00
Redeix
35a14ab62c
particles (#2401) 2025-12-13 11:59:20 +00:00
Mqrius
4ac447cf62
Add circuit to Silicon Tetrachloride (#2387) 
Fixes #2383, deconflicts with Polydimethylsiloxane (and various other recipes!)

Signed-off-by: Mqrius <Nuntius.Marii@Gmail.com>
 2025-12-13 11:57:59 +00:00
Pyritie
73d7bd46ed whoops 2025-12-13 03:01:08 +00:00
Pyritie
a65289562d new belts! 2025-12-13 03:00:58 +00:00
Pyritie
24bd4b9fca langs 2025-12-12 22:11:14 +00:00
Pyritie
a9017c622a Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-12-12 22:10:38 +00:00
Epicificator
2a9f70e35e
add acetic acid and vinegar conversion (#2390) 
* add acetic acid and vinegar conversion

Signed-off-by: Epicificator <143143550+Epicificator@users.noreply.github.com>

* add circuit condition to prevent conflicting with dye recipes

Signed-off-by: Epicificator <143143550+Epicificator@users.noreply.github.com>

* changed machine to mixer, and voltage tier to mv

Signed-off-by: Epicificator <143143550+Epicificator@users.noreply.github.com>

---------

Signed-off-by: Epicificator <143143550+Epicificator@users.noreply.github.com>
 2025-12-12 15:35:44 -06:00
Pyritie
a9613b372f remove logging 2025-12-11 23:44:25 +00:00
Redeix
29f4d54af3
Tags (#2385) 
Signed-off-by: Redeix <brayden.j.m.ford@gmail.com>
 2025-12-11 17:37:22 -06:00
Pyritie
e85d833bce improved tooltips, added boots 2025-12-11 01:10:31 +00:00
Pyritie
1ed6ffb51f added machine recipes for tongs 2025-12-11 00:45:22 +00:00
Pyritie
3f8bd83a1a fixed some dupes? 2025-12-11 00:43:31 +00:00
Pyritie
c0ddacd1cb fix this for nether bricks too 2025-12-10 23:45:17 +00:00
Pyritie
0ec6f5da04 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-12-10 23:30:00 +00:00
Pyritie
f0db35c0ca fix #2373 2025-12-10 23:29:57 +00:00
Pyritie
a6f8024aee some different icons for things 2025-12-10 23:28:51 +00:00
Pyritie
8541c99ab0 langs 2025-12-10 23:22:37 +00:00
Pyritie
5be37dc97f tooltips and tags for more hot/cold/light stuff 2025-12-10 23:22:23 +00:00
Pyritie
c668d32ffa maybe overpowered bastion scythe 2025-12-10 23:02:28 +00:00
Pyritie
9f6c342e8d better warning icons 2025-12-10 21:42:28 +00:00
Redeix
bb9c0b608c
A bunch of random stuff (#2365) 2025-12-10 01:53:28 -06:00
Pyritie
ebb7fecf20 improvements to the hot or not levitation 2025-12-10 01:08:27 +00:00
Pyritie
068466301b mob effect icons + langs 2025-12-10 01:08:09 +00:00
Pyritie
f653703615 tags for hotornot 2025-12-09 18:51:02 +00:00
Pyritie
30cfcbff81 well no wonder this wasn't working 2025-12-09 18:47:08 +00:00
Pyritie
28a657494f some leftover items 2025-12-09 18:46:55 +00:00
Pyritie
d10723d5b7 which also means we can get rid of our overrides now 2025-12-09 15:50:36 +00:00
Pyritie
120d6e1c43 moved drinkable data to the right namespaces, renamed tfcgurman server script dir -> tfc_gurman, moved all alcohols to #tfg:alcohols instead of #tfc:alcohols, because agedalcohols is very fussy 2025-12-09 15:48:42 +00:00
Pyritie
e69ae9ff6d t2 space suit now also gives fire prot - it's not really _needed_, but it does make tfchotornot stop throwing your inventory items away 2025-12-09 15:41:48 +00:00
Pyritie
7896b5f7fd doubled the durability of space suits 2025-12-09 15:40:22 +00:00
Pyritie
c04b3eacb0 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-12-09 12:23:54 +00:00
Pyritie
445809cc87 0.11.10 2025-12-09 12:23:52 +00:00
Pyritie
d45156ef30 adjusted spawn weights for primitive illagers 2025-12-09 11:48:55 +00:00
Pyritie
6cea8ec77b fixed some line breaks in tooltips 2025-12-09 11:48:20 +00:00
Pyritie
904c9389fc langs 2025-12-09 11:35:16 +00:00