Treeku
02ff93312e
Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
Conflicts:
scripts/houses/player_house_corellia_large_style_01.py
scripts/houses/player_house_corellia_large_style_02.py
src/resources/objects/tangible/Deed.java
src/resources/objects/tangible/Harvester_Deed.java
src/resources/objects/tangible/Player_House_Deed.java
src/services/PlayerService.java
src/services/object/ObjectService.java
2014-04-29 05:04:23 +01:00
..
2013-07-08 15:03:08 +02:00
2013-07-08 15:03:08 +02:00
2014-04-28 22:07:32 +01:00
2013-07-08 15:03:08 +02:00
2013-07-08 15:03:08 +02:00
2013-07-08 15:03:08 +02:00
2013-07-08 15:03:08 +02:00
2013-07-08 15:03:08 +02:00
2013-07-08 15:03:08 +02:00
2014-04-28 22:07:32 +01:00
2014-04-28 22:07:32 +01:00
2013-07-08 15:03:08 +02:00
2013-07-08 15:03:08 +02:00
2014-04-29 05:04:23 +01:00
2013-07-08 15:03:08 +02:00
2014-04-23 00:11:26 -04:00
2013-07-08 15:03:08 +02:00