Commit graph

2416 commits

Author SHA1 Message Date
Pyritie
ec2e3cd3c4
Alpha Release: 0.9.0 (#849)
Signed-off-by: Pyritie <pyritie@gmail.com>
Signed-off-by: TomPlop <tomdidome@gmail.com>
Co-authored-by: Xikaro <os.valerievich@ya.ru>
Co-authored-by: Nebby <78170922+Nebby1999@users.noreply.github.com>
Co-authored-by: Redeix <brayden.j.m.ford@gmail.com>
Co-authored-by: TomPlop <tomdidome@gmail.com>
Co-authored-by: aidie8 <aidenvanzuilen@gmail.com>
Co-authored-by: Xikaro <55663835+Xikaro@users.noreply.github.com>
Co-authored-by: Zleub <debray.arnaud@gmail.com>
2025-04-15 23:27:17 +05:00
Xikaro
d344316e5a Update CONTRIBUTING.md 2025-04-14 04:55:57 +05:00
Xikaro
e3dcc31372 Update CONTRIBUTING.md 2025-04-14 04:53:37 +05:00
Xikaro
339f9d2041 Update CONTRIBUTING.md 2025-04-14 04:12:36 +05:00
Xikaro
358cb5d807 Update CONTRIBUTING.md 2025-04-14 04:10:00 +05:00
Xikaro
955cc02413 CONTRIBUTING 2025-04-14 04:01:27 +05:00
TerraFirmaGreg
4f59bfd042 Update PULL_REQUEST_TEMPLATE.md 2025-04-13 04:12:46 +05:00
TerraFirmaGreg
5fbb914577 Update CHANGELOG.md 2025-04-13 04:09:25 +05:00
Xikaro
73de2c38db
Merge pull request #828 from TerraFirmaGreg-Team/dependabot/github_actions/dependencies-aeec8888df
Bump the dependencies group with 2 updates
2025-04-09 15:30:28 +05:00
dependabot[bot]
2b98542bcf
Bump the dependencies group with 2 updates
Bumps the dependencies group with 2 updates: [actions/upload-artifact](https://github.com/actions/upload-artifact) and [actions/download-artifact](https://github.com/actions/download-artifact).


Updates `actions/upload-artifact` from 4.6.1 to 4.6.2
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/v4.6.1...v4.6.2)

Updates `actions/download-artifact` from 4.1.9 to 4.2.1
- [Release notes](https://github.com/actions/download-artifact/releases)
- [Commits](https://github.com/actions/download-artifact/compare/v4.1.9...v4.2.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
2025-03-25 00:16:18 +00:00
Xikaro
aa1a67b1b1
Merge pull request #811 from TerraFirmaGreg-Team/dependabot/github_actions/dependencies-076523d357
Bump the dependencies group across 1 directory with 3 updates
2025-03-06 00:33:38 +05:00
dependabot[bot]
fa6c5cbf5f
Bump the dependencies group across 1 directory with 3 updates
Bumps the dependencies group with 3 updates in the / directory: [actions/upload-artifact](https://github.com/actions/upload-artifact), [actions/download-artifact](https://github.com/actions/download-artifact) and [roamingowl/template-output-with-eta](https://github.com/roamingowl/template-output-with-eta).


Updates `actions/upload-artifact` from 4.6.0 to 4.6.1
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/v4.6.0...v4.6.1)

Updates `actions/download-artifact` from 4.1.8 to 4.1.9
- [Release notes](https://github.com/actions/download-artifact/releases)
- [Commits](https://github.com/actions/download-artifact/compare/v4.1.8...v4.1.9)

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

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: dependencies
- dependency-name: actions/download-artifact
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: 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-03-03 21:35:30 +00:00
Xikaro
fd9b6cdd91 Update server_starter.conf 2025-02-16 00:08:18 +05:00
Xikaro
96ce5acc3c
Merge pull request #778 from TerraFirmaGreg-Team/dependabot/github_actions/dependencies-3df3328615
Bump hugoalh/send-discord-webhook-ghaction from 7.0.4 to 7.0.5 in the dependencies group
2025-02-05 06:56:04 +05:00
dependabot[bot]
747b87b332
Bump hugoalh/send-discord-webhook-ghaction in the dependencies group
Bumps the dependencies group with 1 update: [hugoalh/send-discord-webhook-ghaction](https://github.com/hugoalh/send-discord-webhook-ghaction).


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

---
updated-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>
2025-02-03 21:51:42 +00:00
Xikaro
3b705e3f18 Merge branch 'main' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern 2025-01-25 23:23:53 +05:00
Xikaro
376285e6da Update forge-auto-install.txt 2025-01-25 23:23:49 +05:00
Dmitry
0b17f10c08
Update CHANGELOG.md
Signed-off-by: Dmitry <52341158+Exzept1on@users.noreply.github.com>
2025-01-26 01:05:25 +07:00
Xikaro
97574075c4 Update pakku.json 2025-01-25 22:55:09 +05:00
Xikaro
b44bcb5244 Update pakku-lock.json 2025-01-25 22:51:33 +05:00
Xikaro
f6b8bddc1e Update server_starter.conf 2025-01-25 22:45:17 +05:00
Xikaro
752a845445 Update server_starter.conf 2025-01-25 22:43:38 +05:00
Xikaro
f1da81bb4a ref: server 2025-01-25 22:39:31 +05:00
Dmitry
65e8cd0b06
Update CHANGELOG.md
Signed-off-by: Dmitry <52341158+Exzept1on@users.noreply.github.com>
2025-01-26 00:03:45 +07:00
Dmitry
8e6e1318e5
Merge pull request #733 from Egogorka/fix-collapsible-bricks
Fix collapsible brick slab blocks
2025-01-26 00:03:32 +07:00
Dmitry
0aecdce1d8
Merge pull request #737 from Pyritie/patch-1
Adjusted LV machines book entry
2025-01-26 00:02:23 +07:00
Dmitry
c0a53cab62
Merge pull request #732 from AirRice/sign-exploit-squasher
Hanging Sign Metal Dupe fix
2025-01-26 00:01:51 +07:00
Pyritie
c50f5966f6
Merge branch 'main' into patch-1 2025-01-25 17:01:24 +00:00
Dmitry
d8fa521bc9
Merge pull request #739 from Nebby1999/main
Feature:  Papermaking Overhaul with Wood
2025-01-26 00:00:21 +07:00
Dmitry
4090358be0
Merge pull request #740 from deneth-weerasinghe/main
Fix assembler wool recipe conflicts
2025-01-25 23:59:15 +07:00
Dmitry
5a5260a542
Merge branch 'main' into main
Signed-off-by: Dmitry <52341158+Exzept1on@users.noreply.github.com>
2025-01-25 23:58:43 +07:00
Dmitry
d8c37eac78
Merge pull request #742 from Metriximor/main
Add seaweed and kelp drying recipes
2025-01-25 23:56:42 +07:00
Dmitry
d62ed8bb6b
Update CHANGELOG.md
Signed-off-by: Dmitry <52341158+Exzept1on@users.noreply.github.com>
2025-01-25 23:56:26 +07:00
Dmitry
1ecdc4bd76
Merge pull request #744 from Pyritie/patch-2
Changed LV casing/hull recipes (again)
2025-01-25 23:55:45 +07:00
Dmitry
93ee99349a
Merge pull request #745 from CaptainGold1/glowstone_lamp_fuel
Add glowstone as infinite lamp fuel
2025-01-25 23:54:59 +07:00
Dmitry
50fa27f0e7
Merge pull request #750 from Nebby1999/feature/create_sequenced_assemblying_Scraping
Automatic Scraping with Sequenced Assembly
2025-01-25 23:53:34 +07:00
Dmitry
81b06d7caa
Merge pull request #751 from Pyritie/Fixed-colored-steel-dust-centrifuge-recipes
Fixed colored steel dust centrifuge recipes
2025-01-25 23:53:07 +07:00
Dmitry
3543e8f083
Merge pull request #752 from Pyritie/patch-3
Add circuit settings to netherarium/enderarium
2025-01-25 23:52:43 +07:00
Dmitry
ab9a22d29d
Merge pull request #753 from CaptainGold1/processed-ores-heat
Adds heat values for items with valid heating recipes but no heat values
2025-01-25 23:52:11 +07:00
Dmitry
8025dccf40
Merge pull request #755 from SverhRazum-Nah/TFC-magma-as-passive-boiler-heater
Tfc magma as passive boiler heater
2025-01-25 23:48:43 +07:00
Dmitry
160de3cfa7
Merge branch 'main' into TFC-magma-as-passive-boiler-heater
Signed-off-by: Dmitry <52341158+Exzept1on@users.noreply.github.com>
2025-01-25 23:48:34 +07:00
Dmitry
811f0976b0
Merge pull request #756 from CaptainGold1/cassiterite-fix
Fixed cassiterite heating "exploit"
2025-01-25 23:47:42 +07:00
Dmitry
f2d124265b
Merge pull request #758 from Nebby1999/feature/small_dust_from_failed_pressing
Get small dust from failed pressing
2025-01-25 23:45:49 +07:00
Dmitry
aff2201418
Merge pull request #759 from CaptainGold1/wool_fix
Fixes wool cloth recipe conflict
2025-01-25 23:44:43 +07:00
Dmitry
1726f86477
Update CHANGELOG.md
Signed-off-by: Dmitry <52341158+Exzept1on@users.noreply.github.com>
2025-01-25 23:43:44 +07:00
Dmitry
a9a682bd3d
Merge pull request #760 from Nebby1999/feature/forging_guide_in_guidebook
Add a Forging Guide to the Field Guide
2025-01-25 23:43:17 +07:00
Dmitry
7543a23e88
Merge pull request #731 from Pyritie/crystals
Added budding crystals for the other gemstone ores
2025-01-25 23:40:51 +07:00
Nebby1999
194af34182 Patchouli Entry 2025-01-25 00:42:36 -03:00
CaptainGold1
981929bab0 UNTESTED: fixes wool recipe conflict 2025-01-24 20:00:41 -06:00
Nebby1999
52f44279c9 Remove log call 2025-01-24 20:43:26 -03:00