Skip to content

Commit a06773e

Browse files
authored
Merge pull request #151 from Blossomforth/develop
Merge for release v0.1.2-alpha.1
2 parents 3572b15 + 66796fc commit a06773e

File tree

14 files changed

+1423
-943
lines changed

14 files changed

+1423
-943
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,8 @@ PokeGoBot.iml
5252
Network Trash Folder
5353
Temporary Items
5454
.apdisk
55+
56+
# Project specific files
5557
/target/
5658
*.log
5759
config.json

pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
<plugin>
4040
<groupId>org.apache.maven.plugins</groupId>
4141
<artifactId>maven-jar-plugin</artifactId>
42+
<version>3.0.2</version>
4243
<configuration>
4344
<archive>
4445
<manifest>

prep/LICENSE.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
This work is protected under the Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International license, which can be found here: https://creativecommons.org/licenses/by-nc-sa/4.0/

prep/README.txt

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
********************************
2+
*** BlossomsPokemonGoManager ***
3+
********************************
4+
5+
Requirements
6+
============
7+
Java 8 - Make sure you have the latest version of Java installed
8+
9+
Usage
10+
=====
11+
First, extract the release ZIP file into a folder of its own somewhere on your computer.
12+
To run the Application, do one of the following:
13+
- On Windows, double-click the RunOnWindows.bat
14+
- On Linux/Unix/Mac, double-click the RunOnUnixSystems.sh
15+
- Double-click BlossomsPogoManager.jar
16+
- Run the file through the command prompt, with "java -jar path/to/BlossomsPogoManager.jar"
17+
18+
19+
License
20+
=======
21+
LICENSE.txt will be included both in the zip file, and inside the jar file.
22+
A copy of the notice can be found in help > about, in the program menu bar.
23+
24+
25+
26+
Information
27+
===========
28+
BlossomsPogoManager supports both Google authenticated logins, and Pokemon Trainer Club logins.
29+
30+
Source: https://github.com/Blossomforth/BlossomsPokemonGoManager

prep/RunOnUnixLikeSystems.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
start javaw -jar BlossomsPogoManager.jar

prep/RunOnWindows.bat

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
start javaw -jar BlossomsPogoManager.jar

0 commit comments

Comments
 (0)