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

55 commits

Author SHA1 Message Date
Redeix
fbc456723d
Fluid tag unification (#2194) 
* eslint change

* utility scripts

* cleanup

* beaker fluid change
 2025-11-09 18:22:17 +00:00
Redeix
7ee6ff2c04
bioline materials (#2191) 
* materials

* lang

* materials

* utility linting

* data and linting

* lang
 2025-11-08 03:40:26 -06:00
Redeix
18a689b4ad
Paving Cart Files (#2144) 
* paving cart files

* Updated Changelog

* idk why my changelog was behind

Signed-off-by: Redeix <brayden.j.m.ford@gmail.com>

---------

Signed-off-by: Redeix <brayden.j.m.ford@gmail.com>
 2025-11-02 13:02:45 +00:00
The Compendium System / The Atlassian Collective
9943370b28
Flax Bundles (#2080) 
* yay flax bundle

* yay flax recipes and scraped flax pile

* more flax stuffs

* yay vintage improvements isn't useless now

* the one missing letter of doom

---------

Co-authored-by: Pyritie <pyritie@gmail.com>
Co-authored-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
 2025-10-25 16:56:17 +01:00
Pyritie
51573b0db2 fix glacio/europa marker 2025-10-12 18:29:52 +01:00
TomPlop
744f34cda3
Finishing adding the Fission Reactor to TFG (#1951) 
* Some cleaning

* Some multiblocks change

* more changes

* More changes to nuclear line adding coolant

* Graphite line

* Last changes to Fission Line

* Finishing the nuclear line

* add impure moderator

* fix removal of plutonium

* fix Tag Prefix
 2025-10-04 16:44:53 +01:00
Pyritie
bcbf7664f4 langs, updated changelog, basic mv circuits now need sequenced assembly 2025-10-04 15:26:06 +01:00
TomPlop
3d3795f828
Adding Nuclear Fission (#1926) 
* Fix Chute Assembler recipe

* Fix quest tips beekeper

* Fix for wine and jar alloy smelter conflicting recipe

* fix to fit #1141

* mistakes were made

* Fix jetpack 1 quest mv

* Mistake again

* Revert the fix on chute

* Adding compatibility for nuclear Vazde mod

* Add textures to fission rods

* Updating fission with Vazde mod

* more fixes and add new rotor bismuth

* More changes

* switch recipes for fission reactor

* More fixes for nuclear mod

* more fixes

* Disable tbu

* Nerf Heavy Water cost

* Fix alloy
 2025-09-29 11:26:32 -05:00
Redeix
4c0f2c5428
Growth Chamber (#1924) 
* growth_chamber

* growth_chamber blocks

* more textures

* more casing stuff

* sterilizing pipes

* forgor

* monitor light

* emissives and casings!

* checkpoint

* final call
 2025-09-29 00:53:42 +01:00
Pyritie
0b1c7af4d9 so long, deprecated items 2025-09-26 23:06:59 +01:00
Redeix
f76596b3d1
couple fixes (#1900) 
* needle fix

* furnace minecart textures
 2025-09-25 23:42:09 -05:00
Adrien Vidal
0a8e68e7d0
[Molden] Stone TFG-fication continued (#1845) 
* Fixed some rock type tags

* Nether mossy cobbles

* nether mossy bricks

* mossy bricks

* nether brick recipes + deepstate sets + typos

* cobble interaction index

* reformatting tables

* Region delimiters for stone blocks

* More shaped sets + deepslate recipes

+ missing landslide recipes
+ tables formatting for readability

* Other nether shaped blocks

+ A bit or reorganizing of recipes.rocks.js

* Many Space Stone Blocks

+ Stone Declaration Refactor
+ Many typo fixes
+ Moon Stone Recipes
+ Some Missing tags

* Tags Refactor + Missing Blocks

* definition fix

* remove console debugs

* Space stones cutting & Interractions

+ Breaker Duping Reformat
+ Missing Dripstone Brick
+ Missing Red Granite recipes
+ Misc bugfixes

* small fix

* Vanilla Stone + Red Sandstone Fix

+ Duper loop fix

* Undo .gitignore changes

* Venus sandstone stuff
 2025-09-16 15:54:54 -05:00
Redeix
568db16430
Dna syringes and stainless steel needle (#1759) 
Co-authored-by: Pyritie <pyritie@gmail.com>
 2025-09-09 00:17:04 -05:00
Adrien Vidal
96188e761d
TFG-fication of all exotic stone types (#1764) 
* Deepslate, Blackstone and Dripstone + hammer crushing refactor

* crackrack and space stones

* tags + stonecutting + fixes

* Moon deepslate set + QoL recipes + tags fixes

* pyroxenite tags

* Update tags.js

* Update constants.js

* Update constants.js

---------

Signed-off-by: Pyritie <pyritie@gmail.com>
Co-authored-by: Pyritie <pyritie@gmail.com>
 2025-09-09 00:16:27 +01:00
Pyritie
bf192d1390 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-09-03 22:16:05 +01:00
Pyritie
ede77ef950 textures for mars twigs, fixed models for saplings, some tags 2025-09-03 22:16:02 +01:00
Redeix
957da2cbba
bioreactor stuff (#1742) 
* bioreactor stuff

* Update recipes.js

Signed-off-by: Redeix <brayden.j.m.ford@gmail.com>

---------

Signed-off-by: Redeix <brayden.j.m.ford@gmail.com>
 2025-09-03 11:56:36 -05:00
GameStar
020d4f9018
Flax (#1735) 
* some flax stuff

* linen stuff

* flax line stuff

* flax again

* rapseed wild crop changes

* flax worldgen

* revert grooming station update

* more flax stuff

* trying to fix stuff

one doesn't work

* recipes and lang

* Update CHANGELOG.md

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* fixes

---------

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
 2025-08-31 19:14:14 +01:00
Pyritie
a7d71c8e6b added more variants of a few plans, added some leaf blocks to use as bushes, added some new feather groundcover and started work on some twigs 2025-08-31 02:25:11 +01:00
GameStar
5fb7ef9093
more mars entity stuff (#1697) 
* stuff

* Create wraptor.json

* Update tags.js

* fix wool

* eggs

* Update constants.js

* more recipe stuff

* doing tooltips the correct way

* oops

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

---------

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
 2025-08-25 21:18:46 +01:00
TomPlop
6eb2de0220
Mars ressources (#1569) 
* stupid git again

* First entry for the mars ore line

* Adding the Ostrum Harvester in its first version

* Adding new casings

* Adding the complete Mars Ore Line

* Bugs again

* Add ores and textures

* More changes

* Changes to heavy and semi water and more fluid veins

* Adding more crafting recipes

* More recipes

* weird

* nerf ores

* fix thorium

* Adding dusty ores

* More circuits change to gate IV at the end of Mars

* Fix multiblocks

* Changes to AE2

* Unified Pattern Provider and Interface

* Removing Bedrock

* Fully remove Bedrock Miner

* Disable many stuffs until Mars

* More fixes until Mars is out

* Requested changes

* Cleaning kubejs files

* Adding Moon Ore Line

* Change Mars water to Centrifuge

* Fix duplicate
 2025-08-22 12:41:27 +01:00
Gustavo
c349aa4ad7 revert commit to actually put them in lang files 2025-08-06 19:58:21 +10:00
Gustavo
cdf57686ba rename extruder molds 2025-08-06 19:31:02 +10:00
GameStar
d6b0715c52
Adding stuff related to tree saps + minor fixes (#1531) 
* tree juice changes

* fixed texture stretch

* glacian wool

* Update CHANGELOG.md

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* oops

* Update glacian_wool.png

---------

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
 2025-08-05 11:07:04 -05:00
TomPlop
91e0d36fa0
Rework of Large Solar Array (#1511) 
* Rework of Large Solar Array

* Add quests

* Fix Ad Astra to use the T1 photocell
 2025-08-02 23:09:49 -05:00
GameStar
125efd9ac1
Feature/tier3 rocket (#1483) 
* stuff for rocket

* worm

* Revert "worm"

This reverts commit fa2f0fc74727a7c7f15cbaae2365b8147b2e9313.

* Update blocks.js

* rocket stuff

* Update constants.js

* More

* final stuff

* probably disalbed everything

* Delete options.txt

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* Delete kubejs/startup_scripts/tfg/elements.js

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* dry ice change

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* vacuum freezer change

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

---------

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
 2025-07-30 20:33:50 +01:00
Nebby
cc4f15d6f7
Improved Etched Accessibility (#1473) 
* Feature.

* I did not forget about the changelog this time.

* Comply with Review

---------

Signed-off-by: Pyritie <pyritie@gmail.com>
Co-authored-by: Pyritie <pyritie@gmail.com>
 2025-07-29 16:30:57 +01:00
TomPlop
3c72e94109
Adding Nuclear Line on Mars (#1467) 
* Adding the Nuclear Line CPU Wafer

* merge

* Revert "merge"

This reverts commit b29b5e324f587042a7aad01a49cfdf63b33ab7b4.

* revert

* Revert "revert"

This reverts commit 38376879b37a1150bd84dfa524621c2ffe6350db.

* no change weird things happening to me

* add fluid textures

* Modification of nuclear line

* fix conflict for fluids

* first balance change

* fix conflict with recipes.rocks

* Nuclear Line

* Add the bromine line and more fixes

* Fully added back the bromine line

* Add nuclear energy line and more fixes

* fix conflit

* Add back the recipes change to gtceu for nuclear

* revert

* fix conflict

* One last try

* Adjust Reactor rates

* Added change to uranium dust commented out until Mars Update

* Remove long rod from nuclear pellet
 2025-07-28 20:02:05 +01:00
Gustavo
f3dfa471ec
Refactor & update to gt7 
* gt7 removed credits/coins

* port gregtech additions to java

* add eslint locally

* add style linting

* switch target ECMA standard

* run linter

* clean up a bunch of linter errors

* remove outdated greate API calls

* forgot about the TFC multi compat issue

* reverted greate recipe removals

* some more linting stuff

* fix some issues with greenhouse recipes

* fix up some material stuff

* fix recipe types

* - Fixed single block machine rendering (#1465)

* minor fixes and changes

---------

Signed-off-by: Pyritie <pyritie@gmail.com>
Co-authored-by: Pyritie <pyritie@gmail.com>
Co-authored-by: Redeix <59435925+Redeix@users.noreply.github.com>
 2025-07-28 12:27:06 +10:00
Vazde
b59a4e8136
Universal compost items (#1451) 
* Added universal compost

* Universal compost changes from comments
 2025-07-27 11:21:26 -05:00
GameStar
96d24e7b14
Feature/tier2 rocket bugfixes (#1422) 
* stuff for rocket

* worm

* Assets

* bugfix #1420

* bugfix for #1421

* rocket recipes

* color adjust fluix material

* startup rocket stuff

* everything disabling the stuff until ev

* Delete options.txt

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* Update main_startup_script.js

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* Delete kubejs/startup_scripts/tfg/elements.js

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* Update CHANGELOG.md

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* shhhhh

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

---------

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
Signed-off-by: Pyritie <pyritie@gmail.com>
Co-authored-by: Pyritie <pyritie@gmail.com>
 2025-07-23 10:58:27 +01:00
Gustavo
3d89d59d4d use strict 2025-07-21 13:52:18 +10:00
GameStar
0a32609a4b
Feature: Tier 2 insulation (#1349) 
* Add files via upload

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* models

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* textures

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* ad as

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* Update tags.js

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* Add files via upload

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* Update recipes.removes.js

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* Update recipes.js

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* Update recipes.removes.js

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* Update recipes.js

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* Update recipes.miscellaneous.js

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* Update items.js

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* Update materials.js

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* Update recipes.miscellaneous.js

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* Add files via upload

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* Update CHANGELOG.md

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

---------

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
Signed-off-by: Pyritie <pyritie@gmail.com>
Co-authored-by: Pyritie <pyritie@gmail.com>
 2025-07-16 12:05:10 +01:00
Redeix
31b6da9f1c
Integrated Ad Astra wood & and added wood recipe utility (#1346) 
* - Yeast recipe conflict fix

* - Fixed seed oil voiding in barrels. And item weight inconsistency.

* - Reduced loading screen logo size by 4MB

* - Update Changelog

* - Compressed loading screen images to maybe help with ram

* - Added default gui scale to make the main menu look better on first launch

* - Update Changelog

* - Added utility script for adding circuits to existing recipes

* fixed changelog conflict

Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>

* - Added harvest baskets

* - Fixed baked potato recipe mixing from oven

* - Allowed elytras to be repaired regardless of damage

* - Fixed sea water barrel recipe

* - Gave plants tags to bushes so they can have other uses

* - Pushed stubborn models

* - updated Changelog

* - Changelog typo

* - Integrated Ad Astra wood

* - Updated changelog

---------

Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>
 2025-07-15 17:41:08 +01:00
Pyritie
64244314e0
Updated Primitive Creatures (#1337) 
* updated primitive creatures, and figured out how to make them not spawn randomly any more

* tags and items and recipes

* tweak

* langs

* adding loot

* mod ID rename

* langs

* more loot tweaks

* loot tweaks
 2025-07-15 11:48:00 +01:00
Redeix
28d87caae3
Harvest baskets + (#1338) 
* - Yeast recipe conflict fix

* - Fixed seed oil voiding in barrels. And item weight inconsistency.

* - Reduced loading screen logo size by 4MB

* - Update Changelog

* - Compressed loading screen images to maybe help with ram

* - Added default gui scale to make the main menu look better on first launch

* - Update Changelog

* - Added utility script for adding circuits to existing recipes

* fixed changelog conflict

Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>

* - Added harvest baskets

* - Fixed baked potato recipe mixing from oven

* - Allowed elytras to be repaired regardless of damage

* - Fixed sea water barrel recipe

* - Gave plants tags to bushes so they can have other uses

* - Pushed stubborn models

* - updated Changelog

* - Changelog typo

---------

Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>
 2025-07-15 03:37:45 +01:00
Pyritie
30f50f2e97
Merging guns branch (#1283) 
* Feature/ulv ev guns (#1280)

* update pakku mods

* mod config stuff

* Port over of current guns

* ae2 gun recipes

* nitrocellulose and other stuff

* more recipes

* gun packs

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* Update pakku-lock.json

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

---------

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* LICENSE

* changed powderbarrel to use lumber instead of wood boards

* lang

* gunpowder unification

* emi categories

---------

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
Co-authored-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
 2025-07-13 12:31:39 +01:00
Pyritie
ec7e245220 orbit dim markers 2025-07-10 12:45:11 +01:00
Redeix
7c0c3cd341
Added dry ice support for lunchboxes (#1262) 
* - Lots of ui updates. And a couple fixes.

* - New button textures.
- Fixed campfire loot table.
- Made anvil rod recipes easier.
- Added assembler recipes for multiblock tank parts.

* - Added assembler recipes for multiblock tank parts.

* - Updated Changelog

* - Some more UI tweaks.
- Added modern-markings mod with integration.

* - Updated stromatolite textures
- Added some more WIP venus foliage

* - Moved some blocks over from tfg-core.

* - Updated textures for tier-1 rocket and food oven.

* - Updated textures for more ad-astra stuff + new panorama

* - Biodiesel stuff

* - Quests re-ordering and some new ones

* - Hide wild crops from emi

* - Hide wild crops from emi

* - Moon rabbit meat

* - Moon rabbit meat

* - Moon rabbit meat textures and casings for tom

* - models

* - oops

* - rocket

* - ooops

* - Added dry ice support for lunchboxes

* - Fixed soybean oil quest

* - Added dry ice block

* - Assets for dry ice block

---------

Co-authored-by: Pyritie <pyritie@gmail.com>
 2025-07-09 08:28:16 +01:00
Pyritie
3dffb8e93e remove ender eye, added vitrified ender pearl 2025-07-09 00:49:02 +01:00
Pyritie
282a20e2cd hid the tfg icon from jei 2025-06-29 20:03:35 +01:00
TomPlop
3daacb3c22
AE2 Rework - Recipes (#1193) 
* AE2 Rework

* Adding a universal Requester recipe

* Lower tier of ME Requester

* Fix ME Requester again

* Fix for terminals Eu Tier

* Adding fluix dust to the AE2 Cables

* Add redstone to smart cable

* Change for Processor, Cryo Fluix in the Vac and new Fluix Crystal method

* Nerf moon processors

* Fixes to resolve PR

* Adding Pack/Unpack for colored cables

* Adding Accumulation Press Recipe and fix Molecular Assembler
 2025-06-23 21:03:43 +01:00
Pyritie
d3f0bcd6d6 added space suit fabric 2025-06-21 10:56:44 +01:00
Redeix
c567450875
- Lots of food stuff (#1196) 
* - Lots of food stuff

* Updated Changelog
 2025-06-20 09:49:39 +01:00
Pyritie
25530b72c5 cleaned up some of the tfc data files, also added moon meat! 2025-06-19 00:18:27 +01:00
Pyritie
9262133484 merge 2025-05-13 10:55:31 +01:00
Redeix
cf54f584b4
Fixes and features (#987) 
* - Fixed hide duping recipes.
- Added quest book and field guide instances for fishing nets.
- Fixed rebar support recipe crash.
- Fixed red steel flask dupe.
- Fixed red alloy recipe inconsistency.

* - Fixed blue steel backpack block lang

* - Added max vessel fluid warning to small vessels.

* - Moved red steel flask recipe

* - Fixed fishing nets event function

* Update queststfc_tips.snbt

Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>

* Update en_us.json

Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>

* - Added item to summon armor stands with arms

* - Added recipes to empty vessels and molds

* - Added recipes for extracting/ forming magma blocks.

* - Added recipes for extracting/ forming magma blocks.

* - Nerfed steel support recipe output.

---------

Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>
 2025-05-12 12:29:10 +01:00
Pyritie
0256ece0dd added loose stone, bricks, and recipes for all the different ad astra stone types 2025-05-05 20:08:42 +01:00
Pyritie
2c0d2cbd24 big rock naming overhaul -- keeping to the ad astra naming scheme, then using lang files to give them funny rock names 2025-05-05 17:41:36 +01:00
Pyritie
187e5a2f5f fixed a crash when tping to the moon lol 2025-04-30 00:29:53 +01:00