4 Commits

Include renames

Author	SHA1	Message	Date
gnembon	3e6f83905c	Merge branch 'master' into 1.15 ... # Conflicts: # src/main/java/carpet/script/CarpetExpression.java	2019-12-25 03:18:15 -04:00
gnembon	a4e6e7cb10	camera update and task clearing	2019-12-25 02:44:14 -04:00
gnembon	03703fd7fe	1.15 adjustments for scarpet 1.5	2019-10-08 02:18:09 -03:00
gnembon	2167c929d5	two more events, and nbt cleanups	2019-10-06 22:06:38 -03:00