Merge branch 'halloween' into tazer-halloween

Author: PssbleTrngle

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

@@ -1,5 +1,5 @@
 # Project
-version=3.1.0
+version=3.2.0
 group=galena
 mod_name=Oreganized
 mod_author=Xaidee as part of Team Galena
@@ -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/002701d48eee4c36b62b24b011e74b0624793d05

@@ -0,0 +1,43 @@
+// 1.20.1	2024-10-25T13:00:50.065928	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
+4e9173550595ca2ada5744dc749553e93b05954f data/forge/tags/blocks/ores.json
+dc9cc2dca9fa3a28a0458ec282e3e0fe81999ee1 data/forge/tags/blocks/ores/lead.json
+bb86ac7ab19373da790ec5711f473614e4b62d79 data/forge/tags/blocks/ores/silver.json
+084242f542331c46b8889564325f204f7b8bb6a4 data/forge/tags/blocks/ores_in_ground/deepslate.json
+ec067464a41bb65b72566d6a4e4ffccb80261bf7 data/forge/tags/blocks/ores_in_ground/stone.json
+4e9173550595ca2ada5744dc749553e93b05954f data/forge/tags/blocks/ore_rates/singular.json
+367d69870d9a11ff9049e8f3ba71b3cb7396eee3 data/forge/tags/blocks/storage_blocks.json
+7a1e2c391ad442cdc57f69ce1737207bc52bfb84 data/forge/tags/blocks/storage_blocks/electrum.json
+bb0420ecbadc747d984fcef0fe7fc67586bc3231 data/forge/tags/blocks/storage_blocks/lead.json
+4fb94c8b6f6641d27d70e8ff338e81cee30a321c data/forge/tags/blocks/storage_blocks/raw_lead.json
+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
+c67b7a8b928eab9314c1bf55632789b63a0c62f0 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
+e9873026bc587ab0729bda85f9d2a6ca7790d410 data/minecraft/tags/blocks/slabs.json
+8dcd7041424abab98a418b19eadece10284b87f0 data/minecraft/tags/blocks/snow_layer_cannot_survive_on.json
+e231a716e19756d6a2326e873062dab206b37184 data/minecraft/tags/blocks/stairs.json
+0071c009a80f1ab7661b261dcf94799070b8cbea data/minecraft/tags/blocks/trapdoors.json
+a4acb3623320f801e89e3451f8b7d9e2246f99d0 data/minecraft/tags/blocks/walls.json
+143a34cb0f03223147aa614479cc4fcf4c38ca14 data/oreganized/tags/blocks/blows_lead_cloud.json
+81fb1b18afaa14ae90800b23c32de565d1389bb3 data/oreganized/tags/blocks/crystal_glass.json
+f1dfddab1e3f2dec1e7ed1c3fbf9f6a7f261cf08 data/oreganized/tags/blocks/crystal_glass_panes.json
+6b73bb0ce38222c428d54ee64e82ffa1d96c64d7 data/oreganized/tags/blocks/fire_source.json
+b8aa17690b27ed9cdef06ded577fc79991acf1c4 data/oreganized/tags/blocks/heat_source.json
+eaca08d04b1742f418e6bc0964dd32cf16035d88 data/oreganized/tags/blocks/mineable/scribe.json
+0f64e9b9dc279dd460f6408313b130a37a0c9d86 data/oreganized/tags/blocks/no_silktouch_using_scribe.json
+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
+de4e070ae6815e75f0e299d75ad3557f7660820f data/oreganized/tags/blocks/vigil_candles.json

src/generated/resources/.cache/4d87f6c700406347abbc935fa7e5d5e893a595b5

@@ -0,0 +1,2 @@
+// 1.20.1	2024-10-24T14:51:12.3697524	Sound Definitions
+f0ce8a86a30c0f36dd7616ac727c2eea030ff058 assets/oreganized/sounds.json