diff --git a/.gitignore b/.gitignore index a5c7bf3..a8ff940 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,4 @@ /out/production /out/artifacts/jLSLauncher_jar/config.dat -/.idea -/jLSLauncher.iml /config.dat # Created by .ignore support plugin (hsz.mobi) \ No newline at end of file diff --git a/.idea/artifacts/jLSLauncher_jar.xml b/.idea/artifacts/jLSLauncher_jar.xml new file mode 100644 index 0000000..fafcc6d --- /dev/null +++ b/.idea/artifacts/jLSLauncher_jar.xml @@ -0,0 +1,9 @@ + + + $PROJECT_DIR$/out/artifacts/jLSLauncher_jar + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..96cc43e --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/description.html b/.idea/description.html new file mode 100644 index 0000000..db5f129 --- /dev/null +++ b/.idea/description.html @@ -0,0 +1 @@ +Simple Java application that includes a class with main() method \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..97626ba --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/libraries/json_20140107.xml b/.idea/libraries/json_20140107.xml new file mode 100644 index 0000000..b78ffb2 --- /dev/null +++ b/.idea/libraries/json_20140107.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..037069f --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..0f3aa96 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/project-template.xml b/.idea/project-template.xml new file mode 100644 index 0000000..1f08b88 --- /dev/null +++ b/.idea/project-template.xml @@ -0,0 +1,3 @@ + \ No newline at end of file diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml new file mode 100644 index 0000000..e96534f --- /dev/null +++ b/.idea/uiDesigner.xml @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/README.md b/README.md index d2b9f6d..84363c7 100644 --- a/README.md +++ b/README.md @@ -1,28 +1,28 @@ # jLSLauncher - Livestreamer launching utility ### Download -Eine vorkompilierte `.jar`-Datei kann hier heruntergeladen werden: https://dev.ixab.de/da/jLSLauncher/raw/master/out/artifacts/jLSLauncher_jar/jLSLauncher.jar +A pre-compiled `.jar`-file can be downloaded here: https://dev.ixab.de/da/jLSLauncher/raw/master/out/artifacts/jLSLauncher_jar/jLSLauncher.jar ### Benötigte Software -* Java (mindestens v7) - https://www.java.com/de/download/ -* Livestreamer (Hinweise weiter unten) +* Java (minimum required is v7) - https://www.java.com/de/download/ +* Livestreamer -### Installation von Livestreamer (Windows) +### Installation of Livestreamer (Windows) -1. Livestreamer-Download für Windows: http://docs.livestreamer.io/install.html#zip-archive -2. Das zip-Archiv in einen beliebigen Pfad entpacken. +1. Download Livestreamer for Windows: http://docs.livestreamer.io/install.html#zip-archive +2. Extract the Zip-File to a folder of your choice. -### Installation von Livestreamer (Linux) +### Installation of Livestreamer (Linux) -Installation von Livestreamer unter Linux sollte mit dem gängigen Paketmanager funktionieren. -Alternativ hier vorbeischauen: http://docs.livestreamer.io/install.html +Please use your distribution's packet manager. +Optionally you can download Livestreamer here: http://docs.livestreamer.io/install.html ### Installation von jLSLauncher -`jLSLauncher.jar` benötigt keine Installation und ist direkt ausführbar. -Das Programm kann nach belieben verschoben oder kopiert werden. -Bitte beachten, dass ggf. die Datei `config.dat` auch verschoben werden muss. +`jLSLauncher.jar` does not need an installation and can be executed as is. +You can move or copy this tool to any other location you like. +The configuration is stored in a file named `config.dat` which, if present, has to be moved to the same location. ### Benutzung von jLSLauncher diff --git a/jLSLauncher.iml b/jLSLauncher.iml new file mode 100644 index 0000000..d4d626f --- /dev/null +++ b/jLSLauncher.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file