diff --git a/gradle.properties b/gradle.properties
index 571dc36f7..814a260eb 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -10,4 +10,4 @@ minecraft_version_toml=15
 forge_version=30.0.15
 forge_version_toml=30
 forge_group=net.minecraftforge
-mappings_version=10-1.15.1
+mappings_version=11-1.15.1
diff --git a/mappings/build.gradle b/mappings/build.gradle
index d266f7133..dbd9183b7 100644
--- a/mappings/build.gradle
+++ b/mappings/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'java'
 apply plugin: 'maven'
  
 ext.channel = 'snapshot'
-ext.dlVersion = '10'
+ext.dlVersion = '11'
 ext.mcVersion = '1.15.1'
  
 group = 'de.oceanlabs.mcp'
diff --git a/mappings/custom/fields.csv b/mappings/custom/fields.csv
index 7eb48b8bf..327f6671d 100644
--- a/mappings/custom/fields.csv
+++ b/mappings/custom/fields.csv
@@ -1,7 +1,52 @@
 searge,name,side,desc
+field_110925_j,CLOUDS_LOCATION,0,
+field_110926_k,END_SKY_LOCATION,0,
+field_110927_h,MOON_LOCATION,0,
+field_110928_i,SUN_LOCATION,0,
+field_147593_P,playingRecords,0,
+field_147595_R,needsUpdate,0,
+field_147596_f,xTransparentOld,0,
+field_147597_g,yTransparentOld,0,
+field_147599_m,LOGGER,0,
+field_147602_h,zTransparentOld,0,
 field_149765_K,friction,2,
+field_174987_D,lastCameraZ,0,
+field_174988_E,lastCameraChunkX,0,
+field_174989_F,lastCameraChunkY,0,
+field_174990_G,lastCameraChunkZ,0,
+field_174991_A,entityEffect,0,
+field_174992_B,lastCameraX,0,
+field_174993_C,lastCameraY,0,
+field_174994_L,prevCamRotY,0,
+field_174995_M,chunkRenderDispatcher,0,
+field_174997_H,prevCamX,0,
+field_174998_I,prevCamY,0,
+field_174999_J,prevCamZ,0,
+field_175000_K,prevCamRotX,0,
+field_175001_U,capturedFrustum,0,
+field_175002_T,captureFrustum,0,
+field_175003_W,frustumPos,0,
+field_175004_V,frustumPoints,0,
+field_175006_g,FORCEFIELD_LOCATION,0,
+field_175008_n,viewArea,0,
+field_175009_l,chunksToCompile,0,
+field_175010_j,entityRenderDispatcher,0,
+field_175011_u,darkBuffer,0,
+field_175012_t,skyBuffer,0,
+field_175013_s,starBuffer,0,
+field_175014_r,skyFormat,0,
+field_175015_z,entityTarget,0,
+field_181024_n,globalBlockEntities,0,
 field_196274_w,hasCollision,2,
+field_200006_a,DIRECTIONS,0,
 field_200961_i,friction,2,
+field_204601_A,cloudBuffer,0,
+field_204602_S,prevCloudX,0,
+field_204603_T,prevCloudY,0,
+field_204604_U,prevCloudZ,0,
+field_204605_V,prevCloudColor,0,
+field_204607_y,generateClouds,0,
+field_204800_W,prevCloudsType,0,
 field_208621_p,dynamicShape,2,
 field_208772_j,dynamicShape,2,
 field_215742_b,area,2,
@@ -236,4 +281,78 @@ field_227427_c_,COCOA,2,
 field_227428_d_,BEEHIVE,2,
 field_227429_e_,ALTER_GROUND,2,
 field_227430_f_,deserializer,2,
+field_228386_a_,TYPE_BY_BLOCK ,0,
+field_228387_b_,TYPE_BY_FLUID ,0,
+field_228388_c_,renderCutout ,0,
+field_228407_B_,destructionProgress,0,
+field_228408_W_,format,0,
+field_228409_ai_,frameId,0,
+field_228410_aj_,rainSoundTime,0,
+field_228411_ak_,rainSizeX,0,
+field_228412_al_,rainSizeZ,0,
+field_228413_h_,RAIN_LOCATION,0,
+field_228414_i_,SNOW_LOCATION,0,
+field_228415_m_,renderBuffers,0,
+field_228416_y_,frameTimes,0,
+field_228614_Q_,LINES ,0,
+field_228615_R_,SOLID ,0,
+field_228616_S_,CUTOUT_MIPPED ,0,
+field_228617_T_,CUTOUT ,0,
+field_228618_U_,TRANSLUCENT ,0,
+field_228619_V_,TRANSLUCENT_NO_CRUMBLING ,0,
+field_228620_W_,LEASH ,0,
+field_228621_X_,WATER_MASK ,0,
+field_228622_Y_,GLINT ,0,
+field_228623_Z_,ENTITY_GLINT ,0,
+field_228624_aa_,LIGHTNING ,0,
+field_228625_ab_,format ,0,
+field_228626_ac_,mode ,0,
+field_228627_ad_,bufferSize ,0,
+field_228628_ae_,affectsCrumbling ,0,
+field_228629_af_,sortOnUpload ,0,
+field_228667_R_,INSTANCES,0,
+field_228668_S_,state,0,
+field_228669_T_,hashCode,0,
+field_228670_U_,outline,0,
+field_228677_a_,textureState,0,
+field_228678_b_,transparencyState,0,
+field_228679_c_,diffuseLightingState,0,
+field_228680_d_,shadeModelState,0,
+field_228681_e_,alphaState,0,
+field_228682_f_,depthTestState,0,
+field_228683_g_,cullState,0,
+field_228684_h_,lightmapState,0,
+field_228685_i_,overlayState,0,
+field_228686_j_,fogState,0,
+field_228687_k_,layeringState,0,
+field_228688_l_,outputState,0,
+field_228689_m_,texturingState,0,
+field_228690_n_,writeMaskState,0,
+field_228691_o_,lineState,0,
+field_228692_p_,affectsOutline,0,
+field_228693_q_,states,0,
+field_228698_a_,textureState,0,
+field_228699_b_,transparencyState,0,
+field_228700_c_,diffuseLightingState,0,
+field_228701_d_,shadeModelState,0,
+field_228702_e_,alphaState,0,
+field_228703_f_,depthTestState,0,
+field_228704_g_,cullState,0,
+field_228705_h_,lightmapState,0,
+field_228706_i_,overlayState,0,
+field_228707_j_,fogState,0,
+field_228708_k_,layeringState,0,
+field_228709_l_,outputState,0,
+field_228710_m_,texturingState,0,
+field_228711_n_,writeMaskState,0,
+field_228712_o_,lineState,0,
 field_229978_u_,skyColor,2,
+field_72738_E,destroyingBlocks,0,
+field_72739_F,lastViewDistance,0,
+field_72749_I,renderedEntities,0,
+field_72750_J,culledEntities,0,
+field_72755_R,renderChunks,0,
+field_72769_h,level,0,
+field_72770_i,textureManager,0,
+field_72773_u,ticks,0,
+field_72777_q,minecraft,0,
diff --git a/mappings/custom/methods.csv b/mappings/custom/methods.csv
index 37408b409..049b73013 100644
--- a/mappings/custom/methods.csv
+++ b/mappings/custom/methods.csv
@@ -1,16 +1,52 @@
 searge,name,side,desc
+func_147585_a,setBlocksDirty,0,
+func_174963_q,createStars,0,
+func_174964_o,createDarkSky,0,
+func_174966_b,initOutline,0,
+func_174967_a,compileChunksUntil,0,
+func_174968_a,drawSkyHemisphere,0,
+func_174975_c,doEntityOutline,0,
+func_174978_c,getVisibleDirections,0,
+func_174979_m,needsUpdate,0,
+func_174980_p,createLightSky,0,
+func_174985_d,shouldShowEntityOutlines,0,
+func_174986_e,resetChunksToCompile,0,
+func_180439_a,levelEvent,0,
+func_180440_a,globalLevelEvent,0,
+func_180441_b,destroyBlockProgress,0,
+func_180444_a,drawStars,0,
 func_180626_a,getTemperatureNoCache,2,
+func_181023_a,updateGlobalBlockEntities,0,
+func_181562_a,getRelativeFrom,0,
+func_184376_a,blockChanged,0,
+func_184377_a,playStreamingMusic,0,
+func_184382_g,countRenderedChunks,0,
+func_184384_n,hasRenderedAllChunks,0,
+func_189693_b,addChainedFilledBoxVertices,0,
+func_193054_a,notifyNearbyEntities,0,
+func_195410_a,onResourceManagerReload,0,
+func_195461_a,addParticle,0,
+func_195462_a,addParticle,0,
+func_195467_a,addParticle,0,
+func_195469_b,addParticleInternal,0,
+func_195471_b,addParticleInternal,0,
 func_196253_a,canBeReplaced,2,
 func_196937_a,isTwoByTwoSapling,2,
 func_200941_a,friction,2,
 func_202707_a,run,2,
 func_202713_a,run,2,
 func_202823_a,run,2,
+func_204600_a,buildClouds,0,
 func_208521_b,setBlock,2,
 func_208618_m,getFriction,2,
 func_214584_a,setDirtAt,2,
 func_214587_a,isFree,2,
 func_214840_a,deserialize,2,
+func_215319_a,setSectionDirty,0,
+func_215321_a,setSectionDirtyWithNeighbors,0,
+func_215324_a,setBlockDirty,0,
+func_215327_a,calculateParticleLevel,0,
+func_215328_b,setSectionDirty,0,
 func_215570_a,hasLightWork,2,
 func_215571_a,enableLightSources,2,
 func_215572_a,getDebugData,0,
@@ -96,6 +132,7 @@ func_222346_b,addOceanCarvers,2,
 func_222347_z,addShatteredSavannaTrees,2,
 func_222348_W,addDefaultGrass,2,
 func_222365_c,getHeightValue,2,
+func_224746_a,setBlockDirty,0,
 func_225308_a,addColoringState,0,
 func_225309_a,addColoringStates,0,
 func_225310_a,getColoringProperties,0,
@@ -137,6 +174,8 @@ func_225572_a_,shouldSkipLocation,2,
 func_225573_a_,foliageRadius,2,
 func_225574_a_,getState,2,
 func_225576_a_,place,2,
+func_225612_r_,outline,0,
+func_225612_r_,outline,0,
 func_226658_a_,getBrightness,2,
 func_226659_b_,getRawBrightness,2,
 func_226660_f_,canSeeSky,2,
@@ -210,6 +249,99 @@ func_228358_a_,getAverageGrassColor,0,
 func_228359_a_,getAverageColor,0,
 func_228361_b_,getAverageFoliageColor,0,
 func_228363_c_,getAverageWaterColor,0,
+func_228389_a_,getRenderType,0,
+func_228390_a_,getChunkRenderType,0,
+func_228391_a_,getRenderLayer,0,
+func_228394_b_,getRenderType,0,
+func_228418_a_,renderEntity,0,
+func_228419_a_,captureFrustum,0,
+func_228420_a_,getLightColor,0,
+func_228421_a_,getLightColor,0,
+func_228422_a_,vertex,0,
+func_228423_a_,checkPoseStack,0,
+func_228424_a_,renderSky,0,
+func_228425_a_,renderClouds,0,
+func_228426_a_,renderLevel,0,
+func_228427_a_,renderLineBox,0,
+func_228428_a_,renderLineBox,0,
+func_228429_a_,renderHitOutline,0,
+func_228430_a_,renderLineBox,0,
+func_228431_a_,renderVoxelShape,0,
+func_228432_a_,renderLineBox,0,
+func_228433_a_,addFrustumVertex,0,
+func_228434_a_,addFrustumQuad,0,
+func_228436_a_,tickRain,0,
+func_228437_a_,setupRender,0,
+func_228438_a_,renderSnowAndRain,0,
+func_228441_a_,renderChunkLayer,0,
+func_228442_a_,removeProgress,0,
+func_228444_b_,renderEndSky,0,
+func_228445_b_,renderShape,0,
+func_228446_b_,renderDebug,0,
+func_228447_c_,renderWorldBounds,0,
+func_228448_p_,entityTarget,0,
+func_228630_a_,endPortal,0,
+func_228631_a_,end,0,
+func_228632_a_,create,0,
+func_228633_a_,create,0,
+func_228634_a_,entitySolid,0,
+func_228635_a_,entityAlpha,0,
+func_228636_a_,energySwirl,0,
+func_228637_a_,beaconBeam,0,
+func_228638_b_,entityCutout,0,
+func_228639_c_,solid,0,
+func_228640_c_,entityCutoutNoCull,0,
+func_228641_d_,cutoutMipped,0,
+func_228642_d_,entityTranslucentCull,0,
+func_228643_e_,cutout,0,
+func_228644_e_,entityTranslucent,0,
+func_228645_f_,translucent,0,
+func_228646_f_,entitySmoothCutout,0,
+func_228647_g_,translucentNoCrumbling,0,
+func_228648_g_,entityDecal,0,
+func_228649_h_,leash,0,
+func_228650_h_,entityNoOutline,0,
+func_228651_i_,waterMask,0,
+func_228652_i_,eyes,0,
+func_228653_j_,glint,0,
+func_228654_j_,outline,0,
+func_228655_k_,entityGlint,0,
+func_228656_k_,crumbling,0,
+func_228657_l_,lightning,0,
+func_228658_l_,text,0,
+func_228659_m_,lines,0,
+func_228660_m_,textSeeThrough,0,
+func_228661_n_,chunkBufferLayers,0,
+func_228662_o_,bufferSize,0,
+func_228663_p_,format,0,
+func_228664_q_,mode,0,
+func_228665_s_,affectsCrumbling,0,
+func_228666_t_,translucentState,0,
+func_228676_c_,memoize,0,
+func_228694_a_,builder,0,
+func_228713_a_,setAlphaState,0,
+func_228714_a_,setCullState,0,
+func_228715_a_,setDepthTestState,0,
+func_228716_a_,setDiffuseLightingState,0,
+func_228717_a_,setFogState,0,
+func_228718_a_,setLayeringState,0,
+func_228719_a_,setLightmapState,0,
+func_228720_a_,setLineState,0,
+func_228721_a_,setOutputState,0,
+func_228722_a_,setOverlayState,0,
+func_228723_a_,setShadeModelState,0,
+func_228724_a_,setTextureState,0,
+func_228725_a_,setTexturingState,0,
+func_228726_a_,setTransparencyState,0,
+func_228727_a_,setWriteMaskState,0,
+func_228728_a_,createCompositeState,0,
 func_229869_c_,isSuffocating,2,
 func_229870_f_,isViewBlocking,0,
 func_229979_u_,calculateSkyColor,2,
+func_72712_a,allChanged,0,
+func_72720_a,resize,0,
+func_72723_d,getEntityStatistics,0,
+func_72728_f,clear,0,
+func_72732_a,setLevel,0,
+func_72734_e,tick,0,
+func_72735_c,getChunkStatistics,0,