diff --git a/css/dialogs.css b/css/dialogs.css
index 42df20d5..cc3761c4 100644
--- a/css/dialogs.css
+++ b/css/dialogs.css
@@ -758,6 +758,10 @@
dialog#about .multi_column_list {
column-count: 3;
}
+ .special_thanks_mentions li {
+ line-height: 18px;
+ margin-bottom: 8px;
+ }
/*Specific Dialogs*/
.dialog#texture_edit p.multiline_text {
diff --git a/js/edit_sessions.js b/js/edit_sessions.js
index e6a75db3..7d6864df 100644
--- a/js/edit_sessions.js
+++ b/js/edit_sessions.js
@@ -210,7 +210,8 @@ class EditSession {
before: omitKeys(entry.before, ['aspects']),
post: omitKeys(entry.post, ['aspects']),
save_history: entry.save_history,
- action: entry.action
+ action: entry.action,
+ time: entry.time || Date.now()
}
this.sendAll('edit', JSON.stringify(new_entry))
}
diff --git a/js/interface/about.js b/js/interface/about.js
index f5d0fc37..a7693a94 100644
--- a/js/interface/about.js
+++ b/js/interface/about.js
@@ -75,13 +75,13 @@ BARS.defineActions(() => {
Created by Jannis Petersen
A free and open-source low-poly model editor. To make 3D art easy and accessible for everyone.
- For all who enjoy stylied 3D art. For game developers, students, content creators, and for the Minecraft community.
+ For all who enjoy stylized 3D art. For game developers, students, content creators, and for the Minecraft community.
SPECIAL THANKS TO
-
+
- Mojang Studios
- - The community moderators
- All contributors
+ - The community moderators
- All donators
- All translators
- Wacky
diff --git a/js/interface/start_screen.js b/js/interface/start_screen.js
index f392ea22..6283ac06 100644
--- a/js/interface/start_screen.js
+++ b/js/interface/start_screen.js
@@ -326,7 +326,7 @@ onVueSetup(function() {
}
// Quick Setup
- if (Blockbench.startup_count <= 1 || true) {
+ if (Blockbench.startup_count <= 1) {
let section = Interface.createElement('section', {id: 'quick_setup'});
$('#start_screen content').prepend(section);
diff --git a/js/io/formats/bbmodel.js b/js/io/formats/bbmodel.js
index f6803d00..512fd32b 100644
--- a/js/io/formats/bbmodel.js
+++ b/js/io/formats/bbmodel.js
@@ -185,7 +185,8 @@ var codec = new Codec('project', {
var e = {
before: omitKeys(h.before, ['aspects']),
post: omitKeys(h.post, ['aspects']),
- action: h.action
+ action: h.action,
+ time: h.time
}
model.history.push(e);
})
diff --git a/js/io/project.js b/js/io/project.js
index be569973..2e3b21e4 100644
--- a/js/io/project.js
+++ b/js/io/project.js
@@ -559,7 +559,17 @@ onVueSetup(() => {
this.thumbnail.remove();
delete this.thumbnail;
}
- if (e1.button == 1) return;
+ if (e1.button == 1) {
+ function off(e2) {
+ removeEventListeners(document, 'mouseup', off);
+ delete tab.middle_mouse_pressing;
+ console.log('delete')
+ }
+ tab.middle_mouse_pressing = true;
+ console.log('on')
+ addEventListeners(document, 'mouseup', off, {passive: false});
+ return;
+ }
let scope = this;
let active = false;
@@ -640,7 +650,8 @@ onVueSetup(() => {
}
},
mouseUp(tab, e1) {
- if (e1.button === 1) {
+ console.log(e1.button === 1, tab.middle_mouse_pressing)
+ if (e1.button === 1 && tab.middle_mouse_pressing) {
tab.close()
}
},