Merge branch 'master' into 1.17

Browse Source

# Conflicts:
#	src/main/java/carpet/script/api/Auxiliary.java
#	src/main/java/carpet/script/api/Entities.java
#	src/main/java/carpet/script/api/Inventories.java
#	src/main/java/carpet/script/api/Scoreboards.java
#	src/main/java/carpet/script/api/WorldAccess.java
#	src/main/java/carpet/script/value/FunctionValue.java
#	src/main/java/carpet/script/value/NBTSerializableValue.java

...

This commit is contained in:

gnembon committed 2021-04-23 01:46:11 -03:00

2 parents fc87053978 5ec664240f

commit 5e3812e1f0

35 files changed

+1250 -1416

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/carpet/script/api/WorldAccess.java

+216 -299

File diff suppressed because it is too large. Load diff