Skip to content

Commit

Permalink
Merge branch 'master' into mks_32_V1_4
Browse files Browse the repository at this point in the history
* master:
  fix bug in move.c, clean language keywords and add missing keyword, add knob led to list mode settings (bigtreetech#287)
  Dutch language added (bigtreetech#289)
  Update language_ru.h (bigtreetech#278)
  Fix compile error due to undefined references in move.c, Fix Custom gcode not working in List Mode, disable global info from showing on Status Screen and Move menu (bigtreetech#279)

# Conflicts:
#	TFT/src/User/variants.h
  • Loading branch information
delwinbest committed Jan 11, 2020
2 parents b8d9109 + 114a9ff commit bf56761
Show file tree
Hide file tree
Showing 47 changed files with 766 additions and 517 deletions.
7 changes: 6 additions & 1 deletion .github/ISSUE_TEMPLATE/bug_report.md
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name: Bug report
about: Create a report to help us improve
title: '[BUG] (short description)'
labels: ''
labels: 'bug'
assignees: ''

---
Expand All @@ -25,6 +25,11 @@ Do you want to ask a question? Are you looking for support? Please don't post he
**Actual behavior**
<!-- What actually happens -->

### Hardware Variant
<!-- which TFT controller did you used?-->
### TFT Firmware Version & Main Board Firmware details
<!-- current TFT Firmware version number & Marlin firmware version number -->

### Additional Information
* Include a ZIP file containing your `Configuration.h` or use [Pastebin](https://pastebin.com/) and paste a link in this issue.
* Provide pictures or links to videos that clearly demonstrate the issue.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name: Feature request
about: Suggest an idea for this project
title: '[FR] (feature request title)'
labels: ''
labels: 'enhancement'
assignees: ''

---
Expand Down
16 changes: 16 additions & 0 deletions .github/ISSUE_TEMPLATE/question.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
---
name: Ask a question
about: Ask a question or request details
title: '[Q] (Your Question?)'
labels: 'question'
assignees: ''

---

**Your question or details you need. Please describe.**
A clear and concise question or detail you would like to ask. Like Hardware related or firmware related.

**specify the device variant related to your question.**

**Additional context**
Add any other context or screenshots about the question here.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading

0 comments on commit bf56761

Please sign in to comment.