Commit graph

2325 commits

Author SHA1 Message Date
Pyritie
53a44aed90
Merge branch 'TerraFirmaGreg-Team:main' into crystals 2025-01-19 11:07:42 +00:00
Xikaro
ae34420671 CHANGELOG 2025-01-19 16:03:41 +05:00
Xikaro
1f7d7ffa2c бл 2025-01-19 16:02:39 +05:00
Xikaro
cea78bd5b6 Update pakku.json 2025-01-19 15:37:15 +05:00
Xikaro
4de600fdd4 Update .gitignore 2025-01-19 15:27:12 +05:00
Xikaro
b737a5412e update: CHANGELOG & pakku 2025-01-19 15:10:30 +05:00
Dmitry
4f6abd4d05
Update CHANGELOG.md
Signed-off-by: Dmitry <52341158+Exzept1on@users.noreply.github.com>
2025-01-19 12:15:37 +07:00
Dmitry
9d91daf981
Merge pull request #643 from Pyritie/patch-5
Fix casing exploit, change recipes for tfc alloys
2025-01-19 12:15:33 +07:00
Dmitry
6e6a2011b1
Update CHANGELOG.md
Signed-off-by: Dmitry <52341158+Exzept1on@users.noreply.github.com>
2025-01-19 12:10:22 +07:00
Pyritie
ce6e2838d9
Update deep_sapphire.json
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-19 01:56:07 +00:00
Pyritie
b7b51ede75
Update deep_sapphire.json
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-19 01:55:51 +00:00
Pyritie
63f4285bdc
Update deep_sapphire.json
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-19 01:55:36 +00:00
Pyritie
ee4a580a98
Update normal_bauxite.json
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-19 01:54:49 +00:00
Pyritie
c1a69bb3b1
Update normal_quartz.json
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-19 01:54:10 +00:00
Pyritie
024a7b1b31
Update deep_sapphire.json
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-19 01:52:17 +00:00
Pyritie
32c575e370
Update deep_garnet_opal.json
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-19 01:51:15 +00:00
Pyritie
c084d412b3
Update deep_garnet_amethyst.json
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-19 01:51:01 +00:00
Pyritie
5e42b9b070
updated veins to use new indicators
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-19 01:49:23 +00:00
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
Pyritie
20050fa3eb
Merge branch 'main' into patch-5 2025-01-18 12:18:38 +00:00
Dmitry
53f27984ab
Update CHANGELOG.md
Signed-off-by: Dmitry <52341158+Exzept1on@users.noreply.github.com>
2025-01-18 19:07:35 +07:00
Dmitry
9bfc5b3367
Merge pull request #701 from Pyritie/create-additions
Add blaze burner, fix alternator
2025-01-18 19:07:13 +07: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
Dmitry
ee24d57d77
Update CHANGELOG.md
Signed-off-by: Dmitry <52341158+Exzept1on@users.noreply.github.com>
2025-01-18 16:27:01 +07:00
Dmitry
e1c763f1ca
Merge pull request #728 from KorGgenT/coal
create some rich coal recipes in coke oven and pyro oven
2025-01-18 16:26:26 +07: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
5c6ff1ba2e
Update CHANGELOG.md
Signed-off-by: Dmitry <52341158+Exzept1on@users.noreply.github.com>
2025-01-18 13:21:07 +07:00
Dmitry
621d292120 upd mods 2025-01-18 13:18:14 +07:00
Dmitry
e59e7f7ee9 Update mods 2025-01-18 13:07:15 +07:00
Dmitry
cdc13ca5a7 cfg 2025-01-18 13:07:13 +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
ee4e1a8a4b
Update CHANGELOG.md
Signed-off-by: Dmitry <52341158+Exzept1on@users.noreply.github.com>
2025-01-18 12:40:57 +07:00
Dmitry
eeff30cf46
Merge pull request #727 from MetenBouldry/main
Добавления язиков Украинского(мной) і Італянсокого(@Lollovader)
2025-01-18 12:38:49 +07:00
Dmitry
c9c8179cd5
Merge pull request #724 from Pyritie/mv_superwire
Moved MV superconductor to early HV instead of late HV
2025-01-18 12:36:50 +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