Merge remote-tracking branch 'remotes/origin/Multiloader-1.20' into Multiloader-1.19.4

fayer3 · fayer3 · commit cf8e38fc1d7f · 2024-10-21T14:24:56.000+02:00
diff --git a/common/src/main/java/org/vivecraft/client_vr/settings/VRSettings.java b/common/src/main/java/org/vivecraft/client_vr/settings/VRSettings.java
@@ -2167,6 +2167,7 @@ private ServerOverrides() {
             registerSetting(VrOptions.TELEPORT_HORIZ_LIMIT, "teleportLimitHoriz", () -> vrTeleportHorizLimit);
             registerSetting(VrOptions.WORLD_SCALE, "worldScale", () -> worldScale);
             registerSetting(VrOptions.THIRDPERSON_ITEMTRANSFORMS, "thirdPersonItems", () -> thirdPersonItems);
+            registerSetting(VrOptions.THIRDPERSON_ITEMTRANSFORMS_CUSTOM, "thirdPersonItemsCustom", () -> thirdPersonItemsCustom);
         }
 
         private void registerSetting(VrOptions option, String networkName, Supplier<Object> originalValue) {

Original file line number	Diff line number	Diff line change
`@@ -2167,6 +2167,7 @@ private ServerOverrides() {`
`2167`	`2167`	`registerSetting(VrOptions.TELEPORT_HORIZ_LIMIT, "teleportLimitHoriz", () -> vrTeleportHorizLimit);`
`2168`	`2168`	`registerSetting(VrOptions.WORLD_SCALE, "worldScale", () -> worldScale);`
`2169`	`2169`	`registerSetting(VrOptions.THIRDPERSON_ITEMTRANSFORMS, "thirdPersonItems", () -> thirdPersonItems);`
	`2170`	`+ registerSetting(VrOptions.THIRDPERSON_ITEMTRANSFORMS_CUSTOM, "thirdPersonItemsCustom", () -> thirdPersonItemsCustom);`
`2170`	`2171`	`}`
`2171`	`2172`
`2172`	`2173`	`private void registerSetting(VrOptions option, String networkName, Supplier<Object> originalValue) {`