Merge branch 'master' into gh-pages

JannisX11 · Jun 14, 2024 · d59b8be · d59b8be
2 parents 703ea67 + ae59908
commit d59b8be
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 10 deletions.
diff --git a/js/interface/settings.js b/js/interface/settings.js
@@ -465,10 +465,6 @@ const Settings = {
 		}});
 		new Setting('stretch_linked',		{category: 'edit', value: true});
 		new Setting('auto_keyframe',		{category: 'edit', value: true});
-		new Setting('bedrock_uv_rotations',	{category: 'edit', value: false, name: 'Bedrock UV Rotations (Experimental)', description: 'Enable the experimental bedrock UV rotations feature.', onChange(value) {
-			Formats.bedrock.uv_rotation = value;
-			Formats.bedrock_block.uv_rotation = value;
-		}});
 
 		//Grid
 		new Setting('grids',				{category: 'grid', value: true, onChange() {Canvas.buildGrid()}});
@@ -582,10 +578,6 @@ const Settings = {
 			settings.brush_opacity_modifier.set('none');
 			settings.brush_size_modifier.set('none');
 		})
-		let date = new Date();
-		if (date.getMonth() >= 5 && date.getDate() >= 13) {
-			settings.bedrock_uv_rotations.set(true);
-		}
 	},
 	setupProfiles() {
 		if (localStorage.getItem('settings_profiles') != null) {

diff --git a/js/io/formats/bedrock.js b/js/io/formats/bedrock.js
@@ -1312,7 +1312,7 @@ var entity_format = new ModelFormat({
 	rotate_cubes: true,
 	box_uv: true,
 	optional_box_uv: true,
-	uv_rotation: settings.bedrock_uv_rotations.value,
+	uv_rotation: true,
 	single_texture: true,
 	bone_rig: true,
 	centered_grid: true,
@@ -1351,7 +1351,7 @@ var block_format = new ModelFormat({
 	rotate_cubes: true,
 	box_uv: false,
 	optional_box_uv: true,
-	uv_rotation: settings.bedrock_uv_rotations.value,
+	uv_rotation: true,
 	single_texture_default: true,
 	bone_rig: true,
 	centered_grid: true,