Merge branch 'master' into next

This commit is contained in:
JannisX11 2021-07-24 22:57:11 +02:00
commit 018c2d321a
9 changed files with 35 additions and 19 deletions

View File

@ -1,11 +0,0 @@
[!] Before you report an issue, check if if has already been reported. Also check if you are using the latest version of Blockbench.
[!] Prefix the title of your issue with [Issue] or [Suggestion]
[!] If you are having an issue, please press "Ctrl + Shift + i" and click on console. If there are any (red) error messages, please attach a screenshot of the console to your issue.
For issues, please provide the following informations:
- Detailed description of your issue
- Model format in which the issue occurs
For issues that are related to installation, opening/closing, import/export or other platform specific actions, please provide these informations:
- Blockbench variant (Webapp/Desktop)
- Operating System

5
.github/ISSUE_TEMPLATE/config.yml vendored Normal file
View File

@ -0,0 +1,5 @@
blank_issues_enabled: false
contact_links:
- name: Modeling Help / Support
url: http://discord.blockbench.net
about: If you need help with modeling or implementing models into your project, please ask on the Discord server instead of opening an issue.

15
.github/ISSUE_TEMPLATE/issue.md vendored Normal file
View File

@ -0,0 +1,15 @@
---
name: Bug / Issue
about: Use this template to report an issue that occurs when using Blockbench
title: "[Issue] Issue summary"
---
- Before you report an issue, check if if has already been reported.
- Also check if you are using the latest version of Blockbench.
- If applicable, go to Help > Developer > Open Dev Tools. Switch to the Console tab. If there are any (red) error messages, please attach a screenshot of them.
Please make sure to provide the following information:
- Detailed description of your issue
- Model format in which the issue occurs
- Blockbench variant (Website / PWA / Program)
- Operating System

8
.github/ISSUE_TEMPLATE/suggestion.md vendored Normal file
View File

@ -0,0 +1,8 @@
---
name: Suggestion
about: Use this template to suggest features or improvements for Blockbench
title: "[Suggestion] Suggestion summary"
---
- Please provide a detailed description of your suggestion.
- Before submissing a suggestion, please check if it has already been suggested.

View File

@ -28,7 +28,7 @@
const appVersion = '3.9.2'; const appVersion = '3.9.2';
window.onerror = (message, file, line) => { window.onerror = (message, file, line) => {
if (window.Blockbench && window.Blockbench.setup_successful) return; if (typeof Blockbench != 'undefined' && Blockbench.setup_successful) return;
let error_element = document.querySelector('#loading_error_detail'); let error_element = document.querySelector('#loading_error_detail');
if (error_element && !error_element.innerText) { if (error_element && !error_element.innerText) {

View File

@ -1593,7 +1593,7 @@ const BARS = {
new Action('toggle_sidebars', { new Action('toggle_sidebars', {
icon: 'view_array', icon: 'view_array',
category: 'view', category: 'view',
condition: () => !Blockbench.isMobile && !Mode.selected.hide_sidebars, condition: () => !Blockbench.isMobile && Mode.selected && !Mode.selected.hide_sidebars,
keybind: new Keybind({key: 'b', ctrl: true}), keybind: new Keybind({key: 'b', ctrl: true}),
click: function () { click: function () {
let status = !Prop.show_left_bar; let status = !Prop.show_left_bar;

View File

@ -1,6 +1,5 @@
var onUninstall, onInstall; var onUninstall, onInstall;
const Plugins = { const Plugins = {
apipath: 'https://raw.githubusercontent.com/JannisX11/blockbench-plugins/master/plugins.json',
Vue: [], //Vue Object Vue: [], //Vue Object
installed: [], //Simple List of Names installed: [], //Simple List of Names
json: undefined, //Json from website json: undefined, //Json from website
@ -112,7 +111,7 @@ class Plugin {
} }
return await new Promise((resolve, reject) => { return await new Promise((resolve, reject) => {
var file = originalFs.createWriteStream(Plugins.path+this.id+'.js') var file = originalFs.createWriteStream(Plugins.path+this.id+'.js')
https.get('https://raw.githubusercontent.com/JannisX11/blockbench-plugins/master/plugins/'+this.id+'.js', function(response) { https.get('https://cdn.jsdelivr.net/gh/JannisX11/blockbench-plugins/plugins/'+this.id+'.js', function(response) {
response.pipe(file); response.pipe(file);
response.on('end', function() { response.on('end', function() {
setTimeout(async function() { setTimeout(async function() {
@ -367,7 +366,7 @@ if (isApp) {
} }
Plugins.loading_promise = new Promise((resolve, reject) => { Plugins.loading_promise = new Promise((resolve, reject) => {
$.getJSON(Plugins.apipath, function(data) { $.getJSON('https://cdn.jsdelivr.net/gh/JannisX11/blockbench-plugins/plugins.json', function(data) {
Plugins.json = data Plugins.json = data
resolve(); resolve();
Plugins.loading_promise.resolved = true; Plugins.loading_promise.resolved = true;

View File

@ -93,7 +93,7 @@ const Canvas = {
}` }`
var fragShader = ` var fragShader = `
#ifdef GL_ES #ifdef GL_ES
precision highp float; precision ${isApp ? 'highp' : 'mediump'} float;
#endif #endif
uniform bool SHADE; uniform bool SHADE;
@ -666,7 +666,7 @@ const Canvas = {
}` }`
var fragShader = ` var fragShader = `
#ifdef GL_ES #ifdef GL_ES
precision highp float; precision ${isApp ? 'highp' : 'mediump'} float;
#endif #endif
uniform sampler2D t0; uniform sampler2D t0;

View File

@ -95,7 +95,7 @@ class Texture {
}` }`
var fragShader = ` var fragShader = `
#ifdef GL_ES #ifdef GL_ES
precision highp float; precision ${isApp ? 'highp' : 'mediump'} float;
#endif #endif
uniform sampler2D map; uniform sampler2D map;