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

66 commits

Author SHA1 Message Date
GameStar
848dc99bf8
some modpack cleanup from glacian ram/sniffer (#1617) 
* whitespace changes

* some animal compat

* snifferified recipes

* nest box recipe
 2025-08-13 11:06:50 -05:00
Redeix
2c5658a185
Reflector block and some other fixes (#1575) 
* Reflector block and some other fixes

* Updated Changelog
 2025-08-10 11:39:10 +01:00
Pyritie
e53dcf2ea6 biomass and fish oil buffs, added sodium hydroxide to biodiesel from seed oil 2025-08-09 01:18:14 +01:00
TomPlop
966f4f000c
Fix Pyrolyse Oven accepting other ender pearls (#1567) 
You should have to make an Implosion Compressor and not skip by killing Enderman

Signed-off-by: TomPlop <tomdidome@gmail.com>
 2025-08-08 23:09:24 +01:00
TomPlop
e4a9c2de6b
Rework of all resins (#1550) 
* Rework of the resins done

* Fix wood gas
 2025-08-07 20:46:50 +01: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
Redeix
ed7d65e13f
-Fixed universal compost recipes (#1507) 2025-08-02 11:31:26 +01:00
Redeix
ac0de215f5
Receiver changes (#1498) 2025-08-01 09:22:23 +01:00
Pyritie
c091589136 I think this is a typo? 2025-07-31 23:32:52 +01: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
Pyritie
e83833bcf5 changed all fluid tags to the new format 2025-07-28 15:46:18 +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
Pyritie
2b62124ca2 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-07-21 12:53:57 +01:00
Pyritie
081aac2a4f reduced recipe duration of biodiesel recipes 2025-07-21 12:53:54 +01:00
Gustavo
3d89d59d4d use strict 2025-07-21 13:52:18 +10:00
Redeix
611f5d9199
Recipes, Tags, Assets+ for railgun (#1394) 
* - 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

* - Treated chipboard composite barrel lang

* - Some Tacz fixes

* - Jar dupe fix

* - tacz data

* - updated changelog

* - we hate git

* - Loading screen and main menu optimizations

* - image push

* - I think I got the title screen looking good on all resolutions

* - Updated Changelog

* - Added scale fix to loading screen too

* - Fix pixel alignment

* - Recipes, tags, assets+ for railgun

---------

Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>
Signed-off-by: Pyritie <pyritie@gmail.com>
Co-authored-by: Pyritie <pyritie@gmail.com>
 2025-07-20 11:59:30 +01:00
Pyritie
41b9ebab98 gas pressurizer recipes + langs 2025-07-18 22:53:30 +01: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
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
TomPlop
c5bb515fa5
Small fixes for many different recipes (#1306) 
* Fix snow weirdness and add circuit to rocket part

* More fixes

* fix rose quartz
 2025-07-13 23:28:36 +01:00
Redeix
3a188fb884
Removed infinite lava and fixed refrigerant recipes (#1271) 
* - 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

* - Removed infinite lava

* - Added circuit to tetrafluoroethylene_from_chloroform recipe

* - Fixed my crack-head math

* - update Changelog

---------

Co-authored-by: Pyritie <pyritie@gmail.com>
 2025-07-11 08:30:18 +01:00
Pyritie
b60fb82844 quests, langs, slight change to the vitrified pearl recipe 2025-07-10 23:33:35 +01:00
Pyritie
8987b23b21 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-07-09 22:58:12 +01:00
Pyritie
423da664fe fucking gregtech 2025-07-09 22:58:04 +01:00
Pyritie
416a107b2e fixed amounts in kaolinite chem reaction, added ruby version 2025-07-09 11:20:55 +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
df173e17ab more unification for #898, also a workaround for #963 maybe? 2025-07-07 18:54:55 +01:00
Pyritie
aa85b679c7 added bio fuel quests, more biodiesel recipes 2025-07-06 14:08:25 +01:00
Redeix
035d55ffd5
Biodiesel Stuff (#1249) 
* - 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

---------

Co-authored-by: Pyritie <pyritie@gmail.com>
 2025-07-06 11:56:14 +01:00
Pyritie
f8693af91c seed oil can be used in lamps now, added recipes to get it early 2025-07-05 13:27:14 +01:00
Pyritie
0848393225 cleanup of #1248 
Related Work Items: #12
 2025-07-05 13:12:08 +01:00
Pyritie
5fd8d896eb replaced all our water input fluids with a tag, so river water works too 2025-06-30 19:14:31 +01:00
Redeix
ed41d542aa
- Lots of ui updates. And a couple fixes. (#1221) 
Co-authored-by: Pyritie <pyritie@gmail.com>
 2025-06-27 11:49:46 +01:00
Redeix
ac7e57387a
Updated textures for the fridge and food processor + (#1210) 
* - Lots of food stuff

* Updated Changelog

* Changed dry ice and calorie paste recipes

* Update recipes.miscellaneous.js

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

* Updated textures for the fridge and food processor. Added refrigerant gases for the refrigerators and added recycling recipes for all the new machines.

---------

Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>
 2025-06-23 08:40:17 +01:00
Pyritie
ca87c96ee7 no circuit needed here 2025-06-20 23:57:07 +01:00
Redeix
5ef550f0c2
changed dry ice and calorie paste recipes (#1201) 
* - Lots of food stuff

* Updated Changelog

* Changed dry ice and calorie paste recipes

* Update recipes.miscellaneous.js

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

---------

Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>
 2025-06-20 18:18:06 +01:00
Redeix
c567450875
- Lots of food stuff (#1196) 
* - Lots of food stuff

* Updated Changelog
 2025-06-20 09:49:39 +01:00
Pyritie
b7cc04f188 merge 2025-06-12 13:33:44 +01:00
Pyritie
a845d76657 added recipes for tfc-lunchbox! 2025-06-10 16:32:43 +01:00
Pyritie
9c41fe262f merge 2025-06-09 21:15:19 +01:00
Jean Roberto de Souza
8beb9ba090
Conflict issues fix (#1141) 
* Remove Scaffolding Frame recipe

Signed-off-by: Jean Roberto de Souza <81846511+JeanRdSz@users.noreply.github.com>

* Update Scaffolding Frame recipe

Signed-off-by: Jean Roberto de Souza <81846511+JeanRdSz@users.noreply.github.com>

* Fix Glass Jar conflict 

Signed-off-by: Jean Roberto de Souza <81846511+JeanRdSz@users.noreply.github.com>

---------

Signed-off-by: Jean Roberto de Souza <81846511+JeanRdSz@users.noreply.github.com>
 2025-06-08 22:21:46 +01:00
Pyritie
95c99d761b moved these into a different file 2025-06-01 21:19:24 +01:00
Pyritie
2027047130 reverted the sugars change 2025-06-01 18:26:42 +01:00
Pyritie
08b8cf7f1c changed the sugars recipe to just work for everything 2025-06-01 18:24:11 +01:00
Pyritie
17e7981da7 merge 2025-05-31 13:22:08 +01:00