Commit graph

2065 commits

Author SHA1 Message Date
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
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
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
Pyritie
ea7f6d43cd
Added recipes to stop duping of redalloy + steam machines
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-06 14:55:23 +00:00
Dmitry
7cda18d61a
Update CHANGELOG.md
Signed-off-by: Dmitry <52341158+Exzept1on@users.noreply.github.com>
2025-01-06 21:43:03 +07:00
Dmitry
a716af6b56
Merge pull request #667 from fluffle/0.7.14-patches
Various fixes for 0.7.14
2025-01-06 21:34:13 +07:00
Alex Bramley
d6939485ab Add circuit to assembler redstone lamp recipe. 2025-01-06 14:26:24 +00:00
Alex Bramley
772e8f313e Super tank/chest self-crafting recipes to strip NBT. 2025-01-06 14:26:13 +00:00
Alex Bramley
28c95a7b61 Controversial: remove in-world certus transformation; buff mixer recipes to compensate. 2025-01-06 14:24:57 +00:00
Alex Bramley
eb5a0e5c15 Recipes for certus/nether quartz cutting knives. 2025-01-06 14:24:57 +00:00
Alex Bramley
868defd38f Reduce costs of covered and smart cables. 2025-01-06 14:24:57 +00:00
Dmitry
705db91ad2
Merge pull request #663 from SverhRazum-Nah/patch-7
precision mech in assembler
2025-01-06 21:18:58 +07:00
Dmitry
f46202efec
Merge pull request #666 from Pyritie/main
Fixed TFG things in field guide, added oregen section
2025-01-06 21:12:35 +07:00
Dmitry
adeddb5cb3
Merge pull request #668 from fluffle/0.7.14-lv-recycling
Fix LV recycling recipes to produce basic steel.
2025-01-06 21:11:40 +07:00
Alex Bramley
dac64097ea Fix LV recycling recipes to produce basic steel. 2025-01-06 09:47:47 +00:00
Xikaro
ffb660c730
Merge pull request #648 from TerraFirmaGreg-Team/dependabot/github_actions/dependencies-b8114a21ad
Bump the dependencies group with 3 updates
2025-01-06 13:13:33 +05:00
Pyritie
41f99f940c
initial commit of field guide changes
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-05 17:31:57 +00:00
Pyritie
2c7d8e3688
Merge branch 'TerraFirmaGreg-Team:main' into patch-6 2025-01-05 17:28:35 +00:00
Pyritie
0968a1b080
Update tooltips.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-05 17:28:10 +00:00
Pyritie
1a0dfa3dcb
Merge branch 'TerraFirmaGreg-Team:main' into main 2025-01-05 17:25:58 +00:00
SverhRazum-Nah
3d8b3e7fb6
precision mech in assembler
Signed-off-by: SverhRazum-Nah <leon.trol@mail.ru>
2025-01-03 02:05:38 +03:00
dependabot[bot]
6cd8f443e1
Bump the dependencies group with 3 updates
Bumps the dependencies group with 3 updates: [WcAServices/markdown-template-action](https://github.com/wcaservices/markdown-template-action), [softprops/action-gh-release](https://github.com/softprops/action-gh-release) and [hugoalh/send-discord-webhook-ghaction](https://github.com/hugoalh/send-discord-webhook-ghaction).


Updates `WcAServices/markdown-template-action` from 1.1.0 to 1.1.1
- [Release notes](https://github.com/wcaservices/markdown-template-action/releases)
- [Commits](https://github.com/wcaservices/markdown-template-action/compare/v1.1.0...v1.1.1)

Updates `softprops/action-gh-release` from 2.1.0 to 2.2.0
- [Release notes](https://github.com/softprops/action-gh-release/releases)
- [Changelog](https://github.com/softprops/action-gh-release/blob/master/CHANGELOG.md)
- [Commits](https://github.com/softprops/action-gh-release/compare/v2.1.0...v2.2.0)

Updates `hugoalh/send-discord-webhook-ghaction` from 7.0.3 to 7.0.4
- [Release notes](https://github.com/hugoalh/send-discord-webhook-ghaction/releases)
- [Commits](https://github.com/hugoalh/send-discord-webhook-ghaction/compare/v7.0.3...v7.0.4)

---
updated-dependencies:
- dependency-name: WcAServices/markdown-template-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: dependencies
- dependency-name: softprops/action-gh-release
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dependencies
- dependency-name: hugoalh/send-discord-webhook-ghaction
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-12-30 21:14:48 +00:00
Dmitry
ff43daae07
Merge pull request #639 from Pyritie/patch-1
Fixed not being able to make cobble in assembler
2024-12-29 15:48:21 +07:00
Dmitry
aff372980b
Merge pull request #640 from Pyritie/patch-2
Added recipe for metal bars
2024-12-29 15:48:09 +07:00
Dmitry
58f2a04505
Merge pull request #642 from Pyritie/patch-4
Added quern recipes for graphite
2024-12-29 15:47:56 +07:00
Dmitry
ae069316d3
Merge pull request #641 from Pyritie/patch-3
Added yeast starter and cocoa powder recipes
2024-12-29 15:47:10 +07:00
Dmitry
5829e67a01
Merge pull request #645 from Pyritie/patch-7
Fixed red alloy crucible recipe
2024-12-29 15:46:06 +07:00
Pyritie
386dd79bb3
Fixed red alloy crucible recipe
Signed-off-by: Pyritie <pyritie@gmail.com>
2024-12-23 16:57:37 +00:00
Pyritie
72c5e41eb4
fix stone dust tag
Signed-off-by: Pyritie <pyritie@gmail.com>
2024-12-22 21:19:27 +00:00
Pyritie
73e06eb285
add tooltips
Signed-off-by: Pyritie <pyritie@gmail.com>
2024-12-22 21:05:56 +00:00
Xikaro
1b79284ea2 Create PULL_REQUEST_TEMPLATE.md 2024-12-22 23:07:22 +05:00
Pyritie
6b5373b2cb
Added quern recipes for graphite
Signed-off-by: Pyritie <pyritie@gmail.com>
2024-12-22 18:06:20 +00:00
Xikaro
7ec32efd30 Delete pull_request_template.md 2024-12-22 22:54:46 +05:00
Pyritie
b7bb295a88
Added yeast starter and cocoa powder recipes
Signed-off-by: Pyritie <pyritie@gmail.com>
2024-12-22 17:50:25 +00:00
Xikaro
1039af46f3
Merge branch 'main' into patch-1 2024-12-22 22:46:26 +05:00