mikeysasse merge prep

2019-11-02 17:24:01 -04:00 · 2019-11-02 17:24:01 -04:00 · 5e3d85718d
commit 5e3d85718d
parent 80d0e74b32
13 changed files with 608 additions and 35 deletions
--- a/CompiledServer/production/09Scape/.settings/org.eclipse.jdt.core.prefs
+++ b/CompiledServer/production/09Scape/.settings/org.eclipse.jdt.core.prefs
@ -1,12 +1,12 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.source=1.7
--- a/CompiledServer/production/09Scape/data/eco/grand_exchange_db.emp
+++ b/CompiledServer/production/09Scape/data/eco/grand_exchange_db.emp
--- a/CompiledServer/production/09Scape/org/crandor/ServerConstants.class
+++ b/CompiledServer/production/09Scape/org/crandor/ServerConstants.class
--- a/CompiledServer/production/09Scape/org/crandor/net/event/LoginReadEvent.class
+++ b/CompiledServer/production/09Scape/org/crandor/net/event/LoginReadEvent.class
--- a/CompiledServer/production/09Scape/plugin/dialogue/PhantuwtiFantstuwiFarSight.class
+++ b/CompiledServer/production/09Scape/plugin/dialogue/PhantuwtiFantstuwiFarSight.class