fix merge conflict

This commit is contained in:
petrak@ 2023-06-20 11:35:13 -05:00
commit f9a608a06a
678 changed files with 5593 additions and 1096 deletions

View file

@ -1,4 +1,16 @@
// 1.19.2 2023-05-23T13:13:41.108322225 Item Models: hexcasting
// 1.19.2 2023-06-05T15:45:45.9658447 Item Models: hexcasting
2fc68dcd6d73da3deaa6a33240dd9160a2b79592 assets/hexcasting/models/block/deco/quenched_allay_bricks_0.json
d59af7a48b20b210240b26115fb172d6202f9254 assets/hexcasting/models/block/deco/quenched_allay_bricks_1.json
a62eeebbca2d145c22f25725bd848ed4d673cefa assets/hexcasting/models/block/deco/quenched_allay_bricks_2.json
90e14c7ae44f667810fa5d31af5fd02cb575c13a assets/hexcasting/models/block/deco/quenched_allay_bricks_3.json
669d9348f4581dae45c35268a760675509a89a29 assets/hexcasting/models/block/deco/quenched_allay_bricks_small_0.json
bb65f6b36336fb4746e749a2b248e521ff24f901 assets/hexcasting/models/block/deco/quenched_allay_bricks_small_1.json
39b54b608cdf5e959a5c115379e45aaf590a254a assets/hexcasting/models/block/deco/quenched_allay_bricks_small_2.json
da0aee7c9516804372262165dc5aab16bd1c6ce6 assets/hexcasting/models/block/deco/quenched_allay_bricks_small_3.json
bacd99e8c24b9ce004e8aeff509cca4b971f3ed9 assets/hexcasting/models/block/deco/quenched_allay_tiles_0.json
1b272b737dea8a856c63e253359863dff7ec7e54 assets/hexcasting/models/block/deco/quenched_allay_tiles_1.json
9840fe9648aedd03ecda485e7c6466bbe2a418ba assets/hexcasting/models/block/deco/quenched_allay_tiles_2.json
71abe574694be3f0be75433068bae0489bae5055 assets/hexcasting/models/block/deco/quenched_allay_tiles_3.json
9af2754cb1e53eeaa85618cf92651b4878cf62b1 assets/hexcasting/models/block/quenched_allay_0.json
de4ff723b4332d4e26bd01f74e0485e28c9a2178 assets/hexcasting/models/block/quenched_allay_1.json
4c29163e07f3a903017e38a9cc102f4b37db20b1 assets/hexcasting/models/block/quenched_allay_2.json
@ -6,16 +18,45 @@ de4ff723b4332d4e26bd01f74e0485e28c9a2178 assets/hexcasting/models/block/quenched
f2156b3a7041cf99891b528393db64c6b9ca1a4f assets/hexcasting/models/item/abacus.json
19730853397b109cfedd0c3bbda83d5de6cd15b9 assets/hexcasting/models/item/akashic_record.json
8c735feff09d46d00ed681311f46f61a50cfdc9b assets/hexcasting/models/item/amethyst_dust.json
d1b0892de9d751e7bebc763e6407d5285363c851 assets/hexcasting/models/item/artifact.json
7eb3eb776e70eb616c12ada500b9d1d6a3249a6a assets/hexcasting/models/item/artifact_filled.json
82e3be7bbdad92d2b4c728be54d9d2f2809a0ac2 assets/hexcasting/models/item/battery.json
fbb8706993fbc3246c56b9f3eb274ff8968b70f8 assets/hexcasting/models/item/amethyst_pillar.json
87e7ee44cdd0808a3dd72babfd1db716df2bcdfe assets/hexcasting/models/item/artifact.json
1cd1b4d002d1a9a044ceab7cca842e4a2b7bd2f4 assets/hexcasting/models/item/artifact_0_filled.json
4709e65d8e74cf45b3ba014bdf70373728cccc78 assets/hexcasting/models/item/artifact_1.json
13915cc6b9ebbdce7043939c32c308bf129c2099 assets/hexcasting/models/item/artifact_1_filled.json
5434775bd88a654db6b2d09ab5f74a93a1983528 assets/hexcasting/models/item/artifact_2.json
a084bdd9039f5a16183d0cf70d744bf29a3c8760 assets/hexcasting/models/item/artifact_2_filled.json
206548428fd1a142442469c8b65fae24a1b50af6 assets/hexcasting/models/item/artifact_3.json
d6de8ae6a4d546aac12489cae386731490040c5e assets/hexcasting/models/item/artifact_3_filled.json
a0dbd0d40833d91dd33036686cd58494572cbe42 assets/hexcasting/models/item/artifact_4.json
86f1f0c0cbae34010ec9eca723db64303d5f5d5f assets/hexcasting/models/item/artifact_4_filled.json
e822e463834b9bf4433defbace06cc586629da95 assets/hexcasting/models/item/artifact_5.json
a44fec20b346e1e660027d204b42df312a310086 assets/hexcasting/models/item/artifact_5_filled.json
c499e86bb5b5bc2fe29914ce14832212ca23df10 assets/hexcasting/models/item/artifact_6.json
ccb8a41fdd4bc1b493a11cfa2ea4a39b7f7c3888 assets/hexcasting/models/item/artifact_6_filled.json
6461c5261ec1eb92a608bd2db420b1e5b0c3591a assets/hexcasting/models/item/artifact_7.json
373617635cf75ee236da52eb5b9f341d2b77eac3 assets/hexcasting/models/item/artifact_7_filled.json
c77fe07e43f7a46e04f16e43054588cdcdf4c01e assets/hexcasting/models/item/battery.json
ec7c3a51882a432185fdbb6a449e66165b6a4c4c assets/hexcasting/models/item/charged_amethyst.json
3ed3e3d86dcbc29d2e6fb59b9c6a7e455e9a3332 assets/hexcasting/models/item/cherry_staff.json
c64ed609ece68994ce23dd2809145040bce13579 assets/hexcasting/models/item/conjured.json
c64ed609ece68994ce23dd2809145040bce13579 assets/hexcasting/models/item/conjured_block.json
c64ed609ece68994ce23dd2809145040bce13579 assets/hexcasting/models/item/conjured_light.json
c8da4227db3c80e3e2e7f2fb2ae2649656429d68 assets/hexcasting/models/item/creative_unlocker.json
e47acd1d6ef29a3e1941afb1b212bd40b963cb72 assets/hexcasting/models/item/cypher.json
2db55347092ad6bc9e58bc968e88a3b6c5fd77c1 assets/hexcasting/models/item/cypher_filled.json
afe7113b8411c64651b679ea6b4e41bf36ab38c3 assets/hexcasting/models/item/cypher.json
3b9442e76a05b7fa70f9fb30186f94b1ba08a69b assets/hexcasting/models/item/cypher_0_filled.json
2c240a69627de02937aa601faa2578adc7d44906 assets/hexcasting/models/item/cypher_1.json
5dc34d91f0d6db16d537dd93345ccca8fe4f6aaa assets/hexcasting/models/item/cypher_1_filled.json
29e2a1e5c0e518e5edf0c6c25a5259c361ece478 assets/hexcasting/models/item/cypher_2.json
af274f590258b97dadf050d925c1187ee6e35d77 assets/hexcasting/models/item/cypher_2_filled.json
89a21d5aeef41fe788e799b89c7f80a26f09abed assets/hexcasting/models/item/cypher_3.json
e80d8c33a0b4ca69b157888fbc5f5660ba9c411d assets/hexcasting/models/item/cypher_3_filled.json
fcc1b8d2b97207af1f8c06061e170b11949bcf51 assets/hexcasting/models/item/cypher_4.json
7554e24b6f52c6b8db358e0cb5449449752a5808 assets/hexcasting/models/item/cypher_4_filled.json
85cd0adf020150c69ca7fec1f5200b027fd01d09 assets/hexcasting/models/item/cypher_5.json
1010ce5e3def445462ab69c4289f3ba94f50eacc assets/hexcasting/models/item/cypher_5_filled.json
d5b444a363c101779a01f7298d55161a8271c742 assets/hexcasting/models/item/cypher_6.json
6f4d37c92c0d43da6d20705955e9b7cee83ed612 assets/hexcasting/models/item/cypher_6_filled.json
69e61ff1976e99c43a17c7b1e0591829ac44a4d6 assets/hexcasting/models/item/cypher_7.json
41ee99d878ec66f480ebcbacc65f16696c31d161 assets/hexcasting/models/item/cypher_7_filled.json
c6523de66cbfae3a1e6361c635cc693a0a089bb3 assets/hexcasting/models/item/default_colorizer.json
113c51af571a92009f5f687a82e10bc5ce97b010 assets/hexcasting/models/item/dye_colorizer_black.json
b5a04716775ba2e1b137abc513025b2f1065e5d1 assets/hexcasting/models/item/dye_colorizer_blue.json
@ -36,19 +77,54 @@ de7f7dec75da3170672de5c46a87ff47297db12b assets/hexcasting/models/item/dye_color
f867a3b2bbc117a782d49f0819b60f4727d1f483 assets/hexcasting/models/item/edified_button.json
c9faada6299f388afc2d2798843d2b45159950d1 assets/hexcasting/models/item/edified_door.json
7f22e012a844cc2c5e30b0fcbdc2e7e4afac1c40 assets/hexcasting/models/item/edified_log.json
8197108bfba4b5963e3c0b1e76a04b8a0d6aae03 assets/hexcasting/models/item/edified_log_amethyst.json
7d6bd7d94d4417f85444c387fc34d9b6947858f1 assets/hexcasting/models/item/edified_log_aventurine.json
c13f4b5b9e57224107c7f7c00928a6873b437245 assets/hexcasting/models/item/edified_log_citrine.json
2415591623223d1cb1a4ac2aeb2d1337694fa9a9 assets/hexcasting/models/item/edified_log_purple.json
6b2c9d4aca0c869d7e18707c22b00c14e1d30f0c assets/hexcasting/models/item/edified_pressure_plate.json
31b4d60ff15a6d6de7aecb6feeba25a366bba2fd assets/hexcasting/models/item/edified_slab.json
2584421c2e9e1cdf22a703018b54cf449613d7d9 assets/hexcasting/models/item/edified_stairs.json
ae58c5b7c304d33cbde60caf44a4c4ee4ec1a633 assets/hexcasting/models/item/edified_trapdoor.json
084183e4351973c8165f6f459c0f0dba2463d957 assets/hexcasting/models/item/edified_wood.json
7659d7b7bf93deba4c55405c29b8fa6b8b810ac1 assets/hexcasting/models/item/focus.json
947d1539d88f9d6fd0afcdf831f4327356d19baf assets/hexcasting/models/item/focus_filled.json
cb2d973af25a2ec07e6094ecc106c896a06918dc assets/hexcasting/models/item/focus_sealed.json
1943e85c2ce9a40b0bbe0e4ffca2b6a968287091 assets/hexcasting/models/item/focus.json
7a19f436fc9e8d0e0e01b4404f326eb48404855a assets/hexcasting/models/item/focus_0_filled.json
88615c49de2c14a19da34431724401652e94be79 assets/hexcasting/models/item/focus_0_sealed.json
8099bd2e0afe118fa013b9d635ad47ffaab556bd assets/hexcasting/models/item/focus_1.json
340001b99100480d06cab60229d4af308be3c4ac assets/hexcasting/models/item/focus_1_filled.json
e0f8fef2e2d8d0e9168d10327d55115293ad2ae7 assets/hexcasting/models/item/focus_1_sealed.json
3578e575573fc52c4e819bcc5e207ce7a4e0f808 assets/hexcasting/models/item/focus_2.json
3e31f3b513df519f5e2e2eb4747faa02b89db67d assets/hexcasting/models/item/focus_2_filled.json
6724475ce4ef36295839f95098035889e57896f2 assets/hexcasting/models/item/focus_2_sealed.json
cb22fbb79432527d828475aa457c9c6fdb78bbff assets/hexcasting/models/item/focus_3.json
54f5d42d7104297162cc9b322ff477d568656e26 assets/hexcasting/models/item/focus_3_filled.json
283fcd45c639953802f8345c20ec45d9aa8c463d assets/hexcasting/models/item/focus_3_sealed.json
7818903b0ec7c7926e040e4d634495a7699e6deb assets/hexcasting/models/item/focus_4.json
e2f8f78c5009deb7368e44af09d90c1da075240d assets/hexcasting/models/item/focus_4_filled.json
abdeb1a3563f983bd09db8e7c666ddbdffc3903b assets/hexcasting/models/item/focus_4_sealed.json
9b687b3c191c5802bc39613ae705d7313139b310 assets/hexcasting/models/item/focus_5.json
a00edbeef7c2d828f4f16ed43d5e3a53e9674787 assets/hexcasting/models/item/focus_5_filled.json
c40bd0246003cd2c1824ad61ad718f5959dc6e10 assets/hexcasting/models/item/focus_5_sealed.json
3c77a283be7249e00e1947676276f7484b00ea83 assets/hexcasting/models/item/focus_6.json
732c8201606b3c510c0467fc3840aa1475f7b56f assets/hexcasting/models/item/focus_6_filled.json
9bf849da1973419685e4ed36a823285b154b143f assets/hexcasting/models/item/focus_6_sealed.json
759efbfda9f003e920e37b3b8f0306dd20562e94 assets/hexcasting/models/item/focus_7.json
b2702eb139b47fcdfd3ef268bbc9700eeaae82f3 assets/hexcasting/models/item/focus_7_filled.json
1e89b03a5f3a860dae1864c4dbfe855564f89705 assets/hexcasting/models/item/focus_7_sealed.json
6ec61fea7d8c49cc0c45b64857fd926451b4845f assets/hexcasting/models/item/jeweler_hammer.json
abfc028c974a02780aed3d7a5859352503bbd920 assets/hexcasting/models/item/lens.json
a34a6d777ae265c7e49c8bb23c15f04359236544 assets/hexcasting/models/item/lore_fragment.json
a3e134b79977545049da01671f3a1bd636d14789 assets/hexcasting/models/item/old_staff.json
82fa0a2bb17e40c0b3f826e97b2e95445ec24ab8 assets/hexcasting/models/item/patchouli_book.json
91186c79af073cc390a1f1e6712540e1a49b716e assets/hexcasting/models/item/phial_larger_0.json
548d6999c6b5cb2c5b8d36d190fc849632f9f8ea assets/hexcasting/models/item/phial_larger_1.json
3162e3b88e59a9ab4b9df345724a0964db695688 assets/hexcasting/models/item/phial_larger_2.json
4e8f120d8472135ba1d8c332848fd0cc4c9ef1a0 assets/hexcasting/models/item/phial_larger_3.json
7b0d93186cd60cf31049512ca1147262a2bf203f assets/hexcasting/models/item/phial_larger_4.json
8943ca4912ab23d507725744f675ddcc56ccf1a9 assets/hexcasting/models/item/phial_largest_0.json
e20faba33418dac72ff3ad360eeb6fce3fce2728 assets/hexcasting/models/item/phial_largest_1.json
f0623e9b9192098dff982fabf1e598a27f96b7a8 assets/hexcasting/models/item/phial_largest_2.json
911736f4e2e3d825fb01f13dd32bf0108b68df99 assets/hexcasting/models/item/phial_largest_3.json
86d475f4c5bda63a564604e828f408ac6769e9eb assets/hexcasting/models/item/phial_largest_4.json
d69d10e6cb967b98b3294cc86174182c671de671 assets/hexcasting/models/item/phial_large_0.json
9b7805bec9481956b0ccc6c65dd8e02d3b3cdf54 assets/hexcasting/models/item/phial_large_1.json
596a866a0fac7cfe916d1e78f2a5f20856493c62 assets/hexcasting/models/item/phial_large_2.json
@ -81,7 +157,10 @@ d60b723c44183b59cbadfd02a911dab5e89e0e61 assets/hexcasting/models/item/pride_col
c67e74e2a323872c3b34b113df99da8b77a501c6 assets/hexcasting/models/item/pride_colorizer_plural.json
7c4191ec2479b0a67e578da49d459deea8294ec4 assets/hexcasting/models/item/pride_colorizer_transgender.json
5038e069909e2dcf8664bcde81b229c8e27191ae assets/hexcasting/models/item/quenched_allay.json
6bef352b86abdaf9ce4f4942f01e746aa7cc62a2 assets/hexcasting/models/item/quenched_allay_bricks.json
c9aab9c7c0483766c670cfda7916323473e3c097 assets/hexcasting/models/item/quenched_allay_bricks_small.json
a8859c93236b88f9ed46a4957f5723965ce04e03 assets/hexcasting/models/item/quenched_allay_shard.json
812d5b11011c52dc5ce97040f9df5125c0542d10 assets/hexcasting/models/item/quenched_allay_tiles.json
8105007d186fe2c6bea6958dd85d1b2ed3cecb58 assets/hexcasting/models/item/quenched_shard_0.json
aef7d4b759bcc8a1d5b886b8a0170657e447a8d8 assets/hexcasting/models/item/quenched_shard_1.json
4a08374ef00de51381df9659488cb305e7c8674f assets/hexcasting/models/item/quenched_shard_2.json
@ -96,11 +175,34 @@ e5e1c3116c97deeee0ab5e87178043f4f1b53bea assets/hexcasting/models/item/scroll_an
e4dd5a16b9914044c1721df150e02b657835d97b assets/hexcasting/models/item/scroll_pristine_small.json
c809785d09b2545dac68d4a10b1e576454dd51e7 assets/hexcasting/models/item/scroll_small.json
9b82beea7667a8f9de3d1e8df136bb2034ed51a8 assets/hexcasting/models/item/slate.json
973361a2dd2ba5f3cd9fe2104f7ead43b085acc8 assets/hexcasting/models/item/slate_amethyst_pillar.json
612d4c65fb907c75975659edf00c7d92bf1b43d8 assets/hexcasting/models/item/slate_blank.json
96c85c64446072761910774b36924436c637faab assets/hexcasting/models/item/slate_pillar.json
e6452f95b60240e0067769d7f32a0b9fa7718a1b assets/hexcasting/models/item/slate_written.json
986674763b45e0f9381f9f34a708082e5230652a assets/hexcasting/models/item/spellbook.json
f962c13ab9e299885387cee35b16006651821e81 assets/hexcasting/models/item/spellbook_filled.json
c29e6e7b2168eeeb13b1fc3e93ffc3e0c9bd11ce assets/hexcasting/models/item/spellbook_sealed.json
34abd8e443c028eeb24535b685cb3876f7235c23 assets/hexcasting/models/item/spellbook.json
2c23e0ce8a59f0f143ab514f46251e39fae39d6e assets/hexcasting/models/item/spellbook_0_filled.json
e8264e67b895bb61b52b936968b120c064507a26 assets/hexcasting/models/item/spellbook_0_sealed.json
b94a2beab80e87ed3f7e6004f70a3919c64272b4 assets/hexcasting/models/item/spellbook_1.json
158148d51abd63a93123fa7f2e2bce45d83d237f assets/hexcasting/models/item/spellbook_1_filled.json
c2fc066cee9a1e2ddf5a4507cf90b88a65d32028 assets/hexcasting/models/item/spellbook_1_sealed.json
85adbb3604db5a2e41877e2085d445df5622b549 assets/hexcasting/models/item/spellbook_2.json
83336c6e8bac94473e2f420084e544feef016d52 assets/hexcasting/models/item/spellbook_2_filled.json
a585cd9359896cd5ec62e4ccc28649170b2c8875 assets/hexcasting/models/item/spellbook_2_sealed.json
62e70d832eae787e0f086bf2f959eca19bfdfcd4 assets/hexcasting/models/item/spellbook_3.json
b312e3a09356f92d4f47b89f319e5ceeadb565ae assets/hexcasting/models/item/spellbook_3_filled.json
6ec3b9c77f6c7c4953d06c69bd5c06fc90e51d3d assets/hexcasting/models/item/spellbook_3_sealed.json
411ee9b98ec41a11d4026863332f0c65891807fe assets/hexcasting/models/item/spellbook_4.json
99aea30de3172c435b9a85a8ccce599251ed2722 assets/hexcasting/models/item/spellbook_4_filled.json
5881069c0b7e0e2bbaf07d8016fe4bcacce2e5e8 assets/hexcasting/models/item/spellbook_4_sealed.json
c4a41996c971ab44175cb8be5247b595836973cb assets/hexcasting/models/item/spellbook_5.json
4b9a2d0f4942fff48f31e58bde673863303396ad assets/hexcasting/models/item/spellbook_5_filled.json
d47f10973fa2660230f2249b3c009d4c7e4fc33f assets/hexcasting/models/item/spellbook_5_sealed.json
2adb81185491d908b5059c5a8df2a72c0913406b assets/hexcasting/models/item/spellbook_6.json
1d98011ce5c424be3488ac613d04f09572f85120 assets/hexcasting/models/item/spellbook_6_filled.json
53f092cea6f0f27d1b41a4be4403aed908768d2f assets/hexcasting/models/item/spellbook_6_sealed.json
a1dc5817c7c62e0d6e4c1ca1c5bfba6973a9b253 assets/hexcasting/models/item/spellbook_7.json
e43bfc743664dc23cbb2aaa4a66072ce1bbb5c2f assets/hexcasting/models/item/spellbook_7_filled.json
32210f56cb33747d9890de18300ae936cc8b0f77 assets/hexcasting/models/item/spellbook_7_sealed.json
f791313aa7bb01b418676ffaeeb09286ca9bddff assets/hexcasting/models/item/staff/acacia.json
19acf04c62128275b8fb468e89a30ab94d6e5a1a assets/hexcasting/models/item/staff/birch.json
244ba74a82a188df6fd258affcdd4b1a7320e617 assets/hexcasting/models/item/staff/crimson.json
@ -122,8 +224,22 @@ ea3f18f75776022127f3a108119e3f7a5c211c0f assets/hexcasting/models/item/stripped_
0a100b64e77394606018320bbc5752a546fe0af4 assets/hexcasting/models/item/sub_sandwich.json
6a7f5af82cf8ec72c3457ef4c1ae11a76717bf88 assets/hexcasting/models/item/thought_knot.json
93b2191ffab47003f661b75a85cd833ec64f0c15 assets/hexcasting/models/item/thought_knot_written.json
5f4831d11d8f45b037a6f48e12d2e794ada7b961 assets/hexcasting/models/item/trinket.json
946970e74b8d3c76c15191f494bc1f3d7e36aa43 assets/hexcasting/models/item/trinket_filled.json
9e4d326d8339db5d7a627a14630e6c0b2fa32ba6 assets/hexcasting/models/item/trinket.json
dba1f5c24852f756280a5d20c3327ea3825c083a assets/hexcasting/models/item/trinket_0_filled.json
e666a8f88dce284d5026f61814a19c5c8d49eda5 assets/hexcasting/models/item/trinket_1.json
35c7c9f46b05dc05002ac77f94b33f8da97238a1 assets/hexcasting/models/item/trinket_1_filled.json
678a892654958f87400c4d9afb1c5ed47692b77b assets/hexcasting/models/item/trinket_2.json
d8e372e768ca59566633f720ef7816eb34b13966 assets/hexcasting/models/item/trinket_2_filled.json
f8a08620915d5f1756b04c4e92d4e0324d381998 assets/hexcasting/models/item/trinket_3.json
cfc0260102aa161e893b0300ba6941c724cada9f assets/hexcasting/models/item/trinket_3_filled.json
d01e9a46398df5da17f651129b4c4c597cf1726c assets/hexcasting/models/item/trinket_4.json
bb6347ea5701bbccfc713f695f3722d218c52af2 assets/hexcasting/models/item/trinket_4_filled.json
90235641f09e4b1923c217f3c977427391daed6c assets/hexcasting/models/item/trinket_5.json
684800b5a011fe247f42ebc4829033a72030c55c assets/hexcasting/models/item/trinket_5_filled.json
d912708aa8de120d4598a62276f333ac096cdacb assets/hexcasting/models/item/trinket_6.json
24ad9a85ca790205f3e9e62ecb60bc8e50ac47fb assets/hexcasting/models/item/trinket_6_filled.json
b9d891572f572d76c0c0aef0afc3d3cb80f72c30 assets/hexcasting/models/item/trinket_7.json
4a8b82a628a3c4b16c4a45d3689799c8d9cf8bf8 assets/hexcasting/models/item/trinket_7_filled.json
c6523de66cbfae3a1e6361c635cc693a0a089bb3 assets/hexcasting/models/item/uuid_colorizer.json
c0af5573a4acb5eeacf49ab309d32b6f90ea8a5d assets/hexcasting/models/staff/acacia.json
ac7a4b95db8bde9da23dd4fa76d8086a67e166f8 assets/hexcasting/models/staff/birch.json

View file

@ -1,22 +1,29 @@
// 1.19.2 2023-05-23T13:06:30.179893298 Block States: hexcasting
// 1.19.2 2023-06-10T16:57:29.5188333 Block States: hexcasting
901e38574bdaa40ea4a0f6e773a88a95d9c03e55 assets/hexcasting/blockstates/akashic_bookshelf.json
32a77ef668198002563d68be35a24fa93c8d454a assets/hexcasting/blockstates/akashic_connector.json
85080ce0a0387583a839e4788517d675a1a35e24 assets/hexcasting/blockstates/akashic_record.json
04221253f80c85d1e19e9688cae5039f257c8d63 assets/hexcasting/blockstates/amethyst_bricks.json
3b4d0e25a44b9ac1582a969bdd435c3d436b8ba8 assets/hexcasting/blockstates/amethyst_bricks_small.json
1919f303e32e4ea395caa26c1e08c65cd2641e95 assets/hexcasting/blockstates/amethyst_dust_block.json
d422119401df3daae032f86ea740b6065a92c44c assets/hexcasting/blockstates/amethyst_edified_leaves.json
25990c171a75164aa282a23acae949b17173426d assets/hexcasting/blockstates/amethyst_pillar.json
276a70fa0e2b94ec3e2218015842b6e315157283 assets/hexcasting/blockstates/amethyst_sconce.json
8b35482fc7d38211847ee2e18b8df56cc06dece2 assets/hexcasting/blockstates/amethyst_tiles.json
09b6b22fecc577c4fcf4f7ad49f5d6907ef3d10a assets/hexcasting/blockstates/amethyst_tiles.json
65f7a4db6fa7616374ff814624231aec859d0a71 assets/hexcasting/blockstates/ancient_scroll_paper.json
236496e910696b68480a7b8a977434213fa2197a assets/hexcasting/blockstates/ancient_scroll_paper_lantern.json
2f2eb1130119f6d5f17a98082b727ec7a2ea5334 assets/hexcasting/blockstates/aventurine_edified_leaves.json
fa6dfbc40e5b9b22c01356e8a3848d242c414c02 assets/hexcasting/blockstates/citrine_edified_leaves.json
dc268e4c50e5e155fc5414a5f6b58ce1782bd39b assets/hexcasting/blockstates/conjured.json
dc268e4c50e5e155fc5414a5f6b58ce1782bd39b assets/hexcasting/blockstates/conjured_block.json
dc268e4c50e5e155fc5414a5f6b58ce1782bd39b assets/hexcasting/blockstates/conjured_light.json
b76cc8a2d66700417046c0dc671badd9af3eb519 assets/hexcasting/blockstates/directrix/empty.json
365eba1c32a7a33698120bc7f12670d29087e999 assets/hexcasting/blockstates/directrix/redstone.json
e125b73869a438bafa7f47cfa4c8d837e2463c6f assets/hexcasting/blockstates/edified_button.json
749d29dc5e11aeba703022dd66aad939d211a3b9 assets/hexcasting/blockstates/edified_door.json
9080ec8bb4142aa3f80775fb017d821585cdfeba assets/hexcasting/blockstates/edified_log.json
b9bbfe3288a699ef51ee0d21ec8e335f811353ca assets/hexcasting/blockstates/edified_log_amethyst.json
fc0f4407ef06ac962b5985db31800e05c8f1d1be assets/hexcasting/blockstates/edified_log_aventurine.json
56a1a09d9e755d5db882fad46c2c603037148f24 assets/hexcasting/blockstates/edified_log_citrine.json
1c6a336f3e975ef6c74a62f49f98af601f979a76 assets/hexcasting/blockstates/edified_log_purple.json
2a894cc506928113c967e65281950d91ca73ec50 assets/hexcasting/blockstates/edified_panel.json
61abf0ff91d33d51f2c1e0b5aace5580ad3ec5af assets/hexcasting/blockstates/edified_planks.json
b2c7e0d8dd5ef0e942a28363649a88e268f36ce2 assets/hexcasting/blockstates/edified_pressure_plate.json
@ -30,10 +37,21 @@ b4c85725c8cddadffe0b80586dcd35a8d08b7f47 assets/hexcasting/blockstates/impetus/e
d2c41f2997d018f2e8e095508378e6d9aa8d7b6c assets/hexcasting/blockstates/impetus/redstone.json
d7c50e1ce1a4219f22e1c1ac6b5a1e38ee16d0d7 assets/hexcasting/blockstates/impetus/rightclick.json
c41c3f2f39c9fa8a319a705e2183112df18cb4f8 assets/hexcasting/blockstates/quenched_allay.json
0cdb41c9716ca939f348876aebbb46921e490f0d assets/hexcasting/blockstates/quenched_allay_bricks.json
d595dc580e8c154c771131ab2ad0c982c1c6b280 assets/hexcasting/blockstates/quenched_allay_bricks_small.json
fb69a8b5507838f3e418a4f9724da20b73cfc2d0 assets/hexcasting/blockstates/quenched_allay_tiles.json
0aca7e2e67793a21ffc794c02fb2b22d02d2058a assets/hexcasting/blockstates/scroll_paper.json
e5c88e23be0552d4c06062510e8feeab510472ef assets/hexcasting/blockstates/scroll_paper_lantern.json
ef6b44bd2360926cb9dcde5bb3f1380385acea90 assets/hexcasting/blockstates/slate.json
9d2f430f379569c512ca80540bb0242f33066ed3 assets/hexcasting/blockstates/slate_amethyst_bricks.json
8de3b35109abb92bcd8f8ce0e05068abf37b0c27 assets/hexcasting/blockstates/slate_amethyst_bricks_small.json
b341fc5a5f113863b37bc3e0f4cb16d677a4baeb assets/hexcasting/blockstates/slate_amethyst_pillar.json
b52cc5b8ab2d301df1d220b2596b393a19a149fe assets/hexcasting/blockstates/slate_amethyst_tiles.json
571fe1d5dfdfd9dacd88bc6d04b1a10e01920bd9 assets/hexcasting/blockstates/slate_block.json
c8c732a2c32e0fbdd2d3c1f7de9d1633479f7ce1 assets/hexcasting/blockstates/slate_bricks.json
a67dc65f3b1e4035662154f0de32e33e2300ad3c assets/hexcasting/blockstates/slate_bricks_small.json
b4f572a104921eba369abe5c84af3682087067c9 assets/hexcasting/blockstates/slate_pillar.json
113b805c092cf5e62f0972056d0d53a591b5aae9 assets/hexcasting/blockstates/slate_tiles.json
13fc293e23c575b19f81f9c4bcd7131d2c34f678 assets/hexcasting/blockstates/stripped_edified_log.json
d66dd72dfbc57537c39d98cf221cc0bfd108dc47 assets/hexcasting/blockstates/stripped_edified_wood.json
b2f3c31e92c7ce6d5b42d95d7ece82b898a9f4f7 assets/hexcasting/models/block/akashic_bookshelf.json
@ -46,7 +64,6 @@ d3b9ed0fd896d96d9bf571ccf3e37d1101e5c162 assets/hexcasting/models/block/akashic_
e2a738dede302484f7c8d19dde58c08f841f0432 assets/hexcasting/models/block/akashic_record.json
218a4e73a221eae6b0da7ecdd7f64c0532be46ee assets/hexcasting/models/block/amethyst_dust_block.json
031fefc08eaad4f0d5b7b4b23a0f311f5b5b84b4 assets/hexcasting/models/block/amethyst_edified_leaves.json
a01a3f7c666a611dbf675b66eea2087d435e99d9 assets/hexcasting/models/block/amethyst_tiles.json
c0a2818ae1162e8b93d32a913602ba8523476695 assets/hexcasting/models/block/ancient_scroll_paper.json
77d0a5c4496678f96da5103b49777e612e3cba1e assets/hexcasting/models/block/ancient_scroll_paper_lantern.json
8b6de8cb9ccea9a8e4ce207f0b72048881c11da9 assets/hexcasting/models/block/aventurine_edified_leaves.json
@ -74,18 +91,18 @@ c0a2818ae1162e8b93d32a913602ba8523476695 assets/hexcasting/models/block/ancient_
5a61959d58c2e01b970aea64980b854f5611dd7c assets/hexcasting/models/block/circle/directrix/redstone/dim_unpowered_south.json
5a61959d58c2e01b970aea64980b854f5611dd7c assets/hexcasting/models/block/circle/directrix/redstone/dim_unpowered_up.json
5a61959d58c2e01b970aea64980b854f5611dd7c assets/hexcasting/models/block/circle/directrix/redstone/dim_unpowered_west.json
2d5e4a8848a8c856a2712ddb72b4adc83cf952a2 assets/hexcasting/models/block/circle/directrix/redstone/lit_powered_down.json
2d5e4a8848a8c856a2712ddb72b4adc83cf952a2 assets/hexcasting/models/block/circle/directrix/redstone/lit_powered_east.json
2d5e4a8848a8c856a2712ddb72b4adc83cf952a2 assets/hexcasting/models/block/circle/directrix/redstone/lit_powered_north.json
2d5e4a8848a8c856a2712ddb72b4adc83cf952a2 assets/hexcasting/models/block/circle/directrix/redstone/lit_powered_south.json
2d5e4a8848a8c856a2712ddb72b4adc83cf952a2 assets/hexcasting/models/block/circle/directrix/redstone/lit_powered_up.json
2d5e4a8848a8c856a2712ddb72b4adc83cf952a2 assets/hexcasting/models/block/circle/directrix/redstone/lit_powered_west.json
1a51c4f6d2d749c85562da1df2fa97392eeec40a assets/hexcasting/models/block/circle/directrix/redstone/lit_unpowered_down.json
1a51c4f6d2d749c85562da1df2fa97392eeec40a assets/hexcasting/models/block/circle/directrix/redstone/lit_unpowered_east.json
1a51c4f6d2d749c85562da1df2fa97392eeec40a assets/hexcasting/models/block/circle/directrix/redstone/lit_unpowered_north.json
1a51c4f6d2d749c85562da1df2fa97392eeec40a assets/hexcasting/models/block/circle/directrix/redstone/lit_unpowered_south.json
1a51c4f6d2d749c85562da1df2fa97392eeec40a assets/hexcasting/models/block/circle/directrix/redstone/lit_unpowered_up.json
1a51c4f6d2d749c85562da1df2fa97392eeec40a assets/hexcasting/models/block/circle/directrix/redstone/lit_unpowered_west.json
985d84a2d334b491d50ab434bdb402d35d31420a assets/hexcasting/models/block/circle/directrix/redstone/lit_powered_down.json
985d84a2d334b491d50ab434bdb402d35d31420a assets/hexcasting/models/block/circle/directrix/redstone/lit_powered_east.json
985d84a2d334b491d50ab434bdb402d35d31420a assets/hexcasting/models/block/circle/directrix/redstone/lit_powered_north.json
985d84a2d334b491d50ab434bdb402d35d31420a assets/hexcasting/models/block/circle/directrix/redstone/lit_powered_south.json
985d84a2d334b491d50ab434bdb402d35d31420a assets/hexcasting/models/block/circle/directrix/redstone/lit_powered_up.json
985d84a2d334b491d50ab434bdb402d35d31420a assets/hexcasting/models/block/circle/directrix/redstone/lit_powered_west.json
04dd35d39851feb1b1203b698da39aef2f672e04 assets/hexcasting/models/block/circle/directrix/redstone/lit_unpowered_down.json
04dd35d39851feb1b1203b698da39aef2f672e04 assets/hexcasting/models/block/circle/directrix/redstone/lit_unpowered_east.json
04dd35d39851feb1b1203b698da39aef2f672e04 assets/hexcasting/models/block/circle/directrix/redstone/lit_unpowered_north.json
04dd35d39851feb1b1203b698da39aef2f672e04 assets/hexcasting/models/block/circle/directrix/redstone/lit_unpowered_south.json
04dd35d39851feb1b1203b698da39aef2f672e04 assets/hexcasting/models/block/circle/directrix/redstone/lit_unpowered_up.json
04dd35d39851feb1b1203b698da39aef2f672e04 assets/hexcasting/models/block/circle/directrix/redstone/lit_unpowered_west.json
85a51b4253b01a236df8c691364f14566b964b8e assets/hexcasting/models/block/circle/impetus/empty/dim_down.json
85a51b4253b01a236df8c691364f14566b964b8e assets/hexcasting/models/block/circle/impetus/empty/dim_east.json
85a51b4253b01a236df8c691364f14566b964b8e assets/hexcasting/models/block/circle/impetus/empty/dim_north.json
@ -136,6 +153,20 @@ b45b1e1ff5360c9bd5985bf6ea375df437da2b22 assets/hexcasting/models/block/circle/i
b45b1e1ff5360c9bd5985bf6ea375df437da2b22 assets/hexcasting/models/block/circle/impetus/rightclick/lit_west.json
7b47963b4fb1598595cc972f8ac6a38d542c6cf8 assets/hexcasting/models/block/citrine_edified_leaves.json
8b556039d842c21d8cb4cb902aaa5ab6f657a566 assets/hexcasting/models/block/conjured.json
663e744436e300ccead6a7865c72beb86a12532b assets/hexcasting/models/block/deco/amethyst_bricks.json
8db7e7dff6590f9031718c0513e3d75f92ff2525 assets/hexcasting/models/block/deco/amethyst_bricks_small.json
4ba75056f28a3a9ea0c69eb4bd7167a43bd31d74 assets/hexcasting/models/block/deco/amethyst_pillar.json
498da886ef9ba804d18e9a9ebad2acce0efb4ac2 assets/hexcasting/models/block/deco/amethyst_tiles.json
11ed17c8196b894e7f46f72f58fae1286dec4636 assets/hexcasting/models/block/deco/slate_amethyst_bricks_0.json
a04e6772e19e0803217bad644b0f2b2d342cc0fb assets/hexcasting/models/block/deco/slate_amethyst_bricks_1.json
ea05d80cfd1b19be57a04502948bd72f6b39810f assets/hexcasting/models/block/deco/slate_amethyst_bricks_2.json
c7ace7614fedaa48a07e573948d3265eb9baf399 assets/hexcasting/models/block/deco/slate_amethyst_bricks_small_0.json
6060174b4ee67529c5159a95b1d9a4dc29939558 assets/hexcasting/models/block/deco/slate_amethyst_bricks_small_1.json
e7737a9b49cf47235ce4bc5661ae511fb5502f02 assets/hexcasting/models/block/deco/slate_amethyst_bricks_small_2.json
7232b88842fa67b4d3c49d4080623c758f85d8cd assets/hexcasting/models/block/deco/slate_amethyst_tiles.json
d8cda16f0554a97039096a7c2fba50044bd5d0fa assets/hexcasting/models/block/deco/slate_bricks.json
099367e64dea6cef0399ccb30293e56030a5dc20 assets/hexcasting/models/block/deco/slate_bricks_small.json
606a997b09ab7b1b0b6ddf754b583bd7fceb2e46 assets/hexcasting/models/block/deco/slate_tiles.json
d04e6e7976a44e4286f0693a0ea173bc08525c6d assets/hexcasting/models/block/edified_button.json
79b149288702e1239dee1f94f8562f8c37410d14 assets/hexcasting/models/block/edified_button_pressed.json
b13efe9e1aade0163a8d378184a19a639b98c460 assets/hexcasting/models/block/edified_door_bottom_left.json
@ -147,7 +178,15 @@ b13efe9e1aade0163a8d378184a19a639b98c460 assets/hexcasting/models/block/edified_
729cf57ba13bf915999b4297aadb2ef6848d0337 assets/hexcasting/models/block/edified_door_top_right.json
db3008a51e611ee3ffb86b5829df6b7da6bfcc61 assets/hexcasting/models/block/edified_door_top_right_open.json
c5433d0b5c9f039ae3c314c8a82c7e1d3238447d assets/hexcasting/models/block/edified_log.json
4e779dbe1d8dfcb2d500bf43d71ecf0bd0104eac assets/hexcasting/models/block/edified_log_amethyst.json
5c9d3a002deae195ba8bff03ac106c302d36792d assets/hexcasting/models/block/edified_log_amethyst_horizontal.json
a470e058329c844661a8011393b57d00efa1fe09 assets/hexcasting/models/block/edified_log_aventurine.json
20695e3c99b52b7738e96c57659bb358dbe9f9ec assets/hexcasting/models/block/edified_log_aventurine_horizontal.json
c38df07b2dada3843ce9399b244d2b9ecdb8faf2 assets/hexcasting/models/block/edified_log_citrine.json
df0e644143c2e50e1f165e89223796a758feb685 assets/hexcasting/models/block/edified_log_citrine_horizontal.json
71f1505d8255e1d57b8a9100b008dbaf73beacdc assets/hexcasting/models/block/edified_log_horizontal.json
231d3d0651bc8525e45f1c9a6bdcd0292b7209b4 assets/hexcasting/models/block/edified_log_purple.json
3cbf60f5ff164e84ae1224520f991a53c1177c14 assets/hexcasting/models/block/edified_log_purple_horizontal.json
e691e8592c9ba75a2c67979ebef11e1c9280075b assets/hexcasting/models/block/edified_panel.json
7dbd6ab538ab6452c981275976d698a8cd7f5636 assets/hexcasting/models/block/edified_planks.json
e291a8a550c6a31e1e11cdd590129d2b61aa3f36 assets/hexcasting/models/block/edified_planks_2.json
@ -166,9 +205,16 @@ ba95ea7a856895ca2a3438293b79fe4798b212ad assets/hexcasting/models/block/edified_
d4f286180e320c0ca819067b9e9a9b1db7f72e0a assets/hexcasting/models/block/edified_wood.json
b2e1617c6549ffdf0a38bfbb6e9270a54c7a2718 assets/hexcasting/models/block/edified_wood_horizontal.json
9af2754cb1e53eeaa85618cf92651b4878cf62b1 assets/hexcasting/models/block/quenched_allay.json
2fc68dcd6d73da3deaa6a33240dd9160a2b79592 assets/hexcasting/models/block/quenched_allay_bricks.json
669d9348f4581dae45c35268a760675509a89a29 assets/hexcasting/models/block/quenched_allay_bricks_small.json
bacd99e8c24b9ce004e8aeff509cca4b971f3ed9 assets/hexcasting/models/block/quenched_allay_tiles.json
12ef9da44a265e8aa92d4c37d26fa0777493629e assets/hexcasting/models/block/scroll_paper.json
4f0924c356f9d7bccc490344944d44010ea7e918 assets/hexcasting/models/block/scroll_paper_lantern.json
e450fafba8beee7b800376ed54ff7c3ff7db5faf assets/hexcasting/models/block/slate_amethyst_pillar.json
c68d869d5320b9304ed301a3ce6dfa7dbea74747 assets/hexcasting/models/block/slate_amethyst_pillar_horizontal.json
603ffa587a335cf23e2bb17604583c6ad6f436b8 assets/hexcasting/models/block/slate_block.json
e7481aed52721e3893c4fa70341d696992223c25 assets/hexcasting/models/block/slate_pillar.json
5cfe93a217031aff9db6c9067c56d2366b13ac7e assets/hexcasting/models/block/slate_pillar_horizontal.json
a5081ed63f45e689df2c2d6a6c1283bfcd89f20f assets/hexcasting/models/block/stripped_edified_log.json
e5484f6caf6bea67cc8a447c202a4f1dc11957db assets/hexcasting/models/block/stripped_edified_log_horizontal.json
4495b24baf73ef0aaf930a136bf0052398aad1b3 assets/hexcasting/models/block/stripped_edified_wood.json
@ -176,10 +222,12 @@ ca5cd940b68d928845dc2d104da3dda8d15e45dd assets/hexcasting/models/block/stripped
19a6005af10d0812e8c861053f5863e6e04af3ba assets/hexcasting/models/item/akashic_bookshelf.json
faf66c95b0725ee747c4e510414522121d9f80eb assets/hexcasting/models/item/akashic_connector.json
19730853397b109cfedd0c3bbda83d5de6cd15b9 assets/hexcasting/models/item/akashic_record.json
b5ddad23811e2f51a036c497dbe2e9f569801e79 assets/hexcasting/models/item/amethyst_bricks.json
f41f6f46a5a37e757eb4e4df3b10f68fc86efe66 assets/hexcasting/models/item/amethyst_bricks_small.json
951a9945880de02cae20c1afaf38b16b21194dd1 assets/hexcasting/models/item/amethyst_dust_block.json
144aa423e08987551a34aff969884a11c4efbff7 assets/hexcasting/models/item/amethyst_edified_leaves.json
f81fdf1ffe88fab521b34901e983cd4836ce4529 assets/hexcasting/models/item/amethyst_sconce.json
d0eb15cbb5d10fdf43d421d89b4018ed60d352e2 assets/hexcasting/models/item/amethyst_tiles.json
fa23967e352823f0fc9e2bdd11a9cbac7c47b135 assets/hexcasting/models/item/amethyst_tiles.json
1d0a961ead6b43d20c621b351532656bf3a0d6d2 assets/hexcasting/models/item/ancient_scroll_paper.json
d4a109488c27fc5d60e9054cd1485f1982040ff3 assets/hexcasting/models/item/ancient_scroll_paper_lantern.json
7c2b9b5296ba5e3c261bb237555e7d4082ad9303 assets/hexcasting/models/item/aventurine_edified_leaves.json
@ -195,4 +243,10 @@ cbe5bc7148b9e1c1cf5c4517801da664aa39efb8 assets/hexcasting/models/item/impetus/l
e7f590cfc681aa7d19c56df325c95c5fbed01bc5 assets/hexcasting/models/item/impetus/rightclick.json
769dcfb4a504e4dcd28a43cf603a18c66f57e594 assets/hexcasting/models/item/scroll_paper.json
222e40e5754f5cb5a04321c4ed4cee27748c9224 assets/hexcasting/models/item/scroll_paper_lantern.json
e5b07f23ead1bba9ee5a3b86a9e520da883ba331 assets/hexcasting/models/item/slate_amethyst_bricks.json
826f953fdee668104ec1772941c56332e12dbc46 assets/hexcasting/models/item/slate_amethyst_bricks_small.json
a179178b90c8650b7906ce3aa302623bf3c427b7 assets/hexcasting/models/item/slate_amethyst_tiles.json
145db42b0d90bdb4fd82f5a7eea229be4c0f9675 assets/hexcasting/models/item/slate_block.json
eef72354b37ba0940ecf1e0cc5219cc15a6886a6 assets/hexcasting/models/item/slate_bricks.json
cb5ccddcc3654021fc134867303483bd135db65c assets/hexcasting/models/item/slate_bricks_small.json
71c735cca7c0b8c4e55b31fd87e46982552db135 assets/hexcasting/models/item/slate_tiles.json

View file

@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "hexcasting:block/deco/amethyst_bricks"
}
}
}

View file

@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "hexcasting:block/deco/amethyst_bricks_small"
}
}
}

View file

@ -0,0 +1,30 @@
{
"variants": {
"facing=down": {
"model": "hexcasting:block/deco/amethyst_pillar",
"x": 180
},
"facing=east": {
"model": "hexcasting:block/deco/amethyst_pillar",
"x": 90,
"y": 90
},
"facing=north": {
"model": "hexcasting:block/deco/amethyst_pillar",
"x": 90
},
"facing=south": {
"model": "hexcasting:block/deco/amethyst_pillar",
"x": 90,
"y": 180
},
"facing=up": {
"model": "hexcasting:block/deco/amethyst_pillar"
},
"facing=west": {
"model": "hexcasting:block/deco/amethyst_pillar",
"x": 90,
"y": 270
}
}
}

View file

@ -1,7 +1,7 @@
{
"variants": {
"": {
"model": "hexcasting:block/amethyst_tiles"
"model": "hexcasting:block/deco/amethyst_tiles"
}
}
}

View file

@ -0,0 +1,16 @@
{
"variants": {
"axis=x": {
"model": "hexcasting:block/edified_log_amethyst_horizontal",
"x": 90,
"y": 90
},
"axis=y": {
"model": "hexcasting:block/edified_log_amethyst"
},
"axis=z": {
"model": "hexcasting:block/edified_log_amethyst_horizontal",
"x": 90
}
}
}

View file

@ -0,0 +1,16 @@
{
"variants": {
"axis=x": {
"model": "hexcasting:block/edified_log_aventurine_horizontal",
"x": 90,
"y": 90
},
"axis=y": {
"model": "hexcasting:block/edified_log_aventurine"
},
"axis=z": {
"model": "hexcasting:block/edified_log_aventurine_horizontal",
"x": 90
}
}
}

View file

@ -0,0 +1,16 @@
{
"variants": {
"axis=x": {
"model": "hexcasting:block/edified_log_citrine_horizontal",
"x": 90,
"y": 90
},
"axis=y": {
"model": "hexcasting:block/edified_log_citrine"
},
"axis=z": {
"model": "hexcasting:block/edified_log_citrine_horizontal",
"x": 90
}
}
}

View file

@ -0,0 +1,16 @@
{
"variants": {
"axis=x": {
"model": "hexcasting:block/edified_log_purple_horizontal",
"x": 90,
"y": 90
},
"axis=y": {
"model": "hexcasting:block/edified_log_purple"
},
"axis=z": {
"model": "hexcasting:block/edified_log_purple_horizontal",
"x": 90
}
}
}

View file

@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "hexcasting:block/quenched_allay_bricks"
}
}
}

View file

@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "hexcasting:block/quenched_allay_bricks_small"
}
}
}

View file

@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "hexcasting:block/quenched_allay_tiles"
}
}
}

View file

@ -0,0 +1,15 @@
{
"variants": {
"": [
{
"model": "hexcasting:block/deco/slate_amethyst_bricks_0"
},
{
"model": "hexcasting:block/deco/slate_amethyst_bricks_1"
},
{
"model": "hexcasting:block/deco/slate_amethyst_bricks_2"
}
]
}
}

View file

@ -0,0 +1,15 @@
{
"variants": {
"": [
{
"model": "hexcasting:block/deco/slate_amethyst_bricks_small_0"
},
{
"model": "hexcasting:block/deco/slate_amethyst_bricks_small_1"
},
{
"model": "hexcasting:block/deco/slate_amethyst_bricks_small_2"
}
]
}
}

View file

@ -0,0 +1,16 @@
{
"variants": {
"axis=x": {
"model": "hexcasting:block/slate_amethyst_pillar_horizontal",
"x": 90,
"y": 90
},
"axis=y": {
"model": "hexcasting:block/slate_amethyst_pillar"
},
"axis=z": {
"model": "hexcasting:block/slate_amethyst_pillar_horizontal",
"x": 90
}
}
}

View file

@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "hexcasting:block/deco/slate_amethyst_tiles"
}
}
}

View file

@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "hexcasting:block/deco/slate_bricks"
}
}
}

View file

@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "hexcasting:block/deco/slate_bricks_small"
}
}
}

View file

@ -0,0 +1,16 @@
{
"variants": {
"axis=x": {
"model": "hexcasting:block/slate_pillar_horizontal",
"x": 90,
"y": 90
},
"axis=y": {
"model": "hexcasting:block/slate_pillar"
},
"axis=z": {
"model": "hexcasting:block/slate_pillar_horizontal",
"x": 90
}
}
}

View file

@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "hexcasting:block/deco/slate_tiles"
}
}
}

View file

@ -5,7 +5,7 @@
"east": "hexcasting:block/circle/directrix/redstone/left_powered",
"north": "hexcasting:block/circle/directrix/redstone/front_lit_powered",
"particle": "hexcasting:block/slate",
"south": "hexcasting:block/circle/directrix/redstone/back_lit_unpowered",
"south": "hexcasting:block/circle/directrix/redstone/back_dim_powered",
"up": "hexcasting:block/circle/directrix/redstone/top_powered",
"west": "hexcasting:block/circle/directrix/redstone/right_powered"
}

View file

@ -5,7 +5,7 @@
"east": "hexcasting:block/circle/directrix/redstone/left_powered",
"north": "hexcasting:block/circle/directrix/redstone/front_lit_powered",
"particle": "hexcasting:block/slate",
"south": "hexcasting:block/circle/directrix/redstone/back_lit_unpowered",
"south": "hexcasting:block/circle/directrix/redstone/back_dim_powered",
"up": "hexcasting:block/circle/directrix/redstone/top_powered",
"west": "hexcasting:block/circle/directrix/redstone/right_powered"
}

View file

@ -5,7 +5,7 @@
"east": "hexcasting:block/circle/directrix/redstone/left_powered",
"north": "hexcasting:block/circle/directrix/redstone/front_lit_powered",
"particle": "hexcasting:block/slate",
"south": "hexcasting:block/circle/directrix/redstone/back_lit_unpowered",
"south": "hexcasting:block/circle/directrix/redstone/back_dim_powered",
"up": "hexcasting:block/circle/directrix/redstone/top_powered",
"west": "hexcasting:block/circle/directrix/redstone/right_powered"
}

View file

@ -5,7 +5,7 @@
"east": "hexcasting:block/circle/directrix/redstone/left_powered",
"north": "hexcasting:block/circle/directrix/redstone/front_lit_powered",
"particle": "hexcasting:block/slate",
"south": "hexcasting:block/circle/directrix/redstone/back_lit_unpowered",
"south": "hexcasting:block/circle/directrix/redstone/back_dim_powered",
"up": "hexcasting:block/circle/directrix/redstone/top_powered",
"west": "hexcasting:block/circle/directrix/redstone/right_powered"
}

View file

@ -5,7 +5,7 @@
"east": "hexcasting:block/circle/directrix/redstone/left_powered",
"north": "hexcasting:block/circle/directrix/redstone/front_lit_powered",
"particle": "hexcasting:block/slate",
"south": "hexcasting:block/circle/directrix/redstone/back_lit_unpowered",
"south": "hexcasting:block/circle/directrix/redstone/back_dim_powered",
"up": "hexcasting:block/circle/directrix/redstone/top_powered",
"west": "hexcasting:block/circle/directrix/redstone/right_powered"
}

View file

@ -5,7 +5,7 @@
"east": "hexcasting:block/circle/directrix/redstone/left_powered",
"north": "hexcasting:block/circle/directrix/redstone/front_lit_powered",
"particle": "hexcasting:block/slate",
"south": "hexcasting:block/circle/directrix/redstone/back_lit_unpowered",
"south": "hexcasting:block/circle/directrix/redstone/back_dim_powered",
"up": "hexcasting:block/circle/directrix/redstone/top_powered",
"west": "hexcasting:block/circle/directrix/redstone/right_powered"
}

View file

@ -3,7 +3,7 @@
"textures": {
"down": "hexcasting:block/circle/bottom",
"east": "hexcasting:block/circle/directrix/redstone/left_unpowered",
"north": "hexcasting:block/circle/directrix/redstone/front_lit_powered",
"north": "hexcasting:block/circle/directrix/redstone/front_dim_unpowered",
"particle": "hexcasting:block/slate",
"south": "hexcasting:block/circle/directrix/redstone/back_lit_unpowered",
"up": "hexcasting:block/circle/directrix/redstone/top_unpowered",

View file

@ -3,7 +3,7 @@
"textures": {
"down": "hexcasting:block/circle/bottom",
"east": "hexcasting:block/circle/directrix/redstone/left_unpowered",
"north": "hexcasting:block/circle/directrix/redstone/front_lit_powered",
"north": "hexcasting:block/circle/directrix/redstone/front_dim_unpowered",
"particle": "hexcasting:block/slate",
"south": "hexcasting:block/circle/directrix/redstone/back_lit_unpowered",
"up": "hexcasting:block/circle/directrix/redstone/top_unpowered",

View file

@ -3,7 +3,7 @@
"textures": {
"down": "hexcasting:block/circle/bottom",
"east": "hexcasting:block/circle/directrix/redstone/left_unpowered",
"north": "hexcasting:block/circle/directrix/redstone/front_lit_powered",
"north": "hexcasting:block/circle/directrix/redstone/front_dim_unpowered",
"particle": "hexcasting:block/slate",
"south": "hexcasting:block/circle/directrix/redstone/back_lit_unpowered",
"up": "hexcasting:block/circle/directrix/redstone/top_unpowered",

View file

@ -3,7 +3,7 @@
"textures": {
"down": "hexcasting:block/circle/bottom",
"east": "hexcasting:block/circle/directrix/redstone/left_unpowered",
"north": "hexcasting:block/circle/directrix/redstone/front_lit_powered",
"north": "hexcasting:block/circle/directrix/redstone/front_dim_unpowered",
"particle": "hexcasting:block/slate",
"south": "hexcasting:block/circle/directrix/redstone/back_lit_unpowered",
"up": "hexcasting:block/circle/directrix/redstone/top_unpowered",

View file

@ -3,7 +3,7 @@
"textures": {
"down": "hexcasting:block/circle/bottom",
"east": "hexcasting:block/circle/directrix/redstone/left_unpowered",
"north": "hexcasting:block/circle/directrix/redstone/front_lit_powered",
"north": "hexcasting:block/circle/directrix/redstone/front_dim_unpowered",
"particle": "hexcasting:block/slate",
"south": "hexcasting:block/circle/directrix/redstone/back_lit_unpowered",
"up": "hexcasting:block/circle/directrix/redstone/top_unpowered",

View file

@ -3,7 +3,7 @@
"textures": {
"down": "hexcasting:block/circle/bottom",
"east": "hexcasting:block/circle/directrix/redstone/left_unpowered",
"north": "hexcasting:block/circle/directrix/redstone/front_lit_powered",
"north": "hexcasting:block/circle/directrix/redstone/front_dim_unpowered",
"particle": "hexcasting:block/slate",
"south": "hexcasting:block/circle/directrix/redstone/back_lit_unpowered",
"up": "hexcasting:block/circle/directrix/redstone/top_unpowered",

View file

@ -0,0 +1,6 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "hexcasting:block/deco/amethyst_bricks"
}
}

View file

@ -0,0 +1,6 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "hexcasting:block/deco/amethyst_bricks_small"
}
}

View file

@ -0,0 +1,8 @@
{
"parent": "minecraft:block/cube_bottom_top",
"textures": {
"bottom": "hexcasting:block/deco/amethyst_pillar_bottom",
"side": "hexcasting:block/deco/amethyst_pillar_side",
"top": "hexcasting:block/deco/amethyst_pillar_top"
}
}

View file

@ -0,0 +1,6 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "hexcasting:block/deco/amethyst_tiles"
}
}

View file

@ -0,0 +1,6 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "hexcasting:block/deco/quenched_allay_bricks_0"
}
}

View file

@ -0,0 +1,6 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "hexcasting:block/deco/quenched_allay_bricks_1"
}
}

View file

@ -0,0 +1,6 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "hexcasting:block/deco/quenched_allay_bricks_2"
}
}

View file

@ -0,0 +1,6 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "hexcasting:block/deco/quenched_allay_bricks_3"
}
}

View file

@ -0,0 +1,6 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "hexcasting:block/deco/quenched_allay_bricks_small_0"
}
}

View file

@ -0,0 +1,6 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "hexcasting:block/deco/quenched_allay_bricks_small_1"
}
}

View file

@ -0,0 +1,6 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "hexcasting:block/deco/quenched_allay_bricks_small_2"
}
}

View file

@ -0,0 +1,6 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "hexcasting:block/deco/quenched_allay_bricks_small_3"
}
}

View file

@ -0,0 +1,6 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "hexcasting:block/deco/quenched_allay_tiles_0"
}
}

View file

@ -0,0 +1,6 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "hexcasting:block/deco/quenched_allay_tiles_1"
}
}

View file

@ -0,0 +1,6 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "hexcasting:block/deco/quenched_allay_tiles_2"
}
}

View file

@ -0,0 +1,6 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "hexcasting:block/deco/quenched_allay_tiles_3"
}
}

View file

@ -0,0 +1,6 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "hexcasting:block/deco/slate_amethyst_bricks_0"
}
}

View file

@ -0,0 +1,6 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "hexcasting:block/deco/slate_amethyst_bricks_1"
}
}

View file

@ -0,0 +1,6 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "hexcasting:block/deco/slate_amethyst_bricks_2"
}
}

View file

@ -0,0 +1,6 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "hexcasting:block/deco/slate_amethyst_bricks_small_0"
}
}

View file

@ -0,0 +1,6 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "hexcasting:block/deco/slate_amethyst_bricks_small_1"
}
}

View file

@ -0,0 +1,6 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "hexcasting:block/deco/slate_amethyst_bricks_small_2"
}
}

View file

@ -0,0 +1,6 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "hexcasting:block/deco/slate_amethyst_tiles"
}
}

View file

@ -0,0 +1,6 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "hexcasting:block/deco/slate_bricks"
}
}

View file

@ -0,0 +1,6 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "hexcasting:block/deco/slate_bricks_small"
}
}

View file

@ -1,6 +1,6 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "hexcasting:block/amethyst_tiles"
"all": "hexcasting:block/deco/slate_tiles"
}
}

View file

@ -0,0 +1,7 @@
{
"parent": "minecraft:block/cube_column",
"textures": {
"end": "hexcasting:block/edified_log_top",
"side": "hexcasting:block/deco/edified_log_amethyst"
}
}

View file

@ -0,0 +1,7 @@
{
"parent": "minecraft:block/cube_column_horizontal",
"textures": {
"end": "hexcasting:block/edified_log_top",
"side": "hexcasting:block/deco/edified_log_amethyst"
}
}

View file

@ -0,0 +1,7 @@
{
"parent": "minecraft:block/cube_column",
"textures": {
"end": "hexcasting:block/edified_log_top",
"side": "hexcasting:block/deco/edified_log_aventurine"
}
}

View file

@ -0,0 +1,7 @@
{
"parent": "minecraft:block/cube_column_horizontal",
"textures": {
"end": "hexcasting:block/edified_log_top",
"side": "hexcasting:block/deco/edified_log_aventurine"
}
}

View file

@ -0,0 +1,7 @@
{
"parent": "minecraft:block/cube_column",
"textures": {
"end": "hexcasting:block/edified_log_top",
"side": "hexcasting:block/deco/edified_log_citrine"
}
}

View file

@ -0,0 +1,7 @@
{
"parent": "minecraft:block/cube_column_horizontal",
"textures": {
"end": "hexcasting:block/edified_log_top",
"side": "hexcasting:block/deco/edified_log_citrine"
}
}

View file

@ -0,0 +1,7 @@
{
"parent": "minecraft:block/cube_column",
"textures": {
"end": "hexcasting:block/edified_log_top",
"side": "hexcasting:block/deco/edified_log_purple"
}
}

View file

@ -0,0 +1,7 @@
{
"parent": "minecraft:block/cube_column_horizontal",
"textures": {
"end": "hexcasting:block/edified_log_top",
"side": "hexcasting:block/deco/edified_log_purple"
}
}

View file

@ -0,0 +1,6 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "hexcasting:block/deco/quenched_allay_bricks_0"
}
}

View file

@ -0,0 +1,6 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "hexcasting:block/deco/quenched_allay_bricks_small_0"
}
}

View file

@ -0,0 +1,6 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "hexcasting:block/deco/quenched_allay_tiles_0"
}
}

View file

@ -0,0 +1,7 @@
{
"parent": "minecraft:block/cube_column",
"textures": {
"end": "hexcasting:block/deco/slate_amethyst_pillar_end",
"side": "hexcasting:block/deco/slate_amethyst_pillar_side"
}
}

View file

@ -0,0 +1,7 @@
{
"parent": "minecraft:block/cube_column_horizontal",
"textures": {
"end": "hexcasting:block/deco/slate_amethyst_pillar_end",
"side": "hexcasting:block/deco/slate_amethyst_pillar_side"
}
}

View file

@ -0,0 +1,7 @@
{
"parent": "minecraft:block/cube_column",
"textures": {
"end": "hexcasting:block/deco/slate_pillar_end",
"side": "hexcasting:block/deco/slate_pillar_side"
}
}

View file

@ -0,0 +1,7 @@
{
"parent": "minecraft:block/cube_column_horizontal",
"textures": {
"end": "hexcasting:block/deco/slate_pillar_end",
"side": "hexcasting:block/deco/slate_pillar_side"
}
}

View file

@ -0,0 +1,3 @@
{
"parent": "hexcasting:block/deco/amethyst_bricks"
}

View file

@ -0,0 +1,3 @@
{
"parent": "hexcasting:block/deco/amethyst_bricks_small"
}

View file

@ -0,0 +1,3 @@
{
"parent": "hexcasting:block/deco/amethyst_pillar"
}

View file

@ -1,3 +1,3 @@
{
"parent": "hexcasting:block/amethyst_tiles"
"parent": "hexcasting:block/deco/amethyst_tiles"
}

View file

@ -4,17 +4,117 @@
{
"model": "hexcasting:item/artifact",
"predicate": {
"hexcasting:has_patterns": -0.01
"hexcasting:has_patterns": -0.01,
"hexcasting:variant": 0.0
}
},
{
"model": "hexcasting:item/artifact_filled",
"model": "hexcasting:item/artifact_0_filled",
"predicate": {
"hexcasting:has_patterns": 0.99
"hexcasting:has_patterns": 0.99,
"hexcasting:variant": 0.0
}
},
{
"model": "hexcasting:item/artifact_1",
"predicate": {
"hexcasting:has_patterns": -0.01,
"hexcasting:variant": 1.0
}
},
{
"model": "hexcasting:item/artifact_1_filled",
"predicate": {
"hexcasting:has_patterns": 0.99,
"hexcasting:variant": 1.0
}
},
{
"model": "hexcasting:item/artifact_2",
"predicate": {
"hexcasting:has_patterns": -0.01,
"hexcasting:variant": 2.0
}
},
{
"model": "hexcasting:item/artifact_2_filled",
"predicate": {
"hexcasting:has_patterns": 0.99,
"hexcasting:variant": 2.0
}
},
{
"model": "hexcasting:item/artifact_3",
"predicate": {
"hexcasting:has_patterns": -0.01,
"hexcasting:variant": 3.0
}
},
{
"model": "hexcasting:item/artifact_3_filled",
"predicate": {
"hexcasting:has_patterns": 0.99,
"hexcasting:variant": 3.0
}
},
{
"model": "hexcasting:item/artifact_4",
"predicate": {
"hexcasting:has_patterns": -0.01,
"hexcasting:variant": 4.0
}
},
{
"model": "hexcasting:item/artifact_4_filled",
"predicate": {
"hexcasting:has_patterns": 0.99,
"hexcasting:variant": 4.0
}
},
{
"model": "hexcasting:item/artifact_5",
"predicate": {
"hexcasting:has_patterns": -0.01,
"hexcasting:variant": 5.0
}
},
{
"model": "hexcasting:item/artifact_5_filled",
"predicate": {
"hexcasting:has_patterns": 0.99,
"hexcasting:variant": 5.0
}
},
{
"model": "hexcasting:item/artifact_6",
"predicate": {
"hexcasting:has_patterns": -0.01,
"hexcasting:variant": 6.0
}
},
{
"model": "hexcasting:item/artifact_6_filled",
"predicate": {
"hexcasting:has_patterns": 0.99,
"hexcasting:variant": 6.0
}
},
{
"model": "hexcasting:item/artifact_7",
"predicate": {
"hexcasting:has_patterns": -0.01,
"hexcasting:variant": 7.0
}
},
{
"model": "hexcasting:item/artifact_7_filled",
"predicate": {
"hexcasting:has_patterns": 0.99,
"hexcasting:variant": 7.0
}
}
],
"textures": {
"layer0": "hexcasting:item/artifact"
"layer0": "hexcasting:item/cad/0_artifact"
}
}

View file

@ -0,0 +1,7 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "hexcasting:item/cad/0_artifact",
"layer1": "hexcasting:item/cad/0_artifact_overlay"
}
}

View file

@ -1,6 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "hexcasting:item/trinket_filled"
"layer0": "hexcasting:item/cad/1_artifact"
}
}

View file

@ -0,0 +1,7 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "hexcasting:item/cad/1_artifact",
"layer1": "hexcasting:item/cad/1_artifact_overlay"
}
}

View file

@ -1,6 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "hexcasting:item/artifact_filled"
"layer0": "hexcasting:item/cad/2_artifact"
}
}

View file

@ -0,0 +1,7 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "hexcasting:item/cad/2_artifact",
"layer1": "hexcasting:item/cad/2_artifact_overlay"
}
}

View file

@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "hexcasting:item/cad/3_artifact"
}
}

View file

@ -0,0 +1,7 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "hexcasting:item/cad/3_artifact",
"layer1": "hexcasting:item/cad/3_artifact_overlay"
}
}

View file

@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "hexcasting:item/cad/4_artifact"
}
}

View file

@ -0,0 +1,7 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "hexcasting:item/cad/4_artifact",
"layer1": "hexcasting:item/cad/4_artifact_overlay"
}
}

View file

@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "hexcasting:item/cad/5_artifact"
}
}

View file

@ -0,0 +1,7 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "hexcasting:item/cad/5_artifact",
"layer1": "hexcasting:item/cad/5_artifact_overlay"
}
}

View file

@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "hexcasting:item/cad/6_artifact"
}
}

View file

@ -0,0 +1,7 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "hexcasting:item/cad/6_artifact",
"layer1": "hexcasting:item/cad/6_artifact_overlay"
}
}

View file

@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "hexcasting:item/cad/7_artifact"
}
}

View file

@ -0,0 +1,7 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "hexcasting:item/cad/7_artifact",
"layer1": "hexcasting:item/cad/7_artifact_overlay"
}
}

View file

@ -104,6 +104,76 @@
"hexcasting:max_media": 2.0,
"hexcasting:media": 1.0
}
},
{
"model": "hexcasting:item/phial_larger_0",
"predicate": {
"hexcasting:max_media": 3.0,
"hexcasting:media": 0.0
}
},
{
"model": "hexcasting:item/phial_larger_1",
"predicate": {
"hexcasting:max_media": 3.0,
"hexcasting:media": 0.25
}
},
{
"model": "hexcasting:item/phial_larger_2",
"predicate": {
"hexcasting:max_media": 3.0,
"hexcasting:media": 0.5
}
},
{
"model": "hexcasting:item/phial_larger_3",
"predicate": {
"hexcasting:max_media": 3.0,
"hexcasting:media": 0.75
}
},
{
"model": "hexcasting:item/phial_larger_4",
"predicate": {
"hexcasting:max_media": 3.0,
"hexcasting:media": 1.0
}
},
{
"model": "hexcasting:item/phial_largest_0",
"predicate": {
"hexcasting:max_media": 4.0,
"hexcasting:media": 0.0
}
},
{
"model": "hexcasting:item/phial_largest_1",
"predicate": {
"hexcasting:max_media": 4.0,
"hexcasting:media": 0.25
}
},
{
"model": "hexcasting:item/phial_largest_2",
"predicate": {
"hexcasting:max_media": 4.0,
"hexcasting:media": 0.5
}
},
{
"model": "hexcasting:item/phial_largest_3",
"predicate": {
"hexcasting:max_media": 4.0,
"hexcasting:media": 0.75
}
},
{
"model": "hexcasting:item/phial_largest_4",
"predicate": {
"hexcasting:max_media": 4.0,
"hexcasting:media": 1.0
}
}
]
}

View file

@ -4,17 +4,117 @@
{
"model": "hexcasting:item/cypher",
"predicate": {
"hexcasting:has_patterns": -0.01
"hexcasting:has_patterns": -0.01,
"hexcasting:variant": 0.0
}
},
{
"model": "hexcasting:item/cypher_filled",
"model": "hexcasting:item/cypher_0_filled",
"predicate": {
"hexcasting:has_patterns": 0.99
"hexcasting:has_patterns": 0.99,
"hexcasting:variant": 0.0
}
},
{
"model": "hexcasting:item/cypher_1",
"predicate": {
"hexcasting:has_patterns": -0.01,
"hexcasting:variant": 1.0
}
},
{
"model": "hexcasting:item/cypher_1_filled",
"predicate": {
"hexcasting:has_patterns": 0.99,
"hexcasting:variant": 1.0
}
},
{
"model": "hexcasting:item/cypher_2",
"predicate": {
"hexcasting:has_patterns": -0.01,
"hexcasting:variant": 2.0
}
},
{
"model": "hexcasting:item/cypher_2_filled",
"predicate": {
"hexcasting:has_patterns": 0.99,
"hexcasting:variant": 2.0
}
},
{
"model": "hexcasting:item/cypher_3",
"predicate": {
"hexcasting:has_patterns": -0.01,
"hexcasting:variant": 3.0
}
},
{
"model": "hexcasting:item/cypher_3_filled",
"predicate": {
"hexcasting:has_patterns": 0.99,
"hexcasting:variant": 3.0
}
},
{
"model": "hexcasting:item/cypher_4",
"predicate": {
"hexcasting:has_patterns": -0.01,
"hexcasting:variant": 4.0
}
},
{
"model": "hexcasting:item/cypher_4_filled",
"predicate": {
"hexcasting:has_patterns": 0.99,
"hexcasting:variant": 4.0
}
},
{
"model": "hexcasting:item/cypher_5",
"predicate": {
"hexcasting:has_patterns": -0.01,
"hexcasting:variant": 5.0
}
},
{
"model": "hexcasting:item/cypher_5_filled",
"predicate": {
"hexcasting:has_patterns": 0.99,
"hexcasting:variant": 5.0
}
},
{
"model": "hexcasting:item/cypher_6",
"predicate": {
"hexcasting:has_patterns": -0.01,
"hexcasting:variant": 6.0
}
},
{
"model": "hexcasting:item/cypher_6_filled",
"predicate": {
"hexcasting:has_patterns": 0.99,
"hexcasting:variant": 6.0
}
},
{
"model": "hexcasting:item/cypher_7",
"predicate": {
"hexcasting:has_patterns": -0.01,
"hexcasting:variant": 7.0
}
},
{
"model": "hexcasting:item/cypher_7_filled",
"predicate": {
"hexcasting:has_patterns": 0.99,
"hexcasting:variant": 7.0
}
}
],
"textures": {
"layer0": "hexcasting:item/cypher"
"layer0": "hexcasting:item/cad/0_cypher"
}
}

View file

@ -0,0 +1,7 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "hexcasting:item/cad/0_cypher",
"layer1": "hexcasting:item/cad/0_cypher_overlay"
}
}

View file

@ -1,6 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "hexcasting:item/cypher_filled"
"layer0": "hexcasting:item/cad/1_cypher"
}
}

Some files were not shown because too many files have changed in this diff Show more