master #5

Merged
epCode merged 255 commits from VoxeLibre/VoxeLibre:master into master 2021-02-02 23:20:01 +01:00
1 changed files with 2 additions and 1 deletions
Showing only changes of commit 41246f61f2 - Show all commits

View File

@ -331,7 +331,7 @@ Source path,Source file,Target path,Target file,xs,ys,xl,yl,xt,yt,Blacklisted?
/assets/minecraft/textures/blocks,endframe_side.png,/mods/ITEMS/mcl_end/textures,mcl_end_endframe_side.png,,,,,,,
/assets/minecraft/textures/blocks,endframe_top.png,/mods/ITEMS/mcl_end/textures,mcl_end_endframe_top.png,,,,,,,
/assets/minecraft/textures/blocks,end_stone.png,/mods/ITEMS/mcl_end/textures,mcl_end_end_stone.png,,,,,,,
/assets/minecraft/textures/items/,end_crystal.png,/mods/ITEMS/mcl_end/textures,mcl_end_crystal_item.png,,,,,,,
/assets/minecraft/textures/items,end_crystal.png,/mods/ITEMS/mcl_end/textures,mcl_end_crystal_item.png,,,,,,,
/assets/minecraft/textures/entity/endercrystal,endercrystal.png,/mods/ITEMS/mcl_end/textures,mcl_end_crystal.png,,,,,,,
/assets/minecraft/textures/blocks,purpur_block.png,/mods/ITEMS/mcl_end/textures,mcl_end_purpur_block.png,,,,,,,
/assets/minecraft/textures/blocks,purpur_pillar.png,/mods/ITEMS/mcl_end/textures,mcl_end_purpur_pillar.png,,,,,,,
@ -966,3 +966,4 @@ Source path,Source file,Target path,Target file,xs,ys,xl,yl,xt,yt,Blacklisted?
/assets/minecraft/textures/blocks,cobblestone_mossy.png,/mods/ITEMS/mcl_walls/textures,mcl_walls_cobble_mossy_wall_side.png,,,,,,,
/assets/minecraft/textures/blocks,grass_top.png,/mods/ITEMS/mcl_core/textures,mcl_core_grass_block_top.png,,,,,,,
/assets/minecraft/textures/blocks,grass_side_overlay.png,/mods/ITEMS/mcl_core/textures,mcl_core_grass_block_side_overlay.png,,,,,,,
/assets/minecraft/textures/items,book_enchanted.png,/mods/ITEMS/mcl_enchanting/textures,mcl_enchanting_book_enchanted.png,,,,,,,

1 Source path Source file Target path Target file xs ys xl yl xt yt Blacklisted?
331 /assets/minecraft/textures/blocks endframe_side.png /mods/ITEMS/mcl_end/textures mcl_end_endframe_side.png
332 /assets/minecraft/textures/blocks endframe_top.png /mods/ITEMS/mcl_end/textures mcl_end_endframe_top.png
333 /assets/minecraft/textures/blocks end_stone.png /mods/ITEMS/mcl_end/textures mcl_end_end_stone.png
334 /assets/minecraft/textures/blocks /assets/minecraft/textures/items purpur_block.png end_crystal.png /mods/ITEMS/mcl_end/textures mcl_end_purpur_block.png mcl_end_crystal_item.png
335 /assets/minecraft/textures/blocks /assets/minecraft/textures/entity/endercrystal purpur_pillar.png endercrystal.png /mods/ITEMS/mcl_end/textures mcl_end_purpur_pillar.png mcl_end_crystal.png
336 /assets/minecraft/textures/blocks purpur_pillar_top.png purpur_block.png /mods/ITEMS/mcl_end/textures mcl_end_purpur_pillar_top.png mcl_end_purpur_block.png
337 /assets/minecraft/textures/blocks potatoes_stage_0.png purpur_pillar.png /mods/ITEMS/mcl_farming/textures /mods/ITEMS/mcl_end/textures mcl_farming_potatoes_stage_0.png mcl_end_purpur_pillar.png
966 /assets/minecraft/textures/blocks grass_side_overlay.png cobblestone_mossy.png /mods/ITEMS/mcl_core/textures /mods/ITEMS/mcl_walls/textures mcl_core_grass_block_side_overlay.png mcl_walls_cobble_mossy_wall_side.png
967 /assets/minecraft/textures/blocks grass_top.png /mods/ITEMS/mcl_core/textures mcl_core_grass_block_top.png
968 /assets/minecraft/textures/blocks grass_side_overlay.png /mods/ITEMS/mcl_core/textures mcl_core_grass_block_side_overlay.png
969 /assets/minecraft/textures/items book_enchanted.png /mods/ITEMS/mcl_enchanting/textures mcl_enchanting_book_enchanted.png