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

5908 commits

This branch
This branch
All branches
Author SHA1 Message Date
Pyritie
8932a00c2a merry christmas 2025-12-18 21:20:11 +00:00
Pyritie
da91799f56 pakku 2025-12-18 20:44:35 +00:00
TomPlop
906c64b4b6
Add quests (#2456) 2025-12-18 18:29:10 +00:00
Epicificator
ec8f3519f7
New New belt textures! (#2454) 
* Natural rubber belt block textures

Signed-off-by: Epicificator <143143550+Epicificator@users.noreply.github.com>

* remove old styrene butadiene rubber belt block textures

Signed-off-by: Epicificator <143143550+Epicificator@users.noreply.github.com>

* New SBR belt textures!

Signed-off-by: Epicificator <143143550+Epicificator@users.noreply.github.com>

* Delete old rubber belt item texture

Signed-off-by: Epicificator <143143550+Epicificator@users.noreply.github.com>

* New belt item textures

Signed-off-by: Epicificator <143143550+Epicificator@users.noreply.github.com>

* Delete old silicone rubber belts

Signed-off-by: Epicificator <143143550+Epicificator@users.noreply.github.com>

* New silicone belt textures!

Signed-off-by: Epicificator <143143550+Epicificator@users.noreply.github.com>

---------

Signed-off-by: Epicificator <143143550+Epicificator@users.noreply.github.com>
 2025-12-18 08:37:46 +00:00
Pyritie
3fe50f6345 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-12-17 20:24:32 +00:00
Pyritie
146d0bf2d0 some tweaks to moon structures 2025-12-17 20:24:29 +00:00
Pyritie
098e1e6f06 remove animal fat from beasts cuz you can mob farm them 2025-12-17 13:47:35 +00:00
Pyritie
5abe5fdfd2 pakku, changelog 2025-12-16 23:25:33 +00:00
Pyritie
6805b6368f langs 2025-12-16 23:19:59 +00:00
Xikaro
1c5231b550 Update ranks.snbt 2025-12-17 01:35:03 +05:00
Xikaro
6a4447906a add: disabling commands 2025-12-17 01:09:06 +05:00
Mqrius
bd954b0010
Remove localization from loading screen (#2442) 
Signed-off-by: Mqrius <Nuntius.Marii@Gmail.com>
 2025-12-16 08:42:12 +00:00
Pyritie
b37b046ec6 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-12-15 22:54:32 +00:00
Pyritie
88af05c97e mining machines now replace rocks with the correct cobble 2025-12-15 22:54:23 +00:00
Pyritie
0a16e94ab1 oh yeah there's a tag prefix for this now 2025-12-15 22:53:20 +00:00
dependabot[bot]
a25d15b216
Bump the dependencies group across 1 directory with 5 updates (#2440) 
Bumps the dependencies group with 5 updates in the / directory:

| Package | From | To |
| --- | --- | --- |
| [actions/checkout](https://github.com/actions/checkout) | `6.0.0` | `6.0.1` |
| [mukunku/tag-exists-action](https://github.com/mukunku/tag-exists-action) | `1.6.0` | `1.7.0` |
| [actions/cache](https://github.com/actions/cache) | `4.3.0` | `5.0.1` |
| [actions/upload-artifact](https://github.com/actions/upload-artifact) | `5.0.0` | `6.0.0` |
| [actions/download-artifact](https://github.com/actions/download-artifact) | `6.0.0` | `7.0.0` |



Updates `actions/checkout` from 6.0.0 to 6.0.1
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v6.0.0...v6.0.1)

Updates `mukunku/tag-exists-action` from 1.6.0 to 1.7.0
- [Release notes](https://github.com/mukunku/tag-exists-action/releases)
- [Commits](https://github.com/mukunku/tag-exists-action/compare/v1.6.0...v1.7.0)

Updates `actions/cache` from 4.3.0 to 5.0.1
- [Release notes](https://github.com/actions/cache/releases)
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
- [Commits](https://github.com/actions/cache/compare/v4.3.0...v5.0.1)

Updates `actions/upload-artifact` from 5.0.0 to 6.0.0
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/v5.0.0...v6.0.0)

Updates `actions/download-artifact` from 6.0.0 to 7.0.0
- [Release notes](https://github.com/actions/download-artifact/releases)
- [Commits](https://github.com/actions/download-artifact/compare/v6.0.0...v7.0.0)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: 6.0.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: dependencies
- dependency-name: mukunku/tag-exists-action
  dependency-version: 1.7.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dependencies
- dependency-name: actions/cache
  dependency-version: 5.0.1
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: dependencies
- dependency-name: actions/upload-artifact
  dependency-version: 6.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: dependencies
- dependency-name: actions/download-artifact
  dependency-version: 7.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2025-12-15 21:16:55 +00:00
Pyritie
1c82bded8f langs 2025-12-15 19:46:49 +00:00
Pyritie
1a798b6185 cleanup 2025-12-15 19:26:01 +00:00
Pyritie
d6bb5d7842 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-12-15 19:21:09 +00:00
Pyritie
4ffdf39e07 fix typo 2025-12-15 19:21:06 +00:00
Pyritie
6944cb7083 coke gem trim -> armalcolite gem trim 2025-12-15 19:12:36 +00:00
Pyritie
1b161d09f8 Revert "remove conk" 
This reverts commit 15a94f150f.
 2025-12-15 19:07:53 +00:00
Pyritie
15a94f150f remove conk 2025-12-15 19:06:42 +00:00
thederpysockdude123
93221ceeae
add maintenance hatches to the the cleanroom quest (#2435) 
* Update items.food.js

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

* Revert "add tfc:foods tag to a whole bunch of TFG foods"

* remove macaw's stuff from boiler recipes for easier menu nav

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

* Update hv__high_voltage.snbt

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

* added maintenance hatches to cleanroom quest

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

* added localization string (i think)

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

* moved to the right spot methinks

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

* Update hv__high_voltage.snbt

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

---------

Signed-off-by: thederpysockdude123 <thederpysockdude123@gmail.com>
 2025-12-15 18:47:57 +00:00
Pyritie
aeca63edfb Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-12-15 18:46:47 +00:00
Pyritie
84203c20ab added some missing fuels 2025-12-15 18:46:44 +00:00
Pyritie
6ae4bf942d langs 2025-12-15 18:37:39 +00:00
Pyritie
75c94eb364 remove fancier coke gems 2025-12-15 18:37:34 +00:00
Pyritie
77abafee3e fix recipe collision with vanilla stone plates 2025-12-15 18:37:19 +00:00
Pyritie
f2d633ff8e thanks vexxed 2025-12-15 18:34:54 +00:00
Jeuv
bb74c1ea4c
Fix #2429 (#2436) 
Filter the bronze drum emptying recipe to prevent bronze drum transmutation.

Signed-off-by: Jeuv <73312791+Jeuvke@users.noreply.github.com>
 2025-12-15 18:15:52 +00:00
TomPlop
8ab09abe56
Add btx (#2416) 
* adding textures and recipes

* Balance BTX and Reformate Gas

* Oups

* fix material amount
 2025-12-15 12:12:49 -06:00
Pyritie
404d2f3cd0 concrete dyes 2025-12-15 17:50:03 +00:00
Pyritie
a807d2694f hide tfc gypsum, add some tag models for dirt and sand 2025-12-15 17:49:53 +00:00
Pyritie
7dc6ab64e4 halite so good I made halite2 2025-12-15 16:52:06 +00:00
Pyritie
748f058578 added renewable clay 2025-12-15 16:50:05 +00:00
Pyritie
4eed49cb82 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-12-15 16:09:53 +00:00
Pyritie
557e459954 just doing #2434 myself because merge conflicts 2025-12-15 16:09:51 +00:00
Pyritie
0e6b484224 fixed not being able to grow warped trees on mars dirt 2025-12-15 16:09:05 +00:00
applenper
858d6ccfe0
Boiler recipe cleanup (#2421) 
* boiler recipe cleanup

* removed duplicate bundle event remove
 2025-12-15 15:59:48 +00:00
thederpysockdude123
892f2dcb4f
Remove macaw's stuff from boiler recipes for easier menu nav (#2415) 
* Update items.food.js

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

* Revert "add tfc:foods tag to a whole bunch of TFG foods"

* remove macaw's stuff from boiler recipes for easier menu nav

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

* Update recipes.js

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

* Update recipes.js

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

* removed that line :P

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

---------

Signed-off-by: thederpysockdude123 <thederpysockdude123@gmail.com>
 2025-12-15 15:59:32 +00:00
Pyritie
0f3b4df973 langs 2025-12-15 13:45:05 +00:00
Mqrius
0e415d81f5
Fix toolUsed being referenced before definition (#2428) 
Oops #2419

Signed-off-by: Mqrius <Nuntius.Marii@Gmail.com>
 2025-12-15 11:19:44 +00:00
FlightingFalcon
cfe7ad1b6f
fixed ostrum machine casing recipe (#2427) 
Signed-off-by: FlightingFalcon <100160941@ccisd.net>
Co-authored-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
 2025-12-15 11:19:15 +00:00
GameStar
389c084ee5
Fix error in duration of packing flax 
Potential cause of server crash

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
 2025-12-14 22:07:11 -06:00
GameStar
18e2113366
Update CHANGELOG.md 
Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
 2025-12-14 21:27:11 -06:00
Pyritie
c7d73a805d hid the other greate things, hid the rest of the swine-steel tool heads 2025-12-15 01:29:07 +00:00
Pyritie
60ca14c696 pakku 2025-12-15 00:44:54 +00:00
Pyritie
001c8c3e36 added the new structures to the CL 2025-12-15 00:44:15 +00:00
Pyritie
2a626b422c Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-12-15 00:38:14 +00:00