Merge branch 'master' into 1.16

# Conflicts:
#	src/main/java/carpet/mixins/ThreadedAnvilChunkStorage_scarpetChunkCreationMixin.java
#	src/main/java/carpet/script/CarpetExpression.java
This commit is contained in:
gnembon committed 2020-07-01 01:54:39 -03:00
commit af35504016
19 files changed
+985 -168

No files matched your search

+5 -2
View File
@@ -1,2 +1,5 @@
accessWidener v1 named
Accessible class net/minecraft/recipe/Ingredient$Entry
accessWidener v1 named
accessible class net/minecraft/server/world/ThreadedAnvilChunkStorage$TicketManager
accessible class net/minecraft/server/world/ServerLightingProvider$Stage
accessible class net/minecraft/recipe/Ingredient$Entry
+12
View File
@@ -34,6 +34,18 @@
"ThreadedAnvilChunkStorage_scarpetChunkCreationMixin",
"ChunkHolder_scarpetChunkCreationMixin",
"ServerLightingProvider_scarpetMixin",
"LevelPropagatorInterface",
"ChunkTicketManager_scarpetChunkCreationMixin",
"LightingProvider_scarpetChunkCreationMixin",
"ChunkLightProvider_scarpetChunkCreationMixin",
"LightStorage_scarpetChunkCreationMixin",
"BlockLightStorage_scarpetChunkCreationMixin",
"SkyLightStorage_scarpetChunkCreationMixin",
"ChunkTicketManager_spawnChunksMixin",
"ServerWorld_spawnChunksMixin",
"ServerLightingProvider_scarpetChunkCreationMixin",
"ChunkTicketManager_spawnChunksMixin",
"ServerWorld_spawnChunksMixin",