Merge branch 'master' into 2020-04-28-tool-component

Browse Source

...

This commit is contained in:

zumorica

2020-05-11 12:24:43 +02:00

parent 2c4354c95a 63b0df5ba2

commit 6ae5e36a18

114 changed files with 3532 additions and 531 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

Resources/Textures/Objects/Tools/autolathe_welder.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 330 B