From deeaa98c1694d020b130832d20fb02669cd47329 Mon Sep 17 00:00:00 2001 From: Ombridride Date: Mon, 20 Apr 2015 23:12:05 +0200 Subject: [PATCH] Resolve problems --- .../mobs-master-TenPlus1}/README.txt | 0 .../mobs-master-TenPlus1/api.lua | 0 .../mobs-master-TenPlus1}/bee.lua | 0 .../mobs-master-TenPlus1}/bunny.lua | 0 .../mobs-master-TenPlus1}/chicken.lua | 0 .../mobs-master-TenPlus1}/cow.lua | 0 .../mobs-master-TenPlus1}/creeper.lua | 0 .../mobs-master-TenPlus1}/depends.txt | 0 .../mobs-master-TenPlus1}/dirtmonster.lua | 0 .../mobs-master-TenPlus1/dungeonmaster.lua | 0 .../mobs-master-TenPlus1}/greenslimes.lua | 0 .../mobs-master-TenPlus1}/init.lua | 0 .../mobs-master-TenPlus1}/kitten.lua | 0 .../mobs-master-TenPlus1}/lava_flan.lua | 0 .../mobs-master-TenPlus1}/lavaslimes.lua | 0 .../mobs-master-TenPlus1}/license.txt | 0 .../mobs-master-TenPlus1}/mese_monster.lua | 0 .../models/character.b3d | Bin .../mobs-master-TenPlus1}/models/mobs_bee.x | 0 .../models/mobs_bunny.b3d | Bin .../models/mobs_chicken.x | 0 .../mobs-master-TenPlus1}/models/mobs_cow.x | 0 .../models/mobs_dungeon_master.x | 0 .../models/mobs_kitten.b3d | Bin .../models/mobs_oerkki.x | 0 .../mobs-master-TenPlus1}/models/mobs_pumba.x | 0 .../mobs-master-TenPlus1}/models/mobs_rat.x | 0 .../models/mobs_sand_monster.x | 0 .../mobs-master-TenPlus1}/models/mobs_sheep.x | 0 .../models/mobs_sheep_shaved.x | 0 .../models/mobs_spider.x | 0 .../models/mobs_stone_monster.x | 0 .../models/mobs_tree_monster.x | 0 .../mobs-master-TenPlus1}/models/mobs_wolf.x | 0 .../models/zmobs_lava_flan.x | 0 .../models/zmobs_mese_monster.x | 0 .../mobs-master-TenPlus1}/npc.lua | 0 .../mobs-master-TenPlus1}/oerkki.lua | 0 .../mobs-master-TenPlus1}/rat.lua | 0 .../mobs-master-TenPlus1}/sandmonster.lua | 0 .../mobs-master-TenPlus1}/sheep.lua | 0 .../mobs-master-TenPlus1}/sounds/mobs_bee.ogg | Bin .../sounds/mobs_chicken.ogg | Bin .../mobs-master-TenPlus1}/sounds/mobs_cow.ogg | Bin .../sounds/mobs_dirtmonster.1.ogg | Bin .../sounds/mobs_dirtmonster.2.ogg | Bin .../sounds/mobs_dungeonmaster.1.ogg | Bin .../sounds/mobs_dungeonmaster.2.ogg | Bin .../sounds/mobs_dungeonmaster.3.ogg | Bin .../sounds/mobs_eerie.ogg | Bin .../sounds/mobs_fireball.ogg | Bin .../sounds/mobs_howl.ogg | Bin .../sounds/mobs_kitten.1.ogg | Bin .../sounds/mobs_kitten.2.ogg | Bin .../sounds/mobs_kitten.3.ogg | Bin .../sounds/mobs_kitten.4.ogg | Bin .../sounds/mobs_kitten.5.ogg | Bin .../sounds/mobs_kitten.6.ogg | Bin .../sounds/mobs_lavaflan.1.ogg | Bin .../sounds/mobs_lavaflan.2.ogg | Bin .../sounds/mobs_mesemonster.1.ogg | Bin .../sounds/mobs_mesemonster.2.ogg | Bin .../sounds/mobs_oerkki.1.ogg | Bin .../sounds/mobs_oerkki.2.ogg | Bin .../sounds/mobs_oerkki_attack.ogg | Bin .../mobs-master-TenPlus1}/sounds/mobs_pig.ogg | Bin .../sounds/mobs_pig_angry.ogg | Bin .../sounds/mobs_rat.1.ogg | Bin .../sounds/mobs_rat.2.ogg | Bin .../sounds/mobs_sandmonster.1.ogg | Bin .../sounds/mobs_sandmonster.2.ogg | Bin .../sounds/mobs_sheep.ogg | Bin .../sounds/mobs_slimes_attack.ogg | Bin .../sounds/mobs_slimes_damage.ogg | Bin .../sounds/mobs_slimes_death.ogg | Bin .../sounds/mobs_slimes_jump.ogg | Bin .../sounds/mobs_spider.ogg | Bin .../sounds/mobs_spider_attack.ogg | Bin .../sounds/mobs_stonemonster.1.ogg | Bin .../sounds/mobs_stonemonster.2.ogg | Bin .../sounds/mobs_stonemonster_attack.ogg | Bin .../sounds/mobs_treemonster.1.ogg | Bin .../sounds/mobs_treemonster.2.ogg | Bin .../sounds/mobs_wolf.ogg | Bin .../sounds/tnt_explode.ogg | Bin .../mobs-master-TenPlus1}/spider.lua | 0 .../mobs-master-TenPlus1}/stonemonster.lua | 0 .../textures/jeija_glue.png | Bin .../textures/mobs_bee.png | Bin .../textures/mobs_bee_inv.png | Bin .../textures/mobs_beehive.png | Bin .../textures/mobs_blood.png | Bin .../textures/mobs_bucket_milk.png | Bin .../textures/mobs_bunny_brown.png | Bin .../textures/mobs_bunny_grey.png | Bin .../textures/mobs_bunny_inv.png | Bin .../textures/mobs_bunny_white.png | Bin .../textures/mobs_cheese.png | Bin .../textures/mobs_cheeseblock.png | Bin .../textures/mobs_chick.png | Bin .../textures/mobs_chicken.png | Bin .../textures/mobs_chicken_black.png | Bin .../textures/mobs_chicken_cooked.png | Bin .../textures/mobs_chicken_egg.png | Bin .../textures/mobs_chicken_egg_fried.png | Bin .../textures/mobs_chicken_inv.png | Bin .../textures/mobs_chicken_raw.png | Bin .../textures/mobs_cobweb.png | Bin .../textures/mobs_cooked_rat.png | Bin .../textures/mobs_cow.png | Bin .../textures/mobs_cow_brown.png | Bin .../textures/mobs_creeper.png | Bin .../textures/mobs_creeper_inv.png | Bin .../textures/mobs_dirt_monster.png | Bin .../textures/mobs_dungeon_master.png | Bin .../mobs_dungeon_master_cobblestone.png | Bin .../textures/mobs_dungeon_master_fireball.png | Bin .../mobs_dungeon_master_fireball_back.png | Bin .../mobs_dungeon_master_strangewhite.png | Bin .../textures/mobs_fireball.png | Bin .../textures/mobs_green_slime_blood.png | Bin .../textures/mobs_green_slime_bottom.png | Bin .../textures/mobs_green_slime_egg.png | Bin .../textures/mobs_green_slime_front.png | Bin .../textures/mobs_green_slime_sides.png | Bin .../textures/mobs_green_slime_top.png | Bin .../textures/mobs_honey_block.png | Bin .../textures/mobs_honey_inv.png | Bin .../textures/mobs_kitten_ginger.png | Bin .../textures/mobs_kitten_inv.png | Bin .../textures/mobs_kitten_sandy.png | Bin .../textures/mobs_kitten_splotchy.png | Bin .../textures/mobs_kitten_striped.png | Bin .../textures/mobs_lava_slime_blood.png | Bin .../textures/mobs_lava_slime_bottom.png | Bin .../textures/mobs_lava_slime_egg.png | Bin .../textures/mobs_lava_slime_front.png | Bin .../textures/mobs_lava_slime_sides.png | Bin .../textures/mobs_lava_slime_top.png | Bin .../textures/mobs_leather.png | Bin .../textures/mobs_magic_lasso.png | Bin .../textures/mobs_meat.png | Bin .../textures/mobs_meat_raw.png | Bin .../textures/mobs_npc.png | Bin .../textures/mobs_oerkki.png | Bin .../textures/mobs_oerkki2.png | Bin .../textures/mobs_pork_cooked.png | Bin .../textures/mobs_pork_raw.png | Bin .../textures/mobs_pumba.png | Bin .../textures/mobs_rat.png | Bin .../textures/mobs_rat_brown.png | Bin .../textures/mobs_rat_inventory.png | Bin .../textures/mobs_sand_monster.png | Bin .../textures/mobs_shears.png | Bin .../textures/mobs_sheep.png | Bin .../textures/mobs_sheep_shaved.png | Bin .../textures/mobs_spider.png | Bin .../textures/mobs_stone_monster.png | Bin .../textures/mobs_tree_monster.png | Bin .../textures/mobs_wolf.png | Bin .../textures/mobs_wolf_inv.png | Bin .../mobs-master-TenPlus1}/textures/oerkki.png | Bin .../textures/tnt_smoke.png | Bin .../textures/zmobs_egg_lava_flan.png | Bin .../textures/zmobs_egg_mese_monster.png | Bin .../textures/zmobs_lava_flan.png | Bin .../textures/zmobs_lava_orb.png | Bin .../textures/zmobs_mese_monster.png | Bin .../mobs-master-TenPlus1}/treemonster.lua | 0 .../mobs-master-TenPlus1}/warthog.lua | 0 .../mobs-master-TenPlus1}/wolf.lua | 0 .../mobs-mff}/README.txt | 0 .../mobs-MFF => maj-mobs/mobs-mff}/api.lua | 0 .../mobs-mff}/bee.lua | 0 .../mobs-mff}/bunny.lua | 0 .../mobs-mff}/chicken.lua | 0 .../mobs-mff}/cow.lua | 0 .../mobs-mff}/creeper.lua | 0 .../mobs-mff}/depends.txt | 0 .../mobs-mff}/dirtmonster.lua | 0 .../mobs-mff}/dungeonmaster.lua | 0 .../mobs-mff}/greenslimes.lua | 0 .../mobs-mff}/init.lua | 0 .../mobs-mff}/kitten.lua | 0 .../mobs-mff}/lava_flan.lua | 0 .../mobs-mff}/lavaslimes.lua | 0 .../mobs-mff}/license.txt | 0 .../mobs-mff}/mese_monster.lua | 0 .../mobs-mff}/models/character.b3d | Bin .../mobs-mff}/models/mobs_bee.x | 0 .../mobs-mff}/models/mobs_bunny.b3d | Bin .../mobs-mff}/models/mobs_chicken.x | 0 .../mobs-mff}/models/mobs_cow.x | 0 .../mobs-mff}/models/mobs_dungeon_master.x | 0 .../mobs-mff}/models/mobs_kitten.b3d | Bin .../mobs-mff}/models/mobs_oerkki.x | 0 .../mobs-mff}/models/mobs_pumba.x | 0 .../mobs-mff}/models/mobs_rat.x | 0 .../mobs-mff}/models/mobs_sand_monster.x | 0 .../mobs-mff}/models/mobs_sheep.x | 0 .../mobs-mff}/models/mobs_sheep_shaved.x | 0 .../mobs-mff}/models/mobs_spider.x | 0 .../mobs-mff}/models/mobs_stone_monster.x | 0 .../mobs-mff}/models/mobs_tree_monster.x | 0 .../mobs-mff}/models/mobs_wolf.x | 0 .../mobs-mff}/models/zmobs_lava_flan.x | 0 .../mobs-mff}/models/zmobs_mese_monster.x | 0 .../mobs-mff}/npc.lua | 0 .../mobs-mff}/oerkki.lua | 0 .../mobs-mff}/rat.lua | 0 .../mobs-mff}/sandmonster.lua | 0 .../mobs-mff}/sheep.lua | 0 .../mobs-mff}/sounds/mobs_bee.ogg | Bin .../mobs-mff}/sounds/mobs_chicken.ogg | Bin .../mobs-mff}/sounds/mobs_cow.ogg | Bin .../mobs-mff}/sounds/mobs_dirtmonster.1.ogg | Bin .../mobs-mff}/sounds/mobs_dirtmonster.2.ogg | Bin .../mobs-mff}/sounds/mobs_dungeonmaster.1.ogg | Bin .../mobs-mff}/sounds/mobs_dungeonmaster.2.ogg | Bin .../mobs-mff}/sounds/mobs_dungeonmaster.3.ogg | Bin .../mobs-mff}/sounds/mobs_eerie.ogg | Bin .../mobs-mff}/sounds/mobs_fireball.ogg | Bin .../mobs-mff}/sounds/mobs_howl.ogg | Bin .../mobs-mff}/sounds/mobs_kitten.1.ogg | Bin .../mobs-mff}/sounds/mobs_kitten.2.ogg | Bin .../mobs-mff}/sounds/mobs_kitten.3.ogg | Bin .../mobs-mff}/sounds/mobs_kitten.4.ogg | Bin .../mobs-mff}/sounds/mobs_kitten.5.ogg | Bin .../mobs-mff}/sounds/mobs_kitten.6.ogg | Bin .../mobs-mff}/sounds/mobs_lavaflan.1.ogg | Bin .../mobs-mff}/sounds/mobs_lavaflan.2.ogg | Bin .../mobs-mff}/sounds/mobs_mesemonster.1.ogg | Bin .../mobs-mff}/sounds/mobs_mesemonster.2.ogg | Bin .../mobs-mff}/sounds/mobs_oerkki.1.ogg | Bin .../mobs-mff}/sounds/mobs_oerkki.2.ogg | Bin .../mobs-mff}/sounds/mobs_oerkki_attack.ogg | Bin .../mobs-mff}/sounds/mobs_pig.ogg | Bin .../mobs-mff}/sounds/mobs_pig_angry.ogg | Bin .../mobs-mff}/sounds/mobs_rat.1.ogg | Bin .../mobs-mff}/sounds/mobs_rat.2.ogg | Bin .../mobs-mff}/sounds/mobs_sandmonster.1.ogg | Bin .../mobs-mff}/sounds/mobs_sandmonster.2.ogg | Bin .../mobs-mff}/sounds/mobs_sheep.ogg | Bin .../mobs-mff}/sounds/mobs_slimes_attack.ogg | Bin .../mobs-mff}/sounds/mobs_slimes_damage.ogg | Bin .../mobs-mff}/sounds/mobs_slimes_death.ogg | Bin .../mobs-mff}/sounds/mobs_slimes_jump.ogg | Bin .../mobs-mff}/sounds/mobs_spider.ogg | Bin .../mobs-mff}/sounds/mobs_spider_attack.ogg | Bin .../mobs-mff}/sounds/mobs_stonemonster.1.ogg | Bin .../mobs-mff}/sounds/mobs_stonemonster.2.ogg | Bin .../sounds/mobs_stonemonster_attack.ogg | Bin .../mobs-mff}/sounds/mobs_treemonster.1.ogg | Bin .../mobs-mff}/sounds/mobs_treemonster.2.ogg | Bin .../mobs-mff}/sounds/mobs_wolf.ogg | Bin .../mobs-mff}/sounds/tnt_explode.ogg | Bin .../mobs-mff}/spider.lua | 0 .../mobs-mff}/stonemonster.lua | 0 .../mobs-mff}/textures/jeija_glue.png | Bin .../mobs-mff}/textures/mobs_bee.png | Bin .../mobs-mff}/textures/mobs_bee_inv.png | Bin .../mobs-mff}/textures/mobs_beehive.png | Bin .../mobs-mff}/textures/mobs_blood.png | Bin .../mobs-mff}/textures/mobs_bucket_milk.png | Bin .../mobs-mff}/textures/mobs_bunny_brown.png | Bin .../mobs-mff}/textures/mobs_bunny_grey.png | Bin .../mobs-mff}/textures/mobs_bunny_inv.png | Bin .../mobs-mff}/textures/mobs_bunny_white.png | Bin .../mobs-mff}/textures/mobs_cheese.png | Bin .../mobs-mff}/textures/mobs_cheeseblock.png | Bin .../mobs-mff}/textures/mobs_chick.png | Bin .../mobs-mff}/textures/mobs_chicken.png | Bin .../mobs-mff}/textures/mobs_chicken_black.png | Bin .../textures/mobs_chicken_cooked.png | Bin .../mobs-mff}/textures/mobs_chicken_egg.png | Bin .../textures/mobs_chicken_egg_fried.png | Bin .../mobs-mff}/textures/mobs_chicken_inv.png | Bin .../mobs-mff}/textures/mobs_chicken_raw.png | Bin .../mobs-mff}/textures/mobs_cobweb.png | Bin .../mobs-mff}/textures/mobs_cooked_rat.png | Bin .../mobs-mff}/textures/mobs_cow.png | Bin .../mobs-mff}/textures/mobs_cow_brown.png | Bin .../mobs-mff}/textures/mobs_creeper.png | Bin .../mobs-mff}/textures/mobs_creeper_inv.png | Bin .../mobs-mff}/textures/mobs_dirt_monster.png | Bin .../textures/mobs_dungeon_master.png | Bin .../mobs_dungeon_master_cobblestone.png | Bin .../textures/mobs_dungeon_master_fireball.png | Bin .../mobs_dungeon_master_fireball_back.png | Bin .../mobs_dungeon_master_strangewhite.png | Bin .../mobs-mff}/textures/mobs_fireball.png | Bin .../textures/mobs_green_slime_blood.png | Bin .../textures/mobs_green_slime_bottom.png | Bin .../textures/mobs_green_slime_egg.png | Bin .../textures/mobs_green_slime_front.png | Bin .../textures/mobs_green_slime_sides.png | Bin .../textures/mobs_green_slime_top.png | Bin .../mobs-mff}/textures/mobs_honey_block.png | Bin .../mobs-mff}/textures/mobs_honey_inv.png | Bin .../mobs-mff}/textures/mobs_kitten_ginger.png | Bin .../mobs-mff}/textures/mobs_kitten_inv.png | Bin .../mobs-mff}/textures/mobs_kitten_sandy.png | Bin .../textures/mobs_kitten_splotchy.png | Bin .../textures/mobs_kitten_striped.png | Bin .../textures/mobs_lava_slime_blood.png | Bin .../textures/mobs_lava_slime_bottom.png | Bin .../textures/mobs_lava_slime_egg.png | Bin .../textures/mobs_lava_slime_front.png | Bin .../textures/mobs_lava_slime_sides.png | Bin .../textures/mobs_lava_slime_top.png | Bin .../mobs-mff}/textures/mobs_leather.png | Bin .../mobs-mff}/textures/mobs_magic_lasso.png | Bin .../mobs-mff}/textures/mobs_meat.png | Bin .../mobs-mff}/textures/mobs_meat_raw.png | Bin .../mobs-mff}/textures/mobs_npc.png | Bin .../mobs-mff}/textures/mobs_oerkki.png | Bin .../mobs-mff}/textures/mobs_oerkki2.png | Bin .../mobs-mff}/textures/mobs_pork_cooked.png | Bin .../mobs-mff}/textures/mobs_pork_raw.png | Bin .../mobs-mff}/textures/mobs_pumba.png | Bin .../mobs-mff}/textures/mobs_rat.png | Bin .../mobs-mff}/textures/mobs_rat_brown.png | Bin .../mobs-mff}/textures/mobs_rat_inventory.png | Bin .../mobs-mff}/textures/mobs_sand_monster.png | Bin .../mobs-mff}/textures/mobs_shears.png | Bin .../mobs-mff}/textures/mobs_sheep.png | Bin .../mobs-mff}/textures/mobs_sheep_shaved.png | Bin .../mobs-mff}/textures/mobs_spider.png | Bin .../mobs-mff}/textures/mobs_stone_monster.png | Bin .../mobs-mff}/textures/mobs_tree_monster.png | Bin .../mobs-mff}/textures/mobs_wolf.png | Bin .../mobs-mff}/textures/mobs_wolf_inv.png | Bin .../mobs-mff}/textures/oerkki.png | Bin .../mobs-mff}/textures/tnt_smoke.png | Bin .../textures/zmobs_egg_lava_flan.png | Bin .../textures/zmobs_egg_mese_monster.png | Bin .../mobs-mff}/textures/zmobs_lava_flan.png | Bin .../mobs-mff}/textures/zmobs_lava_orb.png | Bin .../mobs-mff}/textures/zmobs_mese_monster.png | Bin .../mobs-mff}/treemonster.lua | 0 .../mobs-mff}/warthog.lua | 0 .../mobs-mff}/wolf.lua | 0 mods/mobs/README.txt | 3 +- mods/mobs/api.lua | 62 +++++++++++++----- mods/mobs/chicken.lua | 2 +- mods/mobs/cow.lua | 2 +- mods/mobs/lava_flan.lua | 2 +- mods/mobs/stonemonster.lua | 2 +- mods/mobs/textures/mobs_shears.png | Bin 292 -> 224 bytes mods/mobs/treemonster.lua | 2 +- 350 files changed, 51 insertions(+), 24 deletions(-) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/README.txt (100%) mode change 100755 => 100644 rename {a merger => maj-mobs}/mobs-master-TenPlus1/api.lua (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/bee.lua (100%) mode change 100755 => 100644 rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/bunny.lua (100%) mode change 100755 => 100644 rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/chicken.lua (100%) mode change 100755 => 100644 rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/cow.lua (100%) mode change 100755 => 100644 rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/creeper.lua (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/depends.txt (100%) mode change 100755 => 100644 rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/dirtmonster.lua (100%) mode change 100755 => 100644 rename {a merger => maj-mobs}/mobs-master-TenPlus1/dungeonmaster.lua (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/greenslimes.lua (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/init.lua (100%) mode change 100755 => 100644 rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/kitten.lua (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/lava_flan.lua (100%) mode change 100755 => 100644 rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/lavaslimes.lua (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/license.txt (100%) mode change 100755 => 100644 rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/mese_monster.lua (100%) mode change 100755 => 100644 rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/models/character.b3d (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/models/mobs_bee.x (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/models/mobs_bunny.b3d (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/models/mobs_chicken.x (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/models/mobs_cow.x (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/models/mobs_dungeon_master.x (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/models/mobs_kitten.b3d (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/models/mobs_oerkki.x (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/models/mobs_pumba.x (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/models/mobs_rat.x (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/models/mobs_sand_monster.x (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/models/mobs_sheep.x (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/models/mobs_sheep_shaved.x (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/models/mobs_spider.x (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/models/mobs_stone_monster.x (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/models/mobs_tree_monster.x (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/models/mobs_wolf.x (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/models/zmobs_lava_flan.x (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/models/zmobs_mese_monster.x (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/npc.lua (100%) mode change 100755 => 100644 rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/oerkki.lua (100%) mode change 100755 => 100644 rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/rat.lua (100%) mode change 100755 => 100644 rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/sandmonster.lua (100%) mode change 100755 => 100644 rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/sheep.lua (100%) mode change 100755 => 100644 rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/sounds/mobs_bee.ogg (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/sounds/mobs_chicken.ogg (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/sounds/mobs_cow.ogg (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/sounds/mobs_dirtmonster.1.ogg (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/sounds/mobs_dirtmonster.2.ogg (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/sounds/mobs_dungeonmaster.1.ogg (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/sounds/mobs_dungeonmaster.2.ogg (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/sounds/mobs_dungeonmaster.3.ogg (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/sounds/mobs_eerie.ogg (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/sounds/mobs_fireball.ogg (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/sounds/mobs_howl.ogg (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/sounds/mobs_kitten.1.ogg (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/sounds/mobs_kitten.2.ogg (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/sounds/mobs_kitten.3.ogg (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/sounds/mobs_kitten.4.ogg (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/sounds/mobs_kitten.5.ogg (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/sounds/mobs_kitten.6.ogg (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/sounds/mobs_lavaflan.1.ogg (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/sounds/mobs_lavaflan.2.ogg (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/sounds/mobs_mesemonster.1.ogg (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/sounds/mobs_mesemonster.2.ogg (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/sounds/mobs_oerkki.1.ogg (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/sounds/mobs_oerkki.2.ogg (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/sounds/mobs_oerkki_attack.ogg (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/sounds/mobs_pig.ogg (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/sounds/mobs_pig_angry.ogg (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/sounds/mobs_rat.1.ogg (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/sounds/mobs_rat.2.ogg (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/sounds/mobs_sandmonster.1.ogg (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/sounds/mobs_sandmonster.2.ogg (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/sounds/mobs_sheep.ogg (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/sounds/mobs_slimes_attack.ogg (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/sounds/mobs_slimes_damage.ogg (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/sounds/mobs_slimes_death.ogg (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/sounds/mobs_slimes_jump.ogg (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/sounds/mobs_spider.ogg (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/sounds/mobs_spider_attack.ogg (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/sounds/mobs_stonemonster.1.ogg (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/sounds/mobs_stonemonster.2.ogg (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/sounds/mobs_stonemonster_attack.ogg (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/sounds/mobs_treemonster.1.ogg (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/sounds/mobs_treemonster.2.ogg (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/sounds/mobs_wolf.ogg (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/sounds/tnt_explode.ogg (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/spider.lua (100%) mode change 100755 => 100644 rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/stonemonster.lua (100%) mode change 100755 => 100644 rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/textures/jeija_glue.png (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/textures/mobs_bee.png (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/textures/mobs_bee_inv.png (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/textures/mobs_beehive.png (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/textures/mobs_blood.png (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/textures/mobs_bucket_milk.png (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/textures/mobs_bunny_brown.png (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/textures/mobs_bunny_grey.png (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/textures/mobs_bunny_inv.png (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/textures/mobs_bunny_white.png (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/textures/mobs_cheese.png (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/textures/mobs_cheeseblock.png (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/textures/mobs_chick.png (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/textures/mobs_chicken.png (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/textures/mobs_chicken_black.png (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/textures/mobs_chicken_cooked.png (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/textures/mobs_chicken_egg.png (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/textures/mobs_chicken_egg_fried.png (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/textures/mobs_chicken_inv.png (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/textures/mobs_chicken_raw.png (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/textures/mobs_cobweb.png (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/textures/mobs_cooked_rat.png (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/textures/mobs_cow.png (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/textures/mobs_cow_brown.png (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/textures/mobs_creeper.png (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/textures/mobs_creeper_inv.png (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/textures/mobs_dirt_monster.png (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/textures/mobs_dungeon_master.png (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/textures/mobs_dungeon_master_cobblestone.png (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/textures/mobs_dungeon_master_fireball.png (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/textures/mobs_dungeon_master_fireball_back.png (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/textures/mobs_dungeon_master_strangewhite.png (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/textures/mobs_fireball.png (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/textures/mobs_green_slime_blood.png (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/textures/mobs_green_slime_bottom.png (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/textures/mobs_green_slime_egg.png (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/textures/mobs_green_slime_front.png (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/textures/mobs_green_slime_sides.png (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/textures/mobs_green_slime_top.png (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/textures/mobs_honey_block.png (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/textures/mobs_honey_inv.png (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/textures/mobs_kitten_ginger.png (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/textures/mobs_kitten_inv.png (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/textures/mobs_kitten_sandy.png (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/textures/mobs_kitten_splotchy.png (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/textures/mobs_kitten_striped.png (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/textures/mobs_lava_slime_blood.png (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/textures/mobs_lava_slime_bottom.png (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/textures/mobs_lava_slime_egg.png (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/textures/mobs_lava_slime_front.png (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/textures/mobs_lava_slime_sides.png (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/textures/mobs_lava_slime_top.png (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/textures/mobs_leather.png (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/textures/mobs_magic_lasso.png (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/textures/mobs_meat.png (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/textures/mobs_meat_raw.png (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/textures/mobs_npc.png (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/textures/mobs_oerkki.png (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/textures/mobs_oerkki2.png (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/textures/mobs_pork_cooked.png (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/textures/mobs_pork_raw.png (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/textures/mobs_pumba.png (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/textures/mobs_rat.png (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/textures/mobs_rat_brown.png (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/textures/mobs_rat_inventory.png (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/textures/mobs_sand_monster.png (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/textures/mobs_shears.png (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/textures/mobs_sheep.png (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/textures/mobs_sheep_shaved.png (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/textures/mobs_spider.png (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/textures/mobs_stone_monster.png (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/textures/mobs_tree_monster.png (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/textures/mobs_wolf.png (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/textures/mobs_wolf_inv.png (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/textures/oerkki.png (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/textures/tnt_smoke.png (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/textures/zmobs_egg_lava_flan.png (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/textures/zmobs_egg_mese_monster.png (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/textures/zmobs_lava_flan.png (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/textures/zmobs_lava_orb.png (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/textures/zmobs_mese_monster.png (100%) rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/treemonster.lua (100%) mode change 100755 => 100644 rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/warthog.lua (100%) mode change 100755 => 100644 rename {a merger/mobs-MFF => maj-mobs/mobs-master-TenPlus1}/wolf.lua (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/README.txt (100%) mode change 100644 => 100755 rename {a merger/mobs-MFF => maj-mobs/mobs-mff}/api.lua (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/bee.lua (100%) mode change 100644 => 100755 rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/bunny.lua (100%) mode change 100644 => 100755 rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/chicken.lua (100%) mode change 100644 => 100755 rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/cow.lua (100%) mode change 100644 => 100755 rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/creeper.lua (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/depends.txt (100%) mode change 100644 => 100755 rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/dirtmonster.lua (100%) mode change 100644 => 100755 rename {a merger/mobs-MFF => maj-mobs/mobs-mff}/dungeonmaster.lua (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/greenslimes.lua (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/init.lua (100%) mode change 100644 => 100755 rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/kitten.lua (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/lava_flan.lua (100%) mode change 100644 => 100755 rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/lavaslimes.lua (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/license.txt (100%) mode change 100644 => 100755 rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/mese_monster.lua (100%) mode change 100644 => 100755 rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/models/character.b3d (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/models/mobs_bee.x (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/models/mobs_bunny.b3d (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/models/mobs_chicken.x (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/models/mobs_cow.x (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/models/mobs_dungeon_master.x (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/models/mobs_kitten.b3d (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/models/mobs_oerkki.x (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/models/mobs_pumba.x (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/models/mobs_rat.x (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/models/mobs_sand_monster.x (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/models/mobs_sheep.x (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/models/mobs_sheep_shaved.x (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/models/mobs_spider.x (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/models/mobs_stone_monster.x (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/models/mobs_tree_monster.x (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/models/mobs_wolf.x (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/models/zmobs_lava_flan.x (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/models/zmobs_mese_monster.x (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/npc.lua (100%) mode change 100644 => 100755 rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/oerkki.lua (100%) mode change 100644 => 100755 rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/rat.lua (100%) mode change 100644 => 100755 rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/sandmonster.lua (100%) mode change 100644 => 100755 rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/sheep.lua (100%) mode change 100644 => 100755 rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/sounds/mobs_bee.ogg (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/sounds/mobs_chicken.ogg (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/sounds/mobs_cow.ogg (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/sounds/mobs_dirtmonster.1.ogg (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/sounds/mobs_dirtmonster.2.ogg (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/sounds/mobs_dungeonmaster.1.ogg (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/sounds/mobs_dungeonmaster.2.ogg (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/sounds/mobs_dungeonmaster.3.ogg (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/sounds/mobs_eerie.ogg (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/sounds/mobs_fireball.ogg (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/sounds/mobs_howl.ogg (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/sounds/mobs_kitten.1.ogg (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/sounds/mobs_kitten.2.ogg (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/sounds/mobs_kitten.3.ogg (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/sounds/mobs_kitten.4.ogg (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/sounds/mobs_kitten.5.ogg (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/sounds/mobs_kitten.6.ogg (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/sounds/mobs_lavaflan.1.ogg (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/sounds/mobs_lavaflan.2.ogg (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/sounds/mobs_mesemonster.1.ogg (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/sounds/mobs_mesemonster.2.ogg (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/sounds/mobs_oerkki.1.ogg (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/sounds/mobs_oerkki.2.ogg (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/sounds/mobs_oerkki_attack.ogg (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/sounds/mobs_pig.ogg (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/sounds/mobs_pig_angry.ogg (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/sounds/mobs_rat.1.ogg (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/sounds/mobs_rat.2.ogg (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/sounds/mobs_sandmonster.1.ogg (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/sounds/mobs_sandmonster.2.ogg (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/sounds/mobs_sheep.ogg (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/sounds/mobs_slimes_attack.ogg (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/sounds/mobs_slimes_damage.ogg (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/sounds/mobs_slimes_death.ogg (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/sounds/mobs_slimes_jump.ogg (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/sounds/mobs_spider.ogg (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/sounds/mobs_spider_attack.ogg (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/sounds/mobs_stonemonster.1.ogg (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/sounds/mobs_stonemonster.2.ogg (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/sounds/mobs_stonemonster_attack.ogg (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/sounds/mobs_treemonster.1.ogg (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/sounds/mobs_treemonster.2.ogg (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/sounds/mobs_wolf.ogg (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/sounds/tnt_explode.ogg (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/spider.lua (100%) mode change 100644 => 100755 rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/stonemonster.lua (100%) mode change 100644 => 100755 rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/textures/jeija_glue.png (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/textures/mobs_bee.png (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/textures/mobs_bee_inv.png (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/textures/mobs_beehive.png (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/textures/mobs_blood.png (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/textures/mobs_bucket_milk.png (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/textures/mobs_bunny_brown.png (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/textures/mobs_bunny_grey.png (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/textures/mobs_bunny_inv.png (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/textures/mobs_bunny_white.png (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/textures/mobs_cheese.png (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/textures/mobs_cheeseblock.png (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/textures/mobs_chick.png (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/textures/mobs_chicken.png (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/textures/mobs_chicken_black.png (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/textures/mobs_chicken_cooked.png (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/textures/mobs_chicken_egg.png (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/textures/mobs_chicken_egg_fried.png (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/textures/mobs_chicken_inv.png (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/textures/mobs_chicken_raw.png (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/textures/mobs_cobweb.png (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/textures/mobs_cooked_rat.png (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/textures/mobs_cow.png (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/textures/mobs_cow_brown.png (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/textures/mobs_creeper.png (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/textures/mobs_creeper_inv.png (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/textures/mobs_dirt_monster.png (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/textures/mobs_dungeon_master.png (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/textures/mobs_dungeon_master_cobblestone.png (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/textures/mobs_dungeon_master_fireball.png (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/textures/mobs_dungeon_master_fireball_back.png (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/textures/mobs_dungeon_master_strangewhite.png (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/textures/mobs_fireball.png (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/textures/mobs_green_slime_blood.png (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/textures/mobs_green_slime_bottom.png (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/textures/mobs_green_slime_egg.png (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/textures/mobs_green_slime_front.png (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/textures/mobs_green_slime_sides.png (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/textures/mobs_green_slime_top.png (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/textures/mobs_honey_block.png (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/textures/mobs_honey_inv.png (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/textures/mobs_kitten_ginger.png (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/textures/mobs_kitten_inv.png (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/textures/mobs_kitten_sandy.png (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/textures/mobs_kitten_splotchy.png (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/textures/mobs_kitten_striped.png (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/textures/mobs_lava_slime_blood.png (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/textures/mobs_lava_slime_bottom.png (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/textures/mobs_lava_slime_egg.png (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/textures/mobs_lava_slime_front.png (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/textures/mobs_lava_slime_sides.png (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/textures/mobs_lava_slime_top.png (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/textures/mobs_leather.png (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/textures/mobs_magic_lasso.png (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/textures/mobs_meat.png (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/textures/mobs_meat_raw.png (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/textures/mobs_npc.png (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/textures/mobs_oerkki.png (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/textures/mobs_oerkki2.png (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/textures/mobs_pork_cooked.png (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/textures/mobs_pork_raw.png (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/textures/mobs_pumba.png (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/textures/mobs_rat.png (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/textures/mobs_rat_brown.png (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/textures/mobs_rat_inventory.png (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/textures/mobs_sand_monster.png (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/textures/mobs_shears.png (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/textures/mobs_sheep.png (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/textures/mobs_sheep_shaved.png (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/textures/mobs_spider.png (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/textures/mobs_stone_monster.png (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/textures/mobs_tree_monster.png (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/textures/mobs_wolf.png (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/textures/mobs_wolf_inv.png (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/textures/oerkki.png (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/textures/tnt_smoke.png (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/textures/zmobs_egg_lava_flan.png (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/textures/zmobs_egg_mese_monster.png (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/textures/zmobs_lava_flan.png (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/textures/zmobs_lava_orb.png (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/textures/zmobs_mese_monster.png (100%) rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/treemonster.lua (100%) mode change 100644 => 100755 rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/warthog.lua (100%) mode change 100644 => 100755 rename {a merger/mobs-master-TenPlus1 => maj-mobs/mobs-mff}/wolf.lua (100%) mode change 100755 => 100644 mods/mobs/textures/mobs_shears.png diff --git a/a merger/mobs-MFF/README.txt b/maj-mobs/mobs-master-TenPlus1/README.txt old mode 100755 new mode 100644 similarity index 100% rename from a merger/mobs-MFF/README.txt rename to maj-mobs/mobs-master-TenPlus1/README.txt diff --git a/a merger/mobs-master-TenPlus1/api.lua b/maj-mobs/mobs-master-TenPlus1/api.lua similarity index 100% rename from a merger/mobs-master-TenPlus1/api.lua rename to maj-mobs/mobs-master-TenPlus1/api.lua diff --git a/a merger/mobs-MFF/bee.lua b/maj-mobs/mobs-master-TenPlus1/bee.lua old mode 100755 new mode 100644 similarity index 100% rename from a merger/mobs-MFF/bee.lua rename to maj-mobs/mobs-master-TenPlus1/bee.lua diff --git a/a merger/mobs-MFF/bunny.lua b/maj-mobs/mobs-master-TenPlus1/bunny.lua old mode 100755 new mode 100644 similarity index 100% rename from a merger/mobs-MFF/bunny.lua rename to maj-mobs/mobs-master-TenPlus1/bunny.lua diff --git a/a merger/mobs-MFF/chicken.lua b/maj-mobs/mobs-master-TenPlus1/chicken.lua old mode 100755 new mode 100644 similarity index 100% rename from a merger/mobs-MFF/chicken.lua rename to maj-mobs/mobs-master-TenPlus1/chicken.lua diff --git a/a merger/mobs-MFF/cow.lua b/maj-mobs/mobs-master-TenPlus1/cow.lua old mode 100755 new mode 100644 similarity index 100% rename from a merger/mobs-MFF/cow.lua rename to maj-mobs/mobs-master-TenPlus1/cow.lua diff --git a/a merger/mobs-MFF/creeper.lua b/maj-mobs/mobs-master-TenPlus1/creeper.lua similarity index 100% rename from a merger/mobs-MFF/creeper.lua rename to maj-mobs/mobs-master-TenPlus1/creeper.lua diff --git a/a merger/mobs-MFF/depends.txt b/maj-mobs/mobs-master-TenPlus1/depends.txt old mode 100755 new mode 100644 similarity index 100% rename from a merger/mobs-MFF/depends.txt rename to maj-mobs/mobs-master-TenPlus1/depends.txt diff --git a/a merger/mobs-MFF/dirtmonster.lua b/maj-mobs/mobs-master-TenPlus1/dirtmonster.lua old mode 100755 new mode 100644 similarity index 100% rename from a merger/mobs-MFF/dirtmonster.lua rename to maj-mobs/mobs-master-TenPlus1/dirtmonster.lua diff --git a/a merger/mobs-master-TenPlus1/dungeonmaster.lua b/maj-mobs/mobs-master-TenPlus1/dungeonmaster.lua similarity index 100% rename from a merger/mobs-master-TenPlus1/dungeonmaster.lua rename to maj-mobs/mobs-master-TenPlus1/dungeonmaster.lua diff --git a/a merger/mobs-MFF/greenslimes.lua b/maj-mobs/mobs-master-TenPlus1/greenslimes.lua similarity index 100% rename from a merger/mobs-MFF/greenslimes.lua rename to maj-mobs/mobs-master-TenPlus1/greenslimes.lua diff --git a/a merger/mobs-MFF/init.lua b/maj-mobs/mobs-master-TenPlus1/init.lua old mode 100755 new mode 100644 similarity index 100% rename from a merger/mobs-MFF/init.lua rename to maj-mobs/mobs-master-TenPlus1/init.lua diff --git a/a merger/mobs-MFF/kitten.lua b/maj-mobs/mobs-master-TenPlus1/kitten.lua similarity index 100% rename from a merger/mobs-MFF/kitten.lua rename to maj-mobs/mobs-master-TenPlus1/kitten.lua diff --git a/a merger/mobs-MFF/lava_flan.lua b/maj-mobs/mobs-master-TenPlus1/lava_flan.lua old mode 100755 new mode 100644 similarity index 100% rename from a merger/mobs-MFF/lava_flan.lua rename to maj-mobs/mobs-master-TenPlus1/lava_flan.lua diff --git a/a merger/mobs-MFF/lavaslimes.lua b/maj-mobs/mobs-master-TenPlus1/lavaslimes.lua similarity index 100% rename from a merger/mobs-MFF/lavaslimes.lua rename to maj-mobs/mobs-master-TenPlus1/lavaslimes.lua diff --git a/a merger/mobs-MFF/license.txt b/maj-mobs/mobs-master-TenPlus1/license.txt old mode 100755 new mode 100644 similarity index 100% rename from a merger/mobs-MFF/license.txt rename to maj-mobs/mobs-master-TenPlus1/license.txt diff --git a/a merger/mobs-MFF/mese_monster.lua b/maj-mobs/mobs-master-TenPlus1/mese_monster.lua old mode 100755 new mode 100644 similarity index 100% rename from a merger/mobs-MFF/mese_monster.lua rename to maj-mobs/mobs-master-TenPlus1/mese_monster.lua diff --git a/a merger/mobs-MFF/models/character.b3d b/maj-mobs/mobs-master-TenPlus1/models/character.b3d similarity index 100% rename from a merger/mobs-MFF/models/character.b3d rename to maj-mobs/mobs-master-TenPlus1/models/character.b3d diff --git a/a merger/mobs-MFF/models/mobs_bee.x b/maj-mobs/mobs-master-TenPlus1/models/mobs_bee.x similarity index 100% rename from a merger/mobs-MFF/models/mobs_bee.x rename to maj-mobs/mobs-master-TenPlus1/models/mobs_bee.x diff --git a/a merger/mobs-MFF/models/mobs_bunny.b3d b/maj-mobs/mobs-master-TenPlus1/models/mobs_bunny.b3d similarity index 100% rename from a merger/mobs-MFF/models/mobs_bunny.b3d rename to maj-mobs/mobs-master-TenPlus1/models/mobs_bunny.b3d diff --git a/a merger/mobs-MFF/models/mobs_chicken.x b/maj-mobs/mobs-master-TenPlus1/models/mobs_chicken.x similarity index 100% rename from a merger/mobs-MFF/models/mobs_chicken.x rename to maj-mobs/mobs-master-TenPlus1/models/mobs_chicken.x diff --git a/a merger/mobs-MFF/models/mobs_cow.x b/maj-mobs/mobs-master-TenPlus1/models/mobs_cow.x similarity index 100% rename from a merger/mobs-MFF/models/mobs_cow.x rename to maj-mobs/mobs-master-TenPlus1/models/mobs_cow.x diff --git a/a merger/mobs-MFF/models/mobs_dungeon_master.x b/maj-mobs/mobs-master-TenPlus1/models/mobs_dungeon_master.x similarity index 100% rename from a merger/mobs-MFF/models/mobs_dungeon_master.x rename to maj-mobs/mobs-master-TenPlus1/models/mobs_dungeon_master.x diff --git a/a merger/mobs-MFF/models/mobs_kitten.b3d b/maj-mobs/mobs-master-TenPlus1/models/mobs_kitten.b3d similarity index 100% rename from a merger/mobs-MFF/models/mobs_kitten.b3d rename to maj-mobs/mobs-master-TenPlus1/models/mobs_kitten.b3d diff --git a/a merger/mobs-MFF/models/mobs_oerkki.x b/maj-mobs/mobs-master-TenPlus1/models/mobs_oerkki.x similarity index 100% rename from a merger/mobs-MFF/models/mobs_oerkki.x rename to maj-mobs/mobs-master-TenPlus1/models/mobs_oerkki.x diff --git a/a merger/mobs-MFF/models/mobs_pumba.x b/maj-mobs/mobs-master-TenPlus1/models/mobs_pumba.x similarity index 100% rename from a merger/mobs-MFF/models/mobs_pumba.x rename to maj-mobs/mobs-master-TenPlus1/models/mobs_pumba.x diff --git a/a merger/mobs-MFF/models/mobs_rat.x b/maj-mobs/mobs-master-TenPlus1/models/mobs_rat.x similarity index 100% rename from a merger/mobs-MFF/models/mobs_rat.x rename to maj-mobs/mobs-master-TenPlus1/models/mobs_rat.x diff --git a/a merger/mobs-MFF/models/mobs_sand_monster.x b/maj-mobs/mobs-master-TenPlus1/models/mobs_sand_monster.x similarity index 100% rename from a merger/mobs-MFF/models/mobs_sand_monster.x rename to maj-mobs/mobs-master-TenPlus1/models/mobs_sand_monster.x diff --git a/a merger/mobs-MFF/models/mobs_sheep.x b/maj-mobs/mobs-master-TenPlus1/models/mobs_sheep.x similarity index 100% rename from a merger/mobs-MFF/models/mobs_sheep.x rename to maj-mobs/mobs-master-TenPlus1/models/mobs_sheep.x diff --git a/a merger/mobs-MFF/models/mobs_sheep_shaved.x b/maj-mobs/mobs-master-TenPlus1/models/mobs_sheep_shaved.x similarity index 100% rename from a merger/mobs-MFF/models/mobs_sheep_shaved.x rename to maj-mobs/mobs-master-TenPlus1/models/mobs_sheep_shaved.x diff --git a/a merger/mobs-MFF/models/mobs_spider.x b/maj-mobs/mobs-master-TenPlus1/models/mobs_spider.x similarity index 100% rename from a merger/mobs-MFF/models/mobs_spider.x rename to maj-mobs/mobs-master-TenPlus1/models/mobs_spider.x diff --git a/a merger/mobs-MFF/models/mobs_stone_monster.x b/maj-mobs/mobs-master-TenPlus1/models/mobs_stone_monster.x similarity index 100% rename from a merger/mobs-MFF/models/mobs_stone_monster.x rename to maj-mobs/mobs-master-TenPlus1/models/mobs_stone_monster.x diff --git a/a merger/mobs-MFF/models/mobs_tree_monster.x b/maj-mobs/mobs-master-TenPlus1/models/mobs_tree_monster.x similarity index 100% rename from a merger/mobs-MFF/models/mobs_tree_monster.x rename to maj-mobs/mobs-master-TenPlus1/models/mobs_tree_monster.x diff --git a/a merger/mobs-MFF/models/mobs_wolf.x b/maj-mobs/mobs-master-TenPlus1/models/mobs_wolf.x similarity index 100% rename from a merger/mobs-MFF/models/mobs_wolf.x rename to maj-mobs/mobs-master-TenPlus1/models/mobs_wolf.x diff --git a/a merger/mobs-MFF/models/zmobs_lava_flan.x b/maj-mobs/mobs-master-TenPlus1/models/zmobs_lava_flan.x similarity index 100% rename from a merger/mobs-MFF/models/zmobs_lava_flan.x rename to maj-mobs/mobs-master-TenPlus1/models/zmobs_lava_flan.x diff --git a/a merger/mobs-MFF/models/zmobs_mese_monster.x b/maj-mobs/mobs-master-TenPlus1/models/zmobs_mese_monster.x similarity index 100% rename from a merger/mobs-MFF/models/zmobs_mese_monster.x rename to maj-mobs/mobs-master-TenPlus1/models/zmobs_mese_monster.x diff --git a/a merger/mobs-MFF/npc.lua b/maj-mobs/mobs-master-TenPlus1/npc.lua old mode 100755 new mode 100644 similarity index 100% rename from a merger/mobs-MFF/npc.lua rename to maj-mobs/mobs-master-TenPlus1/npc.lua diff --git a/a merger/mobs-MFF/oerkki.lua b/maj-mobs/mobs-master-TenPlus1/oerkki.lua old mode 100755 new mode 100644 similarity index 100% rename from a merger/mobs-MFF/oerkki.lua rename to maj-mobs/mobs-master-TenPlus1/oerkki.lua diff --git a/a merger/mobs-MFF/rat.lua b/maj-mobs/mobs-master-TenPlus1/rat.lua old mode 100755 new mode 100644 similarity index 100% rename from a merger/mobs-MFF/rat.lua rename to maj-mobs/mobs-master-TenPlus1/rat.lua diff --git a/a merger/mobs-MFF/sandmonster.lua b/maj-mobs/mobs-master-TenPlus1/sandmonster.lua old mode 100755 new mode 100644 similarity index 100% rename from a merger/mobs-MFF/sandmonster.lua rename to maj-mobs/mobs-master-TenPlus1/sandmonster.lua diff --git a/a merger/mobs-MFF/sheep.lua b/maj-mobs/mobs-master-TenPlus1/sheep.lua old mode 100755 new mode 100644 similarity index 100% rename from a merger/mobs-MFF/sheep.lua rename to maj-mobs/mobs-master-TenPlus1/sheep.lua diff --git a/a merger/mobs-MFF/sounds/mobs_bee.ogg b/maj-mobs/mobs-master-TenPlus1/sounds/mobs_bee.ogg similarity index 100% rename from a merger/mobs-MFF/sounds/mobs_bee.ogg rename to maj-mobs/mobs-master-TenPlus1/sounds/mobs_bee.ogg diff --git a/a merger/mobs-MFF/sounds/mobs_chicken.ogg b/maj-mobs/mobs-master-TenPlus1/sounds/mobs_chicken.ogg similarity index 100% rename from a merger/mobs-MFF/sounds/mobs_chicken.ogg rename to maj-mobs/mobs-master-TenPlus1/sounds/mobs_chicken.ogg diff --git a/a merger/mobs-MFF/sounds/mobs_cow.ogg b/maj-mobs/mobs-master-TenPlus1/sounds/mobs_cow.ogg similarity index 100% rename from a merger/mobs-MFF/sounds/mobs_cow.ogg rename to maj-mobs/mobs-master-TenPlus1/sounds/mobs_cow.ogg diff --git a/a merger/mobs-MFF/sounds/mobs_dirtmonster.1.ogg b/maj-mobs/mobs-master-TenPlus1/sounds/mobs_dirtmonster.1.ogg similarity index 100% rename from a merger/mobs-MFF/sounds/mobs_dirtmonster.1.ogg rename to maj-mobs/mobs-master-TenPlus1/sounds/mobs_dirtmonster.1.ogg diff --git a/a merger/mobs-MFF/sounds/mobs_dirtmonster.2.ogg b/maj-mobs/mobs-master-TenPlus1/sounds/mobs_dirtmonster.2.ogg similarity index 100% rename from a merger/mobs-MFF/sounds/mobs_dirtmonster.2.ogg rename to maj-mobs/mobs-master-TenPlus1/sounds/mobs_dirtmonster.2.ogg diff --git a/a merger/mobs-MFF/sounds/mobs_dungeonmaster.1.ogg b/maj-mobs/mobs-master-TenPlus1/sounds/mobs_dungeonmaster.1.ogg similarity index 100% rename from a merger/mobs-MFF/sounds/mobs_dungeonmaster.1.ogg rename to maj-mobs/mobs-master-TenPlus1/sounds/mobs_dungeonmaster.1.ogg diff --git a/a merger/mobs-MFF/sounds/mobs_dungeonmaster.2.ogg b/maj-mobs/mobs-master-TenPlus1/sounds/mobs_dungeonmaster.2.ogg similarity index 100% rename from a merger/mobs-MFF/sounds/mobs_dungeonmaster.2.ogg rename to maj-mobs/mobs-master-TenPlus1/sounds/mobs_dungeonmaster.2.ogg diff --git a/a merger/mobs-MFF/sounds/mobs_dungeonmaster.3.ogg b/maj-mobs/mobs-master-TenPlus1/sounds/mobs_dungeonmaster.3.ogg similarity index 100% rename from a merger/mobs-MFF/sounds/mobs_dungeonmaster.3.ogg rename to maj-mobs/mobs-master-TenPlus1/sounds/mobs_dungeonmaster.3.ogg diff --git a/a merger/mobs-MFF/sounds/mobs_eerie.ogg b/maj-mobs/mobs-master-TenPlus1/sounds/mobs_eerie.ogg similarity index 100% rename from a merger/mobs-MFF/sounds/mobs_eerie.ogg rename to maj-mobs/mobs-master-TenPlus1/sounds/mobs_eerie.ogg diff --git a/a merger/mobs-MFF/sounds/mobs_fireball.ogg b/maj-mobs/mobs-master-TenPlus1/sounds/mobs_fireball.ogg similarity index 100% rename from a merger/mobs-MFF/sounds/mobs_fireball.ogg rename to maj-mobs/mobs-master-TenPlus1/sounds/mobs_fireball.ogg diff --git a/a merger/mobs-MFF/sounds/mobs_howl.ogg b/maj-mobs/mobs-master-TenPlus1/sounds/mobs_howl.ogg similarity index 100% rename from a merger/mobs-MFF/sounds/mobs_howl.ogg rename to maj-mobs/mobs-master-TenPlus1/sounds/mobs_howl.ogg diff --git a/a merger/mobs-MFF/sounds/mobs_kitten.1.ogg b/maj-mobs/mobs-master-TenPlus1/sounds/mobs_kitten.1.ogg similarity index 100% rename from a merger/mobs-MFF/sounds/mobs_kitten.1.ogg rename to maj-mobs/mobs-master-TenPlus1/sounds/mobs_kitten.1.ogg diff --git a/a merger/mobs-MFF/sounds/mobs_kitten.2.ogg b/maj-mobs/mobs-master-TenPlus1/sounds/mobs_kitten.2.ogg similarity index 100% rename from a merger/mobs-MFF/sounds/mobs_kitten.2.ogg rename to maj-mobs/mobs-master-TenPlus1/sounds/mobs_kitten.2.ogg diff --git a/a merger/mobs-MFF/sounds/mobs_kitten.3.ogg b/maj-mobs/mobs-master-TenPlus1/sounds/mobs_kitten.3.ogg similarity index 100% rename from a merger/mobs-MFF/sounds/mobs_kitten.3.ogg rename to maj-mobs/mobs-master-TenPlus1/sounds/mobs_kitten.3.ogg diff --git a/a merger/mobs-MFF/sounds/mobs_kitten.4.ogg b/maj-mobs/mobs-master-TenPlus1/sounds/mobs_kitten.4.ogg similarity index 100% rename from a merger/mobs-MFF/sounds/mobs_kitten.4.ogg rename to maj-mobs/mobs-master-TenPlus1/sounds/mobs_kitten.4.ogg diff --git a/a merger/mobs-MFF/sounds/mobs_kitten.5.ogg b/maj-mobs/mobs-master-TenPlus1/sounds/mobs_kitten.5.ogg similarity index 100% rename from a merger/mobs-MFF/sounds/mobs_kitten.5.ogg rename to maj-mobs/mobs-master-TenPlus1/sounds/mobs_kitten.5.ogg diff --git a/a merger/mobs-MFF/sounds/mobs_kitten.6.ogg b/maj-mobs/mobs-master-TenPlus1/sounds/mobs_kitten.6.ogg similarity index 100% rename from a merger/mobs-MFF/sounds/mobs_kitten.6.ogg rename to maj-mobs/mobs-master-TenPlus1/sounds/mobs_kitten.6.ogg diff --git a/a merger/mobs-MFF/sounds/mobs_lavaflan.1.ogg b/maj-mobs/mobs-master-TenPlus1/sounds/mobs_lavaflan.1.ogg similarity index 100% rename from a merger/mobs-MFF/sounds/mobs_lavaflan.1.ogg rename to maj-mobs/mobs-master-TenPlus1/sounds/mobs_lavaflan.1.ogg diff --git a/a merger/mobs-MFF/sounds/mobs_lavaflan.2.ogg b/maj-mobs/mobs-master-TenPlus1/sounds/mobs_lavaflan.2.ogg similarity index 100% rename from a merger/mobs-MFF/sounds/mobs_lavaflan.2.ogg rename to maj-mobs/mobs-master-TenPlus1/sounds/mobs_lavaflan.2.ogg diff --git a/a merger/mobs-MFF/sounds/mobs_mesemonster.1.ogg b/maj-mobs/mobs-master-TenPlus1/sounds/mobs_mesemonster.1.ogg similarity index 100% rename from a merger/mobs-MFF/sounds/mobs_mesemonster.1.ogg rename to maj-mobs/mobs-master-TenPlus1/sounds/mobs_mesemonster.1.ogg diff --git a/a merger/mobs-MFF/sounds/mobs_mesemonster.2.ogg b/maj-mobs/mobs-master-TenPlus1/sounds/mobs_mesemonster.2.ogg similarity index 100% rename from a merger/mobs-MFF/sounds/mobs_mesemonster.2.ogg rename to maj-mobs/mobs-master-TenPlus1/sounds/mobs_mesemonster.2.ogg diff --git a/a merger/mobs-MFF/sounds/mobs_oerkki.1.ogg b/maj-mobs/mobs-master-TenPlus1/sounds/mobs_oerkki.1.ogg similarity index 100% rename from a merger/mobs-MFF/sounds/mobs_oerkki.1.ogg rename to maj-mobs/mobs-master-TenPlus1/sounds/mobs_oerkki.1.ogg diff --git a/a merger/mobs-MFF/sounds/mobs_oerkki.2.ogg b/maj-mobs/mobs-master-TenPlus1/sounds/mobs_oerkki.2.ogg similarity index 100% rename from a merger/mobs-MFF/sounds/mobs_oerkki.2.ogg rename to maj-mobs/mobs-master-TenPlus1/sounds/mobs_oerkki.2.ogg diff --git a/a merger/mobs-MFF/sounds/mobs_oerkki_attack.ogg b/maj-mobs/mobs-master-TenPlus1/sounds/mobs_oerkki_attack.ogg similarity index 100% rename from a merger/mobs-MFF/sounds/mobs_oerkki_attack.ogg rename to maj-mobs/mobs-master-TenPlus1/sounds/mobs_oerkki_attack.ogg diff --git a/a merger/mobs-MFF/sounds/mobs_pig.ogg b/maj-mobs/mobs-master-TenPlus1/sounds/mobs_pig.ogg similarity index 100% rename from a merger/mobs-MFF/sounds/mobs_pig.ogg rename to maj-mobs/mobs-master-TenPlus1/sounds/mobs_pig.ogg diff --git a/a merger/mobs-MFF/sounds/mobs_pig_angry.ogg b/maj-mobs/mobs-master-TenPlus1/sounds/mobs_pig_angry.ogg similarity index 100% rename from a merger/mobs-MFF/sounds/mobs_pig_angry.ogg rename to maj-mobs/mobs-master-TenPlus1/sounds/mobs_pig_angry.ogg diff --git a/a merger/mobs-MFF/sounds/mobs_rat.1.ogg b/maj-mobs/mobs-master-TenPlus1/sounds/mobs_rat.1.ogg similarity index 100% rename from a merger/mobs-MFF/sounds/mobs_rat.1.ogg rename to maj-mobs/mobs-master-TenPlus1/sounds/mobs_rat.1.ogg diff --git a/a merger/mobs-MFF/sounds/mobs_rat.2.ogg b/maj-mobs/mobs-master-TenPlus1/sounds/mobs_rat.2.ogg similarity index 100% rename from a merger/mobs-MFF/sounds/mobs_rat.2.ogg rename to maj-mobs/mobs-master-TenPlus1/sounds/mobs_rat.2.ogg diff --git a/a merger/mobs-MFF/sounds/mobs_sandmonster.1.ogg b/maj-mobs/mobs-master-TenPlus1/sounds/mobs_sandmonster.1.ogg similarity index 100% rename from a merger/mobs-MFF/sounds/mobs_sandmonster.1.ogg rename to maj-mobs/mobs-master-TenPlus1/sounds/mobs_sandmonster.1.ogg diff --git a/a merger/mobs-MFF/sounds/mobs_sandmonster.2.ogg b/maj-mobs/mobs-master-TenPlus1/sounds/mobs_sandmonster.2.ogg similarity index 100% rename from a merger/mobs-MFF/sounds/mobs_sandmonster.2.ogg rename to maj-mobs/mobs-master-TenPlus1/sounds/mobs_sandmonster.2.ogg diff --git a/a merger/mobs-MFF/sounds/mobs_sheep.ogg b/maj-mobs/mobs-master-TenPlus1/sounds/mobs_sheep.ogg similarity index 100% rename from a merger/mobs-MFF/sounds/mobs_sheep.ogg rename to maj-mobs/mobs-master-TenPlus1/sounds/mobs_sheep.ogg diff --git a/a merger/mobs-MFF/sounds/mobs_slimes_attack.ogg b/maj-mobs/mobs-master-TenPlus1/sounds/mobs_slimes_attack.ogg similarity index 100% rename from a merger/mobs-MFF/sounds/mobs_slimes_attack.ogg rename to maj-mobs/mobs-master-TenPlus1/sounds/mobs_slimes_attack.ogg diff --git a/a merger/mobs-MFF/sounds/mobs_slimes_damage.ogg b/maj-mobs/mobs-master-TenPlus1/sounds/mobs_slimes_damage.ogg similarity index 100% rename from a merger/mobs-MFF/sounds/mobs_slimes_damage.ogg rename to maj-mobs/mobs-master-TenPlus1/sounds/mobs_slimes_damage.ogg diff --git a/a merger/mobs-MFF/sounds/mobs_slimes_death.ogg b/maj-mobs/mobs-master-TenPlus1/sounds/mobs_slimes_death.ogg similarity index 100% rename from a merger/mobs-MFF/sounds/mobs_slimes_death.ogg rename to maj-mobs/mobs-master-TenPlus1/sounds/mobs_slimes_death.ogg diff --git a/a merger/mobs-MFF/sounds/mobs_slimes_jump.ogg b/maj-mobs/mobs-master-TenPlus1/sounds/mobs_slimes_jump.ogg similarity index 100% rename from a merger/mobs-MFF/sounds/mobs_slimes_jump.ogg rename to maj-mobs/mobs-master-TenPlus1/sounds/mobs_slimes_jump.ogg diff --git a/a merger/mobs-MFF/sounds/mobs_spider.ogg b/maj-mobs/mobs-master-TenPlus1/sounds/mobs_spider.ogg similarity index 100% rename from a merger/mobs-MFF/sounds/mobs_spider.ogg rename to maj-mobs/mobs-master-TenPlus1/sounds/mobs_spider.ogg diff --git a/a merger/mobs-MFF/sounds/mobs_spider_attack.ogg b/maj-mobs/mobs-master-TenPlus1/sounds/mobs_spider_attack.ogg similarity index 100% rename from a merger/mobs-MFF/sounds/mobs_spider_attack.ogg rename to maj-mobs/mobs-master-TenPlus1/sounds/mobs_spider_attack.ogg diff --git a/a merger/mobs-MFF/sounds/mobs_stonemonster.1.ogg b/maj-mobs/mobs-master-TenPlus1/sounds/mobs_stonemonster.1.ogg similarity index 100% rename from a merger/mobs-MFF/sounds/mobs_stonemonster.1.ogg rename to maj-mobs/mobs-master-TenPlus1/sounds/mobs_stonemonster.1.ogg diff --git a/a merger/mobs-MFF/sounds/mobs_stonemonster.2.ogg b/maj-mobs/mobs-master-TenPlus1/sounds/mobs_stonemonster.2.ogg similarity index 100% rename from a merger/mobs-MFF/sounds/mobs_stonemonster.2.ogg rename to maj-mobs/mobs-master-TenPlus1/sounds/mobs_stonemonster.2.ogg diff --git a/a merger/mobs-MFF/sounds/mobs_stonemonster_attack.ogg b/maj-mobs/mobs-master-TenPlus1/sounds/mobs_stonemonster_attack.ogg similarity index 100% rename from a merger/mobs-MFF/sounds/mobs_stonemonster_attack.ogg rename to maj-mobs/mobs-master-TenPlus1/sounds/mobs_stonemonster_attack.ogg diff --git a/a merger/mobs-MFF/sounds/mobs_treemonster.1.ogg b/maj-mobs/mobs-master-TenPlus1/sounds/mobs_treemonster.1.ogg similarity index 100% rename from a merger/mobs-MFF/sounds/mobs_treemonster.1.ogg rename to maj-mobs/mobs-master-TenPlus1/sounds/mobs_treemonster.1.ogg diff --git a/a merger/mobs-MFF/sounds/mobs_treemonster.2.ogg b/maj-mobs/mobs-master-TenPlus1/sounds/mobs_treemonster.2.ogg similarity index 100% rename from a merger/mobs-MFF/sounds/mobs_treemonster.2.ogg rename to maj-mobs/mobs-master-TenPlus1/sounds/mobs_treemonster.2.ogg diff --git a/a merger/mobs-MFF/sounds/mobs_wolf.ogg b/maj-mobs/mobs-master-TenPlus1/sounds/mobs_wolf.ogg similarity index 100% rename from a merger/mobs-MFF/sounds/mobs_wolf.ogg rename to maj-mobs/mobs-master-TenPlus1/sounds/mobs_wolf.ogg diff --git a/a merger/mobs-MFF/sounds/tnt_explode.ogg b/maj-mobs/mobs-master-TenPlus1/sounds/tnt_explode.ogg similarity index 100% rename from a merger/mobs-MFF/sounds/tnt_explode.ogg rename to maj-mobs/mobs-master-TenPlus1/sounds/tnt_explode.ogg diff --git a/a merger/mobs-MFF/spider.lua b/maj-mobs/mobs-master-TenPlus1/spider.lua old mode 100755 new mode 100644 similarity index 100% rename from a merger/mobs-MFF/spider.lua rename to maj-mobs/mobs-master-TenPlus1/spider.lua diff --git a/a merger/mobs-MFF/stonemonster.lua b/maj-mobs/mobs-master-TenPlus1/stonemonster.lua old mode 100755 new mode 100644 similarity index 100% rename from a merger/mobs-MFF/stonemonster.lua rename to maj-mobs/mobs-master-TenPlus1/stonemonster.lua diff --git a/a merger/mobs-MFF/textures/jeija_glue.png b/maj-mobs/mobs-master-TenPlus1/textures/jeija_glue.png similarity index 100% rename from a merger/mobs-MFF/textures/jeija_glue.png rename to maj-mobs/mobs-master-TenPlus1/textures/jeija_glue.png diff --git a/a merger/mobs-MFF/textures/mobs_bee.png b/maj-mobs/mobs-master-TenPlus1/textures/mobs_bee.png similarity index 100% rename from a merger/mobs-MFF/textures/mobs_bee.png rename to maj-mobs/mobs-master-TenPlus1/textures/mobs_bee.png diff --git a/a merger/mobs-MFF/textures/mobs_bee_inv.png b/maj-mobs/mobs-master-TenPlus1/textures/mobs_bee_inv.png similarity index 100% rename from a merger/mobs-MFF/textures/mobs_bee_inv.png rename to maj-mobs/mobs-master-TenPlus1/textures/mobs_bee_inv.png diff --git a/a merger/mobs-MFF/textures/mobs_beehive.png b/maj-mobs/mobs-master-TenPlus1/textures/mobs_beehive.png similarity index 100% rename from a merger/mobs-MFF/textures/mobs_beehive.png rename to maj-mobs/mobs-master-TenPlus1/textures/mobs_beehive.png diff --git a/a merger/mobs-MFF/textures/mobs_blood.png b/maj-mobs/mobs-master-TenPlus1/textures/mobs_blood.png similarity index 100% rename from a merger/mobs-MFF/textures/mobs_blood.png rename to maj-mobs/mobs-master-TenPlus1/textures/mobs_blood.png diff --git a/a merger/mobs-MFF/textures/mobs_bucket_milk.png b/maj-mobs/mobs-master-TenPlus1/textures/mobs_bucket_milk.png similarity index 100% rename from a merger/mobs-MFF/textures/mobs_bucket_milk.png rename to maj-mobs/mobs-master-TenPlus1/textures/mobs_bucket_milk.png diff --git a/a merger/mobs-MFF/textures/mobs_bunny_brown.png b/maj-mobs/mobs-master-TenPlus1/textures/mobs_bunny_brown.png similarity index 100% rename from a merger/mobs-MFF/textures/mobs_bunny_brown.png rename to maj-mobs/mobs-master-TenPlus1/textures/mobs_bunny_brown.png diff --git a/a merger/mobs-MFF/textures/mobs_bunny_grey.png b/maj-mobs/mobs-master-TenPlus1/textures/mobs_bunny_grey.png similarity index 100% rename from a merger/mobs-MFF/textures/mobs_bunny_grey.png rename to maj-mobs/mobs-master-TenPlus1/textures/mobs_bunny_grey.png diff --git a/a merger/mobs-MFF/textures/mobs_bunny_inv.png b/maj-mobs/mobs-master-TenPlus1/textures/mobs_bunny_inv.png similarity index 100% rename from a merger/mobs-MFF/textures/mobs_bunny_inv.png rename to maj-mobs/mobs-master-TenPlus1/textures/mobs_bunny_inv.png diff --git a/a merger/mobs-MFF/textures/mobs_bunny_white.png b/maj-mobs/mobs-master-TenPlus1/textures/mobs_bunny_white.png similarity index 100% rename from a merger/mobs-MFF/textures/mobs_bunny_white.png rename to maj-mobs/mobs-master-TenPlus1/textures/mobs_bunny_white.png diff --git a/a merger/mobs-MFF/textures/mobs_cheese.png b/maj-mobs/mobs-master-TenPlus1/textures/mobs_cheese.png similarity index 100% rename from a merger/mobs-MFF/textures/mobs_cheese.png rename to maj-mobs/mobs-master-TenPlus1/textures/mobs_cheese.png diff --git a/a merger/mobs-MFF/textures/mobs_cheeseblock.png b/maj-mobs/mobs-master-TenPlus1/textures/mobs_cheeseblock.png similarity index 100% rename from a merger/mobs-MFF/textures/mobs_cheeseblock.png rename to maj-mobs/mobs-master-TenPlus1/textures/mobs_cheeseblock.png diff --git a/a merger/mobs-MFF/textures/mobs_chick.png b/maj-mobs/mobs-master-TenPlus1/textures/mobs_chick.png similarity index 100% rename from a merger/mobs-MFF/textures/mobs_chick.png rename to maj-mobs/mobs-master-TenPlus1/textures/mobs_chick.png diff --git a/a merger/mobs-MFF/textures/mobs_chicken.png b/maj-mobs/mobs-master-TenPlus1/textures/mobs_chicken.png similarity index 100% rename from a merger/mobs-MFF/textures/mobs_chicken.png rename to maj-mobs/mobs-master-TenPlus1/textures/mobs_chicken.png diff --git a/a merger/mobs-MFF/textures/mobs_chicken_black.png b/maj-mobs/mobs-master-TenPlus1/textures/mobs_chicken_black.png similarity index 100% rename from a merger/mobs-MFF/textures/mobs_chicken_black.png rename to maj-mobs/mobs-master-TenPlus1/textures/mobs_chicken_black.png diff --git a/a merger/mobs-MFF/textures/mobs_chicken_cooked.png b/maj-mobs/mobs-master-TenPlus1/textures/mobs_chicken_cooked.png similarity index 100% rename from a merger/mobs-MFF/textures/mobs_chicken_cooked.png rename to maj-mobs/mobs-master-TenPlus1/textures/mobs_chicken_cooked.png diff --git a/a merger/mobs-MFF/textures/mobs_chicken_egg.png b/maj-mobs/mobs-master-TenPlus1/textures/mobs_chicken_egg.png similarity index 100% rename from a merger/mobs-MFF/textures/mobs_chicken_egg.png rename to maj-mobs/mobs-master-TenPlus1/textures/mobs_chicken_egg.png diff --git a/a merger/mobs-MFF/textures/mobs_chicken_egg_fried.png b/maj-mobs/mobs-master-TenPlus1/textures/mobs_chicken_egg_fried.png similarity index 100% rename from a merger/mobs-MFF/textures/mobs_chicken_egg_fried.png rename to maj-mobs/mobs-master-TenPlus1/textures/mobs_chicken_egg_fried.png diff --git a/a merger/mobs-MFF/textures/mobs_chicken_inv.png b/maj-mobs/mobs-master-TenPlus1/textures/mobs_chicken_inv.png similarity index 100% rename from a merger/mobs-MFF/textures/mobs_chicken_inv.png rename to maj-mobs/mobs-master-TenPlus1/textures/mobs_chicken_inv.png diff --git a/a merger/mobs-MFF/textures/mobs_chicken_raw.png b/maj-mobs/mobs-master-TenPlus1/textures/mobs_chicken_raw.png similarity index 100% rename from a merger/mobs-MFF/textures/mobs_chicken_raw.png rename to maj-mobs/mobs-master-TenPlus1/textures/mobs_chicken_raw.png diff --git a/a merger/mobs-MFF/textures/mobs_cobweb.png b/maj-mobs/mobs-master-TenPlus1/textures/mobs_cobweb.png similarity index 100% rename from a merger/mobs-MFF/textures/mobs_cobweb.png rename to maj-mobs/mobs-master-TenPlus1/textures/mobs_cobweb.png diff --git a/a merger/mobs-MFF/textures/mobs_cooked_rat.png b/maj-mobs/mobs-master-TenPlus1/textures/mobs_cooked_rat.png similarity index 100% rename from a merger/mobs-MFF/textures/mobs_cooked_rat.png rename to maj-mobs/mobs-master-TenPlus1/textures/mobs_cooked_rat.png diff --git a/a merger/mobs-MFF/textures/mobs_cow.png b/maj-mobs/mobs-master-TenPlus1/textures/mobs_cow.png similarity index 100% rename from a merger/mobs-MFF/textures/mobs_cow.png rename to maj-mobs/mobs-master-TenPlus1/textures/mobs_cow.png diff --git a/a merger/mobs-MFF/textures/mobs_cow_brown.png b/maj-mobs/mobs-master-TenPlus1/textures/mobs_cow_brown.png similarity index 100% rename from a merger/mobs-MFF/textures/mobs_cow_brown.png rename to maj-mobs/mobs-master-TenPlus1/textures/mobs_cow_brown.png diff --git a/a merger/mobs-MFF/textures/mobs_creeper.png b/maj-mobs/mobs-master-TenPlus1/textures/mobs_creeper.png similarity index 100% rename from a merger/mobs-MFF/textures/mobs_creeper.png rename to maj-mobs/mobs-master-TenPlus1/textures/mobs_creeper.png diff --git a/a merger/mobs-MFF/textures/mobs_creeper_inv.png b/maj-mobs/mobs-master-TenPlus1/textures/mobs_creeper_inv.png similarity index 100% rename from a merger/mobs-MFF/textures/mobs_creeper_inv.png rename to maj-mobs/mobs-master-TenPlus1/textures/mobs_creeper_inv.png diff --git a/a merger/mobs-MFF/textures/mobs_dirt_monster.png b/maj-mobs/mobs-master-TenPlus1/textures/mobs_dirt_monster.png similarity index 100% rename from a merger/mobs-MFF/textures/mobs_dirt_monster.png rename to maj-mobs/mobs-master-TenPlus1/textures/mobs_dirt_monster.png diff --git a/a merger/mobs-MFF/textures/mobs_dungeon_master.png b/maj-mobs/mobs-master-TenPlus1/textures/mobs_dungeon_master.png similarity index 100% rename from a merger/mobs-MFF/textures/mobs_dungeon_master.png rename to maj-mobs/mobs-master-TenPlus1/textures/mobs_dungeon_master.png diff --git a/a merger/mobs-MFF/textures/mobs_dungeon_master_cobblestone.png b/maj-mobs/mobs-master-TenPlus1/textures/mobs_dungeon_master_cobblestone.png similarity index 100% rename from a merger/mobs-MFF/textures/mobs_dungeon_master_cobblestone.png rename to maj-mobs/mobs-master-TenPlus1/textures/mobs_dungeon_master_cobblestone.png diff --git a/a merger/mobs-MFF/textures/mobs_dungeon_master_fireball.png b/maj-mobs/mobs-master-TenPlus1/textures/mobs_dungeon_master_fireball.png similarity index 100% rename from a merger/mobs-MFF/textures/mobs_dungeon_master_fireball.png rename to maj-mobs/mobs-master-TenPlus1/textures/mobs_dungeon_master_fireball.png diff --git a/a merger/mobs-MFF/textures/mobs_dungeon_master_fireball_back.png b/maj-mobs/mobs-master-TenPlus1/textures/mobs_dungeon_master_fireball_back.png similarity index 100% rename from a merger/mobs-MFF/textures/mobs_dungeon_master_fireball_back.png rename to maj-mobs/mobs-master-TenPlus1/textures/mobs_dungeon_master_fireball_back.png diff --git a/a merger/mobs-MFF/textures/mobs_dungeon_master_strangewhite.png b/maj-mobs/mobs-master-TenPlus1/textures/mobs_dungeon_master_strangewhite.png similarity index 100% rename from a merger/mobs-MFF/textures/mobs_dungeon_master_strangewhite.png rename to maj-mobs/mobs-master-TenPlus1/textures/mobs_dungeon_master_strangewhite.png diff --git a/a merger/mobs-MFF/textures/mobs_fireball.png b/maj-mobs/mobs-master-TenPlus1/textures/mobs_fireball.png similarity index 100% rename from a merger/mobs-MFF/textures/mobs_fireball.png rename to maj-mobs/mobs-master-TenPlus1/textures/mobs_fireball.png diff --git a/a merger/mobs-MFF/textures/mobs_green_slime_blood.png b/maj-mobs/mobs-master-TenPlus1/textures/mobs_green_slime_blood.png similarity index 100% rename from a merger/mobs-MFF/textures/mobs_green_slime_blood.png rename to maj-mobs/mobs-master-TenPlus1/textures/mobs_green_slime_blood.png diff --git a/a merger/mobs-MFF/textures/mobs_green_slime_bottom.png b/maj-mobs/mobs-master-TenPlus1/textures/mobs_green_slime_bottom.png similarity index 100% rename from a merger/mobs-MFF/textures/mobs_green_slime_bottom.png rename to maj-mobs/mobs-master-TenPlus1/textures/mobs_green_slime_bottom.png diff --git a/a merger/mobs-MFF/textures/mobs_green_slime_egg.png b/maj-mobs/mobs-master-TenPlus1/textures/mobs_green_slime_egg.png similarity index 100% rename from a merger/mobs-MFF/textures/mobs_green_slime_egg.png rename to maj-mobs/mobs-master-TenPlus1/textures/mobs_green_slime_egg.png diff --git a/a merger/mobs-MFF/textures/mobs_green_slime_front.png b/maj-mobs/mobs-master-TenPlus1/textures/mobs_green_slime_front.png similarity index 100% rename from a merger/mobs-MFF/textures/mobs_green_slime_front.png rename to maj-mobs/mobs-master-TenPlus1/textures/mobs_green_slime_front.png diff --git a/a merger/mobs-MFF/textures/mobs_green_slime_sides.png b/maj-mobs/mobs-master-TenPlus1/textures/mobs_green_slime_sides.png similarity index 100% rename from a merger/mobs-MFF/textures/mobs_green_slime_sides.png rename to maj-mobs/mobs-master-TenPlus1/textures/mobs_green_slime_sides.png diff --git a/a merger/mobs-MFF/textures/mobs_green_slime_top.png b/maj-mobs/mobs-master-TenPlus1/textures/mobs_green_slime_top.png similarity index 100% rename from a merger/mobs-MFF/textures/mobs_green_slime_top.png rename to maj-mobs/mobs-master-TenPlus1/textures/mobs_green_slime_top.png diff --git a/a merger/mobs-MFF/textures/mobs_honey_block.png b/maj-mobs/mobs-master-TenPlus1/textures/mobs_honey_block.png similarity index 100% rename from a merger/mobs-MFF/textures/mobs_honey_block.png rename to maj-mobs/mobs-master-TenPlus1/textures/mobs_honey_block.png diff --git a/a merger/mobs-MFF/textures/mobs_honey_inv.png b/maj-mobs/mobs-master-TenPlus1/textures/mobs_honey_inv.png similarity index 100% rename from a merger/mobs-MFF/textures/mobs_honey_inv.png rename to maj-mobs/mobs-master-TenPlus1/textures/mobs_honey_inv.png diff --git a/a merger/mobs-MFF/textures/mobs_kitten_ginger.png b/maj-mobs/mobs-master-TenPlus1/textures/mobs_kitten_ginger.png similarity index 100% rename from a merger/mobs-MFF/textures/mobs_kitten_ginger.png rename to maj-mobs/mobs-master-TenPlus1/textures/mobs_kitten_ginger.png diff --git a/a merger/mobs-MFF/textures/mobs_kitten_inv.png b/maj-mobs/mobs-master-TenPlus1/textures/mobs_kitten_inv.png similarity index 100% rename from a merger/mobs-MFF/textures/mobs_kitten_inv.png rename to maj-mobs/mobs-master-TenPlus1/textures/mobs_kitten_inv.png diff --git a/a merger/mobs-MFF/textures/mobs_kitten_sandy.png b/maj-mobs/mobs-master-TenPlus1/textures/mobs_kitten_sandy.png similarity index 100% rename from a merger/mobs-MFF/textures/mobs_kitten_sandy.png rename to maj-mobs/mobs-master-TenPlus1/textures/mobs_kitten_sandy.png diff --git a/a merger/mobs-MFF/textures/mobs_kitten_splotchy.png b/maj-mobs/mobs-master-TenPlus1/textures/mobs_kitten_splotchy.png similarity index 100% rename from a merger/mobs-MFF/textures/mobs_kitten_splotchy.png rename to maj-mobs/mobs-master-TenPlus1/textures/mobs_kitten_splotchy.png diff --git a/a merger/mobs-MFF/textures/mobs_kitten_striped.png b/maj-mobs/mobs-master-TenPlus1/textures/mobs_kitten_striped.png similarity index 100% rename from a merger/mobs-MFF/textures/mobs_kitten_striped.png rename to maj-mobs/mobs-master-TenPlus1/textures/mobs_kitten_striped.png diff --git a/a merger/mobs-MFF/textures/mobs_lava_slime_blood.png b/maj-mobs/mobs-master-TenPlus1/textures/mobs_lava_slime_blood.png similarity index 100% rename from a merger/mobs-MFF/textures/mobs_lava_slime_blood.png rename to maj-mobs/mobs-master-TenPlus1/textures/mobs_lava_slime_blood.png diff --git a/a merger/mobs-MFF/textures/mobs_lava_slime_bottom.png b/maj-mobs/mobs-master-TenPlus1/textures/mobs_lava_slime_bottom.png similarity index 100% rename from a merger/mobs-MFF/textures/mobs_lava_slime_bottom.png rename to maj-mobs/mobs-master-TenPlus1/textures/mobs_lava_slime_bottom.png diff --git a/a merger/mobs-MFF/textures/mobs_lava_slime_egg.png b/maj-mobs/mobs-master-TenPlus1/textures/mobs_lava_slime_egg.png similarity index 100% rename from a merger/mobs-MFF/textures/mobs_lava_slime_egg.png rename to maj-mobs/mobs-master-TenPlus1/textures/mobs_lava_slime_egg.png diff --git a/a merger/mobs-MFF/textures/mobs_lava_slime_front.png b/maj-mobs/mobs-master-TenPlus1/textures/mobs_lava_slime_front.png similarity index 100% rename from a merger/mobs-MFF/textures/mobs_lava_slime_front.png rename to maj-mobs/mobs-master-TenPlus1/textures/mobs_lava_slime_front.png diff --git a/a merger/mobs-MFF/textures/mobs_lava_slime_sides.png b/maj-mobs/mobs-master-TenPlus1/textures/mobs_lava_slime_sides.png similarity index 100% rename from a merger/mobs-MFF/textures/mobs_lava_slime_sides.png rename to maj-mobs/mobs-master-TenPlus1/textures/mobs_lava_slime_sides.png diff --git a/a merger/mobs-MFF/textures/mobs_lava_slime_top.png b/maj-mobs/mobs-master-TenPlus1/textures/mobs_lava_slime_top.png similarity index 100% rename from a merger/mobs-MFF/textures/mobs_lava_slime_top.png rename to maj-mobs/mobs-master-TenPlus1/textures/mobs_lava_slime_top.png diff --git a/a merger/mobs-MFF/textures/mobs_leather.png b/maj-mobs/mobs-master-TenPlus1/textures/mobs_leather.png similarity index 100% rename from a merger/mobs-MFF/textures/mobs_leather.png rename to maj-mobs/mobs-master-TenPlus1/textures/mobs_leather.png diff --git a/a merger/mobs-MFF/textures/mobs_magic_lasso.png b/maj-mobs/mobs-master-TenPlus1/textures/mobs_magic_lasso.png similarity index 100% rename from a merger/mobs-MFF/textures/mobs_magic_lasso.png rename to maj-mobs/mobs-master-TenPlus1/textures/mobs_magic_lasso.png diff --git a/a merger/mobs-MFF/textures/mobs_meat.png b/maj-mobs/mobs-master-TenPlus1/textures/mobs_meat.png similarity index 100% rename from a merger/mobs-MFF/textures/mobs_meat.png rename to maj-mobs/mobs-master-TenPlus1/textures/mobs_meat.png diff --git a/a merger/mobs-MFF/textures/mobs_meat_raw.png b/maj-mobs/mobs-master-TenPlus1/textures/mobs_meat_raw.png similarity index 100% rename from a merger/mobs-MFF/textures/mobs_meat_raw.png rename to maj-mobs/mobs-master-TenPlus1/textures/mobs_meat_raw.png diff --git a/a merger/mobs-MFF/textures/mobs_npc.png b/maj-mobs/mobs-master-TenPlus1/textures/mobs_npc.png similarity index 100% rename from a merger/mobs-MFF/textures/mobs_npc.png rename to maj-mobs/mobs-master-TenPlus1/textures/mobs_npc.png diff --git a/a merger/mobs-MFF/textures/mobs_oerkki.png b/maj-mobs/mobs-master-TenPlus1/textures/mobs_oerkki.png similarity index 100% rename from a merger/mobs-MFF/textures/mobs_oerkki.png rename to maj-mobs/mobs-master-TenPlus1/textures/mobs_oerkki.png diff --git a/a merger/mobs-MFF/textures/mobs_oerkki2.png b/maj-mobs/mobs-master-TenPlus1/textures/mobs_oerkki2.png similarity index 100% rename from a merger/mobs-MFF/textures/mobs_oerkki2.png rename to maj-mobs/mobs-master-TenPlus1/textures/mobs_oerkki2.png diff --git a/a merger/mobs-MFF/textures/mobs_pork_cooked.png b/maj-mobs/mobs-master-TenPlus1/textures/mobs_pork_cooked.png similarity index 100% rename from a merger/mobs-MFF/textures/mobs_pork_cooked.png rename to maj-mobs/mobs-master-TenPlus1/textures/mobs_pork_cooked.png diff --git a/a merger/mobs-MFF/textures/mobs_pork_raw.png b/maj-mobs/mobs-master-TenPlus1/textures/mobs_pork_raw.png similarity index 100% rename from a merger/mobs-MFF/textures/mobs_pork_raw.png rename to maj-mobs/mobs-master-TenPlus1/textures/mobs_pork_raw.png diff --git a/a merger/mobs-MFF/textures/mobs_pumba.png b/maj-mobs/mobs-master-TenPlus1/textures/mobs_pumba.png similarity index 100% rename from a merger/mobs-MFF/textures/mobs_pumba.png rename to maj-mobs/mobs-master-TenPlus1/textures/mobs_pumba.png diff --git a/a merger/mobs-MFF/textures/mobs_rat.png b/maj-mobs/mobs-master-TenPlus1/textures/mobs_rat.png similarity index 100% rename from a merger/mobs-MFF/textures/mobs_rat.png rename to maj-mobs/mobs-master-TenPlus1/textures/mobs_rat.png diff --git a/a merger/mobs-MFF/textures/mobs_rat_brown.png b/maj-mobs/mobs-master-TenPlus1/textures/mobs_rat_brown.png similarity index 100% rename from a merger/mobs-MFF/textures/mobs_rat_brown.png rename to maj-mobs/mobs-master-TenPlus1/textures/mobs_rat_brown.png diff --git a/a merger/mobs-MFF/textures/mobs_rat_inventory.png b/maj-mobs/mobs-master-TenPlus1/textures/mobs_rat_inventory.png similarity index 100% rename from a merger/mobs-MFF/textures/mobs_rat_inventory.png rename to maj-mobs/mobs-master-TenPlus1/textures/mobs_rat_inventory.png diff --git a/a merger/mobs-MFF/textures/mobs_sand_monster.png b/maj-mobs/mobs-master-TenPlus1/textures/mobs_sand_monster.png similarity index 100% rename from a merger/mobs-MFF/textures/mobs_sand_monster.png rename to maj-mobs/mobs-master-TenPlus1/textures/mobs_sand_monster.png diff --git a/a merger/mobs-MFF/textures/mobs_shears.png b/maj-mobs/mobs-master-TenPlus1/textures/mobs_shears.png similarity index 100% rename from a merger/mobs-MFF/textures/mobs_shears.png rename to maj-mobs/mobs-master-TenPlus1/textures/mobs_shears.png diff --git a/a merger/mobs-MFF/textures/mobs_sheep.png b/maj-mobs/mobs-master-TenPlus1/textures/mobs_sheep.png similarity index 100% rename from a merger/mobs-MFF/textures/mobs_sheep.png rename to maj-mobs/mobs-master-TenPlus1/textures/mobs_sheep.png diff --git a/a merger/mobs-MFF/textures/mobs_sheep_shaved.png b/maj-mobs/mobs-master-TenPlus1/textures/mobs_sheep_shaved.png similarity index 100% rename from a merger/mobs-MFF/textures/mobs_sheep_shaved.png rename to maj-mobs/mobs-master-TenPlus1/textures/mobs_sheep_shaved.png diff --git a/a merger/mobs-MFF/textures/mobs_spider.png b/maj-mobs/mobs-master-TenPlus1/textures/mobs_spider.png similarity index 100% rename from a merger/mobs-MFF/textures/mobs_spider.png rename to maj-mobs/mobs-master-TenPlus1/textures/mobs_spider.png diff --git a/a merger/mobs-MFF/textures/mobs_stone_monster.png b/maj-mobs/mobs-master-TenPlus1/textures/mobs_stone_monster.png similarity index 100% rename from a merger/mobs-MFF/textures/mobs_stone_monster.png rename to maj-mobs/mobs-master-TenPlus1/textures/mobs_stone_monster.png diff --git a/a merger/mobs-MFF/textures/mobs_tree_monster.png b/maj-mobs/mobs-master-TenPlus1/textures/mobs_tree_monster.png similarity index 100% rename from a merger/mobs-MFF/textures/mobs_tree_monster.png rename to maj-mobs/mobs-master-TenPlus1/textures/mobs_tree_monster.png diff --git a/a merger/mobs-MFF/textures/mobs_wolf.png b/maj-mobs/mobs-master-TenPlus1/textures/mobs_wolf.png similarity index 100% rename from a merger/mobs-MFF/textures/mobs_wolf.png rename to maj-mobs/mobs-master-TenPlus1/textures/mobs_wolf.png diff --git a/a merger/mobs-MFF/textures/mobs_wolf_inv.png b/maj-mobs/mobs-master-TenPlus1/textures/mobs_wolf_inv.png similarity index 100% rename from a merger/mobs-MFF/textures/mobs_wolf_inv.png rename to maj-mobs/mobs-master-TenPlus1/textures/mobs_wolf_inv.png diff --git a/a merger/mobs-MFF/textures/oerkki.png b/maj-mobs/mobs-master-TenPlus1/textures/oerkki.png similarity index 100% rename from a merger/mobs-MFF/textures/oerkki.png rename to maj-mobs/mobs-master-TenPlus1/textures/oerkki.png diff --git a/a merger/mobs-MFF/textures/tnt_smoke.png b/maj-mobs/mobs-master-TenPlus1/textures/tnt_smoke.png similarity index 100% rename from a merger/mobs-MFF/textures/tnt_smoke.png rename to maj-mobs/mobs-master-TenPlus1/textures/tnt_smoke.png diff --git a/a merger/mobs-MFF/textures/zmobs_egg_lava_flan.png b/maj-mobs/mobs-master-TenPlus1/textures/zmobs_egg_lava_flan.png similarity index 100% rename from a merger/mobs-MFF/textures/zmobs_egg_lava_flan.png rename to maj-mobs/mobs-master-TenPlus1/textures/zmobs_egg_lava_flan.png diff --git a/a merger/mobs-MFF/textures/zmobs_egg_mese_monster.png b/maj-mobs/mobs-master-TenPlus1/textures/zmobs_egg_mese_monster.png similarity index 100% rename from a merger/mobs-MFF/textures/zmobs_egg_mese_monster.png rename to maj-mobs/mobs-master-TenPlus1/textures/zmobs_egg_mese_monster.png diff --git a/a merger/mobs-MFF/textures/zmobs_lava_flan.png b/maj-mobs/mobs-master-TenPlus1/textures/zmobs_lava_flan.png similarity index 100% rename from a merger/mobs-MFF/textures/zmobs_lava_flan.png rename to maj-mobs/mobs-master-TenPlus1/textures/zmobs_lava_flan.png diff --git a/a merger/mobs-MFF/textures/zmobs_lava_orb.png b/maj-mobs/mobs-master-TenPlus1/textures/zmobs_lava_orb.png similarity index 100% rename from a merger/mobs-MFF/textures/zmobs_lava_orb.png rename to maj-mobs/mobs-master-TenPlus1/textures/zmobs_lava_orb.png diff --git a/a merger/mobs-MFF/textures/zmobs_mese_monster.png b/maj-mobs/mobs-master-TenPlus1/textures/zmobs_mese_monster.png similarity index 100% rename from a merger/mobs-MFF/textures/zmobs_mese_monster.png rename to maj-mobs/mobs-master-TenPlus1/textures/zmobs_mese_monster.png diff --git a/a merger/mobs-MFF/treemonster.lua b/maj-mobs/mobs-master-TenPlus1/treemonster.lua old mode 100755 new mode 100644 similarity index 100% rename from a merger/mobs-MFF/treemonster.lua rename to maj-mobs/mobs-master-TenPlus1/treemonster.lua diff --git a/a merger/mobs-MFF/warthog.lua b/maj-mobs/mobs-master-TenPlus1/warthog.lua old mode 100755 new mode 100644 similarity index 100% rename from a merger/mobs-MFF/warthog.lua rename to maj-mobs/mobs-master-TenPlus1/warthog.lua diff --git a/a merger/mobs-MFF/wolf.lua b/maj-mobs/mobs-master-TenPlus1/wolf.lua similarity index 100% rename from a merger/mobs-MFF/wolf.lua rename to maj-mobs/mobs-master-TenPlus1/wolf.lua diff --git a/a merger/mobs-master-TenPlus1/README.txt b/maj-mobs/mobs-mff/README.txt old mode 100644 new mode 100755 similarity index 100% rename from a merger/mobs-master-TenPlus1/README.txt rename to maj-mobs/mobs-mff/README.txt diff --git a/a merger/mobs-MFF/api.lua b/maj-mobs/mobs-mff/api.lua similarity index 100% rename from a merger/mobs-MFF/api.lua rename to maj-mobs/mobs-mff/api.lua diff --git a/a merger/mobs-master-TenPlus1/bee.lua b/maj-mobs/mobs-mff/bee.lua old mode 100644 new mode 100755 similarity index 100% rename from a merger/mobs-master-TenPlus1/bee.lua rename to maj-mobs/mobs-mff/bee.lua diff --git a/a merger/mobs-master-TenPlus1/bunny.lua b/maj-mobs/mobs-mff/bunny.lua old mode 100644 new mode 100755 similarity index 100% rename from a merger/mobs-master-TenPlus1/bunny.lua rename to maj-mobs/mobs-mff/bunny.lua diff --git a/a merger/mobs-master-TenPlus1/chicken.lua b/maj-mobs/mobs-mff/chicken.lua old mode 100644 new mode 100755 similarity index 100% rename from a merger/mobs-master-TenPlus1/chicken.lua rename to maj-mobs/mobs-mff/chicken.lua diff --git a/a merger/mobs-master-TenPlus1/cow.lua b/maj-mobs/mobs-mff/cow.lua old mode 100644 new mode 100755 similarity index 100% rename from a merger/mobs-master-TenPlus1/cow.lua rename to maj-mobs/mobs-mff/cow.lua diff --git a/a merger/mobs-master-TenPlus1/creeper.lua b/maj-mobs/mobs-mff/creeper.lua similarity index 100% rename from a merger/mobs-master-TenPlus1/creeper.lua rename to maj-mobs/mobs-mff/creeper.lua diff --git a/a merger/mobs-master-TenPlus1/depends.txt b/maj-mobs/mobs-mff/depends.txt old mode 100644 new mode 100755 similarity index 100% rename from a merger/mobs-master-TenPlus1/depends.txt rename to maj-mobs/mobs-mff/depends.txt diff --git a/a merger/mobs-master-TenPlus1/dirtmonster.lua b/maj-mobs/mobs-mff/dirtmonster.lua old mode 100644 new mode 100755 similarity index 100% rename from a merger/mobs-master-TenPlus1/dirtmonster.lua rename to maj-mobs/mobs-mff/dirtmonster.lua diff --git a/a merger/mobs-MFF/dungeonmaster.lua b/maj-mobs/mobs-mff/dungeonmaster.lua similarity index 100% rename from a merger/mobs-MFF/dungeonmaster.lua rename to maj-mobs/mobs-mff/dungeonmaster.lua diff --git a/a merger/mobs-master-TenPlus1/greenslimes.lua b/maj-mobs/mobs-mff/greenslimes.lua similarity index 100% rename from a merger/mobs-master-TenPlus1/greenslimes.lua rename to maj-mobs/mobs-mff/greenslimes.lua diff --git a/a merger/mobs-master-TenPlus1/init.lua b/maj-mobs/mobs-mff/init.lua old mode 100644 new mode 100755 similarity index 100% rename from a merger/mobs-master-TenPlus1/init.lua rename to maj-mobs/mobs-mff/init.lua diff --git a/a merger/mobs-master-TenPlus1/kitten.lua b/maj-mobs/mobs-mff/kitten.lua similarity index 100% rename from a merger/mobs-master-TenPlus1/kitten.lua rename to maj-mobs/mobs-mff/kitten.lua diff --git a/a merger/mobs-master-TenPlus1/lava_flan.lua b/maj-mobs/mobs-mff/lava_flan.lua old mode 100644 new mode 100755 similarity index 100% rename from a merger/mobs-master-TenPlus1/lava_flan.lua rename to maj-mobs/mobs-mff/lava_flan.lua diff --git a/a merger/mobs-master-TenPlus1/lavaslimes.lua b/maj-mobs/mobs-mff/lavaslimes.lua similarity index 100% rename from a merger/mobs-master-TenPlus1/lavaslimes.lua rename to maj-mobs/mobs-mff/lavaslimes.lua diff --git a/a merger/mobs-master-TenPlus1/license.txt b/maj-mobs/mobs-mff/license.txt old mode 100644 new mode 100755 similarity index 100% rename from a merger/mobs-master-TenPlus1/license.txt rename to maj-mobs/mobs-mff/license.txt diff --git a/a merger/mobs-master-TenPlus1/mese_monster.lua b/maj-mobs/mobs-mff/mese_monster.lua old mode 100644 new mode 100755 similarity index 100% rename from a merger/mobs-master-TenPlus1/mese_monster.lua rename to maj-mobs/mobs-mff/mese_monster.lua diff --git a/a merger/mobs-master-TenPlus1/models/character.b3d b/maj-mobs/mobs-mff/models/character.b3d similarity index 100% rename from a merger/mobs-master-TenPlus1/models/character.b3d rename to maj-mobs/mobs-mff/models/character.b3d diff --git a/a merger/mobs-master-TenPlus1/models/mobs_bee.x b/maj-mobs/mobs-mff/models/mobs_bee.x similarity index 100% rename from a merger/mobs-master-TenPlus1/models/mobs_bee.x rename to maj-mobs/mobs-mff/models/mobs_bee.x diff --git a/a merger/mobs-master-TenPlus1/models/mobs_bunny.b3d b/maj-mobs/mobs-mff/models/mobs_bunny.b3d similarity index 100% rename from a merger/mobs-master-TenPlus1/models/mobs_bunny.b3d rename to maj-mobs/mobs-mff/models/mobs_bunny.b3d diff --git a/a merger/mobs-master-TenPlus1/models/mobs_chicken.x b/maj-mobs/mobs-mff/models/mobs_chicken.x similarity index 100% rename from a merger/mobs-master-TenPlus1/models/mobs_chicken.x rename to maj-mobs/mobs-mff/models/mobs_chicken.x diff --git a/a merger/mobs-master-TenPlus1/models/mobs_cow.x b/maj-mobs/mobs-mff/models/mobs_cow.x similarity index 100% rename from a merger/mobs-master-TenPlus1/models/mobs_cow.x rename to maj-mobs/mobs-mff/models/mobs_cow.x diff --git a/a merger/mobs-master-TenPlus1/models/mobs_dungeon_master.x b/maj-mobs/mobs-mff/models/mobs_dungeon_master.x similarity index 100% rename from a merger/mobs-master-TenPlus1/models/mobs_dungeon_master.x rename to maj-mobs/mobs-mff/models/mobs_dungeon_master.x diff --git a/a merger/mobs-master-TenPlus1/models/mobs_kitten.b3d b/maj-mobs/mobs-mff/models/mobs_kitten.b3d similarity index 100% rename from a merger/mobs-master-TenPlus1/models/mobs_kitten.b3d rename to maj-mobs/mobs-mff/models/mobs_kitten.b3d diff --git a/a merger/mobs-master-TenPlus1/models/mobs_oerkki.x b/maj-mobs/mobs-mff/models/mobs_oerkki.x similarity index 100% rename from a merger/mobs-master-TenPlus1/models/mobs_oerkki.x rename to maj-mobs/mobs-mff/models/mobs_oerkki.x diff --git a/a merger/mobs-master-TenPlus1/models/mobs_pumba.x b/maj-mobs/mobs-mff/models/mobs_pumba.x similarity index 100% rename from a merger/mobs-master-TenPlus1/models/mobs_pumba.x rename to maj-mobs/mobs-mff/models/mobs_pumba.x diff --git a/a merger/mobs-master-TenPlus1/models/mobs_rat.x b/maj-mobs/mobs-mff/models/mobs_rat.x similarity index 100% rename from a merger/mobs-master-TenPlus1/models/mobs_rat.x rename to maj-mobs/mobs-mff/models/mobs_rat.x diff --git a/a merger/mobs-master-TenPlus1/models/mobs_sand_monster.x b/maj-mobs/mobs-mff/models/mobs_sand_monster.x similarity index 100% rename from a merger/mobs-master-TenPlus1/models/mobs_sand_monster.x rename to maj-mobs/mobs-mff/models/mobs_sand_monster.x diff --git a/a merger/mobs-master-TenPlus1/models/mobs_sheep.x b/maj-mobs/mobs-mff/models/mobs_sheep.x similarity index 100% rename from a merger/mobs-master-TenPlus1/models/mobs_sheep.x rename to maj-mobs/mobs-mff/models/mobs_sheep.x diff --git a/a merger/mobs-master-TenPlus1/models/mobs_sheep_shaved.x b/maj-mobs/mobs-mff/models/mobs_sheep_shaved.x similarity index 100% rename from a merger/mobs-master-TenPlus1/models/mobs_sheep_shaved.x rename to maj-mobs/mobs-mff/models/mobs_sheep_shaved.x diff --git a/a merger/mobs-master-TenPlus1/models/mobs_spider.x b/maj-mobs/mobs-mff/models/mobs_spider.x similarity index 100% rename from a merger/mobs-master-TenPlus1/models/mobs_spider.x rename to maj-mobs/mobs-mff/models/mobs_spider.x diff --git a/a merger/mobs-master-TenPlus1/models/mobs_stone_monster.x b/maj-mobs/mobs-mff/models/mobs_stone_monster.x similarity index 100% rename from a merger/mobs-master-TenPlus1/models/mobs_stone_monster.x rename to maj-mobs/mobs-mff/models/mobs_stone_monster.x diff --git a/a merger/mobs-master-TenPlus1/models/mobs_tree_monster.x b/maj-mobs/mobs-mff/models/mobs_tree_monster.x similarity index 100% rename from a merger/mobs-master-TenPlus1/models/mobs_tree_monster.x rename to maj-mobs/mobs-mff/models/mobs_tree_monster.x diff --git a/a merger/mobs-master-TenPlus1/models/mobs_wolf.x b/maj-mobs/mobs-mff/models/mobs_wolf.x similarity index 100% rename from a merger/mobs-master-TenPlus1/models/mobs_wolf.x rename to maj-mobs/mobs-mff/models/mobs_wolf.x diff --git a/a merger/mobs-master-TenPlus1/models/zmobs_lava_flan.x b/maj-mobs/mobs-mff/models/zmobs_lava_flan.x similarity index 100% rename from a merger/mobs-master-TenPlus1/models/zmobs_lava_flan.x rename to maj-mobs/mobs-mff/models/zmobs_lava_flan.x diff --git a/a merger/mobs-master-TenPlus1/models/zmobs_mese_monster.x b/maj-mobs/mobs-mff/models/zmobs_mese_monster.x similarity index 100% rename from a merger/mobs-master-TenPlus1/models/zmobs_mese_monster.x rename to maj-mobs/mobs-mff/models/zmobs_mese_monster.x diff --git a/a merger/mobs-master-TenPlus1/npc.lua b/maj-mobs/mobs-mff/npc.lua old mode 100644 new mode 100755 similarity index 100% rename from a merger/mobs-master-TenPlus1/npc.lua rename to maj-mobs/mobs-mff/npc.lua diff --git a/a merger/mobs-master-TenPlus1/oerkki.lua b/maj-mobs/mobs-mff/oerkki.lua old mode 100644 new mode 100755 similarity index 100% rename from a merger/mobs-master-TenPlus1/oerkki.lua rename to maj-mobs/mobs-mff/oerkki.lua diff --git a/a merger/mobs-master-TenPlus1/rat.lua b/maj-mobs/mobs-mff/rat.lua old mode 100644 new mode 100755 similarity index 100% rename from a merger/mobs-master-TenPlus1/rat.lua rename to maj-mobs/mobs-mff/rat.lua diff --git a/a merger/mobs-master-TenPlus1/sandmonster.lua b/maj-mobs/mobs-mff/sandmonster.lua old mode 100644 new mode 100755 similarity index 100% rename from a merger/mobs-master-TenPlus1/sandmonster.lua rename to maj-mobs/mobs-mff/sandmonster.lua diff --git a/a merger/mobs-master-TenPlus1/sheep.lua b/maj-mobs/mobs-mff/sheep.lua old mode 100644 new mode 100755 similarity index 100% rename from a merger/mobs-master-TenPlus1/sheep.lua rename to maj-mobs/mobs-mff/sheep.lua diff --git a/a merger/mobs-master-TenPlus1/sounds/mobs_bee.ogg b/maj-mobs/mobs-mff/sounds/mobs_bee.ogg similarity index 100% rename from a merger/mobs-master-TenPlus1/sounds/mobs_bee.ogg rename to maj-mobs/mobs-mff/sounds/mobs_bee.ogg diff --git a/a merger/mobs-master-TenPlus1/sounds/mobs_chicken.ogg b/maj-mobs/mobs-mff/sounds/mobs_chicken.ogg similarity index 100% rename from a merger/mobs-master-TenPlus1/sounds/mobs_chicken.ogg rename to maj-mobs/mobs-mff/sounds/mobs_chicken.ogg diff --git a/a merger/mobs-master-TenPlus1/sounds/mobs_cow.ogg b/maj-mobs/mobs-mff/sounds/mobs_cow.ogg similarity index 100% rename from a merger/mobs-master-TenPlus1/sounds/mobs_cow.ogg rename to maj-mobs/mobs-mff/sounds/mobs_cow.ogg diff --git a/a merger/mobs-master-TenPlus1/sounds/mobs_dirtmonster.1.ogg b/maj-mobs/mobs-mff/sounds/mobs_dirtmonster.1.ogg similarity index 100% rename from a merger/mobs-master-TenPlus1/sounds/mobs_dirtmonster.1.ogg rename to maj-mobs/mobs-mff/sounds/mobs_dirtmonster.1.ogg diff --git a/a merger/mobs-master-TenPlus1/sounds/mobs_dirtmonster.2.ogg b/maj-mobs/mobs-mff/sounds/mobs_dirtmonster.2.ogg similarity index 100% rename from a merger/mobs-master-TenPlus1/sounds/mobs_dirtmonster.2.ogg rename to maj-mobs/mobs-mff/sounds/mobs_dirtmonster.2.ogg diff --git a/a merger/mobs-master-TenPlus1/sounds/mobs_dungeonmaster.1.ogg b/maj-mobs/mobs-mff/sounds/mobs_dungeonmaster.1.ogg similarity index 100% rename from a merger/mobs-master-TenPlus1/sounds/mobs_dungeonmaster.1.ogg rename to maj-mobs/mobs-mff/sounds/mobs_dungeonmaster.1.ogg diff --git a/a merger/mobs-master-TenPlus1/sounds/mobs_dungeonmaster.2.ogg b/maj-mobs/mobs-mff/sounds/mobs_dungeonmaster.2.ogg similarity index 100% rename from a merger/mobs-master-TenPlus1/sounds/mobs_dungeonmaster.2.ogg rename to maj-mobs/mobs-mff/sounds/mobs_dungeonmaster.2.ogg diff --git a/a merger/mobs-master-TenPlus1/sounds/mobs_dungeonmaster.3.ogg b/maj-mobs/mobs-mff/sounds/mobs_dungeonmaster.3.ogg similarity index 100% rename from a merger/mobs-master-TenPlus1/sounds/mobs_dungeonmaster.3.ogg rename to maj-mobs/mobs-mff/sounds/mobs_dungeonmaster.3.ogg diff --git a/a merger/mobs-master-TenPlus1/sounds/mobs_eerie.ogg b/maj-mobs/mobs-mff/sounds/mobs_eerie.ogg similarity index 100% rename from a merger/mobs-master-TenPlus1/sounds/mobs_eerie.ogg rename to maj-mobs/mobs-mff/sounds/mobs_eerie.ogg diff --git a/a merger/mobs-master-TenPlus1/sounds/mobs_fireball.ogg b/maj-mobs/mobs-mff/sounds/mobs_fireball.ogg similarity index 100% rename from a merger/mobs-master-TenPlus1/sounds/mobs_fireball.ogg rename to maj-mobs/mobs-mff/sounds/mobs_fireball.ogg diff --git a/a merger/mobs-master-TenPlus1/sounds/mobs_howl.ogg b/maj-mobs/mobs-mff/sounds/mobs_howl.ogg similarity index 100% rename from a merger/mobs-master-TenPlus1/sounds/mobs_howl.ogg rename to maj-mobs/mobs-mff/sounds/mobs_howl.ogg diff --git a/a merger/mobs-master-TenPlus1/sounds/mobs_kitten.1.ogg b/maj-mobs/mobs-mff/sounds/mobs_kitten.1.ogg similarity index 100% rename from a merger/mobs-master-TenPlus1/sounds/mobs_kitten.1.ogg rename to maj-mobs/mobs-mff/sounds/mobs_kitten.1.ogg diff --git a/a merger/mobs-master-TenPlus1/sounds/mobs_kitten.2.ogg b/maj-mobs/mobs-mff/sounds/mobs_kitten.2.ogg similarity index 100% rename from a merger/mobs-master-TenPlus1/sounds/mobs_kitten.2.ogg rename to maj-mobs/mobs-mff/sounds/mobs_kitten.2.ogg diff --git a/a merger/mobs-master-TenPlus1/sounds/mobs_kitten.3.ogg b/maj-mobs/mobs-mff/sounds/mobs_kitten.3.ogg similarity index 100% rename from a merger/mobs-master-TenPlus1/sounds/mobs_kitten.3.ogg rename to maj-mobs/mobs-mff/sounds/mobs_kitten.3.ogg diff --git a/a merger/mobs-master-TenPlus1/sounds/mobs_kitten.4.ogg b/maj-mobs/mobs-mff/sounds/mobs_kitten.4.ogg similarity index 100% rename from a merger/mobs-master-TenPlus1/sounds/mobs_kitten.4.ogg rename to maj-mobs/mobs-mff/sounds/mobs_kitten.4.ogg diff --git a/a merger/mobs-master-TenPlus1/sounds/mobs_kitten.5.ogg b/maj-mobs/mobs-mff/sounds/mobs_kitten.5.ogg similarity index 100% rename from a merger/mobs-master-TenPlus1/sounds/mobs_kitten.5.ogg rename to maj-mobs/mobs-mff/sounds/mobs_kitten.5.ogg diff --git a/a merger/mobs-master-TenPlus1/sounds/mobs_kitten.6.ogg b/maj-mobs/mobs-mff/sounds/mobs_kitten.6.ogg similarity index 100% rename from a merger/mobs-master-TenPlus1/sounds/mobs_kitten.6.ogg rename to maj-mobs/mobs-mff/sounds/mobs_kitten.6.ogg diff --git a/a merger/mobs-master-TenPlus1/sounds/mobs_lavaflan.1.ogg b/maj-mobs/mobs-mff/sounds/mobs_lavaflan.1.ogg similarity index 100% rename from a merger/mobs-master-TenPlus1/sounds/mobs_lavaflan.1.ogg rename to maj-mobs/mobs-mff/sounds/mobs_lavaflan.1.ogg diff --git a/a merger/mobs-master-TenPlus1/sounds/mobs_lavaflan.2.ogg b/maj-mobs/mobs-mff/sounds/mobs_lavaflan.2.ogg similarity index 100% rename from a merger/mobs-master-TenPlus1/sounds/mobs_lavaflan.2.ogg rename to maj-mobs/mobs-mff/sounds/mobs_lavaflan.2.ogg diff --git a/a merger/mobs-master-TenPlus1/sounds/mobs_mesemonster.1.ogg b/maj-mobs/mobs-mff/sounds/mobs_mesemonster.1.ogg similarity index 100% rename from a merger/mobs-master-TenPlus1/sounds/mobs_mesemonster.1.ogg rename to maj-mobs/mobs-mff/sounds/mobs_mesemonster.1.ogg diff --git a/a merger/mobs-master-TenPlus1/sounds/mobs_mesemonster.2.ogg b/maj-mobs/mobs-mff/sounds/mobs_mesemonster.2.ogg similarity index 100% rename from a merger/mobs-master-TenPlus1/sounds/mobs_mesemonster.2.ogg rename to maj-mobs/mobs-mff/sounds/mobs_mesemonster.2.ogg diff --git a/a merger/mobs-master-TenPlus1/sounds/mobs_oerkki.1.ogg b/maj-mobs/mobs-mff/sounds/mobs_oerkki.1.ogg similarity index 100% rename from a merger/mobs-master-TenPlus1/sounds/mobs_oerkki.1.ogg rename to maj-mobs/mobs-mff/sounds/mobs_oerkki.1.ogg diff --git a/a merger/mobs-master-TenPlus1/sounds/mobs_oerkki.2.ogg b/maj-mobs/mobs-mff/sounds/mobs_oerkki.2.ogg similarity index 100% rename from a merger/mobs-master-TenPlus1/sounds/mobs_oerkki.2.ogg rename to maj-mobs/mobs-mff/sounds/mobs_oerkki.2.ogg diff --git a/a merger/mobs-master-TenPlus1/sounds/mobs_oerkki_attack.ogg b/maj-mobs/mobs-mff/sounds/mobs_oerkki_attack.ogg similarity index 100% rename from a merger/mobs-master-TenPlus1/sounds/mobs_oerkki_attack.ogg rename to maj-mobs/mobs-mff/sounds/mobs_oerkki_attack.ogg diff --git a/a merger/mobs-master-TenPlus1/sounds/mobs_pig.ogg b/maj-mobs/mobs-mff/sounds/mobs_pig.ogg similarity index 100% rename from a merger/mobs-master-TenPlus1/sounds/mobs_pig.ogg rename to maj-mobs/mobs-mff/sounds/mobs_pig.ogg diff --git a/a merger/mobs-master-TenPlus1/sounds/mobs_pig_angry.ogg b/maj-mobs/mobs-mff/sounds/mobs_pig_angry.ogg similarity index 100% rename from a merger/mobs-master-TenPlus1/sounds/mobs_pig_angry.ogg rename to maj-mobs/mobs-mff/sounds/mobs_pig_angry.ogg diff --git a/a merger/mobs-master-TenPlus1/sounds/mobs_rat.1.ogg b/maj-mobs/mobs-mff/sounds/mobs_rat.1.ogg similarity index 100% rename from a merger/mobs-master-TenPlus1/sounds/mobs_rat.1.ogg rename to maj-mobs/mobs-mff/sounds/mobs_rat.1.ogg diff --git a/a merger/mobs-master-TenPlus1/sounds/mobs_rat.2.ogg b/maj-mobs/mobs-mff/sounds/mobs_rat.2.ogg similarity index 100% rename from a merger/mobs-master-TenPlus1/sounds/mobs_rat.2.ogg rename to maj-mobs/mobs-mff/sounds/mobs_rat.2.ogg diff --git a/a merger/mobs-master-TenPlus1/sounds/mobs_sandmonster.1.ogg b/maj-mobs/mobs-mff/sounds/mobs_sandmonster.1.ogg similarity index 100% rename from a merger/mobs-master-TenPlus1/sounds/mobs_sandmonster.1.ogg rename to maj-mobs/mobs-mff/sounds/mobs_sandmonster.1.ogg diff --git a/a merger/mobs-master-TenPlus1/sounds/mobs_sandmonster.2.ogg b/maj-mobs/mobs-mff/sounds/mobs_sandmonster.2.ogg similarity index 100% rename from a merger/mobs-master-TenPlus1/sounds/mobs_sandmonster.2.ogg rename to maj-mobs/mobs-mff/sounds/mobs_sandmonster.2.ogg diff --git a/a merger/mobs-master-TenPlus1/sounds/mobs_sheep.ogg b/maj-mobs/mobs-mff/sounds/mobs_sheep.ogg similarity index 100% rename from a merger/mobs-master-TenPlus1/sounds/mobs_sheep.ogg rename to maj-mobs/mobs-mff/sounds/mobs_sheep.ogg diff --git a/a merger/mobs-master-TenPlus1/sounds/mobs_slimes_attack.ogg b/maj-mobs/mobs-mff/sounds/mobs_slimes_attack.ogg similarity index 100% rename from a merger/mobs-master-TenPlus1/sounds/mobs_slimes_attack.ogg rename to maj-mobs/mobs-mff/sounds/mobs_slimes_attack.ogg diff --git a/a merger/mobs-master-TenPlus1/sounds/mobs_slimes_damage.ogg b/maj-mobs/mobs-mff/sounds/mobs_slimes_damage.ogg similarity index 100% rename from a merger/mobs-master-TenPlus1/sounds/mobs_slimes_damage.ogg rename to maj-mobs/mobs-mff/sounds/mobs_slimes_damage.ogg diff --git a/a merger/mobs-master-TenPlus1/sounds/mobs_slimes_death.ogg b/maj-mobs/mobs-mff/sounds/mobs_slimes_death.ogg similarity index 100% rename from a merger/mobs-master-TenPlus1/sounds/mobs_slimes_death.ogg rename to maj-mobs/mobs-mff/sounds/mobs_slimes_death.ogg diff --git a/a merger/mobs-master-TenPlus1/sounds/mobs_slimes_jump.ogg b/maj-mobs/mobs-mff/sounds/mobs_slimes_jump.ogg similarity index 100% rename from a merger/mobs-master-TenPlus1/sounds/mobs_slimes_jump.ogg rename to maj-mobs/mobs-mff/sounds/mobs_slimes_jump.ogg diff --git a/a merger/mobs-master-TenPlus1/sounds/mobs_spider.ogg b/maj-mobs/mobs-mff/sounds/mobs_spider.ogg similarity index 100% rename from a merger/mobs-master-TenPlus1/sounds/mobs_spider.ogg rename to maj-mobs/mobs-mff/sounds/mobs_spider.ogg diff --git a/a merger/mobs-master-TenPlus1/sounds/mobs_spider_attack.ogg b/maj-mobs/mobs-mff/sounds/mobs_spider_attack.ogg similarity index 100% rename from a merger/mobs-master-TenPlus1/sounds/mobs_spider_attack.ogg rename to maj-mobs/mobs-mff/sounds/mobs_spider_attack.ogg diff --git a/a merger/mobs-master-TenPlus1/sounds/mobs_stonemonster.1.ogg b/maj-mobs/mobs-mff/sounds/mobs_stonemonster.1.ogg similarity index 100% rename from a merger/mobs-master-TenPlus1/sounds/mobs_stonemonster.1.ogg rename to maj-mobs/mobs-mff/sounds/mobs_stonemonster.1.ogg diff --git a/a merger/mobs-master-TenPlus1/sounds/mobs_stonemonster.2.ogg b/maj-mobs/mobs-mff/sounds/mobs_stonemonster.2.ogg similarity index 100% rename from a merger/mobs-master-TenPlus1/sounds/mobs_stonemonster.2.ogg rename to maj-mobs/mobs-mff/sounds/mobs_stonemonster.2.ogg diff --git a/a merger/mobs-master-TenPlus1/sounds/mobs_stonemonster_attack.ogg b/maj-mobs/mobs-mff/sounds/mobs_stonemonster_attack.ogg similarity index 100% rename from a merger/mobs-master-TenPlus1/sounds/mobs_stonemonster_attack.ogg rename to maj-mobs/mobs-mff/sounds/mobs_stonemonster_attack.ogg diff --git a/a merger/mobs-master-TenPlus1/sounds/mobs_treemonster.1.ogg b/maj-mobs/mobs-mff/sounds/mobs_treemonster.1.ogg similarity index 100% rename from a merger/mobs-master-TenPlus1/sounds/mobs_treemonster.1.ogg rename to maj-mobs/mobs-mff/sounds/mobs_treemonster.1.ogg diff --git a/a merger/mobs-master-TenPlus1/sounds/mobs_treemonster.2.ogg b/maj-mobs/mobs-mff/sounds/mobs_treemonster.2.ogg similarity index 100% rename from a merger/mobs-master-TenPlus1/sounds/mobs_treemonster.2.ogg rename to maj-mobs/mobs-mff/sounds/mobs_treemonster.2.ogg diff --git a/a merger/mobs-master-TenPlus1/sounds/mobs_wolf.ogg b/maj-mobs/mobs-mff/sounds/mobs_wolf.ogg similarity index 100% rename from a merger/mobs-master-TenPlus1/sounds/mobs_wolf.ogg rename to maj-mobs/mobs-mff/sounds/mobs_wolf.ogg diff --git a/a merger/mobs-master-TenPlus1/sounds/tnt_explode.ogg b/maj-mobs/mobs-mff/sounds/tnt_explode.ogg similarity index 100% rename from a merger/mobs-master-TenPlus1/sounds/tnt_explode.ogg rename to maj-mobs/mobs-mff/sounds/tnt_explode.ogg diff --git a/a merger/mobs-master-TenPlus1/spider.lua b/maj-mobs/mobs-mff/spider.lua old mode 100644 new mode 100755 similarity index 100% rename from a merger/mobs-master-TenPlus1/spider.lua rename to maj-mobs/mobs-mff/spider.lua diff --git a/a merger/mobs-master-TenPlus1/stonemonster.lua b/maj-mobs/mobs-mff/stonemonster.lua old mode 100644 new mode 100755 similarity index 100% rename from a merger/mobs-master-TenPlus1/stonemonster.lua rename to maj-mobs/mobs-mff/stonemonster.lua diff --git a/a merger/mobs-master-TenPlus1/textures/jeija_glue.png b/maj-mobs/mobs-mff/textures/jeija_glue.png similarity index 100% rename from a merger/mobs-master-TenPlus1/textures/jeija_glue.png rename to maj-mobs/mobs-mff/textures/jeija_glue.png diff --git a/a merger/mobs-master-TenPlus1/textures/mobs_bee.png b/maj-mobs/mobs-mff/textures/mobs_bee.png similarity index 100% rename from a merger/mobs-master-TenPlus1/textures/mobs_bee.png rename to maj-mobs/mobs-mff/textures/mobs_bee.png diff --git a/a merger/mobs-master-TenPlus1/textures/mobs_bee_inv.png b/maj-mobs/mobs-mff/textures/mobs_bee_inv.png similarity index 100% rename from a merger/mobs-master-TenPlus1/textures/mobs_bee_inv.png rename to maj-mobs/mobs-mff/textures/mobs_bee_inv.png diff --git a/a merger/mobs-master-TenPlus1/textures/mobs_beehive.png b/maj-mobs/mobs-mff/textures/mobs_beehive.png similarity index 100% rename from a merger/mobs-master-TenPlus1/textures/mobs_beehive.png rename to maj-mobs/mobs-mff/textures/mobs_beehive.png diff --git a/a merger/mobs-master-TenPlus1/textures/mobs_blood.png b/maj-mobs/mobs-mff/textures/mobs_blood.png similarity index 100% rename from a merger/mobs-master-TenPlus1/textures/mobs_blood.png rename to maj-mobs/mobs-mff/textures/mobs_blood.png diff --git a/a merger/mobs-master-TenPlus1/textures/mobs_bucket_milk.png b/maj-mobs/mobs-mff/textures/mobs_bucket_milk.png similarity index 100% rename from a merger/mobs-master-TenPlus1/textures/mobs_bucket_milk.png rename to maj-mobs/mobs-mff/textures/mobs_bucket_milk.png diff --git a/a merger/mobs-master-TenPlus1/textures/mobs_bunny_brown.png b/maj-mobs/mobs-mff/textures/mobs_bunny_brown.png similarity index 100% rename from a merger/mobs-master-TenPlus1/textures/mobs_bunny_brown.png rename to maj-mobs/mobs-mff/textures/mobs_bunny_brown.png diff --git a/a merger/mobs-master-TenPlus1/textures/mobs_bunny_grey.png b/maj-mobs/mobs-mff/textures/mobs_bunny_grey.png similarity index 100% rename from a merger/mobs-master-TenPlus1/textures/mobs_bunny_grey.png rename to maj-mobs/mobs-mff/textures/mobs_bunny_grey.png diff --git a/a merger/mobs-master-TenPlus1/textures/mobs_bunny_inv.png b/maj-mobs/mobs-mff/textures/mobs_bunny_inv.png similarity index 100% rename from a merger/mobs-master-TenPlus1/textures/mobs_bunny_inv.png rename to maj-mobs/mobs-mff/textures/mobs_bunny_inv.png diff --git a/a merger/mobs-master-TenPlus1/textures/mobs_bunny_white.png b/maj-mobs/mobs-mff/textures/mobs_bunny_white.png similarity index 100% rename from a merger/mobs-master-TenPlus1/textures/mobs_bunny_white.png rename to maj-mobs/mobs-mff/textures/mobs_bunny_white.png diff --git a/a merger/mobs-master-TenPlus1/textures/mobs_cheese.png b/maj-mobs/mobs-mff/textures/mobs_cheese.png similarity index 100% rename from a merger/mobs-master-TenPlus1/textures/mobs_cheese.png rename to maj-mobs/mobs-mff/textures/mobs_cheese.png diff --git a/a merger/mobs-master-TenPlus1/textures/mobs_cheeseblock.png b/maj-mobs/mobs-mff/textures/mobs_cheeseblock.png similarity index 100% rename from a merger/mobs-master-TenPlus1/textures/mobs_cheeseblock.png rename to maj-mobs/mobs-mff/textures/mobs_cheeseblock.png diff --git a/a merger/mobs-master-TenPlus1/textures/mobs_chick.png b/maj-mobs/mobs-mff/textures/mobs_chick.png similarity index 100% rename from a merger/mobs-master-TenPlus1/textures/mobs_chick.png rename to maj-mobs/mobs-mff/textures/mobs_chick.png diff --git a/a merger/mobs-master-TenPlus1/textures/mobs_chicken.png b/maj-mobs/mobs-mff/textures/mobs_chicken.png similarity index 100% rename from a merger/mobs-master-TenPlus1/textures/mobs_chicken.png rename to maj-mobs/mobs-mff/textures/mobs_chicken.png diff --git a/a merger/mobs-master-TenPlus1/textures/mobs_chicken_black.png b/maj-mobs/mobs-mff/textures/mobs_chicken_black.png similarity index 100% rename from a merger/mobs-master-TenPlus1/textures/mobs_chicken_black.png rename to maj-mobs/mobs-mff/textures/mobs_chicken_black.png diff --git a/a merger/mobs-master-TenPlus1/textures/mobs_chicken_cooked.png b/maj-mobs/mobs-mff/textures/mobs_chicken_cooked.png similarity index 100% rename from a merger/mobs-master-TenPlus1/textures/mobs_chicken_cooked.png rename to maj-mobs/mobs-mff/textures/mobs_chicken_cooked.png diff --git a/a merger/mobs-master-TenPlus1/textures/mobs_chicken_egg.png b/maj-mobs/mobs-mff/textures/mobs_chicken_egg.png similarity index 100% rename from a merger/mobs-master-TenPlus1/textures/mobs_chicken_egg.png rename to maj-mobs/mobs-mff/textures/mobs_chicken_egg.png diff --git a/a merger/mobs-master-TenPlus1/textures/mobs_chicken_egg_fried.png b/maj-mobs/mobs-mff/textures/mobs_chicken_egg_fried.png similarity index 100% rename from a merger/mobs-master-TenPlus1/textures/mobs_chicken_egg_fried.png rename to maj-mobs/mobs-mff/textures/mobs_chicken_egg_fried.png diff --git a/a merger/mobs-master-TenPlus1/textures/mobs_chicken_inv.png b/maj-mobs/mobs-mff/textures/mobs_chicken_inv.png similarity index 100% rename from a merger/mobs-master-TenPlus1/textures/mobs_chicken_inv.png rename to maj-mobs/mobs-mff/textures/mobs_chicken_inv.png diff --git a/a merger/mobs-master-TenPlus1/textures/mobs_chicken_raw.png b/maj-mobs/mobs-mff/textures/mobs_chicken_raw.png similarity index 100% rename from a merger/mobs-master-TenPlus1/textures/mobs_chicken_raw.png rename to maj-mobs/mobs-mff/textures/mobs_chicken_raw.png diff --git a/a merger/mobs-master-TenPlus1/textures/mobs_cobweb.png b/maj-mobs/mobs-mff/textures/mobs_cobweb.png similarity index 100% rename from a merger/mobs-master-TenPlus1/textures/mobs_cobweb.png rename to maj-mobs/mobs-mff/textures/mobs_cobweb.png diff --git a/a merger/mobs-master-TenPlus1/textures/mobs_cooked_rat.png b/maj-mobs/mobs-mff/textures/mobs_cooked_rat.png similarity index 100% rename from a merger/mobs-master-TenPlus1/textures/mobs_cooked_rat.png rename to maj-mobs/mobs-mff/textures/mobs_cooked_rat.png diff --git a/a merger/mobs-master-TenPlus1/textures/mobs_cow.png b/maj-mobs/mobs-mff/textures/mobs_cow.png similarity index 100% rename from a merger/mobs-master-TenPlus1/textures/mobs_cow.png rename to maj-mobs/mobs-mff/textures/mobs_cow.png diff --git a/a merger/mobs-master-TenPlus1/textures/mobs_cow_brown.png b/maj-mobs/mobs-mff/textures/mobs_cow_brown.png similarity index 100% rename from a merger/mobs-master-TenPlus1/textures/mobs_cow_brown.png rename to maj-mobs/mobs-mff/textures/mobs_cow_brown.png diff --git a/a merger/mobs-master-TenPlus1/textures/mobs_creeper.png b/maj-mobs/mobs-mff/textures/mobs_creeper.png similarity index 100% rename from a merger/mobs-master-TenPlus1/textures/mobs_creeper.png rename to maj-mobs/mobs-mff/textures/mobs_creeper.png diff --git a/a merger/mobs-master-TenPlus1/textures/mobs_creeper_inv.png b/maj-mobs/mobs-mff/textures/mobs_creeper_inv.png similarity index 100% rename from a merger/mobs-master-TenPlus1/textures/mobs_creeper_inv.png rename to maj-mobs/mobs-mff/textures/mobs_creeper_inv.png diff --git a/a merger/mobs-master-TenPlus1/textures/mobs_dirt_monster.png b/maj-mobs/mobs-mff/textures/mobs_dirt_monster.png similarity index 100% rename from a merger/mobs-master-TenPlus1/textures/mobs_dirt_monster.png rename to maj-mobs/mobs-mff/textures/mobs_dirt_monster.png diff --git a/a merger/mobs-master-TenPlus1/textures/mobs_dungeon_master.png b/maj-mobs/mobs-mff/textures/mobs_dungeon_master.png similarity index 100% rename from a merger/mobs-master-TenPlus1/textures/mobs_dungeon_master.png rename to maj-mobs/mobs-mff/textures/mobs_dungeon_master.png diff --git a/a merger/mobs-master-TenPlus1/textures/mobs_dungeon_master_cobblestone.png b/maj-mobs/mobs-mff/textures/mobs_dungeon_master_cobblestone.png similarity index 100% rename from a merger/mobs-master-TenPlus1/textures/mobs_dungeon_master_cobblestone.png rename to maj-mobs/mobs-mff/textures/mobs_dungeon_master_cobblestone.png diff --git a/a merger/mobs-master-TenPlus1/textures/mobs_dungeon_master_fireball.png b/maj-mobs/mobs-mff/textures/mobs_dungeon_master_fireball.png similarity index 100% rename from a merger/mobs-master-TenPlus1/textures/mobs_dungeon_master_fireball.png rename to maj-mobs/mobs-mff/textures/mobs_dungeon_master_fireball.png diff --git a/a merger/mobs-master-TenPlus1/textures/mobs_dungeon_master_fireball_back.png b/maj-mobs/mobs-mff/textures/mobs_dungeon_master_fireball_back.png similarity index 100% rename from a merger/mobs-master-TenPlus1/textures/mobs_dungeon_master_fireball_back.png rename to maj-mobs/mobs-mff/textures/mobs_dungeon_master_fireball_back.png diff --git a/a merger/mobs-master-TenPlus1/textures/mobs_dungeon_master_strangewhite.png b/maj-mobs/mobs-mff/textures/mobs_dungeon_master_strangewhite.png similarity index 100% rename from a merger/mobs-master-TenPlus1/textures/mobs_dungeon_master_strangewhite.png rename to maj-mobs/mobs-mff/textures/mobs_dungeon_master_strangewhite.png diff --git a/a merger/mobs-master-TenPlus1/textures/mobs_fireball.png b/maj-mobs/mobs-mff/textures/mobs_fireball.png similarity index 100% rename from a merger/mobs-master-TenPlus1/textures/mobs_fireball.png rename to maj-mobs/mobs-mff/textures/mobs_fireball.png diff --git a/a merger/mobs-master-TenPlus1/textures/mobs_green_slime_blood.png b/maj-mobs/mobs-mff/textures/mobs_green_slime_blood.png similarity index 100% rename from a merger/mobs-master-TenPlus1/textures/mobs_green_slime_blood.png rename to maj-mobs/mobs-mff/textures/mobs_green_slime_blood.png diff --git a/a merger/mobs-master-TenPlus1/textures/mobs_green_slime_bottom.png b/maj-mobs/mobs-mff/textures/mobs_green_slime_bottom.png similarity index 100% rename from a merger/mobs-master-TenPlus1/textures/mobs_green_slime_bottom.png rename to maj-mobs/mobs-mff/textures/mobs_green_slime_bottom.png diff --git a/a merger/mobs-master-TenPlus1/textures/mobs_green_slime_egg.png b/maj-mobs/mobs-mff/textures/mobs_green_slime_egg.png similarity index 100% rename from a merger/mobs-master-TenPlus1/textures/mobs_green_slime_egg.png rename to maj-mobs/mobs-mff/textures/mobs_green_slime_egg.png diff --git a/a merger/mobs-master-TenPlus1/textures/mobs_green_slime_front.png b/maj-mobs/mobs-mff/textures/mobs_green_slime_front.png similarity index 100% rename from a merger/mobs-master-TenPlus1/textures/mobs_green_slime_front.png rename to maj-mobs/mobs-mff/textures/mobs_green_slime_front.png diff --git a/a merger/mobs-master-TenPlus1/textures/mobs_green_slime_sides.png b/maj-mobs/mobs-mff/textures/mobs_green_slime_sides.png similarity index 100% rename from a merger/mobs-master-TenPlus1/textures/mobs_green_slime_sides.png rename to maj-mobs/mobs-mff/textures/mobs_green_slime_sides.png diff --git a/a merger/mobs-master-TenPlus1/textures/mobs_green_slime_top.png b/maj-mobs/mobs-mff/textures/mobs_green_slime_top.png similarity index 100% rename from a merger/mobs-master-TenPlus1/textures/mobs_green_slime_top.png rename to maj-mobs/mobs-mff/textures/mobs_green_slime_top.png diff --git a/a merger/mobs-master-TenPlus1/textures/mobs_honey_block.png b/maj-mobs/mobs-mff/textures/mobs_honey_block.png similarity index 100% rename from a merger/mobs-master-TenPlus1/textures/mobs_honey_block.png rename to maj-mobs/mobs-mff/textures/mobs_honey_block.png diff --git a/a merger/mobs-master-TenPlus1/textures/mobs_honey_inv.png b/maj-mobs/mobs-mff/textures/mobs_honey_inv.png similarity index 100% rename from a merger/mobs-master-TenPlus1/textures/mobs_honey_inv.png rename to maj-mobs/mobs-mff/textures/mobs_honey_inv.png diff --git a/a merger/mobs-master-TenPlus1/textures/mobs_kitten_ginger.png b/maj-mobs/mobs-mff/textures/mobs_kitten_ginger.png similarity index 100% rename from a merger/mobs-master-TenPlus1/textures/mobs_kitten_ginger.png rename to maj-mobs/mobs-mff/textures/mobs_kitten_ginger.png diff --git a/a merger/mobs-master-TenPlus1/textures/mobs_kitten_inv.png b/maj-mobs/mobs-mff/textures/mobs_kitten_inv.png similarity index 100% rename from a merger/mobs-master-TenPlus1/textures/mobs_kitten_inv.png rename to maj-mobs/mobs-mff/textures/mobs_kitten_inv.png diff --git a/a merger/mobs-master-TenPlus1/textures/mobs_kitten_sandy.png b/maj-mobs/mobs-mff/textures/mobs_kitten_sandy.png similarity index 100% rename from a merger/mobs-master-TenPlus1/textures/mobs_kitten_sandy.png rename to maj-mobs/mobs-mff/textures/mobs_kitten_sandy.png diff --git a/a merger/mobs-master-TenPlus1/textures/mobs_kitten_splotchy.png b/maj-mobs/mobs-mff/textures/mobs_kitten_splotchy.png similarity index 100% rename from a merger/mobs-master-TenPlus1/textures/mobs_kitten_splotchy.png rename to maj-mobs/mobs-mff/textures/mobs_kitten_splotchy.png diff --git a/a merger/mobs-master-TenPlus1/textures/mobs_kitten_striped.png b/maj-mobs/mobs-mff/textures/mobs_kitten_striped.png similarity index 100% rename from a merger/mobs-master-TenPlus1/textures/mobs_kitten_striped.png rename to maj-mobs/mobs-mff/textures/mobs_kitten_striped.png diff --git a/a merger/mobs-master-TenPlus1/textures/mobs_lava_slime_blood.png b/maj-mobs/mobs-mff/textures/mobs_lava_slime_blood.png similarity index 100% rename from a merger/mobs-master-TenPlus1/textures/mobs_lava_slime_blood.png rename to maj-mobs/mobs-mff/textures/mobs_lava_slime_blood.png diff --git a/a merger/mobs-master-TenPlus1/textures/mobs_lava_slime_bottom.png b/maj-mobs/mobs-mff/textures/mobs_lava_slime_bottom.png similarity index 100% rename from a merger/mobs-master-TenPlus1/textures/mobs_lava_slime_bottom.png rename to maj-mobs/mobs-mff/textures/mobs_lava_slime_bottom.png diff --git a/a merger/mobs-master-TenPlus1/textures/mobs_lava_slime_egg.png b/maj-mobs/mobs-mff/textures/mobs_lava_slime_egg.png similarity index 100% rename from a merger/mobs-master-TenPlus1/textures/mobs_lava_slime_egg.png rename to maj-mobs/mobs-mff/textures/mobs_lava_slime_egg.png diff --git a/a merger/mobs-master-TenPlus1/textures/mobs_lava_slime_front.png b/maj-mobs/mobs-mff/textures/mobs_lava_slime_front.png similarity index 100% rename from a merger/mobs-master-TenPlus1/textures/mobs_lava_slime_front.png rename to maj-mobs/mobs-mff/textures/mobs_lava_slime_front.png diff --git a/a merger/mobs-master-TenPlus1/textures/mobs_lava_slime_sides.png b/maj-mobs/mobs-mff/textures/mobs_lava_slime_sides.png similarity index 100% rename from a merger/mobs-master-TenPlus1/textures/mobs_lava_slime_sides.png rename to maj-mobs/mobs-mff/textures/mobs_lava_slime_sides.png diff --git a/a merger/mobs-master-TenPlus1/textures/mobs_lava_slime_top.png b/maj-mobs/mobs-mff/textures/mobs_lava_slime_top.png similarity index 100% rename from a merger/mobs-master-TenPlus1/textures/mobs_lava_slime_top.png rename to maj-mobs/mobs-mff/textures/mobs_lava_slime_top.png diff --git a/a merger/mobs-master-TenPlus1/textures/mobs_leather.png b/maj-mobs/mobs-mff/textures/mobs_leather.png similarity index 100% rename from a merger/mobs-master-TenPlus1/textures/mobs_leather.png rename to maj-mobs/mobs-mff/textures/mobs_leather.png diff --git a/a merger/mobs-master-TenPlus1/textures/mobs_magic_lasso.png b/maj-mobs/mobs-mff/textures/mobs_magic_lasso.png similarity index 100% rename from a merger/mobs-master-TenPlus1/textures/mobs_magic_lasso.png rename to maj-mobs/mobs-mff/textures/mobs_magic_lasso.png diff --git a/a merger/mobs-master-TenPlus1/textures/mobs_meat.png b/maj-mobs/mobs-mff/textures/mobs_meat.png similarity index 100% rename from a merger/mobs-master-TenPlus1/textures/mobs_meat.png rename to maj-mobs/mobs-mff/textures/mobs_meat.png diff --git a/a merger/mobs-master-TenPlus1/textures/mobs_meat_raw.png b/maj-mobs/mobs-mff/textures/mobs_meat_raw.png similarity index 100% rename from a merger/mobs-master-TenPlus1/textures/mobs_meat_raw.png rename to maj-mobs/mobs-mff/textures/mobs_meat_raw.png diff --git a/a merger/mobs-master-TenPlus1/textures/mobs_npc.png b/maj-mobs/mobs-mff/textures/mobs_npc.png similarity index 100% rename from a merger/mobs-master-TenPlus1/textures/mobs_npc.png rename to maj-mobs/mobs-mff/textures/mobs_npc.png diff --git a/a merger/mobs-master-TenPlus1/textures/mobs_oerkki.png b/maj-mobs/mobs-mff/textures/mobs_oerkki.png similarity index 100% rename from a merger/mobs-master-TenPlus1/textures/mobs_oerkki.png rename to maj-mobs/mobs-mff/textures/mobs_oerkki.png diff --git a/a merger/mobs-master-TenPlus1/textures/mobs_oerkki2.png b/maj-mobs/mobs-mff/textures/mobs_oerkki2.png similarity index 100% rename from a merger/mobs-master-TenPlus1/textures/mobs_oerkki2.png rename to maj-mobs/mobs-mff/textures/mobs_oerkki2.png diff --git a/a merger/mobs-master-TenPlus1/textures/mobs_pork_cooked.png b/maj-mobs/mobs-mff/textures/mobs_pork_cooked.png similarity index 100% rename from a merger/mobs-master-TenPlus1/textures/mobs_pork_cooked.png rename to maj-mobs/mobs-mff/textures/mobs_pork_cooked.png diff --git a/a merger/mobs-master-TenPlus1/textures/mobs_pork_raw.png b/maj-mobs/mobs-mff/textures/mobs_pork_raw.png similarity index 100% rename from a merger/mobs-master-TenPlus1/textures/mobs_pork_raw.png rename to maj-mobs/mobs-mff/textures/mobs_pork_raw.png diff --git a/a merger/mobs-master-TenPlus1/textures/mobs_pumba.png b/maj-mobs/mobs-mff/textures/mobs_pumba.png similarity index 100% rename from a merger/mobs-master-TenPlus1/textures/mobs_pumba.png rename to maj-mobs/mobs-mff/textures/mobs_pumba.png diff --git a/a merger/mobs-master-TenPlus1/textures/mobs_rat.png b/maj-mobs/mobs-mff/textures/mobs_rat.png similarity index 100% rename from a merger/mobs-master-TenPlus1/textures/mobs_rat.png rename to maj-mobs/mobs-mff/textures/mobs_rat.png diff --git a/a merger/mobs-master-TenPlus1/textures/mobs_rat_brown.png b/maj-mobs/mobs-mff/textures/mobs_rat_brown.png similarity index 100% rename from a merger/mobs-master-TenPlus1/textures/mobs_rat_brown.png rename to maj-mobs/mobs-mff/textures/mobs_rat_brown.png diff --git a/a merger/mobs-master-TenPlus1/textures/mobs_rat_inventory.png b/maj-mobs/mobs-mff/textures/mobs_rat_inventory.png similarity index 100% rename from a merger/mobs-master-TenPlus1/textures/mobs_rat_inventory.png rename to maj-mobs/mobs-mff/textures/mobs_rat_inventory.png diff --git a/a merger/mobs-master-TenPlus1/textures/mobs_sand_monster.png b/maj-mobs/mobs-mff/textures/mobs_sand_monster.png similarity index 100% rename from a merger/mobs-master-TenPlus1/textures/mobs_sand_monster.png rename to maj-mobs/mobs-mff/textures/mobs_sand_monster.png diff --git a/a merger/mobs-master-TenPlus1/textures/mobs_shears.png b/maj-mobs/mobs-mff/textures/mobs_shears.png similarity index 100% rename from a merger/mobs-master-TenPlus1/textures/mobs_shears.png rename to maj-mobs/mobs-mff/textures/mobs_shears.png diff --git a/a merger/mobs-master-TenPlus1/textures/mobs_sheep.png b/maj-mobs/mobs-mff/textures/mobs_sheep.png similarity index 100% rename from a merger/mobs-master-TenPlus1/textures/mobs_sheep.png rename to maj-mobs/mobs-mff/textures/mobs_sheep.png diff --git a/a merger/mobs-master-TenPlus1/textures/mobs_sheep_shaved.png b/maj-mobs/mobs-mff/textures/mobs_sheep_shaved.png similarity index 100% rename from a merger/mobs-master-TenPlus1/textures/mobs_sheep_shaved.png rename to maj-mobs/mobs-mff/textures/mobs_sheep_shaved.png diff --git a/a merger/mobs-master-TenPlus1/textures/mobs_spider.png b/maj-mobs/mobs-mff/textures/mobs_spider.png similarity index 100% rename from a merger/mobs-master-TenPlus1/textures/mobs_spider.png rename to maj-mobs/mobs-mff/textures/mobs_spider.png diff --git a/a merger/mobs-master-TenPlus1/textures/mobs_stone_monster.png b/maj-mobs/mobs-mff/textures/mobs_stone_monster.png similarity index 100% rename from a merger/mobs-master-TenPlus1/textures/mobs_stone_monster.png rename to maj-mobs/mobs-mff/textures/mobs_stone_monster.png diff --git a/a merger/mobs-master-TenPlus1/textures/mobs_tree_monster.png b/maj-mobs/mobs-mff/textures/mobs_tree_monster.png similarity index 100% rename from a merger/mobs-master-TenPlus1/textures/mobs_tree_monster.png rename to maj-mobs/mobs-mff/textures/mobs_tree_monster.png diff --git a/a merger/mobs-master-TenPlus1/textures/mobs_wolf.png b/maj-mobs/mobs-mff/textures/mobs_wolf.png similarity index 100% rename from a merger/mobs-master-TenPlus1/textures/mobs_wolf.png rename to maj-mobs/mobs-mff/textures/mobs_wolf.png diff --git a/a merger/mobs-master-TenPlus1/textures/mobs_wolf_inv.png b/maj-mobs/mobs-mff/textures/mobs_wolf_inv.png similarity index 100% rename from a merger/mobs-master-TenPlus1/textures/mobs_wolf_inv.png rename to maj-mobs/mobs-mff/textures/mobs_wolf_inv.png diff --git a/a merger/mobs-master-TenPlus1/textures/oerkki.png b/maj-mobs/mobs-mff/textures/oerkki.png similarity index 100% rename from a merger/mobs-master-TenPlus1/textures/oerkki.png rename to maj-mobs/mobs-mff/textures/oerkki.png diff --git a/a merger/mobs-master-TenPlus1/textures/tnt_smoke.png b/maj-mobs/mobs-mff/textures/tnt_smoke.png similarity index 100% rename from a merger/mobs-master-TenPlus1/textures/tnt_smoke.png rename to maj-mobs/mobs-mff/textures/tnt_smoke.png diff --git a/a merger/mobs-master-TenPlus1/textures/zmobs_egg_lava_flan.png b/maj-mobs/mobs-mff/textures/zmobs_egg_lava_flan.png similarity index 100% rename from a merger/mobs-master-TenPlus1/textures/zmobs_egg_lava_flan.png rename to maj-mobs/mobs-mff/textures/zmobs_egg_lava_flan.png diff --git a/a merger/mobs-master-TenPlus1/textures/zmobs_egg_mese_monster.png b/maj-mobs/mobs-mff/textures/zmobs_egg_mese_monster.png similarity index 100% rename from a merger/mobs-master-TenPlus1/textures/zmobs_egg_mese_monster.png rename to maj-mobs/mobs-mff/textures/zmobs_egg_mese_monster.png diff --git a/a merger/mobs-master-TenPlus1/textures/zmobs_lava_flan.png b/maj-mobs/mobs-mff/textures/zmobs_lava_flan.png similarity index 100% rename from a merger/mobs-master-TenPlus1/textures/zmobs_lava_flan.png rename to maj-mobs/mobs-mff/textures/zmobs_lava_flan.png diff --git a/a merger/mobs-master-TenPlus1/textures/zmobs_lava_orb.png b/maj-mobs/mobs-mff/textures/zmobs_lava_orb.png similarity index 100% rename from a merger/mobs-master-TenPlus1/textures/zmobs_lava_orb.png rename to maj-mobs/mobs-mff/textures/zmobs_lava_orb.png diff --git a/a merger/mobs-master-TenPlus1/textures/zmobs_mese_monster.png b/maj-mobs/mobs-mff/textures/zmobs_mese_monster.png similarity index 100% rename from a merger/mobs-master-TenPlus1/textures/zmobs_mese_monster.png rename to maj-mobs/mobs-mff/textures/zmobs_mese_monster.png diff --git a/a merger/mobs-master-TenPlus1/treemonster.lua b/maj-mobs/mobs-mff/treemonster.lua old mode 100644 new mode 100755 similarity index 100% rename from a merger/mobs-master-TenPlus1/treemonster.lua rename to maj-mobs/mobs-mff/treemonster.lua diff --git a/a merger/mobs-master-TenPlus1/warthog.lua b/maj-mobs/mobs-mff/warthog.lua old mode 100644 new mode 100755 similarity index 100% rename from a merger/mobs-master-TenPlus1/warthog.lua rename to maj-mobs/mobs-mff/warthog.lua diff --git a/a merger/mobs-master-TenPlus1/wolf.lua b/maj-mobs/mobs-mff/wolf.lua similarity index 100% rename from a merger/mobs-master-TenPlus1/wolf.lua rename to maj-mobs/mobs-mff/wolf.lua diff --git a/mods/mobs/README.txt b/mods/mobs/README.txt index 4d108250..85fd8721 100755 --- a/mods/mobs/README.txt +++ b/mods/mobs/README.txt @@ -28,10 +28,11 @@ This mod contains the following additions: Changelog: -beta- Npc mob added, kills monsters, attacks player when punched, right click with food to heal or gold lump for drop +1,10- Footstep removed (use replace), explosion routine added for exploding mobs. 1.09- reworked breeding routine, added mob rotation value, added footstep feature, added jumping mobs with sounds feature, added magic lasso for picking up animals 1.08- Mob throwing attack has been rehauled so that they can damage one another, also drops and on_die function added 1.07- Npc's can now be set to follow player or stand by using self.order and self.owner variables +beta- Npc mob added, kills monsters, attacks player when punched, right click with food to heal or gold lump for drop 1.06- Changed recovery times after breeding, and time taken to grow up (can be sped up by feeding baby animal) 1.05- Added ExeterDad's bunny's which can be picked up and tamed with 4 carrots from farming redo or farming_plus, also shears added to get wool from sheep and lastly Jordach/BSD's kitten 1.04- Added mating for sheep, cows and hogs... feed animals to make horny and hope for a baby which is half size, will grow up quick though :) diff --git a/mods/mobs/api.lua b/mods/mobs/api.lua index 572d2407..34986fc5 100755 --- a/mods/mobs/api.lua +++ b/mods/mobs/api.lua @@ -1,4 +1,4 @@ --- Mobs Api (11th April 2015) +-- Mobs Api (20th April 2015) mobs = {} mobs.mod = "redo" @@ -19,7 +19,6 @@ function mobs:register_mob(name, def) on_die = def.on_die, jump_height = def.jump_height or 6, jump_chance = def.jump_chance or 0, -footstep = def.footstep, rotate = def.rotate or 0, -- 0=front, 1.5=side, 3.0=back, 4.5=side2 lifetimer = def.lifetimer or 600, hp_min = def.hp_min or 5, @@ -182,26 +181,36 @@ lifetimer = def.lifetimer or 600, end -- check for mob drop/replace (used for chicken egg and sheep eating grass/wheat) - if self.replace_rate and math.random(1,self.replace_rate) == 1 and self.child == false then - local pos = self.object:getpos() ; pos.y = pos.y + self.replace_offset - if self.footstep and self.object:getvelocity().y == 0 and minetest.get_node(pos).name == "air" then minetest.set_node(pos, {name = self.footstep}) end + if self.replace_rate + and math.random(1,self.replace_rate) == 1 + and self.child == false then + local pos = self.object:getpos() + pos.y = pos.y + self.replace_offset if #minetest.find_nodes_in_area(pos,pos,self.replace_what) > 0 and self.object:getvelocity().y == 0 - and self.replace_what - and self.state == "stand" then + and self.replace_what then + --and self.state == "stand" then minetest.set_node(pos, {name = self.replace_with}) end end - -- gravity, falling or floating in water - if self.floats == 1 then + -- jump direction (adapted from Carbone mobs), gravity, falling or floating in water + if self.object:getvelocity().y > 0.1 then + local yaw = self.object:getyaw() + self.rotate + local x = math.sin(yaw) * -2 + local z = math.cos(yaw) * 2 + if minetest.get_item_group(minetest.get_node(self.object:getpos()).name, "water") ~= 0 then - self.object:setacceleration({x = 0, y = 1.5, z = 0}) + if self.floats == 1 then self.object:setacceleration({x = x, y = 1.5, z = z}) end + else + self.object:setacceleration({x = x, y = self.fall_speed, z = z}) + end + else + if minetest.get_item_group(minetest.get_node(self.object:getpos()).name, "water") ~= 0 then + if self.floats == 1 then self.object:setacceleration({x = 0, y = 1.5, z = 0}) end else self.object:setacceleration({x = 0, y = self.fall_speed, z = 0}) end - else - self.object:setacceleration({x = 0, y = self.fall_speed, z = 0}) end -- fall damage @@ -214,7 +223,7 @@ lifetimer = def.lifetimer or 600, self.old_y = self.object:getpos().y end - -- knock back timer + -- knockback timer if self.pause_timer > 0 then self.pause_timer = self.pause_timer - dtime if self.pause_timer < 1 then @@ -540,7 +549,21 @@ lifetimer = def.lifetimer or 600, elseif self.state == "walk" then - if math.random(1, 100) <= 30 then + local lp = nil + 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 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 + yaw = yaw+math.pi + end + self.object:setyaw(yaw) + + -- no water near, so randomly turn + elseif math.random(1, 100) <= 30 then self.object:setyaw(self.object:getyaw()+((math.random(0,360)-180)/180*math.pi)) end if self.jump and self.get_velocity(self) <= 0.5 and self.object:getvelocity().y == 0 then @@ -555,6 +578,7 @@ lifetimer = def.lifetimer or 600, self.state = "stand" self:set_animation("stand") end + -- Modif MFF "attack type kamicaze" des creepers /DEBUT elseif self.state == "attack" and self.attack_type == "kamicaze" then if not self.attack.player or not self.attack.player:is_player() then @@ -595,7 +619,7 @@ lifetimer = def.lifetimer or 600, self.v_start = true self.set_velocity(self, self.run_velocity) self.timer = 0 - self.blinktimer = 0 + self.blinktimer = 0 else self.timer = 0 self.blinktimer = 0 @@ -683,6 +707,7 @@ lifetimer = def.lifetimer or 600, end end -- Modif MFF "attack type kamicaze" des creepers /FIN + elseif self.state == "attack" and self.attack_type == "dogfight" then if not self.attack.player or not self.attack.player:getpos() then @@ -710,7 +735,7 @@ lifetimer = def.lifetimer or 600, yaw = yaw+math.pi end self.object:setyaw(yaw) - if self.attack.dist > 2 then + if self.attack.dist > 3 then -- was set to 2 but slimes didnt hurt when above player -- jump attack 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 @@ -979,11 +1004,11 @@ function mobs:spawn_specific(name, nodes, neighbors, min_light, max_light, inter -- are we spawning inside a solid node? local nod = minetest.get_node_or_nil(pos) - if not nod or not minetest.registered_nodes[nod.name] + if not nod or not nod.name or not minetest.registered_nodes[nod.name] or minetest.registered_nodes[nod.name].walkable == true then return end pos.y = pos.y + 1 nod = minetest.get_node_or_nil(pos) - if not nod or not minetest.registered_nodes[nod.name] + if not nod or not nod.name or not minetest.registered_nodes[nod.name] or minetest.registered_nodes[nod.name].walkable == true then return end if minetest.setting_getbool("display_mob_spawn") then @@ -1053,6 +1078,7 @@ function check_for_death(self) self.on_die(self, pos) end end + -- Modif MFF "fonction TNT" des creepers /DEBUT function do_tnt_physics(tnt_np,tntr,entity) local objs = minetest.get_objects_inside_radius(tnt_np, tntr) diff --git a/mods/mobs/chicken.lua b/mods/mobs/chicken.lua index 9b7695c5..400813a3 100755 --- a/mods/mobs/chicken.lua +++ b/mods/mobs/chicken.lua @@ -93,7 +93,7 @@ mobs:register_mob("mobs:chicken", { end, }) -- spawn on default or bamboo grass between 8 and 20 light, 1 in 10000 change, 1 chicken in area up to 31000 in height -mobs:register_spawn("mobs:chicken", {"default:dirt_with_grass"}, 20, 0, 10000, 1, 31000) +mobs:register_spawn("mobs:chicken", {"default:dirt_with_grass"}, 20, 8, 10000, 1, 31000) -- register spawn egg mobs:register_egg("mobs:chicken", "Chicken", "mobs_chicken_inv.png", 0) diff --git a/mods/mobs/cow.lua b/mods/mobs/cow.lua index 2767bc00..35d1dbf6 100755 --- a/mods/mobs/cow.lua +++ b/mods/mobs/cow.lua @@ -112,7 +112,7 @@ mobs:register_mob("mobs:cow", { end, }) -- spawn on default;green;prairie grass between 0 and 20 light, 1 in 11000 chance, 1 cow in area up to 31000 in height -mobs:register_spawn("mobs:cow", {"default:dirt_with_grass"}, 20, 0, 10000, 1, 31000) +mobs:register_spawn("mobs:cow", {"default:dirt_with_grass"}, 20, 8, 10000, 1, 31000) -- register spawn egg mobs:register_egg("mobs:cow", "Cow", "default_grass.png", 1) diff --git a/mods/mobs/lava_flan.lua b/mods/mobs/lava_flan.lua index 82007b45..886c40ad 100755 --- a/mods/mobs/lava_flan.lua +++ b/mods/mobs/lava_flan.lua @@ -31,7 +31,7 @@ mobs:register_mob("mobs:lava_flan", { walk_velocity = 0.5, run_velocity = 2, jump = true, - -- step = 2, (c'était pas mal, voir comment faire pour le remettre comme ça ?) + -- step = 2, (was good with this value, but don't care now because Lava Slime remplace Lava Flan) view_range = 16, floats = 1, -- chance of dropping lava orb when dead diff --git a/mods/mobs/stonemonster.lua b/mods/mobs/stonemonster.lua index 7f175ba6..4be2956a 100755 --- a/mods/mobs/stonemonster.lua +++ b/mods/mobs/stonemonster.lua @@ -20,7 +20,7 @@ mobs:register_mob("mobs:stone_monster", { {"mobs_stone_monster.png"}, }, visual_size = {x=3, y=2.6}, - blood_texture = "mobs_blood.png", + blood_texture = "default_stone.png", -- sounds makes_footstep_sound = true, sounds = { diff --git a/mods/mobs/textures/mobs_shears.png b/mods/mobs/textures/mobs_shears.png old mode 100755 new mode 100644 index d4c9dae996048be407f1a73d7de776ad2e2f6831..aa16f2ecb7669819952028204beead64104f8102 GIT binary patch delta 207 zcmV;=05Jcg0^k9V8Gi!+001a04^sdD05ecbR7E%d045t3AR!((BoH(_I8rznZAlVR zTUKm!aCLrpgpG)emXepCo29O)u(`Cu%*WE)*Jz5Fv;Y7A0d!JMQvg8b*k%9#09#2! zK~xyiea=A=fFKM5z#3XWK=l8wwWw7XM|0a8(h_}!HG|isph$NuYR2Q7)teQF@o>Eg z5eC{yw!%AlnK&g|XoU#EVDH^z7v;3OUkKznYC&_)_7y-s*#S;10y3JHr0D%#%nFgb