diff --git a/.gitattributes b/.gitattributes index 1162ec620f0..27acd3030d5 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1197,7 +1197,6 @@ forge-gui-ios/pom.xml -text forge-gui-ios/robovm.properties -text forge-gui-ios/robovm.xml -text forge-gui-ios/src/forge/ios/Main.java -text -forge-gui-ios/src/forge/ios/package-info.java -text forge-gui-mobile-dev/.classpath -text forge-gui-mobile-dev/.project -text forge-gui-mobile-dev/.settings/org.eclipse.jdt.core.prefs -text diff --git a/.gitignore b/.gitignore index 3f6387b76a5..ebeef8c723c 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ /*.iml /*.tmp /.metadata +/.recommenders forge-ai/forge-ai.iml forge-ai/target forge-core/forge-core.iml diff --git a/forge-gui-ios/.settings/org.eclipse.core.resources.prefs b/forge-gui-ios/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 00000000000..370ae2c6983 --- /dev/null +++ b/forge-gui-ios/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=ISO-8859-1 diff --git a/forge-gui-ios/pom.xml b/forge-gui-ios/pom.xml index 75c0c909679..e5961c48e6c 100644 --- a/forge-gui-ios/pom.xml +++ b/forge-gui-ios/pom.xml @@ -7,7 +7,7 @@ jar -Xms128m -Xmx2048m - 1.5.38.001 + 1.5.38.002 diff --git a/forge-gui-ios/src/forge/ios/package-info.java b/forge-gui-ios/src/forge/ios/package-info.java deleted file mode 100644 index e1d9e45230d..00000000000 --- a/forge-gui-ios/src/forge/ios/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package forge.ios; \ No newline at end of file