Fuzzlemann a66b4d8104 Merge branch '4.0.0-BungeeCord-Support' of https://github.com/Rsl1122/Plan-PlayerAnalytics ... # Conflicts: # Plan/src/main/java/com/djrapitops/plan/Plan.java # Plan/src/main/java/com/djrapitops/plan/command/commands/QuickInspectCommand.java # Plan/src/main/java/com/djrapitops/plan/data/handling/PlaytimeHandling.java		2017-08-21 19:46:51 +02:00
..
.idea	Fix PluginBridge (#254 #253 #232)	2017-08-17 11:23:14 +03:00
src/main	Merge branch '4.0.0-BungeeCord-Support' of https://github.com/Rsl1122/Plan-PlayerAnalytics	2017-08-21 19:46:51 +02:00
test/test/java	Merge branch '4.0.0-BungeeCord-Support' of https://github.com/Rsl1122/Plan-PlayerAnalytics	2017-08-21 19:46:51 +02:00
checkstyle.xml	Revamped Locale #219	2017-08-10 14:55:18 +03:00
Class Diagram.xml	Reformatted code	2017-07-26 15:46:20 +02:00
dependency-reduced-pom.xml	New Html, Rewrote Config, Deprecated some Settings enums	2017-08-20 12:20:01 +03:00
nbactions.xml	Reformatted code	2017-07-26 15:46:20 +02:00
pom.xml	Themes (Examples generated onEnable, temporary)	2017-08-20 22:15:13 +03:00