Dmitry
6e6a2011b1
Update CHANGELOG.md
...
Signed-off-by: Dmitry <52341158+Exzept1on@users.noreply.github.com>
2025-01-19 12:10:22 +07: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
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
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
b6fa89fa55
Update CHANGELOG.md
...
Signed-off-by: Dmitry <52341158+Exzept1on@users.noreply.github.com>
2025-01-18 00:42:40 +07:00
Dmitry
ee98a3b0e7
Update CHANGELOG.md
...
Signed-off-by: Dmitry <52341158+Exzept1on@users.noreply.github.com>
2025-01-18 00:39:16 +07:00
Dmitry
11ad77c1b4
Merge pull request #717 from Nebby1999/main
...
Create Sails: Recipe Improvements
2025-01-18 00:38:39 +07: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
b1318a2c4d
Merge pull request #714 from CaptainGold1/alternate_papermaking_quests
...
Add alternate papermaking quests using treated hide
2025-01-18 00:32:51 +07:00
Dmitry
7f69d76cd7
Merge pull request #713 from CaptainGold1/colored_glass_macerate
...
Allows all colors of glass to be macerated/hammered to dust
2025-01-18 00:32:08 +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
5a99bec780
Merge pull request #707 from Pyritie/trims
...
Added armor trims
2025-01-18 00:28:43 +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
Dmitry
12e142d1de
Merge pull request #703 from Pyritie/sprinklers
...
Fix sprinklers + fix bread and yeast starter recipe conflict
2025-01-18 00:23:04 +07:00
Dmitry
2bac0b4ba2
Merge pull request #711 from TerraFirmaGreg-Team/dependabot/github_actions/dependencies-cff0214797
...
Bump actions/upload-artifact from 4.5.0 to 4.6.0 in the dependencies group
2025-01-18 00:17:28 +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
