Merge branch 'master' into LaneSh4d0w-clean

channels/au.m3u

@@ -45,14 +45,14 @@ https://c.mjh.nz/101002810281/
 https://c.mjh.nz/3201026102E1/
 #EXTINF:-1 tvg-id="ABCTVPlus.au" tvg-name="ABC TV Plus" tvg-country="AU" tvg-language="English" tvg-logo="" group-title="",ABC TV Plus (720p)
 https://c.mjh.nz/abc2/
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-country="AU" tvg-language="Arabic" tvg-logo="" group-title="",Aflam Mohtrama
-https://linkastream.co/headless?url=https://youtube.com/c/mim21889aflammo7trama/live
 #EXTINF:-1 tvg-id="ACCTV.au" tvg-name="ACCTV (Adelaide)" tvg-country="AU" tvg-language="English" tvg-logo="http://www.acc.tv/wp-content/uploads/2016/06/acctv-logo-web.png" group-title="Religious",ACCTV (Adelaide) (720p)
 https://iptv-all.lanesh4d0w.codes/australia/acctv-adelaide
 #EXTINF:-1 tvg-id="ACCTV.au" tvg-name="ACCTV (Melbourne)" tvg-country="AU" tvg-language="English" tvg-logo="http://www.acc.tv/wp-content/uploads/2016/06/acctv-logo-web.png" group-title="Religious",ACCTV (Melbourne) (720p)
 https://iptv-all.lanesh4d0w.codes/australia/acctv-melbourne
 #EXTINF:-1 tvg-id="ActionHollywoodMovies.au" tvg-name="Action Hollywood Movies" tvg-country="AU" tvg-language="English" tvg-logo="https://i.imgur.com/wnlzC0w.jpg" group-title="Movies",Action Hollywood Movies (1080p)
 https://lightning-actionhollywood-samsungaustralia.amagi.tv/playlist.m3u8
+#EXTINF:-1 tvg-id="AflamMohtrama.au" tvg-name="Aflam Mohtrama" tvg-country="AU" tvg-language="Arabic" tvg-logo="" group-title="",Aflam Mohtrama
+https://linkastream.co/headless?url=https://youtube.com/c/mim21889aflammo7trama/live
 #EXTINF:-1 tvg-id="AusBizTV.au" tvg-name="Aus Biz TV" tvg-country="AU" tvg-language="" tvg-logo="" group-title="",Aus Biz TV
 https://ausbiztv-ausbiz-1-au.samsung.wurl.com/manifest/playlist.m3u8
 #EXTINF:-1 tvg-id="AusTamil.au" tvg-name="Aus Tamil" tvg-country="AU" tvg-language="" tvg-logo="" group-title="",Aus Tamil

channels/fr.m3u

@@ -401,6 +401,8 @@ https://alchimie-sport-en-france-1-fr.samsung.wurl.com/manifest/playlist.m3u8
 https://stormcast-telenovelatv-1-fr.samsung.wurl.com/manifest/playlist.m3u8
 #EXTINF:-1 tvg-id="SupertoonsTV.fr" tvg-name="Supertoons TV" tvg-country="FR" tvg-language="French" tvg-logo="https://i.imgur.com/kUmPbel.jpg" group-title="Kids",Supertoons TV (720p)
 https://kedoo-supertoonstv-3-fr.samsung.wurl.com/manifest/playlist.m3u8
+#EXTINF:-1 tvg-id="TF1.fr" tvg-name="TF1" tvg-country="FR" tvg-language="French" tvg-logo="" group-title="Entertainment",TF1
+http://stream.tvtap.net:8081/live/fr-tf1.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="Tiji.fr" tvg-name="Tiji" tvg-country="FR" tvg-language="French" tvg-logo="" group-title="Kids",Tiji (1080p)
 https://shls-tiji-tv-prod-dub.shahid.net/out/v1/ee05878a88474f408ff04495d44cc249/index.m3u8
 #EXTINF:-1 tvg-id="TijiRussia.fr" tvg-name="Tiji Russia" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="Kids",Tiji Russia (576p)
@@ -455,5 +457,3 @@ https://query-streamlink.lanesh4d0w.repl.co/iptv-query?streaming-ip=https://www.
 https://linkastream.co/headless?url=https://www.dailymotion.com/video/x63085w
 #EXTINF:-1 tvg-id="WéoNordPasdeCalais.fr" tvg-name="Wéo (Picardie)" tvg-country="FR" tvg-language="French" tvg-logo="" group-title="Local",Wéo (Picardie)
 https://query-streamlink.lanesh4d0w.repl.co/iptv-query?streaming-ip=https://www.dailymotion.com/video/x63085w
-#EXTINF:-1 tvg-id="TF1.fr" tvg-name="TF1" tvg-country="FR" tvg-language="French" tvg-logo="" group-title="Entertainment",TF1
-http://stream.tvtap.net:8081/live/fr-tf1.stream/playlist.m3u8

channels/nl.m3u

@@ -307,3 +307,9 @@ https://xite-samsung-de.amagi.tv/playlist.m3u8
 https://ms7.mx-cd.net/tv/226-1855782/XITE_NL.smil/chunklist_w323364313_b3328000_slNLD.m3u8
 #EXTINF:-1 tvg-id="ZO34.nl" tvg-name="ZO!34" tvg-country="NL" tvg-language="" tvg-logo="https://i.imgur.com/KrEBHLw.jpg" group-title="",ZO!34 (720p)
 https://streams.uitzending.tv/zo34/zo34/playlist.m3u8
+#EXTINF:-1 tvg-id="NPO1.nl" tvg-name="NPO 1" tvg-country="NL" tvg-language="Dutch" tvg-logo="https://over.npo.nl/images/zenders/npo-1.png" group-title="",NPO 1
+http://stream.tvtap.net:8081/live/nl-npo1.stream/playlist.m3u8
+#EXTINF:-1 tvg-id="NPO2.nl" tvg-name="NPO 2" tvg-country="NL" tvg-language="Dutch" tvg-logo="https://over.npo.nl/images/zenders/npo-2.png" group-title="",NPO 2
+http://stream.tvtap.net:8081/live/nl-npo2.stream/playlist.m3u8
+#EXTINF:-1 tvg-id="NPO3.nl" tvg-name="NPO 3" tvg-country="NL" tvg-language="Dutch" tvg-logo="https://over.npo.nl/images/zenders/npo-3.png" group-title="",NPO 3
+http://stream.tvtap.net:8081/live/nl-npo3.stream/playlist.m3u8

channels/us.m3u

@@ -67,10 +67,10 @@ https://wews-syndication.ewscloud.com/out/v1/72729e3f4dbe4aafbab93d6b1117e5f1/in
 https://content.uplynk.com/channel/64ca339f04964a5e961c3207a7771bf1.m3u8
 #EXTINF:-1 tvg-id="WXYZTV.us" tvg-name="ABC 7 Detroit (WXYZ-TV)" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/8sQ5mfL.png" group-title="Local",ABC 7 Detroit (WXYZ-TV)
 https://content-auso2.uplynk.com/channel/9c9e4e410b5a471391c116166d8c010e.m3u8
-#EXTINF:-1 tvg-id="WXYZTV.us" tvg-name="ABC 7 Detroit (WXYZ-TV)" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/8sQ5mfL.png" group-title="Local",ABC 7 Detroit (WXYZ-TV)
-https://live-news-manifest.tubi.video/live-news-manifest/csm/extlive/tubiprd01,Cloudfront-WXYZ.m3u8
 #EXTINF:-1 tvg-id="WXYZTV.us" tvg-name="ABC 7 Detroit (WXYZ-TV)" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/8sQ5mfL.png" group-title="Local",ABC 7 Detroit (WXYZ-TV) (720p)
 https://content-auso2.uplynk.com/channel/9c9e4e410b5a471391c116166d8c010e.m3u8?ad=live
+#EXTINF:-1 tvg-id="WXYZTV.us" tvg-name="ABC 7 Detroit (WXYZ-TV)" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/8sQ5mfL.png" group-title="Local",ABC 7 Detroit (WXYZ-TV)
+https://live-news-manifest.tubi.video/live-news-manifest/csm/extlive/tubiprd01,Cloudfront-WXYZ.m3u8
 #EXTINF:-1 tvg-id="WWSB.us" tvg-name="ABC 7 Sarasota FL (WWSB)" tvg-country="US" tvg-language="English" tvg-logo="https://cloudfront-us-east-1.images.arcpublishing.com/raycom/HJ3SAXRMNFAHXOFIRVYCQBIOGM.jpg" group-title="Local",ABC 7 Sarasota FL (WWSB) (720p)
 https://d2nt5wxzqbe1ad.cloudfront.net/out/raycom-wwsb1-hls/live.m3u8
 #EXTINF:-1 tvg-id="WMURTV.us" tvg-name="ABC 9 New Hampshire (WMUR-TV)" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/6oNx5F0.png" group-title="Local",ABC 9 New Hampshire (WMUR-TV)
@@ -1726,6 +1726,8 @@ https://dai.google.com/linear/hls/event/EpqgwRlpQKq73ySVSohJWA/master.m3u8
 https://gravitas-movies.sinclair.wurl.com/manifest/playlist.m3u8
 #EXTINF:-1 tvg-id="GreatestAmericanHeroSTIRR.us" tvg-name="Greatest American Hero (STIRR)" tvg-country="US" tvg-language="English" tvg-logo="https://komonews.com/resources/media2/3x1/full/119/center/90/885a4fe2-5dce-4193-8c9b-e72c9b16ae4d-small3x1_stirr_1219_epg_thegreatestamericanhero_1920x1080.png?cb=c81e728d9d4c2f636f067f89cc14862c" group-title="",Greatest American Hero (STIRR) (720p)
 https://dai.google.com/linear/hls/event/zaW9PVeXQeamNt6SZ9FsOg/master.m3u8
+#EXTINF:-1 tvg-id="WZRACD.us" tvg-name="Greek Voice Live 48 Tampa Bay (WZRA-CD1)" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/biG4n2a.jpg" group-title="Entertainment",Greek Voice Live 48 Tampa Bay (WZRA-CD1)
+http://wpso.com:1936/hls/wzra.m3u8
 #EXTINF:-1 tvg-id="GreenbeltTV.us" tvg-name="Greenbelt TV" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/uxUqIVT.png" group-title="",Greenbelt TV
 https://t07113a-lh.akamaihd.net/i/t07113a_1@756729/master.m3u8
 #EXTINF:-1 tvg-id="GreensboroTV.us" tvg-name="Greensboro TV" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/wHb9BLd.png" group-title="Local",Greensboro TV
@@ -5427,12 +5429,6 @@ https://adultswim-vodlive.cdn.turner.com/live/samurai-jack/stream.m3u8
 https://cloudfront.tubi.video/21df8036-fa23-49ff-9877-8af983546d2b/elw3phlf/stream.m3u8
 #EXTINF:-1 tvg-id="Saveur.us" tvg-name="Saveur" tvg-country="US" tvg-language="" tvg-logo="https://github.com/geonsey/Free2ViewTV/blob/master/images/logos/DistroTV_250x250.png?raw=true" group-title="",Saveur (720p)
 https://a.jsrdn.com/broadcast/060753d37e/+0000/c.m3u8
-#EXTINF:-1 tvg-id="SBN.us" tvg-name="SonLife Broadcasting (SBN)" tvg-country="US" tvg-language="Spanish" tvg-logo="https://i.imgur.com/h9Gxavk.png" group-title="Religious",SonLife Broadcasting (SBN)
-https://sonlife5-i.akamaihd.net/hls/live/584631/ch5/master.m3u8
-#EXTINF:-1 tvg-id="SBN.us" tvg-name="SonLife Broadcasting (SBN)" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/h9Gxavk.png" group-title="Religious",SonLife Broadcasting (SBN)
-https://sonlife7-i.akamaihd.net/hls/live/585011/ch7/master.m3u8
-#EXTINF:-1 tvg-id="SBNGlobal.us" tvg-name="SonLife Broadcasting Global (SBN)" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/h9Gxavk.png" group-title="Religious",SonLife Broadcasting Global (SBN)
-https://sonlife10-i.akamaihd.net/hls/live/585013/ch10/master.m3u8
 #EXTINF:-1 tvg-id="Screamfest.us" tvg-name="Screamfest" tvg-country="US" tvg-language="English" tvg-logo="https://app.digitickets.co.uk/userfiles/companies/screamfestlogo.300x150.png" group-title="Movies",Screamfest (720p)
 https://vcnleomarkstudios.teleosmedia.com/stream/leomarkstudios/screamfest/playlist.m3u8
 #EXTINF:-1 tvg-id="ScreenDreams.us" tvg-name="Screen Dreams" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/6hIfTMC.jpg" group-title="Relax",Screen Dreams
@@ -5515,6 +5511,12 @@ https://soreal-localnow.cinedigm.com/playlist.m3u8
 https://soreal-tcl.amagi.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="SOARSTIRR.us" tvg-name="SOAR (STIRR)" tvg-country="US" tvg-language="English" tvg-logo="https://komonews.com/resources/media2/3x1/full/119/center/90/2b6ed67f-5284-4622-8594-a956633c8383-small3x1_stirr_1219_epg_soartv_1920x1080.png?cb=eccbc87e4b5ce2fe28308fd9f2a7baf3" group-title="",SOAR (STIRR) (720p)
 https://dai.google.com/linear/hls/event/_PDxBUttQYqkxPnmh3VOZA/master.m3u8
+#EXTINF:-1 tvg-id="SBN.us" tvg-name="SonLife Broadcasting (SBN)" tvg-country="US" tvg-language="Spanish" tvg-logo="https://i.imgur.com/h9Gxavk.png" group-title="Religious",SonLife Broadcasting (SBN)
+https://sonlife5-i.akamaihd.net/hls/live/584631/ch5/master.m3u8
+#EXTINF:-1 tvg-id="SBN.us" tvg-name="SonLife Broadcasting (SBN)" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/h9Gxavk.png" group-title="Religious",SonLife Broadcasting (SBN)
+https://sonlife7-i.akamaihd.net/hls/live/585011/ch7/master.m3u8
+#EXTINF:-1 tvg-id="SBNGlobal.us" tvg-name="SonLife Broadcasting Global (SBN)" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/h9Gxavk.png" group-title="Religious",SonLife Broadcasting Global (SBN)
+https://sonlife10-i.akamaihd.net/hls/live/585013/ch10/master.m3u8
 #EXTINF:-1 tvg-id="SonyCanalComedias.us" tvg-name="Sony Canal Comedias" tvg-country="US" tvg-language="Spanish" tvg-logo="https://i.imgur.com/E7gDhBW.png" group-title="Comedy",Sony Canal Comedias
 https://sony-comedias-1.roku.wurl.com/manifest/playlist.m3u8
 #EXTINF:-1 tvg-id="SonyCanalNovelas.us" tvg-name="Sony Canal Novelas" tvg-country="US" tvg-language="Spanish" tvg-logo="https://i.imgur.com/yijitpa.png" group-title="Movies",Sony Canal Novelas
@@ -6452,8 +6454,6 @@ https://wownow-wownowkids-1.vizio.wurl.com/manifest/playlist.m3u8
 https://wsjlivehls-lh.akamaihd.net/i/events1_1@174990/master.m3u8
 #EXTINF:-1 tvg-id="WuTangCollection.us" tvg-name="Wu Tang Collection" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/jbMmsjI.png" group-title="Music",Wu Tang Collection
 https://stream-us-east-1.getpublica.com/playlist.m3u8?network_id=73
-#EXTINF:-1 tvg-id="WZRACD.us" tvg-name="Greek Voice Live 48 Tampa Bay (WZRA-CD1)" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/biG4n2a.jpg" group-title="Entertainment",Greek Voice Live 48 Tampa Bay (WZRA-CD1)
-http://wpso.com:1936/hls/wzra.m3u8
 #EXTINF:-1 tvg-id="Xcorps.us" tvg-name="Xcorps" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/SDKWWQu.png" group-title="Series",Xcorps (720p)
 https://rpn1.bozztv.com/36bay2/gusa-xcorps/playlist.m3u8
 #EXTINF:-1 tvg-id="Xcorps.us" tvg-name="Xcorps" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/SDKWWQu.png" group-title="Series",Xcorps