Skip to content

Commit 22d6bea

Browse files
authored
Merge pull request #40 from Xaidee/feature/lead-bolt
2 parents a49eeca + e71af68 commit 22d6bea

File tree

57 files changed

+603
-887
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+603
-887
lines changed

src/generated/resources/.cache/002701d48eee4c36b62b24b011e74b0624793d05

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// 1.20.1 2024-02-22T13:39:06.380662 oreganized Block States
1+
// 1.20.1 2024-02-29T16:55:52.18598 oreganized Block States
22
d85b0fb9e5cad1d9c4f22ed192b0fa621ee3373c assets/oreganized/blockstates/black_crystal_glass.json
33
05bb006ff7f48557fe5c5333bc120f7206052717 assets/oreganized/blockstates/black_crystal_glass_pane.json
44
5e5002e9c77ee7221425eeacce8834af484db877 assets/oreganized/blockstates/blue_crystal_glass.json
@@ -26,6 +26,7 @@ c72a5228ef929553df57844bee603f560e737100 assets/oreganized/blockstates/gray_crys
2626
8e259fefeef23ef07a4f72a5a22c47b99d65859f assets/oreganized/blockstates/green_crystal_glass.json
2727
0f0f5654a1123c1bfa032e813f1f6cff21ec1dcb assets/oreganized/blockstates/green_crystal_glass_pane.json
2828
121e6d2788d907261435fceb5c2ed9aec2947965 assets/oreganized/blockstates/lead_block.json
29+
d43efacf05b2229ee7dad465c3ad83df616ab763 assets/oreganized/blockstates/lead_bolt_crate.json
2930
ac3dc34ee50ebc5c1ef49b1d5200bbcce6989806 assets/oreganized/blockstates/lead_bricks.json
3031
3ef194f72e7b5911c4cb174e70906524d82bc695 assets/oreganized/blockstates/lead_bulb.json
3132
1e0faf898de4c648019ee6c1cef8ce1e8aed23ec assets/oreganized/blockstates/lead_ore.json
@@ -280,6 +281,7 @@ f06c23bb719390bafdc75bda45d27d754cf5ca88 assets/oreganized/models/block/green_cr
280281
526a594c52b1fd25b57124861bb247fd4fc32814 assets/oreganized/models/block/green_crystal_glass_pane_side_rot.json
281282
0771143da48d3d7a50bd6bf5beb62fa778397c48 assets/oreganized/models/block/green_crystal_glass_rot.json
282283
99f53d2888cb23cc09f497c6ea86063b0e8d7c06 assets/oreganized/models/block/lead_block.json
284+
3711df98ba5e24c56ca10f080681b0efa52f7a69 assets/oreganized/models/block/lead_bolt_crate.json
283285
fb1ee9f9c979aabda19fcc48ec167ba711d35ae2 assets/oreganized/models/block/lead_bricks.json
284286
b93ab0c45a40dc3a5a25a6ccde6e8eb2471e0084 assets/oreganized/models/block/lead_bulb.json
285287
638234cafeea24173c4c595e3f6b5f0eead7f3f9 assets/oreganized/models/block/lead_ore.json

src/generated/resources/.cache/4d87f6c700406347abbc935fa7e5d5e893a595b5

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// 1.20.1 2024-02-22T13:27:06.3815236 oreganized Item Models
1+
// 1.20.1 2024-02-29T16:55:52.1950088 oreganized Item Models
22
18fcb236eeab67fa16a0014d9af5ba7dd6f9e7c8 assets/oreganized/models/item/black_crystal_glass.json
33
30bbb36792cb2d3f0a8a399f25238120cdf7e659 assets/oreganized/models/item/black_crystal_glass_pane.json
44
8dcab59e8c34403761c4aec2c3357b7db80b3f0b assets/oreganized/models/item/blue_crystal_glass.json
@@ -7,6 +7,7 @@ ca77522dcfcf982429256fd99ca0e9f2c195bd73 assets/oreganized/models/item/brown_cry
77
cc365240dd7450add26aeaf5e0e689e985a4e5ad assets/oreganized/models/item/brown_crystal_glass_pane.json
88
87ae9e55b9b93036e2004b186696da47cbc5ca81 assets/oreganized/models/item/bush_hammer.json
99
9cb46711c71fcec37eae98916aa50acbe76cf96d assets/oreganized/models/item/chiseled_glance.json
10+
0873e5720c3f7d81c4ef7e3f3d333e14a87e6757 assets/oreganized/models/item/crossbow_lead_bolt.json
1011
cda1abbd4abc8987ee1a6d4ec093a5824260b4e0 assets/oreganized/models/item/cut_lead.json
1112
1cad99f5b1d9bb26fafe94dd95e758217cb50a78 assets/oreganized/models/item/cyan_crystal_glass.json
1213
522ec2287a524fc138cb3ebd01e3f4c70c43147e assets/oreganized/models/item/cyan_crystal_glass_pane.json
@@ -91,6 +92,8 @@ bbe691c708914b9faf9bade0d70192b5fe4eaebb assets/oreganized/models/item/glance_st
9192
be766846cf1dac197488418054a28488724b45db assets/oreganized/models/item/green_crystal_glass.json
9293
0d2774c3473576f2f0e28ec4eaf9c9adaeca3e00 assets/oreganized/models/item/green_crystal_glass_pane.json
9394
41e56017441ac21af8e8b9bb05b61e1cf4fbd035 assets/oreganized/models/item/lead_block.json
95+
ae57922ed2f7a86f2f2228c54fe277a743a93000 assets/oreganized/models/item/lead_bolt.json
96+
feba1e587044ee5e3b0c0eb5078d2c8e857aaeb5 assets/oreganized/models/item/lead_bolt_crate.json
9497
e7d8507c908b82cd3a90619142d88fabe131f4b4 assets/oreganized/models/item/lead_bricks.json
9598
f884e385f339f84b7d27ef8cbaa9d1ecc1fb6fd8 assets/oreganized/models/item/lead_bulb.json
9699
d882831b769bc45aa22e6401f6e6d86ce7f734af assets/oreganized/models/item/lead_ingot.json

src/generated/resources/.cache/5bb646c3cee204f41a1b59a2c0d9083b5f7155b0

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// 1.20.1 2024-02-22T13:27:06.3825221 Oreganized Block Tags
1+
// 1.20.1 2024-02-29T16:55:52.1970092 Oreganized Block Tags
22
7a2d68d81bc5ee59f9a2f4ba68ddb39bfd9c875d data/forge/tags/blocks/glass.json
33
d96b4f83e03abe39a1b97d92b7818c8f6b2e5c68 data/forge/tags/blocks/glass_panes.json
44
d062c23ad5308b7de0b2e86f6531ea724530f898 data/forge/tags/blocks/melts_lead.json
@@ -17,6 +17,7 @@ bff6697a058fddfe9e14615bc043fcb2071fd6fc data/forge/tags/blocks/storage_blocks/s
1717
7a1e2c391ad442cdc57f69ce1737207bc52bfb84 data/minecraft/tags/blocks/beacon_base_blocks.json
1818
82c03c405a971b2a7fc3fd43a9fb6c221f463ce0 data/minecraft/tags/blocks/cauldrons.json
1919
7a2d68d81bc5ee59f9a2f4ba68ddb39bfd9c875d data/minecraft/tags/blocks/impermeable.json
20+
f7079c32fc948b65cb486bea80e2dc93d13ce577 data/minecraft/tags/blocks/mineable/axe.json
2021
35bb07676476bb9f09ff129c00b5ac75e9f6ae9c data/minecraft/tags/blocks/mineable/pickaxe.json
2122
84a13f81c79f0c05f8f7a8cbf1d3c25129a97179 data/minecraft/tags/blocks/mineable/shovel.json
2223
bb86ac7ab19373da790ec5711f473614e4b62d79 data/minecraft/tags/blocks/needs_iron_tool.json
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
// 1.20.1 2023-08-24T20:32:13.5574802 Sound Definitions
2-
496a9e1afe04e05f3f6bfc259ce5b58c03df46bc assets/oreganized/sounds.json
1+
// 1.20.1 2024-02-29T16:37:03.2403501 Sound Definitions
2+
47254237d13fdbae0fc8e5a730e2c1370f1a0156 assets/oreganized/sounds.json

src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e

+7-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// 1.20.1 2024-02-23T18:18:39.1670328 Recipes
1+
// 1.20.1 2024-02-29T16:55:52.1929955 Recipes
22
c27d3499944bf522a573dc8987582db2d7349b41 data/oreganized/advancements/recipes/brewing/poisonous_potato_from_lead.json
33
ee5e42ab2e9ac549022fadf1c2cbf9faebc2c53c data/oreganized/advancements/recipes/building_blocks/black_crystal_glass_pane.json
44
40700c3f2f5c78c617650fdd16e2ba248967353f data/oreganized/advancements/recipes/building_blocks/blue_crystal_glass_pane.json
@@ -21,6 +21,8 @@ cd97e0da4ca12f382f0668a766f7d6cc8fd734bd data/oreganized/advancements/recipes/bu
2121
1fdc8740e3cb94baa8de7c16c93a25c7d8ba1163 data/oreganized/advancements/recipes/building_blocks/gray_crystal_glass_pane.json
2222
cb23709fa45885e26600b4c77044a515d0bec180 data/oreganized/advancements/recipes/building_blocks/green_crystal_glass_pane.json
2323
36e6b6e9acc7a2d1e5d06499c08774b428491e64 data/oreganized/advancements/recipes/building_blocks/lead_block.json
24+
6c6208eebd6c66cc8a03b2845bbd227dc4a19cae data/oreganized/advancements/recipes/building_blocks/lead_bolt_crate.json
25+
5ebf44699bc82f68474d6f9b78178750faf6ca24 data/oreganized/advancements/recipes/building_blocks/lead_bolt_from_crate.json
2426
946c08ec1a613679af7062c7108bb751aebf8252 data/oreganized/advancements/recipes/building_blocks/lead_bricks.json
2527
eee68e2739bde8977814e2cfc0c04354a5c7f84c data/oreganized/advancements/recipes/building_blocks/lead_bulb.json
2628
cb45a0e98365b4c03da2b7ce702a72498110fb6a data/oreganized/advancements/recipes/building_blocks/lead_ingot.json
@@ -70,6 +72,7 @@ ab878e34895cc94b31ad5f33433d394b3470eb67 data/oreganized/advancements/recipes/bu
7072
f14efdf82e5565a7f0c8a03bcbde5df9b8af3073 data/oreganized/advancements/recipes/building_blocks/stonecutting/polished_glance.json
7173
a73b76343b9abc9d4c082f831be8daf1b62f762a data/oreganized/advancements/recipes/building_blocks/white_crystal_glass_pane.json
7274
8c7873a88da4761a440798323daf006887973daf data/oreganized/advancements/recipes/building_blocks/yellow_crystal_glass_pane.json
75+
b47ef8f1cecfb7182ed71b4684219ec469d3f2f3 data/oreganized/advancements/recipes/combat/lead_bolt.json
7376
68105c4709bbf9a9c38cfea3aef83d7ae761c56c data/oreganized/advancements/recipes/decorations/black_crystal_glass.json
7477
dcb18c1fb204f38642de3c1e3dc39a29c96d3c2a data/oreganized/advancements/recipes/decorations/blue_crystal_glass.json
7578
4e458a90cff9efa21ded7e7af6b9325aa2b71b53 data/oreganized/advancements/recipes/decorations/brown_crystal_glass.json
@@ -177,6 +180,9 @@ e1c09f2d1950d7e5186f3a1ebaed0d1d9bc20f2a data/oreganized/recipes/gray_crystal_gl
177180
137cc4870829488fe9aac4b7cc3c1d2d961ce636 data/oreganized/recipes/green_crystal_glass.json
178181
716c99397627e656f05017ee28f973380862691f data/oreganized/recipes/green_crystal_glass_pane.json
179182
65befcd063025cfae493e0f156e69cad8c397843 data/oreganized/recipes/lead_block.json
183+
86d1472c32c4c0db36539f7929ecde7460d069ef data/oreganized/recipes/lead_bolt.json
184+
9a3d66b85dc44ff589e742ac94a11a513e3a8e85 data/oreganized/recipes/lead_bolt_crate.json
185+
b13c740aa1e59139c3ad6e85c0d6692457ae81e2 data/oreganized/recipes/lead_bolt_from_crate.json
180186
d556fb758fd3dbab160acceee42cd40c0d02170f data/oreganized/recipes/lead_bricks.json
181187
b280a1dac0963942de582b67ea3803fc9a362398 data/oreganized/recipes/lead_bulb.json
182188
c3f86a2f15dedc7d9258364671aa799e426758eb data/oreganized/recipes/lead_ingot.json

0 commit comments

Comments
 (0)