Merge branch 'master' of https://github.com/aeon0/botty

Browse Source

...

This commit is contained in:

aeon0

2021-11-08 22:22:25 +01:00

parent 10d912ba25 91e5c18f11

commit cbfacdac03

177 changed files with 180 additions and 83 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

assets/items/Eth_Armor_archon_plate.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 6.6 KiB

assets/items/Eth_Armor_dusk_shroud.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.4 KiB

assets/items/Eth_Armor_lacquered_plate.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 5.4 KiB

assets/items/Eth_Armor_light_plate.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.7 KiB

assets/items/Eth_Armor_mage_plate.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.9 KiB

assets/items/Eth_Armor_sacred_armor.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 5.4 KiB

assets/items/Eth_Armor_shadow_plate.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 5.7 KiB

assets/items/Eth_Helm_bone_visage.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 5.5 KiB

assets/items/Eth_Helm_corona.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.7 KiB

assets/items/Eth_Helm_diadem.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.1 KiB

assets/items/Eth_Helm_giant_conch.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 5.3 KiB

assets/items/Eth_Helm_shako.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.2 KiB

assets/items/Eth_Shield_monarch.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.0 KiB

assets/items/Eth_Shield_sacred_targe.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 5.8 KiB

assets/items/Eth_Shield_troll_nest.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.5 KiB

assets/items/Eth_Weapon_berserker_axe.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 5.5 KiB

assets/items/Eth_Weapon_colossus_voulge.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 7.2 KiB

assets/items/Eth_Weapon_cryptic_axe.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 5.8 KiB

assets/items/Eth_Weapon_crystal_sword.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 7.1 KiB

assets/items/Eth_Weapon_flail.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.3 KiB

assets/items/Eth_Weapon_ghost_spear.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.3 KiB

assets/items/Eth_Weapon_giant_thresher.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 5.8 KiB

assets/items/Eth_Weapon_grand_matron_bow.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 7.7 KiB

assets/items/Eth_Weapon_great_poleaxe.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 6.7 KiB

assets/items/Eth_Weapon_phase_blade.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 5.0 KiB

assets/items/superior_colossus_voulge_gray.png → assets/items/Eth_Weapon_superior_colossus_voulge.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 9.1 KiB After Width:  |  Height:  |  Size: 9.1 KiB

assets/items/superior_cryptic_axe_gray.png → assets/items/Eth_Weapon_superior_cryptic_axe.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 7.2 KiB After Width:  |  Height:  |  Size: 7.2 KiB

assets/items/superior_grand_matron_bow_gray.png → assets/items/Eth_Weapon_superior_grand_matron_bow.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 9.6 KiB After Width:  |  Height:  |  Size: 9.6 KiB

assets/items/superior_thresher_gray.png → assets/items/Eth_Weapon_superior_thresher.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 6.6 KiB After Width:  |  Height:  |  Size: 6.6 KiB

assets/items/Eth_Weapon_thresher.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.1 KiB

assets/items/Eth_Weapon_war_scepter.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 5.0 KiB

assets/items/LT_Set_griswold_valor.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.5 KiB

assets/items/LT_Set_immortal_king_will.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.9 KiB

assets/items/LT_Set_laying_of_hands.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.7 KiB

assets/items/LT_Set_mavina_caster.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 5.8 KiB

assets/items/LT_Set_mavina_true_sight.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.9 KiB

assets/items/LT_Set_natalya_soul.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.7 KiB

assets/items/LT_Set_tal_rasha_fine-spun_cloth.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.8 KiB

assets/items/LT_Set_trang-oul_claws.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.6 KiB

assets/items/LT_Set_trang-oul_girth.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.0 KiB

assets/items/LT_arreat_face.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.3 KiB

assets/items/LT_blade_of_ali_baba.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.1 KiB

assets/items/ogre_axe_unique.png → assets/items/LT_bonehew.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.3 KiB After Width:  |  Height:  |  Size: 3.3 KiB

assets/items/LT_cerebus_bite.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.8 KiB

assets/items/bloodlord_skull_unique.png → assets/items/LT_darkforce_spawn.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 5.8 KiB After Width:  |  Height:  |  Size: 5.8 KiB

assets/items/LT_duriel_shell.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.3 KiB

assets/items/LT_frostburn.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.7 KiB

assets/items/LT_giant_skull.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.9 KiB

assets/items/LT_goblin_toe.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 5.4 KiB

assets/items/LT_goldwrap.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.3 KiB

assets/items/LT_gore_rider.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.5 KiB

assets/items/LT_guardian_angel.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.5 KiB

assets/items/LT_head_hunter_glory.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.8 KiB

assets/items/LT_jalal_mane.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 5.5 KiB

assets/items/LT_kira_guardian.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.3 KiB

assets/items/LT_lacerator.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 5.0 KiB

assets/items/LT_lightsabre.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.4 KiB

assets/items/LT_marrowwalk.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 6.3 KiB

assets/items/LT_razortail.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.8 KiB

assets/items/LT_schaefer_hammer.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 5.0 KiB

assets/items/LT_shaftstop.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.4 KiB

assets/items/LT_silkweave.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.7 KiB

assets/items/LT_skullder_ire.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 5.2 KiB

assets/items/LT_snowclash.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.5 KiB

assets/items/LT_stealskull.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.0 KiB

assets/items/LT_stormshield.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.5 KiB

assets/items/LT_string_of_ears.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.7 KiB

assets/items/LT_the_cranium_basher.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.7 KiB

assets/items/LT_thundergod_vigor.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.8 KiB

assets/items/LT_vampire_gaze.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.1 KiB

assets/items/LT_warshrike.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 5.3 KiB

assets/items/hydra_bow_unique.png → assets/items/LT_windforce.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 4.4 KiB After Width:  |  Height:  |  Size: 4.4 KiB

assets/items/LT_wizardspike.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.3 KiB

assets/items/MT_Set_aldur_advance.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.7 KiB

assets/items/MT_Set_guillaum_face.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.6 KiB

assets/items/MT_Set_immortal_king_soul_cage.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.8 KiB

assets/items/demonhead_unique.png → assets/items/MT_andariel_visage.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 4.1 KiB After Width:  |  Height:  |  Size: 4.1 KiB

assets/items/MT_boneflame.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 5.3 KiB

assets/items/MT_boneshade.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.6 KiB

assets/items/MT_chance_guards.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.9 KiB

assets/items/vampirebone_gloves_unique.png → assets/items/MT_dracul_grasp.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 5.1 KiB After Width:  |  Height:  |  Size: 5.1 KiB

assets/items/MT_gheed_fortune.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 6.1 KiB

assets/items/gilded_shield_unique.png → assets/items/MT_herald_of_zakarum.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.9 KiB After Width:  |  Height:  |  Size: 3.9 KiB

assets/items/MT_homunculus.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 5.3 KiB

assets/items/MT_magefist.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 5.3 KiB

assets/items/MT_ondal_wisdom.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.8 KiB

assets/items/MT_ribcracker.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.8 KiB

assets/items/scarabshell_boots_unique.png → assets/items/MT_sandstorm_trek.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 7.9 KiB After Width:  |  Height:  |  Size: 7.9 KiB

assets/items/MT_shadow_dancer.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 8.9 KiB

assets/items/ogre_gauntlets_unique.png → assets/items/MT_steelrend.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 5.1 KiB After Width:  |  Height:  |  Size: 5.1 KiB

assets/items/MT_stormlash.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.8 KiB

assets/items/swirling_crystal_unique.png → assets/items/MT_the_oculus.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 5.4 KiB After Width:  |  Height:  |  Size: 5.4 KiB

assets/items/thresher_unique.png → assets/items/MT_the_reaper_toll.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.2 KiB After Width:  |  Height:  |  Size: 3.2 KiB

assets/items/MT_thunderstroke.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 5.7 KiB

assets/items/ceremonial_javelin_unique.png → assets/items/MT_titan_revenge.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 7.1 KiB After Width:  |  Height:  |  Size: 7.1 KiB

assets/items/cryptic_axe_unique.png → assets/items/MT_tomb_reaver.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.9 KiB After Width:  |  Height:  |  Size: 3.9 KiB

assets/items/mithril_coil_unique.png → assets/items/MT_verdungo_hearty_cord.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 5.7 KiB After Width:  |  Height:  |  Size: 5.7 KiB

assets/items/sharkskin_boots_unique.png → assets/items/MT_waterwalk.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 6.1 KiB After Width:  |  Height:  |  Size: 6.1 KiB

assets/items/circlet_magic.png → assets/items/Magic_circlet.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.0 KiB After Width:  |  Height:  |  Size: 3.0 KiB

assets/items/coronet_magic.png → assets/items/Magic_coronet.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.7 KiB After Width:  |  Height:  |  Size: 3.7 KiB

Some files were not shown because too many files have changed in this diff Show More