Merge branch 'refs/heads/architectury-1.17.1' into architectury-1.16.5

# Conflicts: # gradle.properties
UnlikePaladin · Oct 7, 2024 · 25e8b88 · 25e8b88
2 parents abff368 + e9da0c7
commit 25e8b88
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/common/src/main/resources/assets/pfm/blockstates/kitchen_stovetop.json b/common/src/main/resources/assets/pfm/blockstates/kitchen_stovetop.json
@@ -1,9 +1,9 @@
 {"variants":
 {
-    "facing=north":{"model":"pfm:block/kitchen_counter/kitchen_stovetop","y":180,"uvlock":"true"},
-    "facing=east":{"model":"pfm:block/kitchen_counter/kitchen_stovetop","y":270,"uvlock":"true"},
-    "facing=south":{"model":"pfm:block/kitchen_counter/kitchen_stovetop","y":0,"uvlock":"true"},
-    "facing=west":{"model":"pfm:block/kitchen_counter/kitchen_stovetop","y":90,"uvlock":"true"}
+    "facing=north":{"model":"pfm:block/kitchen_counter/kitchen_stovetop","y":180,"uvlock":"false"},
+    "facing=east":{"model":"pfm:block/kitchen_counter/kitchen_stovetop","y":270,"uvlock":"false"},
+    "facing=south":{"model":"pfm:block/kitchen_counter/kitchen_stovetop","y":0,"uvlock":"false"},
+    "facing=west":{"model":"pfm:block/kitchen_counter/kitchen_stovetop","y":90,"uvlock":"false"}
 
 }
 

diff --git a/common/src/main/resources/assets/pfm/models/block/kitchen_counter/kitchen_stovetop.json b/common/src/main/resources/assets/pfm/models/block/kitchen_counter/kitchen_stovetop.json
@@ -2,6 +2,7 @@
 	"credit": "By UnlikePaladin",
 	"texture_size": [64, 64],
 	"textures": {
+		"particle": "pfm:block/iron_stove",
 		"6": "pfm:block/iron_stove"
 	},
 	"elements": [

diff --git a/gradle.properties b/gradle.properties
@@ -23,7 +23,6 @@ sandwichable_version=1.2+1.16
 sandwichable_compatibility=false
 rei_compatibility=false
 patchouli_compatibility=true
-arrp_compatibility=true
 modmenu_version=1.16.23
 jei_version=7.7.1.152
 patchouli_version_forge=1.16.4-53