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

2109 commits

This branch
This branch
All branches
Author SHA1 Message Date
Pyritie
983ce50199
Merge branch 'main' into gas-multiblocks 
Signed-off-by: Pyritie <pyritie@gmail.com>
 2025-01-11 11:45:40 +00:00
Dmitry
510e84390c
Update CHANGELOG.md 
Signed-off-by: Dmitry <52341158+Exzept1on@users.noreply.github.com>
 2025-01-11 14:29:37 +07:00
Dmitry
fbb8e91637
Update CHANGELOG.md 
Signed-off-by: Dmitry <52341158+Exzept1on@users.noreply.github.com>
 2025-01-11 14:29:08 +07:00
Dmitry
f6414b980c
Merge pull request #684 from 8oyNextDoor/main 
Перевод книги
 2025-01-11 14:27:33 +07:00
Dmitry
7d6755d4b9
Merge pull request #680 from Juzrm/main 
Craft recipe for framed chest so it isn't cheaper then the alternatives
 2025-01-11 14:23:13 +07:00
Dmitry
06c4477cc6
Merge pull request #681 from fluffle/0.7.15-mainframe 
Use 2x annealed copper wires in ZPM mainframe recipe.
 2025-01-11 14:21:41 +07:00
Dmitry
7490513d24
Merge pull request #687 from Saaghh/more-greenhouse-plants 
Added greenhouse recipes for tfc plants tag
 2025-01-11 14:20:28 +07:00
Dmitry
a8a1614893
Merge pull request #688 from Pyritie/patch-3 
Fix charcoal in macerator overlap
 2025-01-11 14:19:30 +07:00
Dmitry
0b17cbe2ec
Merge pull request #689 from Saaghh/electric-olive-oil 
Olive oil in machines
 2025-01-11 14:18:31 +07:00
Dmitry
8f06680702
Merge pull request #678 from fluffle/0.7.15-mainthatch 
Fix maintenance hatch recycling recipes too.
 2025-01-11 14:17:50 +07:00
Sergey Semin
ea075ec8b5 fix again 2025-01-11 04:41:40 +03:00
Pyritie
f1469147ae
fix charcoal in macerator 
Signed-off-by: Pyritie <pyritie@gmail.com>
 2025-01-11 00:21:35 +00:00
Sergey Semin
7cc1ce81d1 Added greenhouse recipes for tfc plants tag 2025-01-11 03:03:10 +03:00
Pyritie
10d69af86f
update tooltips.js 
Signed-off-by: Pyritie <pyritie@gmail.com>
 2025-01-10 23:23:26 +00:00
Pyritie
04407db649
update gregtech/recipes.js 
Signed-off-by: Pyritie <pyritie@gmail.com>
 2025-01-10 23:23:02 +00:00
Pyritie
a1d402eba6
update minecraft/constants.js 
Signed-off-by: Pyritie <pyritie@gmail.com>
 2025-01-10 23:21:53 +00:00
Pyritie
538f6c8952
add model for artificial end portal frame 
Signed-off-by: Pyritie <pyritie@gmail.com>
 2025-01-10 23:20:57 +00:00
Pyritie
4602044a59
add new blocks + fluids 
Signed-off-by: Pyritie <pyritie@gmail.com>
 2025-01-10 23:20:11 +00:00
Pyritie
11c3737c5e
update main_server_script.js 
Signed-off-by: Pyritie <pyritie@gmail.com>
 2025-01-10 23:19:20 +00:00
Pyritie
55492435ce
terrarium recipes 
Signed-off-by: Pyritie <pyritie@gmail.com>
 2025-01-10 23:16:05 +00:00
Pyritie
1707781a0a
updated multiblocks 
Signed-off-by: Pyritie <pyritie@gmail.com>
 2025-01-10 23:15:19 +00:00
BoyNextDoor
c006a36e86
Add files via upload 
Signed-off-by: BoyNextDoor <130379681+8oyNextDoor@users.noreply.github.com>
 2025-01-10 16:33:53 +03:00
BoyNextDoor
4dbcfc648b
Add files via upload 
Signed-off-by: BoyNextDoor <130379681+8oyNextDoor@users.noreply.github.com>
 2025-01-10 16:31:13 +03:00
BoyNextDoor
7103b0056a
Update deep_scheelite.json 
Исправил опечатку/fixed a typo

Signed-off-by: BoyNextDoor <130379681+8oyNextDoor@users.noreply.github.com>
 2025-01-10 16:26:05 +03:00
Pyritie
5431621574
multiblock definitions 
Signed-off-by: Pyritie <pyritie@gmail.com>
 2025-01-09 23:18:10 +00:00
Pyritie
013c4f4fb5
new lang strings for the terrariums 
Signed-off-by: Pyritie <pyritie@gmail.com>
 2025-01-09 23:17:16 +00:00
Pyritie
4af7345975
re-enable things for multiblocks 
dragon egg, end stone, netherrack, nether bricks

Signed-off-by: Pyritie <pyritie@gmail.com>
 2025-01-09 23:13:21 +00:00
Alex Bramley
d6084eaff6 Use 2x annealed copper wires in ZPM mainframe recipe. 2025-01-09 23:06:26 +00:00
Juzrm
ee4292bee2
Update recipes.js 
Signed-off-by: Juzrm <themarythemarythemary@gmail.com>
 2025-01-09 22:19:07 +00:00
Pyritie
f4d73fd5cf
started adding some tips entries 
Signed-off-by: Pyritie <pyritie@gmail.com>
 2025-01-09 13:00:58 +00:00
Pyritie
eeb84836a5
Merge branch 'TerraFirmaGreg-Team:main' into main 2025-01-09 12:23:20 +00:00
Alex Bramley
296b9abd9e Fix maintenance hatch recycling recipes too. 2025-01-09 09:28:47 +00:00
Dmitry
1a63c551ad
Update CHANGELOG.md 
Signed-off-by: Dmitry <52341158+Exzept1on@users.noreply.github.com>
 2025-01-08 20:01:04 +07:00
Dmitry
be2fd5c64b
Merge pull request #676 from Pyritie/patch-2 
Remove ore spreadsheet link from field guide
 2025-01-08 20:00:11 +07:00
Pyritie
567af6a226
Remove ore spreadsheet link from field guide 
Signed-off-by: Pyritie <pyritie@gmail.com>
 2025-01-08 12:59:07 +00:00
Xikaro
9dc37eb2dd Update build.yml 2025-01-08 10:16:49 +05:00
Xikaro
5323c5a587 Delete pakku-lock-pre.json 2025-01-08 07:32:55 +05:00
Xikaro
959c4fb202 Update CHANGELOG.md 2025-01-08 07:23:17 +05:00
Xikaro
b4d3ce3f22 fix: workflows 2025-01-08 07:18:30 +05:00
Dmitry
e79defef1f Update primitive_age.snbt 2025-01-08 00:26:12 +07:00
Dmitry
12ed029fb6 requested fixes 2025-01-08 00:26:09 +07:00
Pyritie
7243c8530c
Fix broken saltpeter link 
Signed-off-by: Pyritie <pyritie@gmail.com>
 2025-01-07 14:47:28 +00:00
Xikaro
8da38ce491 Update build.yml 2025-01-07 18:59:24 +05:00
Xikaro
cbe256e9a3
Merge pull request #672 from TerraFirmaGreg-Team/dependabot/github_actions/dependencies-c6f5dba21f 
Bump roamingowl/template-output-with-eta from 1.10.0 to 1.11.0 in the dependencies group
 2025-01-07 18:58:33 +05:00
dependabot[bot]
1feb123706
Bump roamingowl/template-output-with-eta in the dependencies group 
Bumps the dependencies group with 1 update: [roamingowl/template-output-with-eta](https://github.com/roamingowl/template-output-with-eta).


Updates `roamingowl/template-output-with-eta` from 1.10.0 to 1.11.0
- [Release notes](https://github.com/roamingowl/template-output-with-eta/releases)
- [Commits](https://github.com/roamingowl/template-output-with-eta/compare/v1.10.0...v1.11.0)

---
updated-dependencies:
- dependency-name: roamingowl/template-output-with-eta
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
 2025-01-07 13:57:33 +00:00
Xikaro
294fa06a8c fix: .github 2025-01-07 18:56:19 +05:00
Dmitry
2f2a32280f
Merge pull request #674 from Pyritie/main 
Added hazards entry to field guide, moved field guide changes to correct place
 2025-01-07 20:22:03 +07:00
Pyritie
f9c3ef144f
Delete kubejs/assets/tfc/patchouli_books/field_guide/ru_ru directory 
Signed-off-by: Pyritie <pyritie@gmail.com>
 2025-01-07 13:15:58 +00:00
Pyritie
368542fc64
Delete kubejs/assets/tfg/patchouli_books directory 
Signed-off-by: Pyritie <pyritie@gmail.com>
 2025-01-07 13:15:34 +00:00
Pyritie
5c89688b87
Moved files to correct place 
Signed-off-by: Pyritie <pyritie@gmail.com>
 2025-01-07 13:15:03 +00:00