nitro/G-Earth
1
0
Fork 0
mirror of https://github.com/sirjonasxx/G-Earth.git synced 2024-06-30 21:55:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

mergeconflict

Browse Source
This commit is contained in:
sirjonasxx 2018-10-11 20:27:54 +02:00
commit e32cee6cfd
4 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitignore vendored
View File

@ -1,7 +1,9 @@
.idea/
out/
G-Earth2.iml
/Extensions
/G-WinMem/.vs
/G-WinMem/x64
/G-WinMem/G-WinMem/x64
/G-WinMem/G-WinMem/x64
/Extensions/
G-Earth.iml
/G-EarthWindows.iml

12
G-Earth.iml
View File

@ -1,12 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="json-simple-1.1.1" level="project" />
</component>
</module>

0
src/json-simple-1.1.1.jar → json-simple-1.1.1.jar
View File

4
src/main/ui/info/Info.java
View File

@ -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",
"",