Merge branch 'master' into no-sounds

Browse source

...

This commit is contained in:

Alexander Minges 2020-07-04 20:19:14 +02:00

parent f0fe60009b 937abec7bb

commit 273c59b700

1835 changed files with 1629 additions and 6 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

assets/minecraft/sounds/enchant/thorns/hit1.ogg Normal file

View file

Binary file not shown.

BIN

assets/minecraft/sounds/enchant/thorns/hit2.ogg Normal file

View file

Binary file not shown.

BIN

assets/minecraft/sounds/enchant/thorns/hit3.ogg Normal file

View file

Binary file not shown.

BIN

assets/minecraft/sounds/enchant/thorns/hit4.ogg Normal file

View file

Binary file not shown.

BIN

assets/minecraft/sounds/enchant/thorns/thorns.ogg Normal file

View file

Binary file not shown.

BIN

assets/minecraft/sounds/item/armor/equip_chain1.ogg Normal file

View file

Binary file not shown.

BIN

assets/minecraft/sounds/item/armor/equip_chain2.ogg Normal file

View file

Binary file not shown.

BIN

assets/minecraft/sounds/item/armor/equip_chain3.ogg Normal file

View file

Binary file not shown.

BIN

assets/minecraft/sounds/item/armor/equip_chain4.ogg Normal file

View file

Binary file not shown.

BIN

assets/minecraft/sounds/item/armor/equip_chain5.ogg Normal file

View file

Binary file not shown.

BIN

assets/minecraft/sounds/item/armor/equip_chain6.ogg Normal file

View file

Binary file not shown.

BIN

assets/minecraft/sounds/item/armor/equip_diamond1.ogg Normal file

View file

Binary file not shown.

BIN

assets/minecraft/sounds/item/armor/equip_diamond2.ogg Normal file

View file

Binary file not shown.

BIN

assets/minecraft/sounds/item/armor/equip_diamond3.ogg Normal file

View file

Binary file not shown.

BIN

assets/minecraft/sounds/item/armor/equip_diamond4.ogg Normal file

View file

Binary file not shown.

BIN

assets/minecraft/sounds/item/armor/equip_diamond5.ogg Normal file

View file

Binary file not shown.

BIN

assets/minecraft/sounds/item/armor/equip_diamond6.ogg Normal file

View file

Binary file not shown.

BIN

assets/minecraft/sounds/item/armor/equip_generic1.ogg Normal file

View file

Binary file not shown.

BIN

assets/minecraft/sounds/item/armor/equip_generic2.ogg Normal file

View file

Binary file not shown.

BIN

assets/minecraft/sounds/item/armor/equip_generic3.ogg Normal file

View file

Binary file not shown.

BIN

assets/minecraft/sounds/item/armor/equip_generic4.ogg Normal file

View file

Binary file not shown.

BIN

assets/minecraft/sounds/item/armor/equip_generic5.ogg Normal file

View file

Binary file not shown.

BIN

assets/minecraft/sounds/item/armor/equip_generic6.ogg Normal file

View file

Binary file not shown.

BIN

assets/minecraft/sounds/item/armor/equip_gold1.ogg Normal file

View file

Binary file not shown.

BIN

assets/minecraft/sounds/item/armor/equip_gold2.ogg Normal file

View file

Binary file not shown.

BIN

assets/minecraft/sounds/item/armor/equip_gold3.ogg Normal file

View file

Binary file not shown.

BIN

assets/minecraft/sounds/item/armor/equip_gold4.ogg Normal file

View file

Binary file not shown.

BIN

assets/minecraft/sounds/item/armor/equip_gold5.ogg Normal file

View file

Binary file not shown.

BIN

assets/minecraft/sounds/item/armor/equip_gold6.ogg Normal file

View file

Binary file not shown.

BIN

assets/minecraft/sounds/item/armor/equip_iron1.ogg Normal file

View file

Binary file not shown.

BIN

assets/minecraft/sounds/item/armor/equip_iron2.ogg Normal file

View file

Binary file not shown.

BIN

assets/minecraft/sounds/item/armor/equip_iron3.ogg Normal file

View file

Binary file not shown.

BIN

assets/minecraft/sounds/item/armor/equip_iron4.ogg Normal file

View file

Binary file not shown.

BIN

assets/minecraft/sounds/item/armor/equip_iron5.ogg Normal file

View file

Binary file not shown.

BIN

assets/minecraft/sounds/item/armor/equip_iron6.ogg Normal file

View file

Binary file not shown.

BIN

assets/minecraft/sounds/item/armor/equip_leather1.ogg Normal file

View file

Binary file not shown.

BIN

assets/minecraft/sounds/item/armor/equip_leather2.ogg Normal file

View file

Binary file not shown.

BIN

assets/minecraft/sounds/item/armor/equip_leather3.ogg Normal file

View file

Binary file not shown.

BIN

assets/minecraft/sounds/item/armor/equip_leather4.ogg Normal file

View file

Binary file not shown.

BIN

assets/minecraft/sounds/item/armor/equip_leather5.ogg Normal file

View file

Binary file not shown.

BIN

assets/minecraft/sounds/item/armor/equip_leather6.ogg Normal file

View file

Binary file not shown.

BIN

assets/minecraft/sounds/item/bottle/fill1.ogg Normal file

View file

Binary file not shown.

BIN

assets/minecraft/sounds/item/bottle/fill2.ogg Normal file

View file

Binary file not shown.

BIN

assets/minecraft/sounds/item/bottle/fill3.ogg Normal file

View file

Binary file not shown.

BIN

assets/minecraft/sounds/item/bottle/fill4.ogg Normal file

View file

Binary file not shown.

BIN

assets/minecraft/sounds/item/bottle/fill_dragonbreath1.ogg Normal file

View file

Binary file not shown.

BIN

assets/minecraft/sounds/item/bottle/fill_dragonbreath2.ogg Normal file

View file

Binary file not shown.

BIN

assets/minecraft/sounds/item/elytra/elytra_loop.ogg Normal file

View file

Binary file not shown.

BIN

assets/minecraft/sounds/item/hoe/till1.ogg Normal file

View file

Binary file not shown.

BIN

assets/minecraft/sounds/item/hoe/till2.ogg Normal file

View file

Binary file not shown.

BIN

assets/minecraft/sounds/item/hoe/till3.ogg Normal file

View file

Binary file not shown.

BIN

assets/minecraft/sounds/item/hoe/till4.ogg Normal file

View file

Binary file not shown.

BIN

assets/minecraft/sounds/item/shield/block1.ogg Normal file

View file

Binary file not shown.

BIN

assets/minecraft/sounds/item/shield/block2.ogg Normal file

View file

Binary file not shown.

BIN

assets/minecraft/sounds/item/shield/block3.ogg Normal file

View file

Binary file not shown.

BIN

assets/minecraft/sounds/item/shield/block4.ogg Normal file

View file

Binary file not shown.

BIN

assets/minecraft/sounds/item/shield/block5.ogg Normal file

View file

Binary file not shown.

BIN

assets/minecraft/sounds/item/shovel/flatten1.ogg Normal file

View file

Binary file not shown.

BIN

assets/minecraft/sounds/item/shovel/flatten2.ogg Normal file

View file

Binary file not shown.

BIN

assets/minecraft/sounds/item/shovel/flatten3.ogg Normal file

View file

Binary file not shown.

BIN

assets/minecraft/sounds/item/shovel/flatten4.ogg Normal file

View file

Binary file not shown.

BIN

assets/minecraft/sounds/liquid/splash1.ogg Normal file

View file

Binary file not shown.

BIN

assets/minecraft/sounds/minecart/base.ogg Normal file

View file

Binary file not shown.

BIN

assets/minecraft/sounds/minecart/base2.ogg Normal file

View file

Binary file not shown.

BIN

assets/minecraft/sounds/minecart/base3.ogg Normal file

View file

Binary file not shown.

BIN

assets/minecraft/sounds/minecart/base4.ogg Normal file

View file

Binary file not shown.

BIN

assets/minecraft/sounds/minecart/inside.ogg Normal file

View file

Binary file not shown.

BIN

assets/minecraft/sounds/minecart/inside2.ogg Normal file

View file

Binary file not shown.

BIN

assets/minecraft/sounds/minecart/inside3.ogg Normal file

View file

Binary file not shown.

BIN

assets/minecraft/sounds/minecart/inside4.ogg Normal file

View file

Binary file not shown.

BIN

assets/minecraft/sounds/mob/bat/death.ogg Normal file

View file

Binary file not shown.

BIN

assets/minecraft/sounds/mob/bat/hurt1.ogg Normal file

View file

Binary file not shown.

BIN

assets/minecraft/sounds/mob/bat/hurt2.ogg Normal file

View file

Binary file not shown.

BIN

assets/minecraft/sounds/mob/bat/hurt3.ogg Normal file

View file

Binary file not shown.

BIN

assets/minecraft/sounds/mob/bat/hurt4.ogg Normal file

View file

Binary file not shown.

BIN

assets/minecraft/sounds/mob/bat/idle1.ogg Normal file

View file

Binary file not shown.

BIN

assets/minecraft/sounds/mob/bat/idle2.ogg Normal file

View file

Binary file not shown.

BIN

assets/minecraft/sounds/mob/bat/idle3.ogg Normal file

View file

Binary file not shown.

BIN

assets/minecraft/sounds/mob/bat/idle4.ogg Normal file

View file

Binary file not shown.

BIN

assets/minecraft/sounds/mob/bat/loop.ogg Normal file

View file

Binary file not shown.

BIN

assets/minecraft/sounds/mob/bat/takeoff.ogg Normal file

View file

Binary file not shown.

BIN

assets/minecraft/sounds/mob/blaze/breathe1.ogg Normal file

View file

Binary file not shown.

BIN

assets/minecraft/sounds/mob/blaze/breathe2.ogg Normal file

View file

Binary file not shown.

BIN

assets/minecraft/sounds/mob/blaze/breathe3.ogg Normal file

View file

Binary file not shown.

BIN

assets/minecraft/sounds/mob/blaze/breathe4.ogg Normal file

View file

Binary file not shown.

BIN

assets/minecraft/sounds/mob/blaze/death.ogg Normal file

View file

Binary file not shown.

BIN

assets/minecraft/sounds/mob/blaze/hit1.ogg Normal file

View file

Binary file not shown.

BIN

assets/minecraft/sounds/mob/blaze/hit2.ogg Normal file

View file

Binary file not shown.

BIN

assets/minecraft/sounds/mob/blaze/hit3.ogg Normal file

View file

Binary file not shown.

BIN

assets/minecraft/sounds/mob/blaze/hit4.ogg Normal file

View file

Binary file not shown.

BIN

assets/minecraft/sounds/mob/cat/hiss1.ogg Normal file

View file

Binary file not shown.

BIN

assets/minecraft/sounds/mob/cat/hiss2.ogg Normal file

View file

Binary file not shown.

BIN

assets/minecraft/sounds/mob/cat/hiss3.ogg Normal file

View file

Binary file not shown.

BIN

assets/minecraft/sounds/mob/cat/hitt1.ogg Normal file

View file

Binary file not shown.

BIN

assets/minecraft/sounds/mob/cat/hitt2.ogg Normal file

View file

Binary file not shown.

BIN

assets/minecraft/sounds/mob/cat/hitt3.ogg Normal file

View file

Binary file not shown.

BIN

assets/minecraft/sounds/mob/cat/meow1.ogg Normal file

View file

Binary file not shown.

BIN

assets/minecraft/sounds/mob/cat/meow2.ogg Normal file

View file

Binary file not shown.

BIN

assets/minecraft/sounds/mob/cat/meow3.ogg Normal file

View file

Binary file not shown.

BIN

assets/minecraft/sounds/mob/cat/meow4.ogg Normal file

View file

Binary file not shown.

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