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

6291 commits

This branch
This branch
All branches
Author SHA1 Message Date
Pyritie
2e10938e1c
Refactor of material recipes (#2732) 
* refactor

* phew

* drive-by fix

* all done I think

* cleaned up some lines that didn't do anything, added more comments, removed log spam
 2026-01-14 21:36:52 +00:00
Inceitious
8c6551dda6
Feature/tidying recipes (#2733) 
* Added tags to support recycling

* Cleaned up recipe bloat for recycling

* Merged loops

* Remove constant

* Remove constant

* I think this is what you mean

* Updated tags

* Sorry!

---------

Co-authored-by: Redeix <redeix.m@gmail.com>
 2026-01-14 13:04:59 -06:00
MetenBouldry
b94347d9e1
Translate book uk_ua (#2743) 
* Translate Book

Ukraine

* Update Crowdin configuration file

* Update Crowdin configuration file

* Update Crowdin configuration file

* Update Crowdin configuration file

* Delete basic_automation.json

* Up Translate

* Translate Book

* Delete kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_tips/infinite_resources.json

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

* Delete kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/beneath/burpflower.json

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

* Translate Book uk_ua

* Del

* Book

Restructuring of the book

* Update book uk_ua

* Update primitive_alloys.json

Signed-off-by: MetenBouldry <94766011+MetenBouldry@users.noreply.github.com>

* Fix typo in blast furnace entry text

Signed-off-by: MetenBouldry <94766011+MetenBouldry@users.noreply.github.com>

* Update bloomery.json

Signed-off-by: MetenBouldry <94766011+MetenBouldry@users.noreply.github.com>

---------

Signed-off-by: Pyritie <pyritie@gmail.com>
Signed-off-by: MetenBouldry <94766011+MetenBouldry@users.noreply.github.com>
Co-authored-by: Pyritie <pyritie@gmail.com>
 2026-01-14 12:34:50 -06:00
Mqrius
c9a2395ee9
Update CHANGELOG.md 
Signed-off-by: Mqrius <Nuntius.Marii@Gmail.com>
 2026-01-14 11:13:51 +01:00
Maxiffon
2e87d36b4b
Added patchouli translation for the buildinggadgets2 mod (#2737) 
* Add files via upload

langs (patchouli_books)

Signed-off-by: Maxiffon <39791678+Maxiffon@users.noreply.github.com>

* Update basics.json

Signed-off-by: Maxiffon <39791678+Maxiffon@users.noreply.github.com>

---------

Signed-off-by: Maxiffon <39791678+Maxiffon@users.noreply.github.com>
 2026-01-14 08:32:26 +00:00
Pyritie
e9506d17d0 added some uses to mars charnia, to mirror kelp 2026-01-13 17:33:51 +00:00
Pyritie
a593d40d93 langs 2026-01-13 17:11:08 +00:00
Pyritie
50028491eb update emi categories 2026-01-13 17:10:50 +00:00
Pyritie
ce3c14ae6d remove sylvite 2026-01-13 17:09:08 +00:00
Redeix
e9e4ad90cf
Greenhouse Rework Finishing Touches (#2719) 
* asset changes

* recipe changes

* lang and quests

* fixes

---------

Signed-off-by: Redeix <redeix.m@gmail.com>
 2026-01-13 11:11:07 +00:00
Xtrial-01
f7cd09c4a0
hypertube recipe (#2723) 2026-01-12 20:30:58 +00:00
Pyritie
241b80a4a0 migrate everything over to linuxUnfucker() 2026-01-12 15:32:18 +00:00
Pyritie
e74043472d cleanup this recycling file 2026-01-12 14:53:58 +00:00
Pyritie
75f0fc13ce fix vacuum engine intake model 2026-01-12 14:48:02 +00:00
Pyritie
45198604c0 cl 2026-01-12 14:00:50 +00:00
Pyritie
1fceb61e43 fix helve hammer blows being < 1 #2584 2026-01-12 13:58:08 +00:00
Pyritie
8026bfed69 reduce frequency of wolf sounds at night, make crickets etc look for grass plants instead of grass blocks #2680 2026-01-12 13:56:51 +00:00
Pyritie
1cbc81edf3 fix #2707 2026-01-12 13:45:44 +00:00
Pyritie
9870970c89 fix #2714 2026-01-12 13:44:45 +00:00
Pyritie
79e404c1dd update pakku + create picky waterwheels again 2026-01-12 13:37:45 +00:00
Pyritie
a27fe966a8 langs 2026-01-12 13:28:47 +00:00
Pyritie
543128e6e8 blockrunner compat 2026-01-12 09:59:54 +00:00
Yan
05cc0a8a59
feat: update zh_cn translation for new drinkings (#2721) 
Co-authored-by: 闫茂源 <yanmaoyuan@baijiayun.com>
 2026-01-12 09:09:26 +00:00
Inceitious
96b0e79aff
Feature/tfc tools integration (#2716) 
* Bugfix/Scraping Knives

Code should be more robust now

* Recycling

---------

Co-authored-by: Redeix <redeix.m@gmail.com>
 2026-01-11 22:01:08 -06:00
Pyritie
7e2816c917 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2026-01-12 01:04:08 +00:00
Pyritie
9fb45e2e0c changelog, fix invar crucible alloying, add tooltip to ice slush 2026-01-12 01:04:03 +00:00
Inceitious
882c477037
Feature/drinkable (#2708) 
* Drinkable ice slush

* Update thirst value

* Added quests

* Edited some text

* a

---------

Co-authored-by: Redeix <redeix.m@gmail.com>
 2026-01-11 13:48:11 -06:00
Inceitious
563bf2306a
Incorrect tiering for extractor for Bis and Black Bronze (#2684) 
* Incorrect tiering for extractor for Bis and Black Bronze

Bismuth Bronze and Black Bronze wrong tiering in extractor
Added some documentation

* Update recipes.materials.js

* Updated

* Updated

* Unified tiering

* Revert "Unified tiering"

This reverts commit ea9e00d2bca8f70c2f95bb1362766edcc9e29498.

---------

Co-authored-by: Redeix <redeix.m@gmail.com>
 2026-01-11 13:46:10 -06:00
thederpysockdude123
17be437196
Added alloy smelter recipes for jar lids (#2705) 
* added alloy smelter recipes for jar lids

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

* remove TFC jar lid anvil recipe

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

* Update recipes.js

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

* new jar lid recipe

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

* recipes changed for consistency

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

* Update recipes.metals.js

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

* Update recipes.metals.js

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

* Update recipes.metals.js

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

* Update recipes.removes.js

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

---------

Signed-off-by: thederpysockdude123 <thederpysockdude123@gmail.com>
Co-authored-by: Redeix <redeix.m@gmail.com>
 2026-01-11 13:41:56 -06:00
Pyritie
5df4fcfcc6 update cl 2026-01-11 16:36:47 +00:00
Pyritie
7636a38223 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2026-01-11 12:27:29 +00:00
Pyritie
6c59adbcf7 langs 2026-01-11 12:27:27 +00:00
Redeix
900e1de8e9
The big green PR (#2694) 
* blocks

* more textures

* more textures more textures

* blocks

* more textures

* more textures more textures

* blocks

* more textures

* more textures more textures

* blocks

* more textures

* more textures more textures

* firmalife gh stuff

* chloroplasts and brick regex

* gh recipes

* pisciculture fishery

* I am going insane

* more casings = more gooder

* rotten voiding cover

* greenhouse glory

* Is this it chat

* not needed

Signed-off-by: Redeix <redeix.m@gmail.com>

* missed in conflicts

Signed-off-by: Redeix <redeix.m@gmail.com>

* consumerism

* re-add tag import

* remove unused object map

* id normalizer function

---------

Signed-off-by: Redeix <redeix.m@gmail.com>
 2026-01-10 19:30:46 -06:00
Pyritie
3899512635 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2026-01-10 22:45:04 +00:00
Pyritie
edd6d3eb51 fix #2687 2026-01-10 22:32:01 +00:00
Pyritie
334e435042 adjusted mars wind volume 2026-01-10 22:29:53 +00:00
Pyritie
012da662f2 fix some mars plants self-destructing 2026-01-10 21:31:20 +00:00
Pyritie
6178c5cb1d fixed rocket fuel quest not using lang IDs 2026-01-10 21:13:03 +00:00
Pyritie
277f8b8973 actually the bee is from firmalife 2026-01-10 20:46:39 +00:00
Pyritie
a6ec313d09 blossom berry counts as a flower for bees 2026-01-10 20:39:16 +00:00
Pyritie
05fc0aa6f6 bees ignore gravity in space 2026-01-10 20:10:06 +00:00
Pyritie
515461560e changed blood lily to be visible all year-round (as well as in the beneath) 2026-01-10 18:41:54 +00:00
Kieran
218562107c
Remove duplicate quest entry from ore processing chapter (#2681) 
Signed-off-by: Kieran  <78378380+KieranBeals@users.noreply.github.com>
 2026-01-10 18:14:09 +00:00
Pyritie
6b778d7ab1 langs 2026-01-10 11:55:56 +00:00
Pyritie
a1450016d3 langs 2026-01-10 00:40:47 +00:00
Pyritie
8b28f2d652 pizza unification 2026-01-10 00:39:38 +00:00
Pyritie
68cfeca7fa rock salt and sylvite are actually the same thing 2026-01-10 00:33:34 +00:00
Pyritie
936a098ff1 add tfc powders to dye tags 2026-01-10 00:33:23 +00:00
Pyritie
68e5731474 fix turning any cobble into domum cobble extra 2026-01-10 00:33:08 +00:00
Pyritie
4b85045325 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2026-01-10 00:18:14 +00:00