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

315 commits

Author SHA1 Message Date
Pyritie
764f149423 fixed wire cutter head extruder mold typo 2025-07-29 17:39:32 +01:00
Pyritie
c94418447d removed tfc stone -> vanilla stone conversion via rods 2025-07-29 12:36:13 +01:00
Zippity
5f151cdab2
Forge, Anvil Tweaks (#1417) 
* rearrange anvil sequences to match convention

* add heating and melting to basic forgeable gears

* another anvil tweak

* Update changelog

* typo!

* refactor heating and forging of small gears

* refactor gear forging to use built-in material forge tier

* one last fix

---------

Signed-off-by: Gustavo <77560533+gustovafing@users.noreply.github.com>
Co-authored-by: Gustavo <77560533+gustovafing@users.noreply.github.com>
Co-authored-by: Pyritie <pyritie@gmail.com>
 2025-07-28 23:43:54 +01:00
Pyritie
a607627d98 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-07-28 23:10:32 +01:00
Pyritie
e804a8a9dd added fluid parameter to the greenhouse recipe builder 2025-07-28 21:04:10 +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
Pyritie
e83833bcf5 changed all fluid tags to the new format 2025-07-28 15:46:18 +01:00
Pyritie
54d44ea0a4 added shapeless recipes for matches #1449 2025-07-28 14:18:50 +01:00
Pyritie
050ac49fd9 removed gregtech stonecutter recipe #1464 2025-07-28 14:11:37 +01:00
Pyritie
f197a08195 fixed cobalt brass/potin double plate being unobtainable early 2025-07-28 14:06:18 +01:00
Redeix
9d2e5518a7
More multiblock fixes (#1470) 
* Casing recipe changes

* Render fixes for greenhouse and railgun controllers
 2025-07-28 10:10:11 +01:00
Redeix
f61a6615dd
More things (#1468) 
* - 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

* - Brick interaction events and new function for interacting with blocks

* - Added parameter boolean to decide if blockstate should be copied

* - Change for block interaction event constant that may fix linux crash

* - Moved global array to the events file and some linter fixes.

* - Updated Changelog

* - Some more model fixes and remove gtceu metal armor

* - always a stubborn file

* - Large Solar Panel Change

---------

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-28 15:03:48 +10: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
Pyritie
9c09341baf maybe not the ingot one 2025-07-26 17:21:42 +01:00
Pyritie
76001f0fc4 fixed cobalt brass buzzsaws not being obtainable until mv 2025-07-26 17:10:06 +01:00
Pyritie
3d2ed09f9b added create sandpaper recipes for early game gems, unified observer recipes 2025-07-23 21:10:59 +01: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
bbae9d2501 removed mortar recipes for metal ingots 2025-07-22 00:54:23 +01:00
Pyritie
888a227229 fixes #1413 2025-07-21 23:55:22 +01:00
Gustavo
3d89d59d4d use strict 2025-07-21 13:52:18 +10:00
Pyritie
a95d2aaf09 fixes #1405 2025-07-20 17:13:06 +01:00
Pyritie
d1f76ca1bd fixes #1395 2025-07-20 13:03:01 +01:00
Pyritie
0523ff9a02 fix mushroom conflicting recipes 2025-07-19 19:43:09 +01:00
Pyritie
c84960c04a fixed glass dupe with lamps 2025-07-19 17:07:49 +01:00
Pyritie
087170ffc9 implements #1375 2025-07-18 21:48:25 +01:00
Pyritie
df5add25e7 glue 2025-07-18 21:44:05 +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
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
9de6557326
nugget material fix, changelog (#1332) 2025-07-14 21:34:23 +01:00
Redeix
911ede670a
Created utility function to add circuit numbers to pre-existing recipes (#1320) 
* - 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>

---------

Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>
 2025-07-14 10:10:37 +01:00
TomPlop
671d2af43e
Changing input for notConsumable (#1307) 2025-07-13 23:53:25 +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
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
a571779997 fixed naming of casing blocks 2025-07-11 23:20:30 +01:00
TomPlop
044494ee8e
Adding the Large Solar Panel (#1275) 
* Adding the Large Solar Panel

* Update config for Ad Astral Solar increase possible output

* fix conflict
 2025-07-11 20:23:47 +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
9e60fb584a fixed some damascus steel stuff still showing up 2025-07-09 21:33:51 +01:00
Pyritie
891bae53e9 fixed unobtainable cobalt brass buzzsaw before mv 2025-07-08 14:50:37 +01:00
Pyritie
b1f76dc706 whoops 2025-07-07 19:15:29 +01:00
Pyritie
466ac32107 removed power tool recycling recipes because of duping, fixed crafting table spring recipes 2025-07-07 19:12:34 +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
Pyritie
3a255f5e70 oops, greate's update meant all our macerator removals stopped working 2025-07-06 22:48:42 +01:00
Pyritie
9816bfa0c5 apparently 9 inputs is the maximum, so no flux allowed 2025-07-06 21:11:28 +01:00
Pyritie
edd59f502e moon bedrock veins 2025-07-06 17:12:09 +01:00
Pyritie
a9eab2e3b9 some more tweaks 2025-07-06 01:40:01 +01:00
Pyritie
d80c5a0e84 tweaks and balances after playtesting a bit 2025-07-06 00:49:29 +01:00
Pyritie
6ac427a585 replace wood dust for carbon in biomass distillation 2025-07-05 17:19:50 +01:00
Pyritie
2a2e56dffe forgot some ore processing forge hammer recipes 2025-07-05 15:13:09 +01:00
Pyritie
0848393225 cleanup of #1248 
Related Work Items: #12
 2025-07-05 13:12:08 +01:00