CreatBot/CreatBotMainsail
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
893 Commits 1 Branch 0 Tags
cb874c1918f47f79441bd80decaa272fe8bae40f
Commit Graph

893 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
winbin
76aec74e92 add translation 2021-03-15 16:55:31 +08:00
winbin
2ca5adecaa get language list 2021-03-15 16:40:52 +08:00
winbin
9a218c516e get language list 2021-03-15 16:33:32 +08:00
winbin
ef732ebc87 Merge branch 'master' of https://github.com/meteyou/mainsail into LanguageChange 
# Conflicts:
#	package.json
#	src/App.vue
#	src/components/ConnectingDialog.vue
#	src/components/SelectPrinterDialog.vue
#	src/components/panels/ControlPanel.vue
#	src/components/panels/ExtruderPanel.vue
#	src/components/panels/Settings/ConfigFilesPanel.vue
#	src/components/panels/Settings/ControlPanel.vue
#	src/components/panels/Settings/EndstopPanel.vue
#	src/components/panels/Settings/GeneralPanel.vue
#	src/components/panels/Settings/LimitsPanel.vue
#	src/components/panels/Settings/UpdatePanel.vue
#	src/components/panels/StatusPanel.vue
#	src/components/panels/ToolsPanel.vue
#	src/components/panels/WebcamPanel.vue
#	src/components/panels/ZOffsetPanel.vue
#	src/main.js
#	src/pages/Files.vue
#	src/store/gui/actions.js
#	src/store/gui/index.js
 2021-03-15 16:17:56 +08:00
Stefan Dej
b1e13bce28 change gcode files icon in navi 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-03-12 13:00:28 +01:00
Stefan Dej
9f7dc5effb bugfix: fix typo in connecting dialog 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-03-12 10:12:09 +01:00
Stefan Dej
58c0aa216d bugfix: fix margins in temperature datasets options dialog 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-03-12 00:37:33 +01:00
Stefan Dej
914a4baad7 bugfix: fix tempchart resize error after switching page 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-03-12 00:34:02 +01:00
Stefan Dej
3b86377b58 bugfix: fix updateManager enable_repo_debug doesn't work 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-03-11 23:24:56 +01:00
Stefan Dej
4e7f7310dd bugfix: fix updateManager commits dialog responsive mobile view 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-03-11 17:11:35 +01:00
Stefan Dej
40293a22d1 feature: add probe to endstop status panel 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-03-11 16:12:54 +01:00
Stefan Dej
bc458a11af bugfix: fix margin between panels in settings > interface 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-03-11 15:53:50 +01:00
Stefan Dej
68a957b43b bugfix: fix responsive view on mobile devices of presets editing dialog 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-03-11 15:31:30 +01:00
Stefan Dej
21056ff01a bugfix: fix max width of update dialog on mobile devices 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-03-11 14:58:11 +01:00
Stefan Dej
a940115e4e bugfix: fix migrate presets from .mainsail.json to moonraker db 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-03-11 14:54:02 +01:00
Stefan Dej
8ab94747eb change position of min/max in bed_mesh profile tooltip 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-03-11 14:35:16 +01:00
Stefan Dej
6ea4caf28d bugfix margin in SelectPrinterDialog 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-03-09 16:38:43 +01:00
Stefan Dej
cc20cf4128 update versionnumber 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-03-09 16:26:33 +01:00
Stefan Dej
27a3c17ec8 fix alternativ d-pad selector 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-03-09 16:19:02 +01:00
Stefan Dej
55ae82e4cf bugfix: check version and remote_version to be valid in update manager 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-03-09 16:18:09 +01:00
Stefan Dej
e864356f26 bugfix: only switch to relative mode when the printer is in absolute mode, when moving with the control buttons 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-03-09 15:09:25 +01:00
Stefan Dej
30875ffb5d update remote printers to moonraker DB 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-03-09 15:01:12 +01:00
Stefan Dej
a966c41561 bugfix: editing cooldown gcode 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-03-09 14:21:50 +01:00
Stefan Dej
9325e9d93a display invert z option only with alternative controls 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-03-09 14:07:12 +01:00
Stefan Dej
437f459b94 bugfix: disable dataset on hover 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-03-09 00:41:01 +01:00
Stefan Dej
0430eee826 cleanup debug outputs 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-03-09 00:00:45 +01:00
Stefan Dej
0825d85000 feature: add option to enable cancel_print button permanently 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-03-08 23:54:20 +01:00
Stefan Dej
42c353df20 bugfix: decrement / increment buttons in MiscellaneousSlider 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-03-08 21:11:40 +01:00
Stefan Dej
78549ef587 combine control and extruder panel 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-03-08 21:06:48 +01:00
Stefan Dej
f16d80745a bugfix: update cooldown preset > type in variable name 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-03-08 15:53:20 +01:00
Stefan Dej
70903ae3cf bugfix: upgrade notification with semver check 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-03-08 13:36:35 +01:00
Stefan Dej
309fc4eee2 bugfix: migration .mainsail.json to moonraker db 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-03-08 13:22:47 +01:00
Stefan Dej
fed5956500 feature: add .nc to valid gcode extensions 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-03-08 11:43:13 +01:00
Stefan Dej
cfaae9831e bugfix for older moonraker versions without owner in the update object 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-03-08 01:00:33 +01:00
Stefan Dej
526c1800f2 fix margin/padding issues after vuetify update 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-03-08 00:43:26 +01:00
Stefan Dej
2bf8f8e8e2 feature: add info icon to clickable update logs 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-03-08 00:33:12 +01:00
Stefan Dej
7750a897e2 finish to move from mainsail.json to moonraker db 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-03-08 00:22:10 +01:00
Stefan Dej
80c53494f9 first tests with the moonraker database 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-03-08 00:22:10 +01:00
Stefan Dej
4ee0f4bd46 Merge pull request #220 from freasy/feature/controll_cross 
Control pad for movement
 2021-03-08 00:13:23 +01:00
Eike Ahmels
6d90d320d8 all same icons! 2021-03-06 22:06:01 +01:00
Stefan Dej
b1345d09fa add moonraker octoprint_combat and add cura fileupload in docs 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-03-05 12:40:47 +01:00
Eike Ahmels
b0ebc2eee1 switched icon for macro panel, fixing merge bug 2021-03-05 09:37:43 +01:00
Eike Ahmels
9856f5d4db Merge remote-tracking branch 'upstream/master' into feature/controll_cross 2021-03-05 09:06:59 +01:00
Eike Ahmels
00574006b3 smaller and narrower 2021-03-05 09:06:47 +01:00
Stefan Dej
1854c04d7a feature: display power/speed axis in tempchart only with a enabled dataset 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-03-05 00:04:48 +01:00
Stefan Dej
ab6e0c07dc feature: display bed_mesh variance and make profile name clickable 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-03-04 23:33:51 +01:00
Stefan Dej
3850d6773a fix margins in micellaneous and tempchart tooltip 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-03-04 22:45:23 +01:00
Stefan Dej
e22a88d397 bugfix: fan slider off_below 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
 2021-03-04 22:35:11 +01:00
eliteSCHW31N
08b783c160 Update README.md 2021-03-04 20:53:31 +01:00
eliteSCHW31N
a9d82f547d remove default background, add transparent background 2021-03-04 20:53:31 +01:00