Commit graph

2256 commits

Author SHA1 Message Date
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
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
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
CaptainGold1
a9e446d5bb Fixed some recipes regarding dirt in the mixer 2025-01-15 15:06:29 -06:00
Curtis Merrill
2b5d388c09 create fluxstone recipes in macerator and forge hammer 2025-01-15 15:51:51 -05:00
Egogorka
1ebf496587
fix dupes via firmaciv items
Signed-off-by: Egogorka <35399166+Egogorka@users.noreply.github.com>
2025-01-15 22:53:02 +03:00
Nebby_G
deed3c4849 Add silk to tag, redo comments 2025-01-15 13:22:26 -03:00
Pyritie
ffaa650288
Update recipes.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-15 11:50:37 +00:00
Pyritie
594b7ad758
Update items.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-15 11:48:14 +00:00
Pyritie
72ecc7ec89
Update main_server_script.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-15 11:47:12 +00:00
Pyritie
180e593c7e
Add files via upload
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-15 11:46:18 +00:00
Pyritie
d2f64a1bcc
Update machines.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-15 11:44:16 +00:00
Pyritie
fa7c506236
Add files via upload
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-15 11:41:28 +00:00
Nebby_G
a9db4c5754 Remove create sail conversions 2025-01-14 21:24:36 -03:00
Nebby_G
ba87e796f3 Add more accesible create sails 2025-01-14 21:20:03 -03:00
CaptainGold1
b28cc7c195 Added quests for treated hide 2025-01-13 20:44:34 -06:00
CaptainGold1
56b631346a Removed create_connected glass panes 2025-01-13 20:07:20 -06:00
CaptainGold1
edfe28034b Allows all colors of glass to be macerated/hammered to dust 2025-01-13 16:57:49 -06:00
CaptainGold1
f30b6e38e9 Allows stick bundles to be used in the coke oven 2025-01-13 16:18:31 -06:00
CaptainGold1
650d054582 Added the preheating entry and valid inputs entry to the blast furnace tips, along with adding a note about replacing tuyeres with hoppers. 2025-01-13 15:36:01 -06:00
dependabot[bot]
3455d44016
Bump actions/upload-artifact in the dependencies group
Bumps the dependencies group with 1 update: [actions/upload-artifact](https://github.com/actions/upload-artifact).


Updates `actions/upload-artifact` from 4.5.0 to 4.6.0
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/v4.5.0...v4.6.0)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-01-13 21:28:34 +00:00
Pyritie
943e7f2e02
Update constants.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-13 15:47:18 +00:00
Pyritie
f2f86a1bf6
copied from 0.8.1
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-13 15:24:02 +00:00
Pyritie
dbf29787c9
Add files via upload
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-13 15:15:05 +00:00
Pyritie
5b834e6a05
Add files via upload
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-13 14:58:30 +00:00
Pyritie
c5e5193da3
Update tags.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-13 14:58:15 +00:00