From 3f01b316ab2891319f2daa81cc7d47959076381d Mon Sep 17 00:00:00 2001 From: sirjonasxx <36828922+sirjonasxx@users.noreply.github.com> Date: Thu, 11 Oct 2018 20:15:30 +0200 Subject: [PATCH 1/3] gitignore update & json.jar move --- .gitignore | 3 ++- G-Earth.iml | 12 ------------ desktop.ini | 3 --- src/json-simple-1.1.1.jar => json-simple-1.1.1.jar | Bin src/META-INF/MANIFEST.MF | 6 +++--- 5 files changed, 5 insertions(+), 19 deletions(-) delete mode 100644 G-Earth.iml delete mode 100644 desktop.ini rename src/json-simple-1.1.1.jar => json-simple-1.1.1.jar (100%) diff --git a/.gitignore b/.gitignore index b548b8c..01a744d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ .idea/ out/ G-Earth2.iml -Extensions/ +/Extensions/ +G-Earth.iml diff --git a/G-Earth.iml b/G-Earth.iml deleted file mode 100644 index 16fc742..0000000 --- a/G-Earth.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/desktop.ini b/desktop.ini deleted file mode 100644 index 808f178..0000000 --- a/desktop.ini +++ /dev/null @@ -1,3 +0,0 @@ -[LocalizedFileNames] -jna-4.5.1.jar=@jna-4.5.1.jar,0 -jna-platform-4.5.1.jar=@jna-platform-4.5.1.jar,0 diff --git a/src/json-simple-1.1.1.jar b/json-simple-1.1.1.jar similarity index 100% rename from src/json-simple-1.1.1.jar rename to json-simple-1.1.1.jar diff --git a/src/META-INF/MANIFEST.MF b/src/META-INF/MANIFEST.MF index 889dc56..564884d 100644 --- a/src/META-INF/MANIFEST.MF +++ b/src/META-INF/MANIFEST.MF @@ -1,3 +1,3 @@ -Manifest-Version: 1.0 -Main-Class: main.extensions.examples.adminonconnect.AdminOnConnect - +Manifest-Version: 1.0 +Main-Class: main.extensions.examples.adminonconnect.AdminOnConnect + From e75fa38f97d46e6f5ef21addb1a5082924c0c632 Mon Sep 17 00:00:00 2001 From: sirjonasxx <36828922+sirjonasxx@users.noreply.github.com> Date: Thu, 11 Oct 2018 20:19:50 +0200 Subject: [PATCH 2/3] add contributer --- src/META-INF/MANIFEST.MF | 2 +- src/main/ui/info/Info.java | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/META-INF/MANIFEST.MF b/src/META-INF/MANIFEST.MF index 564884d..6948c82 100644 --- a/src/META-INF/MANIFEST.MF +++ b/src/META-INF/MANIFEST.MF @@ -1,3 +1,3 @@ Manifest-Version: 1.0 -Main-Class: main.extensions.examples.adminonconnect.AdminOnConnect +Main-Class: main.Main diff --git a/src/main/ui/info/Info.java b/src/main/ui/info/Info.java index e44adbc..b8f1159 100644 --- a/src/main/ui/info/Info.java +++ b/src/main/ui/info/Info.java @@ -9,6 +9,7 @@ import main.ui.SubForm; public class Info extends SubForm { public TextArea text; + // this is a TEMPORARY info tab public void initialize() { String[] lines = { @@ -18,7 +19,8 @@ public class Info extends SubForm { "Made by:", "sirjonasxx", "", - "Special thanks to:", + "Contributers:", + "XePeleato (Windows & Mac support)", "LittleJ", "ArachisH", "", From e6d3b6bf2f3dc681486b3a6ab424f0bad297f969 Mon Sep 17 00:00:00 2001 From: sirjonasxx <36828922+sirjonasxx@users.noreply.github.com> Date: Thu, 11 Oct 2018 20:21:45 +0200 Subject: [PATCH 3/3] spelling is overrated --- src/main/ui/info/Info.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/ui/info/Info.java b/src/main/ui/info/Info.java index b8f1159..61601af 100644 --- a/src/main/ui/info/Info.java +++ b/src/main/ui/info/Info.java @@ -19,7 +19,7 @@ public class Info extends SubForm { "Made by:", "sirjonasxx", "", - "Contributers:", + "Contributors:", "XePeleato (Windows & Mac support)", "LittleJ", "ArachisH",