diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 diff --git a/LICENSE b/LICENSE old mode 100644 new mode 100755 diff --git a/README.md b/README.md old mode 100644 new mode 100755 diff --git a/minetestforfun_game/README.txt b/minetestforfun_game/README.txt old mode 100644 new mode 100755 diff --git a/minetestforfun_game/game.conf b/minetestforfun_game/game.conf old mode 100644 new mode 100755 diff --git a/minetestforfun_game/game_api.txt b/minetestforfun_game/game_api.txt old mode 100644 new mode 100755 diff --git a/minetestforfun_game/menu/header.png b/minetestforfun_game/menu/header.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/menu/icon.png b/minetestforfun_game/menu/icon.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/minetest.conf b/minetestforfun_game/minetest.conf old mode 100644 new mode 100755 diff --git a/minetestforfun_game/minetest.conf.example b/minetestforfun_game/minetest.conf.example old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/beds/models/fancy_bed.obj b/minetestforfun_game/mods/beds/models/fancy_bed.obj old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/beds/models/simple_bed.obj b/minetestforfun_game/mods/beds/models/simple_bed.obj old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/beds/textures/beds_bed.png b/minetestforfun_game/mods/beds/textures/beds_bed.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/beds/textures/beds_bed_fancy.png b/minetestforfun_game/mods/beds/textures/beds_bed_fancy.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/beds/textures/fancy_bed.png b/minetestforfun_game/mods/beds/textures/fancy_bed.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/beds/textures/simple_bed.png b/minetestforfun_game/mods/beds/textures/simple_bed.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/boats/README.txt b/minetestforfun_game/mods/boats/README.txt old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/boats/depends.txt b/minetestforfun_game/mods/boats/depends.txt old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/boats/init.lua b/minetestforfun_game/mods/boats/init.lua old mode 100644 new mode 100755 index d05f8770..9c5c6c77 --- a/minetestforfun_game/mods/boats/init.lua +++ b/minetestforfun_game/mods/boats/init.lua @@ -228,7 +228,7 @@ boats.register_boat({ controls = { up = 0.25, down = 0.25, - rotate = 2 + rotate = 4 }, description = "Expert race boat" }) diff --git a/minetestforfun_game/mods/boats/models/boat.x b/minetestforfun_game/mods/boats/models/boat.x old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/boats/textures/boats_boat_inventory.png b/minetestforfun_game/mods/boats/textures/boats_boat_inventory.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/boats/textures/boats_boat_wield.png b/minetestforfun_game/mods/boats/textures/boats_boat_wield.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/boats/textures/boats_expert_race_inventory.png b/minetestforfun_game/mods/boats/textures/boats_expert_race_inventory.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/boats/textures/boats_expert_race_wield.png b/minetestforfun_game/mods/boats/textures/boats_expert_race_wield.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/boats/textures/boats_inventory.png b/minetestforfun_game/mods/boats/textures/boats_inventory.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/boats/textures/boats_moon.png b/minetestforfun_game/mods/boats/textures/boats_moon.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/boats/textures/boats_moon_inventory.png b/minetestforfun_game/mods/boats/textures/boats_moon_inventory.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/boats/textures/boats_moon_wield.png b/minetestforfun_game/mods/boats/textures/boats_moon_wield.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/boats/textures/boats_race_inventory.png b/minetestforfun_game/mods/boats/textures/boats_race_inventory.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/boats/textures/boats_race_wield.png b/minetestforfun_game/mods/boats/textures/boats_race_wield.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/boats/textures/boats_water_inventory.png b/minetestforfun_game/mods/boats/textures/boats_water_inventory.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/boats/textures/boats_water_wield.png b/minetestforfun_game/mods/boats/textures/boats_water_wield.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/boats/textures/mboat_inventory.png b/minetestforfun_game/mods/boats/textures/mboat_inventory.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/boats/textures/mboat_wield.png b/minetestforfun_game/mods/boats/textures/mboat_wield.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/bucket/README.txt b/minetestforfun_game/mods/bucket/README.txt old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/bucket/depends.txt b/minetestforfun_game/mods/bucket/depends.txt old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/bucket/init.lua b/minetestforfun_game/mods/bucket/init.lua old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/bucket/textures/bucket.png b/minetestforfun_game/mods/bucket/textures/bucket.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/bucket/textures/bucket_acid.png b/minetestforfun_game/mods/bucket/textures/bucket_acid.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/bucket/textures/bucket_lava.png b/minetestforfun_game/mods/bucket/textures/bucket_lava.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/bucket/textures/bucket_sand.png b/minetestforfun_game/mods/bucket/textures/bucket_sand.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/bucket/textures/bucket_water.png b/minetestforfun_game/mods/bucket/textures/bucket_water.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/creative/README.txt b/minetestforfun_game/mods/creative/README.txt old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/creative/depends.txt b/minetestforfun_game/mods/creative/depends.txt old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/creative/init.lua b/minetestforfun_game/mods/creative/init.lua old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/aliases.lua b/minetestforfun_game/mods/default/aliases.lua old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/commands.lua b/minetestforfun_game/mods/default/commands.lua old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/crafting.lua b/minetestforfun_game/mods/default/crafting.lua old mode 100644 new mode 100755 index b9da9a4f..845957fa --- a/minetestforfun_game/mods/default/crafting.lua +++ b/minetestforfun_game/mods/default/crafting.lua @@ -548,6 +548,34 @@ minetest.register_craft({ } }) +minetest.register_craft({ + output = "default:gravel", + recipe = { + {"default:cobble"}, + } +}) + +minetest.register_craft({ + output = "default:sand", + recipe = { + {"default:desert_sand"}, + } +}) + +minetest.register_craft({ + output = "default:desert_sand", + recipe = { + {"default:sand"}, + } +}) + +minetest.register_craft({ + output = "default:sand", + recipe = { + {"default:gravel"}, + } +}) + minetest.register_craft({ type = "cooking", output = "default:stone", diff --git a/minetestforfun_game/mods/default/craftitems.lua b/minetestforfun_game/mods/default/craftitems.lua old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/functions.lua b/minetestforfun_game/mods/default/functions.lua old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/furnace.lua b/minetestforfun_game/mods/default/furnace.lua old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/init.lua b/minetestforfun_game/mods/default/init.lua old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/legacy.lua b/minetestforfun_game/mods/default/legacy.lua old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/mapgen.lua b/minetestforfun_game/mods/default/mapgen.lua old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/models/character.b3d b/minetestforfun_game/mods/default/models/character.b3d old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/models/character.blend b/minetestforfun_game/mods/default/models/character.blend old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/models/character.png b/minetestforfun_game/mods/default/models/character.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/nodes.lua b/minetestforfun_game/mods/default/nodes.lua old mode 100644 new mode 100755 index c2ecf88f..ce2a5235 --- a/minetestforfun_game/mods/default/nodes.lua +++ b/minetestforfun_game/mods/default/nodes.lua @@ -994,7 +994,7 @@ minetest.register_node("default:sand_flowing", { animation={type = "vertical_frames", aspect_w= 16, aspect_h = 16, length = 0.6} }, }, - alpha = 160, + alpha = 255, paramtype = "light", paramtype2 = "flowingliquid", walkable = false, @@ -1007,7 +1007,7 @@ minetest.register_node("default:sand_flowing", { liquid_alternative_flowing = "default:sand_flowing", liquid_alternative_source = "default:sand_source", liquid_viscosity = 20, - post_effect_color = {a = 220, r = 187, g = 187, b = 0}, + post_effect_color = {a = 250, r = 0, g = 0, b = 0}, groups = {liquid = 3, not_in_creative_inventory = 1}, }) @@ -1015,9 +1015,7 @@ minetest.register_node("default:sand_source", { description = "Sand Source", inventory_image = minetest.inventorycube("default_sand.png"), drawtype = "liquid", - tiles = { - {name = "default_sand_source_animated.png", animation={type = "vertical_frames", aspect_w= 16, aspect_h = 16, length = 1.5}} - }, + tiles = {"default_sand.png"}, special_tiles = { -- New-style water source material (mostly unused) { @@ -1026,7 +1024,7 @@ minetest.register_node("default:sand_source", { backface_culling = false, } }, - alpha = 160, + alpha = 255, paramtype = "light", walkable = false, pointable = false, @@ -1039,7 +1037,7 @@ minetest.register_node("default:sand_source", { liquid_alternative_source = "default:sand_source", liquid_viscosity = 20, liquid_renewable = false, - post_effect_color = {a = 220, r = 187, g = 187, b = 0}, + post_effect_color = {a = 250, r = 0, g = 0, b = 0}, groups = {liquid = 3}, }) diff --git a/minetestforfun_game/mods/default/player.lua b/minetestforfun_game/mods/default/player.lua old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/sounds/default_break_glass.1.ogg b/minetestforfun_game/mods/default/sounds/default_break_glass.1.ogg old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/sounds/default_break_glass.2.ogg b/minetestforfun_game/mods/default/sounds/default_break_glass.2.ogg old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/sounds/default_break_glass.3.ogg b/minetestforfun_game/mods/default/sounds/default_break_glass.3.ogg old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/sounds/default_breathless.ogg b/minetestforfun_game/mods/default/sounds/default_breathless.ogg old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/sounds/default_cool_lava.1.ogg b/minetestforfun_game/mods/default/sounds/default_cool_lava.1.ogg old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/sounds/default_cool_lava.2.ogg b/minetestforfun_game/mods/default/sounds/default_cool_lava.2.ogg old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/sounds/default_cool_lava.3.ogg b/minetestforfun_game/mods/default/sounds/default_cool_lava.3.ogg old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/sounds/default_dig_choppy.ogg b/minetestforfun_game/mods/default/sounds/default_dig_choppy.ogg old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/sounds/default_dig_cracky.ogg b/minetestforfun_game/mods/default/sounds/default_dig_cracky.ogg old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/sounds/default_dig_crumbly.ogg b/minetestforfun_game/mods/default/sounds/default_dig_crumbly.ogg old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/sounds/default_dig_dig_immediate.ogg b/minetestforfun_game/mods/default/sounds/default_dig_dig_immediate.ogg old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/sounds/default_dig_oddly_breakable_by_hand.ogg b/minetestforfun_game/mods/default/sounds/default_dig_oddly_breakable_by_hand.ogg old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/sounds/default_dirt_footstep.1.ogg b/minetestforfun_game/mods/default/sounds/default_dirt_footstep.1.ogg old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/sounds/default_dirt_footstep.2.ogg b/minetestforfun_game/mods/default/sounds/default_dirt_footstep.2.ogg old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/sounds/default_dirt_footstep.3.ogg b/minetestforfun_game/mods/default/sounds/default_dirt_footstep.3.ogg old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/sounds/default_dirt_footstep.4.ogg b/minetestforfun_game/mods/default/sounds/default_dirt_footstep.4.ogg old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/sounds/default_dug_node.1.ogg b/minetestforfun_game/mods/default/sounds/default_dug_node.1.ogg old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/sounds/default_dug_node.2.ogg b/minetestforfun_game/mods/default/sounds/default_dug_node.2.ogg old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/sounds/default_glass_footstep.ogg b/minetestforfun_game/mods/default/sounds/default_glass_footstep.ogg old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/sounds/default_grass_footstep.1.ogg b/minetestforfun_game/mods/default/sounds/default_grass_footstep.1.ogg old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/sounds/default_grass_footstep.2.ogg b/minetestforfun_game/mods/default/sounds/default_grass_footstep.2.ogg old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/sounds/default_grass_footstep.3.ogg b/minetestforfun_game/mods/default/sounds/default_grass_footstep.3.ogg old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/sounds/default_grass_footstep.4.ogg b/minetestforfun_game/mods/default/sounds/default_grass_footstep.4.ogg old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/sounds/default_gravel_footstep.1.ogg b/minetestforfun_game/mods/default/sounds/default_gravel_footstep.1.ogg old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/sounds/default_gravel_footstep.2.ogg b/minetestforfun_game/mods/default/sounds/default_gravel_footstep.2.ogg old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/sounds/default_gravel_footstep.3.ogg b/minetestforfun_game/mods/default/sounds/default_gravel_footstep.3.ogg old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/sounds/default_gravel_footstep.4.ogg b/minetestforfun_game/mods/default/sounds/default_gravel_footstep.4.ogg old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/sounds/default_hard_footstep.1.ogg b/minetestforfun_game/mods/default/sounds/default_hard_footstep.1.ogg old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/sounds/default_hard_footstep.2.ogg b/minetestforfun_game/mods/default/sounds/default_hard_footstep.2.ogg old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/sounds/default_hard_footstep.3.ogg b/minetestforfun_game/mods/default/sounds/default_hard_footstep.3.ogg old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/sounds/default_hard_footstep.4.ogg b/minetestforfun_game/mods/default/sounds/default_hard_footstep.4.ogg old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/sounds/default_metal_footstep.1.ogg b/minetestforfun_game/mods/default/sounds/default_metal_footstep.1.ogg old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/sounds/default_metal_footstep.2.ogg b/minetestforfun_game/mods/default/sounds/default_metal_footstep.2.ogg old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/sounds/default_metal_footstep.3.ogg b/minetestforfun_game/mods/default/sounds/default_metal_footstep.3.ogg old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/sounds/default_metal_footstep.4.ogg b/minetestforfun_game/mods/default/sounds/default_metal_footstep.4.ogg old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/sounds/default_place_node.1.ogg b/minetestforfun_game/mods/default/sounds/default_place_node.1.ogg old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/sounds/default_place_node.2.ogg b/minetestforfun_game/mods/default/sounds/default_place_node.2.ogg old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/sounds/default_place_node.3.ogg b/minetestforfun_game/mods/default/sounds/default_place_node.3.ogg old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/sounds/default_place_node_hard.1.ogg b/minetestforfun_game/mods/default/sounds/default_place_node_hard.1.ogg old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/sounds/default_place_node_hard.2.ogg b/minetestforfun_game/mods/default/sounds/default_place_node_hard.2.ogg old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/sounds/default_sand_footstep.1.ogg b/minetestforfun_game/mods/default/sounds/default_sand_footstep.1.ogg old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/sounds/default_sand_footstep.2.ogg b/minetestforfun_game/mods/default/sounds/default_sand_footstep.2.ogg old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/sounds/default_sand_footstep.3.ogg b/minetestforfun_game/mods/default/sounds/default_sand_footstep.3.ogg old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/sounds/default_sand_footstep.4.ogg b/minetestforfun_game/mods/default/sounds/default_sand_footstep.4.ogg old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/sounds/default_snow_footstep.1.ogg b/minetestforfun_game/mods/default/sounds/default_snow_footstep.1.ogg old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/sounds/default_snow_footstep.2.ogg b/minetestforfun_game/mods/default/sounds/default_snow_footstep.2.ogg old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/sounds/default_snow_footstep.3.ogg b/minetestforfun_game/mods/default/sounds/default_snow_footstep.3.ogg old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/sounds/default_snow_footstep.4.ogg b/minetestforfun_game/mods/default/sounds/default_snow_footstep.4.ogg old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/sounds/default_wood_footstep.1.ogg b/minetestforfun_game/mods/default/sounds/default_wood_footstep.1.ogg old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/sounds/default_wood_footstep.2.ogg b/minetestforfun_game/mods/default/sounds/default_wood_footstep.2.ogg old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/sounds/default_wood_footstep.3.ogg b/minetestforfun_game/mods/default/sounds/default_wood_footstep.3.ogg old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/sounds/default_wood_footstep.4.ogg b/minetestforfun_game/mods/default/sounds/default_wood_footstep.4.ogg old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/sounds/health_gain.ogg b/minetestforfun_game/mods/default/sounds/health_gain.ogg old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/sounds/hit.ogg b/minetestforfun_game/mods/default/sounds/hit.ogg old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/sounds/hit_death.ogg b/minetestforfun_game/mods/default/sounds/hit_death.ogg old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/sounds/lava.ogg b/minetestforfun_game/mods/default/sounds/lava.ogg old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/sounds/player_damage.1.ogg b/minetestforfun_game/mods/default/sounds/player_damage.1.ogg old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/sounds/player_damage.2.ogg b/minetestforfun_game/mods/default/sounds/player_damage.2.ogg old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/sounds/player_death.ogg b/minetestforfun_game/mods/default/sounds/player_death.ogg old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/sounds/player_falling_damage.ogg b/minetestforfun_game/mods/default/sounds/player_falling_damage.ogg old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/sounds/player_join.ogg b/minetestforfun_game/mods/default/sounds/player_join.ogg old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/sounds/player_leave.ogg b/minetestforfun_game/mods/default/sounds/player_leave.ogg old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/sounds/waterfall.ogg b/minetestforfun_game/mods/default/sounds/waterfall.ogg old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/bubble.png b/minetestforfun_game/mods/default/textures/bubble.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/crack_anylength.png b/minetestforfun_game/mods/default/textures/crack_anylength.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/crosshair.png b/minetestforfun_game/mods/default/textures/crosshair.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_acid.png b/minetestforfun_game/mods/default/textures/default_acid.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_acid_flowing_animated.png b/minetestforfun_game/mods/default/textures/default_acid_flowing_animated.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_acid_source_animated.png b/minetestforfun_game/mods/default/textures/default_acid_source_animated.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_apple.png b/minetestforfun_game/mods/default/textures/default_apple.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_book.png b/minetestforfun_game/mods/default/textures/default_book.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_bookshelf.png b/minetestforfun_game/mods/default/textures/default_bookshelf.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_brick.png b/minetestforfun_game/mods/default/textures/default_brick.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_bronze_block.png b/minetestforfun_game/mods/default/textures/default_bronze_block.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_cactus_side.png b/minetestforfun_game/mods/default/textures/default_cactus_side.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_cactus_top.png b/minetestforfun_game/mods/default/textures/default_cactus_top.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_cherry_blossom_leaves.png b/minetestforfun_game/mods/default/textures/default_cherry_blossom_leaves.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_cherry_sapling.png b/minetestforfun_game/mods/default/textures/default_cherry_sapling.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_cherry_top.png b/minetestforfun_game/mods/default/textures/default_cherry_top.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_cherry_tree.png b/minetestforfun_game/mods/default/textures/default_cherry_tree.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_chest_front.png b/minetestforfun_game/mods/default/textures/default_chest_front.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_chest_lock.png b/minetestforfun_game/mods/default/textures/default_chest_lock.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_chest_side.png b/minetestforfun_game/mods/default/textures/default_chest_side.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_chest_top.png b/minetestforfun_game/mods/default/textures/default_chest_top.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_clay.png b/minetestforfun_game/mods/default/textures/default_clay.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_clay_brick.png b/minetestforfun_game/mods/default/textures/default_clay_brick.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_clay_burned.png b/minetestforfun_game/mods/default/textures/default_clay_burned.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_cloud.png b/minetestforfun_game/mods/default/textures/default_cloud.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_coal_block.png b/minetestforfun_game/mods/default/textures/default_coal_block.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_cobble.png b/minetestforfun_game/mods/default/textures/default_cobble.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_copper_block.png b/minetestforfun_game/mods/default/textures/default_copper_block.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_desert_cobble.png b/minetestforfun_game/mods/default/textures/default_desert_cobble.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_desert_sand.png b/minetestforfun_game/mods/default/textures/default_desert_sand.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_desert_stone.png b/minetestforfun_game/mods/default/textures/default_desert_stone.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_desert_stone_brick.png b/minetestforfun_game/mods/default/textures/default_desert_stone_brick.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_diamond.png b/minetestforfun_game/mods/default/textures/default_diamond.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_diamond_block.png b/minetestforfun_game/mods/default/textures/default_diamond_block.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_dirt.png b/minetestforfun_game/mods/default/textures/default_dirt.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_dry_shrub.png b/minetestforfun_game/mods/default/textures/default_dry_shrub.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_fence.png b/minetestforfun_game/mods/default/textures/default_fence.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_fence_overlay.png b/minetestforfun_game/mods/default/textures/default_fence_overlay.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_furnace_bottom.png b/minetestforfun_game/mods/default/textures/default_furnace_bottom.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_furnace_fire_bg.png b/minetestforfun_game/mods/default/textures/default_furnace_fire_bg.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_furnace_fire_fg.png b/minetestforfun_game/mods/default/textures/default_furnace_fire_fg.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_furnace_front.png b/minetestforfun_game/mods/default/textures/default_furnace_front.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_furnace_front_active.png b/minetestforfun_game/mods/default/textures/default_furnace_front_active.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_furnace_lock.png b/minetestforfun_game/mods/default/textures/default_furnace_lock.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_furnace_lock_active.png b/minetestforfun_game/mods/default/textures/default_furnace_lock_active.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_furnace_side.png b/minetestforfun_game/mods/default/textures/default_furnace_side.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_furnace_top.png b/minetestforfun_game/mods/default/textures/default_furnace_top.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_glass.png b/minetestforfun_game/mods/default/textures/default_glass.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_glass_detail.png b/minetestforfun_game/mods/default/textures/default_glass_detail.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_glass_frame.png b/minetestforfun_game/mods/default/textures/default_glass_frame.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_gold_block.png b/minetestforfun_game/mods/default/textures/default_gold_block.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_gold_ingot.png b/minetestforfun_game/mods/default/textures/default_gold_ingot.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_grass.png b/minetestforfun_game/mods/default/textures/default_grass.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_grass_1.png b/minetestforfun_game/mods/default/textures/default_grass_1.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_grass_2.png b/minetestforfun_game/mods/default/textures/default_grass_2.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_grass_3.png b/minetestforfun_game/mods/default/textures/default_grass_3.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_grass_4.png b/minetestforfun_game/mods/default/textures/default_grass_4.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_grass_5.png b/minetestforfun_game/mods/default/textures/default_grass_5.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_grass_footsteps.png b/minetestforfun_game/mods/default/textures/default_grass_footsteps.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_grass_side.png b/minetestforfun_game/mods/default/textures/default_grass_side.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_gravel.png b/minetestforfun_game/mods/default/textures/default_gravel.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_ice.png b/minetestforfun_game/mods/default/textures/default_ice.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_infotool.png b/minetestforfun_game/mods/default/textures/default_infotool.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_junglegrass.png b/minetestforfun_game/mods/default/textures/default_junglegrass.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_jungleleaves.png b/minetestforfun_game/mods/default/textures/default_jungleleaves.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_junglesapling.png b/minetestforfun_game/mods/default/textures/default_junglesapling.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_jungletree.png b/minetestforfun_game/mods/default/textures/default_jungletree.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_jungletree_top.png b/minetestforfun_game/mods/default/textures/default_jungletree_top.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_junglewood.png b/minetestforfun_game/mods/default/textures/default_junglewood.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_ladder.png b/minetestforfun_game/mods/default/textures/default_ladder.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_ladder_new.png b/minetestforfun_game/mods/default/textures/default_ladder_new.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_ladder_new_inv.png b/minetestforfun_game/mods/default/textures/default_ladder_new_inv.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_ladder_obsidian.png b/minetestforfun_game/mods/default/textures/default_ladder_obsidian.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_ladder_obsidian_inv.png b/minetestforfun_game/mods/default/textures/default_ladder_obsidian_inv.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_lava.png b/minetestforfun_game/mods/default/textures/default_lava.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_lava_flowing_animated.png b/minetestforfun_game/mods/default/textures/default_lava_flowing_animated.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_lava_source_animated.png b/minetestforfun_game/mods/default/textures/default_lava_source_animated.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_leaves.png b/minetestforfun_game/mods/default/textures/default_leaves.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_mese_block.png b/minetestforfun_game/mods/default/textures/default_mese_block.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_mese_crystal_fragment.png b/minetestforfun_game/mods/default/textures/default_mese_crystal_fragment.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_meselamp.png b/minetestforfun_game/mods/default/textures/default_meselamp.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_meze_block.png b/minetestforfun_game/mods/default/textures/default_meze_block.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_mineral_coal.png b/minetestforfun_game/mods/default/textures/default_mineral_coal.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_mineral_copper.png b/minetestforfun_game/mods/default/textures/default_mineral_copper.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_mineral_diamond.png b/minetestforfun_game/mods/default/textures/default_mineral_diamond.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_mineral_gold.png b/minetestforfun_game/mods/default/textures/default_mineral_gold.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_mineral_iron.png b/minetestforfun_game/mods/default/textures/default_mineral_iron.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_mineral_mese.png b/minetestforfun_game/mods/default/textures/default_mineral_mese.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_mossycobble.png b/minetestforfun_game/mods/default/textures/default_mossycobble.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_nc_back.png b/minetestforfun_game/mods/default/textures/default_nc_back.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_nc_front.png b/minetestforfun_game/mods/default/textures/default_nc_front.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_nc_rb.png b/minetestforfun_game/mods/default/textures/default_nc_rb.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_nc_side.png b/minetestforfun_game/mods/default/textures/default_nc_side.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_obsidian.png b/minetestforfun_game/mods/default/textures/default_obsidian.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_obsidian_brick.png b/minetestforfun_game/mods/default/textures/default_obsidian_brick.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_obsidian_glass.png b/minetestforfun_game/mods/default/textures/default_obsidian_glass.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_obsidian_glass_detail.png b/minetestforfun_game/mods/default/textures/default_obsidian_glass_detail.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_obsidian_glass_frame.png b/minetestforfun_game/mods/default/textures/default_obsidian_glass_frame.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_obsidian_shard.png b/minetestforfun_game/mods/default/textures/default_obsidian_shard.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_papyrus.png b/minetestforfun_game/mods/default/textures/default_papyrus.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_pine_needles.png b/minetestforfun_game/mods/default/textures/default_pine_needles.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_pine_sapling.png b/minetestforfun_game/mods/default/textures/default_pine_sapling.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_pinetree.png b/minetestforfun_game/mods/default/textures/default_pinetree.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_pinetree_top.png b/minetestforfun_game/mods/default/textures/default_pinetree_top.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_pinewood.png b/minetestforfun_game/mods/default/textures/default_pinewood.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_sand.png b/minetestforfun_game/mods/default/textures/default_sand.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_sand_flowing_animated.png b/minetestforfun_game/mods/default/textures/default_sand_flowing_animated.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_sand_source_animated.png b/minetestforfun_game/mods/default/textures/default_sand_source_animated.png deleted file mode 100644 index cac4eaad..00000000 Binary files a/minetestforfun_game/mods/default/textures/default_sand_source_animated.png and /dev/null differ diff --git a/minetestforfun_game/mods/default/textures/default_sandstone.png b/minetestforfun_game/mods/default/textures/default_sandstone.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_sandstone_brick.png b/minetestforfun_game/mods/default/textures/default_sandstone_brick.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_sapling.png b/minetestforfun_game/mods/default/textures/default_sapling.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_scorched_stuff.png b/minetestforfun_game/mods/default/textures/default_scorched_stuff.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_sign.png b/minetestforfun_game/mods/default/textures/default_sign.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_sign_new.png b/minetestforfun_game/mods/default/textures/default_sign_new.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_sign_new_inv.png b/minetestforfun_game/mods/default/textures/default_sign_new_inv.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_sign_wall.png b/minetestforfun_game/mods/default/textures/default_sign_wall.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_snow.png b/minetestforfun_game/mods/default/textures/default_snow.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_snow_side.png b/minetestforfun_game/mods/default/textures/default_snow_side.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_snowball.png b/minetestforfun_game/mods/default/textures/default_snowball.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_steel_block.png b/minetestforfun_game/mods/default/textures/default_steel_block.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_steel_ingot.png b/minetestforfun_game/mods/default/textures/default_steel_ingot.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_stick.png b/minetestforfun_game/mods/default/textures/default_stick.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_stone.png b/minetestforfun_game/mods/default/textures/default_stone.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_stone_brick.png b/minetestforfun_game/mods/default/textures/default_stone_brick.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_tnt_bottom.png b/minetestforfun_game/mods/default/textures/default_tnt_bottom.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_tnt_side.png b/minetestforfun_game/mods/default/textures/default_tnt_side.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_tnt_top.png b/minetestforfun_game/mods/default/textures/default_tnt_top.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_tool_bronzeaxe.png b/minetestforfun_game/mods/default/textures/default_tool_bronzeaxe.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_tool_bronzepick.png b/minetestforfun_game/mods/default/textures/default_tool_bronzepick.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_tool_bronzeshovel.png b/minetestforfun_game/mods/default/textures/default_tool_bronzeshovel.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_tool_bronzesword.png b/minetestforfun_game/mods/default/textures/default_tool_bronzesword.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_tool_diamondaxe.png b/minetestforfun_game/mods/default/textures/default_tool_diamondaxe.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_tool_diamondpick.png b/minetestforfun_game/mods/default/textures/default_tool_diamondpick.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_tool_diamondshovel.png b/minetestforfun_game/mods/default/textures/default_tool_diamondshovel.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_tool_diamondsword.png b/minetestforfun_game/mods/default/textures/default_tool_diamondsword.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_tool_goldaxe.png b/minetestforfun_game/mods/default/textures/default_tool_goldaxe.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_tool_goldpick.png b/minetestforfun_game/mods/default/textures/default_tool_goldpick.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_tool_goldshovel.png b/minetestforfun_game/mods/default/textures/default_tool_goldshovel.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_tool_goldsword.png b/minetestforfun_game/mods/default/textures/default_tool_goldsword.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_tool_meseaxe.png b/minetestforfun_game/mods/default/textures/default_tool_meseaxe.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_tool_mesepick.png b/minetestforfun_game/mods/default/textures/default_tool_mesepick.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_tool_meseshovel.png b/minetestforfun_game/mods/default/textures/default_tool_meseshovel.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_tool_mesesword.png b/minetestforfun_game/mods/default/textures/default_tool_mesesword.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_tool_nyanaxe.png b/minetestforfun_game/mods/default/textures/default_tool_nyanaxe.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_tool_nyanpick.png b/minetestforfun_game/mods/default/textures/default_tool_nyanpick.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_tool_nyanshovel.png b/minetestforfun_game/mods/default/textures/default_tool_nyanshovel.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_tool_nyansword.png b/minetestforfun_game/mods/default/textures/default_tool_nyansword.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_tool_steelaxe.png b/minetestforfun_game/mods/default/textures/default_tool_steelaxe.png old mode 100644 new mode 100755 index 3964a754..ce2d0e14 Binary files a/minetestforfun_game/mods/default/textures/default_tool_steelaxe.png and b/minetestforfun_game/mods/default/textures/default_tool_steelaxe.png differ diff --git a/minetestforfun_game/mods/default/textures/default_tool_steelpick.png b/minetestforfun_game/mods/default/textures/default_tool_steelpick.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_tool_steelshovel.png b/minetestforfun_game/mods/default/textures/default_tool_steelshovel.png old mode 100644 new mode 100755 index 05bc02bc..2a71e0f9 Binary files a/minetestforfun_game/mods/default/textures/default_tool_steelshovel.png and b/minetestforfun_game/mods/default/textures/default_tool_steelshovel.png differ diff --git a/minetestforfun_game/mods/default/textures/default_tool_steelsword.png b/minetestforfun_game/mods/default/textures/default_tool_steelsword.png old mode 100644 new mode 100755 index bc1e642c..02b15acb Binary files a/minetestforfun_game/mods/default/textures/default_tool_steelsword.png and b/minetestforfun_game/mods/default/textures/default_tool_steelsword.png differ diff --git a/minetestforfun_game/mods/default/textures/default_tool_stoneaxe.png b/minetestforfun_game/mods/default/textures/default_tool_stoneaxe.png old mode 100644 new mode 100755 index 9a18990b..d774b803 Binary files a/minetestforfun_game/mods/default/textures/default_tool_stoneaxe.png and b/minetestforfun_game/mods/default/textures/default_tool_stoneaxe.png differ diff --git a/minetestforfun_game/mods/default/textures/default_tool_stonepick.png b/minetestforfun_game/mods/default/textures/default_tool_stonepick.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_tool_stoneshovel.png b/minetestforfun_game/mods/default/textures/default_tool_stoneshovel.png old mode 100644 new mode 100755 index fa29e85c..1190331c Binary files a/minetestforfun_game/mods/default/textures/default_tool_stoneshovel.png and b/minetestforfun_game/mods/default/textures/default_tool_stoneshovel.png differ diff --git a/minetestforfun_game/mods/default/textures/default_tool_stonesword.png b/minetestforfun_game/mods/default/textures/default_tool_stonesword.png old mode 100644 new mode 100755 index e8814ab2..e12d158b Binary files a/minetestforfun_game/mods/default/textures/default_tool_stonesword.png and b/minetestforfun_game/mods/default/textures/default_tool_stonesword.png differ diff --git a/minetestforfun_game/mods/default/textures/default_tool_woodaxe.png b/minetestforfun_game/mods/default/textures/default_tool_woodaxe.png old mode 100644 new mode 100755 index 0d683adf..d105eaad Binary files a/minetestforfun_game/mods/default/textures/default_tool_woodaxe.png and b/minetestforfun_game/mods/default/textures/default_tool_woodaxe.png differ diff --git a/minetestforfun_game/mods/default/textures/default_tool_woodpick.png b/minetestforfun_game/mods/default/textures/default_tool_woodpick.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_tool_woodshovel.png b/minetestforfun_game/mods/default/textures/default_tool_woodshovel.png old mode 100644 new mode 100755 index 5652580d..c63aeb91 Binary files a/minetestforfun_game/mods/default/textures/default_tool_woodshovel.png and b/minetestforfun_game/mods/default/textures/default_tool_woodshovel.png differ diff --git a/minetestforfun_game/mods/default/textures/default_tool_woodsword.png b/minetestforfun_game/mods/default/textures/default_tool_woodsword.png old mode 100644 new mode 100755 index 792a0464..89f621e3 Binary files a/minetestforfun_game/mods/default/textures/default_tool_woodsword.png and b/minetestforfun_game/mods/default/textures/default_tool_woodsword.png differ diff --git a/minetestforfun_game/mods/default/textures/default_torch.png b/minetestforfun_game/mods/default/textures/default_torch.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_torch_animated.png b/minetestforfun_game/mods/default/textures/default_torch_animated.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_torch_new_bottom.png b/minetestforfun_game/mods/default/textures/default_torch_new_bottom.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_torch_new_inv.png b/minetestforfun_game/mods/default/textures/default_torch_new_inv.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_torch_new_side.png b/minetestforfun_game/mods/default/textures/default_torch_new_side.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_torch_new_top.png b/minetestforfun_game/mods/default/textures/default_torch_new_top.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_torch_on_ceiling.png b/minetestforfun_game/mods/default/textures/default_torch_on_ceiling.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_torch_on_ceiling_animated.png b/minetestforfun_game/mods/default/textures/default_torch_on_ceiling_animated.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_torch_on_floor.png b/minetestforfun_game/mods/default/textures/default_torch_on_floor.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_torch_on_floor_animated.png b/minetestforfun_game/mods/default/textures/default_torch_on_floor_animated.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_tree.png b/minetestforfun_game/mods/default/textures/default_tree.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_tree_top.png b/minetestforfun_game/mods/default/textures/default_tree_top.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_water.png b/minetestforfun_game/mods/default/textures/default_water.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_water_flowing_animated.png b/minetestforfun_game/mods/default/textures/default_water_flowing_animated.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_water_source_animated.png b/minetestforfun_game/mods/default/textures/default_water_source_animated.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_wood.png b/minetestforfun_game/mods/default/textures/default_wood.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/default_wood_cherry_planks.png b/minetestforfun_game/mods/default/textures/default_wood_cherry_planks.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/gui_formbg.png b/minetestforfun_game/mods/default/textures/gui_formbg.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/gui_furnace_arrow_bg.png b/minetestforfun_game/mods/default/textures/gui_furnace_arrow_bg.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/gui_furnace_arrow_fg.png b/minetestforfun_game/mods/default/textures/gui_furnace_arrow_fg.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/gui_hb_bg.png b/minetestforfun_game/mods/default/textures/gui_hb_bg.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/gui_hotbar.png b/minetestforfun_game/mods/default/textures/gui_hotbar.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/gui_hotbar_selected.png b/minetestforfun_game/mods/default/textures/gui_hotbar_selected.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/heart.png b/minetestforfun_game/mods/default/textures/heart.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/moon.png b/minetestforfun_game/mods/default/textures/moon.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/player.png b/minetestforfun_game/mods/default/textures/player.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/player_back.png b/minetestforfun_game/mods/default/textures/player_back.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/smoke_puff.png b/minetestforfun_game/mods/default/textures/smoke_puff.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/sun.png b/minetestforfun_game/mods/default/textures/sun.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/treeprop.png b/minetestforfun_game/mods/default/textures/treeprop.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/unknown_item.png b/minetestforfun_game/mods/default/textures/unknown_item.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/unknown_node.png b/minetestforfun_game/mods/default/textures/unknown_node.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/unknown_object.png b/minetestforfun_game/mods/default/textures/unknown_object.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/textures/wieldhand.png b/minetestforfun_game/mods/default/textures/wieldhand.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/tools.lua b/minetestforfun_game/mods/default/tools.lua old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/trees.lua b/minetestforfun_game/mods/default/trees.lua old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/doors/README.txt b/minetestforfun_game/mods/doors/README.txt old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/doors/depends.txt b/minetestforfun_game/mods/doors/depends.txt old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/doors/init.lua b/minetestforfun_game/mods/doors/init.lua old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/doors/sounds/door_close.ogg b/minetestforfun_game/mods/doors/sounds/door_close.ogg old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/doors/sounds/door_open.ogg b/minetestforfun_game/mods/doors/sounds/door_open.ogg old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/doors/sounds/doors_door_close.ogg b/minetestforfun_game/mods/doors/sounds/doors_door_close.ogg old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/doors/sounds/doors_door_open.ogg b/minetestforfun_game/mods/doors/sounds/doors_door_open.ogg old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/doors/textures/doors_brown.png b/minetestforfun_game/mods/doors/textures/doors_brown.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/doors/textures/doors_glass.png b/minetestforfun_game/mods/doors/textures/doors_glass.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/doors/textures/doors_glass_a.png b/minetestforfun_game/mods/doors/textures/doors_glass_a.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/doors/textures/doors_glass_b.png b/minetestforfun_game/mods/doors/textures/doors_glass_b.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/doors/textures/doors_glass_side.png b/minetestforfun_game/mods/doors/textures/doors_glass_side.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/doors/textures/doors_grey.png b/minetestforfun_game/mods/doors/textures/doors_grey.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/doors/textures/doors_obsidian_glass.png b/minetestforfun_game/mods/doors/textures/doors_obsidian_glass.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/doors/textures/doors_obsidian_glass_a.png b/minetestforfun_game/mods/doors/textures/doors_obsidian_glass_a.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/doors/textures/doors_obsidian_glass_b.png b/minetestforfun_game/mods/doors/textures/doors_obsidian_glass_b.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/doors/textures/doors_obsidian_glass_side.png b/minetestforfun_game/mods/doors/textures/doors_obsidian_glass_side.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/doors/textures/doors_steel.png b/minetestforfun_game/mods/doors/textures/doors_steel.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/doors/textures/doors_steel_a.png b/minetestforfun_game/mods/doors/textures/doors_steel_a.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/doors/textures/doors_steel_b.png b/minetestforfun_game/mods/doors/textures/doors_steel_b.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/doors/textures/doors_trapdoor.png b/minetestforfun_game/mods/doors/textures/doors_trapdoor.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/doors/textures/doors_trapdoor_cherry.png b/minetestforfun_game/mods/doors/textures/doors_trapdoor_cherry.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/doors/textures/doors_trapdoor_side.png b/minetestforfun_game/mods/doors/textures/doors_trapdoor_side.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/doors/textures/doors_wood.png b/minetestforfun_game/mods/doors/textures/doors_wood.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/doors/textures/doors_wood_a.png b/minetestforfun_game/mods/doors/textures/doors_wood_a.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/doors/textures/doors_wood_b.png b/minetestforfun_game/mods/doors/textures/doors_wood_b.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/doors/textures/doors_wood_cherry.png b/minetestforfun_game/mods/doors/textures/doors_wood_cherry.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/doors/textures/doors_wood_cherry_a.png b/minetestforfun_game/mods/doors/textures/doors_wood_cherry_a.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/doors/textures/doors_wood_cherry_b.png b/minetestforfun_game/mods/doors/textures/doors_wood_cherry_b.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/dye/README.txt b/minetestforfun_game/mods/dye/README.txt old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/dye/depends.txt b/minetestforfun_game/mods/dye/depends.txt old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/dye/init.lua b/minetestforfun_game/mods/dye/init.lua old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/dye/textures/dye_black.png b/minetestforfun_game/mods/dye/textures/dye_black.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/dye/textures/dye_blue.png b/minetestforfun_game/mods/dye/textures/dye_blue.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/dye/textures/dye_brown.png b/minetestforfun_game/mods/dye/textures/dye_brown.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/dye/textures/dye_cyan.png b/minetestforfun_game/mods/dye/textures/dye_cyan.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/dye/textures/dye_dark_green.png b/minetestforfun_game/mods/dye/textures/dye_dark_green.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/dye/textures/dye_dark_grey.png b/minetestforfun_game/mods/dye/textures/dye_dark_grey.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/dye/textures/dye_green.png b/minetestforfun_game/mods/dye/textures/dye_green.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/dye/textures/dye_grey.png b/minetestforfun_game/mods/dye/textures/dye_grey.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/dye/textures/dye_magenta.png b/minetestforfun_game/mods/dye/textures/dye_magenta.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/dye/textures/dye_orange.png b/minetestforfun_game/mods/dye/textures/dye_orange.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/dye/textures/dye_pink.png b/minetestforfun_game/mods/dye/textures/dye_pink.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/dye/textures/dye_red.png b/minetestforfun_game/mods/dye/textures/dye_red.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/dye/textures/dye_violet.png b/minetestforfun_game/mods/dye/textures/dye_violet.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/dye/textures/dye_white.png b/minetestforfun_game/mods/dye/textures/dye_white.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/dye/textures/dye_yellow.png b/minetestforfun_game/mods/dye/textures/dye_yellow.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/fire/README.txt b/minetestforfun_game/mods/fire/README.txt old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/fire/init.lua b/minetestforfun_game/mods/fire/init.lua old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/fire/sounds/fire_large.ogg b/minetestforfun_game/mods/fire/sounds/fire_large.ogg old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/fire/sounds/fire_small.ogg b/minetestforfun_game/mods/fire/sounds/fire_small.ogg old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/fire/textures/fire_basic_flame.png b/minetestforfun_game/mods/fire/textures/fire_basic_flame.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/fire/textures/fire_basic_flame_animated.png b/minetestforfun_game/mods/fire/textures/fire_basic_flame_animated.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/flowers/README.txt b/minetestforfun_game/mods/flowers/README.txt old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/flowers/depends.txt b/minetestforfun_game/mods/flowers/depends.txt old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/flowers/init.lua b/minetestforfun_game/mods/flowers/init.lua old mode 100644 new mode 100755 index 4d5d9aef..8b23d0d9 --- a/minetestforfun_game/mods/flowers/init.lua +++ b/minetestforfun_game/mods/flowers/init.lua @@ -16,7 +16,7 @@ minetest.register_alias("flowers:flower_viola", "flowers:viola") --- Simple flowers (one node) --- --------------------------------- -local function add_simple_flower(name, desc, image, f_groups) +local function add_simple_flower(name, desc, image, box, f_groups) minetest.register_node("flowers:"..name.."", { description = desc, drawtype = "plantlike", @@ -29,20 +29,30 @@ local function add_simple_flower(name, desc, image, f_groups) stack_max = 99, groups = f_groups, sounds = default.node_sound_leaves_defaults(), - selection_box = { - type = "fixed", - fixed = { -0.15, -0.5, -0.15, 0.15, 0.2, 0.15 }, - }, + selection_box = box }) end +-- Selection boxes +vertical = { + type = "fixed", + fixed = { -0.15, -0.5, -0.15, 0.15, 0.2, 0.15 }, +} -add_simple_flower("dandelion_yellow", "Yellow Dandelion", "flowers_dandelion_yellow", {snappy=3,flammable=2,flower=1,flora=1,attached_node=1,dig_by_water=1,color_yellow=1}) -add_simple_flower("geranium", "Blue Geranium", "flowers_geranium", {snappy=3,flammable=2,flower=1,flora=1,attached_node=1,dig_by_water=1,color_blue=1}) -add_simple_flower("rose", "Rose", "flowers_rose", {snappy=3,flammable=2,flower=1,flora=1,attached_node=1,dig_by_water=1,color_red=1}) -add_simple_flower("tulip", "Orange Tulip", "flowers_tulip", {snappy=3,flammable=2,flower=1,flora=1,attached_node=1,dig_by_water=1,color_orange=1}) -add_simple_flower("dandelion_white", "White dandelion", "flowers_dandelion_white",{snappy=3,flammable=2,flower=1,flora=1,attached_node=1,color_white=1}) -add_simple_flower("viola", "Viola", "flowers_viola", {snappy=3,flammable=2,flower=1,flora=1,attached_node=1,color_violet=1}) +slab = { + type = "fixed", + fixed = { -0.5, -0.5, -0.5, 0.5, -0.2, 0.5 }, +} + +add_simple_flower("dandelion_yellow", "Yellow Dandelion", "flowers_dandelion_yellow", vertical, {snappy=3,flammable=2,flower=1,flora=1,attached_node=1,dig_by_water=1,color_yellow=1}) +add_simple_flower("geranium", "Blue Geranium", "flowers_geranium", vertical, {snappy=3,flammable=2,flower=1,flora=1,attached_node=1,dig_by_water=1,color_blue=1}) +add_simple_flower("rose", "Rose", "flowers_rose", vertical, +{snappy=3,flammable=2,flower=1,flora=1,attached_node=1,dig_by_water=1,color_red=1}) +add_simple_flower("tulip", "Orange Tulip", "flowers_tulip", vertical, +{snappy=3,flammable=2,flower=1,flora=1,attached_node=1,dig_by_water=1,color_orange=1}) +add_simple_flower("dandelion_white", "White dandelion", "flowers_dandelion_white", slab, {snappy=3,flammable=2,flower=1,flora=1,attached_node=1,color_white=1}) +add_simple_flower("viola", "Viola", "flowers_viola", slab, +{snappy=3,flammable=2,flower=1,flora=1,attached_node=1,color_violet=1}) minetest.register_node("flowers:lily_pad", { description = "Lily Pad", diff --git a/minetestforfun_game/mods/flowers/mapgen.lua b/minetestforfun_game/mods/flowers/mapgen.lua old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/flowers/textures/flowers_dandelion_white.png b/minetestforfun_game/mods/flowers/textures/flowers_dandelion_white.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/flowers/textures/flowers_dandelion_yellow.png b/minetestforfun_game/mods/flowers/textures/flowers_dandelion_yellow.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/flowers/textures/flowers_geranium.png b/minetestforfun_game/mods/flowers/textures/flowers_geranium.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/flowers/textures/flowers_lily_pad.png b/minetestforfun_game/mods/flowers/textures/flowers_lily_pad.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/flowers/textures/flowers_rose.png b/minetestforfun_game/mods/flowers/textures/flowers_rose.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/flowers/textures/flowers_tulip.png b/minetestforfun_game/mods/flowers/textures/flowers_tulip.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/flowers/textures/flowers_viola.png b/minetestforfun_game/mods/flowers/textures/flowers_viola.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/highlandpools/README.txt b/minetestforfun_game/mods/highlandpools/README.txt old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/highlandpools/depends.txt b/minetestforfun_game/mods/highlandpools/depends.txt old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/highlandpools/init.lua b/minetestforfun_game/mods/highlandpools/init.lua old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/highlandpools/license.txt b/minetestforfun_game/mods/highlandpools/license.txt old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/init.lua b/minetestforfun_game/mods/init.lua old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/sethome/init.lua b/minetestforfun_game/mods/sethome/init.lua old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/stairs/README.txt b/minetestforfun_game/mods/stairs/README.txt old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/stairs/depends.txt b/minetestforfun_game/mods/stairs/depends.txt old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/stairs/init.lua b/minetestforfun_game/mods/stairs/init.lua old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/vessels/README.txt b/minetestforfun_game/mods/vessels/README.txt old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/vessels/depends.txt b/minetestforfun_game/mods/vessels/depends.txt old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/vessels/init.lua b/minetestforfun_game/mods/vessels/init.lua old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/vessels/textures/alternates/vessels_drinking_glass.png b/minetestforfun_game/mods/vessels/textures/alternates/vessels_drinking_glass.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/vessels/textures/alternates/vessels_glass_bottle.png b/minetestforfun_game/mods/vessels/textures/alternates/vessels_glass_bottle.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/vessels/textures/alternates/vessels_steel_bottle.png b/minetestforfun_game/mods/vessels/textures/alternates/vessels_steel_bottle.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/vessels/textures/vessels_drinking_glass.png b/minetestforfun_game/mods/vessels/textures/vessels_drinking_glass.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/vessels/textures/vessels_drinking_glass_inv.png b/minetestforfun_game/mods/vessels/textures/vessels_drinking_glass_inv.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/vessels/textures/vessels_glass_bottle.png b/minetestforfun_game/mods/vessels/textures/vessels_glass_bottle.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/vessels/textures/vessels_glass_bottle_inv.png b/minetestforfun_game/mods/vessels/textures/vessels_glass_bottle_inv.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/vessels/textures/vessels_glass_fragments.png b/minetestforfun_game/mods/vessels/textures/vessels_glass_fragments.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/vessels/textures/vessels_shelf.png b/minetestforfun_game/mods/vessels/textures/vessels_shelf.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/vessels/textures/vessels_steel_bottle.png b/minetestforfun_game/mods/vessels/textures/vessels_steel_bottle.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/vessels/textures/vessels_steel_bottle_inv.png b/minetestforfun_game/mods/vessels/textures/vessels_steel_bottle_inv.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/wool/README.txt b/minetestforfun_game/mods/wool/README.txt old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/wool/depends.txt b/minetestforfun_game/mods/wool/depends.txt old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/wool/init.lua b/minetestforfun_game/mods/wool/init.lua old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/wool/textures/wool_black.png b/minetestforfun_game/mods/wool/textures/wool_black.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/wool/textures/wool_blue.png b/minetestforfun_game/mods/wool/textures/wool_blue.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/wool/textures/wool_brown.png b/minetestforfun_game/mods/wool/textures/wool_brown.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/wool/textures/wool_cyan.png b/minetestforfun_game/mods/wool/textures/wool_cyan.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/wool/textures/wool_dark_green.png b/minetestforfun_game/mods/wool/textures/wool_dark_green.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/wool/textures/wool_dark_grey.png b/minetestforfun_game/mods/wool/textures/wool_dark_grey.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/wool/textures/wool_green.png b/minetestforfun_game/mods/wool/textures/wool_green.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/wool/textures/wool_grey.png b/minetestforfun_game/mods/wool/textures/wool_grey.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/wool/textures/wool_magenta.png b/minetestforfun_game/mods/wool/textures/wool_magenta.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/wool/textures/wool_orange.png b/minetestforfun_game/mods/wool/textures/wool_orange.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/wool/textures/wool_pink.png b/minetestforfun_game/mods/wool/textures/wool_pink.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/wool/textures/wool_red.png b/minetestforfun_game/mods/wool/textures/wool_red.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/wool/textures/wool_violet.png b/minetestforfun_game/mods/wool/textures/wool_violet.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/wool/textures/wool_white.png b/minetestforfun_game/mods/wool/textures/wool_white.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/wool/textures/wool_yellow.png b/minetestforfun_game/mods/wool/textures/wool_yellow.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/xpanes/README.txt b/minetestforfun_game/mods/xpanes/README.txt old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/xpanes/depends.txt b/minetestforfun_game/mods/xpanes/depends.txt old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/xpanes/init.lua b/minetestforfun_game/mods/xpanes/init.lua old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/xpanes/textures/xpanes_bar.png b/minetestforfun_game/mods/xpanes/textures/xpanes_bar.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/xpanes/textures/xpanes_grey.png b/minetestforfun_game/mods/xpanes/textures/xpanes_grey.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/xpanes/textures/xpanes_pane_half.png b/minetestforfun_game/mods/xpanes/textures/xpanes_pane_half.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/xpanes/textures/xpanes_space.png b/minetestforfun_game/mods/xpanes/textures/xpanes_space.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/xpanes/textures/xpanes_white.png b/minetestforfun_game/mods/xpanes/textures/xpanes_white.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor/3d_armor/armor.conf b/mods/3d_armor/3d_armor/armor.conf index b9ead1e5..4e4b86fd 100755 --- a/mods/3d_armor/3d_armor/armor.conf +++ b/mods/3d_armor/3d_armor/armor.conf @@ -30,8 +30,8 @@ ARMOR_HEAL_MULTIPLIER = 0 -- You can also use this file to execute arbitary lua code -- eg: Dumb the armor down if using Simple Mobs -if minetest.get_modpath("mobs") then - ARMOR_LEVEL_MULTIPLIER = 1 - ARMOR_HEAL_MULTIPLIER = 0 -end +--if minetest.get_modpath("mobs") then +-- ARMOR_LEVEL_MULTIPLIER = 1 +-- ARMOR_HEAL_MULTIPLIER = 0 +--end diff --git a/mods/3d_armor/3d_armor/armor.lua b/mods/3d_armor/3d_armor/armor.lua index 1b2c6e5c..a223896f 100755 --- a/mods/3d_armor/3d_armor/armor.lua +++ b/mods/3d_armor/3d_armor/armor.lua @@ -15,6 +15,12 @@ ARMOR_MATERIALS = { gold = "default:gold_ingot", mithril = "moreores:mithril_ingot", crystal = "ethereal:crystal_ingot", + -- Hunter armors (A déc-ommenter quand activation de l'armure au total) + --hardened_leather = "3d_armor:hardened_leather" + --reinforced_leather = "3d_armor:reinforced_leather" + -- Wizard armors + --armor = "xxx", + --armor = "xxx", } ARMOR_FIRE_PROTECT = minetest.get_modpath("ethereal") ~= nil ARMOR_FIRE_NODES = { diff --git a/mods/3d_armor/3d_armor/init.lua b/mods/3d_armor/3d_armor/init.lua index a5bb71fe..05fed80d 100755 --- a/mods/3d_armor/3d_armor/init.lua +++ b/mods/3d_armor/3d_armor/init.lua @@ -87,25 +87,25 @@ if ARMOR_MATERIALS.bronze then minetest.register_tool("3d_armor:helmet_bronze", { description = "Bronze Helmet", inventory_image = "3d_armor_inv_helmet_bronze.png", - groups = {armor_head=2.5, armor_heal=4, armor_use=250}, + groups = {armor_head=2.5, armor_heal=0, armor_use=250}, wear = 0, }) minetest.register_tool("3d_armor:chestplate_bronze", { description = "Bronze Chestplate", inventory_image = "3d_armor_inv_chestplate_bronze.png", - groups = {armor_torso=5.5, armor_heal=4, armor_use=250}, + groups = {armor_torso=5.5, armor_heal=0, armor_use=250}, wear = 0, }) minetest.register_tool("3d_armor:leggings_bronze", { description = "Bronze Leggings", inventory_image = "3d_armor_inv_leggings_bronze.png", - groups = {armor_legs=5.5, armor_heal=6, armor_use=250}, + groups = {armor_legs=5.5, armor_heal=0, armor_use=250}, wear = 0, }) minetest.register_tool("3d_armor:boots_bronze", { description = "Bronze Boots", inventory_image = "3d_armor_inv_boots_bronze.png", - groups = {armor_feet=2.5, armor_heal=4, armor_use=250}, + groups = {armor_feet=2.5, armor_heal=0, armor_use=250}, wear = 0, }) end @@ -114,25 +114,25 @@ if ARMOR_MATERIALS.diamond then minetest.register_tool("3d_armor:helmet_diamond", { description = "Diamond Helmet", inventory_image = "3d_armor_inv_helmet_diamond.png", - groups = {armor_head=4, armor_heal=12, armor_use=100}, + groups = {armor_head=4, armor_heal=0, armor_use=100}, wear = 0, }) minetest.register_tool("3d_armor:chestplate_diamond", { description = "Diamond Chestplate", inventory_image = "3d_armor_inv_chestplate_diamond.png", - groups = {armor_torso=8, armor_heal=12, armor_use=100}, + groups = {armor_torso=8, armor_heal=0, armor_use=100}, wear = 0, }) minetest.register_tool("3d_armor:leggings_diamond", { description = "Diamond Leggings", inventory_image = "3d_armor_inv_leggings_diamond.png", - groups = {armor_legs=8, armor_heal=12, armor_use=100}, + groups = {armor_legs=8, armor_heal=0, armor_use=100}, wear = 0, }) minetest.register_tool("3d_armor:boots_diamond", { description = "Diamond Boots", inventory_image = "3d_armor_inv_boots_diamond.png", - groups = {armor_feet=4, armor_heal=12, armor_use=100}, + groups = {armor_feet=4, armor_heal=0, armor_use=100}, wear = 0, }) end @@ -141,25 +141,25 @@ if ARMOR_MATERIALS.gold then minetest.register_tool("3d_armor:helmet_gold", { description = "Gold Helmet", inventory_image = "3d_armor_inv_helmet_gold.png", - groups = {armor_head=3, armor_heal=6, armor_use=200}, + groups = {armor_head=3, armor_heal=0, armor_use=200}, wear = 0, }) minetest.register_tool("3d_armor:chestplate_gold", { description = "Gold Chestplate", inventory_image = "3d_armor_inv_chestplate_gold.png", - groups = {armor_torso=7, armor_heal=6, armor_use=200}, + groups = {armor_torso=7, armor_heal=0, armor_use=200}, wear = 0, }) minetest.register_tool("3d_armor:leggings_gold", { description = "Gold Leggings", inventory_image = "3d_armor_inv_leggings_gold.png", - groups = {armor_legs=7, armor_heal=6, armor_use=200}, + groups = {armor_legs=7, armor_heal=0, armor_use=200}, wear = 0, }) minetest.register_tool("3d_armor:boots_gold", { description = "Gold Boots", inventory_image = "3d_armor_inv_boots_gold.png", - groups = {armor_feet=3, armor_heal=6, armor_use=200}, + groups = {armor_feet=3, armor_heal=0, armor_use=200}, wear = 0, }) end @@ -168,25 +168,25 @@ if ARMOR_MATERIALS.mithril then minetest.register_tool("3d_armor:helmet_mithril", { description = "Mithril Helmet", inventory_image = "3d_armor_inv_helmet_mithril.png", - groups = {armor_head=5, armor_heal=12, armor_use=50}, + groups = {armor_head=5, armor_heal=0, armor_use=50}, wear = 0, }) minetest.register_tool("3d_armor:chestplate_mithril", { description = "Mithril Chestplate", inventory_image = "3d_armor_inv_chestplate_mithril.png", - groups = {armor_torso=11, armor_heal=12, armor_use=50}, + groups = {armor_torso=11, armor_heal=0, armor_use=50}, wear = 0, }) minetest.register_tool("3d_armor:leggings_mithril", { description = "Mithril Leggings", inventory_image = "3d_armor_inv_leggings_mithril.png", - groups = {armor_legs=11, armor_heal=12, armor_use=50}, + groups = {armor_legs=11, armor_heal=0, armor_use=50}, wear = 0, }) minetest.register_tool("3d_armor:boots_mithril", { description = "Mithril Boots", inventory_image = "3d_armor_inv_boots_mithril.png", - groups = {armor_feet=5, armor_heal=12, armor_use=50}, + groups = {armor_feet=5, armor_heal=0, armor_use=50}, wear = 0, }) end @@ -195,25 +195,25 @@ if ARMOR_MATERIALS.crystal then minetest.register_tool("3d_armor:helmet_crystal", { description = "Crystal Helmet", inventory_image = "3d_armor_inv_helmet_crystal.png", - groups = {armor_head=15, armor_heal=12, armor_use=50, armor_fire=1}, + groups = {armor_head=15, armor_heal=0, armor_use=50, armor_fire=1}, wear = 0, }) minetest.register_tool("3d_armor:chestplate_crystal", { description = "Crystal Chestplate", inventory_image = "3d_armor_inv_chestplate_crystal.png", - groups = {armor_torso=20, armor_heal=12, armor_use=50, armor_fire=1}, + groups = {armor_torso=20, armor_heal=0, armor_use=50, armor_fire=1}, wear = 0, }) minetest.register_tool("3d_armor:leggings_crystal", { description = "Crystal Leggings", inventory_image = "3d_armor_inv_leggings_crystal.png", - groups = {armor_legs=20, armor_heal=12, armor_use=50, armor_fire=1}, + groups = {armor_legs=20, armor_heal=0, armor_use=50, armor_fire=1}, wear = 0, }) minetest.register_tool("3d_armor:boots_crystal", { description = "Crystal Boots", inventory_image = "3d_armor_inv_boots_crystal.png", - groups = {armor_feet=15, armor_heal=12, armor_use=50, physics_speed=1, physics_jump=0.5, armor_fire=1}, + groups = {armor_feet=15, armor_heal=0, armor_use=50, physics_speed=1, physics_jump=0.5, armor_fire=1}, wear = 0, }) end diff --git a/mods/3d_armor/3d_armor/models/3d_armor_character.b3d b/mods/3d_armor/3d_armor/models/3d_armor_character.b3d old mode 100644 new mode 100755 diff --git a/mods/3d_armor/3d_armor/models/3d_armor_character.blend b/mods/3d_armor/3d_armor/models/3d_armor_character.blend old mode 100644 new mode 100755 diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_boots_crystal.png b/mods/3d_armor/3d_armor/textures/3d_armor_boots_crystal.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_boots_crystal_preview.png b/mods/3d_armor/3d_armor/textures/3d_armor_boots_crystal_preview.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_chestplate_crystal.png b/mods/3d_armor/3d_armor/textures/3d_armor_chestplate_crystal.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_chestplate_crystal_preview.png b/mods/3d_armor/3d_armor/textures/3d_armor_chestplate_crystal_preview.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_hardened_leather.png b/mods/3d_armor/3d_armor/textures/3d_armor_hardened_leather.png new file mode 100755 index 00000000..5feb5683 Binary files /dev/null and b/mods/3d_armor/3d_armor/textures/3d_armor_hardened_leather.png differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_helmet_crystal.png b/mods/3d_armor/3d_armor/textures/3d_armor_helmet_crystal.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_helmet_crystal_preview.png b/mods/3d_armor/3d_armor/textures/3d_armor_helmet_crystal_preview.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_inv_boots_crystal.png b/mods/3d_armor/3d_armor/textures/3d_armor_inv_boots_crystal.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_inv_chestplate_crystal.png b/mods/3d_armor/3d_armor/textures/3d_armor_inv_chestplate_crystal.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_inv_helmet_crystal.png b/mods/3d_armor/3d_armor/textures/3d_armor_inv_helmet_crystal.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_inv_leggings_crystal.png b/mods/3d_armor/3d_armor/textures/3d_armor_inv_leggings_crystal.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_leggings_crystal.png b/mods/3d_armor/3d_armor/textures/3d_armor_leggings_crystal.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_leggings_crystal_preview.png b/mods/3d_armor/3d_armor/textures/3d_armor_leggings_crystal_preview.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_reinforced_leather.png b/mods/3d_armor/3d_armor/textures/3d_armor_reinforced_leather.png new file mode 100755 index 00000000..f8bbb1ba Binary files /dev/null and b/mods/3d_armor/3d_armor/textures/3d_armor_reinforced_leather.png differ diff --git a/mods/3d_armor/shields/init.lua b/mods/3d_armor/shields/init.lua index 4f4e7dad..2a5d59a4 100755 --- a/mods/3d_armor/shields/init.lua +++ b/mods/3d_armor/shields/init.lua @@ -68,7 +68,7 @@ if ARMOR_MATERIALS.bronze then minetest.register_tool("shields:shield_bronze", { description = "Bronze Shield", inventory_image = "shields_inv_shield_bronze.png", - groups = {armor_shield=5, armor_heal=6, armor_use=250}, + groups = {armor_shield=5, armor_heal=0, armor_use=250}, wear = 0, }) end @@ -77,7 +77,7 @@ if ARMOR_MATERIALS.diamond then minetest.register_tool("shields:shield_diamond", { description = "Diamond Shield", inventory_image = "shields_inv_shield_diamond.png", - groups = {armor_shield=7, armor_heal=12, armor_use=100}, + groups = {armor_shield=7, armor_heal=0, armor_use=100}, wear = 0, }) end @@ -86,7 +86,7 @@ if ARMOR_MATERIALS.gold then minetest.register_tool("shields:shield_gold", { description = "Gold Shield", inventory_image = "shields_inv_shield_gold.png", - groups = {armor_shield=6, armor_heal=6, armor_use=200}, + groups = {armor_shield=6, armor_heal=0, armor_use=200}, wear = 0, }) end @@ -95,7 +95,7 @@ if ARMOR_MATERIALS.mithril then minetest.register_tool("shields:shield_mithril", { description = "Mithril Shield", inventory_image = "shields_inv_shield_mithril.png", - groups = {armor_shield=9, armor_heal=12, armor_use=50}, + groups = {armor_shield=9, armor_heal=0, armor_use=50}, wear = 0, }) end @@ -104,7 +104,7 @@ if ARMOR_MATERIALS.crystal then minetest.register_tool("shields:shield_crystal", { description = "Crystal Shield", inventory_image = "shields_inv_shield_crystal.png", - groups = {armor_shield=15, armor_heal=12, armor_use=50, armor_fire=1}, + groups = {armor_shield=15, armor_heal=0, armor_use=50, armor_fire=1}, wear = 0, }) end diff --git a/mods/3d_armor/shields/textures/shields_inv_shield_crystal.png b/mods/3d_armor/shields/textures/shields_inv_shield_crystal.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor/shields/textures/shields_shield_crystal.png b/mods/3d_armor/shields/textures/shields_shield_crystal.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor/shields/textures/shields_shield_crystal_preview.png b/mods/3d_armor/shields/textures/shields_shield_crystal_preview.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor/technic_armor/README.txt b/mods/3d_armor/technic_armor/README.txt old mode 100644 new mode 100755 diff --git a/mods/3d_armor/technic_armor/depends.txt b/mods/3d_armor/technic_armor/depends.txt old mode 100644 new mode 100755 diff --git a/mods/3d_armor/technic_armor/init.lua b/mods/3d_armor/technic_armor/init.lua old mode 100644 new mode 100755 index a48e8763..f08ecd91 --- a/mods/3d_armor/technic_armor/init.lua +++ b/mods/3d_armor/technic_armor/init.lua @@ -1,9 +1,9 @@ if minetest.get_modpath("technic") then local stats = { brass = { name="Brass", armor=1.8, heal=0, use=650 }, - cast = { name="Cast Iron", armor=2.5, heal=8, use=200 }, - carbon = { name="Carbon Steel", armor=2.7, heal=10, use=100 }, - stainless = { name="Stainless Steel", armor=2.7, heal=10, use=75 }, + cast = { name="Cast Iron", armor=2.5, heal=0, use=200 }, + carbon = { name="Carbon Steel", armor=2.7, heal=0, use=100 }, + stainless = { name="Stainless Steel", armor=2.7, heal=0, use=75 }, } local mats = { brass="technic:brass_ingot", @@ -13,7 +13,7 @@ if minetest.get_modpath("technic") then } if minetest.get_modpath("moreores") then stats.tin = { name="Tin", armor=1.6, heal=0, use=750 } - stats.silver = { name="Silver", armor=1.8, heal=6, use=650 } + stats.silver = { name="Silver", armor=1.8, heal=0, use=650 } mats.tin = "moreores:tin_ingot" mats.silver = "moreores:silver_ingot" end diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_boots_brass.png b/mods/3d_armor/technic_armor/textures/technic_armor_boots_brass.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_boots_brass_preview.png b/mods/3d_armor/technic_armor/textures/technic_armor_boots_brass_preview.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_boots_carbon.png b/mods/3d_armor/technic_armor/textures/technic_armor_boots_carbon.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_boots_carbon_preview.png b/mods/3d_armor/technic_armor/textures/technic_armor_boots_carbon_preview.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_boots_cast.png b/mods/3d_armor/technic_armor/textures/technic_armor_boots_cast.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_boots_cast_preview.png b/mods/3d_armor/technic_armor/textures/technic_armor_boots_cast_preview.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_boots_silver.png b/mods/3d_armor/technic_armor/textures/technic_armor_boots_silver.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_boots_silver_preview.png b/mods/3d_armor/technic_armor/textures/technic_armor_boots_silver_preview.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_boots_stainless.png b/mods/3d_armor/technic_armor/textures/technic_armor_boots_stainless.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_boots_stainless_preview.png b/mods/3d_armor/technic_armor/textures/technic_armor_boots_stainless_preview.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_boots_tin.png b/mods/3d_armor/technic_armor/textures/technic_armor_boots_tin.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_boots_tin_preview.png b/mods/3d_armor/technic_armor/textures/technic_armor_boots_tin_preview.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_chestplate_brass.png b/mods/3d_armor/technic_armor/textures/technic_armor_chestplate_brass.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_chestplate_brass_preview.png b/mods/3d_armor/technic_armor/textures/technic_armor_chestplate_brass_preview.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_chestplate_carbon.png b/mods/3d_armor/technic_armor/textures/technic_armor_chestplate_carbon.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_chestplate_carbon_preview.png b/mods/3d_armor/technic_armor/textures/technic_armor_chestplate_carbon_preview.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_chestplate_cast.png b/mods/3d_armor/technic_armor/textures/technic_armor_chestplate_cast.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_chestplate_cast_preview.png b/mods/3d_armor/technic_armor/textures/technic_armor_chestplate_cast_preview.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_chestplate_silver.png b/mods/3d_armor/technic_armor/textures/technic_armor_chestplate_silver.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_chestplate_silver_preview.png b/mods/3d_armor/technic_armor/textures/technic_armor_chestplate_silver_preview.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_chestplate_stainless.png b/mods/3d_armor/technic_armor/textures/technic_armor_chestplate_stainless.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_chestplate_stainless_preview.png b/mods/3d_armor/technic_armor/textures/technic_armor_chestplate_stainless_preview.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_chestplate_tin.png b/mods/3d_armor/technic_armor/textures/technic_armor_chestplate_tin.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_chestplate_tin_preview.png b/mods/3d_armor/technic_armor/textures/technic_armor_chestplate_tin_preview.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_helmet_brass.png b/mods/3d_armor/technic_armor/textures/technic_armor_helmet_brass.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_helmet_brass_preview.png b/mods/3d_armor/technic_armor/textures/technic_armor_helmet_brass_preview.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_helmet_carbon.png b/mods/3d_armor/technic_armor/textures/technic_armor_helmet_carbon.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_helmet_carbon_preview.png b/mods/3d_armor/technic_armor/textures/technic_armor_helmet_carbon_preview.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_helmet_cast.png b/mods/3d_armor/technic_armor/textures/technic_armor_helmet_cast.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_helmet_cast_preview.png b/mods/3d_armor/technic_armor/textures/technic_armor_helmet_cast_preview.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_helmet_silver.png b/mods/3d_armor/technic_armor/textures/technic_armor_helmet_silver.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_helmet_silver_preview.png b/mods/3d_armor/technic_armor/textures/technic_armor_helmet_silver_preview.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_helmet_stainless.png b/mods/3d_armor/technic_armor/textures/technic_armor_helmet_stainless.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_helmet_stainless_preview.png b/mods/3d_armor/technic_armor/textures/technic_armor_helmet_stainless_preview.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_helmet_tin.png b/mods/3d_armor/technic_armor/textures/technic_armor_helmet_tin.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_helmet_tin_preview.png b/mods/3d_armor/technic_armor/textures/technic_armor_helmet_tin_preview.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_inv_boots_brass.png b/mods/3d_armor/technic_armor/textures/technic_armor_inv_boots_brass.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_inv_boots_carbon.png b/mods/3d_armor/technic_armor/textures/technic_armor_inv_boots_carbon.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_inv_boots_cast.png b/mods/3d_armor/technic_armor/textures/technic_armor_inv_boots_cast.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_inv_boots_silver.png b/mods/3d_armor/technic_armor/textures/technic_armor_inv_boots_silver.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_inv_boots_stainless.png b/mods/3d_armor/technic_armor/textures/technic_armor_inv_boots_stainless.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_inv_boots_tin.png b/mods/3d_armor/technic_armor/textures/technic_armor_inv_boots_tin.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_inv_chestplate_brass.png b/mods/3d_armor/technic_armor/textures/technic_armor_inv_chestplate_brass.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_inv_chestplate_carbon.png b/mods/3d_armor/technic_armor/textures/technic_armor_inv_chestplate_carbon.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_inv_chestplate_cast.png b/mods/3d_armor/technic_armor/textures/technic_armor_inv_chestplate_cast.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_inv_chestplate_silver.png b/mods/3d_armor/technic_armor/textures/technic_armor_inv_chestplate_silver.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_inv_chestplate_stainless.png b/mods/3d_armor/technic_armor/textures/technic_armor_inv_chestplate_stainless.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_inv_chestplate_tin.png b/mods/3d_armor/technic_armor/textures/technic_armor_inv_chestplate_tin.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_inv_helmet_brass.png b/mods/3d_armor/technic_armor/textures/technic_armor_inv_helmet_brass.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_inv_helmet_carbon.png b/mods/3d_armor/technic_armor/textures/technic_armor_inv_helmet_carbon.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_inv_helmet_cast.png b/mods/3d_armor/technic_armor/textures/technic_armor_inv_helmet_cast.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_inv_helmet_silver.png b/mods/3d_armor/technic_armor/textures/technic_armor_inv_helmet_silver.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_inv_helmet_stainless.png b/mods/3d_armor/technic_armor/textures/technic_armor_inv_helmet_stainless.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_inv_helmet_tin.png b/mods/3d_armor/technic_armor/textures/technic_armor_inv_helmet_tin.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_inv_leggings_brass.png b/mods/3d_armor/technic_armor/textures/technic_armor_inv_leggings_brass.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_inv_leggings_carbon.png b/mods/3d_armor/technic_armor/textures/technic_armor_inv_leggings_carbon.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_inv_leggings_cast.png b/mods/3d_armor/technic_armor/textures/technic_armor_inv_leggings_cast.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_inv_leggings_silver.png b/mods/3d_armor/technic_armor/textures/technic_armor_inv_leggings_silver.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_inv_leggings_stainless.png b/mods/3d_armor/technic_armor/textures/technic_armor_inv_leggings_stainless.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_inv_leggings_tin.png b/mods/3d_armor/technic_armor/textures/technic_armor_inv_leggings_tin.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_inv_shield_brass.png b/mods/3d_armor/technic_armor/textures/technic_armor_inv_shield_brass.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_inv_shield_carbon.png b/mods/3d_armor/technic_armor/textures/technic_armor_inv_shield_carbon.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_inv_shield_cast.png b/mods/3d_armor/technic_armor/textures/technic_armor_inv_shield_cast.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_inv_shield_silver.png b/mods/3d_armor/technic_armor/textures/technic_armor_inv_shield_silver.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_inv_shield_stainless.png b/mods/3d_armor/technic_armor/textures/technic_armor_inv_shield_stainless.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_inv_shield_tin.png b/mods/3d_armor/technic_armor/textures/technic_armor_inv_shield_tin.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_leggings_brass.png b/mods/3d_armor/technic_armor/textures/technic_armor_leggings_brass.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_leggings_brass_preview.png b/mods/3d_armor/technic_armor/textures/technic_armor_leggings_brass_preview.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_leggings_carbon.png b/mods/3d_armor/technic_armor/textures/technic_armor_leggings_carbon.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_leggings_carbon_preview.png b/mods/3d_armor/technic_armor/textures/technic_armor_leggings_carbon_preview.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_leggings_cast.png b/mods/3d_armor/technic_armor/textures/technic_armor_leggings_cast.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_leggings_cast_preview.png b/mods/3d_armor/technic_armor/textures/technic_armor_leggings_cast_preview.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_leggings_silver.png b/mods/3d_armor/technic_armor/textures/technic_armor_leggings_silver.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_leggings_silver_preview.png b/mods/3d_armor/technic_armor/textures/technic_armor_leggings_silver_preview.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_leggings_stainless.png b/mods/3d_armor/technic_armor/textures/technic_armor_leggings_stainless.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_leggings_stainless_preview.png b/mods/3d_armor/technic_armor/textures/technic_armor_leggings_stainless_preview.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_leggings_tin.png b/mods/3d_armor/technic_armor/textures/technic_armor_leggings_tin.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_leggings_tin_preview.png b/mods/3d_armor/technic_armor/textures/technic_armor_leggings_tin_preview.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_shield_brass.png b/mods/3d_armor/technic_armor/textures/technic_armor_shield_brass.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_shield_brass_preview.png b/mods/3d_armor/technic_armor/textures/technic_armor_shield_brass_preview.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_shield_carbon.png b/mods/3d_armor/technic_armor/textures/technic_armor_shield_carbon.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_shield_carbon_preview.png b/mods/3d_armor/technic_armor/textures/technic_armor_shield_carbon_preview.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_shield_cast.png b/mods/3d_armor/technic_armor/textures/technic_armor_shield_cast.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_shield_cast_preview.png b/mods/3d_armor/technic_armor/textures/technic_armor_shield_cast_preview.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_shield_silver.png b/mods/3d_armor/technic_armor/textures/technic_armor_shield_silver.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_shield_silver_preview.png b/mods/3d_armor/technic_armor/textures/technic_armor_shield_silver_preview.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_shield_stainless.png b/mods/3d_armor/technic_armor/textures/technic_armor_shield_stainless.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_shield_stainless_preview.png b/mods/3d_armor/technic_armor/textures/technic_armor_shield_stainless_preview.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_shield_tin.png b/mods/3d_armor/technic_armor/textures/technic_armor_shield_tin.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor/technic_armor/textures/technic_armor_shield_tin_preview.png b/mods/3d_armor/technic_armor/textures/technic_armor_shield_tin_preview.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor_classes/leather_armor_hunter/depends.txt b/mods/3d_armor_classes/leather_armor_hunter/depends.txt old mode 100644 new mode 100755 diff --git a/mods/3d_armor_classes/leather_armor_hunter/init.lua b/mods/3d_armor_classes/leather_armor_hunter/init.lua old mode 100644 new mode 100755 index 870f35a0..083bad6d --- a/mods/3d_armor_classes/leather_armor_hunter/init.lua +++ b/mods/3d_armor_classes/leather_armor_hunter/init.lua @@ -1,35 +1,40 @@ --- Register helmets: +if ARMOR_MATERIALS.hardened_leather then + -- Register helmets : + minetest.register_tool(":3d_armor:helmet_leather_hunter", { + description = "Hunter's Leather Helmet", + inventory_image = "3d_armor_inv_helmet_leather_hunter.png", + groups = {armor_head = 5, armor_heal = 0, armor_use = 250}, + wear = 0, + }) + -- Register chestplates : + minetest.register_tool(":3d_armor:chestplate_leather_hunter", { + description = "Hunter's Leather Chestplate", + inventory_image = "3d_armor_inv_chestplate_leather_hunter.png", + groups = {armor_torso = 9, armor_heal = 0, armor_use = 250}, + wear = 0, + }) + -- Register leggings : + minetest.register_tool(":3d_armor:leggings_leather_hunter", { + description = "Hunter's Leather Leggings", + inventory_image = "3d_armor_inv_leggings_leather_hunter.png", + groups = {armor_legs = 9, armor_heal = 0, armor_use = 250}, + wear = 0, + }) + -- Register boots : + minetest.register_tool(":3d_armor:boots_leather_hunter", { + description = "Hunter's Leather Boots", + inventory_image = "3d_armor_inv_boots_leather_hunter.png", + groups = {armor_feet = 5, armor_heal = 0, armor_use = 250}, + wear = 0, + }) +end -minetest.register_tool(":3d_armor:helmet_leather_hunter", { - description = "Hunter's Leather Helmet", - inventory_image = "3d_armor_inv_helmet_leather_hunter.png", - groups = {armor_head = 10, armor_heal = 0, armor_use = 500}, -- Valeurs décidés, a mettre en fonction du spreadsheet - wear = 0, -}) - --- Register chestplates: - -minetest.register_tool(":3d_armor:chestplate_leather_hunter", { - description = "Hunter's Leather Chestplate", - inventory_image = "3d_armor_inv_chestplate_leather_hunter.png", - groups = {armor_torso = 15, armor_heal = 0, armor_use = 500}, -- Valeurs décidés, a mettre en fonction du spreadsheet - wear = 0, -}) - --- Register leggings: - -minetest.register_tool(":3d_armor:leggings_leather_hunter", { - description = "Hunter's Leather Leggings", - inventory_image = "3d_armor_inv_leggings_leather_hunter.png", - groups = {armor_legs = 15, armor_heal = 0, armor_use = 500}, -- Valeurs décidés, a mettre en fonction du spreadsheet - wear = 0, -}) - --- Register boots: - - minetest.register_tool(":3d_armor:boots_leather_hunter", { - description = "Hunter's Leather Boots", - inventory_image = "3d_armor_inv_boots_leather_hunter.png", - groups = {armor_feet = 10, armor_heal = 0, armor_use = 500}, -- Valeurs décidés, a mettre en fonction du spreadsheet - wear = 0, +-- Hardened Leather craft recipe +minetest.register_craft({ + output = "3d_armor:hardened_leather", + recipe = { + {"default:steel_ingot", "mobs:leather", "default:bronze_ingot" }, + {"mobs:leather", "mobs:leather", "mobs:leather" }, + {"default:bronze_ingot", "mobs:leather", "default:steel_ingot" }, + } }) diff --git a/mods/3d_armor_classes/leather_armor_hunter/textures/3d_armor_boots_leather_hunter.png b/mods/3d_armor_classes/leather_armor_hunter/textures/3d_armor_boots_leather_hunter.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor_classes/leather_armor_hunter/textures/3d_armor_boots_leather_hunter_preview.png b/mods/3d_armor_classes/leather_armor_hunter/textures/3d_armor_boots_leather_hunter_preview.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor_classes/leather_armor_hunter/textures/3d_armor_chestplate_leather_hunter.png b/mods/3d_armor_classes/leather_armor_hunter/textures/3d_armor_chestplate_leather_hunter.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor_classes/leather_armor_hunter/textures/3d_armor_chestplate_leather_hunter_preview.png b/mods/3d_armor_classes/leather_armor_hunter/textures/3d_armor_chestplate_leather_hunter_preview.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor_classes/leather_armor_hunter/textures/3d_armor_helmet_leather_hunter.png b/mods/3d_armor_classes/leather_armor_hunter/textures/3d_armor_helmet_leather_hunter.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor_classes/leather_armor_hunter/textures/3d_armor_helmet_leather_hunter_preview.png b/mods/3d_armor_classes/leather_armor_hunter/textures/3d_armor_helmet_leather_hunter_preview.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor_classes/leather_armor_hunter/textures/3d_armor_inv_boots_leather_hunter.png b/mods/3d_armor_classes/leather_armor_hunter/textures/3d_armor_inv_boots_leather_hunter.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor_classes/leather_armor_hunter/textures/3d_armor_inv_chestplate_leather_hunter.png b/mods/3d_armor_classes/leather_armor_hunter/textures/3d_armor_inv_chestplate_leather_hunter.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor_classes/leather_armor_hunter/textures/3d_armor_inv_helmet_leather_hunter.png b/mods/3d_armor_classes/leather_armor_hunter/textures/3d_armor_inv_helmet_leather_hunter.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor_classes/leather_armor_hunter/textures/3d_armor_inv_leggings_leather_hunter.png b/mods/3d_armor_classes/leather_armor_hunter/textures/3d_armor_inv_leggings_leather_hunter.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor_classes/leather_armor_hunter/textures/3d_armor_leggings_leather_hunter.png b/mods/3d_armor_classes/leather_armor_hunter/textures/3d_armor_leggings_leather_hunter.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor_classes/leather_armor_hunter/textures/3d_armor_leggings_leather_hunter_preview.png b/mods/3d_armor_classes/leather_armor_hunter/textures/3d_armor_leggings_leather_hunter_preview.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor_classes/magic_mithril_armor_wizard/depends.txt b/mods/3d_armor_classes/magic_mithril_armor_wizard/depends.txt old mode 100644 new mode 100755 diff --git a/mods/3d_armor_classes/magic_mithril_armor_wizard/init.lua b/mods/3d_armor_classes/magic_mithril_armor_wizard/init.lua old mode 100644 new mode 100755 diff --git a/mods/3d_armor_classes/obsidian_armor_wizard/depends.txt b/mods/3d_armor_classes/obsidian_armor_wizard/depends.txt old mode 100644 new mode 100755 diff --git a/mods/3d_armor_classes/obsidian_armor_wizard/init.lua b/mods/3d_armor_classes/obsidian_armor_wizard/init.lua old mode 100644 new mode 100755 diff --git a/mods/3d_armor_classes/reinforced_leather_armor_hunter/depends.txt b/mods/3d_armor_classes/reinforced_leather_armor_hunter/depends.txt old mode 100644 new mode 100755 diff --git a/mods/3d_armor_classes/reinforced_leather_armor_hunter/init.lua b/mods/3d_armor_classes/reinforced_leather_armor_hunter/init.lua old mode 100644 new mode 100755 index f5be2240..e710a2fc --- a/mods/3d_armor_classes/reinforced_leather_armor_hunter/init.lua +++ b/mods/3d_armor_classes/reinforced_leather_armor_hunter/init.lua @@ -1,35 +1,40 @@ --- Register helmets: +if ARMOR_MATERIALS.reinforced_leather then + -- Register helmets : + minetest.register_tool(":3d_armor:helmet_reinforced_leather_hunter", { + description = "Hunter's Reinforced Leather Helmet", + inventory_image = "3d_armor_inv_helmet_reinforced_leather_hunter.png", + groups = {armor_head = 6, armor_heal = 0, armor_use = 40}, + wear = 0, + }) + -- Register chestplates : + minetest.register_tool(":3d_armor:chestplate_reinforced_leather_hunter", { + description = "Hunter's Reinforced Leather Chestplate", + inventory_image = "3d_armor_inv_chestplate_reinforced_leather_hunter.png", + groups = {armor_torso = 10, armor_heal = 0, armor_use = 40}, + wear = 0, + }) + -- Register leggings : + minetest.register_tool(":3d_armor:leggings_reinforced_leather_hunter", { + description = "Hunter's Reinforced Leather Leggings", + inventory_image = "3d_armor_inv_leggings_reinforced_leather_hunter.png", + groups = {armor_legs = 10, armor_heal = 0, armor_use = 40}, + wear = 0, + }) + -- Register boots : + minetest.register_tool(":3d_armor:boots_reinforced_leather_hunter", { + description = "Hunter's Reinforced Leather Boots", + inventory_image = "3d_armor_inv_boots_reinforced_leather_hunter.png", + groups = {armor_feet = 6, armor_heal = 0, armor_use = 40}, + wear = 0, + }) +end -minetest.register_tool(":3d_armor:helmet_reinforced_leather_hunter", { - description = "Hunter's Reinforced Leather Helmet", - inventory_image = "3d_armor_inv_helmet_reinforced_leather_hunter.png", - groups = {armor_head = 10, armor_heal = 0, armor_use = 500}, -- Valeurs décidés, a mettre en fonction du spreadsheet - wear = 0, -}) - --- Register chestplates: - -minetest.register_tool(":3d_armor:chestplate_reinforced_leather_hunter", { - description = "Hunter's Reinforced Leather Chestplate", - inventory_image = "3d_armor_inv_chestplate_reinforced_leather_hunter.png", - groups = {armor_torso = 15, armor_heal = 0, armor_use = 500}, -- Valeurs décidés, a mettre en fonction du spreadsheet - wear = 0, -}) - --- Register leggings: - -minetest.register_tool(":3d_armor:leggings_reinforced_leather_hunter", { - description = "Hunter's Reinforced Leather Leggings", - inventory_image = "3d_armor_inv_leggings_reinforced_leather_hunter.png", - groups = {armor_legs = 15, armor_heal = 0, armor_use = 500}, -- Valeurs décidés, a mettre en fonction du spreadsheet - wear = 0, -}) - --- Register boots: - - minetest.register_tool(":3d_armor:boots_reinforced_leather_hunter", { - description = "Hunter's Reinforced Leather Boots", - inventory_image = "3d_armor_inv_boots_reinforced_leather_hunter.png", - groups = {armor_feet = 10, armor_heal = 0, armor_use = 500}, -- Valeurs décidés, a mettre en fonction du spreadsheet - wear = 0, +-- Reinforced Leather craft recipe +minetest.register_craft({ + output = "3d_armor:reinforced_leather", + recipe = { + {"technic:brass_ingot", "moreores:mithril_ingot", "darkage:chain" }, + {"mobs:leather", "mobs:minotaur_eye", "mobs:leather" }, + {"darkage:chain", "moreores:mithril_ingot", "technic:brass_ingot" }, + } }) diff --git a/mods/3d_armor_classes/reinforced_leather_armor_hunter/textures/3d_armor_boots_reinforced_leather_hunter.png b/mods/3d_armor_classes/reinforced_leather_armor_hunter/textures/3d_armor_boots_reinforced_leather_hunter.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor_classes/reinforced_leather_armor_hunter/textures/3d_armor_boots_reinforced_leather_hunter_preview.png b/mods/3d_armor_classes/reinforced_leather_armor_hunter/textures/3d_armor_boots_reinforced_leather_hunter_preview.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor_classes/reinforced_leather_armor_hunter/textures/3d_armor_chestplate_reinforced_leather_hunter.png b/mods/3d_armor_classes/reinforced_leather_armor_hunter/textures/3d_armor_chestplate_reinforced_leather_hunter.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor_classes/reinforced_leather_armor_hunter/textures/3d_armor_chestplate_reinforced_leather_hunter_preview.png b/mods/3d_armor_classes/reinforced_leather_armor_hunter/textures/3d_armor_chestplate_reinforced_leather_hunter_preview.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor_classes/reinforced_leather_armor_hunter/textures/3d_armor_helmet_reinforced_leather_hunter.png b/mods/3d_armor_classes/reinforced_leather_armor_hunter/textures/3d_armor_helmet_reinforced_leather_hunter.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor_classes/reinforced_leather_armor_hunter/textures/3d_armor_helmet_reinforced_leather_hunter_preview.png b/mods/3d_armor_classes/reinforced_leather_armor_hunter/textures/3d_armor_helmet_reinforced_leather_hunter_preview.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor_classes/reinforced_leather_armor_hunter/textures/3d_armor_inv_boots_reinforced_leather_hunter.png b/mods/3d_armor_classes/reinforced_leather_armor_hunter/textures/3d_armor_inv_boots_reinforced_leather_hunter.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor_classes/reinforced_leather_armor_hunter/textures/3d_armor_inv_chestplate_reinforced_leather_hunter.png b/mods/3d_armor_classes/reinforced_leather_armor_hunter/textures/3d_armor_inv_chestplate_reinforced_leather_hunter.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor_classes/reinforced_leather_armor_hunter/textures/3d_armor_inv_helmet_reinforced_leather_hunter.png b/mods/3d_armor_classes/reinforced_leather_armor_hunter/textures/3d_armor_inv_helmet_reinforced_leather_hunter.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor_classes/reinforced_leather_armor_hunter/textures/3d_armor_inv_leggings_reinforced_leather_hunter.png b/mods/3d_armor_classes/reinforced_leather_armor_hunter/textures/3d_armor_inv_leggings_reinforced_leather_hunter.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor_classes/reinforced_leather_armor_hunter/textures/3d_armor_leggings_reinforced_leather_hunter.png b/mods/3d_armor_classes/reinforced_leather_armor_hunter/textures/3d_armor_leggings_reinforced_leather_hunter.png old mode 100644 new mode 100755 diff --git a/mods/3d_armor_classes/reinforced_leather_armor_hunter/textures/3d_armor_leggings_reinforced_leather_hunter_preview.png b/mods/3d_armor_classes/reinforced_leather_armor_hunter/textures/3d_armor_leggings_reinforced_leather_hunter_preview.png old mode 100644 new mode 100755 diff --git a/mods/_misc/list_players.lua b/mods/_misc/list_players.lua old mode 100644 new mode 100755 diff --git a/mods/ambience_modpack/ambience/14init.lua b/mods/ambience_modpack/ambience/14init.lua deleted file mode 100755 index 92adb917..00000000 --- a/mods/ambience_modpack/ambience/14init.lua +++ /dev/null @@ -1,390 +0,0 @@ --------------------------------------------------------------------------------------------------------- ---Ambiance Configuration for version .14 - -local max_frequency_all = 1000 --the larger you make this number the lest frequent ALL sounds will happen recommended values between 100-2000. - ---for frequencies below use a number between 0 and max_frequency_all ---for volumes below, use a number between 0.0 and 1, the larger the number the louder the sounds -local night_frequency = 20 --owls, wolves -local night_volume = 0.9 -local night_frequent_frequency = 150 --crickets -local night_frequent_volume = 0.9 -local day_frequency = 100 --crow, bluejay, cardinal -local day_volume = 0.9 -local day_frequent_frequency = 1000 --crow, bluejay, cardinal -local day_frequent_volume = 0.18 -local cave_frequency = 10 --bats -local cave_volume = 1.0 -local cave_frequent_frequency = 70 --drops of water dripping -local cave_frequent_volume = 1.0 -local water_frequent_frequency = 1000 --water sounds -local water_frequent_volume = 1.0 -local music_frequency = 7 --music (suggestion: keep this one low like around 6) -local music_volume = 0.3 ---End of Config ----------------------------------------------------------------------------------------------------- -local played_on_start = false -local night = { - handler = {}, - frequency = night_frequency, - {name="horned_owl", length=3, gain=night_volume}, - {name="Wolves_Howling", length=11, gain=night_volume}, - {name="ComboWind", length=17, gain=night_volume} -} - -local night_frequent = { - handler = {}, - frequency = night_frequent_frequency, - {name="Crickets_At_NightCombo", length=69, gain=night_frequent_volume} -} - -local day = { - handler = {}, - frequency = day_frequency, - {name="Best Cardinal Bird", length=4, gain=day_volume}, - {name="craw", length=3, gain=day_volume}, - {name="bluejay", length=18, gain=day_volume}, - {name="ComboWind", length=17, gain=day_volume} -} - -local day_frequent = { - handler = {}, - frequency = day_frequent_frequency, - {name="robin2", length=16, gain=day_frequent_volume}, - {name="birdsongnl", length=13, gain=day_frequent_volume}, - {name="bird", length=30, gain=day_frequent_volume}, - {name="Best Cardinal Bird", length=4, gain=day_frequent_volume}, - {name="craw", length=3, gain=day_frequent_volume}, - {name="bluejay", length=18, gain=day_frequent_volume}, - {name="ComboWind", length=17, gain=day_frequent_volume*3} -} - - -local cave = { - handler = {}, - frequency = cave_frequency, - {name="Bats_in_Cave", length=5, gain=cave_volume} -} - -local cave_frequent = { - handler = {}, - frequency = cave_frequent_frequency, - {name="drippingwater_drip_a", length=2, gain=cave_frequent_volume}, - {name="drippingwater_drip_b", length=2, gain=cave_frequent_volume}, - {name="drippingwater_drip_c", length=2, gain=cave_frequent_volume}, - {name="Single_Water_Droplet", length=3, gain=cave_frequent_volume}, - {name="Spooky_Water_Drops", length=7, gain=cave_frequent_volume} -} - -local water = { - handler = {}, - frequency = 0,--dolphins dont fit into small lakes - {name="dolphins", length=6}, - {name="dolphins_screaming", length=16.5} -} - -local water_frequent = { - handler = {}, - frequency = water_frequent_frequency, - on_stop = "drowning_gasp", - on_start = "Splash", - {name="scuba1bubbles", length=11, gain=water_frequent_volume}, - {name="scuba1calm", length=10}, --not sure why but sometimes I get errors when setting gain=water_frequent_volume here. - {name="scuba1calm2", length=8.5, gain=water_frequent_volume}, - {name="scuba1interestingbubbles", length=11, gain=water_frequent_volume}, - {name="scuba1tubulentbubbles", length=10.5, gain=water_frequent_volume} -} - -local flowing_water = { - handler = {}, - frequency = 1000, - {name="small_waterfall", length=14, gain=.4} -} -local flowing_water2 = { - handler = {}, - frequency = 1000, - {name="small_waterfall", length=11, gain=.3} -} - -local lava = { - handler = {}, - frequency = 1000, - {name="earth01a", length=20} -} -local lava2 = { - handler = {}, - frequency = 1000, - {name="earth01a", length=15} -} - -local play_music = minetest.setting_getbool("music") or false -local music = { - handler = {}, - frequency = music_frequency, - {name="mtest", length=4*60+33, gain=music_volume}, - {name="echos", length=2*60+26, gain=music_volume}, - {name="FoamOfTheSea", length=1*60+50, gain=music_volume}, - {name="eastern_feeling", length=3*60+51, gain=music_volume}, - {name="Mass_Effect_Uncharted_Worlds", length=2*60+29, gain=music_volume}, - {name="dark_ambiance", length=44, gain=music_volume} -} - -local is_daytime = function() - return (minetest.:get_timeofday() > 0.2 and minetest.:get_timeofday() < 0.8) -end - ---[[old -local nodes_in_range = function(pos, search_distance, node_name) - local search_p = {x=0, y=0, z=0} - local nodes_found = 0 - for p_x=(pos.x-search_distance), (pos.x+search_distance) do - for p_y=(pos.y-search_distance), (pos.y+search_distance) do - for p_z=(pos.z-search_distance), (pos.z+search_distance) do - local search_n = minetest.:get_node({x=p_x, y=p_y, z=p_z}) - if search_n.name == node_name then - nodes_found = nodes_found + 1 - end - end - end - end - return nodes_found - --minetest.chat_send_all("Range: " .. tostring(search_distance) .. " | Found (" .. node_name .. ": " .. nodes_found .. ")") -end --]] - -local nodes_in_range = function(pos, search_distance, node_name) - minp = {x=pos.x-search_distance,y=pos.y-search_distance, z=pos.z-search_distance} - maxp = {x=pos.x+search_distance,y=pos.y+search_distance, z=pos.z+search_distance} - nodes = minetest.:find_nodes_in_area(minp, maxp, node_name) --- minetest.chat_send_all("Found (" .. node_name .. ": " .. #nodes .. ")") - return #nodes -end - - -local get_ambience = function(player) - local pos = player:getpos() - pos.y = pos.y+1.0 - local nodename = minetest.:get_node(pos).name - if string.find(nodename, "default:water") then - if music then - return {water=water, water_frequent=water_frequent, music=music} - else - return {water=water, water_frequent=water_frequent} - end - end - if nodes_in_range(pos, 7, "default:lava_flowing")>5 or nodes_in_range(pos, 7, "default:lava_source")>5 then - if music then - return {lava=lava, lava2=lava2, music=music} - else - return {lava=lava} - end - end - if nodes_in_range(pos, 7, "default:water_flowing")>5 then - if music then - return {flowing_water=flowing_water, flowing_water2=flowing_water2, music=music} - else - return {flowing_water=flowing_water, flowing_water2=flowing_water2} - end - end - if player:getpos().y < 0 then - if music then - return {cave=cave, cave_frequent=cave_frequent, music=music} - else - return {cave=cave, cave_frequent=cave_frequent} - end - end - if is_daytime() then - if music then - return {day=day, day_frequent=day_frequent, music=music} - else - return {day=day, day_frequent=day_frequent} - end - else - if music then - return {night=night, night_frequent=night_frequent, music=music} - else - return {night=night, night_frequent=night_frequent} - end - end -end - --- start playing the sound, set the handler and delete the handler after sound is played -local play_sound = function(player, list, number) - local player_name = player:get_player_name() - if list.handler[player_name] == nil then - local gain = 1.0 - if list[number].gain ~= nil then - gain = list[number].gain - end - local handler = minetest.sound_play(list[number].name, {to_player=player_name, gain=gain}) - if handler ~= nil then - list.handler[player_name] = handler - minetest.after(list[number].length, function(args) - local list = args[1] - local player_name = args[2] - if list.handler[player_name] ~= nil then - minetest.sound_stop(list.handler[player_name]) - list.handler[player_name] = nil - end - end, {list, player_name}) - end - end -end - --- stops all sounds that are not in still_playing -local stop_sound = function(still_playing, player) - local player_name = player:get_player_name() - if still_playing.cave == nil then - local list = cave - if list.handler[player_name] ~= nil then - if list.on_stop ~= nil then - minetest.sound_play(list.on_stop, {to_player=player:get_player_name()}) - end - minetest.sound_stop(list.handler[player_name]) - list.handler[player_name] = nil - end - end - if still_playing.cave_frequent == nil then - local list = cave_frequent - if list.handler[player_name] ~= nil then - if list.on_stop ~= nil then - minetest.sound_play(list.on_stop, {to_player=player:get_player_name()}) - end - minetest.sound_stop(list.handler[player_name]) - list.handler[player_name] = nil - end - end - if still_playing.night == nil then - local list = night - if list.handler[player_name] ~= nil then - if list.on_stop ~= nil then - minetest.sound_play(list.on_stop, {to_player=player:get_player_name()}) - end - minetest.sound_stop(list.handler[player_name]) - list.handler[player_name] = nil - end - end - if still_playing.night_frequent == nil then - local list = night_frequent - if list.handler[player_name] ~= nil then - if list.on_stop ~= nil then - minetest.sound_play(list.on_stop, {to_player=player:get_player_name()}) - end - minetest.sound_stop(list.handler[player_name]) - list.handler[player_name] = nil - end - end - if still_playing.day == nil then - local list = day - if list.handler[player_name] ~= nil then - if list.on_stop ~= nil then - minetest.sound_play(list.on_stop, {to_player=player:get_player_name()}) - end - minetest.sound_stop(list.handler[player_name]) - list.handler[player_name] = nil - end - end - if still_playing.day_frequent == nil then - local list = day_frequent - if list.handler[player_name] ~= nil then - if list.on_stop ~= nil then - minetest.sound_play(list.on_stop, {to_player=player:get_player_name()}) - end - minetest.sound_stop(list.handler[player_name]) - list.handler[player_name] = nil - end - end - if still_playing.music == nil then - local list = music - if list.handler[player_name] ~= nil then - if list.on_stop ~= nil then - minetest.sound_play(list.on_stop, {to_player=player:get_player_name()}) - end - minetest.sound_stop(list.handler[player_name]) - list.handler[player_name] = nil - end - end - if still_playing.flowing_water == nil then - local list = flowing_water - if list.handler[player_name] ~= nil then - if list.on_stop ~= nil then - minetest.sound_play(list.on_stop, {to_player=player:get_player_name()}) - end - minetest.sound_stop(list.handler[player_name]) - list.handler[player_name] = nil - end - end - if still_playing.flowing_water2 == nil then - local list = flowing_water2 - if list.handler[player_name] ~= nil then - if list.on_stop ~= nil then - minetest.sound_play(list.on_stop, {to_player=player:get_player_name()}) - end - minetest.sound_stop(list.handler[player_name]) - list.handler[player_name] = nil - end - end - if still_playing.lava == nil then - local list = lava - if list.handler[player_name] ~= nil then - if list.on_stop ~= nil then - minetest.sound_play(list.on_stop, {to_player=player:get_player_name()}) - end - minetest.sound_stop(list.handler[player_name]) - list.handler[player_name] = nil - end - end - if still_playing.lava2 == nil then - local list = lava2 - if list.handler[player_name] ~= nil then - if list.on_stop ~= nil then - minetest.sound_play(list.on_stop, {to_player=player:get_player_name()}) - end - minetest.sound_stop(list.handler[player_name]) - list.handler[player_name] = nil - end - end - if still_playing.water == nil then - local list = water - if list.handler[player_name] ~= nil then - if list.on_stop ~= nil then - minetest.sound_play(list.on_stop, {to_player=player:get_player_name()}) - end - minetest.sound_stop(list.handler[player_name]) - list.handler[player_name] = nil - end - end - if still_playing.water_frequent == nil then - local list = water_frequent - if list.handler[player_name] ~= nil then - if list.on_stop ~= nil then - minetest.sound_play(list.on_stop, {to_player=player:get_player_name()}) - played_on_start = false - end - minetest.sound_stop(list.handler[player_name]) - list.handler[player_name] = nil - end - end -end - -local timer = 0 -minetest.register_globalstep(function(dtime) - timer = timer+dtime - if timer < 1 then - return - end - timer = 0 - - for _,player in ipairs(minetest.get_connected_players()) do - local ambiences = get_ambience(player) - stop_sound(ambiences, player) - for _,ambience in pairs(ambiences) do - if math.random(1, 1000) <= ambience.frequency then - if ambience.on_start ~= nil and played_on_start == false then - played_on_start = true - minetest.sound_play(ambience.on_start, {to_player=player:get_player_name()}) - end - play_sound(player, ambience, math.random(1, #ambience)) - end - end - end -end) \ No newline at end of file diff --git a/mods/ambience_modpack/ambience/Badinit.lua b/mods/ambience_modpack/ambience/Badinit.lua deleted file mode 100755 index fe5f06f6..00000000 --- a/mods/ambience_modpack/ambience/Badinit.lua +++ /dev/null @@ -1,439 +0,0 @@ --------------------------------------------------------------------------------------------------------- ---Ambiance Configuration for version .16 - -local max_frequency_all = 1000 --the larger you make this number the lest frequent ALL sounds will happen recommended values between 100-2000. - ---for frequencies below use a number between 0 and max_frequency_all ---for volumes below, use a number between 0.0 and 1, the larger the number the louder the sounds -local night_frequency = 20 --owls, wolves -local night_volume = 0.9 -local night_frequent_frequency = 150 --crickets -local night_frequent_volume = 0.9 -local day_frequency = 100 --crow, bluejay, cardinal -local day_volume = 0.9 -local day_frequent_frequency = 1000 --crow, bluejay, cardinal -local day_frequent_volume = 0.18 -local cave_frequency = 10 --bats -local cave_volume = 1.0 -local cave_frequent_frequency = 70 --drops of water dripping -local cave_frequent_volume = 1.0 -local beach_frequency = 20 --seagulls -local beach_volume = 1.0 -local beach_frequent_frequency = 1000 --waves -local beach_frequent_volume = 1.0 -local water_frequent_frequency = 1000 --water sounds -local water_frequent_volume = 1.0 -local music_frequency = 7 --music (suggestion: keep this one low like around 6) -local music_volume = 0.3 ---End of Config ----------------------------------------------------------------------------------------------------- -local played_on_start = false -local night = { - handler = {}, - frequency = night_frequency, - {name="horned_owl", length=3, gain=night_volume}, - {name="Wolves_Howling", length=11, gain=night_volume}, - {name="ComboWind", length=17, gain=night_volume} -} - -local night_frequent = { - handler = {}, - frequency = night_frequent_frequency, - {name="Crickets_At_NightCombo", length=69, gain=night_frequent_volume} -} - -local day = { - handler = {}, - frequency = day_frequency, - {name="Best Cardinal Bird", length=4, gain=day_volume}, - {name="craw", length=3, gain=day_volume}, - {name="bluejay", length=18, gain=day_volume}, - {name="ComboWind", length=17, gain=day_volume} -} - -local day_frequent = { - handler = {}, - frequency = day_frequent_frequency, - {name="robin2", length=16, gain=day_frequent_volume}, - {name="birdsongnl", length=13, gain=day_frequent_volume}, - {name="bird", length=30, gain=day_frequent_volume}, - {name="Best Cardinal Bird", length=4, gain=day_frequent_volume}, - {name="craw", length=3, gain=day_frequent_volume}, - {name="bluejay", length=18, gain=day_frequent_volume}, - {name="ComboWind", length=17, gain=day_frequent_volume*3} -} - - -local cave = { - handler = {}, - frequency = cave_frequency, - {name="Bats_in_Cave", length=5, gain=cave_volume} -} - -local cave_frequent = { - handler = {}, - frequency = cave_frequent_frequency, - {name="drippingwater_drip_a", length=2, gain=cave_frequent_volume}, - {name="drippingwater_drip_b", length=2, gain=cave_frequent_volume}, - {name="drippingwater_drip_c", length=2, gain=cave_frequent_volume}, - {name="Single_Water_Droplet", length=3, gain=cave_frequent_volume}, - {name="Spooky_Water_Drops", length=7, gain=cave_frequent_volume} -} - -local beach = { - handler = {}, - frequency = beach_frequency, - {name="seagull", length=4.5, gain=beach_volume} -} - -local beach_frequent = { - handler = {}, - frequency = beach_frequent_frequency, - {name="fiji_beach", length=43.5, gain=beach_frequent_volume} -} - - -local water = { - handler = {}, - frequency = 0,--dolphins dont fit into small lakes - {name="dolphins", length=6}, - {name="dolphins_screaming", length=16.5} -} - -local water_frequent = { - handler = {}, - frequency = water_frequent_frequency, - on_stop = "drowning_gasp", - on_start = "Splash", - {name="scuba1bubbles", length=11, gain=water_frequent_volume}, - {name="scuba1calm", length=10}, --not sure why but sometimes I get errors when setting gain=water_frequent_volume here. - {name="scuba1calm2", length=8.5, gain=water_frequent_volume}, - {name="scuba1interestingbubbles", length=11, gain=water_frequent_volume}, - {name="scuba1tubulentbubbles", length=10.5, gain=water_frequent_volume} -} - -local flowing_water = { - handler = {}, - frequency = 1000, - {name="small_waterfall", length=14, gain=.4} -} -local flowing_water2 = { - handler = {}, - frequency = 1000, - {name="small_waterfall", length=11, gain=.3} -} - -local lava = { - handler = {}, - frequency = 1000, - {name="earth01a", length=20} -} -local lava2 = { - handler = {}, - frequency = 1000, - {name="earth01a", length=15} -} - - -local play_music = minetest.setting_getbool("music") or false -local music = { - handler = {}, - frequency = music_frequency, - {name="mtest", length=4*60+33, gain=music_volume}, - {name="echos", length=2*60+26, gain=music_volume}, - {name="FoamOfTheSea", length=1*60+50, gain=music_volume}, - {name="eastern_feeling", length=3*60+51, gain=music_volume}, - {name="Mass_Effect_Uncharted_Worlds", length=2*60+29, gain=music_volume}, - {name="dark_ambiance", length=44, gain=music_volume} -} - -local is_daytime = function() - return (minetest.:get_timeofday() > 0.2 and minetest.:get_timeofday() < 0.8) -end - ---[[old -local nodes_in_range = function(pos, search_distance, node_name) - local search_p = {x=0, y=0, z=0} - local nodes_found = 0 - for p_x=(pos.x-search_distance), (pos.x+search_distance) do - for p_y=(pos.y-search_distance), (pos.y+search_distance) do - for p_z=(pos.z-search_distance), (pos.z+search_distance) do - local search_n = minetest.:get_node({x=p_x, y=p_y, z=p_z}) - if search_n.name == node_name then - nodes_found = nodes_found + 1 - end - end - end - end - return nodes_found - --minetest.chat_send_all("Range: " .. tostring(search_distance) .. " | Found (" .. node_name .. ": " .. nodes_found .. ")") -end --]] - -local nodes_in_range = function(pos, search_distance, node_name) - minp = {x=pos.x-search_distance,y=pos.y-search_distance, z=pos.z-search_distance} - maxp = {x=pos.x+search_distance,y=pos.y+search_distance, z=pos.z+search_distance} - nodes = minetest.:find_nodes_in_area(minp, maxp, node_name) --- minetest.chat_send_all("Found (" .. node_name .. ": " .. #nodes .. ")") - return #nodes -end - - -local get_ambience = function(player) - local pos = player:getpos() - pos.y = pos.y+1.0 - local nodename = minetest.:get_node(pos).name - if string.find(nodename, "default:water") then - if music then - return {water=water, water_frequent=water_frequent, music=music} - else - return {water=water, water_frequent=water_frequent} - end - end - if nodes_in_range(pos, 7, "default:lava_flowing")>5 or nodes_in_range(pos, 7, "default:lava_source")>5 then - if music then - return {lava=lava, lava2=lava2, music=music} - else - return {lava=lava} - end - end - if nodes_in_range(pos, 7, "default:water_flowing")>5 then - if music then - return {flowing_water=flowing_water, flowing_water2=flowing_water2, music=music} - else - return {flowing_water=flowing_water, flowing_water2=flowing_water2} - end - end - pos.y = pos.y-2 - nodename = minetest.:get_node(pos).name - --minetest.chat_send_all("Found " .. nodename .. pos.y ) - if string.find(nodename, "default:sand") and pos.y < 5 then - if music then - return {beach=beach, beach_frequent=beach_frequent, music=music} - else - return {beach=beach, beach_frequent=beach_frequent} - end - end - if player:getpos().y < 0 then - if music then - return {cave=cave, cave_frequent=cave_frequent, music=music} - else - return {cave=cave, cave_frequent=cave_frequent} - end - end - if is_daytime() then - if music then - return {day=day, day_frequent=day_frequent, music=music} - else - return {day=day, day_frequent=day_frequent} - end - else - if music then - return {night=night, night_frequent=night_frequent, music=music} - else - return {night=night, night_frequent=night_frequent} - end - end -end - --- start playing the sound, set the handler and delete the handler after sound is played -local play_sound = function(player, list, number) - local player_name = player:get_player_name() - if list.handler[player_name] == nil then - local gain = 1.0 - if list[number].gain ~= nil then - gain = list[number].gain - end - local handler = minetest.sound_play(list[number].name, {to_player=player_name, gain=gain}) - if handler ~= nil then - list.handler[player_name] = handler - minetest.after(list[number].length, function(args) - local list = args[1] - local player_name = args[2] - if list.handler[player_name] ~= nil then - minetest.sound_stop(list.handler[player_name]) - list.handler[player_name] = nil - end - end, {list, player_name}) - end - end -end - --- stops all sounds that are not in still_playing -local stop_sound = function(still_playing, player) - local player_name = player:get_player_name() - if still_playing.cave == nil then - local list = cave - if list.handler[player_name] ~= nil then - if list.on_stop ~= nil then - minetest.sound_play(list.on_stop, {to_player=player:get_player_name()}) - end - minetest.sound_stop(list.handler[player_name]) - list.handler[player_name] = nil - end - end - if still_playing.cave_frequent == nil then - local list = cave_frequent - if list.handler[player_name] ~= nil then - if list.on_stop ~= nil then - minetest.sound_play(list.on_stop, {to_player=player:get_player_name()}) - end - minetest.sound_stop(list.handler[player_name]) - list.handler[player_name] = nil - end - end - if still_playing.beach == nil then - local list = beach - if list.handler[player_name] ~= nil then - if list.on_stop ~= nil then - minetest.sound_play(list.on_stop, {to_player=player:get_player_name()}) - end - minetest.sound_stop(list.handler[player_name]) - list.handler[player_name] = nil - end - end - if still_playing.beach_frequent == nil then - local list = beach_frequent - if list.handler[player_name] ~= nil then - if list.on_stop ~= nil then - minetest.sound_play(list.on_stop, {to_player=player:get_player_name()}) - end - minetest.sound_stop(list.handler[player_name]) - list.handler[player_name] = nil - end - end - - if still_playing.night == nil then - local list = night - if list.handler[player_name] ~= nil then - if list.on_stop ~= nil then - minetest.sound_play(list.on_stop, {to_player=player:get_player_name()}) - end - minetest.sound_stop(list.handler[player_name]) - list.handler[player_name] = nil - end - end - if still_playing.night_frequent == nil then - local list = night_frequent - if list.handler[player_name] ~= nil then - if list.on_stop ~= nil then - minetest.sound_play(list.on_stop, {to_player=player:get_player_name()}) - end - minetest.sound_stop(list.handler[player_name]) - list.handler[player_name] = nil - end - end - if still_playing.day == nil then - local list = day - if list.handler[player_name] ~= nil then - if list.on_stop ~= nil then - minetest.sound_play(list.on_stop, {to_player=player:get_player_name()}) - end - minetest.sound_stop(list.handler[player_name]) - list.handler[player_name] = nil - end - end - if still_playing.day_frequent == nil then - local list = day_frequent - if list.handler[player_name] ~= nil then - if list.on_stop ~= nil then - minetest.sound_play(list.on_stop, {to_player=player:get_player_name()}) - end - minetest.sound_stop(list.handler[player_name]) - list.handler[player_name] = nil - end - end - if still_playing.music == nil then - local list = music - if list.handler[player_name] ~= nil then - if list.on_stop ~= nil then - minetest.sound_play(list.on_stop, {to_player=player:get_player_name()}) - end - minetest.sound_stop(list.handler[player_name]) - list.handler[player_name] = nil - end - end - if still_playing.flowing_water == nil then - local list = flowing_water - if list.handler[player_name] ~= nil then - if list.on_stop ~= nil then - minetest.sound_play(list.on_stop, {to_player=player:get_player_name()}) - end - minetest.sound_stop(list.handler[player_name]) - list.handler[player_name] = nil - end - end - if still_playing.flowing_water2 == nil then - local list = flowing_water2 - if list.handler[player_name] ~= nil then - if list.on_stop ~= nil then - minetest.sound_play(list.on_stop, {to_player=player:get_player_name()}) - end - minetest.sound_stop(list.handler[player_name]) - list.handler[player_name] = nil - end - end - if still_playing.lava == nil then - local list = lava - if list.handler[player_name] ~= nil then - if list.on_stop ~= nil then - minetest.sound_play(list.on_stop, {to_player=player:get_player_name()}) - end - minetest.sound_stop(list.handler[player_name]) - list.handler[player_name] = nil - end - end - if still_playing.lava2 == nil then - local list = lava2 - if list.handler[player_name] ~= nil then - if list.on_stop ~= nil then - minetest.sound_play(list.on_stop, {to_player=player:get_player_name()}) - end - minetest.sound_stop(list.handler[player_name]) - list.handler[player_name] = nil - end - end - if still_playing.water == nil then - local list = water - if list.handler[player_name] ~= nil then - if list.on_stop ~= nil then - minetest.sound_play(list.on_stop, {to_player=player:get_player_name()}) - end - minetest.sound_stop(list.handler[player_name]) - list.handler[player_name] = nil - end - end - if still_playing.water_frequent == nil then - local list = water_frequent - if list.handler[player_name] ~= nil then - if list.on_stop ~= nil then - minetest.sound_play(list.on_stop, {to_player=player:get_player_name()}) - played_on_start = false - end - minetest.sound_stop(list.handler[player_name]) - list.handler[player_name] = nil - end - end -end - -local timer = 0 -minetest.register_globalstep(function(dtime) - timer = timer+dtime - if timer < 1 then - return - end - timer = 0 - - for _,player in ipairs(minetest.get_connected_players()) do - local ambiences = get_ambience(player) - stop_sound(ambiences, player) - for _,ambience in pairs(ambiences) do - if math.random(1, 1000) <= ambience.frequency then - if ambience.on_start ~= nil and played_on_start == false then - played_on_start = true - minetest.sound_play(ambience.on_start, {to_player=player:get_player_name()}) - end - play_sound(player, ambience, math.random(1, #ambience)) - end - end - end -end) \ No newline at end of file diff --git a/mods/ambience_modpack/ambience/README.txt b/mods/ambience_modpack/ambience/README.txt new file mode 100755 index 00000000..c11e7b64 --- /dev/null +++ b/mods/ambience_modpack/ambience/README.txt @@ -0,0 +1,43 @@ +=== AMBIENCE-MOD for MINETEST-C55 === +by Neuromancer and PilzAdam + +Intorduction: +This mod adds sounds to Minetest, that are played randomly in ambiences. + +How to install: +Unzip the archive an place it in minetest-base-directory/mods/minetest/ +if you have a windows client or a linux run-in-place client. If you have +a linux system-wide instalation place it in ~/.minetest/mods/minetest/. +If you want to install this mod only in one world create the folder +worldmods/ in your worlddirectory. +For further information or help see: +http://wiki.minetest.com/wiki/Installing_Mods +!!!Important!!! +Unzip the sounds folder before you use the mod or you wont hear +anything. + +Configuration: +To add your own sounds copy them into the ambience/sounds/ folder and +add there names with the length in seconds to the tables at the top of +init.lua (only ogg files are supported). + +License: +Sourcecode: WTFPL (see below) +Sounds: see sounds/SoundLicenses.txt + +See also: +http://minetest.net/ + + DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE + Version 2, December 2004 + + Copyright (C) 2004 Sam Hocevar + + Everyone is permitted to copy and distribute verbatim or modified + copies of this license document, and changing it is allowed as long + as the name is changed. + + DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. You just DO WHAT THE FUCK YOU WANT TO. diff --git a/mods/ambience_modpack/ambience/ambience.zip b/mods/ambience_modpack/ambience/ambience.zip new file mode 100755 index 00000000..2ba064f1 Binary files /dev/null and b/mods/ambience_modpack/ambience/ambience.zip differ diff --git a/mods/ambience_modpack/ambience/init.lua.pilz.lua b/mods/ambience_modpack/ambience/init.lua.pilz.lua deleted file mode 100755 index a978c90a..00000000 --- a/mods/ambience_modpack/ambience/init.lua.pilz.lua +++ /dev/null @@ -1,287 +0,0 @@ -local night = { - handler = {}, - frequency = 10, - {name="horned_owl", length=3}, - {name="Wolves_Howling", length=11}, - {name="ComboWind", length=17}, -} - -local night_frequent = { - handler = {}, - frequency = 25, - {name="Crickets_At_NightCombo", length=69}, -} - -local day = { - handler = {}, - frequency = 5, - {name="Best Cardinal Bird", length=4}, - {name="craw", length=3}, - {name="bluejay", length=18}, - {name="ComboWind", length=17}, -} - -local day_frequent = { - handler = {}, - frequency = 25, - {name="robin2", length=16}, - {name="birdsongnl", length=12.5}, - {name="bird", length=30}, -} - -local cave = { - handler = {}, - frequency = 5, - {name="Bats_in_Cave", length=5}, -} - -local cave_frequent = { - handler = {}, - frequency = 100, - {name="drippingwater_drip_a", length=2}, - {name="drippingwater_drip_b", length=2}, - {name="drippingwater_drip_c", length=2}, - {name="Single_Water_Droplet", length=3}, - {name="Spooky_Water_Drops", length=7}, -} - -local water = { - handler = {}, - frequency = 0,--dolphins dont fit into small lakes - {name="dolphins", length=6}, - {name="dolphins_screaming", length=16.5}, -} - -local water_frequent = { - handler = {}, - frequency = 100, - on_stop = "drowning_gasp", - {name="scuba1bubbles", length=11}, - {name="scuba1calm", length=10}, - {name="scuba1calm2", length=8.5}, - {name="scuba1interestingbubbles", length=11}, - {name="scuba1tubulentbubbles", length=10.5}, -} - -local splash = { - handler = {}, - frequency = 100, - {name="Splash", length=1.5}, -} - -local play_music = minetest.setting_getbool("music") or false -local music = { - handler = {}, - frequency = 1, - {name="mtest", length=4*60+33, gain=0.3}, - {name="music_1", length=1*60+52, gain=0.3}, - {name="ambiance", length=19, gain=0.3}, - {name="dark_ambiance", length=46, gain=0.3}, - {name="eastern_feeling", length=3*60+51, gain=0.3}, - {name="echos", length=2*60+26, gain=0.3}, - {name="FoamOfTheSea", length=1*60+50, gain=0.3}, -} - -local is_daytime = function() - return (minetest.get_timeofday() > 0.2 and minetest.get_timeofday() < 0.8) -end - -local get_ambience = function(player) - local table = {} - - local play_water = false - local play_splash = false - local play_day = false - local play_cave = false - local play_night = false - - local pos = player:getpos() - pos.y = pos.y+1.5 - local nodename = minetest.get_node(pos).name - if string.find(nodename, "default:water") then - play_water = true - elseif nodename == "air" then - pos.y = pos.y-1.5 - local nodename = minetest.get_node(pos).name - if string.find(nodename, "default:water") then - play_splash = true - end - end - if player:getpos().y < 0 then - play_cave = true - elseif is_daytime() then - play_day = true - else - play_night = true - end - - if play_music then - table.music = music - end - if play_water then - table.water = water - table.water_frequent = water_frequent - return table - end - if play_splash then - table.splash = splash - end - if play_day then - table.day = day - table.day_frequent = day_frequent - elseif play_night then - table.night = night - table.night_frequent = night_frequent - elseif play_cave then - table.cave = cave - table.cave_frequent = cave_frequent - end - return table -end - --- start playing the sound, set the handler and delete the handler after sound is played -local play_sound = function(player, list, number) - local player_name = player:get_player_name() - if list.handler[player_name] == nil then - local gain = 1.0 - if list[number].gain ~= nil then - gain = list[number].gain - end - local handler = minetest.sound_play(list[number].name, {to_player=player_name, gain=gain}) - if handler ~= nil then - list.handler[player_name] = handler - minetest.after(list[number].length, function(args) - local list = args[1] - local player_name = args[2] - if list.handler[player_name] ~= nil then - minetest.sound_stop(list.handler[player_name]) - list.handler[player_name] = nil - end - end, {list, player_name}) - end - end -end - --- stops all sounds that are not in still_playing -local stop_sound = function(still_playing, player) - local player_name = player:get_player_name() - if still_playing.cave == nil then - local list = cave - if list.handler[player_name] ~= nil then - if list.on_stop ~= nil then - minetest.sound_play(list.on_stop, {to_player=player:get_player_name()}) - end - minetest.sound_stop(list.handler[player_name]) - list.handler[player_name] = nil - end - end - if still_playing.cave_frequent == nil then - local list = cave_frequent - if list.handler[player_name] ~= nil then - if list.on_stop ~= nil then - minetest.sound_play(list.on_stop, {to_player=player:get_player_name()}) - end - minetest.sound_stop(list.handler[player_name]) - list.handler[player_name] = nil - end - end - if still_playing.night == nil then - local list = night - if list.handler[player_name] ~= nil then - if list.on_stop ~= nil then - minetest.sound_play(list.on_stop, {to_player=player:get_player_name()}) - end - minetest.sound_stop(list.handler[player_name]) - list.handler[player_name] = nil - end - end - if still_playing.night_frequent == nil then - local list = night_frequent - if list.handler[player_name] ~= nil then - if list.on_stop ~= nil then - minetest.sound_play(list.on_stop, {to_player=player:get_player_name()}) - end - minetest.sound_stop(list.handler[player_name]) - list.handler[player_name] = nil - end - end - if still_playing.day == nil then - local list = day - if list.handler[player_name] ~= nil then - if list.on_stop ~= nil then - minetest.sound_play(list.on_stop, {to_player=player:get_player_name()}) - end - minetest.sound_stop(list.handler[player_name]) - list.handler[player_name] = nil - end - end - if still_playing.day_frequent == nil then - local list = day_frequent - if list.handler[player_name] ~= nil then - if list.on_stop ~= nil then - minetest.sound_play(list.on_stop, {to_player=player:get_player_name()}) - end - minetest.sound_stop(list.handler[player_name]) - list.handler[player_name] = nil - end - end - if still_playing.music == nil then - local list = music - if list.handler[player_name] ~= nil then - if list.on_stop ~= nil then - minetest.sound_play(list.on_stop, {to_player=player:get_player_name()}) - end - minetest.sound_stop(list.handler[player_name]) - list.handler[player_name] = nil - end - end - if still_playing.water == nil then - local list = water - if list.handler[player_name] ~= nil then - if list.on_stop ~= nil then - minetest.sound_play(list.on_stop, {to_player=player:get_player_name()}) - end - minetest.sound_stop(list.handler[player_name]) - list.handler[player_name] = nil - end - end - if still_playing.water_frequent == nil then - local list = water_frequent - if list.handler[player_name] ~= nil then - if list.on_stop ~= nil then - minetest.sound_play(list.on_stop, {to_player=player:get_player_name()}) - end - minetest.sound_stop(list.handler[player_name]) - list.handler[player_name] = nil - end - end - if still_playing.splash == nil then - local list = splash - if list.handler[player_name] ~= nil then - if list.on_stop ~= nil then - minetest.sound_play(list.on_stop, {to_player=player:get_player_name()}) - end - minetest.sound_stop(list.handler[player_name]) - list.handler[player_name] = nil - end - end -end - -local timer = 0 -minetest.register_globalstep(function(dtime) - timer = timer+dtime - if timer < 1 then - return - end - timer = 0 - - for _,player in ipairs(minetest.get_connected_players()) do - local ambiences = get_ambience(player) - stop_sound(ambiences, player) - for _,ambience in pairs(ambiences) do - if math.random(1, 100) <= ambience.frequency then - play_sound(player, ambience, math.random(1, #ambience)) - end - end - end -end) \ No newline at end of file diff --git a/mods/ambience_modpack/ambience/init16.lua b/mods/ambience_modpack/ambience/init16.lua deleted file mode 100755 index c7a70d47..00000000 --- a/mods/ambience_modpack/ambience/init16.lua +++ /dev/null @@ -1,439 +0,0 @@ --------------------------------------------------------------------------------------------------------- ---Ambiance Configuration for version .16 - -local max_frequency_all = 1000 --the larger you make this number the lest frequent ALL sounds will happen recommended values between 100-2000. - ---for frequencies below use a number between 0 and max_frequency_all ---for volumes below, use a number between 0.0 and 1, the larger the number the louder the sounds -local night_frequency = 20 --owls, wolves -local night_volume = 0.9 -local night_frequent_frequency = 150 --crickets -local night_frequent_volume = 0.9 -local day_frequency = 100 --crow, bluejay, cardinal -local day_volume = 0.9 -local day_frequent_frequency = 1000 --crow, bluejay, cardinal -local day_frequent_volume = 0.18 -local cave_frequency = 10 --bats -local cave_volume = 1.0 -local cave_frequent_frequency = 70 --drops of water dripping -local cave_frequent_volume = 1.0 -local beach_frequency = 20 --seagulls -local beach_volume = 1.0 -local beach_frequent_frequency = 1000 --waves -local beach_frequent_volume = 1.0 -local water_frequent_frequency = 1000 --water sounds -local water_frequent_volume = 1.0 -local music_frequency = 7 --music (suggestion: keep this one low like around 6) -local music_volume = 0.3 ---End of Config ----------------------------------------------------------------------------------------------------- -local played_on_start = false -local night = { - handler = {}, - frequency = night_frequency, - {name="horned_owl", length=3, gain=night_volume}, - {name="Wolves_Howling", length=11, gain=night_volume}, - {name="ComboWind", length=17, gain=night_volume} -} - -local night_frequent = { - handler = {}, - frequency = night_frequent_frequency, - {name="Crickets_At_NightCombo", length=69, gain=night_frequent_volume} -} - -local day = { - handler = {}, - frequency = day_frequency, - {name="Best Cardinal Bird", length=4, gain=day_volume}, - {name="craw", length=3, gain=day_volume}, - {name="bluejay", length=18, gain=day_volume}, - {name="ComboWind", length=17, gain=day_volume} -} - -local day_frequent = { - handler = {}, - frequency = day_frequent_frequency, - {name="robin2", length=16, gain=day_frequent_volume}, - {name="birdsongnl", length=13, gain=day_frequent_volume}, - {name="bird", length=30, gain=day_frequent_volume}, - {name="Best Cardinal Bird", length=4, gain=day_frequent_volume}, - {name="craw", length=3, gain=day_frequent_volume}, - {name="bluejay", length=18, gain=day_frequent_volume}, - {name="ComboWind", length=17, gain=day_frequent_volume*3} -} - - -local cave = { - handler = {}, - frequency = cave_frequency, - {name="Bats_in_Cave", length=5, gain=cave_volume} -} - -local cave_frequent = { - handler = {}, - frequency = cave_frequent_frequency, - {name="drippingwater_drip_a", length=2, gain=cave_frequent_volume}, - {name="drippingwater_drip_b", length=2, gain=cave_frequent_volume}, - {name="drippingwater_drip_c", length=2, gain=cave_frequent_volume}, - {name="Single_Water_Droplet", length=3, gain=cave_frequent_volume}, - {name="Spooky_Water_Drops", length=7, gain=cave_frequent_volume} -} - -local beach = { - handler = {}, - frequency = beach_frequency, - {name="seagull", length=4.5, gain=beach_volume} -} - -local beach_frequent = { - handler = {}, - frequency = beach_frequent_frequency, - {name="fiji_beach", length=43.5, gain=beach_frequent_volume} -} - - -local water = { - handler = {}, - frequency = 0,--dolphins dont fit into small lakes - {name="dolphins", length=6}, - {name="dolphins_screaming", length=16.5} -} - -local water_frequent = { - handler = {}, - frequency = water_frequent_frequency, - on_stop = "drowning_gasp", - on_start = "Splash", - {name="scuba1bubbles", length=11, gain=water_frequent_volume}, - {name="scuba1calm", length=10}, --not sure why but sometimes I get errors when setting gain=water_frequent_volume here. - {name="scuba1calm2", length=8.5, gain=water_frequent_volume}, - {name="scuba1interestingbubbles", length=11, gain=water_frequent_volume}, - {name="scuba1tubulentbubbles", length=10.5, gain=water_frequent_volume} -} - -local flowing_water = { - handler = {}, - frequency = 1000, - {name="small_waterfall", length=14, gain=.4} -} -local flowing_water2 = { - handler = {}, - frequency = 1000, - {name="small_waterfall", length=11, gain=.3} -} - -local lava = { - handler = {}, - frequency = 1000, - {name="earth01a", length=20} -} -local lava2 = { - handler = {}, - frequency = 1000, - {name="earth01a", length=15} -} - - -local play_music = minetest.setting_getbool("music") or false -local music = { - handler = {}, - frequency = music_frequency, - {name="mtest", length=4*60+33, gain=music_volume}, - {name="echos", length=2*60+26, gain=music_volume}, - {name="FoamOfTheSea", length=1*60+50, gain=music_volume}, - {name="eastern_feeling", length=3*60+51, gain=music_volume}, - {name="Mass_Effect_Uncharted_Worlds", length=2*60+29, gain=music_volume}, - {name="dark_ambiance", length=44, gain=music_volume} -} - -local is_daytime = function() - return (minetest.get_timeofday() > 0.2 and minetest.get_timeofday() < 0.8) -end - ---[[old -local nodes_in_range = function(pos, search_distance, node_name) - local search_p = {x=0, y=0, z=0} - local nodes_found = 0 - for p_x=(pos.x-search_distance), (pos.x+search_distance) do - for p_y=(pos.y-search_distance), (pos.y+search_distance) do - for p_z=(pos.z-search_distance), (pos.z+search_distance) do - local search_n = minetest.get_node({x=p_x, y=p_y, z=p_z}) - if search_n.name == node_name then - nodes_found = nodes_found + 1 - end - end - end - end - return nodes_found - --minetest.chat_send_all("Range: " .. tostring(search_distance) .. " | Found (" .. node_name .. ": " .. nodes_found .. ")") -end --]] - -local nodes_in_range = function(pos, search_distance, node_name) - minp = {x=pos.x-search_distance,y=pos.y-search_distance, z=pos.z-search_distance} - maxp = {x=pos.x+search_distance,y=pos.y+search_distance, z=pos.z+search_distance} - nodes = minetest.find_nodes_in_area(minp, maxp, node_name) --- minetest.chat_send_all("Found (" .. node_name .. ": " .. #nodes .. ")") - return #nodes -end - - -local get_ambience = function(player) - local pos = player:getpos() - pos.y = pos.y+1.0 - local nodename = minetest.get_node(pos).name - if string.find(nodename, "default:water") then - if music then - return {water=water, water_frequent=water_frequent, music=music} - else - return {water=water, water_frequent=water_frequent} - end - end - if nodes_in_range(pos, 7, "default:lava_flowing")>5 or nodes_in_range(pos, 7, "default:lava_source")>5 then - if music then - return {lava=lava, lava2=lava2, music=music} - else - return {lava=lava} - end - end - if nodes_in_range(pos, 7, "default:water_flowing")>5 then - if music then - return {flowing_water=flowing_water, flowing_water2=flowing_water2, music=music} - else - return {flowing_water=flowing_water, flowing_water2=flowing_water2} - end - end - pos.y = pos.y-2 - nodename = minetest.get_node(pos).name - --minetest.chat_send_all("Found " .. nodename .. pos.y ) - if string.find(nodename, "default:sand") and pos.y < 5 then - if music then - return {beach=beach, beach_frequent=beach_frequent, music=music} - else - return {beach=beach, beach_frequent=beach_frequent} - end - end - if player:getpos().y < 0 then - if music then - return {cave=cave, cave_frequent=cave_frequent, music=music} - else - return {cave=cave, cave_frequent=cave_frequent} - end - end - if is_daytime() then - if music then - return {day=day, day_frequent=day_frequent, music=music} - else - return {day=day, day_frequent=day_frequent} - end - else - if music then - return {night=night, night_frequent=night_frequent, music=music} - else - return {night=night, night_frequent=night_frequent} - end - end -end - --- start playing the sound, set the handler and delete the handler after sound is played -local play_sound = function(player, list, number) - local player_name = player:get_player_name() - if list.handler[player_name] == nil then - local gain = 1.0 - if list[number].gain ~= nil then - gain = list[number].gain - end - local handler = minetest.sound_play(list[number].name, {to_player=player_name, gain=gain}) - if handler ~= nil then - list.handler[player_name] = handler - minetest.after(list[number].length, function(args) - local list = args[1] - local player_name = args[2] - if list.handler[player_name] ~= nil then - minetest.sound_stop(list.handler[player_name]) - list.handler[player_name] = nil - end - end, {list, player_name}) - end - end -end - --- stops all sounds that are not in still_playing -local stop_sound = function(still_playing, player) - local player_name = player:get_player_name() - if still_playing.cave == nil then - local list = cave - if list.handler[player_name] ~= nil then - if list.on_stop ~= nil then - minetest.sound_play(list.on_stop, {to_player=player:get_player_name()}) - end - minetest.sound_stop(list.handler[player_name]) - list.handler[player_name] = nil - end - end - if still_playing.cave_frequent == nil then - local list = cave_frequent - if list.handler[player_name] ~= nil then - if list.on_stop ~= nil then - minetest.sound_play(list.on_stop, {to_player=player:get_player_name()}) - end - minetest.sound_stop(list.handler[player_name]) - list.handler[player_name] = nil - end - end - if still_playing.beach == nil then - local list = beach - if list.handler[player_name] ~= nil then - if list.on_stop ~= nil then - minetest.sound_play(list.on_stop, {to_player=player:get_player_name()}) - end - minetest.sound_stop(list.handler[player_name]) - list.handler[player_name] = nil - end - end - if still_playing.beach_frequent == nil then - local list = beach_frequent - if list.handler[player_name] ~= nil then - if list.on_stop ~= nil then - minetest.sound_play(list.on_stop, {to_player=player:get_player_name()}) - end - minetest.sound_stop(list.handler[player_name]) - list.handler[player_name] = nil - end - end - - if still_playing.night == nil then - local list = night - if list.handler[player_name] ~= nil then - if list.on_stop ~= nil then - minetest.sound_play(list.on_stop, {to_player=player:get_player_name()}) - end - minetest.sound_stop(list.handler[player_name]) - list.handler[player_name] = nil - end - end - if still_playing.night_frequent == nil then - local list = night_frequent - if list.handler[player_name] ~= nil then - if list.on_stop ~= nil then - minetest.sound_play(list.on_stop, {to_player=player:get_player_name()}) - end - minetest.sound_stop(list.handler[player_name]) - list.handler[player_name] = nil - end - end - if still_playing.day == nil then - local list = day - if list.handler[player_name] ~= nil then - if list.on_stop ~= nil then - minetest.sound_play(list.on_stop, {to_player=player:get_player_name()}) - end - minetest.sound_stop(list.handler[player_name]) - list.handler[player_name] = nil - end - end - if still_playing.day_frequent == nil then - local list = day_frequent - if list.handler[player_name] ~= nil then - if list.on_stop ~= nil then - minetest.sound_play(list.on_stop, {to_player=player:get_player_name()}) - end - minetest.sound_stop(list.handler[player_name]) - list.handler[player_name] = nil - end - end - if still_playing.music == nil then - local list = music - if list.handler[player_name] ~= nil then - if list.on_stop ~= nil then - minetest.sound_play(list.on_stop, {to_player=player:get_player_name()}) - end - minetest.sound_stop(list.handler[player_name]) - list.handler[player_name] = nil - end - end - if still_playing.flowing_water == nil then - local list = flowing_water - if list.handler[player_name] ~= nil then - if list.on_stop ~= nil then - minetest.sound_play(list.on_stop, {to_player=player:get_player_name()}) - end - minetest.sound_stop(list.handler[player_name]) - list.handler[player_name] = nil - end - end - if still_playing.flowing_water2 == nil then - local list = flowing_water2 - if list.handler[player_name] ~= nil then - if list.on_stop ~= nil then - minetest.sound_play(list.on_stop, {to_player=player:get_player_name()}) - end - minetest.sound_stop(list.handler[player_name]) - list.handler[player_name] = nil - end - end - if still_playing.lava == nil then - local list = lava - if list.handler[player_name] ~= nil then - if list.on_stop ~= nil then - minetest.sound_play(list.on_stop, {to_player=player:get_player_name()}) - end - minetest.sound_stop(list.handler[player_name]) - list.handler[player_name] = nil - end - end - if still_playing.lava2 == nil then - local list = lava2 - if list.handler[player_name] ~= nil then - if list.on_stop ~= nil then - minetest.sound_play(list.on_stop, {to_player=player:get_player_name()}) - end - minetest.sound_stop(list.handler[player_name]) - list.handler[player_name] = nil - end - end - if still_playing.water == nil then - local list = water - if list.handler[player_name] ~= nil then - if list.on_stop ~= nil then - minetest.sound_play(list.on_stop, {to_player=player:get_player_name()}) - end - minetest.sound_stop(list.handler[player_name]) - list.handler[player_name] = nil - end - end - if still_playing.water_frequent == nil then - local list = water_frequent - if list.handler[player_name] ~= nil then - if list.on_stop ~= nil then - minetest.sound_play(list.on_stop, {to_player=player:get_player_name()}) - played_on_start = false - end - minetest.sound_stop(list.handler[player_name]) - list.handler[player_name] = nil - end - end -end - -local timer = 0 -minetest.register_globalstep(function(dtime) - timer = timer+dtime - if timer < 1 then - return - end - timer = 0 - - for _,player in ipairs(minetest.get_connected_players()) do - local ambiences = get_ambience(player) - stop_sound(ambiences, player) - for _,ambience in pairs(ambiences) do - if math.random(1, 1000) <= ambience.frequency then - if ambience.on_start ~= nil and played_on_start == false then - played_on_start = true - minetest.sound_play(ambience.on_start, {to_player=player:get_player_name()}) - end - play_sound(player, ambience, math.random(1, #ambience)) - end - end - end -end) \ No newline at end of file diff --git a/mods/ambience_modpack/ambience/init17.lua b/mods/ambience_modpack/ambience/init17.lua deleted file mode 100755 index e76df865..00000000 --- a/mods/ambience_modpack/ambience/init17.lua +++ /dev/null @@ -1,474 +0,0 @@ --------------------------------------------------------------------------------------------------------- ---Ambiance Configuration for version .17 - -local max_frequency_all = 1000 --the larger you make this number the lest frequent ALL sounds will happen recommended values between 100-2000. - ---for frequencies below use a number between 0 and max_frequency_all ---for volumes below, use a number between 0.0 and 1, the larger the number the louder the sounds -local night_frequency = 20 --owls, wolves -local night_volume = 0.9 -local night_frequent_frequency = 150 --crickets -local night_frequent_volume = 0.9 -local day_frequency = 100 --crow, bluejay, cardinal -local day_volume = 0.9 -local day_frequent_frequency = 1000 --crow, bluejay, cardinal -local day_frequent_volume = 0.18 -local cave_frequency = 10 --bats -local cave_volume = 1.0 -local cave_frequent_frequency = 70 --drops of water dripping -local cave_frequent_volume = 1.0 -local beach_frequency = 20 --seagulls -local beach_volume = 1.0 -local beach_frequent_frequency = 1000 --waves -local beach_frequent_volume = 1.0 -local water_frequent_frequency = 1000 --water sounds -local water_frequent_volume = 1.0 -local music_frequency = 0 --music (suggestion: keep this one low like around 6) -local music_volume = 0.3 ---End of Config ----------------------------------------------------------------------------------------------------- -local played_on_start = false -local night = { - handler = {}, - frequency = night_frequency, - {name="horned_owl", length=3, gain=night_volume}, - {name="Wolves_Howling", length=11, gain=night_volume}, - {name="ComboWind", length=17, gain=night_volume} -} - -local night_frequent = { - handler = {}, - frequency = night_frequent_frequency, - {name="Crickets_At_NightCombo", length=69, gain=night_frequent_volume} -} - -local day = { - handler = {}, - frequency = day_frequency, - {name="Best Cardinal Bird", length=4, gain=day_volume}, - {name="craw", length=3, gain=day_volume}, - {name="bluejay", length=18, gain=day_volume}, - {name="ComboWind", length=17, gain=day_volume} -} - -local day_frequent = { - handler = {}, - frequency = day_frequent_frequency, - {name="robin2", length=16, gain=day_frequent_volume}, - {name="birdsongnl", length=13, gain=day_frequent_volume}, - {name="bird", length=30, gain=day_frequent_volume}, - {name="Best Cardinal Bird", length=4, gain=day_frequent_volume}, - {name="craw", length=3, gain=day_frequent_volume}, - {name="bluejay", length=18, gain=day_frequent_volume}, - {name="ComboWind", length=17, gain=day_frequent_volume*3} -} - - -local cave = { - handler = {}, - frequency = cave_frequency, - {name="Bats_in_Cave", length=5, gain=cave_volume} -} - -local cave_frequent = { - handler = {}, - frequency = cave_frequent_frequency, - {name="drippingwater_drip_a", length=2, gain=cave_frequent_volume}, - {name="drippingwater_drip_b", length=2, gain=cave_frequent_volume}, - {name="drippingwater_drip_c", length=2, gain=cave_frequent_volume}, - {name="Single_Water_Droplet", length=3, gain=cave_frequent_volume}, - {name="Spooky_Water_Drops", length=7, gain=cave_frequent_volume} -} - -local beach = { - handler = {}, - frequency = beach_frequency, - {name="seagull", length=4.5, gain=beach_volume} -} - -local beach_frequent = { - handler = {}, - frequency = beach_frequent_frequency, - {name="fiji_beach", length=43.5, gain=beach_frequent_volume} -} - - -local water = { - handler = {}, - frequency = 0,--dolphins dont fit into small lakes - {name="dolphins", length=6}, - {name="dolphins_screaming", length=16.5} -} - -local water_frequent = { - handler = {}, - frequency = water_frequent_frequency, - on_stop = "drowning_gasp", - on_start = "Splash", - {name="scuba1bubbles", length=11, gain=water_frequent_volume}, - {name="scuba1calm", length=10}, --not sure why but sometimes I get errors when setting gain=water_frequent_volume here. - {name="scuba1calm2", length=8.5, gain=water_frequent_volume}, - {name="scuba1interestingbubbles", length=11, gain=water_frequent_volume}, - {name="scuba1tubulentbubbles", length=10.5, gain=water_frequent_volume} -} - -local water_surface = { - handler = {}, - frequency = 10, - on_start = "Splash", - {name="lake_waves_2_calm", length=9.5}, - {name="lake_waves_2_variety", length=13.1} -} - -local flowing_water = { - handler = {}, - frequency = 1000, - {name="small_waterfall", length=14, gain=.4} -} -local flowing_water2 = { - handler = {}, - frequency = 1000, - {name="small_waterfall", length=11, gain=.3} -} - -local lava = { - handler = {}, - frequency = 1000, - {name="earth01a", length=20} -} -local lava2 = { - handler = {}, - frequency = 1000, - {name="earth01a", length=15} -} - - -local play_music = minetest.setting_getbool("music") or false -local music = { - handler = {}, - frequency = music_frequency, - {name="mtest", length=4*60+33, gain=music_volume}, - {name="echos", length=2*60+26, gain=music_volume}, - {name="FoamOfTheSea", length=1*60+50, gain=music_volume}, - {name="eastern_feeling", length=3*60+51, gain=music_volume}, - {name="Mass_Effect_Uncharted_Worlds", length=2*60+29, gain=music_volume}, - {name="dark_ambiance", length=44, gain=music_volume} -} - -local is_daytime = function() - return (minetest.get_timeofday() > 0.2 and minetest.get_timeofday() < 0.8) -end - ---[[old -local nodes_in_range = function(pos, search_distance, node_name) - local search_p = {x=0, y=0, z=0} - local nodes_found = 0 - for p_x=(pos.x-search_distance), (pos.x+search_distance) do - for p_y=(pos.y-search_distance), (pos.y+search_distance) do - for p_z=(pos.z-search_distance), (pos.z+search_distance) do - local search_n = minetest.get_node({x=p_x, y=p_y, z=p_z}) - if search_n.name == node_name then - nodes_found = nodes_found + 1 - end - end - end - end - return nodes_found - --minetest.chat_send_all("Range: " .. tostring(search_distance) .. " | Found (" .. node_name .. ": " .. nodes_found .. ")") -end --]] - -local nodes_in_range = function(pos, search_distance, node_name) - minp = {x=pos.x-search_distance,y=pos.y-search_distance, z=pos.z-search_distance} - maxp = {x=pos.x+search_distance,y=pos.y+search_distance, z=pos.z+search_distance} - nodes = minetest.find_nodes_in_area(minp, maxp, node_name) --- minetest.chat_send_all("Found (" .. node_name .. ": " .. #nodes .. ")") - return #nodes -end - - -local get_ambience = function(player) - local pos = player:getpos() - pos.y = pos.y+1.0 - local nodename = minetest.get_node(pos).name - if string.find(nodename, "default:water") then - if music then - return {water=water, water_frequent=water_frequent, music=music} - else - return {water=water, water_frequent=water_frequent} - end - elseif nodename == "air" then - pos.y = pos.y-1.5 - local nodename = minetest.get_node(pos).name - pos.y = pos.y+1.5 - if string.find(nodename, "default:water") then - if music then - return {water_surface=water_surface, music=music} - else - return {water_surface} - end - end - end - - if nodes_in_range(pos, 7, "default:lava_flowing")>5 or nodes_in_range(pos, 7, "default:lava_source")>5 then - if music then - return {lava=lava, lava2=lava2, music=music} - else - return {lava=lava} - end - end - if nodes_in_range(pos, 7, "default:water_flowing")>5 then - if music then - return {flowing_water=flowing_water, flowing_water2=flowing_water2, music=music} - else - return {flowing_water=flowing_water, flowing_water2=flowing_water2} - end - end - pos.y = pos.y-2 - nodename = minetest.get_node(pos).name - --minetest.chat_send_all("Found " .. nodename .. pos.y ) - if string.find(nodename, "default:sand") and pos.y < 5 then - if music then - return {beach=beach, beach_frequent=beach_frequent, music=music} - else - return {beach=beach, beach_frequent=beach_frequent} - end - end - if player:getpos().y < 0 then - if music then - return {cave=cave, cave_frequent=cave_frequent, music=music} - else - return {cave=cave, cave_frequent=cave_frequent} - end - end - if is_daytime() then - if music then - return {day=day, day_frequent=day_frequent, music=music} - else - return {day=day, day_frequent=day_frequent} - end - else - if music then - return {night=night, night_frequent=night_frequent, music=music} - else - return {night=night, night_frequent=night_frequent} - end - end -end - --- start playing the sound, set the handler and delete the handler after sound is played -local play_sound = function(player, list, number) - local player_name = player:get_player_name() - if list.handler[player_name] == nil then - local gain = 1.0 - if list[number].gain ~= nil then - gain = list[number].gain - end - local handler = minetest.sound_play(list[number].name, {to_player=player_name, gain=gain}) - if handler ~= nil then - list.handler[player_name] = handler - minetest.after(list[number].length, function(args) - local list = args[1] - local player_name = args[2] - if list.handler[player_name] ~= nil then - minetest.sound_stop(list.handler[player_name]) - list.handler[player_name] = nil - end - end, {list, player_name}) - end - end -end - --- stops all sounds that are not in still_playing -local stop_sound = function(still_playing, player) - local player_name = player:get_player_name() - if still_playing.cave == nil then - local list = cave - if list.handler[player_name] ~= nil then - if list.on_stop ~= nil then - minetest.sound_play(list.on_stop, {to_player=player:get_player_name()}) - end - minetest.sound_stop(list.handler[player_name]) - list.handler[player_name] = nil - end - end - if still_playing.cave_frequent == nil then - local list = cave_frequent - if list.handler[player_name] ~= nil then - if list.on_stop ~= nil then - minetest.sound_play(list.on_stop, {to_player=player:get_player_name()}) - end - minetest.sound_stop(list.handler[player_name]) - list.handler[player_name] = nil - end - end - if still_playing.beach == nil then - local list = beach - if list.handler[player_name] ~= nil then - if list.on_stop ~= nil then - minetest.sound_play(list.on_stop, {to_player=player:get_player_name()}) - end - minetest.sound_stop(list.handler[player_name]) - list.handler[player_name] = nil - end - end - if still_playing.beach_frequent == nil then - local list = beach_frequent - if list.handler[player_name] ~= nil then - if list.on_stop ~= nil then - minetest.sound_play(list.on_stop, {to_player=player:get_player_name()}) - end - minetest.sound_stop(list.handler[player_name]) - list.handler[player_name] = nil - end - end - - if still_playing.night == nil then - local list = night - if list.handler[player_name] ~= nil then - if list.on_stop ~= nil then - minetest.sound_play(list.on_stop, {to_player=player:get_player_name()}) - end - minetest.sound_stop(list.handler[player_name]) - list.handler[player_name] = nil - end - end - if still_playing.night_frequent == nil then - local list = night_frequent - if list.handler[player_name] ~= nil then - if list.on_stop ~= nil then - minetest.sound_play(list.on_stop, {to_player=player:get_player_name()}) - end - minetest.sound_stop(list.handler[player_name]) - list.handler[player_name] = nil - end - end - if still_playing.day == nil then - local list = day - if list.handler[player_name] ~= nil then - if list.on_stop ~= nil then - minetest.sound_play(list.on_stop, {to_player=player:get_player_name()}) - end - minetest.sound_stop(list.handler[player_name]) - list.handler[player_name] = nil - end - end - if still_playing.day_frequent == nil then - local list = day_frequent - if list.handler[player_name] ~= nil then - if list.on_stop ~= nil then - minetest.sound_play(list.on_stop, {to_player=player:get_player_name()}) - end - minetest.sound_stop(list.handler[player_name]) - list.handler[player_name] = nil - end - end - if still_playing.music == nil then - local list = music - if list.handler[player_name] ~= nil then - if list.on_stop ~= nil then - minetest.sound_play(list.on_stop, {to_player=player:get_player_name()}) - end - minetest.sound_stop(list.handler[player_name]) - list.handler[player_name] = nil - end - end - if still_playing.flowing_water == nil then - local list = flowing_water - if list.handler[player_name] ~= nil then - if list.on_stop ~= nil then - minetest.sound_play(list.on_stop, {to_player=player:get_player_name()}) - end - minetest.sound_stop(list.handler[player_name]) - list.handler[player_name] = nil - end - end - if still_playing.flowing_water2 == nil then - local list = flowing_water2 - if list.handler[player_name] ~= nil then - if list.on_stop ~= nil then - minetest.sound_play(list.on_stop, {to_player=player:get_player_name()}) - end - minetest.sound_stop(list.handler[player_name]) - list.handler[player_name] = nil - end - end - if still_playing.lava == nil then - local list = lava - if list.handler[player_name] ~= nil then - if list.on_stop ~= nil then - minetest.sound_play(list.on_stop, {to_player=player:get_player_name()}) - end - minetest.sound_stop(list.handler[player_name]) - list.handler[player_name] = nil - end - end - if still_playing.lava2 == nil then - local list = lava2 - if list.handler[player_name] ~= nil then - if list.on_stop ~= nil then - minetest.sound_play(list.on_stop, {to_player=player:get_player_name()}) - end - minetest.sound_stop(list.handler[player_name]) - list.handler[player_name] = nil - end - end - if still_playing.water == nil then - local list = water - if list.handler[player_name] ~= nil then - if list.on_stop ~= nil then - minetest.sound_play(list.on_stop, {to_player=player:get_player_name()}) - end - minetest.sound_stop(list.handler[player_name]) - list.handler[player_name] = nil - end - end - if still_playing.water_surface == nil then - local list = water_surface - if list.handler[player_name] ~= nil then - if list.on_stop ~= nil then - minetest.sound_play(list.on_stop, {to_player=player:get_player_name()}) - played_on_start = false - end - minetest.sound_stop(list.handler[player_name]) - list.handler[player_name] = nil - end - end - if still_playing.water_frequent == nil then - local list = water_frequent - if list.handler[player_name] ~= nil then - if list.on_stop ~= nil then - minetest.sound_play(list.on_stop, {to_player=player:get_player_name()}) - minetest.chat_send_all("list.on_stop " .. list.on_stop ) - -- played_on_start = false - end - minetest.sound_stop(list.handler[player_name]) - list.handler[player_name] = nil - end - end - - - -end - -local timer = 0 -minetest.register_globalstep(function(dtime) - timer = timer+dtime - if timer < 1 then - return - end - timer = 0 - - for _,player in ipairs(minetest.get_connected_players()) do - local ambiences = get_ambience(player) - stop_sound(ambiences, player) - for _,ambience in pairs(ambiences) do - if math.random(1, 1000) <= ambience.frequency then - if ambience.on_start ~= nil and played_on_start == false then - played_on_start = true - minetest.sound_play(ambience.on_start, {to_player=player:get_player_name()}) - end - play_sound(player, ambience, math.random(1, #ambience)) - end - end - end -end) \ No newline at end of file diff --git a/mods/ambience_modpack/ambience/init29debug.lua b/mods/ambience_modpack/ambience/init29debug.lua deleted file mode 100755 index c8335313..00000000 --- a/mods/ambience_modpack/ambience/init29debug.lua +++ /dev/null @@ -1,722 +0,0 @@ --------------------------------------------------------------------------------------------------------- ---Ambiance Configuration for version .29 ---working on Flying ---PROB: wind stops short even though it says we are still flying and don't hear the start sound. ---really BIG prob, it ruins water meaning you hear beach while treading water. (find out if still hear it in .28) because ---it is fairly rare in .29 ---need a separate onstart variable for flying - - -local max_frequency_all = 1000 --the larger you make this number the lest frequent ALL sounds will happen recommended values between 100-2000. - ---for frequencies below use a number between 0 and max_frequency_all ---for volumes below, use a number between 0.0 and 1, the larger the number the louder the sounds -local night_frequency = 20 --owls, wolves -local night_volume = 0.9 -local night_frequent_frequency = 150 --crickets -local night_frequent_volume = 0.9 -local day_frequency = 100 --crow, bluejay, cardinal -local day_volume = 0.9 -local day_frequent_frequency = 1000 --crow, bluejay, cardinal -local day_frequent_volume = 0.18 -local cave_frequency = 10 --bats -local cave_volume = 1.0 -local cave_frequent_frequency = 70 --drops of water dripping -local cave_frequent_volume = 1.0 -local beach_frequency = 20 --seagulls -local beach_volume = 1.0 -local beach_frequent_frequency = 1000 --waves -local beach_frequent_volume = 1.0 -local water_frequent_frequency = 1000 --water sounds -local water_frequent_volume = 1.0 -local desert_frequency = 20 --coyote -local desert_volume = 1.0 -local desert_frequent_frequency = 700 --desertwind -local desert_frequent_volume = 1.0 -local swimming_frequent_frequency = 1000 --swimming splashes -local swimming_frequent_volume = 1.0 -local music_frequency = 0 --music (suggestion: keep this one low like around 6) -local music_volume = 0.3 ---End of Config ----------------------------------------------------------------------------------------------------- -local counter=0--***************** -local last_x_pos = 0 -local last_y_pos = 0 -local last_z_pos = 0 -local node_under_feet -local node_at_upper_body -local node_at_lower_body -local node_3_under_feet - -local played_on_start = false -local played_on_start_flying = false - -local night = { - handler = {}, - frequency = night_frequency, - {name="horned_owl", length=3, gain=night_volume}, - {name="Wolves_Howling", length=11, gain=night_volume}, - {name="ComboWind", length=17, gain=night_volume} -} - -local night_frequent = { - handler = {}, - frequency = night_frequent_frequency, - {name="Crickets_At_NightCombo", length=69, gain=night_frequent_volume} -} - -local day = { - handler = {}, - frequency = day_frequency, - {name="Best Cardinal Bird", length=4, gain=day_volume}, - {name="craw", length=3, gain=day_volume}, - {name="bluejay", length=18, gain=day_volume}, - {name="ComboWind", length=17, gain=day_volume} -} - -local day_frequent = { - handler = {}, - frequency = day_frequent_frequency, - {name="robin2", length=16, gain=day_frequent_volume}, - {name="birdsongnl", length=13, gain=day_frequent_volume}, - {name="bird", length=30, gain=day_frequent_volume}, - {name="Best Cardinal Bird", length=4, gain=day_frequent_volume}, - {name="craw", length=3, gain=day_frequent_volume}, - {name="bluejay", length=18, gain=day_frequent_volume}, - {name="ComboWind", length=17, gain=day_frequent_volume*3} -} -local swimming_frequent = { - handler = {}, - frequency = day_frequent_frequency, - {name="water_swimming_splashing_breath", length=11.5, gain=swimming_frequent_volume}, - {name="water_swimming_splashing", length=9, gain=swimming_frequent_volume} -} - -local cave = { - handler = {}, - frequency = cave_frequency, - {name="Bats_in_Cave", length=5, gain=cave_volume} -} - -local cave_frequent = { - handler = {}, - frequency = cave_frequent_frequency, - {name="drippingwater_drip_a", length=2, gain=cave_frequent_volume}, - {name="drippingwater_drip_b", length=2, gain=cave_frequent_volume}, - {name="drippingwater_drip_c", length=2, gain=cave_frequent_volume}, - {name="Single_Water_Droplet", length=3, gain=cave_frequent_volume}, - {name="Spooky_Water_Drops", length=7, gain=cave_frequent_volume} -} - -local beach = { - handler = {}, - frequency = beach_frequency, - {name="seagull", length=4.5, gain=beach_volume} -} - -local beach_frequent = { - handler = {}, - frequency = beach_frequent_frequency, - {name="fiji_beach", length=43.5, gain=beach_frequent_volume} -} - -local desert = { - handler = {}, - frequency = desert_frequency, - {name="coyote2", length=2.5, gain=desert_volume}, - {name="RattleSnake", length=8, gain=desert_volume} -} - -local desert_frequent = { - handler = {}, - frequency = desert_frequent_frequency, - {name="DesertMonolithMed", length=34.5, gain=desert_frequent_volume} -} - -local flying = { - handler = {}, - frequency = 1000, - on_start = "crystal_airlines", - on_stop = "nothing_yet", - {name="ComboWind", length=17, gain=1} -} - -local water = { - handler = {}, - frequency = 0,--dolphins dont fit into small lakes - {name="dolphins", length=6}, - {name="dolphins_screaming", length=16.5} -} - -local water_frequent = { - handler = {}, - frequency = water_frequent_frequency, - on_stop = "drowning_gasp", - --on_start = "Splash", - {name="scuba1bubbles", length=11, gain=water_frequent_volume}, - {name="scuba1calm", length=10}, --not sure why but sometimes I get errors when setting gain=water_frequent_volume here. - {name="scuba1calm2", length=8.5, gain=water_frequent_volume}, - {name="scuba1interestingbubbles", length=11, gain=water_frequent_volume}, - {name="scuba1tubulentbubbles", length=10.5, gain=water_frequent_volume} -} - -local water_surface = { - handler = {}, - frequency = 1000, - on_stop = "Splash", - on_start = "Splash", - {name="lake_waves_2_calm", length=9.5}, - {name="lake_waves_2_variety", length=13.1} -} -local splashing_water = { - handler = {}, - frequency = 1000, - {name="Splash", length=1.22, gain=1} -} - -local flowing_water = { - handler = {}, - frequency = 1000, - {name="small_waterfall", length=14, gain=.4} -} -local flowing_water2 = { - handler = {}, - frequency = 1000, - {name="small_waterfall", length=11, gain=.3} -} - -local lava = { - handler = {}, - frequency = 1000, - {name="earth01a", length=20} -} -local lava2 = { - handler = {}, - frequency = 1000, - {name="earth01a", length=15} -} - - -local play_music = minetest.setting_getbool("music") or false -local music = { - handler = {}, - frequency = music_frequency, - {name="mtest", length=4*60+33, gain=music_volume}, - {name="echos", length=2*60+26, gain=music_volume}, - {name="FoamOfTheSea", length=1*60+50, gain=music_volume}, - {name="eastern_feeling", length=3*60+51, gain=music_volume}, - {name="Mass_Effect_Uncharted_Worlds", length=2*60+29, gain=music_volume}, - {name="dark_ambiance", length=44, gain=music_volume} -} - -local is_daytime = function() - return (minetest.get_timeofday() > 0.2 and minetest.get_timeofday() < 0.8) -end - -local nodes_in_range = function(pos, search_distance, node_name) - minp = {x=pos.x-search_distance,y=pos.y-search_distance, z=pos.z-search_distance} - maxp = {x=pos.x+search_distance,y=pos.y+search_distance, z=pos.z+search_distance} - nodes = minetest.find_nodes_in_area(minp, maxp, node_name) - --minetest.chat_send_all("Found (" .. node_name .. ": " .. #nodes .. ")") - return #nodes -end - -local nodes_in_coords = function(minp, maxp, node_name) - nodes = minetest.find_nodes_in_area(minp, maxp, node_name) - --minetest.chat_send_all("Found (" .. node_name .. ": " .. #nodes .. ")") - return #nodes -end - -local atleast_nodes_in_grid = function(pos, search_distance, height, node_name, threshold) --- counter = counter +1 --- minetest.chat_send_all("counter: (" .. counter .. ")") - minp = {x=pos.x-search_distance,y=height, z=pos.z+20} - maxp = {x=pos.x+search_distance,y=height, z=pos.z+20} - nodes = minetest.find_nodes_in_area(minp, maxp, node_name) --- minetest.chat_send_all("z+Found (" .. node_name .. ": " .. #nodes .. ")") - if #nodes >= threshold then - return true - end - totalnodes = #nodes - minp = {x=pos.x-search_distance,y=height, z=pos.z-20} - maxp = {x=pos.x+search_distance,y=height, z=pos.z-20} - nodes = minetest.find_nodes_in_area(minp, maxp, node_name) --- minetest.chat_send_all("z-Found (" .. node_name .. ": " .. #nodes .. ")") - if #nodes >= threshold then - return true - end - totalnodes = totalnodes + #nodes - maxp = {x=pos.x+20,y=height, z=pos.z+search_distance} - minp = {x=pos.x+20,y=height, z=pos.z-search_distance} - nodes = minetest.find_nodes_in_area(minp, maxp, node_name) --- minetest.chat_send_all("x+Found (" .. node_name .. ": " .. #nodes .. ")") - if #nodes >= threshold then - return true - end - totalnodes = totalnodes + #nodes - maxp = {x=pos.x-20,y=height, z=pos.z+search_distance} - minp = {x=pos.x-20,y=height, z=pos.z-search_distance} - nodes = minetest.find_nodes_in_area(minp, maxp, node_name) --- minetest.chat_send_all("x+Found (" .. node_name .. ": " .. #nodes .. ")") - if #nodes >= threshold then - return true - end - totalnodes = totalnodes + #nodes --- minetest.chat_send_all("Found total(" .. totalnodes .. ")") - if totalnodes >= threshold*2 then - return true - end - return false -end - -local get_immediate_nodes = function(pos) - pos.y = pos.y-1 - node_under_feet = minetest.get_node(pos).name - pos.y = pos.y-3 - node_3_under_feet = minetest.get_node(pos).name - pos.y = pos.y+3 - pos.y = pos.y+2.2 - node_at_upper_body = minetest.get_node(pos).name - pos.y = pos.y-1.19 - node_at_lower_body = minetest.get_node(pos).name - pos.y = pos.y+0.99 --1.6 - --minetest.chat_send_all("node_under_feet(" .. nodename .. ")") -end - - -local get_ambience = function(player) - local player_is_climbing = false - local player_is_descending = false - local player_is_moving_horiz = false - local standing_in_water = false - local pos = player:getpos() - get_immediate_nodes(pos) - - if last_x_pos ~=pos.x or last_z_pos ~=pos.z then - player_is_moving_horiz = true - end - if pos.y > last_y_pos+.5 then - player_is_climbing = true - end - if pos.y < last_y_pos-.5 then - player_is_descending = true - end - - last_x_pos =pos.x - last_z_pos =pos.z - last_y_pos =pos.y - - if string.find(node_at_upper_body, "default:water") then - if music then - return {water=water, water_frequent=water_frequent, music=music} - else - return {water=water, water_frequent=water_frequent} - end - elseif node_at_upper_body == "air" then - if string.find(node_at_lower_body, "default:water") then - --minetest.chat_send_all("bottom counted as water") - --we found air at upperbody, and water at lower body. Now there are 4 possibilities: - --Key: under feet, moving or not - --swimming w, m swimming - --walking in water nw, m splashing - --treading water w, nm sloshing - --standing in water nw, nm beach trumps, then sloshing - if player_is_moving_horiz then - if string.find(node_under_feet, "default:water") then - if music then - return {swimming_frequent=swimming_frequent, music=music} - else - return {swimming_frequent} - end - else --didn't find water under feet: walking in water - if music then - return {splashing_water=splashing_water, music=music} - else - return {splashing_water} - end - end - else--player is not moving - if string.find(node_under_feet, "default:water") then - if music then - return {water_surface=water_surface, music=music} - else - return {water_surface} - end - else --didn't find water under feet - standing_in_water = true - end - end - end - end - if player_is_moving_horiz then - minetest.chat_send_all("playermoving") - end - if player_is_climbing then - minetest.chat_send_all("player Climbing") - end - minetest.chat_send_all("nub:" ..node_at_upper_body) - minetest.chat_send_all("nlb:" ..node_at_lower_body) - minetest.chat_send_all("nuf:" ..node_under_feet) - minetest.chat_send_all("n3uf:" ..node_3_under_feet) - - local air_or_ignore = {air=true,ignore=true} - --minetest.chat_send_all(air_or_ignore[node_under_feet]) - if (player_is_moving_horiz or player_is_climbing) and air_or_ignore[node_at_upper_body] and air_or_ignore[node_at_lower_body] - and air_or_ignore[node_under_feet] and air_or_ignore[node_3_under_feet] and not player_is_descending then - minetest.chat_send_all("flying!!!!") - if music then - return {flying=flying, music=music} - else - return {flying} - end - end - minetest.chat_send_all("not flying!!!!") - - if nodes_in_range(pos, 7, "default:lava_flowing")>5 or nodes_in_range(pos, 7, "default:lava_source")>5 then - if music then - return {lava=lava, lava2=lava2, music=music} - else - return {lava=lava} - end - end - if nodes_in_range(pos, 6, "default:water_flowing")>45 then - if music then - return {flowing_water=flowing_water, flowing_water2=flowing_water2, music=music} - else - return {flowing_water=flowing_water, flowing_water2=flowing_water2} - end - end - - ---if we are near sea level and there is lots of water around the area - if pos.y < 7 and pos.y >0 and atleast_nodes_in_grid(pos, 60, 1, "default:water_source", 51 ) then - if music then - return {beach=beach, beach_frequent=beach_frequent, music=music} - else - return {beach=beach, beach_frequent=beach_frequent} - end - end - if standing_in_water then - if music then - return {water_surface=water_surface, music=music} - else - return {water_surface} - end - end - - - desert_in_range = (nodes_in_range(pos, 6, "default:desert_sand")+nodes_in_range(pos, 6, "default:desert_stone")) - --minetest.chat_send_all("desertcount: " .. desert_in_range .. ",".. pos.y ) - if desert_in_range >250 then - if music then - return {desert=desert, desert_frequent=desert_frequent, music=music} - else - return {desert=desert, desert_frequent=desert_frequent} - end - end - - pos.y = pos.y-2 - nodename = minetest.get_node(pos).name --- minetest.chat_send_all("Found " .. nodename .. pos.y ) - - - if player:getpos().y < 0 then - if music then - return {cave=cave, cave_frequent=cave_frequent, music=music} - else - return {cave=cave, cave_frequent=cave_frequent} - end - end - if is_daytime() then - if music then - return {day=day, day_frequent=day_frequent, music=music} - else - return {day=day, day_frequent=day_frequent} - end - else - if music then - return {night=night, night_frequent=night_frequent, music=music} - else - return {night=night, night_frequent=night_frequent} - end - end -end - --- start playing the sound, set the handler and delete the handler after sound is played -local play_sound = function(player, list, number) - local player_name = player:get_player_name() - if list.handler[player_name] == nil then - local gain = 1.0 - if list[number].gain ~= nil then - gain = list[number].gain - end - local handler = minetest.sound_play(list[number].name, {to_player=player_name, gain=gain}) - if handler ~= nil then - list.handler[player_name] = handler - minetest.after(list[number].length, function(args) - local list = args[1] - local player_name = args[2] - if list.handler[player_name] ~= nil then - minetest.sound_stop(list.handler[player_name]) - list.handler[player_name] = nil - end - end, {list, player_name}) - end - end -end - --- stops all sounds that are not in still_playing -local stop_sound = function(still_playing, player) - local player_name = player:get_player_name() - if still_playing.cave == nil then - local list = cave - if list.handler[player_name] ~= nil then - if list.on_stop ~= nil then - minetest.sound_play(list.on_stop, {to_player=player:get_player_name()}) - end - minetest.sound_stop(list.handler[player_name]) - list.handler[player_name] = nil - end - end - if still_playing.cave_frequent == nil then - local list = cave_frequent - if list.handler[player_name] ~= nil then - if list.on_stop ~= nil then - minetest.sound_play(list.on_stop, {to_player=player:get_player_name()}) - end - minetest.sound_stop(list.handler[player_name]) - list.handler[player_name] = nil - end - end - if still_playing.swimming_frequent == nil then - local list = swimming_frequent - if list.handler[player_name] ~= nil then - if list.on_stop ~= nil then - minetest.sound_play(list.on_stop, {to_player=player:get_player_name()}) - end - minetest.sound_stop(list.handler[player_name]) - list.handler[player_name] = nil - end - end - if still_playing.beach == nil then - local list = beach - if list.handler[player_name] ~= nil then - if list.on_stop ~= nil then - minetest.sound_play(list.on_stop, {to_player=player:get_player_name()}) - end - minetest.sound_stop(list.handler[player_name]) - list.handler[player_name] = nil - end - end - if still_playing.beach_frequent == nil then - local list = beach_frequent - if list.handler[player_name] ~= nil then - if list.on_stop ~= nil then - minetest.sound_play(list.on_stop, {to_player=player:get_player_name()}) - end - minetest.sound_stop(list.handler[player_name]) - list.handler[player_name] = nil - end - end - if still_playing.desert == nil then - local list = desert - if list.handler[player_name] ~= nil then - if list.on_stop ~= nil then - minetest.sound_play(list.on_stop, {to_player=player:get_player_name()}) - end - minetest.sound_stop(list.handler[player_name]) - list.handler[player_name] = nil - end - end - if still_playing.desert_frequent == nil then - local list = desert_frequent - if list.handler[player_name] ~= nil then - if list.on_stop ~= nil then - minetest.sound_play(list.on_stop, {to_player=player:get_player_name()}) - end - minetest.sound_stop(list.handler[player_name]) - list.handler[player_name] = nil - end - end - if still_playing.night == nil then - local list = night - if list.handler[player_name] ~= nil then - if list.on_stop ~= nil then - minetest.sound_play(list.on_stop, {to_player=player:get_player_name()}) - end - minetest.sound_stop(list.handler[player_name]) - list.handler[player_name] = nil - end - end - if still_playing.night_frequent == nil then - local list = night_frequent - if list.handler[player_name] ~= nil then - if list.on_stop ~= nil then - minetest.sound_play(list.on_stop, {to_player=player:get_player_name()}) - end - minetest.sound_stop(list.handler[player_name]) - list.handler[player_name] = nil - end - end - if still_playing.day == nil then - local list = day - if list.handler[player_name] ~= nil then - if list.on_stop ~= nil then - minetest.sound_play(list.on_stop, {to_player=player:get_player_name()}) - end - minetest.sound_stop(list.handler[player_name]) - list.handler[player_name] = nil - end - end - if still_playing.day_frequent == nil then - local list = day_frequent - if list.handler[player_name] ~= nil then - if list.on_stop ~= nil then - minetest.sound_play(list.on_stop, {to_player=player:get_player_name()}) - end - minetest.sound_stop(list.handler[player_name]) - list.handler[player_name] = nil - end - end - if still_playing.music == nil then - local list = music - if list.handler[player_name] ~= nil then - if list.on_stop ~= nil then - minetest.sound_play(list.on_stop, {to_player=player:get_player_name()}) - end - minetest.sound_stop(list.handler[player_name]) - list.handler[player_name] = nil - end - end - if still_playing.flowing_water == nil then - local list = flowing_water - if list.handler[player_name] ~= nil then - if list.on_stop ~= nil then - minetest.sound_play(list.on_stop, {to_player=player:get_player_name()}) - end - minetest.sound_stop(list.handler[player_name]) - list.handler[player_name] = nil - end - end - if still_playing.flowing_water2 == nil then - local list = flowing_water2 - if list.handler[player_name] ~= nil then - if list.on_stop ~= nil then - minetest.sound_play(list.on_stop, {to_player=player:get_player_name()}) - end - minetest.sound_stop(list.handler[player_name]) - list.handler[player_name] = nil - end - end - if still_playing.lava == nil then - local list = lava - if list.handler[player_name] ~= nil then - if list.on_stop ~= nil then - minetest.sound_play(list.on_stop, {to_player=player:get_player_name()}) - end - minetest.sound_stop(list.handler[player_name]) - list.handler[player_name] = nil - end - end - if still_playing.lava2 == nil then - local list = lava2 - if list.handler[player_name] ~= nil then - if list.on_stop ~= nil then - minetest.sound_play(list.on_stop, {to_player=player:get_player_name()}) - end - minetest.sound_stop(list.handler[player_name]) - list.handler[player_name] = nil - end - end - if still_playing.water == nil then - local list = water - if list.handler[player_name] ~= nil then - if list.on_stop ~= nil then - minetest.sound_play(list.on_stop, {to_player=player:get_player_name()}) - end - minetest.sound_stop(list.handler[player_name]) - list.handler[player_name] = nil - end - end - if still_playing.water_surface == nil then - local list = water_surface - if list.handler[player_name] ~= nil then - if list.on_stop ~= nil then - minetest.sound_play(list.on_stop, {to_player=player:get_player_name()}) - played_on_start = false - end - minetest.sound_stop(list.handler[player_name]) - list.handler[player_name] = nil - end - end - if still_playing.water_frequent == nil then - local list = water_frequent - if list.handler[player_name] ~= nil then - if list.on_stop ~= nil then - minetest.sound_play(list.on_stop, {to_player=player:get_player_name()}) - -- minetest.chat_send_all("list.on_stop " .. list.on_stop ) - played_on_start = false - end - minetest.sound_stop(list.handler[player_name]) - list.handler[player_name] = nil - end - end - if still_playing.flying == nil then - --minetest.chat_send_all("begin stop flying " ) - local list = flying - if list.handler[player_name] ~= nil then - -- minetest.chat_send_all("handler flying " ) - if list.on_stop ~= nil then - -- minetest.chat_send_all("onstop flying" ) - minetest.sound_play(list.on_stop, {to_player=player:get_player_name()}) - played_on_start = false - end - minetest.sound_stop(list.handler[player_name]) - list.handler[player_name] = nil - end - end - if still_playing.splashing_water == nil then - local list = splashing_water - if list.handler[player_name] ~= nil then - if list.on_stop ~= nil then - minetest.sound_play(list.on_stop, {to_player=player:get_player_name()}) - end - minetest.sound_stop(list.handler[player_name]) - list.handler[player_name] = nil - end - end - -end - -local timer = 0 -minetest.register_globalstep(function(dtime) - timer = timer+dtime - if timer < 1 then - return - end - timer = 0 - - for _,player in ipairs(minetest.get_connected_players()) do - local ambiences = get_ambience(player) - stop_sound(ambiences, player) - for _,ambience in pairs(ambiences) do - if math.random(1, 1000) <= ambience.frequency then - if(played_on_start) then - -- minetest.chat_send_all("playedOnStart " ) - else - -- minetest.chat_send_all("FALSEplayedOnStart " ) - end - if ambience.on_start ~= nil and played_on_start == false then - played_on_start = true - minetest.sound_play(ambience.on_start, {to_player=player:get_player_name()}) - end - minetest.chat_send_all("ambience: " ..ambience ) - -- if ambience.on_start ~= nil and played_on_start_flying == false then - -- played_on_start_flying = true - -- minetest.sound_play(ambience.on_start, {to_player=player:get_player_name()}) - -- end - play_sound(player, ambience, math.random(1, #ambience)) - end - end - end -end) \ No newline at end of file diff --git a/mods/ambience_modpack/ambience/sounds/Best_Cardinal_Bird.ogg b/mods/ambience_modpack/ambience/sounds/Best_Cardinal_Bird.ogg old mode 100644 new mode 100755 diff --git a/mods/ambience_modpack/ambience/sounds/Interlude.ogg b/mods/ambience_modpack/ambience/sounds/Interlude.ogg old mode 100644 new mode 100755 diff --git a/mods/ambience_modpack/ambience/todo.txt b/mods/ambience_modpack/ambience/todo.txt deleted file mode 100755 index 4f95977a..00000000 --- a/mods/ambience_modpack/ambience/todo.txt +++ /dev/null @@ -1,11 +0,0 @@ -To Do: - --add random_volume parameter to night normal, day normal, & cave normal sounds to create feeling of distance. - -m-get constant birds more quiet during the day -m-bats seem way too frequent now? -m-when playing multiplayer seems to increase frequency of music & normal sounds to the point where they are obnoxious -m-which songs should go with which environments? Dark songs in caves or night, light sounds during day. -m-may be drowning out some of the normal sound effects like walking on stone. -l-what about other weird bubble -l-put in wind/ wind in trees during day and night diff --git a/mods/awards/depends.txt b/mods/awards/depends.txt old mode 100644 new mode 100755 diff --git a/mods/awards/sounds/award_award_won.ogg b/mods/awards/sounds/award_award_won.ogg old mode 100644 new mode 100755 diff --git a/mods/beginners_chest/LICENSE b/mods/beginners_chest/LICENSE old mode 100644 new mode 100755 diff --git a/mods/beginners_chest/README.md b/mods/beginners_chest/README.md old mode 100644 new mode 100755 diff --git a/mods/bobblocks/textures/bobblocks_majorspike_reverse.png b/mods/bobblocks/textures/bobblocks_majorspike_reverse.png old mode 100644 new mode 100755 diff --git a/mods/chatplus/README.md b/mods/chatplus/README.md old mode 100644 new mode 100755 diff --git a/mods/chatplus/description.txt b/mods/chatplus/description.txt old mode 100644 new mode 100755 diff --git a/mods/chatplus/init.lua b/mods/chatplus/init.lua old mode 100644 new mode 100755 diff --git a/mods/chatplus/textures/chatplus_mail.png b/mods/chatplus/textures/chatplus_mail.png old mode 100644 new mode 100755 diff --git a/mods/christmas_craft/crafts.lua b/mods/christmas_craft/crafts.lua old mode 100644 new mode 100755 diff --git a/mods/christmas_craft/depends.txt b/mods/christmas_craft/depends.txt old mode 100644 new mode 100755 diff --git a/mods/christmas_craft/init.lua b/mods/christmas_craft/init.lua old mode 100644 new mode 100755 diff --git a/mods/christmas_craft/mods.lua b/mods/christmas_craft/mods.lua old mode 100644 new mode 100755 diff --git a/mods/christmas_craft/settings.lua b/mods/christmas_craft/settings.lua old mode 100644 new mode 100755 diff --git a/mods/christmas_craft/settings.txt b/mods/christmas_craft/settings.txt old mode 100644 new mode 100755 diff --git a/mods/christmas_craft/sounds/cannons_splash.1.ogg b/mods/christmas_craft/sounds/cannons_splash.1.ogg old mode 100644 new mode 100755 diff --git a/mods/christmas_craft/sounds/cannons_splash.2.ogg b/mods/christmas_craft/sounds/cannons_splash.2.ogg old mode 100644 new mode 100755 diff --git a/mods/christmas_craft/sounds/cannons_splash.3.ogg b/mods/christmas_craft/sounds/cannons_splash.3.ogg old mode 100644 new mode 100755 diff --git a/mods/christmas_craft/sounds/cannons_splash.4.ogg b/mods/christmas_craft/sounds/cannons_splash.4.ogg old mode 100644 new mode 100755 diff --git a/mods/christmas_craft/textures/Snowman_F.png b/mods/christmas_craft/textures/Snowman_F.png old mode 100644 new mode 100755 diff --git a/mods/christmas_craft/textures/Wreath.png b/mods/christmas_craft/textures/Wreath.png old mode 100644 new mode 100755 diff --git a/mods/christmas_craft/textures/c_lights.png b/mods/christmas_craft/textures/c_lights.png old mode 100644 new mode 100755 diff --git a/mods/christmas_craft/textures/christmas_craft_baubles_side_bl.png b/mods/christmas_craft/textures/christmas_craft_baubles_side_bl.png old mode 100644 new mode 100755 diff --git a/mods/christmas_craft/textures/christmas_craft_baubles_side_gr.png b/mods/christmas_craft/textures/christmas_craft_baubles_side_gr.png old mode 100644 new mode 100755 diff --git a/mods/christmas_craft/textures/christmas_craft_baubles_side_or.png b/mods/christmas_craft/textures/christmas_craft_baubles_side_or.png old mode 100644 new mode 100755 diff --git a/mods/christmas_craft/textures/christmas_craft_baubles_side_pi.png b/mods/christmas_craft/textures/christmas_craft_baubles_side_pi.png old mode 100644 new mode 100755 diff --git a/mods/christmas_craft/textures/christmas_craft_baubles_side_re.png b/mods/christmas_craft/textures/christmas_craft_baubles_side_re.png old mode 100644 new mode 100755 diff --git a/mods/christmas_craft/textures/christmas_craft_baubles_side_si.png b/mods/christmas_craft/textures/christmas_craft_baubles_side_si.png old mode 100644 new mode 100755 diff --git a/mods/christmas_craft/textures/christmas_craft_baubles_side_vi.png b/mods/christmas_craft/textures/christmas_craft_baubles_side_vi.png old mode 100644 new mode 100755 diff --git a/mods/christmas_craft/textures/christmas_craft_baubles_side_ye.png b/mods/christmas_craft/textures/christmas_craft_baubles_side_ye.png old mode 100644 new mode 100755 diff --git a/mods/christmas_craft/textures/christmas_craft_baubles_top.png b/mods/christmas_craft/textures/christmas_craft_baubles_top.png old mode 100644 new mode 100755 diff --git a/mods/christmas_craft/textures/christmas_craft_baubles_top_bl.png b/mods/christmas_craft/textures/christmas_craft_baubles_top_bl.png old mode 100644 new mode 100755 diff --git a/mods/christmas_craft/textures/christmas_craft_baubles_top_gr.png b/mods/christmas_craft/textures/christmas_craft_baubles_top_gr.png old mode 100644 new mode 100755 diff --git a/mods/christmas_craft/textures/christmas_craft_baubles_top_or.png b/mods/christmas_craft/textures/christmas_craft_baubles_top_or.png old mode 100644 new mode 100755 diff --git a/mods/christmas_craft/textures/christmas_craft_baubles_top_pi.png b/mods/christmas_craft/textures/christmas_craft_baubles_top_pi.png old mode 100644 new mode 100755 diff --git a/mods/christmas_craft/textures/christmas_craft_baubles_top_re.png b/mods/christmas_craft/textures/christmas_craft_baubles_top_re.png old mode 100644 new mode 100755 diff --git a/mods/christmas_craft/textures/christmas_craft_baubles_top_si.png b/mods/christmas_craft/textures/christmas_craft_baubles_top_si.png old mode 100644 new mode 100755 diff --git a/mods/christmas_craft/textures/christmas_craft_baubles_top_vi.png b/mods/christmas_craft/textures/christmas_craft_baubles_top_vi.png old mode 100644 new mode 100755 diff --git a/mods/christmas_craft/textures/christmas_craft_baubles_top_ye.png b/mods/christmas_craft/textures/christmas_craft_baubles_top_ye.png old mode 100644 new mode 100755 diff --git a/mods/christmas_craft/textures/christmas_craft_bow_bottom.png b/mods/christmas_craft/textures/christmas_craft_bow_bottom.png old mode 100644 new mode 100755 diff --git a/mods/christmas_craft/textures/christmas_craft_bow_side.png b/mods/christmas_craft/textures/christmas_craft_bow_side.png old mode 100644 new mode 100755 diff --git a/mods/christmas_craft/textures/christmas_craft_bow_top.png b/mods/christmas_craft/textures/christmas_craft_bow_top.png old mode 100644 new mode 100755 diff --git a/mods/christmas_craft/textures/christmas_craft_leaves_side.png b/mods/christmas_craft/textures/christmas_craft_leaves_side.png old mode 100644 new mode 100755 diff --git a/mods/christmas_craft/textures/christmas_craft_leaves_top.png b/mods/christmas_craft/textures/christmas_craft_leaves_top.png old mode 100644 new mode 100755 diff --git a/mods/christmas_craft/textures/christmas_craft_paper_bl.png b/mods/christmas_craft/textures/christmas_craft_paper_bl.png old mode 100644 new mode 100755 diff --git a/mods/christmas_craft/textures/christmas_craft_paper_gr.png b/mods/christmas_craft/textures/christmas_craft_paper_gr.png old mode 100644 new mode 100755 diff --git a/mods/christmas_craft/textures/christmas_craft_paper_or.png b/mods/christmas_craft/textures/christmas_craft_paper_or.png old mode 100644 new mode 100755 diff --git a/mods/christmas_craft/textures/christmas_craft_paper_pi.png b/mods/christmas_craft/textures/christmas_craft_paper_pi.png old mode 100644 new mode 100755 diff --git a/mods/christmas_craft/textures/christmas_craft_paper_re.png b/mods/christmas_craft/textures/christmas_craft_paper_re.png old mode 100644 new mode 100755 diff --git a/mods/christmas_craft/textures/christmas_craft_paper_vi.png b/mods/christmas_craft/textures/christmas_craft_paper_vi.png old mode 100644 new mode 100755 diff --git a/mods/christmas_craft/textures/christmas_craft_paper_ye.png b/mods/christmas_craft/textures/christmas_craft_paper_ye.png old mode 100644 new mode 100755 diff --git a/mods/christmas_craft/textures/christmas_craft_present_bl.png b/mods/christmas_craft/textures/christmas_craft_present_bl.png old mode 100644 new mode 100755 diff --git a/mods/christmas_craft/textures/christmas_craft_present_box.png b/mods/christmas_craft/textures/christmas_craft_present_box.png old mode 100644 new mode 100755 diff --git a/mods/christmas_craft/textures/christmas_craft_present_gr.png b/mods/christmas_craft/textures/christmas_craft_present_gr.png old mode 100644 new mode 100755 diff --git a/mods/christmas_craft/textures/christmas_craft_present_or.png b/mods/christmas_craft/textures/christmas_craft_present_or.png old mode 100644 new mode 100755 diff --git a/mods/christmas_craft/textures/christmas_craft_present_pi.png b/mods/christmas_craft/textures/christmas_craft_present_pi.png old mode 100644 new mode 100755 diff --git a/mods/christmas_craft/textures/christmas_craft_present_re.png b/mods/christmas_craft/textures/christmas_craft_present_re.png old mode 100644 new mode 100755 diff --git a/mods/christmas_craft/textures/christmas_craft_present_vi.png b/mods/christmas_craft/textures/christmas_craft_present_vi.png old mode 100644 new mode 100755 diff --git a/mods/christmas_craft/textures/christmas_craft_present_wh.png b/mods/christmas_craft/textures/christmas_craft_present_wh.png old mode 100644 new mode 100755 diff --git a/mods/christmas_craft/textures/christmas_craft_present_ye.png b/mods/christmas_craft/textures/christmas_craft_present_ye.png old mode 100644 new mode 100755 diff --git a/mods/christmas_craft/textures/christmas_craft_red_ribbon.png b/mods/christmas_craft/textures/christmas_craft_red_ribbon.png old mode 100644 new mode 100755 diff --git a/mods/christmas_craft/textures/christmas_craft_which_list.png b/mods/christmas_craft/textures/christmas_craft_which_list.png old mode 100644 new mode 100755 diff --git a/mods/christmas_craft/textures/christmas_leaves.png b/mods/christmas_craft/textures/christmas_leaves.png old mode 100644 new mode 100755 diff --git a/mods/christmas_craft/textures/default_stick.png b/mods/christmas_craft/textures/default_stick.png old mode 100644 new mode 100755 diff --git a/mods/christmas_craft/textures/grass_w_snow_side.png b/mods/christmas_craft/textures/grass_w_snow_side.png old mode 100644 new mode 100755 diff --git a/mods/christmas_craft/textures/lights_animated.png b/mods/christmas_craft/textures/lights_animated.png old mode 100644 new mode 100755 diff --git a/mods/christmas_craft/textures/side_stick.png b/mods/christmas_craft/textures/side_stick.png old mode 100644 new mode 100755 diff --git a/mods/christmas_craft/textures/snow.png b/mods/christmas_craft/textures/snow.png old mode 100644 new mode 100755 diff --git a/mods/christmas_craft/textures/snow_ball.png b/mods/christmas_craft/textures/snow_ball.png old mode 100644 new mode 100755 diff --git a/mods/christmas_craft/textures/snow_footstep.png b/mods/christmas_craft/textures/snow_footstep.png old mode 100644 new mode 100755 diff --git a/mods/christmas_craft/textures/snowball.png b/mods/christmas_craft/textures/snowball.png old mode 100644 new mode 100755 diff --git a/mods/christmas_craft/textures/star.png b/mods/christmas_craft/textures/star.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/init.lua b/mods/coloredwood/init.lua index 23dfa156..f1c863ce 100755 --- a/mods/coloredwood/init.lua +++ b/mods/coloredwood/init.lua @@ -133,5 +133,5 @@ dofile(minetest.get_modpath("coloredwood").."/wood.lua") dofile(minetest.get_modpath("coloredwood").."/fence.lua") dofile(minetest.get_modpath("coloredwood").."/stick.lua") -print("[Colored Wood] Loaded!") +minetest.log("action", "[Colored Wood] Loaded!") diff --git a/mods/coloredwood/textures/coloredwood_fence_aqua.png b/mods/coloredwood/textures/coloredwood_fence_aqua.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_fence_aqua_s50.png b/mods/coloredwood/textures/coloredwood_fence_aqua_s50.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_fence_black.png b/mods/coloredwood/textures/coloredwood_fence_black.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_fence_blue.png b/mods/coloredwood/textures/coloredwood_fence_blue.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_fence_blue_s50.png b/mods/coloredwood/textures/coloredwood_fence_blue_s50.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_fence_cyan.png b/mods/coloredwood/textures/coloredwood_fence_cyan.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_fence_cyan_s50.png b/mods/coloredwood/textures/coloredwood_fence_cyan_s50.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_fence_dark_aqua.png b/mods/coloredwood/textures/coloredwood_fence_dark_aqua.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_fence_dark_aqua_s50.png b/mods/coloredwood/textures/coloredwood_fence_dark_aqua_s50.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_fence_dark_blue.png b/mods/coloredwood/textures/coloredwood_fence_dark_blue.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_fence_dark_blue_s50.png b/mods/coloredwood/textures/coloredwood_fence_dark_blue_s50.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_fence_dark_cyan.png b/mods/coloredwood/textures/coloredwood_fence_dark_cyan.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_fence_dark_cyan_s50.png b/mods/coloredwood/textures/coloredwood_fence_dark_cyan_s50.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_fence_dark_green.png b/mods/coloredwood/textures/coloredwood_fence_dark_green.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_fence_dark_green_s50.png b/mods/coloredwood/textures/coloredwood_fence_dark_green_s50.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_fence_dark_lime.png b/mods/coloredwood/textures/coloredwood_fence_dark_lime.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_fence_dark_lime_s50.png b/mods/coloredwood/textures/coloredwood_fence_dark_lime_s50.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_fence_dark_magenta.png b/mods/coloredwood/textures/coloredwood_fence_dark_magenta.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_fence_dark_magenta_s50.png b/mods/coloredwood/textures/coloredwood_fence_dark_magenta_s50.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_fence_dark_orange.png b/mods/coloredwood/textures/coloredwood_fence_dark_orange.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_fence_dark_orange_s50.png b/mods/coloredwood/textures/coloredwood_fence_dark_orange_s50.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_fence_dark_red.png b/mods/coloredwood/textures/coloredwood_fence_dark_red.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_fence_dark_red_s50.png b/mods/coloredwood/textures/coloredwood_fence_dark_red_s50.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_fence_dark_redviolet.png b/mods/coloredwood/textures/coloredwood_fence_dark_redviolet.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_fence_dark_redviolet_s50.png b/mods/coloredwood/textures/coloredwood_fence_dark_redviolet_s50.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_fence_dark_skyblue.png b/mods/coloredwood/textures/coloredwood_fence_dark_skyblue.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_fence_dark_skyblue_s50.png b/mods/coloredwood/textures/coloredwood_fence_dark_skyblue_s50.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_fence_dark_violet.png b/mods/coloredwood/textures/coloredwood_fence_dark_violet.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_fence_dark_violet_s50.png b/mods/coloredwood/textures/coloredwood_fence_dark_violet_s50.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_fence_dark_yellow.png b/mods/coloredwood/textures/coloredwood_fence_dark_yellow.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_fence_dark_yellow_s50.png b/mods/coloredwood/textures/coloredwood_fence_dark_yellow_s50.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_fence_darkgrey.png b/mods/coloredwood/textures/coloredwood_fence_darkgrey.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_fence_green.png b/mods/coloredwood/textures/coloredwood_fence_green.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_fence_green_s50.png b/mods/coloredwood/textures/coloredwood_fence_green_s50.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_fence_grey.png b/mods/coloredwood/textures/coloredwood_fence_grey.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_fence_light_aqua.png b/mods/coloredwood/textures/coloredwood_fence_light_aqua.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_fence_light_blue.png b/mods/coloredwood/textures/coloredwood_fence_light_blue.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_fence_light_cyan.png b/mods/coloredwood/textures/coloredwood_fence_light_cyan.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_fence_light_green.png b/mods/coloredwood/textures/coloredwood_fence_light_green.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_fence_light_lime.png b/mods/coloredwood/textures/coloredwood_fence_light_lime.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_fence_light_magenta.png b/mods/coloredwood/textures/coloredwood_fence_light_magenta.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_fence_light_orange.png b/mods/coloredwood/textures/coloredwood_fence_light_orange.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_fence_light_red.png b/mods/coloredwood/textures/coloredwood_fence_light_red.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_fence_light_redviolet.png b/mods/coloredwood/textures/coloredwood_fence_light_redviolet.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_fence_light_skyblue.png b/mods/coloredwood/textures/coloredwood_fence_light_skyblue.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_fence_light_violet.png b/mods/coloredwood/textures/coloredwood_fence_light_violet.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_fence_light_yellow.png b/mods/coloredwood/textures/coloredwood_fence_light_yellow.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_fence_lightgrey.png b/mods/coloredwood/textures/coloredwood_fence_lightgrey.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_fence_lime.png b/mods/coloredwood/textures/coloredwood_fence_lime.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_fence_lime_s50.png b/mods/coloredwood/textures/coloredwood_fence_lime_s50.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_fence_magenta.png b/mods/coloredwood/textures/coloredwood_fence_magenta.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_fence_magenta_s50.png b/mods/coloredwood/textures/coloredwood_fence_magenta_s50.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_fence_medium_aqua.png b/mods/coloredwood/textures/coloredwood_fence_medium_aqua.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_fence_medium_aqua_s50.png b/mods/coloredwood/textures/coloredwood_fence_medium_aqua_s50.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_fence_medium_blue.png b/mods/coloredwood/textures/coloredwood_fence_medium_blue.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_fence_medium_blue_s50.png b/mods/coloredwood/textures/coloredwood_fence_medium_blue_s50.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_fence_medium_cyan.png b/mods/coloredwood/textures/coloredwood_fence_medium_cyan.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_fence_medium_cyan_s50.png b/mods/coloredwood/textures/coloredwood_fence_medium_cyan_s50.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_fence_medium_green.png b/mods/coloredwood/textures/coloredwood_fence_medium_green.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_fence_medium_green_s50.png b/mods/coloredwood/textures/coloredwood_fence_medium_green_s50.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_fence_medium_lime.png b/mods/coloredwood/textures/coloredwood_fence_medium_lime.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_fence_medium_lime_s50.png b/mods/coloredwood/textures/coloredwood_fence_medium_lime_s50.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_fence_medium_magenta.png b/mods/coloredwood/textures/coloredwood_fence_medium_magenta.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_fence_medium_magenta_s50.png b/mods/coloredwood/textures/coloredwood_fence_medium_magenta_s50.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_fence_medium_orange.png b/mods/coloredwood/textures/coloredwood_fence_medium_orange.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_fence_medium_orange_s50.png b/mods/coloredwood/textures/coloredwood_fence_medium_orange_s50.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_fence_medium_red.png b/mods/coloredwood/textures/coloredwood_fence_medium_red.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_fence_medium_red_s50.png b/mods/coloredwood/textures/coloredwood_fence_medium_red_s50.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_fence_medium_redviolet.png b/mods/coloredwood/textures/coloredwood_fence_medium_redviolet.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_fence_medium_redviolet_s50.png b/mods/coloredwood/textures/coloredwood_fence_medium_redviolet_s50.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_fence_medium_skyblue.png b/mods/coloredwood/textures/coloredwood_fence_medium_skyblue.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_fence_medium_skyblue_s50.png b/mods/coloredwood/textures/coloredwood_fence_medium_skyblue_s50.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_fence_medium_violet.png b/mods/coloredwood/textures/coloredwood_fence_medium_violet.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_fence_medium_violet_s50.png b/mods/coloredwood/textures/coloredwood_fence_medium_violet_s50.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_fence_medium_yellow.png b/mods/coloredwood/textures/coloredwood_fence_medium_yellow.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_fence_medium_yellow_s50.png b/mods/coloredwood/textures/coloredwood_fence_medium_yellow_s50.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_fence_orange.png b/mods/coloredwood/textures/coloredwood_fence_orange.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_fence_orange_s50.png b/mods/coloredwood/textures/coloredwood_fence_orange_s50.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_fence_red.png b/mods/coloredwood/textures/coloredwood_fence_red.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_fence_red_s50.png b/mods/coloredwood/textures/coloredwood_fence_red_s50.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_fence_redviolet.png b/mods/coloredwood/textures/coloredwood_fence_redviolet.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_fence_redviolet_s50.png b/mods/coloredwood/textures/coloredwood_fence_redviolet_s50.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_fence_skyblue.png b/mods/coloredwood/textures/coloredwood_fence_skyblue.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_fence_skyblue_s50.png b/mods/coloredwood/textures/coloredwood_fence_skyblue_s50.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_fence_violet.png b/mods/coloredwood/textures/coloredwood_fence_violet.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_fence_violet_s50.png b/mods/coloredwood/textures/coloredwood_fence_violet_s50.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_fence_white.png b/mods/coloredwood/textures/coloredwood_fence_white.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_fence_yellow.png b/mods/coloredwood/textures/coloredwood_fence_yellow.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_fence_yellow_s50.png b/mods/coloredwood/textures/coloredwood_fence_yellow_s50.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_stick_aqua.png b/mods/coloredwood/textures/coloredwood_stick_aqua.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_stick_aqua_s50.png b/mods/coloredwood/textures/coloredwood_stick_aqua_s50.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_stick_black.png b/mods/coloredwood/textures/coloredwood_stick_black.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_stick_blue.png b/mods/coloredwood/textures/coloredwood_stick_blue.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_stick_blue_s50.png b/mods/coloredwood/textures/coloredwood_stick_blue_s50.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_stick_cyan.png b/mods/coloredwood/textures/coloredwood_stick_cyan.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_stick_cyan_s50.png b/mods/coloredwood/textures/coloredwood_stick_cyan_s50.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_stick_dark_aqua.png b/mods/coloredwood/textures/coloredwood_stick_dark_aqua.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_stick_dark_aqua_s50.png b/mods/coloredwood/textures/coloredwood_stick_dark_aqua_s50.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_stick_dark_blue.png b/mods/coloredwood/textures/coloredwood_stick_dark_blue.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_stick_dark_blue_s50.png b/mods/coloredwood/textures/coloredwood_stick_dark_blue_s50.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_stick_dark_cyan.png b/mods/coloredwood/textures/coloredwood_stick_dark_cyan.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_stick_dark_cyan_s50.png b/mods/coloredwood/textures/coloredwood_stick_dark_cyan_s50.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_stick_dark_green.png b/mods/coloredwood/textures/coloredwood_stick_dark_green.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_stick_dark_green_s50.png b/mods/coloredwood/textures/coloredwood_stick_dark_green_s50.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_stick_dark_lime.png b/mods/coloredwood/textures/coloredwood_stick_dark_lime.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_stick_dark_lime_s50.png b/mods/coloredwood/textures/coloredwood_stick_dark_lime_s50.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_stick_dark_magenta.png b/mods/coloredwood/textures/coloredwood_stick_dark_magenta.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_stick_dark_magenta_s50.png b/mods/coloredwood/textures/coloredwood_stick_dark_magenta_s50.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_stick_dark_orange.png b/mods/coloredwood/textures/coloredwood_stick_dark_orange.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_stick_dark_orange_s50.png b/mods/coloredwood/textures/coloredwood_stick_dark_orange_s50.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_stick_dark_red.png b/mods/coloredwood/textures/coloredwood_stick_dark_red.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_stick_dark_red_s50.png b/mods/coloredwood/textures/coloredwood_stick_dark_red_s50.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_stick_dark_redviolet.png b/mods/coloredwood/textures/coloredwood_stick_dark_redviolet.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_stick_dark_redviolet_s50.png b/mods/coloredwood/textures/coloredwood_stick_dark_redviolet_s50.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_stick_dark_skyblue.png b/mods/coloredwood/textures/coloredwood_stick_dark_skyblue.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_stick_dark_skyblue_s50.png b/mods/coloredwood/textures/coloredwood_stick_dark_skyblue_s50.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_stick_dark_violet.png b/mods/coloredwood/textures/coloredwood_stick_dark_violet.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_stick_dark_violet_s50.png b/mods/coloredwood/textures/coloredwood_stick_dark_violet_s50.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_stick_dark_yellow.png b/mods/coloredwood/textures/coloredwood_stick_dark_yellow.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_stick_dark_yellow_s50.png b/mods/coloredwood/textures/coloredwood_stick_dark_yellow_s50.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_stick_darkgrey.png b/mods/coloredwood/textures/coloredwood_stick_darkgrey.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_stick_green.png b/mods/coloredwood/textures/coloredwood_stick_green.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_stick_green_s50.png b/mods/coloredwood/textures/coloredwood_stick_green_s50.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_stick_grey.png b/mods/coloredwood/textures/coloredwood_stick_grey.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_stick_light_aqua.png b/mods/coloredwood/textures/coloredwood_stick_light_aqua.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_stick_light_blue.png b/mods/coloredwood/textures/coloredwood_stick_light_blue.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_stick_light_cyan.png b/mods/coloredwood/textures/coloredwood_stick_light_cyan.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_stick_light_green.png b/mods/coloredwood/textures/coloredwood_stick_light_green.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_stick_light_lime.png b/mods/coloredwood/textures/coloredwood_stick_light_lime.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_stick_light_magenta.png b/mods/coloredwood/textures/coloredwood_stick_light_magenta.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_stick_light_orange.png b/mods/coloredwood/textures/coloredwood_stick_light_orange.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_stick_light_red.png b/mods/coloredwood/textures/coloredwood_stick_light_red.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_stick_light_redviolet.png b/mods/coloredwood/textures/coloredwood_stick_light_redviolet.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_stick_light_skyblue.png b/mods/coloredwood/textures/coloredwood_stick_light_skyblue.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_stick_light_violet.png b/mods/coloredwood/textures/coloredwood_stick_light_violet.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_stick_light_yellow.png b/mods/coloredwood/textures/coloredwood_stick_light_yellow.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_stick_lightgrey.png b/mods/coloredwood/textures/coloredwood_stick_lightgrey.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_stick_lime.png b/mods/coloredwood/textures/coloredwood_stick_lime.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_stick_lime_s50.png b/mods/coloredwood/textures/coloredwood_stick_lime_s50.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_stick_magenta.png b/mods/coloredwood/textures/coloredwood_stick_magenta.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_stick_magenta_s50.png b/mods/coloredwood/textures/coloredwood_stick_magenta_s50.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_stick_medium_aqua.png b/mods/coloredwood/textures/coloredwood_stick_medium_aqua.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_stick_medium_aqua_s50.png b/mods/coloredwood/textures/coloredwood_stick_medium_aqua_s50.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_stick_medium_blue.png b/mods/coloredwood/textures/coloredwood_stick_medium_blue.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_stick_medium_blue_s50.png b/mods/coloredwood/textures/coloredwood_stick_medium_blue_s50.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_stick_medium_cyan.png b/mods/coloredwood/textures/coloredwood_stick_medium_cyan.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_stick_medium_cyan_s50.png b/mods/coloredwood/textures/coloredwood_stick_medium_cyan_s50.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_stick_medium_green.png b/mods/coloredwood/textures/coloredwood_stick_medium_green.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_stick_medium_green_s50.png b/mods/coloredwood/textures/coloredwood_stick_medium_green_s50.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_stick_medium_lime.png b/mods/coloredwood/textures/coloredwood_stick_medium_lime.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_stick_medium_lime_s50.png b/mods/coloredwood/textures/coloredwood_stick_medium_lime_s50.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_stick_medium_magenta.png b/mods/coloredwood/textures/coloredwood_stick_medium_magenta.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_stick_medium_magenta_s50.png b/mods/coloredwood/textures/coloredwood_stick_medium_magenta_s50.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_stick_medium_orange.png b/mods/coloredwood/textures/coloredwood_stick_medium_orange.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_stick_medium_orange_s50.png b/mods/coloredwood/textures/coloredwood_stick_medium_orange_s50.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_stick_medium_red.png b/mods/coloredwood/textures/coloredwood_stick_medium_red.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_stick_medium_red_s50.png b/mods/coloredwood/textures/coloredwood_stick_medium_red_s50.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_stick_medium_redviolet.png b/mods/coloredwood/textures/coloredwood_stick_medium_redviolet.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_stick_medium_redviolet_s50.png b/mods/coloredwood/textures/coloredwood_stick_medium_redviolet_s50.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_stick_medium_skyblue.png b/mods/coloredwood/textures/coloredwood_stick_medium_skyblue.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_stick_medium_skyblue_s50.png b/mods/coloredwood/textures/coloredwood_stick_medium_skyblue_s50.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_stick_medium_violet.png b/mods/coloredwood/textures/coloredwood_stick_medium_violet.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_stick_medium_violet_s50.png b/mods/coloredwood/textures/coloredwood_stick_medium_violet_s50.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_stick_medium_yellow.png b/mods/coloredwood/textures/coloredwood_stick_medium_yellow.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_stick_medium_yellow_s50.png b/mods/coloredwood/textures/coloredwood_stick_medium_yellow_s50.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_stick_orange.png b/mods/coloredwood/textures/coloredwood_stick_orange.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_stick_orange_s50.png b/mods/coloredwood/textures/coloredwood_stick_orange_s50.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_stick_red.png b/mods/coloredwood/textures/coloredwood_stick_red.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_stick_red_s50.png b/mods/coloredwood/textures/coloredwood_stick_red_s50.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_stick_redviolet.png b/mods/coloredwood/textures/coloredwood_stick_redviolet.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_stick_redviolet_s50.png b/mods/coloredwood/textures/coloredwood_stick_redviolet_s50.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_stick_skyblue.png b/mods/coloredwood/textures/coloredwood_stick_skyblue.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_stick_skyblue_s50.png b/mods/coloredwood/textures/coloredwood_stick_skyblue_s50.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_stick_violet.png b/mods/coloredwood/textures/coloredwood_stick_violet.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_stick_violet_s50.png b/mods/coloredwood/textures/coloredwood_stick_violet_s50.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_stick_white.png b/mods/coloredwood/textures/coloredwood_stick_white.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_stick_yellow.png b/mods/coloredwood/textures/coloredwood_stick_yellow.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_stick_yellow_s50.png b/mods/coloredwood/textures/coloredwood_stick_yellow_s50.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_wood_aqua.png b/mods/coloredwood/textures/coloredwood_wood_aqua.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_wood_aqua_s50.png b/mods/coloredwood/textures/coloredwood_wood_aqua_s50.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_wood_black.png b/mods/coloredwood/textures/coloredwood_wood_black.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_wood_blue.png b/mods/coloredwood/textures/coloredwood_wood_blue.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_wood_blue_s50.png b/mods/coloredwood/textures/coloredwood_wood_blue_s50.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_wood_cyan.png b/mods/coloredwood/textures/coloredwood_wood_cyan.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_wood_cyan_s50.png b/mods/coloredwood/textures/coloredwood_wood_cyan_s50.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_wood_dark_aqua.png b/mods/coloredwood/textures/coloredwood_wood_dark_aqua.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_wood_dark_aqua_s50.png b/mods/coloredwood/textures/coloredwood_wood_dark_aqua_s50.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_wood_dark_blue.png b/mods/coloredwood/textures/coloredwood_wood_dark_blue.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_wood_dark_blue_s50.png b/mods/coloredwood/textures/coloredwood_wood_dark_blue_s50.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_wood_dark_cyan.png b/mods/coloredwood/textures/coloredwood_wood_dark_cyan.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_wood_dark_cyan_s50.png b/mods/coloredwood/textures/coloredwood_wood_dark_cyan_s50.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_wood_dark_green.png b/mods/coloredwood/textures/coloredwood_wood_dark_green.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_wood_dark_green_s50.png b/mods/coloredwood/textures/coloredwood_wood_dark_green_s50.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_wood_dark_lime.png b/mods/coloredwood/textures/coloredwood_wood_dark_lime.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_wood_dark_lime_s50.png b/mods/coloredwood/textures/coloredwood_wood_dark_lime_s50.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_wood_dark_magenta.png b/mods/coloredwood/textures/coloredwood_wood_dark_magenta.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_wood_dark_magenta_s50.png b/mods/coloredwood/textures/coloredwood_wood_dark_magenta_s50.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_wood_dark_orange.png b/mods/coloredwood/textures/coloredwood_wood_dark_orange.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_wood_dark_orange_s50.png b/mods/coloredwood/textures/coloredwood_wood_dark_orange_s50.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_wood_dark_red.png b/mods/coloredwood/textures/coloredwood_wood_dark_red.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_wood_dark_red_s50.png b/mods/coloredwood/textures/coloredwood_wood_dark_red_s50.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_wood_dark_redviolet.png b/mods/coloredwood/textures/coloredwood_wood_dark_redviolet.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_wood_dark_redviolet_s50.png b/mods/coloredwood/textures/coloredwood_wood_dark_redviolet_s50.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_wood_dark_skyblue.png b/mods/coloredwood/textures/coloredwood_wood_dark_skyblue.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_wood_dark_skyblue_s50.png b/mods/coloredwood/textures/coloredwood_wood_dark_skyblue_s50.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_wood_dark_violet.png b/mods/coloredwood/textures/coloredwood_wood_dark_violet.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_wood_dark_violet_s50.png b/mods/coloredwood/textures/coloredwood_wood_dark_violet_s50.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_wood_dark_yellow.png b/mods/coloredwood/textures/coloredwood_wood_dark_yellow.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_wood_dark_yellow_s50.png b/mods/coloredwood/textures/coloredwood_wood_dark_yellow_s50.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_wood_darkgrey.png b/mods/coloredwood/textures/coloredwood_wood_darkgrey.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_wood_green.png b/mods/coloredwood/textures/coloredwood_wood_green.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_wood_green_s50.png b/mods/coloredwood/textures/coloredwood_wood_green_s50.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_wood_grey.png b/mods/coloredwood/textures/coloredwood_wood_grey.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_wood_light_aqua.png b/mods/coloredwood/textures/coloredwood_wood_light_aqua.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_wood_light_blue.png b/mods/coloredwood/textures/coloredwood_wood_light_blue.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_wood_light_cyan.png b/mods/coloredwood/textures/coloredwood_wood_light_cyan.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_wood_light_green.png b/mods/coloredwood/textures/coloredwood_wood_light_green.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_wood_light_lime.png b/mods/coloredwood/textures/coloredwood_wood_light_lime.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_wood_light_magenta.png b/mods/coloredwood/textures/coloredwood_wood_light_magenta.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_wood_light_orange.png b/mods/coloredwood/textures/coloredwood_wood_light_orange.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_wood_light_red.png b/mods/coloredwood/textures/coloredwood_wood_light_red.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_wood_light_redviolet.png b/mods/coloredwood/textures/coloredwood_wood_light_redviolet.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_wood_light_skyblue.png b/mods/coloredwood/textures/coloredwood_wood_light_skyblue.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_wood_light_violet.png b/mods/coloredwood/textures/coloredwood_wood_light_violet.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_wood_light_yellow.png b/mods/coloredwood/textures/coloredwood_wood_light_yellow.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_wood_lightgrey.png b/mods/coloredwood/textures/coloredwood_wood_lightgrey.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_wood_lime.png b/mods/coloredwood/textures/coloredwood_wood_lime.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_wood_lime_s50.png b/mods/coloredwood/textures/coloredwood_wood_lime_s50.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_wood_magenta.png b/mods/coloredwood/textures/coloredwood_wood_magenta.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_wood_magenta_s50.png b/mods/coloredwood/textures/coloredwood_wood_magenta_s50.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_wood_medium_aqua.png b/mods/coloredwood/textures/coloredwood_wood_medium_aqua.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_wood_medium_aqua_s50.png b/mods/coloredwood/textures/coloredwood_wood_medium_aqua_s50.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_wood_medium_blue.png b/mods/coloredwood/textures/coloredwood_wood_medium_blue.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_wood_medium_blue_s50.png b/mods/coloredwood/textures/coloredwood_wood_medium_blue_s50.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_wood_medium_cyan.png b/mods/coloredwood/textures/coloredwood_wood_medium_cyan.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_wood_medium_cyan_s50.png b/mods/coloredwood/textures/coloredwood_wood_medium_cyan_s50.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_wood_medium_green.png b/mods/coloredwood/textures/coloredwood_wood_medium_green.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_wood_medium_green_s50.png b/mods/coloredwood/textures/coloredwood_wood_medium_green_s50.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_wood_medium_lime.png b/mods/coloredwood/textures/coloredwood_wood_medium_lime.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_wood_medium_lime_s50.png b/mods/coloredwood/textures/coloredwood_wood_medium_lime_s50.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_wood_medium_magenta.png b/mods/coloredwood/textures/coloredwood_wood_medium_magenta.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_wood_medium_magenta_s50.png b/mods/coloredwood/textures/coloredwood_wood_medium_magenta_s50.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_wood_medium_orange.png b/mods/coloredwood/textures/coloredwood_wood_medium_orange.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_wood_medium_orange_s50.png b/mods/coloredwood/textures/coloredwood_wood_medium_orange_s50.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_wood_medium_red.png b/mods/coloredwood/textures/coloredwood_wood_medium_red.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_wood_medium_red_s50.png b/mods/coloredwood/textures/coloredwood_wood_medium_red_s50.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_wood_medium_redviolet.png b/mods/coloredwood/textures/coloredwood_wood_medium_redviolet.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_wood_medium_redviolet_s50.png b/mods/coloredwood/textures/coloredwood_wood_medium_redviolet_s50.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_wood_medium_skyblue.png b/mods/coloredwood/textures/coloredwood_wood_medium_skyblue.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_wood_medium_skyblue_s50.png b/mods/coloredwood/textures/coloredwood_wood_medium_skyblue_s50.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_wood_medium_violet.png b/mods/coloredwood/textures/coloredwood_wood_medium_violet.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_wood_medium_violet_s50.png b/mods/coloredwood/textures/coloredwood_wood_medium_violet_s50.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_wood_medium_yellow.png b/mods/coloredwood/textures/coloredwood_wood_medium_yellow.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_wood_medium_yellow_s50.png b/mods/coloredwood/textures/coloredwood_wood_medium_yellow_s50.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_wood_orange.png b/mods/coloredwood/textures/coloredwood_wood_orange.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_wood_orange_s50.png b/mods/coloredwood/textures/coloredwood_wood_orange_s50.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_wood_red.png b/mods/coloredwood/textures/coloredwood_wood_red.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_wood_red_s50.png b/mods/coloredwood/textures/coloredwood_wood_red_s50.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_wood_redviolet.png b/mods/coloredwood/textures/coloredwood_wood_redviolet.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_wood_redviolet_s50.png b/mods/coloredwood/textures/coloredwood_wood_redviolet_s50.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_wood_skyblue.png b/mods/coloredwood/textures/coloredwood_wood_skyblue.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_wood_skyblue_s50.png b/mods/coloredwood/textures/coloredwood_wood_skyblue_s50.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_wood_violet.png b/mods/coloredwood/textures/coloredwood_wood_violet.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_wood_violet_s50.png b/mods/coloredwood/textures/coloredwood_wood_violet_s50.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_wood_white.png b/mods/coloredwood/textures/coloredwood_wood_white.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_wood_yellow.png b/mods/coloredwood/textures/coloredwood_wood_yellow.png old mode 100644 new mode 100755 diff --git a/mods/coloredwood/textures/coloredwood_wood_yellow_s50.png b/mods/coloredwood/textures/coloredwood_wood_yellow_s50.png old mode 100644 new mode 100755 diff --git a/mods/colouredstonebricks/init.lua b/mods/colouredstonebricks/init.lua index e9cb82f7..d686490a 100755 --- a/mods/colouredstonebricks/init.lua +++ b/mods/colouredstonebricks/init.lua @@ -75,4 +75,4 @@ minetest.register_alias("dye:dark_blue","dye:blue") minetest.register_alias("dye:dark_pink","dye:magenta") minetest.register_alias("dye:purple","dye:violet") -print ("Coloured Stone Bricks [colouredstonebricks] has loaded!") +minetest.log ("action", "Coloured Stone Bricks [colouredstonebricks] has loaded!") diff --git a/mods/compassgps/README.md b/mods/compassgps/README.md old mode 100644 new mode 100755 diff --git a/mods/compassgps/README.txt b/mods/compassgps/README.txt old mode 100644 new mode 100755 diff --git a/mods/compassgps/cgpsmap.lua b/mods/compassgps/cgpsmap.lua old mode 100644 new mode 100755 diff --git a/mods/compassgps/depends.txt b/mods/compassgps/depends.txt old mode 100644 new mode 100755 diff --git a/mods/compassgps/init.lua b/mods/compassgps/init.lua old mode 100644 new mode 100755 index 09e2525b..2e1d52e3 --- a/mods/compassgps/init.lua +++ b/mods/compassgps/init.lua @@ -61,7 +61,7 @@ local default_bookmark = {} local backwardscompatsave = "NO" -print(S("compassgps reading bookmarks")) +minetest.log("action", S("compassgps reading bookmarks")) local file = io.open(minetest.get_worldpath().."/bookmarks", "r") if file then bookmarks = minetest.deserialize(file:read("*all")) @@ -127,7 +127,7 @@ end --distance3d -- ********************************************************** -print(S("compassgps reading settings")) +minetest.log("action", S("compassgps reading settings")) if minetest.is_singleplayer() and show_shared_on_singleplayer==false then singleplayer=true else @@ -570,7 +570,7 @@ end --write_bookmarks function compassgps.write_settings() --loop through players and set settings --(less error prone than trying to keep settings in sync all the time - print(S("compassgps writing settings")) + minetest.log("action", S("compassgps writing settings")) local players = minetest.get_connected_players() for i,player in ipairs(players) do local name = player:get_player_name(); diff --git a/mods/compassgps/locale/de.txt b/mods/compassgps/locale/de.txt old mode 100644 new mode 100755 diff --git a/mods/compassgps/locale/template.txt b/mods/compassgps/locale/template.txt old mode 100644 new mode 100755 diff --git a/mods/compassgps/textures/cgpsmap-blank.png b/mods/compassgps/textures/cgpsmap-blank.png old mode 100644 new mode 100755 diff --git a/mods/compassgps/textures/cgpsmap-marked.png b/mods/compassgps/textures/cgpsmap-marked.png old mode 100644 new mode 100755 diff --git a/mods/compassgps/textures/compass_0.png b/mods/compassgps/textures/compass_0.png old mode 100644 new mode 100755 diff --git a/mods/compassgps/textures/compass_1.png b/mods/compassgps/textures/compass_1.png old mode 100644 new mode 100755 diff --git a/mods/compassgps/textures/compass_10.png b/mods/compassgps/textures/compass_10.png old mode 100644 new mode 100755 diff --git a/mods/compassgps/textures/compass_11.png b/mods/compassgps/textures/compass_11.png old mode 100644 new mode 100755 diff --git a/mods/compassgps/textures/compass_2.png b/mods/compassgps/textures/compass_2.png old mode 100644 new mode 100755 diff --git a/mods/compassgps/textures/compass_3.png b/mods/compassgps/textures/compass_3.png old mode 100644 new mode 100755 diff --git a/mods/compassgps/textures/compass_4.png b/mods/compassgps/textures/compass_4.png old mode 100644 new mode 100755 diff --git a/mods/compassgps/textures/compass_5.png b/mods/compassgps/textures/compass_5.png old mode 100644 new mode 100755 diff --git a/mods/compassgps/textures/compass_6.png b/mods/compassgps/textures/compass_6.png old mode 100644 new mode 100755 diff --git a/mods/compassgps/textures/compass_7.png b/mods/compassgps/textures/compass_7.png old mode 100644 new mode 100755 diff --git a/mods/compassgps/textures/compass_8.png b/mods/compassgps/textures/compass_8.png old mode 100644 new mode 100755 diff --git a/mods/compassgps/textures/compass_9.png b/mods/compassgps/textures/compass_9.png old mode 100644 new mode 100755 diff --git a/mods/compassgps/textures/compass_b0.png b/mods/compassgps/textures/compass_b0.png old mode 100644 new mode 100755 diff --git a/mods/compassgps/textures/compass_b1.png b/mods/compassgps/textures/compass_b1.png old mode 100644 new mode 100755 diff --git a/mods/compassgps/textures/compass_b10.png b/mods/compassgps/textures/compass_b10.png old mode 100644 new mode 100755 diff --git a/mods/compassgps/textures/compass_b11.png b/mods/compassgps/textures/compass_b11.png old mode 100644 new mode 100755 diff --git a/mods/compassgps/textures/compass_b2.png b/mods/compassgps/textures/compass_b2.png old mode 100644 new mode 100755 diff --git a/mods/compassgps/textures/compass_b3.png b/mods/compassgps/textures/compass_b3.png old mode 100644 new mode 100755 diff --git a/mods/compassgps/textures/compass_b4.png b/mods/compassgps/textures/compass_b4.png old mode 100644 new mode 100755 diff --git a/mods/compassgps/textures/compass_b5.png b/mods/compassgps/textures/compass_b5.png old mode 100644 new mode 100755 diff --git a/mods/compassgps/textures/compass_b6.png b/mods/compassgps/textures/compass_b6.png old mode 100644 new mode 100755 diff --git a/mods/compassgps/textures/compass_b7.png b/mods/compassgps/textures/compass_b7.png old mode 100644 new mode 100755 diff --git a/mods/compassgps/textures/compass_b8.png b/mods/compassgps/textures/compass_b8.png old mode 100644 new mode 100755 diff --git a/mods/compassgps/textures/compass_b9.png b/mods/compassgps/textures/compass_b9.png old mode 100644 new mode 100755 diff --git a/mods/compassgps/textures/compass_c0.png b/mods/compassgps/textures/compass_c0.png old mode 100644 new mode 100755 diff --git a/mods/compassgps/textures/compass_c1.png b/mods/compassgps/textures/compass_c1.png old mode 100644 new mode 100755 diff --git a/mods/compassgps/textures/compass_c10.png b/mods/compassgps/textures/compass_c10.png old mode 100644 new mode 100755 diff --git a/mods/compassgps/textures/compass_c11.png b/mods/compassgps/textures/compass_c11.png old mode 100644 new mode 100755 diff --git a/mods/compassgps/textures/compass_c2.png b/mods/compassgps/textures/compass_c2.png old mode 100644 new mode 100755 diff --git a/mods/compassgps/textures/compass_c3.png b/mods/compassgps/textures/compass_c3.png old mode 100644 new mode 100755 diff --git a/mods/compassgps/textures/compass_c4.png b/mods/compassgps/textures/compass_c4.png old mode 100644 new mode 100755 diff --git a/mods/compassgps/textures/compass_c5.png b/mods/compassgps/textures/compass_c5.png old mode 100644 new mode 100755 diff --git a/mods/compassgps/textures/compass_c6.png b/mods/compassgps/textures/compass_c6.png old mode 100644 new mode 100755 diff --git a/mods/compassgps/textures/compass_c7.png b/mods/compassgps/textures/compass_c7.png old mode 100644 new mode 100755 diff --git a/mods/compassgps/textures/compass_c8.png b/mods/compassgps/textures/compass_c8.png old mode 100644 new mode 100755 diff --git a/mods/compassgps/textures/compass_c9.png b/mods/compassgps/textures/compass_c9.png old mode 100644 new mode 100755 diff --git a/mods/connected_chests/README.txt b/mods/connected_chests/README.txt old mode 100644 new mode 100755 diff --git a/mods/connected_chests/depends.txt b/mods/connected_chests/depends.txt old mode 100644 new mode 100755 diff --git a/mods/connected_chests/init.lua b/mods/connected_chests/init.lua old mode 100644 new mode 100755 diff --git a/mods/connected_chests/textures/connected_chests_frame.png b/mods/connected_chests/textures/connected_chests_frame.png old mode 100644 new mode 100755 diff --git a/mods/connected_chests/textures/connected_chests_front.png b/mods/connected_chests/textures/connected_chests_front.png old mode 100644 new mode 100755 diff --git a/mods/connected_chests/textures/connected_chests_lock.png b/mods/connected_chests/textures/connected_chests_lock.png old mode 100644 new mode 100755 diff --git a/mods/connected_chests/textures/connected_chests_side.png b/mods/connected_chests/textures/connected_chests_side.png old mode 100644 new mode 100755 diff --git a/mods/connected_chests/textures/connected_chests_top.png b/mods/connected_chests/textures/connected_chests_top.png old mode 100644 new mode 100755 diff --git a/mods/darkage/init.lua b/mods/darkage/init.lua index be2ba198..63b5330b 100755 --- a/mods/darkage/init.lua +++ b/mods/darkage/init.lua @@ -13,4 +13,4 @@ dofile(minetest.get_modpath("darkage").."/aliases.lua") -- Config -- -print ("Darkage [darkage] has loaded!") \ No newline at end of file +minetest.log ("Darkage [darkage] has loaded!") diff --git a/mods/death_messages/init.lua b/mods/death_messages/init.lua index 24094725..1f539233 100755 --- a/mods/death_messages/init.lua +++ b/mods/death_messages/init.lua @@ -21,7 +21,8 @@ messages.lava = { " s'est sentit oblige de toucher la lave.", " est tombe dans la lave.", " est mort(e) dans de la lave.", - " ne savait pas que la lave etait vraiment chaude." + " ne savait pas que la lave etait vraiment chaude.", + " a detruit l'anneau de Sauron." } -- Drowning death messages @@ -30,7 +31,9 @@ messages.water = { " a essaye d'usurper l'identite d'une ancre.", " a oublie qu'il n'etait pas un poisson.", " a oublier qu'il lui fallait respirer sous l'eau.", - " n'est pas bon en natation." + " n'est pas bon en natation.", + " a cherche le secret de la licorne.", + " a oublie son scaphandre." } -- Burning death messages @@ -39,7 +42,8 @@ messages.fire = { " a ete trop pres du feu.", " vient de se faire rotir.", " a ete carbonise.", - " s'est prit pour torch man. (des quatres fantastiques)" + " s'est prit pour la torche.", + " a allume le feu." } -- Acid death messages @@ -48,7 +52,18 @@ messages.acid = { " a decouvert que l'acide c'est fun.", " a mis sa tete la ou elle a fondu.", " a decouvert que son corps dans l'acide, c'est comme du sucre dans de l'eau.", - " a cru qu'il se baignait dans du jus de pomme." + " a cru qu'il se baignait dans du jus de pomme.", + " a donne son corps pour faire une infusion.", + " a bu la mauvaise tasse.", + " a voulu tester la solubilite de son corps dans l'acide." +} + +-- Quicksands death messages +messages.sand = { + " a appris que le sable etait moins fluide que l'eau.", + " a rejoint les momies.", + " s'est fait(e) ensevelir.", + " a choisi la voie de la fossilisation." } -- Other death messages @@ -57,7 +72,8 @@ messages.other = { " est mort(e).", " n'est plus de ce monde.", " a rejoint le paradis des mineurs.", - " a perdu la vie." + " a perdu la vie.", + " a vu la lumière." } @@ -84,11 +100,14 @@ if RANDOM_MESSAGES == true then elseif node.groups.acid ~= nil then minetest.chat_send_all(player_name .. messages.acid[math.random(1,#messages.acid)] ) -- Death by drowning - elseif player:get_breath() == 0 then + elseif player:get_breath() == 0 and node.groups.water then minetest.chat_send_all(player_name .. messages.water[math.random(1,#messages.water)] ) -- Death by fire elseif node.name == "fire:basic_flame" then minetest.chat_send_all(player_name .. messages.fire[math.random(1,#messages.fire)] ) + -- Death in quicksand + elseif player:get_breath() == 0 and node.name == "default:sand_source" or node.name == "default:sand_flowing" then + minetest.chat_send_all(player_name .. messages.sand[math.random(1,#messages.sand)] ) -- Death by something else else minetest.chat_send_all(player_name .. messages.other[math.random(1,#messages.other)] ) @@ -123,5 +142,5 @@ else end ----------------------------------------------------------------------------------------------- -print("[Mod] "..title.." ["..version.."] ["..mname.."] Loaded...") +minetest.log("action", "[Mod] "..title.." ["..version.."] ["..mname.."] Loaded...") ----------------------------------------------------------------------------------------------- diff --git a/mods/death_messages/sounds/death_messages_people_1.ogg b/mods/death_messages/sounds/death_messages_people_1.ogg old mode 100644 new mode 100755 diff --git a/mods/death_messages/sounds/death_messages_player_1.ogg b/mods/death_messages/sounds/death_messages_player_1.ogg old mode 100644 new mode 100755 diff --git a/mods/dumpnodes/init.lua b/mods/dumpnodes/init.lua old mode 100644 new mode 100755 diff --git a/mods/eventobjects/README.md b/mods/eventobjects/README.md old mode 100644 new mode 100755 diff --git a/mods/eventobjects/depends.txt b/mods/eventobjects/depends.txt old mode 100644 new mode 100755 diff --git a/mods/eventobjects/init.lua b/mods/eventobjects/init.lua old mode 100644 new mode 100755 diff --git a/mods/eventobjects/textures/eventobjects_spleef_shovel.png b/mods/eventobjects/textures/eventobjects_spleef_shovel.png old mode 100644 new mode 100755 diff --git a/mods/eventobjects/textures/eventobjects_surprise_node.png b/mods/eventobjects/textures/eventobjects_surprise_node.png old mode 100644 new mode 100755 diff --git a/mods/eventobjects/textures/eventobjects_surprise_node_animated.png b/mods/eventobjects/textures/eventobjects_surprise_node_animated.png old mode 100644 new mode 100755 diff --git a/mods/eventobjects/textures/eventobjects_surprise_node_top.png b/mods/eventobjects/textures/eventobjects_surprise_node_top.png old mode 100644 new mode 100755 diff --git a/mods/fail/README.md b/mods/fail/README.md old mode 100644 new mode 100755 diff --git a/mods/fail/cookie.lua b/mods/fail/cookie.lua old mode 100644 new mode 100755 diff --git a/mods/fail/init.lua b/mods/fail/init.lua old mode 100644 new mode 100755 diff --git a/mods/fail/sounds/cookie.ogg b/mods/fail/sounds/cookie.ogg old mode 100644 new mode 100755 diff --git a/mods/fail/sounds/failpoint.ogg b/mods/fail/sounds/failpoint.ogg old mode 100644 new mode 100755 diff --git a/mods/farming/README.txt b/mods/farming/README.txt index aa7b320e..d10ad538 100755 --- a/mods/farming/README.txt +++ b/mods/farming/README.txt @@ -13,6 +13,7 @@ This mod works by adding your new plant to the {growing=1} group and numbering t Changelog: +1.20 - NEW growing routine added that allows crops to grow while player is away doing other things (thanks prestidigitator) 1.14 - Added Green Beans from Crops mod (thanks sofar), little bushels in the wild but need to be grown using beanpoles crafted with 4 sticks (2 either side) 1.13 - Fixed seed double-placement glitch. Mapgen now uses 0.4.12+ for plant generation 1.12 - Player cannot place seeds in protected area, also growing speeds changed to match defaults diff --git a/mods/farming/beanpole.lua b/mods/farming/beanpole.lua old mode 100644 new mode 100755 index 0387fa04..895b6fa3 --- a/mods/farming/beanpole.lua +++ b/mods/farming/beanpole.lua @@ -65,7 +65,7 @@ minetest.register_craft({ } }) --- Define Corn growth stages +-- Define Green Bean growth stages minetest.register_node("farming:beanpole_1", { drawtype = "plantlike", @@ -140,7 +140,7 @@ minetest.register_node("farming:beanpole_4", { sounds = default.node_sound_leaves_defaults(), }) --- Last stage of Corn growth doesnnot have growing=1 so abm never has to check these +-- Last stage of Green Bean growth does not have growing=1 so abm never has to check these minetest.register_node("farming:beanpole_5", { drawtype = "plantlike", diff --git a/mods/farming/cocoa.lua b/mods/farming/cocoa.lua index 6fbdd49e..50dc0bec 100755 --- a/mods/farming/cocoa.lua +++ b/mods/farming/cocoa.lua @@ -66,7 +66,7 @@ minetest.register_craft( { minetest.register_craftitem("farming:chocolate_dark", { description = "Bar of Dark Chocolate", inventory_image = "farming_chocolate_dark.png", - on_use = minetest.item_eat(2), + on_use = minetest.item_eat(2), --/MFF (Mg|05/26/2015) }) minetest.register_craft( { diff --git a/mods/farming/cotton.lua b/mods/farming/cotton.lua index 8be0f90a..ebb3d658 100755 --- a/mods/farming/cotton.lua +++ b/mods/farming/cotton.lua @@ -42,6 +42,7 @@ minetest.register_craft({ {"farming:string", "farming:string", "farming:string"}, {"farming:string", "farming:string", "farming:string"}, {"farming:string", "farming:string", "farming:string"}, + -- ^ /MFF (Mg|05/26/2015) } }) diff --git a/mods/farming/init.lua b/mods/farming/init.lua index aee9976f..94e9832e 100755 --- a/mods/farming/init.lua +++ b/mods/farming/init.lua @@ -1,6 +1,7 @@ --[[ - Minetest Farming Redo Mod 1.14 (11th May 2015) + Minetest Farming Redo Mod 1.20 (20th May 2015) by TenPlus1 + NEW growing routine by prestidigitator ]] farming = {} @@ -8,6 +9,39 @@ farming.mod = "redo" farming.path = minetest.get_modpath("farming") farming.hoe_on_use = default.hoe_on_use +farming.DEBUG = false +-- farming.DEBUG = {} -- Uncomment to turn on profiling code/functions + +local DEBUG_abm_runs = 0 +local DEBUG_abm_time = 0 +local DEBUG_timer_runs = 0 +local DEBUG_timer_time = 0 +if farming.DEBUG then + function farming.DEBUG.reset_times() + DEBUG_abm_runs = 0 + DEBUG_abm_time = 0 + DEBUG_timer_runs = 0 + DEBUG_timer_time = 0 + end + + function farming.DEBUG.report_times() + local abm_n = DEBUG_abm_runs + local abm_dt = DEBUG_abm_time + local abm_avg = (abm_n > 0 and abm_dt / abm_n) or 0 + local timer_n = DEBUG_timer_runs + local timer_dt = DEBUG_timer_time + local timer_avg = (timer_n > 0 and timer_dt / timer_n) or 0 + local dt = abm_dt + timer_dt + print("ABM ran for "..abm_dt.."µs over "..abm_n.." runs: ".. + abm_avg.."µs/run") + print("Timer ran for "..timer_dt.."µs over "..timer_n.." runs: ".. + timer_avg.."µs/run") + print("Total farming time: "..dt.."µs") + end +else +end + +local statistics = dofile(farming.path.."/statistics.lua") dofile(farming.path.."/soil.lua") dofile(farming.path.."/hoes.lua") dofile(farming.path.."/grass.lua") @@ -31,6 +65,319 @@ dofile(farming.path.."/donut.lua") dofile(farming.path.."/mapgen.lua") dofile(farming.path.."/compatibility.lua") -- Farming Plus compatibility +-- Utility Functions + +local time_speed = tonumber(minetest.setting_get("time_speed")) or 72 +local SECS_PER_CYCLE = (time_speed > 0 and 24 * 60 * 60/time_speed) or nil + +local function clamp(x, min, max) + return (x < min and min) or (x > max and max) or x +end + +local function in_range(x, min, max) + return min <= x and x <= max +end + +--- Tests the amount of day or night time between two times. + -- + -- @param t_game + -- The current time, as reported by mintest.get_gametime(). + -- @param t_day + -- The current time, as reported by mintest.get_timeofday(). + -- @param dt + -- The amount of elapsed time. + -- @param count_day + -- If true, count elapsed day time. Otherwise, count elapsed night time. + -- @return + -- The amount of day or night time that has elapsed. + -- +local function day_or_night_time(t_game, t_day, dt, count_day) + local t1_day = t_day - dt / SECS_PER_CYCLE + + local t1_c, t2_c -- t1_c < t2_c and t2_c always in [0, 1) + if count_day then + if t_day < 0.25 then + t1_c = t1_day + 0.75 -- Relative to sunup, yesterday + t2_c = t_day + 0.75 + else + t1_c = t1_day - 0.25 -- Relative to sunup, today + t2_c = t_day - 0.25 + end + else + if t_day < 0.75 then + t1_c = t1_day + 0.25 -- Relative to sundown, yesterday + t2_c = t_day + 0.25 + else + t1_c = t1_day - 0.75 -- Relative to sundown, today + t2_c = t_day - 0.75 + end + end + + local dt_c = clamp(t2_c, 0, 0.5) - clamp(t1_c, 0, 0.5) -- this cycle + if t1_c < -0.5 then + local nc = math.floor(-t1_c) + t1_c = t1_c + nc + dt_c = dt_c + 0.5 * nc + clamp(-t1_c - 0.5, 0, 0.5) + end + + return dt_c * SECS_PER_CYCLE +end + +--- Tests the amount of elapsed day time. + -- + -- @param dt + -- The amount of elapsed time. + -- @return + -- The amount of day time that has elapsed. + -- +local function day_time(dt) + return day_or_night_time(minetest.get_gametime(), minetest.get_timeofday(), dt, true) +end + +--- Tests the amount of elapsed night time. + -- + -- @param dt + -- The amount of elapsed time. + -- @return + -- The amount of night time that has elapsed. + -- +local function night_time(time_game, time_day, dt, count_day) + return day_or_night_time(minetest.get_gametime(), minetest.get_timeofday(), dt, false) +end + + +-- Growth Logic + +local STAGE_LENGTH_AVG = 160.0 +local STAGE_LENGTH_DEV = STAGE_LENGTH_AVG / 6 +local MIN_LIGHT = 13 +local MAX_LIGHT = 1000 + +--- Determines plant name and stage from node. + -- + -- Separates node name on the last underscore (_). + -- + -- @param node + -- Node or position table, or node name. + -- @return + -- List (plant_name, stage), or nothing (nil) if node isn't loaded + -- +local function plant_name_stage(node) + local name + if type(node) == 'table' then + if node.name then + name = node.name + elseif node.x and node.y and node.z then + node = minetest.get_node_or_nil(node) + name = node and node.name + end + else + name = tostring(node) + end + if not name or name == "ignore" then return nil end + + local sep_pos = name:find("_[^_]+$") + if sep_pos and sep_pos > 1 then + local stage = tonumber(name:sub(sep_pos + 1)) + if stage and stage >= 0 then + return name:sub(1, sep_pos - 1), stage + end + end + + return name, 0 +end + +--- Map from node name to + -- { plant_name = ..., name = ..., stage = n, stages_left = { node_name, ... } } +local plant_stages = {} +farming.plant_stages = plant_stages + +--- Registers the stages of growth of a (possible plant) node. + -- + -- @param node + -- Node or position table, or node name. + -- @return + -- The (possibly zero) number of stages of growth the plant will go through + -- before being fully grown, or nil if not a plant. + -- +local register_plant_node +-- Recursive helper +local function reg_plant_stages(plant_name, stage, force_last) + local node_name = plant_name and plant_name .. "_" .. stage + local node_def = node_name and minetest.registered_nodes[node_name] + if not node_def then return nil end + + local stages = plant_stages[node_name] + if stages then return stages end + + if minetest.get_item_group(node_name, "growing") > 0 then + local ns = reg_plant_stages(plant_name, stage + 1, true) + + local stages_left = (ns and { ns.name, unpack(ns.stages_left) }) or {} + stages = { plant_name = plant_name, name = node_name, stage = stage, stages_left = stages_left } + + if #stages_left > 0 then + local old_constr = node_def.on_construct + local old_destr = node_def.on_destruct + minetest.override_item(node_name, + { + on_construct = function(pos) + if old_constr then old_constr(pos) end + farming.handle_growth(pos) + end, + + on_destruct = function(pos) + minetest.get_node_timer(pos):stop() + if old_destr then old_destr(pos) end + end, + + on_timer = function(pos, elapsed) + return farming.plant_growth_timer(pos, elapsed, node_name) + end, + }) + end + elseif force_last then + stages = { plant_name = plant_name, name = node_name, stage = stage, stages_left = {} } + else + return nil + end + + plant_stages[node_name] = stages + return stages +end + +register_plant_node = function(node) + local plant_name, stage = plant_name_stage(node) + if plant_name then + local stages = reg_plant_stages(plant_name, stage, false) + return stages and #stages.stages_left + else + return nil + end +end + +local function set_growing(pos, stages_left) + if not stages_left then return end + + local timer = minetest.get_node_timer(pos) + if stages_left > 0 then + if not timer:is_started() then + local stage_length = statistics.normal(STAGE_LENGTH_AVG, STAGE_LENGTH_DEV) + stage_length = clamp(stage_length, 0.5 * STAGE_LENGTH_AVG, 3.0 * STAGE_LENGTH_AVG) + timer:set(stage_length, -0.5 * math.random() * STAGE_LENGTH_AVG) + end + elseif timer:is_started() then + timer:stop() + end +end + +--- Detects a plant type node at the given position, starting or stopping the plant growth timer as appopriate + -- + -- @param pos + -- The node's position. + -- @param node + -- The cached node table if available, or nil. + -- +function farming.handle_growth(pos, node) + if not pos then return end + local stages_left = register_plant_node(node or pos) + if stages_left then set_growing(pos, stages_left) end +end + +minetest.after(0, + function() + for _, node_def in pairs(minetest.registered_nodes) do + register_plant_node(node_def) + end + end) + +local abm_func = farming.handle_growth +if farming.DEBUG then + local normal_abm_func = abm_func + abm_func = function(...) + local t0 = minetest.get_us_time() + local r = { normal_abm_func(...) } + local t1 = minetest.get_us_time() + DEBUG_abm_runs = DEBUG_abm_runs + 1 + DEBUG_abm_time = DEBUG_abm_time + (t1 - t0) + return unpack(r) + end +end + +-- Just in case a growing type or added node is missed (also catches existing +-- nodes added to map before timers were incorporated). +minetest.register_abm({ + nodenames = { "group:growing" }, + interval = 300, + chance = 1, + action = abm_func}) + +--- Plant timer function. + -- + -- Grows plants under the right conditions. + -- +function farming.plant_growth_timer(pos, elapsed, node_name) + local stages = plant_stages[node_name] + if not stages then return false end + + local max_growth = #stages.stages_left + if max_growth <= 0 then return false end + + if stages.plant_name == "farming:cocoa" then + if not minetest.find_node_near(pos, 1, { "default:jungletree", "moretrees:jungletree_leaves_green" }) then + return true + end + else + local under = minetest.get_node_or_nil({ x = pos.x, y = pos.y - 1, z = pos.z }) + if not under or under.name ~= "farming:soil_wet" then return true end + end + + local growth + + local light_pos = { x = pos.x, y = pos.y + 1, z = pos.z } + local lambda = elapsed / STAGE_LENGTH_AVG + if lambda < 0.1 then return true end + if max_growth == 1 or lambda < 2.0 then + local light = (minetest.get_node_light(light_pos) or 0) -- CHANGED + if not in_range(light, MIN_LIGHT, MAX_LIGHT) then return true end + growth = 1 + else + local night_light = (minetest.get_node_light(light_pos, 0) or 0) -- CHANGED + local day_light = (minetest.get_node_light(light_pos, 0.5) or 0) -- ChANGED + local night_growth = in_range(night_light, MIN_LIGHT, MAX_LIGHT) + local day_growth = in_range(day_light, MIN_LIGHT, MAX_LIGHT) + + if not night_growth then + if not day_growth then return true end + lambda = day_time(elapsed) / STAGE_LENGTH_AVG + elseif not day_growth then + lambda = night_time(elapsed) / STAGE_LENGTH_AVG + end + + growth = statistics.poisson(lambda, max_growth) + if growth < 1 then return true end + end + + minetest.swap_node(pos, { name = stages.stages_left[growth] }) + + return growth ~= max_growth +end + +if farming.DEBUG then + local timer_func = farming.plant_growth_timer; + farming.plant_growth_timer = function(pos, elapsed, node_name) + local t0 = minetest.get_us_time() + + local r = { timer_func(pos, elapsed, node_name) } + + local t1 = minetest.get_us_time() + DEBUG_timer_runs = DEBUG_timer_runs + 1 + DEBUG_timer_time = DEBUG_timer_time + (t1 - t0) + return unpack(r) + end +end + + -- Place Seeds on Soil function farming.place_seed(itemstack, placer, pointed_thing, plantname) @@ -72,38 +419,6 @@ function farming.place_seed(itemstack, placer, pointed_thing, plantname) end end --- Single ABM Handles Growing of All Plants - -minetest.register_abm({ - nodenames = {"group:growing"}, - neighbors = {"farming:soil_wet", "default:jungletree"}, - interval = 80, - chance = 2, - - action = function(pos, node) - - -- split plant name (e.g. farming:wheat_1) - local plant = node.name:split("_")[1].."_" - local numb = node.name:split("_")[2] - - -- fully grown ? - if not minetest.registered_nodes[plant..(numb + 1)] then return end - - -- cocoa pod on jungle tree ? - if plant ~= "farming:cocoa_" then - - -- growing on wet soil ? - if minetest.get_node({x=pos.x,y=pos.y-1,z=pos.z}).name ~= "farming:soil_wet" then return end - end - - -- enough light ? - if minetest.get_node_light(pos) < 13 then return end - - -- grow - minetest.set_node(pos, {name=plant..(numb + 1)}) - - end -}) -- Function to register plants (for compatibility) @@ -163,7 +478,8 @@ farming.register_plant = function(name, def) g = {snappy = 3, flammable = 2, plant = 1, not_in_creative_inventory = 1, attached_node = 1} end - minetest.register_node(mname .. ":" .. pname .. "_" .. i, { + local node_name = mname .. ":" .. pname .. "_" .. i + minetest.register_node(node_name, { drawtype = "plantlike", waving = 1, tiles = {mname .. "_" .. pname .. "_" .. i .. ".png"}, @@ -176,6 +492,7 @@ farming.register_plant = function(name, def) groups = g, sounds = default.node_sound_leaves_defaults(), }) + register_plant_node(node_name) end -- Return info diff --git a/mods/farming/init.lua_orig b/mods/farming/init.lua_orig new file mode 100755 index 00000000..aee9976f --- /dev/null +++ b/mods/farming/init.lua_orig @@ -0,0 +1,192 @@ +--[[ + Minetest Farming Redo Mod 1.14 (11th May 2015) + by TenPlus1 +]] + +farming = {} +farming.mod = "redo" +farming.path = minetest.get_modpath("farming") +farming.hoe_on_use = default.hoe_on_use + +dofile(farming.path.."/soil.lua") +dofile(farming.path.."/hoes.lua") +dofile(farming.path.."/grass.lua") +dofile(farming.path.."/wheat.lua") +dofile(farming.path.."/cotton.lua") +dofile(farming.path.."/carrot.lua") +dofile(farming.path.."/potato.lua") +dofile(farming.path.."/tomato.lua") +dofile(farming.path.."/cucumber.lua") +dofile(farming.path.."/corn.lua") +dofile(farming.path.."/coffee.lua") +dofile(farming.path.."/melon.lua") +dofile(farming.path.."/sugar.lua") +dofile(farming.path.."/pumpkin.lua") +dofile(farming.path.."/cocoa.lua") +dofile(farming.path.."/raspberry.lua") +dofile(farming.path.."/blueberry.lua") +dofile(farming.path.."/rhubarb.lua") +dofile(farming.path.."/beanpole.lua") +dofile(farming.path.."/donut.lua") +dofile(farming.path.."/mapgen.lua") +dofile(farming.path.."/compatibility.lua") -- Farming Plus compatibility + +-- Place Seeds on Soil + +function farming.place_seed(itemstack, placer, pointed_thing, plantname) + local pt = pointed_thing + + -- check if pointing at a node + if not pt and pt.type ~= "node" then + return + end + + local under = minetest.get_node(pt.under) + local above = minetest.get_node(pt.above) + + -- check if pointing at the top of the node + if pt.above.y ~= pt.under.y+1 then + return + end + + -- return if any of the nodes is not registered + if not minetest.registered_nodes[under.name] + or not minetest.registered_nodes[above.name] then + return + end + + -- can I replace above node, and am I pointing at soil + if not minetest.registered_nodes[above.name].buildable_to + or minetest.get_item_group(under.name, "soil") < 2 + or minetest.get_item_group(above.name, "plant") ~= 0 then -- ADDED this line for multiple seed placement bug + return + end + + -- add the node and remove 1 item from the itemstack + if not minetest.is_protected(pt.above, placer:get_player_name()) then + minetest.add_node(pt.above, {name=plantname}) + if not minetest.setting_getbool("creative_mode") then + itemstack:take_item() + end + return itemstack + end +end + +-- Single ABM Handles Growing of All Plants + +minetest.register_abm({ + nodenames = {"group:growing"}, + neighbors = {"farming:soil_wet", "default:jungletree"}, + interval = 80, + chance = 2, + + action = function(pos, node) + + -- split plant name (e.g. farming:wheat_1) + local plant = node.name:split("_")[1].."_" + local numb = node.name:split("_")[2] + + -- fully grown ? + if not minetest.registered_nodes[plant..(numb + 1)] then return end + + -- cocoa pod on jungle tree ? + if plant ~= "farming:cocoa_" then + + -- growing on wet soil ? + if minetest.get_node({x=pos.x,y=pos.y-1,z=pos.z}).name ~= "farming:soil_wet" then return end + end + + -- enough light ? + if minetest.get_node_light(pos) < 13 then return end + + -- grow + minetest.set_node(pos, {name=plant..(numb + 1)}) + + end +}) + +-- Function to register plants (for compatibility) + +farming.register_plant = function(name, def) + local mname = name:split(":")[1] + local pname = name:split(":")[2] + + -- Check def table + if not def.description then + def.description = "Seed" + end + if not def.inventory_image then + def.inventory_image = "unknown_item.png" + end + if not def.steps then + return nil + end + + -- Register seed + minetest.register_node(":" .. mname .. ":seed_" .. pname, { + description = def.description, + tiles = {def.inventory_image}, + inventory_image = def.inventory_image, + wield_image = def.inventory_image, + drawtype = "signlike", + groups = {seed = 1, snappy = 3, attached_node = 1}, + paramtype = "light", + paramtype2 = "wallmounted", + walkable = false, + sunlight_propagates = true, + selection_box = {type = "fixed", fixed = {-0.5, -0.5, -0.5, 0.5, -5/16, 0.5},}, + on_place = function(itemstack, placer, pointed_thing) + return farming.place_seed(itemstack, placer, pointed_thing, mname .. ":"..pname.."_1") + end + }) + + -- Register harvest + minetest.register_craftitem(":" .. mname .. ":" .. pname, { + description = pname:gsub("^%l", string.upper), + inventory_image = mname .. "_" .. pname .. ".png", + }) + + -- Register growing steps + for i=1,def.steps do + local drop = { + items = { + {items = {mname .. ":" .. pname}, rarity = 9 - i}, + {items = {mname .. ":" .. pname}, rarity= 18 - i * 2}, + {items = {mname .. ":seed_" .. pname}, rarity = 9 - i}, + {items = {mname .. ":seed_" .. pname}, rarity = 18 - i * 2}, + } + } + + local g = {snappy = 3, flammable = 2, plant = 1, not_in_creative_inventory = 1, attached_node = 1, growing = 1} + -- Last step doesn't need growing=1 so Abm never has to check these + if i == def.steps then + g = {snappy = 3, flammable = 2, plant = 1, not_in_creative_inventory = 1, attached_node = 1} + end + + minetest.register_node(mname .. ":" .. pname .. "_" .. i, { + drawtype = "plantlike", + waving = 1, + tiles = {mname .. "_" .. pname .. "_" .. i .. ".png"}, + paramtype = "light", + walkable = false, + buildable_to = true, + is_ground_content = true, + drop = drop, + selection_box = {type = "fixed", fixed = {-0.5, -0.5, -0.5, 0.5, -5/16, 0.5},}, + groups = g, + sounds = default.node_sound_leaves_defaults(), + }) + end + + -- Return info + local r = {seed = mname .. ":seed_" .. pname, harvest = mname .. ":" .. pname} + return r +end + +--[[ Cotton (example, is already registered in cotton.lua) +farming.register_plant("farming:cotton", { + description = "Cotton seed", + inventory_image = "farming_cotton_seed.png", + steps = 8, +}) +--]] diff --git a/mods/farming/soil.lua b/mods/farming/soil.lua index e1863bc0..1c2c57c4 100755 --- a/mods/farming/soil.lua +++ b/mods/farming/soil.lua @@ -1,8 +1,4 @@ - ---= Soil Functions - --- Normal Soil - +-- normal soil minetest.register_node("farming:soil", { description = "Soil", tiles = {"farming_soil.png", "default_dirt.png"}, @@ -11,10 +7,11 @@ minetest.register_node("farming:soil", { groups = {crumbly=3, not_in_creative_inventory=1, soil=2}, sounds = default.node_sound_dirt_defaults(), }) + +-- sand is not soil, change existing sand-soil to use normal soil minetest.register_alias("farming:desert_sand_soil", "farming:soil") --- Wet Soil - +-- wet soil minetest.register_node("farming:soil_wet", { description = "Wet Soil", tiles = {"farming_soil_wet.png", "farming_soil_wet_side.png"}, @@ -25,23 +22,21 @@ minetest.register_node("farming:soil_wet", { }) minetest.register_alias("farming:desert_sand_soil_wet", "farming:soil_wet") --- If Water near Soil then turn into Wet Soil - +-- if water near soil then change to wet soil minetest.register_abm({ nodenames = {"farming:soil", "farming:soil_wet"}, interval = 15, chance = 4, action = function(pos, node) - pos.y = pos.y+1 - local nn = minetest.get_node(pos).name - pos.y = pos.y-1 + local nn = minetest.get_node({x=pos.x,y=pos.y+1,z=pos.z}).name -- what's on top of soil, if solid/not plant change soil to dirt if minetest.registered_nodes[nn] and minetest.registered_nodes[nn].walkable and minetest.get_item_group(nn, "plant") == 0 then minetest.set_node(pos, {name="default:dirt"}) + return end -- if map around soil not loaded then skip until loaded diff --git a/mods/farming/statistics.lua b/mods/farming/statistics.lua new file mode 100755 index 00000000..aaa4f512 --- /dev/null +++ b/mods/farming/statistics.lua @@ -0,0 +1,150 @@ +local statistics = {} + +local ROOT_2 = math.sqrt(2.0) + +-- Approximations for erf(x) and erfInv(x) from +-- https://en.wikipedia.org/wiki/Error_function +local erf +local erf_inv + +local A = 8 * (math.pi - 3.0)/(3.0 * math.pi * (4.0 - math.pi)) +local B = 4.0 / math.pi +local C = 2.0/(math.pi * A) +local D = 1.0 / A + +erf = function(x) + if x == 0 then return 0; end + local xSq = x * x + local aXSq = A * xSq + local v = math.sqrt(1.0 - math.exp(-xSq * (B + aXSq)/(1.0 + aXSq))) + return (x > 0 and v) or -v +end + +erf_inv = function(x) + if x == 0 then return 0; end + if x <= -1 or x >= 1 then return nil; end + local y = math.log(1 - x * x) + local u = C + 0.5 * y + local v = math.sqrt(math.sqrt(u * u - D * y) - u) + return (x > 0 and v) or -v +end + +local function std_normal(u) + return ROOT_2 * erf_inv(2.0 * u - 1.0) +end + +local poisson +local cdf_table = {} + +local function generate_cdf(lambda_index, lambda) + local max = math.ceil(4 * lambda) + local pdf = math.exp(-lambda) + local cdf = pdf + local t = { [0] = pdf } + + for i = 1, max - 1 do + pdf = pdf * lambda / i + cdf = cdf + pdf + t[i] = cdf + end + + return t +end + +for li = 1, 100 do + cdf_table[li] = generate_cdf(li, 0.25 * li) +end + +poisson = function(lambda, max) + if max < 2 then + return (math.random() < math.exp(-lambda) and 0) or 1 + elseif lambda >= 2 * max then + return max + end + + local u = math.random() + local lambda_index = math.floor(4 * lambda + 0.5) + local cdfs = cdf_table[lambda_index] + + if cdfs then + lambda = 0.25 * lambda_index + + if u < cdfs[0] then return 0; end + if max > #cdfs then max = #cdfs + 1 else max = math.floor(max); end + if u >= cdfs[max - 1] then return max; end + + if max > 4 then -- Binary search + local s = 0 + while s + 1 < max do + local m = math.floor(0.5 * (s + max)) + if u < cdfs[m] then max = m; else s = m; end + end + else + for i = 1, max - 1 do + if u < cdfs[i] then return i; end + end + end + + return max + else + local x = lambda + math.sqrt(lambda) * std_normal(u) + return (x < 0.5 and 0) or (x >= max - 0.5 and max) or math.floor(x + 0.5) + end +end + +-- Error function. +statistics.erf = erf + +-- Inverse error function. +statistics.erf_inv = erf_inv + +--- Standard normal distribution function (mean 0, standard deviation 1). + -- + -- @return + -- Any real number (actually between -3.0 and 3.0). + -- +statistics.std_normal = function() + local u = math.random() + if u < 0.001 then + return -3.0 + elseif u > 0.999 then + return 3.0 + end + return std_normal(u) +end + +--- Standard normal distribution function (mean 0, standard deviation 1). + -- + -- @param mu + -- The distribution mean. + -- @param sigma + -- The distribution standard deviation. + -- @return + -- Any real number (actually between -3*sigma and 3*sigma). + -- +statistics.normal = function(mu, sigma) + local u = math.random() + if u < 0.001 then + return mu - 3.0 * sigma + elseif u > 0.999 then + return mu + 3.0 * sigma + end + return mu + sigma * std_normal(u) +end + +--- Poisson distribution function. + -- + -- @param lambda + -- The distribution mean and variance. + -- @param max + -- The distribution maximum. + -- @return + -- An integer between 0 and max (both inclusive). + -- +statistics.poisson = function(lambda, max) + lambda, max = tonumber(lambda), tonumber(max) + if not lambda or not max or lambda <= 0 or max < 1 then return 0; end + return poisson(lambda, max) +end + +return statistics diff --git a/mods/farming/textures/farming_beanbush.png b/mods/farming/textures/farming_beanbush.png old mode 100644 new mode 100755 diff --git a/mods/farming/textures/farming_beanpole.png b/mods/farming/textures/farming_beanpole.png old mode 100644 new mode 100755 diff --git a/mods/farming/textures/farming_beanpole_1.png b/mods/farming/textures/farming_beanpole_1.png old mode 100644 new mode 100755 diff --git a/mods/farming/textures/farming_beanpole_2.png b/mods/farming/textures/farming_beanpole_2.png old mode 100644 new mode 100755 diff --git a/mods/farming/textures/farming_beanpole_3.png b/mods/farming/textures/farming_beanpole_3.png old mode 100644 new mode 100755 diff --git a/mods/farming/textures/farming_beanpole_4.png b/mods/farming/textures/farming_beanpole_4.png old mode 100644 new mode 100755 diff --git a/mods/farming/textures/farming_beanpole_5.png b/mods/farming/textures/farming_beanpole_5.png old mode 100644 new mode 100755 diff --git a/mods/farming/textures/farming_beans.png b/mods/farming/textures/farming_beans.png old mode 100644 new mode 100755 diff --git a/mods/fishing/bobber.lua b/mods/fishing/bobber.lua old mode 100644 new mode 100755 diff --git a/mods/fishing/bobber_shark.lua b/mods/fishing/bobber_shark.lua old mode 100644 new mode 100755 diff --git a/mods/fishing/crafting.lua b/mods/fishing/crafting.lua old mode 100644 new mode 100755 diff --git a/mods/fishing/depends.txt b/mods/fishing/depends.txt old mode 100644 new mode 100755 diff --git a/mods/fishing/fishes.lua b/mods/fishing/fishes.lua old mode 100644 new mode 100755 diff --git a/mods/fishing/init.lua b/mods/fishing/init.lua old mode 100644 new mode 100755 index 13dd5b8d..18eecf4b --- a/mods/fishing/init.lua +++ b/mods/fishing/init.lua @@ -531,5 +531,5 @@ else end ----------------------------------------------------------------------------------------------- -print("[Mod] "..title.." ["..version.."] ["..mname.."] Loaded...") +minetest.log("action", "[Mod] "..title.." ["..version.."] ["..mname.."] Loaded...") ----------------------------------------------------------------------------------------------- diff --git a/mods/fishing/locale/de.txt b/mods/fishing/locale/de.txt old mode 100644 new mode 100755 diff --git a/mods/fishing/locale/template.txt b/mods/fishing/locale/template.txt old mode 100644 new mode 100755 diff --git a/mods/fishing/settings.txt b/mods/fishing/settings.txt old mode 100644 new mode 100755 diff --git a/mods/fishing/sounds/SoundLicense.txt b/mods/fishing/sounds/SoundLicense.txt old mode 100644 new mode 100755 diff --git a/mods/fishing/sounds/fishing_bobber1.ogg b/mods/fishing/sounds/fishing_bobber1.ogg old mode 100644 new mode 100755 diff --git a/mods/fishing/sounds/fishing_bobber2.ogg b/mods/fishing/sounds/fishing_bobber2.ogg old mode 100644 new mode 100755 diff --git a/mods/fishing/textures/alternates/fishing_bobber.png b/mods/fishing/textures/alternates/fishing_bobber.png old mode 100644 new mode 100755 diff --git a/mods/fishing/textures/alternates/fishing_bobber_bottom.png b/mods/fishing/textures/alternates/fishing_bobber_bottom.png old mode 100644 new mode 100755 diff --git a/mods/fishing/textures/alternates/fishing_bobber_top.png b/mods/fishing/textures/alternates/fishing_bobber_top.png old mode 100644 new mode 100755 diff --git a/mods/fishing/textures/alternates/fishing_pole.png b/mods/fishing/textures/alternates/fishing_pole.png old mode 100644 new mode 100755 diff --git a/mods/fishing/textures/animal_clownfish_clownfish_item.png b/mods/fishing/textures/animal_clownfish_clownfish_item.png old mode 100644 new mode 100755 diff --git a/mods/fishing/textures/animal_fish_blue_white_fish_blue_white_item.png b/mods/fishing/textures/animal_fish_blue_white_fish_blue_white_item.png old mode 100644 new mode 100755 diff --git a/mods/fishing/textures/fishing_bobber.png b/mods/fishing/textures/fishing_bobber.png old mode 100644 new mode 100755 diff --git a/mods/fishing/textures/fishing_bobber_bottom.png b/mods/fishing/textures/fishing_bobber_bottom.png old mode 100644 new mode 100755 diff --git a/mods/fishing/textures/fishing_bobber_feather_1.png b/mods/fishing/textures/fishing_bobber_feather_1.png old mode 100644 new mode 100755 diff --git a/mods/fishing/textures/fishing_bobber_top.png b/mods/fishing/textures/fishing_bobber_top.png old mode 100644 new mode 100755 diff --git a/mods/fishing/textures/fishing_deco_pike.png b/mods/fishing/textures/fishing_deco_pike.png old mode 100644 new mode 100755 diff --git a/mods/fishing/textures/fishing_fish.png b/mods/fishing/textures/fishing_fish.png old mode 100644 new mode 100755 diff --git a/mods/fishing/textures/fishing_fish_cooked.png b/mods/fishing/textures/fishing_fish_cooked.png old mode 100644 new mode 100755 diff --git a/mods/fishing/textures/fishing_pike.png b/mods/fishing/textures/fishing_pike.png old mode 100644 new mode 100755 diff --git a/mods/fishing/textures/fishing_pike_cooked.png b/mods/fishing/textures/fishing_pike_cooked.png old mode 100644 new mode 100755 diff --git a/mods/fishing/textures/fishing_pole.png b/mods/fishing/textures/fishing_pole.png old mode 100644 new mode 100755 diff --git a/mods/fishing/textures/fishing_pole_back.png b/mods/fishing/textures/fishing_pole_back.png old mode 100644 new mode 100755 diff --git a/mods/fishing/textures/fishing_pole_bottom.png b/mods/fishing/textures/fishing_pole_bottom.png old mode 100644 new mode 100755 diff --git a/mods/fishing/textures/fishing_pole_deco.png b/mods/fishing/textures/fishing_pole_deco.png old mode 100644 new mode 100755 diff --git a/mods/fishing/textures/fishing_pole_front.png b/mods/fishing/textures/fishing_pole_front.png old mode 100644 new mode 100755 diff --git a/mods/fishing/textures/fishing_pole_perfect.png b/mods/fishing/textures/fishing_pole_perfect.png old mode 100644 new mode 100755 diff --git a/mods/fishing/textures/fishing_pole_perfect_back.png b/mods/fishing/textures/fishing_pole_perfect_back.png old mode 100644 new mode 100755 diff --git a/mods/fishing/textures/fishing_pole_perfect_bottom.png b/mods/fishing/textures/fishing_pole_perfect_bottom.png old mode 100644 new mode 100755 diff --git a/mods/fishing/textures/fishing_pole_perfect_front.png b/mods/fishing/textures/fishing_pole_perfect_front.png old mode 100644 new mode 100755 diff --git a/mods/fishing/textures/fishing_pole_perfect_simple.png b/mods/fishing/textures/fishing_pole_perfect_simple.png old mode 100644 new mode 100755 diff --git a/mods/fishing/textures/fishing_pole_perfect_top.png b/mods/fishing/textures/fishing_pole_perfect_top.png old mode 100644 new mode 100755 diff --git a/mods/fishing/textures/fishing_pole_simple.png b/mods/fishing/textures/fishing_pole_simple.png old mode 100644 new mode 100755 diff --git a/mods/fishing/textures/fishing_pole_top.png b/mods/fishing/textures/fishing_pole_top.png old mode 100644 new mode 100755 diff --git a/mods/fishing/textures/fishing_shark.png b/mods/fishing/textures/fishing_shark.png old mode 100644 new mode 100755 diff --git a/mods/fishing/textures/fishing_shark_cooked.png b/mods/fishing/textures/fishing_shark_cooked.png old mode 100644 new mode 100755 diff --git a/mods/fishing/textures/fishing_sushi.png b/mods/fishing/textures/fishing_sushi.png old mode 100644 new mode 100755 diff --git a/mods/fishing/textures/fishing_trophy_label.png b/mods/fishing/textures/fishing_trophy_label.png old mode 100644 new mode 100755 diff --git a/mods/fishing/textures/fishing_worm.png b/mods/fishing/textures/fishing_worm.png old mode 100644 new mode 100755 diff --git a/mods/fishing/textures/not_in_use/fishing_bobber_feather_1.png b/mods/fishing/textures/not_in_use/fishing_bobber_feather_1.png old mode 100644 new mode 100755 diff --git a/mods/fishing/textures/not_in_use/fishing_bobber_feather_2.png b/mods/fishing/textures/not_in_use/fishing_bobber_feather_2.png old mode 100644 new mode 100755 diff --git a/mods/fishing/textures/not_in_use/fishing_bobber_ready.png b/mods/fishing/textures/not_in_use/fishing_bobber_ready.png old mode 100644 new mode 100755 diff --git a/mods/fishing/textures/not_in_use/fishing_pole_on_use.png b/mods/fishing/textures/not_in_use/fishing_pole_on_use.png old mode 100644 new mode 100755 diff --git a/mods/fishing/textures/old/fishing_bobber_alternate_old.png b/mods/fishing/textures/old/fishing_bobber_alternate_old.png old mode 100644 new mode 100755 diff --git a/mods/fishing/textures/old/fishing_bobber_old.png b/mods/fishing/textures/old/fishing_bobber_old.png old mode 100644 new mode 100755 diff --git a/mods/fishing/textures/old/fishing_pole_wield.png b/mods/fishing/textures/old/fishing_pole_wield.png old mode 100644 new mode 100755 diff --git a/mods/fishing/textures/old/fishing_shark_old6.png b/mods/fishing/textures/old/fishing_shark_old6.png old mode 100644 new mode 100755 diff --git a/mods/fishing/trophies.lua b/mods/fishing/trophies.lua old mode 100644 new mode 100755 diff --git a/mods/fishing/worm.lua b/mods/fishing/worm.lua old mode 100644 new mode 100755 diff --git a/mods/food/README.md b/mods/food/README.md old mode 100644 new mode 100755 diff --git a/mods/food/description.txt b/mods/food/description.txt old mode 100644 new mode 100755 diff --git a/mods/food/food/depends.txt b/mods/food/food/depends.txt old mode 100644 new mode 100755 diff --git a/mods/food/food/description.txt b/mods/food/food/description.txt old mode 100644 new mode 100755 diff --git a/mods/food/food_basic/README.md b/mods/food/food_basic/README.md old mode 100644 new mode 100755 diff --git a/mods/food/food_basic/description.txt b/mods/food/food_basic/description.txt old mode 100644 new mode 100755 diff --git a/mods/food/food_basic/init.lua b/mods/food/food_basic/init.lua index 9f035d49..453d2877 100755 --- a/mods/food/food_basic/init.lua +++ b/mods/food/food_basic/init.lua @@ -6,7 +6,7 @@ -- Some basic foods -- ===================================== -print("Food Mod - Version 2.3") +minetest.log("action", "Food Mod - Version 2.3") dofile(minetest.get_modpath("food_basic").."/support.lua") dofile(minetest.get_modpath("food_basic").."/ingredients.lua") diff --git a/mods/food/food_basic/locale/de.txt b/mods/food/food_basic/locale/de.txt old mode 100644 new mode 100755 diff --git a/mods/food/food_basic/locale/fr.txt b/mods/food/food_basic/locale/fr.txt old mode 100644 new mode 100755 diff --git a/mods/food/food_basic/locale/template.txt b/mods/food/food_basic/locale/template.txt old mode 100644 new mode 100755 diff --git a/mods/food/food_basic/textures/food_orange.png b/mods/food/food_basic/textures/food_orange.png old mode 100644 new mode 100755 diff --git a/mods/food/food_basic/textures/food_orange_juice.png b/mods/food/food_basic/textures/food_orange_juice.png old mode 100644 new mode 100755 diff --git a/mods/food/modpack.txt b/mods/food/modpack.txt old mode 100644 new mode 100755 diff --git a/mods/forceload/README.md b/mods/forceload/README.md old mode 100644 new mode 100755 diff --git a/mods/forceload/init.lua b/mods/forceload/init.lua old mode 100644 new mode 100755 diff --git a/mods/forceload/textures/forceload_anchor.png b/mods/forceload/textures/forceload_anchor.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/building_blocks/init.lua b/mods/homedecor_modpack/building_blocks/init.lua index 4f238637..09fc44eb 100755 --- a/mods/homedecor_modpack/building_blocks/init.lua +++ b/mods/homedecor_modpack/building_blocks/init.lua @@ -598,4 +598,3 @@ if not minetest.get_modpath("technic") then }) end end - diff --git a/mods/homedecor_modpack/building_blocks/textures/technic_granite.png b/mods/homedecor_modpack/building_blocks/textures/technic_granite.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/chains/models/chains_chandelier.obj b/mods/homedecor_modpack/chains/models/chains_chandelier.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/chains/textures/chain_brass_inv.png b/mods/homedecor_modpack/chains/textures/chain_brass_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/chains/textures/chain_wrought_iron_inv.png b/mods/homedecor_modpack/chains/textures/chain_wrought_iron_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/chains/textures/chains_brass.png b/mods/homedecor_modpack/chains/textures/chains_brass.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/chains/textures/chains_candle.png b/mods/homedecor_modpack/chains/textures/chains_candle.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/chains/textures/chains_candle_flame.png b/mods/homedecor_modpack/chains/textures/chains_candle_flame.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/chains/textures/chains_wrought_iron.png b/mods/homedecor_modpack/chains/textures/chains_wrought_iron.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/chains/textures/top_chain_brass_inv.png b/mods/homedecor_modpack/chains/textures/top_chain_brass_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/chains/textures/top_chain_wrought_iron_inv.png b/mods/homedecor_modpack/chains/textures/top_chain_wrought_iron_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/computer/LICENSE.txt b/mods/homedecor_modpack/computer/LICENSE.txt deleted file mode 100755 index 1dc9f2f4..00000000 --- a/mods/homedecor_modpack/computer/LICENSE.txt +++ /dev/null @@ -1,15 +0,0 @@ - - DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE - Version 2, December 2004 - - Copyright (C) 2012 Diego Martínez - - Everyone is permitted to copy and distribute verbatim or modified - copies of this license document, and changing it is allowed as long - as the name is changed. - - DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. You just DO WHAT THE FUCK YOU WANT TO. - diff --git a/mods/homedecor_modpack/computer/init.lua b/mods/homedecor_modpack/computer/init.lua index f43cc8ad..975f04f0 100755 --- a/mods/homedecor_modpack/computer/init.lua +++ b/mods/homedecor_modpack/computer/init.lua @@ -1,4 +1,5 @@ -computer = { } +computer = {} +screwdriver = screwdriver or {} computer.register = function (name, def) local nodename = name diff --git a/mods/homedecor_modpack/computer/models/computer_laptop.obj b/mods/homedecor_modpack/computer/models/computer_laptop.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/computer/models/computer_laptop_closed.obj b/mods/homedecor_modpack/computer/models/computer_laptop_closed.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/computer/models/computer_monitor.obj b/mods/homedecor_modpack/computer/models/computer_monitor.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/computer/models/computer_tower.obj b/mods/homedecor_modpack/computer/models/computer_tower.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/computer/models/tetris_arcade.obj b/mods/homedecor_modpack/computer/models/tetris_arcade.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/computer/tetris.lua b/mods/homedecor_modpack/computer/tetris.lua old mode 100644 new mode 100755 index e985e0e6..32a02393 --- a/mods/homedecor_modpack/computer/tetris.lua +++ b/mods/homedecor_modpack/computer/tetris.lua @@ -224,7 +224,7 @@ local function step(pos, fields) run = tick() end - if t ~= nil then + if t then local scr = { formsize, background, t.boardstring, t.previewstring, draw_shape(t.cur, t.x, t.y, t.rot, boardx, boardy), diff --git a/mods/homedecor_modpack/computer/textures/computer_ad128_inv.png b/mods/homedecor_modpack/computer/textures/computer_ad128_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/computer/textures/computer_ad64_inv.png b/mods/homedecor_modpack/computer/textures/computer_ad64_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/computer/textures/computer_admiral128_bk.png b/mods/homedecor_modpack/computer/textures/computer_admiral128_bk.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/computer/textures/computer_admiral128_bt.png b/mods/homedecor_modpack/computer/textures/computer_admiral128_bt.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/computer/textures/computer_admiral128_ft.png b/mods/homedecor_modpack/computer/textures/computer_admiral128_ft.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/computer/textures/computer_admiral128_lt.png b/mods/homedecor_modpack/computer/textures/computer_admiral128_lt.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/computer/textures/computer_admiral128_rt.png b/mods/homedecor_modpack/computer/textures/computer_admiral128_rt.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/computer/textures/computer_admiral128_tp.png b/mods/homedecor_modpack/computer/textures/computer_admiral128_tp.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/computer/textures/computer_admiral64_bk.png b/mods/homedecor_modpack/computer/textures/computer_admiral64_bk.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/computer/textures/computer_admiral64_bt.png b/mods/homedecor_modpack/computer/textures/computer_admiral64_bt.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/computer/textures/computer_admiral64_ft.png b/mods/homedecor_modpack/computer/textures/computer_admiral64_ft.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/computer/textures/computer_admiral64_lt.png b/mods/homedecor_modpack/computer/textures/computer_admiral64_lt.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/computer/textures/computer_admiral64_rt.png b/mods/homedecor_modpack/computer/textures/computer_admiral64_rt.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/computer/textures/computer_admiral64_tp.png b/mods/homedecor_modpack/computer/textures/computer_admiral64_tp.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/computer/textures/computer_black.png b/mods/homedecor_modpack/computer/textures/computer_black.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/computer/textures/computer_blue.png b/mods/homedecor_modpack/computer/textures/computer_blue.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/computer/textures/computer_computer_front_old.png b/mods/homedecor_modpack/computer/textures/computer_computer_front_old.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/computer/textures/computer_computer_top_old.png b/mods/homedecor_modpack/computer/textures/computer_computer_top_old.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/computer/textures/computer_cyan.png b/mods/homedecor_modpack/computer/textures/computer_cyan.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/computer/textures/computer_green.png b/mods/homedecor_modpack/computer/textures/computer_green.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/computer/textures/computer_laptop.png b/mods/homedecor_modpack/computer/textures/computer_laptop.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/computer/textures/computer_laptop_inv.png b/mods/homedecor_modpack/computer/textures/computer_laptop_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/computer/textures/computer_magenta.png b/mods/homedecor_modpack/computer/textures/computer_magenta.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/computer/textures/computer_monitor_inv.png b/mods/homedecor_modpack/computer/textures/computer_monitor_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/computer/textures/computer_orange.png b/mods/homedecor_modpack/computer/textures/computer_orange.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/computer/textures/computer_piepad_inv.png b/mods/homedecor_modpack/computer/textures/computer_piepad_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/computer/textures/computer_piepad_inv_off.png b/mods/homedecor_modpack/computer/textures/computer_piepad_inv_off.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/computer/textures/computer_printer_b.png b/mods/homedecor_modpack/computer/textures/computer_printer_b.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/computer/textures/computer_printer_bt.png b/mods/homedecor_modpack/computer/textures/computer_printer_bt.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/computer/textures/computer_printer_f.png b/mods/homedecor_modpack/computer/textures/computer_printer_f.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/computer/textures/computer_printer_inv.png b/mods/homedecor_modpack/computer/textures/computer_printer_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/computer/textures/computer_printer_l.png b/mods/homedecor_modpack/computer/textures/computer_printer_l.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/computer/textures/computer_printer_r.png b/mods/homedecor_modpack/computer/textures/computer_printer_r.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/computer/textures/computer_printer_t.png b/mods/homedecor_modpack/computer/textures/computer_printer_t.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/computer/textures/computer_ps1_inv.png b/mods/homedecor_modpack/computer/textures/computer_ps1_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/computer/textures/computer_ps2_inv.png b/mods/homedecor_modpack/computer/textures/computer_ps2_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/computer/textures/computer_red.png b/mods/homedecor_modpack/computer/textures/computer_red.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/computer/textures/computer_router_b.png b/mods/homedecor_modpack/computer/textures/computer_router_b.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/computer/textures/computer_router_bt.png b/mods/homedecor_modpack/computer/textures/computer_router_bt.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/computer/textures/computer_router_f.png b/mods/homedecor_modpack/computer/textures/computer_router_f.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/computer/textures/computer_router_f_animated.png b/mods/homedecor_modpack/computer/textures/computer_router_f_animated.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/computer/textures/computer_router_inv.png b/mods/homedecor_modpack/computer/textures/computer_router_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/computer/textures/computer_router_l.png b/mods/homedecor_modpack/computer/textures/computer_router_l.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/computer/textures/computer_router_r.png b/mods/homedecor_modpack/computer/textures/computer_router_r.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/computer/textures/computer_router_t.png b/mods/homedecor_modpack/computer/textures/computer_router_t.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/computer/textures/computer_server_bt.png b/mods/homedecor_modpack/computer/textures/computer_server_bt.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/computer/textures/computer_server_f_off.png b/mods/homedecor_modpack/computer/textures/computer_server_f_off.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/computer/textures/computer_server_f_on.png b/mods/homedecor_modpack/computer/textures/computer_server_f_on.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/computer/textures/computer_server_inv.png b/mods/homedecor_modpack/computer/textures/computer_server_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/computer/textures/computer_server_l.png b/mods/homedecor_modpack/computer/textures/computer_server_l.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/computer/textures/computer_server_r.png b/mods/homedecor_modpack/computer/textures/computer_server_r.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/computer/textures/computer_server_t.png b/mods/homedecor_modpack/computer/textures/computer_server_t.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/computer/textures/computer_shefriendSOO_bk.png b/mods/homedecor_modpack/computer/textures/computer_shefriendSOO_bk.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/computer/textures/computer_shefriendSOO_bt.png b/mods/homedecor_modpack/computer/textures/computer_shefriendSOO_bt.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/computer/textures/computer_shefriendSOO_ft.png b/mods/homedecor_modpack/computer/textures/computer_shefriendSOO_ft.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/computer/textures/computer_shefriendSOO_ft_off.png b/mods/homedecor_modpack/computer/textures/computer_shefriendSOO_ft_off.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/computer/textures/computer_shefriendSOO_lt.png b/mods/homedecor_modpack/computer/textures/computer_shefriendSOO_lt.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/computer/textures/computer_shefriendSOO_rt.png b/mods/homedecor_modpack/computer/textures/computer_shefriendSOO_rt.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/computer/textures/computer_shefriendSOO_tp.png b/mods/homedecor_modpack/computer/textures/computer_shefriendSOO_tp.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/computer/textures/computer_slaystation2_bk.png b/mods/homedecor_modpack/computer/textures/computer_slaystation2_bk.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/computer/textures/computer_slaystation2_bt.png b/mods/homedecor_modpack/computer/textures/computer_slaystation2_bt.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/computer/textures/computer_slaystation2_ft.png b/mods/homedecor_modpack/computer/textures/computer_slaystation2_ft.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/computer/textures/computer_slaystation2_ft_off.png b/mods/homedecor_modpack/computer/textures/computer_slaystation2_ft_off.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/computer/textures/computer_slaystation2_lt.png b/mods/homedecor_modpack/computer/textures/computer_slaystation2_lt.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/computer/textures/computer_slaystation2_rt.png b/mods/homedecor_modpack/computer/textures/computer_slaystation2_rt.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/computer/textures/computer_slaystation2_tp.png b/mods/homedecor_modpack/computer/textures/computer_slaystation2_tp.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/computer/textures/computer_slaystation_bk.png b/mods/homedecor_modpack/computer/textures/computer_slaystation_bk.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/computer/textures/computer_slaystation_bt.png b/mods/homedecor_modpack/computer/textures/computer_slaystation_bt.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/computer/textures/computer_slaystation_ft.png b/mods/homedecor_modpack/computer/textures/computer_slaystation_ft.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/computer/textures/computer_slaystation_lt.png b/mods/homedecor_modpack/computer/textures/computer_slaystation_lt.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/computer/textures/computer_slaystation_rt.png b/mods/homedecor_modpack/computer/textures/computer_slaystation_rt.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/computer/textures/computer_slaystation_tp.png b/mods/homedecor_modpack/computer/textures/computer_slaystation_tp.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/computer/textures/computer_slaystation_tp_off.png b/mods/homedecor_modpack/computer/textures/computer_slaystation_tp_off.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/computer/textures/computer_specter_bk.png b/mods/homedecor_modpack/computer/textures/computer_specter_bk.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/computer/textures/computer_specter_bt.png b/mods/homedecor_modpack/computer/textures/computer_specter_bt.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/computer/textures/computer_specter_ft.png b/mods/homedecor_modpack/computer/textures/computer_specter_ft.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/computer/textures/computer_specter_inv.png b/mods/homedecor_modpack/computer/textures/computer_specter_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/computer/textures/computer_specter_lt.png b/mods/homedecor_modpack/computer/textures/computer_specter_lt.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/computer/textures/computer_specter_rt.png b/mods/homedecor_modpack/computer/textures/computer_specter_rt.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/computer/textures/computer_specter_tp.png b/mods/homedecor_modpack/computer/textures/computer_specter_tp.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/computer/textures/computer_spectre_back.png b/mods/homedecor_modpack/computer/textures/computer_spectre_back.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/computer/textures/computer_spectre_bottom.png b/mods/homedecor_modpack/computer/textures/computer_spectre_bottom.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/computer/textures/computer_spectre_front.png b/mods/homedecor_modpack/computer/textures/computer_spectre_front.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/computer/textures/computer_spectre_left.png b/mods/homedecor_modpack/computer/textures/computer_spectre_left.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/computer/textures/computer_spectre_right.png b/mods/homedecor_modpack/computer/textures/computer_spectre_right.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/computer/textures/computer_spectre_top.png b/mods/homedecor_modpack/computer/textures/computer_spectre_top.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/computer/textures/computer_tower.png b/mods/homedecor_modpack/computer/textures/computer_tower.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/computer/textures/computer_tower_inv.png b/mods/homedecor_modpack/computer/textures/computer_tower_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/computer/textures/computer_wee_bk.png b/mods/homedecor_modpack/computer/textures/computer_wee_bk.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/computer/textures/computer_wee_bt.png b/mods/homedecor_modpack/computer/textures/computer_wee_bt.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/computer/textures/computer_wee_ft.png b/mods/homedecor_modpack/computer/textures/computer_wee_ft.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/computer/textures/computer_wee_ft_off.png b/mods/homedecor_modpack/computer/textures/computer_wee_ft_off.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/computer/textures/computer_wee_lt.png b/mods/homedecor_modpack/computer/textures/computer_wee_lt.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/computer/textures/computer_wee_rt.png b/mods/homedecor_modpack/computer/textures/computer_wee_rt.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/computer/textures/computer_wee_tp.png b/mods/homedecor_modpack/computer/textures/computer_wee_tp.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/computer/textures/computer_wii_inv.png b/mods/homedecor_modpack/computer/textures/computer_wii_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/computer/textures/computer_yellow.png b/mods/homedecor_modpack/computer/textures/computer_yellow.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/computer/textures/homedecor_plastic_base.png b/mods/homedecor_modpack/computer/textures/homedecor_plastic_base.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/computer/textures/homedecor_plastic_base_inv.png b/mods/homedecor_modpack/computer/textures/homedecor_plastic_base_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/computer/textures/homedecor_plastic_sheeting.png b/mods/homedecor_modpack/computer/textures/homedecor_plastic_sheeting.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/computer/textures/monitor_display.png b/mods/homedecor_modpack/computer/textures/monitor_display.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/computer/textures/monitor_plastic.png b/mods/homedecor_modpack/computer/textures/monitor_plastic.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/computer/textures/tetris_arcade.png b/mods/homedecor_modpack/computer/textures/tetris_arcade.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/fake_fire/LICENSE.txt b/mods/homedecor_modpack/fake_fire/LICENSE.txt deleted file mode 100755 index d6a4b6cd..00000000 --- a/mods/homedecor_modpack/fake_fire/LICENSE.txt +++ /dev/null @@ -1,680 +0,0 @@ -Semmett9's "Fake Fire" mod. kilbith's fork. -Some textures by LazyJ. -Fancy mesh fire model/texture by NathanS (CC-0). -============================================================== - - - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - Copyright (C) - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. \ No newline at end of file diff --git a/mods/homedecor_modpack/fake_fire/init.lua b/mods/homedecor_modpack/fake_fire/init.lua index b72db191..08760de3 100755 --- a/mods/homedecor_modpack/fake_fire/init.lua +++ b/mods/homedecor_modpack/fake_fire/init.lua @@ -1,3 +1,5 @@ +screwdriver = screwdriver or {} + local function start_smoke(pos, node, clicker, chimney) local this_spawner_meta = minetest.get_meta(pos) local id = this_spawner_meta:get_int("smoky") @@ -18,7 +20,7 @@ local function start_smoke(pos, node, clicker, chimney) if above == "air" and (not id or id == 0) then id = minetest.add_particlespawner({ - amount = 4, time = 0, collisiondetection = false, + amount = 4, time = 0, collisiondetection = true, minpos = {x=pos.x-0.25, y=pos.y+0.4, z=pos.z-0.25}, maxpos = {x=pos.x+0.25, y=pos.y+5, z=pos.z+0.25}, minvel = {x=-0.2, y=0.3, z=-0.2}, maxvel = {x=0.2, y=1, z=0.2}, diff --git a/mods/homedecor_modpack/fake_fire/models/fancy_fire.obj b/mods/homedecor_modpack/fake_fire/models/fancy_fire.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/fake_fire/sounds/fire_extinguish.ogg b/mods/homedecor_modpack/fake_fire/sounds/fire_extinguish.ogg old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/fake_fire/sounds/fire_small.ogg b/mods/homedecor_modpack/fake_fire/sounds/fire_small.ogg old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/fake_fire/textures/chimney_top.png b/mods/homedecor_modpack/fake_fire/textures/chimney_top.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/fake_fire/textures/embers_animated.png b/mods/homedecor_modpack/fake_fire/textures/embers_animated.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/fake_fire/textures/fake_fire_animated.png b/mods/homedecor_modpack/fake_fire/textures/fake_fire_animated.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/fake_fire/textures/fake_fire_embers.png b/mods/homedecor_modpack/fake_fire/textures/fake_fire_embers.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/fake_fire/textures/fake_fire_inv.png b/mods/homedecor_modpack/fake_fire/textures/fake_fire_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/fake_fire/textures/fake_fire_logs.png b/mods/homedecor_modpack/fake_fire/textures/fake_fire_logs.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/fake_fire/textures/fancy_fire_inv.png b/mods/homedecor_modpack/fake_fire/textures/fancy_fire_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/fake_fire/textures/flint_and_steel.png b/mods/homedecor_modpack/fake_fire/textures/flint_and_steel.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/fake_fire/textures/ice_fire_animated.png b/mods/homedecor_modpack/fake_fire/textures/ice_fire_animated.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/fake_fire/textures/ice_fire_inv.png b/mods/homedecor_modpack/fake_fire/textures/ice_fire_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/fake_fire/textures/smoke_particle.png b/mods/homedecor_modpack/fake_fire/textures/smoke_particle.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/LICENSE b/mods/homedecor_modpack/homedecor/LICENSE deleted file mode 100755 index 65c5ca88..00000000 --- a/mods/homedecor_modpack/homedecor/LICENSE +++ /dev/null @@ -1,165 +0,0 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - - This version of the GNU Lesser General Public License incorporates -the terms and conditions of version 3 of the GNU General Public -License, supplemented by the additional permissions listed below. - - 0. Additional Definitions. - - As used herein, "this License" refers to version 3 of the GNU Lesser -General Public License, and the "GNU GPL" refers to version 3 of the GNU -General Public License. - - "The Library" refers to a covered work governed by this License, -other than an Application or a Combined Work as defined below. - - An "Application" is any work that makes use of an interface provided -by the Library, but which is not otherwise based on the Library. -Defining a subclass of a class defined by the Library is deemed a mode -of using an interface provided by the Library. - - A "Combined Work" is a work produced by combining or linking an -Application with the Library. The particular version of the Library -with which the Combined Work was made is also called the "Linked -Version". - - The "Minimal Corresponding Source" for a Combined Work means the -Corresponding Source for the Combined Work, excluding any source code -for portions of the Combined Work that, considered in isolation, are -based on the Application, and not on the Linked Version. - - The "Corresponding Application Code" for a Combined Work means the -object code and/or source code for the Application, including any data -and utility programs needed for reproducing the Combined Work from the -Application, but excluding the System Libraries of the Combined Work. - - 1. Exception to Section 3 of the GNU GPL. - - You may convey a covered work under sections 3 and 4 of this License -without being bound by section 3 of the GNU GPL. - - 2. Conveying Modified Versions. - - If you modify a copy of the Library, and, in your modifications, a -facility refers to a function or data to be supplied by an Application -that uses the facility (other than as an argument passed when the -facility is invoked), then you may convey a copy of the modified -version: - - a) under this License, provided that you make a good faith effort to - ensure that, in the event an Application does not supply the - function or data, the facility still operates, and performs - whatever part of its purpose remains meaningful, or - - b) under the GNU GPL, with none of the additional permissions of - this License applicable to that copy. - - 3. Object Code Incorporating Material from Library Header Files. - - The object code form of an Application may incorporate material from -a header file that is part of the Library. You may convey such object -code under terms of your choice, provided that, if the incorporated -material is not limited to numerical parameters, data structure -layouts and accessors, or small macros, inline functions and templates -(ten or fewer lines in length), you do both of the following: - - a) Give prominent notice with each copy of the object code that the - Library is used in it and that the Library and its use are - covered by this License. - - b) Accompany the object code with a copy of the GNU GPL and this license - document. - - 4. Combined Works. - - You may convey a Combined Work under terms of your choice that, -taken together, effectively do not restrict modification of the -portions of the Library contained in the Combined Work and reverse -engineering for debugging such modifications, if you also do each of -the following: - - a) Give prominent notice with each copy of the Combined Work that - the Library is used in it and that the Library and its use are - covered by this License. - - b) Accompany the Combined Work with a copy of the GNU GPL and this license - document. - - c) For a Combined Work that displays copyright notices during - execution, include the copyright notice for the Library among - these notices, as well as a reference directing the user to the - copies of the GNU GPL and this license document. - - d) Do one of the following: - - 0) Convey the Minimal Corresponding Source under the terms of this - License, and the Corresponding Application Code in a form - suitable for, and under terms that permit, the user to - recombine or relink the Application with a modified version of - the Linked Version to produce a modified Combined Work, in the - manner specified by section 6 of the GNU GPL for conveying - Corresponding Source. - - 1) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (a) uses at run time - a copy of the Library already present on the user's computer - system, and (b) will operate properly with a modified version - of the Library that is interface-compatible with the Linked - Version. - - e) Provide Installation Information, but only if you would otherwise - be required to provide such information under section 6 of the - GNU GPL, and only to the extent that such information is - necessary to install and execute a modified version of the - Combined Work produced by recombining or relinking the - Application with a modified version of the Linked Version. (If - you use option 4d0, the Installation Information must accompany - the Minimal Corresponding Source and Corresponding Application - Code. If you use option 4d1, you must provide the Installation - Information in the manner specified by section 6 of the GNU GPL - for conveying Corresponding Source.) - - 5. Combined Libraries. - - You may place library facilities that are a work based on the -Library side by side in a single library together with other library -facilities that are not Applications and are not covered by this -License, and convey such a combined library under terms of your -choice, if you do both of the following: - - a) Accompany the combined library with a copy of the same work based - on the Library, uncombined with any other library facilities, - conveyed under the terms of this License. - - b) Give prominent notice with the combined library that part of it - is a work based on the Library, and explaining where to find the - accompanying uncombined form of the same work. - - 6. Revised Versions of the GNU Lesser General Public License. - - The Free Software Foundation may publish revised and/or new versions -of the GNU Lesser General Public License from time to time. Such new -versions will be similar in spirit to the present version, but may -differ in detail to address new problems or concerns. - - Each version is given a distinguishing version number. If the -Library as you received it specifies that a certain numbered version -of the GNU Lesser General Public License "or any later version" -applies to it, you have the option of following the terms and -conditions either of that published version or of any later version -published by the Free Software Foundation. If the Library as you -received it does not specify a version number of the GNU Lesser -General Public License, you may choose any version of the GNU Lesser -General Public License ever published by the Free Software Foundation. - - If the Library as you received it specifies that a proxy can decide -whether future versions of the GNU Lesser General Public License shall -apply, that proxy's public statement of acceptance of any version is -permanent authorization for you to choose that version for the -Library. diff --git a/mods/homedecor_modpack/homedecor/bathroom_furniture.lua b/mods/homedecor_modpack/homedecor/bathroom_furniture.lua index 64ae2143..09ebee9a 100755 --- a/mods/homedecor_modpack/homedecor/bathroom_furniture.lua +++ b/mods/homedecor_modpack/homedecor/bathroom_furniture.lua @@ -35,6 +35,7 @@ for i in ipairs(bathroom_tile_colors) do "("..coloredtile..")^[transformR90" }, groups = {cracky=3}, + paramtype = "light", sounds = default.node_sound_stone_defaults(), }) end diff --git a/mods/homedecor_modpack/homedecor/beds.lua b/mods/homedecor_modpack/homedecor/beds.lua old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/changelog.txt b/mods/homedecor_modpack/homedecor/changelog.txt deleted file mode 100755 index 9e287e72..00000000 --- a/mods/homedecor_modpack/homedecor/changelog.txt +++ /dev/null @@ -1,229 +0,0 @@ -Changelog ---------- - -2013-03-16: Kaeza pushed fixes for signs on wrought iron/brass fences not -showing the text. This also fixed a potential undesired replacement bug. He -also fixed many of the sounds in the mod so that they aren't based on leaves. -:-) - -2013-03-11: Kaeza merged in code from my fork of thexyz/PilzAdam's -3d/visible-text signs mods and fixed some bugs in my signs-on-fenceposts code -in homedecor. If you have any of those three versions of the signs mod, -uninstall it. Homedecor will cover its functionality. Thanks to kaeza for the -contribution! Also, now signs-on-fences work slightly differently than before -when digging - dig to get the sign back from the post, then dig the remaining -post to get that back as well. - -2013-02-13: changed glowlight recipes to avoid conflicts with moreblocks (now -uses moreblocks glowglass *and* super glowglass together), made IC rely on -moreores copper ingot, added recipes to craft glow cubes back into glowlight -slabs. See crafting guide for details. - -2012-02-09: Add ability to place a sign directly onto a brass/wrought iron -fencepost, rather than crafting a sign-on-fencepost from one of each. Place a -brass or wrought iron fencepost, then attempt to place a sign against it. -Instead of the sign floating in air, the fencepost will be replaced with one -bearing the sign in the same node. Dig to get the two pieces back as separate -items, right click the resultant sign to edit the text thereon. - -2012-02-08: Added ability to add signs to brass/wrought iron fenceposts. - -2013-01-23: Completely rewrote all doors code to condense them into two files - -one with the nodebox models, and one with the actual node definitions. In the -process, cleaned up the code that handles node_ownership and protection mods. -Also made the mod automatically enable either left-click or right-click to -open/close a door, depending on whether the game supports it (actually it -checks for the existance of an unrelated function that happened to be added the -same time as the new right-click function). Renamed some textures, duplicated -all of the _lr.png textures to make it easier to register the textures in a -loop and to allow for more flexible texturing. - -2012-10-11 (late night): Minor update - fixed a recipe conflict with throwing -mod. Unprocessed plastic, when made from jungle grass or dry shrubs, now -requires three jungle grass (yields 6) or three dry shrubs (yields 3). Still -works with 6 leaves also. Extended the above owned-node support to work with -glomie's "protector" mod since it has a similar bug as node_ownership has. - - All server Admins: If you have Home Decor and you use either node_ownership - or protector (or both), please update your copy of Home Decor as soon as - practical. - -2012-10-09: Added code to all doors to check for the presence of node_ownership -and adapt accordingly. If that mod is present, you can only place doors in -land you own, or land you have been given permission by the owner to build in, -or land that is not owned at all. Singleplayer mode still works the same as -before. Works around a bug in node_ownership where it doesn't completely -handle the on_place= construct in register_node(), causing it to only delete -half of an illegally-placed door. - -2012-10-05: Added titanium dioxide and white paint from Unified Dyes as -alternates if that mod isn't present. Both are compatible/interchangeable with -the ones from that mod. Uses the same crafting recipes as UD uses, plus a -couple of alternates in case of materials shortages. Added white and mahogany -variants of the aforementioned grid-style glass-and-wood door. - -2012-10-04: Added a couple new types of doors, converted the others to -nodeboxes. All door code has been rewritten mostly from scratch. These new -doors should convert over just fine, or at least you won't lose anything. You -may have to dig and re-place a few if their orientation is wrong. Also note -that these always return the left-opening version when you dig one. - -2012-10-03: Refrigerators are now two nodes tall and have a 10x5 inventory -space. If you have two stacked up already before this update, you'll need to -empty them, dig them, and then re-place one or both, and put their contents -back in. Sorry about the inconvenience, the one-node-tall ones were only -supposed to be temporary anyway. Besides, now one stores more than twice as -much as before. :-) The associated crafting recipe yields only one now, in -keeping with this change. - -2012-10-01: Added white glowlights, changed nodenames for yellow glowlights to -indicate that they're supposed to be yellow (you'll need to destroy and -re-craft them, sorry). - -2012-09-30: Added a few different kinds of fences - bare/unpainted wooden and -classic white picket fences, chainlink, barbed wire, and wooden privacy fence -(e.g to put around a backyard pool). - -Also added gates that open/close on a click, for the picket fences, chainlink -fence, and barbed wire fence. For the privacy fence, use a regular door if you -need a gate. - -2012-09-30: Big set of updates today to make the mod a little easier to use in -places and to add some more nodes. Recipe changes: Brass and wrought iron -poles, table legs, and fences/railings were too expensive in practice. -Increased recipe outputs. Small square glass table now comes from one small -round table (instead of three-to-two). Large square glass table comes from one -small square now instead of two. Small round, small square, and large wooden -tables follow the same pattern. - - Recycling: All glass tables can be recycled back into glass blocks via the - Vessels mod's recipes. All are 3:1 with glass fragments (and thus, 3:1 with - glass blocks), so there's no glass wasted. All wooden tables can be crafted - into sticks by putting three of a given item onto the crafting grid. Any - such craft yields 4 sticks, so there's no waste. Glass skylights recycle - 3:1 also, which does result in a little waste. - - New nodes: - - Added working oven (really just a furnace with new textures/recipe) - Added mini-fridge that stores 24 slots - Added kitchen cabinet that stores 24 slots - Added half-size kitchen cabinet that stores 12 slots (6x2) - Added kitchen sink with under-sink cabinet that stores 16 slots - Added slab-sized, half-slab-sized, and microblock-sized glowlights (e.g. - ceiling fixtures and yard/sidewalk lighting) - Added curtains in 6 colors: red, green, blue, purple, pink, white - - Misc. changes: 3d-ified nightstands (e.g. nodeboxes), improved their - textures somewhat. Got rid of the dressers - they were never brought to a - working state, but they're obsolete now (stacked two-drawer nightstands look - the same anyway). - - Notes about this update: This mod now requires Moreblocks for some recipes - - namely fridge and oven, and uses the Vessels mod's recycle crafts. - -2012-09-27: Changed most uses of dyes so that they can come from the game's -in-built groups-based dye system, where appropriate. Unified Dyes can still -supply the colors, this just makes it possible to use any other dye system that -might come about as long as it uses the groups method. Improved recipe outputs -for all shutters and mahogany folding door (better ratios of objects to -colorants). - - Added intermediate "unprocessed plastic" step to get from materials to - plastic sheeting (now craft some materials to get unprocessed plastic, then - smelt that to get the sheeting), added alternate recipes to produce it, - improved ratio of materials to plastic. Minor code cleanups. - - Later in the day: Nightstands now offer small inventories - one-drawer units - get 8 slots, while two-drawer nightstands get 16 slots (8x2). They're - smaller than chests because they're cheaper to make. Note that if you have - nightstands already placed, dig them up and place them again to enable their - new inventory capabilities. - -2012-09-25: Added alternate recipes for most items that use dyes. Removed -Mesecons dependency from TV and stereo (uses in-built silicon lumps if Mesecons -isn't present). Replaced speakers' Mesecons Noteblocks with copper ingots from -Moreores. - -2012-08-01: Added optional recipes for items that use wool to also use cotton -instead. Choose one or the other in any given recipe (you can't mix the two). -No, it isn't a Kosher thing. ;-) - -2012-07-28: Noticed I technically had left/right textures swapped on a few -blocks. The textures were drawn to counteract this, without my realizing I was -doing just that. :-) Fixed. Also replaced all "tile_images" references with -"tiles", since the former is deprecated in favor of the latter. - -2012-07-26: Updated to use the Vessels mod to give back empty dye bottles. - -2012-07-24: Made all objects that use a dye require a more appropriate color, -made all objects that use a dye give back empty bottles on craft, made grey -shutters use the various grey paints directly. Moved this changelog out of the -forum post and into this separate file. - -2012-07-12: Moved project to github. - -2012-07-02: Deleted a few redundant files from the unified dyes mod. - -2012-06-30: Added a fancy wood-and-glass door. Textures used here were -formerly used for (and have been replaced by new textures for) the default wood -door in my realistic texture packs. - -2012-06-27: Relaxed dependency on UnifiedDyes to prevent depending on Flowers. -The mod will still use them if available; if not, you just can't craft the -various colored objects. - -2012-06-26: Separated dyes into their own mod ("unifieddyes"). Added a copy of -flowers and made this mod depend on it and unified dyes. Updated all crafting -recipes to fit, got rid of the conditional code for flowers (since it is a -dependency now), removed a bunch of redundant register_craftitem code, fixed -some copy&paste errors on the window shutters. As a consequence of these -changes, white paint, titanium dioxide, and all colors of dyes will have to be -removed and replaced (but the things that depend on them are fine). - -2012-06-25: Removed all of the old legacy_wallmounted references - I didn't -realize they were deprecated (and they were causing out-of-nodes issues also). - -2012-06-23: Added small speaker, round brass pole, square wrought iron pole -(without connecting rungs). Fairly recent version of Minetest required for -these to work (uses nodeboxes). Note that if you've placed brass or wrought -iron poles in your world already, they will be drawn using these newer styles; -if you need the square poles and/or connecting rungs, you'll need to remove -them and craft brass/wrought iron fences instead. - -2012-06-16: Tweaked terracotta roof tiles/shingles to give the 4 pieces back on -digging a 'shingle'. - -2012-06-15 (a bit later): Did the same for the stereo and television and -improved them in the process. - -2012-06-15: Tweaked the speaker textures, added separate images for all 6 -sides. - -2012-06-14: Added right-opening versions of oak and mahogany "folding" doors - -allows one to create double doors. Split the two colors into separate files. -Inspired by Calinou's update to the default doors mod - works the same way too. -:-) - -2012-06-13 (a lot later): Changed the crafting recipe slightly for nightstands -- they're designated as 'oak' now. Added crafting recipe for mahogany -variants. If you've already placed nightstands into your world, you should -remove them before updating - sorry, you'll have to rebuild them due my having -had to change the node names. Added initial crafting recipes for oak and -mahogany drawers and complete dressers (dresser components are not yet useful, -work in progress. See crafts.lua for more details). - -2012-06-13: Changed buckets of white paint so that the empty bucket is returned -when the bucket of paint is crafted into something else (rather than when the -bucket of paint is first created). * Fixed copy&paste error from the previous -bucket change. * Moved smelting and crafting of white paint from crafts.lua -over to dyes.lua. - -2012-06-12: Multiple post-release updates over the course of the day. * Fixed -recipe collision with glass panes. * Implemented a full set of dyes derived -from flowers, updated all related crafting recipes and screenshots to match. * -Collected all dyes into one file. Changed recipes for blue and purple dyes to -something that makes a bit more sense. :-) * Tweaked oak shutters to give two -pieces on crafting. * Added alternate recipes for orange and green dyes. - -2012-06-12: Initial release. diff --git a/mods/homedecor_modpack/homedecor/crafts.lua b/mods/homedecor_modpack/homedecor/crafts.lua index 8cfb0aa2..6e8d4aac 100755 --- a/mods/homedecor_modpack/homedecor/crafts.lua +++ b/mods/homedecor_modpack/homedecor/crafts.lua @@ -125,7 +125,7 @@ minetest.register_craftitem("homedecor:soda_can", { }) minetest.register_craftitem("homedecor:coin", { - description = "Gold Coin", + description = "Gold Coin (only for machine)", -- Modif MFF inventory_image = "homedecor_coin.png", }) @@ -3316,6 +3316,24 @@ minetest.register_craft({ }, }) +minetest.register_craftitem("homedecor:flower_pot_small", { + description = S("Small Flower Pot"), + inventory_image = "homedecor_flowerpot_small_inv.png" +}) + +minetest.register_craft( { + output = "homedecor:flower_pot_small", + recipe = { + { "default:clay_brick", "", "default:clay_brick" }, + { "", "default:clay_brick", "" } + } +}) + +minetest.register_craft( { + output = "homedecor:flower_pot_small 3", + recipe = { { "homedecor:flower_pot_terracotta" } } +}) + for i in ipairs(homedecor.banister_materials) do local name = homedecor.banister_materials[i][1] diff --git a/mods/homedecor_modpack/homedecor/depends.txt b/mods/homedecor_modpack/homedecor/depends.txt index bed6ac05..71babcee 100755 --- a/mods/homedecor_modpack/homedecor/depends.txt +++ b/mods/homedecor_modpack/homedecor/depends.txt @@ -8,3 +8,4 @@ bees? intllib? bucket? beds? +flowers? diff --git a/mods/homedecor_modpack/homedecor/electronics.lua b/mods/homedecor_modpack/homedecor/electronics.lua index d7b35b47..3e7abbbf 100755 --- a/mods/homedecor_modpack/homedecor/electronics.lua +++ b/mods/homedecor_modpack/homedecor/electronics.lua @@ -145,12 +145,12 @@ homedecor.register("telephone", { minetest.register_abm({ nodenames = "homedecor:telephone", interval = 30, - chance = 10, + chance = 15, action = function(pos, node) minetest.sound_play("homedecor_telephone_ringing", { pos = pos, gain = 1.0, - max_hear_distance = 10 + max_hear_distance = 5 }) end }) diff --git a/mods/homedecor_modpack/homedecor/exterior.lua b/mods/homedecor_modpack/homedecor/exterior.lua index d66edaaf..70527e46 100755 --- a/mods/homedecor_modpack/homedecor/exterior.lua +++ b/mods/homedecor_modpack/homedecor/exterior.lua @@ -344,10 +344,11 @@ if minetest.get_modpath("bucket") then minetest.chat_send_player(user:get_player_name(), "No room in your inventory to add a filled bucket!") end return wielditem - else - return original_bucket_on_use(itemstack, user, pointed_thing) - end + else if original_bucket_on_use then + original_bucket_on_use(itemstack, user, pointed_thing) + else return end end + end }) end diff --git a/mods/homedecor_modpack/homedecor/handlers/sit.lua b/mods/homedecor_modpack/homedecor/handlers/sit.lua old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/handlers/water_particles.lua b/mods/homedecor_modpack/homedecor/handlers/water_particles.lua old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/init.lua b/mods/homedecor_modpack/homedecor/init.lua index 222b8fa6..360d4ed6 100755 --- a/mods/homedecor_modpack/homedecor/init.lua +++ b/mods/homedecor_modpack/homedecor/init.lua @@ -99,7 +99,7 @@ function homedecor.find_ceiling(itemstack, placer, pointed_thing) return isceiling, pos end -if screwdriver == nil then screwdriver = {} end +screwdriver = screwdriver or {} homedecor.plain_wood = "homedecor_generic_wood_plain.png^".. "(homedecor_generic_wood_boards_overlay.png^[colorize:#a7682020:100)" @@ -170,4 +170,4 @@ dofile(homedecor.modpath.."/handlers/locked.lua") dofile(homedecor.modpath.."/crafts.lua") -print("[HomeDecor] "..S("Loaded!")) +minetest.log("action", "[HomeDecor] "..S("Loaded!")) diff --git a/mods/homedecor_modpack/homedecor/kitchen_furniture.lua b/mods/homedecor_modpack/homedecor/kitchen_furniture.lua index 146ce089..3efead53 100755 --- a/mods/homedecor_modpack/homedecor/kitchen_furniture.lua +++ b/mods/homedecor_modpack/homedecor/kitchen_furniture.lua @@ -128,7 +128,8 @@ homedecor.register("kitchen_faucet", { } homedecor.start_particle_spawner(pos, node, particledef, "homedecor_faucet") end - end + end, + on_destruct = homedecor.stop_particle_spawner }) homedecor.register("paper_towel", { diff --git a/mods/homedecor_modpack/homedecor/misc-nodes.lua b/mods/homedecor_modpack/homedecor/misc-nodes.lua index c9ba3865..86957584 100755 --- a/mods/homedecor_modpack/homedecor/misc-nodes.lua +++ b/mods/homedecor_modpack/homedecor/misc-nodes.lua @@ -79,6 +79,46 @@ homedecor.register("flower_pot_"..p, { }) end +local flowers_list = { + { "Rose", "rose", "flowers:rose" }, + { "Tulip", "tulip", "flowers:tulip" }, + { "Yellow Dandelion", "dandelion_yellow", "flowers:dandelion_yellow" }, + { "White Dandelion", "dandelion_white", "flowers:dandelion_white" }, + { "Blue Geranium", "geranium", "flowers:geranium" }, + { "Viola", "viola", "flowers:viola" }, + { "Cactus", "cactus", "default:cactus" }, + { "Bonsai", "bonsai", "default:sapling" } +} + +for i in ipairs(flowers_list) do + local flowerdesc = flowers_list[i][1] + local flower = flowers_list[i][2] + local craftwith = flowers_list[i][3] + + homedecor.register("potted_"..flower, { + description = S("Potted flower ("..flowerdesc..")"), + mesh = "homedecor_flowerpot_small.obj", + tiles = {"homedecor_potted_"..flower..".png", "homedecor_potted.png"}, + walkable = false, + groups = {snappy = 3}, + sounds = default.node_sound_glass_defaults(), + selection_box = { + type = "fixed", + fixed = { -0.2, -0.5, -0.2, 0.2, 0.4, 0.2 } + } + }) + + minetest.register_craft({ + type = "shapeless", + output = "homedecor:potted_"..flower, + recipe = { craftwith, "homedecor:flower_pot_small" } + }) + + minetest.register_alias("flowers:flower_"..flower.."_pot", "homedecor:potted_"..flower) + minetest.register_alias("flowers:potted_"..flower, "homedecor:potted_"..flower) + minetest.register_alias("flowers:flower_pot", "homedecor:flower_pot_small") +end + homedecor.register("pole_brass", { description = S("Brass Pole"), mesh = "homedecor_round_pole.obj", @@ -550,7 +590,8 @@ homedecor.register("beer_mug", { groups = { snappy=3, oddly_breakable_by_hand=3 }, walkable = false, sounds = default.node_sound_glass_defaults(), - selection_box = beer_cbox + selection_box = beer_cbox, + on_use = minetest.item_eat(2) }) homedecor.register("tool_cabinet", { diff --git a/mods/homedecor_modpack/homedecor/models/forniture_armchair.obj b/mods/homedecor_modpack/homedecor/models/forniture_armchair.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/forniture_chains.obj b/mods/homedecor_modpack/homedecor/models/forniture_chains.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/forniture_torch.obj b/mods/homedecor_modpack/homedecor/models/forniture_torch.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_4_bottles.obj b/mods/homedecor_modpack/homedecor/models/homedecor_4_bottles.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_ac.obj b/mods/homedecor_modpack/homedecor/models/homedecor_ac.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_analog_clock.obj b/mods/homedecor_modpack/homedecor/models/homedecor_analog_clock.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_banister_diagonal_left.obj b/mods/homedecor_modpack/homedecor/models/homedecor_banister_diagonal_left.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_banister_diagonal_right.obj b/mods/homedecor_modpack/homedecor/models/homedecor_banister_diagonal_right.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_banister_horizontal.obj b/mods/homedecor_modpack/homedecor/models/homedecor_banister_horizontal.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_barbecue.obj b/mods/homedecor_modpack/homedecor/models/homedecor_barbecue.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_bathroom_faucet.obj b/mods/homedecor_modpack/homedecor/models/homedecor_bathroom_faucet.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_bathroom_set.obj b/mods/homedecor_modpack/homedecor/models/homedecor_bathroom_set.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_bathroom_sink.obj b/mods/homedecor_modpack/homedecor/models/homedecor_bathroom_sink.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_bed_extended.obj b/mods/homedecor_modpack/homedecor/models/homedecor_bed_extended.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_bed_kingsize.obj b/mods/homedecor_modpack/homedecor/models/homedecor_bed_kingsize.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_bed_regular.obj b/mods/homedecor_modpack/homedecor/models/homedecor_bed_regular.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_bedroom_wardrobe.obj b/mods/homedecor_modpack/homedecor/models/homedecor_bedroom_wardrobe.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_beer_mug.obj b/mods/homedecor_modpack/homedecor/models/homedecor_beer_mug.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_beer_taps.obj b/mods/homedecor_modpack/homedecor/models/homedecor_beer_taps.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_bench_large_1.obj b/mods/homedecor_modpack/homedecor/models/homedecor_bench_large_1.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_bench_large_2.obj b/mods/homedecor_modpack/homedecor/models/homedecor_bench_large_2.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_book.obj b/mods/homedecor_modpack/homedecor/models/homedecor_book.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_book_open.obj b/mods/homedecor_modpack/homedecor/models/homedecor_book_open.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_bottle.obj b/mods/homedecor_modpack/homedecor/models/homedecor_bottle.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_calendar.obj b/mods/homedecor_modpack/homedecor/models/homedecor_calendar.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_candle_thick.obj b/mods/homedecor_modpack/homedecor/models/homedecor_candle_thick.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_candle_thin.obj b/mods/homedecor_modpack/homedecor/models/homedecor_candle_thin.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_candlestick.obj b/mods/homedecor_modpack/homedecor/models/homedecor_candlestick.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_ceiling_lamp.obj b/mods/homedecor_modpack/homedecor/models/homedecor_ceiling_lamp.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_ceiling_lantern.obj b/mods/homedecor_modpack/homedecor/models/homedecor_ceiling_lantern.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_chimney.obj b/mods/homedecor_modpack/homedecor/models/homedecor_chimney.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_coatrack.obj b/mods/homedecor_modpack/homedecor/models/homedecor_coatrack.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_coffeemaker.obj b/mods/homedecor_modpack/homedecor/models/homedecor_coffeemaker.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_copper_pans.obj b/mods/homedecor_modpack/homedecor/models/homedecor_copper_pans.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_cutlery_set.obj b/mods/homedecor_modpack/homedecor/models/homedecor_cutlery_set.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_dartboard.obj b/mods/homedecor_modpack/homedecor/models/homedecor_dartboard.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_deckchair.obj b/mods/homedecor_modpack/homedecor/models/homedecor_deckchair.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_desk.obj b/mods/homedecor_modpack/homedecor/models/homedecor_desk.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_desk_fan.b3d b/mods/homedecor_modpack/homedecor/models/homedecor_desk_fan.b3d old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_desk_fan_uv.png b/mods/homedecor_modpack/homedecor/models/homedecor_desk_fan_uv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_desk_globe.obj b/mods/homedecor_modpack/homedecor/models/homedecor_desk_globe.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_desk_lamp.obj b/mods/homedecor_modpack/homedecor/models/homedecor_desk_lamp.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_doghouse.obj b/mods/homedecor_modpack/homedecor/models/homedecor_doghouse.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_door_closet.obj b/mods/homedecor_modpack/homedecor/models/homedecor_door_closet.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_door_closet_right.obj b/mods/homedecor_modpack/homedecor/models/homedecor_door_closet_right.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_door_fancy.obj b/mods/homedecor_modpack/homedecor/models/homedecor_door_fancy.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_door_fancy_right.obj b/mods/homedecor_modpack/homedecor/models/homedecor_door_fancy_right.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_door_japanese_closed.obj b/mods/homedecor_modpack/homedecor/models/homedecor_door_japanese_closed.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_door_japanese_open.obj b/mods/homedecor_modpack/homedecor/models/homedecor_door_japanese_open.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_door_plain.obj b/mods/homedecor_modpack/homedecor/models/homedecor_door_plain.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_door_plain_right.obj b/mods/homedecor_modpack/homedecor/models/homedecor_door_plain_right.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_door_wood_glass.obj b/mods/homedecor_modpack/homedecor/models/homedecor_door_wood_glass.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_door_wood_glass_right.obj b/mods/homedecor_modpack/homedecor/models/homedecor_door_wood_glass_right.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_door_woodglass_typea.obj b/mods/homedecor_modpack/homedecor/models/homedecor_door_woodglass_typea.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_door_woodglass_typea_right.obj b/mods/homedecor_modpack/homedecor/models/homedecor_door_woodglass_typea_right.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_door_wrought_iron.obj b/mods/homedecor_modpack/homedecor/models/homedecor_door_wrought_iron.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_door_wrought_iron_right.obj b/mods/homedecor_modpack/homedecor/models/homedecor_door_wrought_iron_right.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_dvd_cabinet.obj b/mods/homedecor_modpack/homedecor/models/homedecor_dvd_cabinet.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_filing_cabinet.obj b/mods/homedecor_modpack/homedecor/models/homedecor_filing_cabinet.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_fishtank.obj b/mods/homedecor_modpack/homedecor/models/homedecor_fishtank.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_flowerpot.obj b/mods/homedecor_modpack/homedecor/models/homedecor_flowerpot.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_flowerpot_small.obj b/mods/homedecor_modpack/homedecor/models/homedecor_flowerpot_small.obj new file mode 100755 index 00000000..bd6e84d1 --- /dev/null +++ b/mods/homedecor_modpack/homedecor/models/homedecor_flowerpot_small.obj @@ -0,0 +1,510 @@ +# Blender v2.73 (sub 0) OBJ File: 'flowersplus_potted.blend' +# www.blender.org +o Plane_Plane_None +v -0.280963 0.570852 -0.280962 +v -0.280963 -0.122043 -0.280962 +v 0.280961 -0.122043 0.280962 +v 0.280961 0.570851 0.280962 +v 0.280961 0.570852 -0.280962 +v 0.280961 -0.122043 -0.280962 +v -0.280963 -0.122043 0.280962 +v -0.280963 0.570851 0.280962 +vt 0.000015 0.999998 +vt 0.000016 0.000012 +vt 0.999986 0.000012 +vt 0.999986 0.999990 +vn -0.707100 -0.000000 0.707100 +vn -0.707100 -0.000000 -0.707100 +g Plane_Plane_None_Plane_Plane_None_None +s off +f 1/1/1 2/2/1 3/3/1 4/4/1 +f 5/1/2 6/2/2 7/3/2 8/4/2 +o Cylinder.001_Cylinder.001_None +v 0.039325 -0.147239 -0.197702 +v 0.039325 -0.096845 -0.197702 +v 0.111989 -0.096845 -0.167603 +v 0.111989 -0.147239 -0.167603 +v 0.167603 -0.096845 -0.111989 +v 0.167603 -0.147239 -0.111989 +v 0.197702 -0.096845 -0.039325 +v 0.197702 -0.147239 -0.039325 +v 0.197702 -0.096845 0.039325 +v 0.197702 -0.147239 0.039325 +v 0.167603 -0.096845 0.111989 +v 0.167603 -0.147239 0.111989 +v 0.111989 -0.096845 0.167604 +v 0.111989 -0.147239 0.167604 +v 0.039325 -0.096845 0.197702 +v 0.039325 -0.147239 0.197702 +v -0.039325 -0.096845 0.197702 +v -0.039325 -0.147239 0.197702 +v -0.111989 -0.096845 0.167604 +v -0.111989 -0.147239 0.167604 +v -0.167603 -0.096845 0.111989 +v -0.167603 -0.147239 0.111989 +v -0.197702 -0.096845 0.039325 +v -0.197702 -0.147239 0.039325 +v -0.197702 -0.096845 -0.039326 +v -0.197702 -0.147239 -0.039326 +v -0.167603 -0.096845 -0.111989 +v -0.167603 -0.147239 -0.111989 +v -0.111989 -0.096845 -0.167603 +v -0.111989 -0.147239 -0.167603 +v -0.039325 -0.147239 -0.197702 +v -0.039325 -0.096845 -0.197702 +v 0.098851 -0.499995 -0.019663 +v 0.000000 -0.499995 -0.000000 +v -0.083802 -0.499995 0.055994 +v 0.055995 -0.499995 -0.083802 +v 0.055995 -0.499995 0.083802 +v -0.098851 -0.499995 -0.019663 +v -0.055995 -0.499995 0.083802 +v -0.083802 -0.499995 -0.055995 +v -0.019663 -0.499995 0.098851 +v -0.055994 -0.499995 -0.083802 +v 0.019663 -0.499995 0.098851 +v 0.098851 -0.499995 0.019662 +v 0.083802 -0.499995 0.055994 +v 0.083802 -0.499995 -0.055995 +v -0.098851 -0.499995 0.019662 +v -0.019662 -0.499995 -0.098851 +v 0.097990 -0.122042 -0.146653 +v 0.097990 -0.096845 -0.146653 +v 0.172989 -0.122042 0.034410 +v 0.172989 -0.096845 0.034410 +v 0.146653 -0.122042 -0.097990 +v 0.146653 -0.096845 -0.097990 +v -0.034409 -0.122042 -0.172989 +v -0.034409 -0.096845 -0.172989 +v -0.172989 -0.122042 0.034410 +v -0.172989 -0.096845 0.034410 +v -0.146653 -0.122042 0.097990 +v -0.146653 -0.096845 0.097990 +v 0.172989 -0.122042 -0.034410 +v 0.172989 -0.096845 -0.034410 +v 0.146653 -0.122042 0.097990 +v 0.146653 -0.096845 0.097990 +v 0.034410 -0.122042 -0.172989 +v 0.034410 -0.096845 -0.172989 +v -0.146653 -0.122042 -0.097990 +v -0.146653 -0.096845 -0.097990 +v 0.034410 -0.122042 0.172989 +v 0.034410 -0.096845 0.172989 +v -0.172989 -0.122042 -0.034410 +v -0.172989 -0.096845 -0.034410 +v -0.034410 -0.122042 0.172989 +v -0.034410 -0.096845 0.172989 +v 0.097990 -0.122042 0.146653 +v 0.097990 -0.096845 0.146653 +v -0.097990 -0.122042 -0.146653 +v -0.097990 -0.096845 -0.146653 +v -0.097990 -0.122042 0.146653 +v -0.097990 -0.096845 0.146653 +v 0.000000 -0.122042 -0.000000 +v 0.019663 -0.499995 -0.098851 +v 0.034410 -0.147239 -0.172989 +v 0.097990 -0.147239 -0.146653 +v 0.146653 -0.147239 -0.097990 +v 0.172989 -0.147239 -0.034410 +v 0.172989 -0.147239 0.034410 +v 0.146653 -0.147239 0.097990 +v 0.097990 -0.147239 0.146653 +v 0.034410 -0.147239 0.172989 +v -0.034410 -0.147239 0.172989 +v -0.097990 -0.147239 0.146653 +v -0.146653 -0.147239 0.097990 +v -0.172989 -0.147239 0.034410 +v -0.172989 -0.147239 -0.034410 +v -0.146653 -0.147239 -0.097990 +v -0.097990 -0.147239 -0.146653 +v -0.034409 -0.147239 -0.172989 +vt 0.156250 0.593750 +vt 0.156250 0.375000 +vt 0.218750 0.375000 +vt 0.218750 0.593750 +vt 0.925348 0.807408 +vt 0.942592 0.824652 +vt 0.890625 0.859375 +vt 0.611122 0.768387 +vt 0.602441 0.755395 +vt 0.647502 0.736730 +vt 0.650550 0.752055 +vt 0.468750 0.656250 +vt 0.406250 0.656250 +vt 0.406250 0.625000 +vt 0.468750 0.625000 +vt 0.093750 0.656250 +vt 0.093750 0.625000 +vt 0.156250 0.625000 +vt 0.156250 0.656250 +vt 0.031250 0.656250 +vt 0.031250 0.625000 +vt 0.343750 0.656250 +vt 0.343750 0.625000 +vt 0.031250 0.593750 +vt 0.968750 0.593750 +vt 0.968750 0.375000 +vt 0.031250 0.375000 +vt 0.718750 0.656250 +vt 0.718750 0.625000 +vt 0.781250 0.625000 +vt 0.781250 0.656250 +vt 0.656250 0.656250 +vt 0.656250 0.625000 +vt 0.650550 0.966602 +vt 0.693226 0.966602 +vt 0.696274 0.981927 +vt 0.647501 0.981927 +vt 0.906250 0.656250 +vt 0.906250 0.625000 +vt 0.968750 0.625000 +vt 0.968750 0.656250 +vt 0.406250 0.593750 +vt 0.343750 0.593750 +vt 0.343750 0.375000 +vt 0.406250 0.375000 +vt 0.531250 0.656250 +vt 0.531250 0.625000 +vt 0.593750 0.625000 +vt 0.593750 0.656250 +vt 0.564614 0.837990 +vt 0.564614 0.880667 +vt 0.549289 0.883715 +vt 0.549289 0.834942 +vt 0.580946 0.798563 +vt 0.567954 0.789882 +vt 0.902818 0.798076 +vt 0.656250 0.593750 +vt 0.593750 0.593750 +vt 0.593750 0.375000 +vt 0.656250 0.375000 +vt 0.951924 0.847182 +vt 0.033364 0.838084 +vt 0.018040 0.835036 +vt 0.036704 0.789976 +vt 0.049696 0.798656 +vt 0.779161 0.837991 +vt 0.762830 0.798563 +vt 0.775821 0.789882 +vt 0.794486 0.834942 +vt 0.906250 0.593750 +vt 0.906250 0.375000 +vt 0.218750 0.625000 +vt 0.218750 0.656250 +vt 0.406250 0.859375 +vt 0.467016 0.950317 +vt 0.427588 0.966648 +vt 0.794486 0.883715 +vt 0.779161 0.880667 +vt 0.775821 0.928775 +vt 0.762830 0.920094 +vt 0.210084 0.755488 +vt 0.244571 0.789976 +vt 0.231580 0.798656 +vt 0.201403 0.768480 +vt 0.384912 0.966648 +vt 0.696274 0.736730 +vt 0.693226 0.752055 +vt 0.593750 0.687500 +vt 0.656250 0.687500 +vt 0.656250 0.703125 +vt 0.593750 0.703125 +vt 0.156250 0.687500 +vt 0.218750 0.687500 +vt 0.218750 0.703125 +vt 0.156250 0.703125 +vt 0.611122 0.950271 +vt 0.602441 0.963262 +vt 0.718750 0.687500 +vt 0.718750 0.703125 +vt 0.263236 0.883808 +vt 0.244571 0.928868 +vt 0.231580 0.920187 +vt 0.247911 0.880760 +vt 0.567954 0.928775 +vt 0.580946 0.920094 +vt 0.781250 0.687500 +vt 0.781250 0.703125 +vt 0.781250 0.593750 +vt 0.718750 0.593750 +vt 0.718750 0.375000 +vt 0.781250 0.375000 +vt 0.951924 0.871568 +vt 0.071191 0.755488 +vt 0.116251 0.736824 +vt 0.119300 0.752149 +vt 0.079872 0.768480 +vt 0.298977 0.838037 +vt 0.315308 0.798609 +vt 0.467016 0.768433 +vt 0.497192 0.798609 +vt 0.210084 0.963356 +vt 0.201403 0.950364 +vt 0.843750 0.687500 +vt 0.843750 0.703125 +vt 0.468750 0.687500 +vt 0.531250 0.687500 +vt 0.531250 0.703125 +vt 0.468750 0.703125 +vt 0.071192 0.963356 +vt 0.079872 0.950364 +vt 0.119300 0.966695 +vt 0.116252 0.982020 +vt 0.942592 0.894098 +vt 0.281250 0.687500 +vt 0.281250 0.703125 +vt 0.165024 0.982020 +vt 0.161976 0.966695 +vt 0.161976 0.752149 +vt 0.165024 0.736824 +vt 0.513523 0.838037 +vt 0.531250 0.593750 +vt 0.531250 0.375000 +vt 0.878432 0.920674 +vt 0.855901 0.911342 +vt 0.843750 0.656250 +vt 0.843750 0.625000 +vt 0.468750 0.593750 +vt 0.468750 0.375000 +vt 0.031250 0.687500 +vt 0.093750 0.687500 +vt 0.093750 0.703125 +vt 0.031250 0.703125 +vt 0.406250 0.687500 +vt 0.406250 0.703125 +vt 0.741334 0.963262 +vt 0.732653 0.950271 +vt 0.018040 0.883808 +vt 0.033364 0.880760 +vt 0.049696 0.920188 +vt 0.036704 0.928868 +vt 0.315308 0.920140 +vt 0.298977 0.880713 +vt 0.345485 0.768433 +vt 0.513523 0.880713 +vt 0.855902 0.807408 +vt 0.878432 0.798076 +vt 0.906250 0.687500 +vt 0.968750 0.687500 +vt 0.968750 0.703125 +vt 0.906250 0.703125 +vt 0.829326 0.871568 +vt 0.829326 0.847182 +vt 0.247911 0.838084 +vt 0.263236 0.835036 +vt 0.925348 0.911342 +vt 0.384912 0.752101 +vt 0.902818 0.920674 +vt 0.732653 0.768387 +vt 0.741334 0.755395 +vt 0.281250 0.625000 +vt 0.281250 0.656250 +vt 0.345485 0.950317 +vt 0.843750 0.593750 +vt 0.843750 0.375000 +vt 0.281250 0.593750 +vt 0.281250 0.375000 +vt 0.343750 0.687500 +vt 0.343750 0.703125 +vt 0.093750 0.593750 +vt 0.093750 0.375000 +vt 0.427588 0.752101 +vt 0.838658 0.894098 +vt 0.838658 0.824652 +vt 0.497192 0.920140 +vn 0.479200 -0.817200 0.320200 +vn 0.813000 -0.209500 0.543200 +vn 0.959000 -0.209500 0.190800 +vn 0.565300 -0.817200 0.112400 +vn 0.000000 -1.000000 0.000000 +vn -0.320200 -0.817200 -0.479200 +vn -0.414600 -0.665700 -0.620400 +vn -0.145600 -0.665700 -0.731900 +vn -0.112400 -0.817200 -0.565300 +vn 0.195100 0.000000 -0.980800 +vn 0.555600 0.000000 -0.831500 +vn 0.414600 -0.665700 -0.620400 +vn 0.145600 -0.665700 -0.731900 +vn 0.555600 0.000000 0.831500 +vn 0.414600 -0.665700 0.620400 +vn 0.620400 -0.665700 0.414600 +vn 0.831500 0.000000 0.555600 +vn 0.195100 0.000000 0.980800 +vn 0.145600 -0.665700 0.731900 +vn 0.831500 -0.000000 -0.555600 +vn 0.620400 -0.665700 -0.414600 +vn 0.112400 -0.817200 0.565300 +vn -0.112400 -0.817200 0.565300 +vn -0.190800 -0.209500 0.959000 +vn 0.190800 -0.209500 0.959000 +vn -0.980800 -0.000000 -0.195100 +vn -0.731900 -0.665700 -0.145600 +vn -0.731900 -0.665700 0.145600 +vn -0.980800 -0.000000 0.195100 +vn -0.831500 -0.000000 -0.555600 +vn -0.620400 -0.665700 -0.414600 +vn -0.145600 -0.665700 0.731900 +vn -0.555600 0.000000 0.831500 +vn -0.414600 -0.665700 0.620400 +vn -0.195100 0.000000 0.980800 +vn 0.320200 -0.817200 -0.479200 +vn 0.479200 -0.817200 -0.320200 +vn 0.813000 -0.209500 -0.543200 +vn 0.543200 -0.209500 -0.813000 +vn -0.195100 0.000000 -0.980800 +vn -0.555600 0.000000 -0.831500 +vn -0.565300 -0.817200 -0.112400 +vn -0.565300 -0.817200 0.112400 +vn -0.479200 -0.817200 -0.320200 +vn -0.543200 -0.209500 -0.813000 +vn -0.813000 -0.209500 -0.543200 +vn 0.644500 0.753700 -0.128200 +vn 0.000000 1.000000 0.000000 +vn 0.546400 0.753700 -0.365100 +vn 0.565300 -0.817200 -0.112400 +vn 0.731900 -0.665700 -0.145600 +vn -0.320200 -0.817200 0.479200 +vn -0.543200 -0.209500 0.813000 +vn 0.731900 -0.665700 0.145600 +vn 0.980800 0.000000 0.195100 +vn -0.546400 0.753700 -0.365100 +vn -0.365100 0.753700 -0.546400 +vn 0.112400 -0.817200 -0.565300 +vn -0.831500 0.000000 0.555600 +vn -0.546400 0.753700 0.365100 +vn -0.365100 0.753700 0.546400 +vn 0.980800 0.000000 -0.195100 +vn -0.644500 0.753700 0.128200 +vn -0.620400 -0.665700 0.414600 +vn -0.479200 -0.817200 0.320200 +vn -0.644500 0.753700 -0.128200 +vn -0.959000 -0.209500 -0.190800 +vn -0.959000 -0.209500 0.190800 +vn 0.128200 0.753700 -0.644500 +vn 0.365100 0.753700 -0.546400 +vn -0.128200 0.753700 0.644500 +vn 0.128200 0.753700 0.644500 +vn 0.365100 0.753700 0.546400 +vn 0.644500 0.753700 0.128200 +vn -0.128200 0.753700 -0.644500 +vn -0.190800 -0.209500 -0.959000 +vn 0.190800 -0.209500 -0.959000 +vn 0.320200 -0.817200 0.479200 +vn 0.546400 0.753700 0.365100 +vn -0.813000 -0.209500 0.543200 +vn 0.959000 -0.209500 -0.190800 +vn 0.543200 -0.209500 0.813000 +g Cylinder.001_Cylinder.001_None_Cylinder.001_Cylinder.001_None_None_flowers_potted.png +s 1 +f 96/5/3 53/6/4 52/7/5 95/8/6 +f 44/9/7 54/10/7 42/11/7 +f 105/12/8 38/13/9 39/14/10 106/15/11 +f 10/16/12 11/17/13 12/18/14 9/19/15 +f 21/20/16 22/21/17 20/22/18 19/23/19 +f 23/24/20 24/25/21 22/21/17 21/20/16 +f 13/26/22 14/27/23 12/18/14 11/17/13 +f 98/28/24 99/29/25 49/30/26 51/31/27 +f 33/32/28 34/33/29 32/34/30 31/35/31 +f 35/36/32 36/37/33 34/33/29 33/32/28 +f 99/38/25 98/39/24 24/40/21 26/41/34 +f 27/42/35 28/43/36 26/44/34 25/45/37 +f 92/46/38 93/47/39 54/48/40 44/49/41 +f 40/50/42 39/51/10 38/52/9 37/53/43 +f 103/54/44 102/55/45 32/56/30 34/57/29 +f 104/58/46 36/59/33 38/13/9 105/12/8 +f 90/60/7 44/9/7 42/11/7 +f 104/61/46 105/62/8 50/63/47 48/64/48 +f 54/10/7 41/65/7 42/11/7 +f 66/66/49 31/67/50 29/68/50 68/69/51 +f 94/70/52 93/71/39 14/72/23 16/73/53 +f 100/74/54 47/75/55 49/30/26 99/29/25 +f 19/23/19 20/22/18 18/76/56 17/77/57 +f 89/78/50 57/79/50 73/80/50 +f 94/70/52 16/73/53 18/81/56 95/82/6 +f 25/45/37 26/44/34 24/25/21 23/24/20 +f 95/82/6 18/81/56 20/83/18 96/84/3 +f 21/85/50 19/86/50 72/87/58 84/88/59 +f 63/89/50 89/78/50 73/80/50 +f 9/90/15 91/91/60 106/15/11 39/14/10 +f 57/92/35 61/93/61 62/94/62 58/95/63 +f 67/96/22 65/97/64 66/98/49 68/99/51 +f 100/100/54 99/38/25 26/41/34 28/101/36 +f 61/93/61 69/102/31 70/103/65 62/94/62 +f 15/104/50 13/105/50 62/106/62 70/107/65 +f 30/108/66 32/56/30 102/55/45 101/109/67 +f 59/110/28 60/111/68 70/103/65 69/102/31 +f 102/112/45 103/113/44 46/114/69 55/115/70 +f 41/65/7 52/116/7 42/11/7 +f 27/117/50 25/118/50 82/119/71 88/120/72 +f 89/78/50 65/121/50 67/122/50 +f 89/78/50 83/123/50 71/124/50 +f 11/125/50 58/126/63 62/106/62 13/105/50 +f 59/110/28 71/127/32 72/128/58 60/111/68 +f 63/129/20 73/130/37 74/131/73 64/132/74 +f 37/133/50 86/134/75 64/135/74 40/136/50 +f 52/116/7 53/137/7 42/11/7 +f 79/138/57 80/139/76 66/98/49 65/97/64 +f 10/140/50 74/141/73 58/126/63 11/125/50 +f 78/142/77 23/143/50 21/85/50 84/88/59 +f 89/78/50 71/124/50 59/144/50 +f 105/62/8 106/145/11 56/146/78 50/63/47 +f 49/147/7 47/148/7 42/11/7 +f 29/149/61 30/150/66 28/43/36 27/42/35 +f 56/146/78 106/145/11 91/151/60 90/152/79 +f 81/153/12 87/154/13 88/155/72 82/156/71 +f 9/19/15 39/51/10 40/50/42 10/16/12 +f 85/157/16 63/129/20 64/132/74 86/158/75 +f 20/83/18 22/159/17 97/160/80 96/84/3 +f 92/46/38 44/49/41 90/152/79 91/151/60 +f 33/161/50 80/162/76 76/163/81 35/164/50 +f 89/78/50 75/165/50 79/166/50 +f 89/78/50 67/122/50 87/167/50 +f 89/78/50 59/144/50 69/168/50 +f 50/169/7 56/170/7 42/11/7 +f 83/171/43 77/172/42 78/173/77 84/174/59 +f 77/172/42 81/153/12 82/156/71 78/173/77 +f 98/39/24 97/160/80 22/159/17 24/40/21 +f 55/175/7 46/176/7 42/11/7 +f 60/177/68 17/178/50 15/104/50 70/107/65 +f 45/179/7 42/11/7 53/137/7 +f 87/154/13 67/96/22 68/99/51 88/155/72 +f 28/101/36 30/108/66 101/109/67 100/100/54 +f 72/87/58 19/86/50 17/178/50 60/177/68 +f 40/136/50 64/135/74 74/141/73 10/140/50 +f 89/78/50 87/167/50 81/180/50 +f 51/181/7 49/147/7 42/11/7 +f 71/127/32 83/171/43 84/174/59 72/128/58 +f 31/35/31 32/34/30 30/150/66 29/149/61 +f 93/71/39 92/182/38 12/183/14 14/72/23 +f 92/182/38 91/91/60 9/90/15 12/183/14 +f 37/53/43 38/52/9 36/37/33 35/36/32 +f 17/77/57 18/76/56 16/184/53 15/185/64 +f 89/78/50 63/89/50 85/186/50 +f 90/60/7 42/11/7 56/170/7 +f 101/187/67 102/112/45 55/115/70 43/188/82 +f 93/47/39 94/189/52 41/190/83 54/48/40 +f 15/185/64 16/184/53 14/27/23 13/26/22 +f 89/78/50 79/166/50 65/121/50 +f 94/189/52 95/8/6 52/7/5 41/190/83 +f 75/191/19 76/192/81 80/139/76 79/138/57 +f 97/193/80 98/28/24 51/31/27 45/194/84 +f 104/58/46 103/54/44 34/57/29 36/59/33 +f 89/78/50 81/180/50 77/195/50 +f 85/157/16 86/158/75 76/192/81 75/191/19 +f 43/196/7 55/175/7 42/11/7 +f 104/61/46 48/64/48 46/114/69 103/113/44 +f 89/78/50 85/186/50 75/165/50 +f 47/148/7 43/196/7 42/11/7 +f 76/163/81 86/134/75 37/133/50 35/164/50 +f 100/74/54 101/187/67 43/188/82 47/75/55 +f 50/169/7 42/11/7 48/197/7 +f 89/78/50 77/195/50 83/123/50 +f 96/5/3 97/193/80 45/194/84 53/6/4 +f 89/78/50 69/168/50 61/198/50 +f 25/118/50 23/143/50 78/142/77 82/119/71 +f 48/197/7 42/11/7 46/176/7 +f 88/120/72 68/69/51 29/68/50 27/117/50 +f 66/66/49 80/162/76 33/161/50 31/67/50 +f 89/78/50 61/198/50 57/79/50 +f 51/181/7 42/11/7 45/179/7 +f 73/130/37 57/92/35 58/95/63 74/131/73 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_grandfather_clock.obj b/mods/homedecor_modpack/homedecor/models/homedecor_grandfather_clock.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_ground_lantern.obj b/mods/homedecor_modpack/homedecor/models/homedecor_ground_lantern.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_hanging_lantern.obj b/mods/homedecor_modpack/homedecor/models/homedecor_hanging_lantern.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_ironing_board.obj b/mods/homedecor_modpack/homedecor/models/homedecor_ironing_board.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_kitchen_chair.obj b/mods/homedecor_modpack/homedecor/models/homedecor_kitchen_chair.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_kitchen_faucet.obj b/mods/homedecor_modpack/homedecor/models/homedecor_kitchen_faucet.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_kitchen_sink.obj b/mods/homedecor_modpack/homedecor/models/homedecor_kitchen_sink.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_medicine_cabinet.obj b/mods/homedecor_modpack/homedecor/models/homedecor_medicine_cabinet.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_medicine_cabinet_open.obj b/mods/homedecor_modpack/homedecor/models/homedecor_medicine_cabinet_open.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_office_chair_basic.obj b/mods/homedecor_modpack/homedecor/models/homedecor_office_chair_basic.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_office_chair_upscale.obj b/mods/homedecor_modpack/homedecor/models/homedecor_office_chair_upscale.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_oil_lamp.obj b/mods/homedecor_modpack/homedecor/models/homedecor_oil_lamp.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_oil_lamp_tabletop.obj b/mods/homedecor_modpack/homedecor/models/homedecor_oil_lamp_tabletop.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_openframe_bookshelf.obj b/mods/homedecor_modpack/homedecor/models/homedecor_openframe_bookshelf.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_painting.obj b/mods/homedecor_modpack/homedecor/models/homedecor_painting.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_paper_towel.obj b/mods/homedecor_modpack/homedecor/models/homedecor_paper_towel.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_piano.obj b/mods/homedecor_modpack/homedecor/models/homedecor_piano.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_picture_frame.obj b/mods/homedecor_modpack/homedecor/models/homedecor_picture_frame.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_plasma_ball.obj b/mods/homedecor_modpack/homedecor/models/homedecor_plasma_ball.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_pool_table.obj b/mods/homedecor_modpack/homedecor/models/homedecor_pool_table.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_radiator.obj b/mods/homedecor_modpack/homedecor/models/homedecor_radiator.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_refrigerator.obj b/mods/homedecor_modpack/homedecor/models/homedecor_refrigerator.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_round_pole.obj b/mods/homedecor_modpack/homedecor/models/homedecor_round_pole.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_shower_head.obj b/mods/homedecor_modpack/homedecor/models/homedecor_shower_head.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_skateboard.obj b/mods/homedecor_modpack/homedecor/models/homedecor_skateboard.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_slope.obj b/mods/homedecor_modpack/homedecor/models/homedecor_slope.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_slope_inner_corner.obj b/mods/homedecor_modpack/homedecor/models/homedecor_slope_inner_corner.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_slope_outer_corner.obj b/mods/homedecor_modpack/homedecor/models/homedecor_slope_outer_corner.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_small_rug.obj b/mods/homedecor_modpack/homedecor/models/homedecor_small_rug.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_soda_machine.obj b/mods/homedecor_modpack/homedecor/models/homedecor_soda_machine.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_speaker_large.obj b/mods/homedecor_modpack/homedecor/models/homedecor_speaker_large.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_speaker_large_open.obj b/mods/homedecor_modpack/homedecor/models/homedecor_speaker_large_open.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_speaker_small.obj b/mods/homedecor_modpack/homedecor/models/homedecor_speaker_small.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_spiral_staircase.obj b/mods/homedecor_modpack/homedecor/models/homedecor_spiral_staircase.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_sport_bench.obj b/mods/homedecor_modpack/homedecor/models/homedecor_sport_bench.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_standing_lamp.obj b/mods/homedecor_modpack/homedecor/models/homedecor_standing_lamp.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_table_lamp.obj b/mods/homedecor_modpack/homedecor/models/homedecor_table_lamp.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_table_small_round.obj b/mods/homedecor_modpack/homedecor/models/homedecor_table_small_round.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_table_small_square.obj b/mods/homedecor_modpack/homedecor/models/homedecor_table_small_square.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_telephone.obj b/mods/homedecor_modpack/homedecor/models/homedecor_telephone.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_toilet_closed.obj b/mods/homedecor_modpack/homedecor/models/homedecor_toilet_closed.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_toilet_open.obj b/mods/homedecor_modpack/homedecor/models/homedecor_toilet_open.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_toilet_paper.obj b/mods/homedecor_modpack/homedecor/models/homedecor_toilet_paper.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_tool_cabinet.obj b/mods/homedecor_modpack/homedecor/models/homedecor_tool_cabinet.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_towel_rod.obj b/mods/homedecor_modpack/homedecor/models/homedecor_towel_rod.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_trash_can.obj b/mods/homedecor_modpack/homedecor/models/homedecor_trash_can.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_trash_can_green.obj b/mods/homedecor_modpack/homedecor/models/homedecor_trash_can_green.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_trash_can_green_open.obj b/mods/homedecor_modpack/homedecor/models/homedecor_trash_can_green_open.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_trophy.obj b/mods/homedecor_modpack/homedecor/models/homedecor_trophy.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_wall_japanese_bottom.obj b/mods/homedecor_modpack/homedecor/models/homedecor_wall_japanese_bottom.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_wall_japanese_middle.obj b/mods/homedecor_modpack/homedecor/models/homedecor_wall_japanese_middle.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_wall_japanese_top.obj b/mods/homedecor_modpack/homedecor/models/homedecor_wall_japanese_top.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_wall_lamp.obj b/mods/homedecor_modpack/homedecor/models/homedecor_wall_lamp.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_wall_sconce.obj b/mods/homedecor_modpack/homedecor/models/homedecor_wall_sconce.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_well.obj b/mods/homedecor_modpack/homedecor/models/homedecor_well.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_window_shutter.obj b/mods/homedecor_modpack/homedecor/models/homedecor_window_shutter.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_windowblind_thick.obj b/mods/homedecor_modpack/homedecor/models/homedecor_windowblind_thick.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_windowblind_thin.obj b/mods/homedecor_modpack/homedecor/models/homedecor_windowblind_thin.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_wine_rack.obj b/mods/homedecor_modpack/homedecor/models/homedecor_wine_rack.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/shingles.lua b/mods/homedecor_modpack/homedecor/shingles.lua index be0e9706..fa3f8988 100755 --- a/mods/homedecor_modpack/homedecor/shingles.lua +++ b/mods/homedecor_modpack/homedecor/shingles.lua @@ -7,6 +7,7 @@ minetest.register_node("homedecor:skylight", { wield_image = "default_glass.png", inventory_image = "homedecor_skylight_inv.png", groups = { snappy = 3 }, + paramtype = "light", sounds = default.node_sound_glass_defaults(), selection_box = homedecor.nodebox.slab_y(0.1), }) @@ -19,6 +20,7 @@ minetest.register_node("homedecor:skylight_frosted", { inventory_image = "homedecor_skylight_frosted_inv.png", use_texture_alpha = true, groups = { snappy = 3 }, + paramtype = "light", sounds = default.node_sound_glass_defaults(), selection_box = homedecor.nodebox.slab_y(0.1), }) diff --git a/mods/homedecor_modpack/homedecor/sounds/homedecor_book_close.ogg b/mods/homedecor_modpack/homedecor/sounds/homedecor_book_close.ogg old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/sounds/homedecor_door_close.ogg b/mods/homedecor_modpack/homedecor/sounds/homedecor_door_close.ogg old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/sounds/homedecor_door_open.ogg b/mods/homedecor_modpack/homedecor/sounds/homedecor_door_open.ogg old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/sounds/homedecor_doorbell.ogg b/mods/homedecor_modpack/homedecor/sounds/homedecor_doorbell.ogg old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/sounds/homedecor_faucet.ogg b/mods/homedecor_modpack/homedecor/sounds/homedecor_faucet.ogg old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/sounds/homedecor_gate_open_close.ogg b/mods/homedecor_modpack/homedecor/sounds/homedecor_gate_open_close.ogg old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/sounds/homedecor_shower.ogg b/mods/homedecor_modpack/homedecor/sounds/homedecor_shower.ogg old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/sounds/homedecor_telephone_ringing.ogg b/mods/homedecor_modpack/homedecor/sounds/homedecor_telephone_ringing.ogg old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/sounds/homedecor_toilet_flush.ogg b/mods/homedecor_modpack/homedecor/sounds/homedecor_toilet_flush.ogg old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/sounds/homedecor_trash_all.ogg b/mods/homedecor_modpack/homedecor/sounds/homedecor_trash_all.ogg old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/sounds/insert_coin.ogg b/mods/homedecor_modpack/homedecor/sounds/insert_coin.ogg old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/sounds/toaster.ogg b/mods/homedecor_modpack/homedecor/sounds/toaster.ogg old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/3dforniture_taps_brass_inv.png b/mods/homedecor_modpack/homedecor/textures/3dforniture_taps_brass_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/3dforniture_taps_inv.png b/mods/homedecor_modpack/homedecor/textures/3dforniture_taps_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/forniture_chains_inv.png b/mods/homedecor_modpack/homedecor/textures/forniture_chains_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/forniture_coal.png b/mods/homedecor_modpack/homedecor/textures/forniture_coal.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/forniture_marble_base_ducha_top.png b/mods/homedecor_modpack/homedecor/textures/forniture_marble_base_ducha_top.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/forniture_marble_top_toilet.png b/mods/homedecor_modpack/homedecor/textures/forniture_marble_top_toilet.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/forniture_torch_flame.png b/mods/homedecor_modpack/homedecor/textures/forniture_torch_flame.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/forniture_torch_inv.png b/mods/homedecor_modpack/homedecor/textures/forniture_torch_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_4_bottles_brown_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_4_bottles_brown_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_4_bottles_green_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_4_bottles_green_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_4_bottles_multi_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_4_bottles_multi_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_ac.png b/mods/homedecor_modpack/homedecor/textures/homedecor_ac.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_alarm_clock_back.png b/mods/homedecor_modpack/homedecor/textures/homedecor_alarm_clock_back.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_alarm_clock_bottom.png b/mods/homedecor_modpack/homedecor/textures/homedecor_alarm_clock_bottom.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_alarm_clock_front.png b/mods/homedecor_modpack/homedecor/textures/homedecor_alarm_clock_front.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_alarm_clock_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_alarm_clock_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_alarm_clock_sides.png b/mods/homedecor_modpack/homedecor/textures/homedecor_alarm_clock_sides.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_alarm_clock_top.png b/mods/homedecor_modpack/homedecor/textures/homedecor_alarm_clock_top.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_analog_clock_back.png b/mods/homedecor_modpack/homedecor/textures/homedecor_analog_clock_back.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_analog_clock_face.png b/mods/homedecor_modpack/homedecor/textures/homedecor_analog_clock_face.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_analog_clock_plastic_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_analog_clock_plastic_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_analog_clock_wood_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_analog_clock_wood_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_banister_brass_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_banister_brass_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_banister_white_dark_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_banister_white_dark_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_banister_wood_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_banister_wood_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_banister_wrought_iron_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_banister_wrought_iron_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_barbecue_meat.png b/mods/homedecor_modpack/homedecor/textures/homedecor_barbecue_meat.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bathroom_set_cup.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bathroom_set_cup.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bathroom_set_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bathroom_set_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bathroom_set_mirror.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bathroom_set_mirror.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bathroom_set_toothbrush.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bathroom_set_toothbrush.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bathroom_set_toothpaste.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bathroom_set_toothpaste.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bathroom_set_tray.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bathroom_set_tray.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bathroom_sink_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bathroom_sink_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bathroom_tiles_bg.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bathroom_tiles_bg.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bathroom_tiles_fg.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bathroom_tiles_fg.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_bottom.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_bottom.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_frame.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_frame.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_kingsize_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_kingsize_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_kingsize_overlay_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_kingsize_overlay_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bed_overlay_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bed_overlay_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_beer_mug.png b/mods/homedecor_modpack/homedecor/textures/homedecor_beer_mug.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_beer_mug_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_beer_mug_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_beertap_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_beertap_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bench_large_1_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bench_large_1_inv.png old mode 100644 new mode 100755 index 0baeb9ba..b9eb36cb Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bench_large_1_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_bench_large_1_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bench_large_2_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bench_large_2_inv.png old mode 100644 new mode 100755 index 97abc604..961be62c Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_bench_large_2_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_bench_large_2_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_blank_canvas.png b/mods/homedecor_modpack/homedecor/textures/homedecor_blank_canvas.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_blanktile.png b/mods/homedecor_modpack/homedecor/textures/homedecor_blanktile.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_book_cover.png b/mods/homedecor_modpack/homedecor/textures/homedecor_book_cover.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_book_cover_trim.png b/mods/homedecor_modpack/homedecor/textures/homedecor_book_cover_trim.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_book_edges.png b/mods/homedecor_modpack/homedecor/textures/homedecor_book_edges.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_book_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_book_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_book_pages.png b/mods/homedecor_modpack/homedecor/textures/homedecor_book_pages.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_book_trim_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_book_trim_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bottle_brown.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bottle_brown.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bottle_brown2.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bottle_brown2.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bottle_brown3.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bottle_brown3.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bottle_brown4.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bottle_brown4.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bottle_brown_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bottle_brown_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bottle_green.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bottle_green.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_bottle_green_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_bottle_green_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_brass_ingot.png b/mods/homedecor_modpack/homedecor/textures/homedecor_brass_ingot.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_calendar.png b/mods/homedecor_modpack/homedecor/textures/homedecor_calendar.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_calendar_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_calendar_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_candle_flame.png b/mods/homedecor_modpack/homedecor/textures/homedecor_candle_flame.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_candle_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_candle_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_candle_sides.png b/mods/homedecor_modpack/homedecor/textures/homedecor_candle_sides.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_candle_thin_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_candle_thin_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_candlestick_brass_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_candlestick_brass_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_candlestick_wrought_iron_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_candlestick_wrought_iron_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_cardbox_big_sides.png b/mods/homedecor_modpack/homedecor/textures/homedecor_cardbox_big_sides.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_cardbox_big_tb.png b/mods/homedecor_modpack/homedecor/textures/homedecor_cardbox_big_tb.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_cardbox_sides.png b/mods/homedecor_modpack/homedecor/textures/homedecor_cardbox_sides.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_cardbox_tb.png b/mods/homedecor_modpack/homedecor/textures/homedecor_cardbox_tb.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_ceiling_fan_bottom.png b/mods/homedecor_modpack/homedecor/textures/homedecor_ceiling_fan_bottom.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_ceiling_fan_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_ceiling_fan_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_ceiling_fan_sides.png b/mods/homedecor_modpack/homedecor/textures/homedecor_ceiling_fan_sides.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_ceiling_fan_top.png b/mods/homedecor_modpack/homedecor/textures/homedecor_ceiling_fan_top.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_ceiling_lamp_glass.png b/mods/homedecor_modpack/homedecor/textures/homedecor_ceiling_lamp_glass.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_ceiling_lamp_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_ceiling_lamp_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_ceiling_lantern_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_ceiling_lantern_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_ceiling_paint.png b/mods/homedecor_modpack/homedecor/textures/homedecor_ceiling_paint.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_ceiling_paint_roller.png b/mods/homedecor_modpack/homedecor/textures/homedecor_ceiling_paint_roller.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_ceiling_tile.png b/mods/homedecor_modpack/homedecor/textures/homedecor_ceiling_tile.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_chainlink_brass.png b/mods/homedecor_modpack/homedecor/textures/homedecor_chainlink_brass.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_chainlink_steel.png b/mods/homedecor_modpack/homedecor/textures/homedecor_chainlink_steel.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_chimney_tb.png b/mods/homedecor_modpack/homedecor/textures/homedecor_chimney_tb.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_clothes_female1.png b/mods/homedecor_modpack/homedecor/textures/homedecor_clothes_female1.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_clothes_female1_preview.png b/mods/homedecor_modpack/homedecor/textures/homedecor_clothes_female1_preview.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_clothes_female2.png b/mods/homedecor_modpack/homedecor/textures/homedecor_clothes_female2.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_clothes_female2_preview.png b/mods/homedecor_modpack/homedecor/textures/homedecor_clothes_female2_preview.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_clothes_female3.png b/mods/homedecor_modpack/homedecor/textures/homedecor_clothes_female3.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_clothes_female3_preview.png b/mods/homedecor_modpack/homedecor/textures/homedecor_clothes_female3_preview.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_clothes_female4.png b/mods/homedecor_modpack/homedecor/textures/homedecor_clothes_female4.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_clothes_female4_preview.png b/mods/homedecor_modpack/homedecor/textures/homedecor_clothes_female4_preview.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_clothes_female5.png b/mods/homedecor_modpack/homedecor/textures/homedecor_clothes_female5.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_clothes_female5_preview.png b/mods/homedecor_modpack/homedecor/textures/homedecor_clothes_female5_preview.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_clothes_male1.png b/mods/homedecor_modpack/homedecor/textures/homedecor_clothes_male1.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_clothes_male1_preview.png b/mods/homedecor_modpack/homedecor/textures/homedecor_clothes_male1_preview.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_clothes_male2.png b/mods/homedecor_modpack/homedecor/textures/homedecor_clothes_male2.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_clothes_male2_preview.png b/mods/homedecor_modpack/homedecor/textures/homedecor_clothes_male2_preview.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_clothes_male3.png b/mods/homedecor_modpack/homedecor/textures/homedecor_clothes_male3.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_clothes_male3_preview.png b/mods/homedecor_modpack/homedecor/textures/homedecor_clothes_male3_preview.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_clothes_male4.png b/mods/homedecor_modpack/homedecor/textures/homedecor_clothes_male4.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_clothes_male4_preview.png b/mods/homedecor_modpack/homedecor/textures/homedecor_clothes_male4_preview.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_clothes_male5.png b/mods/homedecor_modpack/homedecor/textures/homedecor_clothes_male5.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_clothes_male5_preview.png b/mods/homedecor_modpack/homedecor/textures/homedecor_clothes_male5_preview.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_coatrack_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_coatrack_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_coatrack_wallmount_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_coatrack_wallmount_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_cobweb.png b/mods/homedecor_modpack/homedecor/textures/homedecor_cobweb.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_cobweb_plantlike.png b/mods/homedecor_modpack/homedecor/textures/homedecor_cobweb_plantlike.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_cobweb_torchlike.png b/mods/homedecor_modpack/homedecor/textures/homedecor_cobweb_torchlike.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_coffeemaker_case.png b/mods/homedecor_modpack/homedecor/textures/homedecor_coffeemaker_case.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_coffeemaker_cup.png b/mods/homedecor_modpack/homedecor/textures/homedecor_coffeemaker_cup.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_coffeemaker_decanter.png b/mods/homedecor_modpack/homedecor/textures/homedecor_coffeemaker_decanter.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_coffeemaker_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_coffeemaker_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_coin.png b/mods/homedecor_modpack/homedecor/textures/homedecor_coin.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_copper_pans_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_copper_pans_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_copper_strip.png b/mods/homedecor_modpack/homedecor/textures/homedecor_copper_strip.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_copper_wire.png b/mods/homedecor_modpack/homedecor/textures/homedecor_copper_wire.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_curtain.png b/mods/homedecor_modpack/homedecor/textures/homedecor_curtain.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_curtain_open.png b/mods/homedecor_modpack/homedecor/textures/homedecor_curtain_open.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_curtainrod_brass_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_curtainrod_brass_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_curtainrod_wood_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_curtainrod_wood_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_curtainrod_wrought_iron_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_curtainrod_wrought_iron_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_cutlery_set.png b/mods/homedecor_modpack/homedecor/textures/homedecor_cutlery_set.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_cutlery_set_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_cutlery_set_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_dartboard.png b/mods/homedecor_modpack/homedecor/textures/homedecor_dartboard.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_dartboard_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_dartboard_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_deckchair.png b/mods/homedecor_modpack/homedecor/textures/homedecor_deckchair.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_deckchair_striped_blue.png b/mods/homedecor_modpack/homedecor/textures/homedecor_deckchair_striped_blue.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_desk_drawers.png b/mods/homedecor_modpack/homedecor/textures/homedecor_desk_drawers.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_desk_fan_body.png b/mods/homedecor_modpack/homedecor/textures/homedecor_desk_fan_body.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_desk_fan_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_desk_fan_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_desk_globe_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_desk_globe_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_desk_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_desk_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_desk_lamp_metal_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_desk_lamp_metal_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_desk_lamp_stem_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_desk_lamp_stem_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_digital_clock_back.png b/mods/homedecor_modpack/homedecor/textures/homedecor_digital_clock_back.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_digital_clock_edges.png b/mods/homedecor_modpack/homedecor/textures/homedecor_digital_clock_edges.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_digital_clock_front.png b/mods/homedecor_modpack/homedecor/textures/homedecor_digital_clock_front.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_digital_clock_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_digital_clock_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_dishwasher_back.png b/mods/homedecor_modpack/homedecor/textures/homedecor_dishwasher_back.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_dishwasher_bottom.png b/mods/homedecor_modpack/homedecor/textures/homedecor_dishwasher_bottom.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_dishwasher_front.png b/mods/homedecor_modpack/homedecor/textures/homedecor_dishwasher_front.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_dishwasher_sides.png b/mods/homedecor_modpack/homedecor/textures/homedecor_dishwasher_sides.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_dishwasher_top.png b/mods/homedecor_modpack/homedecor/textures/homedecor_dishwasher_top.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_doghouse_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_doghouse_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_bedroom.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_bedroom.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_bedroom_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_bedroom_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_closet_mahogany.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_closet_mahogany.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_closet_mahogany_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_closet_mahogany_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_closet_oak.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_closet_oak.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_closet_oak_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_closet_oak_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_exterior_fancy.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_exterior_fancy.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_exterior_fancy_insert.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_exterior_fancy_insert.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_exterior_fancy_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_exterior_fancy_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_glass.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_glass.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_glass_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_glass_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_japanese_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_japanese_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_insert.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_insert.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_mahogany.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_mahogany.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_mahogany_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_mahogany_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_oak.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_oak.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_oak_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_oak_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_white.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_white.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_white_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_glass_white_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_plain.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_plain.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_plain_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_wood_plain_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_woodglass2.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_woodglass2.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_woodglass2_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_woodglass2_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_woodglass_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_woodglass_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_woodglass_typea.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_woodglass_typea.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_woodglass_typea_insert.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_woodglass_typea_insert.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wrought_iron.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_wrought_iron.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_door_wrought_iron_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_door_wrought_iron_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_doorbell.png b/mods/homedecor_modpack/homedecor/textures/homedecor_doorbell.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_doorbell_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_doorbell_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_drawer_small.png b/mods/homedecor_modpack/homedecor/textures/homedecor_drawer_small.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_dryer_back.png b/mods/homedecor_modpack/homedecor/textures/homedecor_dryer_back.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_dryer_bottom.png b/mods/homedecor_modpack/homedecor/textures/homedecor_dryer_bottom.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_dryer_front.png b/mods/homedecor_modpack/homedecor/textures/homedecor_dryer_front.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_dryer_sides.png b/mods/homedecor_modpack/homedecor/textures/homedecor_dryer_sides.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_dryer_top.png b/mods/homedecor_modpack/homedecor/textures/homedecor_dryer_top.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_dvd_player.png b/mods/homedecor_modpack/homedecor/textures/homedecor_dvd_player.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_dvdcd_cabinet_back.png b/mods/homedecor_modpack/homedecor/textures/homedecor_dvdcd_cabinet_back.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_dvdcd_cabinet_front.png b/mods/homedecor_modpack/homedecor/textures/homedecor_dvdcd_cabinet_front.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_dvdvcr_back.png b/mods/homedecor_modpack/homedecor/textures/homedecor_dvdvcr_back.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_dvdvcr_bottom.png b/mods/homedecor_modpack/homedecor/textures/homedecor_dvdvcr_bottom.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_dvdvcr_front.png b/mods/homedecor_modpack/homedecor/textures/homedecor_dvdvcr_front.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_dvdvcr_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_dvdvcr_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_dvdvcr_sides.png b/mods/homedecor_modpack/homedecor/textures/homedecor_dvdvcr_sides.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_dvdvcr_top.png b/mods/homedecor_modpack/homedecor/textures/homedecor_dvdvcr_top.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_earth.png b/mods/homedecor_modpack/homedecor/textures/homedecor_earth.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_embers.png b/mods/homedecor_modpack/homedecor/textures/homedecor_embers.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_fan_blades.png b/mods/homedecor_modpack/homedecor/textures/homedecor_fan_blades.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_fence_barbed_wire.png b/mods/homedecor_modpack/homedecor/textures/homedecor_fence_barbed_wire.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_fence_brass.png b/mods/homedecor_modpack/homedecor/textures/homedecor_fence_brass.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_fence_chainlink_corner_front.png b/mods/homedecor_modpack/homedecor/textures/homedecor_fence_chainlink_corner_front.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_fence_chainlink_corner_top.png b/mods/homedecor_modpack/homedecor/textures/homedecor_fence_chainlink_corner_top.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_fence_chainlink_fb.png b/mods/homedecor_modpack/homedecor/textures/homedecor_fence_chainlink_fb.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_fence_chainlink_sides.png b/mods/homedecor_modpack/homedecor/textures/homedecor_fence_chainlink_sides.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_fence_chainlink_tb.png b/mods/homedecor_modpack/homedecor/textures/homedecor_fence_chainlink_tb.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_fence_corner_wrought_iron_2_sides.png b/mods/homedecor_modpack/homedecor/textures/homedecor_fence_corner_wrought_iron_2_sides.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_fence_corner_wrought_iron_2_tb.png b/mods/homedecor_modpack/homedecor/textures/homedecor_fence_corner_wrought_iron_2_tb.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_fence_picket.png b/mods/homedecor_modpack/homedecor/textures/homedecor_fence_picket.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_fence_picket_backside.png b/mods/homedecor_modpack/homedecor/textures/homedecor_fence_picket_backside.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_fence_picket_white.png b/mods/homedecor_modpack/homedecor/textures/homedecor_fence_picket_white.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_fence_picket_white_backside.png b/mods/homedecor_modpack/homedecor/textures/homedecor_fence_picket_white_backside.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_fence_privacy_backside.png b/mods/homedecor_modpack/homedecor/textures/homedecor_fence_privacy_backside.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_fence_privacy_backside2.png b/mods/homedecor_modpack/homedecor/textures/homedecor_fence_privacy_backside2.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_fence_privacy_corner_front.png b/mods/homedecor_modpack/homedecor/textures/homedecor_fence_privacy_corner_front.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_fence_privacy_corner_right.png b/mods/homedecor_modpack/homedecor/textures/homedecor_fence_privacy_corner_right.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_fence_privacy_corner_tb.png b/mods/homedecor_modpack/homedecor/textures/homedecor_fence_privacy_corner_tb.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_fence_privacy_front.png b/mods/homedecor_modpack/homedecor/textures/homedecor_fence_privacy_front.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_fence_privacy_sides.png b/mods/homedecor_modpack/homedecor/textures/homedecor_fence_privacy_sides.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_fence_privacy_tb.png b/mods/homedecor_modpack/homedecor/textures/homedecor_fence_privacy_tb.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_fence_wrought_iron.png b/mods/homedecor_modpack/homedecor/textures/homedecor_fence_wrought_iron.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_fence_wrought_iron_2_fb.png b/mods/homedecor_modpack/homedecor/textures/homedecor_fence_wrought_iron_2_fb.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_fence_wrought_iron_2_sides.png b/mods/homedecor_modpack/homedecor/textures/homedecor_fence_wrought_iron_2_sides.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_fence_wrought_iron_2_tb.png b/mods/homedecor_modpack/homedecor/textures/homedecor_fence_wrought_iron_2_tb.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_filing_cabinet_bottom.png b/mods/homedecor_modpack/homedecor/textures/homedecor_filing_cabinet_bottom.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_filing_cabinet_front.png b/mods/homedecor_modpack/homedecor/textures/homedecor_filing_cabinet_front.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_fishtank_filter.png b/mods/homedecor_modpack/homedecor/textures/homedecor_fishtank_filter.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_fishtank_fishes.png b/mods/homedecor_modpack/homedecor/textures/homedecor_fishtank_fishes.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_fishtank_fishes_lighted.png b/mods/homedecor_modpack/homedecor/textures/homedecor_fishtank_fishes_lighted.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_fishtank_gravel.png b/mods/homedecor_modpack/homedecor/textures/homedecor_fishtank_gravel.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_fishtank_gravel_lighted.png b/mods/homedecor_modpack/homedecor/textures/homedecor_fishtank_gravel_lighted.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_fishtank_sides.png b/mods/homedecor_modpack/homedecor/textures/homedecor_fishtank_sides.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_fishtank_sides_lighted.png b/mods/homedecor_modpack/homedecor/textures/homedecor_fishtank_sides_lighted.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_fishtank_water_top.png b/mods/homedecor_modpack/homedecor/textures/homedecor_fishtank_water_top.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_fishtank_water_top_lighted.png b/mods/homedecor_modpack/homedecor/textures/homedecor_fishtank_water_top_lighted.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_flower_pot_black.png b/mods/homedecor_modpack/homedecor/textures/homedecor_flower_pot_black.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_flower_pot_green.png b/mods/homedecor_modpack/homedecor/textures/homedecor_flower_pot_green.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_flower_pot_terracotta.png b/mods/homedecor_modpack/homedecor/textures/homedecor_flower_pot_terracotta.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_flowerbox_bottom.png b/mods/homedecor_modpack/homedecor/textures/homedecor_flowerbox_bottom.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_flowerbox_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_flowerbox_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_flowerbox_sides.png b/mods/homedecor_modpack/homedecor/textures/homedecor_flowerbox_sides.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_flowerbox_top.png b/mods/homedecor_modpack/homedecor/textures/homedecor_flowerbox_top.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_flowerpot_small_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_flowerpot_small_inv.png new file mode 100755 index 00000000..e28545a7 Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_flowerpot_small_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_gate_barbed_wire_edges.png b/mods/homedecor_modpack/homedecor/textures/homedecor_gate_barbed_wire_edges.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_gate_barbed_wire_fb.png b/mods/homedecor_modpack/homedecor/textures/homedecor_gate_barbed_wire_fb.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_gate_chainlink_fb.png b/mods/homedecor_modpack/homedecor/textures/homedecor_gate_chainlink_fb.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_gate_chainlink_lr.png b/mods/homedecor_modpack/homedecor/textures/homedecor_gate_chainlink_lr.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_gate_chainlink_tb.png b/mods/homedecor_modpack/homedecor/textures/homedecor_gate_chainlink_tb.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_gate_picket_back.png b/mods/homedecor_modpack/homedecor/textures/homedecor_gate_picket_back.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_gate_picket_front.png b/mods/homedecor_modpack/homedecor/textures/homedecor_gate_picket_front.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_gate_picket_white_back.png b/mods/homedecor_modpack/homedecor/textures/homedecor_gate_picket_white_back.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_gate_picket_white_front.png b/mods/homedecor_modpack/homedecor/textures/homedecor_gate_picket_white_front.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_generic_metal_black.png b/mods/homedecor_modpack/homedecor/textures/homedecor_generic_metal_black.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_generic_metal_brass.png b/mods/homedecor_modpack/homedecor/textures/homedecor_generic_metal_brass.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_generic_metal_bright.png b/mods/homedecor_modpack/homedecor/textures/homedecor_generic_metal_bright.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_generic_metal_gold.png b/mods/homedecor_modpack/homedecor/textures/homedecor_generic_metal_gold.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_generic_metal_gold2.png b/mods/homedecor_modpack/homedecor/textures/homedecor_generic_metal_gold2.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_generic_metal_lines_overlay.png b/mods/homedecor_modpack/homedecor/textures/homedecor_generic_metal_lines_overlay.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_generic_metal_wrought_iron.png b/mods/homedecor_modpack/homedecor/textures/homedecor_generic_metal_wrought_iron.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_generic_plastic_black.png b/mods/homedecor_modpack/homedecor/textures/homedecor_generic_plastic_black.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_generic_quilted_paper.png b/mods/homedecor_modpack/homedecor/textures/homedecor_generic_quilted_paper.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_generic_terrycloth.png b/mods/homedecor_modpack/homedecor/textures/homedecor_generic_terrycloth.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_generic_wood_boards_overlay.png b/mods/homedecor_modpack/homedecor/textures/homedecor_generic_wood_boards_overlay.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_generic_wood_luxury.png b/mods/homedecor_modpack/homedecor/textures/homedecor_generic_wood_luxury.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_generic_wood_old.png b/mods/homedecor_modpack/homedecor/textures/homedecor_generic_wood_old.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_generic_wood_plain.png b/mods/homedecor_modpack/homedecor/textures/homedecor_generic_wood_plain.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_generic_wood_red.png b/mods/homedecor_modpack/homedecor/textures/homedecor_generic_wood_red.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_glass_face_clean.png b/mods/homedecor_modpack/homedecor/textures/homedecor_glass_face_clean.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_glass_table_large_edges.png b/mods/homedecor_modpack/homedecor/textures/homedecor_glass_table_large_edges.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_glass_table_large_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_glass_table_large_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_glass_table_large_tb.png b/mods/homedecor_modpack/homedecor/textures/homedecor_glass_table_large_tb.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_glass_table_small_round.png b/mods/homedecor_modpack/homedecor/textures/homedecor_glass_table_small_round.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_glass_table_small_round_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_glass_table_small_round_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_glass_table_small_square.png b/mods/homedecor_modpack/homedecor/textures/homedecor_glass_table_small_square.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_glass_table_small_square_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_glass_table_small_square_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_glowlight_cube_white_sides.png b/mods/homedecor_modpack/homedecor/textures/homedecor_glowlight_cube_white_sides.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_glowlight_cube_white_sides_ceiling.png b/mods/homedecor_modpack/homedecor/textures/homedecor_glowlight_cube_white_sides_ceiling.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_glowlight_cube_white_tb.png b/mods/homedecor_modpack/homedecor/textures/homedecor_glowlight_cube_white_tb.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_glowlight_cube_yellow_sides.png b/mods/homedecor_modpack/homedecor/textures/homedecor_glowlight_cube_yellow_sides.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_glowlight_cube_yellow_sides_ceiling.png b/mods/homedecor_modpack/homedecor/textures/homedecor_glowlight_cube_yellow_sides_ceiling.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_glowlight_cube_yellow_tb.png b/mods/homedecor_modpack/homedecor/textures/homedecor_glowlight_cube_yellow_tb.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_glowlight_thick_white_sides.png b/mods/homedecor_modpack/homedecor/textures/homedecor_glowlight_thick_white_sides.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_glowlight_thick_yellow_sides.png b/mods/homedecor_modpack/homedecor/textures/homedecor_glowlight_thick_yellow_sides.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_glowlight_thin_white_sides.png b/mods/homedecor_modpack/homedecor/textures/homedecor_glowlight_thin_white_sides.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_glowlight_thin_yellow_sides.png b/mods/homedecor_modpack/homedecor/textures/homedecor_glowlight_thin_yellow_sides.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_glowlight_white_bottom.png b/mods/homedecor_modpack/homedecor/textures/homedecor_glowlight_white_bottom.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_glowlight_white_top.png b/mods/homedecor_modpack/homedecor/textures/homedecor_glowlight_white_top.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_glowlight_yellow_bottom.png b/mods/homedecor_modpack/homedecor/textures/homedecor_glowlight_yellow_bottom.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_glowlight_yellow_top.png b/mods/homedecor_modpack/homedecor/textures/homedecor_glowlight_yellow_top.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_grandfather_clock_face.png b/mods/homedecor_modpack/homedecor/textures/homedecor_grandfather_clock_face.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_grandfather_clock_face_edge.png b/mods/homedecor_modpack/homedecor/textures/homedecor_grandfather_clock_face_edge.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_grandfather_clock_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_grandfather_clock_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_ground_lantern_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_ground_lantern_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_hanging_lantern_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_hanging_lantern_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_heater_back.png b/mods/homedecor_modpack/homedecor/textures/homedecor_heater_back.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_heater_front.png b/mods/homedecor_modpack/homedecor/textures/homedecor_heater_front.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_heater_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_heater_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_heater_sides.png b/mods/homedecor_modpack/homedecor/textures/homedecor_heater_sides.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_heater_tb.png b/mods/homedecor_modpack/homedecor/textures/homedecor_heater_tb.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_heating_element.png b/mods/homedecor_modpack/homedecor/textures/homedecor_heating_element.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_ic.png b/mods/homedecor_modpack/homedecor/textures/homedecor_ic.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_japanese_paper.png b/mods/homedecor_modpack/homedecor/textures/homedecor_japanese_paper.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_jpn_door_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_jpn_door_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_kitchen_cabinet_bevel.png b/mods/homedecor_modpack/homedecor/textures/homedecor_kitchen_cabinet_bevel.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_kitchen_cabinet_front.png b/mods/homedecor_modpack/homedecor/textures/homedecor_kitchen_cabinet_front.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_kitchen_cabinet_front_half.png b/mods/homedecor_modpack/homedecor/textures/homedecor_kitchen_cabinet_front_half.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_kitchen_cabinet_top.png b/mods/homedecor_modpack/homedecor/textures/homedecor_kitchen_cabinet_top.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_kitchen_cabinet_top_granite.png b/mods/homedecor_modpack/homedecor/textures/homedecor_kitchen_cabinet_top_granite.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_kitchen_cabinet_top_marble.png b/mods/homedecor_modpack/homedecor/textures/homedecor_kitchen_cabinet_top_marble.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_kitchen_cabinet_top_steel.png b/mods/homedecor_modpack/homedecor/textures/homedecor_kitchen_cabinet_top_steel.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_kitchen_cabinet_top_wood.png b/mods/homedecor_modpack/homedecor/textures/homedecor_kitchen_cabinet_top_wood.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_kitchen_faucet_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_kitchen_faucet_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_kitchen_sink_top.png b/mods/homedecor_modpack/homedecor/textures/homedecor_kitchen_sink_top.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_lattice.png b/mods/homedecor_modpack/homedecor/textures/homedecor_lattice.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_lattice_lantern_large.png b/mods/homedecor_modpack/homedecor/textures/homedecor_lattice_lantern_large.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_lattice_lantern_small_sides.png b/mods/homedecor_modpack/homedecor/textures/homedecor_lattice_lantern_small_sides.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_lattice_lantern_small_tb.png b/mods/homedecor_modpack/homedecor/textures/homedecor_lattice_lantern_small_tb.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_lattice_vegetal.png b/mods/homedecor_modpack/homedecor/textures/homedecor_lattice_vegetal.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_light.png b/mods/homedecor_modpack/homedecor/textures/homedecor_light.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_light_switch_back.png b/mods/homedecor_modpack/homedecor/textures/homedecor_light_switch_back.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_light_switch_edges.png b/mods/homedecor_modpack/homedecor/textures/homedecor_light_switch_edges.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_light_switch_front.png b/mods/homedecor_modpack/homedecor/textures/homedecor_light_switch_front.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_light_switch_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_light_switch_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_marble.png b/mods/homedecor_modpack/homedecor/textures/homedecor_marble.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_medicine_cabinet_inside.png b/mods/homedecor_modpack/homedecor/textures/homedecor_medicine_cabinet_inside.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_medicine_cabinet_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_medicine_cabinet_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_medicine_cabinet_mirror.png b/mods/homedecor_modpack/homedecor/textures/homedecor_medicine_cabinet_mirror.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_microwave_front.png b/mods/homedecor_modpack/homedecor/textures/homedecor_microwave_front.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_microwave_front_active.png b/mods/homedecor_modpack/homedecor/textures/homedecor_microwave_front_active.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_microwave_top.png b/mods/homedecor_modpack/homedecor/textures/homedecor_microwave_top.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_motor.png b/mods/homedecor_modpack/homedecor/textures/homedecor_motor.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_nightstand_mahogany_1_drawer_front.png b/mods/homedecor_modpack/homedecor/textures/homedecor_nightstand_mahogany_1_drawer_front.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_nightstand_mahogany_2_drawer_front.png b/mods/homedecor_modpack/homedecor/textures/homedecor_nightstand_mahogany_2_drawer_front.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_nightstand_mahogany_back.png b/mods/homedecor_modpack/homedecor/textures/homedecor_nightstand_mahogany_back.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_nightstand_mahogany_lr.png b/mods/homedecor_modpack/homedecor/textures/homedecor_nightstand_mahogany_lr.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_nightstand_mahogany_tb.png b/mods/homedecor_modpack/homedecor/textures/homedecor_nightstand_mahogany_tb.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_nightstand_oak_1_drawer_front.png b/mods/homedecor_modpack/homedecor/textures/homedecor_nightstand_oak_1_drawer_front.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_nightstand_oak_2_drawer_front.png b/mods/homedecor_modpack/homedecor/textures/homedecor_nightstand_oak_2_drawer_front.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_nightstand_oak_back.png b/mods/homedecor_modpack/homedecor/textures/homedecor_nightstand_oak_back.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_nightstand_oak_lr.png b/mods/homedecor_modpack/homedecor/textures/homedecor_nightstand_oak_lr.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_nightstand_oak_tb.png b/mods/homedecor_modpack/homedecor/textures/homedecor_nightstand_oak_tb.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_office_chair_basic.png b/mods/homedecor_modpack/homedecor/textures/homedecor_office_chair_basic.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_office_chair_upscale.png b/mods/homedecor_modpack/homedecor/textures/homedecor_office_chair_upscale.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_oil_extract.png b/mods/homedecor_modpack/homedecor/textures/homedecor_oil_extract.png old mode 100644 new mode 100755 index 48e6dffd..e34623d0 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_oil_extract.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_oil_extract.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_oil_lamp_glass.png b/mods/homedecor_modpack/homedecor/textures/homedecor_oil_lamp_glass.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_oil_lamp_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_oil_lamp_inv.png old mode 100644 new mode 100755 index a37b2254..084d1f69 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_oil_lamp_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_oil_lamp_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_oil_lamp_tabletop.png b/mods/homedecor_modpack/homedecor/textures/homedecor_oil_lamp_tabletop.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_oil_lamp_tabletop_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_oil_lamp_tabletop_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_oil_lamp_wick.png b/mods/homedecor_modpack/homedecor/textures/homedecor_oil_lamp_wick.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_openframe_bookshelf_books.png b/mods/homedecor_modpack/homedecor/textures/homedecor_openframe_bookshelf_books.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_outlet_back.png b/mods/homedecor_modpack/homedecor/textures/homedecor_outlet_back.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_outlet_edges.png b/mods/homedecor_modpack/homedecor/textures/homedecor_outlet_edges.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_outlet_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_outlet_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_oven_bottom.png b/mods/homedecor_modpack/homedecor/textures/homedecor_oven_bottom.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_oven_front.png b/mods/homedecor_modpack/homedecor/textures/homedecor_oven_front.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_oven_front_active.png b/mods/homedecor_modpack/homedecor/textures/homedecor_oven_front_active.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_oven_side.png b/mods/homedecor_modpack/homedecor/textures/homedecor_oven_side.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_oven_steel_bottom.png b/mods/homedecor_modpack/homedecor/textures/homedecor_oven_steel_bottom.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_oven_steel_front.png b/mods/homedecor_modpack/homedecor/textures/homedecor_oven_steel_front.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_oven_steel_front_active.png b/mods/homedecor_modpack/homedecor/textures/homedecor_oven_steel_front_active.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_oven_steel_side.png b/mods/homedecor_modpack/homedecor/textures/homedecor_oven_steel_side.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_oven_steel_top.png b/mods/homedecor_modpack/homedecor/textures/homedecor_oven_steel_top.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_oven_top.png b/mods/homedecor_modpack/homedecor/textures/homedecor_oven_top.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_painting1.png b/mods/homedecor_modpack/homedecor/textures/homedecor_painting1.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_painting10.png b/mods/homedecor_modpack/homedecor/textures/homedecor_painting10.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_painting11.png b/mods/homedecor_modpack/homedecor/textures/homedecor_painting11.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_painting12.png b/mods/homedecor_modpack/homedecor/textures/homedecor_painting12.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_painting13.png b/mods/homedecor_modpack/homedecor/textures/homedecor_painting13.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_painting14.png b/mods/homedecor_modpack/homedecor/textures/homedecor_painting14.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_painting15.png b/mods/homedecor_modpack/homedecor/textures/homedecor_painting15.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_painting16.png b/mods/homedecor_modpack/homedecor/textures/homedecor_painting16.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_painting17.png b/mods/homedecor_modpack/homedecor/textures/homedecor_painting17.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_painting18.png b/mods/homedecor_modpack/homedecor/textures/homedecor_painting18.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_painting19.png b/mods/homedecor_modpack/homedecor/textures/homedecor_painting19.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_painting2.png b/mods/homedecor_modpack/homedecor/textures/homedecor_painting2.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_painting20.png b/mods/homedecor_modpack/homedecor/textures/homedecor_painting20.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_painting3.png b/mods/homedecor_modpack/homedecor/textures/homedecor_painting3.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_painting4.png b/mods/homedecor_modpack/homedecor/textures/homedecor_painting4.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_painting5.png b/mods/homedecor_modpack/homedecor/textures/homedecor_painting5.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_painting6.png b/mods/homedecor_modpack/homedecor/textures/homedecor_painting6.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_painting7.png b/mods/homedecor_modpack/homedecor/textures/homedecor_painting7.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_painting8.png b/mods/homedecor_modpack/homedecor/textures/homedecor_painting8.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_painting9.png b/mods/homedecor_modpack/homedecor/textures/homedecor_painting9.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_painting_back.png b/mods/homedecor_modpack/homedecor/textures/homedecor_painting_back.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_paper_towel_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_paper_towel_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_paraffin.png b/mods/homedecor_modpack/homedecor/textures/homedecor_paraffin.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_piano_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_piano_inv.png old mode 100644 new mode 100755 index 3ce526dc..f0610220 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_piano_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_piano_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_piano_keys.png b/mods/homedecor_modpack/homedecor/textures/homedecor_piano_keys.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_picture_frame1_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_picture_frame1_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_picture_frame2_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_picture_frame2_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_picture_frame_back.png b/mods/homedecor_modpack/homedecor/textures/homedecor_picture_frame_back.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_picture_frame_image1.png b/mods/homedecor_modpack/homedecor/textures/homedecor_picture_frame_image1.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_picture_frame_image2.png b/mods/homedecor_modpack/homedecor/textures/homedecor_picture_frame_image2.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_plasma_ball_glass.png b/mods/homedecor_modpack/homedecor/textures/homedecor_plasma_ball_glass.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_plasma_ball_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_plasma_ball_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_plasma_ball_streamers.png b/mods/homedecor_modpack/homedecor/textures/homedecor_plasma_ball_streamers.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_plasma_storm.png b/mods/homedecor_modpack/homedecor/textures/homedecor_plasma_storm.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_plastic_sheeting.png b/mods/homedecor_modpack/homedecor/textures/homedecor_plastic_sheeting.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_plastic_strips.png b/mods/homedecor_modpack/homedecor/textures/homedecor_plastic_strips.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_pole_brass_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_pole_brass_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_pole_wrought_iron_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_pole_wrought_iron_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_polished_copper.png b/mods/homedecor_modpack/homedecor/textures/homedecor_polished_copper.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_pool_table_baize.png b/mods/homedecor_modpack/homedecor/textures/homedecor_pool_table_baize.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_pool_table_balls.png b/mods/homedecor_modpack/homedecor/textures/homedecor_pool_table_balls.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_pool_table_cue.png b/mods/homedecor_modpack/homedecor/textures/homedecor_pool_table_cue.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_pool_table_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_pool_table_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_pool_table_pockets.png b/mods/homedecor_modpack/homedecor/textures/homedecor_pool_table_pockets.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_potted.png b/mods/homedecor_modpack/homedecor/textures/homedecor_potted.png new file mode 100755 index 00000000..ab03d05d Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_potted.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_potted_bonsai.png b/mods/homedecor_modpack/homedecor/textures/homedecor_potted_bonsai.png new file mode 100755 index 00000000..bdc95ee3 Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_potted_bonsai.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_potted_cactus.png b/mods/homedecor_modpack/homedecor/textures/homedecor_potted_cactus.png new file mode 100755 index 00000000..e3c03da8 Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_potted_cactus.png differ diff --git a/mods/plantlife_modpack/flowers_plus/textures/flowers_potted_dandelion_white.png b/mods/homedecor_modpack/homedecor/textures/homedecor_potted_dandelion_white.png old mode 100644 new mode 100755 similarity index 100% rename from mods/plantlife_modpack/flowers_plus/textures/flowers_potted_dandelion_white.png rename to mods/homedecor_modpack/homedecor/textures/homedecor_potted_dandelion_white.png diff --git a/mods/plantlife_modpack/flowers_plus/textures/flowers_potted_dandelion_yellow.png b/mods/homedecor_modpack/homedecor/textures/homedecor_potted_dandelion_yellow.png old mode 100644 new mode 100755 similarity index 100% rename from mods/plantlife_modpack/flowers_plus/textures/flowers_potted_dandelion_yellow.png rename to mods/homedecor_modpack/homedecor/textures/homedecor_potted_dandelion_yellow.png diff --git a/mods/plantlife_modpack/flowers_plus/textures/flowers_potted_geranium.png b/mods/homedecor_modpack/homedecor/textures/homedecor_potted_geranium.png old mode 100644 new mode 100755 similarity index 100% rename from mods/plantlife_modpack/flowers_plus/textures/flowers_potted_geranium.png rename to mods/homedecor_modpack/homedecor/textures/homedecor_potted_geranium.png diff --git a/mods/plantlife_modpack/flowers_plus/textures/flowers_potted_rose.png b/mods/homedecor_modpack/homedecor/textures/homedecor_potted_rose.png old mode 100644 new mode 100755 similarity index 100% rename from mods/plantlife_modpack/flowers_plus/textures/flowers_potted_rose.png rename to mods/homedecor_modpack/homedecor/textures/homedecor_potted_rose.png diff --git a/mods/plantlife_modpack/flowers_plus/textures/flowers_potted_tulip.png b/mods/homedecor_modpack/homedecor/textures/homedecor_potted_tulip.png old mode 100644 new mode 100755 similarity index 100% rename from mods/plantlife_modpack/flowers_plus/textures/flowers_potted_tulip.png rename to mods/homedecor_modpack/homedecor/textures/homedecor_potted_tulip.png diff --git a/mods/plantlife_modpack/flowers_plus/textures/flowers_potted_viola.png b/mods/homedecor_modpack/homedecor/textures/homedecor_potted_viola.png old mode 100644 new mode 100755 similarity index 100% rename from mods/plantlife_modpack/flowers_plus/textures/flowers_potted_viola.png rename to mods/homedecor_modpack/homedecor/textures/homedecor_potted_viola.png diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_power_crystal.png b/mods/homedecor_modpack/homedecor/textures/homedecor_power_crystal.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_projection_screen.png b/mods/homedecor_modpack/homedecor/textures/homedecor_projection_screen.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_projection_screen_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_projection_screen_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_radiator_controls.png b/mods/homedecor_modpack/homedecor/textures/homedecor_radiator_controls.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_radiator_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_radiator_inv.png old mode 100644 new mode 100755 index d58fa41b..3059f0a0 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_radiator_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_radiator_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_steel.png b/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_steel.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_steel_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_steel_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_white.png b/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_white.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_white_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_refrigerator_white_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_roof_tile_terracotta.png b/mods/homedecor_modpack/homedecor/textures/homedecor_roof_tile_terracotta.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_rope_texture.png b/mods/homedecor_modpack/homedecor/textures/homedecor_rope_texture.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_rug_large.png b/mods/homedecor_modpack/homedecor/textures/homedecor_rug_large.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_rug_persian.png b/mods/homedecor_modpack/homedecor/textures/homedecor_rug_persian.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_rug_small.png b/mods/homedecor_modpack/homedecor/textures/homedecor_rug_small.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_shingles_asphalt.png b/mods/homedecor_modpack/homedecor/textures/homedecor_shingles_asphalt.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_shingles_asphalt_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_shingles_asphalt_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_shingles_glass.png b/mods/homedecor_modpack/homedecor/textures/homedecor_shingles_glass.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_shingles_terracotta.png b/mods/homedecor_modpack/homedecor/textures/homedecor_shingles_terracotta.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_shingles_terracotta_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_shingles_terracotta_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_shingles_wood.png b/mods/homedecor_modpack/homedecor/textures/homedecor_shingles_wood.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_shingles_wood_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_shingles_wood_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_shower_head.png b/mods/homedecor_modpack/homedecor/textures/homedecor_shower_head.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_shower_head_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_shower_head_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_sign_brass_post.png b/mods/homedecor_modpack/homedecor/textures/homedecor_sign_brass_post.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_sign_brass_post_back.png b/mods/homedecor_modpack/homedecor/textures/homedecor_sign_brass_post_back.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_sign_brass_post_bottom.png b/mods/homedecor_modpack/homedecor/textures/homedecor_sign_brass_post_bottom.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_sign_brass_post_front.png b/mods/homedecor_modpack/homedecor/textures/homedecor_sign_brass_post_front.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_sign_brass_post_side.png b/mods/homedecor_modpack/homedecor/textures/homedecor_sign_brass_post_side.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_sign_brass_post_top.png b/mods/homedecor_modpack/homedecor/textures/homedecor_sign_brass_post_top.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_sign_wrought_iron_post.png b/mods/homedecor_modpack/homedecor/textures/homedecor_sign_wrought_iron_post.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_sign_wrought_iron_post_back.png b/mods/homedecor_modpack/homedecor/textures/homedecor_sign_wrought_iron_post_back.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_sign_wrought_iron_post_bottom.png b/mods/homedecor_modpack/homedecor/textures/homedecor_sign_wrought_iron_post_bottom.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_sign_wrought_iron_post_front.png b/mods/homedecor_modpack/homedecor/textures/homedecor_sign_wrought_iron_post_front.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_sign_wrought_iron_post_side.png b/mods/homedecor_modpack/homedecor/textures/homedecor_sign_wrought_iron_post_side.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_sign_wrought_iron_post_top.png b/mods/homedecor_modpack/homedecor/textures/homedecor_sign_wrought_iron_post_top.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_silicon.png b/mods/homedecor_modpack/homedecor/textures/homedecor_silicon.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_skateboard.png b/mods/homedecor_modpack/homedecor/textures/homedecor_skateboard.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_skateboard_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_skateboard_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_skylight_frosted.png b/mods/homedecor_modpack/homedecor/textures/homedecor_skylight_frosted.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_skylight_frosted_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_skylight_frosted_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_skylight_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_skylight_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_soda_can.png b/mods/homedecor_modpack/homedecor/textures/homedecor_soda_can.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_soda_machine.png b/mods/homedecor_modpack/homedecor/textures/homedecor_soda_machine.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_speaker_driver.png b/mods/homedecor_modpack/homedecor/textures/homedecor_speaker_driver.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_speaker_driver_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_speaker_driver_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_speaker_front.png b/mods/homedecor_modpack/homedecor/textures/homedecor_speaker_front.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_speaker_open_front.png b/mods/homedecor_modpack/homedecor/textures/homedecor_speaker_open_front.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_speaker_sides.png b/mods/homedecor_modpack/homedecor/textures/homedecor_speaker_sides.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_sport_bench_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_sport_bench_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_stained_glass.png b/mods/homedecor_modpack/homedecor/textures/homedecor_stained_glass.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_standing_lamp_foot_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_standing_lamp_foot_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_standing_lamp_top_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_standing_lamp_top_inv.png old mode 100644 new mode 100755 index 2190d2ad..23a0817a Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_standing_lamp_top_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_standing_lamp_top_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_steam.png b/mods/homedecor_modpack/homedecor/textures/homedecor_steam.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_steel_strip.png b/mods/homedecor_modpack/homedecor/textures/homedecor_steel_strip.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_steel_wire.png b/mods/homedecor_modpack/homedecor/textures/homedecor_steel_wire.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_stereo_back.png b/mods/homedecor_modpack/homedecor/textures/homedecor_stereo_back.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_stereo_bottom.png b/mods/homedecor_modpack/homedecor/textures/homedecor_stereo_bottom.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_stereo_front.png b/mods/homedecor_modpack/homedecor/textures/homedecor_stereo_front.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_stereo_left.png b/mods/homedecor_modpack/homedecor/textures/homedecor_stereo_left.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_stereo_top.png b/mods/homedecor_modpack/homedecor/textures/homedecor_stereo_top.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_stonepath_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_stonepath_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_swing_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_swing_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_swing_top.png b/mods/homedecor_modpack/homedecor/textures/homedecor_swing_top.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_swingrope_sides.png b/mods/homedecor_modpack/homedecor/textures/homedecor_swingrope_sides.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_table_lamp_foot_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_table_lamp_foot_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_table_lamp_top_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_table_lamp_top_inv.png old mode 100644 new mode 100755 index ce657653..6a753f43 Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_table_lamp_top_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_table_lamp_top_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_table_legs_brass.png b/mods/homedecor_modpack/homedecor/textures/homedecor_table_legs_brass.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_table_legs_wrought_iron.png b/mods/homedecor_modpack/homedecor/textures/homedecor_table_legs_wrought_iron.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_lightbulb.png b/mods/homedecor_modpack/homedecor/textures/homedecor_table_standing_lamp_lightbulb.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_tatami.png b/mods/homedecor_modpack/homedecor/textures/homedecor_tatami.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_telephone_base.png b/mods/homedecor_modpack/homedecor/textures/homedecor_telephone_base.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_telephone_cord.png b/mods/homedecor_modpack/homedecor/textures/homedecor_telephone_cord.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_telephone_dial.png b/mods/homedecor_modpack/homedecor/textures/homedecor_telephone_dial.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_telephone_handset.png b/mods/homedecor_modpack/homedecor/textures/homedecor_telephone_handset.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_telephone_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_telephone_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_television_back.png b/mods/homedecor_modpack/homedecor/textures/homedecor_television_back.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_television_bottom.png b/mods/homedecor_modpack/homedecor/textures/homedecor_television_bottom.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_television_front.png b/mods/homedecor_modpack/homedecor/textures/homedecor_television_front.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_television_front_animated.png b/mods/homedecor_modpack/homedecor/textures/homedecor_television_front_animated.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_television_left.png b/mods/homedecor_modpack/homedecor/textures/homedecor_television_left.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_television_top.png b/mods/homedecor_modpack/homedecor/textures/homedecor_television_top.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_terracotta_base.png b/mods/homedecor_modpack/homedecor/textures/homedecor_terracotta_base.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_toaster_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_toaster_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_toaster_sides.png b/mods/homedecor_modpack/homedecor/textures/homedecor_toaster_sides.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_toaster_toploaf.png b/mods/homedecor_modpack/homedecor/textures/homedecor_toaster_toploaf.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_toilet_paper_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_toilet_paper_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_tool_cabinet_drawers.png b/mods/homedecor_modpack/homedecor/textures/homedecor_tool_cabinet_drawers.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_tool_cabinet_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_tool_cabinet_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_tool_cabinet_misc.png b/mods/homedecor_modpack/homedecor/textures/homedecor_tool_cabinet_misc.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_towel_rod_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_towel_rod_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_trash_can.png b/mods/homedecor_modpack/homedecor/textures/homedecor_trash_can.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_trash_can_green_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_trash_can_green_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_trash_can_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_trash_can_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_trophy_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_trophy_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_utility_table_edges.png b/mods/homedecor_modpack/homedecor/textures/homedecor_utility_table_edges.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_utility_table_legs.png b/mods/homedecor_modpack/homedecor/textures/homedecor_utility_table_legs.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_utility_table_legs_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_utility_table_legs_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_utility_table_tb.png b/mods/homedecor_modpack/homedecor/textures/homedecor_utility_table_tb.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_vcr.png b/mods/homedecor_modpack/homedecor/textures/homedecor_vcr.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_wall_lamp_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_wall_lamp_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_wall_sconce_back.png b/mods/homedecor_modpack/homedecor/textures/homedecor_wall_sconce_back.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_wall_sconce_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_wall_sconce_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_wardrobe_doors.png b/mods/homedecor_modpack/homedecor/textures/homedecor_wardrobe_doors.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_wardrobe_drawers.png b/mods/homedecor_modpack/homedecor/textures/homedecor_wardrobe_drawers.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_wardrobe_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_wardrobe_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_washing_machine_back.png b/mods/homedecor_modpack/homedecor/textures/homedecor_washing_machine_back.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_washing_machine_bottom.png b/mods/homedecor_modpack/homedecor/textures/homedecor_washing_machine_bottom.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_washing_machine_front.png b/mods/homedecor_modpack/homedecor/textures/homedecor_washing_machine_front.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_washing_machine_sides.png b/mods/homedecor_modpack/homedecor/textures/homedecor_washing_machine_sides.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_washing_machine_top.png b/mods/homedecor_modpack/homedecor/textures/homedecor_washing_machine_top.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_water_particle.png b/mods/homedecor_modpack/homedecor/textures/homedecor_water_particle.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_welcome_mat_bottom.png b/mods/homedecor_modpack/homedecor/textures/homedecor_welcome_mat_bottom.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_welcome_mat_brown.png b/mods/homedecor_modpack/homedecor/textures/homedecor_welcome_mat_brown.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_welcome_mat_green.png b/mods/homedecor_modpack/homedecor/textures/homedecor_welcome_mat_green.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_welcome_mat_grey.png b/mods/homedecor_modpack/homedecor/textures/homedecor_welcome_mat_grey.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_well_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_well_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_window_frame.png b/mods/homedecor_modpack/homedecor/textures/homedecor_window_frame.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_window_quartered.png b/mods/homedecor_modpack/homedecor/textures/homedecor_window_quartered.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter.png b/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_inv.png old mode 100644 new mode 100755 index eecb908f..c3f54aac Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_window_shutter_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_window_sides.png b/mods/homedecor_modpack/homedecor/textures/homedecor_window_sides.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_windowblind_strings.png b/mods/homedecor_modpack/homedecor/textures/homedecor_windowblind_strings.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_windowblind_thick_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_windowblind_thick_inv.png old mode 100644 new mode 100755 index 254bb33b..63c2dedc Binary files a/mods/homedecor_modpack/homedecor/textures/homedecor_windowblind_thick_inv.png and b/mods/homedecor_modpack/homedecor/textures/homedecor_windowblind_thick_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_windowblind_thin_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_windowblind_thin_inv.png new file mode 100755 index 00000000..5e70dfea Binary files /dev/null and b/mods/homedecor_modpack/homedecor/textures/homedecor_windowblind_thin_inv.png differ diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_windowblinds.png b/mods/homedecor_modpack/homedecor/textures/homedecor_windowblinds.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_wine_rack_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_wine_rack_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_wood_table_large_edges.png b/mods/homedecor_modpack/homedecor/textures/homedecor_wood_table_large_edges.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_wood_table_large_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_wood_table_large_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_wood_table_large_tb.png b/mods/homedecor_modpack/homedecor/textures/homedecor_wood_table_large_tb.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_wood_table_small_round.png b/mods/homedecor_modpack/homedecor/textures/homedecor_wood_table_small_round.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_wood_table_small_round_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_wood_table_small_round_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_wood_table_small_square.png b/mods/homedecor_modpack/homedecor/textures/homedecor_wood_table_small_square.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_wood_table_small_square_inv.png b/mods/homedecor_modpack/homedecor/textures/homedecor_wood_table_small_square_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/trash_cans.lua b/mods/homedecor_modpack/homedecor/trash_cans.lua old mode 100644 new mode 100755 index 82b3e5cb..a3049109 --- a/mods/homedecor_modpack/homedecor/trash_cans.lua +++ b/mods/homedecor_modpack/homedecor/trash_cans.lua @@ -17,7 +17,6 @@ homedecor.register("trash_can_green", { on_punch = function(pos, node, puncher, pointed_thing) minetest.set_node(pos, {name = "homedecor:trash_can_green_open", param2 = node.param2}) end - }) homedecor.register("trash_can_green_open", { @@ -27,6 +26,7 @@ homedecor.register("trash_can_green_open", { groups = {snappy=3, not_in_creative_inventory=1}, selection_box = tg_cbox, collision_box = tg_cbox, + drop = "homedecor:trash_can_green", on_punch = function(pos, node, puncher, pointed_thing) minetest.set_node(pos, {name = "homedecor:trash_can_green", param2 = node.param2}) end, @@ -65,7 +65,7 @@ homedecor.register("trash_can_green_open", { inv:set_list("main", {}) minetest.sound_play("homedecor_trash_all", {to_player=sender:get_player_name(), gain = 1.0}) end - end, + end }) local trash_cbox = { diff --git a/mods/homedecor_modpack/homedecor/wardrobe.lua b/mods/homedecor_modpack/homedecor/wardrobe.lua old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor/window_treatments.lua b/mods/homedecor_modpack/homedecor/window_treatments.lua index 9d4e90b8..2d9b1253 100755 --- a/mods/homedecor_modpack/homedecor/window_treatments.lua +++ b/mods/homedecor_modpack/homedecor/window_treatments.lua @@ -87,7 +87,7 @@ local wb2_cbox = { homedecor.register("blinds_thin", { description = "Window Blinds (thin)", mesh = "homedecor_windowblind_thin.obj", - inventory_image = "homedecor_windowblind_thick_inv.png", + inventory_image = "homedecor_windowblind_thin_inv.png", tiles = { "homedecor_windowblind_strings.png", "homedecor_windowblinds.png" diff --git a/mods/homedecor_modpack/homedecor_3d_extras/LICENSE b/mods/homedecor_modpack/homedecor_3d_extras/LICENSE deleted file mode 100755 index 65c5ca88..00000000 --- a/mods/homedecor_modpack/homedecor_3d_extras/LICENSE +++ /dev/null @@ -1,165 +0,0 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - - This version of the GNU Lesser General Public License incorporates -the terms and conditions of version 3 of the GNU General Public -License, supplemented by the additional permissions listed below. - - 0. Additional Definitions. - - As used herein, "this License" refers to version 3 of the GNU Lesser -General Public License, and the "GNU GPL" refers to version 3 of the GNU -General Public License. - - "The Library" refers to a covered work governed by this License, -other than an Application or a Combined Work as defined below. - - An "Application" is any work that makes use of an interface provided -by the Library, but which is not otherwise based on the Library. -Defining a subclass of a class defined by the Library is deemed a mode -of using an interface provided by the Library. - - A "Combined Work" is a work produced by combining or linking an -Application with the Library. The particular version of the Library -with which the Combined Work was made is also called the "Linked -Version". - - The "Minimal Corresponding Source" for a Combined Work means the -Corresponding Source for the Combined Work, excluding any source code -for portions of the Combined Work that, considered in isolation, are -based on the Application, and not on the Linked Version. - - The "Corresponding Application Code" for a Combined Work means the -object code and/or source code for the Application, including any data -and utility programs needed for reproducing the Combined Work from the -Application, but excluding the System Libraries of the Combined Work. - - 1. Exception to Section 3 of the GNU GPL. - - You may convey a covered work under sections 3 and 4 of this License -without being bound by section 3 of the GNU GPL. - - 2. Conveying Modified Versions. - - If you modify a copy of the Library, and, in your modifications, a -facility refers to a function or data to be supplied by an Application -that uses the facility (other than as an argument passed when the -facility is invoked), then you may convey a copy of the modified -version: - - a) under this License, provided that you make a good faith effort to - ensure that, in the event an Application does not supply the - function or data, the facility still operates, and performs - whatever part of its purpose remains meaningful, or - - b) under the GNU GPL, with none of the additional permissions of - this License applicable to that copy. - - 3. Object Code Incorporating Material from Library Header Files. - - The object code form of an Application may incorporate material from -a header file that is part of the Library. You may convey such object -code under terms of your choice, provided that, if the incorporated -material is not limited to numerical parameters, data structure -layouts and accessors, or small macros, inline functions and templates -(ten or fewer lines in length), you do both of the following: - - a) Give prominent notice with each copy of the object code that the - Library is used in it and that the Library and its use are - covered by this License. - - b) Accompany the object code with a copy of the GNU GPL and this license - document. - - 4. Combined Works. - - You may convey a Combined Work under terms of your choice that, -taken together, effectively do not restrict modification of the -portions of the Library contained in the Combined Work and reverse -engineering for debugging such modifications, if you also do each of -the following: - - a) Give prominent notice with each copy of the Combined Work that - the Library is used in it and that the Library and its use are - covered by this License. - - b) Accompany the Combined Work with a copy of the GNU GPL and this license - document. - - c) For a Combined Work that displays copyright notices during - execution, include the copyright notice for the Library among - these notices, as well as a reference directing the user to the - copies of the GNU GPL and this license document. - - d) Do one of the following: - - 0) Convey the Minimal Corresponding Source under the terms of this - License, and the Corresponding Application Code in a form - suitable for, and under terms that permit, the user to - recombine or relink the Application with a modified version of - the Linked Version to produce a modified Combined Work, in the - manner specified by section 6 of the GNU GPL for conveying - Corresponding Source. - - 1) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (a) uses at run time - a copy of the Library already present on the user's computer - system, and (b) will operate properly with a modified version - of the Library that is interface-compatible with the Linked - Version. - - e) Provide Installation Information, but only if you would otherwise - be required to provide such information under section 6 of the - GNU GPL, and only to the extent that such information is - necessary to install and execute a modified version of the - Combined Work produced by recombining or relinking the - Application with a modified version of the Linked Version. (If - you use option 4d0, the Installation Information must accompany - the Minimal Corresponding Source and Corresponding Application - Code. If you use option 4d1, you must provide the Installation - Information in the manner specified by section 6 of the GNU GPL - for conveying Corresponding Source.) - - 5. Combined Libraries. - - You may place library facilities that are a work based on the -Library side by side in a single library together with other library -facilities that are not Applications and are not covered by this -License, and convey such a combined library under terms of your -choice, if you do both of the following: - - a) Accompany the combined library with a copy of the same work based - on the Library, uncombined with any other library facilities, - conveyed under the terms of this License. - - b) Give prominent notice with the combined library that part of it - is a work based on the Library, and explaining where to find the - accompanying uncombined form of the same work. - - 6. Revised Versions of the GNU Lesser General Public License. - - The Free Software Foundation may publish revised and/or new versions -of the GNU Lesser General Public License from time to time. Such new -versions will be similar in spirit to the present version, but may -differ in detail to address new problems or concerns. - - Each version is given a distinguishing version number. If the -Library as you received it specifies that a certain numbered version -of the GNU Lesser General Public License "or any later version" -applies to it, you have the option of following the terms and -conditions either of that published version or of any later version -published by the Free Software Foundation. If the Library as you -received it does not specify a version number of the GNU Lesser -General Public License, you may choose any version of the GNU Lesser -General Public License ever published by the Free Software Foundation. - - If the Library as you received it specifies that a proxy can decide -whether future versions of the GNU Lesser General Public License shall -apply, that proxy's public statement of acceptance of any version is -permanent authorization for you to choose that version for the -Library. diff --git a/mods/homedecor_modpack/homedecor_3d_extras/init.lua b/mods/homedecor_modpack/homedecor_3d_extras/init.lua index 32b25f3f..0b18d92c 100755 --- a/mods/homedecor_modpack/homedecor_3d_extras/init.lua +++ b/mods/homedecor_modpack/homedecor_3d_extras/init.lua @@ -10,18 +10,56 @@ minetest.override_item("default:bookshelf", { paramtype2 = "facedir", }) -if minetest.get_modpath("vessels") and minetest.registered_nodes["vessels:shelf"] then +if minetest.get_modpath("vessels") + and minetest.registered_nodes["vessels:shelf"] + and minetest.registered_nodes["vessels:glass_bottle"] + and minetest.registered_nodes["vessels:drinking_glass"] then + minetest.override_item("vessels:shelf", { drawtype = "mesh", - mesh = "3dvesselshelf.obj", + mesh = "3dvessels_shelf.obj", tiles = { "default_wood.png", "default_wood.png^3dbookshelf_inside_back.png", - "3dvesselshelf_glass.png", + "3dvessels_shelf_glass.png", }, - use_texture_alpha = true, paramtype = "light", paramtype2 = "facedir", + use_texture_alpha = true + }) + + local sbox = { + type = "fixed", + fixed = { -0.15, -0.5, -0.15, 0.15, -0.1, 0.15 } + } + + minetest.override_item("vessels:glass_bottle", { + drawtype = "mesh", + mesh = "3dvessels_bottle.obj", + tiles = {"3dvessels_shelf_glass.png"}, + inventory_image = "3dvessels_glass_bottle_inv.png", + wield_image = "3dvessels_glass_bottle_inv.png", + use_texture_alpha = true, + selection_box = sbox + }) + + minetest.override_item("vessels:steel_bottle", { + drawtype = "mesh", + mesh = "3dvessels_bottle_steel.obj", + tiles = {"bottle_metal_bright.png"}, + inventory_image = "3dvessels_steel_bottle_inv.png", + wield_image = "3dvessels_steel_bottle_inv.png", + selection_box = sbox + }) + + minetest.override_item("vessels:drinking_glass", { + drawtype = "mesh", + mesh = "3dvessels_drink.obj", + tiles = {"3dvessels_shelf_glass.png"}, + inventory_image = "3dvessels_drinking_glass_inv.png", + wield_image = "3dvessels_drinking_glass_inv.png", + use_texture_alpha = true, + selection_box = sbox }) end diff --git a/mods/homedecor_modpack/homedecor_3d_extras/models/3dvessels_bottle.obj b/mods/homedecor_modpack/homedecor_3d_extras/models/3dvessels_bottle.obj new file mode 100755 index 00000000..03e780ba --- /dev/null +++ b/mods/homedecor_modpack/homedecor_3d_extras/models/3dvessels_bottle.obj @@ -0,0 +1,216 @@ +# Blender v2.72 (sub 0) OBJ File: '' +# www.blender.org +mtllib 3dvesselbottle.mtl +o glass_bottle +v 0.012054 -0.152742 0.028345 +v 0.010687 -0.139846 0.025046 +v -0.010104 -0.139846 0.025046 +v -0.011470 -0.152742 0.028345 +v -0.024805 -0.139846 0.010345 +v -0.028104 -0.152742 0.011711 +v -0.024805 -0.139846 -0.010446 +v -0.028104 -0.152742 -0.011813 +v -0.010103 -0.139846 -0.025148 +v -0.011470 -0.152742 -0.028447 +v 0.010687 -0.139846 -0.025148 +v 0.012054 -0.152742 -0.028447 +v 0.025389 -0.139846 -0.010446 +v 0.028688 -0.152742 -0.011813 +v 0.025389 -0.139846 0.010345 +v 0.028688 -0.152742 0.011711 +v 0.031611 -0.499996 0.075560 +v -0.031027 -0.499996 0.075560 +v -0.075319 -0.499996 0.031268 +v -0.075319 -0.499996 -0.031370 +v -0.031027 -0.499996 -0.075662 +v 0.031611 -0.499996 -0.075662 +v 0.075903 -0.499996 -0.031370 +v 0.075903 -0.499996 0.031268 +v 0.084304 -0.294604 -0.034850 +v 0.019356 -0.191432 -0.007947 +v 0.019356 -0.191432 0.007846 +v 0.084304 -0.294604 0.034748 +v 0.008188 -0.191432 0.019013 +v 0.035091 -0.294604 0.083961 +v 0.035091 -0.294604 -0.084063 +v 0.008188 -0.191432 -0.019115 +v -0.034507 -0.294604 -0.084063 +v -0.007604 -0.191432 -0.019115 +v -0.083720 -0.294604 -0.034850 +v -0.018772 -0.191432 -0.007947 +v -0.083720 -0.294604 0.034748 +v -0.018772 -0.191432 0.007846 +v -0.034507 -0.294604 0.083961 +v -0.007605 -0.191432 0.019013 +v 0.008188 -0.165639 0.019013 +v -0.007605 -0.165639 0.019013 +v -0.018772 -0.165639 0.007846 +v -0.018772 -0.165639 -0.007947 +v -0.007604 -0.165639 -0.019115 +v 0.008188 -0.165639 -0.019115 +v 0.019356 -0.165639 -0.007947 +v 0.019356 -0.165639 0.007846 +v 0.037642 -0.464327 0.090121 +v 0.039774 -0.371983 0.095268 +v -0.039190 -0.371983 0.095268 +v -0.037059 -0.464327 0.090121 +v -0.095027 -0.371983 0.039431 +v -0.089880 -0.464327 0.037300 +v -0.095027 -0.371983 -0.039533 +v -0.089880 -0.464327 -0.037401 +v -0.039190 -0.371983 -0.095370 +v -0.037058 -0.464327 -0.090223 +v 0.039774 -0.371983 -0.095370 +v 0.037642 -0.464327 -0.090223 +v 0.095611 -0.371983 -0.039533 +v 0.090464 -0.464327 -0.037401 +v 0.090464 -0.464327 0.037300 +v 0.095611 -0.371983 0.039431 +vt 0.250000 0.750000 +vt 0.250000 0.875000 +vt 0.125000 0.875000 +vt 0.125000 0.750000 +vt 0.000000 0.875000 +vt 0.000000 0.750000 +vt 1.000000 0.750000 +vt 1.000000 0.875000 +vt 0.875000 0.875000 +vt 0.875000 0.750000 +vt 0.750000 0.875000 +vt 0.750000 0.750000 +vt 0.625000 0.875000 +vt 0.625000 0.750000 +vt 0.500000 0.875000 +vt 0.500000 0.750000 +vt 0.375000 0.750000 +vt 0.375000 0.875000 +vt 0.500000 0.375000 +vt 0.500000 0.500000 +vt 0.375000 0.500000 +vt 0.375000 0.375000 +vt 0.250000 0.500000 +vt 0.250000 0.375000 +vt 0.625000 0.375000 +vt 0.625000 0.500000 +vt 0.750000 0.375000 +vt 0.750000 0.500000 +vt 0.875000 0.375000 +vt 0.875000 0.500000 +vt 1.000000 0.375000 +vt 1.000000 0.500000 +vt 0.125000 0.375000 +vt 0.125000 0.500000 +vt 0.000000 0.500000 +vt 0.000000 0.375000 +vt 0.250000 0.625000 +vt 0.125000 0.625000 +vt 0.000000 0.625000 +vt 1.000000 0.625000 +vt 0.875000 0.625000 +vt 0.750000 0.625000 +vt 0.625000 0.625000 +vt 0.500000 0.625000 +vt 0.375000 0.625000 +vt 0.250000 0.125000 +vt 0.250000 0.250000 +vt 0.125000 0.250000 +vt 0.125000 0.125000 +vt 0.000000 0.250000 +vt 0.000000 0.125000 +vt 1.000000 0.125000 +vt 1.000000 0.250000 +vt 0.875000 0.250000 +vt 0.875000 0.125000 +vt 0.750000 0.250000 +vt 0.750000 0.125000 +vt 0.625000 0.250000 +vt 0.625000 0.125000 +vt 0.500000 0.250000 +vt 0.500000 0.125000 +vt 0.375000 0.125000 +vt 0.375000 0.250000 +vt 0.500000 -0.000000 +vt 0.375000 -0.000000 +vt 0.250000 -0.000000 +vt 0.625000 -0.000000 +vt 0.750000 -0.000000 +vt 0.875000 -0.000000 +vt 1.000000 0.000000 +vt 0.125000 -0.000000 +vt 0.000000 0.000000 +vt 0.341044 0.514065 +vt 0.341044 0.485935 +vt 0.360935 0.466044 +vt 0.389065 0.466044 +vt 0.408956 0.485935 +vt 0.408956 0.514065 +vt 0.389065 0.533956 +vt 0.360935 0.533956 +vt 0.727303 0.457625 +vt 0.667375 0.397697 +vt 0.582625 0.397697 +vt 0.522698 0.457625 +vt 0.522698 0.542375 +vt 0.582625 0.602302 +vt 0.667375 0.602302 +vt 0.727303 0.542375 +usemtl None +s 1 +f 1/1 2/2 3/3 4/4 +f 4/4 3/3 5/5 6/6 +f 6/7 5/8 7/9 8/10 +f 8/10 7/9 9/11 10/12 +f 10/12 9/11 11/13 12/14 +f 12/14 11/13 13/15 14/16 +f 16/17 15/18 2/2 1/1 +f 14/16 13/15 15/18 16/17 +f 25/19 26/20 27/21 28/22 +f 28/22 27/21 29/23 30/24 +f 31/25 32/26 26/20 25/19 +f 33/27 34/28 32/26 31/25 +f 35/29 36/30 34/28 33/27 +f 37/31 38/32 36/30 35/29 +f 39/33 40/34 38/35 37/36 +f 30/24 29/23 40/34 39/33 +f 41/37 1/1 4/4 42/38 +f 42/38 4/4 6/6 43/39 +f 43/40 6/7 8/10 44/41 +f 44/41 8/10 10/12 45/42 +f 45/42 10/12 12/14 46/43 +f 46/43 12/14 14/16 47/44 +f 48/45 16/17 1/1 41/37 +f 26/20 47/44 48/45 27/21 +f 27/21 48/45 41/37 29/23 +f 32/26 46/43 47/44 26/20 +f 34/28 45/42 46/43 32/26 +f 36/30 44/41 45/42 34/28 +f 38/32 43/40 44/41 36/30 +f 40/34 42/38 43/39 38/35 +f 29/23 41/37 42/38 40/34 +f 49/46 50/47 51/48 52/49 +f 52/49 51/48 53/50 54/51 +f 54/52 53/53 55/54 56/55 +f 56/55 55/54 57/56 58/57 +f 58/57 57/56 59/58 60/59 +f 60/59 59/58 61/60 62/61 +f 63/62 64/63 50/47 49/46 +f 62/61 61/60 64/63 63/62 +f 47/44 14/16 16/17 48/45 +f 23/64 62/61 63/62 24/65 +f 24/65 63/62 49/46 17/66 +f 22/67 60/59 62/61 23/64 +f 21/68 58/57 60/59 22/67 +f 20/69 56/55 58/57 21/68 +f 19/70 54/52 56/55 20/69 +f 18/71 52/49 54/51 19/72 +f 50/47 30/24 39/33 51/48 +f 51/48 39/33 37/36 53/50 +f 53/53 37/31 35/29 55/54 +f 55/54 35/29 33/27 57/56 +f 57/56 33/27 31/25 59/58 +f 59/58 31/25 25/19 61/60 +f 64/63 28/22 30/24 50/47 +f 61/60 25/19 28/22 64/63 +f 17/66 49/46 52/49 18/71 +f 15/73 13/74 11/75 9/76 7/77 5/78 3/79 2/80 +f 20/81 21/82 22/83 23/84 24/85 17/86 18/87 19/88 diff --git a/mods/homedecor_modpack/homedecor_3d_extras/models/3dvessels_bottle_steel.obj b/mods/homedecor_modpack/homedecor_3d_extras/models/3dvessels_bottle_steel.obj new file mode 100755 index 00000000..a82ec17b --- /dev/null +++ b/mods/homedecor_modpack/homedecor_3d_extras/models/3dvessels_bottle_steel.obj @@ -0,0 +1,180 @@ +# Blender v2.73 (sub 0) OBJ File: '' +# www.blender.org +o glass_bottle +v 0.018918 -0.139846 0.044919 +v -0.018336 -0.139846 0.044919 +v -0.044678 -0.139846 0.018577 +v -0.044678 -0.139846 -0.018677 +v -0.018334 -0.139846 -0.045021 +v 0.018918 -0.139846 -0.045021 +v 0.045262 -0.139846 -0.018677 +v 0.045262 -0.139846 0.018577 +v 0.125195 -0.294604 -0.051788 +v 0.045233 -0.191432 -0.018665 +v 0.045233 -0.191432 0.018565 +v 0.125195 -0.294604 0.051685 +v 0.018906 -0.191432 0.044889 +v 0.052029 -0.294604 0.124852 +v 0.052029 -0.294604 -0.124954 +v 0.018906 -0.191432 -0.044992 +v -0.051445 -0.294604 -0.124954 +v -0.018321 -0.191432 -0.044992 +v -0.124611 -0.294604 -0.051788 +v -0.044648 -0.191432 -0.018665 +v -0.124611 -0.294604 0.051685 +v -0.044648 -0.191432 0.018565 +v -0.051445 -0.294604 0.124852 +v -0.018324 -0.191432 0.044889 +v 0.052035 -0.464327 0.124870 +v -0.051453 -0.464327 0.124870 +v -0.124629 -0.464327 0.051694 +v -0.124629 -0.464327 -0.051794 +v -0.051451 -0.464327 -0.124972 +v 0.052035 -0.464327 -0.124972 +v 0.125213 -0.464327 -0.051794 +v 0.125213 -0.464327 0.051694 +v 0.105041 -0.499996 -0.043439 +v 0.105041 -0.499996 0.043337 +v 0.043680 -0.499996 0.104698 +v 0.043680 -0.499996 -0.104800 +v -0.043096 -0.499996 -0.104800 +v -0.104457 -0.499996 -0.043439 +v -0.104457 -0.499996 0.043337 +v -0.043096 -0.499996 0.104698 +vt 0.750000 0.562500 +vt 0.750000 0.687500 +vt 0.625000 0.687500 +vt 0.625000 0.562500 +vt 0.500000 0.375000 +vt 0.500000 0.562500 +vt 0.375000 0.562500 +vt 0.375000 0.375000 +vt 0.250000 0.562500 +vt 0.250000 0.375000 +vt 0.625000 0.375000 +vt 0.750000 0.375000 +vt 0.875000 0.375000 +vt 0.875000 0.562500 +vt 1.000000 0.375000 +vt 1.000000 0.562500 +vt 0.125000 0.375000 +vt 0.125000 0.562500 +vt 0.000000 0.562500 +vt 0.000000 0.375000 +vt 0.250000 0.687500 +vt 0.375000 0.687500 +vt 1.000000 0.687500 +vt 0.875000 0.687500 +vt 0.500000 0.687500 +vt 0.125000 0.687500 +vt 0.000000 0.687500 +vt 0.875000 0.125000 +vt 1.000000 0.125000 +vt 0.625000 0.125000 +vt 0.750000 0.125000 +vt 0.375000 0.125000 +vt 0.500000 0.125000 +vt 0.250000 0.125000 +vt 0.125000 0.125000 +vt 0.000000 0.125000 +vt 0.500000 -0.000000 +vt 0.375000 -0.000000 +vt 0.250000 -0.000000 +vt 0.625000 -0.000000 +vt 0.750000 -0.000000 +vt 0.875000 -0.000000 +vt 1.000000 0.000000 +vt 0.125000 -0.000000 +vt 0.000000 0.000000 +vt 0.602303 0.167375 +vt 0.602303 0.082625 +vt 0.542375 0.022697 +vt 0.457625 0.022697 +vt 0.397698 0.082625 +vt 0.397698 0.167375 +vt 0.457625 0.227302 +vt 0.542375 0.227302 +vt 0.783956 0.889065 +vt 0.764065 0.908956 +vt 0.735935 0.908956 +vt 0.716044 0.889065 +vt 0.716044 0.860935 +vt 0.735935 0.841044 +vt 0.764065 0.841044 +vt 0.783956 0.860935 +vn -0.355200 0.371800 -0.857600 +vn -0.297200 0.630000 -0.717400 +vn 0.297200 0.630000 -0.717400 +vn 0.355200 0.371800 -0.857600 +vn 0.875900 0.317800 -0.362800 +vn 0.857600 0.371800 -0.355200 +vn 0.857600 0.371800 0.355200 +vn 0.875900 0.317800 0.362800 +vn 0.355200 0.371800 0.857600 +vn 0.362800 0.317800 0.875900 +vn 0.362800 0.317800 -0.875900 +vn -0.362800 0.317800 -0.875900 +vn -0.875900 0.317800 -0.362800 +vn -0.857600 0.371800 -0.355200 +vn -0.875900 0.317800 0.362800 +vn -0.857600 0.371800 0.355200 +vn -0.362800 0.317800 0.875900 +vn -0.355200 0.371800 0.857600 +vn 0.297200 0.630000 0.717500 +vn 0.717400 0.630000 0.297200 +vn -0.717500 0.630000 0.297200 +vn -0.717500 0.630000 -0.297200 +vn 0.717400 0.630000 -0.297200 +vn -0.297200 0.630000 0.717500 +vn -0.893200 -0.255300 -0.370000 +vn -0.893200 -0.255300 0.370000 +vn 0.370000 -0.255300 -0.893200 +vn -0.370000 -0.255300 -0.893200 +vn 0.893200 -0.255300 0.370000 +vn 0.893200 -0.255300 -0.370000 +vn 0.370000 -0.255300 0.893200 +vn -0.370000 -0.255300 0.893200 +vn 0.527200 -0.821200 -0.218400 +vn 0.527200 -0.821200 0.218400 +vn 0.218400 -0.821200 0.527200 +vn 0.218400 -0.821200 -0.527200 +vn -0.218400 -0.821200 -0.527200 +vn -0.527200 -0.821200 -0.218400 +vn -0.527200 -0.821200 0.218400 +vn -0.218400 -0.821200 0.527200 +g glass_bottle_glass_bottle_None +s 1 +f 18/1/1 5/2/2 6/3/3 16/4/4 +f 9/5/5 10/6/6 11/7/7 12/8/8 +f 12/8/8 11/7/7 13/9/9 14/10/10 +f 15/11/11 16/4/4 10/6/6 9/5/5 +f 17/12/12 18/1/1 16/4/4 15/11/11 +f 19/13/13 20/14/14 18/1/1 17/12/12 +f 21/15/15 22/16/16 20/14/14 19/13/13 +f 23/17/17 24/18/18 22/19/16 21/20/15 +f 14/10/10 13/9/9 24/18/18 23/17/17 +f 1/21/19 13/9/9 11/7/7 8/22/20 +f 22/16/16 3/23/21 4/24/22 20/14/14 +f 20/14/14 4/24/22 5/2/2 18/1/1 +f 10/6/6 7/25/23 8/22/20 11/7/7 +f 2/26/24 3/27/21 22/19/16 24/18/18 +f 13/9/9 1/21/19 2/26/24 24/18/18 +f 16/4/4 6/3/3 7/25/23 10/6/6 +f 21/15/15 19/13/13 28/28/25 27/29/26 +f 17/12/12 15/11/11 30/30/27 29/31/28 +f 9/5/5 12/8/8 32/32/29 31/33/30 +f 12/8/8 14/10/10 25/34/31 32/32/29 +f 14/10/10 23/17/17 26/35/32 25/34/31 +f 23/17/17 21/20/15 27/36/26 26/35/32 +f 19/13/13 17/12/12 29/31/28 28/28/25 +f 33/37/33 31/33/30 32/32/29 34/38/34 +f 34/38/34 32/32/29 25/34/31 35/39/35 +f 36/40/36 30/30/27 31/33/30 33/37/33 +f 37/41/37 29/31/28 30/30/27 36/40/36 +f 38/42/38 28/28/25 29/31/28 37/41/37 +f 39/43/39 27/29/26 28/28/25 38/42/38 +f 40/44/40 26/35/32 27/36/26 39/45/39 +f 35/39/35 25/34/31 26/35/32 40/44/40 +f 39/46/39 38/47/38 37/48/37 36/49/36 33/50/33 34/51/34 35/52/35 40/53/40 +f 3/54/21 2/55/24 1/56/19 8/57/20 7/58/23 6/59/3 5/60/2 4/61/22 +f 30/30/27 15/11/11 9/5/5 31/33/30 diff --git a/mods/homedecor_modpack/homedecor_3d_extras/models/3dvessels_drink.obj b/mods/homedecor_modpack/homedecor_3d_extras/models/3dvessels_drink.obj new file mode 100755 index 00000000..f6cefac1 --- /dev/null +++ b/mods/homedecor_modpack/homedecor_3d_extras/models/3dvessels_drink.obj @@ -0,0 +1,204 @@ +# Blender v2.72 (sub 0) OBJ File: '' +# www.blender.org +mtllib 3dvesseldrink.mtl +o Torus.001 +v 0.027435 -0.500000 0.137430 +v -0.027433 -0.500000 0.137430 +v -0.078125 -0.500000 0.116433 +v -0.116923 -0.500000 0.077635 +v -0.137920 -0.500000 0.026944 +v -0.137920 -0.500000 -0.027925 +v -0.116923 -0.500000 -0.078617 +v -0.078125 -0.500000 -0.117415 +v -0.027433 -0.500000 -0.138412 +v 0.027435 -0.500000 -0.138412 +v 0.078127 -0.500000 -0.117415 +v 0.116925 -0.500000 -0.078617 +v 0.137922 -0.500000 -0.027925 +v 0.137922 -0.500000 0.026943 +v 0.116925 -0.500000 0.077635 +v 0.078127 -0.500000 0.116433 +v 0.078127 -0.125001 0.116433 +v 0.116925 -0.125001 0.077635 +v 0.102550 -0.125001 0.068030 +v 0.068522 -0.125001 0.102058 +v 0.078127 -0.125001 -0.117415 +v 0.027435 -0.125001 -0.138412 +v 0.024062 -0.125001 -0.121456 +v 0.068522 -0.125001 -0.103040 +v -0.137921 -0.125001 -0.027925 +v -0.137921 -0.125001 0.026944 +v -0.120964 -0.125001 0.023571 +v -0.120964 -0.125001 -0.024552 +v 0.027435 -0.125001 0.137430 +v 0.024062 -0.125001 0.120474 +v 0.116925 -0.125001 -0.078617 +v 0.102550 -0.125001 -0.069012 +v -0.116923 -0.125001 -0.078617 +v -0.102548 -0.125001 -0.069012 +v 0.137922 -0.125001 -0.027925 +v 0.120966 -0.125001 -0.024552 +v -0.078125 -0.125001 0.116433 +v -0.027433 -0.125001 0.137430 +v -0.024061 -0.125001 0.120474 +v -0.068520 -0.125001 0.102058 +v -0.078125 -0.125001 -0.117415 +v -0.068520 -0.125001 -0.103040 +v 0.137922 -0.125001 0.026943 +v 0.120966 -0.125001 0.023571 +v -0.116923 -0.125001 0.077635 +v -0.102548 -0.125001 0.068030 +v -0.027433 -0.125001 -0.138412 +v -0.024061 -0.125001 -0.121456 +v -0.102548 -0.487780 0.068030 +v -0.120964 -0.487780 0.023571 +v 0.102550 -0.487780 0.068030 +v 0.068522 -0.487780 0.102058 +v -0.024061 -0.487780 -0.121456 +v -0.068520 -0.487780 -0.103040 +v 0.068522 -0.487780 -0.103040 +v 0.102550 -0.487780 -0.069012 +v -0.102548 -0.487780 -0.069012 +v -0.068520 -0.487780 0.102058 +v 0.120966 -0.487780 0.023571 +v 0.024062 -0.487780 -0.121456 +v -0.120964 -0.487780 -0.024552 +v -0.024060 -0.487780 0.120474 +v 0.120966 -0.487780 -0.024552 +v 0.024062 -0.487780 0.120474 +vt 0.625000 0.906250 +vt 0.687500 0.906250 +vt 0.687500 0.937500 +vt 0.625000 0.937500 +vt 0.937500 0.906250 +vt 1.000000 0.906250 +vt 1.000000 0.937500 +vt 0.937500 0.937500 +vt 0.250000 0.906250 +vt 0.312500 0.906250 +vt 0.312500 0.937500 +vt 0.250000 0.937500 +vt 0.562500 0.906250 +vt 0.562500 0.937500 +vt 0.875000 0.906250 +vt 0.875000 0.937500 +vt 0.187500 0.906250 +vt 0.187500 0.937500 +vt 0.812500 0.906250 +vt 0.812500 0.937500 +vt 0.437500 0.906250 +vt 0.500000 0.906250 +vt 0.500000 0.937500 +vt 0.437500 0.937500 +vt 0.125000 0.906250 +vt 0.125000 0.937500 +vt 0.750000 0.906250 +vt 0.750000 0.937500 +vt 0.375000 0.906250 +vt 0.375000 0.937500 +vt 0.062500 0.906250 +vt 0.062500 0.937500 +vt -0.000000 0.906250 +vt -0.000000 0.937500 +vt 0.375000 1.000000 +vt 0.312500 1.000000 +vt 0.125000 0.406250 +vt 0.187500 0.406250 +vt 0.687500 1.000000 +vt 0.625000 1.000000 +vt 0.937500 0.406250 +vt 1.000000 0.406250 +vt 0.062500 1.000000 +vt 0.125000 1.000000 +vt 0.375000 0.406250 +vt 0.437500 0.406250 +vt 0.687500 0.406250 +vt 0.750000 0.406250 +vt 0.937500 1.000000 +vt 0.875000 1.000000 +vt 0.250000 0.406250 +vt 0.187500 1.000000 +vt 0.500000 0.406250 +vt 0.812500 0.406250 +vt 0.437500 1.000000 +vt 0.750000 1.000000 +vt 0.562500 0.406250 +vt -0.000000 0.406250 +vt 0.062500 0.406250 +vt 1.000000 1.000000 +vt 0.312500 0.406250 +vt 0.625000 0.406250 +vt 0.250000 1.000000 +vt 0.875000 0.406250 +vt 0.500000 1.000000 +vt 0.812500 1.000000 +vt 0.562500 1.000000 +vt -0.000000 1.000000 +vt 0.681251 0.549764 +vt 0.681251 0.621226 +vt 0.653904 0.687248 +vt 0.603372 0.737779 +vt 0.537350 0.765126 +vt 0.465889 0.765126 +vt 0.399867 0.737779 +vt 0.349335 0.687248 +vt 0.321988 0.621226 +vt 0.321988 0.549764 +vt 0.349335 0.483742 +vt 0.399867 0.433211 +vt 0.465889 0.405864 +vt 0.537350 0.405864 +vt 0.603372 0.433211 +vt 0.653903 0.483742 +usemtl None +s 1 +f 17/1 18/2 19/3 20/4 +f 21/5 22/6 23/7 24/8 +f 25/9 26/10 27/11 28/12 +f 29/13 17/1 20/4 30/14 +f 31/15 21/5 24/8 32/16 +f 33/17 25/9 28/12 34/18 +f 35/19 31/15 32/16 36/20 +f 37/21 38/22 39/23 40/24 +f 41/25 33/17 34/18 42/26 +f 43/27 35/19 36/20 44/28 +f 45/29 37/21 40/24 46/30 +f 47/31 41/25 42/26 48/32 +f 18/2 43/27 44/28 19/3 +f 22/33 47/31 48/32 23/34 +f 38/22 29/13 30/14 39/23 +f 49/35 50/36 27/11 46/30 +f 8/37 7/38 33/17 41/25 +f 51/39 52/40 20/4 19/3 +f 11/41 10/42 22/6 21/5 +f 53/43 48/32 42/26 54/44 +f 4/45 3/46 37/21 45/29 +f 15/47 14/48 43/27 18/2 +f 55/49 56/50 32/16 24/8 +f 7/38 6/51 25/9 33/17 +f 57/52 54/44 42/26 34/18 +f 3/46 2/53 38/22 37/21 +f 14/48 13/54 35/19 43/27 +f 58/55 49/35 46/30 40/24 +f 59/56 51/39 19/3 44/28 +f 2/53 1/57 29/13 38/22 +f 10/58 9/59 47/31 22/33 +f 60/60 55/49 24/8 23/7 +f 6/51 5/61 26/10 25/9 +f 1/57 16/62 17/1 29/13 +f 61/63 57/52 34/18 28/12 +f 13/54 12/64 31/15 35/19 +f 62/65 58/55 40/24 39/23 +f 63/66 59/56 44/28 36/20 +f 9/59 8/37 41/25 47/31 +f 64/67 62/65 39/23 30/14 +f 53/43 60/68 23/34 48/32 +f 5/61 4/45 45/29 26/10 +f 16/62 15/47 18/2 17/1 +f 50/36 61/63 28/12 27/11 +f 52/40 64/67 30/14 20/4 +f 12/64 11/41 21/5 31/15 +f 56/50 63/66 36/20 32/16 +f 26/10 45/29 46/30 27/11 +f 49/55 58/65 62/67 64/40 52/39 51/56 59/66 63/50 56/49 55/60 60/43 53/44 54/52 57/63 61/36 50/35 +f 5/69 6/70 7/71 8/72 9/73 10/74 11/75 12/76 13/77 14/78 15/79 16/80 1/81 2/82 3/83 4/84 diff --git a/mods/homedecor_modpack/homedecor_3d_extras/models/3dvesselshelf.obj b/mods/homedecor_modpack/homedecor_3d_extras/models/3dvessels_shelf.obj old mode 100644 new mode 100755 similarity index 100% rename from mods/homedecor_modpack/homedecor_3d_extras/models/3dvesselshelf.obj rename to mods/homedecor_modpack/homedecor_3d_extras/models/3dvessels_shelf.obj diff --git a/mods/homedecor_modpack/homedecor_3d_extras/textures/3dbookshelf_books.png b/mods/homedecor_modpack/homedecor_3d_extras/textures/3dbookshelf_books.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor_3d_extras/textures/3dbookshelf_inside_back.png b/mods/homedecor_modpack/homedecor_3d_extras/textures/3dbookshelf_inside_back.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/homedecor_3d_extras/textures/3dvessels_drinking_glass_inv.png b/mods/homedecor_modpack/homedecor_3d_extras/textures/3dvessels_drinking_glass_inv.png new file mode 100755 index 00000000..13f3f882 Binary files /dev/null and b/mods/homedecor_modpack/homedecor_3d_extras/textures/3dvessels_drinking_glass_inv.png differ diff --git a/mods/homedecor_modpack/homedecor_3d_extras/textures/3dvessels_glass_bottle_inv.png b/mods/homedecor_modpack/homedecor_3d_extras/textures/3dvessels_glass_bottle_inv.png new file mode 100755 index 00000000..20a42d6f Binary files /dev/null and b/mods/homedecor_modpack/homedecor_3d_extras/textures/3dvessels_glass_bottle_inv.png differ diff --git a/mods/homedecor_modpack/homedecor_3d_extras/textures/3dvessels_shelf_glass.png b/mods/homedecor_modpack/homedecor_3d_extras/textures/3dvessels_shelf_glass.png new file mode 100755 index 00000000..101666f7 Binary files /dev/null and b/mods/homedecor_modpack/homedecor_3d_extras/textures/3dvessels_shelf_glass.png differ diff --git a/mods/homedecor_modpack/homedecor_3d_extras/textures/3dvessels_steel_bottle_inv.png b/mods/homedecor_modpack/homedecor_3d_extras/textures/3dvessels_steel_bottle_inv.png new file mode 100755 index 00000000..bfecba72 Binary files /dev/null and b/mods/homedecor_modpack/homedecor_3d_extras/textures/3dvessels_steel_bottle_inv.png differ diff --git a/mods/homedecor_modpack/homedecor_3d_extras/textures/3dvesselshelf_glass.png b/mods/homedecor_modpack/homedecor_3d_extras/textures/3dvesselshelf_glass.png deleted file mode 100644 index 1cb38f1d..00000000 Binary files a/mods/homedecor_modpack/homedecor_3d_extras/textures/3dvesselshelf_glass.png and /dev/null differ diff --git a/mods/homedecor_modpack/homedecor_3d_extras/textures/bottle_metal_bright.png b/mods/homedecor_modpack/homedecor_3d_extras/textures/bottle_metal_bright.png new file mode 100755 index 00000000..c0d9c2e4 Binary files /dev/null and b/mods/homedecor_modpack/homedecor_3d_extras/textures/bottle_metal_bright.png differ diff --git a/mods/homedecor_modpack/inbox/init.lua b/mods/homedecor_modpack/inbox/init.lua index 940ec610..7e5867a5 100755 --- a/mods/homedecor_modpack/inbox/init.lua +++ b/mods/homedecor_modpack/inbox/init.lua @@ -1,4 +1,5 @@ local inbox = {} +screwdriver = screwdriver or {} minetest.register_craft({ output ="inbox:empty", diff --git a/mods/homedecor_modpack/inbox/models/inbox_mailbox.obj b/mods/homedecor_modpack/inbox/models/inbox_mailbox.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/inbox/textures/inbox_grey_metal.png b/mods/homedecor_modpack/inbox/textures/inbox_grey_metal.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/inbox/textures/inbox_red_metal.png b/mods/homedecor_modpack/inbox/textures/inbox_red_metal.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/inbox/textures/inbox_white_metal.png b/mods/homedecor_modpack/inbox/textures/inbox_white_metal.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/inbox/textures/mailbox_inv.png b/mods/homedecor_modpack/inbox/textures/mailbox_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/itemframes/init.lua b/mods/homedecor_modpack/itemframes/init.lua index 04fad49d..c2a6c0d5 100755 --- a/mods/homedecor_modpack/itemframes/init.lua +++ b/mods/homedecor_modpack/itemframes/init.lua @@ -1,5 +1,6 @@ local tmp = {} -local itemframes = {} +itemframes = {} +screwdriver = screwdriver or {} minetest.register_entity("itemframes:item",{ hp_max = 1, @@ -68,11 +69,11 @@ local update_item = function(pos, node) if node.name == "itemframes:frame" then local posad = facedir[node.param2] if not posad then return end - pos.x = pos.x + posad.x*6.5/16 - pos.y = pos.y + posad.y*6.5/16 - pos.z = pos.z + posad.z*6.5/16 - elseif minetest.get_item_group(node.name, "group:pedestal") then - pos.y = pos.y + 12/16+.33 + pos.x = pos.x + posad.x*6.5/16 + pos.y = pos.y + posad.y*6.5/16 + pos.z = pos.z + posad.z*6.5/16 + elseif minetest.get_item_group(node.name, "group:pedestal") then + pos.y = pos.y + 12/16+.33 end tmp.nodename = node.name tmp.texture = ItemStack(meta:get_string("item")):get_name() diff --git a/mods/homedecor_modpack/lavalamp/README.txt b/mods/homedecor_modpack/lavalamp/README.txt old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/lavalamp/depends.txt b/mods/homedecor_modpack/lavalamp/depends.txt old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/lavalamp/init.lua b/mods/homedecor_modpack/lavalamp/init.lua old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/lavalamp/models/lavalamp.obj b/mods/homedecor_modpack/lavalamp/models/lavalamp.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/lavalamp/textures/lavalamp_lamp_anim_blue.png b/mods/homedecor_modpack/lavalamp/textures/lavalamp_lamp_anim_blue.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/lavalamp/textures/lavalamp_lamp_anim_green.png b/mods/homedecor_modpack/lavalamp/textures/lavalamp_lamp_anim_green.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/lavalamp/textures/lavalamp_lamp_anim_orange.png b/mods/homedecor_modpack/lavalamp/textures/lavalamp_lamp_anim_orange.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/lavalamp/textures/lavalamp_lamp_anim_red.png b/mods/homedecor_modpack/lavalamp/textures/lavalamp_lamp_anim_red.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/lavalamp/textures/lavalamp_lamp_anim_violet.png b/mods/homedecor_modpack/lavalamp/textures/lavalamp_lamp_anim_violet.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/lavalamp/textures/lavalamp_lamp_anim_yellow.png b/mods/homedecor_modpack/lavalamp/textures/lavalamp_lamp_anim_yellow.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/lavalamp/textures/lavalamp_lamp_blue_inv.png b/mods/homedecor_modpack/lavalamp/textures/lavalamp_lamp_blue_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/lavalamp/textures/lavalamp_lamp_green_inv.png b/mods/homedecor_modpack/lavalamp/textures/lavalamp_lamp_green_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/lavalamp/textures/lavalamp_lamp_off.png b/mods/homedecor_modpack/lavalamp/textures/lavalamp_lamp_off.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/lavalamp/textures/lavalamp_lamp_orange_inv.png b/mods/homedecor_modpack/lavalamp/textures/lavalamp_lamp_orange_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/lavalamp/textures/lavalamp_lamp_red_inv.png b/mods/homedecor_modpack/lavalamp/textures/lavalamp_lamp_red_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/lavalamp/textures/lavalamp_lamp_violet_inv.png b/mods/homedecor_modpack/lavalamp/textures/lavalamp_lamp_violet_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/lavalamp/textures/lavalamp_lamp_yellow_inv.png b/mods/homedecor_modpack/lavalamp/textures/lavalamp_lamp_yellow_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/lavalamp/textures/lavalamp_metal.png b/mods/homedecor_modpack/lavalamp/textures/lavalamp_metal.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/lrfurn/init.lua b/mods/homedecor_modpack/lrfurn/init.lua index 416adafd..2d60dabe 100755 --- a/mods/homedecor_modpack/lrfurn/init.lua +++ b/mods/homedecor_modpack/lrfurn/init.lua @@ -1,4 +1,5 @@ lrfurn = {} +screwdriver = screwdriver or {} lrfurn.fdir_to_fwd = { { 0, 1 }, diff --git a/mods/homedecor_modpack/lrfurn/models/lrfurn_armchair.obj b/mods/homedecor_modpack/lrfurn/models/lrfurn_armchair.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/lrfurn/models/lrfurn_sofa_long.obj b/mods/homedecor_modpack/lrfurn/models/lrfurn_sofa_long.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/lrfurn/models/lrfurn_sofa_short.obj b/mods/homedecor_modpack/lrfurn/models/lrfurn_sofa_short.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_coffeetable_back.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_coffeetable_back.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_coffeetable_front.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_coffeetable_front.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_black.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_black.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_blue.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_blue.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_bottom.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_bottom.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_green.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_green.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_grey.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_grey.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_orange.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_orange.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_red.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_red.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_violet.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_violet.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_white.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_white.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_yellow.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_yellow.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/plasmascreen/init.lua b/mods/homedecor_modpack/plasmascreen/init.lua index ab3e059a..839fa1fa 100755 --- a/mods/homedecor_modpack/plasmascreen/init.lua +++ b/mods/homedecor_modpack/plasmascreen/init.lua @@ -1,3 +1,5 @@ +screwdriver = screwdriver or {} + minetest.register_node("plasmascreen:stand", { description = "Plasma Screen TV Stand", tiles = {"plasmascreen_back.png"}, @@ -142,6 +144,7 @@ minetest.register_node("plasmascreen:tv_off", { light_source = 10, selection_box = tv_cbox, collision_box = tv_cbox, + on_rotate = screwdriver.disallow, groups = {snappy=1, choppy=2, oddly_breakable_by_hand=2, not_in_creative_inventory=1}, after_place_node = function(pos, placer, itemstack) if not checkwall(pos) then diff --git a/mods/homedecor_modpack/plasmascreen/models/plasmascreen_tv.obj b/mods/homedecor_modpack/plasmascreen/models/plasmascreen_tv.obj old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/plasmascreen/textures/plasmascreen_back.png b/mods/homedecor_modpack/plasmascreen/textures/plasmascreen_back.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/plasmascreen/textures/plasmascreen_case.png b/mods/homedecor_modpack/plasmascreen/textures/plasmascreen_case.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/plasmascreen/textures/plasmascreen_case_off.png b/mods/homedecor_modpack/plasmascreen/textures/plasmascreen_case_off.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/plasmascreen/textures/plasmascreen_screen_off.png b/mods/homedecor_modpack/plasmascreen/textures/plasmascreen_screen_off.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/plasmascreen/textures/plasmascreen_tv_inv.png b/mods/homedecor_modpack/plasmascreen/textures/plasmascreen_tv_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/plasmascreen/textures/plasmascreen_video.png b/mods/homedecor_modpack/plasmascreen/textures/plasmascreen_video.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/LICENSE b/mods/homedecor_modpack/signs_lib/LICENSE deleted file mode 100755 index 65c5ca88..00000000 --- a/mods/homedecor_modpack/signs_lib/LICENSE +++ /dev/null @@ -1,165 +0,0 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - - This version of the GNU Lesser General Public License incorporates -the terms and conditions of version 3 of the GNU General Public -License, supplemented by the additional permissions listed below. - - 0. Additional Definitions. - - As used herein, "this License" refers to version 3 of the GNU Lesser -General Public License, and the "GNU GPL" refers to version 3 of the GNU -General Public License. - - "The Library" refers to a covered work governed by this License, -other than an Application or a Combined Work as defined below. - - An "Application" is any work that makes use of an interface provided -by the Library, but which is not otherwise based on the Library. -Defining a subclass of a class defined by the Library is deemed a mode -of using an interface provided by the Library. - - A "Combined Work" is a work produced by combining or linking an -Application with the Library. The particular version of the Library -with which the Combined Work was made is also called the "Linked -Version". - - The "Minimal Corresponding Source" for a Combined Work means the -Corresponding Source for the Combined Work, excluding any source code -for portions of the Combined Work that, considered in isolation, are -based on the Application, and not on the Linked Version. - - The "Corresponding Application Code" for a Combined Work means the -object code and/or source code for the Application, including any data -and utility programs needed for reproducing the Combined Work from the -Application, but excluding the System Libraries of the Combined Work. - - 1. Exception to Section 3 of the GNU GPL. - - You may convey a covered work under sections 3 and 4 of this License -without being bound by section 3 of the GNU GPL. - - 2. Conveying Modified Versions. - - If you modify a copy of the Library, and, in your modifications, a -facility refers to a function or data to be supplied by an Application -that uses the facility (other than as an argument passed when the -facility is invoked), then you may convey a copy of the modified -version: - - a) under this License, provided that you make a good faith effort to - ensure that, in the event an Application does not supply the - function or data, the facility still operates, and performs - whatever part of its purpose remains meaningful, or - - b) under the GNU GPL, with none of the additional permissions of - this License applicable to that copy. - - 3. Object Code Incorporating Material from Library Header Files. - - The object code form of an Application may incorporate material from -a header file that is part of the Library. You may convey such object -code under terms of your choice, provided that, if the incorporated -material is not limited to numerical parameters, data structure -layouts and accessors, or small macros, inline functions and templates -(ten or fewer lines in length), you do both of the following: - - a) Give prominent notice with each copy of the object code that the - Library is used in it and that the Library and its use are - covered by this License. - - b) Accompany the object code with a copy of the GNU GPL and this license - document. - - 4. Combined Works. - - You may convey a Combined Work under terms of your choice that, -taken together, effectively do not restrict modification of the -portions of the Library contained in the Combined Work and reverse -engineering for debugging such modifications, if you also do each of -the following: - - a) Give prominent notice with each copy of the Combined Work that - the Library is used in it and that the Library and its use are - covered by this License. - - b) Accompany the Combined Work with a copy of the GNU GPL and this license - document. - - c) For a Combined Work that displays copyright notices during - execution, include the copyright notice for the Library among - these notices, as well as a reference directing the user to the - copies of the GNU GPL and this license document. - - d) Do one of the following: - - 0) Convey the Minimal Corresponding Source under the terms of this - License, and the Corresponding Application Code in a form - suitable for, and under terms that permit, the user to - recombine or relink the Application with a modified version of - the Linked Version to produce a modified Combined Work, in the - manner specified by section 6 of the GNU GPL for conveying - Corresponding Source. - - 1) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (a) uses at run time - a copy of the Library already present on the user's computer - system, and (b) will operate properly with a modified version - of the Library that is interface-compatible with the Linked - Version. - - e) Provide Installation Information, but only if you would otherwise - be required to provide such information under section 6 of the - GNU GPL, and only to the extent that such information is - necessary to install and execute a modified version of the - Combined Work produced by recombining or relinking the - Application with a modified version of the Linked Version. (If - you use option 4d0, the Installation Information must accompany - the Minimal Corresponding Source and Corresponding Application - Code. If you use option 4d1, you must provide the Installation - Information in the manner specified by section 6 of the GNU GPL - for conveying Corresponding Source.) - - 5. Combined Libraries. - - You may place library facilities that are a work based on the -Library side by side in a single library together with other library -facilities that are not Applications and are not covered by this -License, and convey such a combined library under terms of your -choice, if you do both of the following: - - a) Accompany the combined library with a copy of the same work based - on the Library, uncombined with any other library facilities, - conveyed under the terms of this License. - - b) Give prominent notice with the combined library that part of it - is a work based on the Library, and explaining where to find the - accompanying uncombined form of the same work. - - 6. Revised Versions of the GNU Lesser General Public License. - - The Free Software Foundation may publish revised and/or new versions -of the GNU Lesser General Public License from time to time. Such new -versions will be similar in spirit to the present version, but may -differ in detail to address new problems or concerns. - - Each version is given a distinguishing version number. If the -Library as you received it specifies that a certain numbered version -of the GNU Lesser General Public License "or any later version" -applies to it, you have the option of following the terms and -conditions either of that published version or of any later version -published by the Free Software Foundation. If the Library as you -received it does not specify a version number of the GNU Lesser -General Public License, you may choose any version of the GNU Lesser -General Public License ever published by the Free Software Foundation. - - If the Library as you received it specifies that a proxy can decide -whether future versions of the GNU Lesser General Public License shall -apply, that proxy's public statement of acceptance of any version is -permanent authorization for you to choose that version for the -Library. diff --git a/mods/homedecor_modpack/signs_lib/init.lua b/mods/homedecor_modpack/signs_lib/init.lua index 9bf36e23..699a43b8 100755 --- a/mods/homedecor_modpack/signs_lib/init.lua +++ b/mods/homedecor_modpack/signs_lib/init.lua @@ -11,12 +11,12 @@ -- } signs_lib = {} +screwdriver = screwdriver or {} -local screwdriver = screwdriver or {} signs_lib.wallmounted_rotate = function(pos, node, user, mode, new_param2) if mode ~= screwdriver.ROTATE_AXIS then return false end minetest.swap_node(pos, {name = node.name, param2 = (node.param2 + 1) % 6}) - for _, v in ipairs(minetest.get_objects_inside_radius(pos, 0.5)) do + for _, v in ipairs(minetest.get_objects_inside_radius(pos, 0.5)) do local e = v:get_luaentity() if e and e.name == "signs:text" then v:remove() @@ -634,7 +634,7 @@ function signs_lib.determine_sign_type(itemstack, placer, pointed_thing, locked) local fdir = minetest.dir_to_facedir(dir) local pt_name = minetest.get_node(under).name - print(dump(pt_name)) + minetest.log("action", dump(pt_name)) local signname = itemstack:get_name() if fences_with_sign[pt_name] and signname == "default:sign_wall" then @@ -981,7 +981,7 @@ function signs_lib.register_fence_with_sign(fencename, fencewithsignname) minetest.register_node(":"..fencename, def) minetest.register_node(":"..fencewithsignname, def_sign) table.insert(signs_lib.sign_node_list, fencewithsignname) - print(S("Registered %s and %s"):format(fencename, fencewithsignname)) + minetest.log("action", S("Registered %s and %s"):format(fencename, fencewithsignname)) end build_char_db() diff --git a/mods/homedecor_modpack/signs_lib/textures/bg_signs_lib.jpg b/mods/homedecor_modpack/signs_lib/textures/bg_signs_lib.jpg old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_20.png b/mods/homedecor_modpack/signs_lib/textures/hdf_20.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_21.png b/mods/homedecor_modpack/signs_lib/textures/hdf_21.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_22.png b/mods/homedecor_modpack/signs_lib/textures/hdf_22.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_23.png b/mods/homedecor_modpack/signs_lib/textures/hdf_23.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_24.png b/mods/homedecor_modpack/signs_lib/textures/hdf_24.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_25.png b/mods/homedecor_modpack/signs_lib/textures/hdf_25.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_26.png b/mods/homedecor_modpack/signs_lib/textures/hdf_26.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_27.png b/mods/homedecor_modpack/signs_lib/textures/hdf_27.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_28.png b/mods/homedecor_modpack/signs_lib/textures/hdf_28.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_29.png b/mods/homedecor_modpack/signs_lib/textures/hdf_29.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_2a.png b/mods/homedecor_modpack/signs_lib/textures/hdf_2a.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_2b.png b/mods/homedecor_modpack/signs_lib/textures/hdf_2b.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_2c.png b/mods/homedecor_modpack/signs_lib/textures/hdf_2c.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_2d.png b/mods/homedecor_modpack/signs_lib/textures/hdf_2d.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_2e.png b/mods/homedecor_modpack/signs_lib/textures/hdf_2e.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_2f.png b/mods/homedecor_modpack/signs_lib/textures/hdf_2f.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_30.png b/mods/homedecor_modpack/signs_lib/textures/hdf_30.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_31.png b/mods/homedecor_modpack/signs_lib/textures/hdf_31.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_32.png b/mods/homedecor_modpack/signs_lib/textures/hdf_32.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_33.png b/mods/homedecor_modpack/signs_lib/textures/hdf_33.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_34.png b/mods/homedecor_modpack/signs_lib/textures/hdf_34.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_35.png b/mods/homedecor_modpack/signs_lib/textures/hdf_35.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_36.png b/mods/homedecor_modpack/signs_lib/textures/hdf_36.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_37.png b/mods/homedecor_modpack/signs_lib/textures/hdf_37.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_38.png b/mods/homedecor_modpack/signs_lib/textures/hdf_38.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_39.png b/mods/homedecor_modpack/signs_lib/textures/hdf_39.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_3a.png b/mods/homedecor_modpack/signs_lib/textures/hdf_3a.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_3b.png b/mods/homedecor_modpack/signs_lib/textures/hdf_3b.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_3c.png b/mods/homedecor_modpack/signs_lib/textures/hdf_3c.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_3d.png b/mods/homedecor_modpack/signs_lib/textures/hdf_3d.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_3e.png b/mods/homedecor_modpack/signs_lib/textures/hdf_3e.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_3f.png b/mods/homedecor_modpack/signs_lib/textures/hdf_3f.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_40.png b/mods/homedecor_modpack/signs_lib/textures/hdf_40.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_41.png b/mods/homedecor_modpack/signs_lib/textures/hdf_41.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_42.png b/mods/homedecor_modpack/signs_lib/textures/hdf_42.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_43.png b/mods/homedecor_modpack/signs_lib/textures/hdf_43.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_44.png b/mods/homedecor_modpack/signs_lib/textures/hdf_44.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_45.png b/mods/homedecor_modpack/signs_lib/textures/hdf_45.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_46.png b/mods/homedecor_modpack/signs_lib/textures/hdf_46.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_47.png b/mods/homedecor_modpack/signs_lib/textures/hdf_47.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_48.png b/mods/homedecor_modpack/signs_lib/textures/hdf_48.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_49.png b/mods/homedecor_modpack/signs_lib/textures/hdf_49.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_4a.png b/mods/homedecor_modpack/signs_lib/textures/hdf_4a.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_4b.png b/mods/homedecor_modpack/signs_lib/textures/hdf_4b.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_4c.png b/mods/homedecor_modpack/signs_lib/textures/hdf_4c.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_4d.png b/mods/homedecor_modpack/signs_lib/textures/hdf_4d.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_4e.png b/mods/homedecor_modpack/signs_lib/textures/hdf_4e.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_4f.png b/mods/homedecor_modpack/signs_lib/textures/hdf_4f.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_50.png b/mods/homedecor_modpack/signs_lib/textures/hdf_50.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_51.png b/mods/homedecor_modpack/signs_lib/textures/hdf_51.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_52.png b/mods/homedecor_modpack/signs_lib/textures/hdf_52.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_53.png b/mods/homedecor_modpack/signs_lib/textures/hdf_53.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_54.png b/mods/homedecor_modpack/signs_lib/textures/hdf_54.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_55.png b/mods/homedecor_modpack/signs_lib/textures/hdf_55.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_56.png b/mods/homedecor_modpack/signs_lib/textures/hdf_56.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_57.png b/mods/homedecor_modpack/signs_lib/textures/hdf_57.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_58.png b/mods/homedecor_modpack/signs_lib/textures/hdf_58.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_59.png b/mods/homedecor_modpack/signs_lib/textures/hdf_59.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_5a.png b/mods/homedecor_modpack/signs_lib/textures/hdf_5a.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_5b.png b/mods/homedecor_modpack/signs_lib/textures/hdf_5b.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_5c.png b/mods/homedecor_modpack/signs_lib/textures/hdf_5c.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_5d.png b/mods/homedecor_modpack/signs_lib/textures/hdf_5d.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_5e.png b/mods/homedecor_modpack/signs_lib/textures/hdf_5e.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_5f.png b/mods/homedecor_modpack/signs_lib/textures/hdf_5f.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_60.png b/mods/homedecor_modpack/signs_lib/textures/hdf_60.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_61.png b/mods/homedecor_modpack/signs_lib/textures/hdf_61.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_62.png b/mods/homedecor_modpack/signs_lib/textures/hdf_62.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_63.png b/mods/homedecor_modpack/signs_lib/textures/hdf_63.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_64.png b/mods/homedecor_modpack/signs_lib/textures/hdf_64.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_65.png b/mods/homedecor_modpack/signs_lib/textures/hdf_65.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_66.png b/mods/homedecor_modpack/signs_lib/textures/hdf_66.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_67.png b/mods/homedecor_modpack/signs_lib/textures/hdf_67.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_68.png b/mods/homedecor_modpack/signs_lib/textures/hdf_68.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_69.png b/mods/homedecor_modpack/signs_lib/textures/hdf_69.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_6a.png b/mods/homedecor_modpack/signs_lib/textures/hdf_6a.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_6b.png b/mods/homedecor_modpack/signs_lib/textures/hdf_6b.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_6c.png b/mods/homedecor_modpack/signs_lib/textures/hdf_6c.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_6d.png b/mods/homedecor_modpack/signs_lib/textures/hdf_6d.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_6e.png b/mods/homedecor_modpack/signs_lib/textures/hdf_6e.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_6f.png b/mods/homedecor_modpack/signs_lib/textures/hdf_6f.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_70.png b/mods/homedecor_modpack/signs_lib/textures/hdf_70.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_71.png b/mods/homedecor_modpack/signs_lib/textures/hdf_71.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_72.png b/mods/homedecor_modpack/signs_lib/textures/hdf_72.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_73.png b/mods/homedecor_modpack/signs_lib/textures/hdf_73.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_74.png b/mods/homedecor_modpack/signs_lib/textures/hdf_74.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_75.png b/mods/homedecor_modpack/signs_lib/textures/hdf_75.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_76.png b/mods/homedecor_modpack/signs_lib/textures/hdf_76.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_77.png b/mods/homedecor_modpack/signs_lib/textures/hdf_77.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_78.png b/mods/homedecor_modpack/signs_lib/textures/hdf_78.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_79.png b/mods/homedecor_modpack/signs_lib/textures/hdf_79.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_7a.png b/mods/homedecor_modpack/signs_lib/textures/hdf_7a.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_7b.png b/mods/homedecor_modpack/signs_lib/textures/hdf_7b.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_7c.png b/mods/homedecor_modpack/signs_lib/textures/hdf_7c.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_7d.png b/mods/homedecor_modpack/signs_lib/textures/hdf_7d.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/hdf_7e.png b/mods/homedecor_modpack/signs_lib/textures/hdf_7e.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/signs_back.png b/mods/homedecor_modpack/signs_lib/textures/signs_back.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/signs_bottom.png b/mods/homedecor_modpack/signs_lib/textures/signs_bottom.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/signs_front.png b/mods/homedecor_modpack/signs_lib/textures/signs_front.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/signs_green_front.png b/mods/homedecor_modpack/signs_lib/textures/signs_green_front.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/signs_green_inv.png b/mods/homedecor_modpack/signs_lib/textures/signs_green_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/signs_hanging_back.png b/mods/homedecor_modpack/signs_lib/textures/signs_hanging_back.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/signs_hanging_bottom.png b/mods/homedecor_modpack/signs_lib/textures/signs_hanging_bottom.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/signs_hanging_front.png b/mods/homedecor_modpack/signs_lib/textures/signs_hanging_front.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/signs_hanging_side.png b/mods/homedecor_modpack/signs_lib/textures/signs_hanging_side.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/signs_hanging_top.png b/mods/homedecor_modpack/signs_lib/textures/signs_hanging_top.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/signs_locked_inv.png b/mods/homedecor_modpack/signs_lib/textures/signs_locked_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/signs_metal_back.png b/mods/homedecor_modpack/signs_lib/textures/signs_metal_back.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/signs_metal_sides.png b/mods/homedecor_modpack/signs_lib/textures/signs_metal_sides.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/signs_metal_tb.png b/mods/homedecor_modpack/signs_lib/textures/signs_metal_tb.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/signs_post_back.png b/mods/homedecor_modpack/signs_lib/textures/signs_post_back.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/signs_post_bottom.png b/mods/homedecor_modpack/signs_lib/textures/signs_post_bottom.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/signs_post_front.png b/mods/homedecor_modpack/signs_lib/textures/signs_post_front.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/signs_post_side.png b/mods/homedecor_modpack/signs_lib/textures/signs_post_side.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/signs_post_top.png b/mods/homedecor_modpack/signs_lib/textures/signs_post_top.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/signs_red_front.png b/mods/homedecor_modpack/signs_lib/textures/signs_red_front.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/signs_red_inv.png b/mods/homedecor_modpack/signs_lib/textures/signs_red_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/signs_side.png b/mods/homedecor_modpack/signs_lib/textures/signs_side.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/signs_top.png b/mods/homedecor_modpack/signs_lib/textures/signs_top.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/signs_wall_sign.png b/mods/homedecor_modpack/signs_lib/textures/signs_wall_sign.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/signs_wall_sign_locked.png b/mods/homedecor_modpack/signs_lib/textures/signs_wall_sign_locked.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/signs_white_black_front.png b/mods/homedecor_modpack/signs_lib/textures/signs_white_black_front.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/signs_white_black_inv.png b/mods/homedecor_modpack/signs_lib/textures/signs_white_black_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/signs_white_red_front.png b/mods/homedecor_modpack/signs_lib/textures/signs_white_red_front.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/signs_white_red_inv.png b/mods/homedecor_modpack/signs_lib/textures/signs_white_red_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/signs_yellow_front.png b/mods/homedecor_modpack/signs_lib/textures/signs_yellow_front.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/signs_yellow_inv.png b/mods/homedecor_modpack/signs_lib/textures/signs_yellow_inv.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/slc_0.png b/mods/homedecor_modpack/signs_lib/textures/slc_0.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/slc_1.png b/mods/homedecor_modpack/signs_lib/textures/slc_1.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/slc_2.png b/mods/homedecor_modpack/signs_lib/textures/slc_2.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/slc_3.png b/mods/homedecor_modpack/signs_lib/textures/slc_3.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/slc_4.png b/mods/homedecor_modpack/signs_lib/textures/slc_4.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/slc_5.png b/mods/homedecor_modpack/signs_lib/textures/slc_5.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/slc_6.png b/mods/homedecor_modpack/signs_lib/textures/slc_6.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/slc_7.png b/mods/homedecor_modpack/signs_lib/textures/slc_7.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/slc_8.png b/mods/homedecor_modpack/signs_lib/textures/slc_8.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/slc_9.png b/mods/homedecor_modpack/signs_lib/textures/slc_9.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/slc_A.png b/mods/homedecor_modpack/signs_lib/textures/slc_A.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/slc_B.png b/mods/homedecor_modpack/signs_lib/textures/slc_B.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/slc_C.png b/mods/homedecor_modpack/signs_lib/textures/slc_C.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/slc_D.png b/mods/homedecor_modpack/signs_lib/textures/slc_D.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/slc_E.png b/mods/homedecor_modpack/signs_lib/textures/slc_E.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/slc_F.png b/mods/homedecor_modpack/signs_lib/textures/slc_F.png old mode 100644 new mode 100755 diff --git a/mods/homedecor_modpack/signs_lib/textures/slc_n.png b/mods/homedecor_modpack/signs_lib/textures/slc_n.png old mode 100644 new mode 100755 diff --git a/mods/hud/hunger.lua b/mods/hud/hunger.lua index 1d158271..823842ff 100755 --- a/mods/hud/hunger.lua +++ b/mods/hud/hunger.lua @@ -277,6 +277,7 @@ if minetest.get_modpath("farming") and farming.mod == "redo" then overwrite("farming:raspberries", 1) overwrite("farming:blueberries", 1) overwrite("farming:muffin_blueberry", 4) + overwrite("farming:beans", 1) if minetest.get_modpath("vessels") then overwrite("farming:smoothie_raspberry", 2, "vessels:drinking_glass") end diff --git a/mods/interact/Readme.md b/mods/interact/Readme.md old mode 100644 new mode 100755 diff --git a/mods/interact/config.lua b/mods/interact/config.lua old mode 100644 new mode 100755 diff --git a/mods/interact/depends.txt b/mods/interact/depends.txt old mode 100644 new mode 100755 diff --git a/mods/interact/init.lua b/mods/interact/init.lua old mode 100644 new mode 100755 diff --git a/mods/interact/license.txt b/mods/interact/license.txt old mode 100644 new mode 100755 diff --git a/mods/interact/rules.lua b/mods/interact/rules.lua old mode 100644 new mode 100755 diff --git a/mods/inventorycheck/README.md b/mods/inventorycheck/README.md old mode 100644 new mode 100755 diff --git a/mods/inventorycheck/depends.txt b/mods/inventorycheck/depends.txt old mode 100644 new mode 100755 diff --git a/mods/inventorycheck/init.lua b/mods/inventorycheck/init.lua old mode 100644 new mode 100755 diff --git a/mods/invtweak/README.txt b/mods/invtweak/README.txt old mode 100644 new mode 100755 diff --git a/mods/invtweak/depends.txt b/mods/invtweak/depends.txt old mode 100644 new mode 100755 diff --git a/mods/invtweak/init.lua b/mods/invtweak/init.lua old mode 100644 new mode 100755 index c14ce98a..9672f921 --- a/mods/invtweak/init.lua +++ b/mods/invtweak/init.lua @@ -15,6 +15,7 @@ tweak.buttons = { local function get_formspec_size(formspec) local w = 8 local h = 7.5 + if not formspec then return end local sstring = string.find(formspec,"size[",1,true) if sstring ~= nil then sstring = string.sub(formspec, sstring+5) diff --git a/mods/invtweak/sounds/invtweak_tool_break.ogg b/mods/invtweak/sounds/invtweak_tool_break.ogg old mode 100644 new mode 100755 diff --git a/mods/irc/.gitignore b/mods/irc/.gitignore old mode 100644 new mode 100755 diff --git a/mods/irc/API.md b/mods/irc/API.md old mode 100644 new mode 100755 diff --git a/mods/irc/LICENSE.txt b/mods/irc/LICENSE.txt old mode 100644 new mode 100755 diff --git a/mods/irc/README.md b/mods/irc/README.md old mode 100644 new mode 100755 diff --git a/mods/irc/botcmds.lua b/mods/irc/botcmds.lua old mode 100644 new mode 100755 index 407821db..34978a87 --- a/mods/irc/botcmds.lua +++ b/mods/irc/botcmds.lua @@ -162,3 +162,4 @@ irc:register_bot_command("players", { ..table.concat(names, ", ") end }) + diff --git a/mods/irc/callback.lua b/mods/irc/callback.lua old mode 100644 new mode 100755 diff --git a/mods/irc/chatcmds.lua b/mods/irc/chatcmds.lua old mode 100644 new mode 100755 diff --git a/mods/irc/config.lua b/mods/irc/config.lua old mode 100644 new mode 100755 diff --git a/mods/irc/core.so b/mods/irc/core.so old mode 100644 new mode 100755 diff --git a/mods/irc/hooks.lua b/mods/irc/hooks.lua old mode 100644 new mode 100755 diff --git a/mods/irc/init.lua b/mods/irc/init.lua old mode 100644 new mode 100755 diff --git a/mods/irc/irc/.gitignore b/mods/irc/irc/.gitignore old mode 100644 new mode 100755 diff --git a/mods/irc/irc/.travis.yml b/mods/irc/irc/.travis.yml old mode 100644 new mode 100755 diff --git a/mods/irc/irc/LICENSE.txt b/mods/irc/irc/LICENSE.txt old mode 100644 new mode 100755 diff --git a/mods/irc/irc/README.markdown b/mods/irc/irc/README.markdown old mode 100644 new mode 100755 diff --git a/mods/irc/irc/asyncoperations.lua b/mods/irc/irc/asyncoperations.lua old mode 100644 new mode 100755 diff --git a/mods/irc/irc/doc/irc.luadoc b/mods/irc/irc/doc/irc.luadoc old mode 100644 new mode 100755 diff --git a/mods/irc/irc/handlers.lua b/mods/irc/irc/handlers.lua old mode 100644 new mode 100755 diff --git a/mods/irc/irc/init.lua b/mods/irc/irc/init.lua old mode 100644 new mode 100755 diff --git a/mods/irc/irc/messages.lua b/mods/irc/irc/messages.lua old mode 100644 new mode 100755 index 48aa6873..8f721502 --- a/mods/irc/irc/messages.lua +++ b/mods/irc/irc/messages.lua @@ -104,6 +104,12 @@ function msg_meta:fromRFC1459(line) local pos self.command, pos = line:match("(%S+)()") + -- /MFF BEGIN + if not pos then + minetest.log("error", "[IRC] This crash message was intended to see the value of a breaking variable. line = " .. (line or "nil")) + return + end + -- /MFF END (Mg|06/01/2015) line = line:sub(pos) self.args = self.args or {} diff --git a/mods/irc/irc/set.lua b/mods/irc/irc/set.lua old mode 100644 new mode 100755 diff --git a/mods/irc/irc/util.lua b/mods/irc/irc/util.lua old mode 100644 new mode 100755 diff --git a/mods/irc/messages.lua b/mods/irc/messages.lua old mode 100644 new mode 100755 diff --git a/mods/irc/player_part.lua b/mods/irc/player_part.lua old mode 100644 new mode 100755 diff --git a/mods/irc/unix.so b/mods/irc/unix.so old mode 100644 new mode 100755 diff --git a/mods/item_drop/init.lua b/mods/item_drop/init.lua old mode 100644 new mode 100755 diff --git a/mods/lavatemple/textures/lavatemple_ladder.png b/mods/lavatemple/textures/lavatemple_ladder.png old mode 100644 new mode 100755 diff --git a/mods/mana/API.md b/mods/mana/API.md old mode 100644 new mode 100755 diff --git a/mods/mana/README.txt b/mods/mana/README.txt old mode 100644 new mode 100755 diff --git a/mods/mana/depends.txt b/mods/mana/depends.txt old mode 100644 new mode 100755 diff --git a/mods/mana/description.txt b/mods/mana/description.txt old mode 100644 new mode 100755 diff --git a/mods/mana/init.lua b/mods/mana/init.lua old mode 100644 new mode 100755 index 4ecd5dbf..3dfb5953 --- a/mods/mana/init.lua +++ b/mods/mana/init.lua @@ -173,7 +173,7 @@ do local savetable = minetest.deserialize(string) mana.playerlist = savetable.playerlist if mana.playerlist == nil then mana.playerlist = {} end - minetest.debug("[mana] mana.mt successfully read.") + minetest.log("action", "[mana] mana.mt successfully read.") end end end diff --git a/mods/mana/textures/mana_bar.png b/mods/mana/textures/mana_bar.png old mode 100644 new mode 100755 diff --git a/mods/mana/textures/mana_icon.png b/mods/mana/textures/mana_icon.png old mode 100644 new mode 100755 diff --git a/mods/mana/textures/mana_icon_bg_empty.png b/mods/mana/textures/mana_icon_bg_empty.png old mode 100644 new mode 100755 diff --git a/mods/mana/textures/mana_icon_violet.png b/mods/mana/textures/mana_icon_violet.png old mode 100644 new mode 100755 diff --git a/mods/maptools/.default_nodes.lua.swp b/mods/maptools/.default_nodes.lua.swp old mode 100644 new mode 100755 diff --git a/mods/maptools/LICENSE.md b/mods/maptools/LICENSE.md old mode 100644 new mode 100755 diff --git a/mods/maptools/NODES.md b/mods/maptools/NODES.md old mode 100644 new mode 100755 diff --git a/mods/maptools/README.md b/mods/maptools/README.md old mode 100644 new mode 100755 diff --git a/mods/maptools/aliases.lua b/mods/maptools/aliases.lua old mode 100644 new mode 100755 diff --git a/mods/maptools/config.lua b/mods/maptools/config.lua old mode 100644 new mode 100755 index 9de05951..3cd502ef --- a/mods/maptools/config.lua +++ b/mods/maptools/config.lua @@ -26,4 +26,4 @@ local function setting(settingtype, name, default) end -- Show Map Tools stuff in creative inventory (1 or 0): -setting("integer", "hide_from_creative_inventory", 0) \ No newline at end of file +setting("integer", "hide_from_creative_inventory", 0) diff --git a/mods/maptools/craftitems.lua b/mods/maptools/craftitems.lua old mode 100644 new mode 100755 diff --git a/mods/maptools/default_nodes.lua b/mods/maptools/default_nodes.lua old mode 100644 new mode 100755 index 3f0924da..ca28c529 --- a/mods/maptools/default_nodes.lua +++ b/mods/maptools/default_nodes.lua @@ -190,7 +190,7 @@ minetest.register_node("maptools:sandstone", { sounds = default.node_sound_stone_defaults(), }) -minetest.register_node("maptools:sandstonebrick", { +minetest.register_node("maptools:sandstone_brick", { description = S("Unbreakable Sandstone Brick"), range = 12, stack_max = 10000, diff --git a/mods/maptools/depends.txt b/mods/maptools/depends.txt old mode 100644 new mode 100755 diff --git a/mods/maptools/init.lua b/mods/maptools/init.lua old mode 100644 new mode 100755 diff --git a/mods/maptools/locale/es.txt b/mods/maptools/locale/es.txt old mode 100644 new mode 100755 diff --git a/mods/maptools/locale/fr.txt b/mods/maptools/locale/fr.txt old mode 100644 new mode 100755 diff --git a/mods/maptools/nodes.lua b/mods/maptools/nodes.lua old mode 100644 new mode 100755 diff --git a/mods/maptools/textures/black.png b/mods/maptools/textures/black.png old mode 100644 new mode 100755 diff --git a/mods/maptools/textures/bones_bones.png b/mods/maptools/textures/bones_bones.png deleted file mode 100755 index 651ee214..00000000 Binary files a/mods/maptools/textures/bones_bones.png and /dev/null differ diff --git a/mods/maptools/textures/dye_purple.png b/mods/maptools/textures/dye_purple.png deleted file mode 100755 index 41d45fa0..00000000 Binary files a/mods/maptools/textures/dye_purple.png and /dev/null differ diff --git a/mods/maptools/textures/fire_basic_flame.png b/mods/maptools/textures/fire_basic_flame.png old mode 100644 new mode 100755 diff --git a/mods/maptools/textures/fire_basic_flame_animated.png b/mods/maptools/textures/fire_basic_flame_animated.png old mode 100644 new mode 100755 diff --git a/mods/maptools/textures/invisible.png b/mods/maptools/textures/invisible.png old mode 100644 new mode 100755 diff --git a/mods/maptools/textures/maptools_adminpick.png b/mods/maptools/textures/maptools_adminpick.png old mode 100644 new mode 100755 diff --git a/mods/maptools/textures/maptools_adminpick_with_drops.png b/mods/maptools/textures/maptools_adminpick_with_drops.png old mode 100644 new mode 100755 diff --git a/mods/maptools/textures/maptools_copper_coin.png b/mods/maptools/textures/maptools_copper_coin.png old mode 100644 new mode 100755 diff --git a/mods/maptools/textures/maptools_gold_coin.png b/mods/maptools/textures/maptools_gold_coin.png old mode 100644 new mode 100755 diff --git a/mods/maptools/textures/maptools_grass_side_12.png b/mods/maptools/textures/maptools_grass_side_12.png old mode 100644 new mode 100755 diff --git a/mods/maptools/textures/maptools_grass_side_4.png b/mods/maptools/textures/maptools_grass_side_4.png old mode 100644 new mode 100755 diff --git a/mods/maptools/textures/maptools_grass_side_8.png b/mods/maptools/textures/maptools_grass_side_8.png old mode 100644 new mode 100755 diff --git a/mods/maptools/textures/maptools_infinitefuel.png b/mods/maptools/textures/maptools_infinitefuel.png old mode 100644 new mode 100755 diff --git a/mods/maptools/textures/maptools_silver_coin.png b/mods/maptools/textures/maptools_silver_coin.png old mode 100644 new mode 100755 diff --git a/mods/maptools/textures/maptools_smoke.png b/mods/maptools/textures/maptools_smoke.png old mode 100644 new mode 100755 diff --git a/mods/maptools/textures/maptools_super_apple_bottom.png b/mods/maptools/textures/maptools_super_apple_bottom.png old mode 100644 new mode 100755 diff --git a/mods/maptools/textures/maptools_super_apple_side.png b/mods/maptools/textures/maptools_super_apple_side.png old mode 100644 new mode 100755 diff --git a/mods/maptools/textures/maptools_super_apple_top.png b/mods/maptools/textures/maptools_super_apple_top.png old mode 100644 new mode 100755 diff --git a/mods/maptools/textures/maptools_superapple.png b/mods/maptools/textures/maptools_superapple.png old mode 100644 new mode 100755 diff --git a/mods/maptools/textures/white.png b/mods/maptools/textures/white.png old mode 100644 new mode 100755 diff --git a/mods/maptools/tools.lua b/mods/maptools/tools.lua old mode 100644 new mode 100755 diff --git a/mods/maze/init.lua b/mods/maze/init.lua old mode 100644 new mode 100755 diff --git a/mods/mesecons/LICENSE.txt b/mods/mesecons/LICENSE.txt old mode 100644 new mode 100755 diff --git a/mods/mesecons/README.md b/mods/mesecons/README.md old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons/VERSION b/mods/mesecons/mesecons/VERSION old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons/actionqueue.lua b/mods/mesecons/mesecons/actionqueue.lua old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons/depends.txt b/mods/mesecons/mesecons/depends.txt old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons/init.lua b/mods/mesecons/mesecons/init.lua old mode 100644 new mode 100755 index 096e509f..031d8d90 --- a/mods/mesecons/mesecons/init.lua +++ b/mods/mesecons/mesecons/init.lua @@ -126,7 +126,7 @@ function mesecon.receptor_off(pos, rules) end -print("[OK] Mesecons") +minetest.log("action", "[OK] Mesecons") -- Deprecated stuff -- To be removed in future releases diff --git a/mods/mesecons/mesecons/internal.lua b/mods/mesecons/mesecons/internal.lua old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons/legacy.lua b/mods/mesecons/mesecons/legacy.lua old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons/oldwires.lua b/mods/mesecons/mesecons/oldwires.lua old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons/presets.lua b/mods/mesecons/mesecons/presets.lua old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons/services.lua b/mods/mesecons/mesecons/services.lua old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons/settings.lua b/mods/mesecons/mesecons/settings.lua old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons/textures/jeija_fiber.png b/mods/mesecons/mesecons/textures/jeija_fiber.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons/textures/jeija_glue.png b/mods/mesecons/mesecons/textures/jeija_glue.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons/textures/jeija_mesecon_switch_off.png b/mods/mesecons/mesecons/textures/jeija_mesecon_switch_off.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons/textures/jeija_mesecon_switch_on.png b/mods/mesecons/mesecons/textures/jeija_mesecon_switch_on.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons/textures/jeija_mesecon_switch_side.png b/mods/mesecons/mesecons/textures/jeija_mesecon_switch_side.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons/textures/jeija_silicon.png b/mods/mesecons/mesecons/textures/jeija_silicon.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons/textures/mesecons_wire_inv.png b/mods/mesecons/mesecons/textures/mesecons_wire_inv.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons/textures/mesecons_wire_off.png b/mods/mesecons/mesecons/textures/mesecons_wire_off.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons/textures/mesecons_wire_on.png b/mods/mesecons/mesecons/textures/mesecons_wire_on.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons/util.lua b/mods/mesecons/mesecons/util.lua old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons/wires.lua b/mods/mesecons/mesecons/wires.lua old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_alias/depends.txt b/mods/mesecons/mesecons_alias/depends.txt old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_alias/init.lua b/mods/mesecons/mesecons_alias/init.lua old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_blinkyplant/depends.txt b/mods/mesecons/mesecons_blinkyplant/depends.txt old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_blinkyplant/init.lua b/mods/mesecons/mesecons_blinkyplant/init.lua old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_blinkyplant/textures/jeija_blinky_plant_off.png b/mods/mesecons/mesecons_blinkyplant/textures/jeija_blinky_plant_off.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_blinkyplant/textures/jeija_blinky_plant_on.png b/mods/mesecons/mesecons_blinkyplant/textures/jeija_blinky_plant_on.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_button/depends.txt b/mods/mesecons/mesecons_button/depends.txt old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_button/init.lua b/mods/mesecons/mesecons_button/init.lua old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_button/sounds/mesecons_button_pop.ogg b/mods/mesecons/mesecons_button/sounds/mesecons_button_pop.ogg old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_button/sounds/mesecons_button_push.ogg b/mods/mesecons/mesecons_button/sounds/mesecons_button_push.ogg old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_button/textures/jeija_wall_button_off.png b/mods/mesecons/mesecons_button/textures/jeija_wall_button_off.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_button/textures/jeija_wall_button_on.png b/mods/mesecons/mesecons_button/textures/jeija_wall_button_on.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_button/textures/jeija_wall_button_sides.png b/mods/mesecons/mesecons_button/textures/jeija_wall_button_sides.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_commandblock/depends.txt b/mods/mesecons/mesecons_commandblock/depends.txt old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_commandblock/init.lua b/mods/mesecons/mesecons_commandblock/init.lua old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_commandblock/textures/jeija_close_window.png b/mods/mesecons/mesecons_commandblock/textures/jeija_close_window.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_commandblock/textures/jeija_commandblock_off.png b/mods/mesecons/mesecons_commandblock/textures/jeija_commandblock_off.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_commandblock/textures/jeija_commandblock_on.png b/mods/mesecons/mesecons_commandblock/textures/jeija_commandblock_on.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_delayer/depends.txt b/mods/mesecons/mesecons_delayer/depends.txt old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_delayer/init.lua b/mods/mesecons/mesecons_delayer/init.lua old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_delayer/textures/mesecons_delayer_bottom.png b/mods/mesecons/mesecons_delayer/textures/mesecons_delayer_bottom.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_delayer/textures/mesecons_delayer_ends_off.png b/mods/mesecons/mesecons_delayer/textures/mesecons_delayer_ends_off.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_delayer/textures/mesecons_delayer_ends_on.png b/mods/mesecons/mesecons_delayer/textures/mesecons_delayer_ends_on.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_delayer/textures/mesecons_delayer_off_1.png b/mods/mesecons/mesecons_delayer/textures/mesecons_delayer_off_1.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_delayer/textures/mesecons_delayer_off_2.png b/mods/mesecons/mesecons_delayer/textures/mesecons_delayer_off_2.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_delayer/textures/mesecons_delayer_off_3.png b/mods/mesecons/mesecons_delayer/textures/mesecons_delayer_off_3.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_delayer/textures/mesecons_delayer_off_4.png b/mods/mesecons/mesecons_delayer/textures/mesecons_delayer_off_4.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_delayer/textures/mesecons_delayer_on_1.png b/mods/mesecons/mesecons_delayer/textures/mesecons_delayer_on_1.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_delayer/textures/mesecons_delayer_on_2.png b/mods/mesecons/mesecons_delayer/textures/mesecons_delayer_on_2.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_delayer/textures/mesecons_delayer_on_3.png b/mods/mesecons/mesecons_delayer/textures/mesecons_delayer_on_3.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_delayer/textures/mesecons_delayer_on_4.png b/mods/mesecons/mesecons_delayer/textures/mesecons_delayer_on_4.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_delayer/textures/mesecons_delayer_sides_off.png b/mods/mesecons/mesecons_delayer/textures/mesecons_delayer_sides_off.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_delayer/textures/mesecons_delayer_sides_on.png b/mods/mesecons/mesecons_delayer/textures/mesecons_delayer_sides_on.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_detector/depends.txt b/mods/mesecons/mesecons_detector/depends.txt old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_detector/init.lua b/mods/mesecons/mesecons_detector/init.lua old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_detector/textures/jeija_node_detector_off.png b/mods/mesecons/mesecons_detector/textures/jeija_node_detector_off.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_detector/textures/jeija_node_detector_on.png b/mods/mesecons/mesecons_detector/textures/jeija_node_detector_on.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_detector/textures/jeija_object_detector_off.png b/mods/mesecons/mesecons_detector/textures/jeija_object_detector_off.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_detector/textures/jeija_object_detector_on.png b/mods/mesecons/mesecons_detector/textures/jeija_object_detector_on.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_doors/depends.txt b/mods/mesecons/mesecons_doors/depends.txt old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_doors/init.lua b/mods/mesecons/mesecons_doors/init.lua old mode 100644 new mode 100755 index 9b79dcab..dca8b4d6 --- a/mods/mesecons/mesecons_doors/init.lua +++ b/mods/mesecons/mesecons_doors/init.lua @@ -82,19 +82,3 @@ if minetest.registered_nodes["doors:trapdoor"] then }}, }) end - -if minetest.registered_nodes["doors:trapdoor_cherry"] then - minetest.override_item("doors:trapdoor_cherry", { - mesecons = {effector = { - action_on = trapdoor_switch, - action_off = trapdoor_switch - }}, - }) - - minetest.override_item("doors:trapdoor_cherry_open", { - mesecons = {effector = { - action_on = trapdoor_switch, - action_off = trapdoor_switch - }}, - }) -end diff --git a/mods/mesecons/mesecons_extrawires/corner.lua b/mods/mesecons/mesecons_extrawires/corner.lua old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_extrawires/crossover.lua b/mods/mesecons/mesecons_extrawires/crossover.lua old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_extrawires/depends.txt b/mods/mesecons/mesecons_extrawires/depends.txt old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_extrawires/init.lua b/mods/mesecons/mesecons_extrawires/init.lua old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_extrawires/mesewire.lua b/mods/mesecons/mesecons_extrawires/mesewire.lua old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_extrawires/tjunction.lua b/mods/mesecons/mesecons_extrawires/tjunction.lua old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_extrawires/vertical.lua b/mods/mesecons/mesecons_extrawires/vertical.lua old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_gates/depends.txt b/mods/mesecons/mesecons_gates/depends.txt old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_gates/init.lua b/mods/mesecons/mesecons_gates/init.lua old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_gates/textures/jeija_gate_and.png b/mods/mesecons/mesecons_gates/textures/jeija_gate_and.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_gates/textures/jeija_gate_diode.png b/mods/mesecons/mesecons_gates/textures/jeija_gate_diode.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_gates/textures/jeija_gate_nand.png b/mods/mesecons/mesecons_gates/textures/jeija_gate_nand.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_gates/textures/jeija_gate_not.png b/mods/mesecons/mesecons_gates/textures/jeija_gate_not.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_gates/textures/jeija_gate_off.png b/mods/mesecons/mesecons_gates/textures/jeija_gate_off.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_gates/textures/jeija_gate_on.png b/mods/mesecons/mesecons_gates/textures/jeija_gate_on.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_gates/textures/jeija_gate_xor.png b/mods/mesecons/mesecons_gates/textures/jeija_gate_xor.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_hydroturbine/depends.txt b/mods/mesecons/mesecons_hydroturbine/depends.txt old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_hydroturbine/init.lua b/mods/mesecons/mesecons_hydroturbine/init.lua old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_hydroturbine/models/jeija_hydro_turbine.obj b/mods/mesecons/mesecons_hydroturbine/models/jeija_hydro_turbine.obj old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_hydroturbine/textures/jeija_hydro_turbine_inv.png b/mods/mesecons/mesecons_hydroturbine/textures/jeija_hydro_turbine_inv.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_hydroturbine/textures/jeija_hydro_turbine_off.png b/mods/mesecons/mesecons_hydroturbine/textures/jeija_hydro_turbine_off.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_hydroturbine/textures/jeija_hydro_turbine_on.png b/mods/mesecons/mesecons_hydroturbine/textures/jeija_hydro_turbine_on.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_insulated/depends.txt b/mods/mesecons/mesecons_insulated/depends.txt old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_insulated/init.lua b/mods/mesecons/mesecons_insulated/init.lua old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_insulated/textures/jeija_insulated_wire_crossing_tb_01.png b/mods/mesecons/mesecons_insulated/textures/jeija_insulated_wire_crossing_tb_01.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_insulated/textures/jeija_insulated_wire_crossing_tb_10.png b/mods/mesecons/mesecons_insulated/textures/jeija_insulated_wire_crossing_tb_10.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_insulated/textures/jeija_insulated_wire_crossing_tb_off.png b/mods/mesecons/mesecons_insulated/textures/jeija_insulated_wire_crossing_tb_off.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_insulated/textures/jeija_insulated_wire_crossing_tb_on.png b/mods/mesecons/mesecons_insulated/textures/jeija_insulated_wire_crossing_tb_on.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_insulated/textures/jeija_insulated_wire_curved_tb_off.png b/mods/mesecons/mesecons_insulated/textures/jeija_insulated_wire_curved_tb_off.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_insulated/textures/jeija_insulated_wire_curved_tb_on.png b/mods/mesecons/mesecons_insulated/textures/jeija_insulated_wire_curved_tb_on.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_insulated/textures/jeija_insulated_wire_ends_01x.png b/mods/mesecons/mesecons_insulated/textures/jeija_insulated_wire_ends_01x.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_insulated/textures/jeija_insulated_wire_ends_01z.png b/mods/mesecons/mesecons_insulated/textures/jeija_insulated_wire_ends_01z.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_insulated/textures/jeija_insulated_wire_ends_10x.png b/mods/mesecons/mesecons_insulated/textures/jeija_insulated_wire_ends_10x.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_insulated/textures/jeija_insulated_wire_ends_10z.png b/mods/mesecons/mesecons_insulated/textures/jeija_insulated_wire_ends_10z.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_insulated/textures/jeija_insulated_wire_ends_off.png b/mods/mesecons/mesecons_insulated/textures/jeija_insulated_wire_ends_off.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_insulated/textures/jeija_insulated_wire_ends_on.png b/mods/mesecons/mesecons_insulated/textures/jeija_insulated_wire_ends_on.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_insulated/textures/jeija_insulated_wire_sides_off.png b/mods/mesecons/mesecons_insulated/textures/jeija_insulated_wire_sides_off.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_insulated/textures/jeija_insulated_wire_sides_on.png b/mods/mesecons/mesecons_insulated/textures/jeija_insulated_wire_sides_on.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_insulated/textures/jeija_insulated_wire_tjunction_tb_off.png b/mods/mesecons/mesecons_insulated/textures/jeija_insulated_wire_tjunction_tb_off.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_insulated/textures/jeija_insulated_wire_tjunction_tb_on.png b/mods/mesecons/mesecons_insulated/textures/jeija_insulated_wire_tjunction_tb_on.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_lamp/depends.txt b/mods/mesecons/mesecons_lamp/depends.txt old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_lamp/init.lua b/mods/mesecons/mesecons_lamp/init.lua old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_lamp/textures/jeija_meselamp.png b/mods/mesecons/mesecons_lamp/textures/jeija_meselamp.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_lamp/textures/jeija_meselamp_off.png b/mods/mesecons/mesecons_lamp/textures/jeija_meselamp_off.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_lamp/textures/jeija_meselamp_on.png b/mods/mesecons/mesecons_lamp/textures/jeija_meselamp_on.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_lightstone/depends.txt b/mods/mesecons/mesecons_lightstone/depends.txt old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_lightstone/init.lua b/mods/mesecons/mesecons_lightstone/init.lua old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_lightstone/textures/jeija_lightstone_blue_off.png b/mods/mesecons/mesecons_lightstone/textures/jeija_lightstone_blue_off.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_lightstone/textures/jeija_lightstone_blue_on.png b/mods/mesecons/mesecons_lightstone/textures/jeija_lightstone_blue_on.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_lightstone/textures/jeija_lightstone_darkgray_off.png b/mods/mesecons/mesecons_lightstone/textures/jeija_lightstone_darkgray_off.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_lightstone/textures/jeija_lightstone_darkgray_on.png b/mods/mesecons/mesecons_lightstone/textures/jeija_lightstone_darkgray_on.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_lightstone/textures/jeija_lightstone_gray_off.png b/mods/mesecons/mesecons_lightstone/textures/jeija_lightstone_gray_off.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_lightstone/textures/jeija_lightstone_gray_on.png b/mods/mesecons/mesecons_lightstone/textures/jeija_lightstone_gray_on.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_lightstone/textures/jeija_lightstone_green_off.png b/mods/mesecons/mesecons_lightstone/textures/jeija_lightstone_green_off.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_lightstone/textures/jeija_lightstone_green_on.png b/mods/mesecons/mesecons_lightstone/textures/jeija_lightstone_green_on.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_lightstone/textures/jeija_lightstone_red_off.png b/mods/mesecons/mesecons_lightstone/textures/jeija_lightstone_red_off.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_lightstone/textures/jeija_lightstone_red_on.png b/mods/mesecons/mesecons_lightstone/textures/jeija_lightstone_red_on.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_lightstone/textures/jeija_lightstone_yellow_off.png b/mods/mesecons/mesecons_lightstone/textures/jeija_lightstone_yellow_off.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_lightstone/textures/jeija_lightstone_yellow_on.png b/mods/mesecons/mesecons_lightstone/textures/jeija_lightstone_yellow_on.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_luacontroller/depends.txt b/mods/mesecons/mesecons_luacontroller/depends.txt old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_luacontroller/init.lua b/mods/mesecons/mesecons_luacontroller/init.lua old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_luacontroller/textures/jeija_luac_background.png b/mods/mesecons/mesecons_luacontroller/textures/jeija_luac_background.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_luacontroller/textures/jeija_luac_runbutton.png b/mods/mesecons/mesecons_luacontroller/textures/jeija_luac_runbutton.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_luacontroller/textures/jeija_luacontroller_LED_A.png b/mods/mesecons/mesecons_luacontroller/textures/jeija_luacontroller_LED_A.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_luacontroller/textures/jeija_luacontroller_LED_B.png b/mods/mesecons/mesecons_luacontroller/textures/jeija_luacontroller_LED_B.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_luacontroller/textures/jeija_luacontroller_LED_C.png b/mods/mesecons/mesecons_luacontroller/textures/jeija_luacontroller_LED_C.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_luacontroller/textures/jeija_luacontroller_LED_D.png b/mods/mesecons/mesecons_luacontroller/textures/jeija_luacontroller_LED_D.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_luacontroller/textures/jeija_luacontroller_burnt_top.png b/mods/mesecons/mesecons_luacontroller/textures/jeija_luacontroller_burnt_top.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_luacontroller/textures/jeija_luacontroller_top.png b/mods/mesecons/mesecons_luacontroller/textures/jeija_luacontroller_top.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_materials/depends.txt b/mods/mesecons/mesecons_materials/depends.txt old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_materials/init.lua b/mods/mesecons/mesecons_materials/init.lua old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_microcontroller/MeseconMicro.odt b/mods/mesecons/mesecons_microcontroller/MeseconMicro.odt old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_microcontroller/MeseconMicro.pdf b/mods/mesecons/mesecons_microcontroller/MeseconMicro.pdf old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_microcontroller/depends.txt b/mods/mesecons/mesecons_microcontroller/depends.txt old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_microcontroller/init.lua b/mods/mesecons/mesecons_microcontroller/init.lua old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_microcontroller/textures/jeija_microcontroller_LED_A.png b/mods/mesecons/mesecons_microcontroller/textures/jeija_microcontroller_LED_A.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_microcontroller/textures/jeija_microcontroller_LED_B.png b/mods/mesecons/mesecons_microcontroller/textures/jeija_microcontroller_LED_B.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_microcontroller/textures/jeija_microcontroller_LED_C.png b/mods/mesecons/mesecons_microcontroller/textures/jeija_microcontroller_LED_C.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_microcontroller/textures/jeija_microcontroller_LED_D.png b/mods/mesecons/mesecons_microcontroller/textures/jeija_microcontroller_LED_D.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_microcontroller/textures/jeija_microcontroller_bottom.png b/mods/mesecons/mesecons_microcontroller/textures/jeija_microcontroller_bottom.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_microcontroller/textures/jeija_microcontroller_sides.png b/mods/mesecons/mesecons_microcontroller/textures/jeija_microcontroller_sides.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_microcontroller/textures/jeija_microcontroller_top.png b/mods/mesecons/mesecons_microcontroller/textures/jeija_microcontroller_top.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_movestones/depends.txt b/mods/mesecons/mesecons_movestones/depends.txt old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_movestones/init.lua b/mods/mesecons/mesecons_movestones/init.lua old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_movestones/textures/jeija_movestone_arrows.png b/mods/mesecons/mesecons_movestones/textures/jeija_movestone_arrows.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_movestones/textures/jeija_movestone_side.png b/mods/mesecons/mesecons_movestones/textures/jeija_movestone_side.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_movestones/textures/jeija_sticky_movestone.png b/mods/mesecons/mesecons_movestones/textures/jeija_sticky_movestone.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_mvps/depends.txt b/mods/mesecons/mesecons_mvps/depends.txt old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_mvps/init.lua b/mods/mesecons/mesecons_mvps/init.lua old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_noteblock/depends.txt b/mods/mesecons/mesecons_noteblock/depends.txt old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_noteblock/init.lua b/mods/mesecons/mesecons_noteblock/init.lua old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_a.ogg b/mods/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_a.ogg old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_a2.ogg b/mods/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_a2.ogg old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_asharp.ogg b/mods/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_asharp.ogg old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_asharp2.ogg b/mods/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_asharp2.ogg old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_b.ogg b/mods/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_b.ogg old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_b2.ogg b/mods/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_b2.ogg old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_c.ogg b/mods/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_c.ogg old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_c2.ogg b/mods/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_c2.ogg old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_crash.ogg b/mods/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_crash.ogg old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_csharp.ogg b/mods/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_csharp.ogg old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_csharp2.ogg b/mods/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_csharp2.ogg old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_d.ogg b/mods/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_d.ogg old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_d2.ogg b/mods/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_d2.ogg old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_dsharp.ogg b/mods/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_dsharp.ogg old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_dsharp2.ogg b/mods/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_dsharp2.ogg old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_e.ogg b/mods/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_e.ogg old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_e2.ogg b/mods/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_e2.ogg old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_f.ogg b/mods/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_f.ogg old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_f2.ogg b/mods/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_f2.ogg old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_fsharp.ogg b/mods/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_fsharp.ogg old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_fsharp2.ogg b/mods/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_fsharp2.ogg old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_g.ogg b/mods/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_g.ogg old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_g2.ogg b/mods/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_g2.ogg old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_gsharp.ogg b/mods/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_gsharp.ogg old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_gsharp2.ogg b/mods/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_gsharp2.ogg old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_hihat.ogg b/mods/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_hihat.ogg old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_kick.ogg b/mods/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_kick.ogg old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_litecrash.ogg b/mods/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_litecrash.ogg old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_snare.ogg b/mods/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_snare.ogg old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_noteblock/textures/mesecons_noteblock.png b/mods/mesecons/mesecons_noteblock/textures/mesecons_noteblock.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_pistons/depends.txt b/mods/mesecons/mesecons_pistons/depends.txt old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_pistons/init.lua b/mods/mesecons/mesecons_pistons/init.lua old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_pistons/sounds/piston_extend.ogg b/mods/mesecons/mesecons_pistons/sounds/piston_extend.ogg old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_pistons/sounds/piston_retract.ogg b/mods/mesecons/mesecons_pistons/sounds/piston_retract.ogg old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_pistons/textures/mesecons_piston_back.png b/mods/mesecons/mesecons_pistons/textures/mesecons_piston_back.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_pistons/textures/mesecons_piston_bottom.png b/mods/mesecons/mesecons_pistons/textures/mesecons_piston_bottom.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_pistons/textures/mesecons_piston_left.png b/mods/mesecons/mesecons_pistons/textures/mesecons_piston_left.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_pistons/textures/mesecons_piston_on_front.png b/mods/mesecons/mesecons_pistons/textures/mesecons_piston_on_front.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_pistons/textures/mesecons_piston_pusher_back.png b/mods/mesecons/mesecons_pistons/textures/mesecons_piston_pusher_back.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_pistons/textures/mesecons_piston_pusher_bottom.png b/mods/mesecons/mesecons_pistons/textures/mesecons_piston_pusher_bottom.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_pistons/textures/mesecons_piston_pusher_front.png b/mods/mesecons/mesecons_pistons/textures/mesecons_piston_pusher_front.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_pistons/textures/mesecons_piston_pusher_front_sticky.png b/mods/mesecons/mesecons_pistons/textures/mesecons_piston_pusher_front_sticky.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_pistons/textures/mesecons_piston_pusher_left.png b/mods/mesecons/mesecons_pistons/textures/mesecons_piston_pusher_left.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_pistons/textures/mesecons_piston_pusher_right.png b/mods/mesecons/mesecons_pistons/textures/mesecons_piston_pusher_right.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_pistons/textures/mesecons_piston_pusher_top.png b/mods/mesecons/mesecons_pistons/textures/mesecons_piston_pusher_top.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_pistons/textures/mesecons_piston_right.png b/mods/mesecons/mesecons_pistons/textures/mesecons_piston_right.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_pistons/textures/mesecons_piston_top.png b/mods/mesecons/mesecons_pistons/textures/mesecons_piston_top.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_powerplant/depends.txt b/mods/mesecons/mesecons_powerplant/depends.txt old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_powerplant/init.lua b/mods/mesecons/mesecons_powerplant/init.lua old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_powerplant/textures/jeija_power_plant.png b/mods/mesecons/mesecons_powerplant/textures/jeija_power_plant.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_pressureplates/depends.txt b/mods/mesecons/mesecons_pressureplates/depends.txt old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_pressureplates/init.lua b/mods/mesecons/mesecons_pressureplates/init.lua old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_pressureplates/textures/jeija_pressure_plate_stone_inv.png b/mods/mesecons/mesecons_pressureplates/textures/jeija_pressure_plate_stone_inv.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_pressureplates/textures/jeija_pressure_plate_stone_off.png b/mods/mesecons/mesecons_pressureplates/textures/jeija_pressure_plate_stone_off.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_pressureplates/textures/jeija_pressure_plate_stone_off_edges.png b/mods/mesecons/mesecons_pressureplates/textures/jeija_pressure_plate_stone_off_edges.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_pressureplates/textures/jeija_pressure_plate_stone_on.png b/mods/mesecons/mesecons_pressureplates/textures/jeija_pressure_plate_stone_on.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_pressureplates/textures/jeija_pressure_plate_stone_on_edges.png b/mods/mesecons/mesecons_pressureplates/textures/jeija_pressure_plate_stone_on_edges.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_pressureplates/textures/jeija_pressure_plate_stone_wield.png b/mods/mesecons/mesecons_pressureplates/textures/jeija_pressure_plate_stone_wield.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_pressureplates/textures/jeija_pressure_plate_wood_inv.png b/mods/mesecons/mesecons_pressureplates/textures/jeija_pressure_plate_wood_inv.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_pressureplates/textures/jeija_pressure_plate_wood_off.png b/mods/mesecons/mesecons_pressureplates/textures/jeija_pressure_plate_wood_off.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_pressureplates/textures/jeija_pressure_plate_wood_off_edges.png b/mods/mesecons/mesecons_pressureplates/textures/jeija_pressure_plate_wood_off_edges.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_pressureplates/textures/jeija_pressure_plate_wood_on.png b/mods/mesecons/mesecons_pressureplates/textures/jeija_pressure_plate_wood_on.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_pressureplates/textures/jeija_pressure_plate_wood_on_edges.png b/mods/mesecons/mesecons_pressureplates/textures/jeija_pressure_plate_wood_on_edges.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_pressureplates/textures/jeija_pressure_plate_wood_wield.png b/mods/mesecons/mesecons_pressureplates/textures/jeija_pressure_plate_wood_wield.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_random/depends.txt b/mods/mesecons/mesecons_random/depends.txt old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_random/init.lua b/mods/mesecons/mesecons_random/init.lua old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_random/textures/jeija_ghoststone.png b/mods/mesecons/mesecons_random/textures/jeija_ghoststone.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_random/textures/jeija_ghoststone_inv.png b/mods/mesecons/mesecons_random/textures/jeija_ghoststone_inv.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_random/textures/jeija_removestone.png b/mods/mesecons/mesecons_random/textures/jeija_removestone.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_random/textures/jeija_removestone_inv.png b/mods/mesecons/mesecons_random/textures/jeija_removestone_inv.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_receiver/depends.txt b/mods/mesecons/mesecons_receiver/depends.txt old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_receiver/init.lua b/mods/mesecons/mesecons_receiver/init.lua old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_receiver/textures/receiver_bottom_off.png b/mods/mesecons/mesecons_receiver/textures/receiver_bottom_off.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_receiver/textures/receiver_bottom_on.png b/mods/mesecons/mesecons_receiver/textures/receiver_bottom_on.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_receiver/textures/receiver_fb_off.png b/mods/mesecons/mesecons_receiver/textures/receiver_fb_off.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_receiver/textures/receiver_fb_on.png b/mods/mesecons/mesecons_receiver/textures/receiver_fb_on.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_receiver/textures/receiver_lr_off.png b/mods/mesecons/mesecons_receiver/textures/receiver_lr_off.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_receiver/textures/receiver_lr_on.png b/mods/mesecons/mesecons_receiver/textures/receiver_lr_on.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_receiver/textures/receiver_top_off.png b/mods/mesecons/mesecons_receiver/textures/receiver_top_off.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_receiver/textures/receiver_top_on.png b/mods/mesecons/mesecons_receiver/textures/receiver_top_on.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_solarpanel/depends.txt b/mods/mesecons/mesecons_solarpanel/depends.txt old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_solarpanel/init.lua b/mods/mesecons/mesecons_solarpanel/init.lua old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_solarpanel/textures/jeija_solar_panel.png b/mods/mesecons/mesecons_solarpanel/textures/jeija_solar_panel.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_stickyblocks/depends.txt b/mods/mesecons/mesecons_stickyblocks/depends.txt old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_stickyblocks/init.lua b/mods/mesecons/mesecons_stickyblocks/init.lua old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_switch/depends.txt b/mods/mesecons/mesecons_switch/depends.txt old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_switch/init.lua b/mods/mesecons/mesecons_switch/init.lua old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_switch/sounds/mesecons_switch.ogg b/mods/mesecons/mesecons_switch/sounds/mesecons_switch.ogg old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_torch/depends.txt b/mods/mesecons/mesecons_torch/depends.txt old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_torch/init.lua b/mods/mesecons/mesecons_torch/init.lua old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_torch/textures/jeija_torches_off.png b/mods/mesecons/mesecons_torch/textures/jeija_torches_off.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_torch/textures/jeija_torches_off_ceiling.png b/mods/mesecons/mesecons_torch/textures/jeija_torches_off_ceiling.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_torch/textures/jeija_torches_off_side.png b/mods/mesecons/mesecons_torch/textures/jeija_torches_off_side.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_torch/textures/jeija_torches_on.png b/mods/mesecons/mesecons_torch/textures/jeija_torches_on.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_torch/textures/jeija_torches_on_ceiling.png b/mods/mesecons/mesecons_torch/textures/jeija_torches_on_ceiling.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_torch/textures/jeija_torches_on_side.png b/mods/mesecons/mesecons_torch/textures/jeija_torches_on_side.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_walllever/depends.txt b/mods/mesecons/mesecons_walllever/depends.txt old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_walllever/init.lua b/mods/mesecons/mesecons_walllever/init.lua old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_walllever/models/jeija_wall_lever_off.obj b/mods/mesecons/mesecons_walllever/models/jeija_wall_lever_off.obj old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_walllever/models/jeija_wall_lever_on.obj b/mods/mesecons/mesecons_walllever/models/jeija_wall_lever_on.obj old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_walllever/sounds/mesecons_lever.ogg b/mods/mesecons/mesecons_walllever/sounds/mesecons_lever.ogg old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_walllever/textures/jeija_wall_lever_inv.png b/mods/mesecons/mesecons_walllever/textures/jeija_wall_lever_inv.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_walllever/textures/jeija_wall_lever_off.png b/mods/mesecons/mesecons_walllever/textures/jeija_wall_lever_off.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/mesecons_walllever/textures/jeija_wall_lever_on.png b/mods/mesecons/mesecons_walllever/textures/jeija_wall_lever_on.png old mode 100644 new mode 100755 diff --git a/mods/mesecons/modpack.txt b/mods/mesecons/modpack.txt old mode 100644 new mode 100755 diff --git a/mods/metatools/README.md b/mods/metatools/README.md old mode 100644 new mode 100755 diff --git a/mods/metatools/init.lua b/mods/metatools/init.lua old mode 100644 new mode 100755 diff --git a/mods/metatools/textures/metatools_stick.png b/mods/metatools/textures/metatools_stick.png old mode 100644 new mode 100755 diff --git a/mods/mobs/api.lua b/mods/mobs/api.lua old mode 100644 new mode 100755 index 4350a86a..95d0b2ae --- a/mods/mobs/api.lua +++ b/mods/mobs/api.lua @@ -1,4 +1,4 @@ --- Mobs Api (22nd May 2015) +-- Mobs Api (27th May 2015) mobs = {} mobs.mod = "redo" @@ -12,10 +12,6 @@ local enable_blood = minetest.setting_getbool("mobs_enable_blood") or true function mobs:register_mob(name, def) minetest.register_entity(name, { ---weight = 5, ---is_visible = true, ---automatic_rotate = false, ---automatic_face_movement_dir = 0.0, -- set yaw direction in degrees, false to disable stepheight = def.stepheight or 0.6, name = name, fly = def.fly, @@ -34,7 +30,7 @@ function mobs:register_mob(name, def) visual = def.visual, visual_size = def.visual_size or {x=1, y=1}, mesh = def.mesh, - makes_footstep_sound = def.makes_footstep_sound or true, + makes_footstep_sound = def.makes_footstep_sound or false, view_range = def.view_range or 5, walk_velocity = def.walk_velocity or 1, run_velocity = def.run_velocity or 2, @@ -61,12 +57,15 @@ function mobs:register_mob(name, def) --fov = def.fov or 120, passive = def.passive or false, recovery_time = def.recovery_time or 0.5, - knock_back = def.knock_back or 1, --Modif MFF, default value is "or 3", + knock_back = def.knock_back or 3, blood_amount = def.blood_amount or 5, blood_texture = def.blood_texture or "mobs_blood.png", shoot_offset = def.shoot_offset or 0, floats = def.floats or 1, -- floats in water by default - replacements = def.replacements or {}, + replace_rate = def.replace_rate, + replace_what = def.replace_what, + replace_with = def.replace_with, + replace_offset = def.replace_offset or 0, timer = 0, env_damage_timer = 0, -- only if state = "attack" attack = {player=nil, dist=nil}, @@ -78,6 +77,7 @@ function mobs:register_mob(name, def) child = false, gotten = false, owner = "", + health = 0, do_attack = function(self, player, dist) if self.state ~= "attack" then @@ -161,57 +161,42 @@ function mobs:register_mob(name, def) on_step = function(self, dtime) - local yaw = 0 - if self.type == "monster" and peaceful_only then self.object:remove() return end - -- if lifetimer run out and not npc, tamed or attacking then remove mob + -- if lifetimer run out and not npc; tamed or attacking then remove mob if self.type ~= "npc" and not self.tamed then self.lifetimer = self.lifetimer - dtime if self.lifetimer <= 0 and self.state ~= "attack" then - for _,obj in ipairs(minetest.get_objects_inside_radius(self.object:getpos(), 10)) do - if obj:is_player() then - minetest.log("action","lifetimer expired, removed mob "..self.name) - self.object:remove() - return - end - end + minetest.log("action","lifetimer expired, removed "..self.name) + effect(self.object:getpos(), 15, "tnt_smoke.png") + self.object:remove() + return end end -- check for mob drop/replace (used for chicken egg and sheep eating grass/wheat) - --[[ - old fields : - replace_rate = def.replace_rate, - replace_what = def.replace_what, - replace_with = def.replace_with, - replace_offset = def.replace_offset or 0, - ]]-- - for _, fields in pairs(self.replacements) do - - if fields.replace_rate - and math.random(1,fields.replace_rate) == 1 - and self.child == false then - - fields.replace_offset = fields.replace_offset or 0 - - local pos = self.object:getpos() - pos.y = pos.y + fields.replace_offset - if #minetest.find_nodes_in_area(pos,pos,fields.replace_what) > 0 - and self.object:getvelocity().y == 0 - and fields.replace_what then - minetest.set_node(pos, {name = fields.replace_with}) - end + if self.replace_rate + and self.child == false + and math.random(1,self.replace_rate) == 1 then + local pos = self.object:getpos() + pos.y = pos.y + self.replace_offset + if self.replace_what + and self.object:getvelocity().y == 0 + and #minetest.find_nodes_in_area(pos, pos, self.replace_what) > 0 then + --and self.state == "stand" then + minetest.set_node(pos, {name = self.replace_with}) end end + local yaw = 0 + -- jump direction (adapted from Carbone mobs), gravity, falling or floating in water if not self.fly then if self.object:getvelocity().y > 0.1 then - local yaw = self.object:getyaw() + self.rotate + yaw = self.object:getyaw() + self.rotate local x = math.sin(yaw) * -2 local z = math.cos(yaw) * 2 @@ -233,6 +218,7 @@ function mobs:register_mob(name, def) local d = self.old_y - self.object:getpos().y if d > 5 then self.object:set_hp(self.object:get_hp() - math.floor(d - 5)) + effect(self.object:getpos(), 5, "tnt_smoke.png") check_for_death(self) end self.old_y = self.object:getpos().y @@ -266,29 +252,31 @@ function mobs:register_mob(name, def) local pos = self.object:getpos() local n = minetest.get_node(pos) local tod = minetest.get_timeofday() - pos.y = pos.y + (self.collisionbox[2] + self.collisionbox[5]) / 2 - + pos.y = (pos.y + self.collisionbox[2]) -- foot level +--print ("standing on:", minetest.get_node(pos).name) if self.light_damage and self.light_damage ~= 0 and pos.y > 0 and tod > 0.2 and tod < 0.8 and (minetest.get_node_light(pos) or 0) > 10 then self.object:set_hp(self.object:get_hp()-self.light_damage) effect(pos, 5, "tnt_smoke.png") + check_for_death(self) end if self.water_damage and self.water_damage ~= 0 and minetest.get_item_group(n.name, "water") ~= 0 then self.object:set_hp(self.object:get_hp()-self.water_damage) effect(pos, 5, "bubble.png") + check_for_death(self) end if self.lava_damage and self.lava_damage ~= 0 and minetest.get_item_group(n.name, "lava") ~= 0 then self.object:set_hp(self.object:get_hp()-self.lava_damage) effect(pos, 5, "fire_basic_flame.png") + check_for_death(self) end - check_for_death(self) end local do_jump = function(self) @@ -299,13 +287,13 @@ function mobs:register_mob(name, def) local pos = self.object:getpos() pos.y = (pos.y + self.collisionbox[2]) - 0.2 local nod = minetest.get_node(pos) ---print ("stand", nod.name, pos.y) +--print ("standing on:", nod.name, pos.y) if not nod or not minetest.registered_nodes[nod.name] or minetest.registered_nodes[nod.name].walkable == false then return end if self.direction then pos.y = pos.y + 0.2 local nod = minetest.get_node_or_nil({x=pos.x + self.direction.x,y=pos.y,z=pos.z + self.direction.z}) ---print ("front", nod.name, pos.y) +--print ("in front:", nod.name, pos.y) if nod and nod.name and (nod.name ~= "air" or self.walk_chance == 0) then local def = minetest.registered_items[nod.name] if (def and def.walkable and not nod.name:find("fence")) or self.walk_chance == 0 then @@ -431,8 +419,8 @@ function mobs:register_mob(name, def) -- if animal is horny, find another same animal who is horny and mate if self.horny == true and self.hornytimer <= 40 then - local pos = self.object:getpos() ; pos.y = pos.y + 1 - effect(pos, 4, "heart.png") ; pos.y = pos.y - 1 + local pos = self.object:getpos() + effect({x=pos.x, y=pos.y+1, z=pos.z}, 4, "heart.png") local ents = minetest.get_objects_inside_radius(pos, self.view_range) local num = 0 local ent = nil @@ -508,7 +496,7 @@ function mobs:register_mob(name, def) self.following = nil else local vec = {x=p.x-s.x, y=p.y-s.y, z=p.z-s.z} - local yaw = (math.atan(vec.z/vec.x)+math.pi/2) + self.rotate + yaw = (math.atan(vec.z/vec.x)+math.pi/2) + self.rotate -- local if p.x > s.x then yaw = yaw+math.pi end @@ -517,7 +505,7 @@ function mobs:register_mob(name, def) -- anyone but standing npc's can move along if dist > 2 and self.order ~= "stand" then if (self.jump and self.get_velocity(self) <= 0.5 and self.object:getvelocity().y == 0) - or (self.object:getvelocity().y == 0 and self.jump_chance > 0) then -- CHANGED from self.jump + or (self.object:getvelocity().y == 0 and self.jump_chance > 0) then self.direction = {x = math.sin(yaw)*-1, y = -20, z = math.cos(yaw)} do_jump(self) end @@ -590,10 +578,9 @@ function mobs:register_mob(name, def) elseif self.state == "walk" then local s = self.object:getpos() - -- if there is water nearby, try to avoid it - local lp = minetest.find_node_near(s, 2, {"group:water"}) - - if lp ~= nil then + local lp = minetest.find_node_near(s, 1, {"group:water"}) + -- if water nearby then turn away + if lp then local vec = {x=lp.x-s.x, y=lp.y-s.y, z=lp.z-s.z} yaw = math.atan(vec.z/vec.x) + 3*math.pi / 2 + self.rotate if lp.x > s.x then @@ -601,7 +588,7 @@ function mobs:register_mob(name, def) end self.object:setyaw(yaw) - -- no water near, so randomly turn + -- otherwise randomly turn elseif math.random(1, 100) <= 30 then self.object:setyaw(self.object:getyaw()+((math.random(0,360)-180)/180*math.pi)) end @@ -645,7 +632,7 @@ function mobs:register_mob(name, def) end local vec = {x = p.x -s.x, y = p.y -s.y, z = p.z -s.z} - local yaw = math.atan(vec.z/vec.x)+math.pi/2 + self.rotate + yaw = math.atan(vec.z/vec.x)+math.pi/2 + self.rotate -- local if p.x > s.x then yaw = yaw+math.pi end @@ -710,30 +697,31 @@ function mobs:register_mob(name, def) local p = self.attack.player:getpos() local dist = ((p.x-s.x)^2 + (p.y-s.y)^2 + (p.z-s.z)^2)^0.5 --- fly bit modified from BlockMens creatures mod -if self.fly and dist > 2 then + -- fly bit modified from BlockMens creatures mod + if self.fly and dist > 2 then - local nod = minetest.get_node_or_nil(s) - local p1 = s - local me_y = math.floor(p1.y) - local p2 = p - local p_y = math.floor(p2.y+1) - if nod and nod.name == self.fly_in then - if me_y < p_y then - self.object:setvelocity({x=self.object:getvelocity().x,y=1*self.walk_velocity,z=self.object:getvelocity().z}) - elseif me_y > p_y then - self.object:setvelocity({x=self.object:getvelocity().x,y=-1*self.walk_velocity,z=self.object:getvelocity().z}) - end - else - if me_y < p_y then - self.object:setvelocity({x=self.object:getvelocity().x,y=0.01,z=self.object:getvelocity().z}) - elseif me_y > p_y then - self.object:setvelocity({x=self.object:getvelocity().x,y=-0.01,z=self.object:getvelocity().z}) - end - end + local nod = minetest.get_node_or_nil(s) + local p1 = s + local me_y = math.floor(p1.y) + local p2 = p + local p_y = math.floor(p2.y+1) + local v = self.object:getvelocity() + if nod and nod.name == self.fly_in then + if me_y < p_y then + self.object:setvelocity({x=v.x,y=1*self.walk_velocity,z=v.z}) + elseif me_y > p_y then + self.object:setvelocity({x=v.x,y=-1*self.walk_velocity,z=v.z}) + end + else + if me_y < p_y then + self.object:setvelocity({x=v.x,y=0.01,z=v.z}) + elseif me_y > p_y then + self.object:setvelocity({x=v.x,y=-0.01,z=v.z}) + end + end -end --- end fly bit + end + -- end fly bit if dist > self.view_range or self.attack.player:get_hp() <= 0 then self.state = "stand" @@ -746,7 +734,7 @@ end end local vec = {x=p.x-s.x, y=p.y-s.y, z=p.z-s.z} - local yaw = (math.atan(vec.z/vec.x)+math.pi/2) + self.rotate + yaw = (math.atan(vec.z/vec.x)+math.pi/2) + self.rotate -- local if p.x > s.x then yaw = yaw+math.pi end @@ -811,7 +799,7 @@ end end local vec = {x=p.x-s.x, y=p.y-s.y, z=p.z-s.z} - local yaw = (math.atan(vec.z/vec.x)+math.pi/2) + self.rotate + yaw = (math.atan(vec.z/vec.x)+math.pi/2) + self.rotate -- local if p.x > s.x then yaw = yaw+math.pi end @@ -842,18 +830,19 @@ end end, on_activate = function(self, staticdata, dtime_s) - local pos = self.object:getpos() - self.object:set_hp( math.random(self.hp_min, self.hp_max) ) -- set HP - self.oldhp = self.object:get_hp(self) -- used for hurt sound + if self.type == "monster" and peaceful_only then + self.object:remove() + end + + self.health = math.random (self.hp_min, self.hp_max) -- set initial HP + self.object:set_hp( self.health ) + self.health = self.object:get_hp() self.object:set_armor_groups({fleshy=self.armor}) self.object:setacceleration({x=0, y= self.fall_speed, z=0}) self.state = "stand" self.object:setvelocity({x=0, y=self.object:getvelocity().y, z=0}) self.old_y = self.object:getpos().y self.object:setyaw(math.random(1, 360)/180*math.pi) - if self.type == "monster" and peaceful_only then - self.object:remove() - end if staticdata then local tmp = minetest.deserialize(staticdata) @@ -891,12 +880,12 @@ end if tmp.owner then self.owner = tmp.owner end + if tmp.health then + self.health = tmp.health + self.object:set_hp( self.health ) + end end end - -- quick fix for dog so it doesn't revert back to wolf - if self.type == "monster" and self.tamed == true then - self.type = "npc" - end end, get_staticdata = function(self) @@ -941,17 +930,36 @@ end base_texture = self.base_texture, collisionbox = colbox, owner = self.owner, + health = self.health, } self.object:set_properties(tmp) return minetest.serialize(tmp) end, on_punch = function(self, hitter, tflp, tool_capabilities, dir) + -- weapon wear + local weapon = hitter:get_wielded_item() + if weapon:get_definition().tool_capabilities ~= nil then + local wear = ( weapon:get_definition().tool_capabilities.full_punch_interval / 75 ) * 9000 + weapon:add_wear(wear) + hitter:set_wielded_item(weapon) + end + + -- weapon sounds + if weapon:get_definition().sounds ~= nil then + local s = math.random(0,#weapon:get_definition().sounds) + minetest.sound_play(weapon:get_definition().sounds[s], { + object=hitter, + }) + else + minetest.sound_play("default_punch", { + object = hitter, + }) + end - process_weapon(hitter,tflp,tool_capabilities) check_for_death(self) - --blood_particles + -- blood_particles local pos = self.object:getpos() pos.y = pos.y + (-self.collisionbox[2] + self.collisionbox[5]) / 2 if self.blood_amount > 0 and pos and enable_blood == true then @@ -959,17 +967,14 @@ end end -- knock back effect, adapted from blockmen's pyramids mod - -- https://github.com/BlockMen/pyramids local kb = self.knock_back local r = self.recovery_time - local ykb = 0 -- was 2 local v = self.object:getvelocity() if tflp < tool_capabilities.full_punch_interval then kb = kb * ( tflp / tool_capabilities.full_punch_interval ) r = r * ( tflp / tool_capabilities.full_punch_interval ) end - if v.y ~= 0 then ykb = 0 end - self.object:setvelocity({x=dir.x*kb,y=ykb,z=dir.z*kb}) + self.object:setvelocity({x=dir.x*kb,y=0,z=dir.z*kb}) self.pause_timer = r -- attack puncher and call other mobs for help @@ -1082,24 +1087,6 @@ function mobs:explosion(pos, radius, fire, smoke, sound) local a = VoxelArea:new({MinEdge = minp, MaxEdge = maxp}) local data = vm:get_data() local p = {} - local undestroyed = { --Modif MFF DEBUT - minetest.get_content_id("air"), - minetest.get_content_id("ignore"), - minetest.get_content_id("default:obsidian"), - minetest.get_content_id("default:obsidianbrick"), - minetest.get_content_id("default:chest_locked"), - minetest.get_content_id("doors:door_steel_b_1"), - minetest.get_content_id("doors:door_steel_t_1"), - minetest.get_content_id("doors:door_steel_b_2"), - minetest.get_content_id("doors:door_steel_t_2"), - minetest.get_content_id("default:bedrock"), - minetest.get_content_id("default:obsidian_cooled"), - minetest.get_content_id("more_chests:cobble"), - minetest.get_content_id("more_chests:shared"), - minetest.get_content_id("more_chests:secret"), - minetest.get_content_id("more_chests:dropbox"), - minetest.get_content_id("more_chests:shared_chest") - } --Modif MFF DEBUT local c_air = minetest.get_content_id("air") local c_ignore = minetest.get_content_id("ignore") local c_obsidian = minetest.get_content_id("default:obsidian") @@ -1133,19 +1120,14 @@ function mobs:explosion(pos, radius, fire, smoke, sound) end end end - end - if n.name == "doors:door_wood_b_1" then - minetest.remove_node({x=np.x,y=np.y+1,z=np.z}) - elseif n.name == "doors:door_wood_t_1" then - minetest.remove_node({x=np.x,y=np.y-1,z=np.z}) - end - if fire > 0 and (minetest.registered_nodes[n].groups.flammable or math.random(1, 100) <= 30) then - minetest.set_node(p, {name="fire:basic_flame"}) - else - minetest.remove_node(p) - end - if smoke > 0 then - effect(p, 2, "tnt_smoke.png", 5) + if fire > 0 and (minetest.registered_nodes[n].groups.flammable or math.random(1, 100) <= 30) then + minetest.set_node(p, {name="fire:basic_flame"}) + else + minetest.remove_node(p) + end + if smoke > 0 then + effect(p, 2, "tnt_smoke.png", 5) + end end end vi = vi + 1 @@ -1158,9 +1140,9 @@ end function check_for_death(self) local hp = self.object:get_hp() if hp > 0 then - if self.sounds.damage ~= nil and hp < self.oldhp then + if self.sounds.damage ~= nil then minetest.sound_play(self.sounds.damage,{object = self.object}) - self.oldhp = hp + self.health = hp end return end @@ -1268,15 +1250,6 @@ function mobs:register_arrow(name, def) }) end -function process_weapon(player, time_from_last_punch, tool_capabilities) -local weapon = player:get_wielded_item() - if tool_capabilities ~= nil then - local wear = ( tool_capabilities.full_punch_interval / 75 ) * 65535 - weapon:add_wear(wear) - player:set_wielded_item(weapon) - end -end - -- Spawn Egg function mobs:register_egg(mob, desc, background, addegg) local invimg = background @@ -1293,8 +1266,7 @@ function mobs:register_egg(mob, desc, background, addegg) local mob = minetest.add_entity(pos, mob) local ent = mob:get_luaentity() if ent.type ~= "monster" then - ent.owner = placer:get_player_name() - ent.tamed = true + -- set owner ent.owner = placer:get_player_name() ent.tamed = true end diff --git a/mods/mobs/dog-can-help.lua b/mods/mobs/dog-can-help.lua old mode 100644 new mode 100755 diff --git a/mods/mobs/dungeonmaster.lua b/mods/mobs/dungeonmaster.lua old mode 100644 new mode 100755 index bf725925..9a0defab --- a/mods/mobs/dungeonmaster.lua +++ b/mods/mobs/dungeonmaster.lua @@ -40,6 +40,7 @@ mobs:register_mob("mobs:dungeon_master", { run_velocity = 2, jump = false, view_range = 16, + knock_back = 0, --this is a test -- drops mese or diamond when dead drops = { {name = "default:mese_crystal_fragment", diff --git a/mods/mobs/goat.lua b/mods/mobs/goat.lua old mode 100644 new mode 100755 index adc6e43a..b799043a --- a/mods/mobs/goat.lua +++ b/mods/mobs/goat.lua @@ -5,7 +5,7 @@ mobs:register_mob("mobs:goat", { -- animal, monster, npc, barbarian type = "animal", -- aggressive, does 5 damage to player when threatened - passive = true, + passive = false, attack_type = "dogfight", damage = 5, -- health & armor diff --git a/mods/mobs/greenslimes.lua b/mods/mobs/greenslimes.lua old mode 100644 new mode 100755 index 11f8e839..1351b060 --- a/mods/mobs/greenslimes.lua +++ b/mods/mobs/greenslimes.lua @@ -137,6 +137,7 @@ mobs:register_mob("mobs:greenbig", { jump_height = 6, view_range = 16, floats = 1, + knock_back = 0, --this is a test -- chance of dropping glue and coins drops = { }, diff --git a/mods/mobs/lavaslimes.lua b/mods/mobs/lavaslimes.lua old mode 100644 new mode 100755 index d27e564b..7dfd75cc --- a/mods/mobs/lavaslimes.lua +++ b/mods/mobs/lavaslimes.lua @@ -144,6 +144,7 @@ mobs:register_mob("mobs:lavabig", { footstep = "fire:basic_flame", view_range = 16, floats = 1, + knock_back = 0, --this is a test -- chance of dropping lava orb and coins drops = { }, diff --git a/mods/mobs/minotaur.lua b/mods/mobs/minotaur.lua old mode 100644 new mode 100755 index 5091aaf7..44c34740 --- a/mods/mobs/minotaur.lua +++ b/mods/mobs/minotaur.lua @@ -35,6 +35,7 @@ mobs:register_mob("mobs:minotaur", { jump = true, floats = 1, view_range = 16, + knock_back = 0, --this is a test -- drops desert_sand and coins when dead drops = { {name = "maptools:gold_coin", @@ -70,6 +71,6 @@ minetest.register_craftitem("mobs:minotaur_eye", { minetest.register_craftitem("mobs:minotaur_horn", { description = "Minotaur Horn", - inventory_image = "mobs_minotaur_eye.png", + inventory_image = "mobs_minotaur_horn.png", groups = {magic = 1}, }) diff --git a/mods/mobs/models/mobs_goat.b3d b/mods/mobs/models/mobs_goat.b3d old mode 100644 new mode 100755 diff --git a/mods/mobs/models/mobs_minotaur.b3d b/mods/mobs/models/mobs_minotaur.b3d old mode 100644 new mode 100755 diff --git a/mods/mobs/models/mobs_minotaur.blend b/mods/mobs/models/mobs_minotaur.blend old mode 100644 new mode 100755 diff --git a/mods/mobs/models/mobs_zombie.x b/mods/mobs/models/mobs_zombie.x old mode 100644 new mode 100755 diff --git a/mods/mobs/sandmonster.lua b/mods/mobs/sandmonster.lua index 970beb6b..0ffa8647 100755 --- a/mods/mobs/sandmonster.lua +++ b/mods/mobs/sandmonster.lua @@ -53,8 +53,6 @@ mobs:register_mob("mobs:sand_monster", { }, }) -- spawns on desert sand between -1 and 20 light, 1 in 15000 chance, 1 sand monster in area up to 31000 in height -mobs:register_spawn("mobs:sand_monster", {"default:desert_sand"}, 20, -1, 15000, 1, 31000) --- spawns on sand between -1 and 20 light, 1 in 8000 chance, 1 sand monster in area up to 31000 in height -mobs:register_spawn("mobs:sand_monster", {"default:sand"}, 20, -1, 8000, 1, 31000) +mobs:register_spawn("mobs:sand_monster", {"default:desert_sand", "default:sand"}, 20, -1, 15000, 1, 31000) -- register spawn egg mobs:register_egg("mobs:sand_monster", "Sand Monster", "default_desert_sand.png", 1) diff --git a/mods/mobs/sounds/mobs_slimes_attack.ogg b/mods/mobs/sounds/mobs_slimes_attack.ogg old mode 100644 new mode 100755 diff --git a/mods/mobs/sounds/mobs_slimes_damage.ogg b/mods/mobs/sounds/mobs_slimes_damage.ogg old mode 100644 new mode 100755 diff --git a/mods/mobs/sounds/mobs_slimes_death.ogg b/mods/mobs/sounds/mobs_slimes_death.ogg old mode 100644 new mode 100755 diff --git a/mods/mobs/sounds/mobs_slimes_jump.ogg b/mods/mobs/sounds/mobs_slimes_jump.ogg old mode 100644 new mode 100755 diff --git a/mods/mobs/sounds/mobs_wolf_attack.ogg b/mods/mobs/sounds/mobs_wolf_attack.ogg old mode 100644 new mode 100755 diff --git a/mods/mobs/sounds/mobs_zombie.1.ogg b/mods/mobs/sounds/mobs_zombie.1.ogg old mode 100644 new mode 100755 diff --git a/mods/mobs/sounds/mobs_zombie.2.ogg b/mods/mobs/sounds/mobs_zombie.2.ogg old mode 100644 new mode 100755 diff --git a/mods/mobs/sounds/mobs_zombie_attack.ogg b/mods/mobs/sounds/mobs_zombie_attack.ogg old mode 100644 new mode 100755 diff --git a/mods/mobs/sounds/mobs_zombie_death.ogg b/mods/mobs/sounds/mobs_zombie_death.ogg old mode 100644 new mode 100755 diff --git a/mods/mobs/sounds/mobs_zombie_hit.ogg b/mods/mobs/sounds/mobs_zombie_hit.ogg old mode 100644 new mode 100755 diff --git a/mods/mobs/textures/jeija_glue.png b/mods/mobs/textures/jeija_glue.png old mode 100644 new mode 100755 diff --git a/mods/mobs/textures/mobs_dog.png b/mods/mobs/textures/mobs_dog.png old mode 100644 new mode 100755 diff --git a/mods/mobs/textures/mobs_dung.png b/mods/mobs/textures/mobs_dung.png old mode 100644 new mode 100755 diff --git a/mods/mobs/textures/mobs_goat_brown.png b/mods/mobs/textures/mobs_goat_brown.png old mode 100644 new mode 100755 diff --git a/mods/mobs/textures/mobs_goat_grey.png b/mods/mobs/textures/mobs_goat_grey.png old mode 100644 new mode 100755 diff --git a/mods/mobs/textures/mobs_goat_white.png b/mods/mobs/textures/mobs_goat_white.png old mode 100644 new mode 100755 diff --git a/mods/mobs/textures/mobs_green_slime_blood.png b/mods/mobs/textures/mobs_green_slime_blood.png old mode 100644 new mode 100755 diff --git a/mods/mobs/textures/mobs_green_slime_bottom.png b/mods/mobs/textures/mobs_green_slime_bottom.png old mode 100644 new mode 100755 diff --git a/mods/mobs/textures/mobs_green_slime_egg.png b/mods/mobs/textures/mobs_green_slime_egg.png old mode 100644 new mode 100755 diff --git a/mods/mobs/textures/mobs_green_slime_front.png b/mods/mobs/textures/mobs_green_slime_front.png old mode 100644 new mode 100755 diff --git a/mods/mobs/textures/mobs_green_slime_sides.png b/mods/mobs/textures/mobs_green_slime_sides.png old mode 100644 new mode 100755 diff --git a/mods/mobs/textures/mobs_green_slime_top.png b/mods/mobs/textures/mobs_green_slime_top.png old mode 100644 new mode 100755 diff --git a/mods/mobs/textures/mobs_lava_slime_blood.png b/mods/mobs/textures/mobs_lava_slime_blood.png old mode 100644 new mode 100755 diff --git a/mods/mobs/textures/mobs_lava_slime_bottom.png b/mods/mobs/textures/mobs_lava_slime_bottom.png old mode 100644 new mode 100755 diff --git a/mods/mobs/textures/mobs_lava_slime_egg.png b/mods/mobs/textures/mobs_lava_slime_egg.png old mode 100644 new mode 100755 diff --git a/mods/mobs/textures/mobs_lava_slime_front.png b/mods/mobs/textures/mobs_lava_slime_front.png old mode 100644 new mode 100755 diff --git a/mods/mobs/textures/mobs_lava_slime_sides.png b/mods/mobs/textures/mobs_lava_slime_sides.png old mode 100644 new mode 100755 diff --git a/mods/mobs/textures/mobs_lava_slime_top.png b/mods/mobs/textures/mobs_lava_slime_top.png old mode 100644 new mode 100755 diff --git a/mods/mobs/textures/mobs_magic_lasso.png b/mods/mobs/textures/mobs_magic_lasso.png old mode 100644 new mode 100755 diff --git a/mods/mobs/textures/mobs_minotaur.png b/mods/mobs/textures/mobs_minotaur.png old mode 100644 new mode 100755 diff --git a/mods/runes/textures/mobs_minotaur_eye.png b/mods/mobs/textures/mobs_minotaur_eye.png old mode 100644 new mode 100755 similarity index 100% rename from mods/runes/textures/mobs_minotaur_eye.png rename to mods/mobs/textures/mobs_minotaur_eye.png diff --git a/mods/runes/textures/mobs_minotaur_horn.png b/mods/mobs/textures/mobs_minotaur_horn.png old mode 100644 new mode 100755 similarity index 100% rename from mods/runes/textures/mobs_minotaur_horn.png rename to mods/mobs/textures/mobs_minotaur_horn.png diff --git a/mods/mobs/textures/mobs_shears.png b/mods/mobs/textures/mobs_shears.png old mode 100644 new mode 100755 diff --git a/mods/mobs/textures/mobs_yeti.png b/mods/mobs/textures/mobs_yeti.png old mode 100644 new mode 100755 diff --git a/mods/mobs/textures/mobs_zombie.png b/mods/mobs/textures/mobs_zombie.png old mode 100644 new mode 100755 diff --git a/mods/mobs/textures/mobs_zombie_head.png b/mods/mobs/textures/mobs_zombie_head.png old mode 100644 new mode 100755 diff --git a/mods/mobs/yeti.lua b/mods/mobs/yeti.lua old mode 100644 new mode 100755 diff --git a/mods/mobs/zombie.lua b/mods/mobs/zombie.lua old mode 100644 new mode 100755 diff --git a/mods/moreblocks/LICENSE.md b/mods/moreblocks/LICENSE.md old mode 100644 new mode 100755 diff --git a/mods/moreblocks/README.md b/mods/moreblocks/README.md old mode 100644 new mode 100755 diff --git a/mods/moreblocks/aliases.lua b/mods/moreblocks/aliases.lua old mode 100644 new mode 100755 diff --git a/mods/moreblocks/circular_saw.lua b/mods/moreblocks/circular_saw.lua old mode 100644 new mode 100755 diff --git a/mods/moreblocks/config.lua b/mods/moreblocks/config.lua old mode 100644 new mode 100755 diff --git a/mods/moreblocks/crafting.lua b/mods/moreblocks/crafting.lua old mode 100644 new mode 100755 diff --git a/mods/moreblocks/depends.txt b/mods/moreblocks/depends.txt old mode 100644 new mode 100755 diff --git a/mods/moreblocks/init.lua b/mods/moreblocks/init.lua old mode 100644 new mode 100755 diff --git a/mods/moreblocks/locale/de.txt b/mods/moreblocks/locale/de.txt old mode 100644 new mode 100755 diff --git a/mods/moreblocks/locale/es.txt b/mods/moreblocks/locale/es.txt old mode 100644 new mode 100755 diff --git a/mods/moreblocks/locale/fr.txt b/mods/moreblocks/locale/fr.txt old mode 100644 new mode 100755 diff --git a/mods/moreblocks/locale/template.txt b/mods/moreblocks/locale/template.txt old mode 100644 new mode 100755 diff --git a/mods/moreblocks/models/moreblocks_slope.obj b/mods/moreblocks/models/moreblocks_slope.obj old mode 100644 new mode 100755 diff --git a/mods/moreblocks/models/moreblocks_slope_half.obj b/mods/moreblocks/models/moreblocks_slope_half.obj old mode 100644 new mode 100755 diff --git a/mods/moreblocks/models/moreblocks_slope_half_raised.obj b/mods/moreblocks/models/moreblocks_slope_half_raised.obj old mode 100644 new mode 100755 diff --git a/mods/moreblocks/models/moreblocks_slope_inner.obj b/mods/moreblocks/models/moreblocks_slope_inner.obj old mode 100644 new mode 100755 diff --git a/mods/moreblocks/models/moreblocks_slope_inner_half.obj b/mods/moreblocks/models/moreblocks_slope_inner_half.obj old mode 100644 new mode 100755 diff --git a/mods/moreblocks/models/moreblocks_slope_inner_half_raised.obj b/mods/moreblocks/models/moreblocks_slope_inner_half_raised.obj old mode 100644 new mode 100755 diff --git a/mods/moreblocks/models/moreblocks_slope_outer.obj b/mods/moreblocks/models/moreblocks_slope_outer.obj old mode 100644 new mode 100755 diff --git a/mods/moreblocks/models/moreblocks_slope_outer_cut.obj b/mods/moreblocks/models/moreblocks_slope_outer_cut.obj old mode 100644 new mode 100755 diff --git a/mods/moreblocks/models/moreblocks_slope_outer_cut_half.obj b/mods/moreblocks/models/moreblocks_slope_outer_cut_half.obj old mode 100644 new mode 100755 diff --git a/mods/moreblocks/models/moreblocks_slope_outer_cut_half_raised.obj b/mods/moreblocks/models/moreblocks_slope_outer_cut_half_raised.obj old mode 100644 new mode 100755 diff --git a/mods/moreblocks/models/moreblocks_slope_outer_half.obj b/mods/moreblocks/models/moreblocks_slope_outer_half.obj old mode 100644 new mode 100755 diff --git a/mods/moreblocks/models/moreblocks_slope_outer_half_raised.obj b/mods/moreblocks/models/moreblocks_slope_outer_half_raised.obj old mode 100644 new mode 100755 diff --git a/mods/moreblocks/nodes.lua b/mods/moreblocks/nodes.lua old mode 100644 new mode 100755 diff --git a/mods/moreblocks/ownership.lua b/mods/moreblocks/ownership.lua old mode 100644 new mode 100755 diff --git a/mods/moreblocks/redefinitions.lua b/mods/moreblocks/redefinitions.lua old mode 100644 new mode 100755 diff --git a/mods/moreblocks/stairsplus/API.md b/mods/moreblocks/stairsplus/API.md old mode 100644 new mode 100755 diff --git a/mods/moreblocks/stairsplus/aliases.lua b/mods/moreblocks/stairsplus/aliases.lua old mode 100644 new mode 100755 diff --git a/mods/moreblocks/stairsplus/conversion.lua b/mods/moreblocks/stairsplus/conversion.lua old mode 100644 new mode 100755 diff --git a/mods/moreblocks/stairsplus/init.lua b/mods/moreblocks/stairsplus/init.lua old mode 100644 new mode 100755 diff --git a/mods/moreblocks/stairsplus/microblocks.lua b/mods/moreblocks/stairsplus/microblocks.lua old mode 100644 new mode 100755 diff --git a/mods/moreblocks/stairsplus/panels.lua b/mods/moreblocks/stairsplus/panels.lua old mode 100644 new mode 100755 diff --git a/mods/moreblocks/stairsplus/registrations.lua b/mods/moreblocks/stairsplus/registrations.lua old mode 100644 new mode 100755 diff --git a/mods/moreblocks/stairsplus/slabs.lua b/mods/moreblocks/stairsplus/slabs.lua old mode 100644 new mode 100755 diff --git a/mods/moreblocks/stairsplus/slopes.lua b/mods/moreblocks/stairsplus/slopes.lua old mode 100644 new mode 100755 diff --git a/mods/moreblocks/stairsplus/stairs.lua b/mods/moreblocks/stairsplus/stairs.lua old mode 100644 new mode 100755 diff --git a/mods/moreblocks/textures/default_brick.png b/mods/moreblocks/textures/default_brick.png old mode 100644 new mode 100755 diff --git a/mods/moreblocks/textures/default_fence_overlay.png b/mods/moreblocks/textures/default_fence_overlay.png old mode 100644 new mode 100755 diff --git a/mods/moreblocks/textures/invisible.png b/mods/moreblocks/textures/invisible.png old mode 100644 new mode 100755 diff --git a/mods/moreblocks/textures/moreblocks_cactus_brick.png b/mods/moreblocks/textures/moreblocks_cactus_brick.png old mode 100644 new mode 100755 diff --git a/mods/moreblocks/textures/moreblocks_cactus_checker.png b/mods/moreblocks/textures/moreblocks_cactus_checker.png old mode 100644 new mode 100755 diff --git a/mods/moreblocks/textures/moreblocks_circle_stone_bricks.png b/mods/moreblocks/textures/moreblocks_circle_stone_bricks.png old mode 100644 new mode 100755 diff --git a/mods/moreblocks/textures/moreblocks_circular_saw_bottom.png b/mods/moreblocks/textures/moreblocks_circular_saw_bottom.png old mode 100644 new mode 100755 diff --git a/mods/moreblocks/textures/moreblocks_circular_saw_side.png b/mods/moreblocks/textures/moreblocks_circular_saw_side.png old mode 100644 new mode 100755 diff --git a/mods/moreblocks/textures/moreblocks_circular_saw_top.png b/mods/moreblocks/textures/moreblocks_circular_saw_top.png old mode 100644 new mode 100755 diff --git a/mods/moreblocks/textures/moreblocks_clean_glass.png b/mods/moreblocks/textures/moreblocks_clean_glass.png old mode 100644 new mode 100755 diff --git a/mods/moreblocks/textures/moreblocks_clean_glass_detail.png b/mods/moreblocks/textures/moreblocks_clean_glass_detail.png old mode 100644 new mode 100755 diff --git a/mods/moreblocks/textures/moreblocks_coal_checker.png b/mods/moreblocks/textures/moreblocks_coal_checker.png old mode 100644 new mode 100755 diff --git a/mods/moreblocks/textures/moreblocks_coal_glass.png b/mods/moreblocks/textures/moreblocks_coal_glass.png old mode 100644 new mode 100755 diff --git a/mods/moreblocks/textures/moreblocks_coal_glass_detail.png b/mods/moreblocks/textures/moreblocks_coal_glass_detail.png old mode 100644 new mode 100755 diff --git a/mods/moreblocks/textures/moreblocks_coal_glass_stairsplus.png b/mods/moreblocks/textures/moreblocks_coal_glass_stairsplus.png old mode 100644 new mode 100755 diff --git a/mods/moreblocks/textures/moreblocks_coal_stone.png b/mods/moreblocks/textures/moreblocks_coal_stone.png old mode 100644 new mode 100755 diff --git a/mods/moreblocks/textures/moreblocks_coal_stone_bricks.png b/mods/moreblocks/textures/moreblocks_coal_stone_bricks.png old mode 100644 new mode 100755 diff --git a/mods/moreblocks/textures/moreblocks_cobble_compressed.png b/mods/moreblocks/textures/moreblocks_cobble_compressed.png old mode 100644 new mode 100755 diff --git a/mods/moreblocks/textures/moreblocks_empty_bookshelf.png b/mods/moreblocks/textures/moreblocks_empty_bookshelf.png old mode 100644 new mode 100755 diff --git a/mods/moreblocks/textures/moreblocks_fence_jungle_wood.png b/mods/moreblocks/textures/moreblocks_fence_jungle_wood.png old mode 100644 new mode 100755 diff --git a/mods/moreblocks/textures/moreblocks_fence_wood.png b/mods/moreblocks/textures/moreblocks_fence_wood.png old mode 100644 new mode 100755 diff --git a/mods/moreblocks/textures/moreblocks_glass.png b/mods/moreblocks/textures/moreblocks_glass.png old mode 100644 new mode 100755 diff --git a/mods/moreblocks/textures/moreblocks_glass_stairsplus.png b/mods/moreblocks/textures/moreblocks_glass_stairsplus.png old mode 100644 new mode 100755 diff --git a/mods/moreblocks/textures/moreblocks_glow_glass.png b/mods/moreblocks/textures/moreblocks_glow_glass.png old mode 100644 new mode 100755 diff --git a/mods/moreblocks/textures/moreblocks_glow_glass_detail.png b/mods/moreblocks/textures/moreblocks_glow_glass_detail.png old mode 100644 new mode 100755 diff --git a/mods/moreblocks/textures/moreblocks_glow_glass_stairsplus.png b/mods/moreblocks/textures/moreblocks_glow_glass_stairsplus.png old mode 100644 new mode 100755 diff --git a/mods/moreblocks/textures/moreblocks_grey_bricks.png b/mods/moreblocks/textures/moreblocks_grey_bricks.png old mode 100644 new mode 100755 diff --git a/mods/moreblocks/textures/moreblocks_iron_checker.png b/mods/moreblocks/textures/moreblocks_iron_checker.png old mode 100644 new mode 100755 diff --git a/mods/moreblocks/textures/moreblocks_iron_glass.png b/mods/moreblocks/textures/moreblocks_iron_glass.png old mode 100644 new mode 100755 diff --git a/mods/moreblocks/textures/moreblocks_iron_glass_detail.png b/mods/moreblocks/textures/moreblocks_iron_glass_detail.png old mode 100644 new mode 100755 diff --git a/mods/moreblocks/textures/moreblocks_iron_glass_stairsplus.png b/mods/moreblocks/textures/moreblocks_iron_glass_stairsplus.png old mode 100644 new mode 100755 diff --git a/mods/moreblocks/textures/moreblocks_iron_stone.png b/mods/moreblocks/textures/moreblocks_iron_stone.png old mode 100644 new mode 100755 diff --git a/mods/moreblocks/textures/moreblocks_iron_stone_bricks.png b/mods/moreblocks/textures/moreblocks_iron_stone_bricks.png old mode 100644 new mode 100755 diff --git a/mods/moreblocks/textures/moreblocks_junglestick.png b/mods/moreblocks/textures/moreblocks_junglestick.png old mode 100644 new mode 100755 diff --git a/mods/moreblocks/textures/moreblocks_obsidian_glass_stairsplus.png b/mods/moreblocks/textures/moreblocks_obsidian_glass_stairsplus.png old mode 100644 new mode 100755 diff --git a/mods/moreblocks/textures/moreblocks_plankstone.png b/mods/moreblocks/textures/moreblocks_plankstone.png old mode 100644 new mode 100755 diff --git a/mods/moreblocks/textures/moreblocks_plankstone_2.png b/mods/moreblocks/textures/moreblocks_plankstone_2.png old mode 100644 new mode 100755 diff --git a/mods/moreblocks/textures/moreblocks_rope.png b/mods/moreblocks/textures/moreblocks_rope.png old mode 100644 new mode 100755 diff --git a/mods/moreblocks/textures/moreblocks_split_stone_tile.png b/mods/moreblocks/textures/moreblocks_split_stone_tile.png old mode 100644 new mode 100755 diff --git a/mods/moreblocks/textures/moreblocks_split_stone_tile_alt.png b/mods/moreblocks/textures/moreblocks_split_stone_tile_alt.png old mode 100644 new mode 100755 diff --git a/mods/moreblocks/textures/moreblocks_split_stone_tile_top.png b/mods/moreblocks/textures/moreblocks_split_stone_tile_top.png old mode 100644 new mode 100755 diff --git a/mods/moreblocks/textures/moreblocks_stone_tile.png b/mods/moreblocks/textures/moreblocks_stone_tile.png old mode 100644 new mode 100755 diff --git a/mods/moreblocks/textures/moreblocks_super_glow_glass.png b/mods/moreblocks/textures/moreblocks_super_glow_glass.png old mode 100644 new mode 100755 diff --git a/mods/moreblocks/textures/moreblocks_super_glow_glass_detail.png b/mods/moreblocks/textures/moreblocks_super_glow_glass_detail.png old mode 100644 new mode 100755 diff --git a/mods/moreblocks/textures/moreblocks_super_glow_glass_stairsplus.png b/mods/moreblocks/textures/moreblocks_super_glow_glass_stairsplus.png old mode 100644 new mode 100755 diff --git a/mods/moreblocks/textures/moreblocks_sweeper.png b/mods/moreblocks/textures/moreblocks_sweeper.png old mode 100644 new mode 100755 diff --git a/mods/moreblocks/textures/moreblocks_tar.png b/mods/moreblocks/textures/moreblocks_tar.png old mode 100644 new mode 100755 diff --git a/mods/moreblocks/textures/moreblocks_trap_glass.png b/mods/moreblocks/textures/moreblocks_trap_glass.png old mode 100644 new mode 100755 diff --git a/mods/moreblocks/textures/moreblocks_trap_glow_glass.png b/mods/moreblocks/textures/moreblocks_trap_glow_glass.png old mode 100644 new mode 100755 diff --git a/mods/moreblocks/textures/moreblocks_trap_stone.png b/mods/moreblocks/textures/moreblocks_trap_stone.png old mode 100644 new mode 100755 diff --git a/mods/moreblocks/textures/moreblocks_trap_super_glow_glass.png b/mods/moreblocks/textures/moreblocks_trap_super_glow_glass.png old mode 100644 new mode 100755 diff --git a/mods/moreblocks/textures/moreblocks_tree_stairsplus.png b/mods/moreblocks/textures/moreblocks_tree_stairsplus.png old mode 100644 new mode 100755 diff --git a/mods/moreblocks/textures/moreblocks_wood_tile.png b/mods/moreblocks/textures/moreblocks_wood_tile.png old mode 100644 new mode 100755 diff --git a/mods/moreblocks/textures/moreblocks_wood_tile_center.png b/mods/moreblocks/textures/moreblocks_wood_tile_center.png old mode 100644 new mode 100755 diff --git a/mods/moreblocks/textures/moreblocks_wood_tile_full.png b/mods/moreblocks/textures/moreblocks_wood_tile_full.png old mode 100644 new mode 100755 diff --git a/mods/moreblocks/textures/moreblocks_wood_tile_up.png b/mods/moreblocks/textures/moreblocks_wood_tile_up.png old mode 100644 new mode 100755 diff --git a/mods/moreores/LICENSE.md b/mods/moreores/LICENSE.md old mode 100644 new mode 100755 diff --git a/mods/moreores/README.md b/mods/moreores/README.md old mode 100644 new mode 100755 diff --git a/mods/moreores/locale/tr.txt b/mods/moreores/locale/tr.txt old mode 100644 new mode 100755 diff --git a/mods/moretrees/.gitignore b/mods/moretrees/.gitignore old mode 100644 new mode 100755 diff --git a/mods/moretrees/LICENSE b/mods/moretrees/LICENSE old mode 100644 new mode 100755 diff --git a/mods/moretrees/README.md b/mods/moretrees/README.md old mode 100644 new mode 100755 diff --git a/mods/moretrees/biome_defs.lua b/mods/moretrees/biome_defs.lua old mode 100644 new mode 100755 diff --git a/mods/moretrees/crafts.lua b/mods/moretrees/crafts.lua old mode 100644 new mode 100755 diff --git a/mods/moretrees/default_settings.txt b/mods/moretrees/default_settings.txt old mode 100644 new mode 100755 diff --git a/mods/moretrees/depends.txt b/mods/moretrees/depends.txt old mode 100644 new mode 100755 diff --git a/mods/moretrees/init.lua b/mods/moretrees/init.lua old mode 100644 new mode 100755 index 9c368837..5f1bfdb2 --- a/mods/moretrees/init.lua +++ b/mods/moretrees/init.lua @@ -301,4 +301,4 @@ function moretrees:grow_fir_snow(pos) minetest.spawn_tree(pos,moretrees.fir_model) end -print(S("[Moretrees] Loaded (2013-02-11)")) +minetest.log("action", S("[Moretrees] Loaded (2013-02-11)")) diff --git a/mods/moretrees/leafdecay.lua b/mods/moretrees/leafdecay.lua old mode 100644 new mode 100755 diff --git a/mods/moretrees/locale/de.txt b/mods/moretrees/locale/de.txt old mode 100644 new mode 100755 diff --git a/mods/moretrees/locale/template.txt b/mods/moretrees/locale/template.txt old mode 100644 new mode 100755 diff --git a/mods/moretrees/node_defs.lua b/mods/moretrees/node_defs.lua old mode 100644 new mode 100755 diff --git a/mods/moretrees/saplings.lua b/mods/moretrees/saplings.lua old mode 100644 new mode 100755 diff --git a/mods/moretrees/textures/moretrees_acacia_leaves.png b/mods/moretrees/textures/moretrees_acacia_leaves.png old mode 100644 new mode 100755 diff --git a/mods/moretrees/textures/moretrees_acacia_sapling.png b/mods/moretrees/textures/moretrees_acacia_sapling.png old mode 100644 new mode 100755 diff --git a/mods/moretrees/textures/moretrees_acacia_trunk.png b/mods/moretrees/textures/moretrees_acacia_trunk.png old mode 100644 new mode 100755 diff --git a/mods/moretrees/textures/moretrees_acacia_trunk_top.png b/mods/moretrees/textures/moretrees_acacia_trunk_top.png old mode 100644 new mode 100755 diff --git a/mods/moretrees/textures/moretrees_acacia_wood.png b/mods/moretrees/textures/moretrees_acacia_wood.png old mode 100644 new mode 100755 diff --git a/mods/moretrees/textures/moretrees_acorn.png b/mods/moretrees/textures/moretrees_acorn.png old mode 100644 new mode 100755 diff --git a/mods/moretrees/textures/moretrees_acorn_muffin.png b/mods/moretrees/textures/moretrees_acorn_muffin.png old mode 100644 new mode 100755 diff --git a/mods/moretrees/textures/moretrees_acorn_muffin_batter.png b/mods/moretrees/textures/moretrees_acorn_muffin_batter.png old mode 100644 new mode 100755 diff --git a/mods/moretrees/textures/moretrees_apple_tree_leaves.png b/mods/moretrees/textures/moretrees_apple_tree_leaves.png old mode 100644 new mode 100755 diff --git a/mods/moretrees/textures/moretrees_apple_tree_sapling.png b/mods/moretrees/textures/moretrees_apple_tree_sapling.png old mode 100644 new mode 100755 diff --git a/mods/moretrees/textures/moretrees_apple_tree_trunk.png b/mods/moretrees/textures/moretrees_apple_tree_trunk.png old mode 100644 new mode 100755 diff --git a/mods/moretrees/textures/moretrees_apple_tree_trunk_top.png b/mods/moretrees/textures/moretrees_apple_tree_trunk_top.png old mode 100644 new mode 100755 diff --git a/mods/moretrees/textures/moretrees_apple_tree_wood.png b/mods/moretrees/textures/moretrees_apple_tree_wood.png old mode 100644 new mode 100755 diff --git a/mods/moretrees/textures/moretrees_beech_leaves.png b/mods/moretrees/textures/moretrees_beech_leaves.png old mode 100644 new mode 100755 diff --git a/mods/moretrees/textures/moretrees_beech_sapling.png b/mods/moretrees/textures/moretrees_beech_sapling.png old mode 100644 new mode 100755 diff --git a/mods/moretrees/textures/moretrees_beech_trunk.png b/mods/moretrees/textures/moretrees_beech_trunk.png old mode 100644 new mode 100755 diff --git a/mods/moretrees/textures/moretrees_beech_trunk_top.png b/mods/moretrees/textures/moretrees_beech_trunk_top.png old mode 100644 new mode 100755 diff --git a/mods/moretrees/textures/moretrees_beech_wood.png b/mods/moretrees/textures/moretrees_beech_wood.png old mode 100644 new mode 100755 diff --git a/mods/moretrees/textures/moretrees_birch_leaves.png b/mods/moretrees/textures/moretrees_birch_leaves.png old mode 100644 new mode 100755 diff --git a/mods/moretrees/textures/moretrees_birch_sapling.png b/mods/moretrees/textures/moretrees_birch_sapling.png old mode 100644 new mode 100755 diff --git a/mods/moretrees/textures/moretrees_birch_trunk.png b/mods/moretrees/textures/moretrees_birch_trunk.png old mode 100644 new mode 100755 diff --git a/mods/moretrees/textures/moretrees_birch_trunk_top.png b/mods/moretrees/textures/moretrees_birch_trunk_top.png old mode 100644 new mode 100755 diff --git a/mods/moretrees/textures/moretrees_birch_wood.png b/mods/moretrees/textures/moretrees_birch_wood.png old mode 100644 new mode 100755 diff --git a/mods/moretrees/textures/moretrees_coconut.png b/mods/moretrees/textures/moretrees_coconut.png old mode 100644 new mode 100755 diff --git a/mods/moretrees/textures/moretrees_coconut_milk.png b/mods/moretrees/textures/moretrees_coconut_milk.png old mode 100644 new mode 100755 diff --git a/mods/moretrees/textures/moretrees_coconut_milk_inv.png b/mods/moretrees/textures/moretrees_coconut_milk_inv.png old mode 100644 new mode 100755 diff --git a/mods/moretrees/textures/moretrees_fir_cone.png b/mods/moretrees/textures/moretrees_fir_cone.png old mode 100644 new mode 100755 diff --git a/mods/moretrees/textures/moretrees_fir_leaves.png b/mods/moretrees/textures/moretrees_fir_leaves.png old mode 100644 new mode 100755 diff --git a/mods/moretrees/textures/moretrees_fir_leaves_bright.png b/mods/moretrees/textures/moretrees_fir_leaves_bright.png old mode 100644 new mode 100755 diff --git a/mods/moretrees/textures/moretrees_fir_nuts.png b/mods/moretrees/textures/moretrees_fir_nuts.png old mode 100644 new mode 100755 diff --git a/mods/moretrees/textures/moretrees_fir_sapling.png b/mods/moretrees/textures/moretrees_fir_sapling.png old mode 100644 new mode 100755 diff --git a/mods/moretrees/textures/moretrees_fir_trunk.png b/mods/moretrees/textures/moretrees_fir_trunk.png old mode 100644 new mode 100755 diff --git a/mods/moretrees/textures/moretrees_fir_trunk_top.png b/mods/moretrees/textures/moretrees_fir_trunk_top.png old mode 100644 new mode 100755 diff --git a/mods/moretrees/textures/moretrees_fir_wood.png b/mods/moretrees/textures/moretrees_fir_wood.png old mode 100644 new mode 100755 diff --git a/mods/moretrees/textures/moretrees_jungletree_leaves_green.png b/mods/moretrees/textures/moretrees_jungletree_leaves_green.png old mode 100644 new mode 100755 diff --git a/mods/moretrees/textures/moretrees_jungletree_leaves_red.png b/mods/moretrees/textures/moretrees_jungletree_leaves_red.png old mode 100644 new mode 100755 diff --git a/mods/moretrees/textures/moretrees_jungletree_leaves_yellow.png b/mods/moretrees/textures/moretrees_jungletree_leaves_yellow.png old mode 100644 new mode 100755 diff --git a/mods/moretrees/textures/moretrees_oak_leaves.png b/mods/moretrees/textures/moretrees_oak_leaves.png old mode 100644 new mode 100755 diff --git a/mods/moretrees/textures/moretrees_oak_sapling.png b/mods/moretrees/textures/moretrees_oak_sapling.png old mode 100644 new mode 100755 diff --git a/mods/moretrees/textures/moretrees_oak_trunk.png b/mods/moretrees/textures/moretrees_oak_trunk.png old mode 100644 new mode 100755 diff --git a/mods/moretrees/textures/moretrees_oak_trunk_top.png b/mods/moretrees/textures/moretrees_oak_trunk_top.png old mode 100644 new mode 100755 diff --git a/mods/moretrees/textures/moretrees_oak_wood.png b/mods/moretrees/textures/moretrees_oak_wood.png old mode 100644 new mode 100755 diff --git a/mods/moretrees/textures/moretrees_palm_leaves.png b/mods/moretrees/textures/moretrees_palm_leaves.png old mode 100644 new mode 100755 diff --git a/mods/moretrees/textures/moretrees_palm_sapling.png b/mods/moretrees/textures/moretrees_palm_sapling.png old mode 100644 new mode 100755 diff --git a/mods/moretrees/textures/moretrees_palm_trunk.png b/mods/moretrees/textures/moretrees_palm_trunk.png old mode 100644 new mode 100755 diff --git a/mods/moretrees/textures/moretrees_palm_trunk_top.png b/mods/moretrees/textures/moretrees_palm_trunk_top.png old mode 100644 new mode 100755 diff --git a/mods/moretrees/textures/moretrees_palm_wood.png b/mods/moretrees/textures/moretrees_palm_wood.png old mode 100644 new mode 100755 diff --git a/mods/moretrees/textures/moretrees_pine_cone.png b/mods/moretrees/textures/moretrees_pine_cone.png old mode 100644 new mode 100755 diff --git a/mods/moretrees/textures/moretrees_pine_leaves.png b/mods/moretrees/textures/moretrees_pine_leaves.png old mode 100644 new mode 100755 diff --git a/mods/moretrees/textures/moretrees_pine_nuts.png b/mods/moretrees/textures/moretrees_pine_nuts.png old mode 100644 new mode 100755 diff --git a/mods/moretrees/textures/moretrees_pine_sapling.png b/mods/moretrees/textures/moretrees_pine_sapling.png old mode 100644 new mode 100755 diff --git a/mods/moretrees/textures/moretrees_pine_trunk.png b/mods/moretrees/textures/moretrees_pine_trunk.png old mode 100644 new mode 100755 diff --git a/mods/moretrees/textures/moretrees_pine_trunk_top.png b/mods/moretrees/textures/moretrees_pine_trunk_top.png old mode 100644 new mode 100755 diff --git a/mods/moretrees/textures/moretrees_pine_wood.png b/mods/moretrees/textures/moretrees_pine_wood.png old mode 100644 new mode 100755 diff --git a/mods/moretrees/textures/moretrees_raw_coconut.png b/mods/moretrees/textures/moretrees_raw_coconut.png old mode 100644 new mode 100755 diff --git a/mods/moretrees/textures/moretrees_rubber_tree_leaves.png b/mods/moretrees/textures/moretrees_rubber_tree_leaves.png old mode 100644 new mode 100755 diff --git a/mods/moretrees/textures/moretrees_rubber_tree_sapling.png b/mods/moretrees/textures/moretrees_rubber_tree_sapling.png old mode 100644 new mode 100755 diff --git a/mods/moretrees/textures/moretrees_rubber_tree_trunk.png b/mods/moretrees/textures/moretrees_rubber_tree_trunk.png old mode 100644 new mode 100755 diff --git a/mods/moretrees/textures/moretrees_rubber_tree_trunk_empty.png b/mods/moretrees/textures/moretrees_rubber_tree_trunk_empty.png old mode 100644 new mode 100755 diff --git a/mods/moretrees/textures/moretrees_rubber_tree_trunk_top.png b/mods/moretrees/textures/moretrees_rubber_tree_trunk_top.png old mode 100644 new mode 100755 diff --git a/mods/moretrees/textures/moretrees_rubber_tree_wood.png b/mods/moretrees/textures/moretrees_rubber_tree_wood.png old mode 100644 new mode 100755 diff --git a/mods/moretrees/textures/moretrees_sequoia_leaves.png b/mods/moretrees/textures/moretrees_sequoia_leaves.png old mode 100644 new mode 100755 diff --git a/mods/moretrees/textures/moretrees_sequoia_sapling.png b/mods/moretrees/textures/moretrees_sequoia_sapling.png old mode 100644 new mode 100755 diff --git a/mods/moretrees/textures/moretrees_sequoia_trunk.png b/mods/moretrees/textures/moretrees_sequoia_trunk.png old mode 100644 new mode 100755 diff --git a/mods/moretrees/textures/moretrees_sequoia_trunk_top.png b/mods/moretrees/textures/moretrees_sequoia_trunk_top.png old mode 100644 new mode 100755 diff --git a/mods/moretrees/textures/moretrees_sequoia_wood.png b/mods/moretrees/textures/moretrees_sequoia_wood.png old mode 100644 new mode 100755 diff --git a/mods/moretrees/textures/moretrees_spruce_cone.png b/mods/moretrees/textures/moretrees_spruce_cone.png old mode 100644 new mode 100755 diff --git a/mods/moretrees/textures/moretrees_spruce_leaves.png b/mods/moretrees/textures/moretrees_spruce_leaves.png old mode 100644 new mode 100755 diff --git a/mods/moretrees/textures/moretrees_spruce_nuts.png b/mods/moretrees/textures/moretrees_spruce_nuts.png old mode 100644 new mode 100755 diff --git a/mods/moretrees/textures/moretrees_spruce_sapling.png b/mods/moretrees/textures/moretrees_spruce_sapling.png old mode 100644 new mode 100755 diff --git a/mods/moretrees/textures/moretrees_spruce_trunk.png b/mods/moretrees/textures/moretrees_spruce_trunk.png old mode 100644 new mode 100755 diff --git a/mods/moretrees/textures/moretrees_spruce_trunk_top.png b/mods/moretrees/textures/moretrees_spruce_trunk_top.png old mode 100644 new mode 100755 diff --git a/mods/moretrees/textures/moretrees_spruce_wood.png b/mods/moretrees/textures/moretrees_spruce_wood.png old mode 100644 new mode 100755 diff --git a/mods/moretrees/textures/moretrees_willow_leaves.png b/mods/moretrees/textures/moretrees_willow_leaves.png old mode 100644 new mode 100755 diff --git a/mods/moretrees/textures/moretrees_willow_sapling.png b/mods/moretrees/textures/moretrees_willow_sapling.png old mode 100644 new mode 100755 diff --git a/mods/moretrees/textures/moretrees_willow_trunk.png b/mods/moretrees/textures/moretrees_willow_trunk.png old mode 100644 new mode 100755 diff --git a/mods/moretrees/textures/moretrees_willow_trunk_top.png b/mods/moretrees/textures/moretrees_willow_trunk_top.png old mode 100644 new mode 100755 diff --git a/mods/moretrees/textures/moretrees_willow_wood.png b/mods/moretrees/textures/moretrees_willow_wood.png old mode 100644 new mode 100755 diff --git a/mods/moretrees/tree_biomes.txt b/mods/moretrees/tree_biomes.txt old mode 100644 new mode 100755 diff --git a/mods/moretrees/tree_models.lua b/mods/moretrees/tree_models.lua old mode 100644 new mode 100755 diff --git a/mods/nether/.gitignore b/mods/nether/.gitignore old mode 100644 new mode 100755 diff --git a/mods/nether/README.txt b/mods/nether/README.txt old mode 100644 new mode 100755 diff --git a/mods/nether/modpack.txt b/mods/nether/modpack.txt old mode 100644 new mode 100755 diff --git a/mods/nether/nether/crafting.lua b/mods/nether/nether/crafting.lua old mode 100644 new mode 100755 diff --git a/mods/nether/nether/depends.txt b/mods/nether/nether/depends.txt old mode 100644 new mode 100755 diff --git a/mods/nether/nether/furnace.lua b/mods/nether/nether/furnace.lua old mode 100644 new mode 100755 diff --git a/mods/nether/nether/guide.lua b/mods/nether/nether/guide.lua old mode 100644 new mode 100755 diff --git a/mods/nether/nether/init.lua b/mods/nether/nether/init.lua old mode 100644 new mode 100755 index 6e4e752e..7d09e69b --- a/mods/nether/nether/init.lua +++ b/mods/nether/nether/init.lua @@ -98,7 +98,7 @@ if nether.info then else info = "[nether] "..msg end - print(info) + minetest.log("action", info) if self.inform_all then minetest.chat_send_all(info) end @@ -239,6 +239,7 @@ HADES_THRONE_ENDPOS_ABS = {x=htx, y=hty, z=htz}]] local c local function define_contents() c = { + ignore = minetest.get_content_id("ignore"), air = minetest.get_content_id("air"), lava = minetest.get_content_id("default:lava_source"), gravel = minetest.get_content_id("default:gravel"), @@ -397,10 +398,12 @@ minetest.register_on_generated(function(minp, maxp, seed) local forest_possible = maxp.y > f_h_min and minp.y < f_h_max --local pmap_f_bottom = minetest.get_perlin_map(perlins.forest_bottom, map_lengths_xyz):get2dMap_flat({x=minp.x, y=minp.z}) - local perlin_f_bottom, pmap_f_top + local perlin_f_bottom, pmap_f_top, strassx, strassz if forest_possible then perlin_f_bottom = minetest.get_perlin(11, 3, 0.8, tmp2) pmap_f_top = minetest.get_perlin_map(perlins.forest_top, map_lengths_xyz):get2dMap_flat({x=minp.x, y=minp.z}) + strassx = get_ws_list(2, minp.x) + strassz = get_ws_list(2, minp.z) end local num2, tab2 @@ -479,8 +482,13 @@ minetest.register_on_generated(function(minp, maxp, seed) if not f_perlins[pstr] then f_perlins[pstr] = math.floor(f_h_min+(math.abs(perlin_f_bottom:get2d({x=p.x, y=p.z})+1))*f_yscale_bottom+0.5) end - f_bottom = f_perlins[pstr]+math.random(0,f_bottom_scale-1) - f_top = math.floor(f_h_max-(pmap_f_top[count]+1)*f_yscale_top+0.5) + local top_noise = pmap_f_top[count]+1 + if top_noise < 0 then + top_noise = -top_noise/10 + --nether:inform("ERROR: (perlin noise) "..pmap_f_top[count].." is not inside [-1; 1]", 1) + end + f_top = math.floor(f_h_max - top_noise*f_yscale_top + 0.5) + f_bottom = f_perlins[pstr]+pr:next(0,f_bottom_scale-1) is_forest = f_bottom < f_top f_h_dirt = f_bottom-pr:next(0,1) end @@ -540,6 +548,18 @@ minetest.register_on_generated(function(minp, maxp, seed) ) then data[p_addpos] = c.air end + elseif is_forest + and y == f_top then + local sel = math.floor(strassx[x]+strassz[z]+0.5)%10 + if sel <= 5 then + data[p_addpos] = return_nether_ore(d_p_addp, true) + elseif sel == 6 then + data[p_addpos] = c.netherrack_black + elseif sel == 7 then + data[p_addpos] = c.glowstone + else + data[p_addpos] = c.air + end elseif y <= NETHER_BOTTOM then if y <= bottom then @@ -668,6 +688,10 @@ function nether.grow_netherstructure(pos, generated) end +local function soft_node(id) + return id == c.air or id == c.ignore +end + local function update_minmax(min, max, p) min.x = math.min(min.x, p.x) max.x = math.max(max.x, p.x) @@ -840,7 +864,7 @@ function nether.grow_tree(pos, generated) for _,p in pairs(leaf_ps) do p = area:indexp(p) - if nodes[p] == c.air then + if soft_node(nodes[p]) then nodes[p] = c.nether_leaves param2s[p] = math.random(0,44) end @@ -848,7 +872,7 @@ function nether.grow_tree(pos, generated) for _,p in pairs(fruit_ps) do p = area:indexp(p) - if nodes[p] == c.air then + if soft_node(nodes[p]) then nodes[p] = c.nether_apple --param2s[p] = math.random(0,44) end diff --git a/mods/nether/nether/items.lua b/mods/nether/nether/items.lua old mode 100644 new mode 100755 diff --git a/mods/nether/nether/pearl.lua b/mods/nether/nether/pearl.lua old mode 100644 new mode 100755 diff --git a/mods/nether/nether/portal.lua b/mods/nether/nether/portal.lua old mode 100644 new mode 100755 diff --git a/mods/nether/nether/rest/Nicht Leere Datei.lua b/mods/nether/nether/rest/Nicht Leere Datei.lua old mode 100644 new mode 100755 diff --git a/mods/nether/nether/rest/nether_fruit_leaves.png b/mods/nether/nether/rest/nether_fruit_leaves.png old mode 100644 new mode 100755 diff --git a/mods/nether/nether/rest/nether_glowstone.png b/mods/nether/nether/rest/nether_glowstone.png old mode 100644 new mode 100755 diff --git a/mods/nether/nether/rest/nether_leaves.png b/mods/nether/nether/rest/nether_leaves.png old mode 100644 new mode 100755 diff --git a/mods/nether/nether/rest/nether_leaves_decision/nether_leaves.png b/mods/nether/nether/rest/nether_leaves_decision/nether_leaves.png old mode 100644 new mode 100755 diff --git a/mods/nether/nether/rest/nether_leaves_decision/nether_leaves_high_cont.png b/mods/nether/nether/rest/nether_leaves_decision/nether_leaves_high_cont.png old mode 100644 new mode 100755 diff --git a/mods/nether/nether/rest/nether_netherrack.png1 b/mods/nether/nether/rest/nether_netherrack.png1 old mode 100644 new mode 100755 diff --git a/mods/nether/nether/rest/nether_portal_creator.png b/mods/nether/nether/rest/nether_portal_creator.png old mode 100644 new mode 100755 diff --git a/mods/nether/nether/rest/nether_tree.png b/mods/nether/nether/rest/nether_tree.png old mode 100644 new mode 100755 diff --git a/mods/nether/nether/rest/nether_tree_top.png b/mods/nether/nether/rest/nether_tree_top.png old mode 100644 new mode 100755 diff --git a/mods/nether/nether/rest/temp.txt b/mods/nether/nether/rest/temp.txt old mode 100644 new mode 100755 diff --git a/mods/nether/nether/sounds/nether_dig.1.ogg b/mods/nether/nether/sounds/nether_dig.1.ogg old mode 100644 new mode 100755 diff --git a/mods/nether/nether/sounds/nether_dig.2.ogg b/mods/nether/nether/sounds/nether_dig.2.ogg old mode 100644 new mode 100755 diff --git a/mods/nether/nether/sounds/nether_dug.1.ogg b/mods/nether/nether/sounds/nether_dug.1.ogg old mode 100644 new mode 100755 diff --git a/mods/nether/nether/sounds/nether_dug.2.ogg b/mods/nether/nether/sounds/nether_dug.2.ogg old mode 100644 new mode 100755 diff --git a/mods/nether/nether/sounds/nether_extract_blood.1.ogg b/mods/nether/nether/sounds/nether_extract_blood.1.ogg old mode 100644 new mode 100755 diff --git a/mods/nether/nether/sounds/nether_extract_blood.2.ogg b/mods/nether/nether/sounds/nether_extract_blood.2.ogg old mode 100644 new mode 100755 diff --git a/mods/nether/nether/sounds/nether_extract_blood.3.ogg b/mods/nether/nether/sounds/nether_extract_blood.3.ogg old mode 100644 new mode 100755 diff --git a/mods/nether/nether/sounds/nether_extract_blood.4.ogg b/mods/nether/nether/sounds/nether_extract_blood.4.ogg old mode 100644 new mode 100755 diff --git a/mods/nether/nether/sounds/nether_extract_blood.5.ogg b/mods/nether/nether/sounds/nether_extract_blood.5.ogg old mode 100644 new mode 100755 diff --git a/mods/nether/nether/sounds/nether_extract_blood.6.ogg b/mods/nether/nether/sounds/nether_extract_blood.6.ogg old mode 100644 new mode 100755 diff --git a/mods/nether/nether/sounds/nether_extract_blood.7.ogg b/mods/nether/nether/sounds/nether_extract_blood.7.ogg old mode 100644 new mode 100755 diff --git a/mods/nether/nether/sounds/nether_footstep.1.ogg b/mods/nether/nether/sounds/nether_footstep.1.ogg old mode 100644 new mode 100755 diff --git a/mods/nether/nether/sounds/nether_footstep.2.ogg b/mods/nether/nether/sounds/nether_footstep.2.ogg old mode 100644 new mode 100755 diff --git a/mods/nether/nether/sounds/nether_footstep.3.ogg b/mods/nether/nether/sounds/nether_footstep.3.ogg old mode 100644 new mode 100755 diff --git a/mods/nether/nether/sounds/nether_pearl.ogg b/mods/nether/nether/sounds/nether_pearl.ogg old mode 100644 new mode 100755 diff --git a/mods/nether/nether/sounds/nether_portal_usual.ogg b/mods/nether/nether/sounds/nether_portal_usual.ogg old mode 100644 new mode 100755 diff --git a/mods/nether/nether/sounds/nether_remove_leaf.1.ogg b/mods/nether/nether/sounds/nether_remove_leaf.1.ogg old mode 100644 new mode 100755 diff --git a/mods/nether/nether/sounds/nether_remove_leaf.2.ogg b/mods/nether/nether/sounds/nether_remove_leaf.2.ogg old mode 100644 new mode 100755 diff --git a/mods/nether/nether/sounds/nether_remove_leaf.3.ogg b/mods/nether/nether/sounds/nether_remove_leaf.3.ogg old mode 100644 new mode 100755 diff --git a/mods/nether/nether/sounds/nether_teleporter.1.ogg b/mods/nether/nether/sounds/nether_teleporter.1.ogg old mode 100644 new mode 100755 diff --git a/mods/nether/nether/sounds/nether_teleporter.2.ogg b/mods/nether/nether/sounds/nether_teleporter.2.ogg old mode 100644 new mode 100755 diff --git a/mods/nether/nether/sounds/nether_teleporter.3.ogg b/mods/nether/nether/sounds/nether_teleporter.3.ogg old mode 100644 new mode 100755 diff --git a/mods/nether/nether/textures/nether_axe_netherrack.png b/mods/nether/nether/textures/nether_axe_netherrack.png old mode 100644 new mode 100755 diff --git a/mods/nether/nether/textures/nether_axe_netherrack_blue.png b/mods/nether/nether/textures/nether_axe_netherrack_blue.png old mode 100644 new mode 100755 diff --git a/mods/nether/nether/textures/nether_axe_white.png b/mods/nether/nether/textures/nether_axe_white.png old mode 100644 new mode 100755 diff --git a/mods/nether/nether/textures/nether_bark.png b/mods/nether/nether/textures/nether_bark.png old mode 100644 new mode 100755 diff --git a/mods/nether/nether/textures/nether_blood.png b/mods/nether/nether/textures/nether_blood.png old mode 100644 new mode 100755 diff --git a/mods/nether/nether/textures/nether_blood_cooked.png b/mods/nether/nether/textures/nether_blood_cooked.png old mode 100644 new mode 100755 diff --git a/mods/nether/nether/textures/nether_blood_empty.png b/mods/nether/nether/textures/nether_blood_empty.png old mode 100644 new mode 100755 diff --git a/mods/nether/nether/textures/nether_blood_extracted.png b/mods/nether/nether/textures/nether_blood_extracted.png old mode 100644 new mode 100755 diff --git a/mods/nether/nether/textures/nether_blood_extractor.png b/mods/nether/nether/textures/nether_blood_extractor.png old mode 100644 new mode 100755 diff --git a/mods/nether/nether/textures/nether_blood_side.png b/mods/nether/nether/textures/nether_blood_side.png old mode 100644 new mode 100755 diff --git a/mods/nether/nether/textures/nether_blood_side_cooked.png b/mods/nether/nether/textures/nether_blood_side_cooked.png old mode 100644 new mode 100755 diff --git a/mods/nether/nether/textures/nether_blood_side_empty.png b/mods/nether/nether/textures/nether_blood_side_empty.png old mode 100644 new mode 100755 diff --git a/mods/nether/nether/textures/nether_blood_stem.png b/mods/nether/nether/textures/nether_blood_stem.png old mode 100644 new mode 100755 diff --git a/mods/nether/nether/textures/nether_blood_stem_cooked.png b/mods/nether/nether/textures/nether_blood_stem_cooked.png old mode 100644 new mode 100755 diff --git a/mods/nether/nether/textures/nether_blood_stem_empty.png b/mods/nether/nether/textures/nether_blood_stem_empty.png old mode 100644 new mode 100755 diff --git a/mods/nether/nether/textures/nether_blood_stem_top.png b/mods/nether/nether/textures/nether_blood_stem_top.png old mode 100644 new mode 100755 diff --git a/mods/nether/nether/textures/nether_blood_stem_top_cooked.png b/mods/nether/nether/textures/nether_blood_stem_top_cooked.png old mode 100644 new mode 100755 diff --git a/mods/nether/nether/textures/nether_blood_stem_top_empty.png b/mods/nether/nether/textures/nether_blood_stem_top_empty.png old mode 100644 new mode 100755 diff --git a/mods/nether/nether/textures/nether_blood_top.png b/mods/nether/nether/textures/nether_blood_top.png old mode 100644 new mode 100755 diff --git a/mods/nether/nether/textures/nether_blood_top_cooked.png b/mods/nether/nether/textures/nether_blood_top_cooked.png old mode 100644 new mode 100755 diff --git a/mods/nether/nether/textures/nether_blood_top_empty.png b/mods/nether/nether/textures/nether_blood_top_empty.png old mode 100644 new mode 100755 diff --git a/mods/nether/nether/textures/nether_dirt.png b/mods/nether/nether/textures/nether_dirt.png old mode 100644 new mode 100755 diff --git a/mods/nether/nether/textures/nether_dirt_normal.png b/mods/nether/nether/textures/nether_dirt_normal.png old mode 100644 new mode 100755 diff --git a/mods/nether/nether/textures/nether_dirt_top.png b/mods/nether/nether/textures/nether_dirt_top.png old mode 100644 new mode 100755 diff --git a/mods/nether/nether/textures/nether_dirt_top_normal.png b/mods/nether/nether/textures/nether_dirt_top_normal.png old mode 100644 new mode 100755 diff --git a/mods/nether/nether/textures/nether_dirt_top_side.png b/mods/nether/nether/textures/nether_dirt_top_side.png old mode 100644 new mode 100755 diff --git a/mods/nether/nether/textures/nether_dirt_top_side_normal.png b/mods/nether/nether/textures/nether_dirt_top_side_normal.png old mode 100644 new mode 100755 diff --git a/mods/nether/nether/textures/nether_dirt_transition.png b/mods/nether/nether/textures/nether_dirt_transition.png old mode 100644 new mode 100755 diff --git a/mods/nether/nether/textures/nether_dirt_transition_normal.png b/mods/nether/nether/textures/nether_dirt_transition_normal.png old mode 100644 new mode 100755 diff --git a/mods/nether/nether/textures/nether_fim.png b/mods/nether/nether/textures/nether_fim.png old mode 100644 new mode 100755 diff --git a/mods/nether/nether/textures/nether_forest_planks.png b/mods/nether/nether/textures/nether_forest_planks.png old mode 100644 new mode 100755 diff --git a/mods/nether/nether/textures/nether_forest_wood.png b/mods/nether/nether/textures/nether_forest_wood.png old mode 100644 new mode 100755 diff --git a/mods/nether/nether/textures/nether_forest_wood_normal.png b/mods/nether/nether/textures/nether_forest_wood_normal.png old mode 100644 new mode 100755 diff --git a/mods/nether/nether/textures/nether_fruit.png b/mods/nether/nether/textures/nether_fruit.png old mode 100644 new mode 100755 diff --git a/mods/nether/nether/textures/nether_fruit_bottom.png b/mods/nether/nether/textures/nether_fruit_bottom.png old mode 100644 new mode 100755 diff --git a/mods/nether/nether/textures/nether_fruit_leaf.png b/mods/nether/nether/textures/nether_fruit_leaf.png old mode 100644 new mode 100755 diff --git a/mods/nether/nether/textures/nether_fruit_leaves.png b/mods/nether/nether/textures/nether_fruit_leaves.png old mode 100644 new mode 100755 diff --git a/mods/nether/nether/textures/nether_fruit_no_leaf.png b/mods/nether/nether/textures/nether_fruit_no_leaf.png old mode 100644 new mode 100755 diff --git a/mods/nether/nether/textures/nether_fruit_top.png b/mods/nether/nether/textures/nether_fruit_top.png old mode 100644 new mode 100755 diff --git a/mods/nether/nether/textures/nether_glowflower.png b/mods/nether/nether/textures/nether_glowflower.png old mode 100644 new mode 100755 diff --git a/mods/nether/nether/textures/nether_grass.png b/mods/nether/nether/textures/nether_grass.png old mode 100644 new mode 100755 diff --git a/mods/nether/nether/textures/nether_grass_big.png b/mods/nether/nether/textures/nether_grass_big.png old mode 100644 new mode 100755 diff --git a/mods/nether/nether/textures/nether_grass_dried.png b/mods/nether/nether/textures/nether_grass_dried.png old mode 100644 new mode 100755 diff --git a/mods/nether/nether/textures/nether_grass_middle.png b/mods/nether/nether/textures/nether_grass_middle.png old mode 100644 new mode 100755 diff --git a/mods/nether/nether/textures/nether_grass_small.png b/mods/nether/nether/textures/nether_grass_small.png old mode 100644 new mode 100755 diff --git a/mods/nether/nether/textures/nether_hotbed.png b/mods/nether/nether/textures/nether_hotbed.png old mode 100644 new mode 100755 diff --git a/mods/nether/nether/textures/nether_leaves.png b/mods/nether/nether/textures/nether_leaves.png old mode 100644 new mode 100755 diff --git a/mods/nether/nether/textures/nether_netherrack.png b/mods/nether/nether/textures/nether_netherrack.png old mode 100644 new mode 100755 diff --git a/mods/nether/nether/textures/nether_netherrack_black.png b/mods/nether/nether/textures/nether_netherrack_black.png old mode 100644 new mode 100755 diff --git a/mods/nether/nether/textures/nether_netherrack_black_normal.png b/mods/nether/nether/textures/nether_netherrack_black_normal.png old mode 100644 new mode 100755 diff --git a/mods/nether/nether/textures/nether_netherrack_blue.png b/mods/nether/nether/textures/nether_netherrack_blue.png old mode 100644 new mode 100755 diff --git a/mods/nether/nether/textures/nether_netherrack_blue_normal.png b/mods/nether/nether/textures/nether_netherrack_blue_normal.png old mode 100644 new mode 100755 diff --git a/mods/nether/nether/textures/nether_netherrack_brick.png b/mods/nether/nether/textures/nether_netherrack_brick.png old mode 100644 new mode 100755 diff --git a/mods/nether/nether/textures/nether_netherrack_brick_black.png b/mods/nether/nether/textures/nether_netherrack_brick_black.png old mode 100644 new mode 100755 diff --git a/mods/nether/nether/textures/nether_netherrack_brick_blue.png b/mods/nether/nether/textures/nether_netherrack_brick_blue.png old mode 100644 new mode 100755 diff --git a/mods/nether/nether/textures/nether_netherrack_normal.png b/mods/nether/nether/textures/nether_netherrack_normal.png old mode 100644 new mode 100755 diff --git a/mods/nether/nether/textures/nether_netherrack_soil.png b/mods/nether/nether/textures/nether_netherrack_soil.png old mode 100644 new mode 100755 diff --git a/mods/nether/nether/textures/nether_netherrack_soil_normal.png b/mods/nether/nether/textures/nether_netherrack_soil_normal.png old mode 100644 new mode 100755 diff --git a/mods/nether/nether/textures/nether_netherrack_tiled.png b/mods/nether/nether/textures/nether_netherrack_tiled.png old mode 100644 new mode 100755 diff --git a/mods/nether/nether/textures/nether_netherrack_tiled_normal.png b/mods/nether/nether/textures/nether_netherrack_tiled_normal.png old mode 100644 new mode 100755 diff --git a/mods/nether/nether/textures/nether_pearl.png b/mods/nether/nether/textures/nether_pearl.png old mode 100644 new mode 100755 diff --git a/mods/nether/nether/textures/nether_pick_mushroom.png b/mods/nether/nether/textures/nether_pick_mushroom.png old mode 100644 new mode 100755 diff --git a/mods/nether/nether/textures/nether_pick_netherrack.png b/mods/nether/nether/textures/nether_pick_netherrack.png old mode 100644 new mode 100755 diff --git a/mods/nether/nether/textures/nether_pick_netherrack_blue.png b/mods/nether/nether/textures/nether_pick_netherrack_blue.png old mode 100644 new mode 100755 diff --git a/mods/nether/nether/textures/nether_pick_white.png b/mods/nether/nether/textures/nether_pick_white.png old mode 100644 new mode 100755 diff --git a/mods/nether/nether/textures/nether_pick_wood.png b/mods/nether/nether/textures/nether_pick_wood.png old mode 100644 new mode 100755 diff --git a/mods/nether/nether/textures/nether_portal_particle.png b/mods/nether/nether/textures/nether_portal_particle.png old mode 100644 new mode 100755 diff --git a/mods/nether/nether/textures/nether_portal_stuff.png b/mods/nether/nether/textures/nether_portal_stuff.png old mode 100644 new mode 100755 diff --git a/mods/nether/nether/textures/nether_portal_stuff_normal.png b/mods/nether/nether/textures/nether_portal_stuff_normal.png old mode 100644 new mode 100755 diff --git a/mods/nether/nether/textures/nether_sapling.png b/mods/nether/nether/textures/nether_sapling.png old mode 100644 new mode 100755 diff --git a/mods/nether/nether/textures/nether_shovel_netherrack.png b/mods/nether/nether/textures/nether_shovel_netherrack.png old mode 100644 new mode 100755 diff --git a/mods/nether/nether/textures/nether_shovel_netherrack_blue.png b/mods/nether/nether/textures/nether_shovel_netherrack_blue.png old mode 100644 new mode 100755 diff --git a/mods/nether/nether/textures/nether_shovel_white.png b/mods/nether/nether/textures/nether_shovel_white.png old mode 100644 new mode 100755 diff --git a/mods/nether/nether/textures/nether_shroom_stem.png b/mods/nether/nether/textures/nether_shroom_stem.png old mode 100644 new mode 100755 diff --git a/mods/nether/nether/textures/nether_shroom_top.png b/mods/nether/nether/textures/nether_shroom_top.png old mode 100644 new mode 100755 diff --git a/mods/nether/nether/textures/nether_stick.png b/mods/nether/nether/textures/nether_stick.png old mode 100644 new mode 100755 diff --git a/mods/nether/nether/textures/nether_sword_netherrack.png b/mods/nether/nether/textures/nether_sword_netherrack.png old mode 100644 new mode 100755 diff --git a/mods/nether/nether/textures/nether_sword_netherrack_blue.png b/mods/nether/nether/textures/nether_sword_netherrack_blue.png old mode 100644 new mode 100755 diff --git a/mods/nether/nether/textures/nether_sword_white.png b/mods/nether/nether/textures/nether_sword_white.png old mode 100644 new mode 100755 diff --git a/mods/nether/nether/textures/nether_teleporter.png b/mods/nether/nether/textures/nether_teleporter.png old mode 100644 new mode 100755 diff --git a/mods/nether/nether/textures/nether_torch.png b/mods/nether/nether/textures/nether_torch.png old mode 100644 new mode 100755 diff --git a/mods/nether/nether/textures/nether_torch_on_ceiling.png b/mods/nether/nether/textures/nether_torch_on_ceiling.png old mode 100644 new mode 100755 diff --git a/mods/nether/nether/textures/nether_torch_on_floor.png b/mods/nether/nether/textures/nether_torch_on_floor.png old mode 100644 new mode 100755 diff --git a/mods/nether/nether/textures/nether_transparent.png b/mods/nether/nether/textures/nether_transparent.png old mode 100644 new mode 100755 diff --git a/mods/nether/nether/textures/nether_tree.png b/mods/nether/nether/textures/nether_tree.png old mode 100644 new mode 100755 diff --git a/mods/nether/nether/textures/nether_tree_corner.png b/mods/nether/nether/textures/nether_tree_corner.png old mode 100644 new mode 100755 diff --git a/mods/nether/nether/textures/nether_tree_sapling.png b/mods/nether/nether/textures/nether_tree_sapling.png old mode 100644 new mode 100755 diff --git a/mods/nether/nether/textures/nether_tree_top.png b/mods/nether/nether/textures/nether_tree_top.png old mode 100644 new mode 100755 diff --git a/mods/nether/nether/textures/nether_vine.png b/mods/nether/nether/textures/nether_vine.png old mode 100644 new mode 100755 diff --git a/mods/nether/nether/textures/nether_white.png b/mods/nether/nether/textures/nether_white.png old mode 100644 new mode 100755 diff --git a/mods/nether/nether/textures/nether_wood.png b/mods/nether/nether/textures/nether_wood.png old mode 100644 new mode 100755 diff --git a/mods/nether/nether/textures/nether_wood_cooked.png b/mods/nether/nether/textures/nether_wood_cooked.png old mode 100644 new mode 100755 diff --git a/mods/nether/nether/textures/nether_wood_empty.png b/mods/nether/nether/textures/nether_wood_empty.png old mode 100644 new mode 100755 diff --git a/mods/nether/nether/textures/nether_wood_empty_normal.png b/mods/nether/nether/textures/nether_wood_empty_normal.png old mode 100644 new mode 100755 diff --git a/mods/nether/nether/weird_mapgen_noise.lua b/mods/nether/nether/weird_mapgen_noise.lua old mode 100644 new mode 100755 diff --git a/mods/pipeworks/LICENSE b/mods/pipeworks/LICENSE old mode 100644 new mode 100755 diff --git a/mods/pipeworks/README b/mods/pipeworks/README old mode 100644 new mode 100755 diff --git a/mods/pipeworks/autocrafter.lua b/mods/pipeworks/autocrafter.lua old mode 100644 new mode 100755 diff --git a/mods/pipeworks/autoplace_pipes.lua b/mods/pipeworks/autoplace_pipes.lua old mode 100644 new mode 100755 diff --git a/mods/pipeworks/changelog.txt b/mods/pipeworks/changelog.txt old mode 100644 new mode 100755 diff --git a/mods/pipeworks/compat.lua b/mods/pipeworks/compat.lua old mode 100644 new mode 100755 diff --git a/mods/pipeworks/crafts.lua b/mods/pipeworks/crafts.lua old mode 100644 new mode 100755 diff --git a/mods/pipeworks/decorative_tubes.lua b/mods/pipeworks/decorative_tubes.lua old mode 100644 new mode 100755 diff --git a/mods/pipeworks/default_settings.txt b/mods/pipeworks/default_settings.txt old mode 100644 new mode 100755 diff --git a/mods/pipeworks/depends.txt b/mods/pipeworks/depends.txt old mode 100644 new mode 100755 diff --git a/mods/pipeworks/devices.lua b/mods/pipeworks/devices.lua old mode 100644 new mode 100755 diff --git a/mods/pipeworks/filter-injector.lua b/mods/pipeworks/filter-injector.lua old mode 100644 new mode 100755 diff --git a/mods/pipeworks/flowing_logic.lua b/mods/pipeworks/flowing_logic.lua old mode 100644 new mode 100755 diff --git a/mods/pipeworks/init.lua b/mods/pipeworks/init.lua index 92ce02c6..51656171 100755 --- a/mods/pipeworks/init.lua +++ b/mods/pipeworks/init.lua @@ -111,5 +111,5 @@ if pipeworks.enable_autocrafter then dofile(pipeworks.modpath.."/autocrafter.lua minetest.register_alias("pipeworks:pipe", "pipeworks:pipe_110000_empty") -print("Pipeworks loaded!") +minetest.log("Pipeworks loaded!") diff --git a/mods/pipeworks/legacy.lua b/mods/pipeworks/legacy.lua old mode 100644 new mode 100755 diff --git a/mods/pipeworks/models.lua b/mods/pipeworks/models.lua old mode 100644 new mode 100755 diff --git a/mods/pipeworks/models/pipeworks_entry_panel.obj b/mods/pipeworks/models/pipeworks_entry_panel.obj old mode 100644 new mode 100755 diff --git a/mods/pipeworks/models/pipeworks_flow_sensor.obj b/mods/pipeworks/models/pipeworks_flow_sensor.obj old mode 100644 new mode 100755 diff --git a/mods/pipeworks/models/pipeworks_fountainhead.obj b/mods/pipeworks/models/pipeworks_fountainhead.obj old mode 100644 new mode 100755 diff --git a/mods/pipeworks/models/pipeworks_pipe_10.obj b/mods/pipeworks/models/pipeworks_pipe_10.obj old mode 100644 new mode 100755 diff --git a/mods/pipeworks/models/pipeworks_pipe_2.obj b/mods/pipeworks/models/pipeworks_pipe_2.obj old mode 100644 new mode 100755 diff --git a/mods/pipeworks/models/pipeworks_pipe_3.obj b/mods/pipeworks/models/pipeworks_pipe_3.obj old mode 100644 new mode 100755 diff --git a/mods/pipeworks/models/pipeworks_pipe_4.obj b/mods/pipeworks/models/pipeworks_pipe_4.obj old mode 100644 new mode 100755 diff --git a/mods/pipeworks/models/pipeworks_pipe_5.obj b/mods/pipeworks/models/pipeworks_pipe_5.obj old mode 100644 new mode 100755 diff --git a/mods/pipeworks/models/pipeworks_pipe_6.obj b/mods/pipeworks/models/pipeworks_pipe_6.obj old mode 100644 new mode 100755 diff --git a/mods/pipeworks/models/pipeworks_pipe_7.obj b/mods/pipeworks/models/pipeworks_pipe_7.obj old mode 100644 new mode 100755 diff --git a/mods/pipeworks/models/pipeworks_pipe_8.obj b/mods/pipeworks/models/pipeworks_pipe_8.obj old mode 100644 new mode 100755 diff --git a/mods/pipeworks/models/pipeworks_pipe_9.obj b/mods/pipeworks/models/pipeworks_pipe_9.obj old mode 100644 new mode 100755 diff --git a/mods/pipeworks/models/pipeworks_pump.obj b/mods/pipeworks/models/pipeworks_pump.obj old mode 100644 new mode 100755 diff --git a/mods/pipeworks/models/pipeworks_spigot.obj b/mods/pipeworks/models/pipeworks_spigot.obj old mode 100644 new mode 100755 diff --git a/mods/pipeworks/models/pipeworks_spigot_pouring.obj b/mods/pipeworks/models/pipeworks_spigot_pouring.obj old mode 100644 new mode 100755 diff --git a/mods/pipeworks/models/pipeworks_valve_off.obj b/mods/pipeworks/models/pipeworks_valve_off.obj old mode 100644 new mode 100755 diff --git a/mods/pipeworks/models/pipeworks_valve_on.obj b/mods/pipeworks/models/pipeworks_valve_on.obj old mode 100644 new mode 100755 diff --git a/mods/pipeworks/pipes.lua b/mods/pipeworks/pipes.lua old mode 100644 new mode 100755 diff --git a/mods/pipeworks/routing_tubes.lua b/mods/pipeworks/routing_tubes.lua old mode 100644 new mode 100755 diff --git a/mods/pipeworks/signal_tubes.lua b/mods/pipeworks/signal_tubes.lua old mode 100644 new mode 100755 diff --git a/mods/pipeworks/sorting_tubes.lua b/mods/pipeworks/sorting_tubes.lua old mode 100644 new mode 100755 diff --git a/mods/pipeworks/teleport_tube.lua b/mods/pipeworks/teleport_tube.lua old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/homedecor_oil_extract.png b/mods/pipeworks/textures/homedecor_oil_extract.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/homedecor_paraffin.png b/mods/pipeworks/textures/homedecor_paraffin.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/homedecor_plastic_sheeting.png b/mods/pipeworks/textures/homedecor_plastic_sheeting.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_accelerator_tube_end.png b/mods/pipeworks/textures/pipeworks_accelerator_tube_end.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_accelerator_tube_inv.png b/mods/pipeworks/textures/pipeworks_accelerator_tube_inv.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_accelerator_tube_noctr.png b/mods/pipeworks/textures/pipeworks_accelerator_tube_noctr.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_accelerator_tube_plain.png b/mods/pipeworks/textures/pipeworks_accelerator_tube_plain.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_accelerator_tube_short.png b/mods/pipeworks/textures/pipeworks_accelerator_tube_short.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_autocrafter.png b/mods/pipeworks/textures/pipeworks_autocrafter.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_black.png b/mods/pipeworks/textures/pipeworks_black.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_blue.png b/mods/pipeworks/textures/pipeworks_blue.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_button_interm.png b/mods/pipeworks/textures/pipeworks_button_interm.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_button_off.png b/mods/pipeworks/textures/pipeworks_button_off.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_button_on.png b/mods/pipeworks/textures/pipeworks_button_on.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_conductor_tube_end.png b/mods/pipeworks/textures/pipeworks_conductor_tube_end.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_conductor_tube_inv.png b/mods/pipeworks/textures/pipeworks_conductor_tube_inv.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_conductor_tube_noctr.png b/mods/pipeworks/textures/pipeworks_conductor_tube_noctr.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_conductor_tube_on_end.png b/mods/pipeworks/textures/pipeworks_conductor_tube_on_end.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_conductor_tube_on_noctr.png b/mods/pipeworks/textures/pipeworks_conductor_tube_on_noctr.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_conductor_tube_on_plain.png b/mods/pipeworks/textures/pipeworks_conductor_tube_on_plain.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_conductor_tube_plain.png b/mods/pipeworks/textures/pipeworks_conductor_tube_plain.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_conductor_tube_short.png b/mods/pipeworks/textures/pipeworks_conductor_tube_short.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_crossing_tube_end.png b/mods/pipeworks/textures/pipeworks_crossing_tube_end.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_crossing_tube_inv.png b/mods/pipeworks/textures/pipeworks_crossing_tube_inv.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_crossing_tube_noctr.png b/mods/pipeworks/textures/pipeworks_crossing_tube_noctr.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_crossing_tube_plain.png b/mods/pipeworks/textures/pipeworks_crossing_tube_plain.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_crossing_tube_short.png b/mods/pipeworks/textures/pipeworks_crossing_tube_short.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_deployer_back.png b/mods/pipeworks/textures/pipeworks_deployer_back.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_deployer_bottom.png b/mods/pipeworks/textures/pipeworks_deployer_bottom.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_deployer_front_off.png b/mods/pipeworks/textures/pipeworks_deployer_front_off.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_deployer_front_on.png b/mods/pipeworks/textures/pipeworks_deployer_front_on.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_deployer_side.png b/mods/pipeworks/textures/pipeworks_deployer_side.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_deployer_side1.png b/mods/pipeworks/textures/pipeworks_deployer_side1.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_deployer_side2.png b/mods/pipeworks/textures/pipeworks_deployer_side2.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_deployer_top.png b/mods/pipeworks/textures/pipeworks_deployer_top.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_detector_tube_end.png b/mods/pipeworks/textures/pipeworks_detector_tube_end.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_detector_tube_inv.png b/mods/pipeworks/textures/pipeworks_detector_tube_inv.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_detector_tube_noctr.png b/mods/pipeworks/textures/pipeworks_detector_tube_noctr.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_detector_tube_plain.png b/mods/pipeworks/textures/pipeworks_detector_tube_plain.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_detector_tube_short.png b/mods/pipeworks/textures/pipeworks_detector_tube_short.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_dispenser_back.png b/mods/pipeworks/textures/pipeworks_dispenser_back.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_dispenser_bottom.png b/mods/pipeworks/textures/pipeworks_dispenser_bottom.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_dispenser_front_off.png b/mods/pipeworks/textures/pipeworks_dispenser_front_off.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_dispenser_front_on.png b/mods/pipeworks/textures/pipeworks_dispenser_front_on.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_dispenser_side1.png b/mods/pipeworks/textures/pipeworks_dispenser_side1.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_dispenser_side2.png b/mods/pipeworks/textures/pipeworks_dispenser_side2.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_dispenser_top.png b/mods/pipeworks/textures/pipeworks_dispenser_top.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_entry_panel.png b/mods/pipeworks/textures/pipeworks_entry_panel.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_filter_input.png b/mods/pipeworks/textures/pipeworks_filter_input.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_filter_output.png b/mods/pipeworks/textures/pipeworks_filter_output.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_filter_side.png b/mods/pipeworks/textures/pipeworks_filter_side.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_filter_top.png b/mods/pipeworks/textures/pipeworks_filter_top.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_flow_sensor_off.png b/mods/pipeworks/textures/pipeworks_flow_sensor_off.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_flow_sensor_on.png b/mods/pipeworks/textures/pipeworks_flow_sensor_on.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_fountainhead.png b/mods/pipeworks/textures/pipeworks_fountainhead.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_grating_sides.png b/mods/pipeworks/textures/pipeworks_grating_sides.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_grating_top.png b/mods/pipeworks/textures/pipeworks_grating_top.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_green.png b/mods/pipeworks/textures/pipeworks_green.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_mese_filter_input.png b/mods/pipeworks/textures/pipeworks_mese_filter_input.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_mese_filter_output.png b/mods/pipeworks/textures/pipeworks_mese_filter_output.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_mese_filter_side.png b/mods/pipeworks/textures/pipeworks_mese_filter_side.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_mese_filter_top.png b/mods/pipeworks/textures/pipeworks_mese_filter_top.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_mese_sand_tube_end.png b/mods/pipeworks/textures/pipeworks_mese_sand_tube_end.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_mese_sand_tube_inv.png b/mods/pipeworks/textures/pipeworks_mese_sand_tube_inv.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_mese_sand_tube_noctr.png b/mods/pipeworks/textures/pipeworks_mese_sand_tube_noctr.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_mese_sand_tube_plain.png b/mods/pipeworks/textures/pipeworks_mese_sand_tube_plain.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_mese_sand_tube_short.png b/mods/pipeworks/textures/pipeworks_mese_sand_tube_short.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_mese_tube_end.png b/mods/pipeworks/textures/pipeworks_mese_tube_end.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_mese_tube_inv.png b/mods/pipeworks/textures/pipeworks_mese_tube_inv.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_mese_tube_noctr_1.png b/mods/pipeworks/textures/pipeworks_mese_tube_noctr_1.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_mese_tube_noctr_2.png b/mods/pipeworks/textures/pipeworks_mese_tube_noctr_2.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_mese_tube_noctr_3.png b/mods/pipeworks/textures/pipeworks_mese_tube_noctr_3.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_mese_tube_noctr_4.png b/mods/pipeworks/textures/pipeworks_mese_tube_noctr_4.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_mese_tube_noctr_5.png b/mods/pipeworks/textures/pipeworks_mese_tube_noctr_5.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_mese_tube_noctr_6.png b/mods/pipeworks/textures/pipeworks_mese_tube_noctr_6.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_mese_tube_plain_1.png b/mods/pipeworks/textures/pipeworks_mese_tube_plain_1.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_mese_tube_plain_2.png b/mods/pipeworks/textures/pipeworks_mese_tube_plain_2.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_mese_tube_plain_3.png b/mods/pipeworks/textures/pipeworks_mese_tube_plain_3.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_mese_tube_plain_4.png b/mods/pipeworks/textures/pipeworks_mese_tube_plain_4.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_mese_tube_plain_5.png b/mods/pipeworks/textures/pipeworks_mese_tube_plain_5.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_mese_tube_plain_6.png b/mods/pipeworks/textures/pipeworks_mese_tube_plain_6.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_mese_tube_short.png b/mods/pipeworks/textures/pipeworks_mese_tube_short.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_nodebreaker_back.png b/mods/pipeworks/textures/pipeworks_nodebreaker_back.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_nodebreaker_bottom_off.png b/mods/pipeworks/textures/pipeworks_nodebreaker_bottom_off.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_nodebreaker_bottom_on.png b/mods/pipeworks/textures/pipeworks_nodebreaker_bottom_on.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_nodebreaker_front_off.png b/mods/pipeworks/textures/pipeworks_nodebreaker_front_off.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_nodebreaker_front_on.png b/mods/pipeworks/textures/pipeworks_nodebreaker_front_on.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_nodebreaker_side1_off.png b/mods/pipeworks/textures/pipeworks_nodebreaker_side1_off.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_nodebreaker_side1_on.png b/mods/pipeworks/textures/pipeworks_nodebreaker_side1_on.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_nodebreaker_side2_off.png b/mods/pipeworks/textures/pipeworks_nodebreaker_side2_off.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_nodebreaker_side2_on.png b/mods/pipeworks/textures/pipeworks_nodebreaker_side2_on.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_nodebreaker_top_off.png b/mods/pipeworks/textures/pipeworks_nodebreaker_top_off.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_nodebreaker_top_on.png b/mods/pipeworks/textures/pipeworks_nodebreaker_top_on.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_one_way_tube_input.png b/mods/pipeworks/textures/pipeworks_one_way_tube_input.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_one_way_tube_output.png b/mods/pipeworks/textures/pipeworks_one_way_tube_output.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_one_way_tube_side.png b/mods/pipeworks/textures/pipeworks_one_way_tube_side.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_one_way_tube_top.png b/mods/pipeworks/textures/pipeworks_one_way_tube_top.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_pane_embedded_tube_ends.png b/mods/pipeworks/textures/pipeworks_pane_embedded_tube_ends.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_pane_embedded_tube_sides.png b/mods/pipeworks/textures/pipeworks_pane_embedded_tube_sides.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_pipe_3_empty.png b/mods/pipeworks/textures/pipeworks_pipe_3_empty.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_pipe_3_loaded.png b/mods/pipeworks/textures/pipeworks_pipe_3_loaded.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_pipe_inv.png b/mods/pipeworks/textures/pipeworks_pipe_inv.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_pipe_plain.png b/mods/pipeworks/textures/pipeworks_pipe_plain.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_plastic_sheeting.png b/mods/pipeworks/textures/pipeworks_plastic_sheeting.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_pump_off.png b/mods/pipeworks/textures/pipeworks_pump_off.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_pump_on.png b/mods/pipeworks/textures/pipeworks_pump_on.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_red.png b/mods/pipeworks/textures/pipeworks_red.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_sand_tube_end.png b/mods/pipeworks/textures/pipeworks_sand_tube_end.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_sand_tube_inv.png b/mods/pipeworks/textures/pipeworks_sand_tube_inv.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_sand_tube_noctr.png b/mods/pipeworks/textures/pipeworks_sand_tube_noctr.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_sand_tube_plain.png b/mods/pipeworks/textures/pipeworks_sand_tube_plain.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_sand_tube_short.png b/mods/pipeworks/textures/pipeworks_sand_tube_short.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_spigot.png b/mods/pipeworks/textures/pipeworks_spigot.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_storage_tank_back.png b/mods/pipeworks/textures/pipeworks_storage_tank_back.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_storage_tank_fittings.png b/mods/pipeworks/textures/pipeworks_storage_tank_fittings.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_storage_tank_front_0.png b/mods/pipeworks/textures/pipeworks_storage_tank_front_0.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_storage_tank_front_1.png b/mods/pipeworks/textures/pipeworks_storage_tank_front_1.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_storage_tank_front_10.png b/mods/pipeworks/textures/pipeworks_storage_tank_front_10.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_storage_tank_front_2.png b/mods/pipeworks/textures/pipeworks_storage_tank_front_2.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_storage_tank_front_3.png b/mods/pipeworks/textures/pipeworks_storage_tank_front_3.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_storage_tank_front_4.png b/mods/pipeworks/textures/pipeworks_storage_tank_front_4.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_storage_tank_front_5.png b/mods/pipeworks/textures/pipeworks_storage_tank_front_5.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_storage_tank_front_6.png b/mods/pipeworks/textures/pipeworks_storage_tank_front_6.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_storage_tank_front_7.png b/mods/pipeworks/textures/pipeworks_storage_tank_front_7.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_storage_tank_front_8.png b/mods/pipeworks/textures/pipeworks_storage_tank_front_8.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_storage_tank_front_9.png b/mods/pipeworks/textures/pipeworks_storage_tank_front_9.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_teleport_tube_end.png b/mods/pipeworks/textures/pipeworks_teleport_tube_end.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_teleport_tube_inv.png b/mods/pipeworks/textures/pipeworks_teleport_tube_inv.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_teleport_tube_noctr.png b/mods/pipeworks/textures/pipeworks_teleport_tube_noctr.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_teleport_tube_plain.png b/mods/pipeworks/textures/pipeworks_teleport_tube_plain.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_teleport_tube_short.png b/mods/pipeworks/textures/pipeworks_teleport_tube_short.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_testobject.png b/mods/pipeworks/textures/pipeworks_testobject.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_trashcan_bottom.png b/mods/pipeworks/textures/pipeworks_trashcan_bottom.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_trashcan_side.png b/mods/pipeworks/textures/pipeworks_trashcan_side.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_tube_connection_metallic.png b/mods/pipeworks/textures/pipeworks_tube_connection_metallic.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_tube_connection_stony.png b/mods/pipeworks/textures/pipeworks_tube_connection_stony.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_tube_connection_wooden.png b/mods/pipeworks/textures/pipeworks_tube_connection_wooden.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_tube_end.png b/mods/pipeworks/textures/pipeworks_tube_end.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_tube_inv.png b/mods/pipeworks/textures/pipeworks_tube_inv.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_tube_noctr.png b/mods/pipeworks/textures/pipeworks_tube_noctr.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_tube_plain.png b/mods/pipeworks/textures/pipeworks_tube_plain.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_tube_short.png b/mods/pipeworks/textures/pipeworks_tube_short.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_tube_transparent.png b/mods/pipeworks/textures/pipeworks_tube_transparent.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_valve.png b/mods/pipeworks/textures/pipeworks_valve.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_white.png b/mods/pipeworks/textures/pipeworks_white.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/textures/pipeworks_yellow.png b/mods/pipeworks/textures/pipeworks_yellow.png old mode 100644 new mode 100755 diff --git a/mods/pipeworks/trashcan.lua b/mods/pipeworks/trashcan.lua old mode 100644 new mode 100755 diff --git a/mods/pipeworks/tube_registration.lua b/mods/pipeworks/tube_registration.lua old mode 100644 new mode 100755 diff --git a/mods/pipeworks/vacuum_tubes.lua b/mods/pipeworks/vacuum_tubes.lua old mode 100644 new mode 100755 diff --git a/mods/pipeworks/wielder.lua b/mods/pipeworks/wielder.lua old mode 100644 new mode 100755 diff --git a/mods/plantlife_modpack/along_shore/init.lua b/mods/plantlife_modpack/along_shore/init.lua index 719d3245..a83d0f9b 100755 --- a/mods/plantlife_modpack/along_shore/init.lua +++ b/mods/plantlife_modpack/along_shore/init.lua @@ -5,5 +5,5 @@ local mname = "along_shore" ----------------------------------------------------------------------------------------------- ----------------------------------------------------------------------------------------------- -print("[Mod] "..title.." ["..version.."] ["..mname.."] Loaded...") ------------------------------------------------------------------------------------------------ \ No newline at end of file +minetest.log("action", "[Mod] "..title.." ["..version.."] ["..mname.."] Loaded...") +----------------------------------------------------------------------------------------------- diff --git a/mods/plantlife_modpack/bushes_classic/init.lua b/mods/plantlife_modpack/bushes_classic/init.lua index f06c50ca..43c848ea 100755 --- a/mods/plantlife_modpack/bushes_classic/init.lua +++ b/mods/plantlife_modpack/bushes_classic/init.lua @@ -55,4 +55,4 @@ plantslib:spawn_on_surfaces({ minetest.register_alias("bushes:basket_pies", "bushes:basket_strawberry") -print(S("[Bushes] Loaded.")) +minetest.log("action", S("[Bushes] Loaded.")) diff --git a/mods/plantlife_modpack/bushes_classic/locale/fr.txt b/mods/plantlife_modpack/bushes_classic/locale/fr.txt old mode 100644 new mode 100755 diff --git a/mods/plantlife_modpack/bushes_classic/locale/tr.txt b/mods/plantlife_modpack/bushes_classic/locale/tr.txt old mode 100644 new mode 100755 diff --git a/mods/plantlife_modpack/cavestuff/init.lua b/mods/plantlife_modpack/cavestuff/init.lua index f2bed1a5..d5209cbe 100755 --- a/mods/plantlife_modpack/cavestuff/init.lua +++ b/mods/plantlife_modpack/cavestuff/init.lua @@ -9,4 +9,4 @@ dofile(minetest.get_modpath("cavestuff").."/mapgen.lua") ----------------------------------------------------------------------------------------------- -print("[Mod] "..title.." ["..version.."] ["..mname.."] Loaded...") +minetest.log("action", "[Mod] "..title.." ["..version.."] ["..mname.."] Loaded...") diff --git a/mods/plantlife_modpack/dryplants/init.lua b/mods/plantlife_modpack/dryplants/init.lua index b33304fd..1a1a1705 100755 --- a/mods/plantlife_modpack/dryplants/init.lua +++ b/mods/plantlife_modpack/dryplants/init.lua @@ -195,5 +195,5 @@ minetest.register_abm({ }) ----------------------------------------------------------------------------------------------- -print("[Mod] "..title.." ["..version.."] ["..mname.."] Loaded...") +minetest.log("action", "[Mod] "..title.." ["..version.."] ["..mname.."] Loaded...") ----------------------------------------------------------------------------------------------- diff --git a/mods/plantlife_modpack/dryplants/models/plantlike.obj b/mods/plantlife_modpack/dryplants/models/plantlike.obj index 3a9ac439..4b38d39c 100755 --- a/mods/plantlife_modpack/dryplants/models/plantlike.obj +++ b/mods/plantlife_modpack/dryplants/models/plantlike.obj @@ -1,56 +1,28 @@ -# Blender v2.69 (sub 0) OBJ File: 'plantlike.blend' +# Blender v2.73 (sub 0) OBJ File: '' # www.blender.org -mtllib plantlike.mtl -o Plane.001 -v 0.347299 -0.500000 -0.359699 -v -0.347299 -0.500000 0.359699 -v 0.347299 0.500000 -0.359699 -v -0.347299 0.500000 0.359699 -v 0.359699 -0.500000 0.347299 -v -0.359699 -0.500000 -0.347299 -v 0.359699 0.500000 0.347299 -v -0.359699 0.500000 -0.347299 -v -0.347659 -0.500000 0.359352 -v -0.347659 0.500000 0.359351 -v 0.346940 0.500000 -0.360046 -v 0.346940 -0.500000 -0.360046 -v -0.359352 -0.500000 -0.347659 -v -0.359351 0.500000 -0.347659 -v 0.360046 0.500000 0.346939 -v 0.360046 -0.500000 0.346940 -vt 0.000000 0.000000 -vt 1.000000 0.000000 +o Cylinder +v 0.359670 -0.500000 0.347329 +v 0.359670 0.500000 0.347329 +v -0.359670 -0.500000 -0.347329 +v -0.359670 0.500000 -0.347329 +v 0.347329 0.500000 -0.359670 +v 0.347329 -0.500000 -0.359670 +v -0.347329 0.500000 0.359670 +v -0.347329 -0.500000 0.359670 +v 0.359670 -0.500000 0.347329 +v 0.359670 0.500000 0.347329 +v -0.359670 -0.500000 -0.347329 +v -0.359670 0.500000 -0.347329 +v 0.347329 0.500000 -0.359670 +v 0.347329 -0.500000 -0.359670 +v -0.347329 0.500000 0.359670 +v -0.347329 -0.500000 0.359670 +vt 1.000000 -0.000000 vt 1.000000 1.000000 vt 0.000000 1.000000 -vt 0.999500 0.499625 -vt 0.999500 0.000000 -vt 0.999750 0.000000 -vt 0.999750 0.499625 -vt 0.999250 0.499625 -vt 0.999251 0.000000 -vt 0.999750 0.999250 -vt 0.999500 0.999250 -vt 1.000000 0.499625 -vt 1.000000 0.999250 -vt 0.499625 0.999500 -vt 0.000000 0.999500 -vt 0.000000 0.999250 -vt 0.499625 0.999250 -vt 0.999251 0.999250 -vt 0.499625 0.999251 -vt 0.999250 0.999250 -vt 0.999250 0.999500 -usemtl None +vt -0.000000 0.000000 s off -f 2/1 1/2 3/3 4/4 -f 6/1 5/2 7/3 8/4 -f 9/2 10/3 11/4 12/1 -f 13/2 14/3 15/4 16/1 -f 5/5 6/6 13/7 16/8 -f 7/6 5/5 16/9 15/10 -f 8/8 7/11 15/12 14/5 -f 6/13 8/14 14/11 13/8 -f 1/15 2/16 9/17 12/18 -f 3/5 1/12 12/19 11/9 -f 4/20 3/21 11/22 10/15 -f 2/2 4/13 10/8 9/7 +f 1/1 2/2 4/3 3/4 +f 8/1 7/2 5/3 6/4 +f 9/1 11/4 12/3 10/2 +f 16/1 14/4 13/3 15/2 diff --git a/mods/plantlife_modpack/ferns/init.lua b/mods/plantlife_modpack/ferns/init.lua index b629d5d4..5add4808 100755 --- a/mods/plantlife_modpack/ferns/init.lua +++ b/mods/plantlife_modpack/ferns/init.lua @@ -43,20 +43,20 @@ if run_tests then -- Check node names if abstract_ferns.config.enable_horsetails then - print("[Mod] " ..title.. " Checking horsetail item strings") + minetest.log("action", "[Mod] " ..title.. " Checking horsetail item strings") assert(minetest.registered_items["ferns:horsetail_01"] ~= nil) assert(minetest.registered_items["ferns:horsetail_02"] ~= nil) assert(minetest.registered_items["ferns:horsetail_03"] ~= nil) assert(minetest.registered_items["ferns:horsetail_04"] ~= nil) end if abstract_ferns.config.enable_lady_fern then - print("[Mod] ".. title .." Checking lady fern item strings") + minetest.log("action", "[Mod] ".. title .." Checking lady fern item strings") assert(minetest.registered_items["ferns:fern_01"] ~= nil) assert(minetest.registered_items["ferns:fern_02"] ~= nil) assert(minetest.registered_items["ferns:fern_03"] ~= nil) end if abstract_ferns.config.enable_treefern then - print("[Mod] ".. title .." Checking tree fern item strings") + minetest.log("action", "[Mod] ".. title .." Checking tree fern item strings") assert(minetest.registered_items["ferns:tree_fern_leaves"] ~= nil) assert(minetest.registered_items["ferns:tree_fern_leaves_02"] ~= nil) assert(minetest.registered_items["ferns:fern_trunk"] ~= nil) @@ -65,5 +65,5 @@ if run_tests then end ----------------------------------------------------------------------------------------------- -print("[Mod] "..title.." ["..version.."] ["..mname.."] Loaded...") +minetest.log("action", "[Mod] "..title.." ["..version.."] ["..mname.."] Loaded...") ----------------------------------------------------------------------------------------------- diff --git a/mods/plantlife_modpack/flowers_plus/init.lua b/mods/plantlife_modpack/flowers_plus/init.lua index 02b7d084..7a28e4e7 100755 --- a/mods/plantlife_modpack/flowers_plus/init.lua +++ b/mods/plantlife_modpack/flowers_plus/init.lua @@ -535,4 +535,4 @@ minetest.register_alias("flowers:cotton", "farming:string") minetest.register_alias("flowers:cotton_wad", "farming:string") minetest.register_alias("sunflower:sunflower", "flowers:sunflower") -print(S("[Flowers] Loaded.")) +minetest.log("action", S("[Flowers] Loaded.")) diff --git a/mods/plantlife_modpack/flowers_plus/locale/fr.txt b/mods/plantlife_modpack/flowers_plus/locale/fr.txt old mode 100644 new mode 100755 diff --git a/mods/plantlife_modpack/flowers_plus/models/flowers_sunflower.obj b/mods/plantlife_modpack/flowers_plus/models/flowers_sunflower.obj old mode 100644 new mode 100755 diff --git a/mods/plantlife_modpack/flowers_plus/textures/flowers_flowerpot.png b/mods/plantlife_modpack/flowers_plus/textures/flowers_flowerpot.png deleted file mode 100644 index acd7c8df..00000000 Binary files a/mods/plantlife_modpack/flowers_plus/textures/flowers_flowerpot.png and /dev/null differ diff --git a/mods/plantlife_modpack/flowers_plus/textures/flowers_potted.png b/mods/plantlife_modpack/flowers_plus/textures/flowers_potted.png deleted file mode 100644 index 6505f05a..00000000 Binary files a/mods/plantlife_modpack/flowers_plus/textures/flowers_potted.png and /dev/null differ diff --git a/mods/plantlife_modpack/flowers_plus/textures/flowers_potted_bonsai.png b/mods/plantlife_modpack/flowers_plus/textures/flowers_potted_bonsai.png deleted file mode 100644 index f2a8c6c8..00000000 Binary files a/mods/plantlife_modpack/flowers_plus/textures/flowers_potted_bonsai.png and /dev/null differ diff --git a/mods/plantlife_modpack/flowers_plus/textures/flowers_potted_cactus.png b/mods/plantlife_modpack/flowers_plus/textures/flowers_potted_cactus.png deleted file mode 100644 index 725c6303..00000000 Binary files a/mods/plantlife_modpack/flowers_plus/textures/flowers_potted_cactus.png and /dev/null differ diff --git a/mods/plantlife_modpack/flowers_plus/textures/flowers_seaweed.png b/mods/plantlife_modpack/flowers_plus/textures/flowers_seaweed.png old mode 100644 new mode 100755 diff --git a/mods/plantlife_modpack/flowers_plus/textures/flowers_seaweedLight.png b/mods/plantlife_modpack/flowers_plus/textures/flowers_seaweedLight.png old mode 100644 new mode 100755 diff --git a/mods/plantlife_modpack/flowers_plus/textures/flowers_seaweed_2.png b/mods/plantlife_modpack/flowers_plus/textures/flowers_seaweed_2.png old mode 100644 new mode 100755 diff --git a/mods/plantlife_modpack/flowers_plus/textures/flowers_seaweed_3.png b/mods/plantlife_modpack/flowers_plus/textures/flowers_seaweed_3.png old mode 100644 new mode 100755 diff --git a/mods/plantlife_modpack/flowers_plus/textures/flowers_seaweed_4.png b/mods/plantlife_modpack/flowers_plus/textures/flowers_seaweed_4.png old mode 100644 new mode 100755 diff --git a/mods/plantlife_modpack/flowers_plus/textures/flowers_sunflower.png b/mods/plantlife_modpack/flowers_plus/textures/flowers_sunflower.png old mode 100644 new mode 100755 diff --git a/mods/plantlife_modpack/flowers_plus/textures/flowers_sunflower_inv.png b/mods/plantlife_modpack/flowers_plus/textures/flowers_sunflower_inv.png old mode 100644 new mode 100755 diff --git a/mods/plantlife_modpack/flowers_plus/textures/flowers_waterlily.png b/mods/plantlife_modpack/flowers_plus/textures/flowers_waterlily.png old mode 100644 new mode 100755 diff --git a/mods/plantlife_modpack/flowers_plus/textures/flowers_waterlily_22.5.png b/mods/plantlife_modpack/flowers_plus/textures/flowers_waterlily_22.5.png old mode 100644 new mode 100755 diff --git a/mods/plantlife_modpack/flowers_plus/textures/flowers_waterlily_45.png b/mods/plantlife_modpack/flowers_plus/textures/flowers_waterlily_45.png old mode 100644 new mode 100755 diff --git a/mods/plantlife_modpack/flowers_plus/textures/flowers_waterlily_67.5.png b/mods/plantlife_modpack/flowers_plus/textures/flowers_waterlily_67.5.png old mode 100644 new mode 100755 diff --git a/mods/plantlife_modpack/flowers_plus/textures/flowers_waterlily_small_1.png b/mods/plantlife_modpack/flowers_plus/textures/flowers_waterlily_small_1.png old mode 100644 new mode 100755 diff --git a/mods/plantlife_modpack/flowers_plus/textures/flowers_waterlily_small_2.png b/mods/plantlife_modpack/flowers_plus/textures/flowers_waterlily_small_2.png old mode 100644 new mode 100755 diff --git a/mods/plantlife_modpack/flowers_plus/textures/flowers_waterlily_small_3.png b/mods/plantlife_modpack/flowers_plus/textures/flowers_waterlily_small_3.png old mode 100644 new mode 100755 diff --git a/mods/plantlife_modpack/flowers_plus/textures/flowers_waterlily_small_4.png b/mods/plantlife_modpack/flowers_plus/textures/flowers_waterlily_small_4.png old mode 100644 new mode 100755 diff --git a/mods/plantlife_modpack/flowers_plus/textures/tr.txt b/mods/plantlife_modpack/flowers_plus/textures/tr.txt old mode 100644 new mode 100755 diff --git a/mods/plantlife_modpack/molehills/init.lua b/mods/plantlife_modpack/molehills/init.lua index 28e157af..0e84e137 100755 --- a/mods/plantlife_modpack/molehills/init.lua +++ b/mods/plantlife_modpack/molehills/init.lua @@ -106,5 +106,5 @@ plantslib:register_generate_plant({ ) ----------------------------------------------------------------------------------------------- -print("[Mod] "..title.." ["..version.."] ["..mname.."] Loaded...") +minetest.log("action", "[Mod] "..title.." ["..version.."] ["..mname.."] Loaded...") ----------------------------------------------------------------------------------------------- diff --git a/mods/plantlife_modpack/mushroom/init.lua b/mods/plantlife_modpack/mushroom/init.lua index 8c5b9eea..a65f28f6 100755 --- a/mods/plantlife_modpack/mushroom/init.lua +++ b/mods/plantlife_modpack/mushroom/init.lua @@ -258,4 +258,4 @@ minetest.register_abm({ dofile(minetest.get_modpath("mushroom").."/crafting.lua") dofile(minetest.get_modpath("mushroom").."/compat.lua") -print("[Mushrooms] loaded.") +minetest.log("action", "[Mushrooms] loaded.") diff --git a/mods/plantlife_modpack/plants_lib/init.lua b/mods/plantlife_modpack/plants_lib/init.lua index d0401ae5..2e29c55c 100755 --- a/mods/plantlife_modpack/plants_lib/init.lua +++ b/mods/plantlife_modpack/plants_lib/init.lua @@ -42,7 +42,7 @@ local DEBUG = false --... except if you want to spam the console with debugging function plantslib:dbg(msg) if DEBUG then - print("[Plantlife] "..msg) + minetest.log("action", "[Plantlife] "..msg) minetest.log("verbose", "[Plantlife] "..msg) end end @@ -446,8 +446,8 @@ end) -- to prevent unpopulated map areas minetest.register_on_shutdown(function() - print("[plants_lib] Stand by, playing out the rest of the aircheck mapblock log") - print("(there are "..#plantslib.blocklist_aircheck.." entries)...") + minetest.log("[plants_lib] Stand by, playing out the rest of the aircheck mapblock log") + minetest.log("(there are "..#plantslib.blocklist_aircheck.." entries)...") while true do plantslib:generate_block_with_air_checking(0.1) if #plantslib.blocklist_aircheck == 0 then return end @@ -455,8 +455,8 @@ minetest.register_on_shutdown(function() end) minetest.register_on_shutdown(function() - print("[plants_lib] Stand by, playing out the rest of the no-aircheck mapblock log") - print("(there are "..#plantslib.blocklist_aircheck.." entries)...") + minetest.log("[plants_lib] Stand by, playing out the rest of the no-aircheck mapblock log") + minetest.log("(there are "..#plantslib.blocklist_aircheck.." entries)...") while true do plantslib:generate_block_no_aircheck(0.1) if #plantslib.blocklist_no_aircheck == 0 then return end @@ -726,10 +726,10 @@ function plantslib:get_nodedef_field(nodename, fieldname) return minetest.registered_nodes[nodename][fieldname] end -print("[Plants Lib] Loaded") +minetest.log("action", "[Plants Lib] Loaded") minetest.after(0, function() - print("[Plants Lib] Registered a total of "..(#plantslib.surfaceslist_aircheck)+(#plantslib.surfaceslist_no_aircheck).." surface types to be evaluated, spread") - print("[Plants Lib] across "..#plantslib.actionslist_aircheck.." actions with air-checking and "..#plantslib.actionslist_no_aircheck.." actions without.") + minetest.log("action", "[Plants Lib] Registered a total of "..(#plantslib.surfaceslist_aircheck)+(#plantslib.surfaceslist_no_aircheck).." surface types to be evaluated, spread") + minetest.log("action", "[Plants Lib] across "..#plantslib.actionslist_aircheck.." actions with air-checking and "..#plantslib.actionslist_no_aircheck.." actions without.") end) diff --git a/mods/plantlife_modpack/plants_lib/locale/fr.txt b/mods/plantlife_modpack/plants_lib/locale/fr.txt old mode 100644 new mode 100755 diff --git a/mods/plantlife_modpack/plants_lib/locale/tr.txt b/mods/plantlife_modpack/plants_lib/locale/tr.txt old mode 100644 new mode 100755 diff --git a/mods/plantlife_modpack/poisonivy/init.lua b/mods/plantlife_modpack/poisonivy/init.lua index bb321219..6ab84f10 100755 --- a/mods/plantlife_modpack/poisonivy/init.lua +++ b/mods/plantlife_modpack/poisonivy/init.lua @@ -100,4 +100,4 @@ plantslib:grow_plants({ ground_nodes = {"default:dirt_with_grass"} }) -print(S("[Poison Ivy] Loaded.")) +minetest.log("action", S("[Poison Ivy] Loaded.")) diff --git a/mods/plantlife_modpack/poisonivy/locale/fr.txt b/mods/plantlife_modpack/poisonivy/locale/fr.txt old mode 100644 new mode 100755 diff --git a/mods/plantlife_modpack/poisonivy/locale/tr.txt b/mods/plantlife_modpack/poisonivy/locale/tr.txt old mode 100644 new mode 100755 diff --git a/mods/plantlife_modpack/trunks/init.lua b/mods/plantlife_modpack/trunks/init.lua index ee9427d0..fcbb86f2 100755 --- a/mods/plantlife_modpack/trunks/init.lua +++ b/mods/plantlife_modpack/trunks/init.lua @@ -13,5 +13,5 @@ dofile(minetest.get_modpath("trunks").."/nodes.lua") dofile(minetest.get_modpath("trunks").."/crafting.lua") ----------------------------------------------------------------------------------------------- -print("[Mod] "..title.." ["..version.."] ["..mname.."] Loaded...") ------------------------------------------------------------------------------------------------ \ No newline at end of file +minetest.log("action", "[Mod] "..title.." ["..version.."] ["..mname.."] Loaded...") +----------------------------------------------------------------------------------------------- diff --git a/mods/plantlife_modpack/vines/init.lua b/mods/plantlife_modpack/vines/init.lua index 72eda930..bf5694f5 100755 --- a/mods/plantlife_modpack/vines/init.lua +++ b/mods/plantlife_modpack/vines/init.lua @@ -11,4 +11,4 @@ dofile( minetest.get_modpath( vines.name ) .. "/nodes.lua" ) dofile( minetest.get_modpath( vines.name ) .. "/shear.lua" ) dofile( minetest.get_modpath( vines.name ) .. "/vines.lua" ) -print("[Vines] Loaded!") +minetest.log("action", "[Vines] Loaded!") diff --git a/mods/plantlife_modpack/woodsoils/init.lua b/mods/plantlife_modpack/woodsoils/init.lua index 9037d459..f52665f2 100755 --- a/mods/plantlife_modpack/woodsoils/init.lua +++ b/mods/plantlife_modpack/woodsoils/init.lua @@ -25,5 +25,5 @@ print("/____ >____/|__|____/____ >") print(" \\/ \\/")]] ----------------------------------------------------------------------------------------------- -print("[Mod] "..title.." ["..version.."] ["..mname.."] Loaded...") ------------------------------------------------------------------------------------------------ \ No newline at end of file +minetest.log("action", "[Mod] "..title.." ["..version.."] ["..mname.."] Loaded...") +----------------------------------------------------------------------------------------------- diff --git a/mods/random_messages/README.txt b/mods/random_messages/README.txt old mode 100644 new mode 100755 diff --git a/mods/random_messages/depends.txt b/mods/random_messages/depends.txt old mode 100644 new mode 100755 diff --git a/mods/random_messages/init.lua b/mods/random_messages/init.lua old mode 100644 new mode 100755 diff --git a/mods/returnmirror/README.txt b/mods/returnmirror/README.txt old mode 100644 new mode 100755 diff --git a/mods/returnmirror/depends.txt b/mods/returnmirror/depends.txt old mode 100644 new mode 100755 diff --git a/mods/returnmirror/description.txt b/mods/returnmirror/description.txt old mode 100644 new mode 100755 diff --git a/mods/returnmirror/init.lua b/mods/returnmirror/init.lua old mode 100644 new mode 100755 diff --git a/mods/returnmirror/sounds/returnmirror_set.ogg b/mods/returnmirror/sounds/returnmirror_set.ogg old mode 100644 new mode 100755 diff --git a/mods/returnmirror/sounds/returnmirror_teleport.ogg b/mods/returnmirror/sounds/returnmirror_teleport.ogg old mode 100644 new mode 100755 diff --git a/mods/returnmirror/textures/returnmirror_mirror_active.png b/mods/returnmirror/textures/returnmirror_mirror_active.png old mode 100644 new mode 100755 diff --git a/mods/returnmirror/textures/returnmirror_mirror_glass.png b/mods/returnmirror/textures/returnmirror_mirror_glass.png old mode 100644 new mode 100755 diff --git a/mods/returnmirror/textures/returnmirror_mirror_inactive.png b/mods/returnmirror/textures/returnmirror_mirror_inactive.png old mode 100644 new mode 100755 diff --git a/mods/returnmirror/textures/returnmirror_particle_arrival.png b/mods/returnmirror/textures/returnmirror_particle_arrival.png old mode 100644 new mode 100755 diff --git a/mods/returnmirror/textures/returnmirror_particle_departure.png b/mods/returnmirror/textures/returnmirror_particle_departure.png old mode 100644 new mode 100755 diff --git a/mods/riesenpilz/functions.lua b/mods/riesenpilz/functions.lua index 8b428692..6d554b40 100755 --- a/mods/riesenpilz/functions.lua +++ b/mods/riesenpilz/functions.lua @@ -7,7 +7,7 @@ if riesenpilz.info then else info = "[riesenpilz] "..msg end - print(info) + minetest.log("action", info) if riesenpilz.inform_all then minetest.chat_send_all(info) end diff --git a/mods/riesenpilz/mapgen.lua b/mods/riesenpilz/mapgen.lua index 6195c9c0..4738c12d 100755 --- a/mods/riesenpilz/mapgen.lua +++ b/mods/riesenpilz/mapgen.lua @@ -43,7 +43,7 @@ end local function find_ground(a,list) - for _,nam in ipairs(list) do + for _,nam in ipairs(list) do if a == nam then return true end @@ -157,7 +157,7 @@ minetest.register_on_generated(function(minp, maxp, seed) for p_pos in area:iterp(minp, maxp) do --remove tree stuff local d_p_pos = data[p_pos] - for _,nam in ipairs(c.TREE_STUFF) do + for _,nam in ipairs(c.TREE_STUFF) do if d_p_pos == nam then data[p_pos] = c.air break @@ -201,7 +201,7 @@ minetest.register_on_generated(function(minp, maxp, seed) for b = minp.y,maxp.y,1 do --remove usual stuff local p_pos = area:index(x, b, z) local d_p_pos = data[p_pos] - for _,nam in ipairs(c.USUAL_STUFF) do + for _,nam in ipairs(c.USUAL_STUFF) do if d_p_pos == nam then data[p_pos] = c.air break diff --git a/mods/riesenpilz/rest/ 😿 b/mods/riesenpilz/rest/ 😿 old mode 100644 new mode 100755 diff --git a/mods/riesenpilz/rest/cutting.ogg b/mods/riesenpilz/rest/cutting.ogg old mode 100644 new mode 100755 diff --git a/mods/riesenpilz/rest/frying.mp3 b/mods/riesenpilz/rest/frying.mp3 old mode 100644 new mode 100755 diff --git a/mods/riesenpilz/rest/info.txt b/mods/riesenpilz/rest/info.txt old mode 100644 new mode 100755 diff --git a/mods/riesenpilz/rest/smallhead.1.ogg b/mods/riesenpilz/rest/smallhead.1.ogg old mode 100644 new mode 100755 diff --git a/mods/riesenpilz/settings.lua b/mods/riesenpilz/settings.lua index 6c7a866e..5f636692 100755 --- a/mods/riesenpilz/settings.lua +++ b/mods/riesenpilz/settings.lua @@ -9,7 +9,7 @@ riesenpilz.always_generate = false riesenpilz.smooth = true --rarity in % -riesenpilz.mapgen_rarity = 0.1 +riesenpilz.mapgen_rarity = 0.25 -- Modif MFF (default = 1) --size of the generated... (has an effect to the rarity, too) riesenpilz.mapgen_size = 50 diff --git a/mods/riesenpilz/sounds/riesenpilz_head.0.ogg b/mods/riesenpilz/sounds/riesenpilz_head.0.ogg old mode 100644 new mode 100755 diff --git a/mods/riesenpilz/sounds/riesenpilz_head.1.ogg b/mods/riesenpilz/sounds/riesenpilz_head.1.ogg old mode 100644 new mode 100755 diff --git a/mods/riesenpilz/sounds/riesenpilz_head.2.ogg b/mods/riesenpilz/sounds/riesenpilz_head.2.ogg old mode 100644 new mode 100755 diff --git a/mods/riesenpilz/sounds/riesenpilz_stem.0.ogg b/mods/riesenpilz/sounds/riesenpilz_stem.0.ogg old mode 100644 new mode 100755 diff --git a/mods/riesenpilz/sounds/riesenpilz_stem.1.ogg b/mods/riesenpilz/sounds/riesenpilz_stem.1.ogg old mode 100644 new mode 100755 diff --git a/mods/riesenpilz/sounds/riesenpilz_stem.2.ogg b/mods/riesenpilz/sounds/riesenpilz_stem.2.ogg old mode 100644 new mode 100755 diff --git a/mods/riesenpilz/textures/riesenpilz_brown45_bottom.png b/mods/riesenpilz/textures/riesenpilz_brown45_bottom.png old mode 100644 new mode 100755 diff --git a/mods/riesenpilz/textures/riesenpilz_brown45_top.png b/mods/riesenpilz/textures/riesenpilz_brown45_top.png old mode 100644 new mode 100755 diff --git a/mods/riesenpilz/textures/riesenpilz_brown_side.png b/mods/riesenpilz/textures/riesenpilz_brown_side.png old mode 100644 new mode 100755 diff --git a/mods/riesenpilz/textures/riesenpilz_stem_white.png b/mods/riesenpilz/textures/riesenpilz_stem_white.png old mode 100644 new mode 100755 diff --git a/mods/riesenpilz/textures/riesenpilz_stem_white_normal.png b/mods/riesenpilz/textures/riesenpilz_stem_white_normal.png old mode 100644 new mode 100755 diff --git a/mods/runes/README.md b/mods/runes/README.md old mode 100644 new mode 100755 diff --git a/mods/runes/amulets.lua b/mods/runes/amulets.lua old mode 100644 new mode 100755 diff --git a/mods/runes/api.lua b/mods/runes/api.lua old mode 100644 new mode 100755 diff --git a/mods/runes/depends.txt b/mods/runes/depends.txt old mode 100644 new mode 100755 diff --git a/mods/runes/handlers.lua b/mods/runes/handlers.lua old mode 100644 new mode 100755 diff --git a/mods/runes/init.lua b/mods/runes/init.lua old mode 100644 new mode 100755 diff --git a/mods/runes/registration.lua b/mods/runes/registration.lua old mode 100644 new mode 100755 diff --git a/mods/runes/textures/runes_black_magic_block.png b/mods/runes/textures/runes_black_magic_block.png old mode 100644 new mode 100755 diff --git a/mods/runes/textures/runes_damaging_major.png b/mods/runes/textures/runes_damaging_major.png old mode 100644 new mode 100755 diff --git a/mods/runes/textures/runes_damaging_medium.png b/mods/runes/textures/runes_damaging_medium.png old mode 100644 new mode 100755 diff --git a/mods/runes/textures/runes_damaging_minor.png b/mods/runes/textures/runes_damaging_minor.png old mode 100644 new mode 100755 diff --git a/mods/runes/textures/runes_earthquake_major.png b/mods/runes/textures/runes_earthquake_major.png old mode 100644 new mode 100755 diff --git a/mods/runes/textures/runes_earthquake_medium.png b/mods/runes/textures/runes_earthquake_medium.png old mode 100644 new mode 100755 diff --git a/mods/runes/textures/runes_earthquake_minor.png b/mods/runes/textures/runes_earthquake_minor.png old mode 100644 new mode 100755 diff --git a/mods/runes/textures/runes_go_to_me_major.png b/mods/runes/textures/runes_go_to_me_major.png old mode 100644 new mode 100755 diff --git a/mods/runes/textures/runes_go_to_me_medium.png b/mods/runes/textures/runes_go_to_me_medium.png old mode 100644 new mode 100755 diff --git a/mods/runes/textures/runes_go_to_me_minor.png b/mods/runes/textures/runes_go_to_me_minor.png old mode 100644 new mode 100755 diff --git a/mods/runes/textures/runes_heal_major.png b/mods/runes/textures/runes_heal_major.png old mode 100644 new mode 100755 diff --git a/mods/runes/textures/runes_heal_medium.png b/mods/runes/textures/runes_heal_medium.png old mode 100644 new mode 100755 diff --git a/mods/runes/textures/runes_heal_minor.png b/mods/runes/textures/runes_heal_minor.png old mode 100644 new mode 100755 diff --git a/mods/runes/textures/runes_megamana_majorsang.png b/mods/runes/textures/runes_megamana_majorsang.png old mode 100644 new mode 100755 diff --git a/mods/runes/textures/runes_megamana_medium.png b/mods/runes/textures/runes_megamana_medium.png old mode 100644 new mode 100755 diff --git a/mods/runes/textures/runes_megamana_minor.png b/mods/runes/textures/runes_megamana_minor.png old mode 100644 new mode 100755 diff --git a/mods/screwdriver/init.lua b/mods/screwdriver/init.lua index b2249d87..5a483c05 100755 --- a/mods/screwdriver/init.lua +++ b/mods/screwdriver/init.lua @@ -106,11 +106,11 @@ minetest.register_tool("screwdriver:screwdriver_perfect", { description = "Perfect Screwdriver (left-click rotates face, right-click rotates axis)", inventory_image = "screwdriver_perfect.png", on_use = function(itemstack, user, pointed_thing) - screwdriver_handler(itemstack, user, pointed_thing, ROTATE_FACE) + screwdriver_handler(itemstack, user, pointed_thing, screwdriver.ROTATE_FACE) return itemstack end, on_place = function(itemstack, user, pointed_thing) - screwdriver_handler(itemstack, user, pointed_thing, ROTATE_AXIS) + screwdriver_handler(itemstack, user, pointed_thing, screwdriver.ROTATE_AXIS) return itemstack end, }) diff --git a/mods/screwdriver/textures/screwdriver_perfect.png b/mods/screwdriver/textures/screwdriver_perfect.png old mode 100644 new mode 100755 diff --git a/mods/shutdown/init.lua b/mods/shutdown/init.lua old mode 100644 new mode 100755 diff --git a/mods/snow/other_textures/connected_textures_ice.png b/mods/snow/other_textures/connected_textures_ice.png old mode 100644 new mode 100755 diff --git a/mods/snow/other_textures/default_ice.png b/mods/snow/other_textures/default_ice.png old mode 100644 new mode 100755 diff --git a/mods/snow/other_textures/default_ice.xcf b/mods/snow/other_textures/default_ice.xcf old mode 100644 new mode 100755 diff --git a/mods/snow/other_textures/inkscape_default_ice.svg b/mods/snow/other_textures/inkscape_default_ice.svg old mode 100644 new mode 100755 diff --git a/mods/snow/other_textures/mocha.png b/mods/snow/other_textures/mocha.png old mode 100644 new mode 100755 diff --git a/mods/snow/other_textures/mocha.xcf b/mods/snow/other_textures/mocha.xcf old mode 100644 new mode 100755 diff --git a/mods/snow/other_textures/original_snow_snow_brick.png b/mods/snow/other_textures/original_snow_snow_brick.png old mode 100644 new mode 100755 diff --git a/mods/snow/other_textures/rect2985.png b/mods/snow/other_textures/rect2985.png old mode 100644 new mode 100755 diff --git a/mods/snow/other_textures/snow_ice.png b/mods/snow/other_textures/snow_ice.png old mode 100644 new mode 100755 diff --git a/mods/snow/other_textures/snow_needles_decorated_animated.xcf b/mods/snow/other_textures/snow_needles_decorated_animated.xcf old mode 100644 new mode 100755 diff --git a/mods/snow/other_textures/snow_snow.png b/mods/snow/other_textures/snow_snow.png old mode 100644 new mode 100755 diff --git a/mods/snow/other_textures/snow_snow_brick.xcf b/mods/snow/other_textures/snow_snow_brick.xcf old mode 100644 new mode 100755 diff --git a/mods/snow/other_textures/snow_snow_brick_lazyJ.png b/mods/snow/other_textures/snow_snow_brick_lazyJ.png old mode 100644 new mode 100755 diff --git a/mods/snow/other_textures/snow_snow_cobble.png_01 b/mods/snow/other_textures/snow_snow_cobble.png_01 old mode 100644 new mode 100755 diff --git a/mods/snow/other_textures/snow_snow_cobble.xcf b/mods/snow/other_textures/snow_snow_cobble.xcf old mode 100644 new mode 100755 diff --git a/mods/snow/other_textures/snow_snow_side.png b/mods/snow/other_textures/snow_snow_side.png old mode 100644 new mode 100755 diff --git a/mods/snow/other_textures/snow_snowball.png b/mods/snow/other_textures/snow_snowball.png old mode 100644 new mode 100755 diff --git a/mods/snow/other_textures/snow_snowfall.png b/mods/snow/other_textures/snow_snowfall.png old mode 100644 new mode 100755 diff --git a/mods/snow/other_textures/snow_star_lit.xcf b/mods/snow/other_textures/snow_star_lit.xcf old mode 100644 new mode 100755 diff --git a/mods/snow/other_textures/xdefault_cobble.png b/mods/snow/other_textures/xdefault_cobble.png old mode 100644 new mode 100755 diff --git a/mods/snow/other_textures/xdefault_furnace_bottom.png b/mods/snow/other_textures/xdefault_furnace_bottom.png old mode 100644 new mode 100755 diff --git a/mods/snow/other_textures/xdefault_furnace_fire_bg.png b/mods/snow/other_textures/xdefault_furnace_fire_bg.png old mode 100644 new mode 100755 diff --git a/mods/snow/other_textures/xdefault_furnace_fire_fg.png b/mods/snow/other_textures/xdefault_furnace_fire_fg.png old mode 100644 new mode 100755 diff --git a/mods/snow/other_textures/xdefault_furnace_front.png b/mods/snow/other_textures/xdefault_furnace_front.png old mode 100644 new mode 100755 diff --git a/mods/snow/other_textures/xdefault_furnace_front_active.png b/mods/snow/other_textures/xdefault_furnace_front_active.png old mode 100644 new mode 100755 diff --git a/mods/snow/other_textures/xdefault_furnace_side.png b/mods/snow/other_textures/xdefault_furnace_side.png old mode 100644 new mode 100755 diff --git a/mods/snow/other_textures/xdefault_furnace_top.png b/mods/snow/other_textures/xdefault_furnace_top.png old mode 100644 new mode 100755 diff --git a/mods/snow/other_textures/xdefault_glass.png b/mods/snow/other_textures/xdefault_glass.png old mode 100644 new mode 100755 diff --git a/mods/snow/other_textures/xdefault_ice.png b/mods/snow/other_textures/xdefault_ice.png old mode 100644 new mode 100755 diff --git a/mods/snow/other_textures/xdefault_ice.xcf b/mods/snow/other_textures/xdefault_ice.xcf old mode 100644 new mode 100755 diff --git a/mods/snow/other_textures/xdefault_snow.png b/mods/snow/other_textures/xdefault_snow.png old mode 100644 new mode 100755 diff --git a/mods/snow/other_textures/xdefault_stone_brick.png b/mods/snow/other_textures/xdefault_stone_brick.png old mode 100644 new mode 100755 diff --git a/mods/snow/schematics/pine.mts b/mods/snow/schematics/pine.mts old mode 100644 new mode 100755 diff --git a/mods/snow/textures/character_snow_man.png b/mods/snow/textures/character_snow_man.png old mode 100644 new mode 100755 diff --git a/mods/snow/textures/character_snow_man_preview.png b/mods/snow/textures/character_snow_man_preview.png old mode 100644 new mode 100755 diff --git a/mods/snow/textures/character_snow_man_preview_back.png b/mods/snow/textures/character_snow_man_preview_back.png old mode 100644 new mode 100755 diff --git a/mods/snow/textures/default_ice.png b/mods/snow/textures/default_ice.png old mode 100644 new mode 100755 diff --git a/mods/snow/textures/default_ice.xcf b/mods/snow/textures/default_ice.xcf old mode 100644 new mode 100755 diff --git a/mods/snow/textures/inkscape_default_ice.svg b/mods/snow/textures/inkscape_default_ice.svg old mode 100644 new mode 100755 diff --git a/mods/snow/textures/snow_ice.png b/mods/snow/textures/snow_ice.png old mode 100644 new mode 100755 diff --git a/mods/snow/textures/snow_moss.png b/mods/snow/textures/snow_moss.png old mode 100644 new mode 100755 diff --git a/mods/snow/textures/snow_needles.png b/mods/snow/textures/snow_needles.png old mode 100644 new mode 100755 diff --git a/mods/snow/textures/snow_needles_decorated.png b/mods/snow/textures/snow_needles_decorated.png old mode 100644 new mode 100755 diff --git a/mods/snow/textures/snow_needles_decorated_animated.png b/mods/snow/textures/snow_needles_decorated_animated.png old mode 100644 new mode 100755 diff --git a/mods/snow/textures/snow_sapling_pine.png b/mods/snow/textures/snow_sapling_pine.png old mode 100644 new mode 100755 diff --git a/mods/snow/textures/snow_sled.png b/mods/snow/textures/snow_sled.png old mode 100644 new mode 100755 diff --git a/mods/snow/textures/snow_snow_brick.png b/mods/snow/textures/snow_snow_brick.png old mode 100644 new mode 100755 diff --git a/mods/snow/textures/snow_snow_cobble.png b/mods/snow/textures/snow_snow_cobble.png old mode 100644 new mode 100755 diff --git a/mods/snow/textures/snow_snowball.png b/mods/snow/textures/snow_snowball.png old mode 100644 new mode 100755 diff --git a/mods/snow/textures/snow_snowfall.png b/mods/snow/textures/snow_snowfall.png old mode 100644 new mode 100755 diff --git a/mods/snow/textures/snow_star.png b/mods/snow/textures/snow_star.png old mode 100644 new mode 100755 diff --git a/mods/snow/textures/snow_star_lit.png b/mods/snow/textures/snow_star_lit.png old mode 100644 new mode 100755 diff --git a/mods/snow/textures/snow_star_lit.xcf b/mods/snow/textures/snow_star_lit.xcf old mode 100644 new mode 100755 diff --git a/mods/snow/textures/snow_xmas_tree.png b/mods/snow/textures/snow_xmas_tree.png old mode 100644 new mode 100755 diff --git a/mods/snow/textures/weather_snow.png b/mods/snow/textures/weather_snow.png old mode 100644 new mode 100755 diff --git a/mods/solarmana/LICENSE b/mods/solarmana/LICENSE old mode 100644 new mode 100755 diff --git a/mods/solarmana/README.txt b/mods/solarmana/README.txt old mode 100644 new mode 100755 diff --git a/mods/solarmana/depends.txt b/mods/solarmana/depends.txt old mode 100644 new mode 100755 diff --git a/mods/solarmana/description.txt b/mods/solarmana/description.txt old mode 100644 new mode 100755 diff --git a/mods/solarmana/init.lua b/mods/solarmana/init.lua old mode 100644 new mode 100755 index caa38c21..d7e32254 --- a/mods/solarmana/init.lua +++ b/mods/solarmana/init.lua @@ -67,7 +67,7 @@ minetest.register_globalstep(function(dtime) local regen_to = 0 -- simplest version checks for "full sunlight now" - if light_now >= 15 then + if light_now >= 14 then regen_to = 1 end diff --git a/mods/soundset/depends.txt b/mods/soundset/depends.txt old mode 100644 new mode 100755 diff --git a/mods/soundset/init.lua b/mods/soundset/init.lua old mode 100644 new mode 100755 diff --git a/mods/soundset/readme.txt b/mods/soundset/readme.txt old mode 100644 new mode 100755 diff --git a/mods/soundset/textures/soundset_dec.png b/mods/soundset/textures/soundset_dec.png old mode 100644 new mode 100755 diff --git a/mods/soundset/textures/soundset_inc.png b/mods/soundset/textures/soundset_inc.png old mode 100644 new mode 100755 diff --git a/mods/soundset/textures/soundset_menu_icon.png b/mods/soundset/textures/soundset_menu_icon.png old mode 100644 new mode 100755 diff --git a/mods/sprint/depends.txt b/mods/sprint/depends.txt old mode 100644 new mode 100755 diff --git a/mods/sprint/textures/sprint_particle.png b/mods/sprint/textures/sprint_particle.png old mode 100644 new mode 100755 diff --git a/mods/sprint/textures/sprint_stamina_bar.png b/mods/sprint/textures/sprint_stamina_bar.png old mode 100644 new mode 100755 diff --git a/mods/stained_glass/init.lua b/mods/stained_glass/init.lua index 53a248ad..08e647fa 100755 --- a/mods/stained_glass/init.lua +++ b/mods/stained_glass/init.lua @@ -289,7 +289,7 @@ for h = 1, 12 do end --hues -print("[stained_glass] Loaded!") +minetest.log("action", "[stained_glass] Loaded!") diff --git a/mods/stained_glass/textures/stained_glass_aqua_detail.png b/mods/stained_glass/textures/stained_glass_aqua_detail.png old mode 100644 new mode 100755 diff --git a/mods/stained_glass/textures/stained_glass_aqua_s50_detail.png b/mods/stained_glass/textures/stained_glass_aqua_s50_detail.png old mode 100644 new mode 100755 diff --git a/mods/stained_glass/textures/stained_glass_blue_detail.png b/mods/stained_glass/textures/stained_glass_blue_detail.png old mode 100644 new mode 100755 diff --git a/mods/stained_glass/textures/stained_glass_blue_s50_detail.png b/mods/stained_glass/textures/stained_glass_blue_s50_detail.png old mode 100644 new mode 100755 diff --git a/mods/stained_glass/textures/stained_glass_cyan_detail.png b/mods/stained_glass/textures/stained_glass_cyan_detail.png old mode 100644 new mode 100755 diff --git a/mods/stained_glass/textures/stained_glass_cyan_s50_detail.png b/mods/stained_glass/textures/stained_glass_cyan_s50_detail.png old mode 100644 new mode 100755 diff --git a/mods/stained_glass/textures/stained_glass_dark_aqua_detail.png b/mods/stained_glass/textures/stained_glass_dark_aqua_detail.png old mode 100644 new mode 100755 diff --git a/mods/stained_glass/textures/stained_glass_dark_aqua_s50_detail.png b/mods/stained_glass/textures/stained_glass_dark_aqua_s50_detail.png old mode 100644 new mode 100755 diff --git a/mods/stained_glass/textures/stained_glass_dark_blue_detail.png b/mods/stained_glass/textures/stained_glass_dark_blue_detail.png old mode 100644 new mode 100755 diff --git a/mods/stained_glass/textures/stained_glass_dark_blue_s50_detail.png b/mods/stained_glass/textures/stained_glass_dark_blue_s50_detail.png old mode 100644 new mode 100755 diff --git a/mods/stained_glass/textures/stained_glass_dark_cyan_detail.png b/mods/stained_glass/textures/stained_glass_dark_cyan_detail.png old mode 100644 new mode 100755 diff --git a/mods/stained_glass/textures/stained_glass_dark_cyan_s50_detail.png b/mods/stained_glass/textures/stained_glass_dark_cyan_s50_detail.png old mode 100644 new mode 100755 diff --git a/mods/stained_glass/textures/stained_glass_dark_green_detail.png b/mods/stained_glass/textures/stained_glass_dark_green_detail.png old mode 100644 new mode 100755 diff --git a/mods/stained_glass/textures/stained_glass_dark_green_s50_detail.png b/mods/stained_glass/textures/stained_glass_dark_green_s50_detail.png old mode 100644 new mode 100755 diff --git a/mods/stained_glass/textures/stained_glass_dark_lime_detail.png b/mods/stained_glass/textures/stained_glass_dark_lime_detail.png old mode 100644 new mode 100755 diff --git a/mods/stained_glass/textures/stained_glass_dark_lime_s50_detail.png b/mods/stained_glass/textures/stained_glass_dark_lime_s50_detail.png old mode 100644 new mode 100755 diff --git a/mods/stained_glass/textures/stained_glass_dark_magenta_detail.png b/mods/stained_glass/textures/stained_glass_dark_magenta_detail.png old mode 100644 new mode 100755 diff --git a/mods/stained_glass/textures/stained_glass_dark_magenta_s50_detail.png b/mods/stained_glass/textures/stained_glass_dark_magenta_s50_detail.png old mode 100644 new mode 100755 diff --git a/mods/stained_glass/textures/stained_glass_dark_orange_detail.png b/mods/stained_glass/textures/stained_glass_dark_orange_detail.png old mode 100644 new mode 100755 diff --git a/mods/stained_glass/textures/stained_glass_dark_orange_s50_detail.png b/mods/stained_glass/textures/stained_glass_dark_orange_s50_detail.png old mode 100644 new mode 100755 diff --git a/mods/stained_glass/textures/stained_glass_dark_red_detail.png b/mods/stained_glass/textures/stained_glass_dark_red_detail.png old mode 100644 new mode 100755 diff --git a/mods/stained_glass/textures/stained_glass_dark_red_s50_detail.png b/mods/stained_glass/textures/stained_glass_dark_red_s50_detail.png old mode 100644 new mode 100755 diff --git a/mods/stained_glass/textures/stained_glass_dark_redviolet_detail.png b/mods/stained_glass/textures/stained_glass_dark_redviolet_detail.png old mode 100644 new mode 100755 diff --git a/mods/stained_glass/textures/stained_glass_dark_redviolet_s50_detail.png b/mods/stained_glass/textures/stained_glass_dark_redviolet_s50_detail.png old mode 100644 new mode 100755 diff --git a/mods/stained_glass/textures/stained_glass_dark_skyblue_detail.png b/mods/stained_glass/textures/stained_glass_dark_skyblue_detail.png old mode 100644 new mode 100755 diff --git a/mods/stained_glass/textures/stained_glass_dark_skyblue_s50_detail.png b/mods/stained_glass/textures/stained_glass_dark_skyblue_s50_detail.png old mode 100644 new mode 100755 diff --git a/mods/stained_glass/textures/stained_glass_dark_violet_detail.png b/mods/stained_glass/textures/stained_glass_dark_violet_detail.png old mode 100644 new mode 100755 diff --git a/mods/stained_glass/textures/stained_glass_dark_violet_s50_detail.png b/mods/stained_glass/textures/stained_glass_dark_violet_s50_detail.png old mode 100644 new mode 100755 diff --git a/mods/stained_glass/textures/stained_glass_dark_yellow_detail.png b/mods/stained_glass/textures/stained_glass_dark_yellow_detail.png old mode 100644 new mode 100755 diff --git a/mods/stained_glass/textures/stained_glass_dark_yellow_s50_detail.png b/mods/stained_glass/textures/stained_glass_dark_yellow_s50_detail.png old mode 100644 new mode 100755 diff --git a/mods/stained_glass/textures/stained_glass_faint_aqua_detail.png b/mods/stained_glass/textures/stained_glass_faint_aqua_detail.png old mode 100644 new mode 100755 diff --git a/mods/stained_glass/textures/stained_glass_faint_blue_detail.png b/mods/stained_glass/textures/stained_glass_faint_blue_detail.png old mode 100644 new mode 100755 diff --git a/mods/stained_glass/textures/stained_glass_faint_cyan_detail.png b/mods/stained_glass/textures/stained_glass_faint_cyan_detail.png old mode 100644 new mode 100755 diff --git a/mods/stained_glass/textures/stained_glass_faint_green_detail.png b/mods/stained_glass/textures/stained_glass_faint_green_detail.png old mode 100644 new mode 100755 diff --git a/mods/stained_glass/textures/stained_glass_faint_lime_detail.png b/mods/stained_glass/textures/stained_glass_faint_lime_detail.png old mode 100644 new mode 100755 diff --git a/mods/stained_glass/textures/stained_glass_faint_magenta_detail.png b/mods/stained_glass/textures/stained_glass_faint_magenta_detail.png old mode 100644 new mode 100755 diff --git a/mods/stained_glass/textures/stained_glass_faint_orange_detail.png b/mods/stained_glass/textures/stained_glass_faint_orange_detail.png old mode 100644 new mode 100755 diff --git a/mods/stained_glass/textures/stained_glass_faint_red_detail.png b/mods/stained_glass/textures/stained_glass_faint_red_detail.png old mode 100644 new mode 100755 diff --git a/mods/stained_glass/textures/stained_glass_faint_redviolet_detail.png b/mods/stained_glass/textures/stained_glass_faint_redviolet_detail.png old mode 100644 new mode 100755 diff --git a/mods/stained_glass/textures/stained_glass_faint_skyblue_detail.png b/mods/stained_glass/textures/stained_glass_faint_skyblue_detail.png old mode 100644 new mode 100755 diff --git a/mods/stained_glass/textures/stained_glass_faint_violet_detail.png b/mods/stained_glass/textures/stained_glass_faint_violet_detail.png old mode 100644 new mode 100755 diff --git a/mods/stained_glass/textures/stained_glass_faint_yellow_detail.png b/mods/stained_glass/textures/stained_glass_faint_yellow_detail.png old mode 100644 new mode 100755 diff --git a/mods/stained_glass/textures/stained_glass_green_detail.png b/mods/stained_glass/textures/stained_glass_green_detail.png old mode 100644 new mode 100755 diff --git a/mods/stained_glass/textures/stained_glass_green_s50_detail.png b/mods/stained_glass/textures/stained_glass_green_s50_detail.png old mode 100644 new mode 100755 diff --git a/mods/stained_glass/textures/stained_glass_light_aqua_detail.png b/mods/stained_glass/textures/stained_glass_light_aqua_detail.png old mode 100644 new mode 100755 diff --git a/mods/stained_glass/textures/stained_glass_light_blue_detail.png b/mods/stained_glass/textures/stained_glass_light_blue_detail.png old mode 100644 new mode 100755 diff --git a/mods/stained_glass/textures/stained_glass_light_cyan_detail.png b/mods/stained_glass/textures/stained_glass_light_cyan_detail.png old mode 100644 new mode 100755 diff --git a/mods/stained_glass/textures/stained_glass_light_green_detail.png b/mods/stained_glass/textures/stained_glass_light_green_detail.png old mode 100644 new mode 100755 diff --git a/mods/stained_glass/textures/stained_glass_light_lime_detail.png b/mods/stained_glass/textures/stained_glass_light_lime_detail.png old mode 100644 new mode 100755 diff --git a/mods/stained_glass/textures/stained_glass_light_magenta_detail.png b/mods/stained_glass/textures/stained_glass_light_magenta_detail.png old mode 100644 new mode 100755 diff --git a/mods/stained_glass/textures/stained_glass_light_orange_detail.png b/mods/stained_glass/textures/stained_glass_light_orange_detail.png old mode 100644 new mode 100755 diff --git a/mods/stained_glass/textures/stained_glass_light_red_detail.png b/mods/stained_glass/textures/stained_glass_light_red_detail.png old mode 100644 new mode 100755 diff --git a/mods/stained_glass/textures/stained_glass_light_redviolet_detail.png b/mods/stained_glass/textures/stained_glass_light_redviolet_detail.png old mode 100644 new mode 100755 diff --git a/mods/stained_glass/textures/stained_glass_light_skyblue_detail.png b/mods/stained_glass/textures/stained_glass_light_skyblue_detail.png old mode 100644 new mode 100755 diff --git a/mods/stained_glass/textures/stained_glass_light_violet_detail.png b/mods/stained_glass/textures/stained_glass_light_violet_detail.png old mode 100644 new mode 100755 diff --git a/mods/stained_glass/textures/stained_glass_light_yellow_detail.png b/mods/stained_glass/textures/stained_glass_light_yellow_detail.png old mode 100644 new mode 100755 diff --git a/mods/stained_glass/textures/stained_glass_lime_detail.png b/mods/stained_glass/textures/stained_glass_lime_detail.png old mode 100644 new mode 100755 diff --git a/mods/stained_glass/textures/stained_glass_lime_s50_detail.png b/mods/stained_glass/textures/stained_glass_lime_s50_detail.png old mode 100644 new mode 100755 diff --git a/mods/stained_glass/textures/stained_glass_magenta_detail.png b/mods/stained_glass/textures/stained_glass_magenta_detail.png old mode 100644 new mode 100755 diff --git a/mods/stained_glass/textures/stained_glass_magenta_s50_detail.png b/mods/stained_glass/textures/stained_glass_magenta_s50_detail.png old mode 100644 new mode 100755 diff --git a/mods/stained_glass/textures/stained_glass_medium_aqua_detail.png b/mods/stained_glass/textures/stained_glass_medium_aqua_detail.png old mode 100644 new mode 100755 diff --git a/mods/stained_glass/textures/stained_glass_medium_aqua_s50_detail.png b/mods/stained_glass/textures/stained_glass_medium_aqua_s50_detail.png old mode 100644 new mode 100755 diff --git a/mods/stained_glass/textures/stained_glass_medium_blue_detail.png b/mods/stained_glass/textures/stained_glass_medium_blue_detail.png old mode 100644 new mode 100755 diff --git a/mods/stained_glass/textures/stained_glass_medium_blue_s50_detail.png b/mods/stained_glass/textures/stained_glass_medium_blue_s50_detail.png old mode 100644 new mode 100755 diff --git a/mods/stained_glass/textures/stained_glass_medium_cyan_detail.png b/mods/stained_glass/textures/stained_glass_medium_cyan_detail.png old mode 100644 new mode 100755 diff --git a/mods/stained_glass/textures/stained_glass_medium_cyan_s50_detail.png b/mods/stained_glass/textures/stained_glass_medium_cyan_s50_detail.png old mode 100644 new mode 100755 diff --git a/mods/stained_glass/textures/stained_glass_medium_green_detail.png b/mods/stained_glass/textures/stained_glass_medium_green_detail.png old mode 100644 new mode 100755 diff --git a/mods/stained_glass/textures/stained_glass_medium_green_s50_detail.png b/mods/stained_glass/textures/stained_glass_medium_green_s50_detail.png old mode 100644 new mode 100755 diff --git a/mods/stained_glass/textures/stained_glass_medium_lime_detail.png b/mods/stained_glass/textures/stained_glass_medium_lime_detail.png old mode 100644 new mode 100755 diff --git a/mods/stained_glass/textures/stained_glass_medium_lime_s50_detail.png b/mods/stained_glass/textures/stained_glass_medium_lime_s50_detail.png old mode 100644 new mode 100755 diff --git a/mods/stained_glass/textures/stained_glass_medium_magenta_detail.png b/mods/stained_glass/textures/stained_glass_medium_magenta_detail.png old mode 100644 new mode 100755 diff --git a/mods/stained_glass/textures/stained_glass_medium_magenta_s50_detail.png b/mods/stained_glass/textures/stained_glass_medium_magenta_s50_detail.png old mode 100644 new mode 100755 diff --git a/mods/stained_glass/textures/stained_glass_medium_orange_detail.png b/mods/stained_glass/textures/stained_glass_medium_orange_detail.png old mode 100644 new mode 100755 diff --git a/mods/stained_glass/textures/stained_glass_medium_orange_s50_detail.png b/mods/stained_glass/textures/stained_glass_medium_orange_s50_detail.png old mode 100644 new mode 100755 diff --git a/mods/stained_glass/textures/stained_glass_medium_red_detail.png b/mods/stained_glass/textures/stained_glass_medium_red_detail.png old mode 100644 new mode 100755 diff --git a/mods/stained_glass/textures/stained_glass_medium_red_s50_detail.png b/mods/stained_glass/textures/stained_glass_medium_red_s50_detail.png old mode 100644 new mode 100755 diff --git a/mods/stained_glass/textures/stained_glass_medium_redviolet_detail.png b/mods/stained_glass/textures/stained_glass_medium_redviolet_detail.png old mode 100644 new mode 100755 diff --git a/mods/stained_glass/textures/stained_glass_medium_redviolet_s50_detail.png b/mods/stained_glass/textures/stained_glass_medium_redviolet_s50_detail.png old mode 100644 new mode 100755 diff --git a/mods/stained_glass/textures/stained_glass_medium_skyblue_detail.png b/mods/stained_glass/textures/stained_glass_medium_skyblue_detail.png old mode 100644 new mode 100755 diff --git a/mods/stained_glass/textures/stained_glass_medium_skyblue_s50_detail.png b/mods/stained_glass/textures/stained_glass_medium_skyblue_s50_detail.png old mode 100644 new mode 100755 diff --git a/mods/stained_glass/textures/stained_glass_medium_violet_detail.png b/mods/stained_glass/textures/stained_glass_medium_violet_detail.png old mode 100644 new mode 100755 diff --git a/mods/stained_glass/textures/stained_glass_medium_violet_s50_detail.png b/mods/stained_glass/textures/stained_glass_medium_violet_s50_detail.png old mode 100644 new mode 100755 diff --git a/mods/stained_glass/textures/stained_glass_medium_yellow_detail.png b/mods/stained_glass/textures/stained_glass_medium_yellow_detail.png old mode 100644 new mode 100755 diff --git a/mods/stained_glass/textures/stained_glass_medium_yellow_s50_detail.png b/mods/stained_glass/textures/stained_glass_medium_yellow_s50_detail.png old mode 100644 new mode 100755 diff --git a/mods/stained_glass/textures/stained_glass_orange_detail.png b/mods/stained_glass/textures/stained_glass_orange_detail.png old mode 100644 new mode 100755 diff --git a/mods/stained_glass/textures/stained_glass_orange_s50_detail.png b/mods/stained_glass/textures/stained_glass_orange_s50_detail.png old mode 100644 new mode 100755 diff --git a/mods/stained_glass/textures/stained_glass_pastel_aqua_detail.png b/mods/stained_glass/textures/stained_glass_pastel_aqua_detail.png old mode 100644 new mode 100755 diff --git a/mods/stained_glass/textures/stained_glass_pastel_blue_detail.png b/mods/stained_glass/textures/stained_glass_pastel_blue_detail.png old mode 100644 new mode 100755 diff --git a/mods/stained_glass/textures/stained_glass_pastel_cyan_detail.png b/mods/stained_glass/textures/stained_glass_pastel_cyan_detail.png old mode 100644 new mode 100755 diff --git a/mods/stained_glass/textures/stained_glass_pastel_green_detail.png b/mods/stained_glass/textures/stained_glass_pastel_green_detail.png old mode 100644 new mode 100755 diff --git a/mods/stained_glass/textures/stained_glass_pastel_lime_detail.png b/mods/stained_glass/textures/stained_glass_pastel_lime_detail.png old mode 100644 new mode 100755 diff --git a/mods/stained_glass/textures/stained_glass_pastel_magenta_detail.png b/mods/stained_glass/textures/stained_glass_pastel_magenta_detail.png old mode 100644 new mode 100755 diff --git a/mods/stained_glass/textures/stained_glass_pastel_orange_detail.png b/mods/stained_glass/textures/stained_glass_pastel_orange_detail.png old mode 100644 new mode 100755 diff --git a/mods/stained_glass/textures/stained_glass_pastel_red_detail.png b/mods/stained_glass/textures/stained_glass_pastel_red_detail.png old mode 100644 new mode 100755 diff --git a/mods/stained_glass/textures/stained_glass_pastel_redviolet_detail.png b/mods/stained_glass/textures/stained_glass_pastel_redviolet_detail.png old mode 100644 new mode 100755 diff --git a/mods/stained_glass/textures/stained_glass_pastel_skyblue_detail.png b/mods/stained_glass/textures/stained_glass_pastel_skyblue_detail.png old mode 100644 new mode 100755 diff --git a/mods/stained_glass/textures/stained_glass_pastel_violet_detail.png b/mods/stained_glass/textures/stained_glass_pastel_violet_detail.png old mode 100644 new mode 100755 diff --git a/mods/stained_glass/textures/stained_glass_pastel_yellow_detail.png b/mods/stained_glass/textures/stained_glass_pastel_yellow_detail.png old mode 100644 new mode 100755 diff --git a/mods/stained_glass/textures/stained_glass_red_detail.png b/mods/stained_glass/textures/stained_glass_red_detail.png old mode 100644 new mode 100755 diff --git a/mods/stained_glass/textures/stained_glass_red_s50_detail.png b/mods/stained_glass/textures/stained_glass_red_s50_detail.png old mode 100644 new mode 100755 diff --git a/mods/stained_glass/textures/stained_glass_redviolet_detail.png b/mods/stained_glass/textures/stained_glass_redviolet_detail.png old mode 100644 new mode 100755 diff --git a/mods/stained_glass/textures/stained_glass_redviolet_s50_detail.png b/mods/stained_glass/textures/stained_glass_redviolet_s50_detail.png old mode 100644 new mode 100755 diff --git a/mods/stained_glass/textures/stained_glass_skyblue_detail.png b/mods/stained_glass/textures/stained_glass_skyblue_detail.png old mode 100644 new mode 100755 diff --git a/mods/stained_glass/textures/stained_glass_skyblue_s50_detail.png b/mods/stained_glass/textures/stained_glass_skyblue_s50_detail.png old mode 100644 new mode 100755 diff --git a/mods/stained_glass/textures/stained_glass_violet_detail.png b/mods/stained_glass/textures/stained_glass_violet_detail.png old mode 100644 new mode 100755 diff --git a/mods/stained_glass/textures/stained_glass_violet_s50_detail.png b/mods/stained_glass/textures/stained_glass_violet_s50_detail.png old mode 100644 new mode 100755 diff --git a/mods/stained_glass/textures/stained_glass_yellow_detail.png b/mods/stained_glass/textures/stained_glass_yellow_detail.png old mode 100644 new mode 100755 diff --git a/mods/stained_glass/textures/stained_glass_yellow_s50_detail.png b/mods/stained_glass/textures/stained_glass_yellow_s50_detail.png old mode 100644 new mode 100755 diff --git a/mods/treasurer/GROUPS_AND_PRECIOUSNESS b/mods/treasurer/GROUPS_AND_PRECIOUSNESS old mode 100644 new mode 100755 diff --git a/mods/treasurer/README.md b/mods/treasurer/README.md old mode 100644 new mode 100755 diff --git a/mods/treasurer/Treasurer_ANNOUNCEMENT b/mods/treasurer/Treasurer_ANNOUNCEMENT old mode 100644 new mode 100755 diff --git a/mods/treasurer/depends.txt b/mods/treasurer/depends.txt old mode 100644 new mode 100755 diff --git a/mods/treasurer/descripton.txt b/mods/treasurer/descripton.txt old mode 100644 new mode 100755 diff --git a/mods/treasurer/init.lua b/mods/treasurer/init.lua old mode 100644 new mode 100755 diff --git a/mods/trm_pyramids/depends.txt b/mods/trm_pyramids/depends.txt old mode 100644 new mode 100755 diff --git a/mods/trm_pyramids/init.lua b/mods/trm_pyramids/init.lua old mode 100644 new mode 100755 diff --git a/mods/trm_pyramids/more_trms.lua b/mods/trm_pyramids/more_trms.lua old mode 100644 new mode 100755 diff --git a/mods/tsm_pyramids/.gitattributes b/mods/tsm_pyramids/.gitattributes old mode 100644 new mode 100755 diff --git a/mods/tsm_pyramids/.gitignore b/mods/tsm_pyramids/.gitignore old mode 100644 new mode 100755 diff --git a/mods/tsm_pyramids/README.txt b/mods/tsm_pyramids/README.txt old mode 100644 new mode 100755 diff --git a/mods/tsm_pyramids/depends.txt b/mods/tsm_pyramids/depends.txt old mode 100644 new mode 100755 diff --git a/mods/tsm_pyramids/init.lua b/mods/tsm_pyramids/init.lua old mode 100644 new mode 100755 diff --git a/mods/tsm_pyramids/models/tsm_pyramids_hit.png b/mods/tsm_pyramids/models/tsm_pyramids_hit.png old mode 100644 new mode 100755 diff --git a/mods/tsm_pyramids/models/tsm_pyramids_mummy.png b/mods/tsm_pyramids/models/tsm_pyramids_mummy.png old mode 100644 new mode 100755 diff --git a/mods/tsm_pyramids/models/tsm_pyramids_mummy.x b/mods/tsm_pyramids/models/tsm_pyramids_mummy.x old mode 100644 new mode 100755 diff --git a/mods/tsm_pyramids/mummy.lua b/mods/tsm_pyramids/mummy.lua old mode 100644 new mode 100755 diff --git a/mods/tsm_pyramids/nodes.lua b/mods/tsm_pyramids/nodes.lua old mode 100644 new mode 100755 diff --git a/mods/tsm_pyramids/room.lua b/mods/tsm_pyramids/room.lua old mode 100644 new mode 100755 diff --git a/mods/tsm_pyramids/sounds/mummy.1.ogg b/mods/tsm_pyramids/sounds/mummy.1.ogg old mode 100644 new mode 100755 diff --git a/mods/tsm_pyramids/sounds/mummy.2.ogg b/mods/tsm_pyramids/sounds/mummy.2.ogg old mode 100644 new mode 100755 diff --git a/mods/tsm_pyramids/sounds/mummy_death.1.ogg b/mods/tsm_pyramids/sounds/mummy_death.1.ogg old mode 100644 new mode 100755 diff --git a/mods/tsm_pyramids/sounds/mummy_hurt.1.ogg b/mods/tsm_pyramids/sounds/mummy_hurt.1.ogg old mode 100644 new mode 100755 diff --git a/mods/tsm_pyramids/textures/tsm_pyramids_crack.png b/mods/tsm_pyramids/textures/tsm_pyramids_crack.png old mode 100644 new mode 100755 diff --git a/mods/tsm_pyramids/textures/tsm_pyramids_eye.png b/mods/tsm_pyramids/textures/tsm_pyramids_eye.png old mode 100644 new mode 100755 diff --git a/mods/tsm_pyramids/textures/tsm_pyramids_men.png b/mods/tsm_pyramids/textures/tsm_pyramids_men.png old mode 100644 new mode 100755 diff --git a/mods/tsm_pyramids/textures/tsm_pyramids_mummy_egg.png b/mods/tsm_pyramids/textures/tsm_pyramids_mummy_egg.png old mode 100644 new mode 100755 diff --git a/mods/tsm_pyramids/textures/tsm_pyramids_spawner.png b/mods/tsm_pyramids/textures/tsm_pyramids_spawner.png old mode 100644 new mode 100755 diff --git a/mods/tsm_pyramids/textures/tsm_pyramids_sun.png b/mods/tsm_pyramids/textures/tsm_pyramids_sun.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/.previews/mff_skin_previews.blend b/mods/u_skins/.previews/mff_skin_previews.blend old mode 100644 new mode 100755 diff --git a/mods/u_skins/.previews/skin_previews.blend b/mods/u_skins/.previews/skin_previews.blend old mode 100644 new mode 100755 diff --git a/mods/u_skins/removed_skins.txt b/mods/u_skins/removed_skins.txt old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/meta/character_422.txt b/mods/u_skins/u_skins/meta/character_422.txt old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/meta/character_423.txt b/mods/u_skins/u_skins/meta/character_423.txt old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/meta/character_424.txt b/mods/u_skins/u_skins/meta/character_424.txt old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/meta/character_425.txt b/mods/u_skins/u_skins/meta/character_425.txt old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/meta/character_426.txt b/mods/u_skins/u_skins/meta/character_426.txt old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/meta/character_427.txt b/mods/u_skins/u_skins/meta/character_427.txt old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/meta/character_455.txt b/mods/u_skins/u_skins/meta/character_455.txt old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/meta/character_472.txt b/mods/u_skins/u_skins/meta/character_472.txt old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/meta/character_481.txt b/mods/u_skins/u_skins/meta/character_481.txt old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/meta/character_519.txt b/mods/u_skins/u_skins/meta/character_519.txt old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/meta/mff_character_1.txt b/mods/u_skins/u_skins/meta/mff_character_1.txt old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/meta/mff_character_10.txt b/mods/u_skins/u_skins/meta/mff_character_10.txt old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/meta/mff_character_11.txt b/mods/u_skins/u_skins/meta/mff_character_11.txt old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/meta/mff_character_12.txt b/mods/u_skins/u_skins/meta/mff_character_12.txt old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/meta/mff_character_13.txt b/mods/u_skins/u_skins/meta/mff_character_13.txt old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/meta/mff_character_2.txt b/mods/u_skins/u_skins/meta/mff_character_2.txt old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/meta/mff_character_3.txt b/mods/u_skins/u_skins/meta/mff_character_3.txt old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/meta/mff_character_4.txt b/mods/u_skins/u_skins/meta/mff_character_4.txt old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/meta/mff_character_5.txt b/mods/u_skins/u_skins/meta/mff_character_5.txt old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/meta/mff_character_6.txt b/mods/u_skins/u_skins/meta/mff_character_6.txt old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/meta/mff_character_7.txt b/mods/u_skins/u_skins/meta/mff_character_7.txt old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/meta/mff_character_8.txt b/mods/u_skins/u_skins/meta/mff_character_8.txt old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/meta/mff_character_9.txt b/mods/u_skins/u_skins/meta/mff_character_9.txt old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_100_preview.png b/mods/u_skins/u_skins/textures/character_100_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_101_preview.png b/mods/u_skins/u_skins/textures/character_101_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_102_preview.png b/mods/u_skins/u_skins/textures/character_102_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_103_preview.png b/mods/u_skins/u_skins/textures/character_103_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_104_preview.png b/mods/u_skins/u_skins/textures/character_104_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_105_preview.png b/mods/u_skins/u_skins/textures/character_105_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_106_preview.png b/mods/u_skins/u_skins/textures/character_106_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_107_preview.png b/mods/u_skins/u_skins/textures/character_107_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_108_preview.png b/mods/u_skins/u_skins/textures/character_108_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_109_preview.png b/mods/u_skins/u_skins/textures/character_109_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_10_preview.png b/mods/u_skins/u_skins/textures/character_10_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_110_preview.png b/mods/u_skins/u_skins/textures/character_110_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_111_preview.png b/mods/u_skins/u_skins/textures/character_111_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_112_preview.png b/mods/u_skins/u_skins/textures/character_112_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_113_preview.png b/mods/u_skins/u_skins/textures/character_113_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_114_preview.png b/mods/u_skins/u_skins/textures/character_114_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_115_preview.png b/mods/u_skins/u_skins/textures/character_115_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_116_preview.png b/mods/u_skins/u_skins/textures/character_116_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_117_preview.png b/mods/u_skins/u_skins/textures/character_117_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_118_preview.png b/mods/u_skins/u_skins/textures/character_118_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_119_preview.png b/mods/u_skins/u_skins/textures/character_119_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_11_preview.png b/mods/u_skins/u_skins/textures/character_11_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_120_preview.png b/mods/u_skins/u_skins/textures/character_120_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_121_preview.png b/mods/u_skins/u_skins/textures/character_121_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_122_preview.png b/mods/u_skins/u_skins/textures/character_122_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_123_preview.png b/mods/u_skins/u_skins/textures/character_123_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_124_preview.png b/mods/u_skins/u_skins/textures/character_124_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_125_preview.png b/mods/u_skins/u_skins/textures/character_125_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_126_preview.png b/mods/u_skins/u_skins/textures/character_126_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_127_preview.png b/mods/u_skins/u_skins/textures/character_127_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_128_preview.png b/mods/u_skins/u_skins/textures/character_128_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_129_preview.png b/mods/u_skins/u_skins/textures/character_129_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_12_preview.png b/mods/u_skins/u_skins/textures/character_12_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_130_preview.png b/mods/u_skins/u_skins/textures/character_130_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_131_preview.png b/mods/u_skins/u_skins/textures/character_131_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_132_preview.png b/mods/u_skins/u_skins/textures/character_132_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_133_preview.png b/mods/u_skins/u_skins/textures/character_133_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_134_preview.png b/mods/u_skins/u_skins/textures/character_134_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_135_preview.png b/mods/u_skins/u_skins/textures/character_135_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_136_preview.png b/mods/u_skins/u_skins/textures/character_136_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_137_preview.png b/mods/u_skins/u_skins/textures/character_137_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_138_preview.png b/mods/u_skins/u_skins/textures/character_138_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_139_preview.png b/mods/u_skins/u_skins/textures/character_139_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_13_preview.png b/mods/u_skins/u_skins/textures/character_13_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_140_preview.png b/mods/u_skins/u_skins/textures/character_140_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_141_preview.png b/mods/u_skins/u_skins/textures/character_141_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_142_preview.png b/mods/u_skins/u_skins/textures/character_142_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_143_preview.png b/mods/u_skins/u_skins/textures/character_143_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_144_preview.png b/mods/u_skins/u_skins/textures/character_144_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_145_preview.png b/mods/u_skins/u_skins/textures/character_145_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_146_preview.png b/mods/u_skins/u_skins/textures/character_146_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_147_preview.png b/mods/u_skins/u_skins/textures/character_147_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_148_preview.png b/mods/u_skins/u_skins/textures/character_148_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_149_preview.png b/mods/u_skins/u_skins/textures/character_149_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_14_preview.png b/mods/u_skins/u_skins/textures/character_14_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_150_preview.png b/mods/u_skins/u_skins/textures/character_150_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_151_preview.png b/mods/u_skins/u_skins/textures/character_151_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_152_preview.png b/mods/u_skins/u_skins/textures/character_152_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_153_preview.png b/mods/u_skins/u_skins/textures/character_153_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_154_preview.png b/mods/u_skins/u_skins/textures/character_154_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_155_preview.png b/mods/u_skins/u_skins/textures/character_155_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_156_preview.png b/mods/u_skins/u_skins/textures/character_156_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_157_preview.png b/mods/u_skins/u_skins/textures/character_157_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_158_preview.png b/mods/u_skins/u_skins/textures/character_158_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_159_preview.png b/mods/u_skins/u_skins/textures/character_159_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_15_preview.png b/mods/u_skins/u_skins/textures/character_15_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_161_preview.png b/mods/u_skins/u_skins/textures/character_161_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_162_preview.png b/mods/u_skins/u_skins/textures/character_162_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_163_preview.png b/mods/u_skins/u_skins/textures/character_163_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_164_preview.png b/mods/u_skins/u_skins/textures/character_164_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_165_preview.png b/mods/u_skins/u_skins/textures/character_165_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_166_preview.png b/mods/u_skins/u_skins/textures/character_166_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_167_preview.png b/mods/u_skins/u_skins/textures/character_167_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_168_preview.png b/mods/u_skins/u_skins/textures/character_168_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_169_preview.png b/mods/u_skins/u_skins/textures/character_169_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_16_preview.png b/mods/u_skins/u_skins/textures/character_16_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_170_preview.png b/mods/u_skins/u_skins/textures/character_170_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_171_preview.png b/mods/u_skins/u_skins/textures/character_171_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_172_preview.png b/mods/u_skins/u_skins/textures/character_172_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_173_preview.png b/mods/u_skins/u_skins/textures/character_173_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_174_preview.png b/mods/u_skins/u_skins/textures/character_174_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_175_preview.png b/mods/u_skins/u_skins/textures/character_175_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_176_preview.png b/mods/u_skins/u_skins/textures/character_176_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_177_preview.png b/mods/u_skins/u_skins/textures/character_177_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_178_preview.png b/mods/u_skins/u_skins/textures/character_178_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_179_preview.png b/mods/u_skins/u_skins/textures/character_179_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_17_preview.png b/mods/u_skins/u_skins/textures/character_17_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_180_preview.png b/mods/u_skins/u_skins/textures/character_180_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_181_preview.png b/mods/u_skins/u_skins/textures/character_181_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_182_preview.png b/mods/u_skins/u_skins/textures/character_182_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_183_preview.png b/mods/u_skins/u_skins/textures/character_183_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_184_preview.png b/mods/u_skins/u_skins/textures/character_184_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_185_preview.png b/mods/u_skins/u_skins/textures/character_185_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_186_preview.png b/mods/u_skins/u_skins/textures/character_186_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_187_preview.png b/mods/u_skins/u_skins/textures/character_187_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_188_preview.png b/mods/u_skins/u_skins/textures/character_188_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_189_preview.png b/mods/u_skins/u_skins/textures/character_189_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_18_preview.png b/mods/u_skins/u_skins/textures/character_18_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_190_preview.png b/mods/u_skins/u_skins/textures/character_190_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_191_preview.png b/mods/u_skins/u_skins/textures/character_191_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_192_preview.png b/mods/u_skins/u_skins/textures/character_192_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_193_preview.png b/mods/u_skins/u_skins/textures/character_193_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_194_preview.png b/mods/u_skins/u_skins/textures/character_194_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_195_preview.png b/mods/u_skins/u_skins/textures/character_195_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_196_preview.png b/mods/u_skins/u_skins/textures/character_196_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_197_preview.png b/mods/u_skins/u_skins/textures/character_197_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_198_preview.png b/mods/u_skins/u_skins/textures/character_198_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_199_preview.png b/mods/u_skins/u_skins/textures/character_199_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_19_preview.png b/mods/u_skins/u_skins/textures/character_19_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_1_preview.png b/mods/u_skins/u_skins/textures/character_1_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_200_preview.png b/mods/u_skins/u_skins/textures/character_200_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_201_preview.png b/mods/u_skins/u_skins/textures/character_201_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_202_preview.png b/mods/u_skins/u_skins/textures/character_202_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_203_preview.png b/mods/u_skins/u_skins/textures/character_203_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_204_preview.png b/mods/u_skins/u_skins/textures/character_204_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_205_preview.png b/mods/u_skins/u_skins/textures/character_205_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_206_preview.png b/mods/u_skins/u_skins/textures/character_206_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_207_preview.png b/mods/u_skins/u_skins/textures/character_207_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_208_preview.png b/mods/u_skins/u_skins/textures/character_208_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_209_preview.png b/mods/u_skins/u_skins/textures/character_209_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_20_preview.png b/mods/u_skins/u_skins/textures/character_20_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_210_preview.png b/mods/u_skins/u_skins/textures/character_210_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_211_preview.png b/mods/u_skins/u_skins/textures/character_211_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_212_preview.png b/mods/u_skins/u_skins/textures/character_212_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_213_preview.png b/mods/u_skins/u_skins/textures/character_213_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_214_preview.png b/mods/u_skins/u_skins/textures/character_214_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_215_preview.png b/mods/u_skins/u_skins/textures/character_215_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_216_preview.png b/mods/u_skins/u_skins/textures/character_216_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_217_preview.png b/mods/u_skins/u_skins/textures/character_217_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_218_preview.png b/mods/u_skins/u_skins/textures/character_218_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_219_preview.png b/mods/u_skins/u_skins/textures/character_219_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_21_preview.png b/mods/u_skins/u_skins/textures/character_21_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_220_preview.png b/mods/u_skins/u_skins/textures/character_220_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_221_preview.png b/mods/u_skins/u_skins/textures/character_221_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_222_preview.png b/mods/u_skins/u_skins/textures/character_222_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_223_preview.png b/mods/u_skins/u_skins/textures/character_223_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_224_preview.png b/mods/u_skins/u_skins/textures/character_224_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_225_preview.png b/mods/u_skins/u_skins/textures/character_225_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_226_preview.png b/mods/u_skins/u_skins/textures/character_226_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_227_preview.png b/mods/u_skins/u_skins/textures/character_227_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_228_preview.png b/mods/u_skins/u_skins/textures/character_228_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_229_preview.png b/mods/u_skins/u_skins/textures/character_229_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_22_preview.png b/mods/u_skins/u_skins/textures/character_22_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_230_preview.png b/mods/u_skins/u_skins/textures/character_230_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_232_preview.png b/mods/u_skins/u_skins/textures/character_232_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_233_preview.png b/mods/u_skins/u_skins/textures/character_233_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_234_preview.png b/mods/u_skins/u_skins/textures/character_234_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_235_preview.png b/mods/u_skins/u_skins/textures/character_235_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_236_preview.png b/mods/u_skins/u_skins/textures/character_236_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_237_preview.png b/mods/u_skins/u_skins/textures/character_237_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_238_preview.png b/mods/u_skins/u_skins/textures/character_238_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_239_preview.png b/mods/u_skins/u_skins/textures/character_239_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_23_preview.png b/mods/u_skins/u_skins/textures/character_23_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_240_preview.png b/mods/u_skins/u_skins/textures/character_240_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_241_preview.png b/mods/u_skins/u_skins/textures/character_241_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_242_preview.png b/mods/u_skins/u_skins/textures/character_242_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_243_preview.png b/mods/u_skins/u_skins/textures/character_243_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_244_preview.png b/mods/u_skins/u_skins/textures/character_244_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_245_preview.png b/mods/u_skins/u_skins/textures/character_245_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_246_preview.png b/mods/u_skins/u_skins/textures/character_246_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_247_preview.png b/mods/u_skins/u_skins/textures/character_247_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_248_preview.png b/mods/u_skins/u_skins/textures/character_248_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_249_preview.png b/mods/u_skins/u_skins/textures/character_249_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_24_preview.png b/mods/u_skins/u_skins/textures/character_24_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_250_preview.png b/mods/u_skins/u_skins/textures/character_250_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_251_preview.png b/mods/u_skins/u_skins/textures/character_251_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_252_preview.png b/mods/u_skins/u_skins/textures/character_252_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_253_preview.png b/mods/u_skins/u_skins/textures/character_253_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_254_preview.png b/mods/u_skins/u_skins/textures/character_254_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_255_preview.png b/mods/u_skins/u_skins/textures/character_255_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_256_preview.png b/mods/u_skins/u_skins/textures/character_256_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_257_preview.png b/mods/u_skins/u_skins/textures/character_257_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_258_preview.png b/mods/u_skins/u_skins/textures/character_258_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_259_preview.png b/mods/u_skins/u_skins/textures/character_259_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_25_preview.png b/mods/u_skins/u_skins/textures/character_25_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_260_preview.png b/mods/u_skins/u_skins/textures/character_260_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_261_preview.png b/mods/u_skins/u_skins/textures/character_261_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_262_preview.png b/mods/u_skins/u_skins/textures/character_262_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_263_preview.png b/mods/u_skins/u_skins/textures/character_263_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_264_preview.png b/mods/u_skins/u_skins/textures/character_264_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_265_preview.png b/mods/u_skins/u_skins/textures/character_265_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_266_preview.png b/mods/u_skins/u_skins/textures/character_266_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_267_preview.png b/mods/u_skins/u_skins/textures/character_267_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_268_preview.png b/mods/u_skins/u_skins/textures/character_268_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_269_preview.png b/mods/u_skins/u_skins/textures/character_269_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_26_preview.png b/mods/u_skins/u_skins/textures/character_26_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_270_preview.png b/mods/u_skins/u_skins/textures/character_270_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_271_preview.png b/mods/u_skins/u_skins/textures/character_271_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_272_preview.png b/mods/u_skins/u_skins/textures/character_272_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_273_preview.png b/mods/u_skins/u_skins/textures/character_273_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_274_preview.png b/mods/u_skins/u_skins/textures/character_274_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_275_preview.png b/mods/u_skins/u_skins/textures/character_275_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_276_preview.png b/mods/u_skins/u_skins/textures/character_276_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_277_preview.png b/mods/u_skins/u_skins/textures/character_277_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_278_preview.png b/mods/u_skins/u_skins/textures/character_278_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_279_preview.png b/mods/u_skins/u_skins/textures/character_279_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_27_preview.png b/mods/u_skins/u_skins/textures/character_27_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_280_preview.png b/mods/u_skins/u_skins/textures/character_280_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_281_preview.png b/mods/u_skins/u_skins/textures/character_281_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_282_preview.png b/mods/u_skins/u_skins/textures/character_282_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_283_preview.png b/mods/u_skins/u_skins/textures/character_283_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_284_preview.png b/mods/u_skins/u_skins/textures/character_284_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_285_preview.png b/mods/u_skins/u_skins/textures/character_285_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_286_preview.png b/mods/u_skins/u_skins/textures/character_286_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_287_preview.png b/mods/u_skins/u_skins/textures/character_287_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_288_preview.png b/mods/u_skins/u_skins/textures/character_288_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_289_preview.png b/mods/u_skins/u_skins/textures/character_289_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_28_preview.png b/mods/u_skins/u_skins/textures/character_28_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_290_preview.png b/mods/u_skins/u_skins/textures/character_290_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_291_preview.png b/mods/u_skins/u_skins/textures/character_291_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_292_preview.png b/mods/u_skins/u_skins/textures/character_292_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_293_preview.png b/mods/u_skins/u_skins/textures/character_293_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_294_preview.png b/mods/u_skins/u_skins/textures/character_294_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_295_preview.png b/mods/u_skins/u_skins/textures/character_295_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_296_preview.png b/mods/u_skins/u_skins/textures/character_296_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_297_preview.png b/mods/u_skins/u_skins/textures/character_297_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_298_preview.png b/mods/u_skins/u_skins/textures/character_298_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_299_preview.png b/mods/u_skins/u_skins/textures/character_299_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_29_preview.png b/mods/u_skins/u_skins/textures/character_29_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_2_preview.png b/mods/u_skins/u_skins/textures/character_2_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_300_preview.png b/mods/u_skins/u_skins/textures/character_300_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_301_preview.png b/mods/u_skins/u_skins/textures/character_301_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_302_preview.png b/mods/u_skins/u_skins/textures/character_302_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_304_preview.png b/mods/u_skins/u_skins/textures/character_304_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_305_preview.png b/mods/u_skins/u_skins/textures/character_305_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_306_preview.png b/mods/u_skins/u_skins/textures/character_306_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_307_preview.png b/mods/u_skins/u_skins/textures/character_307_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_308_preview.png b/mods/u_skins/u_skins/textures/character_308_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_309_preview.png b/mods/u_skins/u_skins/textures/character_309_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_30_preview.png b/mods/u_skins/u_skins/textures/character_30_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_310_preview.png b/mods/u_skins/u_skins/textures/character_310_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_311_preview.png b/mods/u_skins/u_skins/textures/character_311_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_312_preview.png b/mods/u_skins/u_skins/textures/character_312_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_313_preview.png b/mods/u_skins/u_skins/textures/character_313_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_314_preview.png b/mods/u_skins/u_skins/textures/character_314_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_315_preview.png b/mods/u_skins/u_skins/textures/character_315_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_316_preview.png b/mods/u_skins/u_skins/textures/character_316_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_317_preview.png b/mods/u_skins/u_skins/textures/character_317_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_318_preview.png b/mods/u_skins/u_skins/textures/character_318_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_319_preview.png b/mods/u_skins/u_skins/textures/character_319_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_31_preview.png b/mods/u_skins/u_skins/textures/character_31_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_320_preview.png b/mods/u_skins/u_skins/textures/character_320_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_321_preview.png b/mods/u_skins/u_skins/textures/character_321_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_322_preview.png b/mods/u_skins/u_skins/textures/character_322_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_323_preview.png b/mods/u_skins/u_skins/textures/character_323_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_324_preview.png b/mods/u_skins/u_skins/textures/character_324_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_325_preview.png b/mods/u_skins/u_skins/textures/character_325_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_326_preview.png b/mods/u_skins/u_skins/textures/character_326_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_327_preview.png b/mods/u_skins/u_skins/textures/character_327_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_328_preview.png b/mods/u_skins/u_skins/textures/character_328_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_329_preview.png b/mods/u_skins/u_skins/textures/character_329_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_32_preview.png b/mods/u_skins/u_skins/textures/character_32_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_330_preview.png b/mods/u_skins/u_skins/textures/character_330_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_331_preview.png b/mods/u_skins/u_skins/textures/character_331_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_332_preview.png b/mods/u_skins/u_skins/textures/character_332_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_333_preview.png b/mods/u_skins/u_skins/textures/character_333_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_334_preview.png b/mods/u_skins/u_skins/textures/character_334_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_335_preview.png b/mods/u_skins/u_skins/textures/character_335_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_336_preview.png b/mods/u_skins/u_skins/textures/character_336_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_337_preview.png b/mods/u_skins/u_skins/textures/character_337_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_338_preview.png b/mods/u_skins/u_skins/textures/character_338_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_339_preview.png b/mods/u_skins/u_skins/textures/character_339_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_33_preview.png b/mods/u_skins/u_skins/textures/character_33_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_340_preview.png b/mods/u_skins/u_skins/textures/character_340_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_341_preview.png b/mods/u_skins/u_skins/textures/character_341_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_342_preview.png b/mods/u_skins/u_skins/textures/character_342_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_343_preview.png b/mods/u_skins/u_skins/textures/character_343_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_344_preview.png b/mods/u_skins/u_skins/textures/character_344_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_345_preview.png b/mods/u_skins/u_skins/textures/character_345_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_346_preview.png b/mods/u_skins/u_skins/textures/character_346_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_347_preview.png b/mods/u_skins/u_skins/textures/character_347_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_349_preview.png b/mods/u_skins/u_skins/textures/character_349_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_34_preview.png b/mods/u_skins/u_skins/textures/character_34_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_350_preview.png b/mods/u_skins/u_skins/textures/character_350_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_351_preview.png b/mods/u_skins/u_skins/textures/character_351_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_352_preview.png b/mods/u_skins/u_skins/textures/character_352_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_355_preview.png b/mods/u_skins/u_skins/textures/character_355_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_356_preview.png b/mods/u_skins/u_skins/textures/character_356_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_357_preview.png b/mods/u_skins/u_skins/textures/character_357_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_358_preview.png b/mods/u_skins/u_skins/textures/character_358_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_359_preview.png b/mods/u_skins/u_skins/textures/character_359_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_35_preview.png b/mods/u_skins/u_skins/textures/character_35_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_360_preview.png b/mods/u_skins/u_skins/textures/character_360_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_361_preview.png b/mods/u_skins/u_skins/textures/character_361_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_362_preview.png b/mods/u_skins/u_skins/textures/character_362_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_363_preview.png b/mods/u_skins/u_skins/textures/character_363_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_364_preview.png b/mods/u_skins/u_skins/textures/character_364_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_365_preview.png b/mods/u_skins/u_skins/textures/character_365_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_366_preview.png b/mods/u_skins/u_skins/textures/character_366_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_367_preview.png b/mods/u_skins/u_skins/textures/character_367_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_368_preview.png b/mods/u_skins/u_skins/textures/character_368_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_369_preview.png b/mods/u_skins/u_skins/textures/character_369_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_36_preview.png b/mods/u_skins/u_skins/textures/character_36_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_370_preview.png b/mods/u_skins/u_skins/textures/character_370_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_371_preview.png b/mods/u_skins/u_skins/textures/character_371_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_372_preview.png b/mods/u_skins/u_skins/textures/character_372_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_373_preview.png b/mods/u_skins/u_skins/textures/character_373_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_374_preview.png b/mods/u_skins/u_skins/textures/character_374_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_376_preview.png b/mods/u_skins/u_skins/textures/character_376_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_377_preview.png b/mods/u_skins/u_skins/textures/character_377_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_378_preview.png b/mods/u_skins/u_skins/textures/character_378_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_379_preview.png b/mods/u_skins/u_skins/textures/character_379_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_37_preview.png b/mods/u_skins/u_skins/textures/character_37_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_380_preview.png b/mods/u_skins/u_skins/textures/character_380_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_381_preview.png b/mods/u_skins/u_skins/textures/character_381_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_382_preview.png b/mods/u_skins/u_skins/textures/character_382_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_383_preview.png b/mods/u_skins/u_skins/textures/character_383_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_384_preview.png b/mods/u_skins/u_skins/textures/character_384_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_385_preview.png b/mods/u_skins/u_skins/textures/character_385_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_386_preview.png b/mods/u_skins/u_skins/textures/character_386_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_387_preview.png b/mods/u_skins/u_skins/textures/character_387_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_388_preview.png b/mods/u_skins/u_skins/textures/character_388_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_389_preview.png b/mods/u_skins/u_skins/textures/character_389_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_38_preview.png b/mods/u_skins/u_skins/textures/character_38_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_390_preview.png b/mods/u_skins/u_skins/textures/character_390_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_391_preview.png b/mods/u_skins/u_skins/textures/character_391_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_392_preview.png b/mods/u_skins/u_skins/textures/character_392_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_393_preview.png b/mods/u_skins/u_skins/textures/character_393_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_394_preview.png b/mods/u_skins/u_skins/textures/character_394_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_395_preview.png b/mods/u_skins/u_skins/textures/character_395_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_396_preview.png b/mods/u_skins/u_skins/textures/character_396_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_397_preview.png b/mods/u_skins/u_skins/textures/character_397_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_398_preview.png b/mods/u_skins/u_skins/textures/character_398_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_399_preview.png b/mods/u_skins/u_skins/textures/character_399_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_39_preview.png b/mods/u_skins/u_skins/textures/character_39_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_3_preview.png b/mods/u_skins/u_skins/textures/character_3_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_400_preview.png b/mods/u_skins/u_skins/textures/character_400_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_401_preview.png b/mods/u_skins/u_skins/textures/character_401_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_402_preview.png b/mods/u_skins/u_skins/textures/character_402_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_403_preview.png b/mods/u_skins/u_skins/textures/character_403_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_404_preview.png b/mods/u_skins/u_skins/textures/character_404_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_405_preview.png b/mods/u_skins/u_skins/textures/character_405_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_406_preview.png b/mods/u_skins/u_skins/textures/character_406_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_407_preview.png b/mods/u_skins/u_skins/textures/character_407_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_408_preview.png b/mods/u_skins/u_skins/textures/character_408_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_409_preview.png b/mods/u_skins/u_skins/textures/character_409_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_40_preview.png b/mods/u_skins/u_skins/textures/character_40_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_410_preview.png b/mods/u_skins/u_skins/textures/character_410_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_411_preview.png b/mods/u_skins/u_skins/textures/character_411_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_412_preview.png b/mods/u_skins/u_skins/textures/character_412_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_413_preview.png b/mods/u_skins/u_skins/textures/character_413_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_414_preview.png b/mods/u_skins/u_skins/textures/character_414_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_415_preview.png b/mods/u_skins/u_skins/textures/character_415_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_416_preview.png b/mods/u_skins/u_skins/textures/character_416_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_417_preview.png b/mods/u_skins/u_skins/textures/character_417_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_418_preview.png b/mods/u_skins/u_skins/textures/character_418_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_419_preview.png b/mods/u_skins/u_skins/textures/character_419_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_41_preview.png b/mods/u_skins/u_skins/textures/character_41_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_420_preview.png b/mods/u_skins/u_skins/textures/character_420_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_421_preview.png b/mods/u_skins/u_skins/textures/character_421_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_422.png b/mods/u_skins/u_skins/textures/character_422.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_422_preview.png b/mods/u_skins/u_skins/textures/character_422_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_423.png b/mods/u_skins/u_skins/textures/character_423.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_423_preview.png b/mods/u_skins/u_skins/textures/character_423_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_424.png b/mods/u_skins/u_skins/textures/character_424.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_424_preview.png b/mods/u_skins/u_skins/textures/character_424_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_425.png b/mods/u_skins/u_skins/textures/character_425.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_425_preview.png b/mods/u_skins/u_skins/textures/character_425_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_426.png b/mods/u_skins/u_skins/textures/character_426.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_426_preview.png b/mods/u_skins/u_skins/textures/character_426_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_427.png b/mods/u_skins/u_skins/textures/character_427.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_427_preview.png b/mods/u_skins/u_skins/textures/character_427_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_428_preview.png b/mods/u_skins/u_skins/textures/character_428_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_429_preview.png b/mods/u_skins/u_skins/textures/character_429_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_42_preview.png b/mods/u_skins/u_skins/textures/character_42_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_430_preview.png b/mods/u_skins/u_skins/textures/character_430_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_431_preview.png b/mods/u_skins/u_skins/textures/character_431_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_432_preview.png b/mods/u_skins/u_skins/textures/character_432_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_433_preview.png b/mods/u_skins/u_skins/textures/character_433_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_434_preview.png b/mods/u_skins/u_skins/textures/character_434_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_435_preview.png b/mods/u_skins/u_skins/textures/character_435_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_436_preview.png b/mods/u_skins/u_skins/textures/character_436_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_437_preview.png b/mods/u_skins/u_skins/textures/character_437_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_438_preview.png b/mods/u_skins/u_skins/textures/character_438_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_439_preview.png b/mods/u_skins/u_skins/textures/character_439_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_43_preview.png b/mods/u_skins/u_skins/textures/character_43_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_440_preview.png b/mods/u_skins/u_skins/textures/character_440_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_441_preview.png b/mods/u_skins/u_skins/textures/character_441_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_442_preview.png b/mods/u_skins/u_skins/textures/character_442_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_443_preview.png b/mods/u_skins/u_skins/textures/character_443_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_444_preview.png b/mods/u_skins/u_skins/textures/character_444_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_445_preview.png b/mods/u_skins/u_skins/textures/character_445_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_446_preview.png b/mods/u_skins/u_skins/textures/character_446_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_447_preview.png b/mods/u_skins/u_skins/textures/character_447_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_448_preview.png b/mods/u_skins/u_skins/textures/character_448_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_449_preview.png b/mods/u_skins/u_skins/textures/character_449_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_44_preview.png b/mods/u_skins/u_skins/textures/character_44_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_450_preview.png b/mods/u_skins/u_skins/textures/character_450_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_451_preview.png b/mods/u_skins/u_skins/textures/character_451_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_452_preview.png b/mods/u_skins/u_skins/textures/character_452_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_453_preview.png b/mods/u_skins/u_skins/textures/character_453_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_454_preview.png b/mods/u_skins/u_skins/textures/character_454_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_455.png b/mods/u_skins/u_skins/textures/character_455.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_455_preview.png b/mods/u_skins/u_skins/textures/character_455_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_456_preview.png b/mods/u_skins/u_skins/textures/character_456_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_457_preview.png b/mods/u_skins/u_skins/textures/character_457_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_458_preview.png b/mods/u_skins/u_skins/textures/character_458_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_459_preview.png b/mods/u_skins/u_skins/textures/character_459_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_45_preview.png b/mods/u_skins/u_skins/textures/character_45_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_460_preview.png b/mods/u_skins/u_skins/textures/character_460_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_461_preview.png b/mods/u_skins/u_skins/textures/character_461_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_462_preview.png b/mods/u_skins/u_skins/textures/character_462_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_463_preview.png b/mods/u_skins/u_skins/textures/character_463_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_464_preview.png b/mods/u_skins/u_skins/textures/character_464_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_465_preview.png b/mods/u_skins/u_skins/textures/character_465_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_466_preview.png b/mods/u_skins/u_skins/textures/character_466_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_467_preview.png b/mods/u_skins/u_skins/textures/character_467_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_468_preview.png b/mods/u_skins/u_skins/textures/character_468_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_469_preview.png b/mods/u_skins/u_skins/textures/character_469_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_46_preview.png b/mods/u_skins/u_skins/textures/character_46_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_470_preview.png b/mods/u_skins/u_skins/textures/character_470_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_471_preview.png b/mods/u_skins/u_skins/textures/character_471_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_472.png b/mods/u_skins/u_skins/textures/character_472.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_472_preview.png b/mods/u_skins/u_skins/textures/character_472_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_473_preview.png b/mods/u_skins/u_skins/textures/character_473_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_474_preview.png b/mods/u_skins/u_skins/textures/character_474_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_475_preview.png b/mods/u_skins/u_skins/textures/character_475_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_476_preview.png b/mods/u_skins/u_skins/textures/character_476_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_477_preview.png b/mods/u_skins/u_skins/textures/character_477_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_478_preview.png b/mods/u_skins/u_skins/textures/character_478_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_479_preview.png b/mods/u_skins/u_skins/textures/character_479_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_47_preview.png b/mods/u_skins/u_skins/textures/character_47_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_480_preview.png b/mods/u_skins/u_skins/textures/character_480_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_481.png b/mods/u_skins/u_skins/textures/character_481.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_481_preview.png b/mods/u_skins/u_skins/textures/character_481_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_482_preview.png b/mods/u_skins/u_skins/textures/character_482_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_483_preview.png b/mods/u_skins/u_skins/textures/character_483_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_484_preview.png b/mods/u_skins/u_skins/textures/character_484_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_485_preview.png b/mods/u_skins/u_skins/textures/character_485_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_486_preview.png b/mods/u_skins/u_skins/textures/character_486_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_487_preview.png b/mods/u_skins/u_skins/textures/character_487_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_488_preview.png b/mods/u_skins/u_skins/textures/character_488_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_489_preview.png b/mods/u_skins/u_skins/textures/character_489_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_48_preview.png b/mods/u_skins/u_skins/textures/character_48_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_490_preview.png b/mods/u_skins/u_skins/textures/character_490_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_491_preview.png b/mods/u_skins/u_skins/textures/character_491_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_492_preview.png b/mods/u_skins/u_skins/textures/character_492_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_493_preview.png b/mods/u_skins/u_skins/textures/character_493_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_494_preview.png b/mods/u_skins/u_skins/textures/character_494_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_495_preview.png b/mods/u_skins/u_skins/textures/character_495_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_496_preview.png b/mods/u_skins/u_skins/textures/character_496_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_497_preview.png b/mods/u_skins/u_skins/textures/character_497_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_498_preview.png b/mods/u_skins/u_skins/textures/character_498_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_499_preview.png b/mods/u_skins/u_skins/textures/character_499_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_49_preview.png b/mods/u_skins/u_skins/textures/character_49_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_4_preview.png b/mods/u_skins/u_skins/textures/character_4_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_500_preview.png b/mods/u_skins/u_skins/textures/character_500_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_501_preview.png b/mods/u_skins/u_skins/textures/character_501_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_502_preview.png b/mods/u_skins/u_skins/textures/character_502_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_503_preview.png b/mods/u_skins/u_skins/textures/character_503_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_504_preview.png b/mods/u_skins/u_skins/textures/character_504_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_505_preview.png b/mods/u_skins/u_skins/textures/character_505_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_506_preview.png b/mods/u_skins/u_skins/textures/character_506_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_507_preview.png b/mods/u_skins/u_skins/textures/character_507_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_508_preview.png b/mods/u_skins/u_skins/textures/character_508_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_509_preview.png b/mods/u_skins/u_skins/textures/character_509_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_50_preview.png b/mods/u_skins/u_skins/textures/character_50_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_510_preview.png b/mods/u_skins/u_skins/textures/character_510_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_511_preview.png b/mods/u_skins/u_skins/textures/character_511_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_512_preview.png b/mods/u_skins/u_skins/textures/character_512_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_513_preview.png b/mods/u_skins/u_skins/textures/character_513_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_514_preview.png b/mods/u_skins/u_skins/textures/character_514_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_515_preview.png b/mods/u_skins/u_skins/textures/character_515_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_516_preview.png b/mods/u_skins/u_skins/textures/character_516_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_517_preview.png b/mods/u_skins/u_skins/textures/character_517_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_518_preview.png b/mods/u_skins/u_skins/textures/character_518_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_519.png b/mods/u_skins/u_skins/textures/character_519.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_519_preview.png b/mods/u_skins/u_skins/textures/character_519_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_51_preview.png b/mods/u_skins/u_skins/textures/character_51_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_52_preview.png b/mods/u_skins/u_skins/textures/character_52_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_53_preview.png b/mods/u_skins/u_skins/textures/character_53_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_54_preview.png b/mods/u_skins/u_skins/textures/character_54_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_55_preview.png b/mods/u_skins/u_skins/textures/character_55_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_56_preview.png b/mods/u_skins/u_skins/textures/character_56_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_57_preview.png b/mods/u_skins/u_skins/textures/character_57_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_58_preview.png b/mods/u_skins/u_skins/textures/character_58_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_59_preview.png b/mods/u_skins/u_skins/textures/character_59_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_5_preview.png b/mods/u_skins/u_skins/textures/character_5_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_60_preview.png b/mods/u_skins/u_skins/textures/character_60_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_61_preview.png b/mods/u_skins/u_skins/textures/character_61_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_62_preview.png b/mods/u_skins/u_skins/textures/character_62_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_64_preview.png b/mods/u_skins/u_skins/textures/character_64_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_65_preview.png b/mods/u_skins/u_skins/textures/character_65_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_66_preview.png b/mods/u_skins/u_skins/textures/character_66_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_67_preview.png b/mods/u_skins/u_skins/textures/character_67_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_69_preview.png b/mods/u_skins/u_skins/textures/character_69_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_6_preview.png b/mods/u_skins/u_skins/textures/character_6_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_70_preview.png b/mods/u_skins/u_skins/textures/character_70_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_71_preview.png b/mods/u_skins/u_skins/textures/character_71_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_72_preview.png b/mods/u_skins/u_skins/textures/character_72_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_73_preview.png b/mods/u_skins/u_skins/textures/character_73_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_74_preview.png b/mods/u_skins/u_skins/textures/character_74_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_75_preview.png b/mods/u_skins/u_skins/textures/character_75_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_76_preview.png b/mods/u_skins/u_skins/textures/character_76_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_77_preview.png b/mods/u_skins/u_skins/textures/character_77_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_78_preview.png b/mods/u_skins/u_skins/textures/character_78_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_79_preview.png b/mods/u_skins/u_skins/textures/character_79_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_7_preview.png b/mods/u_skins/u_skins/textures/character_7_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_80_preview.png b/mods/u_skins/u_skins/textures/character_80_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_81_preview.png b/mods/u_skins/u_skins/textures/character_81_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_82_preview.png b/mods/u_skins/u_skins/textures/character_82_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_83_preview.png b/mods/u_skins/u_skins/textures/character_83_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_84_preview.png b/mods/u_skins/u_skins/textures/character_84_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_86_preview.png b/mods/u_skins/u_skins/textures/character_86_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_87_preview.png b/mods/u_skins/u_skins/textures/character_87_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_88_preview.png b/mods/u_skins/u_skins/textures/character_88_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_8_preview.png b/mods/u_skins/u_skins/textures/character_8_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_90_preview.png b/mods/u_skins/u_skins/textures/character_90_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_91_preview.png b/mods/u_skins/u_skins/textures/character_91_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_92_preview.png b/mods/u_skins/u_skins/textures/character_92_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_94_preview.png b/mods/u_skins/u_skins/textures/character_94_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_95_preview.png b/mods/u_skins/u_skins/textures/character_95_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_96_preview.png b/mods/u_skins/u_skins/textures/character_96_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_97_preview.png b/mods/u_skins/u_skins/textures/character_97_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_98_preview.png b/mods/u_skins/u_skins/textures/character_98_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_99_preview.png b/mods/u_skins/u_skins/textures/character_99_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/character_9_preview.png b/mods/u_skins/u_skins/textures/character_9_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/mff_character_1.png b/mods/u_skins/u_skins/textures/mff_character_1.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/mff_character_10.png b/mods/u_skins/u_skins/textures/mff_character_10.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/mff_character_10_preview.png b/mods/u_skins/u_skins/textures/mff_character_10_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/mff_character_11.png b/mods/u_skins/u_skins/textures/mff_character_11.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/mff_character_11_preview.png b/mods/u_skins/u_skins/textures/mff_character_11_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/mff_character_12.png b/mods/u_skins/u_skins/textures/mff_character_12.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/mff_character_12_preview.png b/mods/u_skins/u_skins/textures/mff_character_12_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/mff_character_13.png b/mods/u_skins/u_skins/textures/mff_character_13.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/mff_character_13_preview.png b/mods/u_skins/u_skins/textures/mff_character_13_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/mff_character_1_preview.png b/mods/u_skins/u_skins/textures/mff_character_1_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/mff_character_2.png b/mods/u_skins/u_skins/textures/mff_character_2.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/mff_character_2_preview.png b/mods/u_skins/u_skins/textures/mff_character_2_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/mff_character_3.png b/mods/u_skins/u_skins/textures/mff_character_3.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/mff_character_3_preview.png b/mods/u_skins/u_skins/textures/mff_character_3_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/mff_character_4.png b/mods/u_skins/u_skins/textures/mff_character_4.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/mff_character_4_preview.png b/mods/u_skins/u_skins/textures/mff_character_4_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/mff_character_5.png b/mods/u_skins/u_skins/textures/mff_character_5.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/mff_character_5_preview.png b/mods/u_skins/u_skins/textures/mff_character_5_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/mff_character_6.png b/mods/u_skins/u_skins/textures/mff_character_6.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/mff_character_6_preview.png b/mods/u_skins/u_skins/textures/mff_character_6_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/mff_character_7.png b/mods/u_skins/u_skins/textures/mff_character_7.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/mff_character_7_preview.png b/mods/u_skins/u_skins/textures/mff_character_7_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/mff_character_8.png b/mods/u_skins/u_skins/textures/mff_character_8.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/mff_character_8_preview.png b/mods/u_skins/u_skins/textures/mff_character_8_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/mff_character_9.png b/mods/u_skins/u_skins/textures/mff_character_9.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/mff_character_9_preview.png b/mods/u_skins/u_skins/textures/mff_character_9_preview.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/ucharacter_18.png b/mods/u_skins/u_skins/textures/ucharacter_18.png old mode 100644 new mode 100755 diff --git a/mods/u_skins/u_skins/textures/ucharacter_19.png b/mods/u_skins/u_skins/textures/ucharacter_19.png old mode 100644 new mode 100755 diff --git a/mods/unified_inventory/api.lua b/mods/unified_inventory/api.lua index 5f74ea73..f6a68d69 100755 --- a/mods/unified_inventory/api.lua +++ b/mods/unified_inventory/api.lua @@ -27,7 +27,7 @@ minetest.after(0.01, function() end table.sort(unified_inventory.items_list) unified_inventory.items_list_size = #unified_inventory.items_list - print("Unified Inventory. inventory size: "..unified_inventory.items_list_size) + minetest.log("Unified Inventory. inventory size: "..unified_inventory.items_list_size) for _, name in ipairs(unified_inventory.items_list) do local def = minetest.registered_items[name] if type(def.drop) == "string" then diff --git a/mods/unifieddyes/init.lua b/mods/unifieddyes/init.lua index e8c36b7a..54ea1862 100755 --- a/mods/unifieddyes/init.lua +++ b/mods/unifieddyes/init.lua @@ -373,5 +373,5 @@ minetest.register_alias("unifieddyes:grey_paint", "dye:grey") minetest.register_alias("unifieddyes:darkgrey_paint", "dye:dark_grey") minetest.register_alias("unifieddyes:carbon_black", "dye:black") -print(S("[UnifiedDyes] Loaded!")) +minetest.log("action", S("[UnifiedDyes] Loaded!")) diff --git a/mods/whoison/functions.lua b/mods/whoison/functions.lua old mode 100644 new mode 100755 diff --git a/mods/whoison/init.lua b/mods/whoison/init.lua index bc98c116..bf3e868d 100755 --- a/mods/whoison/init.lua +++ b/mods/whoison/init.lua @@ -95,7 +95,7 @@ minetest.register_chatcommand("seen",{ end }) -minetest.register_chatcommand("played",{ +minetest.register_chatcommand("timeonline",{ param = "", description = "Shows the cumulative time a player has been online", func = function (name, param) @@ -111,6 +111,7 @@ minetest.register_chatcommand("played",{ end end }) +minetest.register_chatcommand("timeonline", core.chatcommands["played"]) function breakdowntime(t) local countdown = t diff --git a/mods/whoison/init.lua.new b/mods/whoison/init.lua.new old mode 100644 new mode 100755 diff --git a/mods/worldedge/README.md b/mods/worldedge/README.md old mode 100644 new mode 100755 diff --git a/mods/worldedge/depends.txt b/mods/worldedge/depends.txt old mode 100644 new mode 100755 diff --git a/mods/worldedge/init.lua b/mods/worldedge/init.lua old mode 100644 new mode 100755 diff --git a/mods/xban2/dbimport.lua b/mods/xban2/dbimport.lua old mode 100644 new mode 100755 diff --git a/mods/xban2/doc/API.md b/mods/xban2/doc/API.md old mode 100644 new mode 100755 diff --git a/mods/xban2/doc/dbformat.txt b/mods/xban2/doc/dbformat.txt old mode 100644 new mode 100755 diff --git a/mods/xban2/gui.lua b/mods/xban2/gui.lua old mode 100644 new mode 100755 diff --git a/mods/xban2/importers/minetest.lua b/mods/xban2/importers/minetest.lua old mode 100644 new mode 100755 diff --git a/mods/xban2/importers/v1.lua b/mods/xban2/importers/v1.lua old mode 100644 new mode 100755 diff --git a/mods/xban2/importers/v2.lua b/mods/xban2/importers/v2.lua old mode 100644 new mode 100755 diff --git a/mods/xban2/init.lua b/mods/xban2/init.lua old mode 100644 new mode 100755 diff --git a/mods/xban2/serialize.lua b/mods/xban2/serialize.lua old mode 100644 new mode 100755 diff --git a/other_things/Tableau-valeurs-MFF.ods b/other_things/Tableau-valeurs-MFF.ods index be6ddb9c..87eed035 100755 Binary files a/other_things/Tableau-valeurs-MFF.ods and b/other_things/Tableau-valeurs-MFF.ods differ diff --git a/other_things/doors-de-davedevils.rar b/other_things/doors-de-davedevils.rar old mode 100644 new mode 100755 diff --git a/other_things/irc-old-save/.gitignore b/other_things/irc-old-save/.gitignore old mode 100644 new mode 100755 diff --git a/other_things/irc-old-save/.gitmodules b/other_things/irc-old-save/.gitmodules old mode 100644 new mode 100755 diff --git a/other_things/irc-old-save/API.md b/other_things/irc-old-save/API.md old mode 100644 new mode 100755 diff --git a/other_things/irc-old-save/LICENSE.txt b/other_things/irc-old-save/LICENSE.txt old mode 100644 new mode 100755 diff --git a/other_things/irc-old-save/README.md b/other_things/irc-old-save/README.md old mode 100644 new mode 100755 diff --git a/other_things/irc-old-save/botcmds.lua b/other_things/irc-old-save/botcmds.lua old mode 100644 new mode 100755 diff --git a/other_things/irc-old-save/callback.lua b/other_things/irc-old-save/callback.lua old mode 100644 new mode 100755 diff --git a/other_things/irc-old-save/chatcmds.lua b/other_things/irc-old-save/chatcmds.lua old mode 100644 new mode 100755 diff --git a/other_things/irc-old-save/config.lua b/other_things/irc-old-save/config.lua old mode 100644 new mode 100755 diff --git a/other_things/irc-old-save/core.so b/other_things/irc-old-save/core.so old mode 100644 new mode 100755 diff --git a/other_things/irc-old-save/hooks.lua b/other_things/irc-old-save/hooks.lua old mode 100644 new mode 100755 diff --git a/other_things/irc-old-save/init.lua b/other_things/irc-old-save/init.lua old mode 100644 new mode 100755 diff --git a/other_things/irc-old-save/irc/.gitignore b/other_things/irc-old-save/irc/.gitignore old mode 100644 new mode 100755 diff --git a/other_things/irc-old-save/irc/LICENSE.txt b/other_things/irc-old-save/irc/LICENSE.txt old mode 100644 new mode 100755 diff --git a/other_things/irc-old-save/irc/README.markdown b/other_things/irc-old-save/irc/README.markdown old mode 100644 new mode 100755 diff --git a/other_things/irc-old-save/irc/asyncoperations.lua b/other_things/irc-old-save/irc/asyncoperations.lua old mode 100644 new mode 100755 diff --git a/other_things/irc-old-save/irc/doc/irc.luadoc b/other_things/irc-old-save/irc/doc/irc.luadoc old mode 100644 new mode 100755 diff --git a/other_things/irc-old-save/irc/handlers.lua b/other_things/irc-old-save/irc/handlers.lua old mode 100644 new mode 100755 diff --git a/other_things/irc-old-save/irc/init.lua b/other_things/irc-old-save/irc/init.lua old mode 100644 new mode 100755 diff --git a/other_things/irc-old-save/irc/main.lua b/other_things/irc-old-save/irc/main.lua old mode 100644 new mode 100755 diff --git a/other_things/irc-old-save/irc/messages.lua b/other_things/irc-old-save/irc/messages.lua old mode 100644 new mode 100755 index 2f753edc..8fa9fa5c --- a/other_things/irc-old-save/irc/messages.lua +++ b/other_things/irc-old-save/irc/messages.lua @@ -103,6 +103,12 @@ function msg_meta:fromRFC1459(line) local pos self.command, pos = line:match("(%S+)()") + -- /MFF BEGIN + if not pos then + minetest.log("error", "[IRC] This crash message was intended to see the value of a breaking variable. line = " .. (line or "nil")) + return + end + -- /MFF END (Mg|06/01/2015) line = line:sub(pos) self.args = self.args or {} diff --git a/other_things/irc-old-save/irc/push-luadoc.sh b/other_things/irc-old-save/irc/push-luadoc.sh old mode 100644 new mode 100755 diff --git a/other_things/irc-old-save/irc/set.lua b/other_things/irc-old-save/irc/set.lua old mode 100644 new mode 100755 diff --git a/other_things/irc-old-save/irc/util.lua b/other_things/irc-old-save/irc/util.lua old mode 100644 new mode 100755 diff --git a/other_things/irc-old-save/messages.lua b/other_things/irc-old-save/messages.lua old mode 100644 new mode 100755 diff --git a/other_things/irc-old-save/player_part.lua b/other_things/irc-old-save/player_part.lua old mode 100644 new mode 100755 diff --git a/other_things/irc-old-save/unix.so b/other_things/irc-old-save/unix.so old mode 100644 new mode 100755 diff --git a/other_things/logos/README.md b/other_things/logos/README.md old mode 100644 new mode 100755 diff --git a/other_things/logos/logo.png b/other_things/logos/logo.png old mode 100644 new mode 100755 diff --git a/other_things/logos/logo2.png b/other_things/logos/logo2.png old mode 100644 new mode 100755 diff --git a/other_things/logos/logo3.png b/other_things/logos/logo3.png old mode 100644 new mode 100755 diff --git a/other_things/logos/logo4.png b/other_things/logos/logo4.png old mode 100644 new mode 100755 diff --git a/other_things/logos/logo5.png b/other_things/logos/logo5.png old mode 100644 new mode 100755 diff --git a/other_things/minetestmapper-improved/README.md b/other_things/minetestmapper-improved/README.md old mode 100644 new mode 100755 diff --git a/other_things/minetestmapper-improved/colors(mientestmapper-need-merged-in-main-file).txt b/other_things/minetestmapper-improved/colors(mientestmapper-need-merged-in-main-file).txt old mode 100644 new mode 100755 diff --git a/other_things/minetestmapper-improved/colors(vanessae-main-file).txt b/other_things/minetestmapper-improved/colors(vanessae-main-file).txt old mode 100644 new mode 100755 diff --git a/other_things/shields_inv_shield_mithril_lapin.png b/other_things/shields_inv_shield_mithril_lapin.png old mode 100644 new mode 100755 diff --git a/other_things/unused_sounds/Monstreloup.ogg b/other_things/unused_sounds/Monstreloup.ogg old mode 100644 new mode 100755 diff --git a/other_things/unused_sounds/Obani - interlude.ogg b/other_things/unused_sounds/Obani - interlude.ogg old mode 100644 new mode 100755 diff --git a/other_things/unused_sounds/event.ogg b/other_things/unused_sounds/event.ogg old mode 100644 new mode 100755 diff --git a/other_things/unused_sounds/hit_hunger1.ogg b/other_things/unused_sounds/hit_hunger1.ogg old mode 100644 new mode 100755 diff --git a/other_things/unused_sounds/hit_hunger2.ogg b/other_things/unused_sounds/hit_hunger2.ogg old mode 100644 new mode 100755 diff --git a/other_things/unused_sounds/monstre.ogg b/other_things/unused_sounds/monstre.ogg old mode 100644 new mode 100755 diff --git a/other_things/unused_sounds/randomsound.ogg b/other_things/unused_sounds/randomsound.ogg old mode 100644 new mode 100755 diff --git a/other_things/update_sources.txt b/other_things/update_sources.txt old mode 100644 new mode 100755 diff --git a/other_things/équilibrage armures.txt b/other_things/équilibrage armures.txt deleted file mode 100644 index bce760cf..00000000 --- a/other_things/équilibrage armures.txt +++ /dev/null @@ -1,29 +0,0 @@ -wood chest / leggs boot / helmet / shield - enchanted => total (approximatif) - 3 + 3 1 + 1 + 3 - 4 => 6 + 4 = 11(12) => réduction 1 unité / 0.5 coeur - -cactus chest / leggs boot / helmet / shield - enchanted => total - 4 + 4 1.5 + 1.5 + 3 - 4 => 8 + 5 = 14(15) => réduction 1 unité / 0.5 coeur - -steel chest / leggs boot / helmet / shield => total - 5 + 5 2 + 2 + 3 => 10 + 7 = 18 => réduction 1 unité / 0.5 coeur - - - - -bronze chest / leggs boot / helmet / shield => total - 5.5 + 5.5 2.5 + 2.5 + 5 => 11 + 9 = 21 => réduction 2 unités / 1 coeur - -gold chest / leggs boot / helmet / shield => total - 7 + 7 3 + 3 + 6 => 14 + 11 = 26 => réduction 2 unités / 1 coeur - - - - -diamond chest / leggs boot / helmet / shield => total - 8 + 8 4 + 4 + 7 => 16 + 14 = 31 => réduction 3 unités / 1.5 coeur - - - - -mithril chest / leggs boot / helmet / shield => total - 11 + 11 5 + 5 + 9 => 22 + 18 = 41 => réduction 4 unités / 2 coeurs \ No newline at end of file diff --git a/worlds/minetestforfun/forbidden_names.txt b/worlds/minetestforfun/forbidden_names.txt old mode 100644 new mode 100755 diff --git a/worlds/minetestforfun/moretrees_settings.txt b/worlds/minetestforfun/moretrees_settings.txt old mode 100644 new mode 100755 diff --git a/worlds/minetestforfun/news.txt b/worlds/minetestforfun/news.txt old mode 100644 new mode 100755 index dad2292c..13a311bc --- a/worlds/minetestforfun/news.txt +++ b/worlds/minetestforfun/news.txt @@ -1,17 +1,46 @@ News de FR - MinetestForFun (Survival - PVP - Hardcore) ---Bientôt--- -/!\ Le serveur étant devenu extrêmement stable, les MAJ vont ce rarifier pour un temps /!\ -/!\ En effet, nous profitons de cette stabilité pour préparer une grosse MAJ qui boulversera à jamais le gameplay de Minetest /!\ +/!\ Le serveur étant devenu stable, les MAJs vont se rarifier pour un temps /!\ +/!\ En effet, nous profitons de cette stabilitée pour préparer une grosse MAJ qui boulversera à jamais le gameplay de Minetest /!\ + +---01/06/2015--- (Remerciements : Mg, Obani, Ataron) +MAJ de "/MFF_subgame/flowers" (ajustement des collision_box) +MAJ de "/MFF_subgame/default/textures" (les outils Sword/Axe/Shovel en Wood/Stone/Steel ont une nouvelle texture en 32px - dite nous ce que vous en pensez ! :)-) +MAJ de "mobs" (les objets "Minotaur Eye" et "Minotaur Horn" ont maintenant une texture) +MAJ de "invtweak" (crashfix) +MAJ de "3d_armor" (préparatif pour diverses futures armures) +MAJ de "death_messages" (Ajout de messages de mort dans le sable mouvant et pour les autres morts) +MAJ de "solarmana" (Debug de la valeur de lumière du soleil nécessaire pour enclencher la régénération de mana) +MAJ de "/MFF_subgame/screwdriver" (Debug du "Mithril Screwdriver") +MAJ de "homedecor_modpack" et "plantlife" (déplacement du flower_potted dans plantlife, aucun meshe ne manque mainteannt, et toujours plus de textures en meshe, renommage du gold coin de homedecor pour que ça fonction soit plus compréhensible - utilisable uniquement pour activer la machine tetris et soda -) +MAJ de "mobs (réduction de 50% du spawn des Sand Monster dans les déserts/desert_sand, et la chèvre attaque le joueur si elles sont attaqués) +MAJ de "/MFF_subgame/crafting.lua" (les crafts/uncrafts de sand<=>desert_sand et gravel=>cobble, sont de nouveaux disponibles) +MAJ de "mobs" (possibilité d'ajouter des armes aux monstres, les monstres endommagés ne voient plus leur vie restauré si le chunck est déchargé puis rechargé, et amélioration du code) +MAJ de "hud/hunger.lua" (ajout des valeurs de nutritions des haricots/beans) + +---27/05/2015--- (Remerciements : Mg, Obani, Ataron) +MAJ de "/_misc/whoison" ("/timeonline" à maintenant un alias "/played", libre à vous de l'utiliser) +MAJ de "bobblocks" (grosse amélioration du code par HybridDog) +MAJ de "/MFF_subgame/node.lua" (ajout du sable mouvant/quicksand et du sceau de sable/bucket_sand, le craft gravel->sand est de nouveau disponible) +MAJ de "/MFF_subgame/boats" (meilleurs textures dans l'inventaire et amélioration du "Expert Boat" pour qu'il tourne plus vite) +MAJ de "homedecor" (encore plus de meshe, meileur textures dans l'inventaire) +MAJ de "nether" (amélioration du code) +MAJ de "maptools" (petit nettoyage) +MAJ de "ambiance" (petit nettoyage) +MAJ de "farming" (les plantes de ce mod poussent même si un joueur n'est pas â coté) +MAJ de "mobs" (le knockback à été supprimé pour les monstres Minotaur, Dungeon Master, Big Lava Slime et Big Green Slime) +MAJ de "riesenpilz" (les champignons – uniquement esthétique – de ce mod ont vu leurs spawnent réduit de 4 fois) ---22/05/2015--- (Remerciements : Gael-de-Sailly, Crabman, Ataron, Obani, Mg, Le_Docteur) +Ajout du mod "solarmana" (la mana ne se recharge plus qu'au contact direct de la lumière du soleil où lorsque le joueur se tient sur de l'or, du bois, ou des minerais, par exemple. Un tableau sera bientôt disponible sur le site dans la section "liste des mods" pour consulter les minerais permettant la régénération de mana) MAJ de "mobs" (énormément d'amélioration général de l'intelligence des monstres, ajout en beta d'une intégration des monstres nageants et volants, nombreux bugfix, ajout du propriétaire sur les monstres apprivoisés - ils ne peuvent donc plus être volé -, les monstres peuvent maintenant marcher sur les demi-dalles, amélioration du code des explosions) Ajout de "/misc/list_players" ("/list_players" ou son alias "/players" est une commande pour afficher la liste des joueurs connectés de façon plus propre que "/status") Ajout du mod "dumpnodes mod" (permet à l'admin de générer les couleurs des cubes pour la worldmap du serveur) MAJ de "worldedit" (amélioration du code) MAJ de "nether" (bugfix du problème de mapgen que nous avons rencontré) MAJ de "whoison" (plus précis dans les données sorties) -Ajout du mod "compassgps" (une boussole, avec possibilité d'enregistrer des positions, différentes textures de boussoles disponibles) +Ajout du mod "compassgps" (une boussole, avec possibilité d'enregistrer des positions, différentes textures de boussoles disponibles) Ajout du mod "worldedge" (quand vous atteingnez le bout de la carte, vous êtes téléporté à l'autre bout "logique" de la carte, à la façon du jeu "snake") MAJ de "mobs" (ajout des bouses/dungs - rare - pour les vaches/cows, elles peuvent être utilisées comme combustible) MAJ de "mobs" (modification des drops de "coins", uniquement "des fois" des silver_coins maintenant, les creeper ne droppent plus de coins, le Minotaur et le Yeti sont maintenant 100% fonctionnels) @@ -69,8 +98,8 @@ MAJ de "connected_chests" (amélioration du code) ---13/04/2015--- (Remerciements : Crabman, Mg) MAJ de "mobs" (Les NPCs vous suivent et protègent uniquement si vous leur donnez 4 diamants - avec un clique droit -) -MAJ de "mesecons" (retour à la version antéireure fonctionnelle tant que la dernière version à son problème avec les portes/doors) -MAJ de "hud" et "hunger" (retour à la version 1.4 fonctionnelle tant que la version 2.1.x n'est pas stable) +MAJ de "mesecons" (retour à la version antéireure fonctionnelle tant que la dernière version à son problème avec les portes/doors) +MAJ de "hud" et "hunger" (retour à la version 1.4 fonctionnelle tant que la version 2.1.x n'est pas stable) ---12/04/2015--- (Remerciements : Mg, Crabman) MAJ de "mobs" (Nouveaux objets nécessaires pour appater les npcs, npcs qui disparaissent après 10 minutes si non apprivoisés) @@ -132,7 +161,7 @@ MAJ de "builtin_item" (amélioration du code) ---28/03/2015--- (Remerciements : Mg, Crabman) MAJ de "tsm_pyramids" (crashfix) MAJ de "fail" (petite améliortion du code) -MAJ de "soundset" (ajout d'un menu dans l'inventaire pour modifier graphiquement le volume de la musique et des sons d'ambiances du serveur) +MAJ de "soundset" (ajout d'un menu dans l'inventaire pour modifier graphiquement le volume de la musique et des sons d'ambiances du serveur) MAJ de "mobs" (Le taux de spawn de la plupart des monstres à été ajusté, les valeurs suivantes sont approximatives : "Lava Flan -13%, Sand Monster -50%, Spider -13%, Creeper -33%, Mese Monster -15%, Stone Monster -29%, Oerkki -7%, Dungeon Master +18%, Rat +11%, Bee -33%, Kiten +15%, Bunny +15%, Chicken +10%, Sheep -5%, Warthog -10%, NPC -5%". Des suites de ces valeurs, il y a autant de chance de trouver tous les animaux passif à la surface exception pour les NPCs qui sont deux fois plus rare. Aussi, Vous avez une chance égal en Cavernes de tomber contre Oerkki, Stone Monster, Mese Monster et Dungeon Master. Enfin, Vous vous ferez agresser un peu moins souvent dans la jungle.) ---26/03/2015--- (Remerciements : Ataron, Crabman, Mg) @@ -234,7 +263,7 @@ MAJ de "mobs" (ajout d'un son pour les loups) MAJ de "mobs" (bugfix des loups) MAJ de "MFF_game" (nouvelle texture de feu pour le four/furnace, ajout de Obsidian/Obsidian brick stairs & slabs, bugfix/amélioration mgv5/mgv7, crashfix) MAJ de "maptools" (bugfix des fences/rails unbreakable) -MAJ de "MFF_game" (beaucoup de textures modifiés - lingots, minerais, rails -, vous coulez dans l'eau plus doucement, recette mossycobble=>stone après un passage au four/furnace) +MAJ de "MFF_game" (beaucoup de textures modifiés - lingots, minerais, rails -, vous coulez dans l'eau plus doucement, recette mossycobble=>stone après un passage au four/furnace) MAJ de "MFF_game/mods/default/commands.lua" (crashfix de l'infotool) MAJ de "MFF_game/mods/door" (optimisation et amélioration du code) MAJ de "MFF_game/mods/bucket" (quand un bucket vide est remplit il est jeté au sol si votre inventaire est plain et non détruit comme auparavant) @@ -364,7 +393,7 @@ MAJ de "riesenpilz" (modification de la texture) MAJ de "homedecor" (bugfix sur les itenframes s'ils sont cassés ou world-édités) MAJ de "chatlog" (les commandes échoués n'apparaîtront plus dans le chat, visible de tous) MAJ de "carts" (bugfix pouvant entrainer un crash du servuer) -MAJ de "la plupart des mods" (résolution des variables globales) +MAJ de "la plupart des mods" (résolution des variables globales) MAJ de "misc/noshout_messages" (debug, s'affiche correctement désormais) MAJ de "future_ban" (bugfix) MAJ de "pipeworks" (toutes les textures sont maintenant en meshe) @@ -594,7 +623,7 @@ Ajout du mod "sprint" (appuyez deux fois sur votre touche avancer avec 0.5sec d' ---10/11/2014--- -MAJ de "_misc/irc.init" (finalisation du mod, les nouveaux joueurs doivent taper "/irc" pour pouvoir communiquer avec les autres joueurs, les anciens joueurs n’ont pas besoin de faire cela cependant, nous vous conseillons fortement de faire cette commande pour vous informer des règles de l’irc) +MAJ de "_misc/irc.init" (finalisation du mod, les nouveaux joueurs doivent taper "/irc" pour pouvoir communiquer avec les autres joueurs, les anciens joueurs n’ont pas besoin de faire cela cependant, nous vous conseillons fortement de faire cette commande pour vous informer des règles de l’irc) ---09/11/2014--- Ajout du mod "coloredwood" (bois/barrière de toute les couleurs, grâce au colorants, compatible avec la colormachine) @@ -664,7 +693,7 @@ Ajout du mod "sponge" (ajout d'une ponge craftable, comme dans minecr**t celle c MAJ de "dropondie" (ré-ajout d'une portion de code pour le bugfix des items qui ce restaure quand vous mourrez et les re-ramassez) MAJ de "minetestforfun_game"(nettoyage du code des tree/jungletree, des doors et des trapdoors par Calinou) MAJ de "snowdrift" (la quantité et fréquence de la neige entrainait du lag coté client, la quantité de neige à été divisé par deux, et la fréquence par trois pour y remédier) -Ajout du mod "highlandpools" (des lacs et rivières ce formeront désormais parfois au dessus du niveau de l'eau dans les nouvelles régions générées) +Ajout du mod "highlandpools" (des lacs et rivières ce formeront désormais parfois au dessus du niveau de l'eau dans les nouvelles régions générées) MAJ de "maptools" (ajustement esthétique du code) MAJ de "minetestforfun_game" (certains minerais rare, à savoir, les gold coin, le mese et le diamant, luisent/brillent désormais dans le noir) MAJ de "nether" (les comandes "/to_hell" et "/from_hell" ont été supprimés) @@ -852,7 +881,7 @@ Nouvelle "default" animation lors du cassage d'un bloque (avec plus de FPS) Ajout du mod "craft obsidian" (à partir d'un "lava_bucket") MAJ farming (bugs fix) MAJ de MinetestForFun_game (nouveaux craft : les "dry shrub"/buisson sec du désert, ce transforme en stick 1 pour 1, le "clay" ce stack maintenant par 200, les "empty_bucket" ce groupe par 100, les "stick" ce groupe par 1000, les "torch" ce craft par 5) -MAJ de screwdriver (avec un clique gauche la texture ce tourne, tandis qu'avec un clique droit le cube ce tourne) +MAJ de screwdriver (avec un clique gauche la texture ce tourne, tandis qu'avec un clique droit le cube ce tourne) ---01/09/2014--- Ajout du mod "Framed_glass" (extraction de technic, ajout notamment de "framed_steel_glass" colorés) diff --git a/worlds/minetestforfun/random_messages b/worlds/minetestforfun/random_messages old mode 100644 new mode 100755 diff --git a/worlds/minetestforfun/world.mt b/worlds/minetestforfun/world.mt old mode 100644 new mode 100755