4045 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Alexander Söderberg	7897d78f0d	Merge pull request #2868 from IntellectualSites/feature/v6/slf4j	2020-07-14 18:49:34 +02:00
Alexander Söderberg	25a58a5c46	Merge branch 'v6' into feature/v6/platform	2020-07-14 17:45:33 +02:00
Alexander Söderberg	f9e5fd714d	Merge remote-tracking branch 'origin/feature/v6/platform' into feature/v6/platform	2020-07-14 17:07:03 +02:00
Alexander Söderberg	55eefd09da	Merge branch 'v6' into feature/v6/json	2020-07-14 16:52:40 +02:00
Alexander Söderberg	0ce1f3e0f6	Send special message when caption cannot be found	2020-07-14 16:36:13 +02:00
Alexander Söderberg	99be181aea	Migrate some more captions	2020-07-14 16:31:58 +02:00
Alexander Söderberg	fbf6a3517d	Add back title method that somehow went missing and add a template utility class to make templates less annoying to work with	2020-07-14 15:04:31 +02:00
Alexander Söderberg	1dc4da8beb	Fix issues from previous merge	2020-07-14 13:21:59 +02:00
NotMyFault	e72ce9c90e	Update gradle.yml	2020-07-14 12:44:11 +02:00
NotMyFault	32264ae5e3	Update gradle.yml	2020-07-14 12:43:45 +02:00
Alexander Söderberg	33f2ff7e6d	Merge branch 'v6' into feature/v6/slf4j	2020-07-13 23:11:40 +02:00
Alexander Söderberg	6664d49928	Prefix all log messages	2020-07-13 23:04:27 +02:00
Alexander Söderberg	d648a6d3db	Merge remote-tracking branch 'origin/feature/v6/slf4j' into feature/v6/slf4j ... # Conflicts: # Bukkit/pom.xml # Core/pom.xml	2020-07-13 22:52:10 +02:00
Alexander Söderberg	a1f262b5b2	Fix gradle setup and replace all debug calls	2020-07-13 22:51:57 +02:00
Alexander Söderberg	b109b76120	Nevermind, it doesn't allow for relocations	2020-07-13 20:50:49 +02:00
N0tMyFaultOG	1388f280e6	Update module poms	2020-07-13 20:46:34 +02:00
Alexander Söderberg	d141b040d6	Fix relocations	2020-07-13 20:45:04 +02:00
Alexander Söderberg	e84d82315c	Add log4j config (this might work :p)	2020-07-13 20:39:52 +02:00
N0tMyFaultOG	c6962ef4d2	Shift a few more messages to debug	2020-07-13 19:56:34 +02:00
N0tMyFaultOG	f93714a44e	Properly add prefixes to messages	2020-07-13 13:01:13 +02:00
Hannes Greule	564efd77f7	Fix some messages	2020-07-12 22:11:23 +02:00
Hannes Greule	5442c7cc2e	Start moving commands to new message system	2020-07-12 22:06:07 +02:00
Alexander Söderberg	0fa5a16cd0	replace remaining debug calls	2020-07-12 21:49:05 +02:00
N0tMyFaultOG	1881cdc9ab	Revert "Add prefix" ... This reverts commit fb2aa44f78.	2020-07-12 21:28:38 +02:00
N0tMyFaultOG	fb2aa44f78	Add prefix	2020-07-12 21:25:22 +02:00
Alexander Söderberg	e88da3cea9	Add chunk coordinator	2020-07-12 20:58:48 +02: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
Alexander Söderberg	5cdb3f4fd5	Add missing injection points	2020-07-12 12:25:44 +02:00
Alexander Söderberg	5a5c5721cc	fix compiler crashing	2020-07-12 07:38:57 +02:00
Alexander Söderberg	916675fb08	Guice progress	2020-07-11 17:19:19 +02:00
dordsor21	a2ec404014	Fix /plot target nearest	2020-07-11 13:40:22 +01:00
Alexander Söderberg	6f6cb4b630	More DI progress	2020-07-11 05:29:41 +02:00
Alexander Söderberg	c0f69f321d	Guice progress	2020-07-10 22:12:37 +02:00
Alexander Söderberg	55bf41d2da	Remove dumdum static access	2020-07-10 19:25:05 +02:00
Alexander Söderberg	7687d7705b	Fix merge issue	2020-07-10 18:38:14 +02:00
Alexander Söderberg	21ad9a36c8	Merge branch 'v6' into feature/v6/platform ... # Conflicts: # Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEvents.java # Core/src/main/java/com/plotsquared/core/PlotSquared.java # Core/src/main/java/com/plotsquared/core/generator/HybridUtils.java # Core/src/main/java/com/plotsquared/core/location/Location.java	2020-07-10 18:37:18 +02:00
dordsor21	afb72aa102	Don't include eggs with spawn*_eggs*	2020-07-10 17:31:46 +01:00
Alexander Söderberg	d00dc658df	Inject EventDispatcher and PlotListener	2020-07-10 18:17:44 +02:00
Alexander Söderberg	2dab7c8dda	Inject PlotAreaManager	2020-07-10 17:32:07 +02:00
Alexander Söderberg	c37cc40ad9	Move annotation in BukkitWorld	2020-07-10 12:27:26 +02:00
Alexander Söderberg	5341015cb1	Finalize immutable locations and add a platform world implementation	2020-07-10 12:21:29 +02:00
dordsor21	2fb76e6636	Split road and plot paste-on-top settings	2020-07-09 22:39:06 +01:00
dordsor21	5b260ea8da	update bukkit pom	2020-07-09 22:33:01 +01:00
dordsor21	55139eb134	Do not respect paste on top for road schematics.	2020-07-09 22:19:23 +01:00
dordsor21	5e44bb60c6	Merge branch 'v5' of github.com:IntellectualSites/PlotSquared into v5	2020-07-09 22:14:38 +01:00
dordsor21	96740fd282	Couple of fixes to road flag logic	2020-07-09 21:52:51 +01:00
Alexander Söderberg	cf1b027db9	Start making locations immutable	2020-07-09 22:28:46 +02:00
NotMyFault	fb050ac3da	5.12.5	2020-07-09 21:15:28 +02:00
Alexander Söderberg	b36c6427d1	Split failed UUID batches into individual requests in order to identify the invalid UUIDs	2020-07-09 20:37:14 +02:00