Commit graph

1516 commits

Author SHA1 Message Date
Dmitry
1c85303851 Merge branch 'main' of https://github.com/TerraFirmaGreg-Team/Modpack-1.20.x 2024-01-06 21:21:21 +07:00
Dmitry
c4ddfe5ac3 pari pari pari 2024-01-06 21:21:10 +07:00
Dmitry
f3b26340df
Update CHANGELOG.md
Signed-off-by: Dmitry <52341158+SpeeeDCraft@users.noreply.github.com>
2024-01-06 21:20:54 +07:00
Dmitry
c75708c848 fix create recipes again 2024-01-06 21:14:14 +07:00
Dmitry
c3b1203215 Update mods 2024-01-06 20:48:19 +07:00
Dmitry
fc9c564d36 Merge branch 'main' of https://github.com/TerraFirmaGreg-Team/Modpack-1.20.x 2024-01-06 20:47:37 +07:00
Dmitry
6fb7f5b21c unfuck stupid backpacks 2024-01-06 20:47:28 +07:00
Xikaro
d0991cd359 Update main_menu.txt 2024-01-06 13:13:08 +05:00
Xikaro
f02a14f019 сopyright_button move 2024-01-06 12:57:08 +05:00
Xikaro
1223ce7ec1 Update main_menu.txt 2024-01-06 12:42:21 +05:00
Xikaro
3a544b2340 Delete dynamic_lights_reforged.toml 2024-01-06 12:31:37 +05:00
Xikaro
b0c3cbe9eb Update main_menu.txt 2024-01-06 12:15:10 +05:00
Xikaro
fd5582a59a рефактор gui 2024-01-06 12:13:05 +05:00
Xikaro
13a0277772 Update main_menu.txt 2024-01-06 11:46:03 +05:00
Xikaro
d7df95409c Update build.yml 2024-01-06 11:35:31 +05:00
Xikaro
c1293399b9 workflows final 2024-01-06 11:33:18 +05:00
Xikaro
711da02895 Update test.yml 2024-01-06 11:17:54 +05:00
Xikaro
704f92a127 Update test.yml 2024-01-06 11:16:26 +05:00
Xikaro
efb338a730 Create test.yml 2024-01-06 11:15:38 +05:00
Xikaro
a3ed98df64 Update mods 2024-01-06 10:19:52 +05:00
Dmitry
ff0240fe55
Update CHANGELOG.md
Signed-off-by: Dmitry <52341158+SpeeeDCraft@users.noreply.github.com>
2024-01-06 10:20:23 +07:00
Dmitry
636d4eaa85 Merge branch 'main' of https://github.com/TerraFirmaGreg-Team/Modpack-1.20.x 2024-01-06 10:19:02 +07:00
Dmitry
566407ec7e fix steel machine recipes 2024-01-06 10:18:59 +07:00
Dmitry
5beccf2428
Update CHANGELOG.md
Signed-off-by: Dmitry <52341158+SpeeeDCraft@users.noreply.github.com>
2024-01-06 09:33:00 +07:00
Dmitry
fd9d823aa1 fixes 2024-01-06 09:28:32 +07:00
Cube
1f80d23b6b
Merge branch 'main' into 143-integration-computercraft 2024-01-05 23:25:25 +02:00
FriendlyCube
ab1c18d5f8 крафты планшетов
остались черепахи
2024-01-05 22:52:12 +02:00
Xikaro
cd6c43fe83 Update build.yml 2024-01-06 00:47:25 +05:00
Xikaro
9008ee8b58 manifest 2024-01-06 00:35:14 +05:00
Xikaro
b05d61ad8c Update mods 2024-01-06 00:34:30 +05:00
Xikaro
f5b265d1e9 Update CHANGELOG.md 2024-01-06 00:34:26 +05:00
Xikaro
3c4561e79e Update mods 2024-01-05 22:18:46 +05:00
Xikaro
30c3741307 Merge branch 'main' of https://github.com/TerraFirmaGreg-Team/Modpack-1.20.x 2024-01-05 20:34:27 +05:00
Xikaro
9be8dbc783 ftbranks 2024-01-05 20:34:19 +05:00
Dmitry
4bd7a3cc5f dead 2024-01-05 22:32:51 +07:00
Dmitry
f4accd7431 Вытер за собой 2024-01-05 22:30:40 +07:00
Cube
6c7c992774
Merge branch 'main' into 143-integration-computercraft 2024-01-05 17:07:57 +02:00
FriendlyCube
c7b2911215 Merge branch '143-integration-computercraft' of https://github.com/TerraFirmaGreg-Team/TFG-Modpack-1.20.x into 143-integration-computercraft 2024-01-05 17:02:03 +02:00
FriendlyCube
2777033e86 почти доделал
остались планшеты и черепахи
2024-01-05 17:00:46 +02:00
Xikaro
b4db9f2bfe Update build.yml 2024-01-05 19:24:56 +05:00
Xikaro
8dfd5808ab workflows 2024-01-05 19:05:47 +05:00
Xikaro
c40d50493c Update mods 2024-01-05 18:49:25 +05:00
Xikaro
85bf619535 Update mods 2024-01-05 18:48:55 +05:00
Dmitry
4306780123 conf 2024-01-05 20:47:18 +07:00
Xikaro
988330881a workflows final 2024-01-05 17:52:07 +05:00
Xikaro
4611d42fca manifest 2024-01-05 17:48:45 +05:00
Xikaro
c6f767aaf7 Update mods 2024-01-05 17:48:07 +05:00
Xikaro
65fecd0ff3 Update CHANGELOG.md 2024-01-05 17:46:13 +05:00
Xikaro
0e7c53af90 Update build.yml 2024-01-05 17:44:18 +05:00
Xikaro
5b3432e7c1 Update build.yml 2024-01-05 17:40:46 +05:00