Compare commits
merge into: VoxeLibre:master
VoxeLibre:master
VoxeLibre:mcl_mobs_cleanup
VoxeLibre:mcl_chests_redo
VoxeLibre:improve_planks
VoxeLibre:fix-has_room
VoxeLibre:opencollective-link
VoxeLibre:upstream/unbreaking_on_crossbows
VoxeLibre:mob_ignore_fix
VoxeLibre:slabs_block_light
VoxeLibre:hardness_blast_res_fixes
VoxeLibre:buildable_flowers
VoxeLibre:burning_in_thunder
VoxeLibre:redstone-update
VoxeLibre:add_shader_support
VoxeLibre:hammers_spears
VoxeLibre:EE_armor
VoxeLibre:mapgen_update
VoxeLibre:projectile-refactor
VoxeLibre:world_aligned_textures
VoxeLibre:zombie_texture_improvements
VoxeLibre:mcl_weathered_nodes
VoxeLibre:orb_of_exchange
VoxeLibre:fix_pumpkin_names
VoxeLibre:patch_skins
VoxeLibre:hollow_logs_ref_recovery
VoxeLibre:copper-adaptation-refs-recovery
VoxeLibre:add_asset_attributions_1
VoxeLibre:fix_pumpkin_typo_pumkin
VoxeLibre:cherry_grove
VoxeLibre:lush_caves
VoxeLibre:release/0.86.1
VoxeLibre:mobile_bow_workaround
VoxeLibre:release/0.85.1
VoxeLibre:optimize_jukebox_sounds
VoxeLibre:optimize_theme_ogg
VoxeLibre:Optimize_backgrounds_jpg
VoxeLibre:archaeology
VoxeLibre:spanish-translations
VoxeLibre:fish_bucket_nametag
VoxeLibre:villager-golem-fixes
VoxeLibre:fix_beetroot_fortune_drops
VoxeLibre:fix_sliding
VoxeLibre:illager_banner_description
VoxeLibre:release_0.83.1
VoxeLibre:skelly_horse_thunder
VoxeLibre:mobs_armor
VoxeLibre:mobsarmorfix
VoxeLibre:smoother_biome_borders
VoxeLibre:jukebox_sound_distance
VoxeLibre:cobble_abm_height
VoxeLibre:callable-tool-rightclick-functions
VoxeLibre:effects_rewrite
VoxeLibre:respiration
VoxeLibre:make-new-music-louder
VoxeLibre:damage
VoxeLibre:texture_conversion_wool
VoxeLibre:dehardcoded_signs
VoxeLibre:mcl_oxidization
VoxeLibre:Texture-Rename2
VoxeLibre:Bamboo-Piston-Dig
VoxeLibre:hardcore_mode_test
VoxeLibre:update_german_translation_attempt2
VoxeLibre:test_mob_tweaks_branch
VoxeLibre:csm-enabled
VoxeLibre:move_physics_tweak
VoxeLibre:water_footstep
VoxeLibre:biome_skycolor
VoxeLibre:bambootoo
VoxeLibre:lower_ow_mapgen
VoxeLibre:release/0.81.1
VoxeLibre:revert_chest_models
VoxeLibre:mcl-craftguide-drop-sfinv
VoxeLibre:mcl-structures-fixes
VoxeLibre:turtlestriderbeefox
VoxeLibre:arrow_node_collision
VoxeLibre:pvp_knockback
VoxeLibre:icebergs
VoxeLibre:light_dump
VoxeLibre:testing
VoxeLibre:mobs-redo
VoxeLibre:wood_api
VoxeLibre:mobs_head_rotation
VoxeLibre:bonemeal
VoxeLibre:dyable-leather-armor
VoxeLibre:new_mapgen_api
VoxeLibre:newmobs-master
VoxeLibre:formspec_overhaul
VoxeLibre:mobs
VoxeLibre:mapgen
VoxeLibre:mineclone5
VoxeLibre:chat-command-builder-2
VoxeLibre:formspec-v4
VoxeLibre:doc-refactoring
VoxeLibre:production
VoxeLibre:objects
WillConker:water_freezing
WillConker:tnt_collision
WillConker:kelp_make_source
WillConker:hudbars_rework
WillConker:hoglin_transformation
WillConker:breath_rework
WillConker:additive_ds_ss
WillConker:environment-physics
WillConker:create_swift_sneak
WillConker:add_swift_sneak
WillConker:all_sus_stews
WillConker:master
WillConker:attach_fix
WillConker:EE_armor
WillConker:mapgen_update
WillConker:hammers_spears
WillConker:add_shader_support
WillConker:buildable_flowers
WillConker:world_aligned_textures
WillConker:zombie_texture_improvements
WillConker:mcl_weathered_nodes
WillConker:orb_of_exchange
WillConker:fix_pumpkin_names
WillConker:patch_skins
WillConker:hollow_logs_ref_recovery
WillConker:copper-adaptation-refs-recovery
WillConker:add_asset_attributions_1
WillConker:fix_pumpkin_typo_pumkin
WillConker:cherry_grove
WillConker:lush_caves
WillConker:release/0.86.1
WillConker:mobile_bow_workaround
WillConker:release/0.85.1
WillConker:hardness_blast_res_fixes
WillConker:optimize_jukebox_sounds
WillConker:optimize_theme_ogg
WillConker:Optimize_backgrounds_jpg
WillConker:archaeology
WillConker:spanish-translations
WillConker:fish_bucket_nametag
WillConker:villager-golem-fixes
WillConker:fix_beetroot_fortune_drops
WillConker:fix_sliding
WillConker:illager_banner_description
WillConker:release_0.83.1
WillConker:skelly_horse_thunder
WillConker:mobs_armor
WillConker:mobsarmorfix
WillConker:smoother_biome_borders
WillConker:jukebox_sound_distance
WillConker:cobble_abm_height
WillConker:callable-tool-rightclick-functions
WillConker:effects_rewrite
WillConker:respiration
WillConker:make-new-music-louder
WillConker:damage
WillConker:texture_conversion_wool
WillConker:dehardcoded_signs
WillConker:mcl_oxidization
WillConker:Texture-Rename2
WillConker:Bamboo-Piston-Dig
WillConker:hardcore_mode_test
WillConker:update_german_translation_attempt2
WillConker:test_mob_tweaks_branch
WillConker:csm-enabled
WillConker:move_physics_tweak
WillConker:water_footstep
WillConker:biome_skycolor
WillConker:bambootoo
WillConker:lower_ow_mapgen
WillConker:release/0.81.1
WillConker:revert_chest_models
WillConker:mcl-craftguide-drop-sfinv
WillConker:mcl-structures-fixes
WillConker:turtlestriderbeefox
WillConker:arrow_node_collision
WillConker:pvp_knockback
WillConker:icebergs
WillConker:light_dump
WillConker:testing
WillConker:mobs-redo
WillConker:wood_api
WillConker:mobs_head_rotation
WillConker:bonemeal
WillConker:dyable-leather-armor
WillConker:new_mapgen_api
WillConker:newmobs-master
WillConker:formspec_overhaul
WillConker:mobs
WillConker:mapgen
WillConker:mineclone5
WillConker:chat-command-builder-2
WillConker:formspec-v4
WillConker:doc-refactoring
WillConker:production
WillConker:objects
VoxeLibre:0.87.2
VoxeLibre:0.87.1
VoxeLibre:0.87.0
VoxeLibre:0.86.2
VoxeLibre:0.86.1
VoxeLibre:0.86.0
VoxeLibre:0.85.0
VoxeLibre:0.84.0
VoxeLibre:0.83.1
VoxeLibre:0.83.0
VoxeLibre:0.82.0
VoxeLibre:0.81.1
VoxeLibre:0.81.0
VoxeLibre:0.80.1
VoxeLibre:0.80.0
VoxeLibre:0.79.0
VoxeLibre:0.78.0
VoxeLibre:0.77.0
VoxeLibre:0.76.0
VoxeLibre:0.75.0
VoxeLibre:0.74.0
VoxeLibre:0.73.1
VoxeLibre:0.73.0
VoxeLibre:0.72.1
VoxeLibre:0.72.0
VoxeLibre:0.71.0
VoxeLibre:0.70.0
VoxeLibre:0.69.1
VoxeLibre:0.69.0
VoxeLibre:0.68.0
VoxeLibre:0.67.2
VoxeLibre:0.67.1
VoxeLibre:0.67.0
VoxeLibre:0.66.2
VoxeLibre:0.66.1
VoxeLibre:0.66.0
VoxeLibre:0.65.2
VoxeLibre:0.65.1
VoxeLibre:0.65.0
VoxeLibre:0.64.0
VoxeLibre:0.63.0
VoxeLibre:0.62.0
VoxeLibre:0.61.0
VoxeLibre:0.60.0
VoxeLibre:0.59.2
VoxeLibre:0.59.1
VoxeLibre:0.59.0
VoxeLibre:0.58.1
VoxeLibre:0.58.0
VoxeLibre:0.57.1
VoxeLibre:0.57.0
VoxeLibre:0.56.2
VoxeLibre:0.56.1
VoxeLibre:0.56.0
VoxeLibre:0.55.1
VoxeLibre:0.55.0
VoxeLibre:0.54.1
VoxeLibre:0.54.0
VoxeLibre:0.53.4
VoxeLibre:0.53.3
VoxeLibre:0.53.2
VoxeLibre:0.53.1
VoxeLibre:0.53.0
VoxeLibre:0.52.1
VoxeLibre:0.52.0
VoxeLibre:0.51.1
VoxeLibre:0.51.0
VoxeLibre:0.50.2
VoxeLibre:0.50.1
VoxeLibre:0.50.0
VoxeLibre:0.49.0
VoxeLibre:0.48.1
VoxeLibre:0.48.0
VoxeLibre:0.47.1
VoxeLibre:0.47.0
VoxeLibre:0.46.0
VoxeLibre:0.45.1
VoxeLibre:0.45.0
VoxeLibre:0.44.0
VoxeLibre:0.43.0
VoxeLibre:0.42.0
VoxeLibre:0.21.0
WillConker:0.87.1
WillConker:0.87.0
WillConker:0.86.2
WillConker:0.86.1
WillConker:0.86.0
WillConker:0.85.0
WillConker:0.84.0
WillConker:0.83.1
WillConker:0.83.0
WillConker:0.82.0
WillConker:0.81.1
WillConker:0.81.0
WillConker:0.80.1
WillConker:0.80.0
WillConker:mcl_signs_rewrite
WillConker:0.79.0
WillConker:0.78.0
WillConker:0.77.0
WillConker:0.76.0
WillConker:0.75.0
WillConker:0.74.0
WillConker:0.73.1
WillConker:0.73.0
WillConker:0.72.1
WillConker:0.72.0
WillConker:0.71.0
WillConker:0.70.0
WillConker:0.69.1
WillConker:0.69.0
WillConker:0.68.0
WillConker:0.67.2
WillConker:0.67.1
WillConker:0.67.0
WillConker:0.66.2
WillConker:0.66.1
WillConker:0.66.0
WillConker:0.65.2
WillConker:0.65.1
WillConker:0.65.0
WillConker:0.64.0
WillConker:0.63.0
WillConker:0.62.0
WillConker:0.61.0
WillConker:0.60.0
WillConker:0.59.2
WillConker:0.59.1
WillConker:0.59.0
WillConker:0.58.1
WillConker:0.58.0
WillConker:0.57.1
WillConker:0.57.0
WillConker:0.56.2
WillConker:0.56.1
WillConker:0.56.0
WillConker:0.55.1
WillConker:0.55.0
WillConker:0.54.1
WillConker:0.54.0
WillConker:0.53.4
WillConker:0.53.3
WillConker:0.53.2
WillConker:0.53.1
WillConker:0.53.0
WillConker:0.52.1
WillConker:0.52.0
WillConker:0.51.1
WillConker:0.51.0
WillConker:0.50.2
WillConker:0.50.1
WillConker:0.50.0
WillConker:0.49.0
WillConker:0.48.1
WillConker:0.48.0
WillConker:0.47.1
WillConker:0.47.0
WillConker:0.46.0
WillConker:0.45.1
WillConker:0.45.0
WillConker:0.44.0
WillConker:0.43.0
WillConker:0.42.0
WillConker:0.21.0
pull from: WillConker:breath_rework
WillConker:water_freezing
WillConker:tnt_collision
WillConker:kelp_make_source
WillConker:hudbars_rework
WillConker:hoglin_transformation
WillConker:breath_rework
WillConker:additive_ds_ss
WillConker:environment-physics
WillConker:create_swift_sneak
WillConker:add_swift_sneak
WillConker:all_sus_stews
WillConker:master
WillConker:attach_fix
WillConker:EE_armor
WillConker:mapgen_update
WillConker:hammers_spears
WillConker:add_shader_support
WillConker:buildable_flowers
WillConker:world_aligned_textures
WillConker:zombie_texture_improvements
WillConker:mcl_weathered_nodes
WillConker:orb_of_exchange
WillConker:fix_pumpkin_names
WillConker:patch_skins
WillConker:hollow_logs_ref_recovery
WillConker:copper-adaptation-refs-recovery
WillConker:add_asset_attributions_1
WillConker:fix_pumpkin_typo_pumkin
WillConker:cherry_grove
WillConker:lush_caves
WillConker:release/0.86.1
WillConker:mobile_bow_workaround
WillConker:release/0.85.1
WillConker:hardness_blast_res_fixes
WillConker:optimize_jukebox_sounds
WillConker:optimize_theme_ogg
WillConker:Optimize_backgrounds_jpg
WillConker:archaeology
WillConker:spanish-translations
WillConker:fish_bucket_nametag
WillConker:villager-golem-fixes
WillConker:fix_beetroot_fortune_drops
WillConker:fix_sliding
WillConker:illager_banner_description
WillConker:release_0.83.1
WillConker:skelly_horse_thunder
WillConker:mobs_armor
WillConker:mobsarmorfix
WillConker:smoother_biome_borders
WillConker:jukebox_sound_distance
WillConker:cobble_abm_height
WillConker:callable-tool-rightclick-functions
WillConker:effects_rewrite
WillConker:respiration
WillConker:make-new-music-louder
WillConker:damage
WillConker:texture_conversion_wool
WillConker:dehardcoded_signs
WillConker:mcl_oxidization
WillConker:Texture-Rename2
WillConker:Bamboo-Piston-Dig
WillConker:hardcore_mode_test
WillConker:update_german_translation_attempt2
WillConker:test_mob_tweaks_branch
WillConker:csm-enabled
WillConker:move_physics_tweak
WillConker:water_footstep
WillConker:biome_skycolor
WillConker:bambootoo
WillConker:lower_ow_mapgen
WillConker:release/0.81.1
WillConker:revert_chest_models
WillConker:mcl-craftguide-drop-sfinv
WillConker:mcl-structures-fixes
WillConker:turtlestriderbeefox
WillConker:arrow_node_collision
WillConker:pvp_knockback
WillConker:icebergs
WillConker:light_dump
WillConker:testing
WillConker:mobs-redo
WillConker:wood_api
WillConker:mobs_head_rotation
WillConker:bonemeal
WillConker:dyable-leather-armor
WillConker:new_mapgen_api
WillConker:newmobs-master
WillConker:formspec_overhaul
WillConker:mobs
WillConker:mapgen
WillConker:mineclone5
WillConker:chat-command-builder-2
WillConker:formspec-v4
WillConker:doc-refactoring
WillConker:production
WillConker:objects
VoxeLibre:master
VoxeLibre:mcl_mobs_cleanup
VoxeLibre:mcl_chests_redo
VoxeLibre:improve_planks
VoxeLibre:fix-has_room
VoxeLibre:opencollective-link
VoxeLibre:upstream/unbreaking_on_crossbows
VoxeLibre:mob_ignore_fix
VoxeLibre:slabs_block_light
VoxeLibre:hardness_blast_res_fixes
VoxeLibre:buildable_flowers
VoxeLibre:burning_in_thunder
VoxeLibre:redstone-update
VoxeLibre:add_shader_support
VoxeLibre:hammers_spears
VoxeLibre:EE_armor
VoxeLibre:mapgen_update
VoxeLibre:projectile-refactor
VoxeLibre:world_aligned_textures
VoxeLibre:zombie_texture_improvements
VoxeLibre:mcl_weathered_nodes
VoxeLibre:orb_of_exchange
VoxeLibre:fix_pumpkin_names
VoxeLibre:patch_skins
VoxeLibre:hollow_logs_ref_recovery
VoxeLibre:copper-adaptation-refs-recovery
VoxeLibre:add_asset_attributions_1
VoxeLibre:fix_pumpkin_typo_pumkin
VoxeLibre:cherry_grove
VoxeLibre:lush_caves
VoxeLibre:release/0.86.1
VoxeLibre:mobile_bow_workaround
VoxeLibre:release/0.85.1
VoxeLibre:optimize_jukebox_sounds
VoxeLibre:optimize_theme_ogg
VoxeLibre:Optimize_backgrounds_jpg
VoxeLibre:archaeology
VoxeLibre:spanish-translations
VoxeLibre:fish_bucket_nametag
VoxeLibre:villager-golem-fixes
VoxeLibre:fix_beetroot_fortune_drops
VoxeLibre:fix_sliding
VoxeLibre:illager_banner_description
VoxeLibre:release_0.83.1
VoxeLibre:skelly_horse_thunder
VoxeLibre:mobs_armor
VoxeLibre:mobsarmorfix
VoxeLibre:smoother_biome_borders
VoxeLibre:jukebox_sound_distance
VoxeLibre:cobble_abm_height
VoxeLibre:callable-tool-rightclick-functions
VoxeLibre:effects_rewrite
VoxeLibre:respiration
VoxeLibre:make-new-music-louder
VoxeLibre:damage
VoxeLibre:texture_conversion_wool
VoxeLibre:dehardcoded_signs
VoxeLibre:mcl_oxidization
VoxeLibre:Texture-Rename2
VoxeLibre:Bamboo-Piston-Dig
VoxeLibre:hardcore_mode_test
VoxeLibre:update_german_translation_attempt2
VoxeLibre:test_mob_tweaks_branch
VoxeLibre:csm-enabled
VoxeLibre:move_physics_tweak
VoxeLibre:water_footstep
VoxeLibre:biome_skycolor
VoxeLibre:bambootoo
VoxeLibre:lower_ow_mapgen
VoxeLibre:release/0.81.1
VoxeLibre:revert_chest_models
VoxeLibre:mcl-craftguide-drop-sfinv
VoxeLibre:mcl-structures-fixes
VoxeLibre:turtlestriderbeefox
VoxeLibre:arrow_node_collision
VoxeLibre:pvp_knockback
VoxeLibre:icebergs
VoxeLibre:light_dump
VoxeLibre:testing
VoxeLibre:mobs-redo
VoxeLibre:wood_api
VoxeLibre:mobs_head_rotation
VoxeLibre:bonemeal
VoxeLibre:dyable-leather-armor
VoxeLibre:new_mapgen_api
VoxeLibre:newmobs-master
VoxeLibre:formspec_overhaul
VoxeLibre:mobs
VoxeLibre:mapgen
VoxeLibre:mineclone5
VoxeLibre:chat-command-builder-2
VoxeLibre:formspec-v4
VoxeLibre:doc-refactoring
VoxeLibre:production
VoxeLibre:objects
WillConker:0.87.1
WillConker:0.87.0
WillConker:0.86.2
WillConker:0.86.1
WillConker:0.86.0
WillConker:0.85.0
WillConker:0.84.0
WillConker:0.83.1
WillConker:0.83.0
WillConker:0.82.0
WillConker:0.81.1
WillConker:0.81.0
WillConker:0.80.1
WillConker:0.80.0
WillConker:mcl_signs_rewrite
WillConker:0.79.0
WillConker:0.78.0
WillConker:0.77.0
WillConker:0.76.0
WillConker:0.75.0
WillConker:0.74.0
WillConker:0.73.1
WillConker:0.73.0
WillConker:0.72.1
WillConker:0.72.0
WillConker:0.71.0
WillConker:0.70.0
WillConker:0.69.1
WillConker:0.69.0
WillConker:0.68.0
WillConker:0.67.2
WillConker:0.67.1
WillConker:0.67.0
WillConker:0.66.2
WillConker:0.66.1
WillConker:0.66.0
WillConker:0.65.2
WillConker:0.65.1
WillConker:0.65.0
WillConker:0.64.0
WillConker:0.63.0
WillConker:0.62.0
WillConker:0.61.0
WillConker:0.60.0
WillConker:0.59.2
WillConker:0.59.1
WillConker:0.59.0
WillConker:0.58.1
WillConker:0.58.0
WillConker:0.57.1
WillConker:0.57.0
WillConker:0.56.2
WillConker:0.56.1
WillConker:0.56.0
WillConker:0.55.1
WillConker:0.55.0
WillConker:0.54.1
WillConker:0.54.0
WillConker:0.53.4
WillConker:0.53.3
WillConker:0.53.2
WillConker:0.53.1
WillConker:0.53.0
WillConker:0.52.1
WillConker:0.52.0
WillConker:0.51.1
WillConker:0.51.0
WillConker:0.50.2
WillConker:0.50.1
WillConker:0.50.0
WillConker:0.49.0
WillConker:0.48.1
WillConker:0.48.0
WillConker:0.47.1
WillConker:0.47.0
WillConker:0.46.0
WillConker:0.45.1
WillConker:0.45.0
WillConker:0.44.0
WillConker:0.43.0
WillConker:0.42.0
WillConker:0.21.0
VoxeLibre:0.87.2
VoxeLibre:0.87.1
VoxeLibre:0.87.0
VoxeLibre:0.86.2
VoxeLibre:0.86.1
VoxeLibre:0.86.0
VoxeLibre:0.85.0
VoxeLibre:0.84.0
VoxeLibre:0.83.1
VoxeLibre:0.83.0
VoxeLibre:0.82.0
VoxeLibre:0.81.1
VoxeLibre:0.81.0
VoxeLibre:0.80.1
VoxeLibre:0.80.0
VoxeLibre:0.79.0
VoxeLibre:0.78.0
VoxeLibre:0.77.0
VoxeLibre:0.76.0
VoxeLibre:0.75.0
VoxeLibre:0.74.0
VoxeLibre:0.73.1
VoxeLibre:0.73.0
VoxeLibre:0.72.1
VoxeLibre:0.72.0
VoxeLibre:0.71.0
VoxeLibre:0.70.0
VoxeLibre:0.69.1
VoxeLibre:0.69.0
VoxeLibre:0.68.0
VoxeLibre:0.67.2
VoxeLibre:0.67.1
VoxeLibre:0.67.0
VoxeLibre:0.66.2
VoxeLibre:0.66.1
VoxeLibre:0.66.0
VoxeLibre:0.65.2
VoxeLibre:0.65.1
VoxeLibre:0.65.0
VoxeLibre:0.64.0
VoxeLibre:0.63.0
VoxeLibre:0.62.0
VoxeLibre:0.61.0
VoxeLibre:0.60.0
VoxeLibre:0.59.2
VoxeLibre:0.59.1
VoxeLibre:0.59.0
VoxeLibre:0.58.1
VoxeLibre:0.58.0
VoxeLibre:0.57.1
VoxeLibre:0.57.0
VoxeLibre:0.56.2
VoxeLibre:0.56.1
VoxeLibre:0.56.0
VoxeLibre:0.55.1
VoxeLibre:0.55.0
VoxeLibre:0.54.1
VoxeLibre:0.54.0
VoxeLibre:0.53.4
VoxeLibre:0.53.3
VoxeLibre:0.53.2
VoxeLibre:0.53.1
VoxeLibre:0.53.0
VoxeLibre:0.52.1
VoxeLibre:0.52.0
VoxeLibre:0.51.1
VoxeLibre:0.51.0
VoxeLibre:0.50.2
VoxeLibre:0.50.1
VoxeLibre:0.50.0
VoxeLibre:0.49.0
VoxeLibre:0.48.1
VoxeLibre:0.48.0
VoxeLibre:0.47.1
VoxeLibre:0.47.0
VoxeLibre:0.46.0
VoxeLibre:0.45.1
VoxeLibre:0.45.0
VoxeLibre:0.44.0
VoxeLibre:0.43.0
VoxeLibre:0.42.0
VoxeLibre:0.21.0
A pull request between these branches already exists: VoxeLibre/VoxeLibre#4412