Merge branch 'hykilpikonna:master' into master

This commit is contained in:
AIT MEDDOUR Fouad-Eddine 2024-08-29 14:34:05 +01:00 committed by GitHub
commit 1e67d65cec
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 209 additions and 10 deletions

View file

@ -721,6 +721,156 @@ PRESETS: dict[str, ColorProfile] = {
'#D2F2E2',
]),
# Start of Extras by Jaida Corvera
# polyamorous flag colors pulled from https://polyamproud.com/flag
'polyam' : ColorProfile([
"#FFFFFF",
"#FCBF00",
"#009FE3",
"#E50051",
"#340C46",
]),
'sapphic' : ColorProfile([
"#FD8BA8",
"#FBF2FF",
"#C76BC5",
"#FDD768",
"#C76BC5",
"#FBF2FF",
"#FD8BA8"
]),
'androgyne' : ColorProfile([
"#FE007F",
"#9832FF",
"#00B8E7",
]),
"genderflux" : ColorProfile([
"#F57694",
"#F2A3B9",
"#CFCFCF",
"#7BE1F5",
"#3ECDFA",
"#FFF48C",
]),
'interprogress' : ColorProfile([
"#FFD800",
"#7902AA",
"#FFFFFF",
"#FFAFC8",
"#74D7EE",
"#613915",
"#000000",
'#E50000',
'#FF8D00',
'#FFEE00',
'#028121',
'#004CFF',
'#770088'
]),
'progress' : ColorProfile ([
"#FFFFFF",
"#FFAFC8",
"#74D7EE",
"#613915",
"#000000",
'#E50000',
'#FF8D00',
'#FFEE00',
'#028121',
'#004CFF',
'#770088'
]),
'intersex' : ColorProfile([
"#FFD800",
"#FFD800",
"#7902AA",
"#FFD800",
"#FFD800"
]),
'old-polyam' : ColorProfile([
"#0000FF",
"#FF0000",
"#FFFF00",
"#FF0000",
"#000000"
]),
'equal-rights' : ColorProfile([
"#0000FF",
"#0000FF",
"#FFFF00",
"#0000FF",
"#0000FF",
"#FFFF00",
"#0000FF",
"#0000FF"
]),
'drag' : ColorProfile([
"#CC67FF",
"#FFFFFF",
"#FFA3E3",
"#FFFFFF",
"#3366FF"
]),
# Pronoun Flags
'pronounfluid' : ColorProfile([
"#ffb3f9",
"#ffffff",
"#d1fdcb",
"#c7b0ff",
"#000000",
"#b8ccff"
]),
'pronounflux' : ColorProfile([
"#fdb3f8",
"#b6ccfa",
"#18ddd3",
"#64ff89",
"#ff7690",
"#ffffff"
]),
'exipronoun' : ColorProfile([
"#1c3d34",
"#ffffff",
"#321848",
"#000000"
]),
'neopronoun' : ColorProfile ([
"#bcec64",
"#ffffff",
"#38077a"
]),
'neofluid' : ColorProfile ([
"#ffeca0",
"#ffffff",
"#ffeca0",
"#38087a",
"#bcec64"
]),
'genderqueer' : ColorProfile ([
"#b57edc",
"#b57edc",
"#ffffff",
"#ffffff",
"#4a8123",
"#4a8123"
]),
# Meme flags
'beiyang': ColorProfile([
'#DF1B12',

View file

@ -1698,6 +1698,34 @@ get_model() {
iMac11,2): "iMac (21.5-inch, Mid 2010)" ;;
iMac10,1): "iMac (27/21.5-inch, Late 2009)" ;;
iMac9,1): "iMac (24/20-inch, Early 2009)" ;;
PowerMac12,1): "iMac G5 (20/17-inch, iSight)" ;;
PowerMac11,2): "Power Macintosh G5" ;;
PowerMac8,2): "iMac G5 (20/17-inch, ALS)" ;;
PowerMac8,1): "iMac G5 (20/17-inch)" ;;
PowerMac7,[2-3]): "Power Macintosh G5 (PCI/PCI-X)" ;;
PowerMac6,4): "eMac G4" ;;
PowerMac6,3): "iMac G4 (20/17/15-inch, USB 2.0)" ;;
PowerMac6,1): "iMac G4 (17-inch, Flat Panel)" ;;
PowerMac5,1): "Power Macintosh G4 Cube" ;;
PowerMac4,5): "iMac G4 (17-inch, Flat Panel)" ;;
PowerMac4,4): "eMac G4" ;;
PowerMac4,1): "iMac G3" ;;
PowerMac3,6): "Power Macintosh G4 (MDD/FW800)" ;;
PowerMac3,5): "Power Macintosh G4 (Quicksilver)" ;;
PowerMac3,4): "Power Macintosh G4 (Digital Audio)" ;;
PowerMac3,3): "Power Macintosh G4 (Gigabit)" ;;
PowerMac3,1): "Power Macintosh G4 (AGP)" ;;
PowerBook6,8 | PowerBook6,4 | PowerBook6,1): "PowerBook G4 (17/15/12-inch, Al)" ;;
PowerBook6,7 | PowerBook6,5 | PowerBook6,3): "iBook G4 (14/12-inch)" ;;
PowerBook6,2): "PowerBook G4 (12-inch, DVI - Al)" ;;
PowerBook5,[8-9]): "PowerBook G4 (17/15-inch, DLSD/HR - Al)" ;;
PowerBook5,[3-7] | PowerBook5,1): "PowerBook G4 (17/15/12-inch, Al)" ;;
PowerBook5,2): "PowerBook G4 (15-inch, FW800 - Al)" ;;
PowerBook4,[1-3]): "iBook G3" ;;
PowerBook3,5): "PowerBook G4 (Ti)" ;;
PowerBook3,4): "PowerBook G4 (DVI - Ti)" ;;
PowerBook3,3): "PowerBook G4 (Gigabit - Ti)" ;;
PowerBook3,2): "PowerBook G4 (Original - Ti)" ;;
*): "$model" ;;
esac
@ -7278,24 +7306,24 @@ EOF
set_colors 15 6
read -rd '' ascii_data <<'EOF'
${c1} ___________
/ \
/ ${c2}______${c1} \
/ ${c2}/ \${c1} \
| ${c2}( )${c1} \
/ ${c2}\______/${c1} |
/ \\
/ ${c2}______${c1} \\
/ ${c2}/ \\${c1} \\
| ${c2}( )${c1} \\
/ ${c2}\\______/${c1} |
| |
/ \
/ \\
| |
| |
/ |
| |
| _______ |
____/ / \ |
____/ / \\ |
/ | | |
| / ____/ |
\_________/ / |
\ __/
\_______/
\\_________/ / |
\\ __/
\\_______/
EOF
;;
@ -11606,6 +11634,27 @@ ${c1} `.-://////:--`
EOF
;;
"Mauna"*)
set_colors 4 6
read -rd '' ascii_data <<'EOF'
${c1} .. :-=++++=-:
.-+*+ -********* **=
=***= +******+ =---=+*.
+**** +****+ :-=++*++=--
=****= **** :+***********+:
+****+ *** ${c2}.-- ${c1}+******-
=*****: *- ${c2}:+=: ${c1}=*****:
${c2}. ${c1}+*****: : ${c2}-+++ ${c1}:****=
${c2}-+ ${c1}:*****+ ${c2}- ++++ ${c1}:***-
${c2}-++=: ${c1}=+****: ${c2}:++ +++++ ${c1}**+
${c2} +++++= ${c1}-====-${c2}++++: +++++ ${c1}*+
${c2} .=++++++++++++++: ${c2}+++++= ${c1}.
${c2} .=+++++++++= :=+++++=
.:::--- -+++++++-
:-==++==-.
EOF
;;
"Meowix"*)
set_colors 1 3 3 4
read -rd '' ascii_data <<'EOF'