Commit graph

1141 commits

Author SHA1 Message Date
Dmitry
ed3ee66c7b Update CHANGELOG.md 2024-01-10 22:13:59 +07:00
Dmitry
777998eb45 Update primitive_age.snbt 2024-01-10 22:04:33 +07:00
Dmitry
39584e96f6 new crushing recipes 2024-01-10 21:58:46 +07:00
Dmitry
c4962e7d28 probably fix tool quests 2024-01-10 21:58:39 +07:00
Dmitry
36120fa53e bla bla 2024-01-10 21:45:05 +07:00
Dmitry
f8aa4a1e38 Create data.js 2024-01-10 21:15:26 +07:00
Dmitry
50d9b7a0d1 compat 2024-01-10 21:15:20 +07:00
Dmitry
d21e1a9227 some 2024-01-10 21:01:48 +07:00
Dmitry
5fa9e51652 Update mods 2024-01-10 21:01:29 +07:00
Dmitry
1015ac8bf6 Update .gitignore 2024-01-10 19:16:05 +07:00
Dmitry
c81340a5db Update mods 2024-01-10 19:16:00 +07:00
Dmitry
6537a3aa2e emi cfg 2024-01-10 18:55:09 +07:00
Dmitry
42559acf97 firmalife integration (I suppose) 2024-01-10 18:55:04 +07:00
Xikaro
8332513790 fix size icon 2024-01-10 15:39:08 +05:00
Xikaro
9af2acbffc v3 gui 2024-01-10 15:07:45 +05:00
Dmitry
d6fad80122 Update mods 2024-01-10 14:50:52 +07:00
Dmitry
c4eced2c9f Update main_client_script.js 2024-01-10 14:08:59 +07:00
Dmitry
80c1696ff1 fxi collapsing 2024-01-10 14:07:59 +07:00
Dmitry
f907c98009 return REI 2024-01-10 13:46:13 +07:00
Xikaro
fcfd91839a Update CHANGELOG.md 2024-01-10 11:07:08 +05:00
Xikaro
cf59845c78 Merge branch 'main' into 0.5.0 2024-01-10 10:47:41 +05:00
Xikaro
2f456aa728 fix embeddium config 2024-01-10 10:46:57 +05:00
Xikaro
005233433e Update mods 2024-01-10 10:42:41 +05:00
Dmitry
58724af628 some recipes 2024-01-10 12:16:47 +07:00
Xikaro
b9f5d0787a Merge branch 'main' of https://github.com/TerraFirmaGreg-Team/Modpack-1.20.x 2024-01-09 23:33:32 +05:00
Xikaro
57a2a6dfe7 gui 2024-01-09 23:33:23 +05:00
Xikaro
549ae398ec
Update client_mod.txt
Signed-off-by: Xikaro <55663835+Xikaro@users.noreply.github.com>
2024-01-09 23:30:40 +05:00
Dmitry
94bf85633d Apply #172 2024-01-09 18:18:23 +07:00
Dmitry
3c9134e070 fix films 2024-01-09 18:13:19 +07:00
Dmitry
5691c75341 fix cc naming 2024-01-09 17:50:25 +07:00
Dmitry
00e3c41120
Merge pull request #164 from TerraFirmaGreg-Team/143-integration-computercraft
Интеграция CumputerCraft
2024-01-09 17:44:51 +07:00
Dmitry
fcf0c04540
Merge branch '0.5.0' into 143-integration-computercraft 2024-01-09 17:44:41 +07:00
Dmitry
c9f77e22e6
Update CHANGELOG.md
Signed-off-by: Dmitry <52341158+SpeeeDCraft@users.noreply.github.com>
2024-01-09 17:44:30 +07:00
Dmitry
818f04cb85
Merge pull request #168 from TerraFirmaGreg-Team/craft-in-ae2-and-ae2wtlib
изменил крафты
2024-01-09 17:41:55 +07:00
Dmitry
5bc6fb0fe5 ore fixes 2024-01-09 17:36:27 +07:00
Dmitry
cc21b7a8a6 Merge branch '0.5.0' of https://github.com/TerraFirmaGreg-Team/Modpack-1.20.x into 0.5.0 2024-01-09 13:08:05 +07:00
Dmitry
cdd8a48556 Update mods 2024-01-09 13:07:57 +07:00
Xikaro
cdb306b1bd Update mods 2024-01-09 11:06:38 +05:00
Dmitry
94e0194c82 cfg 2024-01-09 12:40:42 +07:00
Dmitry
02390cc10f
Update CHANGELOG.md
Signed-off-by: Dmitry <52341158+SpeeeDCraft@users.noreply.github.com>
2024-01-09 12:04:08 +07:00
Dmitry
1295060fd8 some recipes 2024-01-09 09:11:45 +07:00
Dmitry
336e4dbb6d Update mods 2024-01-09 09:11:31 +07:00
Dmitry
6727055cb8 Merge branch 'main' into 0.5.0 2024-01-09 08:28:20 +07:00
Dmitry
d89d2f5281 Merge branch 'main' into 0.5.0 2024-01-09 08:27:33 +07:00
Dmitry
cfb99e1cf9
Update CHANGELOG.md
Signed-off-by: Dmitry <52341158+SpeeeDCraft@users.noreply.github.com>
2024-01-09 08:23:39 +07:00
Xikaro
678118dbe7
Update README.md
Signed-off-by: Xikaro <55663835+Xikaro@users.noreply.github.com>
2024-01-09 00:18:21 +05:00
Dmitry
05ae9265db
Update CHANGELOG.md
Signed-off-by: Dmitry <52341158+SpeeeDCraft@users.noreply.github.com>
2024-01-08 22:22:28 +07:00
Dmitry
4e2cb64076 Update mods 2024-01-08 11:38:11 +07:00
Xikaro
ec1b18ada9 Merge branch 'main' into 0.5.0 2024-01-08 09:32:14 +05:00
Xikaro
c14d895d37 Delete slider_1.png 2024-01-08 09:31:52 +05:00