Waverunner d108353614 Merge remote-tracking branch 'origin/master' into Wave_Entertainer ...

Conflicts:
	src/services/BuffService.java
	src/services/collections/CollectionService.java

2014-03-23 14:32:45 -04:00

..

armor_break.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

bh_armor_sprint_1.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

bh_cover_1.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

bh_prescience.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

bh_return_fire_1.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

bleeding.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

buildabuff_inspiration.py

Added Buff Workshop Collection, hologram variable to creatureobject

2014-03-23 13:42:18 -04:00

co_base_of_operations.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

co_first_aid_training.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

co_position_secured.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

co_stand_fast.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

en_action_regen.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

en_debuff_thrill_1.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

en_debuff_thrill_2.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

en_debuff_thrill.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

en_spiral_kick_snare.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

en_sprint.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

en_sweeping_pirouette_root.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

en_unhealthy_fixation_debuff.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

en_void_dance_buff_1.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

en_void_dance_buff_2.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

en_void_dance_buff_3.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

en_void_dance_buff.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

flawless_bead_1.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

flawless_bead_2.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

flawless_bead_3.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

fs_ae_dm_cc_0.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

fs_ae_dm_cc_1.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

fs_ae_dm_cc_2.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

fs_ae_dm_cc_3.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

fs_ae_dm_cc_4.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

fs_ae_dm_cc_5.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

fs_ae_dm_cc_6.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

fs_buff_ca_1.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

fs_buff_def_1_1.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

fs_dm_cc_crit_1.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

fs_dm_cc_crit_2.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

fs_dm_cc_crit_3.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

fs_dm_cc_crit_4.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

fs_dm_cc_crit_5.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

fs_force_run.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

fs_force_throw.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

fs_saber_reflect.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

invis_fs_buff_invis_1.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

me_buff_action_1.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

me_buff_action_2.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

me_buff_action_3.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

me_buff_agility_1.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

me_buff_agility_2.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

me_buff_agility_3.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

me_buff_health_0.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

me_buff_health_2.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

me_buff_health.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

me_buff_melee_gb_1.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

me_buff_precision_1.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

me_buff_precision_2.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

me_buff_precision_3.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

me_buff_ranged_gb_1.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

me_buff_strength_1.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

me_buff_strength_2.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

me_buff_strength_3.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

me_burst_1.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

me_cranial_smash_1.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

me_cure_affliction_1.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

me_doom.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

me_electrolyte_drain_1.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

me_evasion_1.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

me_rheumatic_calamity_1.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

me_serotonin_boost_1.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

me_serotonin_purge_1.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

me_stasis_1.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

me_stasis_self_1.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

me_thyroid_rupture_1.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

of_adv_paint_debuff_1.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

of_adv_paint_debuff_2.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

of_adv_paint_debuff_3.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

of_adv_paint_debuff_4.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

of_adv_paint_debuff_5.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

of_adv_paint_debuff_6.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

of_adv_paint_debuff_7.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

of_adv_paint_debuff_8.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

of_adv_paint_expose_1.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

of_adv_paint_expose_2.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

of_adv_paint_expose_3.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

of_adv_paint_expose_4.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

of_adv_paint_expose_5.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

of_adv_paint_expose_6.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

of_adv_paint_expose_7.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

of_adv_paint_expose_8.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

of_ae_dm_cc_1.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

of_ae_dm_cc_2.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

of_ae_dm_cc_3.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

of_buff_def_1.py

Officer - Fixed Tactics Duration

2014-03-23 07:07:27 +01:00

of_buff_def_2.py

Officer - Fixed Tactics Duration

2014-03-23 07:07:27 +01:00

of_buff_def_3.py

Officer - Fixed Tactics Duration

2014-03-23 07:07:27 +01:00

of_buff_def_4.py

Officer - Fixed Tactics Duration

2014-03-23 07:07:27 +01:00

of_buff_def_5.py

Officer - Fixed Tactics Duration

2014-03-23 07:07:27 +01:00

of_buff_def_6.py

Officer - Fixed Tactics Duration

2014-03-23 07:07:27 +01:00

of_buff_def_7.py

Officer - Fixed Tactics Duration

2014-03-23 07:07:27 +01:00

of_buff_def_8.py

Officer - Fixed Tactics Duration

2014-03-23 07:07:27 +01:00

of_buff_def_9.py

Officer - Fixed Tactics Duration

2014-03-23 07:07:27 +01:00

of_cc_melee_1.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

of_cc_melee_2.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

of_cc_melee_3.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

of_cc_melee_4.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

of_cc_melee_5.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

of_cc_melee_6.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

of_cc_melee_7.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

of_charge_1.py

Officer - Fixed buff duration and errors

2014-03-23 02:59:25 +01:00

of_deadeye_debuff.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

of_deb_def_1.py

Officer - Fixed buff duration and errors

2014-03-23 02:59:25 +01:00

of_deb_def_2.py

Officer - Fixed buff duration and errors

2014-03-23 02:59:25 +01:00

of_deb_def_3.py

Officer - Fixed buff duration and errors

2014-03-23 02:59:25 +01:00

of_deb_def_4.py

Officer - Fixed buff duration and errors

2014-03-23 02:59:25 +01:00

of_deb_def_5.py

Officer - Fixed buff duration and errors

2014-03-23 02:59:25 +01:00

of_deb_def_6.py

Officer - Fixed buff duration and errors

2014-03-23 02:59:25 +01:00

of_deb_def_7.py

Officer - Fixed buff duration and errors

2014-03-23 02:59:25 +01:00

of_deb_def_8.py

Officer - Fixed buff duration and errors

2014-03-23 02:59:25 +01:00

of_decap_bleed_1.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

of_decap_bleed_2.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

of_decap_bleed_3.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

of_decap_bleed_4.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

of_decap_bleed_5.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

of_decap_bleed_6.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

of_dot_bomb_1.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

of_drillmaster_1.py

Officer - Fixed buff duration and errors

2014-03-23 02:59:25 +01:00

of_emergency_shield.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

of_firepower.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

of_focus_fire_1.py

Officer - Fixed buff duration and errors

2014-03-23 02:59:25 +01:00

of_focus_fire_2.py

Officer - Fixed buff duration and errors

2014-03-23 02:59:25 +01:00

of_focus_fire_3.py

Officer - Fixed buff duration and errors

2014-03-23 02:59:25 +01:00

of_focus_fire_4.py

Officer - Fixed buff duration and errors

2014-03-23 02:59:25 +01:00

of_focus_fire_5.py

Officer - Fixed buff duration and errors

2014-03-23 02:59:25 +01:00

of_focus_fire_6.py

Officer - Fixed buff duration and errors

2014-03-23 02:59:25 +01:00

of_inspiration_1.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

of_inspiration_2.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

of_inspiration_3.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

of_inspiration_4.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

of_inspiration_5.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

of_inspiration_6.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

of_last_words.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

of_pistol_bleed.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

of_purge_1.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

of_scatter_1.py

Officer - Fixed buff duration and errors

2014-03-23 02:59:25 +01:00

of_stimulator_1.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

of_vortex_bleed_1.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

of_vortex_bleed_2.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

of_vortex_bleed_3.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

of_vortex_bleed_4.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

of_vortex_bleed_5.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

of_vortex_root.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

poisoned.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

proc_old_dark_jedi_gift.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

proc_old_light_jedi_gift.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

saberblock.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

set_bonus_bh_dps_1.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

set_bonus_bh_dps_2.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

set_bonus_bh_dps_3.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

set_bonus_bh_utility_a_1.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

set_bonus_bh_utility_a_2.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

set_bonus_bh_utility_a_3.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

set_bonus_bh_utility_b_1.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

set_bonus_bh_utility_b_2.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

set_bonus_bh_utility_b_3.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

set_bonus_hero_1.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

set_bonus_hero_2.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

set_bonus_hero_3.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

sm_ae_dm_cc_1.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

sm_ae_dm_cc_2.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

sm_ae_dm_cc_3.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

sm_ae_dm_cc_4.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

sm_ae_dm_cc_5.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

sm_ae_dm_cc_6.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

sm_pistol_whip_1.py

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00