Merge branch '1.18' into 1.19

# Conflicts: # gradle.properties
sisby-folk · Sep 9, 2022 · a0d449a · a0d449a
2 parents 149ab80 + fd770a4
commit a0d449a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/gradle.properties b/gradle.properties
@@ -3,7 +3,7 @@ org.gradle.jvmargs = -Xmx1G
 org.gradle.parallel = true
 
 # Mod Properties
-version = 1.3.1+1.19
+version = 1.3.2+1.19
 maven_group = folk.sisby
 archives_base_name = switchy
 

diff --git a/src/main/java/folk/sisby/switchy/modules/PehkuiCompat.java b/src/main/java/folk/sisby/switchy/modules/PehkuiCompat.java
@@ -22,6 +22,7 @@ public class PehkuiCompat implements PresetModule {
 	@Override
 	public void updateFromPlayer(PlayerEntity player) {
 		this.scaleHeight = ScaleTypes.HEIGHT.getScaleData(player).getTargetScale();
+		this.scaleWidth = ScaleTypes.WIDTH.getScaleData(player).getTargetScale();
 	}
 
 	@Override

diff --git a/src/main/resources/quilt.mod.json b/src/main/resources/quilt.mod.json
@@ -63,6 +63,11 @@
 				"id": "arcpocalypse",
 				"versions": ">=1.0.0",
 				"optional": true
+			},
+			{
+				"id": "pehkui",
+				"versions": ">=3.4.2",
+				"optional": true
 			}
 		]
 	},