Skip to content

Commit

Permalink
Merge remote-tracking branch 'refs/remotes/origin/master'
Browse files Browse the repository at this point in the history
# Conflicts:
#	sc_network_timezones/missing_images.txt
  • Loading branch information
BKSteve committed May 12, 2024
2 parents 335813f + 99014df commit 48410a8
Show file tree
Hide file tree
Showing 48 changed files with 14 additions and 176 deletions.
52 changes: 1 addition & 51 deletions fonts/pluton.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified images/About.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified images/Client1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified images/Client2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified images/Client3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified images/Left.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified images/Portfolio01.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified images/Portfolio02.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified images/Portfolio03.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified images/Portfolio04.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified images/Portfolio05.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified images/Portfolio06.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified images/Portfolio07.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified images/Portfolio08.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified images/Portfolio09.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified images/Right.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified images/Service1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified images/Service2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified images/Service3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified images/Team1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified images/Team2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified images/Team3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified images/anime.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified images/bx_loader.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified images/clients/ClientLogo01.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified images/clients/ClientLogo02.png
Binary file modified images/clients/ClientLogo03.png
Binary file modified images/clients/ClientLogo04.png
Binary file modified images/clients/ClientLogo05.png
Binary file modified images/clients/ClientLogo06.png
Binary file modified images/fs.spinner.gif
Binary file modified images/iBook.png
Binary file modified images/iMac.png
Binary file modified images/iPhone.png
118 changes: 1 addition & 117 deletions images/ico/safari-pinned-tab.svg

Large diffs are not rendered by default.

Binary file modified images/kodi.png
Binary file modified images/next.png
Binary file modified images/nzb.png
Binary file modified images/prev.png
Binary file modified images/screenshots/add.jpg
Binary file modified images/screenshots/calendar.jpg
Binary file modified images/screenshots/history.jpg
Binary file modified images/screenshots/home.jpg
Binary file modified images/screenshots/search.jpg
Binary file modified images/screenshots/show.jpg
Binary file modified images/subtitles.png
Binary file modified images/thepiratebay.png
20 changes: 12 additions & 8 deletions sc_network_timezones/network_timezones.txt
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ Alpha TV GUJARATI:Asia/Kolkata
Alpha TV PUNJABI:Asia/Kolkata
Alpha TV:Europe/Athens
Altice Studio:Europe/Paris
Amazon Freevee:America/New_York
Amazon Prime Video:America/New_York
America One Television Network:America/New_York
Amman TV:Asia/Amman
Expand Down Expand Up @@ -565,6 +566,7 @@ GMM25:Asia/Bangkok
GNT:America/Noronha
GTV:Asia/Taipei
GYAO!:Japan
GagaOOLala:Asia/Taipei
Gaia:America/New_York
Game One:Europe/Paris
Game Show Network:America/New_York
Expand Down Expand Up @@ -639,8 +641,8 @@ ITV2:Europe/London
ITV3:Europe/London
ITV4:Europe/London
ITV:Europe/London
ITVX:Europe/London
ITVBe:Europe/London
ITVX:Europe/London
Imagen Televisión:America/Mexico_City
Imago TV:Europe/Paris
Independent Television Network:Asia/Colombo
Expand Down Expand Up @@ -834,6 +836,7 @@ NET TV:America/Argentina/Buenos_Aires
NET.:Asia/Jakarta
NFL Network:America/New_York
NHK BS1:Japan
NHK Educational TV:Japan
NHK:Japan
NHL Network:America/New_York
NHNZ:Pacific/Auckland
Expand Down Expand Up @@ -953,6 +956,7 @@ Pivot:America/New_York
Planet Green:America/New_York
Planète+:America/St_Johns
Play More:Europe/Brussels
Play Plus:America/Noronha
Play UK:Europe/London
PlayJam:Europe/London
PlayStation Network:America/New_York
Expand All @@ -973,6 +977,7 @@ Prima televize:Europe/Prague
Prime (BE):Europe/Brussels
Prime (NZ):Pacific/Auckland
Prime Box Brazil:America/Noronha
Prime Video:America/New_York
ProSieben Maxx:Europe/Berlin
ProSieben:Europe/Berlin
Prva Srpska Televizija:Europe/Belgrade
Expand Down Expand Up @@ -1190,6 +1195,7 @@ Smithsonian Channel:America/New_York
Snapchat Originals:America/New_York
SoHo:Australia/Lord_Howe
Sohu TV:Asia/Shanghai
Sony Channel:Africa/Johannesburg
Sony Entertainment Television:America/New_York
SonyLIV:Asia/Kolkata
Space (Brasil):America/Noronha
Expand Down Expand Up @@ -1295,7 +1301,6 @@ TSN:America/St_Johns
TSR:Europe/Zurich
TTV (PL):Poland
TTV:Asia/Taipei
Tubi:America/New_York
TV 2 (DK):Europe/Copenhagen
TV 2 Charlie:Europe/Copenhagen
TV 2 Fri:Europe/Copenhagen
Expand Down Expand Up @@ -1379,6 +1384,7 @@ TVN Style:Poland
TVN Turbo:Poland
TVN:Poland
TVNOW:Europe/Berlin
TVNZ 1:Pacific/Auckland
TVNZ 2:Pacific/Auckland
TVNZ:Pacific/Auckland
TVNorge:Europe/Oslo
Expand Down Expand Up @@ -1461,6 +1467,7 @@ Treehouse TV:America/St_Johns
Trend E:Asia/Seoul
TrueID:Asia/Bangkok
TrueVisions:Asia/Bangkok
Tubi:America/New_York
Turner South:America/New_York
Twitch:America/New_York
Twitter:America/New_York
Expand All @@ -1483,6 +1490,7 @@ USA Network:America/New_York
UTV:Europe/Dublin
Unis TV:America/St_Johns
United Nations Television:America/New_York
Univer Video:America/Noronha
Universal Kids:America/New_York
Universal TV:America/Noronha
Universo:America/New_York
Expand Down Expand Up @@ -1567,6 +1575,7 @@ YTV (JP):Japan
YTV (UK):Europe/London
YTV:America/St_Johns
Yahoo! Screen:America/New_York
Yahoo! View:America/New_York
YouTube Premium:America/New_York
YouTube:America/New_York
Youku:Asia/Shanghai
Expand Down Expand Up @@ -1597,6 +1606,7 @@ fridayVideo:Asia/Taipei
here!:America/New_York
hulu Japan:Japan
iQiyi:Asia/Shanghai
iWantTFC:Asia/Manila
ivi (Russia):Europe/Kaliningrad
jTBC:Asia/Seoul
motorsports.tv:Europe/London
Expand Down Expand Up @@ -1640,9 +1650,3 @@ yes:Israel
ערוץ 10:Israel
ערוץ הילדים‎:Israel
רשת:Israel
GagaOOLala:
NHK Educational TV:
Play Plus:
Sony Channel:
Univer Video:
iWantTFC:

0 comments on commit 48410a8

Please sign in to comment.