projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-10-18 08:02:53 -04:00
Code Issues Projects Releases Wiki Activity
Files
02ff93312ea97ee9983a1871920098c4ee74e311
NGECore2/src/services/resources
T
History
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
..
HarvesterService.java
Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
2014-04-29 05:04:23 +01:00
ResourceService.java
Moved resource functions to resourceService
2014-04-26 00:36:13 +01:00