Merge submodule witchcraft into mods directory

Browse Source

...

This commit is contained in:

sys4-fr

2017-04-04 01:34:26 +02:00

parent aa32feff2c

commit b000b6f2b4

127 changed files with 7058 additions and 4 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

BIN

mods/witchcraft/textures/vessels_shelf_overlay.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 175 B

BIN

mods/witchcraft/textures/witchcraft_bone.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 217 B

BIN

mods/witchcraft/textures/witchcraft_bone_bottle.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 266 B

BIN

mods/witchcraft/textures/witchcraft_brewing_stand_inv.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 228 B

BIN

mods/witchcraft/textures/witchcraft_brewing_stand_side.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 493 B

BIN

mods/witchcraft/textures/witchcraft_brewing_stand_top.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 458 B

BIN

mods/witchcraft/textures/witchcraft_bubble.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 127 B

BIN

mods/witchcraft/textures/witchcraft_bubbles.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 162 B

BIN

mods/witchcraft/textures/witchcraft_bubbles_pink.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 167 B

BIN

mods/witchcraft/textures/witchcraft_candle.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 303 B

BIN

mods/witchcraft/textures/witchcraft_candle_top.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 683 B

BIN

mods/witchcraft/textures/witchcraft_dagger.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 172 B

BIN

mods/witchcraft/textures/witchcraft_dark_over.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 155 B

BIN

mods/witchcraft/textures/witchcraft_effect.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 79 B

BIN

mods/witchcraft/textures/witchcraft_fire_over.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 135 B

BIN

mods/witchcraft/textures/witchcraft_flame.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 306 B

BIN

mods/witchcraft/textures/witchcraft_herb_bottle.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 227 B

BIN

mods/witchcraft/textures/witchcraft_herbs.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 258 B

BIN

mods/witchcraft/textures/witchcraft_horn.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 193 B

BIN

mods/witchcraft/textures/witchcraft_ice.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 255 B

BIN

mods/witchcraft/textures/witchcraft_ice_over.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 137 B

BIN

mods/witchcraft/textures/witchcraft_jar_eyes.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 401 B

BIN

mods/witchcraft/textures/witchcraft_jar_slime.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 338 B

BIN

mods/witchcraft/textures/witchcraft_launcher.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 352 B

BIN

mods/witchcraft/textures/witchcraft_launcher_potion.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 134 B

BIN

mods/witchcraft/textures/witchcraft_leaf_over.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 143 B

BIN

mods/witchcraft/textures/witchcraft_light_over.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 120 B

BIN

mods/witchcraft/textures/witchcraft_medicine_bottle.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 277 B

BIN

mods/witchcraft/textures/witchcraft_moon_over.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 157 B

BIN

mods/witchcraft/textures/witchcraft_mud_bottle.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 230 B

BIN

mods/witchcraft/textures/witchcraft_penta.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 414 B

BIN

mods/witchcraft/textures/witchcraft_pentablock.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 438 B

BIN

mods/witchcraft/textures/witchcraft_pentagram.png Normal file

Binary file not shown.

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

BIN

mods/witchcraft/textures/witchcraft_portal.png Normal file

Binary file not shown.

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

BIN

mods/witchcraft/textures/witchcraft_pot_aqua.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 679 B

BIN

mods/witchcraft/textures/witchcraft_pot_blue.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 698 B

BIN

mods/witchcraft/textures/witchcraft_pot_blue2.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 665 B

BIN

mods/witchcraft/textures/witchcraft_pot_bottom.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 86 B

BIN

mods/witchcraft/textures/witchcraft_pot_brown.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 694 B

BIN

mods/witchcraft/textures/witchcraft_pot_cyan.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 683 B

BIN

mods/witchcraft/textures/witchcraft_pot_darkpurple.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 667 B

BIN

mods/witchcraft/textures/witchcraft_pot_gcyan.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1017 B

BIN

mods/witchcraft/textures/witchcraft_pot_ggreen.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 961 B

BIN

mods/witchcraft/textures/witchcraft_pot_gold.png Normal file

Binary file not shown.

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

BIN

mods/witchcraft/textures/witchcraft_pot_gpurple.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 968 B

BIN

mods/witchcraft/textures/witchcraft_pot_gred.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 981 B

BIN

mods/witchcraft/textures/witchcraft_pot_green.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 693 B

BIN

mods/witchcraft/textures/witchcraft_pot_green2.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 698 B

BIN

mods/witchcraft/textures/witchcraft_pot_grey.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 674 B

BIN

mods/witchcraft/textures/witchcraft_pot_inv.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 437 B

BIN

mods/witchcraft/textures/witchcraft_pot_magenta.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 661 B

BIN

mods/witchcraft/textures/witchcraft_pot_orange.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 658 B

BIN

mods/witchcraft/textures/witchcraft_pot_purple.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 657 B

BIN

mods/witchcraft/textures/witchcraft_pot_red.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 643 B

BIN

mods/witchcraft/textures/witchcraft_pot_redbrown.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 689 B

BIN

mods/witchcraft/textures/witchcraft_pot_side.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 285 B

BIN

mods/witchcraft/textures/witchcraft_pot_silver.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 664 B

BIN

mods/witchcraft/textures/witchcraft_pot_top.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 351 B

BIN

mods/witchcraft/textures/witchcraft_pot_yellow.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 665 B

BIN

mods/witchcraft/textures/witchcraft_pot_yllwgrn.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 679 B

BIN

mods/witchcraft/textures/witchcraft_potion_aqua.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 388 B

BIN

mods/witchcraft/textures/witchcraft_potion_blue.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 377 B

BIN

mods/witchcraft/textures/witchcraft_potion_blue2.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 394 B

BIN

mods/witchcraft/textures/witchcraft_potion_brown.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 382 B

BIN

mods/witchcraft/textures/witchcraft_potion_cyan.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 385 B

BIN

mods/witchcraft/textures/witchcraft_potion_darkpurple.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 391 B

BIN

mods/witchcraft/textures/witchcraft_potion_gcyan.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 544 B

BIN

mods/witchcraft/textures/witchcraft_potion_ggreen.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 550 B

BIN

mods/witchcraft/textures/witchcraft_potion_gold.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 424 B

BIN

mods/witchcraft/textures/witchcraft_potion_gpurple.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 546 B

BIN

mods/witchcraft/textures/witchcraft_potion_gred.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 552 B

BIN

mods/witchcraft/textures/witchcraft_potion_green.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 392 B

BIN

mods/witchcraft/textures/witchcraft_potion_green2.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 391 B

BIN

mods/witchcraft/textures/witchcraft_potion_grey.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 373 B

BIN

mods/witchcraft/textures/witchcraft_potion_magenta.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 395 B

BIN

mods/witchcraft/textures/witchcraft_potion_orange.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 395 B

BIN

mods/witchcraft/textures/witchcraft_potion_purple.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 387 B

BIN

mods/witchcraft/textures/witchcraft_potion_red.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 375 B

BIN

mods/witchcraft/textures/witchcraft_potion_redbrown.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 378 B

BIN

mods/witchcraft/textures/witchcraft_potion_silver.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 419 B

BIN

mods/witchcraft/textures/witchcraft_potion_yellgrn.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 393 B

BIN

mods/witchcraft/textures/witchcraft_potion_yellow.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 398 B

BIN

mods/witchcraft/textures/witchcraft_recipes.png Normal file

Binary file not shown.

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

BIN

mods/witchcraft/textures/witchcraft_recipes_old.png Normal file

Binary file not shown.

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

BIN

mods/witchcraft/textures/witchcraft_scroll.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 409 B

BIN

mods/witchcraft/textures/witchcraft_skin.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 75 B

BIN

mods/witchcraft/textures/witchcraft_slime_bottle.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 242 B

BIN

mods/witchcraft/textures/witchcraft_small_bottle.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 176 B

BIN

mods/witchcraft/textures/witchcraft_smoke.png Normal file

Binary file not shown.

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

BIN

mods/witchcraft/textures/witchcraft_splash_blue2.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 421 B

BIN

mods/witchcraft/textures/witchcraft_splash_brown.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 428 B

BIN

mods/witchcraft/textures/witchcraft_splash_cyan.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 422 B

BIN

mods/witchcraft/textures/witchcraft_splash_darkpurple.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 423 B

BIN

mods/witchcraft/textures/witchcraft_splash_ggreen.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 423 B

BIN

mods/witchcraft/textures/witchcraft_splash_green.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 425 B

BIN

mods/witchcraft/textures/witchcraft_splash_grey.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 385 B

BIN

mods/witchcraft/textures/witchcraft_splash_magenta.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 403 B

BIN

mods/witchcraft/textures/witchcraft_splash_orange.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 393 B

BIN

mods/witchcraft/textures/witchcraft_splash_purple.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 406 B

BIN

mods/witchcraft/textures/witchcraft_splash_red.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 390 B

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