Dmitry
|
29fe3d4e66
|
Merge branch 'main' into trims
Signed-off-by: Dmitry <52341158+Exzept1on@users.noreply.github.com>
|
2025-01-18 00:28:09 +07:00 |
|
Dmitry
|
d319067a8e
|
Merge pull request #705 from Pyritie/patch-1
Added missing recipe for nether brick
|
2025-01-18 00:26:31 +07:00 |
|
Dmitry
|
4c0d7f360c
|
Merge pull request #704 from Pyritie/glass
Added recipes for create glass, more windows, fixed tinted glass recipe conflict
|
2025-01-18 00:25:52 +07:00 |
|
Dmitry
|
12e142d1de
|
Merge pull request #703 from Pyritie/sprinklers
Fix sprinklers + fix bread and yeast starter recipe conflict
|
2025-01-18 00:23:04 +07:00 |
|
Dmitry
|
2bac0b4ba2
|
Merge pull request #711 from TerraFirmaGreg-Team/dependabot/github_actions/dependencies-cff0214797
Bump actions/upload-artifact from 4.5.0 to 4.6.0 in the dependencies group
|
2025-01-18 00:17:28 +07:00 |
|
dependabot[bot]
|
3455d44016
|
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.5.0 to 4.6.0
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/v4.5.0...v4.6.0)
---
updated-dependencies:
- dependency-name: actions/upload-artifact
dependency-type: direct:production
update-type: version-update:semver-minor
dependency-group: dependencies
...
Signed-off-by: dependabot[bot] <support@github.com>
|
2025-01-13 21:28:34 +00:00 |
|
Pyritie
|
943e7f2e02
|
Update constants.js
Signed-off-by: Pyritie <pyritie@gmail.com>
|
2025-01-13 15:47:18 +00:00 |
|
Pyritie
|
f2f86a1bf6
|
copied from 0.8.1
Signed-off-by: Pyritie <pyritie@gmail.com>
|
2025-01-13 15:24:02 +00:00 |
|
Pyritie
|
dbf29787c9
|
Add files via upload
Signed-off-by: Pyritie <pyritie@gmail.com>
|
2025-01-13 15:15:05 +00:00 |
|
Pyritie
|
5b834e6a05
|
Add files via upload
Signed-off-by: Pyritie <pyritie@gmail.com>
|
2025-01-13 14:58:30 +00:00 |
|
Pyritie
|
c5e5193da3
|
Update tags.js
Signed-off-by: Pyritie <pyritie@gmail.com>
|
2025-01-13 14:58:15 +00:00 |
|
Pyritie
|
65dd5e4ac5
|
Update main_server_script.js
Signed-off-by: Pyritie <pyritie@gmail.com>
|
2025-01-13 14:57:57 +00:00 |
|
Pyritie
|
52c31181cc
|
Update tags.js
Signed-off-by: Pyritie <pyritie@gmail.com>
|
2025-01-13 14:41:11 +00:00 |
|
Pyritie
|
8eaa363f38
|
Update tags.js
Signed-off-by: Pyritie <pyritie@gmail.com>
|
2025-01-13 14:31:40 +00:00 |
|
Pyritie
|
a04f0cd439
|
Update constants.js
Signed-off-by: Pyritie <pyritie@gmail.com>
|
2025-01-13 14:31:03 +00:00 |
|
Pyritie
|
529bcad07a
|
fixed netherrack dust being hidden in jei
Signed-off-by: Pyritie <pyritie@gmail.com>
|
2025-01-13 14:16:28 +00:00 |
|
Pyritie
|
66a1f2cc3b
|
Update recipes.js
Signed-off-by: Pyritie <pyritie@gmail.com>
|
2025-01-13 14:04:01 +00:00 |
|
Pyritie
|
04ac888ff8
|
Update constants.js
Signed-off-by: Pyritie <pyritie@gmail.com>
|
2025-01-13 14:03:13 +00:00 |
|
Pyritie
|
ce9d9c33a4
|
Add files via upload
Signed-off-by: Pyritie <pyritie@gmail.com>
|
2025-01-13 14:02:32 +00:00 |
|
Pyritie
|
11b5790bd3
|
Update recipes.js
Signed-off-by: Pyritie <pyritie@gmail.com>
|
2025-01-13 02:45:03 +00:00 |
|
Pyritie
|
1a29e4cfa0
|
Update recipes.js
Signed-off-by: Pyritie <pyritie@gmail.com>
|
2025-01-13 01:17:21 +00:00 |
|
Pyritie
|
478b9ff3f6
|
Update recipes.js
Signed-off-by: Pyritie <pyritie@gmail.com>
|
2025-01-13 01:14:56 +00:00 |
|
Pyritie
|
18aac7cb5b
|
Update constants.js
Signed-off-by: Pyritie <pyritie@gmail.com>
|
2025-01-13 01:13:48 +00:00 |
|
Pyritie
|
d2b75c170a
|
Add files via upload
Signed-off-by: Pyritie <pyritie@gmail.com>
|
2025-01-13 01:12:40 +00:00 |
|
Pyritie
|
dde2ec68e9
|
Update recipes.js
Signed-off-by: Pyritie <pyritie@gmail.com>
|
2025-01-12 22:26:02 +00:00 |
|
Pyritie
|
6b81d71177
|
Update recipes.js
Signed-off-by: Pyritie <pyritie@gmail.com>
|
2025-01-12 22:02:36 +00:00 |
|
Pyritie
|
ce3558feac
|
Update recipes.js
Signed-off-by: Pyritie <pyritie@gmail.com>
|
2025-01-12 21:54:17 +00:00 |
|
Pyritie
|
64bd5bc8cf
|
Update recipes.js
Signed-off-by: Pyritie <pyritie@gmail.com>
|
2025-01-12 21:53:33 +00:00 |
|
Pyritie
|
237891bc9a
|
Merge branch 'TerraFirmaGreg-Team:main' into sprinklers
|
2025-01-12 21:51:20 +00:00 |
|
Pyritie
|
6b8a822028
|
Update constants.js
Signed-off-by: Pyritie <pyritie@gmail.com>
|
2025-01-12 21:50:43 +00:00 |
|
Pyritie
|
bd7b4042c9
|
Add files via upload
Signed-off-by: Pyritie <pyritie@gmail.com>
|
2025-01-12 21:50:04 +00:00 |
|
Dmitry
|
8741d77147
|
Update CHANGELOG.md
Signed-off-by: Dmitry <52341158+Exzept1on@users.noreply.github.com>
|
2025-01-12 22:49:29 +07:00 |
|
Dmitry
|
e6641ca0a7
|
Merge pull request #698 from Pyritie/ae2
Changed the AE2 network analyzer to HV instead of IV
|
2025-01-12 22:49:10 +07:00 |
|
Pyritie
|
629da2b0ea
|
Merge branch 'TerraFirmaGreg-Team:main' into ae2
|
2025-01-12 14:51:09 +00:00 |
|
Xikaro
|
0babb1175a
|
Revert "Update pakku-lock.json"
This reverts commit e7129dac26.
|
2025-01-12 17:28:38 +05:00 |
|
Xikaro
|
e7129dac26
|
Update pakku-lock.json
|
2025-01-12 15:47:35 +05:00 |
|
Pyritie
|
10d14ac7de
|
Update recipes.js
Signed-off-by: Pyritie <pyritie@gmail.com>
|
2025-01-12 10:14:23 +00:00 |
|
Pyritie
|
db4d3e1b44
|
Merge branch 'TerraFirmaGreg-Team:main' into ae2
|
2025-01-12 10:06:48 +00:00 |
|
Dmitry
|
ba895caa15
|
Update CHANGELOG.md
Signed-off-by: Dmitry <52341158+Exzept1on@users.noreply.github.com>
|
2025-01-12 16:41:19 +07:00 |
|
Dmitry
|
fc9be024c1
|
Merge pull request #690 from Pyritie/main
Added ore index, started work on other TFC info category
|
2025-01-12 16:40:22 +07:00 |
|
Pyritie
|
1c55351bfc
|
Merge branch 'main' into main
Signed-off-by: Pyritie <pyritie@gmail.com>
|
2025-01-12 08:48:23 +00:00 |
|
Xikaro
|
fface8041c
|
workflows
|
2025-01-12 10:56:34 +05:00 |
|
Xikaro
|
af5a0638e5
|
Update build.yml
Signed-off-by: Xikaro <55663835+Xikaro@users.noreply.github.com>
|
2025-01-12 10:41:50 +05:00 |
|
Xikaro
|
2a89fa630a
|
Update build.yml
Signed-off-by: Xikaro <55663835+Xikaro@users.noreply.github.com>
|
2025-01-12 10:41:04 +05:00 |
|
Dmitry
|
bdb0e05beb
|
Update pakku.json
Signed-off-by: Dmitry <52341158+Exzept1on@users.noreply.github.com>
|
2025-01-12 12:37:34 +07:00 |
|
Dmitry
|
0f1f7a2f6d
|
what?
|
2025-01-12 11:58:27 +07:00 |
|
Dmitry
|
0212f19e50
|
Update CHANGELOG.md
Signed-off-by: Dmitry <52341158+Exzept1on@users.noreply.github.com>
|
2025-01-12 11:57:06 +07:00 |
|
Dmitry
|
9c4f53b690
|
Merge pull request #693 from Saaghh/electric-leather
electric leather
|
2025-01-12 11:55:50 +07:00 |
|
Dmitry
|
b6627d9030
|
Merge pull request #694 from Saaghh/electrocheese
Electric cheese, tomato sauce and cream
|
2025-01-12 11:54:56 +07:00 |
|
Dmitry
|
e32627de7a
|
Merge pull request #695 from Pyritie/patch-2
Added another recipe for Create's electron tubes
|
2025-01-12 11:54:27 +07:00 |
|