v2.6.7

index.html

@@ -20,7 +20,7 @@
 	<script>
 		if (typeof module === 'object') {window.module = module; module = undefined;}//jQuery Fix
 		const isApp = typeof require !== 'undefined';
-		const appVersion = '2.6.6';
+		const appVersion = '2.6.7';
 	</script>
 		<script src="lib/vue.min.js"></script>
 		<script src="lib/vue_sortable.js"></script>

index.php

@@ -20,7 +20,7 @@
 	<script>
 		if (typeof module === 'object') {window.module = module; module = undefined;}//jQuery Fix
 		const isApp = typeof require !== 'undefined';
-		const appVersion = '2.6.6';
+		const appVersion = '2.6.7';
 	</script>
 		<script src="lib/vue.min.js"></script>
 		<script src="lib/vue_sortable.js"></script>

js/TransformControls.js

@@ -1082,6 +1082,9 @@
 				if (value !== previousValue && Animator.selected && Animator.selected.getBoneAnimator()) {
 					beforeFirstChange(event)
 					var difference = value - (previousValue||0)
+					if (axis == 'x' && Toolbox.selected.id === 'move_tool') {
+						difference *= -1
+					}
 
 					scope.keyframe.offset(axis, difference);
 					scope.keyframe.select()

js/animations.js

@@ -111,7 +111,7 @@ class Animation {
 		var scope = this;
 		Blockbench.textPrompt('message.animation_update_var', this.anim_time_update, function(name) {
 			if (name && name !== scope.anim_time_update) {
-				Undo.initEdit({animations: [this]})
+				Undo.initEdit({animations: [scope]})
 				scope.anim_time_update = name
 				Undo.finishEdit('change animation variable')
 			}
@@ -301,7 +301,9 @@ class BoneAnimator {
 		var bone = this.group.mesh
 		bone.position.copy(bone.fix_position)
 		if (arr) {
-			bone.position.add(new THREE.Vector3().fromArray(arr))
+			var offset = new THREE.Vector3().fromArray(arr);
+			offset.x *= -1;
+			bone.position.add(offset)
 		}
 		return this;
 	}
@@ -648,11 +650,8 @@ class Keyframe {
 			channel: this.channel_index,
 			time: this.time,
 			x: this.x,
-			//uuid: this.uuid
-		}
-		if (this.channel_index !== 2) {//Not Scale
-			copy.y = this.y
-			copy.z = this.z
+			y: this.y,
+			z: this.z,
 		}
 		if (this.channel_index === 0 && this.isQuaternion) {
 			copy.w = this.w
@@ -881,7 +880,7 @@ const Animator = {
 			var ani_tag = animations[a.name] = {}
 			if (a.loop) ani_tag.loop = true
 			if (a.length) ani_tag.animation_length = a.length
-			if (a.override) ani_tag.override = true
+			if (a.override) ani_tag.override_previous_animation = true
 			if (a.anim_time_update) ani_tag.anim_time_update = a.anim_time_update
 			ani_tag.bones = {}
 			for (var uuid in a.bones) {

js/app.js

@@ -21,7 +21,10 @@ $(document).ready(function() {
 		shell.openExternal(event.target.href);
 		return true;
 	});
-	Prop.zoom = 100 + currentwindow.webContents._getZoomLevel()*12
+	try {
+		Prop.zoom = 100 + currentwindow.webContents.getZoomLevel()*12
+	} catch (err) {}
+
 	if (fs.existsSync(app.getPath('userData')+osfs+'backups') === false) {
 		fs.mkdirSync( app.getPath('userData')+osfs+'backups')
 	}
@@ -393,13 +396,20 @@ function findBedrockAnimation() {
 function saveFile(props) {
 	if (Prop.file_path) {
 		var extension = pathToExtension(Prop.file_path)
-		if (Blockbench.entity_mode === false) {
+		if (extension == 'json') {
+			if (Blockbench.entity_mode === false) {
+				Blockbench.writeFile(Prop.file_path, {
+					project_file: true,
+					content: buildBlockModel()
+				})
+			} else {
+				writeFileEntity(buildEntityModel({raw: true}), Prop.file_path)
+			}
+		} else if (extension == 'bbmodel') {
 			Blockbench.writeFile(Prop.file_path, {
 				project_file: true,
-				content: buildBlockModel()
+				content: buildBBModel()
 			})
-		} else {
-			writeFileEntity(buildEntityModel({raw: true}), Prop.file_path)
 		}
 	} else {
 		if (Blockbench.entity_mode === false) {

js/element.js

@@ -667,7 +667,7 @@ class Cube extends OutlinerElement {
 					this.faces.north.rotation = rotateUVFace(this.faces.north.rotation, 1)
 					this.faces.south.rotation= rotateUVFace(this.faces.south.rotation, 3)
 
-					this.faces.up.rotation= rotateUVFace(this.faces.up.rotation, 1)
+					this.faces.up.rotation= rotateUVFace(this.faces.up.rotation, 3)
 					this.faces.east.rotation= rotateUVFace(this.faces.east.rotation, 3)
 					this.faces.west.rotation = rotateUVFace(this.faces.west.rotation, 3)
 					this.faces.down.rotation = rotateUVFace(this.faces.down.rotation, 3)

js/language.js

@@ -28,7 +28,7 @@ const Language = {
 		de: 'Deutsch (German)',
 		es: 'Espa\u00F1ol (Spanish)',
 		fr: 'Fran\u00E7ais (French)',
-		//it: 'Italiano (Italian)',
+		it: 'Italiano (Italian)',
 		ja: '\u65E5\u672C\u8A9E (Japanese)',//日本語
 		nl: 'Nederlands (Dutch)',
 		pl: 'Polski (Polish)',

js/transform.js

@@ -363,6 +363,9 @@ function cancelScaleAll() {
 		obj.to = obj.before.to
 		obj.origin = obj.before.origin
 		delete obj.before
+		if (Blockbench.entity_mode) {
+			Canvas.updateUV(obj)
+		}
 	})
 	if (Blockbench.entity_mode && selected_group) {
 		selected_group.forEachChild((g) => {

js/uv.js

@@ -1274,14 +1274,16 @@ class UVEditor {
 	}
 	paste(event) {
 		this.select()
-		Undo.initEdit({cubes: selected, uv_only: true})
 		if (uv_dialog.clipboard === null || selected.length === 0) return;
+
+		Undo.initEdit({cubes: selected, uv_only: true})
 		if (Blockbench.entity_mode) {
 			selected.forEach(function(obj) {
 				obj.uv_offset = uv_dialog.clipboard[0].uv.slice()
 				Canvas.updateUV(obj)
 			})
 			this.loadData()
+			Undo.finishEdit('uv paste')
 			return;
 		}
 
@@ -1327,7 +1329,7 @@ class UVEditor {
 		this.loadData()
 		Canvas.updateSelectedFaces()
 		this.message('uv_editor.pasted')
-		Undo.finishEdit('uv_paste')
+		Undo.finishEdit('uv paste')
 	}
 	reset(event) {
 		var scope = this;

lang/de.json

@@ -82,7 +82,6 @@
     "message.default_textures.message": "Wähle den \"textures\" Ordner deines Ressourcenpakets",
     "message.default_textures.detail": "Extrahiere das Standard-Ressourcenpaket aus der Minecraft .jar oder lade es aus dem Internet herunder. Finde dann den \"textures\" Ordner und öffne diesen. Blockbench merkt sich diesen Ordner und greift in Zukunft darauf zurück, wenn es die Texturen nicht anderweitig finden kann.",
     "message.default_textures.select": "Ordner auswählen",
-    "message.default_textures.continue": "Fortfahren",
     "message.default_textures.remove": "Entfernen",
     "message.image_editor.title": "Wähle ein Bildbearbeitungsprogramm",
     "message.image_editor.file": "Datei auswählen...",

lang/es.json

@@ -82,7 +82,6 @@
     "message.default_textures.message": "Selecciona la carpeta \"textures\" del Resource Pack por defecto",
     "message.default_textures.detail": "Extrae el paquete de texturas por defecto del Minecraft jar o búscalo en Google y descárgalo. Después busca la carpeta \"textures\" y ábrela. Blockbench recordará esa localización y tratará de extraer las texturas desde ahí si no las puede encontrar en el paquete de texturas actual.",
     "message.default_textures.select": "Selecciona la carpeta \"textures\" por defecto",
-    "message.default_textures.continue": "Continuar",
     "message.default_textures.remove": "Borrar",
     "message.image_editor.title": "Selecciona un editor de imágenes",
     "message.image_editor.file": "Seleccionar archivo...",
@@ -818,7 +817,7 @@
     "action.open_backup_folder.desc": "Abre la carpeta de backups de Blockbench",
     "switches.mirror": "Invertir UV",
     "Name of the Language you are editing, NOT English": {
-        "language_name": "English"
+        "language_name": "Español"
     },
     "message.plugin_reload": "Recargados %0 plugins locales",
     "settings.brightness": "Brillo",
@@ -902,12 +901,12 @@
     "edit_session.status": "Estado",
     "edit_session.hosting": "Anfitrión",
     "edit_session.connected": "Conectado a una sesión",
-    "dialog.sketchfab_uploader.private": "Private (Pro)",
-    "dialog.sketchfab_uploader.password": "Password (Pro)",
-    "action.toggle_chat": "Toggle Chat",
-    "action.toggle_chat.desc": "Toggle the visibility of the chat history",
-    "action.uv_select_all": "Select All",
-    "action.uv_select_all.desc": "Select all faces in the UV dialog",
+    "dialog.sketchfab_uploader.private": "Privado (Pro)",
+    "dialog.sketchfab_uploader.password": "Contraseña (Pro)",
+    "action.toggle_chat": "Cambiar Chat",
+    "action.toggle_chat.desc": "Cambia la visibilidad del historial del chat",
+    "action.uv_select_all": "Seleccionar Todos",
+    "action.uv_select_all.desc": "Selecciona todas las caras en el diálogo del UV",
     "panel.chat": "Chat",
-    "edit_session.welcome": "Welcome to this session by %0"
+    "edit_session.welcome": "Bienvenido a esta sesión por %0"
 }