RisTanA 73d83665e6 Revert "Revert "Merge remote-tracking branch 'upstream/master'"" ...

This reverts commit 9058eae8db.

2020-06-07 02:16:21 -07:00

..

aprilfools

Fixed merge issues.

2018-03-26 01:21:00 +01:00

auto_invasion

Fixed merge issues.

2018-03-26 01:21:00 +01:00

bh_event

Java 11.0.2 migration (#32)

2019-04-18 18:31:52 -05:00

emp_day

Java 11.0.2 migration (#32)

2019-04-18 18:31:52 -05:00

emperorsday

Java 11.0.2 migration (#32)

2019-04-18 18:31:52 -05:00

ep3demo

Java 11.0.2 migration (#32)

2019-04-18 18:31:52 -05:00

ewok_festival

Java 11.0.2 migration (#32)

2019-04-18 18:31:52 -05:00

gcwlaunch

Fixed merge issues.

2018-03-26 01:21:00 +01:00

gcwraids

Java 11.0.2 migration (#32)

2019-04-18 18:31:52 -05:00

generic_raid

Fixed merge issues.

2018-03-26 01:21:00 +01:00

halloween

Java 11.0.2 migration (#32)

2019-04-18 18:31:52 -05:00

housepackup

Revert "Revert "Merge remote-tracking branch 'upstream/master'""

2020-06-07 02:16:21 -07:00

invasion

Java 11.0.2 migration (#32)

2019-04-18 18:31:52 -05:00

lifeday

add additional wookiee vendor to celebration plus randomize the lifeday gifts so players could have chance to receive items from previous years

2018-06-28 17:23:00 -07:00

lost_squadron

Java 11.0.2 migration (#32)

2019-04-18 18:31:52 -05:00

area_badge.java

Java 11.0.2 migration (#32)

2019-04-18 18:31:52 -05:00

area_tefme.java

Fixed merge issues.

2018-03-26 01:21:00 +01:00

boss_buff.java

Fixed merge issues.

2018-03-26 01:21:00 +01:00

dianoga_dumpster.java

Revert "Revert "Merge remote-tracking branch 'upstream/master'""

2020-06-07 02:16:21 -07:00

ep3_herald_wookiee.java

Java 11.0.2 migration (#32)

2019-04-18 18:31:52 -05:00

ep3_trando_herald.java

Java 11.0.2 migration (#32)

2019-04-18 18:31:52 -05:00

event_tool.java

Java 11.0.2 migration (#32)

2019-04-18 18:31:52 -05:00

holiday_controller.java

Fixed merge issues.

2018-03-26 01:21:00 +01:00

honor_guard.java

Java 11.0.2 migration (#32)

2019-04-18 18:31:52 -05:00

no_rent.java

Fixed merge issues.

2018-03-26 01:21:00 +01:00

planet_event_handler.java

Fixed merge issues.

2018-03-26 01:21:00 +01:00

quick_weapon.java

Fixed merge issues.

2018-03-26 01:21:00 +01:00

shield_ring.java

Fixed merge issues.

2018-03-26 01:21:00 +01:00

shuttle_control.java

Fixed merge issues.

2018-03-26 01:21:00 +01:00

shuttle.java

Fixed merge issues.

2018-03-26 01:21:00 +01:00