Commit Graph

2303 Commits

Author SHA1 Message Date
Xikaro
bfdda572bd Update CHANGELOG.md 2024-10-29 05:31:11 +05:00
Xikaro
629e0b06ba Update release.yml 2024-10-29 05:30:29 +05:00
Xikaro
1b2142e440 Merge branch 'main' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern 2024-10-29 04:47:44 +05:00
Xikaro
a8aca43f74 upd: pakku-lock 2024-10-29 04:47:39 +05:00
Xikaro
1ea374ec3a Merge pull request #564 from TerraFirmaGreg-Team/dependabot/github_actions/dependencies-a1cff6d793
Bump actions/upload-artifact from 4.4.0 to 4.4.3 in the dependencies group
2024-10-29 03:31:16 +05:00
dependabot[bot]
95cadd00a7 Bump actions/upload-artifact in the dependencies group
Bumps the dependencies group with 1 update: [actions/upload-artifact](https://github.com/actions/upload-artifact).


Updates `actions/upload-artifact` from 4.4.0 to 4.4.3
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/v4.4.0...v4.4.3)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-10-28 21:49:22 +00:00
Xikaro
a910ce0124 Merge pull request #556 from TerraFirmaGreg-Team/pakku
Pakku
2024-10-28 18:05:07 +05:00
Xikaro
6920a2cfe9 Update .gitattributes 2024-10-27 11:25:40 +05:00
Xikaro
b9642e3cfa up 2024-10-27 03:53:38 +05:00
Xikaro
394e0d8686 up 2024-10-27 03:42:43 +05:00
Xikaro
e7993c887a Merge branch 'main' into pakku 2024-10-26 21:15:36 +05:00
Dmitry
98bb29394c Update CHANGELOG.md
Signed-off-by: Dmitry <52341158+Exzept1on@users.noreply.github.com>
2024-10-26 23:11:03 +07:00
Dmitry
4b99b8ec26 Update mods 2024-10-26 23:09:26 +07:00
Dmitry
67a5605ce4 Merge pull request #553 from TerraFirmaGreg-Team/1.0.0
Обновление 0.8.0
2024-10-26 22:34:19 +07:00
Dmitry
3c8bf025df some fixes 2024-10-26 22:32:28 +07:00
Dmitry
e2e6cee43e Update mods 2024-10-26 22:31:32 +07:00
Dmitry
28a57d98c8 Update primitive_age.snbt 2024-10-26 21:14:31 +07:00
Dmitry
549935dac0 Update embeddium-options.json 2024-10-26 21:14:25 +07:00
Dmitry
411f308abc some recipe for kaolinite powder 2024-10-26 21:08:31 +07:00
Dmitry
8235088ef5 Update gtceu.yaml 2024-10-26 21:08:11 +07:00
Dmitry
47cf0eb163 some quests tweaks 2024-10-26 21:08:08 +07:00
Dmitry
0fb2e2cdd0 Merge branch 'main' into 1.0.0 2024-10-25 08:25:36 +07:00
Xikaro
e3e934861f Update release.yml 2024-10-24 12:33:13 +05:00
Xikaro
238041bfac Update release.yml 2024-10-24 12:32:12 +05:00
Xikaro
6f27a7feff test update 2024-10-24 11:42:41 +05:00
Xikaro
685d802587 up pakku 2024-10-24 11:36:48 +05:00
Xikaro
858a72b999 Merge branch '1.0.0' into pakku 2024-10-24 11:15:46 +05:00
Xikaro
9fac846ae1 Update mods 2024-10-24 11:15:18 +05:00
Xikaro
9895e86fda Merge branch 'main' into pakku 2024-10-24 11:13:33 +05:00
Dmitry
014a499733 Update embeddium-options.json 2024-10-23 12:03:15 +07:00
Dmitry
2b641b84fb copper coils 2024-10-23 12:03:02 +07:00
Dmitry
46680adceb fix create connected fluid vessel recipe 2024-10-23 11:41:06 +07:00
Dmitry
e0efa6ddd7 Fix #483 2024-10-23 11:40:56 +07:00
Xikaro
6279f7cec6 copper_coil_block 2024-10-21 13:32:35 +05:00
Xikaro
98d52419ce coil 2024-10-20 21:05:16 +05:00
Xikaro
e570a5079d Update mods 2024-10-20 16:44:22 +05:00
Dmitry
e4e2593fcb Update craftpresence.json 2024-10-20 14:36:49 +07:00
Dmitry
7f61e3e2ef Update allowed_sounds.properties 2024-10-20 14:36:26 +07:00
Dmitry
ff7d61cd70 Update curios.json 2024-10-20 14:35:04 +07:00
Dmitry
e7e422f703 Update luv__ludicrous_voltage.snbt 2024-10-20 14:34:56 +07:00
Dmitry
c22e86ae59 Update options.txt 2024-10-20 14:34:49 +07:00
Dmitry
4d166c7e9c ckeanup 2 2024-10-20 14:34:45 +07:00
Dmitry
ac154a519e cleanup 2024-10-20 14:34:02 +07:00
Dmitry
bf44c228e7 Update everycomp-entries.toml 2024-10-20 14:32:26 +07:00
Dmitry
6bdb5a90e4 drop embed++, add sodium opts 2024-10-20 14:31:53 +07:00
Dmitry
f826cdf0a7 Create sodiumextras-client.toml 2024-10-20 14:31:39 +07:00
Dmitry
6cd3cd0af1 xaero options 2024-10-20 14:31:36 +07:00
Dmitry
dc015f8faf Merge branch '1.0.0' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into 1.0.0 2024-10-20 14:15:41 +07:00
Dmitry
b548c2253b some create addons fixes 2024-10-20 14:15:37 +07:00
Xikaro
573ded8995 Update mods 2024-10-20 11:41:44 +05:00