3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-22 06:03:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 17

Merge branch 'pirate' of github.com:Ultimaker/Cura into 2.7

Browse source
This commit is contained in:
Jaime van Kessel 2017-08-22 10:53:51 +02:00
commit fd6ee6ee3c
2 changed files with 7 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -6,6 +6,7 @@ __pycache__
docs/html docs/html
*.log *.log
resources/i18n/en resources/i18n/en
resources/i18n/7s
resources/i18n/x-test resources/i18n/x-test
resources/firmware resources/firmware
resources/materials resources/materials

6
resources/qml/Preferences/GeneralPage.qml
View file

@ -161,6 +161,12 @@ UM.PreferencesPage
append({ text: "Português do Brasil", code: "ptbr" }) append({ text: "Português do Brasil", code: "ptbr" })
append({ text: "Русский", code: "ru" }) append({ text: "Русский", code: "ru" })
append({ text: "Türkçe", code: "tr" }) append({ text: "Türkçe", code: "tr" })
var date_object = new Date();
if (date_object.getUTCMonth() == 8 && date_object.getUTCDate() == 19) //Only add Pirate on the 19th of September.
{
append({ text: "Pirate", code: "7s" })
}
} }
} }