Merge branch 'dev' into Master

vorghahn · Dec 3, 2017 · 4ffc5ba · 4ffc5ba
2 parents 94fc80c + 4cf0982
commit 4ffc5ba
Show file tree

Hide file tree

Showing 6 changed files with 652 additions and 140 deletions.
diff --git a/Linux/version.txt b/Linux/version.txt
@@ -1 +1 @@
-{"Version": "1.47", "Date": "27 NOV 2017"}
+{"Version": "1.57", "Date": "03 DEC 2017"}
diff --git a/Windows/version.txt b/Windows/version.txt
@@ -1 +1 @@
-{"Version": "1.47", "Date": "27 NOV 2017"}
+{"Version": "1.57", "Date": "03 DEC 2017"}
diff --git a/advancedsettings.json b/advancedsettings.json
@@ -1 +1,13 @@
-{"networkdiscovery": 1, "ffmpegloc": "C:\\ffmpeg\\bin\\ffmpeg.exe", "kodiuser": "string", "kodipass": "string"}
+{
+  "networkdiscovery": 0,
+  "ffmpegloc": "C:\\ffmpeg\\bin\\ffmpeg.exe",
+  "kodiuser": "kodi",
+  "kodipass": "",
+  "extram3u8url":"",
+  "extram3u8name":"Custom",
+  "extram3u8file":"./blah.m3u",
+  "tvhredirect": "False",
+  "tvhaddress":"127.0.0.1",
+  "tvhuser":"",
+  "tvhpass":""
+}
diff --git a/requirements.txt b/requirements.txt
@@ -1 +1,2 @@
-flask
+flask
+tkinter
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{"Version": "1.47", "Date": "27 NOV 2017"}
		{"Version": "1.57", "Date": "03 DEC 2017"}
-Original file line number
+Diff line change
@@ -1 +1,2 @@
-    flask
+    flask
+    tkinter