Commit graph

486 commits

Author SHA1 Message Date
Dmitry
53c97d0f91 some work 2024-01-12 18:29:45 +07:00
Dmitry
33af10a36c lol 2024-01-12 17:14:34 +07:00
Dmitry
ff323bec9d fixes 2024-01-12 16:07:56 +07:00
Dmitry
466b3beea1 Update recipes.js 2024-01-12 15:58:20 +07:00
Dmitry
dc722f82ec Update recipes.js 2024-01-12 15:40:53 +07:00
Dmitry
2a64cc74b2 Update recipes.js 2024-01-12 15:17:39 +07:00
Dmitry
5f0ecf8659 Update recipes.js 2024-01-12 15:10:01 +07:00
Dmitry
77f8281a7f Update recipes.js 2024-01-12 14:51:33 +07:00
Dmitry
ed340b9240 куча работы 2024-01-12 14:35:26 +07:00
Dmitry
be4b55333d Merge branch 'main' into 0.6.0 2024-01-12 11:46:15 +07:00
Xikaro
2076053aeb main_menu 2024-01-12 08:35:30 +05:00
Dmitry
ad34a8f1da use our kjs plugin 2024-01-12 10:23:05 +07:00
Dmitry
b3b466f509 Отказоустойчивая система 2024-01-12 10:08:32 +07:00
Dmitry
ef1716a1ad drop this big dictionary 2024-01-12 09:48:33 +07:00
Dmitry
dcef88fb51 Update main_client_script.js 2024-01-12 09:04:50 +07:00
Dmitry
6748e20e7a dead 2024-01-12 09:02:11 +07:00
Dmitry
59cda1a59b fix butchery knifes + fix rock anvil quest 2024-01-12 07:53:06 +07:00
Dmitry
5ff36b04a8 Update recipes.js 2024-01-11 20:16:12 +07:00
Dmitry
f078c696fe Update tags.js 2024-01-11 17:36:02 +07:00
Dmitry
447229c8e4 Fix #177 2024-01-11 11:54:34 +07:00
Dmitry
c4a0927113 dead 2024-01-10 23:52:25 +07:00
Dmitry
4b21d22968 fix firmalife shit 2024-01-10 23:44:01 +07:00
Dmitry
39584e96f6 new crushing recipes 2024-01-10 21:58:46 +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
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
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
cf59845c78 Merge branch 'main' into 0.5.0 2024-01-10 10:47:41 +05:00
Dmitry
58724af628 some recipes 2024-01-10 12:16:47 +07:00
Xikaro
57a2a6dfe7 gui 2024-01-09 23:33:23 +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
fcf0c04540
Merge branch '0.5.0' into 143-integration-computercraft 2024-01-09 17:44:41 +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
94e0194c82 cfg 2024-01-09 12:40:42 +07:00
Dmitry
1295060fd8 some recipes 2024-01-09 09:11:45 +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
Xikaro
73610b4fa5 new gui 2024-01-08 09:21:22 +05:00
Dmitry
08955d16cd Fix EMI compat 2024-01-07 12:42:46 +07:00
Dmitry
4e37c5a151 Fix #167 2024-01-07 12:42:38 +07:00
Dmitry
4e678cba11 remove ru translation for gtceu 2024-01-07 12:42:07 +07:00