Merge pull request #57 from TeamGalena/feature/vigil-candle

build.gradle

@@ -108,11 +108,13 @@ dependencies {
     implementation(fg.deobf("maven.modrinth:shield-expansion:${shieldexpansion_version}"))
     implementation(fg.deobf("maven.modrinth:create:${create_version}"))
     implementation(fg.deobf("maven.modrinth:supplementaries:${supplementaries_version}"))
+    implementation(fg.deobf("maven.modrinth:amendments:${amendments_version}"))
+    implementation(fg.deobf("maven.modrinth:amendments:${amendments_version}"))
+    implementation(fg.deobf("maven.modrinth:moonlight:${moonlight_lib_version}"))
 
     // For dev testing
     runtimeOnly(fg.deobf("maven.modrinth:scannable:${scannable_version}"))
     runtimeOnly(fg.deobf("maven.modrinth:architectury-api:${architectury_version}"))
-    runtimeOnly(fg.deobf("maven.modrinth:moonlight:${moonlight_lib_version}"))
 
     /// Utilities for the development environment
     //runtimeOnly fg.deobf("curse.maven:jade-324717:${jade_version}")

gradle.properties

@@ -30,6 +30,7 @@ nethersdelight_version=MTDQhZd2
 shieldexpansion_version=8mpKmudC
 create_version=ZZW2y7nG
 supplementaries_version=eMF95dNK
+amendments_version=qE7sokDv
 scannable_version=2FlwUOgm
 architectury_version=tBWqtdBO
 moonlight_lib_version=sfzdPwZX

src/generated/resources/.cache/4d87f6c700406347abbc935fa7e5d5e893a595b5

@@ -1,16 +1,20 @@
-// 1.20.1	2024-10-14T09:21:58.7369898	oreganized Item Models
+// 1.20.1	2024-10-14T22:19:49.9810347	oreganized Item Models
 18fcb236eeab67fa16a0014d9af5ba7dd6f9e7c8 assets/oreganized/models/item/black_crystal_glass.json
 30bbb36792cb2d3f0a8a399f25238120cdf7e659 assets/oreganized/models/item/black_crystal_glass_pane.json
+e79054a9c107cbd9357eebf3aacbcd7c27955b9b assets/oreganized/models/item/black_vigil_candle.json
 8dcab59e8c34403761c4aec2c3357b7db80b3f0b assets/oreganized/models/item/blue_crystal_glass.json
 dfe6f545297f948beacae59685c3bc29a88b68d1 assets/oreganized/models/item/blue_crystal_glass_pane.json
+fce6f4a24293b0fe701a564eb127f4efb3145c35 assets/oreganized/models/item/blue_vigil_candle.json
 ca77522dcfcf982429256fd99ca0e9f2c195bd73 assets/oreganized/models/item/brown_crystal_glass.json
 cc365240dd7450add26aeaf5e0e689e985a4e5ad assets/oreganized/models/item/brown_crystal_glass_pane.json
+5ad09a7c21c27fa1710fd42e043558b61c872912 assets/oreganized/models/item/brown_vigil_candle.json
 87ae9e55b9b93036e2004b186696da47cbc5ca81 assets/oreganized/models/item/bush_hammer.json
 9cb46711c71fcec37eae98916aa50acbe76cf96d assets/oreganized/models/item/chiseled_glance.json
 0873e5720c3f7d81c4ef7e3f3d333e14a87e6757 assets/oreganized/models/item/crossbow_lead_bolt.json
 cda1abbd4abc8987ee1a6d4ec093a5824260b4e0 assets/oreganized/models/item/cut_lead.json
 1cad99f5b1d9bb26fafe94dd95e758217cb50a78 assets/oreganized/models/item/cyan_crystal_glass.json
 522ec2287a524fc138cb3ebd01e3f4c70c43147e assets/oreganized/models/item/cyan_crystal_glass_pane.json
+65b5b45fe7dfb09f778546c71a6a3ab35b527035 assets/oreganized/models/item/cyan_vigil_candle.json
 20ea18a10ccc6f0cef2ba654ea3358628de49679 assets/oreganized/models/item/deepslate_lead_ore.json
 f4054bc225dbc8d64c33a9be97e3234c6b6aff70 assets/oreganized/models/item/deepslate_silver_ore.json
 90d7ee1955f7b0dafcb1cc8c6e7481f2e798f0b3 assets/oreganized/models/item/electrum_axe.json
@@ -82,8 +86,10 @@ bbe691c708914b9faf9bade0d70192b5fe4eaebb assets/oreganized/models/item/glance_st
 463bc369e8108315ae8dba8e714e23b22a2bf31b assets/oreganized/models/item/glance_wall.json
 9e5901b9c637724066adf0b0cf0a0ea7595643c2 assets/oreganized/models/item/gray_crystal_glass.json
 620d7f2b29b528e35dc4bd1ba7caf47fea81e005 assets/oreganized/models/item/gray_crystal_glass_pane.json
+6ad0573d3697f9df112a83970807eb1daed52db8 assets/oreganized/models/item/gray_vigil_candle.json
 be766846cf1dac197488418054a28488724b45db assets/oreganized/models/item/green_crystal_glass.json
 0d2774c3473576f2f0e28ec4eaf9c9adaeca3e00 assets/oreganized/models/item/green_crystal_glass_pane.json
+da3f4f274a50f655f5e80f10354a247a4930c644 assets/oreganized/models/item/green_vigil_candle.json
 980a1d284d8ad09fb8a3cd3f6de11a5150e48a60 assets/oreganized/models/item/grooved_blue_ice.json
 0a9bb963b90f719437cc2208e8a61ac1ea12d07d assets/oreganized/models/item/grooved_ice.json
 0253c31f06cd51dcace95b3f958e2fa2e98bc954 assets/oreganized/models/item/grooved_packed_ice.json
@@ -101,30 +107,38 @@ ddd9abce5fc944daa9bde4f9c7a2bb7ee8ed5c29 assets/oreganized/models/item/lead_ore.
 338eacf72084c98a75ac9a508e09c0a0fb4d98b5 assets/oreganized/models/item/lead_trapdoor.json
 5108e55f2ba54c678879dc75b16b2929716d9b39 assets/oreganized/models/item/light_blue_crystal_glass.json
 2dfe57627afd868c69ac0facf2f3e597b2622365 assets/oreganized/models/item/light_blue_crystal_glass_pane.json
+a4d9bd5d6b5c5d657204354938c5943cef9c0cc8 assets/oreganized/models/item/light_blue_vigil_candle.json
 4c62fede3aa446ab81dd7ec3a721a797ebf1f4d6 assets/oreganized/models/item/light_gray_crystal_glass.json
 e5cb92ebff46639ff0dafa4ddf23cf47c7477ad3 assets/oreganized/models/item/light_gray_crystal_glass_pane.json
+69055e8409b7e48392ea717cce67879018ad148e assets/oreganized/models/item/light_gray_vigil_candle.json
 6dd0cc69548dd92b4ff7415b60f3f655ec00b6fb assets/oreganized/models/item/lime_crystal_glass.json
 632ad6e9e36a3b06e53e546073f56426fa9e27a9 assets/oreganized/models/item/lime_crystal_glass_pane.json
+3717ab6b7eb4302afe00f044a154e273996911f4 assets/oreganized/models/item/lime_vigil_candle.json
 1f00a2ac13d144011fbf0b44f53f3dd4bb904959 assets/oreganized/models/item/magenta_crystal_glass.json
 4cbb48e036379c1a25aff26c097e960db03958b7 assets/oreganized/models/item/magenta_crystal_glass_pane.json
+7d968bf521ceede2d759246c248cb63dd81476ca assets/oreganized/models/item/magenta_vigil_candle.json
 ab4ff89f9d171d8a8310df55e33939984a25bef1 assets/oreganized/models/item/molten_lead_bucket.json
 2e85dce7d3ffc063559a1bb1eed2f47162c85435 assets/oreganized/models/item/music_disc_structure.json
 9ed1cb50f0ab91d42a700c9868717154a383c774 assets/oreganized/models/item/netherite_nugget.json
 e21f2c763df6c26d8cf26b0a8dc11ddc0ea7d271 assets/oreganized/models/item/orange_crystal_glass.json
 8199d736ede58957f7c69b9d0a0572e595644fab assets/oreganized/models/item/orange_crystal_glass_pane.json
+e14018c643a1e3941fb1dbb22eea8a37a97e1825 assets/oreganized/models/item/orange_vigil_candle.json
 ea37ea78afdd8a4fd3648d41b638718cbc02b836 assets/oreganized/models/item/pink_crystal_glass.json
 865b6f84533ef70a5be69753a83e761755b28383 assets/oreganized/models/item/pink_crystal_glass_pane.json
+c180bd7202c7d1f170131a09ce55231b1fcfcd34 assets/oreganized/models/item/pink_vigil_candle.json
 6464df28e19668c9967c89137664e9d59a99d028 assets/oreganized/models/item/polished_glance.json
 741c04007f9bcbe8c875bcd92fb87172521585c0 assets/oreganized/models/item/polished_glance_slab.json
 e0c5c128da027ed46ef1db33499714d71fa5c911 assets/oreganized/models/item/polished_glance_stairs.json
 cbbc97d973493c32674c1502299822e20e2b9dd9 assets/oreganized/models/item/purple_crystal_glass.json
 f7c411b709a3af883b55ceb15524a116468ee0b4 assets/oreganized/models/item/purple_crystal_glass_pane.json
+b7e86f5c2d080a57b173bb058c8d3300297d30b3 assets/oreganized/models/item/purple_vigil_candle.json
 70f7c5e87a33cccc0bc1baeec4aae548a1f63302 assets/oreganized/models/item/raw_lead.json
 7bd3f2bb76af55b81590b0840503472f5cb5b2c9 assets/oreganized/models/item/raw_lead_block.json
 3feb7012ce5279fcb92fcd9b2278c6c384110a8b assets/oreganized/models/item/raw_silver.json
 0eb2d49665d43c865870beb62e13499299fd7174 assets/oreganized/models/item/raw_silver_block.json
 848e82277b2a6223f4d24e6e8e53fd2769263be0 assets/oreganized/models/item/red_crystal_glass.json
 1cbba207d199088dd85850ea56d55d5976e15f3c assets/oreganized/models/item/red_crystal_glass_pane.json
+d7caf3f0da6c4c0b8f979e58178c609462b78d72 assets/oreganized/models/item/red_vigil_candle.json
 4c384b6c9ca85ea3aa0aca55eea89363d8355bd7 assets/oreganized/models/item/scribe.json
 2f15086e7865fc768aa268ec9b3797e818976165 assets/oreganized/models/item/shrapnel_bomb.json
 0a859cda7510d7756a43cfdf4bac94b2ed57ddb6 assets/oreganized/models/item/shrapnel_bomb_minecart.json
@@ -133,6 +147,7 @@ c644dd3b1845706977764c51e2bf8845fba82d07 assets/oreganized/models/item/silver_bl
 13ed84c2f215331446a11c803af482b22156e938 assets/oreganized/models/item/silver_nugget.json
 59197789f826ddb98e6b015bc21089a1e97612bc assets/oreganized/models/item/silver_ore.json
 41b68d92ddc0e6a5f8c1ed0f11ff43eaa4bdb30c assets/oreganized/models/item/spotted_glance.json
+3f914482c8238343f37ec6f597e1f0cce2ce989a assets/oreganized/models/item/vigil_candle.json
 848b3d02253bb84971088f90d231c7f7d229ed86 assets/oreganized/models/item/waxed_black_concrete_powder.json
 6abe6033090d16e14079f4b0082bddfb1906fb5c assets/oreganized/models/item/waxed_blue_concrete_powder.json
 acf39f6e32f8a16f200fe0ba4366d41e0a3d581d assets/oreganized/models/item/waxed_brown_concrete_powder.json
@@ -152,5 +167,7 @@ c21fa5382d5bf45ffba5327456e2c4d31e975161 assets/oreganized/models/item/waxed_pur
 83db5a91a81de586b19b015a1640cda847e2a31f assets/oreganized/models/item/waxed_yellow_concrete_powder.json
 b85f64f4ee27a765d5e7df6ddd0a8736a7ff60b5 assets/oreganized/models/item/white_crystal_glass.json
 1b016b020d70301e5c110b1374d4d435bf9f0cf6 assets/oreganized/models/item/white_crystal_glass_pane.json
+abe997091331ddd57e186a66fbd85faf4bd85ac3 assets/oreganized/models/item/white_vigil_candle.json
 97b2171d2047af3ffe2449255eabdecc2de5a958 assets/oreganized/models/item/yellow_crystal_glass.json
 628a959a06ec4a440e72a291b17312dd1cc54e4d assets/oreganized/models/item/yellow_crystal_glass_pane.json
+2a098c681660ff89b15207d48f8039fb716eacb7 assets/oreganized/models/item/yellow_vigil_candle.json

src/generated/resources/.cache/5bb646c3cee204f41a1b59a2c0d9083b5f7155b0

@@ -1,4 +1,4 @@
-// 1.20.1	2024-10-11T21:00:01.0565671	Oreganized Block Tags
+// 1.20.1	2024-10-17T22:46:04.3663948	Oreganized Block Tags
 7a2d68d81bc5ee59f9a2f4ba68ddb39bfd9c875d data/forge/tags/blocks/glass.json
 d96b4f83e03abe39a1b97d92b7818c8f6b2e5c68 data/forge/tags/blocks/glass_panes.json
 d062c23ad5308b7de0b2e86f6531ea724530f898 data/forge/tags/blocks/melts_lead.json
@@ -15,12 +15,13 @@ bb0420ecbadc747d984fcef0fe7fc67586bc3231 data/forge/tags/blocks/storage_blocks/l
 05f4708355ed88fe57116020dd93ac53f3098dba data/forge/tags/blocks/storage_blocks/raw_silver.json
 bff6697a058fddfe9e14615bc043fcb2071fd6fc data/forge/tags/blocks/storage_blocks/silver.json
 7a1e2c391ad442cdc57f69ce1737207bc52bfb84 data/minecraft/tags/blocks/beacon_base_blocks.json
+b85964d677734db0ac4bbc66f550f073ed0cb5e1 data/minecraft/tags/blocks/candles.json
 82c03c405a971b2a7fc3fd43a9fb6c221f463ce0 data/minecraft/tags/blocks/cauldrons.json
 503ad75af537d0ffef02ada9fb9afb5f5cd8e83b data/minecraft/tags/blocks/doors.json
 0f64e9b9dc279dd460f6408313b130a37a0c9d86 data/minecraft/tags/blocks/ice.json
 7a2d68d81bc5ee59f9a2f4ba68ddb39bfd9c875d data/minecraft/tags/blocks/impermeable.json
 f7079c32fc948b65cb486bea80e2dc93d13ce577 data/minecraft/tags/blocks/mineable/axe.json
-8794e7f7fcf41783b7738503b68f535efa58d511 data/minecraft/tags/blocks/mineable/pickaxe.json
+abb8283f25d49e1094364bfc91028dd0f3af9ad6 data/minecraft/tags/blocks/mineable/pickaxe.json
 84a13f81c79f0c05f8f7a8cbf1d3c25129a97179 data/minecraft/tags/blocks/mineable/shovel.json
 bb86ac7ab19373da790ec5711f473614e4b62d79 data/minecraft/tags/blocks/needs_iron_tool.json
 dc9cc2dca9fa3a28a0458ec282e3e0fe81999ee1 data/minecraft/tags/blocks/needs_stone_tool.json
@@ -38,3 +39,4 @@ eaca08d04b1742f418e6bc0964dd32cf16035d88 data/oreganized/tags/blocks/mineable/sc
 cf3608bd187922aeb48c566c19e8482b0dca34c7 data/oreganized/tags/blocks/prevents_lead_cloud.json
 06c2e2e512966767a31df77e646e41c4c39e3dd3 data/oreganized/tags/blocks/silktouch_using_scribe.json
 3112fb4a1df2953e2c3572fa47f886bf8e5bd679 data/oreganized/tags/blocks/stone_types/glance.json
+cead6b906640efcd90a6dbb5f5e17623f3631b53 data/oreganized/tags/blocks/vigil_candles.json