Merge branch 'stable' into blend

This commit is contained in:
Jonas Herzig
2018-06-10 19:55:12 +02:00
150 changed files with 2821 additions and 599 deletions

View File

@@ -61,8 +61,13 @@ public net.minecraft.entity.Entity field_70180_af # dataWatcher
# ResourcePackRepository
public net.minecraft.client.resources.ResourcePackRepository field_148534_e # dirServerResourcepacks
##if MC>=10800
public net.minecraft.client.resources.ResourcePackRepository field_177321_h # lock
public net.minecraft.client.resources.ResourcePackRepository field_177322_i # httpRequest
##else
#$$ public net.minecraft.client.resources.ResourcePackRepository field_148532_f # resourcePack
#$$ public net.minecraft.client.resources.ResourcePackRepository field_148533_g # currentlyDownloading
##endif
# EntityRenderer
public net.minecraft.client.renderer.EntityRenderer *