3002 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
MattBDev	237b10a2a2	Tidying up the code	2019-04-29 10:49:58 -04:00
MattBDev	0b7e63bafb	Added new 1.14 blocks	2019-04-24 22:04:30 -04:00
MattBDev	9f792fa54b	Fixes #2328 ... I hope this doesn't cause more issues than it solves	2019-04-24 21:23:57 -04:00
MattBDev	d0be0780fd	Reformatting and cleaning.	2019-04-24 16:11:24 -04:00
dordsor21	bef3dbc6f4	Reformat code	2019-04-23 23:48:22 +01:00
dordsor21	d352804b5d	Update gradle lombok version for core	2019-04-23 23:47:00 +01:00
dordsor21	9485f82ea9	Fix signs between 1.13 and 1.14	2019-04-23 23:46:10 +01:00
dordsor21	c7ba94f959	Fix legacy material loading error and Jenkins4J dependencies	2019-04-23 23:03:52 +01:00
dordsor21	5ac00c4920	downgrade Jenkins4J	2019-04-23 22:41:06 +01:00
dordsor21	bd1217810f	Should fix the sign issue	2019-04-23 22:30:31 +01:00
dordsor21	1e97392244	Update to gradle 5.4	2019-04-23 22:27:32 +01:00
MattBDev	9b3ca4468c	Temporary fix for a working 1.14 build	2019-04-23 14:41:20 -04:00
MattBDev	b2b2f3cd05	attempt to fix signs	2019-04-23 14:24:55 -04:00
MattBDev	bae3774eb6	Merge remote-tracking branch 'origin/breaking' into breaking	2019-04-23 13:45:35 -04:00
MattBDev	1118901ca2	Initial 1.14 Update	2019-04-23 13:45:24 -04:00
Jesse Boyd	0c0a696d36	Merge branch 'breaking' of https://github.com/IntellectualSites/PlotSquared into breaking	2019-04-23 12:57:46 +10:00
Jesse Boyd	21a5b04b7b	remove debug	2019-04-23 12:57:39 +10:00
MattBDev	6fa41efbf5	Merge remote-tracking branch 'origin/breaking' into breaking	2019-04-22 11:55:11 -04:00
MattBDev	ef8d33db41	Minor command changes ... Changed RequiredType in some classes and formatting changed in others.	2019-04-22 11:55:05 -04:00
Jesse Boyd	1abe444205	Merge branch 'breaking' of https://github.com/IntellectualSites/PlotSquared into breaking	2019-04-23 01:53:35 +10:00
Jesse Boyd	145af1e091	fix workaround	2019-04-23 01:53:24 +10:00
MattBDev	f5fa15080c	Minor javadoc updates	2019-04-22 11:45:23 -04:00
Jesse Boyd	0c0d0104d7	Merge branch 'breaking' of https://github.com/IntellectualSites/PlotSquared into breaking	2019-04-23 01:06:52 +10:00
Jesse Boyd	406dd22703	Workaround for effective permission check	2019-04-23 01:06:41 +10:00
dordsor21	bb44c2ea92	parsable build number	2019-04-20 16:26:31 +01:00
Jesse Boyd	ea26ec628d	Use Settings.Teleport.ON_LOGIN	2019-04-19 13:02:50 +10:00
Jesse Boyd	815e513093	Fix teleportOnLogin error	2019-04-19 12:53:48 +10:00
Jesse Boyd	8ac23b92d8	Use UUID, not just name	2019-04-17 22:18:03 +10:00
Jesse Boyd	d31dbc7c7c	Fix debugimportworlds 1.13 ... because someone changed PlotId.fromString to throw an exception without updating things that call it	2019-04-17 22:07:33 +10:00
Jesse Boyd	000e3de35d	Don't allow importing using base directory	2019-04-17 14:36:31 +10:00
Jesse Boyd	7e63ffe745	Optimize vanilla world generation* ... *For single plot worlds Reuse base world data. Instead of taking several seconds, it should now take tens of milliseconds.	2019-04-17 14:30:05 +10:00
Jesse Boyd	27eda9eb7c	Don't setup single plot worlds	2019-04-17 14:00:01 +10:00
Jesse Boyd	0fdc5eafbd	Allow single plot areas to load survival worlds	2019-04-17 13:46:33 +10:00
Jesse Boyd	59f89980a3	Don't need ratio out of 100 anymore	2019-04-17 13:13:56 +10:00
Jesse Boyd	50acf4f51f	Print exception on failed schematic setup	2019-04-13 13:06:21 +10:00
Jesse Boyd	04779d28fb	Don't fail on metrics error	2019-04-13 12:26:19 +10:00
Jesse Boyd	1e78368115	Merge branch 'breaking' of https://github.com/IntellectualSites/PlotSquared into breaking	2019-04-13 12:23:24 +10:00
dordsor21	0c46df65e6	Not sure why that last commit was a thing locally	2019-04-12 17:42:35 +01:00
dordsor21	4c788cb51e	Merge branch 'breaking' of https://github.com/IntellectualSites/PlotSquared into breaking	2019-04-12 17:40:16 +01:00
MattBDev	1c915905c6	Fixes #2275	2019-04-11 23:27:47 -04:00
Jesse Boyd	9f3e3c83e0	Merge branch 'breaking' of https://github.com/IntellectualSites/PlotSquared into breaking	2019-04-12 12:11:16 +10:00
Jesse Boyd	6916752434	Fixes #2322	2019-04-12 12:11:03 +10:00
dordsor21	b0b328e50b	Update offset to match CI	2019-04-11 12:43:16 +01:00
Jesse Boyd	6cea26f436	Add random collection	2019-04-10 17:10:44 +10:00
Jesse Boyd	533edc5f40	Change default threshold to -1	2019-04-10 17:10:17 +10:00
Jesse Boyd	97903f3870	Fix you are not in a plot area for single plot worlds	2019-04-10 11:34:21 +10:00
dordsor21	d571f54c65	Update offset to match ci	2019-04-09 15:48:25 +01:00
Jesse Boyd	e0bd8e3f9d	Merge branch 'breaking' of https://github.com/IntellectualSites/PlotSquared into breaking	2019-04-09 00:29:30 +10:00
Jesse Boyd	9225a13808	sorry for breaking roads	2019-04-09 00:29:13 +10:00
Jesse Boyd	3f712ed5f0	should check both end/nether	2019-04-08 18:03:38 +10:00