190 Commits

Author	SHA1	Message	Date
Jesse Boyd	4e49d16505	fix dependencies	2019-08-26 05:45:03 +01:00
Jesse Boyd	ae89c16390	merge	2019-08-23 08:36:33 +01:00
Jesse Boyd	d434dfcfdd	some minor refactoring	2019-08-18 02:09:09 +01:00
Jesse Boyd	74fe88ae01	merge	2019-08-07 01:28:12 +10:00
MattBDev	9816eb3102	More work on commands	2019-07-23 16:26:18 -04:00
MattBDev	46f5b12b36	Convert tabs to whitespace.	2019-07-22 16:42:40 -04:00
Jesse Boyd	283351fea5	fix conflicts	2019-07-22 16:39:43 +10:00
MattBDev	9c3122a227	More work on getting commands to compile	2019-07-21 22:49:08 -04:00
Jesse Boyd	6e13b44f84	resolve issues with 2e67425d8131a2b1eb7ff752335bccf371801b8b	2019-07-18 20:12:23 +10:00
Jesse Boyd	be8213d8ee	resolve conflicts	2019-07-18 16:56:57 +10:00
Jesse Boyd	dd38cbe750	.	2019-07-18 04:30:02 +10:00
MattBDev	8108d0a936	Major command changes that don't work yet.	2019-07-16 23:44:34 -04:00
NotMyFault	fee57017cd	Bump dummy version to 1.14	2019-07-11 22:50:28 +02:00
Jesse Boyd	cf0c735cf3	Merge branch 'breaking' into breaking-114	2019-07-11 08:08:55 +10:00
Jesse Boyd	cafd4bfece	use Locale.ROOT for uppercase as well	2019-07-10 22:26:31 +10:00
Jesse Boyd	a98a91e066	Use Locale.ROOT	2019-07-10 21:03:00 +10:00
Jesse Boyd	b32d46b08a	Use Locale.ROOT	2019-07-10 21:01:56 +10:00
Jesse Boyd	50e649acb8	update items	2019-07-10 20:58:27 +10:00
MattBDev	4a40c7d99c	Renaming and cleanup and a new method.	2019-07-09 15:50:13 -04:00
Jesse Boyd	f99d6e7478	wip on 1.14	2019-07-09 17:18:51 +10:00
MattBDev	ffc2092d93	toggles and timeouts	2019-06-30 14:56:32 -04:00
Jesse Boyd	a4344fb2df	add 1.14 depend (non functional)	2019-06-29 14:06:19 +10:00
Jesse Boyd	664a7017b6	Add NotNull annotation to adapter	2019-06-29 06:28:14 +10:00
Jesse Boyd	d6280ec945	Avoid redundant check for performance critical code	2019-06-29 04:23:51 +10:00
Jesse Boyd	a2efdbc488	a1c15e1c39	2019-06-29 03:10:47 +10:00
Jesse Boyd	846a1b0769	6c94cca15e	2019-06-29 00:01:51 +10:00
MattBDev	a69b239848	Upstream	2019-06-25 13:07:47 -04:00
MattBDev	a1c15e1c39	Many upstream changes. Should be non-breaking	2019-06-25 09:00:44 -04:00
MattBDev	8c9090a21d	I changed stuff. That's all I remember	2019-06-23 13:27:34 -04:00
NotMyFault	5f037df326	Adding missing permissions ... Added some basic permissions to some basic and fawe specific commands. Since they weren't around previously, they are true by default, however, you can now revoke/negate them.	2019-06-13 00:48:40 +02:00
MattBDev	229182aa63	Remove CUI and other cleaning	2019-06-06 18:39:51 -04:00
Jesse Boyd	6bc5b4a823	.	2019-05-29 06:31:22 +10:00
Jesse Boyd	d603f45063	remove debug	2019-05-05 22:19:13 +10:00
Jesse Boyd	219321b777	Check before copy	2019-04-24 02:29:25 +10:00
Jesse Boyd	1503ba94a4	Forgot FAWE was already added to lookup names	2019-04-23 23:44:47 +10:00
Jesse Boyd	a523ef8176	Use update folder	2019-04-23 23:31:54 +10:00
Jesse Boyd	02a6caa3ab	Don't load dummy twice	2019-04-23 23:30:43 +10:00
Jesse Boyd	edde2ebe51	remove debug	2019-04-14 00:07:17 +10:00
Jesse Boyd	110f782a5c	Optimize entity get (lazy nbt)	2019-04-14 00:00:38 +10:00
Jesse Boyd	f9f6aead0f	Some optimizations for 1.13	2019-04-13 16:44:23 +10:00
NotMyFault	ee630b9236	Fixes #106	2019-04-07 01:38:25 +02:00
Jesse Boyd	501992dd20	Fix setPosition	2019-04-06 05:51:18 +11:00
Jesse Boyd	2143b9b5b7	finish block registry	2019-04-05 17:51:42 +11:00
Jesse Boyd	be5541b61b	revert some changes	2019-04-05 15:48:41 +11:00
Jesse Boyd	94d5d8df8e	Merge branch 'master' into breaking	2019-04-05 15:47:04 +11:00
Jesse Boyd	140809c903	Working now	2019-04-05 15:15:10 +11:00
Jesse Boyd	33f5322fda	WIP merge (i'll finish this later)	2019-04-05 01:24:47 +11:00
Jesse Boyd	7086eb8b3e	continue with merge	2019-04-03 22:28:57 +11:00
Jesse Boyd	f361619037	Merge remote-tracking branch 'upstream/master' into breaking	2019-04-03 16:53:34 +11:00
matt	29692f3fbe	Migrate to SLF4J	2019-04-02 18:21:02 -04:00