From ff92c4cf316c74d634c16668a5c04d97a7ca26c7 Mon Sep 17 00:00:00 2001 From: Maxmtg Date: Sun, 2 Feb 2014 11:16:39 +0000 Subject: [PATCH] add forge.net project (to hold network protocol, FServer and similar things) --- .gitattributes | 6 +++++ forge-gui/pom.xml | 5 ++++ forge-net/.classpath | 9 +++++++ forge-net/.project | 23 ++++++++++++++++ .../org.eclipse.core.resources.prefs | 4 +++ .../.settings/org.eclipse.jdt.core.prefs | 5 ++++ .../.settings/org.eclipse.m2e.core.prefs | 4 +++ forge-net/pom.xml | 27 +++++++++++++++++++ pom.xml | 1 + 9 files changed, 84 insertions(+) create mode 100644 forge-net/.classpath create mode 100644 forge-net/.project create mode 100644 forge-net/.settings/org.eclipse.core.resources.prefs create mode 100644 forge-net/.settings/org.eclipse.jdt.core.prefs create mode 100644 forge-net/.settings/org.eclipse.m2e.core.prefs create mode 100644 forge-net/pom.xml diff --git a/.gitattributes b/.gitattributes index d9a892dc350..523a0d6782b 100644 --- a/.gitattributes +++ b/.gitattributes @@ -15935,4 +15935,10 @@ forge-gui/tools/mtgdata-sets-to-forge.txt svneol=native#text/plain forge-gui/tools/oracleScraper.py -text forge-gui/tools/oracleScript.py svneol=native#text/x-python forge-gui/tools/packdata.xlsx -text +forge-net/.classpath -text +forge-net/.project -text +forge-net/.settings/org.eclipse.core.resources.prefs -text +forge-net/.settings/org.eclipse.jdt.core.prefs -text +forge-net/.settings/org.eclipse.m2e.core.prefs -text +forge-net/pom.xml -text /pom.xml svneol=native#text/xml diff --git a/forge-gui/pom.xml b/forge-gui/pom.xml index 545f21a770a..304bfdd9438 100644 --- a/forge-gui/pom.xml +++ b/forge-gui/pom.xml @@ -173,6 +173,11 @@ forge-ai ${project.version} + + forge + forge-net + ${project.version} + com.miglayout miglayout diff --git a/forge-net/.classpath b/forge-net/.classpath new file mode 100644 index 00000000000..51baab63605 --- /dev/null +++ b/forge-net/.classpath @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/forge-net/.project b/forge-net/.project new file mode 100644 index 00000000000..363ca7afe42 --- /dev/null +++ b/forge-net/.project @@ -0,0 +1,23 @@ + + + forge-net + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.jdt.core.javanature + org.eclipse.m2e.core.maven2Nature + + diff --git a/forge-net/.settings/org.eclipse.core.resources.prefs b/forge-net/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 00000000000..67a168654e8 --- /dev/null +++ b/forge-net/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,4 @@ +eclipse.preferences.version=1 +encoding//src/main/java=ISO-8859-1 +encoding//src/test/java=ISO-8859-1 +encoding/=ISO-8859-1 diff --git a/forge-net/.settings/org.eclipse.jdt.core.prefs b/forge-net/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000000..ec4300d5d09 --- /dev/null +++ b/forge-net/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,5 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.source=1.7 diff --git a/forge-net/.settings/org.eclipse.m2e.core.prefs b/forge-net/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 00000000000..f897a7f1cb2 --- /dev/null +++ b/forge-net/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/forge-net/pom.xml b/forge-net/pom.xml new file mode 100644 index 00000000000..b49651eac19 --- /dev/null +++ b/forge-net/pom.xml @@ -0,0 +1,27 @@ + + + + 4.0.0 + + + forge + forge + 1.5.12-SNAPSHOT + + + forge-net + Forge Net + + + + forge + forge-core + ${project.version} + + + forge + forge-game + ${project.version} + + + diff --git a/pom.xml b/pom.xml index c450957e922..b3b05624b8a 100644 --- a/pom.xml +++ b/pom.xml @@ -182,6 +182,7 @@ forge-core forge-game forge-ai + forge-net forge-gui