687 Commits

Author	SHA1	Message	Date
sauilitired	01a927ccad	Allow PlotRateEvent to be cancelled. Fixes #2017	2018-08-19 23:12:59 +02:00
Jesse Boyd	4b8c434669	Fix compile (var must be final)	2018-08-12 21:36:04 +10:00
sauilitired	b0348cfc34	Update packages. This will not be appreciated 🐱	2018-08-10 17:53:15 +02:00
sauilitired	1646cd0f5a	Reformat code	2018-08-10 17:01:11 +02:00
Alexander Söderberg	bbcd508bc3	Remove unnecessary lines in Configuration javadoc	2018-08-10 16:04:43 +02:00
F0rb1d	a4f176fd07	Updated Simplified Chinese translation and formalized language codes.	2018-08-03 20:35:36 +08:00
Jesse Boyd	3d8d75170d	Check admin for setowner null	2018-07-31 14:28:22 +10:00
Jesse Boyd	2c11a292f4	Prevent multiple uses of plot auto	2018-07-29 21:43:07 +10:00
Jesse Boyd	cd9d22cb9b	Fix augmented generator not clearing column	2018-07-27 14:02:40 +10:00
Jesse Boyd	645c5fb529	Fix nukkit augmented generator	2018-07-27 13:25:46 +10:00
Jesse Boyd	ae1e58c0ac	Add -f override for plot move	2018-07-07 09:22:24 +10:00
Jesse Boyd	18c92bea38	Allow specifying area for move command	2018-07-05 19:33:17 +10:00
Jesse Boyd	9020d740d1	Revert "possible fix for mob damage" ... This reverts commit df6914fb1e.	2018-06-23 11:46:19 +10:00
Jesse Boyd	df6914fb1e	possible fix for mob damage	2018-06-21 07:48:45 +10:00
Jesse Boyd	da5478f141	Only check int flag ranges	2018-06-20 07:48:51 +10:00
Jesse Boyd	d454602888	Fixes #1961	2018-06-19 03:44:45 +10:00
Jesse Boyd	3039331976	Add account age expiry filter	2018-06-19 03:29:14 +10:00
Jesse Boyd	6ed6f607b5	Sort flag list alphabetically	2018-06-13 09:28:32 +10:00
Jesse Boyd	ce3e3be59e	Tweak nukkit plot chat	2018-06-09 15:37:49 +10:00
Jesse Boyd	740de4932b	Fix flag perm check	2018-06-07 12:30:39 +10:00
Jesse Boyd	442513b592	Fixes #1970	2018-06-07 08:15:28 +10:00
Jesse Boyd	40635255e3	Probably fixes #1953	2018-05-18 14:48:17 +10:00
Jesse Boyd	550df7f232	Fixes #1952	2018-05-17 17:46:54 +10:00
Jesse Boyd	4ffc4e67ab	Fixes #1822	2018-05-17 16:30:31 +10:00
Jesse Boyd	d6c472fcdf	Fixes #1484	2018-05-17 16:23:27 +10:00
Jesse Boyd	67a70d4ade	Fixes #1928	2018-05-17 15:17:45 +10:00
Jesse Boyd	9f9527d2e2	Fixes #1784	2018-05-17 14:53:34 +10:00
Jesse Boyd	ecf94b8706	minor web tweaks	2018-05-13 10:32:48 +10:00
NotMyFault	244ccb71cf	Update of german.yml ... german.yml design has been reworked to the up-to-date PlotSquared language file design. Many lines were added and adjusted.	2018-05-11 20:37:50 +02:00
NotMyFault	e13785edfe	Typo fixes ... Had to write some custom messages for a server and fixed the typos in here	2018-05-11 00:03:35 +02:00
Jesse Boyd	d49bfa612e	Merge pull request #1933 from Leomixer17/patch-1 ... Update italian.yml	2018-05-02 00:52:53 +10:00
Jesse Boyd	72f30d8aef	usernames can be 2 characters	2018-05-02 00:43:27 +10:00
Leomixer17	ef6b1cb932	Update italian.yml	2018-05-01 01:29:18 +02:00
Jesse Boyd	154bad6188	*	2018-04-28 21:53:39 +10:00
Jesse Boyd	613d79fb39	Fixes #1691	2018-04-28 21:51:26 +10:00
Jesse Boyd	5f9bd853ec	Fixes #1903	2018-04-28 09:41:09 +10:00
Jesse Boyd	ef83b5a1b7	Fixes #1931	2018-04-28 09:28:55 +10:00
Jesse Boyd	4f63cdf560	Fixes #1920	2018-04-13 20:37:28 +10:00
Foorack	90c3fac4fa	Fix PlotVersion when compiling with Maven	2018-04-07 20:52:19 +02:00
bibo38	fb706e0d60	Fixed wrong newlines in german language file	2018-03-16 18:07:29 +01:00
Jesse Boyd	368b9a0168	Fixes #1786	2018-03-15 16:34:28 +11:00
BrainStone	515405aa9e	using newer MySQL driver ... - Newer driver doesn't need manual loading - Fixes #1783	2018-03-10 21:34:11 +01:00
Jesse Boyd	8f5e2eb439	Merge branch 'master' of https://github.com/IntellectualSites/PlotSquared	2018-03-08 08:37:36 +11:00
Jesse Boyd	5b18b918a9	Ignore unsupported statement isClosed	2018-03-08 08:37:17 +11:00
dordsor whitwell	7dcb85d5d4	Fix typo in database update error message	2018-03-07 21:02:19 +00:00
Jesse Boyd	1cd30b84d5	check for closed connections	2018-02-15 23:12:42 +11:00
Jesse Boyd	eb1c3263ec	Fix deny-exit flag	2018-02-15 18:59:40 +11:00
Jesse Boyd	8815c83ba1	Various minor ... Teleport on login fixes World unloading fixes	2018-01-27 16:26:09 +11:00
Jesse Boyd	0e183f5627	Fixes #1839	2018-01-13 12:47:02 +11:00
Jesse Boyd	b239cb4a18	Fixes #1828	2018-01-10 17:50:38 +11:00
Jesse Boyd	4f464439e5	*	2018-01-10 17:22:46 +11:00
Jesse Boyd	4716104951	Revert broken changes to visit	2018-01-10 17:15:05 +11:00
Jesse Boyd	03337fe080	Merge branch 'master' of https://github.com/IntellectualSites/PlotSquared	2018-01-10 16:58:42 +11:00
Jesse Boyd	4ff02831f3	Fixes #1767 (performance issue)	2018-01-10 16:58:37 +11:00
Jesse Boyd	09e83bcbf8	Merge pull request #1793 from Leomixer17/patch-3 ... Update italian.yml	2018-01-10 16:50:17 +11:00
Jesse Boyd	5ddefcea22	when PlayerQuitEvent is never called	2018-01-04 19:24:00 +11:00
Leomixer17	47314ce00d	Update italian.yml	2017-12-10 15:28:35 +01:00
Leomixer17	452bf593e0	Update italian.yml	2017-12-10 14:35:43 +01:00
Leomixer17	a9bd6566b7	Update italian.yml	2017-12-10 12:53:22 +01:00
Christian Langel	59557cf889	improvements: Message for visit Command to a players without plots (#1796) ... We provide now a clear message if we are sure that the Visit command means a player but we dont found any claimed plots for this player. This is helpful if we try teleport to a numeric named player See this related tickets: #1691, #1778	2017-12-09 11:08:15 +01:00
Leomixer17	48bdfd75e5	Update italian.yml	2017-12-07 19:50:02 +01:00
Opachl	70a82d9fc6	fix: p visit issue in latest builds ... p visit issue in latest builds #1791	2017-12-06 21:40:26 +01:00
Leomixer17	61e045aa50	Update italian.yml (#1789)	2017-12-04 17:02:11 +01:00
Leomixer17	9daf13c897	Update italian.yml	2017-12-03 21:13:39 +01:00
Christian Langel	7d39d09317	fix: remove plot-alias with "/p alias" (#1779) ... * fix: remove plot-alias with "/p alias" remove plot-alias with "/p alias" #1718 * Apply requested Review Changes Restored the original Permisson to keep backwards compatibility Clean unused imports. * added some improvements after testing added some improvements after testing	2017-12-03 17:59:36 +01:00
Christian Langel	06208696db	fix: numeric Playernames thows NumberFormatException on Teleport (#1778) ... * fix: numeric Playernames thows NumberFormatException on Teleport Refactoring of the Teleport Handling Supports now: * p h xPlotPlayerGuy [PAGE] = Player [numeric] [alphanumeric] * p h MyPlantage [PAGE] = Alias [numeric] [alphanumeric] * p h PlotworldLarge [PAGE] = World [numeric] [alphanumeric] * p h 1:1 [PAGE] = plotId [numeric (1,1|1;2) ] * p h 4 = 4 th Plot of the Player if available [numeric (1,1|1;2) ] Check order: Player, Alias, World, PlotId, Page [PAGE] [PAGE] is optional * Apply suggested Code Style Changes: Collections now empty instead of null. Property renaming	2017-12-03 17:15:09 +01:00
Opachl	9413ce0880	fix: no wether update after "/p flag remove weather" ... no wether update after "/p flag remove weather" #1723	2017-11-15 11:14:14 +01:00
Jesse Boyd	a752780eeb	Minor fixes ... Update message color CME on plot action Creative middle click banner/head	2017-11-14 17:09:51 +11:00
Jesse Boyd	6e9c103b55	Fix typo	2017-11-12 13:32:09 +11:00
Jesse Boyd	fe534bccbe	Merge pull request #1753 from Leomixer17/patch-1 ... Improved italian translation	2017-11-09 10:16:37 +11:00
Jesse Boyd	37f1da0715	Various minor ... VehicleMoveEvent - Move KillRoadVehicles code there - Fix for pre-1.12 Fix auto merge being disabled	2017-11-09 10:15:16 +11:00
Leomixer17	faa24bbdf4	Update italian.yml	2017-11-04 21:36:03 +01:00
Jesse Boyd	22429fc3e0	Merge branch 'master' of https://github.com/IntellectualSites/PlotSquared	2017-10-31 23:26:18 +11:00
Jesse Boyd	7e2a911530	Closes #1750	2017-10-31 23:26:08 +11:00
Jesse Boyd	7b04ec9ff3	Merge pull request #1746 from Gabscap/fix-location_equals ... Fix Location.equals	2017-10-29 21:08:58 +11:00
Jesse Boyd	097159d606	Fix wrong sign height	2017-10-23 18:23:37 +11:00
Gabscap	04bfe73c29	Fix Location.equals	2017-10-20 14:23:35 +02:00
Jesse Boyd	d4614007ae	Fixes #1743	2017-10-14 20:52:35 +11:00
Jesse Boyd	9480c70655	Save world before download	2017-09-30 00:28:39 +10:00
Jesse Boyd	8b6cc7a193	*	2017-09-29 23:23:40 +10:00
Jesse Boyd	0d608245f5	Some tweaks / optimizations	2017-09-25 16:57:42 +10:00
Jesse Boyd	92f94ecedc	Tweaks ... Use sign with plot schematic Tweak world unloading	2017-09-24 00:13:05 +10:00
Jesse Boyd	2360782234	*	2017-09-23 20:09:34 +10:00
Jesse Boyd	1d20ae2777	allow air	2017-09-23 19:28:40 +10:00
Jesse Boyd	6b55b8cd67	Allow configuring a separate nonmember home position	2017-09-23 19:10:57 +10:00
Jesse Boyd	c645c4a6cb	*	2017-09-23 18:20:27 +10:00
Jesse Boyd	8e55860f77	Center plot schematic	2017-09-23 16:25:28 +10:00
Jesse Boyd	d97ff94465	Various minor ... Fix download world spawnpoint Fix regenallroads on augmented world Ensure all chunks have unloaded before unloading a world	2017-09-20 00:33:29 +10:00
Jesse Boyd	ce90b36d28	Wrap plot.schematic	2017-09-13 13:57:07 +10:00
Jesse Boyd	20d7a0eea2	Don't overwrite online player names from uuid cache	2017-09-06 19:49:57 +10:00
Jesse Boyd	17154ef1d5	idk why that wasn't working	2017-08-18 23:34:27 +10:00
Jesse Boyd	538e2a6002	Varios ... Fixes #1697 Fixes #1689	2017-08-18 12:37:26 +10:00
Jesse Boyd	84a6a6daf4	Closes #1643	2017-08-10 17:24:59 +10:00
Jesse Boyd	a2324190bb	Fixes #1619	2017-08-10 17:18:35 +10:00
Jesse Boyd	af99c6a706	*	2017-08-10 17:15:03 +10:00
Jesse Boyd	c9cee8a4a8	Fixes #1504	2017-08-10 17:12:27 +10:00
Jesse Boyd	c808257b7c	Fixes #1668	2017-08-10 16:52:17 +10:00
Jesse Boyd	c36ef1d237	Fixes #1673 ... + unrelated plotme conversion fix	2017-08-10 16:35:53 +10:00
Jesse Boyd	f49d43d6a3	Notify player when using an invalid purge argument	2017-08-10 16:11:50 +10:00
Jesse Boyd	ac9042bbe4	Various minor ... New plugin updater and versioning In game changelog fix login teleporting	2017-08-09 15:05:13 +10:00
Jesse Boyd	a913983d99	Add plot leave	2017-07-25 06:39:59 +10:00
Jesse Boyd	3633576e03	Fix teleport for single plot worlds	2017-07-08 23:22:05 +10:00
Jesse Boyd	248751378b	Fixes #1661	2017-07-08 21:50:47 +10:00
Jesse Boyd	1918000668	Merge pull request #1645 from dordsor21/master ... Lower TPS threshold please	2017-07-07 16:12:26 +10:00
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	757b9c695f	Fix compile	2017-04-17 19:11:55 +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	c3e2421d51	Merge pull request #1492 from c7w/master ... Update s_chinese.yml	2016-12-25 17:32:36 +11:00
c7w	f7793f027c	Update s_chinese.yml	2016-12-25 14:30:32 +08: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