Commit Graph

885 Commits

Author SHA1 Message Date
eueln
561ab22924 Remove most mentions of getOfflinePlayer(String)
Faction bank accounts will need to be migrated to use UUID identifiers
before we can remove the remaining getOfflinePlayer(String) calls.
2015-01-09 11:44:15 -06:00
mrlolethan
dc3e7e953b Fix "No player found" message in CmdKick
When `/f kick` was used with zero arguments, an ugly message was sent to
the player regarding a missing player match for "null"
2015-01-07 18:14:27 -06:00
drtshock
8103f953eb Allow chat spying to persist. 2015-01-06 16:08:58 -06:00
drtshock
8300b2ff2b Allow players to monitor joins and leaves of their faction members.
Larger servers tend to have join and leave messages disabled for the entire server. A few have requested to allow faction members to monitor join and leave messages of their own members.
2015-01-06 16:06:46 -06:00
eueln
d36e88f2c0 Correctly remove faction warps in unclaimed land 2015-01-06 11:59:15 -06:00
eueln
5799a0480b Fix String-related bugs
The result of a call to String#toLowerCase() was ignored, and two
Strings were being compared with ==
2015-01-06 11:59:15 -06:00
drtshock
f411b4e014 Remove unneeded permissions class. 2015-01-05 10:40:35 -06:00
eueln
d6bbea7244 Add missing early return in CmdMod 2015-01-05 10:00:51 -06:00
drtshock
0a80b79321 Check for relation when a player tries to create a destination portal in claimed land. Adds #204. 2015-01-05 09:58:32 -06:00
t00thpick1
37565463ad A few optimizations. 2015-01-02 19:33:34 -05:00
t00thpick1
44dc04e3e1 There are lots of unfactioned players, but we shouldn't care about them. 2015-01-02 19:19:57 -05:00
drtshock
91f9d1d8db Remove tooltips for f show and f list.
Tooltips were causing a lot of issues on larger servers. Constructing them as well as the lookups required to display them caused significant lag.

Resolves #197, #164.
2015-01-02 13:38:35 -06:00
Tibo442
2209090783 Different message for own faction and for other factions when faction not found.
Still weird for faction-less players to do /f show <other faction-less player>
2014-12-30 10:07:35 -06:00
t00thpick1
3f949e18cc Lets not do hundreds of object clones when they are nearly never needed. 2014-12-30 00:31:36 -05:00
eueln
c4c5bd9df9 Don't perform /f who for players without a faction 2014-12-29 22:02:18 -06:00
eueln
190c2d793f Use rounded value to match format in /f powerboost 2014-12-24 04:15:16 -06:00
eueln
4703f08027 Fix /f create TL; Save TL nodes on first launch 2014-12-20 20:17:56 -06:00
Tibo442
0d75b1164a Changed FancyMessage.command() to accept command aliases.
Also adds support for servers where slash-less commands are disabled.
2014-12-19 13:51:24 +01:00
Tibo
728b6b0fbc Fix /f enemy/neutral/ally's message of sender's faction 2014-12-19 13:11:38 +01:00
eueln
3c2e51e8ed Make LandUnclaimAllEvent Cancellable 2014-12-17 20:50:28 -06:00
eueln
3733539077 Add cancellable FactionRelationWishEvent
This event is called before a faction relation wish is applied by a
player using `/f relation`
2014-12-17 20:31:21 -06:00
eueln
1ada19b02e Properly split FancyMessages for /f show 2014-12-14 17:24:25 -06:00
eueln
6d2ca16002 Initialize FTeamWrapper if it doesn't exist. Fixes #179 2014-12-14 16:15:25 -06:00
korikisulda
10fd3f082a Fixed phantom section. Accursed underscores. 2014-12-14 13:39:45 -06:00
drtshock
9aecd5f439 Reformat. 2014-12-11 10:05:04 -06:00
drtshock
125a8c2050 Add default American English translation file. 2014-12-11 10:01:05 -06:00
korikisulda
1ce1eb51d4 Add Japanese translation 2014-12-11 09:46:06 -06:00
drtshock
8788778d05 Expose loadLang as public and reload from disk on /f reload. 2014-12-11 09:16:12 -06:00
drtshock
fa4154a0ce Allow f show to be sent to non-players.
Fanciful will remove the json formatting to send a readable message.
2014-12-10 22:36:46 -06:00
drtshock
c9433d0cf3 Send f show messages all at once to remove delay. 2014-12-10 22:32:47 -06:00
korikisulda
24e7873892 Removed contents of lang file. It's outdated, and they're automatically populated anyway. 2014-12-09 23:24:37 +00:00
eueln
a70cfdaf71 Fix /f {set,del,}warp transactions 2014-12-09 17:16:42 -06:00
drtshock
a01d79ef78 Allow the default relation between Factions to be configurable. 2014-12-09 16:01:20 -06:00
korikisulda
1230803cfb Add TL for commands. Resolves #162. Supercedes #97. 2014-12-08 19:47:19 -06:00
eueln
bd8f572cbf Revert reformat on Conf.java 2014-12-08 15:00:20 -06:00
eueln
a6585e6f5c Fix /f warp on Java 6 and 7
Covariance on ConcurrentHashMap#keySet() in Java 8 was to blame.
2014-12-07 21:59:59 -06:00
eueln
e4bafcf072 Clean board on startup 2014-12-07 15:15:42 -06:00
drtshock
caa6f0f0f0 Reformat 2014-12-07 14:26:13 -06:00
korikisulda
a1ab22554c Added dynmap integration. Glory to Arstotzka! Addresses #109 2014-12-07 14:22:29 -06:00
t00thpick1
b8f742a588 Remove players from internal map immediately.
Should resolve #117
2014-12-07 14:59:44 -05:00
eueln
e9b0a4d67c Check projectile shooter's type before casting. Fixes #158 2014-12-07 13:20:48 -06:00
eueln
5e676bdd50 Order /f show by rank. Adds #150 2014-12-06 21:44:00 -06:00
korikisulda
6107e9502e Truncate excessively long online/offline player messages in /f show/who. Resolves #154. 2014-12-06 21:23:19 -06:00
eueln
0487ca77e5 Add spigot constraint for 48-char sidebar text
Spigot has a method `addEntry(String)` for Teams that doesn't block,
unlike the OfflinePlayer option. If the server doesn't have this method,
lines are limited to 16 characters as usual.
2014-12-05 15:58:00 -06:00
eueln
ff2e32feff Fix format in CmdModifyPower message. Fixes #145 2014-11-29 16:29:29 -06:00
drtshock
edfe465ad5 Add missing return statements. 2014-11-17 14:30:41 -06:00
Tibo
356842ab41 Fix clients getting kicked from too many allies/enemies. 2014-11-17 20:16:58 +01:00
Tibo
b970755cb1 Fix spaces with ", "
Fixes #134
2014-11-17 19:32:34 +01:00
eueln
4b6ccc7967 Don't invisibly update faction prefixes when they're disabled 2014-11-17 01:22:12 -06:00
eueln
3af4c9a616 Store OfflinePlayers in FTeamWrapper instead of looking them up 2014-11-15 16:54:16 -06:00
drtshock
8910de367c Require players to be in a faction to promote. 2014-11-14 14:13:51 -06:00
drtshock
bad874495b Add command to modify a player's power specified in #133.
use /f modpower name number
2014-11-14 13:27:23 -06:00
drtshock
104f90c1db Send invite message to correct player. Fixes issue #132 2014-11-14 13:03:51 -06:00
drtshock
54d486cc84 Add tooltips and click commands to f deinvite and show invites. 2014-11-14 10:08:18 -06:00
drtshock
2aa7d7f98d Add tooltips and click commands to f deinvite. 2014-11-14 10:03:57 -06:00
drtshock
03b8f11646 Add tooltips and click commands to f mod. 2014-11-14 09:59:36 -06:00
drtshock
b895fa1e99 Add tooltips and click commands to f kick. 2014-11-14 09:56:13 -06:00
drtshock
656dc90b33 Add tooltips and ability to click to warp when you list faction warps. 2014-11-14 09:46:28 -06:00
drtshock
c4f4036e1d Add tooltips for f show.
Refactor tooltip methods to be shared across command classes.
2014-11-13 13:49:13 -06:00
drtshock
43826d986f Add colors to /f list 2014-11-13 12:52:21 -06:00
drtshock
64e234144e /f list tool tips 2014-11-13 12:45:57 -06:00
drtshock
e585ab57a9 Remove unused f list code. 2014-11-13 09:12:34 -06:00
drtshock
201d10ada5 Add economy option for f warps from #126. 2014-11-11 09:28:53 -06:00
eueln
fdce32e04c Correct FTeamWrapper faction disband detection 2014-11-09 21:27:03 -06:00
eueln
00045b0186 Don't repeatedly update FTeamWrapper for the same faction 2014-11-09 21:12:42 -06:00
drtshock
81182dccaa Add option to completely disable pistons in faction territory.
This is a preemptive method to block new things like http://i.gyazo.com/6a1a31222e58a5d60ff341c13f6a8404.gif
2014-11-08 19:07:42 -06:00
drtshock
ccd8720b09 Fix keySetView issue on non java8 servers. 2014-11-08 14:59:45 -06:00
eueln
917c442b59 Correct implementation of FTeamWrapper::updatePrefix 2014-11-07 13:13:54 -06:00
eueln
29836a9183 Remove faction team prefixes when disbanded 2014-11-07 12:55:59 -06:00
eueln
ea8bb9e24f Remove ghost FInfoBoard.java file 2014-11-07 12:51:18 -06:00
drtshock
77e3fd90b4 Don't assume Essentials is running. 2014-11-07 12:38:45 -06:00
drtshock
962f92496c Don't allow vanished players to block others from teleporting. Fixes #111. 2014-11-07 12:08:57 -06:00
drtshock
8b64b4bfe1 Adds per faction warps functionality from #72.
Default max warps per faction is 5. It can be changed in the config.yml.
You can now use {warps} in the info board to show how many warps a faction has when you walk into their territory.
Only faction mods+ can set faction warps.
2014-11-07 11:49:54 -06:00
drtshock
35813c7210 Reformat. 2014-11-05 18:36:47 -06:00
drtshock
27bf2008f1 Have factions return as 0 instead of null. 2014-11-05 18:36:13 -06:00
drtshock
b66c9ad078 Add missing command help to help command. Resolves #101. 2014-11-05 11:34:46 -06:00
drtshock
11ae51a6ca Check if FTeamWrapper exists for faction. Fixes #107 2014-11-05 11:06:15 -06:00
eueln
2e1a43c228 Make MemoryFactions::load non-abstract.
MemoryFactions::load was incorrectly marked as abstract, which wouldn't
have been possible if not for an erroneous semicolon.

Additionally, we need to call MemoryFactions::load from subclasses.

Fixes #105
Fixes #106
2014-11-02 13:00:01 -06:00
eueln
99c582dda8 Fix issues in CmdOpen
A formatted message was missing a format argument, and comparison on
Strings was being performed with ==
2014-11-02 01:10:41 -05:00
eueln
6c70a7d105 Properly handle player kick before PlayerJoinEvent
Fixes #104
2014-10-31 13:23:22 -05:00
t00thpick1
3e15189c11 Ensure that even if fields are missing from save file, that fields are instantiated. 2014-10-31 10:47:59 -04:00
t00thpick1
ee52016a87 Abstract Data storage method for future implementations. Thanks to Ryan from Reactive MC
Also included:
-Heavily optimized loading process
-Optimizations for various commands.
2014-10-30 23:59:59 -04:00
eueln
17a95fc786 Use older version of Bukkit
For players on versions earlier than 1.7.10, our usage of
getOnlinePlayers() currently throws a NoSuchMethodError.
2014-10-30 23:26:24 -04:00
eueln
79c989bfc8 Remove erroneous comment 2014-10-30 23:26:24 -04:00
eueln
653f918a1b Add support for Glowstone
Glowstone doesn't yet support PlayerMoveEvent nor Scoreboards, so
functionality is unfortunately limited.
2014-10-30 23:26:23 -04:00
eueln
7f2ef4cbd5 Improve Team prefix performance
This change vastly improves performance for faction team prefix update
operations.
2014-10-30 23:26:23 -04:00
Byteflux
90e57740a2 Allow default prefix customization from lang file 2014-10-30 23:26:22 -04:00
drtshock
33bd9f7e81 Allow prefix to be configurable. 2014-10-30 23:26:22 -04:00
eueln
947f82cb2f Don't repeatedly copy the Set<FPlayer> of Faction members 2014-10-30 23:26:22 -04:00
eueln
157d98d4b0 Store FScoreboards by FPlayer instead of Player 2014-10-30 23:26:21 -04:00
drtshock
e739ea0bf6 Add brackets in faction tag. U0.1.7 2014-10-30 23:26:21 -04:00
eueln
49babcd4e8 Add player to faction team when they log in 2014-10-30 23:26:21 -04:00
eueln
c049768e21 Add faction tag to team prefix 2014-10-30 23:26:20 -04:00
Byteflux
51f1ceee14 Show power next to member names in /f show 2014-10-30 23:26:20 -04:00
drtshock
ad1439f431 Add check to prevent scoreboards merging. 2014-10-30 23:26:19 -04:00
drtshock
4929e5dd18 Limit block changes sent in seechunk to prevent client freezing. Use prettier blocks. 2014-10-30 23:26:19 -04:00
Byteflux
5569e5076a Add /f seechunk command for visualizing a chunk 2014-10-30 23:26:19 -04:00
Byteflux
81fc029736 Support modded enums in gson using custom EnumTypeAdapter. Resolves carbon breaking materials in issue #90. 2014-10-30 23:26:18 -04:00
eueln
7ada15992b Refactor scoreboard issue. Resolves issue #80. 2014-10-30 23:26:13 -04:00
eueln
25696f32aa Refactor scoreboard usage
In preparation for team colors, we need to unify scoreboard usage into a
single scoreboard per player.

Rather than creating a new scoreboard for each desired sidebar
objective, we provide an interface FSidebarProvider that allows
implementation-agnostic retrieval of the title and lines of the desired
sidebar, along with appropriate methods in the new implementation of
FScoreboard.

The new FScoreboard implementation manages the currently-visible
sidebar, with methods to set default (non-timed, with update interval)
and temporary (timed, no update interval) sidebars.

Temporary sidebars are replaced with the default sidebar upon
expiration.
2014-10-30 23:26:04 -04:00
drtshock
bed6fe0741 Add faction announcements to send to all players and show to players when they login if they were not online when it was first sent as requested in issue #82. 2014-10-18 03:54:45 -05:00
drtshock
e290ac0320 Add new permissions to plugin.yml and permission kits. Set scoreboards to enabled per player by default. 2014-10-16 13:35:21 -05:00
drtshock
e20995464e Toggling of scoreboards now affects the default board. 2014-10-15 20:58:37 -05:00
drtshock
aee7092b09 Add a scoreboard that can be given to people by default when they join as specified in issue #79.
This was hacked together as I wanted more functionality. Should probably make this prettier and better later.
2014-10-15 19:56:02 -05:00
drtshock
525d31c2b2 Be friendly to other plugins that show scoreboards. Adds #74. 2014-10-15 16:21:27 -05:00
drtshock
4f3310d88f Reload the config.yml on /f reload. 2014-10-15 15:45:20 -05:00
drtshock
2fc17c62b5 Properly persist scoreboard toggles. Fixes issue #61 2014-10-15 15:29:04 -05:00
blha303
9baf297ff7 Add /f status command, closes #70 2014-10-15 12:30:03 -05:00
drtshock
a170a0f4ad /f showinvites for ability to see pending invites for current faction. Adds feature in ticket #76 2014-10-14 13:30:05 -05:00
drtshock
bfc904332a Fix spelling error. 2014-10-13 16:25:32 -05:00
drtshock
04fd18f17a Add tooltips and commands for f invite command as specified in issue #73. 2014-10-13 14:10:18 -05:00
drtshock
272c35cda6 Add cooldown for auto showing f map to players. Fixes issue #64. 2014-10-09 11:04:11 -05:00
drtshock
49e69b74c8 Add radiable as an option for the scoreboard. 2014-10-06 09:48:28 -05:00
Ihaveaporpoise
8e248c9ea7 Make reload command only call configuration file. Fixes issue #59 2014-10-05 00:28:00 -05:00
Ihaveaporpoise
eceb10c185 Prevent players in peaceful factions from damaging with harmful potions. Fixes issue #50. 2014-09-30 19:11:51 -05:00
drtshock
bf6a3c2a4b Version U0.1.5 2014-09-25 13:44:35 -05:00
drtshock
39e0380570 Add patch for interact event. Fixes issue #53. Thanks @swifteh 2014-09-25 13:39:22 -05:00
drtshock
b444b25bc1 Add config toggle for Info scoreboard. 2014-09-01 14:56:32 -05:00
VirtualByte
09d6102798 Fixed economy issues 2014-09-01 13:06:35 -05:00
drtshock
0f88e8535d Limit length of f show messages. Fixes issue #44.
Clients could crash if the messages were too long so we'll limit it here. Thanks to @mccore for the method here.
2014-08-26 13:05:54 -05:00
drtshock
ddf054330a First implementation of scoreboards.
Boards can be toggled with /f sb. Toggles are persistent in a yml file.
Also fix some small spelling and format things that were really bugging me.
2014-08-05 10:17:27 -05:00
drtshock
c735053bc3 Refix chat handling. 2014-08-02 18:19:56 -05:00
drtshock
30f4fdf6c6 Properly replace chat. Hardcoding never helped anyone.
Fixes issue #30.
Use ternaries where possible.
2014-08-02 17:37:48 -05:00
drtshock
957f8a209d Don't apply chat tags twice. 2014-08-02 16:32:25 -05:00
drtshock
5938a4987e Make bare /f command show help.
Just making the plugin think they actually executed the help command because the help pages are built inside of that class and I'd rather not worry about moving them out of there or easily accessible.
2014-07-12 15:50:56 -05:00
drtshock
3298183fdf Add missing javadocs. 2014-07-09 14:01:53 -05:00
drtshock
4d5278b079 Improve and document event system. Deprecate duplicate methods. 2014-07-09 14:00:16 -05:00
drtshock
7604b4455b Don't allow players to be kicked from wilderness faction for whatever reason. Somewhat fixes issue #29. 2014-07-09 13:38:19 -05:00
drtshock
7f1b2d73ad Make sure damage modification is commented out. 2014-07-09 13:20:38 -05:00
drtshock
484a8cc233 Merge branch '1.6.x' of https://github.com/hintss/Factions into hintss-1.6.x 2014-07-09 13:18:50 -05:00
drtshock
1fa7e28ffd Comment out territory shield because modifying the damage just doesn't want to work. 2014-07-08 13:54:22 -05:00
drtshock
0d0085f423 Use double for multiplying damage. Fixes issue #25. 2014-07-05 23:52:07 -05:00
drtshock
3c2f48d582 Remove metrics. 2014-07-05 13:21:10 -05:00
drtshock
d968b9878c Listen to commands to see if they should be allowed. Fixes issue #26. 2014-07-05 13:20:07 -05:00
drtshock
526734b9f6 Update to use async chat event. 2014-07-03 13:04:17 -05:00
Henry Ammermann
97bc72e4f8 intellij autofixes! 2014-07-01 23:37:42 -07:00
Henry Ammermann
95899e7ab9 make Flocation's getCircle not use a square root 2014-07-01 14:51:39 -07:00
drtshock
8a6a97cc90 Reformat 2014-07-01 15:10:18 -05:00
drtshock
5066934a95 More reformatting 2014-07-01 14:52:40 -05:00
drtshock
dc54f78cc1 Some reformat 2014-07-01 14:49:42 -05:00
drtshock
672e115d8b Update default factions description and tags if changed in the lang file. 2014-07-01 13:46:30 -05:00
drtshock
cd65375bd9 Add TL file. Use CommandExecutor to properly handle commands instead of using the preprocess listener and breaking other plugins. 2014-07-01 13:19:36 -05:00
drtshock
753c32785d Fix flocation owner showing as uuid instead of name. Fixes issue #18 2014-06-30 13:41:52 -05:00
drtshock
ee96e330b7 U0.1.2. Attempt to hook chat tags. 2014-06-27 14:57:18 -05:00
drtshock
024e88a35b Fix metrics call to getOnlinePlayers 2014-06-27 13:43:12 -05:00
Trent
a47caa4ff6 Merge pull request #16 from Scyntrus/1.6.x
Re added get function with Player parameter for PlayerEntityCollection
2014-06-17 02:22:22 -05:00
ediTv2
1d13121407 Fix for Issue #6 (Arrow Entity Damage) 2014-06-16 22:54:50 -07:00
Steven Timotius
b3a37576cd Re added get function with Player parameter for PlayerEntityCollection for backwards compatibility 2014-06-03 21:02:24 -07:00
drtshock
a8e3b3c1e2 Add Metrics. Disable opting out because we want to know. Increment version to U0.1.1 2014-05-23 00:46:35 -05:00
drtshock
997d0c5a43 Offline players will not be null. This was interfering with faction invites for some reason. 2014-05-20 16:45:13 -05:00
drtshock
b10e31acbb Remove some unneeded files. 2014-05-19 13:08:37 -05:00
drtshock
28afd6530c Fix f who issue with looking up offline players. Fixes issue #8 2014-05-19 13:03:26 -05:00
drtshock
5d50dc9971 Add this. 2014-05-19 11:45:45 -05:00
drtshock
024336d717 Readd essentials teleport cooldown hook. Fixes issue #5 2014-05-19 11:44:15 -05:00
drtshock
7107829446 Fix missed diff when removing Spout compatibility. Fixes issue #11. 2014-05-19 11:14:55 -05:00
CoOwner/Developer for @ArkhamNetwork - Java, PHP, Redis, LAMP
1a9a2f65c0 Replace getName with hasPlayedBefore as offlineplayer will never be null. This fixes quite a few command bugs. 2014-05-16 17:48:59 +01:00
gravitylow
51ac5d2cb2 Update commands to search by UUID 2014-04-16 23:15:14 -04:00
gravitylow
bad3d779c5 Lookup by player instead of name/id 2014-04-16 22:29:38 -04:00
gravitylow
76be9f16f7 Update block usage to use UUIDs 2014-04-16 22:22:32 -04:00
gravitylow
da16b662b4 Update faction storage to use UUID 2014-04-16 21:10:12 -04:00
gravitylow
43d5c32bad Update block usage player lookups 2014-04-16 18:35:55 -04:00
gravitylow
91e7b1587f Update command player lookups, fixes #3 2014-04-16 18:35:36 -04:00
CoOwner/Developer for @ArkhamNetwork - Java, PHP, Redis, LAMP
2c13dd463c Fix getting the wrong faction from player
This fixes factions getting the wrong faction from a player. Before it was returning a wrong faction and the player could not build in his/her own land.
2014-04-16 20:07:08 +01:00
gravitylow
e2f5548a5f Offline player name hotfix until I can write a good threaded use of OfflinePlayer 2014-04-16 13:55:22 -04:00
drtshock
402b3b0d07 Always attempt to return a name before a uuid. 2014-04-16 12:28:57 -05:00
drtshock
9d73339e14 Ternary 2014-04-16 12:12:18 -05:00
gravitylow
d93a0b16cc Nullcheck name for offline player support 2014-04-16 13:07:14 -04:00
gravitylow
1736f34fc8 Show player name instead of UUID when requesting name.. 2014-04-16 12:33:24 -04:00
gravitylow
0f4bd48817 Create player backups before converting and save data straight away 2014-04-15 21:29:45 -04:00
gravitylow
f9074c0f59 Start re-versioning this fork 2014-04-15 19:09:17 -04:00
gravitylow
b73736b03b Update conversion process to look for dead entries and properly save responses 2014-04-15 18:54:13 -04:00
gravitylow
61c64a94db Update UUIDFetcher to handle more requests 2014-04-15 18:53:38 -04:00
gravitylow
6c4cfd337e Java 6 compatible 2014-04-15 15:19:00 -04:00
gravitylow
8453ab3e76 Convert old player configs 2014-04-15 15:08:25 -04:00
gravitylow
e3c0f6376f More housekeeping 2014-04-15 13:42:09 -04:00
gravitylow
68d3145c7d Let's clean up this config.. 2014-04-15 13:23:18 -04:00
gravitylow
255549099f Store and lookup from UUID 2014-04-15 13:18:13 -04:00
drtshock
eb770edd7a Push pending stuff. 2014-04-13 16:31:10 -04:00
drtshock
b50cebcdb6 COMPILES 2014-04-05 17:25:15 -05:00
drtshock
a73f2b0174 Update to newer API. 2014-04-05 17:00:33 -05:00
drtshock
c4f7d6b756 Remove spout features, add worldguard and worldedit. 2014-04-05 15:42:01 -05:00
drtshock
d9b7cf7058 Remove spout, update pom for lwc. Still need lots of dependencies. 2014-04-04 14:35:35 -05:00
drtshock
814e439705 Reformat before I go crazy. 2014-04-04 13:55:21 -05:00
drtshock
0c3ea377dd Remove mac crap. 2014-04-04 13:54:22 -05:00
drtshock
c3983d3b96 Mavenize 2014-04-04 13:53:42 -05:00