Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Vanilla Compatibility and Phosphor Changes #187

Open
wants to merge 23 commits into
base: 1.20.1
Choose a base branch
from
Open

Vanilla Compatibility and Phosphor Changes #187

Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
dbcd019
Added Luminous Comb and Volcanic Propolis
Spearkiller Feb 23, 2025
70024c0
Updated recipes involving phosphor to use volcanic propolis instead
Spearkiller Feb 23, 2025
40ab4b3
Added a recipe to turn Ice Shards into ice
Spearkiller Feb 23, 2025
47b7492
Added recipes for phosphor torches and beeswax candles
Spearkiller Feb 23, 2025
dc2001b
Added a recipe to turn vanilla combs into beeswax
Spearkiller Feb 23, 2025
b8736fb
Removed Honey Pot, added Vanilla Honey Compat
Spearkiller Feb 23, 2025
43257f1
fixed a miscalculation in previous commit
Spearkiller Feb 23, 2025
549342f
run datagen for new assets
Spearkiller Feb 23, 2025
9f568f2
Added models that weren't datagened
Spearkiller Feb 23, 2025
082a2ef
Changed colouring of Luminous and Simmering combs
Spearkiller Feb 23, 2025
102ef55
fixed new recipes overwriting vanilla ones
Spearkiller Feb 23, 2025
0f2f319
made candles 50% cheaper
Spearkiller Feb 23, 2025
bd02003
made phosphorous less plentiful
Spearkiller Feb 23, 2025
8fc86c5
Lush line of bees now actually make Luminous Comb
Spearkiller Feb 23, 2025
d347ba9
Phosphor can now be used to make Glowing Item Frames
Spearkiller Feb 23, 2025
4ae31d2
Soft revert of Honey Pot removal
Spearkiller Feb 28, 2025
b41e77d
Update ForestryRecipeProvider.java
Spearkiller Feb 28, 2025
16f6935
Removed Luminous Comb as per recommendations
Spearkiller Mar 1, 2025
8b434c8
Changed phosphorusfrom a specialty to a product
Spearkiller Mar 1, 2025
9c4ba77
Merge branch '1.20.1' into phosphorescent-update
Spearkiller Mar 1, 2025
2360f72
Removed String -> Silk centrifuge recipe
Spearkiller Mar 2, 2025
063d384
Reduced cost for Woven Silk
Spearkiller Mar 2, 2025
6849e57
forgot to add file to commit
Spearkiller Mar 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/generated/resources/.cache/238cc0cfd36c5de547818531b5650e941866cc10
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.20.1 2025-02-12T15:45:36.8777845 Tags for minecraft:item mod id forestry
// 1.20.1 2025-02-23T17:38:23.0106738 Tags for minecraft:item mod id forestry
37a390e7a402ae2ce1addd2b8bbefd6229e8c7c6 data/forestry/tags/items/acacia_desert_logs.json
35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/forestry/tags/items/backpack/allow/adventurer.json
426fdc880d77e5feaa70125d93a57b7ce21dbc2b data/forestry/tags/items/backpack/allow/builder.json
Expand All @@ -18,7 +18,7 @@ d38d236618a81cc1b2e0dbb4e4d7c11e43e522ea data/forestry/tags/items/balsa_logs.jso
0b6fe95a1bb4cb3c5bcc1a21af820e9fc001ceb7 data/forestry/tags/items/chestnut_logs.json
5708d00e89da0df1404605668ffb2f3bac650c6d data/forestry/tags/items/citrus_logs.json
a7c007c7c6e32a913007fb71d57b7071baca9550 data/forestry/tags/items/cocobolo_logs.json
a5bf4aa6f99bb4493f6fbdfe528f5c984cee54df data/forestry/tags/items/combs.json
6157af67398cfcc59f2629c466f20112d300cbe0 data/forestry/tags/items/combs.json
9f5d66e4017fbcabe22c6702e93310cf271fe042 data/forestry/tags/items/crafting_tables.json
0065fbab36f74fb846e11c84e9d0bfd535b7c25e data/forestry/tags/items/drop_honey.json
67f36c77c5893b9d657d5707452976bd7292c1b7 data/forestry/tags/items/ebony_logs.json
Expand All @@ -39,12 +39,12 @@ c650452f3c2c7523b5d43f7a54ddebe133610760 data/forestry/tags/items/padauk_logs.js
24f3c0c5b75c3d2795315ab535de9a7cb30879c0 data/forestry/tags/items/pine_logs.json
57a3ddceb21b169b8704e697fd89e03ac1c75cef data/forestry/tags/items/plum_logs.json
1e2ec9fb02b1b3126fa83d7bc90fe335db9e48b6 data/forestry/tags/items/poplar_logs.json
794cdff7b3d1a97e7cec2815b209d867bf747502 data/forestry/tags/items/propolis.json
d013a58efdcf5f8209c8db9f75ede3023e29dde4 data/forestry/tags/items/propolis.json
cf0c5a0245a3eeb822d88e53776905fa468d455c data/forestry/tags/items/scoops.json
5001373d3cdbe55ab238e1c82b521698c299e190 data/forestry/tags/items/sequoia_logs.json
c0020e6f377758179d2d7f23812e757851ba1ff2 data/forestry/tags/items/stamps.json
ff349380d39ea7002699d10ebb9251ed0391aacb data/forestry/tags/items/teak_logs.json
a5bf4aa6f99bb4493f6fbdfe528f5c984cee54df data/forestry/tags/items/village_combs.json
6157af67398cfcc59f2629c466f20112d300cbe0 data/forestry/tags/items/village_combs.json
d9e9f6592978ba94c81b01dce5b81632ca41c1b9 data/forestry/tags/items/walnut_logs.json
71e425f9d7f490e0890cb29ce3f2d76f1e4b47c3 data/forestry/tags/items/wenge_logs.json
713d7fd8e1bbf78f27a8e1239e8149f901295a29 data/forestry/tags/items/willow_logs.json
Expand Down
3 changes: 2 additions & 1 deletion src/generated/resources/.cache/4d27601ef18e96db78f1550f214aa8a7726bd702
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.20.1 2024-11-27T15:50:01.8167478 Item Models: forestry
// 1.20.1 2025-02-23T17:38:23.0126675 Item Models: forestry
3c1431dcb893b5f5648a30b08115a67d8f3227b9 assets/forestry/models/item/adventurer_bag.json
994d21141a5584825744129df0166a56876860ad assets/forestry/models/item/adventurer_bag_woven.json
3c1431dcb893b5f5648a30b08115a67d8f3227b9 assets/forestry/models/item/apiarist_bag.json
Expand Down Expand Up @@ -29,6 +29,7 @@ e1baf302155b8bb7e7702eea7ca6de07d5f2a8ab assets/forestry/models/item/crated_ash.
4ad1ee6e44859791d0f7ffaf2cf7eec377fe3770 assets/forestry/models/item/crated_bee_comb_frozen.json
4ad1ee6e44859791d0f7ffaf2cf7eec377fe3770 assets/forestry/models/item/crated_bee_comb_honey.json
4ad1ee6e44859791d0f7ffaf2cf7eec377fe3770 assets/forestry/models/item/crated_bee_comb_kaolin.json
4ad1ee6e44859791d0f7ffaf2cf7eec377fe3770 assets/forestry/models/item/crated_bee_comb_luminous.json
4ad1ee6e44859791d0f7ffaf2cf7eec377fe3770 assets/forestry/models/item/crated_bee_comb_mellow.json
4ad1ee6e44859791d0f7ffaf2cf7eec377fe3770 assets/forestry/models/item/crated_bee_comb_mossy.json
4ad1ee6e44859791d0f7ffaf2cf7eec377fe3770 assets/forestry/models/item/crated_bee_comb_mysterious.json
Expand Down
3 changes: 1 addition & 2 deletions src/generated/resources/.cache/4efb3cd5c7031f951d5bc11c2822bca5a113b553
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.20.1 2025-01-15T20:49:54.1588466 ModKit Item Models for mod 'forestry'
// 1.20.1 2025-02-23T17:38:23.0086812 ModKit Item Models for mod 'forestry'
5c9a34aaa9fead3fd80793cfe9596223bf8783f0 assets/forestry/models/item/acacia_desert_boat.json
72934de9e502d03a3a3cf9f0f6d4f24e8ee34571 assets/forestry/models/item/acacia_desert_chest_boat.json
9b0e3ae0b83b5c30fe64d5488c10a81b21c890ac assets/forestry/models/item/balsa_boat.json
Expand All @@ -22,7 +22,6 @@ c0b69a7febbefda83b2e7399195be7de6647842c assets/forestry/models/item/hill_cherry
d55ce973081fa9ba48b01a7359d7aa6e4a31ff43 assets/forestry/models/item/honeydew.json
a1bf7d720d131cf8013e3195316681359b4c3566 assets/forestry/models/item/honeyed_slice.json
e091d169fc356d896e94ab50ae77a291477e9a34 assets/forestry/models/item/honey_drop.json
17a31e0ca8e101a1259a47bccc430a204c13b409 assets/forestry/models/item/honey_pot.json
6700742b562ea7e5d787babb2f028437bd6e8508 assets/forestry/models/item/ipe_boat.json
ee1205d9fa4e97bfef6e5297ea36ea3c675a5683 assets/forestry/models/item/ipe_chest_boat.json
d6ef8fb90a7236af5d5dca32af05bb5923f10dc5 assets/forestry/models/item/kapok_boat.json
Expand Down
3 changes: 2 additions & 1 deletion src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.20.1 2025-02-12T14:53:00.5859003 Loot Tables
// 1.20.1 2025-02-23T17:38:22.9917254 Loot Tables
41fb17dab11f0d0ac4c695eb706119b894401c59 data/forestry/loot_tables/blocks/acacia_desert_button.json
cd06ea8f3c3db3fc055cc6b07393f6aa938e0525 data/forestry/loot_tables/blocks/acacia_desert_door.json
0826e330e65982a3be8d6b9d0987e5fc526d62dd data/forestry/loot_tables/blocks/acacia_desert_fence.json
Expand Down Expand Up @@ -119,6 +119,7 @@ d767396e4f8726ed35ceb9997fe60f7023b2c2d9 data/forestry/loot_tables/blocks/block_
430820c5dca884c0211421bedfdfa8ae6c148fc7 data/forestry/loot_tables/blocks/block_bee_comb_frozen.json
bf45fd4a9e950624326e3e947970381606e5a5bc data/forestry/loot_tables/blocks/block_bee_comb_honey.json
d72a6fe049fb8274872f49dcb2c0bdb8bdb3a6ef data/forestry/loot_tables/blocks/block_bee_comb_kaolin.json
444475406e2b9c43f6f57f9c6dd3221bff604670 data/forestry/loot_tables/blocks/block_bee_comb_luminous.json
35805ba5bbed470dab7251c2b352aa1f3133c07f data/forestry/loot_tables/blocks/block_bee_comb_mellow.json
f17c572efd3737307cefed8f1c43be5f8107943b data/forestry/loot_tables/blocks/block_bee_comb_mossy.json
20f94cbe104f01b04e1e04c8aa77c143713ef3ae data/forestry/loot_tables/blocks/block_bee_comb_mysterious.json
Expand Down
Loading