Curtis Merrill
|
ebe0a2763d
|
add gt furnace recipe for wood ash (#790)
Signed-off-by: Pyritie <pyritie@gmail.com>
Co-authored-by: Pyritie <pyritie@gmail.com>
|
2025-04-15 22:54:02 +01:00 |
|
julia
|
3c3062ae9d
|
Fix Chocolate Dust Recipe, Add Additional Chocolate Dust/Powder Recipes (#803)
Signed-off-by: Pyritie <pyritie@gmail.com>
Co-authored-by: Pyritie <pyritie@gmail.com>
|
2025-04-15 22:51:41 +01:00 |
|
Curtis Merrill
|
a00785e751
|
add recipes for passthrough hatches (#815)
Signed-off-by: Pyritie <pyritie@gmail.com>
Co-authored-by: Pyritie <pyritie@gmail.com>
|
2025-04-15 22:51:33 +01:00 |
|
Adora
|
2311308d00
|
GT light/dark concrete recipe fix (#820)
Signed-off-by: Adora <adoradyne.58@gmail.com>
Signed-off-by: Pyritie <pyritie@gmail.com>
Co-authored-by: Pyritie <pyritie@gmail.com>
|
2025-04-15 22:51:22 +01:00 |
|
Xikaro
|
4e4aae4de5
|
pakku-lock
|
2025-04-15 09:39:46 +05:00 |
|
Xikaro
|
b2c4d86e6d
|
Update mods
|
2025-04-15 08:41:26 +05:00 |
|
Pyritie
|
8c6aa36bc4
|
whoops, there was two .vs/
|
2025-04-14 23:00:08 +01:00 |
|
Pyritie
|
1d784aa410
|
made hopper recipe cheaper
|
2025-04-14 22:26:30 +01:00 |
|
Pyritie
|
bf7a903f17
|
quest tweaks
|
2025-04-14 22:26:19 +01:00 |
|
Pyritie
|
89c55f59a4
|
Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev
|
2025-04-14 20:55:41 +01:00 |
|
Pyritie
|
c83f51d6bc
|
Reapply "update gitignore"
This reverts commit 7f89ead730.
|
2025-04-14 20:40:23 +01:00 |
|
Pyritie
|
7f89ead730
|
Revert "update gitignore"
This reverts commit b437a75492.
|
2025-04-14 20:40:14 +01:00 |
|
Nebby
|
d4c80a4b61
|
Consolidating Development: 0.9.x (#846)
Signed-off-by: Pyritie <pyritie@gmail.com>
Signed-off-by: TomPlop <tomdidome@gmail.com>
Co-authored-by: Pyritie <Pyritie@gmail.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 <os.valerievich@ya.ru>
Co-authored-by: Xikaro <55663835+Xikaro@users.noreply.github.com>
Co-authored-by: Zleub <debray.arnaud@gmail.com>
|
2025-04-14 19:00:08 +01:00 |
|
Xikaro
|
528672e95b
|
Update mods
|
2025-04-14 22:15:14 +05:00 |
|
Pyritie
|
b437a75492
|
update gitignore
|
2025-04-14 14:51:50 +01:00 |
|
Xikaro
|
04a2b06d69
|
Update mods
|
2025-04-14 05:34:40 +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 |
|