Rsl1122 1039c54f58 Merge remote-tracking branch 'origin/data-refactoring-bridge-fixes' into data-refactoring ... # Conflicts: # Plan/src/main/java/com/djrapitops/plan/data/Actions.java # Plan/src/main/java/com/djrapitops/plan/data/PlayerProfile.java # Plan/src/main/java/com/djrapitops/plan/data/ServerProfile.java # Plan/src/main/java/com/djrapitops/plan/data/container/Action.java # Plan/src/main/java/com/djrapitops/plan/data/container/GeoInfo.java # Plan/src/main/java/com/djrapitops/plan/data/container/StickyData.java # Plan/src/main/java/com/djrapitops/plan/data/store/mutators/HealthInformation.java # Plan/src/main/java/com/djrapitops/plan/system/database/databases/operation/SaveOperations.java # Plan/src/main/java/com/djrapitops/plan/system/database/databases/operation/TransferOperations.java # Plan/src/main/java/com/djrapitops/plan/system/database/databases/sql/operation/SQLFetchOps.java # Plan/src/main/java/com/djrapitops/plan/system/database/databases/sql/tables/ActionsTable.java # Plan/src/main/java/com/djrapitops/plan/system/info/server/BukkitServerInfo.java # Plan/src/main/java/com/djrapitops/plan/system/listeners/bukkit/PlayerOnlineListener.java # Plan/src/main/java/com/djrapitops/plan/system/listeners/sponge/SpongePlayerListener.java # Plan/src/main/java/com/djrapitops/plan/system/processing/processors/player/FirstLeaveProcessor.java # Plan/src/main/java/com/djrapitops/plan/system/webserver/pages/parsing/AnalysisPage.java # Plan/src/main/java/com/djrapitops/plan/system/webserver/pages/parsing/NetworkPage.java # Plan/src/main/java/com/djrapitops/plan/system/webserver/pages/parsing/Page.java # Plan/src/main/java/com/djrapitops/plan/utilities/html/structure/SessionTabStructureCreator.java # Plan/src/main/java/com/djrapitops/plan/utilities/html/tables/ActionsTable.java # Plan/src/main/java/com/djrapitops/plan/utilities/html/tables/SessionsTableCreator.java		2018-07-09 08:33:03 +03:00
..
src	Merge remote-tracking branch 'origin/data-refactoring-bridge-fixes' into data-refactoring	2018-07-09 08:33:03 +03:00
PlanPluginBridge-4.3.0.jar	Updated PluginBridge jar	2018-05-24 15:50:19 +03:00
pom.xml	Merge PR #596 from PyvesB/aach to 4.3.3	2018-06-02 12:32:57 +03:00