mirror/blockbench
2
0
Fork 0
mirror of https://github.com/JannisX11/blockbench.git synced 2025-02-17 16:20:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into next

Browse Source
This commit is contained in:
JannisX11 2023-07-06 19:34:27 +02:00
commit 1ca6b4899e
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
js/io/formats/skin.js
View File

@ -256,7 +256,7 @@ const skin_dialog = new Dialog({
},
variant: {
label: 'dialog.skin.variant',
type: 'select',
type: 'inline_select',
default: 'java_edition',
options: {
java_edition: 'Java Edition',
@ -498,7 +498,7 @@ Interface.definePanels(function() {
})
skin_presets.steve = {
display_name: 'Steve',
display_name: 'Player - Default',
pose: true,
model: `{
"name": "steve",
@ -572,7 +572,7 @@ skin_presets.steve = {
}`
};
skin_presets.alex = {
display_name: 'Alex',
display_name: 'Player - Slim',
pose: true,
model_java: `{
"name": "alex",

4
js/texturing/painter.js
View File

@ -864,6 +864,10 @@ const Painter = {
})
}
}
targets.forEach(target => {
target.x = Math.roundTo(target.x, 8);
target.y = Math.roundTo(target.y, 8);
})
return targets.filter(target => !!target);
},
drawBrushLine(texture, end_x, end_y, event, new_face, uv) {