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

181 commits

Author SHA1 Message Date
Pyritie
c7831a072e fixed duplicate pizza dough 2025-07-15 23:22:41 +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
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
8dd8d5b344 added ice soup 2025-07-14 20:00:44 +01:00
GameStar
f9ece44a81
Bug fix/Adding in some missing recipes (#1319) 
* kelp + seaweed dry

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

* add assembler 45-70

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

* fixed afc wood stomping barrel recipes

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

* give lead tfc properties

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

* give lead nuggets an anvil recipe

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

* Update CHANGELOG.md

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>
 2025-07-14 10:06:47 +01:00
GameStar
a350467f09
Bug fix for #1298; extruder molds being goofy (#1314) 
* Add files via upload

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.molds.js

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

* Update recipes.misc.js

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>
 2025-07-14 11:03:25 +10:00
TomPlop
671d2af43e
Changing input for notConsumable (#1307) 2025-07-13 23:53:25 +01:00
Redeix
a608c8955c
Quick Fixes (#1310) 
* - Yeast recipe conflict fix

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

* - Reduced loading screen logo size by 4MB

* - Update Changelog
 2025-07-13 23:29:38 +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
TomPlop
755c979573
Adding Ad Astra block to gt facade (#1269) 
Signed-off-by: TomPlop <tomdidome@gmail.com>
 2025-07-11 00:41:10 +01:00
Pyritie
b60fb82844 quests, langs, slight change to the vitrified pearl recipe 2025-07-10 23:33:35 +01:00
Pyritie
ec7e245220 orbit dim markers 2025-07-10 12:45:11 +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
ab9d434679 fixed extruder mold recipe 2025-07-09 22:31:48 +01:00
Pyritie
a904b02a51 changed combustion recipes to be dimension-limited again 2025-07-09 17:14:06 +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
54e41bf2ef 🍰🎂 2025-07-08 17:35:42 +01:00
Pyritie
5c95e4bc0f fiiiiiiine 2025-07-08 13:41:38 +01:00
Pyritie
736549493f whoops 2025-07-08 12:23:05 +01:00
GameStar
48d4475f6b
wire cutter mold and Hypertube compat (#1258) 
* Update constants.js

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

* Update recipes.molds.js

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

* Create hypertube.png

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

* Add files via upload

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

* Create recipes.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>

* Add files via upload

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

* Update main_server_script.js

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

* Update recipes.js

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

---------

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
 2025-07-08 00:12:46 +01:00
Pyritie
df173e17ab more unification for #898, also a workaround for #963 maybe? 2025-07-07 18:54:55 +01:00
GameStar
bf1bbe12d0
Feature/new molds (#1253) 
* Update recipes.js

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

* Update constants.js

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

* Update recipes.molds.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>

* Add files via upload

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

* Update recipes.materials.js

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

* Update recipes.materials.js

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

---------

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
Co-authored-by: Pyritie <pyritie@gmail.com>
 2025-07-07 13:17:30 +01:00
Redeix
8949f7bc86
Moon rabbit meat stuff (#1254) 
* - 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

---------

Co-authored-by: Pyritie <pyritie@gmail.com>
 2025-07-07 11:56:53 +01:00
Pyritie
dde7ca5b89 fixes #1203 and some other incorrect/missing food recipes 2025-07-06 23:24:06 +01:00
Pyritie
88bac4db34 got the oil crops all working! 2025-07-06 16:22:01 +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
41ee5d7b44 let's give these more fruits 2025-07-06 01:01:39 +01:00
Pyritie
d80c5a0e84 tweaks and balances after playtesting a bit 2025-07-06 00:49:29 +01:00
Pyritie
1c2dbae5f4 gave calorie paste a little nutrition 2025-07-05 19:45:09 +01:00
Pyritie
8f9bbc258d missing uses for clean foil packs 2025-07-05 13:27:21 +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
34y34y34y34y34y34y34y34y34y
460b5db80e
Crop stuff for biodiesel, works on my machine . (#1248) 
* Added the crop stuff I made so far

* I think thiss should be fine?

* I litteraly have no idea what I am doing

* I hope this fixes everything

---------

Signed-off-by: 34y34y34y34y34y34y34y34y34y <34y34y34y34y34y34y34y34y34y@gmail.com>
 2025-07-05 12:15:00 +01:00
Pyritie
9bccf4fa3b merge 2025-07-05 01:41:34 +01:00
Pyritie
6bf2ad74cd
Mechanical press (#1243) 
* welcome back, mechanical press

* EMI category order

* langs

* quests

* emi categories

* quests

* greate stress settings for the mech press

* I got distracted so I guess these are on this branch now

* removed welding recipes from the pressurizer

* recipe additions and changes for the mech press!

* let's go gambling!

* added flux to the mech press "welding" recipes
 2025-07-05 01:41:03 +01:00
Pyritie
346e825351 🐇 2025-07-05 01:40:59 +01:00
Pyritie
a497c6fcac adding greenhouse tier bonuses + fixing the fertilised recipes chanced outputs consistency 2025-07-01 01:57:59 +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
Pyritie
8eb93b0699 disable steam/combustible/gas generators on other dims? 2025-06-30 12:42:39 +01:00
Pyritie
710db0a913
added a bunch of plants from Better End, tags, recipes, license, credits (#1229) 2025-06-29 20:10:37 +01:00
Redeix
5c356b0f46
Some small stuff (#1225) 
* - 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

---------

Co-authored-by: Pyritie <pyritie@gmail.com>
 2025-06-28 11:14:05 +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
Pyritie
dad9acede5 started moon rabbit entity 2025-06-26 01:30:03 +01:00
Pyritie
9f439a60ed added rock duping recipes for vanilla basalt, added greenhouse recipe for spore blossom 2025-06-25 22:10:33 +01:00
Pyritie
161e2185cf added back ad astra oxygen loader JEI page, removed greate haunting + ae2 entropy 2025-06-24 23:48:06 +01:00