1564 Commits

Author	SHA1	Message	Date
MattBDev	aa04b0c326	World checks in BrushSettings don't offer any performance benefit	2020-02-05 10:40:29 -05:00
MattBDev	75653087b9	Remove FAWE-Piston ... Disables a lot of previous functionality in FAWE until replacements can be made. This commit was untested and may cause major issues.	2020-02-05 00:37:42 -05:00
MattBDev	3452fd5a63	Merge branch '1.15' of https://github.com/IntellectualSites/FastAsyncWorldEdit-1.13 into 1.15	2020-02-04 17:59:08 -05:00
Griffin Kubesa	8f82a763bf	Remove debug line	2020-02-02 16:12:18 -05:00
Matt	cb1fd7400e	Remove debug line	2020-02-01 23:16:30 -05:00
MattBDev	6c5ac08a3c	Minor upstream changes	2020-01-31 17:44:50 -05:00
Octavia Togami	38d5506e18	Generify BlockMap ... (cherry picked from commit 7384b6973498084f4082d7e1a805b84b13a3ba44)	2020-01-31 14:42:38 -05:00
Octavia Togami	d5828861de	Always use UTF-8 for loading translations ... (cherry picked from commit 624b3a449b5746cee84557992b9b217ac135cf50)	2020-01-31 14:42:02 -05:00
MattBDev	336e411e10	Minor code changes	2020-01-29 17:53:34 -05:00
MattBDev	7236b0a026	Minor code changes	2020-01-29 17:10:59 -05:00
MattBDev	bef69b5be3	Minor language changes	2020-01-29 16:11:52 -05:00
MattBDev	df60e50c96	Revert more changes	2020-01-29 15:32:51 -05:00
MattBDev	020c674c01	Revert migration of FaweCache to Kotlin	2020-01-29 15:01:38 -05:00
MattBDev	cb6359f010	Removed 1.13.2 support.	2020-01-27 18:54:31 -05:00
MattBDev	995e1261e5	Removed some redundant code	2020-01-26 16:03:10 -05:00
MattBDev	8078cf077a	consistency changes	2020-01-26 13:01:16 -05:00
MattBDev	e0f6869573	Revert "More code quality fixes" ... This reverts commit 2d6957ce	2020-01-23 14:41:57 -05:00
MattBDev	2d6957ce1c	More code quality fixes	2020-01-22 21:15:52 -05:00
MattBDev	88359f0215	More Kotlin	2020-01-21 14:30:13 -05:00
MattBDev	0cad7f229b	API improvements	2020-01-15 20:38:46 -05:00
MattBDev	da7c21d32a	Removed metrics from API ... We shouldn't have exposed it in the first place.	2020-01-15 17:20:40 -05:00
MattBDev	2d5a8ce573	Cleaned up a lot of code and introduced Kotlin to the project	2020-01-14 19:44:09 -05:00
MattBDev	b8e3941bb4	Revert "Add some debug messages to aid in future coding decisions." ... This reverts commit c4f376a2	2020-01-13 17:44:51 -05:00
MattBDev	c4f376a2e5	Add some debug messages to aid in future coding decisions.	2020-01-13 16:54:29 -05:00
MattBDev	0d2fff2cd2	Upstream Merge	2020-01-10 22:32:12 -05:00
MattBDev	86a55b7bf0	Merge remote-tracking branch 'origin/wip' into 1.15	2020-01-10 19:22:23 -05:00
MattBDev	98d0420c08	Minor tweaks	2020-01-10 13:29:20 -05:00
NotMyFault	3ee920f9e6	Update upstream	2020-01-08 19:36:12 +01:00
Jesse Boyd	900268633d	Fix compile	2020-01-07 00:41:41 +00:00
Jesse Boyd	d35812f098	wip history list command	2020-01-07 00:30:11 +00:00
Jesse Boyd	a84eb29d86	Merge commit 'e69ea37'	2020-01-07 00:14:25 +00:00
Jesse Boyd	e69ea37665	Merge branch '1.15' of https://github.com/IntellectualSites/FastAsyncWorldEdit-1.13 into 1.15	2020-01-07 00:09:49 +00:00
Jesse Boyd	a52b645175	rename to SimpleChangeSetSummary	2020-01-07 00:09:30 +00:00
xnrand	6315f18503	Base64 is case-sensitive ... Changed Jars.java not to ignore upper/lowercase and updted the included hashes with their correct casing. This should make hash verification more secure.	2020-01-06 12:31:08 +01:00
Jesse Boyd	9623c5cb3f	all hsitory types can summarize	2020-01-06 09:06:38 +00:00
Jesse Boyd	195c4a7647	wip history changes	2020-01-06 08:36:16 +00:00
Jesse Boyd	b173c85c78	Fix for history database ... fix history find y correct purge time units injected language is sql (@MattBDev is there a plugin or something for SQLite? I couldn't find any)	2020-01-05 12:39:58 +00:00
Jesse Boyd	dce9e545ec	Fix schem load byte/varint	2020-01-05 18:41:58 +11:00
Jesse Boyd	39b698f67d	Remove SkipQueue annotation, and combine with perm condition ... it seems piston only generates one condition, idk why	2020-01-05 17:35:19 +11:00
Jesse Boyd	27ec3cdc66	idk why we need a lazy reference for an integer here ... when null would work better	2020-01-05 16:17:17 +11:00
NotMyFault	b292416496	Upstream and some refactoring ... Note: Maybe this doesn't compile, ij is broken af smh, let's give it a try...	2020-01-04 18:34:30 +01:00
Jesse Boyd	c05cdd8faa	Merge branch '1.15' of https://github.com/IntellectualSites/FastAsyncWorldEdit-1.13 into 1.15	2020-01-04 10:12:33 +00:00
Jesse Boyd	88a95221a8	Make masks more stateless	2020-01-04 10:11:13 +00:00
MattBDev	0bf6cfad8d	Debug message for arrayoutofbounds	2020-01-03 16:51:23 -05:00
MattBDev	05760c49cd	Fixed compile issues and disabled plotsquared hook	2020-01-03 16:05:25 -05:00
MattBDev	f3e0109be2	A lot of small changes	2020-01-03 15:38:30 -05:00
MattBDev	6cb2d7cd5c	Stupid Piston	2020-01-03 12:36:00 -05:00
MattBDev	dfa3f457d6	New debugging to generate less console messages.	2020-01-03 12:30:46 -05:00
MattBDev	fc4847745b	Merge remote-tracking branch 'origin/1.15' into 1.15	2020-01-03 12:02:35 -05:00
MattBDev	cfb6e3bca4	Various debugging and cleaning	2020-01-03 12:02:18 -05:00
NotMyFault	cd7133b199	Fix up debugpaste spaces	2020-01-03 17:53:22 +01:00
NotMyFault	3fb5ac6be8	Rename debugpaste value names	2020-01-03 14:48:44 +01:00
Matt	a5ee0b197d	Merge pull request #298 from KasaneKona/1.15 ... Add LZ4 bindings for AARCH64	2020-01-02 16:55:15 -05:00
MattBDev	0d1e32efcb	Upstream and debugging changes.	2020-01-02 16:30:44 -05:00
KasaneKona	eb94bd1773	Add LZ4 bindings for AARCH64	2019-12-28 22:44:22 +00:00
Jesse Boyd	9efdd886c5	Fix translate args	2019-12-25 02:34:20 +00:00
Jesse Boyd	50c19f5a1c	Merge branch '1.15' of https://github.com/IntellectualSites/FastAsyncWorldEdit-1.13 into 1.15	2019-12-23 06:04:24 +00:00
Jesse Boyd	7d519ade4a	Fix region containsChunk	2019-12-23 06:04:12 +00:00
KennyTV	8569359d8f	Fix Java 12+ compatibility	2019-12-21 21:21:25 +01:00
Jesse Boyd	39faa740a2	Fix some adapter issues ... regen 1.13, tile get npe, null block type values	2019-12-21 09:45:59 +00:00
Jesse Boyd	4a4f5bcc74	Fix #288 sphere min/max y	2019-12-21 05:20:17 +00:00
Jesse Boyd	c2cc4f5aeb	Fix craftbook	2019-12-20 05:54:03 +00:00
NotMyFault	f37bc9417c	Merge branch 'merge' into 1.15	2019-12-19 19:05:27 +01:00
NotMyFault	e12b26c96c	Fix wrong message	2019-12-19 19:00:29 +01:00
NotMyFault	d82a6352b0	Fixes #280	2019-12-19 18:34:14 +01:00
Jesse Boyd	2bd65f6423	Update LegacyMapper.java	2019-12-19 16:58:00 +00:00
Jesse Boyd	c9c602470f	fix indexoutofbounds	2019-12-19 16:48:14 +00:00
Jesse Boyd	6a49b71cf2	Fix compile	2019-12-19 16:19:46 +00:00
Jesse Boyd	ea5f7a77be	Merge branch 'merge' of https://github.com/IntellectualSites/FastAsyncWorldEdit-1.13 into merge	2019-12-16 09:08:28 +00:00
Jesse Boyd	6ddeb2ebf5	Various minor ... refactor some region dependencies swithc masking extent to a filter (so it can be parallelized) Some unfinished refactoring of the filters remove piston messages from strings.json	2019-12-16 09:07:51 +00:00
Jesse Boyd	aac30742de	Remove TranslatableComponent override ... use Caption class	2019-12-16 09:01:41 +00:00
MattBDev	9bef8d5664	Minor changes	2019-12-11 17:46:47 -05:00
MattBDev	50856e1f85	Fix SQL Syntax in RollbackDatabase.java	2019-12-11 17:45:46 -05:00
NotMyFault	c037afaf3a	Build 1.15 artifacts	2019-12-11 17:49:17 +01:00
NotMyFault	053b1a20d6	More 1.15 wip	2019-12-11 14:45:27 +01:00
NotMyFault	39b60aa742	Fix legacy id conversion	2019-12-09 22:36:52 +01:00
NotMyFault	b0208e06cd	More updates	2019-12-09 21:59:51 +01:00
NotMyFault	a058f13d6e	Updates	2019-12-09 21:34:26 +01:00
NotMyFault	80d7b0582f	i18n upstream merge	2019-12-09 20:07:57 +01:00
NotMyFault	c5a9436174	Update links	2019-12-09 18:08:44 +01:00
NotMyFault	0f1715ea9f	Revert "Merge pull request #274 from IntellectualSites/api" ... This reverts commit 79d9bda912, reversing changes made to 0fcac39592.	2019-11-29 14:28:06 +01:00
NotMyFault	38bdb929f4	Generate maven artifacts ... I'm not a kotlin dsl expert, but that seems to work.	2019-11-27 23:33:42 +01:00
Jesse Boyd	34afc03443	fix walls	2019-11-25 23:49:16 +00:00
Jesse Boyd	1e9f197035	Fix #263	2019-11-25 17:31:59 +00:00
Jesse Boyd	678f4eb295	Update Confirm.java	2019-11-24 04:18:53 +00:00
Jesse Boyd	00e0ac721f	Fix confirmation	2019-11-24 04:08:17 +00:00
Jesse Boyd	4f34d1b5d1	Fixes #232 dont allow negative brush radius	2019-11-24 01:30:19 +00:00
Jesse Boyd	63839bfdf6	Fixes #261 set bounds	2019-11-24 01:14:12 +00:00
Jesse Boyd	1f19b92b0b	1.13?	2019-11-24 00:57:29 +00:00
NotMyFault	35be4c7fb0	Add //image alias	2019-11-23 20:39:29 +01:00
Jesse Boyd	49d1f6fa88	Merge branch 'merge' of https://github.com/IntellectualSites/FastAsyncWorldEdit-1.13 into merge	2019-11-23 18:41:12 +00:00
NotMyFault	b4a3155ee7	Update translation string matching upstream	2019-11-23 19:34:03 +01:00
NotMyFault	c7acd0fdcd	Add missing translation string	2019-11-23 19:26:20 +01:00
Jesse Boyd	edeb285152	Add frb alias	2019-11-23 18:12:27 +00:00
NotMyFault	206f650d7a	Fix prefix ... Test accomplished	2019-11-23 18:23:38 +01:00
NotMyFault	5a2274b3db	Fix debugpaste	2019-11-23 15:41:27 +01:00
Jesse Boyd	21ecd9dc4b	Fix confirm stack	2019-11-23 05:33:46 +00:00
Jesse Boyd	944c8c5521	Fixes #255 compass exceptipn	2019-11-23 05:15:48 +00:00
Jesse Boyd	97a4d2e103	Fixed regen	2019-11-23 04:45:43 +00:00
Jesse Boyd	1844d4dba7	Various major ... Add regen Add //history [find|restore|rollback|summary|clear] - history commands are interactable - inspect brush info is interactable Commands are now logged to a searchable database Fix some cases of id/ordinal mismatch	2019-11-23 04:31:48 +00:00
Jesse Boyd	edcaeb6cfe	conflicting arg	2019-11-22 17:11:20 +00:00
Jesse Boyd	9712aaab7d	remove unfinished testing	2019-11-22 15:37:15 +00:00
Jesse Boyd	85382ad109	Fix permissions	2019-11-22 15:30:45 +00:00
Jesse Boyd	9b31f39219	idk why that was in there twice	2019-11-21 21:41:13 +00:00
Jesse Boyd	3a16b0ecfe	cmd prefix	2019-11-21 21:06:46 +00:00
Jesse Boyd	2061035bc6	merge color with parent	2019-11-21 21:04:39 +00:00
Jesse Boyd	1a5e8c395a	inherit colors	2019-11-21 20:47:14 +00:00
Jesse Boyd	05992f7fe8	Update strings.json	2019-11-21 20:39:22 +00:00
Jesse Boyd	0c85db920c	save strings.json	2019-11-21 20:37:56 +00:00
Jesse Boyd	1341e38a90	fix compile	2019-11-21 19:56:10 +00:00
Jesse Boyd	6f32783e52	Fix compile	2019-11-21 14:07:07 +00:00
Jesse Boyd	59b8465493	Merge remote-tracking branch 'upstream/feature/translatable-text' int…	2019-11-21 13:50:28 +00:00
Jesse Boyd	66744bfaa4	Merge remote-tracking branch 'upstream/feature/translatable-text' into i18n-merge	2019-11-21 13:50:05 +00:00
Jesse Boyd	37b6c406ac	reduce diff	2019-11-21 07:57:32 +00:00
Jesse Boyd	52a502a1c6	Refactor confirmation	2019-11-21 06:50:37 +00:00
Jesse Boyd	144ea2ef34	Lazy tags + get / set tiles ... Lazy tags means tiles/ents are not translated into the nms NBTBase until it is needed. Should be faster in cases where getFullBlock is called, but nbt is not always needed. Commands like Copy and Paste, where the input/output are both nms worlds, can entirely bypass WorldEdit translating to and from the WorldEdit JNBT classes.	2019-11-20 03:40:52 +00:00
Jesse Boyd	60759934a3	Fix some merge issues	2019-11-20 00:11:54 +00:00
Jesse Boyd	0e22d4718a	fix some merge issues	2019-11-19 22:07:30 +00:00
Jesse Boyd	5d8adbc10c	Merge remote-tracking branch 'upstream/master' into merge	2019-11-19 21:25:36 +00:00
Jesse Boyd	2c9f192baf	Merge remote-tracking branch 'upstream/master' into merge	2019-11-19 21:23:47 +00:00
Jesse Boyd	3eb77e3e8b	7e3fc6c8e7	2019-11-19 04:49:13 +00:00
Kenzie Togami	d9b0aeca7f	7e3fc6c8e7	2019-11-19 04:49:08 +00:00
Kenzie Togami	122f3b2562	8af68fc884	2019-11-19 04:43:30 +00:00
Jesse Boyd	1b07846746	some adapter refactoring	2019-11-19 04:40:40 +00:00
Jesse Boyd	751765cc01	Fix cyl/hcyl args	2019-11-19 01:41:51 +00:00
Jesse Boyd	319b3c5f7f	fix chunks not being submitted	2019-11-18 14:49:52 +00:00
Matthew Miller	ded86d4872	Fixed issues brought up in review	2019-11-18 19:50:52 +10:00
Jesse Boyd	4c32949210	temp fix for undo ... also fix inspect brush using wrong ids	2019-11-18 07:23:48 +00:00
Jesse Boyd	0087a0d6ab	Various minor ... fix undo null sections fix cancel for certain parallel jobs optimize schem paste	2019-11-17 22:47:56 +00:00
Jesse Boyd	0394f3516b	Fix radius mask	2019-11-17 20:52:58 +00:00
Jesse Boyd	329df8d33b	various minor ... Increase target size remove unnecessary brush sync send chunk on biome change	2019-11-17 20:29:25 +00:00
Jesse Boyd	3f92f12e89	synchronize char blocks	2019-11-17 20:02:33 +00:00
Jesse Boyd	e661652c12	Fix setting blocks in null sections	2019-11-17 19:30:28 +00:00
Jesse Boyd	868554367a	Fix schem load legacy	2019-11-17 18:20:00 +00:00
Jesse Boyd	69c225c00f	Fix //vis	2019-11-17 17:22:21 +00:00
Matthew Miller	625be46b30	Allow translation files to be missing entries, and use the english version in place.	2019-11-17 16:04:13 +10:00
Matthew Miller	5d0335eea5	Fixed typo in brush radius too large	2019-11-17 15:31:46 +10:00
Matthew Miller	f3c97887bc	Only download translations if a key is provided	2019-11-17 14:21:36 +10:00
Jesse Boyd	c3f86fd6da	wip brush vis mode	2019-11-17 05:00:10 +11:00
Matthew Miller	9a01bf9ab2	When custom files are found, use the base files for default values.	2019-11-16 22:46:31 +10:00
Matthew Miller	87fb9f6d0e	Added the remaining translation nodes	2019-11-16 22:46:31 +10:00
Matthew Miller	fc0fee39cb	Added a tonne more translations	2019-11-16 22:45:36 +10:00
Matthew Miller	4ba54c4337	Further translations	2019-11-16 22:45:36 +10:00
Matthew Miller	0e6037584f	Remove support for pluralisation to match Minecraft and alleviate issues with over-complexity	2019-11-16 22:43:23 +10:00
Matthew Miller	455a40b3fc	Add a few more strings	2019-11-16 22:43:22 +10:00
Matthew Miller	c01d2f7c24	Further translations	2019-11-16 22:42:14 +10:00
Matthew Miller	1cca2182a9	Fixed gradle setup	2019-11-16 22:42:14 +10:00
Matthew Miller	96e56bdd0c	Rebase translation work for easier rebasing	2019-11-16 22:42:14 +10:00
Jesse Boyd	0b1a36bb7d	WIP VisualExtent	2019-11-16 00:20:14 +00:00
Jesse Boyd	49baebeaa3	Fix some more arguments	2019-11-15 18:06:27 +00:00
Jesse Boyd	1c90d2a341	Fix some more arguments	2019-11-15 18:01:36 +00:00
Jesse Boyd	88c946188b	Fix brush pattern args	2019-11-15 17:57:28 +00:00
Jesse Boyd	e7e2b44b34	merge	2019-11-14 21:24:13 +00:00
Jesse Boyd	d9998982d1	Remove IncendoPaste	2019-11-14 21:20:55 +00:00
NotMyFault	30e38bfed4	Remove commands.yml from debugpaste ... Why does this class exists twice?	2019-11-14 22:11:18 +01:00
NotMyFault	b253ef6ddc	Remove commands.yml from debugpaste for now	2019-11-14 22:10:35 +01:00
Jesse Boyd	3dde61cee6	Legacy schem reader offset	2019-11-14 19:23:41 +00:00
Jesse Boyd	601890fe64	Fix biome sending	2019-11-14 19:21:28 +00:00
Jesse Boyd	b38ff03ca6	Fix P2 hook PlotPlayer.wrap	2019-11-14 19:21:05 +00:00
Jesse Boyd	54f62e689b	WIP level dat for MCAWorld	2019-11-14 19:20:35 +00:00
Jesse Boyd	d7b3db215e	Use SingleBlockTypeMask for fixLiquid	2019-11-14 17:57:43 +00:00
Jesse Boyd	2670e66ce2	Fix mask optimize	2019-11-14 17:25:37 +00:00
Jesse Boyd	69e1c53076	Fix fill args	2019-11-14 17:25:17 +00:00
Jesse Boyd	1071e7c226	Print help on invalid arg	2019-11-14 17:24:10 +00:00
Jesse Boyd	8812e1b60c	Fixes #231	2019-11-14 16:01:38 +00:00
Jesse Boyd	b1244c7780	Remove unused methods from IFawe	2019-11-14 10:54:09 +00:00
Jesse Boyd	580fb11197	Fix stack arg	2019-11-14 10:23:02 +00:00
Jesse Boyd	48929d76f1	Fix p2 download	2019-11-12 23:59:05 +00:00
Jesse Boyd	2354c1a845	Fix P2 block setting in some instances ... PlotSquared doesn't flush from the same thread, so it can't be pooled for reuse	2019-11-12 22:32:26 +00:00
Jesse Boyd	ac6f4ae358	Use BlockArrayClipboard for schem load	2019-11-12 12:41:39 +00:00
Brokkonaut	89bc664f69	Fix flipping of chests and stairs (#526) ... * Fix flipping of chests and stairs * Check if the new property value is valid before updating * Only for horizontal flips double chests/stairs should be modified	2019-11-12 21:09:28 +10:00
Jesse Boyd	cfa147cf76	WIP clipboard offsets ... TODO schem load -> BlockArrayClipboard	2019-11-11 22:34:33 +00:00
MattBDev	599a4dfebc	Merge remote-tracking branch 'origin/commanding-pipeline' into commanding-pipeline	2019-11-11 16:23:46 -05:00
MattBDev	630245bb9f	Attempt to fix compile and other small changes	2019-11-11 16:22:03 -05:00
Jesse Boyd	eac1f8f73d	Remove debug (again)	2019-11-11 21:12:32 +00:00
Jesse Boyd	6cbbefc0de	Merge branch 'commanding-pipeline' of https://github.com/IntellectualSites/FastAsyncWorldEdit-1.13 into commanding-pipeline	2019-11-11 21:06:22 +00:00
Jesse Boyd	53ad3d3cd2	Fix schem save order	2019-11-11 21:06:10 +00:00
MattBDev	1ffe05464f	Merge remote-tracking branch 'origin/commanding-pipeline' into commanding-pipeline	2019-11-11 16:02:41 -05:00
MattBDev	a23a4e5496	misc changes.	2019-11-11 16:02:28 -05:00
Jesse Boyd	032942c0e8	Remove debug	2019-11-11 20:18:22 +00:00
Jesse Boyd	2e6f46e451	Fix QueueHandler uncache	2019-11-11 20:14:57 +00:00
Jesse Boyd	751e6a5dd4	Update SpongeSchematicReader.java	2019-11-11 19:56:55 +00:00
Jesse Boyd	19a7c54341	Fix schem save	2019-11-11 18:48:15 +00:00
Jesse Boyd	7aa0d9c122	Various minor ... Disable P2's we region restrictions (so that it uses FAWE's) Fix extent binding Fix filtering on null sections	2019-11-11 16:49:13 +00:00
Jesse Boyd	9d6f2df908	Fix parsing for injected command types	2019-11-11 08:55:53 +00:00
Jesse Boyd	10a6619853	Update to latest P2	2019-11-10 22:20:46 +00:00
Jesse Boyd	59897dea11	Update MCAFile.java	2019-11-10 14:19:36 +00:00
Jesse Boyd	ac6455db5d	use FaweCache for MCAFile	2019-11-10 11:38:45 +00:00
wizjany	fc5c625f02	Add -n flag to //paste to select without pasting.	2019-11-09 20:58:47 -05:00
wizjany	2b1a7ed943	Make lrbuild tool use history.	2019-11-09 20:58:47 -05:00
wizjany	e5fe051340	Use persistent leaves for garden patch generator (/pumpkins)	2019-11-09 20:58:39 -05:00
wizjany	575463a8e9	Make a few more selection commands usable from console.	2019-11-09 11:31:51 -05:00
Jesse Boyd	d61dac5aa5	Fix CFI generation	2019-11-08 22:30:39 +00:00
Jesse Boyd	26f073faa2	idk what I was doing there	2019-11-08 09:42:07 +00:00
Jesse Boyd	faa63b0c35	CFI changeset	2019-11-08 05:27:04 +00:00
Kenzie Togami	1fbb7a70f9	Merge pull request #527 from EngineHub/feature/extended-expressions ... Expressions Part 1: ANTLR	2019-11-07 16:23:43 -08:00
Jesse Boyd	82f5c4ebed	Fix compile	2019-11-07 10:28:17 +00:00
Jesse Boyd	5f4af7958f	MCAFile is chunk based extent	2019-11-06 10:38:36 +00:00
Jesse Boyd	54a9e03cd6	Update FaweLocalBlockQueue.java	2019-11-06 09:49:01 +00:00
Jesse Boyd	240b2de90c	Update to PlotSquared-we branch	2019-11-06 09:29:20 +00:00