Merge in 9 months of work on capper branch #71

Merged
mattmcw merged 95 commits from capper into main 2023-02-19 05:28:46 +00:00
5 changed files with 19 additions and 19 deletions
Showing only changes of commit 3ec1373f08 - Show all commits

View File

@ -1,5 +1,5 @@
{ {
"version": "1.7.0", "version": "1.7.1",
"ext_port": 1111, "ext_port": 1111,
"profiles": { "profiles": {
"mcopy": { "mcopy": {

View File

@ -679,7 +679,7 @@ class Mscript {
this.cam -= val; this.cam -= val;
} }
else { else {
this.loops[this.rec].cam--; this.loops[this.rec].cam -= val;
} }
} }
else if (cmd === 'PF') { else if (cmd === 'PF') {
@ -695,7 +695,7 @@ class Mscript {
this.proj -= val; this.proj -= val;
} }
else { else {
this.loops[this.rec].proj--; this.loops[this.rec].proj -= val;
} }
} }
else if (cmd === 'BF') { else if (cmd === 'BF') {

File diff suppressed because one or more lines are too long

View File

@ -1,5 +1,5 @@
{ {
"version": "1.7.0", "version": "1.7.1",
"ext_port": 1111, "ext_port": 1111,
"profiles": { "profiles": {
"mcopy": { "mcopy": {

View File

@ -700,7 +700,7 @@ class Mscript {
if (this.rec === -1) { if (this.rec === -1) {
this.cam -= val; this.cam -= val;
} else { } else {
this.loops[this.rec].cam--; this.loops[this.rec].cam -= val;
} }
} else if (cmd === 'PF') { } else if (cmd === 'PF') {
if (this.rec === -1) { if (this.rec === -1) {
@ -712,7 +712,7 @@ class Mscript {
if (this.rec === -1) { if (this.rec === -1) {
this.proj -= val; this.proj -= val;
} else { } else {
this.loops[this.rec].proj--; this.loops[this.rec].proj -= val;
} }
} else if (cmd === 'BF') { } else if (cmd === 'BF') {
if (this.rec === -1) { if (this.rec === -1) {