Commit graph

2849 commits

Author SHA1 Message Date
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
Pyritie
9bf15cedfa
deleted faqs.json, moved to separate category
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-10 18:06:03 +00:00
Pyritie
522e15644b
initial faqs
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-10 18:05:15 +00:00
Pyritie
11f97200d3
Add files via upload
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-10 18:03:29 +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
0abd9d0e40
WIP index
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-10 13:04:20 +00: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
Pyritie
8a7d15be6f
Merge branch 'TerraFirmaGreg-Team:main' into patch-5 2025-01-09 23:09:24 +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
Dmitry
3a1a87f838
Merge pull request #673 from Pyritie/main
Update field guide
2025-01-07 16:36:12 +07:00
Pyritie
8448e9147e
Update names of entries
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-07 09:34:34 +00:00
Pyritie
193770c671
Update tfg_ores.json
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-07 09:33:32 +00:00
Pyritie
0332cf4620
Merge branch 'TerraFirmaGreg-Team:main' into patch-5 2025-01-06 17:44:43 +00:00
Dmitry
723b08001e Merge branch 'main' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern 2025-01-06 22:32:49 +07:00
Dmitry
867c17d3aa unfuck fucking javascript 2025-01-06 22:32:44 +07:00
Dmitry
d4f469b0bf
Update CHANGELOG.md
Signed-off-by: Dmitry <52341158+Exzept1on@users.noreply.github.com>
2025-01-06 22:30:09 +07:00
Dmitry
4678b82128
Merge pull request #644 from Pyritie/patch-6
Fix stone dust tag
2025-01-06 22:29:52 +07:00
Pyritie
9af4b02b21
Merge branch 'TerraFirmaGreg-Team:main' into patch-6 2025-01-06 15:12:56 +00:00
Pyritie
11e8626e91
Merge branch 'main' into patch-5
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-06 15:11:55 +00:00
Dmitry
a5bb219e5b
Update CHANGELOG.md
Signed-off-by: Dmitry <52341158+Exzept1on@users.noreply.github.com>
2025-01-06 22:03:40 +07:00
Dmitry
df29c37a9a
Merge pull request #669 from Pyritie/patch-1
Added recipes to stop duping of red alloy + steam machines
2025-01-06 22:02:45 +07:00
Dmitry
2d18c18142
Merge pull request #670 from Pyritie/patch-2
Adds early glowstone recipe
2025-01-06 22:01:53 +07:00
Pyritie
644bcdee41
Adds early glowstone recipe
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-06 14:58:56 +00:00