Waverunner 2b37cbb7bb Merge branch 'master' into awareness ...

Conflicts:
	src/services/objects/ObjectManager.java

2014-12-15 08:57:01 -05:00

.settings

Added eclipse settings

2014-11-02 23:35:55 -06:00

lib

Added local databases, along with the postgres jdbc driver

2014-11-17 01:00:34 -06:00

namegen

Added surname chance and name generation for Ithorian

2014-11-18 12:01:49 -05:00

odb

Changed galaxyId in CoreManager to 1 and added placeholder.txt to odb folder

2014-12-08 10:08:32 -05:00

src

Merge branch 'master' into awareness

2014-12-15 08:57:01 -05:00

.classpath

Added local databases, along with the postgres jdbc driver

2014-11-17 01:00:34 -06:00

.gitignore

Added odb folder to gitignore

2014-12-08 10:09:12 -05:00

.project

Added eclipse files

2014-11-02 23:34:03 -06:00

nge.backup

Removed my characters from the db backup

2014-12-08 00:22:34 -06:00

nge.cfg

Removed zone/ping ports from the config

2014-12-07 15:34:13 -06:00

S

Description

No description provided

70 MiB

Languages

Java 98.6%

JavaScript 0.9%

CSS 0.4%

HTML 0.1%