From 9a3bdbcec76a89cfd42102e66ae56cba08b9750c Mon Sep 17 00:00:00 2001
From: JannisX11 <jannis4236@gmail.com>
Date: Sat, 31 Jul 2021 15:54:50 +0200
Subject: [PATCH] Update version to 4.0.0 beta Improve support for beta version
 codes

---
 index.html                |  2 +-
 js/animations/keyframe.js |  1 +
 js/util.js                | 14 +++++++++-----
 package.json              |  2 +-
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/index.html b/index.html
index 98e3a00..f2f4c2f 100644
--- a/index.html
+++ b/index.html
@@ -25,7 +25,7 @@
 	<script>
 		if (typeof module === 'object') {window.module = module; module = undefined;}//jQuery Fix
 		const isApp = typeof require !== 'undefined';
-		const appVersion = '3.9.2';
+		const appVersion = '4.0.0-beta.0';
 
 		window.onerror = (message, file, line) => {
 			if (typeof Blockbench != 'undefined' && Blockbench.setup_successful) return;
diff --git a/js/animations/keyframe.js b/js/animations/keyframe.js
index 2a8e7ea..19552bc 100644
--- a/js/animations/keyframe.js
+++ b/js/animations/keyframe.js
@@ -412,6 +412,7 @@ class Keyframe {
 	])
 	new Property(Keyframe, 'number', 'time')
 	new Property(Keyframe, 'number', 'color', {default: -1})
+	new Property(Keyframe, 'boolean', 'uniform', {condition: keyframe => keyframe.channel == 'scale', default: true})
 	new Property(Keyframe, 'string', 'interpolation', {default: 'linear'})
 	Keyframe.selected = [];
 	Keyframe.interpolation = {
diff --git a/js/util.js b/js/util.js
index e146a3f..4fde937 100644
--- a/js/util.js
+++ b/js/util.js
@@ -1,14 +1,18 @@
 //Blockbench
 function compareVersions(string1/*new*/, string2/*old*/) {
 	// Is string1 newer than string2 ?
-	var arr1 = string1.split('.')
-	var arr2 = string2.split('.')
+	var arr1 = string1.split(/[.-]/);
+	var arr2 = string2.split(/[.-]/);
 	var i = 0;
 	var num1 = 0;
 	var num2 = 0;
-	while (i < arr1.length) {
-		num1 = parseInt(arr1[i])
-		num2 = parseInt(arr2[i])
+	while (i < Math.max(arr1.length, arr2.length)) {
+		num1 = arr1[i];
+		num2 = arr2[i];
+		if (num1 == 'beta') num1 = -1;
+		if (num2 == 'beta') num2 = -1;
+		num1 = parseInt(num1) || 0;
+		num2 = parseInt(num2) || 0;
 		if (num1 > num2) {
 			return true;
 		} else if (num1 < num2) {
diff --git a/package.json b/package.json
index 3d1e6d2..4cf447c 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "Blockbench",
 	"description": "Model editing and animation software",
-	"version": "3.9.2",
+	"version": "4.0.0-beta.0",
 	"license": "GPL-3.0-or-later",
 	"author": {
 		"name": "JannisX11",