projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-09-22 07:13:28 -04:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2

Browse Source 
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
This commit is contained in:
Treeku
2014-04-29 05:04:23 +01:00
parent 73f8ad85bc 63d0c5020d
commit 02ff93312e
229 changed files with 6226 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/object/ObjectService.java
+2
View File
@@ -115,6 +115,8 @@ import resources.objects.resource.GalacticResource;
import resources.objects.resource.ResourceContainerObject;
import resources.objects.resource.ResourceRoot;
import resources.objects.staticobject.StaticObject;
import resources.objects.tangible.Harvester_Deed;
import resources.objects.tangible.Player_House_Deed;
import resources.objects.tangible.TangibleObject;
import resources.objects.tool.SurveyTool;
import resources.objects.waypoint.WaypointObject;