Commit graph

1197 commits

Author SHA1 Message Date
Pyritie
afe284c511
added bud blocks to startup_scripts
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-19 01:47:34 +00:00
Pyritie
c7361acb63
adding textures
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-19 01:46:28 +00:00
Pyritie
b73347161a
Added strings for bud blocks
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-19 01:46:24 +00:00
Pyritie
9da5756b22
adding models
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-19 01:44:47 +00:00
Pyritie
48308f28cb
adding blockstates files
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-19 01:43:44 +00:00
Pyritie
3ca7e8e593
Update shimmer.json
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-19 00:15:24 +00:00
Pyritie
0f2e719921
Update shimmer.json
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-18 23:50:00 +00:00
Nebby_G
2731ac8de4 Merge remote-tracking branch 'upstream/main' 2025-01-18 12:12:07 -03:00
Nebby_G
6c36949dc1 Hardwood Materials, items made 2025-01-18 12:11:03 -03:00
Pyritie
20050fa3eb
Merge branch 'main' into patch-5 2025-01-18 12:18:38 +00:00
Pyritie
28b86c9ff3
Merge branch 'main' into patch-5 2025-01-18 11:11:31 +00:00
Pyritie
f53dfcb847
Merge branch 'main' into create-additions 2025-01-18 10:37:20 +00:00
Curtis Merrill
34c46c3b0d create some rich coal recipes in coke oven and pyro oven 2025-01-18 03:59:24 -05:00
Dmitry
c28b64a9c8
Merge branch 'main' into create-additions 2025-01-18 13:21:30 +07:00
Dmitry
acf18b6e22
Merge pull request #702 from 8oyNextDoor/main
Исправил опечатку в температуре кипения морской воды для рецепта маленькой кучки соли с 1000 на 100
2025-01-18 12:53:19 +07:00
BoyNextDoor
0beb99d275
Тест
Signed-off-by: BoyNextDoor <130379681+8oyNextDoor@users.noreply.github.com>
2025-01-18 08:48:27 +03:00
Dmitry
eeff30cf46
Merge pull request #727 from MetenBouldry/main
Добавления язиков Украинского(мной) і Італянсокого(@Lollovader)
2025-01-18 12:38:49 +07:00
Pyritie
bed0cad994
Update machines.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-18 00:10:49 +00:00
Pyritie
eaace89b0a
Update main_server_script.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-18 00:04:19 +00:00
Pyritie
4fa9500701
Update machines.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-18 00:01:13 +00:00
Pyritie
9e34df8ffc
Update recipes.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-17 23:58:43 +00:00
Pyritie
f42fbd7239
Delete kubejs/server_scripts/tfg/recipes.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-17 23:58:20 +00:00
Pyritie
5ad9f00f5a
Update items.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-17 23:57:37 +00:00
Pyritie
5cbf660af1
Delete kubejs/assets/tfg/textures/block/casings/coils directory
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-17 23:56:54 +00:00
Pyritie
878768cc7a
Delete kubejs/assets/tfg/models/item directory
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-17 23:56:44 +00:00
Pyritie
97371eeb01
Delete kubejs/assets/tfg/models/block/copper_coil_block_active.json
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-17 23:56:34 +00:00
Pyritie
7c14da2747
Delete kubejs/assets/tfg/models/block/copper_coil_block.json
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-17 23:56:27 +00:00
Pyritie
cddc46ac25
Delete kubejs/assets/tfg/blockstates/copper_coil_block.json
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-17 23:56:16 +00:00
Pyritie
324ac1adda
Merge branch 'main' into create-additions
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-17 22:10:34 +00:00
Pyritie
5035130495
Merge branch 'main' into mv_superwire
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-17 17:52:01 +00:00
Dmitry
c49c9e7ebb
Merge branch 'main' into main
Signed-off-by: Dmitry <52341158+Exzept1on@users.noreply.github.com>
2025-01-18 00:38:10 +07:00
Dmitry
26e1d84be0
Merge pull request #723 from Pyritie/rails
Changed train tracks to be cheaper
2025-01-18 00:36:17 +07:00
Dmitry
5195828a09
Merge pull request #722 from CaptainGold1/dirt_mixer_fixes
Fixes fertilizer recipe and modifies some mixer recipes relating to dirt
2025-01-18 00:35:43 +07:00
Dmitry
2f43a94b27
Merge pull request #721 from KorGgenT/flux
create fluxstone recipes in macerator and forge hammer
2025-01-18 00:34:51 +07:00
Dmitry
256f6184d4
Merge pull request #720 from Egogorka/fix-dupes-patch
Fix dupes via recycling firmaciv items
2025-01-18 00:33:44 +07:00
Dmitry
ed1becf35d
Merge branch 'main' into colored_glass_macerate
Signed-off-by: Dmitry <52341158+Exzept1on@users.noreply.github.com>
2025-01-18 00:32:00 +07:00
Dmitry
2ab6853ae7
Merge pull request #712 from CaptainGold1/stick_bundle_coke_oven
Allows stick bundles to be used in the coke oven
2025-01-18 00:30:37 +07:00
Dmitry
b50b15e361
Merge pull request #706 from CaptainGold1/main
Add blast furnace tips entry
2025-01-18 00:29:49 +07:00
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
BoyNextDoor
3cfda3b525
Update main_startup_script.js
Изменил цвет висмутовой бронзы на зелёный, ближе к ТФКшному

Changed bismuth bronze colour to green to be closer to how it looks in TFC

Signed-off-by: BoyNextDoor <130379681+8oyNextDoor@users.noreply.github.com>
2025-01-17 19:35:32 +03:00
MetenBouldry
a68c276570
Add files via upload
Signed-off-by: MetenBouldry <94766011+MetenBouldry@users.noreply.github.com>
2025-01-17 13:33:26 +02:00
MetenBouldry
0882a92ab4
Add files via upload
Исправления в glassworking которие визивали ошибку в книге

Signed-off-by: MetenBouldry <94766011+MetenBouldry@users.noreply.github.com>
2025-01-16 23:11:18 +02:00
MetenBouldry
39377c34e7
Translation into Italian
Переведено 9% от всех доступних файлов

Signed-off-by: MetenBouldry <94766011+MetenBouldry@users.noreply.github.com>
2025-01-16 16:26:01 +02:00
MetenBouldry
46bbf8c16d
Translation into Ukrainian
Перевод 100% на доступние в даний момент файли

Signed-off-by: MetenBouldry <94766011+MetenBouldry@users.noreply.github.com>
2025-01-16 16:24:34 +02:00
Pyritie
793cc7676c
Update recipes.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-16 00:23:48 +00:00
Pyritie
9983d34d45
Update recipes.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-15 23:55:45 +00:00
Pyritie
d2fdab45fe
Update constants.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-15 23:54:55 +00:00
Pyritie
afc055ec0a
Update recipes.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-15 23:54:33 +00:00