Upstream/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-15 10:45:45 +01:00
Code Issues Packages Projects Releases Wiki Activity
2,758 Commits 14 Branches 68 Tags 88 MiB
2b9fe5afda
Commit Graph

571 Commits

Author SHA1 Message Date
Jesse Boyd
f6540bbfcb
bypass owner check for download 2017-06-29 15:38:37 +10:00
dordsor whitwell
507d0f19e4 Lower TPS threshold please 2017-06-24 16:11:52 +01:00
Jesse Boyd
2b1905889c
Minor sponge fix 2017-05-16 13:20:28 +10:00
Gabscap
f8ab36b67c Fix world.min_height setting 2017-05-01 21:23:21 +02:00
Jesse Boyd
b5ef5df20d
* 2017-04-28 01:47:05 +10:00
Jesse Boyd
509b1f1c3d
Fixes #1593 2017-04-28 00:59:59 +10:00
Jesse Boyd
bfe98f3285
Some claiming fixes 2017-04-20 14:12:40 +10:00
Jesse Boyd
47915b8b86
Read sign on main thread 2017-04-20 01:09:52 +10:00
Jesse Boyd
3c110bb125
Fixes #1585 2017-04-18 22:55:04 +10:00
Jesse Boyd
a87fee1224 Merge pull request #1583 from manuelgu/patch-3 
Added useSSL=false to JDBC connection URL
 2017-04-17 22:28:20 +10:00
Jesse Boyd
193948d4fd
Fix claim 2017-04-17 11:56:10 +10:00
manuelgu
b616951e23 Added useSSL=false to JDBC connection URL 
This is required according to MySQL 5.5.45+, 5.6.26+ and 5.7.6+.
 2017-04-16 22:17:17 +02:00
Jesse Boyd
37977f1da4
Check database before claiming plot 2017-04-15 12:40:23 +10:00
Jesse Boyd
7eb7cd9b53
Ensure world loading occurs on the main thread 2017-04-11 01:49:01 +10:00
Jesse Boyd
ddfcc5b077
Player login tweaks 2017-04-10 09:06:44 +10:00
Jesse Boyd
9f6bf14649
Log when a plot is created/deleted 2017-04-09 17:10:23 +10:00
Jesse Boyd
f99994737c
Print error when failing to close database 2017-04-09 17:09:06 +10:00
Jesse Boyd
6e0ade4f63
Some sponge fixes 2017-04-07 08:25:08 +10:00
Jesse Boyd
c1a6c75ebe
* 2017-04-04 08:07:54 +10:00
Jesse Boyd
022372e9b7
Fixes #1534 + various 
Auto world loading/unloading
Auto player teleporting on login
 2017-04-04 07:59:36 +10:00
Jesse Boyd
3f54ba23c2
Fix world delete 2017-04-01 04:36:45 +11:00
Jesse Boyd
5d6f4c6668
Some plot area restructuring 2017-03-23 11:10:29 +11:00
Jesse Boyd
1129a80329
Fixes #1510 2017-03-17 17:41:58 +11:00
Jesse Boyd
a628c5927f
Fixes #1560 2017-03-17 16:40:29 +11:00
Jesse Boyd
478ad9670b
Fixes #1476 2017-03-16 14:15:00 +11:00
Jesse Boyd
8e3407505a
Recover on database error 
Might resolve #1476
 2017-03-15 02:10:57 +11:00
Jesse Boyd
e208d7f72a
Fix mass purge 2017-03-15 01:28:02 +11:00
Jesse Boyd
b0df79bb80
Break up purge task 2017-03-15 00:16:27 +11:00
Jesse Boyd
e9723f5be1
Fixes #1532 2017-03-13 18:38:58 +11:00
Jesse Boyd
a015039dad
Fixes #1535 
Set `misc_spawn_unowned`
 2017-03-13 18:36:40 +11:00
Jesse Boyd
0b6d2d3dd6
Fixes #1538 2017-03-13 18:07:48 +11:00
Jesse Boyd
ad11ad3472
Fixes #1517 2017-03-13 18:02:05 +11:00
Jesse Boyd
c8c144b6da
Merge branch 'master' of https://github.com/IntellectualSites/PlotSquared 2017-03-08 16:51:29 +11:00
Jesse Boyd
e94adb04ea
Add maven repo 
closes #1394
 2017-03-08 16:51:01 +11:00
Simon
b1fb01303d Fix plot teleport. 
Fixes https://github.com/IntellectualSites/PlotSquared/issues/1302
 2017-02-20 20:29:43 +01:00
Jesse Boyd
e7990a06e2
Check player name for invalid character first 2017-01-30 19:42:16 +11:00
Jesse Boyd
88f5e5b0bc
Sort player names 2017-01-15 22:51:54 +11:00
Jesse Boyd
47db330764
Fix title global flag 2017-01-13 08:05:13 +11:00
Jesse Boyd
35ebc8c830
Permission check fix 2017-01-13 07:22:28 +11:00
Jesse Boyd
cb6d839214
Possible fix for #1476 
Changes database load to prefer the latest entry over older ones.

Some previous changes may fix connections dropping, which resulted in
(incorrect) fixes being attempted by the plugin.
 2017-01-11 07:21:36 +11:00
Jesse Boyd
6af96f43d4
Optimize schematic paste 2016-12-31 17:23:46 +11:00
Jesse Boyd
e3eccfd476
Fix debugpaste 2016-12-31 17:23:38 +11:00
Jesse Boyd
15d4b6d34b
Bump spigot version 2016-12-29 07:23:51 +11:00
Jesse Boyd
a843203ca3
Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	Core/src/main/java/com/intellectualcrafters/plot/object/Plot.java
 2016-12-15 17:42:51 +11:00
Jesse Boyd
3240fc9559
Exit plot on unclaim 
Fixes #1471
 2016-12-15 17:37:26 +11:00
MattBDev
d554dab8c8 Fix potential NPE with claiming 2016-12-10 14:33:48 -05:00
MattBDev
9ad45750ee Unclaiming a plot should call plotExit() 2016-12-09 20:58:05 -05:00
MattBDev
a554ae5633 Potential fix for commands 2016-12-09 16:58:32 -05:00
Jesse Boyd
7b1c4a5042
Check border when claiming a plot 
Also fixes #1467
 2016-12-10 01:09:07 +11:00
Jesse Boyd
9fc464e896
Shorter border teleportation 2016-12-10 00:44:42 +11:00
Jesse Boyd
bec11b244e
Use the correct plot id 2016-12-10 00:26:40 +11:00
Jesse Boyd
dc94418b51
Only expand border to current plot. 2016-12-09 23:52:48 +11:00
Jesse Boyd
2b561f2efa
Rename to ice-form 2016-11-30 19:06:03 +11:00
Jesse Boyd
81418b07a8
Fixes #1438 (unless other things call this event) 2016-11-30 16:15:20 +11:00
Jesse Boyd
7c6c19ba63
Fixes #740 2016-11-30 16:07:16 +11:00
Jesse Boyd
2e23ae0811
Fixes #1243 2016-11-30 16:00:47 +11:00
Jesse Boyd
28e7f5bc08
Fixes #1349 
Non standard plot managers/areas not supported
 2016-11-30 15:57:24 +11:00
Jesse Boyd
5642fd3899
Fixes #1359 
plots.chat.color
and
PLOT_CHAT_SPY_FORMAT
 2016-11-30 15:36:13 +11:00
Jesse Boyd
95f8aaa2fe
this could be here? 2016-11-30 13:10:36 +11:00
Jesse Boyd
878010255c
Java 9 2016-11-28 18:02:03 +11:00
MattBDev
8d442f58d4 Fixes #1445 2016-11-26 12:05:08 -05:00
MattBDev
dc673f9715 Fixed #1440 , Fixed #1446 2016-11-26 11:55:38 -05:00
Jesse Boyd
deb5441bcf
*Fix compile error 2016-11-24 11:05:28 +11:00
Jesse Boyd
8ebf71c87f
DB fix 2016-11-24 10:19:00 +11:00
Jesse Boyd
9fd53af483
Add world argument 2016-11-23 15:47:18 +11:00
Jesse Boyd
fb729df59e
Setting to sort plots by area 2016-11-23 15:36:25 +11:00
MattBDev
e126054053 Fixes #1429 Removes duplicate aliases. 2016-11-20 22:29:14 -05:00
Jesse Boyd
e0208aa369
Fix plot help category pagination 2016-11-18 10:49:03 +11:00
Jesse Boyd
fdc42a3d5c
Seems the new spigot 1.11 sqlite driver has issues parsing timestamps, no idea why. 2016-11-18 09:08:41 +11:00
Jesse Boyd
2ec0b55482
Fix database lock error 2016-11-13 22:17:17 +11:00
Jesse Boyd
f8b1fcffa1
Fix worldedit mask area 2016-11-12 00:14:12 +11:00
Jesse Boyd
17762f5ae7
Tweak delete message 2016-11-09 00:13:46 +11:00
Jesse Boyd
c950b0021f
Notify inbox permission 2016-11-02 04:27:52 +11:00
Jesse Boyd
68011f43cd
Fixes #1390 2016-10-21 03:51:27 +11:00
Jesse Boyd
e594227d95
Fix some height issues 2016-10-14 16:56:28 +11:00
Jesse Boyd
d6be5703ae
Merge branch 'master' of https://github.com/IntellectualSites/PlotSquared 2016-10-14 15:14:35 +11:00
Jesse Boyd
c97544d083
Minor fixes 2016-10-14 15:14:08 +11:00
MattBDev
a05fd2dd11 Fix #1386 
Signed-off-by: MattBDev <mattbdev@outlook.com>
 2016-10-10 00:18:35 -04:00
Jesse Boyd
5978c9c3c0
Fix center 2016-10-03 00:56:27 +11:00
Jesse Boyd
5d3e096501
*Fix the toggle 2016-10-03 00:56:26 +11:00
filoghost
cd33aaa1b6 Fix permission checks being ignored 2016-10-01 21:35:57 +02:00
Jesse Boyd
0244c0241c
Trim deletes expired plots 2016-10-01 20:17:50 +10:00
Jesse Boyd
c533f0bae9 Fix area removal 2016-09-30 17:05:18 +10:00
Jesse Boyd
499120963a Streamline PlotMe conversion 
Use reflection to disable PlotMe and forward DefaultGenerator to
PlotSquared
Fix border material copying from plotme config
You no longer need to delete the PlotMe jar for conversion
Fix some outdated messages
 2016-09-30 16:14:35 +10:00
Jesse Boyd
f1d581a8d8 Fixes #1377 2016-09-30 15:29:50 +10:00
Jesse Boyd
6074fc8033 Nukkit generator fixes 2016-09-30 14:26:20 +10:00
Jesse Boyd
e4d7270c28 Fix some merged plot events 2016-09-30 03:30:34 +10:00
Jesse Boyd
b6df07f723 Add snow-form flag 2016-09-27 01:38:59 +10:00
Jesse Boyd
6bf2fbcfcf Command tweaks 2016-09-26 18:33:27 +10:00
Jesse Boyd
12f8861d07 Various 
externalize strings
plotme conversion fixes
 2016-09-26 18:31:08 +10:00
Jesse Boyd
c99e23bd3c Fixes #1367 2016-09-25 18:48:38 +10:00
Jesse Boyd
1b6d08b3fe Fixes #1365 2016-09-25 18:43:53 +10:00
Jesse Boyd
3b4490c1c6 Fixes #1366 2016-09-25 18:42:05 +10:00
Jesse Boyd
04c011164a Add near cmd 2016-09-25 18:06:20 +10:00
Jesse Boyd
364b4347d1 Fix area id parsing 2016-09-19 14:18:47 +10:00
Jesse Boyd
d89274ce09 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	Bukkit/src/main/java/com/plotsquared/bukkit/BukkitMain.java
 2016-09-17 16:03:57 +10:00
Jesse Boyd
264114332b Let generator be up to the implementation 2016-09-17 16:02:05 +10:00
MattBDev
8e7e5dcb25 Cleanup 
Signed-off-by: MattBDev <mattbdev@outlook.com>
 2016-09-14 12:16:22 -04:00
Jesse Boyd
56227a6d7d Fixes #1351 2016-09-14 10:21:14 +10:00
Jesse Boyd
63259ec269 Merge pull request #1352 from MisterErwin/master 
A (possible) fix to #1351
 2016-09-14 10:17:11 +10:00
Jesse Boyd
0286a7b046 Fixes #1131 2016-09-14 10:12:53 +10:00
Alexander Lüpges/MisterErwin
bf1d487508 A (possible) fix to #1351 2016-09-12 17:05:13 +02:00
Jesse Boyd
a95b68b73c Add villager-interact flag 2016-09-09 15:17:37 +10:00
Jesse Boyd
85ff8bf639 Minor tweaks 2016-09-07 00:28:01 +10:00
Jesse Boyd
07ee19b4bb Fixes #1337 2016-08-31 19:09:17 +10:00
Jesse Boyd
da7a12bc00 Fixes #1234 2016-08-29 16:21:14 +10:00
Jesse Boyd
3b73b2e9d8 Fix grant check 2016-08-29 15:33:26 +10:00
Jesse Boyd
dd665ed9ce Fence rotation 2016-08-29 15:01:19 +10:00
Jesse Boyd
90d48b2cd0 Fixes #1289 2016-08-26 13:54:22 +10:00
Jesse Boyd
a95d18499e Fixes #1285 2016-08-26 13:19:42 +10:00
Jesse Boyd
a801127036 Merge pull request #1301 from MisterErwin/master 
Calling events when players are removed from plots & correct calling of Member & Trusted events
 2016-08-26 02:02:40 +10:00
Jesse Boyd
2806f8b20c Fixes #1307 2016-08-26 01:36:35 +10:00
Jesse Boyd
7d11147836 Add Lazzy "Offline -> Offline Lowercase" conversion 2016-08-20 21:40:54 +10:00
Jesse Boyd
bc0c0abe7e Fix NPE 2016-08-19 12:16:13 +10:00
Jesse Boyd
005e13a216 Maybe #1239 2016-08-17 18:30:58 +10:00
Jesse Boyd
3558105789 Fix default flags NPE 2016-08-17 15:08:01 +10:00
Jesse Boyd
f651607d2f Might work? 2016-08-17 12:22:45 +10:00
Jesse Boyd
30da060f83 Potential fix for schematic placement on clear 2016-08-16 15:53:26 +10:00
MattBDev
ef3380dc0a Merge remote-tracking branch 'origin/master' 2016-08-12 15:04:18 -04:00
MattBDev
749ab83e5d Move permission check out of loop 
See #1307
 2016-08-12 15:04:11 -04:00
Jesse Boyd
daea9cf60d Allow teleportation for console 2016-08-10 12:33:18 +10:00
Jesse Boyd
db69da5b07 *Wrong runnable 2016-08-09 08:52:31 +10:00
Alex
37e4a652dd Now calling the respective events when a user is removed from a plot. 
And switched the event calling of adding Helpers and Trusted players. (Correct me if that was wrong)
 2016-08-08 22:45:08 +02:00
MattBDev
112da17614 Squashed commit of the following: 
commit 91c78407cd
Author: Jesse Boyd <jessepaleg@gmail.com>
Date:   Sun Aug 7 11:29:59 2016 +1000

    Use a queue for expiry

commit 395d6364be
Author: Jesse Boyd <jessepaleg@gmail.com>
Date:   Sun Aug 7 04:43:41 2016 +1000

    Cache on fail as well

commit facd43700d
Author: Jesse Boyd <jessepaleg@gmail.com>
Date:   Sun Aug 7 04:00:50 2016 +1000

    Cache entity count every second

commit 1ae694ff5b
Author: Jesse Boyd <jessepaleg@gmail.com>
Date:   Sun Aug 7 03:52:37 2016 +1000

    Tweak entity counting

commit c99dd1e74a
Author: Jesse Boyd <jessepaleg@gmail.com>
Date:   Sat Aug 6 00:10:11 2016 +1000

    Needs sponge builds

commit f408ac82be
Author: Alexander Söderberg <Sauilitired@users.noreply.github.com>
Date:   Fri Aug 5 12:13:39 2016 +0200

    Update README.md

commit 9b95990ba6
Author: Alexander Söderberg <Sauilitired@users.noreply.github.com>
Date:   Thu Aug 4 16:50:37 2016 +0200

    Update this here as well
 2016-08-08 14:02:25 -04:00
MattBDev
c8419f4a4a Added more Java 8 warnings 2016-07-29 21:40:23 -04:00
MattBDev
610e204d12 Fix #1281 , Fix #1282 , and Sponge gradle 2016-07-29 12:47:42 -04:00
MattBDev
b5ec6232f9 Sponge Fixes and minor changes. 2016-07-25 22:25:15 -04:00
MattBDev
48064da1ee Fixed deny-teleport flag 2016-07-25 22:25:15 -04:00
Jesse Boyd
0b19cc7d9d Possible fix + add guest-gamemode flag 2016-07-25 22:23:19 -04:00
Jesse Boyd
4e019ab796 UUID cache changes 2016-07-25 22:23:19 -04:00
MattBDev
85d6e42462 Merge branch '3.4.5' of https://github.com/IntellectualSites/PlotSquared into 3.5.0 2016-07-24 17:27:41 -04:00
MattBDev
8b084839fd Fix #1261 2016-07-19 10:22:50 -04:00
MattBDev
8538170cba Metrics 2016-07-16 22:51:49 -04:00
Jesse Boyd
76bce7c0ef Catch CommandException 2016-07-14 20:29:11 +10:00
Jesse Boyd
ba568a3f60 Recover from invalid flag value 2016-07-14 00:28:46 +10:00
Jesse Boyd
a43430b722 Fix NPE for null arg 2016-07-13 00:14:26 +10:00
Jesse Boyd
ca776b2912 Fixes #1226 2016-07-12 22:12:14 +10:00
Jesse Boyd
e859a7f56c Change to interact perm, not build 2016-07-11 20:27:25 +10:00
manuelgu
279084b043 Add additional alias for /p middle 
http://grammarist.com/spelling/center-centre/
 2016-07-09 09:18:55 +02:00
MattBDev
8b0e59209c Remove getServerName() 2016-07-05 23:43:08 -04:00
Jesse Boyd
b9ad75ad84 Add teleport flag 2016-06-29 21:22:55 +10:00
Jesse Boyd
f4fe762135 * 2016-06-28 20:21:50 +10:00
Jesse Boyd
06682b18a5 Fix compile 
Recover on unknown command error
Fixes #1224
Close #1213 (fixed elsewhere)
Fixes #1212
 2016-06-28 19:55:51 +10:00
MattBDev
a579df00db Merge remote-tracking branch 'origin/master' 2016-06-27 10:14:28 -04:00
Jesse Boyd
29a0b68dcb Fix currently online for seen info. 2016-06-27 23:59:38 +10:00
Jesse Boyd
817a5bc16e Various 
Fix compatibility with bukkit 1.5
Recover on failed fancy message initialization
Fix /2 remove *
 2016-06-27 18:38:14 +10:00
Jesse Boyd
047f9a75b9 Fix #1222 2016-06-27 17:45:19 +10:00
Jesse Boyd
f20ef15774 Revert creature spawn message + change expire to seen 2016-06-26 04:30:12 +10:00
MattBDev
3a973342ae Merge remote-tracking branch 'origin/master' 2016-06-24 10:59:18 -04:00
MattBDev
6e25aab51f Cleanup some docs. 2016-06-24 10:56:38 -04:00
Jesse Boyd
a49492aae3 Fix roadregen 2016-06-24 16:16:22 +10:00
Jesse Boyd
dbe965e901 init script engine on get 2016-06-24 15:41:34 +10:00
MattBDev
2c82d1106a Fixed kick message 2016-06-23 23:19:02 -04:00
MattBDev
5b9dc59abf Updates to docs, code style tweaks, and some code optimizations 2016-06-23 20:12:17 -04:00
Jesse Boyd
b587b430b8 #1211 2016-06-24 05:30:26 +10:00
Jesse Boyd
8fd2599686 Fixes #1211 2016-06-24 02:20:21 +10:00
Jesse Boyd
56000d60e7 Just in case 2016-06-23 13:14:29 +10:00
Jesse Boyd
1643399fc6 Alternatives for setowner none if the username is taken 2016-06-23 13:11:26 +10:00
Jesse Boyd
e6387419f7 Potential fix for plot biome (untested) 2016-06-23 13:09:56 +10:00
Jesse Boyd
16d191db2c Fixes /plot kick * 2016-06-23 04:08:06 +10:00
Jesse Boyd
7fb2631421 Cast to string if necessary 2016-06-21 14:23:04 +10:00
Jesse Boyd
718831e8e0 * 2016-06-21 14:10:20 +10:00
Jesse Boyd
df4585a847 Check args for grant 2016-06-21 13:38:08 +10:00
Jesse Boyd
88d8339cfd fix other NPE 2016-06-21 13:32:28 +10:00
Jesse Boyd
e08db3d12b Check teleportation on command location prefix 2016-06-21 03:02:41 +10:00
Jesse Boyd
2ff4e07919 Setup border on world creation 2016-06-21 01:13:09 +10:00
Jesse Boyd
f6fec56677 Potential fix for terrain 3 worlds. 2016-06-21 00:29:39 +10:00
Jesse Boyd
3fabfa10d7 Add liquid-flow flag 2016-06-20 22:48:04 +10:00
Jesse Boyd
a2ca9a52ea Merge pull request #1205 from manuelgu/fix/deadlink 
Remove dead link
 2016-06-20 18:52:35 +10:00
Jesse Boyd
e5e3600206 Why were these restricted to players? 2016-06-20 18:52:00 +10:00
manuelgu
7ad50b6314 Remove dead link 2016-06-20 10:49:40 +02:00
Jesse Boyd
01d508edf4 Fix remove * 2016-06-20 15:08:56 +10:00
Jesse Boyd
9fa28e1179 * 2016-06-20 01:50:43 +10:00
Jesse Boyd
c3dd28caeb Fix clear done flag requirements 2016-06-20 01:49:35 +10:00
Jesse Boyd
ce7468e63a Fix economy NPE 2016-06-20 00:52:05 +10:00
Jesse Boyd
3ce225c044 Bump version 2016-06-19 15:51:46 +10:00
Jesse Boyd
c2f10a7065 Update desc for debugpaste 2016-06-19 13:44:14 +10:00
Jesse Boyd
8512adf9d6 Fix for augmented 2016-06-19 13:01:30 +10:00
manuelgu
5eabf863d6 Fix #1196 2016-06-19 00:11:21 +02:00
Jesse Boyd
cff30a1db4 Fix scripting initialization 2016-06-18 16:29:51 +10:00
Jesse Boyd
ab51d27e49 Remove pointless thread dump 2016-06-18 15:01:42 +10:00
Jesse Boyd
6375922808 I can't count + fix variable scope 2016-06-18 13:54:35 +10:00
Jesse Boyd
29ce4af350 Fixes #987 and #299 (untested) 
Example usage:
claim: 50*{arg}
 2016-06-18 13:43:34 +10:00
Jesse Boyd
91c742c141 Fixes #590 2016-06-18 13:13:36 +10:00
Jesse Boyd
232091454a Fix augmented 2016-06-18 12:44:56 +10:00
Jesse Boyd
081081b36e Fixes #1063 2016-06-17 15:42:23 +10:00
Jesse Boyd
4319300b34 Fixes #1126 2016-06-17 13:46:13 +10:00
Jesse Boyd
b2b90a8d17 Fixes #1064 2016-06-17 13:33:47 +10:00
Jesse Boyd
480453b716 Various 
Fixes #1177
Additional check for left click with milk on adult entity
Add setting for enabling persistent meta
Only set fly persistent meta if it differs from the current gamemode fly
mode.
 2016-06-16 20:16:48 +10:00
Jesse Boyd
2bbfec1a32 Fix load / flush queue before sending message 2016-06-16 17:31:02 +10:00
Jesse Boyd
b2997b7c7b Don't send duplicate messages 2016-06-16 10:31:33 +10:00
Sauilitired
472aadcd01 Add suggestion for flags when invalid flag name was given :] 2016-06-16 02:30:16 +02:00
Sauilitired
5b103d49c0 Fixes #1171 2016-06-16 02:08:01 +02:00
MattBDev
ae5e15e434 Fix invalid record type error 2016-06-13 15:05:38 -04:00
Jesse Boyd
b238bdbd21 Fix armor stand / hangings being considered vehicles 2016-06-13 15:32:13 +10:00
Jesse Boyd
4f0ede646e Chat / Merge blocks placer / generator 2016-06-13 14:47:50 +10:00
Jesse Boyd
506455ae40 Remove debug 2016-06-12 15:33:56 +10:00
Jesse Boyd
6165469e76 Fix scripting 2016-06-12 15:26:58 +10:00
MattBDev
5bdb2263dc CheckStyle code tweaks 2016-06-10 14:04:55 -04:00
MattBDev
76bcb76905 Merge remote-tracking branch 'origin/master' 2016-06-10 13:31:41 -04:00