diff --git a/.gitignore b/.gitignore index ebf1095..8e86036 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,9 @@ .idea/ out/ G-Earth2.iml -/Extensions /G-WinMem/.vs /G-WinMem/x64 -/G-WinMem/G-WinMem/x64 \ No newline at end of file +/G-WinMem/G-WinMem/x64 +/Extensions/ +G-Earth.iml +/G-EarthWindows.iml \ No newline at end of file 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/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/main/ui/info/Info.java b/src/main/ui/info/Info.java index e44adbc..61601af 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:", + "Contributors:", + "XePeleato (Windows & Mac support)", "LittleJ", "ArachisH", "",