3933 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Telesphoreo	ccbceac360	Update for TFM staff refactor	2020-08-15 20:11:51 -05:00
Telesphoreo	9866ee5d80	Fat update	2020-08-14 13:50:28 -05:00
Telesphoreo	bbee51a858	Merge https://github.com/IntellectualSites/PlotSquared into 1.16	2020-08-14 13:50:20 -05:00
NotMyFault	300abd868a	Merge pull request #2888 from IntellectualSites/fix-conversion ... Fix problem with config creation	2020-08-14 18:36:57 +02:00
NotMyFault	78a6e72fe1	5.13.2	2020-08-14 15:26:32 +02:00
dordsor21	8f1b2a9d2a	fix pve against animals on other plots and roads	2020-08-14 14:21:45 +01:00
NotMyFault	924b73f070	Merge pull request #2896 from luca-gg/patch-1 ... Update de-DE.yml	2020-08-11 19:33:41 +02:00
Luca	64181c6ab8	Update de-DE.yml ... adjusted grammar	2020-08-11 19:29:40 +02:00
NotMyFault	9fd11fbe13	Merge pull request #2893 from JunTVDE/de-translation-edit ... added german translation for flag-descriptions to de-DE.yml	2020-08-09 13:21:31 +02:00
NotMyFault	7cd9a03b0f	Merge pull request #2894 from TimonMi/patch-1 ... Update link for contributing	2020-08-09 13:20:17 +02:00
EinDev	f8bd844c6c	Update link for contributing	2020-08-09 13:18:35 +02:00
JunTVDE	987d9a267c	added german translation for flag-descriptions to de-DE.yml	2020-08-09 13:05:40 +02:00
Timon	dc3f45acd4	Added UseFlag check at Roads	2020-08-07 09:57:02 +01:00
N0tMyFaultOG	01d2b0024f	Add more information to the debugpaste	2020-07-31 20:33:17 +02:00
N0tMyFaultOG	01e66f8833	Readd skyblock template	2020-07-29 14:53:09 +02:00
dordsor21	afd9b56e71	Merge branch 'v5' of github.com:IntellectualSites/PlotSquared into v5	2020-07-28 13:58:37 +01:00
dordsor21	e2f9b4245b	Fixes https://issues.intellectualsites.com/issue/PS-81 ... - Add break statements to switches to prevent bleed from normal spawning to breeding - Separate misc spawning from mob spawning	2020-07-28 13:56:37 +01:00
N0tMyFaultOG	22a007b514	Revert "Update zh-CN.yml" ... This reverts commit 240362a16d.	2020-07-28 12:33:04 +02:00
N0tMyFaultOG	ab121c7eee	Fixes https://github.com/IntellectualSites/PlotSquaredSuggestions/issues/133	2020-07-26 21:12:32 +02:00
NotMyFault	240362a16d	Update zh-CN.yml	2020-07-26 17:08:58 +02:00
Alexander Söderberg	f2dcbce490	Fix problem where servers created in v5 (not converted from v4) would fail to start properly. ... This is a quite major issue and I hope this fix resolves it. Although, it should be tested with migration from v4 to v5 and then a fresh v5 server.	2020-07-25 03:16:36 +02:00
Alexander Söderberg	88df434404	Create CODE_OF_CONDUCT.md	2020-07-25 03:11:07 +02:00
Alexander Söderberg	73e3572c72	Fix the redstone flag on roads	2020-07-21 13:11:28 +02:00
N0tMyFaultOG	87a8ff742f	5.13.1	2020-07-19 14:16:13 +02:00
dordsor21	57435fdf34	verbosely ensure items cannot be duplicated when keeping inventory on death ... Seemingly there's duplication issues on some servers (and apparently even when only PlotSquared is installed). Likely a Spigot issue, but there's nothing to be done for Spigot on 1.13/14/15	2020-07-16 23:24:11 +01:00
N0tMyFaultOG	01ff9a34c2	Merge branch 'features/v5/placeholders' into v5	2020-07-16 18:48:45 +02:00
N0tMyFaultOG	ff3a94933a	Bump version	2020-07-16 18:43:52 +02:00
Hannes Greule	97a356c4a0	Very attentive reviewers, can recommend	2020-07-16 18:13:02 +02:00
Hannes Greule	10ab28c1ec	Add missing license headers	2020-07-16 18:08:00 +02:00
Hannes Greule	2d9cf8b759	Get placeholders working	2020-07-16 18:04:17 +02:00
Alexander Söderberg	32b28a4ca5	Turn all UUID messages into debug messages	2020-07-15 22:42:58 +02:00
N0tMyFaultOG	4996d8bcd1	Remove left over debugs	2020-07-15 14:05:15 +02:00
NotMyFault	e5963a8590	Merge pull request #2877 from IntellectualSites/features/v5/split-bukkit-listeners ... Clean up bukkit listeners by splitting them up	2020-07-15 13:35:38 +02:00
N0tMyFaultOG	e8c155763b	Register placeholders	2020-07-15 12:44:07 +02:00
N0tMyFaultOG	a52249513e	Update MVdW version	2020-07-15 12:05:42 +02:00
Alexander Söderberg	5d2d4ac12b	fix language issue	2020-07-14 20:47:15 +02:00
Alexander Söderberg	64f5580edd	Fix code styling issue	2020-07-14 20:46:52 +02:00
Alexander Söderberg	b989531a60	Merge branch 'v5' into features/v5/placeholders	2020-07-14 20:41:17 +02:00
Alexander Söderberg	34655b8d41	Add (untested) MVdWPlaceholderAPI support	2020-07-14 20:41:08 +02:00
dordsor21	30327d2fa3	update bukkit pom	2020-07-14 19:11:46 +01:00
dordsor21	2e4c43c251	Add config option to disable placing top wall blocks	2020-07-14 19:10:53 +01:00
Alexander Söderberg	1908588fcb	Change expansion author and version	2020-07-14 13:17:21 +02:00
Alexander Söderberg	af7db08036	Add new placeholder system	2020-07-14 13:14:02 +02:00
NotMyFault	32264ae5e3	Update gradle.yml	2020-07-14 12:43:45 +02:00
Alexander Söderberg	e88da3cea9	Add chunk coordinator	2020-07-12 20:58:48 +02:00
dordsor21	14b6f84816	fix typos that were c/p over	2020-07-12 18:50:04 +01:00
N0tMyFaultOG	ac8841447c	6cf2c0ad97 (r40542418)	2020-07-12 17:11:25 +02:00
Alexander Söderberg	6cf2c0ad97	Disable the paper uuid service for offline mode servers and add toggles for all third party uuid services	2020-07-12 17:04:30 +02:00
dordsor21	c045ef698c	Add license headers and fix method change in PlotSquared.java	2020-07-12 11:42:45 +01:00
dordsor21	3a11ffc77a	Clean up bukkit listeners by splitting them up	2020-07-11 19:03:55 +01:00