GitLab

library, changed a bunch of css, and took the picker out of the button.

Conflicts:
	blockly/blocks/procedures.js
	blockscad/blockscad.js

merge for release

and restored the tiny thumbnail pic so we are saving THREE copies of the
images for blockscad.

internationalized the messages yet.
Also fixed a typing bug with functions.

strip.

bowst.  Thumbnails are now 450x450.  Crazy!  I should store a smaller
version for sending to the list view.

Conflicts:
	blockly/blockly_compressed.js
	blockly/blocks_compressed.js
	blockly/core/workspace_svg.js
	blockly/msg/js/ar.js
	blockly/msg/js/az.js
	blockly/msg/js/bcc.js
	blockly/msg/js/be-tarask.js
	blockly/msg/js/bg.js
	blockly/msg/js/br.js
	blockly/msg/js/ca.js
	blockly/msg/js/cs.js
	blockly/msg/js/da.js
	blockly/msg/js/el.js
	blockly/msg/js/es.js
	blockly/msg/js/fa.js
	blockly/msg/js/fi.js
	blockly/msg/js/he.js
	blockly/msg/js/hi.js
	blockly/msg/js/hrx.js
	blockly/msg/js/hu.js
	blockly/msg/js/ia.js
	blockly/msg/js/id.js
	blockly/msg/js/is.js
	blockly/msg/js/it.js
	blockly/msg/js/ja.js
	blockly/msg/js/ko.js
	blockly/msg/js/lb.js
	blockly/msg/js/lrc.js
	blockly/msg/js/lt.js
	blockly/msg/js/mk.js
	blockly/msg/js/ms.js
	blockly/msg/js/nb.js
	blockly/msg/js/nl.js
	blockly/msg/js/oc.js
	blockly/msg/js/pl.js
	blockly/msg/js/pms.js
	blockly/msg/js/pt-br.js
	blockly/msg/js/pt.js
	blockly/msg/js/ro.js
	blockly/msg/js/ru.js
	blockly/msg/js/sc.js
	blockly/msg/js/sk.js
	blockly/msg/js/sq.js
	blockly/msg/js/sr.js
	blockly/msg/js/sv.js
	blockly/msg/js/th.js
	blockly/msg/js/tl.js
	blockly/msg/js/tlh.js
	blockly/msg/js/tr.js
	blockly/msg/js/uk.js
	blockly/msg/js/vi.js
	blockly/msg/js/zh-hans.js
	blockly/msg/js/zh-hant.js
	blockscad/blockscad.js

first stage of merge.  Not working.  ???

Conflicts:
	blockscad/blockscad.js
	blockscad/bsPage.js
	blockscad/style.css

merge in Tristan's camera button/screencap code.

bar to the render window.  I want to make it not overlap Blockly - I'll
ask Sol and Adam and Aaron what they think.

immediately if locking is off, added the rest of the shadow blocks to fill
in all default values, even where it is kind of stupid because you'd only
want a varible.  Can I have a shadow variable?  Unknown.  Probably better
off not since you'd need a shadow variable def.

module/function/variable typing seem to mostly work, shadow blocks are
added, imported stls are put in a reasonable place on the workspace,
connections work, all seems to be well.  This needs more testing, but it
is getting close.

typing system, only to discover that now block drawing is COMPLETELY
borked.  Oops.  this commit is just to capture the incremental change.

blockscad functionality, including the new undo (yay!), connections are
working, etc.  Typing with procuderes and variables is not quite there.
Incremental commit.

is a sanity checkin before trying to fix block connections.  BROKEN, DO
NOT USE!

use this.  It is very broken (WIP).  Checking in before I try to start
fixing stuff.

change that in master branch, but it confuses people pulling the code - I
should change it in dev branch).

saving (well, that was a new issue) and the docs link shouldn't have a
leading slash.

easily built during the release process.

Made a button in BlocksCAD.js for capturing the curent project view in the render window.
Placed the button next to the axes toggle button.
Uses a custom camera.png image for button. (could be resized to keep orrigional aspect ratio)
Tested, seems to work fine.
- Tristen P

Conflicts:
	blockly/core/xml.js
	blockscad/blockscad.js

fixed merge conflicts

Completed German translations